diff -Nru gimp-2.8.18/aclocal.m4 gimp-2.8.20/aclocal.m4 --- gimp-2.8.18/aclocal.m4 2016-07-12 23:19:19.000000000 +0000 +++ gimp-2.8.20/aclocal.m4 2017-01-31 23:39:50.000000000 +0000 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.6 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -12,13 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, [m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) # Configure paths for GLIB # Owen Taylor 1997-2001 @@ -710,9503 +710,151 @@ if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then : - else - no_gtk=yes - fi - fi - - if test x"$no_gtk" = x ; then - GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` - GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` - gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" -dnl -dnl Now check if the installed GTK+ is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) -dnl - rm -f conf.gtktest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - fclose (fopen ("conf.gtktest", "w")); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://pkgconfig.sourceforge.net" - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK+ test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK+ or finding the wrong" - echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - rm -f conf.gtktest -]) - -dnl -*- mode: autoconf -*- - -# serial 2 - -dnl Usage: -dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -AC_DEFUN([GTK_DOC_CHECK], -[ - AC_REQUIRE([PKG_PROG_PKG_CONFIG]) - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - - ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"]) - AC_MSG_CHECKING([for gtk-doc]) - PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no]) - AC_MSG_RESULT($have_gtk_doc) - - if test "$have_gtk_doc" = "no"; then - AC_MSG_WARN([ - You will not be able to create source packages with 'make dist' - because $gtk_doc_requires is not found.]) - fi - - dnl check for tools we added during development - dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that - dnl may not be writable by the user. Currently, automake requires that the - dnl test name must end in '.test'. - dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638 - AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test]) - AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check]) - AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) - AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) - - dnl for overriding the documentation installation directory - AC_ARG_WITH([html-dir], - AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, - [with_html_dir='${datadir}/gtk-doc/html']) - HTML_DIR="$with_html_dir" - AC_SUBST([HTML_DIR]) - - dnl enable/disable documentation building - AC_ARG_ENABLE([gtk-doc], - AS_HELP_STRING([--enable-gtk-doc], - [use gtk-doc to build documentation [[default=no]]]),, - [enable_gtk_doc=no]) - - AC_MSG_CHECKING([whether to build gtk-doc documentation]) - AC_MSG_RESULT($enable_gtk_doc) - - if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then - AC_MSG_ERROR([ - You must have $gtk_doc_requires installed to build documentation for - $PACKAGE_NAME. Please install gtk-doc or disable building the - documentation by adding '--disable-gtk-doc' to '[$]0'.]) - fi - - dnl don't check for glib if we build glib - if test "x$PACKAGE_NAME" != "xglib"; then - dnl don't fail if someone does not have glib - PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) - fi - - dnl enable/disable output formats - AC_ARG_ENABLE([gtk-doc-html], - AS_HELP_STRING([--enable-gtk-doc-html], - [build documentation in html format [[default=yes]]]),, - [enable_gtk_doc_html=yes]) - AC_ARG_ENABLE([gtk-doc-pdf], - AS_HELP_STRING([--enable-gtk-doc-pdf], - [build documentation in pdf format [[default=no]]]),, - [enable_gtk_doc_pdf=no]) - - if test -z "$GTKDOC_MKPDF"; then - enable_gtk_doc_pdf=no - fi - - if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 - fi - AC_SUBST([AM_DEFAULT_VERBOSITY]) - - AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes]) - AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) - AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) - AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) - AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) - AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) -]) - - -dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 42 IT_PROG_INTLTOOL -AC_DEFUN([IT_PROG_INTLTOOL], [ -AC_PREREQ([2.50])dnl -AC_REQUIRE([AM_NLS])dnl - -case "$am__api_version" in - 1.[01234]) - AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) - ;; - *) - ;; -esac - -INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` -INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -if test -n "$1"; then - AC_MSG_CHECKING([for intltool >= $1]) - AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) - test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) -fi - -AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) -AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) -AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) -if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) -fi - -if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 -fi -AC_SUBST([AM_DEFAULT_VERBOSITY]) - -INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' -INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' -INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' -AC_SUBST(INTLTOOL_V_MERGE) -AC_SUBST(INTLTOOL__v_MERGE_) -AC_SUBST(INTLTOOL__v_MERGE_0) - -INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' -intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' -intltool__v_merge_options_0='-q' -AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) -AC_SUBST(intltool__v_merge_options_) -AC_SUBST(intltool__v_merge_options_0) - - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' -else - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' -fi - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - -_IT_SUBST(INTLTOOL_DESKTOP_RULE) -_IT_SUBST(INTLTOOL_DIRECTORY_RULE) -_IT_SUBST(INTLTOOL_KEYS_RULE) -_IT_SUBST(INTLTOOL_PROP_RULE) -_IT_SUBST(INTLTOOL_OAF_RULE) -_IT_SUBST(INTLTOOL_PONG_RULE) -_IT_SUBST(INTLTOOL_SERVER_RULE) -_IT_SUBST(INTLTOOL_SHEET_RULE) -_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) -_IT_SUBST(INTLTOOL_UI_RULE) -_IT_SUBST(INTLTOOL_XAM_RULE) -_IT_SUBST(INTLTOOL_KBD_RULE) -_IT_SUBST(INTLTOOL_XML_RULE) -_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) -_IT_SUBST(INTLTOOL_CAVES_RULE) -_IT_SUBST(INTLTOOL_SCHEMAS_RULE) -_IT_SUBST(INTLTOOL_THEME_RULE) -_IT_SUBST(INTLTOOL_SERVICE_RULE) -_IT_SUBST(INTLTOOL_POLICY_RULE) - -# Check the gettext tools to make sure they are GNU -AC_PATH_PROG(XGETTEXT, xgettext) -AC_PATH_PROG(MSGMERGE, msgmerge) -AC_PATH_PROG(MSGFMT, msgfmt) -AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi -xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" -mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" -mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" -if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi - -AC_PATH_PROG(INTLTOOL_PERL, perl) -if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found]) -fi -AC_MSG_CHECKING([for perl >= 5.8.1]) -$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 -if test $? -ne 0; then - AC_MSG_ERROR([perl 5.8.1 is required for intltool]) -else - IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` - AC_MSG_RESULT([$IT_PERL_VERSION]) -fi -if test "x$2" != "xno-xml"; then - AC_MSG_CHECKING([for XML::Parser]) - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - AC_MSG_RESULT([ok]) - else - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) - fi -fi - -# Substitute ALL_LINGUAS so we can use it in po/Makefile -AC_SUBST(ALL_LINGUAS) - -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]], - [[extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr]])], - [DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share - dnl in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; - *) - [DATADIRNAME=lib] - ;; - esac]) -fi -AC_SUBST(DATADIRNAME) - -IT_PO_SUBDIR([po]) - -]) - - -# IT_PO_SUBDIR(DIRNAME) -# --------------------- -# All po subdirs have to be declared with this macro; the subdir "po" is -# declared by IT_PROG_INTLTOOL. -# -AC_DEFUN([IT_PO_SUBDIR], -[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. -dnl -dnl The following CONFIG_COMMANDS should be executed at the very end -dnl of config.status. -AC_CONFIG_COMMANDS_PRE([ - AC_CONFIG_COMMANDS([$1/stamp-it], [ - if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then - AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) - fi - rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" - >"$1/stamp-it.tmp" - [sed '/^#/d - s/^[[].*] *// - /^[ ]*$/d - '"s|^| $ac_top_srcdir/|" \ - "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" - ] - [sed '/^POTFILES =/,/[^\\]$/ { - /^POTFILES =/!d - r $1/POTFILES - } - ' "$1/Makefile.in" >"$1/Makefile"] - rm -f "$1/Makefile.tmp" - mv "$1/stamp-it.tmp" "$1/stamp-it" - ]) -])dnl -]) - -# _IT_SUBST(VARIABLE) -# ------------------- -# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -# -AC_DEFUN([_IT_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) - -# deprecated macros -AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) -# A hint is needed for aclocal from Automake <= 1.9.4: -# AC_DEFUN([AC_PROG_INTLTOOL], ...) - - -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# -# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -m4_define([_LT_COPYING], [dnl -# Copyright (C) 2014 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# GNU Libtool is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of of the License, or -# (at your option) any later version. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program or library that is built -# using GNU Libtool, you may include this file under the same -# distribution terms that you use for the rest of that program. -# -# GNU Libtool 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 . -]) - -# serial 58 LT_INIT - - -# LT_PREREQ(VERSION) -# ------------------ -# Complain and exit if this libtool version is less that VERSION. -m4_defun([LT_PREREQ], -[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, - [m4_default([$3], - [m4_fatal([Libtool version $1 or higher is required], - 63)])], - [$2])]) - - -# _LT_CHECK_BUILDDIR -# ------------------ -# Complain if the absolute build directory name contains unusual characters -m4_defun([_LT_CHECK_BUILDDIR], -[case `pwd` in - *\ * | *\ *) - AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; -esac -]) - - -# LT_INIT([OPTIONS]) -# ------------------ -AC_DEFUN([LT_INIT], -[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK -AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl -AC_BEFORE([$0], [LT_LANG])dnl -AC_BEFORE([$0], [LT_OUTPUT])dnl -AC_BEFORE([$0], [LTDL_INIT])dnl -m4_require([_LT_CHECK_BUILDDIR])dnl - -dnl Autoconf doesn't catch unexpanded LT_ macros by default: -m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl -m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl -dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 -dnl unless we require an AC_DEFUNed macro: -AC_REQUIRE([LTOPTIONS_VERSION])dnl -AC_REQUIRE([LTSUGAR_VERSION])dnl -AC_REQUIRE([LTVERSION_VERSION])dnl -AC_REQUIRE([LTOBSOLETE_VERSION])dnl -m4_require([_LT_PROG_LTMAIN])dnl - -_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) - -dnl Parse OPTIONS -_LT_SET_OPTIONS([$0], [$1]) - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS=$ltmain - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -_LT_SETUP - -# Only expand once: -m4_define([LT_INIT]) -])# LT_INIT - -# Old names: -AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) -AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PROG_LIBTOOL], []) -dnl AC_DEFUN([AM_PROG_LIBTOOL], []) - - -# _LT_PREPARE_CC_BASENAME -# ----------------------- -m4_defun([_LT_PREPARE_CC_BASENAME], [ -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -func_cc_basename () -{ - for cc_temp in @S|@*""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac - done - func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` -} -])# _LT_PREPARE_CC_BASENAME - - -# _LT_CC_BASENAME(CC) -# ------------------- -# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, -# but that macro is also expanded into generated libtool script, which -# arranges for $SED and $ECHO to be set by different means. -m4_defun([_LT_CC_BASENAME], -[m4_require([_LT_PREPARE_CC_BASENAME])dnl -AC_REQUIRE([_LT_DECL_SED])dnl -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl -func_cc_basename $1 -cc_basename=$func_cc_basename_result -]) - - -# _LT_FILEUTILS_DEFAULTS -# ---------------------- -# It is okay to use these file commands and assume they have been set -# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. -m4_defun([_LT_FILEUTILS_DEFAULTS], -[: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} -])# _LT_FILEUTILS_DEFAULTS - - -# _LT_SETUP -# --------- -m4_defun([_LT_SETUP], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl - -_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl -dnl -_LT_DECL([], [host_alias], [0], [The host system])dnl -_LT_DECL([], [host], [0])dnl -_LT_DECL([], [host_os], [0])dnl -dnl -_LT_DECL([], [build_alias], [0], [The build system])dnl -_LT_DECL([], [build], [0])dnl -_LT_DECL([], [build_os], [0])dnl -dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -test -z "$LN_S" && LN_S="ln -s" -_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl -dnl -AC_REQUIRE([LT_CMD_MAX_LEN])dnl -_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl -_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl -dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl -m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl -m4_require([_LT_CMD_RELOAD])dnl -m4_require([_LT_CHECK_MAGIC_METHOD])dnl -m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl -m4_require([_LT_CMD_OLD_ARCHIVE])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_WITH_SYSROOT])dnl -m4_require([_LT_CMD_TRUNCATE])dnl - -_LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options that allow our -# commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}"; then - setopt NO_GLOB_SUBST -fi -]) -if test -n "${ZSH_VERSION+set}"; then - setopt NO_GLOB_SUBST -fi - -_LT_CHECK_OBJDIR - -m4_require([_LT_TAG_COMPILER])dnl - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test set != "${COLLECT_NAMES+set}"; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Global variables: -ofile=libtool -can_build_shared=yes - -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a - -with_gnu_ld=$lt_cv_prog_gnu_ld - -old_CC=$CC -old_CFLAGS=$CFLAGS - -# Set sane defaults for various variables -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$LD" && LD=ld -test -z "$ac_objext" && ac_objext=o - -_LT_CC_BASENAME([$compiler]) - -# Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - _LT_PATH_MAGIC - fi - ;; -esac - -# Use C for the default configuration in the libtool script -LT_SUPPORTED_TAG([CC]) -_LT_LANG_C_CONFIG -_LT_LANG_DEFAULT_CONFIG -_LT_CONFIG_COMMANDS -])# _LT_SETUP - - -# _LT_PREPARE_SED_QUOTE_VARS -# -------------------------- -# Define a few sed substitution that help us do robust quoting. -m4_defun([_LT_PREPARE_SED_QUOTE_VARS], -[# Backslashify metacharacters that are still active within -# double-quoted strings. -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([["`\\]]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' -]) - -# _LT_PROG_LTMAIN -# --------------- -# Note that this code is called both from 'configure', and 'config.status' -# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# 'config.status' has no value for ac_aux_dir unless we are using Automake, -# so we pass a copy along to make sure it has a sensible value anyway. -m4_defun([_LT_PROG_LTMAIN], -[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl -_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain=$ac_aux_dir/ltmain.sh -])# _LT_PROG_LTMAIN - - - -# So that we can recreate a full libtool script including additional -# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the 'libtool' -# label. - - -# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) -# ---------------------------------------- -# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL_INIT], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_INIT], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_INIT]) - - -# _LT_CONFIG_LIBTOOL([COMMANDS]) -# ------------------------------ -# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) - - -# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) -# ----------------------------------------------------- -m4_defun([_LT_CONFIG_SAVE_COMMANDS], -[_LT_CONFIG_LIBTOOL([$1]) -_LT_CONFIG_LIBTOOL_INIT([$2]) -]) - - -# _LT_FORMAT_COMMENT([COMMENT]) -# ----------------------------- -# Add leading comment marks to the start of each line, and a trailing -# full-stop to the whole comment if one is not present already. -m4_define([_LT_FORMAT_COMMENT], -[m4_ifval([$1], [ -m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], - [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) -)]) - - - - - -# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) -# ------------------------------------------------------------------- -# CONFIGNAME is the name given to the value in the libtool script. -# VARNAME is the (base) name used in the configure script. -# VALUE may be 0, 1 or 2 for a computed quote escaped value based on -# VARNAME. Any other value will be used directly. -m4_define([_LT_DECL], -[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], - [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], - [m4_ifval([$1], [$1], [$2])]) - lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) - m4_ifval([$4], - [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) - lt_dict_add_subkey([lt_decl_dict], [$2], - [tagged?], [m4_ifval([$5], [yes], [no])])]) -]) - - -# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) -# -------------------------------------------------------- -m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) - - -# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_tag_varnames], -[_lt_decl_filter([tagged?], [yes], $@)]) - - -# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) -# --------------------------------------------------------- -m4_define([_lt_decl_filter], -[m4_case([$#], - [0], [m4_fatal([$0: too few arguments: $#])], - [1], [m4_fatal([$0: too few arguments: $#: $1])], - [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], - [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], - [lt_dict_filter([lt_decl_dict], $@)])[]dnl -]) - - -# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) -# -------------------------------------------------- -m4_define([lt_decl_quote_varnames], -[_lt_decl_filter([value], [1], $@)]) - - -# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_dquote_varnames], -[_lt_decl_filter([value], [2], $@)]) - - -# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_varnames_tagged], -[m4_assert([$# <= 2])dnl -_$0(m4_quote(m4_default([$1], [[, ]])), - m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), - m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) -m4_define([_lt_decl_varnames_tagged], -[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) - - -# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_all_varnames], -[_$0(m4_quote(m4_default([$1], [[, ]])), - m4_if([$2], [], - m4_quote(lt_decl_varnames), - m4_quote(m4_shift($@))))[]dnl -]) -m4_define([_lt_decl_all_varnames], -[lt_join($@, lt_decl_varnames_tagged([$1], - lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl -]) - - -# _LT_CONFIG_STATUS_DECLARE([VARNAME]) -# ------------------------------------ -# Quote a variable value, and forward it to 'config.status' so that its -# declaration there will have the same value as in 'configure'. VARNAME -# must have a single quote delimited value for this to work. -m4_define([_LT_CONFIG_STATUS_DECLARE], -[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) - - -# _LT_CONFIG_STATUS_DECLARATIONS -# ------------------------------ -# We delimit libtool config variables with single quotes, so when -# we write them to config.status, we have to be sure to quote all -# embedded single quotes properly. In configure, this macro expands -# each variable declared with _LT_DECL (and _LT_TAGDECL) into: -# -# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' -m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], -[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), - [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAGS -# ---------------- -# Output comment and list of tags supported by the script -m4_defun([_LT_LIBTOOL_TAGS], -[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags='_LT_TAGS'dnl -]) - - -# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) -# ----------------------------------- -# Extract the dictionary values for VARNAME (optionally with TAG) and -# expand to a commented shell variable setting: -# -# # Some comment about what VAR is for. -# visible_name=$lt_internal_name -m4_define([_LT_LIBTOOL_DECLARE], -[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], - [description])))[]dnl -m4_pushdef([_libtool_name], - m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl -m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), - [0], [_libtool_name=[$]$1], - [1], [_libtool_name=$lt_[]$1], - [2], [_libtool_name=$lt_[]$1], - [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl -m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl -]) - - -# _LT_LIBTOOL_CONFIG_VARS -# ----------------------- -# Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool' -# script. Tagged libtool config variables (even for the LIBTOOL CONFIG -# section) are produced by _LT_LIBTOOL_TAG_VARS. -m4_defun([_LT_LIBTOOL_CONFIG_VARS], -[m4_foreach([_lt_var], - m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAG_VARS(TAG) -# ------------------------- -m4_define([_LT_LIBTOOL_TAG_VARS], -[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) - - -# _LT_TAGVAR(VARNAME, [TAGNAME]) -# ------------------------------ -m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) - - -# _LT_CONFIG_COMMANDS -# ------------------- -# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of -# variables for single and double quote escaping we saved from calls -# to _LT_DECL, we can put quote escaped variables declarations -# into 'config.status', and then the shell code to quote escape them in -# for loops in 'config.status'. Finally, any additional code accumulated -# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. -m4_defun([_LT_CONFIG_COMMANDS], -[AC_PROVIDE_IFELSE([LT_OUTPUT], - dnl If the libtool generation code has been placed in $CONFIG_LT, - dnl instead of duplicating it all over again into config.status, - dnl then we will have config.status run $CONFIG_LT later, so it - dnl needs to know what name is stored there: - [AC_CONFIG_COMMANDS([libtool], - [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], - dnl If the libtool generation code is destined for config.status, - dnl expand the accumulated commands and init code now: - [AC_CONFIG_COMMANDS([libtool], - [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) -])#_LT_CONFIG_COMMANDS - - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], -[ - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -sed_quote_subst='$sed_quote_subst' -double_quote_subst='$double_quote_subst' -delay_variable_subst='$delay_variable_subst' -_LT_CONFIG_STATUS_DECLARATIONS -LTCC='$LTCC' -LTCFLAGS='$LTCFLAGS' -compiler='$compiler_DEFAULT' - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$[]1 -_LTECHO_EOF' -} - -# Quote evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Double-quote double-evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -_LT_OUTPUT_LIBTOOL_INIT -]) - -# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) -# ------------------------------------ -# Generate a child script FILE with all initialization necessary to -# reuse the environment learned by the parent script, and make the -# file executable. If COMMENT is supplied, it is inserted after the -# '#!' sequence but before initialization text begins. After this -# macro, additional text can be appended to FILE to form the body of -# the child script. The macro ends with non-zero status if the -# file could not be fully written (such as if the disk is full). -m4_ifdef([AS_INIT_GENERATED], -[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], -[m4_defun([_LT_GENERATED_FILE_INIT], -[m4_require([AS_PREPARE])]dnl -[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl -[lt_write_fail=0 -cat >$1 <<_ASEOF || lt_write_fail=1 -#! $SHELL -# Generated by $as_me. -$2 -SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>$1 <<\_ASEOF || lt_write_fail=1 -AS_SHELL_SANITIZE -_AS_PREPARE -exec AS_MESSAGE_FD>&1 -_ASEOF -test 0 = "$lt_write_fail" && chmod +x $1[]dnl -m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT - -# LT_OUTPUT -# --------- -# This macro allows early generation of the libtool script (before -# AC_OUTPUT is called), incase it is used in configure for compilation -# tests. -AC_DEFUN([LT_OUTPUT], -[: ${CONFIG_LT=./config.lt} -AC_MSG_NOTICE([creating $CONFIG_LT]) -_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], -[# Run this file to recreate a libtool stub with the current configuration.]) - -cat >>"$CONFIG_LT" <<\_LTEOF -lt_cl_silent=false -exec AS_MESSAGE_LOG_FD>>config.log -{ - echo - AS_BOX([Running $as_me.]) -} >&AS_MESSAGE_LOG_FD - -lt_cl_help="\ -'$as_me' creates a local libtool stub from the current configuration, -for use in further configure time tests before the real libtool is -generated. - -Usage: $[0] [[OPTIONS]] - - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - -Report bugs to ." - -lt_cl_version="\ -m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl -m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) -configured by $[0], generated by m4_PACKAGE_STRING. - -Copyright (C) 2011 Free Software Foundation, Inc. -This config.lt script is free software; the Free Software Foundation -gives unlimited permision to copy, distribute and modify it." - -while test 0 != $[#] -do - case $[1] in - --version | --v* | -V ) - echo "$lt_cl_version"; exit 0 ;; - --help | --h* | -h ) - echo "$lt_cl_help"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --quiet | --q* | --silent | --s* | -q ) - lt_cl_silent=: ;; - - -*) AC_MSG_ERROR([unrecognized option: $[1] -Try '$[0] --help' for more information.]) ;; - - *) AC_MSG_ERROR([unrecognized argument: $[1] -Try '$[0] --help' for more information.]) ;; - esac - shift -done - -if $lt_cl_silent; then - exec AS_MESSAGE_FD>/dev/null -fi -_LTEOF - -cat >>"$CONFIG_LT" <<_LTEOF -_LT_OUTPUT_LIBTOOL_COMMANDS_INIT -_LTEOF - -cat >>"$CONFIG_LT" <<\_LTEOF -AC_MSG_NOTICE([creating $ofile]) -_LT_OUTPUT_LIBTOOL_COMMANDS -AS_EXIT(0) -_LTEOF -chmod +x "$CONFIG_LT" - -# configure is writing to config.log, but config.lt does its own redirection, -# appending to config.log, which fails on DOS, as config.log is still kept -# open by configure. Here we exec the FD to /dev/null, effectively closing -# config.log, so it can be properly (re)opened and appended to by config.lt. -lt_cl_success=: -test yes = "$silent" && - lt_config_lt_args="$lt_config_lt_args --quiet" -exec AS_MESSAGE_LOG_FD>/dev/null -$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -exec AS_MESSAGE_LOG_FD>>config.log -$lt_cl_success || AS_EXIT(1) -])# LT_OUTPUT - - -# _LT_CONFIG(TAG) -# --------------- -# If TAG is the built-in tag, create an initial libtool script with a -# default configuration from the untagged config vars. Otherwise add code -# to config.status for appending the configuration named by TAG from the -# matching tagged config vars. -m4_defun([_LT_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_CONFIG_SAVE_COMMANDS([ - m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl - m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options that allow our - # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}"; then - setopt NO_GLOB_SUBST - fi - - cfgfile=${ofile}T - trap "$RM \"$cfgfile\"; exit 1" 1 2 15 - $RM "$cfgfile" - - cat <<_LT_EOF >> "$cfgfile" -#! $SHELL -# Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# NOTE: Changes made to this file will be lost: look at ltmain.sh. - -# Provide generalized library-building support services. -# Written by Gordon Matzigkeit, 1996 - -_LT_COPYING -_LT_LIBTOOL_TAGS - -# Configured defaults for sys_lib_dlsearch_path munging. -: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} - -# ### BEGIN LIBTOOL CONFIG -_LT_LIBTOOL_CONFIG_VARS -_LT_LIBTOOL_TAG_VARS -# ### END LIBTOOL CONFIG - -_LT_EOF - - cat <<'_LT_EOF' >> "$cfgfile" - -# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE - -_LT_PREPARE_MUNGE_PATH_LIST -_LT_PREPARE_CC_BASENAME - -# ### END FUNCTIONS SHARED WITH CONFIGURE - -_LT_EOF - - case $host_os in - aix3*) - cat <<\_LT_EOF >> "$cfgfile" -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test set != "${COLLECT_NAMES+set}"; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -_LT_EOF - ;; - esac - - _LT_PROG_LTMAIN - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -], -[cat <<_LT_EOF >> "$ofile" - -dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded -dnl in a comment (ie after a #). -# ### BEGIN LIBTOOL TAG CONFIG: $1 -_LT_LIBTOOL_TAG_VARS(_LT_TAG) -# ### END LIBTOOL TAG CONFIG: $1 -_LT_EOF -])dnl /m4_if -], -[m4_if([$1], [], [ - PACKAGE='$PACKAGE' - VERSION='$VERSION' - RM='$RM' - ofile='$ofile'], []) -])dnl /_LT_CONFIG_SAVE_COMMANDS -])# _LT_CONFIG - - -# LT_SUPPORTED_TAG(TAG) -# --------------------- -# Trace this macro to discover what tags are supported by the libtool -# --tag option, using: -# autoconf --trace 'LT_SUPPORTED_TAG:$1' -AC_DEFUN([LT_SUPPORTED_TAG], []) - - -# C support is built-in for now -m4_define([_LT_LANG_C_enabled], []) -m4_define([_LT_TAGS], []) - - -# LT_LANG(LANG) -# ------------- -# Enable libtool support for the given language if not already enabled. -AC_DEFUN([LT_LANG], -[AC_BEFORE([$0], [LT_OUTPUT])dnl -m4_case([$1], - [C], [_LT_LANG(C)], - [C++], [_LT_LANG(CXX)], - [Go], [_LT_LANG(GO)], - [Java], [_LT_LANG(GCJ)], - [Fortran 77], [_LT_LANG(F77)], - [Fortran], [_LT_LANG(FC)], - [Windows Resource], [_LT_LANG(RC)], - [m4_ifdef([_LT_LANG_]$1[_CONFIG], - [_LT_LANG($1)], - [m4_fatal([$0: unsupported language: "$1"])])])dnl -])# LT_LANG - - -# _LT_LANG(LANGNAME) -# ------------------ -m4_defun([_LT_LANG], -[m4_ifdef([_LT_LANG_]$1[_enabled], [], - [LT_SUPPORTED_TAG([$1])dnl - m4_append([_LT_TAGS], [$1 ])dnl - m4_define([_LT_LANG_]$1[_enabled], [])dnl - _LT_LANG_$1_CONFIG($1)])dnl -])# _LT_LANG - - -m4_ifndef([AC_PROG_GO], [ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_GO. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -m4_defun([AC_PROG_GO], -[AC_LANG_PUSH(Go)dnl -AC_ARG_VAR([GOC], [Go compiler command])dnl -AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl -_AC_ARG_VAR_LDFLAGS()dnl -AC_CHECK_TOOL(GOC, gccgo) -if test -z "$GOC"; then - if test -n "$ac_tool_prefix"; then - AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) - fi -fi -if test -z "$GOC"; then - AC_CHECK_PROG(GOC, gccgo, gccgo, false) -fi -])#m4_defun -])#m4_ifndef - - -# _LT_LANG_DEFAULT_CONFIG -# ----------------------- -m4_defun([_LT_LANG_DEFAULT_CONFIG], -[AC_PROVIDE_IFELSE([AC_PROG_CXX], - [LT_LANG(CXX)], - [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) - -AC_PROVIDE_IFELSE([AC_PROG_F77], - [LT_LANG(F77)], - [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) - -AC_PROVIDE_IFELSE([AC_PROG_FC], - [LT_LANG(FC)], - [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) - -dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal -dnl pulling things in needlessly. -AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([LT_PROG_GCJ], - [LT_LANG(GCJ)], - [m4_ifdef([AC_PROG_GCJ], - [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([A][M_PROG_GCJ], - [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([LT_PROG_GCJ], - [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) - -AC_PROVIDE_IFELSE([AC_PROG_GO], - [LT_LANG(GO)], - [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) - -AC_PROVIDE_IFELSE([LT_PROG_RC], - [LT_LANG(RC)], - [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) -])# _LT_LANG_DEFAULT_CONFIG - -# Obsolete macros: -AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) -AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) -AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) -AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) -AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_CXX], []) -dnl AC_DEFUN([AC_LIBTOOL_F77], []) -dnl AC_DEFUN([AC_LIBTOOL_FC], []) -dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) -dnl AC_DEFUN([AC_LIBTOOL_RC], []) - - -# _LT_TAG_COMPILER -# ---------------- -m4_defun([_LT_TAG_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl - -_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl -_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl -_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl -_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC -])# _LT_TAG_COMPILER - - -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -m4_defun([_LT_COMPILER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* -])# _LT_COMPILER_BOILERPLATE - - -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -m4_defun([_LT_LINKER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* -])# _LT_LINKER_BOILERPLATE - -# _LT_REQUIRED_DARWIN_CHECKS -# ------------------------- -m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - case $host_os in - rhapsody* | darwin*) - AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) - AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) - AC_CHECK_TOOL([LIPO], [lipo], [:]) - AC_CHECK_TOOL([OTOOL], [otool], [:]) - AC_CHECK_TOOL([OTOOL64], [otool64], [:]) - _LT_DECL([], [DSYMUTIL], [1], - [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) - _LT_DECL([], [NMEDIT], [1], - [Tool to change global to local symbols on Mac OS X]) - _LT_DECL([], [LIPO], [1], - [Tool to manipulate fat objects and archives on Mac OS X]) - _LT_DECL([], [OTOOL], [1], - [ldd/readelf like tool for Mach-O binaries on Mac OS X]) - _LT_DECL([], [OTOOL64], [1], - [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) - - AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], - [lt_cv_apple_cc_single_mod=no - if test -z "$LT_MULTI_MODULE"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - # If there is a non-empty error log, and "single_module" - # appears in it, assume the flag caused a linker warning - if test -s conftest.err && $GREP single_module conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD - # Otherwise, if the output was created with a 0 exit code from - # the compiler, it worked. - elif test -f libconftest.dylib && test 0 = "$_lt_result"; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi]) - - AC_CACHE_CHECK([for -exported_symbols_list linker flag], - [lt_cv_ld_exported_symbols_list], - [lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [lt_cv_ld_exported_symbols_list=yes], - [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS=$save_LDFLAGS - ]) - - AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], - [lt_cv_ld_force_load=no - cat > conftest.c << _LT_EOF -int forced_loaded() { return 2;} -_LT_EOF - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD - echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD - $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD - cat > conftest.c << _LT_EOF -int main() { return 0;} -_LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -f conftest.err libconftest.a conftest conftest.c - rm -rf conftest.dSYM - ]) - case $host_os in - rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[[012]][[,.]]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test yes = "$lt_cv_apple_cc_single_mod"; then - _lt_dar_single_mod='$single_module' - fi - if test yes = "$lt_cv_ld_exported_symbols_list"; then - _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' - fi - if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac -]) - - -# _LT_DARWIN_LINKER_FEATURES([TAG]) -# --------------------------------- -# Checks for linker and compiler features on darwin -m4_defun([_LT_DARWIN_LINKER_FEATURES], -[ - m4_require([_LT_REQUIRED_DARWIN_CHECKS]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_automatic, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - if test yes = "$lt_cv_ld_force_load"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], - [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='' - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined - case $cc_basename in - ifort*|nagfor*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test yes = "$_lt_dar_can_shared"; then - output_verbose_link_cmd=func_echo_all - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" - m4_if([$1], [CXX], -[ if test yes != "$lt_cv_apple_cc_single_mod"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" - fi -],[]) - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -]) - -# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) -# ---------------------------------- -# Links a minimal program and checks the executable -# for the system default hardcoded library path. In most cases, -# this is /usr/lib:/lib, but when the MPI compilers are used -# the location of the communication and MPI libs are included too. -# If we don't find anything, use the default library path according -# to the aix ld manual. -# Store the results from the different compilers for each TAGNAME. -# Allow to override them for all tags through lt_cv_aix_libpath. -m4_defun([_LT_SYS_MODULE_PATH_AIX], -[m4_require([_LT_DECL_SED])dnl -if test set = "${lt_cv_aix_libpath+set}"; then - aix_libpath=$lt_cv_aix_libpath -else - AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], - [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ - lt_aix_libpath_sed='[ - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }]' - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi],[]) - if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib - fi - ]) - aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) -fi -])# _LT_SYS_MODULE_PATH_AIX - - -# _LT_SHELL_INIT(ARG) -# ------------------- -m4_define([_LT_SHELL_INIT], -[m4_divert_text([M4SH-INIT], [$1 -])])# _LT_SHELL_INIT - - - -# _LT_PROG_ECHO_BACKSLASH -# ----------------------- -# Find how we can fake an echo command that does not interpret backslash. -# In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script that will find a shell with a builtin -# printf (that we can use as an echo command). -m4_defun([_LT_PROG_ECHO_BACKSLASH], -[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - -AC_MSG_CHECKING([how to print strings]) -# Test print first, because it will be a builtin if present. -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='printf %s\n' -else - # Use this function as a fallback that always works. - func_fallback_echo () - { - eval 'cat <<_LTECHO_EOF -$[]1 -_LTECHO_EOF' - } - ECHO='func_fallback_echo' -fi - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} - -case $ECHO in - printf*) AC_MSG_RESULT([printf]) ;; - print*) AC_MSG_RESULT([print -r]) ;; - *) AC_MSG_RESULT([cat]) ;; -esac - -m4_ifdef([_AS_DETECT_SUGGESTED], -[_AS_DETECT_SUGGESTED([ - test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( - ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - PATH=/empty FPATH=/empty; export PATH FPATH - test "X`printf %s $ECHO`" = "X$ECHO" \ - || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) - -_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) -])# _LT_PROG_ECHO_BACKSLASH - - -# _LT_WITH_SYSROOT -# ---------------- -AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) -AC_ARG_WITH([sysroot], -[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], - [Search for dependent libraries within DIR (or the compiler's sysroot - if not specified).])], -[], [with_sysroot=no]) - -dnl lt_sysroot will always be passed unquoted. We quote it here -dnl in case the user passed a directory name. -lt_sysroot= -case $with_sysroot in #( - yes) - if test yes = "$GCC"; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` - fi - ;; #( - /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` - ;; #( - no|'') - ;; #( - *) - AC_MSG_RESULT([$with_sysroot]) - AC_MSG_ERROR([The sysroot must be an absolute path.]) - ;; -esac - - AC_MSG_RESULT([${lt_sysroot:-no}]) -_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -[dependent libraries, and where our libraries should be installed.])]) - -# _LT_ENABLE_LOCK -# --------------- -m4_defun([_LT_ENABLE_LOCK], -[AC_ARG_ENABLE([libtool-lock], - [AS_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test no = "$enable_libtool_lock" || enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out what ABI is being produced by ac_compile, and set mode - # options accordingly. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE=32 - ;; - *ELF-64*) - HPUX_IA64_MODE=64 - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out what ABI is being produced by ac_compile, and set linker - # options accordingly. - echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -mips64*-*linux*) - # Find out what ABI is being produced by ac_compile, and set linker - # options accordingly. - echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - emul=elf - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - emul="${emul}32" - ;; - *64-bit*) - emul="${emul}64" - ;; - esac - case `/usr/bin/file conftest.$ac_objext` in - *MSB*) - emul="${emul}btsmip" - ;; - *LSB*) - emul="${emul}ltsmip" - ;; - esac - case `/usr/bin/file conftest.$ac_objext` in - *N32*) - emul="${emul}n32" - ;; - esac - LD="${LD-ld} -m $emul" - fi - rm -rf conftest* - ;; - -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out what ABI is being produced by ac_compile, and set linker - # options accordingly. Note that the listed cases only cover the - # situations where additional linker options are needed (such as when - # doing 32-bit compilation for a host where ld defaults to 64-bit, or - # vice versa); the common cases where no linker options are needed do - # not appear in the list. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - case `/usr/bin/file conftest.o` in - *x86-64*) - LD="${LD-ld} -m elf32_x86_64" - ;; - *) - LD="${LD-ld} -m elf_i386" - ;; - esac - ;; - powerpc64le-*linux*) - LD="${LD-ld} -m elf32lppclinux" - ;; - powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - powerpcle-*linux*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) - if test yes != "$lt_cv_cc_needs_belf"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS=$SAVE_CFLAGS - fi - ;; -*-*solaris*) - # Find out what ABI is being produced by ac_compile, and set linker - # options accordingly. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) - case $host in - i?86-*-solaris*|x86_64-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD=${LD-ld}_sol2 - fi - ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; -esac - -need_locks=$enable_libtool_lock -])# _LT_ENABLE_LOCK - - -# _LT_PROG_AR -# ----------- -m4_defun([_LT_PROG_AR], -[AC_CHECK_TOOLS(AR, [ar], false) -: ${AR=ar} -: ${AR_FLAGS=cru} -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) - -AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], - [lt_cv_ar_at_file=no - AC_COMPILE_IFELSE([AC_LANG_PROGRAM], - [echo conftest.$ac_objext > conftest.lst - lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' - AC_TRY_EVAL([lt_ar_try]) - if test 0 -eq "$ac_status"; then - # Ensure the archiver fails upon bogus file names. - rm -f conftest.$ac_objext libconftest.a - AC_TRY_EVAL([lt_ar_try]) - if test 0 -ne "$ac_status"; then - lt_cv_ar_at_file=@ - fi - fi - rm -f conftest.* libconftest.a - ]) - ]) - -if test no = "$lt_cv_ar_at_file"; then - archiver_list_spec= -else - archiver_list_spec=$lt_cv_ar_at_file -fi -_LT_DECL([], [archiver_list_spec], [1], - [How to feed a file listing to the archiver]) -])# _LT_PROG_AR - - -# _LT_CMD_OLD_ARCHIVE -# ------------------- -m4_defun([_LT_CMD_OLD_ARCHIVE], -[_LT_PROG_AR - -AC_CHECK_TOOL(STRIP, strip, :) -test -z "$STRIP" && STRIP=: -_LT_DECL([], [STRIP], [1], [A symbol stripping program]) - -AC_CHECK_TOOL(RANLIB, ranlib, :) -test -z "$RANLIB" && RANLIB=: -_LT_DECL([], [RANLIB], [1], - [Commands used to install an old-style archive]) - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - bitrig* | openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" -fi - -case $host_os in - darwin*) - lock_old_archive_extraction=yes ;; - *) - lock_old_archive_extraction=no ;; -esac -_LT_DECL([], [old_postinstall_cmds], [2]) -_LT_DECL([], [old_postuninstall_cmds], [2]) -_LT_TAGDECL([], [old_archive_cmds], [2], - [Commands used to build an old-style archive]) -_LT_DECL([], [lock_old_archive_extraction], [0], - [Whether to use a lock for old archive extraction]) -])# _LT_CMD_OLD_ARCHIVE - - -# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------------------- -# Check whether the given compiler option works -AC_DEFUN([_LT_COMPILER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - fi - $RM conftest* -]) - -if test yes = "[$]$2"; then - m4_if([$5], , :, [$5]) -else - m4_if([$6], , :, [$6]) -fi -])# _LT_COMPILER_OPTION - -# Old name: -AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) - - -# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------- -# Check whether the given linker option works -AC_DEFUN([_LT_LINKER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS $3" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&AS_MESSAGE_LOG_FD - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - else - $2=yes - fi - fi - $RM -r conftest* - LDFLAGS=$save_LDFLAGS -]) - -if test yes = "[$]$2"; then - m4_if([$4], , :, [$4]) -else - m4_if([$5], , :, [$5]) -fi -])# _LT_LINKER_OPTION - -# Old name: -AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) - - -# LT_CMD_MAX_LEN -#--------------- -AC_DEFUN([LT_CMD_MAX_LEN], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -# find the maximum length of command line arguments -AC_MSG_CHECKING([the maximum length of command line arguments]) -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 - teststring=ABCD - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - - mint*) - # On MiNT this can take a long time and run out of memory. - lt_cv_sys_max_cmd_len=8192; - ;; - - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - os2*) - # The test takes a long time on OS/2. - lt_cv_sys_max_cmd_len=8192 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while { test X`env echo "$teststring$teststring" 2>/dev/null` \ - = "X$teststring$teststring"; } >/dev/null 2>&1 && - test 17 != "$i" # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on - # massive amounts of additional arguments before passing them to the - # linker. It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac -]) -if test -n "$lt_cv_sys_max_cmd_len"; then - AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -else - AC_MSG_RESULT(none) -fi -max_cmd_len=$lt_cv_sys_max_cmd_len -_LT_DECL([], [max_cmd_len], [0], - [What is the maximum length of a command?]) -])# LT_CMD_MAX_LEN - -# Old name: -AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) - - -# _LT_HEADER_DLFCN -# ---------------- -m4_defun([_LT_HEADER_DLFCN], -[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl -])# _LT_HEADER_DLFCN - - -# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ---------------------------------------------------------------- -m4_defun([_LT_TRY_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test yes = "$cross_compiling"; then : - [$4] -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -[#line $LINENO "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -/* When -fvisibility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif - -int fnord () { return 42; } -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } - /* dlclose (self); */ - } - else - puts (dlerror ()); - - return status; -}] -_LT_EOF - if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) $1 ;; - x$lt_dlneed_uscore) $2 ;; - x$lt_dlunknown|x*) $3 ;; - esac - else : - # compilation failed - $3 - fi -fi -rm -fr conftest* -])# _LT_TRY_DLOPEN_SELF - - -# LT_SYS_DLOPEN_SELF -# ------------------ -AC_DEFUN([LT_SYS_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test yes != "$enable_dlopen"; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen=load_add_on - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32* | cegcc*) - lt_cv_dlopen=LoadLibrary - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen=dlopen - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ - lt_cv_dlopen=dyld - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ]) - ;; - - tpf*) - # Don't try to run any link tests for TPF. We know it's impossible - # because TPF is a cross-compiler, and we know how we open DSOs. - lt_cv_dlopen=dlopen - lt_cv_dlopen_libs= - lt_cv_dlopen_self=no - ;; - - *) - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen=shl_load], - [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], - [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=-ldld]) - ]) - ]) - ]) - ]) - ]) - ;; - esac - - if test no = "$lt_cv_dlopen"; then - enable_dlopen=no - else - enable_dlopen=yes - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS=$CPPFLAGS - test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS=$LDFLAGS - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS=$LIBS - LIBS="$lt_cv_dlopen_libs $LIBS" - - AC_CACHE_CHECK([whether a program can dlopen itself], - lt_cv_dlopen_self, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) - ]) - - if test yes = "$lt_cv_dlopen_self"; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - AC_CACHE_CHECK([whether a statically linked program can dlopen itself], - lt_cv_dlopen_self_static, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) - ]) - fi - - CPPFLAGS=$save_CPPFLAGS - LDFLAGS=$save_LDFLAGS - LIBS=$save_LIBS - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi -_LT_DECL([dlopen_support], [enable_dlopen], [0], - [Whether dlopen is supported]) -_LT_DECL([dlopen_self], [enable_dlopen_self], [0], - [Whether dlopen of programs is supported]) -_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], - [Whether dlopen of statically linked programs is supported]) -])# LT_SYS_DLOPEN_SELF - -# Old name: -AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) - - -# _LT_COMPILER_C_O([TAGNAME]) -# --------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler. -# This macro does not hard code the compiler like AC_PROG_CC_C_O. -m4_defun([_LT_COMPILER_C_O], -[m4_require([_LT_DECL_SED])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - fi - fi - chmod u+w . 2>&AS_MESSAGE_LOG_FD - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* -]) -_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], - [Does compiler simultaneously support -c and -o options?]) -])# _LT_COMPILER_C_O - - -# _LT_COMPILER_FILE_LOCKS([TAGNAME]) -# ---------------------------------- -# Check to see if we can do hard links to lock some files if needed -m4_defun([_LT_COMPILER_FILE_LOCKS], -[m4_require([_LT_ENABLE_LOCK])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_COMPILER_C_O([$1]) - -hard_links=nottested -if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then - # do not overwrite the value of need_locks provided by the user - AC_MSG_CHECKING([if we can lock with hard links]) - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - AC_MSG_RESULT([$hard_links]) - if test no = "$hard_links"; then - AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) - need_locks=warn - fi -else - need_locks=no -fi -_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) -])# _LT_COMPILER_FILE_LOCKS - - -# _LT_CHECK_OBJDIR -# ---------------- -m4_defun([_LT_CHECK_OBJDIR], -[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -[rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null]) -objdir=$lt_cv_objdir -_LT_DECL([], [objdir], [0], - [The name of the directory that contains temporary libtool files])dnl -m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/", - [Define to the sub-directory where libtool stores uninstalled libraries.]) -])# _LT_CHECK_OBJDIR - - -# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) -# -------------------------------------- -# Check hardcoding attributes. -m4_defun([_LT_LINKER_HARDCODE_LIBPATH], -[AC_MSG_CHECKING([how to hardcode library paths into programs]) -_LT_TAGVAR(hardcode_action, $1)= -if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || - test -n "$_LT_TAGVAR(runpath_var, $1)" || - test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then - - # We can hardcode non-existent directories. - if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && - test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then - # Linking always hardcodes the temporary library directory. - _LT_TAGVAR(hardcode_action, $1)=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - _LT_TAGVAR(hardcode_action, $1)=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - _LT_TAGVAR(hardcode_action, $1)=unsupported -fi -AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) - -if test relink = "$_LT_TAGVAR(hardcode_action, $1)" || - test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then - # Fast installation is not supported - enable_fast_install=no -elif test yes = "$shlibpath_overrides_runpath" || - test no = "$enable_shared"; then - # Fast installation is not necessary - enable_fast_install=needless -fi -_LT_TAGDECL([], [hardcode_action], [0], - [How to hardcode a shared library path into an executable]) -])# _LT_LINKER_HARDCODE_LIBPATH - - -# _LT_CMD_STRIPLIB -# ---------------- -m4_defun([_LT_CMD_STRIPLIB], -[m4_require([_LT_DECL_EGREP]) -striplib= -old_striplib= -AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP"; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac -fi -_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) -_LT_DECL([], [striplib], [1]) -])# _LT_CMD_STRIPLIB - - -# _LT_PREPARE_MUNGE_PATH_LIST -# --------------------------- -# Make sure func_munge_path_list() is defined correctly. -m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], -[[# func_munge_path_list VARIABLE PATH -# ----------------------------------- -# VARIABLE is name of variable containing _space_ separated list of -# directories to be munged by the contents of PATH, which is string -# having a format: -# "DIR[:DIR]:" -# string "DIR[ DIR]" will be prepended to VARIABLE -# ":DIR[:DIR]" -# string "DIR[ DIR]" will be appended to VARIABLE -# "DIRP[:DIRP]::[DIRA:]DIRA" -# string "DIRP[ DIRP]" will be prepended to VARIABLE and string -# "DIRA[ DIRA]" will be appended to VARIABLE -# "DIR[:DIR]" -# VARIABLE will be replaced by "DIR[ DIR]" -func_munge_path_list () -{ - case x@S|@2 in - x) - ;; - *:) - eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" - ;; - x:*) - eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" - ;; - *::*) - eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" - eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" - ;; - *) - eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" - ;; - esac -} -]])# _LT_PREPARE_PATH_LIST - - -# _LT_SYS_DYNAMIC_LINKER([TAG]) -# ----------------------------- -# PORTME Fill in your ld.so characteristics -m4_defun([_LT_SYS_DYNAMIC_LINKER], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_OBJDUMP])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl -m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl -AC_MSG_CHECKING([dynamic linker characteristics]) -m4_if([$1], - [], [ -if test yes = "$GCC"; then - case $host_os in - darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; - *) lt_awk_arg='/^libraries:/' ;; - esac - case $host_os in - mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; - *) lt_sed_strip_eq='s|=/|/|g' ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` - case $lt_search_path_spec in - *\;*) - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` - ;; - *) - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` - ;; - esac - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary... - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - # ...but if some path component already ends with the multilib dir we assume - # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). - case "$lt_multi_os_dir; $lt_search_path_spec " in - "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) - lt_multi_os_dir= - ;; - esac - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" - elif test -n "$lt_multi_os_dir"; then - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS = " "; FS = "/|\n";} { - lt_foo = ""; - lt_count = 0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo = "/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[[lt_foo]]++; } - if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -}'` - # AWK program above erroneously prepends '/' to C:/dos/paths - # for these hosts. - case $host_os in - mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; - esac - sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi]) -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=.so -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -AC_ARG_VAR([LT_SYS_LIBRARY_PATH], -[User-defined run-time library search path.]) - -case $host_os in -aix3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname$release$shared_ext$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='$libname$release$shared_ext$major' - ;; - -aix[[4-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test ia64 = "$host_cpu"; then - # AIX 5 supports IA64 - library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line '#! .'. This would cause the generated library to - # depend on '.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[[01]] | aix4.[[01]].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # Using Import Files as archive members, it is possible to support - # filename-based versioning of shared library archives on AIX. While - # this would work for both with and without runtime linking, it will - # prevent static linking of such archives. So we do filename-based - # shared library versioning with .so extension only, which is used - # when both runtime linking and shared linking is enabled. - # Unfortunately, runtime linking may impact performance, so we do - # not want this to be the default eventually. Also, we use the - # versioned .so libs for executables only if there is the -brtl - # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. - # To allow for filename-based versioning support, we need to create - # libNAME.so.V as an archive file, containing: - # *) an Import File, referring to the versioned filename of the - # archive as well as the shared archive member, telling the - # bitwidth (32 or 64) of that shared object, and providing the - # list of exported symbols of that shared object, eventually - # decorated with the 'weak' keyword - # *) the shared object with the F_LOADONLY flag set, to really avoid - # it being seen by the linker. - # At run time we better use the real file rather than another symlink, - # but for link time we create the symlink libNAME.so -> libNAME.so.V - - case $with_aix_soname,$aix_use_runtimelinking in - # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - aix,yes) # traditional libtool - dynamic_linker='AIX unversionable lib.so' - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - ;; - aix,no) # traditional AIX only - dynamic_linker='AIX lib.a[(]lib.so.V[)]' - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='$libname$release.a $libname.a' - soname_spec='$libname$release$shared_ext$major' - ;; - svr4,*) # full svr4 only - dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]" - library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' - # We do not specify a path in Import Files, so LIBPATH fires. - shlibpath_overrides_runpath=yes - ;; - *,yes) # both, prefer svr4 - dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]" - library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' - # unpreferred sharedlib libNAME.a needs extra handling - postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' - postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' - # We do not specify a path in Import Files, so LIBPATH fires. - shlibpath_overrides_runpath=yes - ;; - *,no) # both, prefer aix - dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]" - library_names_spec='$libname$release.a $libname.a' - soname_spec='$libname$release$shared_ext$major' - # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling - postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' - postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' - ;; - esac - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='$libname$shared_ext' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[[45]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=.dll - need_version=no - need_lib_prefix=no - - case $GCC,$cc_basename in - yes,*) - # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \$file`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' -m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' - ;; - esac - dynamic_linker='Win32 ld.exe' - ;; - - *,cl*) - # Native MSVC - libname_spec='$name' - soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' - library_names_spec='$libname.dll.lib' - - case $build_os in - mingw*) - sys_lib_search_path_spec= - lt_save_ifs=$IFS - IFS=';' - for lt_path in $LIB - do - IFS=$lt_save_ifs - # Let DOS variable expansion print the short 8.3 style file name. - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" - done - IFS=$lt_save_ifs - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` - ;; - cygwin*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` - sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - ;; - *) - sys_lib_search_path_spec=$LIB - if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # FIXME: find the short name or the path components, as spaces are - # common. (e.g. "Program Files" -> "PROGRA~1") - ;; - esac - - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \$file`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - dynamic_linker='Win32 link.exe' - ;; - - *) - # Assume MSVC wrapper - library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' - dynamic_linker='Win32 ld.exe' - ;; - esac - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' - soname_spec='$libname$release$major$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[[23]].*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2.*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[[01]]* | freebsdelf3.[[01]]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ - freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=no - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' - if test 32 = "$HPUX_IA64_MODE"; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - sys_lib_dlsearch_path_spec=/usr/lib/hpux32 - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - sys_lib_dlsearch_path_spec=/usr/lib/hpux64 - fi - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... - postinstall_cmds='chmod 555 $lib' - # or fails outright, so override atomically: - install_override_mode=555 - ;; - -interix[[3-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test yes = "$lt_cv_prog_gnu_ld"; then - version_type=linux # correct to gnu/linux during the next big refactor - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='$libname$release$shared_ext$major' - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" - sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -linux*android*) - version_type=none # Android doesn't support versioned libraries. - need_lib_prefix=no - need_version=no - library_names_spec='$libname$release$shared_ext' - soname_spec='$libname$release$shared_ext' - finish_cmds= - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - dynamic_linker='Android linker' - # Don't embed -rpath directories since the linker doesn't support them. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - - # Some binutils ld are patched to set DT_RUNPATH - AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], - [lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], - [lt_cv_shlibpath_overrides_runpath=yes])]) - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - ]) - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Ideally, we could use ldconfig to report *all* directores which are - # searched for libraries, however this is still not possible. Aside from not - # being certain /sbin/ldconfig is available, command - # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, - # even though it is searched at run-time. Try to do the best guess by - # appending ld.so.conf contents (and includes) to the search path. - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - -openbsd* | bitrig*) - version_type=sunos - sys_lib_dlsearch_path_spec=/usr/lib - need_lib_prefix=no - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then - need_version=no - else - need_version=yes - fi - library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -os2*) - libname_spec='$name' - version_type=windows - shrext_cmds=.dll - need_version=no - need_lib_prefix=no - # OS/2 can only load a DLL with a base name of 8 characters or less. - soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; - v=$($ECHO $release$versuffix | tr -d .-); - n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); - $ECHO $n$v`$shared_ext' - library_names_spec='${libname}_dll.$libext' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=BEGINLIBPATH - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - postinstall_cmds='base_file=`basename \$file`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='$libname$release$shared_ext$major' - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test yes = "$with_gnu_ld"; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec; then - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' - soname_spec='$libname$shared_ext.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=sco - need_lib_prefix=no - need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test yes = "$with_gnu_ld"; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -uts4*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -AC_MSG_RESULT([$dynamic_linker]) -test no = "$dynamic_linker" && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test yes = "$GCC"; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then - sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec -fi - -if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then - sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec -fi - -# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... -configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec - -# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code -func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" - -# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool -configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH - -_LT_DECL([], [variables_saved_for_relink], [1], - [Variables whose values should be saved in libtool wrapper scripts and - restored at link time]) -_LT_DECL([], [need_lib_prefix], [0], - [Do we need the "lib" prefix for modules?]) -_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) -_LT_DECL([], [version_type], [0], [Library versioning type]) -_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) -_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) -_LT_DECL([], [shlibpath_overrides_runpath], [0], - [Is shlibpath searched before the hard-coded library search path?]) -_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) -_LT_DECL([], [library_names_spec], [1], - [[List of archive names. First name is the real one, the rest are links. - The last name is the one that the linker finds with -lNAME]]) -_LT_DECL([], [soname_spec], [1], - [[The coded name of the library, if different from the real name]]) -_LT_DECL([], [install_override_mode], [1], - [Permission mode override for installation of shared libraries]) -_LT_DECL([], [postinstall_cmds], [2], - [Command to use after installation of a shared archive]) -_LT_DECL([], [postuninstall_cmds], [2], - [Command to use after uninstallation of a shared archive]) -_LT_DECL([], [finish_cmds], [2], - [Commands used to finish a libtool library installation in a directory]) -_LT_DECL([], [finish_eval], [1], - [[As "finish_cmds", except a single script fragment to be evaled but - not shown]]) -_LT_DECL([], [hardcode_into_libs], [0], - [Whether we should hardcode library paths into libraries]) -_LT_DECL([], [sys_lib_search_path_spec], [2], - [Compile-time system search path for libraries]) -_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2], - [Detected run-time system search path for libraries]) -_LT_DECL([], [configure_time_lt_sys_library_path], [2], - [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) -])# _LT_SYS_DYNAMIC_LINKER - - -# _LT_PATH_TOOL_PREFIX(TOOL) -# -------------------------- -# find a file program that can recognize shared library -AC_DEFUN([_LT_PATH_TOOL_PREFIX], -[m4_require([_LT_DECL_EGREP])dnl -AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in -[[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD=$MAGIC_CMD - lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR -dnl $ac_dummy forces splitting on constant user-supplied paths. -dnl POSIX.2 word splitting is done only on the output of word expansions, -dnl not every word. This closes a longstanding sh security hole. - ac_dummy="m4_if([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do - IFS=$lt_save_ifs - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$1"; then - lt_cv_path_MAGIC_CMD=$ac_dir/"$1" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD=$lt_cv_path_MAGIC_CMD - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS=$lt_save_ifs - MAGIC_CMD=$lt_save_MAGIC_CMD - ;; -esac]) -MAGIC_CMD=$lt_cv_path_MAGIC_CMD -if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) -else - AC_MSG_RESULT(no) -fi -_LT_DECL([], [MAGIC_CMD], [0], - [Used to examine libraries when file_magic_cmd begins with "file"])dnl -])# _LT_PATH_TOOL_PREFIX - -# Old name: -AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) - - -# _LT_PATH_MAGIC -# -------------- -# find a file program that can recognize a shared library -m4_defun([_LT_PATH_MAGIC], -[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) - else - MAGIC_CMD=: - fi -fi -])# _LT_PATH_MAGIC - - -# LT_PATH_LD -# ---------- -# find the pathname to the GNU or non-GNU linker -AC_DEFUN([LT_PATH_LD], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_PROG_ECHO_BACKSLASH])dnl - -AC_ARG_WITH([gnu-ld], - [AS_HELP_STRING([--with-gnu-ld], - [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test no = "$withval" || with_gnu_ld=yes], - [with_gnu_ld=no])dnl - -ac_prog=ld -if test yes = "$GCC"; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by $CC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return, which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD=$ac_prog - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test yes = "$with_gnu_ld"; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(lt_cv_path_LD, -[if test -z "$LD"; then - lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS=$lt_save_ifs - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD=$ac_dir/$ac_prog - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &1 conftest.i -cat conftest.i conftest.i >conftest2.i -: ${lt_DD:=$DD} -AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd], -[if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then - cmp -s conftest.i conftest.out \ - && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: -fi]) -rm -f conftest.i conftest2.i conftest.out]) -])# _LT_PATH_DD - - -# _LT_CMD_TRUNCATE -# ---------------- -# find command to truncate a binary pipe -m4_defun([_LT_CMD_TRUNCATE], -[m4_require([_LT_PATH_DD]) -AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin], -[printf 0123456789abcdef0123456789abcdef >conftest.i -cat conftest.i conftest.i >conftest2.i -lt_cv_truncate_bin= -if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then - cmp -s conftest.i conftest.out \ - && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" -fi -rm -f conftest.i conftest2.i conftest.out -test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"]) -_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1], - [Command to truncate a binary pipe]) -])# _LT_CMD_TRUNCATE - - -# _LT_CHECK_MAGIC_METHOD -# ---------------------- -# how to check for library dependencies -# -- PORTME fill in with the dynamic library characteristics -m4_defun([_LT_CHECK_MAGIC_METHOD], -[m4_require([_LT_DECL_EGREP]) -m4_require([_LT_DECL_OBJDUMP]) -AC_CACHE_CHECK([how to recognize dependent libraries], -lt_cv_deplibs_check_method, -[lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# 'unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [[regex]]' -- check by looking for files in library path -# that responds to the $file_magic_cmd with a given extended regex. -# If you have 'file' or equivalent on your system and you're not sure -# whether 'pass_all' will *always* work, you probably want this one. - -case $host_os in -aix[[4-9]]*) - lt_cv_deplibs_check_method=pass_all - ;; - -beos*) - lt_cv_deplibs_check_method=pass_all - ;; - -bsdi[[45]]*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - -cygwin*) - # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - ;; - -mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - # Keep this pattern in sync with the one in func_win32_libid. - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - -cegcc*) - # use the weaker test based on 'objdump'. See mingw*. - lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -interix[[3-9]]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -*nto* | *qnx*) - lt_cv_deplibs_check_method=pass_all - ;; - -openbsd* | bitrig*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -tpf*) - lt_cv_deplibs_check_method=pass_all - ;; -os2*) - lt_cv_deplibs_check_method=pass_all - ;; -esac -]) - -file_magic_glob= -want_nocaseglob=no -if test "$build" = "$host"; then - case $host_os in - mingw* | pw32*) - if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then - want_nocaseglob=yes - else - file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` - fi - ;; - esac -fi - -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown - -_LT_DECL([], [deplibs_check_method], [1], - [Method to check whether dependent libraries are shared objects]) -_LT_DECL([], [file_magic_cmd], [1], - [Command to use when deplibs_check_method = "file_magic"]) -_LT_DECL([], [file_magic_glob], [1], - [How to find potential files when deplibs_check_method = "file_magic"]) -_LT_DECL([], [want_nocaseglob], [1], - [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) -])# _LT_CHECK_MAGIC_METHOD - - -# LT_PATH_NM -# ---------- -# find the pathname to a BSD- or MS-compatible name lister -AC_DEFUN([LT_PATH_NM], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM=$NM -else - lt_nm_to_check=${ac_tool_prefix}nm - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS=$lt_save_ifs - test -z "$ac_dir" && ac_dir=. - tmp_nm=$ac_dir/$lt_tmp_nm - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the 'sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty - case $build_os in - mingw*) lt_bad_file=conftest.nm/nofile ;; - *) lt_bad_file=/dev/null ;; - esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in - *$lt_bad_file* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break 2 - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break 2 - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS=$lt_save_ifs - done - : ${lt_cv_path_NM=no} -fi]) -if test no != "$lt_cv_path_NM"; then - NM=$lt_cv_path_NM -else - # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$DUMPBIN"; then : - # Let the user override the test. - else - AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in - *COFF*) - DUMPBIN="$DUMPBIN -symbols -headers" - ;; - *) - DUMPBIN=: - ;; - esac - fi - AC_SUBST([DUMPBIN]) - if test : != "$DUMPBIN"; then - NM=$DUMPBIN - fi -fi -test -z "$NM" && NM=nm -AC_SUBST([NM]) -_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl - -AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], - [lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) - cat conftest.out >&AS_MESSAGE_LOG_FD - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -f conftest*]) -])# LT_PATH_NM - -# Old names: -AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) -AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_PROG_NM], []) -dnl AC_DEFUN([AC_PROG_NM], []) - -# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -# -------------------------------- -# how to determine the name of the shared library -# associated with a specific link library. -# -- PORTME fill in with the dynamic library characteristics -m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], -[m4_require([_LT_DECL_EGREP]) -m4_require([_LT_DECL_OBJDUMP]) -m4_require([_LT_DECL_DLLTOOL]) -AC_CACHE_CHECK([how to associate runtime and link libraries], -lt_cv_sharedlib_from_linklib_cmd, -[lt_cv_sharedlib_from_linklib_cmd='unknown' - -case $host_os in -cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh; - # decide which one to use based on capabilities of $DLLTOOL - case `$DLLTOOL --help 2>&1` in - *--identify-strict*) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib - ;; - *) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback - ;; - esac - ;; -*) - # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd=$ECHO - ;; -esac -]) -sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO - -_LT_DECL([], [sharedlib_from_linklib_cmd], [1], - [Command to associate shared and link libraries]) -])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB - - -# _LT_PATH_MANIFEST_TOOL -# ---------------------- -# locate the manifest tool -m4_defun([_LT_PATH_MANIFEST_TOOL], -[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) -test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], - [lt_cv_path_mainfest_tool=no - echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD - $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out - cat conftest.err >&AS_MESSAGE_LOG_FD - if $GREP 'Manifest Tool' conftest.out > /dev/null; then - lt_cv_path_mainfest_tool=yes - fi - rm -f conftest*]) -if test yes != "$lt_cv_path_mainfest_tool"; then - MANIFEST_TOOL=: -fi -_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl -])# _LT_PATH_MANIFEST_TOOL - - -# _LT_DLL_DEF_P([FILE]) -# --------------------- -# True iff FILE is a Windows DLL '.def' file. -# Keep in sync with func_dll_def_p in the libtool script -AC_DEFUN([_LT_DLL_DEF_P], -[dnl - test DEF = "`$SED -n dnl - -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace - -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments - -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl - -e q dnl Only consider the first "real" line - $1`" dnl -])# _LT_DLL_DEF_P - - -# LT_LIB_M -# -------- -# check for math library -AC_DEFUN([LT_LIB_M], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) - AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, cos, LIBM=-lm) - ;; -esac -AC_SUBST([LIBM]) -])# LT_LIB_M - -# Old name: -AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_CHECK_LIBM], []) - - -# _LT_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------- -m4_defun([_LT_COMPILER_NO_RTTI], -[m4_require([_LT_TAG_COMPILER])dnl - -_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - -if test yes = "$GCC"; then - case $cc_basename in - nvcc*) - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; - *) - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; - esac - - _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, - [-fno-rtti -fno-exceptions], [], - [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -fi -_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], - [Compiler flag to turn off builtin functions]) -])# _LT_COMPILER_NO_RTTI - - -# _LT_CMD_GLOBAL_SYMBOLS -# ---------------------- -m4_defun([_LT_CMD_GLOBAL_SYMBOLS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([LT_PATH_NM])dnl -AC_REQUIRE([LT_PATH_LD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_TAG_COMPILER])dnl - -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -[ -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[[BCDEGRST]]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32* | cegcc*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) - if test ia64 = "$host_cpu"; then - symcode='[[ABCDEGRST]]' - fi - ;; -irix* | nonstopux*) - symcode='[[BCDEGRST]]' - ;; -osf*) - symcode='[[BCDEGQRST]]' - ;; -solaris*) - symcode='[[BDRT]]' - ;; -sco3.2v5*) - symcode='[[DT]]' - ;; -sysv4.2uw2*) - symcode='[[DT]]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[[ABDT]]' - ;; -sysv4) - symcode='[[DFNSTU]]' - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGIRSTW]]' ;; -esac - -if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" - # Adjust the below global symbol transforms to fixup imported variables. - lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" - lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" - lt_c_name_lib_hook="\ - -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ - -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" -else - # Disable hooks by default. - lt_cv_sys_global_symbol_to_import= - lt_cdecl_hook= - lt_c_name_hook= - lt_c_name_lib_hook= -fi - -# Transform an extracted symbol line into a proper C declaration. -# Some systems (esp. on ia64) link data and code symbols differently, -# so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ -$lt_cdecl_hook\ -" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ -" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ -$lt_c_name_hook\ -" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ -" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" - -# Transform an extracted symbol line into symbol name with lib prefix and -# symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ -$lt_c_name_lib_hook\ -" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ -" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ -" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# Try without a prefix underscore, then with it. -for ac_symprfx in "" "_"; do - - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - - # Write the raw and C identifiers. - if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function, - # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++, - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK ['"\ -" {last_section=section; section=\$ 3};"\ -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ -" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ -" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ -" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ -" \$ 0!~/External *\|/{next};"\ -" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -" {if(hide[section]) next};"\ -" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ -" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ -" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ -" ' prfx=^$ac_symprfx]" - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext <<_LT_EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(void); -void nm_test_func(void){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -_LT_EOF - - if AC_TRY_EVAL(ac_compile); then - # Now try to grab the symbols. - nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE -/* DATA imports from DLLs on WIN32 can't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT@&t@_DLSYM_CONST -#elif defined __osf__ -/* This system does not cope well with relocations in const data. */ -# define LT@&t@_DLSYM_CONST -#else -# define LT@&t@_DLSYM_CONST const -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -_LT_EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - - cat <<_LT_EOF >> conftest.$ac_ext - -/* The mapping between symbol names and symbols. */ -LT@&t@_DLSYM_CONST struct { - const char *name; - void *address; -} -lt__PROGRAM__LTX_preloaded_symbols[[]] = -{ - { "@PROGRAM@", (void *) 0 }, -_LT_EOF - $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt__PROGRAM__LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif -_LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_globsym_save_LIBS=$LIBS - lt_globsym_save_CFLAGS=$CFLAGS - LIBS=conftstm.$ac_objext - CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then - pipe_works=yes - fi - LIBS=$lt_globsym_save_LIBS - CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi - rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test yes = "$pipe_works"; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done -]) -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - AC_MSG_RESULT(failed) -else - AC_MSG_RESULT(ok) -fi - -# Response file support. -if test "$lt_cv_nm_interface" = "MS dumpbin"; then - nm_file_list_spec='@' -elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then - nm_file_list_spec='@' -fi - -_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], - [Take the output of nm and produce a listing of raw symbols and C names]) -_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], - [Transform the output of nm in a proper C declaration]) -_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1], - [Transform the output of nm into a list of symbols to manually relocate]) -_LT_DECL([global_symbol_to_c_name_address], - [lt_cv_sys_global_symbol_to_c_name_address], [1], - [Transform the output of nm in a C name address pair]) -_LT_DECL([global_symbol_to_c_name_address_lib_prefix], - [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], - [Transform the output of nm in a C name address pair when lib prefix is needed]) -_LT_DECL([nm_interface], [lt_cv_nm_interface], [1], - [The name lister interface]) -_LT_DECL([], [nm_file_list_spec], [1], - [Specify filename containing input files for $NM]) -]) # _LT_CMD_GLOBAL_SYMBOLS - - -# _LT_COMPILER_PIC([TAGNAME]) -# --------------------------- -m4_defun([_LT_COMPILER_PIC], -[m4_require([_LT_TAG_COMPILER])dnl -_LT_TAGVAR(lt_prog_compiler_wl, $1)= -_LT_TAGVAR(lt_prog_compiler_pic, $1)= -_LT_TAGVAR(lt_prog_compiler_static, $1)= - -m4_if([$1], [CXX], [ - # C++ specific cases for pic, static, wl, etc. - if test yes = "$GXX"; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test ia64 = "$host_cpu"; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the '-m68020' flag to GCC prevents building anything better, - # like '-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - case $host_os in - os2*) - _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' - ;; - esac - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - _LT_TAGVAR(lt_prog_compiler_static, $1)= - ;; - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - case $host_os in - aix[[4-9]]*) - # All AIX code is PIC. - if test ia64 = "$host_cpu"; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - dgux*) - case $cc_basename in - ec++*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' - if test ia64 != "$host_cpu"; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; - aCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - KCC*) - # KAI C++ Compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - ecpc* ) - # old Intel C++ for x86_64, which still supported -KPIC. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - icpc* ) - # Intel C++, used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) - # IBM XL 8.0, 9.0 on PPC and BlueGene - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx*) - # Digital/Compaq C++ - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - lcc*) - # Lucid - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - *) - ;; - esac - ;; - vxworks*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -], -[ - if test yes = "$GCC"; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test ia64 = "$host_cpu"; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the '-m68020' flag to GCC prevents building anything better, - # like '-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - case $host_os in - os2*) - _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' - ;; - esac - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - _LT_TAGVAR(lt_prog_compiler_static, $1)= - ;; - - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - enable_shared=no - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - - case $cc_basename in - nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" - fi - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test ia64 = "$host_cpu"; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - case $cc_basename in - nagfor*) - # NAG Fortran compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - case $host_os in - os2*) - _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' - ;; - esac - ;; - - hpux9* | hpux10* | hpux11*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC (with -KPIC) is the default. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - # old Intel for x86_64, which still supported -KPIC. - ecc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # Lahey Fortran 8.1. - lf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' - _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' - ;; - nagfor*) - # NAG Fortran compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - tcc*) - # Fabrice Bellard et al's Tiny C Compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - ccc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All Alpha code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xl* | bgxl* | bgf* | mpixl*) - # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; - *Sun\ F* | *Sun*Fortran*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - *Sun\ C*) - # Sun C 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - *Intel*\ [[CF]]*Compiler*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - *Portland\ Group*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - esac - ;; - - newsos6) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - - osf3* | osf4* | osf5*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - rdos*) - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - solaris*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; - esac - ;; - - sunos4*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - unicos*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - - uts4*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -]) -case $host_os in - # For platforms that do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" - ;; -esac - -AC_CACHE_CHECK([for $compiler option to produce PIC], - [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], - [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], - [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; - *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; - esac], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -fi -_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], - [Additional compiler flags for building library objects]) - -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], - [How to pass a linker flag through the compiler]) -# -# Check to make sure the static flag actually works. -# -wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" -_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) -_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], - [Compiler flag to prevent dynamic linking]) -])# _LT_COMPILER_PIC - - -# _LT_LINKER_SHLIBS([TAGNAME]) -# ---------------------------- -# See if the linker supports building shared libraries. -m4_defun([_LT_LINKER_SHLIBS], -[AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -m4_require([_LT_PATH_MANIFEST_TOOL])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -m4_if([$1], [CXX], [ - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to GNU nm, but means don't demangle to AIX nm. - # Without the "-l" option, or with the "-B" option, AIX nm treats - # weak defined symbols like other global defined symbols, whereas - # GNU nm marks them as "W". - # While the 'weak' keyword is ignored in the Export File, we need - # it in the Import File for the 'aix-soname' feature, so we have - # to replace the "-B" option with "-P" for AIX nm. - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds - ;; - cygwin* | mingw* | cegcc*) - case $cc_basename in - cl*) - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - ;; - esac - ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac -], [ - runpath_var= - _LT_TAGVAR(allow_undefined_flag, $1)= - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(archive_cmds, $1)= - _LT_TAGVAR(archive_expsym_cmds, $1)= - _LT_TAGVAR(compiler_needs_object, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(hardcode_automatic, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_separator, $1)= - _LT_TAGVAR(hardcode_minus_L, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(inherit_rpath, $1)=no - _LT_TAGVAR(link_all_deplibs, $1)=unknown - _LT_TAGVAR(module_cmds, $1)= - _LT_TAGVAR(module_expsym_cmds, $1)= - _LT_TAGVAR(old_archive_from_new_cmds, $1)= - _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= - _LT_TAGVAR(thread_safe_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - _LT_TAGVAR(include_expsyms, $1)= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ' (' and ')$', so one must not match beginning or - # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', - # as well as any symbol that contains 'd'. - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. -dnl Note also adjust exclude_expsyms for C++ above. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test yes != "$GCC"; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd* | bitrig*) - with_gnu_ld=no - ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; - esac - - _LT_TAGVAR(ld_shlibs, $1)=yes - - # On some targets, GNU ld is compatible enough with the native linker - # that we're better off using the native interface for both. - lt_use_gnu_ld_interface=no - if test yes = "$with_gnu_ld"; then - case $host_os in - aix*) - # The AIX port of GNU ld has always aspired to compatibility - # with the native linker. However, as the warning in the GNU ld - # block says, versions before 2.19.5* couldn't really create working - # shared libraries, regardless of the interface used. - case `$LD -v 2>&1` in - *\ \(GNU\ Binutils\)\ 2.19.5*) ;; - *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; - *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - fi - - if test yes = "$lt_use_gnu_ld_interface"; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='$wl' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - supports_anon_versioning=no - case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in - *GNU\ gold*) supports_anon_versioning=yes ;; - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - - # See if GNU ld supports shared libraries. - case $host_os in - aix[[3-9]]*) - # On AIX/PPC, the GNU linker is very broken - if test ia64 != "$host_cpu"; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: the GNU linker, at least up to release 2.19, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to install binutils -*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. -*** You will then need to restart the configuration process. - -_LT_EOF - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file, use it as - # is; otherwise, prepend EXPORTS... - _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - os2*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - shrext_cmds=.dll - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - prefix_cmds="$SED"~ - if test EXPORTS = "`$SED 1q $export_symbols`"; then - prefix_cmds="$prefix_cmds -e 1d"; - fi~ - prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ - cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) - tmp_diet=no - if test linux-dietlibc = "$host_os"; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test no = "$tmp_diet" - then - tmp_addflag=' $pic_flag' - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - lf95*) # Lahey Fortran 8.1 - _LT_TAGVAR(whole_archive_flag_spec, $1)= - tmp_sharedflag='--shared' ;; - nagfor*) # NAGFOR 5.3 - tmp_sharedflag='-Wl,-shared' ;; - xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; - nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - - if test yes = "$supports_anon_versioning"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' - fi - - case $cc_basename in - tcc*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' - ;; - xlf* | bgf* | bgxlf* | mpixlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test yes = "$supports_anon_versioning"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - sunos4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - - if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then - runpath_var= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - _LT_TAGVAR(hardcode_direct, $1)=unsupported - fi - ;; - - aix[[4-9]]*) - if test ia64 = "$host_cpu"; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag= - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to GNU nm, but means don't demangle to AIX nm. - # Without the "-l" option, or with the "-B" option, AIX nm treats - # weak defined symbols like other global defined symbols, whereas - # GNU nm marks them as "W". - # While the 'weak' keyword is ignored in the Export File, we need - # it in the Import File for the 'aix-soname' feature, so we have - # to replace the "-B" option with "-P" for AIX nm. - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # have runtime linking enabled, and use it for executables. - # For shared libraries, we enable/disable runtime linking - # depending on the kind of the shared library created - - # when "with_aix_soname,aix_use_runtimelinking" is: - # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables - # "aix,yes" lib.so shared, rtl:yes, for executables - # lib.a static archive - # "both,no" lib.so.V(shr.o) shared, rtl:yes - # lib.a(lib.so.V) shared, rtl:no, for executables - # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables - # lib.a(lib.so.V) shared, rtl:no - # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables - # lib.a static archive - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then - aix_use_runtimelinking=yes - break - fi - done - if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then - # With aix-soname=svr4, we create the lib.so.V shared archives only, - # so we don't have lib.a shared libs to link our executables. - # We have to force runtime linking in this case. - aix_use_runtimelinking=yes - LDFLAGS="$LDFLAGS -Wl,-brtl" - fi - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='$wl-f,' - case $with_aix_soname,$aix_use_runtimelinking in - aix,*) ;; # traditional, no import file - svr4,* | *,yes) # use import file - # The Import File defines what to hardcode. - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - ;; - esac - - if test yes = "$GCC"; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`$CC -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test yes = "$aix_use_runtimelinking"; then - shared_flag="$shared_flag "'$wl-G' - fi - # Need to ensure runtime linking is disabled for the traditional - # shared library, or the linker may eventually find shared libraries - # /with/ Import File - we do not want to mix them. - shared_flag_aix='-shared' - shared_flag_svr4='-shared $wl-G' - else - # not using gcc - if test ia64 = "$host_cpu"; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test yes = "$aix_use_runtimelinking"; then - shared_flag='$wl-G' - else - shared_flag='$wl-bM:SRE' - fi - shared_flag_aix='$wl-bM:SRE' - shared_flag_svr4='$wl-G' - fi - fi - - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag - else - if test ia64 = "$host_cpu"; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' - if test yes = "$with_gnu_ld"; then - # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' - # -brtl affects multiple linker settings, -berok does not and is overridden later - compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' - if test svr4 != "$with_aix_soname"; then - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' - fi - if test aix != "$with_aix_soname"; then - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' - else - # used by -dlpreopen to get the symbols - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' - fi - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' - fi - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - bsdi[[45]]*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - case $cc_basename in - cl*) - # Native MSVC - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=.dll - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then - cp "$export_symbols" "$output_objdir/$soname.def"; - echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; - else - $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - # Don't use ranlib - _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' - _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile=$lt_outputfile.exe - lt_tool_outputfile=$lt_tool_outputfile.exe - ;; - esac~ - if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # Assume MSVC wrapper - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=.dll - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - esac - ;; - - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - dgux*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - hpux9*) - if test yes = "$GCC"; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' - ;; - - hpux10*) - if test yes,no = "$GCC,$with_gnu_ld"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test no = "$with_gnu_ld"; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - fi - ;; - - hpux11*) - if test yes,no = "$GCC,$with_gnu_ld"; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - m4_if($1, [], [ - # Older versions of the 11.00 compiler do not understand -b yet - # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - _LT_LINKER_OPTION([if $CC understands -b], - _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], - [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) - ;; - esac - fi - if test no = "$with_gnu_ld"; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test yes = "$GCC"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - # This should be the same for all languages, so no per-tag cache variable. - AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], - [lt_cv_irix_exported_symbol], - [save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" - AC_LINK_IFELSE( - [AC_LANG_SOURCE( - [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], - [C++], [[int foo (void) { return 0; }]], - [Fortran 77], [[ - subroutine foo - end]], - [Fortran], [[ - subroutine foo - end]])])], - [lt_cv_irix_exported_symbol=yes], - [lt_cv_irix_exported_symbol=no]) - LDFLAGS=$save_LDFLAGS]) - if test yes = "$lt_cv_irix_exported_symbol"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' - fi - _LT_TAGVAR(link_all_deplibs, $1)=no - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - linux*) - case $cc_basename in - tcc*) - # Fabrice Bellard et al's Tiny C Compiler - _LT_TAGVAR(ld_shlibs, $1)=yes - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - newsos6) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *nto* | *qnx*) - ;; - - openbsd* | bitrig*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' - fi - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - os2*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - shrext_cmds=.dll - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - prefix_cmds="$SED"~ - if test EXPORTS = "`$SED 1q $export_symbols`"; then - prefix_cmds="$prefix_cmds -e 1d"; - fi~ - prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ - cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - - osf3*) - if test yes = "$GCC"; then - _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test yes = "$GCC"; then - _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - solaris*) - _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test yes = "$GCC"; then - wlarc='$wl' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) - wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) - wlarc='$wl' - _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - ;; - esac - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands '-z linker_flag'. GCC discards it without '$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test yes = "$GCC"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - fi - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - sunos4*) - if test sequent = "$host_vendor"; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4) - case $host_vendor in - sni) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' - _LT_TAGVAR(hardcode_direct, $1)=no - ;; - motorola) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4.3*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - _LT_TAGVAR(ld_shlibs, $1)=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - if test yes = "$GCC"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We CANNOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' - runpath_var='LD_RUN_PATH' - - if test yes = "$GCC"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - if test sni = "$host_vendor"; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym' - ;; - esac - fi - fi -]) -AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no - -_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld - -_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl -_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl -_LT_DECL([], [extract_expsyms_cmds], [2], - [The commands to extract the exported symbol list from a shared archive]) - -# -# Do we need to explicitly link libc? -# -case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in -x|xyes) - # Assume -lc should be added - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - - if test yes,yes = "$GCC,$enable_shared"; then - case $_LT_TAGVAR(archive_cmds, $1) in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - AC_CACHE_CHECK([whether -lc should be explicitly linked in], - [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), - [$RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) - _LT_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) - then - lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no - else - lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - ]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) - ;; - esac - fi - ;; -esac - -_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], - [Whether or not to add -lc for building shared libraries]) -_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], - [enable_shared_with_static_runtimes], [0], - [Whether or not to disallow shared libs when runtime libs are static]) -_LT_TAGDECL([], [export_dynamic_flag_spec], [1], - [Compiler flag to allow reflexive dlopens]) -_LT_TAGDECL([], [whole_archive_flag_spec], [1], - [Compiler flag to generate shared objects directly from archives]) -_LT_TAGDECL([], [compiler_needs_object], [1], - [Whether the compiler copes with passing no objects directly]) -_LT_TAGDECL([], [old_archive_from_new_cmds], [2], - [Create an old-style archive from a shared archive]) -_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], - [Create a temporary old-style archive to link instead of a shared archive]) -_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) -_LT_TAGDECL([], [archive_expsym_cmds], [2]) -_LT_TAGDECL([], [module_cmds], [2], - [Commands used to build a loadable module if different from building - a shared archive.]) -_LT_TAGDECL([], [module_expsym_cmds], [2]) -_LT_TAGDECL([], [with_gnu_ld], [1], - [Whether we are building with GNU ld or not]) -_LT_TAGDECL([], [allow_undefined_flag], [1], - [Flag that allows shared libraries with undefined symbols to be built]) -_LT_TAGDECL([], [no_undefined_flag], [1], - [Flag that enforces no undefined symbols]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], - [Flag to hardcode $libdir into a binary during linking. - This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_separator], [1], - [Whether we need a single "-rpath" flag with a separated argument]) -_LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes - DIR into the resulting binary]) -_LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes - DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting $shlibpath_var if the - library is relocated]) -_LT_TAGDECL([], [hardcode_minus_L], [0], - [Set to "yes" if using the -LDIR flag during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_shlibpath_var], [0], - [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_automatic], [0], - [Set to "yes" if building a shared library automatically hardcodes DIR - into the library and all subsequent libraries and executables linked - against it]) -_LT_TAGDECL([], [inherit_rpath], [0], - [Set to yes if linker adds runtime paths of dependent libraries - to runtime path list]) -_LT_TAGDECL([], [link_all_deplibs], [0], - [Whether libtool must link a program against all its dependency libraries]) -_LT_TAGDECL([], [always_export_symbols], [0], - [Set to "yes" if exported symbols are required]) -_LT_TAGDECL([], [export_symbols_cmds], [2], - [The commands to list exported symbols]) -_LT_TAGDECL([], [exclude_expsyms], [1], - [Symbols that should not be listed in the preloaded symbols]) -_LT_TAGDECL([], [include_expsyms], [1], - [Symbols that must always be exported]) -_LT_TAGDECL([], [prelink_cmds], [2], - [Commands necessary for linking programs (against libraries) with templates]) -_LT_TAGDECL([], [postlink_cmds], [2], - [Commands necessary for finishing linking programs]) -_LT_TAGDECL([], [file_list_spec], [1], - [Specify filename containing input files]) -dnl FIXME: Not yet implemented -dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], -dnl [Compiler flag to generate thread safe objects]) -])# _LT_LINKER_SHLIBS - - -# _LT_LANG_C_CONFIG([TAG]) -# ------------------------ -# Ensure that the configuration variables for a C compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to 'libtool'. -m4_defun([_LT_LANG_C_CONFIG], -[m4_require([_LT_DECL_EGREP])dnl -lt_save_CC=$CC -AC_LANG_PUSH(C) - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' - -_LT_TAG_COMPILER -# Save the default compiler, since it gets overwritten when the other -# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -compiler_DEFAULT=$CC - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - LT_SYS_DLOPEN_SELF - _LT_CMD_STRIPLIB - - # Report what library types will actually be built - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test no = "$can_build_shared" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test yes = "$enable_shared" && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - - aix[[4-9]]*) - if test ia64 != "$host_cpu"; then - case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in - yes,aix,yes) ;; # shared object as lib.so file only - yes,svr4,*) ;; # shared object as lib.so archive member only - yes,*) enable_static=no ;; # shared object in lib.a archive as well - esac - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test yes = "$enable_shared" || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_CONFIG($1) -fi -AC_LANG_POP -CC=$lt_save_CC -])# _LT_LANG_C_CONFIG - - -# _LT_LANG_CXX_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a C++ compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to 'libtool'. -m4_defun([_LT_LANG_CXX_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_PATH_MANIFEST_TOOL])dnl -if test -n "$CXX" && ( test no != "$CXX" && - ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || - (test g++ != "$CXX"))); then - AC_PROG_CXXCPP -else - _lt_caught_CXX_error=yes -fi - -AC_LANG_PUSH(C++) -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(compiler_needs_object, $1)=no -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the CXX compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test yes != "$_lt_caught_CXX_error"; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests - lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX - lt_save_with_gnu_ld=$with_gnu_ld - lt_save_path_LD=$lt_cv_path_LD - if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx - else - $as_unset lt_cv_prog_gnu_ld - fi - if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX - else - $as_unset lt_cv_path_LD - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} - CFLAGS=$CXXFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - - if test -n "$compiler"; then - # We don't want -fno-exception when compiling C++ code, so set the - # no_builtin_flag separately - if test yes = "$GXX"; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - else - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - fi - - if test yes = "$GXX"; then - # Set up default GNU C++ configuration - - LT_PATH_LD - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test yes = "$with_gnu_ld"; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='$wl' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | - $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - GXX=no - with_gnu_ld=no - wlarc= - fi - - # PORTME: fill in a description of your system's C++ link characteristics - AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - _LT_TAGVAR(ld_shlibs, $1)=yes - case $host_os in - aix3*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aix[[4-9]]*) - if test ia64 = "$host_cpu"; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag= - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # have runtime linking enabled, and use it for executables. - # For shared libraries, we enable/disable runtime linking - # depending on the kind of the shared library created - - # when "with_aix_soname,aix_use_runtimelinking" is: - # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables - # "aix,yes" lib.so shared, rtl:yes, for executables - # lib.a static archive - # "both,no" lib.so.V(shr.o) shared, rtl:yes - # lib.a(lib.so.V) shared, rtl:no, for executables - # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables - # lib.a(lib.so.V) shared, rtl:no - # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables - # lib.a static archive - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then - # With aix-soname=svr4, we create the lib.so.V shared archives only, - # so we don't have lib.a shared libs to link our executables. - # We have to force runtime linking in this case. - aix_use_runtimelinking=yes - LDFLAGS="$LDFLAGS -Wl,-brtl" - fi - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='$wl-f,' - case $with_aix_soname,$aix_use_runtimelinking in - aix,*) ;; # no import file - svr4,* | *,yes) # use import file - # The Import File defines what to hardcode. - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - ;; - esac - - if test yes = "$GXX"; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`$CC -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - esac - shared_flag='-shared' - if test yes = "$aix_use_runtimelinking"; then - shared_flag=$shared_flag' $wl-G' - fi - # Need to ensure runtime linking is disabled for the traditional - # shared library, or the linker may eventually find shared libraries - # /with/ Import File - we do not want to mix them. - shared_flag_aix='-shared' - shared_flag_svr4='-shared $wl-G' - else - # not using gcc - if test ia64 = "$host_cpu"; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test yes = "$aix_use_runtimelinking"; then - shared_flag='$wl-G' - else - shared_flag='$wl-bM:SRE' - fi - shared_flag_aix='$wl-bM:SRE' - shared_flag_svr4='$wl-G' - fi - fi - - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to - # export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - # The "-G" linker flag allows undefined symbols. - _LT_TAGVAR(no_undefined_flag, $1)='-bernotok' - # Determine the default libpath from the value encoded in an empty - # executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" - - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag - else - if test ia64 = "$host_cpu"; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' - if test yes = "$with_gnu_ld"; then - # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' - # -brtl affects multiple linker settings, -berok does not and is overridden later - compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' - if test svr4 != "$with_aix_soname"; then - # This is similar to how AIX traditionally builds its shared - # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' - fi - if test aix != "$with_aix_soname"; then - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' - else - # used by -dlpreopen to get the symbols - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' - fi - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' - fi - fi - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - cygwin* | mingw* | pw32* | cegcc*) - case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=.dll - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then - cp "$export_symbols" "$output_objdir/$soname.def"; - echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; - else - $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - # Don't use ranlib - _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' - _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile=$lt_outputfile.exe - lt_tool_outputfile=$lt_tool_outputfile.exe - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # g++ - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file, use it as - # is; otherwise, prepend EXPORTS... - _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - os2*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - shrext_cmds=.dll - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - prefix_cmds="$SED"~ - if test EXPORTS = "`$SED 1q $export_symbols`"; then - prefix_cmds="$prefix_cmds -e 1d"; - fi~ - prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ - cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - freebsd2.*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - freebsd-elf*) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test yes = "$GXX"; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - hpux10*|hpux11*) - if test no = "$with_gnu_ld"; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test yes = "$GXX"; then - if test no = "$with_gnu_ld"; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test yes = "$GXX"; then - if test no = "$with_gnu_ld"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' - fi - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc* | ecpc* ) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in - *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' - ;; - cxx*) - # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' - ;; - xl* | mpixl* | bgxl*) - # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test yes = "$supports_anon_versioning"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' - fi - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - - lynxos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - m88k*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - - *nto* | *qnx*) - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - openbsd* | bitrig*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' - fi - output_verbose_link_cmd=func_echo_all - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - case $host in - osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; - esac - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - case $host in - osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - ;; - *) - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ - $RM $lib.exp' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test yes,no = "$GXX,$with_gnu_ld"; then - _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' - case $host in - osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - psos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands '-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - - output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test yes,no = "$GXX,$with_gnu_ld"; then - _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - else - # g++ 2.7 appears to require '-G' NOT '-shared' on this - # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - fi - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We CANNOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" - _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - vxworks*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no - - _LT_TAGVAR(GCC, $1)=$GXX - _LT_TAGVAR(LD, $1)=$LD - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC - with_gnu_ld=$lt_save_with_gnu_ld - lt_cv_path_LDCXX=$lt_cv_path_LD - lt_cv_path_LD=$lt_save_path_LD - lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld - lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test yes != "$_lt_caught_CXX_error" - -AC_LANG_POP -])# _LT_LANG_CXX_CONFIG - - -# _LT_FUNC_STRIPNAME_CNF -# ---------------------- -# func_stripname_cnf prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# -# This function is identical to the (non-XSI) version of func_stripname, -# except this one can be used by m4 code that may be executed by configure, -# rather than the libtool script. -m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl -AC_REQUIRE([_LT_DECL_SED]) -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) -func_stripname_cnf () -{ - case @S|@2 in - .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; - *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;; - esac -} # func_stripname_cnf -])# _LT_FUNC_STRIPNAME_CNF - - -# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) -# --------------------------------- -# Figure out "hidden" library dependencies from verbose -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# objects, libraries and library flags. -m4_defun([_LT_SYS_HIDDEN_LIBDEPS], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl -# Dependencies to place before and after the object being linked: -_LT_TAGVAR(predep_objects, $1)= -_LT_TAGVAR(postdep_objects, $1)= -_LT_TAGVAR(predeps, $1)= -_LT_TAGVAR(postdeps, $1)= -_LT_TAGVAR(compiler_lib_search_path, $1)= - -dnl we can't use the lt_simple_compile_test_code here, -dnl because it contains code intended for an executable, -dnl not a library. It's possible we should let each -dnl tag define a new lt_????_link_test_code variable, -dnl but it's only used here... -m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF -int a; -void foo (void) { a = 0; } -_LT_EOF -], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF -class Foo -{ -public: - Foo (void) { a = 0; } -private: - int a; -}; -_LT_EOF -], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer*4 a - a=0 - return - end -_LT_EOF -], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer a - a=0 - return - end -_LT_EOF -], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF -public class foo { - private int a; - public void bar (void) { - a = 0; - } -}; -_LT_EOF -], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF -package foo -func foo() { -} -_LT_EOF -]) - -_lt_libdeps_save_CFLAGS=$CFLAGS -case "$CC $CFLAGS " in #( -*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; -esac - -dnl Parse the compiler output and extract the necessary -dnl objects, libraries and library flags. -if AC_TRY_EVAL(ac_compile); then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do - case $prev$p in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test x-L = "$p" || - test x-R = "$p"; then - prev=$p - continue - fi - - # Expand the sysroot to ease extracting the directories later. - if test -z "$prev"; then - case $p in - -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; - -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; - -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; - esac - fi - case $p in - =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; - esac - if test no = "$pre_test_object_deps_done"; then - case $prev in - -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p - else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)=$prev$p - else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" - fi - fi - prev= - ;; - - *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - - if test no = "$pre_test_object_deps_done"; then - if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)=$p - else - _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" - fi - else - if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)=$p - else - _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling $1 test program" -fi - -$RM -f confest.$objext -CFLAGS=$_lt_libdeps_save_CFLAGS - -# PORTME: override above test on systems where it is broken -m4_if([$1], [CXX], -[case $host_os in -interix[[3-9]]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - _LT_TAGVAR(predep_objects,$1)= - _LT_TAGVAR(postdep_objects,$1)= - _LT_TAGVAR(postdeps,$1)= - ;; -esac -]) - -case " $_LT_TAGVAR(postdeps, $1) " in -*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; -esac - _LT_TAGVAR(compiler_lib_search_dirs, $1)= -if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'` -fi -_LT_TAGDECL([], [compiler_lib_search_dirs], [1], - [The directories searched by this compiler when creating a shared library]) -_LT_TAGDECL([], [predep_objects], [1], - [Dependencies to place before and after the objects being linked to - create a shared library]) -_LT_TAGDECL([], [postdep_objects], [1]) -_LT_TAGDECL([], [predeps], [1]) -_LT_TAGDECL([], [postdeps], [1]) -_LT_TAGDECL([], [compiler_lib_search_path], [1], - [The library search path used internally by the compiler when linking - a shared library]) -])# _LT_SYS_HIDDEN_LIBDEPS - - -# _LT_LANG_F77_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a Fortran 77 compiler are -# suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to 'libtool'. -m4_defun([_LT_LANG_F77_CONFIG], -[AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test no = "$F77"; then - _lt_disable_F77=yes -fi - -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for f77 test sources. -ac_ext=f - -# Object file extension for compiled f77 test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the F77 compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test yes != "$_lt_disable_F77"; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_GCC=$GCC - lt_save_CFLAGS=$CFLAGS - CC=${F77-"f77"} - CFLAGS=$FFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - GCC=$G77 - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test no = "$can_build_shared" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test yes = "$enable_shared" && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test ia64 != "$host_cpu"; then - case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in - yes,aix,yes) ;; # shared object as lib.so file only - yes,svr4,*) ;; # shared object as lib.so archive member only - yes,*) enable_static=no ;; # shared object in lib.a archive as well - esac - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test yes = "$enable_shared" || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)=$G77 - _LT_TAGVAR(LD, $1)=$LD - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - GCC=$lt_save_GCC - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS -fi # test yes != "$_lt_disable_F77" - -AC_LANG_POP -])# _LT_LANG_F77_CONFIG - - -# _LT_LANG_FC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for a Fortran compiler are -# suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to 'libtool'. -m4_defun([_LT_LANG_FC_CONFIG], -[AC_LANG_PUSH(Fortran) - -if test -z "$FC" || test no = "$FC"; then - _lt_disable_FC=yes -fi - -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for fc test sources. -ac_ext=${ac_fc_srcext-f} - -# Object file extension for compiled fc test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the FC compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test yes != "$_lt_disable_FC"; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_GCC=$GCC - lt_save_CFLAGS=$CFLAGS - CC=${FC-"f95"} - CFLAGS=$FCFLAGS - compiler=$CC - GCC=$ac_cv_fc_compiler_gnu - - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test no = "$can_build_shared" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test yes = "$enable_shared" && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test ia64 != "$host_cpu"; then - case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in - yes,aix,yes) ;; # shared object as lib.so file only - yes,svr4,*) ;; # shared object as lib.so archive member only - yes,*) enable_static=no ;; # shared object in lib.a archive as well - esac - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test yes = "$enable_shared" || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu - _LT_TAGVAR(LD, $1)=$LD - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - GCC=$lt_save_GCC - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS -fi # test yes != "$_lt_disable_FC" - -AC_LANG_POP -])# _LT_LANG_FC_CONFIG - - -# _LT_LANG_GCJ_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Java Compiler compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to 'libtool'. -m4_defun([_LT_LANG_GCJ_CONFIG], -[AC_REQUIRE([LT_PROG_GCJ])dnl -AC_LANG_SAVE - -# Source file extension for Java test sources. -ac_ext=java - -# Object file extension for compiled Java test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" - -# Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC=yes -CC=${GCJ-"gcj"} -CFLAGS=$GCJFLAGS -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)=$LD -_LT_CC_BASENAME([$compiler]) - -# GCJ did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) -fi - -AC_LANG_RESTORE - -GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_GCJ_CONFIG - - -# _LT_LANG_GO_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Go compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to 'libtool'. -m4_defun([_LT_LANG_GO_CONFIG], -[AC_REQUIRE([LT_PROG_GO])dnl -AC_LANG_SAVE - -# Source file extension for Go test sources. -ac_ext=go - -# Object file extension for compiled Go test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="package main; func main() { }" - -# Code to be used in simple link tests -lt_simple_link_test_code='package main; func main() { }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC=yes -CC=${GOC-"gccgo"} -CFLAGS=$GOFLAGS -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)=$LD -_LT_CC_BASENAME([$compiler]) - -# Go did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) -fi - -AC_LANG_RESTORE - -GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_GO_CONFIG - - -# _LT_LANG_RC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for the Windows resource compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to 'libtool'. -m4_defun([_LT_LANG_RC_CONFIG], -[AC_REQUIRE([LT_PROG_RC])dnl -AC_LANG_SAVE - -# Source file extension for RC test sources. -ac_ext=rc - -# Object file extension for compiled RC test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - -# Code to be used in simple link tests -lt_simple_link_test_code=$lt_simple_compile_test_code - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC= -CC=${RC-"windres"} -CFLAGS= -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) -_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - -if test -n "$compiler"; then - : - _LT_CONFIG($1) -fi - -GCC=$lt_save_GCC -AC_LANG_RESTORE -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_RC_CONFIG - - -# LT_PROG_GCJ -# ----------- -AC_DEFUN([LT_PROG_GCJ], -[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], - [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], - [AC_CHECK_TOOL(GCJ, gcj,) - test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS)])])[]dnl -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_GCJ], []) - - -# LT_PROG_GO -# ---------- -AC_DEFUN([LT_PROG_GO], -[AC_CHECK_TOOL(GOC, gccgo,) -]) - - -# LT_PROG_RC -# ---------- -AC_DEFUN([LT_PROG_RC], -[AC_CHECK_TOOL(RC, windres,) -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_RC], []) - - -# _LT_DECL_EGREP -# -------------- -# If we don't have a new enough Autoconf to choose the best grep -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_EGREP], -[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_REQUIRE([AC_PROG_FGREP])dnl -test -z "$GREP" && GREP=grep -_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) -_LT_DECL([], [EGREP], [1], [An ERE matcher]) -_LT_DECL([], [FGREP], [1], [A literal string matcher]) -dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too -AC_SUBST([GREP]) -]) - - -# _LT_DECL_OBJDUMP -# -------------- -# If we don't have a new enough Autoconf to choose the best objdump -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_OBJDUMP], -[AC_CHECK_TOOL(OBJDUMP, objdump, false) -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) -AC_SUBST([OBJDUMP]) -]) - -# _LT_DECL_DLLTOOL -# ---------------- -# Ensure DLLTOOL variable is set. -m4_defun([_LT_DECL_DLLTOOL], -[AC_CHECK_TOOL(DLLTOOL, dlltool, false) -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) -AC_SUBST([DLLTOOL]) -]) - -# _LT_DECL_SED -# ------------ -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -m4_defun([_LT_DECL_SED], -[AC_PROG_SED -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" -_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) -_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], - [Sed that helps us avoid accidentally triggering echo(1) options like -n]) -])# _LT_DECL_SED - -m4_ifndef([AC_PROG_SED], [ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # - -m4_defun([AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f "$lt_ac_sed" && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test 10 -lt "$lt_ac_count" && break - lt_ac_count=`expr $lt_ac_count + 1` - if test "$lt_ac_count" -gt "$lt_ac_max"; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done -]) -SED=$lt_cv_path_SED -AC_SUBST([SED]) -AC_MSG_RESULT([$SED]) -])#AC_PROG_SED -])#m4_ifndef - -# Old name: -AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_SED], []) - - -# _LT_CHECK_SHELL_FEATURES -# ------------------------ -# Find out whether the shell is Bourne or XSI compatible, -# or has some other useful features. -m4_defun([_LT_CHECK_SHELL_FEATURES], -[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset -else - lt_unset=false -fi -_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl - -# test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - lt_SP2NL='tr \040 \012' - lt_NL2SP='tr \015\012 \040\040' - ;; - *) # EBCDIC based system - lt_SP2NL='tr \100 \n' - lt_NL2SP='tr \r\n \100\100' - ;; -esac -_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl -_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl -])# _LT_CHECK_SHELL_FEATURES - - -# _LT_PATH_CONVERSION_FUNCTIONS -# ----------------------------- -# Determine what file name conversion functions should be used by -# func_to_host_file (and, implicitly, by func_to_host_path). These are needed -# for certain cross-compile configurations and native mingw. -m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_MSG_CHECKING([how to convert $build file names to $host format]) -AC_CACHE_VAL(lt_cv_to_host_file_cmd, -[case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 - ;; - esac - ;; - *-*-cygwin* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin - ;; - esac - ;; - * ) # unhandled hosts (and "normal" native builds) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; -esac -]) -to_host_file_cmd=$lt_cv_to_host_file_cmd -AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) -_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], - [0], [convert $build file names to $host format])dnl - -AC_MSG_CHECKING([how to convert $build file names to toolchain format]) -AC_CACHE_VAL(lt_cv_to_tool_file_cmd, -[#assume ordinary cross tools, or native build. -lt_cv_to_tool_file_cmd=func_convert_file_noop -case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 - ;; - esac - ;; -esac -]) -to_tool_file_cmd=$lt_cv_to_tool_file_cmd -AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) -_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], - [0], [convert $build files to toolchain format])dnl -])# _LT_PATH_CONVERSION_FUNCTIONS - -# Helper functions for option handling. -*- Autoconf -*- -# -# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software -# Foundation, Inc. -# Written by Gary V. Vaughan, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 8 ltoptions.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) - - -# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) -# ------------------------------------------ -m4_define([_LT_MANGLE_OPTION], -[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) - - -# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) -# --------------------------------------- -# Set option OPTION-NAME for macro MACRO-NAME, and if there is a -# matching handler defined, dispatch to it. Other OPTION-NAMEs are -# saved as a flag. -m4_define([_LT_SET_OPTION], -[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl -m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), - _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option '$2'])])[]dnl -]) - - -# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) -# ------------------------------------------------------------ -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -m4_define([_LT_IF_OPTION], -[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) - - -# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) -# ------------------------------------------------------- -# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME -# are set. -m4_define([_LT_UNLESS_OPTIONS], -[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), - [m4_define([$0_found])])])[]dnl -m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 -])[]dnl -]) - - -# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) -# ---------------------------------------- -# OPTION-LIST is a space-separated list of Libtool options associated -# with MACRO-NAME. If any OPTION has a matching handler declared with -# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about -# the unknown option and exit. -m4_defun([_LT_SET_OPTIONS], -[# Set options -m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [_LT_SET_OPTION([$1], _LT_Option)]) - -m4_if([$1],[LT_INIT],[ - dnl - dnl Simply set some default values (i.e off) if boolean options were not - dnl specified: - _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no - ]) - _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no - ]) - dnl - dnl If no reference was made to various pairs of opposing options, then - dnl we run the default mode handler for the pair. For example, if neither - dnl 'shared' nor 'disable-shared' was passed, we enable building of shared - dnl archives by default: - _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) - _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) - _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], - [_LT_WITH_AIX_SONAME([aix])]) - ]) -])# _LT_SET_OPTIONS - - - -# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) -# ----------------------------------------- -m4_define([_LT_MANGLE_DEFUN], -[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) - - -# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) -# ----------------------------------------------- -m4_define([LT_OPTION_DEFINE], -[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl -])# LT_OPTION_DEFINE - - -# dlopen -# ------ -LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes -]) - -AU_DEFUN([AC_LIBTOOL_DLOPEN], -[_LT_SET_OPTION([LT_INIT], [dlopen]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the 'dlopen' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) - - -# win32-dll -# --------- -# Declare package support for building win32 dll's. -LT_OPTION_DEFINE([LT_INIT], [win32-dll], -[enable_win32_dll=yes - -case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - ;; -esac - -test -z "$AS" && AS=as -_LT_DECL([], [AS], [1], [Assembler program])dnl - -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl - -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl -])# win32-dll - -AU_DEFUN([AC_LIBTOOL_WIN32_DLL], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -_LT_SET_OPTION([LT_INIT], [win32-dll]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the 'win32-dll' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) - - -# _LT_ENABLE_SHARED([DEFAULT]) -# ---------------------------- -# implement the --enable-shared flag, and supports the 'shared' and -# 'disable-shared' LT_INIT options. -# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. -m4_define([_LT_ENABLE_SHARED], -[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([shared], - [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], - [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, - for pkg in $enableval; do - IFS=$lt_save_ifs - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS=$lt_save_ifs - ;; - esac], - [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) - - _LT_DECL([build_libtool_libs], [enable_shared], [0], - [Whether or not to build shared libraries]) -])# _LT_ENABLE_SHARED - -LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) -]) - -AC_DEFUN([AC_DISABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], [disable-shared]) -]) - -AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_SHARED], []) -dnl AC_DEFUN([AM_DISABLE_SHARED], []) - - - -# _LT_ENABLE_STATIC([DEFAULT]) -# ---------------------------- -# implement the --enable-static flag, and support the 'static' and -# 'disable-static' LT_INIT options. -# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. -m4_define([_LT_ENABLE_STATIC], -[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([static], - [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], - [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, - for pkg in $enableval; do - IFS=$lt_save_ifs - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS=$lt_save_ifs - ;; - esac], - [enable_static=]_LT_ENABLE_STATIC_DEFAULT) - - _LT_DECL([build_old_libs], [enable_static], [0], - [Whether or not to build static libraries]) -])# _LT_ENABLE_STATIC - -LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) -]) - -AC_DEFUN([AC_DISABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], [disable-static]) -]) - -AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_STATIC], []) -dnl AC_DEFUN([AM_DISABLE_STATIC], []) - - - -# _LT_ENABLE_FAST_INSTALL([DEFAULT]) -# ---------------------------------- -# implement the --enable-fast-install flag, and support the 'fast-install' -# and 'disable-fast-install' LT_INIT options. -# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. -m4_define([_LT_ENABLE_FAST_INSTALL], -[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([fast-install], - [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], - [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, - for pkg in $enableval; do - IFS=$lt_save_ifs - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS=$lt_save_ifs - ;; - esac], - [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) - -_LT_DECL([fast_install], [enable_fast_install], [0], - [Whether or not to optimize for fast installation])dnl -])# _LT_ENABLE_FAST_INSTALL - -LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) - -# Old names: -AU_DEFUN([AC_ENABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the 'fast-install' option into LT_INIT's first parameter.]) -]) - -AU_DEFUN([AC_DISABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the 'disable-fast-install' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) -dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) - - -# _LT_WITH_AIX_SONAME([DEFAULT]) -# ---------------------------------- -# implement the --with-aix-soname flag, and support the `aix-soname=aix' -# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT -# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. -m4_define([_LT_WITH_AIX_SONAME], -[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl -shared_archive_member_spec= -case $host,$enable_shared in -power*-*-aix[[5-9]]*,yes) - AC_MSG_CHECKING([which variant of shared library versioning to provide]) - AC_ARG_WITH([aix-soname], - [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], - [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], - [case $withval in - aix|svr4|both) - ;; - *) - AC_MSG_ERROR([Unknown argument to --with-aix-soname]) - ;; - esac - lt_cv_with_aix_soname=$with_aix_soname], - [AC_CACHE_VAL([lt_cv_with_aix_soname], - [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) - with_aix_soname=$lt_cv_with_aix_soname]) - AC_MSG_RESULT([$with_aix_soname]) - if test aix != "$with_aix_soname"; then - # For the AIX way of multilib, we name the shared archive member - # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', - # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. - # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, - # the AIX toolchain works better with OBJECT_MODE set (default 32). - if test 64 = "${OBJECT_MODE-32}"; then - shared_archive_member_spec=shr_64 - else - shared_archive_member_spec=shr - fi - fi - ;; -*) - with_aix_soname=aix - ;; -esac - -_LT_DECL([], [shared_archive_member_spec], [0], - [Shared archive member basename, for filename based shared library versioning on AIX])dnl -])# _LT_WITH_AIX_SONAME - -LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) -LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) -LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) - - -# _LT_WITH_PIC([MODE]) -# -------------------- -# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' -# LT_INIT options. -# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. -m4_define([_LT_WITH_PIC], -[AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [lt_p=${PACKAGE-default} - case $withval in - yes|no) pic_mode=$withval ;; - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. - lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, - for lt_pkg in $withval; do - IFS=$lt_save_ifs - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done - IFS=$lt_save_ifs - ;; - esac], - [pic_mode=m4_default([$1], [default])]) - -_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl -])# _LT_WITH_PIC - -LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) - -# Old name: -AU_DEFUN([AC_LIBTOOL_PICMODE], -[_LT_SET_OPTION([LT_INIT], [pic-only]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the 'pic-only' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) - - -m4_define([_LTDL_MODE], []) -LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], - [m4_define([_LTDL_MODE], [nonrecursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [recursive], - [m4_define([_LTDL_MODE], [recursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [subproject], - [m4_define([_LTDL_MODE], [subproject])]) - -m4_define([_LTDL_TYPE], []) -LT_OPTION_DEFINE([LTDL_INIT], [installable], - [m4_define([_LTDL_TYPE], [installable])]) -LT_OPTION_DEFINE([LTDL_INIT], [convenience], - [m4_define([_LTDL_TYPE], [convenience])]) - -# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- -# -# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software -# Foundation, Inc. -# Written by Gary V. Vaughan, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 6 ltsugar.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) - - -# lt_join(SEP, ARG1, [ARG2...]) -# ----------------------------- -# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their -# associated separator. -# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier -# versions in m4sugar had bugs. -m4_define([lt_join], -[m4_if([$#], [1], [], - [$#], [2], [[$2]], - [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) -m4_define([_lt_join], -[m4_if([$#$2], [2], [], - [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) - - -# lt_car(LIST) -# lt_cdr(LIST) -# ------------ -# Manipulate m4 lists. -# These macros are necessary as long as will still need to support -# Autoconf-2.59, which quotes differently. -m4_define([lt_car], [[$1]]) -m4_define([lt_cdr], -[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], - [$#], 1, [], - [m4_dquote(m4_shift($@))])]) -m4_define([lt_unquote], $1) - - -# lt_append(MACRO-NAME, STRING, [SEPARATOR]) -# ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. -# Note that neither SEPARATOR nor STRING are expanded; they are appended -# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). -# No SEPARATOR is output if MACRO-NAME was previously undefined (different -# than defined and empty). -# -# This macro is needed until we can rely on Autoconf 2.62, since earlier -# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. -m4_define([lt_append], -[m4_define([$1], - m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) - - - -# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) -# ---------------------------------------------------------- -# Produce a SEP delimited list of all paired combinations of elements of -# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list -# has the form PREFIXmINFIXSUFFIXn. -# Needed until we can rely on m4_combine added in Autoconf 2.62. -m4_define([lt_combine], -[m4_if(m4_eval([$# > 3]), [1], - [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl -[[m4_foreach([_Lt_prefix], [$2], - [m4_foreach([_Lt_suffix], - ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, - [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) - - -# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) -# ----------------------------------------------------------------------- -# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited -# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. -m4_define([lt_if_append_uniq], -[m4_ifdef([$1], - [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], - [lt_append([$1], [$2], [$3])$4], - [$5])], - [lt_append([$1], [$2], [$3])$4])]) - - -# lt_dict_add(DICT, KEY, VALUE) -# ----------------------------- -m4_define([lt_dict_add], -[m4_define([$1($2)], [$3])]) + else + no_gtk=yes + fi + fi + if test x"$no_gtk" = x ; then + GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` + GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` + gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_gtktest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$GTK_LIBS $LIBS" +dnl +dnl Now check if the installed GTK+ is sufficiently new. (Also sanity +dnl checks the results of pkg-config to some extent) +dnl + rm -f conf.gtktest + AC_TRY_RUN([ +#include +#include +#include -# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) -# -------------------------------------------- -m4_define([lt_dict_add_subkey], -[m4_define([$1($2:$3)], [$4])]) +int +main () +{ + int major, minor, micro; + char *tmp_version; + fclose (fopen ("conf.gtktest", "w")); -# lt_dict_fetch(DICT, KEY, [SUBKEY]) -# ---------------------------------- -m4_define([lt_dict_fetch], -[m4_ifval([$3], - m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), - m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) - - -# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) -# ----------------------------------------------------------------- -m4_define([lt_if_dict_fetch], -[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], - [$5], - [$6])]) - - -# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) -# -------------------------------------------------------------- -m4_define([lt_dict_filter], -[m4_if([$5], [], [], - [lt_join(m4_quote(m4_default([$4], [[, ]])), - lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), - [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl -]) + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_gtk_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_gtk_version"); + exit(1); + } -# ltversion.m4 -- version numbers -*- Autoconf -*- -# -# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# @configure_input@ - -# serial 4179 ltversion.m4 -# This file is part of GNU Libtool - -m4_define([LT_PACKAGE_VERSION], [2.4.6]) -m4_define([LT_PACKAGE_REVISION], [2.4.6]) - -AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.6' -macro_revision='2.4.6' -_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) -_LT_DECL(, macro_revision, 0) + if ((gtk_major_version != $gtk_config_major_version) || + (gtk_minor_version != $gtk_config_minor_version) || + (gtk_micro_version != $gtk_config_micro_version)) + { + printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", + $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, + gtk_major_version, gtk_minor_version, gtk_micro_version); + printf ("*** was found! If pkg-config was correct, then it is best\n"); + printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); + printf("*** to point to the correct configuration files\n"); + } + else if ((gtk_major_version != GTK_MAJOR_VERSION) || + (gtk_minor_version != GTK_MINOR_VERSION) || + (gtk_micro_version != GTK_MICRO_VERSION)) + { + printf("*** GTK+ header files (version %d.%d.%d) do not match\n", + GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + gtk_major_version, gtk_minor_version, gtk_micro_version); + } + else + { + if ((gtk_major_version > major) || + ((gtk_major_version == major) && (gtk_minor_version > minor)) || + ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", + gtk_major_version, gtk_minor_version, gtk_micro_version); + printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", + major, minor, micro); + printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); + printf("*** correct copy of pkg-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_gtk" = x ; then + AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$PKG_CONFIG" = "no" ; then + echo "*** A new enough version of pkg-config was not found." + echo "*** See http://pkgconfig.sourceforge.net" + else + if test -f conf.gtktest ; then + : + else + echo "*** Could not run GTK+ test program, checking why..." + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GTK+ or finding the wrong" + echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GTK_CFLAGS="" + GTK_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + rm -f conf.gtktest ]) -# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- -# -# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software -# Foundation, Inc. -# Written by Scott James Remnant, 2004. -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 5 lt~obsolete.m4 - -# These exist entirely to fool aclocal when bootstrapping libtool. -# -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), -# which have later been changed to m4_define as they aren't part of the -# exported API, or moved to Autoconf or Automake where they belong. -# -# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN -# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us -# using a macro with the same name in our local m4/libtool.m4 it'll -# pull the old libtool.m4 in (it doesn't see our shiny new m4_define -# and doesn't know about Autoconf macros at all.) -# -# So we provide this file, which has a silly filename so it's always -# included after everything else. This provides aclocal with the -# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything -# because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. -# -# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. -# Yes, that means every name once taken will need to remain here until -# we give up compatibility with versions before 1.7, at which point -# we need to keep only those names which we still refer to. - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) - -m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) -m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) -m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) -m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) -m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) -m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) -m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) -m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) -m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) -m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) -m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) -m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) -m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) -m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) -m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) -m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) -m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) -m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) -m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) -m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) -m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) -m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) -m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) -m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) -m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) -m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) -m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) -m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) -m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) -m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) -m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) -m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) -m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) -m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) -m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) -m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) -m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) -m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) -m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) -m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) -m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) -m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) -m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) -m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) -m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) -m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) -m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) -m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) -m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) - # nls.m4 serial 5 (gettext-0.18) dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software dnl Foundation, Inc. @@ -10516,25 +1164,22 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.6], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -10550,21 +1195,19 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.6])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # Figure out how to run the assembler. -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_PROG_AS # ---------- AC_DEFUN([AM_PROG_AS], @@ -10579,17 +1222,15 @@ # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -10608,7 +1249,7 @@ # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -10626,30 +1267,26 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -10668,16 +1305,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -10687,7 +1322,7 @@ # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -10700,12 +1335,13 @@ AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -10713,8 +1349,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -10754,16 +1390,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -10772,8 +1408,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -10781,7 +1417,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -10829,7 +1465,7 @@ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -10839,9 +1475,13 @@ # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -10856,20 +1496,18 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -10882,7 +1520,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -10894,21 +1532,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -10926,7 +1562,7 @@ # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -10936,18 +1572,21 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -10960,7 +1599,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -10989,33 +1628,42 @@ # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -11024,34 +1672,82 @@ [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. ]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -11073,21 +1769,18 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -11095,16 +1788,14 @@ install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -11121,20 +1812,17 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_MAINTAINER_MODE([DEFAULT-MODE]) # ---------------------------------- # Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user # can override the default with the --enable/--disable switch. AC_DEFUN([AM_MAINTAINER_MODE], [m4_case(m4_default([$1], [disable]), @@ -11145,10 +1833,11 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) AC_MSG_RESULT([$USE_MAINTAINER_MODE]) AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE @@ -11156,18 +1845,14 @@ ] ) -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -11185,7 +1870,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -11210,52 +1895,14 @@ rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 6 - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -11263,11 +1910,10 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -11280,54 +1926,22 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, -# Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -11337,7 +1951,7 @@ # -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) # ------------------------ @@ -11351,13 +1965,58 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_RUN_LOG(COMMAND) # ------------------- @@ -11372,22 +2031,16 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -11398,32 +2051,40 @@ esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -11433,31 +2094,50 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2009, 2011 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # AM_SILENT_RULES([DEFAULT]) # -------------------------- # Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). +# ("yes" being less verbose, "no" or empty being verbose). AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; esac dnl -dnl A few `make' implementations (e.g., NonStop OS and NextStep) +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) dnl do not support nested variable expansions. dnl See automake bug#9928 and bug#10237. am_make=${MAKE-make} @@ -11475,7 +2155,7 @@ am_cv_make_support_nested_variables=no fi]) if test $am_cv_make_support_nested_variables = yes; then - dnl Using `$V' instead of `$(V)' breaks IRIX make. + dnl Using '$V' instead of '$(V)' breaks IRIX make. AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' else @@ -11492,44 +2172,40 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -11543,18 +2219,16 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -11564,78 +2238,123 @@ # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4macros/gtk-doc.m4]) +m4_include([m4macros/intltool.m4]) +m4_include([m4macros/libtool.m4]) +m4_include([m4macros/ltoptions.m4]) +m4_include([m4macros/ltsugar.m4]) +m4_include([m4macros/ltversion.m4]) +m4_include([m4macros/lt~obsolete.m4]) m4_include([acinclude.m4]) diff -Nru gimp-2.8.18/app/actions/Makefile.in gimp-2.8.20/app/actions/Makefile.in --- gimp-2.8.18/app/actions/Makefile.in 2016-07-12 23:19:38.000000000 +0000 +++ gimp-2.8.20/app/actions/Makefile.in 2017-01-31 23:40:07.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,16 +89,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/actions -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -70,10 +113,8 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libappactions_a_AR = $(AR) $(ARFLAGS) libappactions_a_LIBADD = am_libappactions_a_OBJECTS = actions.$(OBJEXT) \ @@ -121,6 +162,18 @@ window-commands.$(OBJEXT) windows-actions.$(OBJEXT) \ windows-commands.$(OBJEXT) libappactions_a_OBJECTS = $(am_libappactions_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -130,23 +183,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libappactions_a_SOURCES) DIST_SOURCES = $(libappactions_a_SOURCES) am__can_run_installinfo = \ @@ -154,8 +207,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -696,7 +767,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/actions/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/actions/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -717,6 +787,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libappactions.a: $(libappactions_a_OBJECTS) $(libappactions_a_DEPENDENCIES) $(EXTRA_libappactions_a_DEPENDENCIES) $(AM_V_at)-rm -f libappactions.a $(AM_V_AR)$(libappactions_a_AR) libappactions.a $(libappactions_a_OBJECTS) $(libappactions_a_LIBADD) @@ -818,14 +889,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -840,26 +911,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -871,15 +931,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -888,6 +944,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1029,18 +1100,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/app/base/Makefile.in gimp-2.8.20/app/base/Makefile.in --- gimp-2.8.18/app/base/Makefile.in 2016-07-12 23:19:39.000000000 +0000 +++ gimp-2.8.20/app/base/Makefile.in 2017-01-31 23:40:08.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,16 +89,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/base -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -70,10 +113,8 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libappbase_a_AR = $(AR) $(ARFLAGS) libappbase_a_LIBADD = am_libappbase_a_OBJECTS = base.$(OBJEXT) base-enums.$(OBJEXT) \ @@ -88,6 +129,18 @@ tile-manager-preview.$(OBJEXT) tile-pyramid.$(OBJEXT) \ tile-rowhints.$(OBJEXT) tile-swap.$(OBJEXT) libappbase_a_OBJECTS = $(am_libappbase_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -97,23 +150,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libappbase_a_SOURCES) DIST_SOURCES = $(libappbase_a_SOURCES) am__can_run_installinfo = \ @@ -121,8 +174,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -557,7 +628,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/base/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/base/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -578,6 +648,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libappbase.a: $(libappbase_a_OBJECTS) $(libappbase_a_DEPENDENCIES) $(EXTRA_libappbase_a_DEPENDENCIES) $(AM_V_at)-rm -f libappbase.a $(AM_V_AR)$(libappbase_a_AR) libappbase.a $(libappbase_a_OBJECTS) $(libappbase_a_LIBADD) @@ -622,14 +693,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -644,26 +715,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -675,15 +735,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -692,6 +748,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -834,18 +905,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile base-enums.c: $(srcdir)/base-enums.h $(GIMP_MKENUMS) diff -Nru gimp-2.8.18/app/composite/Makefile.in gimp-2.8.20/app/composite/Makefile.in --- gimp-2.8.18/app/composite/Makefile.in 2016-07-12 23:19:39.000000000 +0000 +++ gimp-2.8.20/app/composite/Makefile.in 2017-01-31 23:40:08.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -59,16 +96,22 @@ gimp-composite-vis-test$(EXEEXT) EXTRA_PROGRAMS = gimp-composite-test$(EXEEXT) $(am__EXEEXT_1) subdir = app/composite -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -77,10 +120,8 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libcomposite_a_AR = $(AR) $(ARFLAGS) libcomposite_a_LIBADD = am__objects_1 = gimp-composite-3dnow-installer.$(OBJEXT) \ @@ -137,6 +178,7 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = am_gimp_composite_altivec_test_OBJECTS = \ gimp-composite-regression.$(OBJEXT) \ gimp-composite-altivec-test.$(OBJEXT) @@ -165,6 +207,18 @@ gimp-composite-vis-test.$(OBJEXT) gimp_composite_vis_test_OBJECTS = \ $(am_gimp_composite_vis_test_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -177,17 +231,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libcomposite_a_SOURCES) $(libcomposite3dnow_a_SOURCES) \ $(libcompositealtivec_a_SOURCES) $(libcompositemmx_a_SOURCES) \ $(libcompositesse_a_SOURCES) $(libcompositesse2_a_SOURCES) \ @@ -216,10 +269,231 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -724,7 +998,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -737,7 +1011,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/composite/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/composite/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -758,52 +1031,66 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libcomposite.a: $(libcomposite_a_OBJECTS) $(libcomposite_a_DEPENDENCIES) $(EXTRA_libcomposite_a_DEPENDENCIES) $(AM_V_at)-rm -f libcomposite.a $(AM_V_AR)$(libcomposite_a_AR) libcomposite.a $(libcomposite_a_OBJECTS) $(libcomposite_a_LIBADD) $(AM_V_at)$(RANLIB) libcomposite.a + libcomposite3dnow.a: $(libcomposite3dnow_a_OBJECTS) $(libcomposite3dnow_a_DEPENDENCIES) $(EXTRA_libcomposite3dnow_a_DEPENDENCIES) $(AM_V_at)-rm -f libcomposite3dnow.a $(AM_V_AR)$(libcomposite3dnow_a_AR) libcomposite3dnow.a $(libcomposite3dnow_a_OBJECTS) $(libcomposite3dnow_a_LIBADD) $(AM_V_at)$(RANLIB) libcomposite3dnow.a + libcompositealtivec.a: $(libcompositealtivec_a_OBJECTS) $(libcompositealtivec_a_DEPENDENCIES) $(EXTRA_libcompositealtivec_a_DEPENDENCIES) $(AM_V_at)-rm -f libcompositealtivec.a $(AM_V_AR)$(libcompositealtivec_a_AR) libcompositealtivec.a $(libcompositealtivec_a_OBJECTS) $(libcompositealtivec_a_LIBADD) $(AM_V_at)$(RANLIB) libcompositealtivec.a + libcompositemmx.a: $(libcompositemmx_a_OBJECTS) $(libcompositemmx_a_DEPENDENCIES) $(EXTRA_libcompositemmx_a_DEPENDENCIES) $(AM_V_at)-rm -f libcompositemmx.a $(AM_V_AR)$(libcompositemmx_a_AR) libcompositemmx.a $(libcompositemmx_a_OBJECTS) $(libcompositemmx_a_LIBADD) $(AM_V_at)$(RANLIB) libcompositemmx.a + libcompositesse.a: $(libcompositesse_a_OBJECTS) $(libcompositesse_a_DEPENDENCIES) $(EXTRA_libcompositesse_a_DEPENDENCIES) $(AM_V_at)-rm -f libcompositesse.a $(AM_V_AR)$(libcompositesse_a_AR) libcompositesse.a $(libcompositesse_a_OBJECTS) $(libcompositesse_a_LIBADD) $(AM_V_at)$(RANLIB) libcompositesse.a + libcompositesse2.a: $(libcompositesse2_a_OBJECTS) $(libcompositesse2_a_DEPENDENCIES) $(EXTRA_libcompositesse2_a_DEPENDENCIES) $(AM_V_at)-rm -f libcompositesse2.a $(AM_V_AR)$(libcompositesse2_a_AR) libcompositesse2.a $(libcompositesse2_a_OBJECTS) $(libcompositesse2_a_LIBADD) $(AM_V_at)$(RANLIB) libcompositesse2.a + libcompositevis.a: $(libcompositevis_a_OBJECTS) $(libcompositevis_a_DEPENDENCIES) $(EXTRA_libcompositevis_a_DEPENDENCIES) $(AM_V_at)-rm -f libcompositevis.a $(AM_V_AR)$(libcompositevis_a_AR) libcompositevis.a $(libcompositevis_a_OBJECTS) $(libcompositevis_a_LIBADD) $(AM_V_at)$(RANLIB) libcompositevis.a + gimp-composite-3dnow-test$(EXEEXT): $(gimp_composite_3dnow_test_OBJECTS) $(gimp_composite_3dnow_test_DEPENDENCIES) $(EXTRA_gimp_composite_3dnow_test_DEPENDENCIES) @rm -f gimp-composite-3dnow-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gimp_composite_3dnow_test_OBJECTS) $(gimp_composite_3dnow_test_LDADD) $(LIBS) + gimp-composite-altivec-test$(EXEEXT): $(gimp_composite_altivec_test_OBJECTS) $(gimp_composite_altivec_test_DEPENDENCIES) $(EXTRA_gimp_composite_altivec_test_DEPENDENCIES) @rm -f gimp-composite-altivec-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gimp_composite_altivec_test_OBJECTS) $(gimp_composite_altivec_test_LDADD) $(LIBS) + gimp-composite-mmx-test$(EXEEXT): $(gimp_composite_mmx_test_OBJECTS) $(gimp_composite_mmx_test_DEPENDENCIES) $(EXTRA_gimp_composite_mmx_test_DEPENDENCIES) @rm -f gimp-composite-mmx-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gimp_composite_mmx_test_OBJECTS) $(gimp_composite_mmx_test_LDADD) $(LIBS) + gimp-composite-sse-test$(EXEEXT): $(gimp_composite_sse_test_OBJECTS) $(gimp_composite_sse_test_DEPENDENCIES) $(EXTRA_gimp_composite_sse_test_DEPENDENCIES) @rm -f gimp-composite-sse-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gimp_composite_sse_test_OBJECTS) $(gimp_composite_sse_test_LDADD) $(LIBS) + gimp-composite-sse2-test$(EXEEXT): $(gimp_composite_sse2_test_OBJECTS) $(gimp_composite_sse2_test_DEPENDENCIES) $(EXTRA_gimp_composite_sse2_test_DEPENDENCIES) @rm -f gimp-composite-sse2-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gimp_composite_sse2_test_OBJECTS) $(gimp_composite_sse2_test_LDADD) $(LIBS) + gimp-composite-test$(EXEEXT): $(gimp_composite_test_OBJECTS) $(gimp_composite_test_DEPENDENCIES) $(EXTRA_gimp_composite_test_DEPENDENCIES) @rm -f gimp-composite-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gimp_composite_test_OBJECTS) $(gimp_composite_test_LDADD) $(LIBS) + gimp-composite-vis-test$(EXEEXT): $(gimp_composite_vis_test_OBJECTS) $(gimp_composite_vis_test_DEPENDENCIES) $(EXTRA_gimp_composite_vis_test_DEPENDENCIES) @rm -f gimp-composite-vis-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gimp_composite_vis_test_OBJECTS) $(gimp_composite_vis_test_LDADD) $(LIBS) @@ -843,14 +1130,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -921,26 +1208,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -952,15 +1228,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -969,102 +1241,222 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +gimp-composite-3dnow-test.log: gimp-composite-3dnow-test$(EXEEXT) + @p='gimp-composite-3dnow-test$(EXEEXT)'; \ + b='gimp-composite-3dnow-test'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +gimp-composite-altivec-test.log: gimp-composite-altivec-test$(EXEEXT) + @p='gimp-composite-altivec-test$(EXEEXT)'; \ + b='gimp-composite-altivec-test'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +gimp-composite-mmx-test.log: gimp-composite-mmx-test$(EXEEXT) + @p='gimp-composite-mmx-test$(EXEEXT)'; \ + b='gimp-composite-mmx-test'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +gimp-composite-sse-test.log: gimp-composite-sse-test$(EXEEXT) + @p='gimp-composite-sse-test$(EXEEXT)'; \ + b='gimp-composite-sse-test'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +gimp-composite-sse2-test.log: gimp-composite-sse2-test$(EXEEXT) + @p='gimp-composite-sse2-test$(EXEEXT)'; \ + b='gimp-composite-sse2-test'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +gimp-composite-vis-test.log: gimp-composite-vis-test$(EXEEXT) + @p='gimp-composite-vis-test$(EXEEXT)'; \ + b='gimp-composite-vis-test'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -1121,6 +1513,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -1205,19 +1600,22 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \ - clean clean-generic clean-libtool clean-noinstLIBRARIES ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \ + check-am clean clean-generic clean-libtool \ + clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am + +.PRECIOUS: Makefile libappcomposite.a: $(noinst_LIBRARIES) diff -Nru gimp-2.8.18/app/config/Makefile.in gimp-2.8.20/app/config/Makefile.in --- gimp-2.8.18/app/config/Makefile.in 2016-07-12 23:19:40.000000000 +0000 +++ gimp-2.8.20/app/config/Makefile.in 2017-01-31 23:40:09.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,16 +91,22 @@ EXTRA_PROGRAMS = test-config$(EXEEXT) TESTS = test-config$(EXEEXT) subdir = app/config -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -72,10 +115,8 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libappconfig_a_AR = $(AR) $(ARFLAGS) libappconfig_a_LIBADD = am__objects_1 = config-enums.$(OBJEXT) @@ -94,9 +135,22 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = test_config_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(test_config_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -109,17 +163,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libappconfig_a_SOURCES) test-config.c DIST_SOURCES = $(libappconfig_a_SOURCES) test-config.c am__can_run_installinfo = \ @@ -127,10 +180,231 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -585,7 +859,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -598,7 +872,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/config/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/config/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -619,10 +892,12 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libappconfig.a: $(libappconfig_a_OBJECTS) $(libappconfig_a_DEPENDENCIES) $(EXTRA_libappconfig_a_DEPENDENCIES) $(AM_V_at)-rm -f libappconfig.a $(AM_V_AR)$(libappconfig_a_AR) libappconfig.a $(libappconfig_a_OBJECTS) $(libappconfig_a_LIBADD) $(AM_V_at)$(RANLIB) libappconfig.a + test-config$(EXEEXT): $(test_config_OBJECTS) $(test_config_DEPENDENCIES) $(EXTRA_test_config_DEPENDENCIES) @rm -f test-config$(EXEEXT) $(AM_V_CCLD)$(test_config_LINK) $(test_config_OBJECTS) $(test_config_LDADD) $(LIBS) @@ -655,14 +930,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -677,26 +952,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -708,15 +972,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -725,102 +985,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +test-config.log: test-config$(EXEEXT) + @p='test-config$(EXEEXT)'; \ + b='test-config'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -877,6 +1222,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -961,19 +1309,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-generic clean-libtool clean-noinstLIBRARIES ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-generic clean-libtool clean-noinstLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + recheck tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile config-enums.c: $(srcdir)/config-enums.h $(GIMP_MKENUMS) diff -Nru gimp-2.8.18/app/core/gimpdynamics.c gimp-2.8.20/app/core/gimpdynamics.c --- gimp-2.8.18/app/core/gimpdynamics.c 2015-08-20 22:57:25.000000000 +0000 +++ gimp-2.8.20/app/core/gimpdynamics.c 2017-01-28 19:08:44.000000000 +0000 @@ -219,7 +219,7 @@ private->flow_output = gimp_dynamics_create_output (dynamics, "flow-output", - GIMP_DYNAMICS_OUTPUT_RATE); + GIMP_DYNAMICS_OUTPUT_FLOW); private->size_output = gimp_dynamics_create_output (dynamics, diff -Nru gimp-2.8.18/app/core/Makefile.in gimp-2.8.20/app/core/Makefile.in --- gimp-2.8.18/app/core/Makefile.in 2016-07-12 23:19:40.000000000 +0000 +++ gimp-2.8.20/app/core/Makefile.in 2017-01-31 23:40:10.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,16 +89,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/core -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -70,10 +113,8 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libappcore_a_AR = $(AR) $(ARFLAGS) libappcore_a_LIBADD = am__objects_1 = core-enums.$(OBJEXT) gimpmarshal.$(OBJEXT) @@ -176,6 +217,18 @@ gimpviewable.$(OBJEXT) am_libappcore_a_OBJECTS = $(am__objects_1) $(am__objects_2) libappcore_a_OBJECTS = $(am_libappcore_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -185,23 +238,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libappcore_a_SOURCES) DIST_SOURCES = $(libappcore_a_SOURCES) am__can_run_installinfo = \ @@ -209,8 +262,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -976,7 +1047,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/core/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/core/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -997,6 +1067,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libappcore.a: $(libappcore_a_OBJECTS) $(libappcore_a_DEPENDENCIES) $(EXTRA_libappcore_a_DEPENDENCIES) $(AM_V_at)-rm -f libappcore.a $(AM_V_AR)$(libappcore_a_AR) libappcore.a $(libappcore_a_OBJECTS) $(libappcore_a_LIBADD) @@ -1197,14 +1268,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1219,26 +1290,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1250,15 +1310,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1267,6 +1323,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1409,18 +1480,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile gimpmarshal.h: $(srcdir)/gimpmarshal.list diff -Nru gimp-2.8.18/app/dialogs/authors.h gimp-2.8.20/app/dialogs/authors.h --- gimp-2.8.18/app/dialogs/authors.h 2016-07-13 00:10:00.000000000 +0000 +++ gimp-2.8.20/app/dialogs/authors.h 2017-02-01 00:26:02.000000000 +0000 @@ -27,6 +27,7 @@ "Hendrik Boom", "Richard Bowers", "Hans Breuer", + "Ingo Brückl", "Simon Budig", "João S. O. Bueno", "Seth Burgess", @@ -69,6 +70,7 @@ "Tor Lillqvist", "Mikael Magnusson", "Luidnel Maignan", + "Thomas Manni", "Takeshi Matsuyama", "Téo Mazars", "Mike Melancon", @@ -89,6 +91,7 @@ "Mircea Purdea", "Dennis Ranke", "Martin Renold", + "Kristian Rietveld", "Gilles Rochefort", "Marco Rossini", "Karthikeyan S", diff -Nru gimp-2.8.18/app/dialogs/Makefile.in gimp-2.8.20/app/dialogs/Makefile.in --- gimp-2.8.18/app/dialogs/Makefile.in 2016-07-12 23:19:41.000000000 +0000 +++ gimp-2.8.20/app/dialogs/Makefile.in 2017-01-31 23:40:10.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,16 +89,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/dialogs -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -70,10 +113,8 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libappdialogs_a_AR = $(AR) $(ARFLAGS) libappdialogs_a_LIBADD = am__objects_1 = @@ -99,6 +140,18 @@ vectors-options-dialog.$(OBJEXT) am_libappdialogs_a_OBJECTS = $(am__objects_1) $(am__objects_2) libappdialogs_a_OBJECTS = $(am_libappdialogs_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -108,23 +161,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libappdialogs_a_SOURCES) DIST_SOURCES = $(libappdialogs_a_SOURCES) am__can_run_installinfo = \ @@ -132,8 +185,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -587,7 +658,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/dialogs/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/dialogs/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -608,6 +678,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libappdialogs.a: $(libappdialogs_a_OBJECTS) $(libappdialogs_a_DEPENDENCIES) $(EXTRA_libappdialogs_a_DEPENDENCIES) $(AM_V_at)-rm -f libappdialogs.a $(AM_V_AR)$(libappdialogs_a_AR) libappdialogs.a $(libappdialogs_a_OBJECTS) $(libappdialogs_a_LIBADD) @@ -661,14 +732,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -683,26 +754,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -714,15 +774,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -731,6 +787,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -872,18 +943,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile $(srcdir)/about-dialog.c: authors.h diff -Nru gimp-2.8.18/app/dialogs/preferences-dialog.c gimp-2.8.20/app/dialogs/preferences-dialog.c --- gimp-2.8.18/app/dialogs/preferences-dialog.c 2015-08-20 22:57:25.000000000 +0000 +++ gimp-2.8.20/app/dialogs/preferences-dialog.c 2017-01-28 19:08:44.000000000 +0000 @@ -34,8 +34,6 @@ #include "core/gimplist.h" #include "core/gimptemplate.h" -#include "pdb/gimppdb.h" - #include "widgets/gimpcolorpanel.h" #include "widgets/gimpcontainercombobox.h" #include "widgets/gimpcontainerview.h" @@ -293,6 +291,14 @@ config_copy = g_object_get_data (G_OBJECT (dialog), "config-copy"); gimp_config_reset (config_copy); + + /* don't use the default value if there is no help browser */ + if (! gimp_help_browser_is_installed (gimp)) + { + g_object_set (config_copy, + "help-browser", GIMP_HELP_BROWSER_WEB_BROWSER, + NULL); + } } gtk_widget_destroy (confirm); @@ -1034,6 +1040,35 @@ } static GtkWidget * +prefs_hint_box_new (const gchar *stock_id, + const gchar *text) +{ + GtkWidget *hbox; + GtkWidget *image; + GtkWidget *label; + + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); + + image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON); + gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); + gtk_widget_show (image); + + label = gtk_label_new (text); + gimp_label_set_attributes (GTK_LABEL (label), + PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC, + -1); + gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); + gtk_widget_show (label); + + gtk_widget_show (hbox); + + return hbox; +} + +static GtkWidget * prefs_button_add (const gchar *stock_id, const gchar *label, GtkBox *box) @@ -1792,62 +1827,64 @@ _("Show help _buttons"), GTK_BOX (vbox2)); - { - GtkWidget *combo; - GtkWidget *hbox; - GtkWidget *image; - GtkWidget *label; - const gchar *icon; - const gchar *text; - - table = prefs_table_new (2, GTK_CONTAINER (vbox2)); - combo = prefs_boolean_combo_box_add (object, "user-manual-online", - _("Use the online version"), - _("Use a locally installed copy"), - _("User manual:"), - GTK_TABLE (table), 0, size_group); - gimp_help_set_help_data (combo, NULL, NULL); + table = prefs_table_new (2, GTK_CONTAINER (vbox2)); + button = prefs_boolean_combo_box_add (object, "user-manual-online", + _("Use the online version"), + _("Use a locally installed copy"), + _("User manual:"), + GTK_TABLE (table), 0, size_group); + gimp_help_set_help_data (button, NULL, NULL); + + if (gimp_help_user_manual_is_installed (gimp)) + { + hbox = prefs_hint_box_new (GIMP_STOCK_INFO, + _("There's a local installation " + "of the user manual.")); + } + else + { + hbox = prefs_hint_box_new (GIMP_STOCK_WARNING, + _("The user manual is not installed " + "locally.")); + } - if (gimp_help_user_manual_is_installed (gimp)) - { - icon = GIMP_STOCK_INFO; - text = _("There's a local installation of the user manual."); - } - else - { - icon = GIMP_STOCK_WARNING; - text = _("The user manual is not installed locally."); - } + gtk_table_attach_defaults (GTK_TABLE (table), hbox, 1, 2, 1, 2); + gtk_widget_show (hbox); - hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); - gtk_table_attach_defaults (GTK_TABLE (table), hbox, 1, 2, 1, 2); - gtk_widget_show (hbox); - - image = gtk_image_new_from_stock (icon, GTK_ICON_SIZE_BUTTON); - gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); - gtk_widget_show (image); - - label = gtk_label_new (text); - gimp_label_set_attributes (GTK_LABEL (label), - PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC, - -1); - gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + /* Help Browser */ +#ifdef HAVE_WEBKIT + /* If there is no webkit available, assume we are on a platform + * that doesn't use the help browser, so don't bother showing + * the combo. + */ + vbox2 = prefs_frame_new (_("Help Browser"), GTK_CONTAINER (vbox), FALSE); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); - gtk_widget_show (label); - } + if (gimp_help_browser_is_installed (gimp)) + { + table = prefs_table_new (1, GTK_CONTAINER (vbox2)); - /* Help Browser */ - if (gimp_pdb_lookup_procedure (gimp->pdb, - "extension-gimp-help-browser")) { - vbox2 = prefs_frame_new (_("Help Browser"), GTK_CONTAINER (vbox), FALSE); - table = prefs_table_new (1, GTK_CONTAINER (vbox2)); - - prefs_enum_combo_box_add (object, "help-browser", 0, 0, - _("H_elp browser to use:"), - GTK_TABLE (table), 0, size_group); - } + button = prefs_enum_combo_box_add (object, "help-browser", 0, 0, + _("H_elp browser to use:"), + GTK_TABLE (table), 0, size_group); + } + else + { + hbox = prefs_hint_box_new (GIMP_STOCK_WARNING, + _("The GIMP help browser doesn't seem to " + "be installed. Using the web browser " + "instead.")); + gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0); + gtk_widget_show (hbox); + + g_object_set (config, + "help-browser", GIMP_HELP_BROWSER_WEB_BROWSER, + NULL); + } +#else + g_object_set (config, + "help-browser", GIMP_HELP_BROWSER_WEB_BROWSER, + NULL); +#endif /* HAVE_WEBKIT */ g_object_unref (size_group); size_group = NULL; diff -Nru gimp-2.8.18/app/display/gimpdisplayshell-tool-events.c gimp-2.8.20/app/display/gimpdisplayshell-tool-events.c --- gimp-2.8.18/app/display/gimpdisplayshell-tool-events.c 2015-08-20 22:57:25.000000000 +0000 +++ gimp-2.8.20/app/display/gimpdisplayshell-tool-events.c 2017-01-28 19:08:44.000000000 +0000 @@ -320,6 +320,19 @@ GIMP_LOG (TOOL_EVENTS, "event (display %p): %s", display, gimp_print_event (event)); + /* See bug 771444 */ + if (shell->pointer_grabbed && + event->type == GDK_MOTION_NOTIFY) + { + GimpDeviceManager *manager = gimp_devices_get_manager (gimp); + GimpDeviceInfo *info; + + info = gimp_device_manager_get_current_device (manager); + + if (info->device != event->motion.device) + return FALSE; + } + /* Find out what device the event occurred upon */ if (! gimp->busy && ! shell->inferior_ignore_mode && diff -Nru gimp-2.8.18/app/display/gimpimagewindow.c gimp-2.8.20/app/display/gimpimagewindow.c --- gimp-2.8.18/app/display/gimpimagewindow.c 2016-05-25 22:26:47.000000000 +0000 +++ gimp-2.8.20/app/display/gimpimagewindow.c 2017-01-28 19:08:44.000000000 +0000 @@ -547,7 +547,7 @@ * as soon as GTK+ has proper support for this, we will migrate to the * new-style full screen mode. */ -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7 +#if defined (MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7 ns_window.collectionBehavior |= NSWindowCollectionBehaviorFullScreenAuxiliary; #else /* Hard code the define ... */ diff -Nru gimp-2.8.18/app/display/Makefile.in gimp-2.8.20/app/display/Makefile.in --- gimp-2.8.18/app/display/Makefile.in 2016-07-12 23:19:41.000000000 +0000 +++ gimp-2.8.20/app/display/Makefile.in 2017-01-31 23:40:10.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,16 +89,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/display -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -70,10 +113,8 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libappdisplay_a_AR = $(AR) $(ARFLAGS) libappdisplay_a_LIBADD = am__objects_1 = display-enums.$(OBJEXT) @@ -124,6 +165,18 @@ gimptooldialog.$(OBJEXT) am_libappdisplay_a_OBJECTS = $(am__objects_1) $(am__objects_2) libappdisplay_a_OBJECTS = $(am_libappdisplay_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -133,23 +186,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libappdisplay_a_SOURCES) DIST_SOURCES = $(libappdisplay_a_SOURCES) am__can_run_installinfo = \ @@ -157,8 +210,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -671,7 +742,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/display/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/display/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -692,6 +762,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libappdisplay.a: $(libappdisplay_a_OBJECTS) $(libappdisplay_a_DEPENDENCIES) $(EXTRA_libappdisplay_a_DEPENDENCIES) $(AM_V_at)-rm -f libappdisplay.a $(AM_V_AR)$(libappdisplay_a_AR) libappdisplay.a $(libappdisplay_a_OBJECTS) $(libappdisplay_a_LIBADD) @@ -773,14 +844,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -795,26 +866,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -826,15 +886,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -843,6 +899,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -985,18 +1056,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile display-enums.c: $(srcdir)/display-enums.h $(GIMP_MKENUMS) diff -Nru gimp-2.8.18/app/file/Makefile.in gimp-2.8.20/app/file/Makefile.in --- gimp-2.8.18/app/file/Makefile.in 2016-07-12 23:19:41.000000000 +0000 +++ gimp-2.8.20/app/file/Makefile.in 2017-01-31 23:40:11.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,16 +89,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/file -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -70,15 +113,25 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libappfile_a_AR = $(AR) $(ARFLAGS) libappfile_a_LIBADD = am_libappfile_a_OBJECTS = file-open.$(OBJEXT) file-procedure.$(OBJEXT) \ file-save.$(OBJEXT) file-utils.$(OBJEXT) libappfile_a_OBJECTS = $(am_libappfile_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -88,23 +141,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libappfile_a_SOURCES) DIST_SOURCES = $(libappfile_a_SOURCES) am__can_run_installinfo = \ @@ -112,8 +165,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -493,7 +564,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/file/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/file/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -514,6 +584,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libappfile.a: $(libappfile_a_OBJECTS) $(libappfile_a_DEPENDENCIES) $(EXTRA_libappfile_a_DEPENDENCIES) $(AM_V_at)-rm -f libappfile.a $(AM_V_AR)$(libappfile_a_AR) libappfile.a $(libappfile_a_OBJECTS) $(libappfile_a_LIBADD) @@ -535,14 +606,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -557,26 +628,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -588,15 +648,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -605,6 +661,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -746,18 +817,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/app/gegl/Makefile.in gimp-2.8.20/app/gegl/Makefile.in --- gimp-2.8.18/app/gegl/Makefile.in 2016-07-12 23:19:42.000000000 +0000 +++ gimp-2.8.20/app/gegl/Makefile.in 2017-01-31 23:40:11.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,16 +89,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/gegl -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -70,10 +113,8 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libappgegl_a_AR = $(AR) $(ARFLAGS) libappgegl_a_LIBADD = am__objects_1 = gimp-gegl-enums.$(OBJEXT) @@ -126,6 +167,18 @@ gimpoperationantierasemode.$(OBJEXT) am_libappgegl_a_OBJECTS = $(am__objects_1) $(am__objects_2) libappgegl_a_OBJECTS = $(am_libappgegl_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -135,23 +188,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libappgegl_a_SOURCES) DIST_SOURCES = $(libappgegl_a_SOURCES) am__can_run_installinfo = \ @@ -159,8 +212,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -653,7 +724,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/gegl/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/gegl/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -674,6 +744,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libappgegl.a: $(libappgegl_a_OBJECTS) $(libappgegl_a_DEPENDENCIES) $(EXTRA_libappgegl_a_DEPENDENCIES) $(AM_V_at)-rm -f libappgegl.a $(AM_V_AR)$(libappgegl_a_AR) libappgegl.a $(libappgegl_a_OBJECTS) $(libappgegl_a_LIBADD) @@ -745,14 +816,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -767,26 +838,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -798,15 +858,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -815,6 +871,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -957,18 +1028,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile gimp-gegl-enums.c: $(srcdir)/gimp-gegl-enums.h $(GIMP_MKENUMS) diff -Nru gimp-2.8.18/app/git-version.h gimp-2.8.20/app/git-version.h --- gimp-2.8.18/app/git-version.h 2016-07-12 23:38:49.000000000 +0000 +++ gimp-2.8.20/app/git-version.h 2017-01-31 23:54:26.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef __GIT_VERSION_H__ #define __GIT_VERSION_H__ -#define GIMP_GIT_VERSION "GIMP_2_8_16-114-gcd2bbf7" -#define GIMP_GIT_LAST_COMMIT_YEAR "2016" +#define GIMP_GIT_VERSION "GIMP_2_8_18-91-g91b41bba51" +#define GIMP_GIT_LAST_COMMIT_YEAR "2017" #endif /* __GIT_VERSION_H__ */ diff -Nru gimp-2.8.18/app/gui/gui.c gimp-2.8.20/app/gui/gui.c --- gimp-2.8.18/app/gui/gui.c 2015-08-20 22:57:25.000000000 +0000 +++ gimp-2.8.20/app/gui/gui.c 2017-01-28 19:08:44.000000000 +0000 @@ -76,9 +76,21 @@ #include "session.h" #include "splash.h" #include "themes.h" + #ifdef GDK_WINDOWING_QUARTZ #import #include + +/* Forward declare since we are building against old SDKs. */ +#if !defined(MAC_OS_X_VERSION_10_12) || \ + MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12 + +@interface NSWindow(ForwardDeclarations) ++ (void)setAllowsAutomaticWindowTabbing:(BOOL)allow; +@end + +#endif + #endif /* GDK_WINDOWING_QUARTZ */ #include "gimp-intl.h" @@ -227,6 +239,17 @@ /* disable automatic startup notification */ gtk_window_set_auto_startup_notification (FALSE); +#ifdef GDK_WINDOWING_QUARTZ + /* Before the first window is created (typically the splash window), + * we need to disable automatic tabbing behavior introduced on Sierra. + * This is known to cause all kinds of weird issues (see for instance + * Bugzilla #776294) and needs proper GTK+ support if we would want to + * enable it. + */ + if ([NSWindow respondsToSelector:@selector(setAllowsAutomaticWindowTabbing:)]) + [NSWindow setAllowsAutomaticWindowTabbing:NO]; +#endif /* GDK_WINDOWING_QUARTZ */ + gimp_dnd_init (gimp); themes_init (gimp); diff -Nru gimp-2.8.18/app/gui/Makefile.in gimp-2.8.20/app/gui/Makefile.in --- gimp-2.8.18/app/gui/Makefile.in 2016-07-12 23:19:42.000000000 +0000 +++ gimp-2.8.20/app/gui/Makefile.in 2017-01-31 23:40:12.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,16 +89,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/gui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -70,10 +113,8 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libappgui_a_AR = $(AR) $(ARFLAGS) libappgui_a_LIBADD = am__objects_1 = @@ -83,6 +124,18 @@ splash.$(OBJEXT) themes.$(OBJEXT) am_libappgui_a_OBJECTS = $(am__objects_1) $(am__objects_2) libappgui_a_OBJECTS = $(am_libappgui_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -92,23 +145,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libappgui_a_SOURCES) DIST_SOURCES = $(libappgui_a_SOURCES) am__can_run_installinfo = \ @@ -116,8 +169,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -526,7 +597,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/gui/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/gui/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -547,6 +617,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libappgui.a: $(libappgui_a_OBJECTS) $(libappgui_a_DEPENDENCIES) $(EXTRA_libappgui_a_DEPENDENCIES) $(AM_V_at)-rm -f libappgui.a $(AM_V_AR)$(libappgui_a_AR) libappgui.a $(libappgui_a_OBJECTS) $(libappgui_a_LIBADD) @@ -574,14 +645,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -596,26 +667,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -627,15 +687,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -644,6 +700,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -786,18 +857,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile $(srcdir)/gimpdbusservice.c: gimpdbusservice-glue.h diff -Nru gimp-2.8.18/app/Makefile.in gimp-2.8.20/app/Makefile.in --- gimp-2.8.18/app/Makefile.in 2016-07-12 23:19:38.000000000 +0000 +++ gimp-2.8.20/app/Makefile.in 2017-01-31 23:40:07.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,23 +18,61 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -57,18 +94,23 @@ @ENABLE_GIMP_CONSOLE_FALSE@bin_PROGRAMS = gimp-2.8$(EXEEXT) @ENABLE_GIMP_CONSOLE_TRUE@bin_PROGRAMS = gimp-2.8$(EXEEXT) \ @ENABLE_GIMP_CONSOLE_TRUE@ gimp-console-2.8$(EXEEXT) -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc.rule subdir = app ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -77,10 +119,8 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libapp_a_AR = $(AR) $(ARFLAGS) libapp_a_LIBADD = am__objects_1 = app.$(OBJEXT) batch.$(OBJEXT) errors.$(OBJEXT) \ @@ -117,6 +157,7 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = gimp_2_8_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(gimp_2_8_LDFLAGS) $(LDFLAGS) -o $@ @@ -144,6 +185,18 @@ @ENABLE_GIMP_CONSOLE_TRUE@gimp_console_2_8_DEPENDENCIES = \ @ENABLE_GIMP_CONSOLE_TRUE@ $(am__DEPENDENCIES_2) \ @ENABLE_GIMP_CONSOLE_TRUE@ $(GIMPCONSOLERC) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -156,28 +209,28 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libapp_a_SOURCES) $(gimp_2_8_SOURCES) \ $(gimp_console_2_8_SOURCES) DIST_SOURCES = $(libapp_a_SOURCES) $(gimp_2_8_SOURCES) \ $(am__gimp_console_2_8_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -185,12 +238,34 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc.rule $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -767,7 +842,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -776,7 +850,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc.rule: +$(top_srcdir)/build/windows/gimprc.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -789,6 +863,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libapp.a: $(libapp_a_OBJECTS) $(libapp_a_DEPENDENCIES) $(EXTRA_libapp_a_DEPENDENCIES) $(AM_V_at)-rm -f libapp.a $(AM_V_AR)$(libapp_a_AR) libapp.a $(libapp_a_OBJECTS) $(libapp_a_LIBADD) @@ -802,10 +877,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -826,7 +903,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -839,9 +917,11 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + gimp-2.8$(EXEEXT): $(gimp_2_8_OBJECTS) $(gimp_2_8_DEPENDENCIES) $(EXTRA_gimp_2_8_DEPENDENCIES) @rm -f gimp-2.8$(EXEEXT) $(AM_V_CCLD)$(gimp_2_8_LINK) $(gimp_2_8_OBJECTS) $(gimp_2_8_LDADD) $(LIBS) + gimp-console-2.8$(EXEEXT): $(gimp_console_2_8_OBJECTS) $(gimp_console_2_8_DEPENDENCIES) $(EXTRA_gimp_console_2_8_DEPENDENCIES) @rm -f gimp-console-2.8$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gimp_console_2_8_OBJECTS) $(gimp_console_2_8_LDADD) $(LIBS) @@ -884,14 +964,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1089,22 +1169,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -1119,57 +1202,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -1185,12 +1223,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1202,15 +1235,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1219,6 +1248,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1395,26 +1439,26 @@ uninstall-am: uninstall-binPROGRAMS uninstall-local -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ - ctags-recursive install install-am install-exec-am \ - install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool clean-noinstLIBRARIES ctags \ - ctags-recursive dist-hook distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-exec-hook \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-local +.MAKE: $(am__recursive_targets) all check install install-am \ + install-exec-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-binPROGRAMS clean-generic clean-libtool \ + clean-noinstLIBRARIES cscopelist-am ctags ctags-am dist-hook \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-exec-hook install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-binPROGRAMS uninstall-local + +.PRECIOUS: Makefile $(srcdir)/version.c: git-version.h diff -Nru gimp-2.8.18/app/menus/Makefile.in gimp-2.8.20/app/menus/Makefile.in --- gimp-2.8.18/app/menus/Makefile.in 2016-07-12 23:19:42.000000000 +0000 +++ gimp-2.8.20/app/menus/Makefile.in 2017-01-31 23:40:12.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,16 +89,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/menus -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -70,10 +113,8 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libappmenus_a_AR = $(AR) $(ARFLAGS) libappmenus_a_LIBADD = am_libappmenus_a_OBJECTS = menus.$(OBJEXT) dockable-menu.$(OBJEXT) \ @@ -81,6 +122,18 @@ plug-in-menus.$(OBJEXT) tool-options-menu.$(OBJEXT) \ window-menu.$(OBJEXT) windows-menu.$(OBJEXT) libappmenus_a_OBJECTS = $(am_libappmenus_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -90,23 +143,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libappmenus_a_SOURCES) DIST_SOURCES = $(libappmenus_a_SOURCES) am__can_run_installinfo = \ @@ -114,8 +167,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -503,7 +574,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/menus/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/menus/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -524,6 +594,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libappmenus.a: $(libappmenus_a_OBJECTS) $(libappmenus_a_DEPENDENCIES) $(EXTRA_libappmenus_a_DEPENDENCIES) $(AM_V_at)-rm -f libappmenus.a $(AM_V_AR)$(libappmenus_a_AR) libappmenus.a $(libappmenus_a_OBJECTS) $(libappmenus_a_LIBADD) @@ -549,14 +620,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -571,26 +642,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -602,15 +662,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -619,6 +675,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -760,18 +831,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/app/paint/Makefile.in gimp-2.8.20/app/paint/Makefile.in --- gimp-2.8.18/app/paint/Makefile.in 2016-07-12 23:19:43.000000000 +0000 +++ gimp-2.8.20/app/paint/Makefile.in 2017-01-31 23:40:13.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,16 +89,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/paint -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -70,10 +113,8 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libapppaint_a_AR = $(AR) $(ARFLAGS) libapppaint_a_LIBADD = am__objects_1 = paint-enums.$(OBJEXT) @@ -94,6 +135,18 @@ gimpsourceoptions.$(OBJEXT) am_libapppaint_a_OBJECTS = $(am__objects_1) $(am__objects_2) libapppaint_a_OBJECTS = $(am_libapppaint_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -103,23 +156,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libapppaint_a_SOURCES) DIST_SOURCES = $(libapppaint_a_SOURCES) am__can_run_installinfo = \ @@ -127,8 +180,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -572,7 +643,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/paint/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/paint/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -593,6 +663,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libapppaint.a: $(libapppaint_a_OBJECTS) $(libapppaint_a_DEPENDENCIES) $(EXTRA_libapppaint_a_DEPENDENCIES) $(AM_V_at)-rm -f libapppaint.a $(AM_V_AR)$(libapppaint_a_AR) libapppaint.a $(libapppaint_a_OBJECTS) $(libapppaint_a_LIBADD) @@ -641,14 +712,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -663,26 +734,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -694,15 +754,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -711,6 +767,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -853,18 +924,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile paint-enums.c: $(srcdir)/paint-enums.h $(GIMP_MKENUMS) diff -Nru gimp-2.8.18/app/paint-funcs/Makefile.in gimp-2.8.20/app/paint-funcs/Makefile.in --- gimp-2.8.18/app/paint-funcs/Makefile.in 2016-07-12 23:19:43.000000000 +0000 +++ gimp-2.8.20/app/paint-funcs/Makefile.in 2017-01-31 23:40:13.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,16 +89,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/paint-funcs -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -70,16 +113,26 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libapppaint_funcs_a_AR = $(AR) $(ARFLAGS) libapppaint_funcs_a_LIBADD = am_libapppaint_funcs_a_OBJECTS = paint-funcs.$(OBJEXT) \ reduce-region.$(OBJEXT) scale-region.$(OBJEXT) \ subsample-region.$(OBJEXT) libapppaint_funcs_a_OBJECTS = $(am_libapppaint_funcs_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -89,23 +142,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libapppaint_funcs_a_SOURCES) DIST_SOURCES = $(libapppaint_funcs_a_SOURCES) am__can_run_installinfo = \ @@ -113,8 +166,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -501,7 +572,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/paint-funcs/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/paint-funcs/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -522,6 +592,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libapppaint-funcs.a: $(libapppaint_funcs_a_OBJECTS) $(libapppaint_funcs_a_DEPENDENCIES) $(EXTRA_libapppaint_funcs_a_DEPENDENCIES) $(AM_V_at)-rm -f libapppaint-funcs.a $(AM_V_AR)$(libapppaint_funcs_a_AR) libapppaint-funcs.a $(libapppaint_funcs_a_OBJECTS) $(libapppaint_funcs_a_LIBADD) @@ -543,14 +614,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -565,26 +636,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -596,15 +656,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -613,6 +669,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -754,18 +825,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/app/pdb/Makefile.in gimp-2.8.20/app/pdb/Makefile.in --- gimp-2.8.18/app/pdb/Makefile.in 2016-07-12 23:19:44.000000000 +0000 +++ gimp-2.8.20/app/pdb/Makefile.in 2017-01-31 23:40:13.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,16 +89,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/pdb -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -70,10 +113,8 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libappinternal_procs_a_AR = $(AR) $(ARFLAGS) libappinternal_procs_a_LIBADD = am_libappinternal_procs_a_OBJECTS = internal-procs.$(OBJEXT) \ @@ -109,6 +150,18 @@ gimppdbcontext.$(OBJEXT) gimppdberror.$(OBJEXT) \ gimpprocedure.$(OBJEXT) libapppdb_a_OBJECTS = $(am_libapppdb_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -118,23 +171,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libappinternal_procs_a_SOURCES) $(libapppdb_a_SOURCES) DIST_SOURCES = $(libappinternal_procs_a_SOURCES) \ $(libapppdb_a_SOURCES) @@ -143,8 +196,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -586,7 +657,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/pdb/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/pdb/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -607,10 +677,12 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libappinternal-procs.a: $(libappinternal_procs_a_OBJECTS) $(libappinternal_procs_a_DEPENDENCIES) $(EXTRA_libappinternal_procs_a_DEPENDENCIES) $(AM_V_at)-rm -f libappinternal-procs.a $(AM_V_AR)$(libappinternal_procs_a_AR) libappinternal-procs.a $(libappinternal_procs_a_OBJECTS) $(libappinternal_procs_a_LIBADD) $(AM_V_at)$(RANLIB) libappinternal-procs.a + libapppdb.a: $(libapppdb_a_OBJECTS) $(libapppdb_a_DEPENDENCIES) $(EXTRA_libapppdb_a_DEPENDENCIES) $(AM_V_at)-rm -f libapppdb.a $(AM_V_AR)$(libapppdb_a_AR) libapppdb.a $(libapppdb_a_OBJECTS) $(libapppdb_a_LIBADD) @@ -686,14 +758,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -708,26 +780,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -739,15 +800,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -756,6 +813,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -897,18 +969,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/app/plug-in/Makefile.in gimp-2.8.20/app/plug-in/Makefile.in --- gimp-2.8.18/app/plug-in/Makefile.in 2016-07-12 23:19:44.000000000 +0000 +++ gimp-2.8.20/app/plug-in/Makefile.in 2017-01-31 23:40:14.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,16 +89,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/plug-in -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -70,10 +113,8 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libappplug_in_a_AR = $(AR) $(ARFLAGS) libappplug_in_a_LIBADD = am_libappplug_in_a_OBJECTS = plug-in-enums.$(OBJEXT) \ @@ -96,6 +137,18 @@ plug-in-menu-path.$(OBJEXT) plug-in-params.$(OBJEXT) \ plug-in-rc.$(OBJEXT) plug-in-icc-profile.$(OBJEXT) libappplug_in_a_OBJECTS = $(am_libappplug_in_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -105,23 +158,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libappplug_in_a_SOURCES) DIST_SOURCES = $(libappplug_in_a_SOURCES) am__can_run_installinfo = \ @@ -129,8 +182,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -571,7 +642,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/plug-in/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/plug-in/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -592,6 +662,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libappplug-in.a: $(libappplug_in_a_OBJECTS) $(libappplug_in_a_DEPENDENCIES) $(EXTRA_libappplug_in_a_DEPENDENCIES) $(AM_V_at)-rm -f libappplug-in.a $(AM_V_AR)$(libappplug_in_a_AR) libappplug-in.a $(libappplug_in_a_OBJECTS) $(libappplug_in_a_LIBADD) @@ -638,14 +709,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -660,26 +731,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -691,15 +751,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -708,6 +764,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -850,18 +921,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile plug-in-enums.c: $(srcdir)/plug-in-enums.h $(GIMP_MKENUMS) diff -Nru gimp-2.8.18/app/tests/files/Makefile.in gimp-2.8.20/app/tests/files/Makefile.in --- gimp-2.8.18/app/tests/files/Makefile.in 2016-07-12 23:19:45.000000000 +0000 +++ gimp-2.8.20/app/tests/files/Makefile.in 2017-01-31 23:40:15.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,26 +88,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/tests/files -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -78,6 +127,8 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -435,7 +486,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tests/files/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/tests/files/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -459,11 +509,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -599,15 +649,18 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/app/tests/gimpdir/brushes/Makefile.in gimp-2.8.20/app/tests/gimpdir/brushes/Makefile.in --- gimp-2.8.18/app/tests/gimpdir/brushes/Makefile.in 2016-07-12 23:19:47.000000000 +0000 +++ gimp-2.8.20/app/tests/gimpdir/brushes/Makefile.in 2017-01-31 23:40:17.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,26 +88,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/tests/gimpdir/brushes -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -78,6 +127,8 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -432,7 +483,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tests/gimpdir/brushes/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/tests/gimpdir/brushes/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -456,11 +506,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -596,15 +646,18 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # We only need the dir itself diff -Nru gimp-2.8.18/app/tests/gimpdir/gradients/Makefile.in gimp-2.8.20/app/tests/gimpdir/gradients/Makefile.in --- gimp-2.8.18/app/tests/gimpdir/gradients/Makefile.in 2016-07-12 23:19:47.000000000 +0000 +++ gimp-2.8.20/app/tests/gimpdir/gradients/Makefile.in 2017-01-31 23:40:17.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,26 +88,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/tests/gimpdir/gradients -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -78,6 +127,8 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -432,7 +483,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tests/gimpdir/gradients/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/tests/gimpdir/gradients/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -456,11 +506,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -596,15 +646,18 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # We only need the dir itself diff -Nru gimp-2.8.18/app/tests/gimpdir/Makefile.in gimp-2.8.20/app/tests/gimpdir/Makefile.in --- gimp-2.8.18/app/tests/gimpdir/Makefile.in 2016-07-12 23:19:46.000000000 +0000 +++ gimp-2.8.20/app/tests/gimpdir/Makefile.in 2017-01-31 23:40:17.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,35 +88,48 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/tests/gimpdir -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -87,12 +137,33 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -491,7 +562,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tests/gimpdir/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/tests/gimpdir/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -517,22 +587,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -547,57 +620,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -613,12 +641,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -630,15 +653,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -647,6 +666,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -807,22 +841,22 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/app/tests/gimpdir/patterns/Makefile.in gimp-2.8.20/app/tests/gimpdir/patterns/Makefile.in --- gimp-2.8.18/app/tests/gimpdir/patterns/Makefile.in 2016-07-12 23:19:47.000000000 +0000 +++ gimp-2.8.20/app/tests/gimpdir/patterns/Makefile.in 2017-01-31 23:40:17.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,26 +88,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/tests/gimpdir/patterns -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -78,6 +127,8 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -432,7 +483,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tests/gimpdir/patterns/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/tests/gimpdir/patterns/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -456,11 +506,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -596,15 +646,18 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # We only need the dir itself diff -Nru gimp-2.8.18/app/tests/gimpdir-empty/brushes/Makefile.in gimp-2.8.20/app/tests/gimpdir-empty/brushes/Makefile.in --- gimp-2.8.18/app/tests/gimpdir-empty/brushes/Makefile.in 2016-07-12 23:19:45.000000000 +0000 +++ gimp-2.8.20/app/tests/gimpdir-empty/brushes/Makefile.in 2017-01-31 23:40:16.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,26 +88,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/tests/gimpdir-empty/brushes -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -78,6 +127,8 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -432,7 +483,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tests/gimpdir-empty/brushes/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/tests/gimpdir-empty/brushes/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -456,11 +506,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -596,15 +646,18 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # We only need the dir itself diff -Nru gimp-2.8.18/app/tests/gimpdir-empty/gradients/Makefile.in gimp-2.8.20/app/tests/gimpdir-empty/gradients/Makefile.in --- gimp-2.8.18/app/tests/gimpdir-empty/gradients/Makefile.in 2016-07-12 23:19:46.000000000 +0000 +++ gimp-2.8.20/app/tests/gimpdir-empty/gradients/Makefile.in 2017-01-31 23:40:16.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,26 +88,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/tests/gimpdir-empty/gradients -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -78,6 +127,8 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -432,7 +483,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tests/gimpdir-empty/gradients/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/tests/gimpdir-empty/gradients/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -456,11 +506,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -596,15 +646,18 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # We only need the dir itself diff -Nru gimp-2.8.18/app/tests/gimpdir-empty/Makefile.in gimp-2.8.20/app/tests/gimpdir-empty/Makefile.in --- gimp-2.8.18/app/tests/gimpdir-empty/Makefile.in 2016-07-12 23:19:45.000000000 +0000 +++ gimp-2.8.20/app/tests/gimpdir-empty/Makefile.in 2017-01-31 23:40:15.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,35 +88,48 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/tests/gimpdir-empty -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -87,12 +137,33 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -480,7 +551,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tests/gimpdir-empty/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/tests/gimpdir-empty/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -506,22 +576,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -536,57 +609,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -602,12 +630,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -619,15 +642,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -636,6 +655,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -796,22 +830,22 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/app/tests/gimpdir-empty/patterns/Makefile.in gimp-2.8.20/app/tests/gimpdir-empty/patterns/Makefile.in --- gimp-2.8.18/app/tests/gimpdir-empty/patterns/Makefile.in 2016-07-12 23:19:46.000000000 +0000 +++ gimp-2.8.20/app/tests/gimpdir-empty/patterns/Makefile.in 2017-01-31 23:40:16.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,26 +88,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/tests/gimpdir-empty/patterns -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -78,6 +127,8 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -432,7 +483,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tests/gimpdir-empty/patterns/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/tests/gimpdir-empty/patterns/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -456,11 +506,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -596,15 +646,18 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # We only need the dir itself diff -Nru gimp-2.8.18/app/tests/Makefile.in gimp-2.8.20/app/tests/Makefile.in --- gimp-2.8.18/app/tests/Makefile.in 2016-07-12 23:19:45.000000000 +0000 +++ gimp-2.8.20/app/tests/Makefile.in 2017-01-31 23:40:15.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -64,16 +101,22 @@ test-ui$(EXEEXT) test-xcf$(EXEEXT) EXTRA_PROGRAMS = $(am__EXEEXT_1) subdir = app/tests -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -82,10 +125,8 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libgimpapptestutils_a_AR = $(AR) $(ARFLAGS) libgimpapptestutils_a_LIBADD = am_libgimpapptestutils_a_OBJECTS = gimp-app-test-utils.$(OBJEXT) \ @@ -139,6 +180,7 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = test_gimpidtable_SOURCES = test-gimpidtable.c test_gimpidtable_OBJECTS = test-gimpidtable.$(OBJEXT) test_gimpidtable_LDADD = $(LDADD) @@ -507,6 +549,18 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -519,17 +573,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libgimpapptestutils_a_SOURCES) test-core.c \ test-gimpidtable.c test-gimptilebackendtilemanager.c \ test-save-and-export.c test-session-2-6-compatibility.c \ @@ -542,13 +595,14 @@ test-session-2-8-compatibility-multi-window.c \ test-session-2-8-compatibility-single-window.c \ test-single-window-mode.c test-tools.c test-ui.c test-xcf.c -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -556,14 +610,237 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + check recheck distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -1042,7 +1319,7 @@ all: all-recursive .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -1055,7 +1332,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tests/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/tests/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1076,40 +1352,52 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libgimpapptestutils.a: $(libgimpapptestutils_a_OBJECTS) $(libgimpapptestutils_a_DEPENDENCIES) $(EXTRA_libgimpapptestutils_a_DEPENDENCIES) $(AM_V_at)-rm -f libgimpapptestutils.a $(AM_V_AR)$(libgimpapptestutils_a_AR) libgimpapptestutils.a $(libgimpapptestutils_a_OBJECTS) $(libgimpapptestutils_a_LIBADD) $(AM_V_at)$(RANLIB) libgimpapptestutils.a + test-core$(EXEEXT): $(test_core_OBJECTS) $(test_core_DEPENDENCIES) $(EXTRA_test_core_DEPENDENCIES) @rm -f test-core$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_core_OBJECTS) $(test_core_LDADD) $(LIBS) + test-gimpidtable$(EXEEXT): $(test_gimpidtable_OBJECTS) $(test_gimpidtable_DEPENDENCIES) $(EXTRA_test_gimpidtable_DEPENDENCIES) @rm -f test-gimpidtable$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_gimpidtable_OBJECTS) $(test_gimpidtable_LDADD) $(LIBS) + test-gimptilebackendtilemanager$(EXEEXT): $(test_gimptilebackendtilemanager_OBJECTS) $(test_gimptilebackendtilemanager_DEPENDENCIES) $(EXTRA_test_gimptilebackendtilemanager_DEPENDENCIES) @rm -f test-gimptilebackendtilemanager$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_gimptilebackendtilemanager_OBJECTS) $(test_gimptilebackendtilemanager_LDADD) $(LIBS) + test-save-and-export$(EXEEXT): $(test_save_and_export_OBJECTS) $(test_save_and_export_DEPENDENCIES) $(EXTRA_test_save_and_export_DEPENDENCIES) @rm -f test-save-and-export$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_save_and_export_OBJECTS) $(test_save_and_export_LDADD) $(LIBS) + test-session-2-6-compatibility$(EXEEXT): $(test_session_2_6_compatibility_OBJECTS) $(test_session_2_6_compatibility_DEPENDENCIES) $(EXTRA_test_session_2_6_compatibility_DEPENDENCIES) @rm -f test-session-2-6-compatibility$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_session_2_6_compatibility_OBJECTS) $(test_session_2_6_compatibility_LDADD) $(LIBS) + test-session-2-8-compatibility-multi-window$(EXEEXT): $(test_session_2_8_compatibility_multi_window_OBJECTS) $(test_session_2_8_compatibility_multi_window_DEPENDENCIES) $(EXTRA_test_session_2_8_compatibility_multi_window_DEPENDENCIES) @rm -f test-session-2-8-compatibility-multi-window$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_session_2_8_compatibility_multi_window_OBJECTS) $(test_session_2_8_compatibility_multi_window_LDADD) $(LIBS) + test-session-2-8-compatibility-single-window$(EXEEXT): $(test_session_2_8_compatibility_single_window_OBJECTS) $(test_session_2_8_compatibility_single_window_DEPENDENCIES) $(EXTRA_test_session_2_8_compatibility_single_window_DEPENDENCIES) @rm -f test-session-2-8-compatibility-single-window$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_session_2_8_compatibility_single_window_OBJECTS) $(test_session_2_8_compatibility_single_window_LDADD) $(LIBS) + test-single-window-mode$(EXEEXT): $(test_single_window_mode_OBJECTS) $(test_single_window_mode_DEPENDENCIES) $(EXTRA_test_single_window_mode_DEPENDENCIES) @rm -f test-single-window-mode$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_single_window_mode_OBJECTS) $(test_single_window_mode_LDADD) $(LIBS) + test-tools$(EXEEXT): $(test_tools_OBJECTS) $(test_tools_DEPENDENCIES) $(EXTRA_test_tools_DEPENDENCIES) @rm -f test-tools$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_tools_OBJECTS) $(test_tools_LDADD) $(LIBS) + test-ui$(EXEEXT): $(test_ui_OBJECTS) $(test_ui_DEPENDENCIES) $(EXTRA_test_ui_DEPENDENCIES) @rm -f test-ui$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_ui_OBJECTS) $(test_ui_LDADD) $(LIBS) + test-xcf$(EXEEXT): $(test_xcf_OBJECTS) $(test_xcf_DEPENDENCIES) $(EXTRA_test_xcf_DEPENDENCIES) @rm -f test-xcf$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_xcf_OBJECTS) $(test_xcf_LDADD) $(LIBS) @@ -1139,14 +1427,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1162,22 +1450,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -1192,57 +1483,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -1258,12 +1504,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1275,15 +1516,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1292,102 +1529,257 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +test-core.log: test-core$(EXEEXT) + @p='test-core$(EXEEXT)'; \ + b='test-core'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-gimpidtable.log: test-gimpidtable$(EXEEXT) + @p='test-gimpidtable$(EXEEXT)'; \ + b='test-gimpidtable'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-gimptilebackendtilemanager.log: test-gimptilebackendtilemanager$(EXEEXT) + @p='test-gimptilebackendtilemanager$(EXEEXT)'; \ + b='test-gimptilebackendtilemanager'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-save-and-export.log: test-save-and-export$(EXEEXT) + @p='test-save-and-export$(EXEEXT)'; \ + b='test-save-and-export'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-session-2-6-compatibility.log: test-session-2-6-compatibility$(EXEEXT) + @p='test-session-2-6-compatibility$(EXEEXT)'; \ + b='test-session-2-6-compatibility'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-session-2-8-compatibility-multi-window.log: test-session-2-8-compatibility-multi-window$(EXEEXT) + @p='test-session-2-8-compatibility-multi-window$(EXEEXT)'; \ + b='test-session-2-8-compatibility-multi-window'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-session-2-8-compatibility-single-window.log: test-session-2-8-compatibility-single-window$(EXEEXT) + @p='test-session-2-8-compatibility-single-window$(EXEEXT)'; \ + b='test-session-2-8-compatibility-single-window'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-single-window-mode.log: test-single-window-mode$(EXEEXT) + @p='test-single-window-mode$(EXEEXT)'; \ + b='test-single-window-mode'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-tools.log: test-tools$(EXEEXT) + @p='test-tools$(EXEEXT)'; \ + b='test-tools'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-ui.log: test-ui$(EXEEXT) + @p='test-ui$(EXEEXT)'; \ + b='test-ui'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-xcf.log: test-xcf$(EXEEXT) + @p='test-xcf$(EXEEXT)'; \ + b='test-xcf'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -1470,6 +1862,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -1552,13 +1947,12 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) check-am install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-TESTS check-am clean clean-generic \ - clean-libtool clean-local clean-noinstLIBRARIES ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-TESTS check-am clean clean-generic clean-libtool \ + clean-local clean-noinstLIBRARIES cscopelist-am ctags ctags-am \ + distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -1568,7 +1962,9 @@ installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am + recheck tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile $(TESTS): gimpdir-output diff -Nru gimp-2.8.18/app/text/gimptextlayout.c gimp-2.8.20/app/text/gimptextlayout.c --- gimp-2.8.18/app/text/gimptextlayout.c 2015-08-20 22:57:26.000000000 +0000 +++ gimp-2.8.20/app/text/gimptextlayout.c 2017-01-28 19:08:44.000000000 +0000 @@ -170,7 +170,8 @@ pango_units_from_double (gimp_units_to_pixels (text->box_width, text->box_unit, - xres))); + xres) - + 2 * layout->text->border)); break; } diff -Nru gimp-2.8.18/app/text/Makefile.in gimp-2.8.20/app/text/Makefile.in --- gimp-2.8.18/app/text/Makefile.in 2016-07-12 23:19:48.000000000 +0000 +++ gimp-2.8.20/app/text/Makefile.in 2017-01-31 23:40:18.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,16 +89,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/text -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -70,10 +113,8 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libapptext_a_AR = $(AR) $(ARFLAGS) libapptext_a_LIBADD = am__objects_1 = text-enums.$(OBJEXT) @@ -86,6 +127,18 @@ gimptextlayout-render.$(OBJEXT) gimptextundo.$(OBJEXT) am_libapptext_a_OBJECTS = $(am__objects_1) $(am__objects_2) libapptext_a_OBJECTS = $(am_libapptext_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -95,23 +148,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libapptext_a_SOURCES) DIST_SOURCES = $(libapptext_a_SOURCES) am__can_run_installinfo = \ @@ -119,8 +172,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -531,7 +602,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/text/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/text/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -552,6 +622,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libapptext.a: $(libapptext_a_OBJECTS) $(libapptext_a_DEPENDENCIES) $(EXTRA_libapptext_a_DEPENDENCIES) $(AM_V_at)-rm -f libapptext.a $(AM_V_AR)$(libapptext_a_AR) libapptext.a $(libapptext_a_OBJECTS) $(libapptext_a_LIBADD) @@ -584,14 +655,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -606,26 +677,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -637,15 +697,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -654,6 +710,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -796,18 +867,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile text-enums.c: $(srcdir)/text-enums.h $(GIMP_MKENUMS) diff -Nru gimp-2.8.18/app/tools/gimppainttool.c gimp-2.8.20/app/tools/gimppainttool.c --- gimp-2.8.18/app/tools/gimppainttool.c 2015-08-20 22:57:26.000000000 +0000 +++ gimp-2.8.20/app/tools/gimppainttool.c 2017-01-28 19:08:45.000000000 +0000 @@ -453,40 +453,41 @@ GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (tool); GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool); - if (key != gimp_get_constrain_behavior_mask ()) - return; - if (paint_tool->pick_colors && ! paint_tool->draw_line) { - if (press) + if ((state & gimp_get_all_modifiers_mask ()) == + gimp_get_constrain_behavior_mask ()) { - GimpToolInfo *info = gimp_get_tool_info (display->gimp, - "gimp-color-picker-tool"); - - if (GIMP_IS_TOOL_INFO (info)) + if (! gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool))) { - if (gimp_draw_tool_is_active (draw_tool)) - gimp_draw_tool_stop (draw_tool); + GimpToolInfo *info = gimp_get_tool_info (display->gimp, + "gimp-color-picker-tool"); - gimp_color_tool_enable (GIMP_COLOR_TOOL (tool), - GIMP_COLOR_OPTIONS (info->tool_options)); - - switch (GIMP_COLOR_TOOL (tool)->pick_mode) + if (GIMP_IS_TOOL_INFO (info)) { - case GIMP_COLOR_PICK_MODE_FOREGROUND: - gimp_tool_push_status (tool, display, - _("Click in any image to pick the " - "foreground color")); - break; - - case GIMP_COLOR_PICK_MODE_BACKGROUND: - gimp_tool_push_status (tool, display, - _("Click in any image to pick the " - "background color")); - break; + if (gimp_draw_tool_is_active (draw_tool)) + gimp_draw_tool_stop (draw_tool); + + gimp_color_tool_enable (GIMP_COLOR_TOOL (tool), + GIMP_COLOR_OPTIONS (info->tool_options)); - default: - break; + switch (GIMP_COLOR_TOOL (tool)->pick_mode) + { + case GIMP_COLOR_PICK_MODE_FOREGROUND: + gimp_tool_push_status (tool, display, + _("Click in any image to pick the " + "foreground color")); + break; + + case GIMP_COLOR_PICK_MODE_BACKGROUND: + gimp_tool_push_status (tool, display, + _("Click in any image to pick the " + "background color")); + break; + + default: + break; + } } } } diff -Nru gimp-2.8.18/app/tools/Makefile.in gimp-2.8.20/app/tools/Makefile.in --- gimp-2.8.18/app/tools/Makefile.in 2016-07-12 23:19:48.000000000 +0000 +++ gimp-2.8.20/app/tools/Makefile.in 2017-01-31 23:40:18.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,16 +89,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/tools -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -70,10 +113,8 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libapptools_a_AR = $(AR) $(ARFLAGS) libapptools_a_LIBADD = am__objects_1 = tools-enums.$(OBJEXT) @@ -128,6 +169,18 @@ gimpvectortool.$(OBJEXT) am_libapptools_a_OBJECTS = $(am__objects_1) $(am__objects_2) libapptools_a_OBJECTS = $(am_libapptools_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -137,23 +190,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libapptools_a_SOURCES) DIST_SOURCES = $(libapptools_a_SOURCES) am__can_run_installinfo = \ @@ -161,8 +214,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -723,7 +794,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tools/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/tools/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -744,6 +814,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libapptools.a: $(libapptools_a_OBJECTS) $(libapptools_a_DEPENDENCIES) $(EXTRA_libapptools_a_DEPENDENCIES) $(AM_V_at)-rm -f libapptools.a $(AM_V_AR)$(libapptools_a_AR) libapptools.a $(libapptools_a_OBJECTS) $(libapptools_a_LIBADD) @@ -851,14 +922,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -873,26 +944,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -904,15 +964,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -921,6 +977,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1063,18 +1134,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile tools-enums.c: $(srcdir)/tools-enums.h $(GIMP_MKENUMS) diff -Nru gimp-2.8.18/app/unique.c gimp-2.8.20/app/unique.c --- gimp-2.8.18/app/unique.c 2015-08-20 22:57:26.000000000 +0000 +++ gimp-2.8.20/app/unique.c 2017-01-28 19:08:45.000000000 +0000 @@ -86,6 +86,7 @@ gboolean as_new) { #ifndef GIMP_CONSOLE_COMPILATION +#if HAVE_DBUS_GLIB /* for the DBus service names */ #include "gui/gimpdbusservice.h" @@ -171,7 +172,8 @@ g_printerr ("%s\n", error->message); g_clear_error (&error); } -#endif +#endif /* GIMP_CONSOLE_COMPILATION */ +#endif /* HAVE_DBUS_GLIB */ return FALSE; } diff -Nru gimp-2.8.18/app/vectors/Makefile.in gimp-2.8.20/app/vectors/Makefile.in --- gimp-2.8.18/app/vectors/Makefile.in 2016-07-12 23:19:49.000000000 +0000 +++ gimp-2.8.20/app/vectors/Makefile.in 2017-01-31 23:40:19.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,16 +89,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/vectors -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -70,10 +113,8 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libappvectors_a_AR = $(AR) $(ARFLAGS) libappvectors_a_LIBADD = am_libappvectors_a_OBJECTS = gimpanchor.$(OBJEXT) \ @@ -84,6 +125,18 @@ gimpvectors-warp.$(OBJEXT) gimpvectorsmodundo.$(OBJEXT) \ gimpvectorspropundo.$(OBJEXT) gimpvectorsundo.$(OBJEXT) libappvectors_a_OBJECTS = $(am_libappvectors_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -93,23 +146,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libappvectors_a_SOURCES) DIST_SOURCES = $(libappvectors_a_SOURCES) am__can_run_installinfo = \ @@ -117,8 +170,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -518,7 +589,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/vectors/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/vectors/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -539,6 +609,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libappvectors.a: $(libappvectors_a_OBJECTS) $(libappvectors_a_DEPENDENCIES) $(EXTRA_libappvectors_a_DEPENDENCIES) $(AM_V_at)-rm -f libappvectors.a $(AM_V_AR)$(libappvectors_a_AR) libappvectors.a $(libappvectors_a_OBJECTS) $(libappvectors_a_LIBADD) @@ -569,14 +640,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -591,26 +662,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -622,15 +682,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -639,6 +695,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -780,18 +851,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/app/widgets/gimpcontainertreeview.c gimp-2.8.20/app/widgets/gimpcontainertreeview.c --- gimp-2.8.18/app/widgets/gimpcontainertreeview.c 2015-08-20 22:57:26.000000000 +0000 +++ gimp-2.8.20/app/widgets/gimpcontainertreeview.c 2017-01-28 19:08:45.000000000 +0000 @@ -1005,6 +1005,17 @@ multisel_mode = (gtk_tree_selection_get_mode (tree_view->priv->selection) == GTK_SELECTION_MULTIPLE); + if (! (bevent->state & (gimp_get_extend_selection_mask () | + gimp_get_modify_selection_mask ()))) + { + /* don't chain up for multi-selection handling if none of + * the participating modifiers is pressed, we implement + * button_press completely ourselves for a reason and don't + * want the default implementation mess up our state + */ + multisel_mode = FALSE; + } + gtk_tree_model_get_iter (tree_view->model, &iter, path); gtk_tree_model_get (tree_view->model, &iter, diff -Nru gimp-2.8.18/app/widgets/gimphandlebar.c gimp-2.8.20/app/widgets/gimphandlebar.c --- gimp-2.8.18/app/widgets/gimphandlebar.c 2015-08-20 22:57:26.000000000 +0000 +++ gimp-2.8.20/app/widgets/gimphandlebar.c 2017-01-28 19:08:45.000000000 +0000 @@ -199,7 +199,13 @@ cairo_fill_preserve (cr); - cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); + /* Make all sliders well visible even on similar colored + * backgrounds. + */ + if (i == 0) + cairo_set_source_rgb (cr, 0.6, 0.6, 0.6); + else + cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); cairo_stroke (cr); } diff -Nru gimp-2.8.18/app/widgets/gimphelp.c gimp-2.8.20/app/widgets/gimphelp.c --- gimp-2.8.18/app/widgets/gimphelp.c 2015-08-20 22:57:26.000000000 +0000 +++ gimp-2.8.20/app/widgets/gimphelp.c 2017-01-28 19:08:45.000000000 +0000 @@ -141,6 +141,17 @@ } gboolean +gimp_help_browser_is_installed (Gimp *gimp) +{ + g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE); + + if (gimp_pdb_lookup_procedure (gimp->pdb, "extension-gimp-help-browser")) + return TRUE; + + return FALSE; +} + +gboolean gimp_help_user_manual_is_installed (Gimp *gimp) { gchar *basedir; @@ -340,7 +351,8 @@ _("Help browser doesn't start"), _("Could not start the GIMP help browser " "plug-in."), - NULL); + _("You may instead use the web browser " + "for reading the help pages.")); busy = FALSE; return FALSE; diff -Nru gimp-2.8.18/app/widgets/gimphelp.h gimp-2.8.20/app/widgets/gimphelp.h --- gimp-2.8.18/app/widgets/gimphelp.h 2015-08-15 07:52:38.000000000 +0000 +++ gimp-2.8.20/app/widgets/gimphelp.h 2017-01-28 18:57:59.000000000 +0000 @@ -32,6 +32,10 @@ const gchar *help_id); +/* checks if the help browser is available + */ +gboolean gimp_help_browser_is_installed (Gimp *gimp); + /* checks if the user manual is installed locally */ gboolean gimp_help_user_manual_is_installed (Gimp *gimp); diff -Nru gimp-2.8.18/app/widgets/Makefile.in gimp-2.8.20/app/widgets/Makefile.in --- gimp-2.8.18/app/widgets/Makefile.in 2016-07-12 23:19:49.000000000 +0000 +++ gimp-2.8.20/app/widgets/Makefile.in 2017-01-31 23:40:19.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,16 +89,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/widgets -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -70,10 +113,8 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libappwidgets_a_AR = $(AR) $(ARFLAGS) libappwidgets_a_LIBADD = am__objects_1 = widgets-enums.$(OBJEXT) @@ -186,6 +227,18 @@ gtkwrapbox.$(OBJEXT) gtkhwrapbox.$(OBJEXT) am_libappwidgets_a_OBJECTS = $(am__objects_1) $(am__objects_2) libappwidgets_a_OBJECTS = $(am_libappwidgets_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -195,23 +248,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libappwidgets_a_SOURCES) DIST_SOURCES = $(libappwidgets_a_SOURCES) am__can_run_installinfo = \ @@ -219,8 +272,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -997,7 +1068,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/widgets/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/widgets/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1018,6 +1088,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libappwidgets.a: $(libappwidgets_a_OBJECTS) $(libappwidgets_a_DEPENDENCIES) $(EXTRA_libappwidgets_a_DEPENDENCIES) $(AM_V_at)-rm -f libappwidgets.a $(AM_V_AR)$(libappwidgets_a_AR) libappwidgets.a $(libappwidgets_a_OBJECTS) $(libappwidgets_a_LIBADD) @@ -1229,14 +1300,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1251,26 +1322,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1282,15 +1342,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1299,6 +1355,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1441,18 +1512,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile widgets-enums.c: $(srcdir)/widgets-enums.h $(GIMP_MKENUMS) diff -Nru gimp-2.8.18/app/xcf/Makefile.in gimp-2.8.20/app/xcf/Makefile.in --- gimp-2.8.18/app/xcf/Makefile.in 2016-07-12 23:19:49.000000000 +0000 +++ gimp-2.8.20/app/xcf/Makefile.in 2017-01-31 23:40:20.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,16 +89,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = app/xcf -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -70,16 +113,26 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libappxcf_a_AR = $(AR) $(ARFLAGS) libappxcf_a_LIBADD = am_libappxcf_a_OBJECTS = xcf.$(OBJEXT) xcf-load.$(OBJEXT) \ xcf-read.$(OBJEXT) xcf-save.$(OBJEXT) xcf-seek.$(OBJEXT) \ xcf-write.$(OBJEXT) libappxcf_a_OBJECTS = $(am_libappxcf_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -89,23 +142,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libappxcf_a_SOURCES) DIST_SOURCES = $(libappxcf_a_SOURCES) am__can_run_installinfo = \ @@ -113,8 +166,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -499,7 +570,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/xcf/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu app/xcf/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -520,6 +590,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libappxcf.a: $(libappxcf_a_OBJECTS) $(libappxcf_a_DEPENDENCIES) $(EXTRA_libappxcf_a_DEPENDENCIES) $(AM_V_at)-rm -f libappxcf.a $(AM_V_AR)$(libappxcf_a_AR) libappxcf.a $(libappxcf_a_OBJECTS) $(libappxcf_a_LIBADD) @@ -543,14 +614,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -565,26 +636,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -596,15 +656,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -613,6 +669,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -754,18 +825,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/AUTHORS gimp-2.8.20/AUTHORS --- gimp-2.8.18/AUTHORS 2015-08-21 00:00:13.000000000 +0000 +++ gimp-2.8.20/AUTHORS 2017-02-01 01:09:46.000000000 +0000 @@ -36,6 +36,7 @@ Roberto Boyd Stanislav Brabec Hans Breuer + Ingo Brückl Simon Budig João S. O. Bueno Seth Burgess @@ -164,6 +165,7 @@ Mikael Magnusson Luidnel Maignan Ian Main + Thomas Manni Kjartan Maraas John Marshall Kelly Martin @@ -220,6 +222,7 @@ Tom Rathborne Martin Renold Jens Restemeier + Kristian Rietveld Maurits Rijk Daniel Risacher Clarence Risher diff -Nru gimp-2.8.18/authors.xml gimp-2.8.20/authors.xml --- gimp-2.8.18/authors.xml 2015-08-20 22:57:26.000000000 +0000 +++ gimp-2.8.20/authors.xml 2017-01-31 23:24:43.000000000 +0000 @@ -38,6 +38,7 @@ Roberto Boyd Stanislav Brabec Hans Breuer + Ingo Brückl Simon Budig João S. O. Bueno Carey Bunks @@ -181,6 +182,7 @@ Mikael Magnusson Luidnel Maignan Ian Main + Thomas Manni Kjartan Maraas John Marshall Kelly Martin @@ -241,6 +243,7 @@ Tom Rathborne Martin Renold Jens Restemeier + Kristian Rietveld Maurits Rijk Daniel Risacher Clarence Risher diff -Nru gimp-2.8.18/build/Makefile.in gimp-2.8.20/build/Makefile.in --- gimp-2.8.18/build/Makefile.in 2016-07-12 23:19:50.000000000 +0000 +++ gimp-2.8.20/build/Makefile.in 2017-01-31 23:40:20.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,35 +88,48 @@ build_triplet = @build@ host_triplet = @host@ subdir = build -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -87,12 +137,33 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -475,7 +546,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu build/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu build/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -501,22 +571,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -531,57 +604,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -597,12 +625,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -614,15 +637,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -631,6 +650,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -791,22 +825,22 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/build/windows/gimp-plug-ins.rc gimp-2.8.20/build/windows/gimp-plug-ins.rc --- gimp-2.8.18/build/windows/gimp-plug-ins.rc 2016-07-12 23:21:44.000000000 +0000 +++ gimp-2.8.20/build/windows/gimp-plug-ins.rc 2017-01-31 23:41:56.000000000 +0000 @@ -6,12 +6,12 @@ #define VER_COMPANYNAME_STR "Spencer Kimball, Peter Mattis and the GIMP Development Team" -#define VER_PRODUCTVERSION 2,8,18,0 -#define VER_PRODUCTVERSION_STR "2.8.18\0" +#define VER_PRODUCTVERSION 2,8,20,0 +#define VER_PRODUCTVERSION_STR "2.8.20\0" #define VER_PRODUCTNAME_STR "GNU Image Manipulation Program" -#define VER_FILEVERSION 2,8,18,0 -#define VER_FILEVERSION_STR "2.8.18.0\0" +#define VER_FILEVERSION 2,8,20,0 +#define VER_FILEVERSION_STR "2.8.20.0\0" #define VER_FILEDESCRIPTION_STR "GNU Image Manipulation Program Plug-In" #define VER_INTERNALNAME_STR QUOTE(INTERNALNAME_STR) diff -Nru gimp-2.8.18/build/windows/gimp.rc gimp-2.8.20/build/windows/gimp.rc --- gimp-2.8.18/build/windows/gimp.rc 2016-07-12 23:21:44.000000000 +0000 +++ gimp-2.8.20/build/windows/gimp.rc 2017-01-31 23:41:56.000000000 +0000 @@ -7,12 +7,12 @@ #define VER_COMPANYNAME_STR "Spencer Kimball, Peter Mattis and the GIMP Development Team" -#define VER_PRODUCTVERSION 2,8,18,0 -#define VER_PRODUCTVERSION_STR "2.8.18\0" +#define VER_PRODUCTVERSION 2,8,20,0 +#define VER_PRODUCTVERSION_STR "2.8.20\0" #define VER_PRODUCTNAME_STR "GNU Image Manipulation Program" -#define VER_FILEVERSION 2,8,18,0 -#define VER_FILEVERSION_STR "2.8.18.0\0" +#define VER_FILEVERSION 2,8,20,0 +#define VER_FILEVERSION_STR "2.8.20.0\0" #define VER_FILEDESCRIPTION_STR "GNU Image Manipulation Program" #define VER_INTERNALNAME_STR QUOTE(INTERNALNAME_STR) diff -Nru gimp-2.8.18/build/windows/Makefile.in gimp-2.8.20/build/windows/Makefile.in --- gimp-2.8.18/build/windows/Makefile.in 2016-07-12 23:19:50.000000000 +0000 +++ gimp-2.8.20/build/windows/Makefile.in 2017-01-31 23:40:20.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,27 +88,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = build/windows -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/gimp-plug-ins.rc.in $(srcdir)/gimp.rc.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = gimp.rc gimp-plug-ins.rc CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -79,6 +127,9 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gimp-plug-ins.rc.in \ + $(srcdir)/gimp.rc.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -443,7 +494,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu build/windows/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu build/windows/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -471,11 +521,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -611,15 +661,18 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/ChangeLog gimp-2.8.20/ChangeLog --- gimp-2.8.18/ChangeLog 2016-07-13 01:00:09.000000000 +0000 +++ gimp-2.8.20/ChangeLog 2017-02-01 06:03:12.000000000 +0000 @@ -1,3 +1,1107 @@ +commit 91b41bba51af9635b97847ee307e86c220ee0657 +Author: Michael Schumacher +Date: Wed Feb 1 00:35:02 2017 +0100 + + configure.ac: release-bump version to 2.8.20 + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit becade190ff89504fb82019d82013d070b66e59b +Author: Michael Schumacher +Date: Tue Jan 31 23:57:02 2017 +0100 + + Update authors.xml and AUTHORS + + AUTHORS | 3 +++ + authors.xml | 3 +++ + 2 files changed, 6 insertions(+) + +commit 531ceb7711dfa1ddd552e67abe8046d9fc0aa9b3 +Author: Michael Schumacher +Date: Tue Jan 31 23:18:49 2017 +0100 + + Keep General section + + NEWS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 08542938d47111fdeeb35b516992965770b69c03 +Author: Michael Schumacher +Date: Tue Jan 31 23:12:29 2017 +0100 + + More NEWS updates for 2.8.20 + + NEWS | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +commit 8f2c71eafc1e38861b073179d7abc9b4ee3183ab +Author: Jordi Mas +Date: Mon Jan 30 21:27:12 2017 +0100 + + Update Catalan translation + + po/ca.po | 773 + +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 386 insertions(+), 387 deletions(-) + +commit 5c8edcbf7fd456162bcc7d7f230150f2a82d47a3 +Author: Christian Kirbach +Date: Mon Jan 23 19:59:17 2017 +0000 + + Update German translation + + po/de.po | 33 ++++++++++++++------------------- + 1 file changed, 14 insertions(+), 19 deletions(-) + +commit 0c3a6185eaf945cc6b9f6f245b36f9bca0fb4b52 +Author: Dušan Kazik +Date: Wed Jan 18 18:29:05 2017 +0000 + + Update Slovak translation + + po/sk.po | 2415 + ++++++++++++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 1639 insertions(+), 776 deletions(-) + +commit 2503054c10a2b96128ba0ef0c1a17390fc937b4a +Author: Michael Natterer +Date: Sun Jan 15 18:04:54 2017 +0100 + + Bug 777233 - Printing an SVG file results in a black sheet of paper + + Create a white rectangle behind everything, which should take care of + whatever print backend brokenness. + + (cherry picked from commit 80003dff38d55e35d8a7c6074df23e0c5209c8b7) + + plug-ins/print/print-draw-page.c | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +commit 0338876edb556c4528f56d61e61b4c486214d5ac +Author: Piotr Drąg +Date: Tue Jan 10 16:35:31 2017 +0100 + + Update Polish translation + + po/pl.po | 42 +++++++++++++++++++++--------------------- + 1 file changed, 21 insertions(+), 21 deletions(-) + +commit eb03ed00fdc21fd9800f02515bbc8eadc68c32f6 +Author: Michael Natterer +Date: Tue Jan 3 15:46:42 2017 +0100 + + Bug 689535 - Color display filters - Color deficient vision aren't + correct + + Fix gamma_lut to apply gamma in the right direction. + Found by Konstantin Kharlov. + + modules/display-filter-color-blind.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dd331a67d8552af4b52db1631c04be75075d670a +Author: Michael Natterer +Date: Tue Jan 3 15:10:35 2017 +0100 + + Bug 776516 - Saving over existing GZ or BZ2 compressed files... + + ...does not truncate them + + Pass O_TRUNC to g_open() when creating the target files. + + (cherry picked from commit 559a75858105bdcc04f24899bba1ade79523f8ea) + + plug-ins/file-compressor/file-compressor.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 67ac4fa028e07da940e85fa47e41eec96c21f687 +Author: Kristian Rietveld +Date: Wed Dec 28 16:12:33 2016 +0100 + + Bug 776294 - Screenshot buttons cannot be clicked + + Disable the new "automatic window tabbing" feature introduced on macOS + Sierra. It breaks GTK+ applications and we would need proper + support for + this in GTK+ if we want to use it. + + (cherry picked from commit 7c35d75bf9e540408eb3a6b835f31d82a49d07b1) + + app/gui/gui.c | 23 +++++++++++++++++++++++ + 1 file changed, 23 insertions(+) + +commit 55925d883cd247b0c187903a8db75971b63a36b2 +Author: Kristian Rietveld +Date: Wed Dec 28 15:32:58 2016 +0100 + + build/osx: add patch for Bug 767091 to the build + + Until it has been approved and merged into GTK+. + + build/osx/README | 1 + + .../patches/gtk2-quartz-fix-dnd-timing-issue.patch | 107 + +++++++++++++++++++++ + 2 files changed, 108 insertions(+) + +commit 04c372bd2a267091976d607a08fb4e13d1817a8d +Author: Kristian Rietveld +Date: Wed Dec 28 15:31:53 2016 +0100 + + build/osx/README: update list of patches + + (Yes, I really need to write this script to automate the DMG builds + now). + + build/osx/README | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 77d6969a9f12c50ea33dbeec8a15e4e754a5f611 +Author: Jehan +Date: Wed Dec 7 01:37:56 2016 +0100 + + Bug 775646 - Levels Tool: handles difficult to read with dark theme. + + The white, gray and dark sliders of GimpHandleBar have a black + contour. + This makes the white and gray slider visible even with similar colored + background. On the other hand, the black slider is barely visible on a + dark background (and could even be made totally invisible using + the same + color). So let's use a light-gray contour on the dark slider, + making now + all sliders working with any background color. + + (cherry picked from commit afccaa91050910102b4da88e4cdd135d3d127241) + + app/widgets/gimphandlebar.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit f2e483df028ca05bcfbf3dcdd92e89ed1d67dd7a +Author: Kristian Rietveld +Date: Sat Nov 19 21:25:54 2016 +0100 + + Bug 770708 - First language preference is ignored when multiple ... + + ... languages are set under Location and Region + + We tracked this down to be a gettext bug, so include the gettext + patch into + our DMG build. The gettext patch has also been submitted upstream. + + build/osx/README | 1 + + build/osx/gimp.modules | 6 ++++++ + ...ext-fix-English-fallback-for-macOS-Sierra.patch | 23 + ++++++++++++++++++++++ + 3 files changed, 30 insertions(+) + +commit e2284c6aa56c454b3cc8dc852d001a2eddbd3b53 +Author: Michael Natterer +Date: Wed Nov 16 13:16:24 2016 +0100 + + app: make switching paint tools to color picker mode more robust + + Don't rely on the exact modifier being pressed or released. Instead, + check if only the right modifier is pressed after *each* modifier + change, and switch to color picking if it is; disable color picking + otherwise. This greatly reduces the risk of missing the user's wish to + pick colors because of other modifiers being pressed and released in + whatever order. + + Probably fixes bug #734743. + + (cherry picked from commit 014fdb87e57dcd2bbba6b2aa18371475aef98b4e) + + app/tools/gimppainttool.c | 57 + ++++++++++++++++++++++++----------------------- + 1 file changed, 29 insertions(+), 28 deletions(-) + +commit e854baf8532305710debfb4afa807e1e87b3bbcb +Author: Michael Natterer +Date: Wed Nov 16 13:02:09 2016 +0100 + + app: be more deterministic in a list view's name column (name + editing etc.) + + We handle multi-selection by letting GtkTreeView handle button press + when the widget is in GTK_SELECTION_MULTIPLE mode. Change that code to + only do that when one of the participating modifiers (shift and + control on Linux and Windows, shift and cmd on macOS) is pressed. + + This makes sure that the same thing is not randomly handled by two + different pieces of code, and probably fixes bug #738440, tho I can't + be sure. + + (cherry picked from commit 61f91c7cd2e18809bc1e38a407af482230226c75) + + app/widgets/gimpcontainertreeview.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit 0947a37ad5f1a1135e07edea083969589c5f3a83 +Author: Michael Natterer +Date: Tue Nov 15 13:23:00 2016 +0100 + + Bug 774383 - Text layer created by gimp-text-fontname doesn't... + + ...respect border when resized + + gimp_text_layout_new(): in FIXED box mode, subtract (2 * border) when + setting the layout width. + + (cherry picked from commit 1415a78fa1035eb8c3397bfd27c959c0e5d5f921) + + app/text/gimptextlayout.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 49a6bda46327250a18d987c0769d460e7faffc95 +Author: Marco Ciampa +Date: Wed Nov 9 19:11:38 2016 +0100 + + Updated Italian translation + + po-plug-ins/it.po | 145 + +++++++++++++++++++++++++++--------------------------- + 1 file changed, 73 insertions(+), 72 deletions(-) + +commit f102b0a8996a24bdfb6e7fbb697d7fe99d9c00ee +Author: Michael Schumacher +Date: Thu Oct 27 00:54:28 2016 +0200 + + More NEWS for 2.8.20, including updated translations + + NEWS | 35 +++++++++++++++++++++++++++++------ + 1 file changed, 29 insertions(+), 6 deletions(-) + +commit 6cd4e0f687b5db7dc91b0338f13fedc80b74fde6 +Author: Michael Schumacher +Date: Thu Oct 27 00:53:17 2016 +0200 + + Make required post-relase version bump more obvious + + ... plus small styling fixes. + + devel-docs/release-howto.txt | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) + +commit fe34a714ee21c1789931f8ab50a4e0a52d21cad2 +Author: Michael Schumacher +Date: Sat Oct 22 12:32:34 2016 +0200 + + More NEWS for 2.8.20 release + + NEWS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 81fe29ebcef6d113ed84aaa8062b6e2b4a2b214b +Author: Ingo Brückl +Date: Fri Oct 21 00:24:13 2016 +0200 + + Bug 773268 - Avoid D-Bus error message when built without D-Bus + support + + app/unique.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit b337075cd9bca9217cd8effd8bf7e066fc0195ce +Author: Michael Schumacher +Date: Wed Oct 19 00:41:45 2016 +0200 + + Start to add NEWS items for 2.8.20 + + NEWS | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 48 insertions(+) + +commit 27604f579cec54ef80bcb9a08aff2c699e850e9c +Author: Thomas Manni +Date: Tue Oct 11 16:26:59 2016 +0200 + + Bug 557380 - Filter 'Edge Detect/Difference of Gaussians' returns + empty image + + Copy the original alpha channel (if exists) to the shadow buffer + during + pixels difference computation. + + plug-ins/common/edge-dog.c | 85 + ++++++++++++++++++++++++++++------------------ + 1 file changed, 52 insertions(+), 33 deletions(-) + +commit c332877c2ae73a50ed2fae19314310f50bcd57ee +Author: Daniel Mustieles +Date: Mon Oct 10 08:32:34 2016 +0000 + + Update Spanish translation + + po/es.po | 484 + ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 246 insertions(+), 238 deletions(-) + +commit 138bdbe866a706f721db51b3ec83162b719f0731 +Author: GNOME Translation Robot +Date: Sun Oct 9 10:52:50 2016 +0000 + + Update Scottish Gaelic translation + + po-script-fu/gd.po | 2814 + ++-------------------------------------------------- + 1 file changed, 70 insertions(+), 2744 deletions(-) + +commit f148134362327208693531b8182a0aefb0f6c5f0 +Author: Jiri Grönroos +Date: Sun Oct 9 09:12:56 2016 +0000 + + Update Finnish translation + + po-python/fi.po | 37 ++++++++++++++++++------------------- + 1 file changed, 18 insertions(+), 19 deletions(-) + +commit f17340493ec47a66e11008f8835eedda306afeeb +Author: Jiri Grönroos +Date: Sun Oct 9 09:04:53 2016 +0000 + + Add Finnish translation + + po-tags/LINGUAS | 1 + + po-tags/fi.po | 29 +++++++++++++++++++++++++++++ + 2 files changed, 30 insertions(+) + +commit f75e087bba10c7b943dbb736db1bbb8ae9aee686 +Author: Jiri Grönroos +Date: Sun Oct 9 08:44:34 2016 +0000 + + Update Finnish translation + + po-plug-ins/fi.po | 728 + ++++++++++++++++++++++++++---------------------------- + 1 file changed, 350 insertions(+), 378 deletions(-) + +commit 1bd4cf4b8af88c12ac58c80cb65f9eab8e766897 +Author: Jiri Grönroos +Date: Sun Oct 9 07:41:56 2016 +0000 + + Update Finnish translation + + po/fi.po | 740 + +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 388 insertions(+), 352 deletions(-) + +commit 2c84150c34fd919ab771918c193b271cf2849d18 +Author: Ask Hjorth Larsen +Date: Sat Oct 8 21:01:49 2016 +0000 + + Update Danish translation + + po-tips/da.po | 450 + ++++++++++++++++++++++++---------------------------------- + 1 file changed, 187 insertions(+), 263 deletions(-) + +commit e022fdc386144a34720888ce7c4d36ea6aaf1753 +Author: Ask Hjorth Larsen +Date: Sat Oct 8 20:51:54 2016 +0000 + + Update Danish translation + + po-tags/da.po | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +commit d84de86902ab487dc00d89f6e452aea8ebe3b8e4 +Author: Ask Hjorth Larsen +Date: Sat Oct 8 20:46:06 2016 +0000 + + Update Danish translation + + po-script-fu/da.po | 4104 + ++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 2519 insertions(+), 1585 deletions(-) + +commit 9aab542c93ce48e7849cf8a1db816e863f22070d +Author: Jernej Simončič +Date: Sat Oct 8 22:32:16 2016 +0200 + + Installer: use smaller LZMA dictionary size (#767352) + + build/windows/installer/gimp3264.iss | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8ee9765020be48fafd4f60cfb13c45705da1230c +Author: Jernej Simončič +Date: Sat Oct 8 22:31:31 2016 +0200 + + Installer: give more info when extracting temporary file fails + + build/windows/installer/gimp3264.iss | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7050ac7e9e00b977dc838fd1bda3aa0b1bf5dc1c +Author: Ask Hjorth Larsen +Date: Sat Oct 8 21:16:18 2016 +0200 + + Updated Danish translation by scootergrisen + + po-plug-ins/da.po | 1765 + +++++++++++++++++++++-------------------------------- + 1 file changed, 704 insertions(+), 1061 deletions(-) + +commit 0167c61dd06d7dadf3a32fc51c2a52907edd82fd +Author: Michael Schumacher +Date: Sat Oct 8 18:31:49 2016 +0200 + + Make string freezes and translation announcement part of the release + process + + devel-docs/release-howto.txt | 19 ++++++++++++++++++- + 1 file changed, 18 insertions(+), 1 deletion(-) + +commit 85ae7d6deea409cf4312243636ae20bb0def8654 +Author: Ask Hjorth Larsen +Date: Mon Oct 3 06:49:49 2016 +0000 + + Updated Danish translation + + po-libgimp/da.po | 42 +++++++++++++----------------------------- + 1 file changed, 13 insertions(+), 29 deletions(-) + +commit bf54b1fc71b1f7d332574b9d43f8282b9ae0fede +Author: Ask Hjorth Larsen +Date: Mon Oct 3 06:45:51 2016 +0000 + + Updated Danish translation + + po/da.po | 392 + ++++++++++++++++++++++++--------------------------------------- + 1 file changed, 150 insertions(+), 242 deletions(-) + +commit e55f021bd4e1b8776998eaf0fc6b9b9ec8e9b62c +Author: Marco Ciampa +Date: Fri Sep 30 07:58:14 2016 +0200 + + Updated Italian translation + + po/it.po | 586 + +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 293 insertions(+), 293 deletions(-) + +commit 1d572540849a833ac5cfeafa61c8b32467f04296 +Author: Claude Paroz +Date: Sat Sep 24 15:45:59 2016 +0200 + + Updated French translation + + po/fr.po | 2603 + +++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 1395 insertions(+), 1208 deletions(-) + +commit 80c449fd32de0e56fa77d7c35427571c6f69b0ac +Author: Claude Paroz +Date: Sat Sep 24 15:15:54 2016 +0200 + + Updated po-plug-ins French translation + + Based on Julien Hardelin's work on master. + + po-plug-ins/fr.po | 2349 + ++++++++++++++++++++++++++++++----------------------- + 1 file changed, 1325 insertions(+), 1024 deletions(-) + +commit ce508a56bd498734cd26ebcb71d054e3966cde59 +Author: Benedikt M. Thoma +Date: Fri Sep 23 09:07:41 2016 +0000 + + Updated German translation + + po/de.po | 519 + +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 271 insertions(+), 248 deletions(-) + +commit c2d63da7d9f6a7fd5bf8d49444d41596402f2475 +Author: Michael Natterer +Date: Thu Sep 22 23:03:53 2016 +0200 + + Bug 771851 - Vertical ruler shows artifacts if the status bar + isn't showing + + gimp_ruler_draw_pos(): when remembering the just drawn rectangle's + position, don't just unconditionally overwrite the previous position's + rectangle. Instead, if the previous position's rectangle has not been + cleared yet (has a non-zero size), remember the union of old and new + rectangle. + + Why this only happened to the vertical ruler with statusbar off is + beyond my mind, it should have always produced artifacts. + + Unrelated: make sure the idle function is removed if we decide to + immediately redraw in gimp_ruler_set_position(). + + (cherry picked from commit e909b77969ea29c882ee38b622c4507e7302c705) + + libgimpwidgets/gimpruler.c | 25 +++++++++++++++++++++---- + 1 file changed, 21 insertions(+), 4 deletions(-) + +commit 3a44989a4528a16474d41575aa61303f3fe4cc91 +Author: Massimo Valentini +Date: Thu Sep 22 18:18:40 2016 +0200 + + Bug 771444: Tablet stylus misbehaves when crossing... + + the edge of a dock in multi-window-mode + + when the pointer is grabbed do not process a + motion-notify-event having the wrong 'device' member. + + This avoids a harmful device change. + + (cherry picked from commit 5037ff35ca6bc21fa2b8dcddec7f5df50c2b2c29) + + app/display/gimpdisplayshell-tool-events.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 75e7cfbbfa3b67559eecb8044ad2ce1f29de0f0e +Author: Marek Černocký +Date: Wed Sep 21 10:18:27 2016 +0200 + + Updated Czech translation + + po-script-fu/cs.po | 153 + +++++++++++++++++++++++++++-------------------------- + 1 file changed, 78 insertions(+), 75 deletions(-) + +commit 74d4320ada6eae2edeecf4b61d71a34415faff7f +Author: Anders Jonsson +Date: Mon Sep 19 09:53:24 2016 +0000 + + Updated Swedish translation + + po/sv.po | 488 + +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 252 insertions(+), 236 deletions(-) + +commit 6d4f3a8e384ac789af9b6c67bcb4e75e5e03fcd2 +Author: Dimitris Spingos (Δημήτρης Σπίγγος) + +Date: Thu Sep 15 10:19:16 2016 +0300 + + Update Greek translation + + po/el.po | 503 + ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 256 insertions(+), 247 deletions(-) + +commit 0e5156b54553c56bd4757ffd4d4f4958d1306e98 +Author: Massimo Valentini +Date: Wed Sep 14 18:32:16 2016 +0200 + + Bug 771208: 'Y' axis name of Flow Graph Parameter... + + on Paint Dynamics curve is wrong + + (cherry picked from commit 0ecd936f576768070ead4e78011635031020af79) + + app/core/gimpdynamics.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d1ed050c62241d4768a099d437811802fb0406ed +Author: Balázs Meskó +Date: Sun Sep 11 19:19:03 2016 +0000 + + Updated Hungarian translation + + po/hu.po | 533 + ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 268 insertions(+), 265 deletions(-) + +commit dbbf2df8ee49efb11025cfe9db0c5bc8d49d6ba5 +Author: Kristian Rietveld +Date: Wed Sep 7 22:38:06 2016 +0200 + + plug-ins: common: commit updates from mkgen.pl + + file-compressor was moved to its own directory long ago. + + plug-ins/common/.gitignore | 2 -- + plug-ins/common/gimprc.common | 1 - + 2 files changed, 3 deletions(-) + +commit f2249f1201242e082fc4c030faf05b9f42ea4878 +Author: Kristian Rietveld +Date: Wed Sep 7 22:36:25 2016 +0200 + + plug-ins: mkgen.pl: fix calls to write_file() routine + + So files get written in the current directory instead of the root + directory. + + (cherry picked from commit f8ddfbe8cba4616d5e65244a4dd1bdb57a375240) + + plug-ins/common/mkgen.pl | 9 +++++++++ + plug-ins/common/plugin-defs.pl | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +commit f8ddfbe8cba4616d5e65244a4dd1bdb57a375240 +Author: Kristian Rietveld +Date: Wed Sep 7 22:31:23 2016 +0200 + + plug-ins: mkgen.pl: fix calls to write_file() routine + + So files get written in the current directory instead of the root + directory. + + plug-ins/common/mkgen.pl | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit fbea2b9a19917f5a228c7836b3471c469e0df671 +Author: Piotr Drąg +Date: Wed Sep 7 18:52:21 2016 +0200 + + Updated Polish translation + + po-libgimp/pl.po | 114 ++-- + po-plug-ins/pl.po | 697 ++++++++++++----------- + po-python/pl.po | 50 +- + po-script-fu/pl.po | 229 ++++---- + po-tags/pl.po | 18 +- + po-tips/pl.po | 138 +++-- + po/pl.po | 1580 + ++++++++++++++++++++++++++-------------------------- + 7 files changed, 1409 insertions(+), 1417 deletions(-) + +commit d31c5517f7989f6bfcabf8adb39f3bd7e5a35ceb +Author: Kristian Rietveld +Date: Wed Sep 7 10:32:15 2016 +0200 + + plug-ins: fix the build on OS X + + We need to have -xobjective-c specified only for compile commands + that will perform compilation. Otherwise, for compile commands + that only link the compiler interprets .o files as C source ... + + (cherry picked from commit 51d26b06db29116258d3e96858642067a7b0f062) + + plug-ins/common/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d7582537164fd87bfdc7ad96eaa3e5397a671c3e +Author: Kristian Rietveld +Date: Wed Sep 7 10:38:48 2016 +0200 + + plug-ins: clean up cherry-pick gone wrong + + Commit 03d99ae2e3cbc9d0c7fd805f469b73fba89c5465 left some conflict + markers in the patch. + + plug-ins/common/Makefile.am | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit b9ff05e7529f2cc2740e5a8952bad8c62a23c489 +Author: Tiago Santos +Date: Wed Sep 7 06:13:04 2016 +0000 + + Updated Portuguese translation + + po/pt.po | 597 + +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 291 insertions(+), 306 deletions(-) + +commit 03d99ae2e3cbc9d0c7fd805f469b73fba89c5465 +Author: Michael Natterer +Date: Tue Sep 6 20:51:47 2016 +0200 + + Bug 767830 - Help browser does not launch on OS X + + Try harder to show help when webkit is missing or the help browser + won't start: + + - offer to switch to the web browser when the help browser is + present, but won't start for some reason + - in prefs, don't bother showing the help browser GUI when webkit + is missing, otherwise show a warning label if the help browser + is not installed even though webkit is there. Switch to the web + browser in both cases (modified patch from lisanet) + - add OS X replacement for gtk_show_uri() in plug-in-web-browser + (modified patch from lisanet) + + (cherry picked and quite modified from commit + 308efbb51401ef2a1032619c335e56150587f227) + + This partly revert commit 863bd791ae94c4abbf29c50f1bec79d71e2d7fd1 + which should not have gone in as-is. + + app/dialogs/preferences-dialog.c | 147 + ++++++++++++++++++++++++--------------- + app/widgets/gimphelp.c | 14 +++- + app/widgets/gimphelp.h | 4 ++ + plug-ins/common/Makefile.am | 11 +++ + plug-ins/common/mkgen.pl | 16 ++++- + plug-ins/common/plugin-defs.pl | 2 +- + plug-ins/common/web-browser.c | 28 +++++++- + 7 files changed, 161 insertions(+), 61 deletions(-) + +commit fc5b7eaece87eb8d2fffcca913bf8ebc38dd8209 +Author: Martin Srebotnjak +Date: Sun Sep 4 18:51:15 2016 +0200 + + Updated Slovenian translation + + po-libgimp/sl.po | 14928 + ++++++++--------------------------------------------- + 1 file changed, 2121 insertions(+), 12807 deletions(-) + +commit 66f912dccb09275f827955f9b90cfa3bfd9df214 +Author: Martin Srebotnjak +Date: Sun Sep 4 18:33:47 2016 +0200 + + Updated Slovenian translation + + po-libgimp/sl.po | 14621 + ++++++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 12926 insertions(+), 1695 deletions(-) + +commit 3216a780a2c1c97c025227e8c9610560a1656e7e +Author: Martin Srebotnjak +Date: Sun Sep 4 18:33:01 2016 +0200 + + Updated Slovenian translation + + po-libgimp/sl.po | 1715 + +++++++++++++++++++----------------------------------- + 1 file changed, 585 insertions(+), 1130 deletions(-) + +commit 853c57a2cb582f00f7420a5a6c3303db7f665f6f +Author: Michael Natterer +Date: Fri Sep 2 20:44:43 2016 +0200 + + libgimpwidgets: call gimp_file_entry_set_filename() with filename + encoding + + GimpPathEditor wass passing an UTF-8 string. + + (cherry picked from commit 9317952375fc8aa7262dbd77f5fed751dafbadbd) + + libgimpwidgets/gimppatheditor.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9be5538504af2b63d0dcd3b24995a673f904b484 +Author: Martin Srebotnjak +Date: Sat Aug 27 22:44:30 2016 +0200 + + Updated Slovenian translation + + po-libgimp/sl.po | 14925 + ++++++++--------------------------------------------- + 1 file changed, 2120 insertions(+), 12805 deletions(-) + +commit 234d558c37cb2606a4a4ff140329be4cec2a6abe +Author: Martin Srebotnjak +Date: Fri Aug 26 22:34:16 2016 +0200 + + Updated Slovenian translation + + po-libgimp/sl.po | 14677 + ++++++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 12959 insertions(+), 1718 deletions(-) + +commit e26889aaeac61b5bb812a0f724469b2aa3555cb4 +Author: Martin Srebotnjak +Date: Fri Aug 26 22:32:45 2016 +0200 + + Updated Slovenian translation + + po/sl.po | 1248 + ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 691 insertions(+), 557 deletions(-) + +commit 5bb4595225604147aa0e272fc111d41ff2c9e40f +Author: Sveinn í Felli +Date: Mon Aug 22 21:45:33 2016 +0000 + + Updated Icelandic translation + + po/is.po | 81 + +++++++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 49 insertions(+), 32 deletions(-) + +commit d93e1828a62fa597bf987cdc40fe7873fc338884 +Author: Gábor Kelemen +Date: Thu Aug 4 10:46:27 2016 +0000 + + Updated Hungarian translation + + po-plug-ins/hu.po | 62 + ++++++++++++++++++++++++++++--------------------------- + 1 file changed, 32 insertions(+), 30 deletions(-) + +commit 22bfd832ca486cb59d28a3ea2a191b8ad180755e +Author: Michael Schumacher +Date: Mon Jul 25 00:59:04 2016 +0200 + + Bug 744878 - Python console should not close on Escape key + + The code is set up to work without returning early, use a pass + instead. + + plug-ins/pygimp/plug-ins/pyconsole.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b7b6217858e5230a51a69e14bccf4f9cd179e506 +Author: Akkana Peck +Date: Mon Jul 25 00:57:07 2016 +0200 + + Bug 744878 - Python console should not close on Escape key + + plug-ins/pygimp/plug-ins/pyconsole.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 5458e4ca6263218b7c172d4b0b12aeebcd94a803 +Author: Michael Schumacher +Date: Thu Jul 21 23:13:00 2016 +0200 + + release-howto.txt: Stylistic change + + devel-docs/release-howto.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0ec4bee359a07447d2bf06010cdba7f3050b98d8 +Author: Michael Schumacher +Date: Sat Jul 16 20:33:35 2016 +0200 + + release-howto.txt: Some more sorting, and parens vs. brackets fix + + devel-docs/release-howto.txt | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +commit 68a0897508470a174e3ef017148179d3297edc71 +Author: Michael Schumacher +Date: Fri Jul 15 00:28:30 2016 +0200 + + release-howto.txt: updated, expanded and slightly reordered + + devel-docs/release-howto.txt | 109 + +++++++++++++++++++++++++++---------------- + 1 file changed, 69 insertions(+), 40 deletions(-) + +commit 6c52b44afa3e58e991cccb27f4a61180180932be +Author: Dimitris Spingos (Δημήτρης Σπίγγος) + +Date: Tue Jul 19 08:31:27 2016 +0300 + + Update Greek translation + + po-plug-ins/el.po | 102 + ++++++++++++++++++++++++++---------------------------- + 1 file changed, 49 insertions(+), 53 deletions(-) + +commit 0ff79b0b517268b5280bb349276584c1c85c6138 +Author: Kristian Rietveld +Date: Mon Jul 18 22:31:20 2016 +0200 + + build/osx: add GTK+ patch to fix crash in imquartz + + build/osx/gimp.modules | 3 ++ + .../gtk2-quartz-fix-regression-in-imquartz.patch | 51 + ++++++++++++++++++++++ + ...duce-gdk_quartz_window_is_quartz-function.patch | 45 + +++++++++++++++++++ + 3 files changed, 99 insertions(+) + +commit f58f1bbf9e66ed9dcd50241d599f95c36a336a8b +Author: Daniel Mustieles +Date: Mon Jul 18 08:03:19 2016 +0000 + + Updated Spanish translation + + po/es.po | 32555 + +++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 16288 insertions(+), 16267 deletions(-) + +commit f23e281e7579be91ea4931b5f9d73f1fedaf18e4 +Author: Daniel Mustieles +Date: Mon Jul 18 08:03:07 2016 +0000 + + Updated Spanish translation + + po-plug-ins/es.po | 420 + ++++++++++++++++++++++++++++-------------------------- + 1 file changed, 218 insertions(+), 202 deletions(-) + +commit 7c2e116bc657a8a8c9a8c2158f688d37026cc02d +Author: Daniel Mustieles +Date: Mon Jul 18 07:59:18 2016 +0000 + + Updated Spanish translation + + po-script-fu/es.po | 4105 + ++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 2521 insertions(+), 1584 deletions(-) + +commit 76b1e8506762694f9d81c330500180ee539ce494 +Author: Piotr Drąg +Date: Mon Jul 18 01:11:44 2016 +0200 + + Updated Polish translation + + po-libgimp/pl.po | 26 +++---- + po/pl.po | 202 + +++++++++++++++++++++++++++---------------------------- + 2 files changed, 114 insertions(+), 114 deletions(-) + +commit 743ef916868887c363c8625c81e520553953154a +Author: Kristian Rietveld +Date: Sun Jul 17 16:17:33 2016 +0200 + + app: fix OS X min required conditional in gimpimagewindow.c + + The _10_7 define is naturally undefined when compiling with older SDKs + such as the 10.6 SDK we use for building the DMG. + + app/display/gimpimagewindow.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 025dd489ac520a9610f0fd939c14eea14715c816 +Author: Kristian Rietveld +Date: Sun Jul 17 14:56:23 2016 +0200 + + build/osx: fix the way mime data is copied into the bundle + + build/osx/gimp-2.8-python.bundle | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 035eec0d66b1d9a6484a1fc37e11a759cbabf6f1 +Author: Kristian Rietveld +Date: Sun Jul 17 14:38:27 2016 +0200 + + build/osx: Set Tango as icon theme and force to copy all icons + + The Tango theme has a complete set of icons for all MIME types. We + need + to force to copy all these icons to the bundle, such that all + icons for + the different MIME types are guaranteed to be present. + + build/osx/custom/gtkrc | 4 ++++ + build/osx/gimp-2.8-python.bundle | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 8b1f7204287e73798890b6b9970af178ad957cfe +Author: Kristian Rietveld +Date: Sun Jul 17 14:31:18 2016 +0200 + + build/osx: no longer copy Pango modules into the bundle + + In the newer Pango we use now, these modules have been removed. + + build/osx/gimp-2.8-python.bundle | 5 ----- + 1 file changed, 5 deletions(-) + +commit d5d119bc22cb7446b2d977dce3749970f1153430 +Author: Kristian Rietveld +Date: Sat Jul 16 21:52:15 2016 +0200 + + build/osx: update version and copyright year in info.plist + + build/osx/info-2.8-python.plist | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit b89fbdaa7f4e1f7cbaad27da2ce5e0268f840b90 +Author: Kristian Rietveld +Date: Sat Jul 16 21:30:31 2016 +0200 + + build/osx: add GTK+ patch that was committed after 2.24.30 release + + In the near future, we should probably ship the top of tree of the + gtk-2-24 branch in the DMG instead of the latest tarball release. + + build/osx/gimp.modules | 1 + + ...dle-didMove-and-didResize-in-the-same-way.patch | 82 + ++++++++++++++++++++++ + 2 files changed, 83 insertions(+) + +commit c0931fc1c15f02dfa676046735beca741593bab9 +Author: Kristian Rietveld +Date: Sat Jul 16 21:26:13 2016 +0200 + + build/osx: update many dependencies and remove obsolete patches + + build/osx/gimp.modules | 58 +- + ...ssing-information-to-po-translation-files.patch | 2423 + -------------------- + ...-wrong-variable-substitution-in-configure.patch | 46 - + 3 files changed, 27 insertions(+), 2500 deletions(-) + +commit 5348c55d5ed20e5d49a4a8bca8354c74f3e6a6ce +Author: Kristian Rietveld +Date: Sat Jul 16 21:15:41 2016 +0200 + + build/osx: remove executable bit on gimp.modules file + + build/osx/gimp.modules | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 3d706c4a768c26ce6231c5e50867bd0e9c8d637f +Author: Kristian Rietveld +Date: Sat Jul 16 14:31:06 2016 +0200 + + build/osx/README: fix typo + + build/osx/README | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3f92952329f150ee518643543e7db43126f519e8 +Author: Piotr Drąg +Date: Sun Jul 17 15:17:42 2016 +0200 + + Add Language headers to po files + + Future versions of gettext will fail if this header is missing. + + po-libgimp/ca@valencia.po | 2 +- + po-libgimp/nb.po | 2 +- + po-libgimp/rw.po | 1 - + po-libgimp/sr@latin.po | 2 +- + po-libgimp/zh_HK.po | 2 +- + po-plug-ins/bs.po | 1 + + po-plug-ins/ca@valencia.po | 2 +- + po-plug-ins/rw.po | 1 - + po-plug-ins/sl.po | 2 +- + po-plug-ins/sr@latin.po | 2 +- + po-plug-ins/zh_HK.po | 2 +- + po-python/bs.po | 1 + + po-python/ca@valencia.po | 2 +- + po-python/nb.po | 2 +- + po-python/pa.po | 42 + ------------------------------------------ + po-python/rw.po | 1 - + po-python/sr@latin.po | 2 +- + po-python/zh_HK.po | 2 +- + po-script-fu/ca@valencia.po | 2 +- + po-script-fu/nb.po | 2 +- + po-script-fu/rw.po | 1 - + po-script-fu/sr@latin.po | 2 +- + po-script-fu/zh_HK.po | 2 +- + po-tags/bs.po | 1 + + po-tags/ca@valencia.po | 2 +- + po-tags/sr@latin.po | 2 +- + po-tags/zh_HK.po | 2 +- + po-tips/bs.po | 1 + + po-tips/ca@valencia.po | 2 +- + po-tips/pt.po | 2 +- + po-tips/sr.po | 2 +- + po-tips/sr@latin.po | 2 +- + po-tips/zh_HK.po | 2 +- + po/ca@valencia.po | 2 +- + po/nb.po | 2 +- + po/rw.po | 1 - + po/sl.po | 2 +- + po/sr@latin.po | 2 +- + 38 files changed, 32 insertions(+), 75 deletions(-) + +commit 448a81520420b99a9e5007ef6d8d37c62bd1c581 +Author: Michael Schumacher +Date: Wed Jul 13 22:35:58 2016 +0200 + + configure.ac: post release version bump to 2.8.19 + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + commit cd2bbf745419be7e7984d9309688604107b3fa72 Author: Michael Schumacher Date: Wed Jul 13 01:16:10 2016 +0200 @@ -68,31 +1172,31 @@ (cherry picked from commit a93cea0ef5bc810647689ae05ee2fc4760799a39) Conflicts: - app/file/file-open.c + app/file/file-open.c - app/file/file-open.c | 6 ++++++ + app/file/file-open.c | 6 ++++++ app/plug-in/gimpplugin-progress.c | 16 ++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) commit 9656e08547d661a600a5dcb7e03e0d18aa874ea6 Author: Massimo Valentini -Date: Fri Jun 24 12:39:01 2016 +0200 +Date: Fri Jun 24 12:39:01 2016 +0200 Bug 767476: Previously bolded font un-bolds on edit, cannot be undone (cherry picked from commit aa8d29deacaa42acde0ba0562f9fe93025b6fdaa) Conflicts: - app/widgets/gimptextbuffer-serialize.c + app/widgets/gimptextbuffer-serialize.c app/widgets/gimptextbuffer-serialize.c | 97 ++++------------------------------ - app/widgets/gimptextbuffer.c | 1 + + app/widgets/gimptextbuffer.c | 1 + 2 files changed, 12 insertions(+), 86 deletions(-) commit e82aaa4b4ee0703c879e35ea9321fff6be3e9b6f Author: Shmuel H -Date: Mon Jun 20 17:14:41 2016 +0300 +Date: Mon Jun 20 17:14:41 2016 +0300 Bug 767873 - (CVE-2016-4994) Multiple Use-After-Free when parsing... @@ -119,7 +1223,7 @@ commit 25dd2c33da360b84de69541b0ca7f69ad35b2372 Author: Jehan -Date: Mon Jun 13 03:26:57 2016 +0200 +Date: Mon Jun 13 03:26:57 2016 +0200 Bug 763202 - Create $XDG_DATA_HOME if it doesn't exist. @@ -133,7 +1237,7 @@ commit fc203cd20aa93d3c7d1be61f16e2449c0207c128 Author: Anders Jonsson -Date: Sat Jun 11 08:55:40 2016 +0000 +Date: Sat Jun 11 08:55:40 2016 +0000 Updated Swedish translation @@ -143,7 +1247,7 @@ commit 0d85024da8c9ef541b56f5dae4b5000d3aa99057 Author: Anders Jonsson -Date: Sat Jun 11 08:49:59 2016 +0000 +Date: Sat Jun 11 08:49:59 2016 +0000 Updated Swedish translation @@ -153,7 +1257,7 @@ commit 00ff2c27d90600cd1cc80ee7fa17133231b0ea24 Author: Tiago Santos -Date: Wed Jun 8 08:59:08 2016 +0000 +Date: Wed Jun 8 08:59:08 2016 +0000 Updated Portuguese translation @@ -164,7 +1268,7 @@ commit 17d8af966937c3ba939246d5512bdce2bbe36d1e Author: Dimitris Spingos (Δημήτρης Σπίγγος) -Date: Tue Jun 7 23:27:52 2016 +0300 +Date: Tue Jun 7 23:27:52 2016 +0300 Update Greek translation @@ -174,7 +1278,7 @@ commit 6d5df7ea8fc32ec28a90a0dbfe53f93b07b66c27 Author: Piotr Drąg -Date: Sun Jun 5 19:26:40 2016 +0200 +Date: Sun Jun 5 19:26:40 2016 +0200 Updated Polish translation @@ -184,7 +1288,7 @@ commit 3efa22b65093b52e0d7901746d66b8adc82e1160 Author: Massimo Valentini -Date: Sun Jun 5 19:02:12 2016 +0200 +Date: Sun Jun 5 19:02:12 2016 +0200 Bug 766886: the save bar keeps saving even whit a full bar @@ -198,7 +1302,7 @@ commit 6d454fdc85699983489265018433a56dd1130e1d Author: Pedro Gimeno -Date: Sun May 29 00:13:22 2016 +0200 +Date: Sun May 29 00:13:22 2016 +0200 Bug 738951 - (modulo n m) may fail for m >= 46342 (in 32-bit) or m >= 3037000501 (in 64-bit) @@ -208,7 +1312,7 @@ commit 59fa1e0359970d71cea6bf99db05b43fd3f80935 Author: Cédric Valmary -Date: Fri May 27 19:58:01 2016 +0000 +Date: Fri May 27 19:58:01 2016 +0000 Updated Occitan translation @@ -218,7 +1322,7 @@ commit 175dab2d7b7879af92cfc476eb3301bc0f460881 Author: Cédric Valmary -Date: Fri May 27 19:56:30 2016 +0000 +Date: Fri May 27 19:56:30 2016 +0000 Updated Occitan translation @@ -227,7 +1331,7 @@ commit 2ca211c7bbe09069c78ab53829895d0731682754 Author: Cédric Valmary -Date: Fri May 27 19:56:20 2016 +0000 +Date: Fri May 27 19:56:20 2016 +0000 Updated Occitan translation @@ -237,7 +1341,7 @@ commit a6fa36eb357085cf626a102c0712643e8b50dfa8 Author: Cédric Valmary -Date: Fri May 27 19:56:11 2016 +0000 +Date: Fri May 27 19:56:11 2016 +0000 Updated Occitan translation @@ -247,7 +1351,7 @@ commit 286a93b20f7765f16e6fe54793c7ac3db8be2eb0 Author: Cédric Valmary -Date: Fri May 27 19:55:26 2016 +0000 +Date: Fri May 27 19:55:26 2016 +0000 Updated Occitan translation @@ -256,7 +1360,7 @@ commit 323853032465ea128624c1795cbb5811796fe721 Author: Cédric Valmary -Date: Fri May 27 19:54:39 2016 +0000 +Date: Fri May 27 19:54:39 2016 +0000 Updated Occitan translation @@ -266,7 +1370,7 @@ commit 015acb41b8790cc77ab87410f93c2a1c38c0732a Author: Cédric Valmary -Date: Fri May 27 19:50:28 2016 +0000 +Date: Fri May 27 19:50:28 2016 +0000 Updated Occitan translation @@ -276,7 +1380,7 @@ commit 8a74bad0b5c6c1213b5695c0aaec00fd4ee7f07d Author: Massimo Valentini -Date: Fri May 27 14:53:40 2016 +0200 +Date: Fri May 27 14:53:40 2016 +0200 Bug 766424: gimp ignores deactivated layer masks when moving a masked part @@ -290,7 +1394,7 @@ commit 8d4f4f021f0ca2eca6f48ffaead34e0b4e6c8b0d Author: Cédric Valmary -Date: Thu May 26 20:51:00 2016 +0000 +Date: Thu May 26 20:51:00 2016 +0000 Updated Occitan translation @@ -300,7 +1404,7 @@ commit d1f86ac181328743ac9e5fd3bb1192ac51e45746 Author: Cédric Valmary -Date: Thu May 26 20:41:24 2016 +0000 +Date: Thu May 26 20:41:24 2016 +0000 Updated Occitan translation @@ -310,7 +1414,7 @@ commit a418407bd5faeaf32d4371791a836e2b25e51dbe Author: Adrian Likins -Date: Thu May 26 03:48:26 2016 +0200 +Date: Thu May 26 03:48:26 2016 +0200 Bug 749044 - Exporting as KISS - CELL (*.cel) results in error @@ -319,7 +1423,7 @@ commit 9a40ae0befd88389e9977147b921ba7292da1b2a Author: Cédric Valmary -Date: Wed May 25 20:09:37 2016 +0000 +Date: Wed May 25 20:09:37 2016 +0000 Updated Occitan translation @@ -329,7 +1433,7 @@ commit cf9d327c09a61b1abf8ea0b6a9c0fe9a98ca1493 Author: Simon Budig -Date: Wed May 25 20:17:02 2016 +0200 +Date: Wed May 25 20:17:02 2016 +0200 script-fu: make regex matching return character indexes @@ -343,7 +1447,7 @@ commit 5fae26020bbb8ccff778e15d2d0f27bb828e25d5 Author: Michael Natterer -Date: Sun May 22 22:42:32 2016 +0200 +Date: Sun May 22 22:42:32 2016 +0200 Bug 766250 - Gamut warning color incorrect, behavior reversion @@ -355,7 +1459,7 @@ commit c534a18d1575fc596b7a2c62d16a0fa5116f1c98 Author: Michael Natterer -Date: Sun May 22 22:38:12 2016 +0200 +Date: Sun May 22 22:38:12 2016 +0200 Bug 766327 - gimptool-2.0 not quoting filenames/directories @@ -368,7 +1472,7 @@ commit 395f1ef953f64fea080aec06a6a9922c343ad876 Author: Piotr Drąg -Date: Wed May 11 18:31:06 2016 +0200 +Date: Wed May 11 18:31:06 2016 +0200 Updated Polish translation @@ -377,7 +1481,7 @@ commit 35f9ee710d69f82f09e52f4b67cfbba9c46f1a73 Author: Tiago Santos -Date: Tue May 10 16:07:24 2016 +0000 +Date: Tue May 10 16:07:24 2016 +0000 Updated Portuguese translation @@ -387,7 +1491,7 @@ commit cfe42c9336b34f33f593858c0a00de7f573d16e8 Author: Tiago Santos -Date: Sun May 1 16:04:34 2016 +0000 +Date: Sun May 1 16:04:34 2016 +0000 Updated Portuguese translation @@ -396,7 +1500,7 @@ commit b9c5cc44784d676d4891cd5edfd5a787c8707485 Author: Tiago Santos -Date: Sun May 1 16:00:16 2016 +0000 +Date: Sun May 1 16:00:16 2016 +0000 Updated Portuguese translation @@ -406,18 +1510,18 @@ commit 0692ffe19ea934ec6361ceda91850c3c13cafe1b Author: Marco Ciampa -Date: Fri Apr 29 09:42:21 2016 +0200 +Date: Fri Apr 29 09:42:21 2016 +0200 Updated Italian translation po-plug-ins/it.po | 353 ++++++++++++++++++++++++++++-------------------------- - po/it.po | 194 ++++++++++++++---------------- + po/it.po | 194 ++++++++++++++---------------- 2 files changed, 273 insertions(+), 274 deletions(-) commit fee9dc252bee58e8fe79baecc7a4da703883cd8c Author: João S. O. Bueno -Date: Wed Apr 27 23:46:19 2016 -0300 +Date: Wed Apr 27 23:46:19 2016 -0300 Bug 765685: Disambiguates octal-escaped output in c-source image output @@ -435,7 +1539,7 @@ commit 428d4346661396d07d9cd4f7a55144f52db24e83 Author: Anders Jonsson -Date: Wed Apr 20 10:21:59 2016 +0000 +Date: Wed Apr 20 10:21:59 2016 +0000 Updated Swedish translation @@ -445,7 +1549,7 @@ commit 5a74bb74123e2d82d0a71b4271ebd0e1ef01b644 Author: Ell -Date: Tue Apr 19 17:43:19 2016 +0200 +Date: Tue Apr 19 17:43:19 2016 +0200 app: clear cond and mutex after usage @@ -456,7 +1560,7 @@ commit 763d87d7013cf496290baf8f0fc50eb20a1f74d3 Author: Dimitris Spingos -Date: Mon Apr 18 12:04:12 2016 +0300 +Date: Mon Apr 18 12:04:12 2016 +0300 Updated Greek translation @@ -466,7 +1570,7 @@ commit ad6729e0d67fc8eeb313c15dcb6c6be9e7276c3c Author: Kristian Rietveld -Date: Sun Apr 17 17:27:06 2016 +0100 +Date: Sun Apr 17 17:27:06 2016 +0100 Bug 449848 - Startup: initialize fontconfig in the background ... @@ -492,7 +1596,7 @@ commit 5abf0bb35763fb3ebe56bd96298f852adb423e51 Author: Kristian Rietveld -Date: Sun Apr 17 17:22:12 2016 +0100 +Date: Sun Apr 17 17:22:12 2016 +0100 Bug 719723 - Drag and drop of sRGB image crashes GIMP @@ -506,7 +1610,7 @@ commit 21c2cef29cae177432711db2c7f227e551feaeef Author: Michael Natterer -Date: Sun Apr 17 16:52:31 2016 +0100 +Date: Sun Apr 17 16:52:31 2016 +0100 app: enable a pulsing progress bar in the splash @@ -523,14 +1627,14 @@ commit 42895c8ed47af04fbf481d6fa7b16fed5311b821 Author: Kristian Rietveld -Date: Sun Apr 17 14:23:28 2016 +0100 +Date: Sun Apr 17 14:23:28 2016 +0100 Fix a bunch of header guards These were probably copy-n-paste errors. Credits go to clang's -Wheader-guard option. - app/display/gimpcanvaspath.h | 4 ++-- + app/display/gimpcanvaspath.h | 4 ++-- app/plug-in/gimppluginprocframe.h | 2 +- app/tools/gimptransformoptions.h | 2 +- app/widgets/gimpcontrollermouse.h | 2 +- @@ -539,7 +1643,7 @@ commit 08c22c0dc0fb8ee0f2f03ece91c9e59a2c226ac7 Author: Kristian Rietveld -Date: Sun Apr 17 00:32:27 2016 +0100 +Date: Sun Apr 17 00:32:27 2016 +0100 Bug 756178 - Crash on new layer creation in fullscreen mode @@ -556,7 +1660,7 @@ commit b1da106ba38a3deb18636fc3cbf305edb8f7bc50 Author: Sven Claussner -Date: Sat Apr 16 06:09:04 2016 +0000 +Date: Sat Apr 16 06:09:04 2016 +0000 Make PDBGEN documentation clearer. @@ -565,13 +1669,13 @@ Update the /lib directory to the current /libgimp directory. Correct spelling. - tools/pdbgen/README | 30 ++++++++++++++++++++---------- + tools/pdbgen/README | 30 ++++++++++++++++++++---------- tools/pdbgen/README_NEW_PDB_PROC | 2 +- 2 files changed, 21 insertions(+), 11 deletions(-) commit c373981c4046889abb743cb068bc8cce5fb88f1b Author: Kristian Rietveld -Date: Fri Apr 15 23:25:08 2016 +0100 +Date: Fri Apr 15 23:25:08 2016 +0100 app: block edited signal in GimpDataFactory edited callback @@ -591,7 +1695,7 @@ commit e73eb9d9b7fec75819a3565e02942f42ba61ee13 Author: Cédric Valmary -Date: Fri Apr 15 12:40:49 2016 +0000 +Date: Fri Apr 15 12:40:49 2016 +0000 Updated Occitan translation @@ -601,7 +1705,7 @@ commit 696f747ac4fafcc72598a39cba4f41354a15857e Author: Michael Natterer -Date: Sat Apr 9 18:08:52 2016 +0200 +Date: Sat Apr 9 18:08:52 2016 +0200 Bug 764822 - gimp man page references incorrect path to system-wide gimprc @@ -616,7 +1720,7 @@ commit 24131b22cdc119b83ebb10c064c7402d0b29ac37 Author: Jernej Simončič -Date: Thu Apr 7 20:33:34 2016 +0200 +Date: Thu Apr 7 20:33:34 2016 +0200 Installer: increase LZMA dictionary size and fastbytes (decreases installer size by 20%) @@ -626,7 +1730,7 @@ commit 02b77afa8cc1091926a22006df20f5039eb94975 Author: Jernej Simončič -Date: Thu Apr 7 20:32:58 2016 +0200 +Date: Thu Apr 7 20:32:58 2016 +0200 Installer: files not needed to be included any more @@ -635,7 +1739,7 @@ commit 1fa50c2452a1d9926b45603631f1308a64412317 Author: Cédric Valmary -Date: Fri Apr 1 10:01:50 2016 +0000 +Date: Fri Apr 1 10:01:50 2016 +0000 Updated Occitan translation @@ -645,19 +1749,19 @@ commit fd9554d6cdcb0f09592a30e568d19ea6a19c4424 Author: Michael Natterer -Date: Thu Mar 31 22:15:37 2016 +0200 +Date: Thu Mar 31 22:15:37 2016 +0200 Bug 753175 - color picker locks down the GUI Disable the color pickers buttons on OS X, they are unfixable in 2.8. - app/widgets/gimpcoloreditor.c | 6 ++++++ + app/widgets/gimpcoloreditor.c | 6 ++++++ libgimpwidgets/gimpcolorselection.c | 6 ++++++ 2 files changed, 12 insertions(+) commit 7a363f71983cb88eb839532fd0ecef550cfb77e7 Author: Mario Blättermann -Date: Mon Mar 28 17:02:27 2016 +0200 +Date: Mon Mar 28 17:02:27 2016 +0200 Updated German translation @@ -666,7 +1770,7 @@ commit 5f562455f7f44448cdeb71321fcca6ede0315330 Author: Mario Blättermann -Date: Mon Mar 28 16:56:36 2016 +0200 +Date: Mon Mar 28 16:56:36 2016 +0200 Updated German translation @@ -676,7 +1780,7 @@ commit e19ec6e511886fa60c000b19465ec00bfdb9d32e Author: Rafael Fontenelle -Date: Mon Mar 28 13:53:30 2016 +0000 +Date: Mon Mar 28 13:53:30 2016 +0000 Updated Brazilian Portuguese translation @@ -686,7 +1790,7 @@ commit fdcb8312a5d8beda4405d2738a29de1664b8d795 Author: Rafael Fontenelle -Date: Mon Mar 28 13:33:19 2016 +0000 +Date: Mon Mar 28 13:33:19 2016 +0000 Updated Brazilian Portuguese translation @@ -696,7 +1800,7 @@ commit 1ff1f40723a44820e72de160d3f53324cf9e3d33 Author: Rafael Fontenelle -Date: Mon Mar 28 13:14:33 2016 +0000 +Date: Mon Mar 28 13:14:33 2016 +0000 Updated Brazilian Portuguese translation @@ -706,7 +1810,7 @@ commit 4dbb1232a8221a31ca16b5c5c0a080fce15c3d4a Author: Jehan -Date: Mon Aug 11 23:01:12 2014 +0000 +Date: Mon Aug 11 23:01:12 2014 +0000 Do not use g_io_channel_unix_new() for the win32 platforms. @@ -720,12 +1824,12 @@ app/config/gimpxmlparser.c | 4 ++++ app/plug-in/gimpplugin.c | 7 ++++++- - libgimp/gimp.c | 5 +++++ + libgimp/gimp.c | 5 +++++ 3 files changed, 15 insertions(+), 1 deletion(-) commit 6245aba8174008fd80a9cd347683301c146d2ad7 Author: Balázs Úr -Date: Fri Mar 25 23:46:26 2016 +0000 +Date: Fri Mar 25 23:46:26 2016 +0000 Updated Hungarian translation @@ -735,7 +1839,7 @@ commit 1ccf19d30759bed777714eb72fa70b4b97dcef99 Author: Balázs Úr -Date: Fri Mar 25 23:41:58 2016 +0000 +Date: Fri Mar 25 23:41:58 2016 +0000 Updated Hungarian translation @@ -745,18 +1849,18 @@ commit 9be5e5c94b0b0d33bb480b2368135efad3398083 Author: Piotr Drąg -Date: Fri Mar 25 23:40:21 2016 +0100 +Date: Fri Mar 25 23:40:21 2016 +0100 Updated Polish translation po-plug-ins/pl.po | 110 ++++++++++++++++++++++++++++-------------------------- - po/pl.po | 69 ++++++++++++++++++---------------- + po/pl.po | 69 ++++++++++++++++++---------------- 2 files changed, 95 insertions(+), 84 deletions(-) commit 396ab85118bbed5a987b6965a4f28629507147fc Author: Jehan -Date: Fri Feb 26 17:15:14 2016 +0100 +Date: Fri Feb 26 17:15:14 2016 +0100 Bug 762282 - Link ends with "/." @@ -765,13 +1869,13 @@ (cherry picked from commit 0e9453d5eec40e1c8f9ba7d96b43f779a40edf70) - app/about.h | 5 +++++ + app/about.h | 5 +++++ plug-ins/help/gimphelpdomain.c | 6 ++++++ 2 files changed, 11 insertions(+) commit c795c16ddd91b6c6f26d5ea8aa7bc9221188cab5 Author: Jehan -Date: Thu Feb 25 16:32:44 2016 +0100 +Date: Thu Feb 25 16:32:44 2016 +0100 Bug 762282 - Link ends with "/." @@ -780,13 +1884,13 @@ (cherry picked from commit 1159ec2d90b266026a12ae6659d4bf962843ef8a) - app/about.h | 2 +- + app/about.h | 2 +- plug-ins/help/gimphelpdomain.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit e3f3f5d2bd5e8a02e410d7b1bfdf5073581b9d8c Author: Michael Natterer -Date: Mon Mar 21 09:19:06 2016 +0100 +Date: Mon Mar 21 09:19:06 2016 +0100 app: fix calculation for action values which can wrap around @@ -799,7 +1903,7 @@ commit f8b3fb2bb1a0dbc7312a20c992bfb9a2af88000a Author: Michael Natterer -Date: Sun Mar 20 20:01:56 2016 +0100 +Date: Sun Mar 20 20:01:56 2016 +0100 Bug 763207 - Dilate / Erode Missing First Line @@ -811,7 +1915,7 @@ commit 9bcd34843853abb4fa449ab7575e95e819bbaf17 Author: Martin Srebotnjak -Date: Fri Mar 11 22:04:31 2016 +0100 +Date: Fri Mar 11 22:04:31 2016 +0100 Updated Slovenian translation @@ -821,7 +1925,7 @@ commit 2549bc604bb07a75378d9f6bd1587668bb47b4af Author: Cédric Valmary -Date: Tue Mar 8 13:46:32 2016 +0000 +Date: Tue Mar 8 13:46:32 2016 +0000 Updated Occitan translation @@ -831,7 +1935,7 @@ commit 2055e1de0baa32b4d3ac97b510c3edbef05e0c53 Author: Anders Jonsson -Date: Mon Mar 7 21:52:01 2016 +0000 +Date: Mon Mar 7 21:52:01 2016 +0000 Updated Swedish translation @@ -841,7 +1945,7 @@ commit 78ee2739653b25399b3c20b4344e3c08553c01b1 Author: Ask Hjorth Larsen -Date: Sun Mar 6 20:15:11 2016 +0000 +Date: Sun Mar 6 20:15:11 2016 +0000 Updated Danish translation @@ -850,7 +1954,7 @@ commit 04b37eabdcce22c1ade46fb6f0b81dba38cfaeaf Author: Ask Hjorth Larsen -Date: Sun Mar 6 20:06:22 2016 +0000 +Date: Sun Mar 6 20:06:22 2016 +0000 Updated Danish translation @@ -859,7 +1963,7 @@ commit 5a24e295c5a962ae8b255cb88b7e1869be377215 Author: Martin Srebotnjak -Date: Sat Mar 5 20:53:07 2016 +0100 +Date: Sat Mar 5 20:53:07 2016 +0100 Updated Slovenian translation @@ -869,7 +1973,7 @@ commit 900669a7f4df71fc3705f6f968128c86028376c8 Author: Ask Hjorth Larsen -Date: Sat Mar 5 16:54:43 2016 +0000 +Date: Sat Mar 5 16:54:43 2016 +0000 Updated Danish translation @@ -879,7 +1983,7 @@ commit 21a50c43cd66f1f9cedc18adc364b010dd9a9cba Author: Thomas Manni -Date: Tue Mar 1 22:40:01 2016 +0100 +Date: Tue Mar 1 22:40:01 2016 +0100 Bug 724731 - Difference clouds - memory leak if UNDO performed @@ -892,7 +1996,7 @@ commit 3b29a10c6fb89f87d9f3b79b722e78ccc688d993 Author: Christian Kirbach -Date: Mon Feb 22 22:59:45 2016 +0100 +Date: Mon Feb 22 22:59:45 2016 +0100 Update German translation @@ -902,7 +2006,7 @@ commit 3c729611618a502127ea667a1c126cc7deb8d5cd Author: Jernej Simončič -Date: Thu Feb 18 20:01:13 2016 +0100 +Date: Thu Feb 18 20:01:13 2016 +0100 Installer: automatically adjust width of Customize button when the text doesn't fit @@ -912,7 +2016,7 @@ commit b43604ea28f00d48e19edd33b9ec06a1f485529d Author: Jernej Simončič -Date: Thu Feb 18 18:46:13 2016 +0100 +Date: Thu Feb 18 18:46:13 2016 +0100 Installer: add Danish translation by scootergrisen at gmail.com @@ -922,7 +2026,7 @@ commit a5c21d6269092857cb7ef5bcac8e9755d4d4e675 Author: Dušan Kazik -Date: Sat Feb 13 16:15:45 2016 +0000 +Date: Sat Feb 13 16:15:45 2016 +0000 Updated Slovak translation @@ -932,7 +2036,7 @@ commit c6a0e85d4c92f1881e25a9f2ef17e1e084fa2edb Author: Michael Natterer -Date: Fri Feb 12 00:36:11 2016 +0100 +Date: Fri Feb 12 00:36:11 2016 +0100 Bug 761573 - Problem with Raw Image Loader plugin @@ -946,7 +2050,7 @@ commit 4bea7134fd11ceaffd759887eb5a820f493e9af5 Author: Massimo Valentini -Date: Wed Feb 10 17:14:00 2016 +0100 +Date: Wed Feb 10 17:14:00 2016 +0100 Bug 761330: Gimp Drop Shadow window always opens... @@ -959,13 +2063,13 @@ (cherry picked from commit f44c77b4a21264d25e6a95d94e11db639c092d84) - app/plug-in/gimppluginmanager-call.c | 13 +++++++++++++ + app/plug-in/gimppluginmanager-call.c | 13 +++++++++++++ plug-ins/script-fu/script-fu-interface.c | 11 +++++++++++ 2 files changed, 24 insertions(+) commit 7b86a179830e499ab662aca703ce97ac4f4f0347 Author: Ask Hjorth Larsen -Date: Tue Feb 9 17:09:09 2016 +0000 +Date: Tue Feb 9 17:09:09 2016 +0000 Updated Danish translation @@ -975,7 +2079,7 @@ commit 25ca13270f5c926cc92daffcf9fadf1054cf8505 Author: Ask Hjorth Larsen -Date: Tue Feb 9 13:57:01 2016 +0000 +Date: Tue Feb 9 13:57:01 2016 +0000 Updated Danish translation @@ -984,7 +2088,7 @@ commit 57b21e165d912fe017fe0fadba523ed3a38bb2fb Author: Ask Hjorth Larsen -Date: Tue Feb 9 13:52:45 2016 +0000 +Date: Tue Feb 9 13:52:45 2016 +0000 Updated Danish translation @@ -994,7 +2098,7 @@ commit 8d2cc6083a1e1cec1538370a0a80d4af059f5d67 Author: Ask Hjorth Larsen -Date: Tue Feb 9 13:44:01 2016 +0000 +Date: Tue Feb 9 13:44:01 2016 +0000 Updated Danish translation @@ -1004,7 +2108,7 @@ commit dafe93c41bfe25d493cdb6ba61853b5e1e9b481c Author: Ask Hjorth Larsen -Date: Tue Feb 9 13:34:14 2016 +0000 +Date: Tue Feb 9 13:34:14 2016 +0000 Updated Danish translation @@ -1014,7 +2118,7 @@ commit f7e8594c34f941fa5fbf24cf07b4d650be8b8037 Author: Sveinn í Felli -Date: Mon Feb 8 13:22:46 2016 +0000 +Date: Mon Feb 8 13:22:46 2016 +0000 Updated Icelandic translation @@ -1024,7 +2128,7 @@ commit 465db952272bda103ce941c83dc0f2098ab6d0eb Author: Gábor Kelemen -Date: Sat Jan 23 13:06:09 2016 +0000 +Date: Sat Jan 23 13:06:09 2016 +0000 Updated Hungarian translation @@ -1034,7 +2138,7 @@ commit d4cebcea8fec7c74b65bd94332d5ac8ce4c303c7 Author: Massimo Valentini -Date: Thu Jan 7 17:49:52 2016 +0100 +Date: Thu Jan 7 17:49:52 2016 +0100 Bug 758760: OpenRaster plug-In could not open image @@ -1047,7 +2151,7 @@ commit 242c5152ae96e817042ff869896056d615fd7441 Author: Michael Natterer -Date: Wed Jan 6 05:12:03 2016 +0100 +Date: Wed Jan 6 05:12:03 2016 +0100 app: set the name of the open dialog again in file_open_dialog_show() @@ -1061,7 +2165,7 @@ commit 9c8aeed60df4ec052ea478fa34ccfce4b6fd2a35 Author: Massimo Valentini -Date: Mon Jan 4 12:55:58 2016 +0100 +Date: Mon Jan 4 12:55:58 2016 +0100 Bug 684295: wrong layer group structure in gimp 2.8.2... @@ -1077,14 +2181,14 @@ (cherry picked from commit 32469d53b7e28973b3c8488573341c69bef0576b) Conflicts: - plug-ins/file-psd/psd-load.c + plug-ins/file-psd/psd-load.c plug-ins/file-psd/psd-load.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 051b1f0bd9b1c50c09ac3453d6bffed6508c3dce Author: Michael Natterer -Date: Mon Dec 28 02:04:46 2015 +0100 +Date: Mon Dec 28 02:04:46 2015 +0100 app: fix the curves tool to not warn on layers without alpha @@ -1098,7 +2202,7 @@ commit 3d5ef9d26601f0e35d77fe1b550b917af3e8fea0 Author: Kristian Rietveld -Date: Sun Dec 13 21:47:42 2015 +0100 +Date: Sun Dec 13 21:47:42 2015 +0100 Bug 737779 - Poppler-data not installed or not working in OSX release @@ -1109,17 +2213,17 @@ launcher script. Also include poppler-data in the resulting app bundle. - build/osx/README | 1 + - build/osx/gimp-2.8-python.bundle | 3 +++ - build/osx/gimp.modules | 5 ++++- - build/osx/launcher-2.8-python.sh | 6 ++++-- + build/osx/README | 1 + + build/osx/gimp-2.8-python.bundle | 3 +++ + build/osx/gimp.modules | 5 ++++- + build/osx/launcher-2.8-python.sh | 6 ++++-- ...r-support-overriding-datadir-through-env-variable.patch | 14 ++++++++++++++ 5 files changed, 26 insertions(+), 3 deletions(-) commit 3122ec86ea29ed673d359acb09455cef86b46efd Author: Kristian Rietveld -Date: Sun Dec 13 21:17:26 2015 +0100 +Date: Sun Dec 13 21:17:26 2015 +0100 build/osx: force to build GIMP_2_8_16 tag @@ -1130,7 +2234,7 @@ commit 7c3d5c73ae3cdb1370f00ebea39fec636c9d3bcc Author: Kristian Rietveld -Date: Sun Dec 13 21:16:42 2015 +0100 +Date: Sun Dec 13 21:16:42 2015 +0100 build/osx: update DBUS version @@ -1141,7 +2245,7 @@ commit 0ba7f5c07ab6cef6e65692da82a27ec905080bdd Author: Kristian Rietveld -Date: Sun Dec 13 21:15:57 2015 +0100 +Date: Sun Dec 13 21:15:57 2015 +0100 build/osx: fix GMP download URL @@ -1150,7 +2254,7 @@ commit 90979d886d5e249d84aa77f5c6d37fd9f4d3ae0d Author: Kristian Rietveld -Date: Sun Dec 13 15:38:12 2015 +0100 +Date: Sun Dec 13 15:38:12 2015 +0100 Bug 746357 - GIMP 2.8.14 for Mac doesn't include full version info ... @@ -1166,7 +2270,7 @@ commit 7745f057d8ec522f729af3f869e8b37dfba7dd46 Author: Kristian Rietveld -Date: Sun Dec 13 15:35:53 2015 +0100 +Date: Sun Dec 13 15:35:53 2015 +0100 build/osx: Add command for creating the DMG image @@ -1175,7 +2279,7 @@ commit eb8a7e4e91b78721acc17498e759d24bd6524760 Author: Kristian Rietveld -Date: Sun Dec 13 15:34:15 2015 +0100 +Date: Sun Dec 13 15:34:15 2015 +0100 build/osx: two additions for outstanding issues to fix after build @@ -1184,7 +2288,7 @@ commit 3a91e2f8dd0be5659ad6f46e7f21275a6dc36f96 Author: Kristian Rietveld -Date: Sun Dec 13 15:32:11 2015 +0100 +Date: Sun Dec 13 15:32:11 2015 +0100 build/osx: describe installation of 10.6 SDK @@ -1193,7 +2297,7 @@ commit cb37475bf68066c6ab40ff61289ac673727cbd01 Author: Kristian Rietveld -Date: Sun Dec 13 15:29:24 2015 +0100 +Date: Sun Dec 13 15:29:24 2015 +0100 build/osx: use "makeargs" in jhbuildrc @@ -1201,13 +2305,13 @@ the perl modules. - build/osx/README | 22 +++------------------- + build/osx/README | 22 +++------------------- build/osx/jhbuildrc-gimp | 2 +- 2 files changed, 4 insertions(+), 20 deletions(-) commit bdb62a1651ba4646fe180867dd330e931a0262df Author: Marco Ciampa -Date: Sun Dec 13 01:25:36 2015 +0100 +Date: Sun Dec 13 01:25:36 2015 +0100 Small fix in Italian translation @@ -1216,17 +2320,17 @@ commit 31c812a2b02104493a3e1985d07ed28e3b38f448 Author: Marco Ciampa -Date: Sat Dec 12 23:17:21 2015 +0100 +Date: Sat Dec 12 23:17:21 2015 +0100 Two small fixies in Italian translation po-script-fu/it.po | 4 ++-- - po/it.po | 4 ++-- + po/it.po | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit 9c7173e251211cee77e5ba06d13132272285e8c8 Author: Ask Hjorth Larsen -Date: Sat Dec 12 20:26:13 2015 +0000 +Date: Sat Dec 12 20:26:13 2015 +0000 Updated Danish translation @@ -1236,7 +2340,7 @@ commit b8785f3922b17e6f9f9053d9d45a90cc7e8d3c28 Author: Sveinn í Felli -Date: Mon Dec 7 15:18:23 2015 +0000 +Date: Mon Dec 7 15:18:23 2015 +0000 Updated Icelandic translation @@ -1246,7 +2350,7 @@ commit 80ab3b7f51012346e1b84351698335a37fb989e4 Author: Sveinn í Felli -Date: Sat Dec 5 15:19:59 2015 +0000 +Date: Sat Dec 5 15:19:59 2015 +0000 Updated Icelandic translation @@ -1256,7 +2360,7 @@ commit 0012ba1602ebbe051a470e934ab22858d50f2034 Author: Милош Поповић -Date: Mon Nov 30 23:20:36 2015 +0000 +Date: Mon Nov 30 23:20:36 2015 +0000 Updated Serbian translation @@ -1266,7 +2370,7 @@ commit 536cce51909350e003d6fd862d1ba67015a01d2d Author: Anders Jonsson -Date: Sat Nov 28 22:55:45 2015 +0000 +Date: Sat Nov 28 22:55:45 2015 +0000 Updated Swedish translation @@ -1276,18 +2380,18 @@ commit 586d698705eb6391417e2d0f63702869955a7be0 Author: Piotr Drąg -Date: Fri Nov 27 21:48:40 2015 +0100 +Date: Fri Nov 27 21:48:40 2015 +0100 Updated Polish translation po-libgimp/pl.po | 36 ++++++++++------------- - po/pl.po | 88 + po/pl.po | 88 ++++++++++++++++++++++++++++---------------------------- 2 files changed, 59 insertions(+), 65 deletions(-) commit 436251badad11fa6fde722acfcfbe28496363509 Author: Alexandre Prokoudine -Date: Mon Nov 23 16:22:43 2015 +0300 +Date: Mon Nov 23 16:22:43 2015 +0300 Fix typos in Russian translation spotted by SourceLocalizer et al. @@ -1296,19 +2400,19 @@ commit 27ce0e659bab14e8e83005cce3ce3218bbd2bea5 Author: Piotr Drąg -Date: Mon Nov 23 00:23:35 2015 +0100 +Date: Mon Nov 23 00:23:35 2015 +0100 Updated Polish translation po-plug-ins/pl.po | 59 +++++++--------- - po-script-fu/pl.po | 6 +- - po/pl.po | 201 + po-script-fu/pl.po | 6 +- + po/pl.po | 201 +++++++++++++++++++++++------------------------------ 3 files changed, 117 insertions(+), 149 deletions(-) commit e0b438348256f028f6ebf20ebb801f79e5cfe04c Author: Baurzhan Muftakhidinov -Date: Sun Nov 22 17:10:13 2015 +0000 +Date: Sun Nov 22 17:10:13 2015 +0000 Updated Kazakh translation @@ -1318,7 +2422,7 @@ commit 03f87e139da0a01b5cba21afccf409396991d592 Author: Michael Natterer -Date: Sun Nov 22 17:28:39 2015 +0100 +Date: Sun Nov 22 17:28:39 2015 +0100 NEWS.pre-2-8: new file preserving the history that lead to 2.8 @@ -1331,7 +2435,7 @@ commit bf397d5cf939c04eabc847ae46c1c04b48d6b1f9 Author: Jernej Simončič -Date: Sun Nov 22 16:12:56 2015 +0100 +Date: Sun Nov 22 16:12:56 2015 +0100 Installer: add new languages @@ -1340,7 +2444,7 @@ commit 97617c65e2b9b0fe036fdb7ed6537318243b1e40 Author: Michael Natterer -Date: Sat Nov 21 19:18:27 2015 +0100 +Date: Sat Nov 21 19:18:27 2015 +0100 configure.ac: post release version bump to 2.8.17 @@ -1349,7 +2453,7 @@ commit 3152b6e1d8a24b1eb74d62c5ef004534e8ad126f Author: Michael Natterer -Date: Sat Nov 21 16:44:58 2015 +0100 +Date: Sat Nov 21 16:44:58 2015 +0100 configure.ac: release 2.8.16 @@ -1358,17 +2462,17 @@ commit 1598eb9cbada171b2f7e4c72d254c3e29d58dc00 Author: Michael Natterer -Date: Fri Nov 20 22:55:26 2015 +0100 +Date: Fri Nov 20 22:55:26 2015 +0100 etc, docs: regenerate the default gimprc and its manpage docs/gimprc.5.in | 4 ++-- - etc/gimprc | 2 +- + etc/gimprc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit 5cbc0e8173de23840af765d1573e171ef5962c6e Author: Jasper Krijgsman -Date: Thu Nov 19 19:55:48 2015 +0100 +Date: Thu Nov 19 19:55:48 2015 +0100 Bug 732363 - wilber.ico doesn't contain 256x256 layer @@ -1379,7 +2483,7 @@ commit 50f25d1c39cc1ae60281525a71a39f8ca64c1adb Author: Rafael Fernandez -Date: Thu Nov 19 19:48:11 2015 +0100 +Date: Thu Nov 19 19:48:11 2015 +0100 Bug 707028 - Dutch translation for Windows installer @@ -1391,7 +2495,7 @@ commit 1b635d999fb6a9d2dda6bd2d1759b5d2997732ed Author: Jehan -Date: Thu Nov 5 18:31:06 2015 +0100 +Date: Thu Nov 5 18:31:06 2015 +0100 app: enable GimpCurvesTool on construction. @@ -1408,7 +2512,7 @@ commit f2323bc5b108a71b5bdab0301929a34f2589b6c8 Author: Pedro Albuquerque -Date: Sat Nov 14 08:57:41 2015 +0000 +Date: Sat Nov 14 08:57:41 2015 +0000 Updated Portuguese translation @@ -1418,7 +2522,7 @@ commit 3aa98c3ef2c7ebd1d564b587e42d65d24f786c37 Author: Pedro Albuquerque -Date: Sat Nov 14 08:16:53 2015 +0000 +Date: Sat Nov 14 08:16:53 2015 +0000 Updated Portuguese translation @@ -1428,7 +2532,7 @@ commit f58b5288bbb5e6882b97561d7a9945f7bb603244 Author: Michael Natterer -Date: Sat Nov 7 21:14:40 2015 +0100 +Date: Sat Nov 7 21:14:40 2015 +0100 Bug 757739 - GIMP crashes closing undocked pointer dialog @@ -1442,7 +2546,7 @@ commit 6afafa75b6cf2f59c2c9079449dddd921e27d4d1 Author: Luis Menina -Date: Mon Nov 2 01:58:57 2015 +0100 +Date: Mon Nov 2 01:58:57 2015 +0100 Bug 683196 - French translation for the Windows installer @@ -1454,7 +2558,7 @@ commit 2e0deb0d78b4f01331ad42af9dc7c0b47b8cc1c1 Author: Jiri Grönroos -Date: Sun Oct 11 14:17:32 2015 +0000 +Date: Sun Oct 11 14:17:32 2015 +0000 Updated Finnish translation @@ -1464,7 +2568,7 @@ commit 9b0b1347ec948d7ecb7a5ebe74d883177fafc97b Author: Jonathan Tait -Date: Mon Sep 21 01:38:16 2015 +0100 +Date: Mon Sep 21 01:38:16 2015 +0100 Bug 755317 - "Apply lens" doesn't work on big images (2366x2366) @@ -1475,7 +2579,7 @@ commit 8182ec4c3ed8d2f052e33f4a2f14eda40d54c896 Author: Dimitris Spingos -Date: Wed Sep 30 10:06:19 2015 +0300 +Date: Wed Sep 30 10:06:19 2015 +0300 Updated Greek translation @@ -1485,7 +2589,7 @@ commit 187411df9d8cde466a730688114e9704283ec120 Author: Милош Поповић -Date: Tue Sep 29 11:24:39 2015 +0000 +Date: Tue Sep 29 11:24:39 2015 +0000 Updated Serbian translation @@ -1495,7 +2599,7 @@ commit 473d28729b145ec1cb9ca4e4b424be51770358cb Author: Piotr Drąg -Date: Sat Sep 26 17:28:13 2015 +0200 +Date: Sat Sep 26 17:28:13 2015 +0200 Fix Chinese (Taiwan) translation of default:LTR @@ -1504,7 +2608,7 @@ commit a941f32747462be18003f8cfdbfff4939b6713e2 Author: Piotr Drąg -Date: Sat Sep 26 17:27:02 2015 +0200 +Date: Sat Sep 26 17:27:02 2015 +0200 Fix Ukrainian translation of default:LTR @@ -1513,7 +2617,7 @@ commit 91ecdcd201414f302d912e8b66e940c10ce51cd1 Author: Piotr Drąg -Date: Sat Sep 26 17:26:21 2015 +0200 +Date: Sat Sep 26 17:26:21 2015 +0200 Fix Swedish translation of default:LTR @@ -1522,7 +2626,7 @@ commit 9cdee54751babf37215282756e90b1520b089945 Author: Piotr Drąg -Date: Sat Sep 26 17:25:48 2015 +0200 +Date: Sat Sep 26 17:25:48 2015 +0200 Fix Slovenian translation of default:LTR @@ -1531,7 +2635,7 @@ commit 6186829a5a74fbda69c81298c8a1ddae1cab6467 Author: Piotr Drąg -Date: Sat Sep 26 17:22:05 2015 +0200 +Date: Sat Sep 26 17:22:05 2015 +0200 Fix Estonian translation of default:LTR @@ -1540,7 +2644,7 @@ commit 00bbab5789dc35116fdf1051f52835bac1405a6b Author: Piotr Drąg -Date: Sat Sep 26 17:21:42 2015 +0200 +Date: Sat Sep 26 17:21:42 2015 +0200 Fix Spanish translation of default:LTR @@ -1549,7 +2653,7 @@ commit b97a4e0538b47f1ade8bc800aa3e19d51fc8a892 Author: Piotr Drąg -Date: Sat Sep 26 17:20:24 2015 +0200 +Date: Sat Sep 26 17:20:24 2015 +0200 Fix Greek translation of default:LTR @@ -1558,7 +2662,7 @@ commit d4ae812a93f8b066bd18e03dc811e5b1f4b73c36 Author: Piotr Drąg -Date: Sat Sep 26 16:59:54 2015 +0200 +Date: Sat Sep 26 16:59:54 2015 +0200 Fix Catalan translation of default:LTR @@ -1567,7 +2671,7 @@ commit 101b224f63fe84d26f79a8bce1d68e020708fc34 Author: Piotr Drąg -Date: Sat Sep 26 16:52:27 2015 +0200 +Date: Sat Sep 26 16:52:27 2015 +0200 Fix Aragonese translation of default:LTR @@ -1576,7 +2680,7 @@ commit 57050cfc7bc7129be067e49e7fca4cb0d4214cd4 Author: Pedro Albuquerque -Date: Mon Sep 21 05:19:29 2015 +0000 +Date: Mon Sep 21 05:19:29 2015 +0000 Updated Portuguese translation @@ -1586,7 +2690,7 @@ commit 368b80fa717a0fe1a371d927f006f45a7f5a3287 Author: Piotr Drąg -Date: Sat Sep 19 17:49:22 2015 +0200 +Date: Sat Sep 19 17:49:22 2015 +0200 Updated po-tags/LINGUAS @@ -1595,7 +2699,7 @@ commit 32e8a4e116b6706b4199a948d19631342d27d9d8 Author: Matt Giuca -Date: Fri Sep 18 18:58:12 2015 +0200 +Date: Fri Sep 18 18:58:12 2015 +0200 plug-ins: Fix generation of the AND mask for 32-bit ICO images @@ -1611,13 +2715,13 @@ commit f55dd9a7f33a03c918649ff2e14ad517df375b60 Author: Jonathan Tait -Date: Tue Sep 15 05:37:37 2015 +0100 +Date: Tue Sep 15 05:37:37 2015 +0100 Bug 751584 - parasite_list() methods fail if no parasites found Correct parasite_list() methods. - plug-ins/pygimp/gimpmodule.c | 22 ++++++++-------------- + plug-ins/pygimp/gimpmodule.c | 22 ++++++++-------------- plug-ins/pygimp/pygimp-drawable.c | 22 ++++++++-------------- plug-ins/pygimp/pygimp-image.c | 23 ++++++++--------------- plug-ins/pygimp/pygimp-vectors.c | 22 ++++++++-------------- @@ -1625,7 +2729,7 @@ commit 9d5fed6ea66dba308400ce2f275b51d6d145d404 Author: Michael Natterer -Date: Sat Sep 12 20:26:56 2015 +0200 +Date: Sat Sep 12 20:26:56 2015 +0200 Bug 754927 - Non-void function should return a value @@ -1638,7 +2742,7 @@ commit bfd482755b081be7dbda2fd1d457d1b6b7ace8a8 Author: Julien Nabet -Date: Tue Sep 8 21:34:11 2015 +0200 +Date: Tue Sep 8 21:34:11 2015 +0200 Bug 69496 - Paint tools, Text tool: Click and drag font/brush/pattern/gradient... @@ -1656,7 +2760,7 @@ commit ff950e6a2591c4c7742101653f2659fb902e78a7 Author: Martin Srebotnjak -Date: Tue Sep 8 23:42:47 2015 +0200 +Date: Tue Sep 8 23:42:47 2015 +0200 Updated Slovenian translation @@ -1666,7 +2770,7 @@ commit 232361ab601c0daaf5f58b58408c707c1eb947d7 Author: Martin Srebotnjak -Date: Tue Sep 8 23:34:24 2015 +0200 +Date: Tue Sep 8 23:34:24 2015 +0200 Updated Slovenian translation @@ -1676,7 +2780,7 @@ commit 244a14d6b6fe3c2f28c314f6e764c0bdb99c1796 Author: Martin Srebotnjak -Date: Tue Sep 8 23:17:55 2015 +0200 +Date: Tue Sep 8 23:17:55 2015 +0200 Updated Slovenian translation @@ -1686,7 +2790,7 @@ commit 978a394efec664da104b8e255eebd794d81095bc Author: Michael Henning -Date: Sun Sep 6 17:41:09 2015 -0400 +Date: Sun Sep 6 17:41:09 2015 -0400 libgimpwidgets: Disconnect ruler's idle handler in dispose @@ -1700,7 +2804,7 @@ commit a8b596b078c637798b404c45f297138bb5c81ae6 Author: Michael Henning -Date: Sun Sep 6 00:05:32 2015 -0400 +Date: Sun Sep 6 00:05:32 2015 -0400 libgimpwidgets: Avoid updating the rulers too often. @@ -1722,7 +2826,7 @@ commit 40fd55612046eac4397ccb03abbdf54fd99a554d Author: Piotr Drąg -Date: Wed Sep 2 20:42:50 2015 +0200 +Date: Wed Sep 2 20:42:50 2015 +0200 Updated Polish translation @@ -1731,7 +2835,7 @@ commit b50a416390d144beca08b2e3ab3fe444fb85034f Author: Piotr Drąg -Date: Sat Aug 29 18:41:52 2015 +0200 +Date: Sat Aug 29 18:41:52 2015 +0200 Updated Polish translation @@ -1740,14 +2844,14 @@ ++++++++++++++++++++++++++--------------------------- po-python/pl.po | 52 +-- po-script-fu/pl.po | 324 +++++++++--------- - po-tags/pl.po | 11 +- - po-tips/pl.po | 86 ++--- - po/pl.po | 764 +++++++++++++++++++++---------------------- + po-tags/pl.po | 11 +- + po-tips/pl.po | 86 ++--- + po/pl.po | 764 +++++++++++++++++++++---------------------- 7 files changed, 1174 insertions(+), 1196 deletions(-) commit f12131744c1288f52e02bb11abefadf24b99b7c9 Author: Michael Henning -Date: Tue Aug 25 21:46:06 2015 -0400 +Date: Tue Aug 25 21:46:06 2015 -0400 NEWS: Updates @@ -1756,7 +2860,7 @@ commit 43f187f5c351b0d06031f1774395bd922c3e1857 Author: Michael Natterer -Date: Tue Aug 25 23:05:25 2015 +0200 +Date: Tue Aug 25 23:05:25 2015 +0200 Bug 749123 - File->Open thumbnail information label misaligned... @@ -1771,7 +2875,7 @@ commit cfcfaddd2ade882d4f4995ad1cb023f8ce783ac9 Author: Michael Schumacher -Date: Fri Aug 21 19:13:27 2015 +0200 +Date: Fri Aug 21 19:13:27 2015 +0200 Adding ChangeLog.pre-git to EXTRA_DIST @@ -1784,9 +2888,9 @@ commit 659a75c68664de85d0be57b934ba0ff17b412567 Author: Michael Schumacher -Date: Fri Aug 21 00:42:10 2015 +0200 +Date: Fri Aug 21 00:42:10 2015 +0200 - Workaround for intltool vs. automake issue during distcheck + Workaround for intltool vs. automake issue during distcheck intltool and automake 1.15 currently cause a problem during make distcheck. @@ -1803,7 +2907,7 @@ commit 6bb8ec5bb37c92db1075b1c0e139325efb9985c0 Author: David Gowers <00ai99@gmail.com> -Date: Sun Aug 16 20:17:03 2015 +0200 +Date: Sun Aug 16 20:17:03 2015 +0200 Bug 753573 - Enter does not take a default action in Python-Fu dialogs @@ -1814,7 +2918,7 @@ commit 9b783de2e4821151dbb470a0021a7d2ba411b489 Author: Saul Goode -Date: Sat Aug 15 20:20:19 2015 +0200 +Date: Sat Aug 15 20:20:19 2015 +0200 Bug 746467 - 'convert-decimal-to-base' produces erroneous results @@ -1824,7 +2928,7 @@ commit daf10480d57cad7641a3395a2b49acee10335739 Author: su-v -Date: Sat Jan 24 03:22:56 2015 +0100 +Date: Sat Jan 24 03:22:56 2015 +0100 autogen.sh: also look for automake 1.15 @@ -1833,7 +2937,7 @@ commit 597fae39b4911b6e6e201e711f6de86cb6548f10 Author: Michael Henning -Date: Tue Aug 11 16:20:59 2015 -0400 +Date: Tue Aug 11 16:20:59 2015 -0400 Bug 736411 - Ruler updates cause slowdown when painting @@ -1850,7 +2954,7 @@ commit 3138ebde3a20e377c8b5dda58e31fe52de7ae170 Author: Pedro Albuquerque -Date: Wed Aug 12 11:58:27 2015 +0000 +Date: Wed Aug 12 11:58:27 2015 +0000 Updated Portuguese translation @@ -1860,7 +2964,7 @@ commit 59c0f0a64d9569b3db56c0f78e5f575681124484 Author: Pedro Albuquerque -Date: Sat Aug 8 05:54:50 2015 +0000 +Date: Sat Aug 8 05:54:50 2015 +0000 Updated Portuguese translation @@ -1870,7 +2974,7 @@ commit a50765821c83763ecadd685cac2e4e7612ba1029 Author: Pedro Albuquerque -Date: Fri Jul 24 18:52:20 2015 +0000 +Date: Fri Jul 24 18:52:20 2015 +0000 Updated Portuguese translation @@ -1880,20 +2984,20 @@ commit c90fa08af1bf9e2d82d4e9a0a3828cc2adae6c8a Author: Daniel Martinez -Date: Thu Jul 23 12:12:19 2015 +0200 +Date: Thu Jul 23 12:12:19 2015 +0200 Update Aragonese translation po-libgimp/an.po | 63 +++++++++----------------- po-plug-ins/an.po | 50 ++++++++++----------- po-python/an.po | 4 +- - po/an.po | 131 + po/an.po | 131 ++++++++++++++++++++++++++---------------------------- 4 files changed, 113 insertions(+), 135 deletions(-) commit 30e5d71ba929bd835b8f5f9eb023775a5f9707a9 Author: Pedro Albuquerque -Date: Thu Jul 23 07:53:30 2015 +0000 +Date: Thu Jul 23 07:53:30 2015 +0000 Updated Portuguese translation @@ -1903,7 +3007,7 @@ commit f78556a44263ccc6c7ed8d522d1ff50c19650b5b Author: Pedro Albuquerque -Date: Thu Jul 23 07:49:48 2015 +0000 +Date: Thu Jul 23 07:49:48 2015 +0000 Updated Portuguese translation @@ -1913,7 +3017,7 @@ commit 9c5a66f929198f5f001052600a2e8cd354bb0ef7 Author: Pedro Albuquerque -Date: Thu Jul 23 07:45:50 2015 +0000 +Date: Thu Jul 23 07:45:50 2015 +0000 Updated Portuguese translation @@ -1923,7 +3027,7 @@ commit 53e5084a361523c810851e43cb2d1d2781133e1c Author: Michael Natterer -Date: Tue Jul 21 19:24:45 2015 +0200 +Date: Tue Jul 21 19:24:45 2015 +0200 Bug 752582 - Error message when refreshing resources without... @@ -1940,7 +3044,7 @@ commit 1fc061aa469c1a70288907bbb02c371fc0c1f4d3 Author: Nils Philippsen -Date: Fri Jul 17 17:07:18 2015 +0200 +Date: Fri Jul 17 17:07:18 2015 +0200 Ref/unref dialog->image around saving as well... @@ -1956,7 +3060,7 @@ commit f60570b3125c8dfd73b531c51ecf0017f2e5b1f0 Author: Nils Philippsen -Date: Thu Jul 16 14:18:55 2015 +0200 +Date: Thu Jul 16 14:18:55 2015 +0200 tests: link against -lm @@ -1965,12 +3069,12 @@ (cherry picked from commit 9171de3b80735cd608b5ac099c67deb5b9ccaf1f) app/config/Makefile.am | 8 +++++++- - app/tests/Makefile.am | 8 +++++++- + app/tests/Makefile.am | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) commit 670fb5602d097be5b53654ff100dbd98bc11cb28 Author: Michael Natterer -Date: Mon Feb 16 19:35:00 2015 +0100 +Date: Mon Feb 16 19:35:00 2015 +0100 app: link against -lm, whatever new linker version seems to need is @@ -1981,7 +3085,7 @@ commit 908f4e69d656e5a1cd4b23310a16e287e8ae72f7 Author: Michael Natterer -Date: Tue Jul 14 13:22:06 2015 +0200 +Date: Tue Jul 14 13:22:06 2015 +0200 Bug 739003 - Crashes in file_save_dialog_response() @@ -1996,7 +3100,7 @@ commit d7f1187e5b6df44e43455eca9f486e9ead1b1dcb Author: Michael Natterer -Date: Sat Jul 4 14:04:35 2015 +0200 +Date: Sat Jul 4 14:04:35 2015 +0200 Bug 751645 - tagbox dialog not showing lower tags @@ -2010,7 +3114,7 @@ commit 76ad66cdf00c405979504c7aebb417b413e28e55 Author: Michael Natterer -Date: Fri Jul 3 19:37:30 2015 +0200 +Date: Fri Jul 3 19:37:30 2015 +0200 app: factor out a function in GimpEditSelectionTool, and move one around @@ -2025,7 +3129,7 @@ commit 6b2ebecfc7e345c176f5a2768b2d6dfba9a7f546 Author: Michael Natterer -Date: Fri Jul 3 12:26:32 2015 +0200 +Date: Fri Jul 3 12:26:32 2015 +0200 app: free GimpEditSelectionTool's stuff in finalize() @@ -2037,7 +3141,7 @@ commit 1ca0f2ec98f9643e2a1798ad0afc17b8b2168d1c Author: Massimo Valentini -Date: Tue Jun 30 19:49:53 2015 +0200 +Date: Tue Jun 30 19:49:53 2015 +0200 Bug 751089: Part PNG files are not opened properly @@ -2048,7 +3152,7 @@ commit 7395e05614b0ecc42d5597396b39e3d88e5dd32e Author: Michael Natterer -Date: Sun Jun 28 23:48:47 2015 +0200 +Date: Sun Jun 28 23:48:47 2015 +0200 app: remove the "exclude" paameter from gimp_image_item_list_get_list() @@ -2064,15 +3168,15 @@ app/core/gimpimage-item-list.c | 19 +++++-------------- app/core/gimpimage-item-list.h | 4 +--- - app/core/gimpimage-resize.c | 2 +- - app/core/gimpimage-scale.c | 4 ++-- - app/core/gimpitem-linked.c | 21 ++++++++++----------- + app/core/gimpimage-resize.c | 2 +- + app/core/gimpimage-scale.c | 4 ++-- + app/core/gimpitem-linked.c | 21 ++++++++++----------- app/tools/gimpeditselectiontool.c | 28 ++++++++++++---------------- 6 files changed, 31 insertions(+), 47 deletions(-) commit b3e0e8327434cc8110e56f85530be100096ab38a Author: Michael Natterer -Date: Sat Jun 27 12:34:19 2015 +0200 +Date: Sat Jun 27 12:34:19 2015 +0200 Bug 735906 - Transform tools give unexpected results when transforming... @@ -2102,7 +3206,7 @@ commit a03d8c42e58bf9121c422ca49724f1fcfb0641d7 Author: Michael Natterer -Date: Fri Jun 26 13:35:07 2015 +0200 +Date: Fri Jun 26 13:35:07 2015 +0200 app: don't push an undo group if an item list transform has only one item @@ -2116,7 +3220,7 @@ commit 1a14fed7b5fca05180ec2ace392f6785f08fd0cd Author: Michael Natterer -Date: Fri Jun 26 12:05:14 2015 +0200 +Date: Fri Jun 26 12:05:14 2015 +0200 Bug 735906 - Transform tools give unexpected results when transforming... @@ -2131,28 +3235,28 @@ (cherry picked from commit 3c706d00c67d675bdb8c255b3fff88490fde82bc) - app/core/gimpitem-linked.c | 17 ++++++++++------- - app/pdb/layer-cmds.c | 37 + app/core/gimpitem-linked.c | 17 ++++++++++------- + app/pdb/layer-cmds.c | 37 ++++++++++++++++--------------------- app/tools/gimpeditselectiontool.c | 11 +++++++---- - tools/pdbgen/pdb/layer.pdb | 37 + tools/pdbgen/pdb/layer.pdb | 37 ++++++++++++++++--------------------- 4 files changed, 49 insertions(+), 53 deletions(-) commit e37b28baae24d8a0e49996fe93f6523dd5cc5c59 Author: Cédric Valmary -Date: Thu Jun 25 20:17:45 2015 +0000 +Date: Thu Jun 25 20:17:45 2015 +0000 Added Occitan translation po-tips/LINGUAS | 1 + - po-tips/oc.po | 327 + po-tips/oc.po | 327 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 328 insertions(+) commit 7144165eab7bbad04afc02a54bce38111461487f Author: Cédric Valmary -Date: Thu Jun 25 20:17:23 2015 +0000 +Date: Thu Jun 25 20:17:23 2015 +0000 Updated Occitan translation @@ -2161,7 +3265,7 @@ commit 5b35276b6fd0d3e855464bc43d39d38ff58b2fe1 Author: Cédric Valmary -Date: Thu Jun 25 20:08:37 2015 +0000 +Date: Thu Jun 25 20:08:37 2015 +0000 Updated Occitan translation @@ -2171,7 +3275,7 @@ commit af6cc5feaa90e806871b421526d04d6ff43bf840 Author: Cédric Valmary -Date: Thu Jun 25 19:58:20 2015 +0000 +Date: Thu Jun 25 19:58:20 2015 +0000 Updated Occitan translation @@ -2181,7 +3285,7 @@ commit 5627787e8531afe245e26da86bbfa815e813cb20 Author: Piotr Drąg -Date: Thu Jun 25 18:11:26 2015 +0200 +Date: Thu Jun 25 18:11:26 2015 +0200 Updated POTFILES.in @@ -2190,7 +3294,7 @@ commit d744c37557a3d4298cb74160c76d037723b9e1ac Author: Michael Natterer -Date: Thu Jun 25 12:25:41 2015 +0200 +Date: Thu Jun 25 12:25:41 2015 +0200 Bug 735906 - Transform tools give unexpected results when transforming... @@ -2219,16 +3323,16 @@ (cherry picked from commit 25a696c7f822864ebb35bcbfdb913a98032b0469) app/actions/drawable-commands.c | 26 ++++++-------- - app/core/gimpitem-linked.c | 77 + app/core/gimpitem-linked.c | 77 ++++++++++++++++++++++++----------------- - app/tools/gimpfliptool.c | 15 +++++--- - app/tools/gimptransformtool.c | 46 +++++++++++++----------- - po/POTFILES.in | 1 + + app/tools/gimpfliptool.c | 15 +++++--- + app/tools/gimptransformtool.c | 46 +++++++++++++----------- + po/POTFILES.in | 1 + 5 files changed, 92 insertions(+), 73 deletions(-) commit e44e53a84ba8d9ae56c14b899c070fda1af44f44 Author: Michael Natterer -Date: Wed Jun 24 19:40:54 2015 +0200 +Date: Wed Jun 24 19:40:54 2015 +0200 app: small fix for the previous patch in gimp_group_layer_update_size() @@ -2240,7 +3344,7 @@ commit d8edb0f21498f7af4749ace404aa720af04b189e Author: Balázs Úr -Date: Tue Jun 23 11:56:50 2015 +0000 +Date: Tue Jun 23 11:56:50 2015 +0000 Updated Hungarian translation @@ -2250,7 +3354,7 @@ commit e645b922bfe2d4029243011381c852cbcc9a398f Author: Michael Natterer -Date: Tue Jun 23 10:24:25 2015 +0200 +Date: Tue Jun 23 10:24:25 2015 +0200 app: fix update of group layers when size changes only trigger an offset change @@ -2267,7 +3371,7 @@ commit 26653680b52c99c445592d5320829637fee18e7d Author: Cédric Valmary -Date: Tue Jun 23 05:50:22 2015 +0000 +Date: Tue Jun 23 05:50:22 2015 +0000 Updated Occitan translation @@ -2277,7 +3381,7 @@ commit 9bb3da5ed5099566cc3e555859080f248dc0befe Author: Massimo Valentini -Date: Mon Jun 22 20:23:08 2015 +0200 +Date: Mon Jun 22 20:23:08 2015 +0200 Bug 751178: GIMP doesn't load fonts from folders... @@ -2286,14 +3390,14 @@ (cherry picked from commit f0028624df617c53e85229f36c0653eb7e078aa4) Conflicts: - app/text/gimp-fonts.c + app/text/gimp-fonts.c app/text/gimp-fonts.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) commit 9b2c6eb8c2bc4d235b4520bf5362faa65b546ac5 Author: Massimo Valentini -Date: Sun Jun 21 18:10:22 2015 +0200 +Date: Sun Jun 21 18:10:22 2015 +0200 Bug 749406 - Displace segfaults on launch @@ -2304,7 +3408,7 @@ commit afd4602957ae280e7b53187440cd416838bc68ba Author: Michael Natterer -Date: Sat Jun 20 22:04:03 2015 +0200 +Date: Sat Jun 20 22:04:03 2015 +0200 app: remove "remove_children" parameter from gimp_image_item_list_filter() @@ -2316,14 +3420,14 @@ app/core/gimpimage-item-list.c | 26 +++++++++++--------------- app/core/gimpimage-item-list.h | 3 +-- - app/core/gimpimage-scale.c | 2 +- - app/core/gimpitem-linked.c | 10 +++++----- + app/core/gimpimage-scale.c | 2 +- + app/core/gimpitem-linked.c | 10 +++++----- app/tools/gimpeditselectiontool.c | 12 ++++++------ 5 files changed, 24 insertions(+), 29 deletions(-) commit 5f41d750ec7a24698cda65f91c5f4870b27c7e48 Author: Michael Natterer -Date: Sat Jun 20 16:03:40 2015 +0200 +Date: Sat Jun 20 16:03:40 2015 +0200 app: remove "remove_locked" parameter from gimp_image_item_list_filter() @@ -2334,14 +3438,14 @@ app/core/gimpimage-item-list.c | 18 +----------------- app/core/gimpimage-item-list.h | 3 +-- - app/core/gimpimage-scale.c | 2 +- - app/core/gimpitem-linked.c | 10 +++++----- + app/core/gimpimage-scale.c | 2 +- + app/core/gimpitem-linked.c | 10 +++++----- app/tools/gimpeditselectiontool.c | 18 ++++++------------ 5 files changed, 14 insertions(+), 37 deletions(-) commit 753e60791aa93e1bd5806cb085c2626305f187df Author: Cédric Valmary -Date: Thu Jun 18 05:23:41 2015 +0000 +Date: Thu Jun 18 05:23:41 2015 +0000 Updated Occitan translation @@ -2351,7 +3455,7 @@ commit f2405277820c09a131f3b90a7f0b0d9209643d31 Author: Michael Natterer -Date: Mon Jun 15 00:11:13 2015 +0200 +Date: Mon Jun 15 00:11:13 2015 +0200 Bug 750953 - The Curves dialog should present per channel lines... @@ -2374,7 +3478,7 @@ commit 8fdbb5b5a301d4951d64a165487275e795eb66bf Author: Michael Natterer -Date: Sun Jun 14 22:57:46 2015 +0200 +Date: Sun Jun 14 22:57:46 2015 +0200 libgimpwidgets: fix registration of GimpRuler's "unit" property @@ -2388,7 +3492,7 @@ commit 8fc54e2d0443a78a3392aac2103e771100e6dc6e Author: Cédric Valmary -Date: Sun Jun 14 12:30:58 2015 +0000 +Date: Sun Jun 14 12:30:58 2015 +0000 Updated Occitan translation @@ -2398,7 +3502,7 @@ commit fb34d738f6d5f10e8c707244a5046f6c139c4b24 Author: Jehan -Date: Thu Jun 11 19:33:58 2015 +0200 +Date: Thu Jun 11 19:33:58 2015 +0200 Bug 750556 - validate a tree cell modification on focus out. @@ -2414,7 +3518,7 @@ commit c0e10bfd69b80cf0c127261bb3ea039532d0ab6b Author: Cédric Valmary -Date: Fri Jun 12 12:53:13 2015 +0000 +Date: Fri Jun 12 12:53:13 2015 +0000 Updated Occitan translation @@ -2424,7 +3528,7 @@ commit 6280cd04fa4d417aa94d628acc7f8e7b98b20798 Author: Daniel Mustieles -Date: Mon Jun 8 16:13:12 2015 +0000 +Date: Mon Jun 8 16:13:12 2015 +0000 Updated Spanish translation @@ -2434,7 +3538,7 @@ commit 5b2bdbdba3c480d344c22a801a9b05258e9e5c71 Author: Cédric Valmary -Date: Sun Jun 7 19:53:15 2015 +0000 +Date: Sun Jun 7 19:53:15 2015 +0000 Updated Occitan translation @@ -2444,7 +3548,7 @@ commit bb9f0794d7a08c711f4e44ac2fabcab7f1726cc3 Author: Michael Natterer -Date: Sat Jun 6 23:05:10 2015 +0200 +Date: Sat Jun 6 23:05:10 2015 +0200 Bug 749777 - Deleting current gradient from script leads to... @@ -2461,7 +3565,7 @@ commit 2d03ff740f9ee0698ef4511dd2fb193169599b7a Author: Dušan Kazik -Date: Sat Jun 6 14:17:10 2015 +0000 +Date: Sat Jun 6 14:17:10 2015 +0000 Updated Slovak translation @@ -2471,7 +3575,7 @@ commit d16010cd30f3b41604fd3abb7f351a7b59552e06 Author: Dušan Kazik -Date: Sat Jun 6 14:14:03 2015 +0000 +Date: Sat Jun 6 14:14:03 2015 +0000 Updated Slovak translation @@ -2481,7 +3585,7 @@ commit 7eca6c23c3861605847fdfec1b8433796433d781 Author: Dušan Kazik -Date: Sat Jun 6 14:10:04 2015 +0000 +Date: Sat Jun 6 14:10:04 2015 +0000 Updated Slovak translation @@ -2491,7 +3595,7 @@ commit 5c1889c4e5ebf475538e762a7000c72e2a9d2dce Author: Michael Natterer -Date: Sun May 31 00:31:40 2015 +0200 +Date: Sun May 31 00:31:40 2015 +0200 Bug 749777 - Deleting current gradient from script leads to... @@ -2507,36 +3611,36 @@ commit 74e9ea17d5ac5d4aa12320678a15838ba8b13dac Author: Cédric Valmary -Date: Fri May 29 20:18:29 2015 +0000 +Date: Fri May 29 20:18:29 2015 +0000 Added Occitan translation po-tags/LINGUAS | 1 + - po-tags/oc.po | 30 ++++++++++++++++++++++++++++++ + po-tags/oc.po | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) commit 45a09012115c210651303bd8866c2a183367194f Author: Daniel Martinez -Date: Thu May 28 11:38:42 2015 +0200 +Date: Thu May 28 11:38:42 2015 +0200 Updated Aragonese translation - po-libgimp/LINGUAS | 1 + - po-libgimp/an.po | 2114 ++++++++ - po-plug-ins/LINGUAS | 1 + + po-libgimp/LINGUAS | 1 + + po-libgimp/an.po | 2114 ++++++++ + po-plug-ins/LINGUAS | 1 + po-plug-ins/an.po | 14101 ++++++++++++++++++++++++++++++++++++++++++++++++++ - po-python/LINGUAS | 1 + - po-python/an.po | 345 ++ - po-script-fu/an.po | 4 +- - po-tags/an.po | 4 +- - po-tips/an.po | 22 +- - po/an.po | 153 +- + po-python/LINGUAS | 1 + + po-python/an.po | 345 ++ + po-script-fu/an.po | 4 +- + po-tags/an.po | 4 +- + po-tips/an.po | 22 +- + po/an.po | 153 +- 10 files changed, 16667 insertions(+), 79 deletions(-) commit 9594734133846e33534c51461da99325dbcf6891 Author: Jordi Mas -Date: Wed May 27 21:58:09 2015 +0200 +Date: Wed May 27 21:58:09 2015 +0200 Update Cataln translation @@ -2546,7 +3650,7 @@ commit 103adbc36a7df5bcd1a035d167800a7a9601388a Author: Marco Ciampa -Date: Mon May 25 08:43:57 2015 +0200 +Date: Mon May 25 08:43:57 2015 +0200 Updated Italian translation @@ -2556,7 +3660,7 @@ commit 33721145c85d9e4b43da4c0e3b2cae1dcd285959 Author: Dimitris Spingos -Date: Mon May 25 11:10:59 2015 +0300 +Date: Mon May 25 11:10:59 2015 +0300 Updated Greek translation @@ -2566,7 +3670,7 @@ commit c31ff768caa415b93d7f1c50e35e89ed02ec982a Author: Jordi Mas -Date: Sun May 24 17:15:05 2015 +0200 +Date: Sun May 24 17:15:05 2015 +0200 Update Catalan translation @@ -2576,7 +3680,7 @@ commit 6f6ac15e50f772ef0abf755af320019abbd1d347 Author: Jordi Mas -Date: Sun May 24 17:11:51 2015 +0200 +Date: Sun May 24 17:11:51 2015 +0200 Update Catalan translation @@ -2586,7 +3690,7 @@ commit 24a1bfb71f1b5b1a42101130843dd2176b894864 Author: Cédric Valmary -Date: Fri May 22 21:25:30 2015 +0000 +Date: Fri May 22 21:25:30 2015 +0000 Updated Occitan translation @@ -2596,7 +3700,7 @@ commit d2b2e03f9bff59754532bb8ac0f8dd4fe2457397 Author: Jordi Mas -Date: Fri May 22 06:01:12 2015 +0200 +Date: Fri May 22 06:01:12 2015 +0200 Add Catalan translation for the win32 installer @@ -2606,7 +3710,7 @@ commit 318df747a11832baaa5a33d68740127cd59cf5a8 Author: Jehan -Date: Sat Dec 14 10:26:55 2013 +1300 +Date: Sat Dec 14 10:26:55 2013 +1300 app: update a comment for translators. @@ -2623,7 +3727,7 @@ commit a349f33d1f753c29523b673c1511e999f6f2ba45 Author: Michael Natterer -Date: Thu May 21 18:41:35 2015 +0200 +Date: Thu May 21 18:41:35 2015 +0200 Bug 749675 - gimp-2.8-doc job fails for undefined reference... @@ -2636,7 +3740,7 @@ commit dbf654d66b1c38c0982cd3688642f3003475b214 Author: Cédric Valmary -Date: Wed May 20 20:11:30 2015 +0000 +Date: Wed May 20 20:11:30 2015 +0000 Updated Occitan translation @@ -2646,7 +3750,7 @@ commit 844d855c9d524983eacbb8cd2f3bdf5211030561 Author: Dušan Kazik -Date: Tue May 12 07:48:00 2015 +0000 +Date: Tue May 12 07:48:00 2015 +0000 Updated Slovak translation @@ -2655,7 +3759,7 @@ commit 4f32c496cf7e4ea70b21b54b79cd10ccf6bd2aee Author: Thomas Manni -Date: Fri May 8 20:25:55 2015 +0200 +Date: Fri May 8 20:25:55 2015 +0200 Bug 749133 - Named buffer: "Paste selected buffer as a new image" does not work when there is no image @@ -2667,7 +3771,7 @@ commit 8f1a4e8b190d0cf855d2058bb1eb272b5d7efd83 Author: Adrian Likins -Date: Thu May 7 00:10:17 2015 -0400 +Date: Thu May 7 00:10:17 2015 -0400 Bug 748472 - Velocity Parameter on .GIH Brushes don't works @@ -2683,7 +3787,7 @@ commit e9b4fb163b207fcfef7ccfbdb95f39a680ddace7 Author: Simon Budig -Date: Mon May 4 20:03:02 2015 +0200 +Date: Mon May 4 20:03:02 2015 +0200 Bug 738952 - Invalid syntax for (cond) causes a segfault @@ -2694,7 +3798,7 @@ commit d2814a641637e9380d791650936c708779f9fbe2 Author: Piotr Drąg -Date: Sat May 2 17:37:11 2015 +0200 +Date: Sat May 2 17:37:11 2015 +0200 Updated Polish translation @@ -2704,7 +3808,7 @@ commit bfd8def5c02e303657a39323e13fe2497591fa1c Author: Michael Natterer -Date: Sat May 2 00:00:39 2015 -0400 +Date: Sat May 2 00:00:39 2015 -0400 Bug 748762 - GIMP crashes when a selection is outside a layer boundary... @@ -2722,7 +3826,7 @@ commit a4dfe7c0559d239744ef0142e0c5cb072bfa57ec Author: Michael Natterer -Date: Fri May 1 19:43:16 2015 -0400 +Date: Fri May 1 19:43:16 2015 -0400 NEWS: cosmetic fixes for the cosmetic fixes @@ -2731,7 +3835,7 @@ commit 3b0fd1dcd902f7731853132a8a2dd66707fed89c Author: Alexandre Prokoudine -Date: Thu Apr 30 02:40:25 2015 +0300 +Date: Thu Apr 30 02:40:25 2015 +0300 Cosmetic fixes to NEWS @@ -2740,7 +3844,7 @@ commit 36d6f724da8189156219f57475a0c0b46e504694 Author: Michael Natterer -Date: Wed Apr 29 18:57:39 2015 -0400 +Date: Wed Apr 29 18:57:39 2015 -0400 Bug 748505 - Don't do nothing and report no error when trying to open a fifo @@ -2759,12 +3863,12 @@ (cherry picked from commit 2480d693416dd2011e9440f0dfae49a1c236d6f4) app/dialogs/file-open-dialog.c | 12 ------------ - app/file/file-open.c | 17 ++++++++++------- + app/file/file-open.c | 17 ++++++++++------- 2 files changed, 10 insertions(+), 19 deletions(-) commit d7108fbac503ae3c115ee1c6166e230c5db5d75c Author: Sveinn í Felli -Date: Wed Apr 29 14:27:15 2015 +0000 +Date: Wed Apr 29 14:27:15 2015 +0000 Updated Icelandic translation @@ -2773,7 +3877,7 @@ commit 8e506cf9465933b8eb648c5bacd679e00dc8a3b0 Author: Sveinn í Felli -Date: Wed Apr 29 12:01:51 2015 +0000 +Date: Wed Apr 29 12:01:51 2015 +0000 Updated Icelandic translation @@ -2783,7 +3887,7 @@ commit bb0da3b4102b1ecfa310d48e496126f4e1681734 Author: Michael Natterer -Date: Tue Apr 28 09:33:38 2015 -0400 +Date: Tue Apr 28 09:33:38 2015 -0400 NEWS: fix style @@ -2792,7 +3896,7 @@ commit 8754a060bdf76d0bd9af4542af5fc3009c4a2f8f Author: Massimo Valentini -Date: Tue Apr 28 07:18:41 2015 +0200 +Date: Tue Apr 28 07:18:41 2015 +0200 Revert "app: properly sample lanczos kernel luts" @@ -2805,7 +3909,7 @@ commit bcddc02b3737bf1773735ac1935d52518a25f74d Author: Michael Natterer -Date: Mon Apr 27 23:10:05 2015 -0400 +Date: Mon Apr 27 23:10:05 2015 -0400 NEWS: updates @@ -2814,20 +3918,20 @@ commit 51ffd4fe109d24f8b7d912cda2d200354dd538a5 Author: Daniel Martinez -Date: Mon Apr 27 23:24:37 2015 +0200 +Date: Mon Apr 27 23:24:37 2015 +0200 Added Aragonese translations for general UI and script-fu po-script-fu/LINGUAS | 1 + po-script-fu/an.po | 297 + - po/LINGUAS | 1 + - po/an.po | 16190 + po/LINGUAS | 1 + + po/an.po | 16190 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 16489 insertions(+) commit 40512895d9e80c25175c6834e15da74bc1136ea6 Author: Massimo Valentini -Date: Sun May 11 10:36:53 2014 +0200 +Date: Sun May 11 10:36:53 2014 +0200 Bug 698859: PSD import filter: opening a PSD file causes... @@ -2843,20 +3947,20 @@ commit 654cf7f157b30ec75339bb65b3ae3f5a5be3c349 Author: Daniel Martinez -Date: Wed Apr 22 13:36:06 2015 +0200 +Date: Wed Apr 22 13:36:06 2015 +0200 Added Aragonese translation for tags and tips po-tags/LINGUAS | 1 + - po-tags/an.po | 30 ++++++ + po-tags/an.po | 30 ++++++ po-tips/LINGUAS | 1 + - po-tips/an.po | 324 + po-tips/an.po | 324 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 356 insertions(+) commit afab779aef1ab5583387131d6fc3d9a957eba76d Author: Sveinn í Felli -Date: Mon Apr 20 13:46:18 2015 +0000 +Date: Mon Apr 20 13:46:18 2015 +0000 Updated Icelandic translation @@ -2866,7 +3970,7 @@ commit df7969c08d531c1c310c85d132b30321e838a47e Author: Michael Natterer -Date: Tue Apr 14 20:08:17 2015 +0200 +Date: Tue Apr 14 20:08:17 2015 +0200 Bug 564697 - Recomposing 'YCbCrITU R470 256' and 'YCbCrITU R709 256'... @@ -2882,7 +3986,7 @@ commit 6faa39a3b2e026a8056189fb9b16d5360f3f9a79 Author: Mukund Sivaraman -Date: Mon Apr 13 00:17:06 2015 +0530 +Date: Mon Apr 13 00:17:06 2015 +0530 windows: Call SetDLLDirectory() in the app @@ -2894,13 +3998,13 @@ (cherry picked from commit 60197c227db92c7cf927927a3b7b2d39aaf622b1) - app/main.c | 34 ++++++++++++++++++++++++++++++++++ + app/main.c | 34 ++++++++++++++++++++++++++++++++++ libgimp/gimp.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) commit 7b7921a3198fee59d7a58824c4198575ddaf0907 Author: Michael Natterer -Date: Mon Apr 6 20:01:39 2015 +0200 +Date: Mon Apr 6 20:01:39 2015 +0200 Bug 686862 - Seek less when saving XCF files @@ -2916,7 +4020,7 @@ commit 54a1b39a91b0dcaeb58d3f16c958cd203df9edd6 Author: Sveinn í Felli -Date: Thu Apr 9 11:45:00 2015 +0000 +Date: Thu Apr 9 11:45:00 2015 +0000 Updated Icelandic translation @@ -2926,7 +4030,7 @@ commit 009a7b10cee9a851b2272e6cda7783fe2c29d211 Author: Michael Natterer -Date: Thu Apr 9 01:12:43 2015 +0200 +Date: Thu Apr 9 01:12:43 2015 +0200 Bug 746649 - Duplicate auto-saved presets for color tools @@ -2938,15 +4042,15 @@ app/gegl/gimpbrightnesscontrastconfig.c | 46 ++++++++++++++++++++++++------- - app/gegl/gimpcolorizeconfig.c | 48 + app/gegl/gimpcolorizeconfig.c | 48 ++++++++++++++++++++++++++------- - app/gegl/gimpthresholdconfig.c | 46 + app/gegl/gimpthresholdconfig.c | 46 ++++++++++++++++++++++++------- 3 files changed, 113 insertions(+), 27 deletions(-) commit fe43d9976bd88b1e629afdeb4519b5467a843206 Author: Mattias Põldaru -Date: Wed Apr 8 20:40:20 2015 +0300 +Date: Wed Apr 8 20:40:20 2015 +0300 [l10n] Updated Estonian translation @@ -2955,7 +4059,7 @@ commit aa9ff011723cbb64dcc58bf3b51e6588c6755e50 Author: Mattias Põldaru -Date: Wed Apr 8 20:37:28 2015 +0300 +Date: Wed Apr 8 20:37:28 2015 +0300 [l10n] Updated Estonian translation @@ -2965,7 +4069,7 @@ commit dee9444360bb8ae6522af9937fd080b2b5598384 Author: Mattias Põldaru -Date: Wed Apr 8 20:36:49 2015 +0300 +Date: Wed Apr 8 20:36:49 2015 +0300 [l10n] Updated Estonian translation @@ -2975,7 +4079,7 @@ commit 08f808a528dd7d221db7544461fec28d8ceeee6f Author: Mattias Põldaru -Date: Wed Apr 8 20:36:12 2015 +0300 +Date: Wed Apr 8 20:36:12 2015 +0300 [l10n] Updated Estonian translation @@ -2985,7 +4089,7 @@ commit 8badfb90fea4b6280543b39f3163d77b42dc7fb5 Author: Mattias Põldaru -Date: Wed Apr 8 20:35:23 2015 +0300 +Date: Wed Apr 8 20:35:23 2015 +0300 [l10n] Updated Estonian translation @@ -2995,7 +4099,7 @@ commit 26abee02b05226755a951cd07fde20d24c7a7781 Author: Mattias Põldaru -Date: Wed Apr 8 20:34:23 2015 +0300 +Date: Wed Apr 8 20:34:23 2015 +0300 [l10n] Updated Estonian translation @@ -3005,7 +4109,7 @@ commit 15101a37a37137cd9967221506ba64db801bfaf8 Author: Mattias Põldaru -Date: Wed Apr 8 20:33:49 2015 +0300 +Date: Wed Apr 8 20:33:49 2015 +0300 [l10n] Updated Estonian translation @@ -3015,7 +4119,7 @@ commit 357ae8ba2a50d89c61a81ce2410edbccd862eb51 Author: Милош Поповић -Date: Wed Apr 1 16:31:30 2015 +0000 +Date: Wed Apr 1 16:31:30 2015 +0000 Updated Serbian translation @@ -3025,7 +4129,7 @@ commit 8f3373dba8981522540cf7cbf3d060a9f07cb712 Author: Baurzhan Muftakhidinov -Date: Mon Mar 30 07:07:30 2015 +0000 +Date: Mon Mar 30 07:07:30 2015 +0000 Updated Kazakh translation @@ -3035,7 +4139,7 @@ commit 3357fb5777be345aede4dd83f64e7115e4ca2c3b Author: Stas Solovey -Date: Mon Mar 23 16:38:54 2015 +0000 +Date: Mon Mar 23 16:38:54 2015 +0000 Updated Russian translation @@ -3045,7 +4149,7 @@ commit a626d314ecf7f86317f14ebe8a93b8ba7534730a Author: Samir Ribic -Date: Sat Mar 14 13:39:41 2015 +0000 +Date: Sat Mar 14 13:39:41 2015 +0000 Added Bosnian translation @@ -3056,18 +4160,18 @@ commit 430693eb736229d533ec5e081562412eedad5b2d Author: Samir Ribic -Date: Sat Mar 14 13:39:23 2015 +0000 +Date: Sat Mar 14 13:39:23 2015 +0000 Added Bosnian translation po-tips/LINGUAS | 1 + - po-tips/bs.po | 305 + po-tips/bs.po | 305 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 306 insertions(+) commit b2e5a6fcfd6c3c9a09c58dd5f6adf0f87cb91883 Author: Samir Ribic -Date: Sat Mar 14 13:35:57 2015 +0000 +Date: Sat Mar 14 13:35:57 2015 +0000 Updated Bosnian translation @@ -3077,7 +4181,7 @@ commit d5904dd5c45bc795c3684c1346a13ee4b0bfe42b Author: Samir Ribic -Date: Sat Mar 14 13:35:36 2015 +0000 +Date: Sat Mar 14 13:35:36 2015 +0000 Added Bosnian translation @@ -3088,50 +4192,50 @@ commit 6ad0a837e4f33df12534941b898801119d3c07a4 Author: Samir Ribic -Date: Sat Mar 14 13:35:18 2015 +0000 +Date: Sat Mar 14 13:35:18 2015 +0000 Added Bosnian translation po-tags/LINGUAS | 1 + - po-tags/bs.po | 27 +++++++++++++++++++++++++++ + po-tags/bs.po | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) commit ec1bfb35dd40ff90deb94411e586d83067a5784a Author: Samir Ribic -Date: Sat Mar 14 13:33:45 2015 +0000 +Date: Sat Mar 14 13:33:45 2015 +0000 Added Bosnian translation - po-plug-ins/LINGUAS | 1 + + po-plug-ins/LINGUAS | 1 + po-plug-ins/bs.po | 13029 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 13030 insertions(+) commit 760b9e92143e1739634d26c57037ffaa579bc455 Author: Samir Ribic -Date: Fri Mar 13 23:02:39 2015 +0000 +Date: Fri Mar 13 23:02:39 2015 +0000 Added Bosnian translation - po/LINGUAS | 1 + + po/LINGUAS | 1 + po/bs.po | 18167 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 18168 insertions(+) commit 632060ceed7db3fc8315eb9e3964d848e15bba8e Author: Samir Ribic -Date: Fri Mar 13 22:57:51 2015 +0000 +Date: Fri Mar 13 22:57:51 2015 +0000 Added Bosnian translation - po-libgimp/LINGUAS | 1 + + po-libgimp/LINGUAS | 1 + po-libgimp/bs.po | 18167 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 18168 insertions(+) commit 39007dd2aac8186ffeb1b26639e48963f606fe9c Author: Michael Natterer -Date: Wed Mar 4 22:32:07 2015 +0100 +Date: Wed Mar 4 22:32:07 2015 +0100 Bug 742821 - Grayscale-mode image malformed when exported as planar raw image data @@ -3147,7 +4251,7 @@ commit 621f5e296def8159020201b06f544517624f767d Author: Joao S. O. Bueno -Date: Thu Feb 26 11:29:07 2015 -0300 +Date: Thu Feb 26 11:29:07 2015 -0300 openraster: Implements exporting and loading group layers. @@ -3163,7 +4267,7 @@ openraster spec. Conflicts: - plug-ins/pygimp/plug-ins/file-openraster.py + plug-ins/pygimp/plug-ins/file-openraster.py plug-ins/pygimp/plug-ins/file-openraster.py | 151 ++++++++++++++++++++++------ @@ -3171,7 +4275,7 @@ commit 1ffac928c5014f228b395b045f402dd0ac300511 Author: Cheng-Chia Tseng -Date: Fri Feb 27 14:57:28 2015 +0000 +Date: Fri Feb 27 14:57:28 2015 +0000 Updated Chinese (Taiwan) translation @@ -3181,7 +4285,7 @@ commit 677ccd4246578dda416bcced3555ec36273be0ff Author: Michael Natterer -Date: Fri Feb 27 09:50:34 2015 +0100 +Date: Fri Feb 27 09:50:34 2015 +0100 Bug 745126 - gimp_preview_area_blend() fails for RGBA image... @@ -3199,7 +4303,7 @@ commit 6bbae6da7a28b9ec630e8f38c7f84ad9df02f8e8 Author: John Ralls -Date: Mon Feb 23 15:12:33 2015 -0800 +Date: Mon Feb 23 15:12:33 2015 -0800 Fix clang complaining about missing void in function prototypes. @@ -3209,7 +4313,7 @@ commit 1601c9123fb1c8488c524755171c07336a6848b6 Author: João S. O. Bueno -Date: Sun Feb 22 12:47:47 2015 -0300 +Date: Sun Feb 22 12:47:47 2015 -0300 openraster: filesystem encoding could return None - defaults to utf-8 @@ -3218,7 +4322,7 @@ commit 0e1c51eca55948a95b97f6482e55938053222126 Author: João S. O. Bueno -Date: Sun Feb 15 14:23:39 2015 -0200 +Date: Sun Feb 15 14:23:39 2015 -0200 Bug 743612: Takes the filesystem encoding in consideration @@ -3228,7 +4332,7 @@ commit a90bae398fabb0ca7c1a777771a36195e3edaaa1 Author: Dušan Kazik -Date: Sun Feb 22 07:45:40 2015 +0000 +Date: Sun Feb 22 07:45:40 2015 +0000 Updated Slovak translation @@ -3238,7 +4342,7 @@ commit 74352ca2caba0c5c68ec8a143ad135508609b605 Author: Michael Natterer -Date: Thu Feb 19 21:18:21 2015 +0100 +Date: Thu Feb 19 21:18:21 2015 +0100 Bug 744127 - Restore tab hover delay during drag-n-drops @@ -3277,7 +4381,7 @@ commit ae3d1f9c2fb3256498576b31593c454b04dbb0cf Author: Joao S. O. Bueno -Date: Tue Feb 10 11:55:30 2015 -0200 +Date: Tue Feb 10 11:55:30 2015 -0200 Fix PF_LAYER always being passed as a Layer, even if object is a LayerGroup @@ -3287,7 +4391,7 @@ commit ad2b01279589d50c4a09d6939f0a47b5855fd51e Author: Anders Jonsson -Date: Sun Feb 8 12:58:55 2015 +0000 +Date: Sun Feb 8 12:58:55 2015 +0000 Updated Swedish translation @@ -3297,7 +4401,7 @@ commit ccb65c8a9cc3bdb874cac3f2d2e9d77d317f880b Author: Inaki Larranaga Murgoitio -Date: Sat Feb 7 15:59:39 2015 +0100 +Date: Sat Feb 7 15:59:39 2015 +0100 Updated Basque language @@ -3307,7 +4411,7 @@ commit 2cff478eaf894fd367856e554ee1077b4deea179 Author: Inaki Larranaga Murgoitio -Date: Sat Feb 7 15:50:46 2015 +0100 +Date: Sat Feb 7 15:50:46 2015 +0100 Updated Basque language @@ -3316,7 +4420,7 @@ commit 3177443a6721fea85849cbc4460d9475cb81f773 Author: Inaki Larranaga Murgoitio -Date: Sat Feb 7 15:48:16 2015 +0100 +Date: Sat Feb 7 15:48:16 2015 +0100 Updated Basque language @@ -3325,7 +4429,7 @@ commit 58ac33ad24dec112d98527fb74386d2fc224a61f Author: Inaki Larranaga Murgoitio -Date: Sat Feb 7 15:43:58 2015 +0100 +Date: Sat Feb 7 15:43:58 2015 +0100 Updated Basque language @@ -3335,7 +4439,7 @@ commit 38622454b6715098f8f767f21ff0368e68236d62 Author: Inaki Larranaga Murgoitio -Date: Sat Feb 7 15:40:28 2015 +0100 +Date: Sat Feb 7 15:40:28 2015 +0100 Updated Basque language @@ -3344,7 +4448,7 @@ commit 2e02570d6661bfa470023e1c28cb0222881f18a9 Author: Inaki Larranaga Murgoitio -Date: Sat Feb 7 15:36:45 2015 +0100 +Date: Sat Feb 7 15:36:45 2015 +0100 Updated Basque language @@ -3354,7 +4458,7 @@ commit d05d315f8e08a73ddd3df15c9743e0965a7a4d61 Author: Inaki Larranaga Murgoitio -Date: Sat Feb 7 15:32:30 2015 +0100 +Date: Sat Feb 7 15:32:30 2015 +0100 Updated Basque language @@ -3364,7 +4468,7 @@ commit a41a27fe530b012de3851bbbbc54cda6c4b68803 Author: Inaki Larranaga Murgoitio -Date: Sat Feb 7 15:26:42 2015 +0100 +Date: Sat Feb 7 15:26:42 2015 +0100 Updated Basque language @@ -3374,7 +4478,7 @@ commit 5575b519ac3c805c44dc27e4e762836462943ca7 Author: Sveinn í Felli -Date: Thu Feb 5 13:13:34 2015 +0000 +Date: Thu Feb 5 13:13:34 2015 +0000 Updated Icelandic translation @@ -3384,7 +4488,7 @@ commit e4e016c9f1cddd7a1146d40bbe02d44263e4ecbe Author: Sveinn í Felli -Date: Wed Feb 4 18:26:09 2015 +0000 +Date: Wed Feb 4 18:26:09 2015 +0000 Updated Icelandic translation @@ -3394,7 +4498,7 @@ commit 9d6c4685a9abba0947464e5e4ad0ff6cf04ab3d5 Author: Massimo Valentini -Date: Tue Feb 3 18:33:12 2015 +0100 +Date: Tue Feb 3 18:33:12 2015 +0100 Bug 742775: Crash when editing text with certain fonts @@ -3405,7 +4509,7 @@ commit af5c9307d796328ed048b8f844ddc1b3c0e0e344 Author: GNOME Translation Robot -Date: Tue Feb 3 07:54:04 2015 +0000 +Date: Tue Feb 3 07:54:04 2015 +0000 Updated Chinese (Taiwan) translation @@ -3415,7 +4519,7 @@ commit 63382d8b1d0e2b3cb879fef08d4d1a5c19de48c3 Author: Christian Kirbach -Date: Thu Jan 29 18:03:38 2015 +0000 +Date: Thu Jan 29 18:03:38 2015 +0000 Updated German translation @@ -3425,7 +4529,7 @@ commit 37921372cd5e059edb5a2e1380c56f067ad8d255 Author: Sveinn í Felli -Date: Thu Jan 29 16:18:20 2015 +0000 +Date: Thu Jan 29 16:18:20 2015 +0000 Updated Icelandic translation @@ -3435,7 +4539,7 @@ commit cca7f6f8a3ca04dae46adbe9858ad377dde113fd Author: Massimo Valentini -Date: Wed Jan 28 19:31:32 2015 +0100 +Date: Wed Jan 28 19:31:32 2015 +0100 Bug 681895: PDF export does not save fonts properly @@ -3447,14 +4551,14 @@ (cherry picked from commit a215fbda56381db42730d70d809628c86adc3711) Conflicts: - plug-ins/common/file-pdf-save.c + plug-ins/common/file-pdf-save.c plug-ins/common/file-pdf-save.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) commit 40722eeaff31b1efb6271e3b72eb5095dd4df011 Author: Marco Ciampa -Date: Wed Jan 28 14:51:00 2015 +0100 +Date: Wed Jan 28 14:51:00 2015 +0100 Updated italian translation. @@ -3464,7 +4568,7 @@ commit 79e56a8b46b55dafe0129aeb18f6971377943e5d Author: Sveinn í Felli -Date: Mon Jan 26 15:30:36 2015 +0000 +Date: Mon Jan 26 15:30:36 2015 +0000 Updated Icelandic translation @@ -3474,7 +4578,7 @@ commit 00fb9fe50e9d867b420bde7098a2a77b44746962 Author: Michael Natterer -Date: Sun Jan 25 16:13:04 2015 +0100 +Date: Sun Jan 25 16:13:04 2015 +0100 Bug 742159 - Empty gradient in loaded tool preset @@ -3491,7 +4595,7 @@ commit 1e2ebd6699a64964ce45956cb4695a6c4f0b79f8 Author: Inaki Larranaga Murgoitio -Date: Tue Jan 20 21:19:05 2015 +0100 +Date: Tue Jan 20 21:19:05 2015 +0100 Updated Basque language @@ -3501,7 +4605,7 @@ commit d9d1f8f2b6c4a43ecb7431f371f0de4224703310 Author: Inaki Larranaga Murgoitio -Date: Tue Jan 20 21:14:38 2015 +0100 +Date: Tue Jan 20 21:14:38 2015 +0100 Updated Basque language @@ -3510,7 +4614,7 @@ commit 7d2634ab0d93376b44ba5d2355f8e76281bc060d Author: Inaki Larranaga Murgoitio -Date: Tue Jan 20 21:13:58 2015 +0100 +Date: Tue Jan 20 21:13:58 2015 +0100 Updated Basque language @@ -3520,7 +4624,7 @@ commit 6c8250efdc7a1f8911f9f3234d9c8878892301e1 Author: Inaki Larranaga Murgoitio -Date: Tue Jan 20 21:10:25 2015 +0100 +Date: Tue Jan 20 21:10:25 2015 +0100 Updated Basque language @@ -3530,7 +4634,7 @@ commit d3002c8c8031f0c192e29d193fadcd0667362744 Author: Sveinn í Felli -Date: Thu Jan 15 17:11:49 2015 +0000 +Date: Thu Jan 15 17:11:49 2015 +0000 Updated Icelandic translation @@ -3540,7 +4644,7 @@ commit 864c724cae75f42296130159e1752c761c03ee25 Author: Sveinn í Felli -Date: Thu Jan 15 13:20:01 2015 +0000 +Date: Thu Jan 15 13:20:01 2015 +0000 Updated Icelandic translation @@ -3550,7 +4654,7 @@ commit 3f1f3429d7c0c99913b2e8e966b809f83c0ebdee Author: Sveinn í Felli -Date: Thu Jan 15 13:01:14 2015 +0000 +Date: Thu Jan 15 13:01:14 2015 +0000 Updated Icelandic translation @@ -3560,7 +4664,7 @@ commit bfa620c119a2dad0f3a2254742940c8b3661f675 Author: Sveinn í Felli -Date: Thu Jan 15 12:39:32 2015 +0000 +Date: Thu Jan 15 12:39:32 2015 +0000 Updated Icelandic translation @@ -3570,7 +4674,7 @@ commit 3d2c4629fe684ceacadee97675105fd7e7d55aa1 Author: GNOME Translation Robot -Date: Thu Jan 15 12:24:54 2015 +0000 +Date: Thu Jan 15 12:24:54 2015 +0000 Updated Icelandic translation @@ -3580,7 +4684,7 @@ commit 8de8583064cd1586109c4a8bb3d7ce9e331e5776 Author: Massimo Valentini -Date: Wed Dec 3 07:44:45 2014 +0100 +Date: Wed Dec 3 07:44:45 2014 +0100 Bug 736411 - Ruler updates cause slowdown when painting @@ -3594,7 +4698,7 @@ commit a4b4957599d4b0181e307576c3d7cb6d422eed9a Author: Sveinn í Felli -Date: Sat Jan 10 14:23:57 2015 +0000 +Date: Sat Jan 10 14:23:57 2015 +0000 Updated Icelandic translation @@ -3604,17 +4708,17 @@ commit 049a68bebda0d6d22fcddfc219c4792df003e2e2 Author: Sveinn í Felli -Date: Sat Jan 10 14:14:14 2015 +0000 +Date: Sat Jan 10 14:14:14 2015 +0000 Added Icelandic translation po-tags/LINGUAS | 1 + - po-tags/is.po | 30 ++++++++++++++++++++++++++++++ + po-tags/is.po | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) commit 29400ec242487af405ea9d6e61171998ec9cb672 Author: Sveinn í Felli -Date: Sat Jan 10 14:05:59 2015 +0000 +Date: Sat Jan 10 14:05:59 2015 +0000 Updated Icelandic translation @@ -3624,7 +4728,7 @@ commit ac9fdad83a9b8c4da0150ce65b3dedc5d517bbc8 Author: Kristian Rietveld -Date: Fri Jan 9 22:53:19 2015 +0100 +Date: Fri Jan 9 22:53:19 2015 +0100 Bug 736746 - Alt+Number only switches to lower-numbered windows @@ -3641,7 +4745,7 @@ commit 440a045986fc7f2863ed25ae7ffdc879571d0e7b Author: Michael Natterer -Date: Thu Jan 8 21:13:41 2015 +0100 +Date: Thu Jan 8 21:13:41 2015 +0100 Bug 742202 - new layer/path dialog opens always in the upper left corner @@ -3657,7 +4761,7 @@ commit 04c26457e31e0e5f4d375c5f3ce303d2d88543da Author: Michael Natterer -Date: Sat Jan 3 17:22:50 2015 +0100 +Date: Sat Jan 3 17:22:50 2015 +0100 Bug 742229 - "pixels" entries get added to unit menus on each popup @@ -3673,7 +4777,7 @@ commit ffa998d487582eb19125956835699f380bd18fd5 Author: Mukund Sivaraman -Date: Sat Dec 20 23:11:12 2014 +0530 +Date: Sat Dec 20 23:11:12 2014 +0530 file-tga: Use the colormap origin / first entry index field @@ -3683,7 +4787,7 @@ commit 9741a811ec87c696c07ec65830cb3848ded68492 Author: Muhammet Kara -Date: Fri Dec 12 14:08:59 2014 +0000 +Date: Fri Dec 12 14:08:59 2014 +0000 Updated Turkish translation @@ -3693,7 +4797,7 @@ commit 0553cbc08496995438b8ed96ddcdf0c3d98da1e7 Author: Muhammet Kara -Date: Fri Dec 12 14:04:49 2014 +0000 +Date: Fri Dec 12 14:04:49 2014 +0000 Updated Turkish translation @@ -3702,7 +4806,7 @@ commit cdeb117cc5973bdb3c301bc507459a813ed2f2c0 Author: Muhammet Kara -Date: Fri Dec 12 13:52:49 2014 +0000 +Date: Fri Dec 12 13:52:49 2014 +0000 Updated Turkish translation @@ -3712,7 +4816,7 @@ commit 774b8af405859513c9a4dec107e6594326c9772b Author: Muhammet Kara -Date: Fri Dec 12 13:35:50 2014 +0000 +Date: Fri Dec 12 13:35:50 2014 +0000 Updated Turkish translation @@ -3722,7 +4826,7 @@ commit daa3ddce8a7ec55781f36d9169a062a501baaf46 Author: Anders Jonsson -Date: Thu Dec 11 20:07:12 2014 +0000 +Date: Thu Dec 11 20:07:12 2014 +0000 Updated Swedish translation @@ -3732,7 +4836,7 @@ commit a43119bbab49359ee478b6634d9332e16622b6dc Author: Muhammet Kara -Date: Thu Dec 11 19:13:06 2014 +0000 +Date: Thu Dec 11 19:13:06 2014 +0000 Updated Turkish translation @@ -3742,21 +4846,21 @@ commit cd9e8785548d68509d7579781486f227d2aa9a56 Author: Massimo Valentini -Date: Thu Dec 11 18:37:49 2014 +0100 +Date: Thu Dec 11 18:37:49 2014 +0100 Bug 741352: Cage tool crashes pressing Enter after Esc (cherry picked from commit af64a104c39551534ac9c90bd8b6c624502e95d7) Conflicts: - app/tools/gimpcagetool.c + app/tools/gimpcagetool.c app/tools/gimpcagetool.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit 948e7a209dce3adfb574f44cd9b8a39a6d2fc08f Author: Massimo Valentini -Date: Tue Dec 9 18:13:35 2014 +0100 +Date: Tue Dec 9 18:13:35 2014 +0100 Bug 741179: Export does not remember compression of input... @@ -3772,7 +4876,7 @@ commit 350300c55a8df81e9be8c9ecdf6aa1e10e2db3c6 Author: Massimo Valentini -Date: Thu Dec 4 18:33:54 2014 +0100 +Date: Thu Dec 4 18:33:54 2014 +0100 Bug 740193: Foreground selection causes segfault @@ -3786,7 +4890,7 @@ commit cd73f9841749d47bd5efac2285cec734fa3becf9 Author: André Schutten -Date: Wed Dec 3 17:49:58 2014 +0100 +Date: Wed Dec 3 17:49:58 2014 +0100 Updated Dutch translation gimp-2-8 @@ -3796,7 +4900,7 @@ commit 7b62d0fe860538bbec048babb0a261ae65dd30d4 Author: André Schutten -Date: Wed Dec 3 17:49:44 2014 +0100 +Date: Wed Dec 3 17:49:44 2014 +0100 Updated Dutch translation gimp-2-8 @@ -3805,7 +4909,7 @@ commit d292d22beef71b67ff3b69574b425e6f5c4d9ef6 Author: André Schutten -Date: Wed Dec 3 17:49:06 2014 +0100 +Date: Wed Dec 3 17:49:06 2014 +0100 Updated Dutch translation gimp-2-8 @@ -3815,7 +4919,7 @@ commit 07023d6d2afad772a77937ca1fbb11096a475dc5 Author: André Schutten -Date: Wed Dec 3 17:48:34 2014 +0100 +Date: Wed Dec 3 17:48:34 2014 +0100 Updated Dutch translation gimp-2-8 @@ -3825,7 +4929,7 @@ commit 59ce8367ae80e32e12e92f954104183516412de6 Author: André Schutten -Date: Wed Dec 3 17:48:16 2014 +0100 +Date: Wed Dec 3 17:48:16 2014 +0100 Updated Dutch translation gimp-2-8 @@ -3835,7 +4939,7 @@ commit 6ccb01eac3589a1b81a76c00a5297e9d54137df6 Author: André Schutten -Date: Wed Dec 3 17:47:44 2014 +0100 +Date: Wed Dec 3 17:47:44 2014 +0100 Updated Dutch translation gimp-2-8 @@ -3845,7 +4949,7 @@ commit a01856d82066446b8b85ec9bfba2e104d52cc5a4 Author: Michael Natterer -Date: Sun Nov 30 23:45:46 2014 +0100 +Date: Sun Nov 30 23:45:46 2014 +0100 Bug 733839 - Crashes on scaling a layer with mask within a group @@ -3858,7 +4962,7 @@ commit dad54b67c1267db6b294004a5c2900a505558785 Author: Saul Goode -Date: Fri Oct 31 12:13:07 2014 -0400 +Date: Fri Oct 31 12:13:07 2014 -0400 Bug 739457 - Some errors not detected for GIMP_PDB_COLOR arguments @@ -3871,7 +4975,7 @@ commit d6c18b2a99d07f9ee76e8123c25c82cecba90d59 Author: Michael Natterer -Date: Sat Nov 29 12:52:26 2014 +0100 +Date: Sat Nov 29 12:52:26 2014 +0100 libgimpwidgets: make GimpColorSelection's main_hbox expand vertically @@ -3885,7 +4989,7 @@ commit 069bb4b078f19a327965ebf2b898eb48736317e4 Author: Michael Natterer -Date: Fri Nov 28 23:57:06 2014 +0100 +Date: Fri Nov 28 23:57:06 2014 +0100 Bug 740059 - Text tool changes from "Dynamic" to "Fixed"... @@ -3902,7 +5006,7 @@ commit 4bdfb6e27c51a424cf501e678660f213a724feec Author: Michael Natterer -Date: Sun Nov 23 20:52:15 2014 +0100 +Date: Sun Nov 23 20:52:15 2014 +0100 Bug 739775 - Select->Distort activates topmost layer @@ -3916,7 +5020,7 @@ commit 2d79330b648ff2b12fda0e05f0ea8b537168f48b Author: Dimitris Spingos -Date: Sun Nov 23 23:09:49 2014 +0200 +Date: Sun Nov 23 23:09:49 2014 +0200 Updated Greek translation @@ -3926,19 +5030,19 @@ commit e84f5909e86a9de414dee14438f0426cfdb2e392 Author: Rūdolfs Mazurs -Date: Sun Nov 23 19:08:05 2014 +0200 +Date: Sun Nov 23 19:08:05 2014 +0200 Updated Latvian translation po-plug-ins/lv.po | 351 +++-- po-script-fu/lv.po | 4128 ++++++++++++++++++++-------------------------------- - po/lv.po | 771 +++++----- + po/lv.po | 771 +++++----- 3 files changed, 2184 insertions(+), 3066 deletions(-) commit 2b404b0cd00bc0b8dcf3f4ca4d96fca3523224bf Author: Téo Mazars -Date: Sat Nov 22 08:47:21 2014 +0100 +Date: Sat Nov 22 08:47:21 2014 +0100 Bug 681140 - Filter Render/Line Nova: renders in black instead... @@ -3951,7 +5055,7 @@ commit 3f03cd93665e64f4e200a8b10f43c4766d578bde Author: Daniel Mustieles -Date: Wed Nov 19 13:36:15 2014 +0100 +Date: Wed Nov 19 13:36:15 2014 +0100 Updated Spanish translation @@ -3961,7 +5065,7 @@ commit 57603055c32a34b52d351cf7fb08a60c7f6ee428 Author: Saul Goode -Date: Sat Nov 15 18:28:42 2014 -0500 +Date: Sat Nov 15 18:28:42 2014 -0500 Bug 740203 - Textured Logo scripts inappropriately defines a global @@ -3972,7 +5076,7 @@ commit 42208d0a82775dec2302a41d29002b98d8aa862a Author: Timo Jyrinki -Date: Sun Nov 16 20:00:06 2014 +0200 +Date: Sun Nov 16 20:00:06 2014 +0200 Single Finnish translation string update. @@ -3981,7 +5085,7 @@ commit 6060c3a972a448ea2a18dfb25d8aac5393460540 Author: Lasse Liehu -Date: Sat Nov 15 13:16:17 2014 +0200 +Date: Sat Nov 15 13:16:17 2014 +0200 Finnish translation update @@ -3992,7 +5096,7 @@ commit 7a500bbe2570ff5d77ea7810f0bfae1a3d5373d8 Author: Андрій Бандура -Date: Tue Nov 11 21:12:52 2014 +0000 +Date: Tue Nov 11 21:12:52 2014 +0000 Updated Ukrainian translation @@ -4002,7 +5106,7 @@ commit e34a97a46b27f77dfd436d79a7a11e9fbde25788 Author: Michael Natterer -Date: Sat Nov 1 15:00:08 2014 +0100 +Date: Sat Nov 1 15:00:08 2014 +0100 Bug 739486 - Enter doesn't confirm "export image as brush" @@ -4016,7 +5120,7 @@ commit 949e90e2a7de306a3563e01acefaae6efa03fc76 Author: Mikael Magnusson -Date: Wed Oct 29 21:01:00 2014 +0100 +Date: Wed Oct 29 21:01:00 2014 +0100 libgimpconfig: fix if condition @@ -4028,7 +5132,7 @@ commit 6189fa98489c6965c6ba8cc5ef2454176651663b Author: Mikael Magnusson -Date: Wed Oct 29 21:16:31 2014 +0100 +Date: Wed Oct 29 21:16:31 2014 +0100 gfig: close file on parse errors @@ -4039,7 +5143,7 @@ commit ed7896a8387760c7a540b86182a087a519b3e4af Author: Michael Natterer -Date: Wed Oct 29 23:30:45 2014 +0100 +Date: Wed Oct 29 23:30:45 2014 +0100 Bug 567333 - Using tab to toggle docked "utility windows" does not... @@ -4056,7 +5160,7 @@ commit 13f02f1cb5e9b89800da937cfebbb944f1e70fc0 Author: Sven Claussner -Date: Sun Oct 26 12:54:41 2014 +0100 +Date: Sun Oct 26 12:54:41 2014 +0100 Jenkins tutorial: fix file permissions @@ -4067,7 +5171,7 @@ commit c1ffb054d8a735782e90c71d36bdf18a29b6ffc4 Author: Sven Claussner -Date: Sun Oct 26 12:49:55 2014 +0100 +Date: Sun Oct 26 12:49:55 2014 +0100 Update Jenkins tutorial @@ -4079,7 +5183,7 @@ commit 7a09c0f44971b5663b9c677929a15a1fd52796c8 Author: Jehan -Date: Wed Jul 3 19:44:53 2013 +0900 +Date: Wed Jul 3 19:44:53 2013 +0900 Bug 675436 - Tabs always present when docks shown and absent when docks hidden @@ -4093,14 +5197,14 @@ (cherry picked from commit 816f651b8277ee9720c52a13f7abd3a074dc82dc) app/display/gimpdisplayshell.c | 11 ++++++++++- - app/display/gimpimagewindow.c | 45 + app/display/gimpimagewindow.c | 45 +++++++++++++++++++++++++++++++----------- - app/display/gimpimagewindow.h | 2 ++ + app/display/gimpimagewindow.h | 2 ++ 3 files changed, 45 insertions(+), 13 deletions(-) commit 21869f257d0bf753dac9c4ad0853a73cc5961fe9 Author: Mukund Sivaraman -Date: Mon Oct 20 10:22:16 2014 +0530 +Date: Mon Oct 20 10:22:16 2014 +0530 file-jpeg: Improve description of file-jpeg-save args (#738443) @@ -4111,7 +5215,7 @@ commit 29d1695911590cfa70c92602be6e3957828f64f4 Author: Michael Natterer -Date: Fri Oct 17 19:12:05 2014 +0200 +Date: Fri Oct 17 19:12:05 2014 +0200 Bug 738329 - xcf_seek_pos() can cause unexpected OS behavior @@ -4127,13 +5231,13 @@ app/xcf/xcf-save.c | 133 +++++++++++++++++++++++++++++++++------------------- - app/xcf/xcf-write.c | 27 +++++++++++ - app/xcf/xcf-write.h | 35 +++++++------- + app/xcf/xcf-write.c | 27 +++++++++++ + app/xcf/xcf-write.h | 35 +++++++------- 3 files changed, 130 insertions(+), 65 deletions(-) commit bc298871dc176bf42121336eaa5541eff7882610 Author: Michael Natterer -Date: Wed Oct 15 23:21:34 2014 +0200 +Date: Wed Oct 15 23:21:34 2014 +0200 app: remove xcf_seek_end(), it's unused, and should not be used any longer @@ -4146,7 +5250,7 @@ commit 02c3b5e360c73767afa367b06f1cf9c9ed01e024 Author: Alexandre Prokoudine -Date: Mon Oct 13 02:02:26 2014 +0400 +Date: Mon Oct 13 02:02:26 2014 +0400 Updated Russian translation @@ -4156,7 +5260,7 @@ commit 1b04c23a13f8fe5e7abfa7b31b025ee5c38387c8 Author: Andika Triwidada -Date: Sat Oct 11 09:31:10 2014 +0000 +Date: Sat Oct 11 09:31:10 2014 +0000 Updated Indonesian translation @@ -4166,7 +5270,7 @@ commit b2ef624e2645b6cb90974d36a7a5df5a7a45258f Author: Michael Natterer -Date: Thu Oct 9 22:45:58 2014 +0200 +Date: Thu Oct 9 22:45:58 2014 +0200 app: revert xcf_write_int8() to work like in 2.8.10, and fix its return value @@ -4182,7 +5286,7 @@ commit 8b6f2751f2b02493c80096ff2eca0d4221da3c5f Author: Michael Natterer -Date: Thu Oct 9 22:35:15 2014 +0200 +Date: Thu Oct 9 22:35:15 2014 +0200 Revert "Use the online help by default" @@ -4196,12 +5300,12 @@ app/config/gimpguiconfig.c | 2 +- build/osx/custom/gimprc | 4 +--- - etc/gimprc | 2 +- + etc/gimprc | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) commit f548021605fb81db653d915aae9e116584b3ae28 Author: Michael Natterer -Date: Tue Oct 7 13:22:19 2014 +0200 +Date: Tue Oct 7 13:22:19 2014 +0200 Bug 738037 - Wrong order of parameters in the Sobel plugin @@ -4215,7 +5319,7 @@ commit 2c3b4a4ffb3232e8ba5cd439b2633697208ecbea Author: Mukund Sivaraman -Date: Fri Oct 3 11:58:42 2014 +0530 +Date: Fri Oct 3 11:58:42 2014 +0530 file-bmp: Use cleaner serialization (sign) @@ -4226,7 +5330,7 @@ commit ba410efe363adf627cc710575de181cd90506382 Author: Mukund Sivaraman -Date: Fri Oct 3 11:10:26 2014 +0530 +Date: Fri Oct 3 11:10:26 2014 +0530 file-bmp: Fix final bfSize patched into BMP header (#737669) @@ -4237,7 +5341,7 @@ commit 90b7f24190d5f2d7934742de17ddc5560a01a5ef Author: Michael Natterer -Date: Wed Oct 1 00:26:48 2014 +0200 +Date: Wed Oct 1 00:26:48 2014 +0200 Bug 737583 - Fix static placement of Chinese IME window @@ -4249,12 +5353,12 @@ app/tools/gimptexttool-editor.c | 39 +++++++++++++++++++++++++++++++++++++++ app/tools/gimptexttool-editor.h | 1 + - app/tools/gimptexttool.c | 8 +++++++- + app/tools/gimptexttool.c | 8 +++++++- 3 files changed, 47 insertions(+), 1 deletion(-) commit 7e658a61db2d5b2c7ca3631ca0fdcec157e27383 Author: Michael Natterer -Date: Sat Sep 27 23:48:39 2014 +0200 +Date: Sat Sep 27 23:48:39 2014 +0200 Bug 735505 - Weird Characters in Zoom Button @@ -4268,7 +5372,7 @@ commit bb3e3768d17c7e625d8435892645752188e36bb0 Author: Mukund Sivaraman -Date: Fri Sep 26 09:01:47 2014 +0530 +Date: Fri Sep 26 09:01:47 2014 +0530 file-gif-load: Fix proto (Bug #737375) @@ -4279,7 +5383,7 @@ commit 2fd04aca7875f41a03fa0dd2c210da1ed183a2e3 Author: Mukund Sivaraman -Date: Fri Sep 26 08:49:59 2014 +0530 +Date: Fri Sep 26 08:49:59 2014 +0530 file-gif-load: Try to use as much as possible of broken GIF file (Bug #737375) @@ -4287,7 +5391,7 @@ (cherry picked from commit 68cb57d97e62ee07a0391652a1de3d9a9de95f47) Conflicts: - plug-ins/common/file-gif-load.c + plug-ins/common/file-gif-load.c plug-ins/common/file-gif-load.c | 91 +++++++++++++++++++++++------------------ @@ -4295,7 +5399,7 @@ commit c9192d25c761a6ae555a97702f17c1d31329e28b Author: Mukund Sivaraman -Date: Fri Sep 26 00:20:01 2014 +0530 +Date: Fri Sep 26 00:20:01 2014 +0530 file-pdf-save: Fix param index (Bug #736281) @@ -4306,7 +5410,7 @@ commit 90f13f4f429586842f95a2c28dd1e836c487022a Author: Mukund Sivaraman -Date: Thu Sep 25 23:49:11 2014 +0530 +Date: Thu Sep 25 23:49:11 2014 +0530 file-gif-load: Fail early in several other places if GetDataBlocks() fails (Bug #737375) @@ -4319,7 +5423,7 @@ commit eb8947d5112ff2632d9f56275a85b7582cb83a27 Author: Mukund Sivaraman -Date: Thu Sep 25 22:48:33 2014 +0530 +Date: Thu Sep 25 22:48:33 2014 +0530 file-gif-load: Fail early if GetCode() fails (Bug #737375) @@ -4330,7 +5434,7 @@ commit e0e2b83005b29160ef9753b6e8f6cf43bc19f75d Author: Michael Natterer -Date: Thu Sep 25 00:24:34 2014 +0200 +Date: Thu Sep 25 00:24:34 2014 +0200 Bug 601139 - Gifg no longer usable with the new brush behavior @@ -4345,7 +5449,7 @@ commit 9d5a6d39fdd4a595ea8e61a54fdbbb2278ae1bc1 Author: Dušan Kazik -Date: Mon Sep 22 19:04:47 2014 +0000 +Date: Mon Sep 22 19:04:47 2014 +0000 Updated Slovak translation @@ -4355,7 +5459,7 @@ commit 563f334037f39c25f04e6061be5b494ba062502d Author: Sven Claussner -Date: Sun Sep 21 19:51:21 2014 +0200 +Date: Sun Sep 21 19:51:21 2014 +0200 Update OS X build README @@ -4368,7 +5472,7 @@ commit 6dd42b4abec938431e15ca685f6bd46cd87abc46 Author: Balázs Úr -Date: Sun Sep 21 11:17:29 2014 +0000 +Date: Sun Sep 21 11:17:29 2014 +0000 Updated Hungarian translation @@ -4378,7 +5482,7 @@ commit 7dda7a3ceb6ede592926c9400f31ff2c41c6fec3 Author: Michael Natterer -Date: Sun Sep 21 12:29:35 2014 +0200 +Date: Sun Sep 21 12:29:35 2014 +0200 Bug 737008 - Curve color always black @@ -4396,7 +5500,7 @@ commit 0f3b97d7c0225236f62087acf8a0ca628c5ed61a Author: Andika Triwidada -Date: Sun Sep 21 07:47:46 2014 +0000 +Date: Sun Sep 21 07:47:46 2014 +0000 Updated Indonesian translation @@ -4406,7 +5510,7 @@ commit b50835704edf8f79e8dfbb249369abb52027d6a7 Author: Balázs Úr -Date: Sat Sep 20 21:43:55 2014 +0000 +Date: Sat Sep 20 21:43:55 2014 +0000 Updated Hungarian translation @@ -4416,7 +5520,7 @@ commit 06d4d7cea49d0b26e2d117e516d14c51e8d2e0cd Author: Andika Triwidada -Date: Sat Sep 20 15:09:17 2014 +0000 +Date: Sat Sep 20 15:09:17 2014 +0000 Updated Indonesian translation @@ -4426,7 +5530,7 @@ commit d45a1cfb717e5b65a178def0ccf99cef8bd9f9a8 Author: Andika Triwidada -Date: Sat Sep 20 09:13:07 2014 +0000 +Date: Sat Sep 20 09:13:07 2014 +0000 Updated Indonesian translation @@ -4436,7 +5540,7 @@ commit f7e227ca73eedaed6b0cb84a2fae7f5a5aa31268 Author: Andika Triwidada -Date: Fri Sep 19 16:17:33 2014 +0000 +Date: Fri Sep 19 16:17:33 2014 +0000 Updated Indonesian translation @@ -4446,7 +5550,7 @@ commit 3a3e06e9ac39db17c1c7cf9502d2efe0e2faacdc Author: Michael Natterer -Date: Wed Sep 17 12:19:31 2014 +0200 +Date: Wed Sep 17 12:19:31 2014 +0200 app: revert destruction of formatting from commit 7a75d4df @@ -4458,7 +5562,7 @@ commit 79b98314eae2bf163627452182b7587f38014861 Author: Jehan -Date: Mon Sep 15 16:11:45 2014 +0200 +Date: Mon Sep 15 16:11:45 2014 +0200 app: do not crash when opening a file with unimplemented compression @@ -4480,7 +5584,7 @@ commit 4148594f82046ca093ec2668f4652107284d0e14 Author: Sven Claussner -Date: Sun Sep 14 15:15:35 2014 +0200 +Date: Sun Sep 14 15:15:35 2014 +0200 Fix garbled file permissions @@ -4488,12 +5592,12 @@ ef0ef921b8dcb49ee82acba6540b69e6617c65d9 app/widgets/gimplanguagestore-parser.c | 0 - build/osx/gimp-2.8-python.bundle | 0 + build/osx/gimp-2.8-python.bundle | 0 2 files changed, 0 insertions(+), 0 deletions(-) commit ef0ef921b8dcb49ee82acba6540b69e6617c65d9 Author: Sven Claussner -Date: Sun Sep 14 14:43:58 2014 +0200 +Date: Sun Sep 14 14:43:58 2014 +0200 Bug 721482 - Make language codes relocatable @@ -4508,13 +5612,13 @@ for it there. app/widgets/gimplanguagestore-parser.c | 2 +- - build/osx/gimp-2.8-python.bundle | 2 ++ - build/osx/gimp-master-python.bundle | 2 ++ + build/osx/gimp-2.8-python.bundle | 2 ++ + build/osx/gimp-master-python.bundle | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) commit 95c3afcab8a9854008cbbf38e6378293d7c24068 Author: Ville-Pekka Vainio -Date: Thu Sep 11 23:37:54 2014 +0300 +Date: Thu Sep 11 23:37:54 2014 +0300 Finnish translation update by Jiri Grönroos @@ -4524,7 +5628,7 @@ commit 2123871bad2ebb3ebf8c735d8cdd3100db1bd2a2 Author: Balázs Úr -Date: Thu Sep 11 18:01:41 2014 +0000 +Date: Thu Sep 11 18:01:41 2014 +0000 Updated Hungarian translation @@ -4534,7 +5638,7 @@ commit d217a0bb2a107cfa9cddc3d6c8dc3902b761ccea Author: Michael Natterer -Date: Wed Sep 10 00:09:28 2014 +0200 +Date: Wed Sep 10 00:09:28 2014 +0200 Bug 735904 - Zealous crop of an image with a selection duplicates image data @@ -4550,7 +5654,7 @@ commit b9c94f4215200d0a2b3ce53fe452261fc71fbe9d Author: Sven Claussner -Date: Tue Sep 9 23:30:17 2014 +0200 +Date: Tue Sep 9 23:30:17 2014 +0200 Fix typo @@ -4559,7 +5663,7 @@ commit d947baed9a525e7509dbd146b8d6265197234bb2 Author: Sven Claussner -Date: Mon Sep 8 19:14:29 2014 +0200 +Date: Mon Sep 8 19:14:29 2014 +0200 OS X build README fixes * use cp to backup user's .profile file instead of mv @@ -4573,7 +5677,7 @@ commit 3d79144c49a5b11a7d74158718b23b1ed2aa489a Author: Sven Claussner -Date: Tue Sep 9 23:25:32 2014 +0200 +Date: Tue Sep 9 23:25:32 2014 +0200 Bug 733525 - Make poppler-data a dependency of poppler @@ -4585,7 +5689,7 @@ commit b1c0b8b2e0c7d15ad07fe5aacbbfdcfcb088be68 Author: Jehan -Date: Sun Sep 7 16:31:12 2014 +0200 +Date: Sun Sep 7 16:31:12 2014 +0200 Bug 735828 - configure fails for python < 2.7. @@ -4601,7 +5705,7 @@ commit 9ff7837b5a206dd73f495dbe8c2060b2f8413c8c Author: su-v -Date: Fri Sep 5 23:18:13 2014 +0200 +Date: Fri Sep 5 23:18:13 2014 +0200 Bug 731446 - Files opened twice via command line @@ -4615,7 +5719,7 @@ commit ed42899041eb4948e492563bccdb5d44f07eb87f Author: Hartmut Kuhse -Date: Sun Aug 31 15:27:12 2014 +0200 +Date: Sun Aug 31 15:27:12 2014 +0200 app: erroneously dereferencing paint_options fixing commit 4d6640ff79ff13ae6d031da477a21c85119b2f15 @@ -4627,21 +5731,21 @@ commit c7c4475eaf578557e6413713ea911012900905d5 Author: Philippe Teuwen -Date: Thu Aug 28 19:27:51 2014 +0530 +Date: Thu Aug 28 19:27:51 2014 +0530 file-bmp: Use masks when BI_BITFIELDS method is found (cherry picked from commit 6e73a6278f306c976f068dfd18db9092819aa90d) Conflicts: - plug-ins/file-bmp/bmp-read.c + plug-ins/file-bmp/bmp-read.c plug-ins/file-bmp/bmp-read.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 121b4d1fa832f9b8caf268be66da5602b596cc29 Author: Mukund Sivaraman -Date: Thu Aug 28 19:27:07 2014 +0530 +Date: Thu Aug 28 19:27:07 2014 +0530 file-bmp: Print compression method in debug build @@ -4652,7 +5756,7 @@ commit 8cb079bab7daf7b3d0ee16184b1b2741a300853e Author: Mukund Sivaraman -Date: Thu Aug 28 19:21:53 2014 +0530 +Date: Thu Aug 28 19:21:53 2014 +0530 file-bmp: Fix format specifiers @@ -4663,7 +5767,7 @@ commit f6e7781c23fde6f18fbe4994241e6acd80f51efc Author: Michael Natterer -Date: Tue Aug 26 19:45:28 2014 +0200 +Date: Tue Aug 26 19:45:28 2014 +0200 configure.ac: post release version bump to 2.8.15 @@ -4672,20 +5776,20 @@ commit e62e6fe354669996e98c94fe0b55024e48f1f607 Author: Michael Natterer -Date: Tue Aug 26 19:01:15 2014 +0200 +Date: Tue Aug 26 19:01:15 2014 +0200 configure.ac, NEWS: release 2.8.14 The last release broke libtool versioning (gimp_interface_age), so we roll out 2.8.14 before any distro picks up 2.8.12. - NEWS | 9 +++++++++ + NEWS | 9 +++++++++ configure.ac | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) commit e99399e45b3c5464cde62e2fa7e4dba9bea5dec6 Author: Michael Natterer -Date: Mon Aug 25 22:38:43 2014 +0200 +Date: Mon Aug 25 22:38:43 2014 +0200 configure.ac: post release version bump to 2.8.13 @@ -4694,20 +5798,20 @@ commit c5fbf02a31cab9df4cb5d2cdd9c63cf6959829bf Author: Michael Natterer -Date: Mon Aug 25 21:49:53 2014 +0200 +Date: Mon Aug 25 21:49:53 2014 +0200 configure.ac: bump version to 2.8.12 And commit gimprc files that are regenerated by make dist. - configure.ac | 2 +- + configure.ac | 2 +- docs/gimprc.5.in | 10 ++-------- - etc/gimprc | 11 ++--------- + etc/gimprc | 11 ++--------- 3 files changed, 5 insertions(+), 18 deletions(-) commit d1d7643016f36e04298f3f860be07a3f58e4bca3 Author: Yuri Myasoedov -Date: Mon Aug 25 13:29:22 2014 +0400 +Date: Mon Aug 25 13:29:22 2014 +0400 Updated Russian translation: @@ -4718,7 +5822,7 @@ commit 5fff2b21d9f145b1dae51054d579a353e8eee148 Author: Christian Kirbach -Date: Mon Aug 25 09:15:54 2014 +0000 +Date: Mon Aug 25 09:15:54 2014 +0000 Updated German translation @@ -4728,7 +5832,7 @@ commit 1a13a714ab2ed79430d4d7a07b0cb493cae40593 Author: Michael Natterer -Date: Mon Aug 25 09:31:28 2014 +0200 +Date: Mon Aug 25 09:31:28 2014 +0200 Revert "app: add gimpmarshal.[ch] to DISTCLEANFILES" @@ -4743,7 +5847,7 @@ commit 2772c2d64e945a9b81692e509d1c3daf4c28862a Author: Michael Natterer -Date: Sun Aug 24 23:07:15 2014 +0200 +Date: Sun Aug 24 23:07:15 2014 +0200 app: add gimpmarshal.[ch] to DISTCLEANFILES @@ -4752,7 +5856,7 @@ commit fc0a0b828b68944aea521e41d776a94cd496c80e Author: Michael Natterer -Date: Sun Aug 24 16:35:32 2014 +0200 +Date: Sun Aug 24 16:35:32 2014 +0200 Bug 731384 - Truncated abr files causing Gimp to not load/crash @@ -4765,7 +5869,7 @@ commit d723ae6b3484a48afee621129b74bd4678f2d410 Author: Massimo Valentini -Date: Thu Aug 21 12:43:51 2014 +0200 +Date: Thu Aug 21 12:43:51 2014 +0200 Bug 732072: Image windows created by script-fu plug-ins... @@ -4783,7 +5887,7 @@ commit d5939fb26302358973e51afca72d969257d03f8b Author: Michael Natterer -Date: Wed Aug 20 17:24:57 2014 +0200 +Date: Wed Aug 20 17:24:57 2014 +0200 Makefile.am: Add gtk-doc.make to EXTRA_DIST @@ -4794,7 +5898,7 @@ commit 7fc822786fbb905674d5d4fd9493ffda1e6b45b9 Author: Michael Natterer -Date: Sun Aug 17 22:12:44 2014 +0200 +Date: Sun Aug 17 22:12:44 2014 +0200 Bug 706275 - "View/Snap to active path" doesn't snap to layer center... @@ -4811,7 +5915,7 @@ commit c828cfe8c668ad421325c30e912aad15b51f2678 Author: Mikael Magnusson -Date: Sat Aug 16 23:52:06 2014 +0200 +Date: Sat Aug 16 23:52:06 2014 +0200 NEWS: fix typo @@ -4820,7 +5924,7 @@ commit 6a1a40dc3e7f781d3dfc93b081bbbc1f1a8127c2 Author: Sven Claussner -Date: Sat Aug 16 17:34:59 2014 +0200 +Date: Sat Aug 16 17:34:59 2014 +0200 Jenkins tutorial: review and fix flaws @@ -4829,7 +5933,7 @@ commit 3644191055c6fe85b79fca410ee0517bdd92df0a Author: Michael Natterer -Date: Fri Aug 15 22:32:58 2014 +0200 +Date: Fri Aug 15 22:32:58 2014 +0200 NEWS: updates for 2.8.12 @@ -4838,7 +5942,7 @@ commit 48d093cf4cb479c364ce9b81870abbfd7e8bf899 Author: André Schutten -Date: Mon Aug 11 13:02:36 2014 +0200 +Date: Mon Aug 11 13:02:36 2014 +0200 Updated Dutch translation 2-8 @@ -4848,7 +5952,7 @@ commit ce79e65bad8d7fdb78ae9ca4a971a13c9af92943 Author: Marco Ciampa -Date: Fri Aug 8 17:10:51 2014 +0200 +Date: Fri Aug 8 17:10:51 2014 +0200 Added doap description translation in Italian. @@ -4859,7 +5963,7 @@ commit 6ab4c23bc645cbef58a8f229ac5045b221de837b Author: Piotr Drąg -Date: Thu Aug 7 22:02:30 2014 +0200 +Date: Thu Aug 7 22:02:30 2014 +0200 Updated Polish translation @@ -4868,7 +5972,7 @@ commit 165c01c8b110e27c42972ad478e0bbf7c7f228a7 Author: Sven Claussner -Date: Thu Aug 7 21:05:54 2014 +0200 +Date: Thu Aug 7 21:05:54 2014 +0200 Make gimp.doap compliant to the new DOAP file style (GUADEC 2014): * Add new mandatory fields 'description' and 'programming-language'. @@ -4879,14 +5983,14 @@ Unify description in gimp.doap and gimp.appdata.xml.in. - desktop/gimp.appdata.xml.in | 2 +- - gimp.doap | 48 + desktop/gimp.appdata.xml.in | 2 +- + gimp.doap | 48 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) commit 6fa627d47d0e57afe9846c4f72483e8377db3ede Author: Sven Claussner -Date: Tue Aug 5 21:15:02 2014 +0200 +Date: Tue Aug 5 21:15:02 2014 +0200 Bug 733525 - Add poppler-data package to the OS X build @@ -4901,7 +6005,7 @@ commit 2629e7f05200f285945c6509365566b6820caef9 Author: Sven Claussner -Date: Sat Aug 2 10:02:43 2014 +0200 +Date: Sat Aug 2 10:02:43 2014 +0200 Fix German translation issue @@ -4914,7 +6018,7 @@ commit 71bf6c46f18f3c038afa5b58b59977de34b2ea53 Author: Jehan -Date: Tue Jul 29 16:55:01 2014 +0000 +Date: Tue Jul 29 16:55:01 2014 +0000 plug-ins: use standard error on failed file descriptor in file-pdf-save. @@ -4928,7 +6032,7 @@ commit 8bbe2485e2bdfe5e4f900a53304cad51c454617f Author: Jehan -Date: Mon Jul 28 19:28:13 2014 +0000 +Date: Mon Jul 28 19:28:13 2014 +0000 Bug 733824 - PDF export fails without warning if open in other application. @@ -4943,7 +6047,7 @@ commit 027fc53bc3cb53a2235e89e0c16785c5d2633ac2 Author: Jehan -Date: Tue Jul 29 16:15:22 2014 +0000 +Date: Tue Jul 29 16:15:22 2014 +0000 INSTALL - add poppler-data as recommended data package. @@ -4954,7 +6058,7 @@ commit 6fa0bc30185ea5b19e6d2084bf2ad40137f7c5c2 Author: Jehan -Date: Tue Jul 22 18:20:02 2014 +0000 +Date: Tue Jul 22 18:20:02 2014 +0000 configure: warning when compiling with old fontconfig on Win32. @@ -4971,7 +6075,7 @@ commit 46726f5e2d6f40a33f3ed30dc3853cd165c37e1f Author: Jehan -Date: Fri May 30 00:55:01 2014 +0000 +Date: Fri May 30 00:55:01 2014 +0000 configure: search only Python 2 interpreter and headers. @@ -4979,15 +6083,15 @@ default installed Python. Search only for Python 2. (cherry picked from commit 6714a414a73bc6d6aac628a0048b9fddfe8f38c3) - INSTALL | 2 +- - configure.ac | 12 +-- + INSTALL | 2 +- + configure.ac | 12 +-- m4macros/pythondev.m4 | 210 +++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 217 insertions(+), 7 deletions(-) commit d3f94bee96cd764be0e9844fd8c795efd03bd395 Author: Jehan -Date: Fri May 30 00:12:12 2014 +0000 +Date: Fri May 30 00:12:12 2014 +0000 configure: clean out forgotten debug print. (cherry picked from commit f1fe8b9c2458fd27f1346adaaf0e456690793082) @@ -4997,18 +6101,18 @@ commit 9afa9a4c9e284bb2c91c31c80e64b1d96fe4abc5 Author: Marco Ciampa -Date: Fri Jul 25 18:37:10 2014 +0200 +Date: Fri Jul 25 18:37:10 2014 +0200 Updated italian translation po-plug-ins/it.po | 145 +++---- - po/it.po | 1104 + po/it.po | 1104 +++++++++++++++++++++++++++-------------------------- 2 files changed, 633 insertions(+), 616 deletions(-) commit f4562d96e432af4c1cfa5fc5e7af9b6fc67f1f3c Author: Sven Claussner -Date: Fri Jul 25 10:18:32 2014 +0200 +Date: Fri Jul 25 10:18:32 2014 +0200 OSX build: update GIMP 2.8 module @@ -5020,7 +6124,7 @@ commit cf451e7a1a43fc6bd3aa923137ca8f8f1b77b4c7 Author: Piotr Drąg -Date: Wed Jul 23 17:47:11 2014 +0200 +Date: Wed Jul 23 17:47:11 2014 +0200 Updated Polish translation @@ -5030,19 +6134,19 @@ commit aab16f7b62f48f103d7ffbdbf52c8c33577c28b6 Author: Sven Claussner -Date: Tue Jul 22 19:04:19 2014 +0200 +Date: Tue Jul 22 19:04:19 2014 +0200 Fix file permissions Replace 755 by 644 for text files. - build/osx/gimp.modules | 0 + build/osx/gimp.modules | 0 build/osx/launcher-master-python.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) commit 15b3fb4b1272a2434ef4243cc17498ef96763b96 Author: Sven Claussner -Date: Tue Jul 22 17:27:55 2014 +0200 +Date: Tue Jul 22 17:27:55 2014 +0200 Cleanup JHBuild configuration for OS X build @@ -5051,26 +6155,18 @@ Remove obsolete patches. Remove trailing whitespaces. - build/osx/gimp.modules | 42 +- - .../0001-libgcrypt-build-without-docs.patch | 35 - - ...ernationalization-of-App-menu-and-other-s.patch | Bin 41273 -> - 0 bytes - ...0003-Keep-separators-between-placeholders.patch | 30 - - ...-wrong-variable-substitution-in-configure.patch | 46 - - ...ssing-information-to-po-translation-files.patch | 2422 - ------------------- - ...ernationalization-of-App-menu-and-other-s.patch | Bin 0 -> - 41273 bytes - ...gmi2-keep-separators-between-placeholders.patch | 30 + - ...ssing-information-to-po-translation-files.patch | 2423 - ++++++++++++++++++++ - ...-wrong-variable-substitution-in-configure.patch | 46 + - .../osx/patches/libgcrypt-build-without-docs.patch | 35 + - 11 files changed, 2553 insertions(+), 2556 deletions(-) + build/osx/gimp.modules | 42 + ++++++++++----------- + ...rnationalization-of-App-menu-and-other-s.patch} | Bin + ...mi2-keep-separators-between-placeholders.patch} | 0 + ...sing-information-to-po-translation-files.patch} | 21 ++++++----- + ...wrong-variable-substitution-in-configure.patch} | 0 + ...cs.patch => libgcrypt-build-without-docs.patch} | 0 + 6 files changed, 30 insertions(+), 33 deletions(-) commit 7329ae0257ffd39313cc37718c5f09d6b5966f2a Author: Sven Claussner -Date: Mon Jul 21 20:19:51 2014 +0200 +Date: Mon Jul 21 20:19:51 2014 +0200 Apply menu separator bugfix @@ -5079,7 +6175,7 @@ commit c126cc0d6893f332d00b151249b0f7227d585d6e Author: Sven Claussner -Date: Sun Jul 20 21:38:36 2014 +0200 +Date: Sun Jul 20 21:38:36 2014 +0200 Update OS X build dependencies @@ -5091,7 +6187,7 @@ commit e1e8e19237937766f44c7fdf8c184b64dfe8492b Author: Massimo Valentini -Date: Tue Jul 15 19:55:37 2014 +0200 +Date: Tue Jul 15 19:55:37 2014 +0200 Bug 730211-Load XCF files with shifted layer offset table @@ -5109,7 +6205,7 @@ commit 1b2bdd458f618dc81126d70c0b6a20b9150084a6 Author: Sven Claussner -Date: Fri Jul 18 08:23:22 2014 +0200 +Date: Fri Jul 18 08:23:22 2014 +0200 Comment XCF saving code and test driver @@ -5120,7 +6216,7 @@ commit 0c2f431ec238765a7b7a2ab1597ee3f74f8cc00a Author: Sven Claussner -Date: Fri Jul 18 08:23:44 2014 +0200 +Date: Fri Jul 18 08:23:44 2014 +0200 Initialize constant zero=0 properly @@ -5132,28 +6228,28 @@ commit 0657a68d2ef18f9f8c67e9fad938406b1ff6f38f Author: Sven Claussner -Date: Thu Jul 17 21:00:21 2014 +0200 +Date: Thu Jul 17 21:00:21 2014 +0200 Add API-documentation, fixes Document XCF functions and a macro. Minor fixes - app/xcf/xcf-load.c | 15 +++--- - app/xcf/xcf-private.h | 111 + app/xcf/xcf-load.c | 15 +++--- + app/xcf/xcf-private.h | 111 +++++++++++++++++++++++++++++++++++++++++++ - app/xcf/xcf-read.c | 59 +++++++++++++++++++++++ - app/xcf/xcf-save.c | 38 ++++++++++++++- - app/xcf/xcf-seek.c | 27 +++++++++++ - app/xcf/xcf-write.c | 55 ++++++++++++++++++++- - app/xcf/xcf.c | 30 ++++++++++++ + app/xcf/xcf-read.c | 59 +++++++++++++++++++++++ + app/xcf/xcf-save.c | 38 ++++++++++++++- + app/xcf/xcf-seek.c | 27 +++++++++++ + app/xcf/xcf-write.c | 55 ++++++++++++++++++++- + app/xcf/xcf.c | 30 ++++++++++++ devel-docs/app/app-docs.sgml | 2 +- - devel-docs/xcf.txt | 8 ++++ + devel-docs/xcf.txt | 8 ++++ 9 files changed, 333 insertions(+), 12 deletions(-) commit 89c9c671c501b9151a0c70821f4293693413d008 Author: Sven Claussner -Date: Mon Jul 14 20:11:00 2014 +0200 +Date: Mon Jul 14 20:11:00 2014 +0200 Minor cleanups in xcf.txt @@ -5162,7 +6258,7 @@ commit 2e0d0bc24d5ed27eed4108ecc3b56494ae96749b Author: Sven Claussner -Date: Sun Jul 13 18:27:09 2014 +0200 +Date: Sun Jul 13 18:27:09 2014 +0200 XCF loader/saver: fix wrong 'locked' attribute in PROP_PATHS @@ -5176,7 +6272,7 @@ commit a83791be198a7e2fd45bc38ddf566283f8a7ab78 Author: Sven Claussner -Date: Sat Jul 12 07:26:36 2014 +0200 +Date: Sat Jul 12 07:26:36 2014 +0200 Review, amend and update the XCF file format spec and parasites.txt @@ -5200,14 +6296,14 @@ - Add table of contents devel-docs/compositing.txt | 274 +++++++ - devel-docs/parasites.txt | 62 +- - devel-docs/xcf.txt | 1841 + devel-docs/parasites.txt | 62 +- + devel-docs/xcf.txt | 1841 ++++++++++++++++++++++---------------------- 3 files changed, 1238 insertions(+), 939 deletions(-) commit ca0dc0ac99bfcbfa0308da89c8d7ad466725024e Author: Sven Claussner -Date: Sun Jul 6 08:35:59 2014 +0200 +Date: Sun Jul 6 08:35:59 2014 +0200 Proofread XCF format specification. @@ -5225,7 +6321,7 @@ commit 208ffcee758641956231c339d27810d38cb33b48 Author: Sven Claussner -Date: Fri Jun 27 07:19:02 2014 +0200 +Date: Fri Jun 27 07:19:02 2014 +0200 Update to GTK+ 2.24.24, po translation patch @@ -5234,32 +6330,32 @@ review). Fix ca@valencia language code to ca-XV. - build/osx/gimp.modules | 5 +- + build/osx/gimp.modules | 5 +- ...ssing-information-to-po-translation-files.patch | 1125 ++++---------------- - po-script-fu/ca@valencia.po | 2 +- + po-script-fu/ca@valencia.po | 2 +- 3 files changed, 217 insertions(+), 915 deletions(-) commit d86456d10aaad26b39dd27d30da8eca6dee604de Author: Sven Claussner -Date: Wed Jun 25 20:21:51 2014 +0200 +Date: Wed Jun 25 20:21:51 2014 +0200 Fix file permissions Set file permissions of text files to 644. - build/osx/README | 0 - build/osx/gimp-master-python.bundle | 0 - build/osx/gimp.modules | 0 - build/osx/patches/0001-libgcrypt-build-without-docs.patch | 0 + build/osx/README | 0 + build/osx/gimp-master-python.bundle | 0 + build/osx/gimp.modules | 0 + build/osx/patches/0001-libgcrypt-build-without-docs.patch | 0 ...prove-internationalization-of-App-menu-and-other-s.patch | Bin - .../0004-Fix-wrong-variable-substitution-in-configure.patch | 0 - ...TK-Add-missing-information-to-po-translation-files.patch | 0 + .../0004-Fix-wrong-variable-substitution-in-configure.patch | 0 + ...TK-Add-missing-information-to-po-translation-files.patch | 0 7 files changed, 0 insertions(+), 0 deletions(-) commit a57e49b1bbd318b06c4f8d578557b63256a1e66d Author: Massimo Valentini -Date: Sat Jun 14 17:57:11 2014 +0200 +Date: Sat Jun 14 17:57:11 2014 +0200 Bug 730211 - Extra zeroes appear in XCF files (draft) @@ -5274,20 +6370,20 @@ commit 44655f9eff12efbdf2ef9ab13c9f46623e62e758 Author: Sven Claussner -Date: Sat Jun 14 11:30:20 2014 +0200 +Date: Sat Jun 14 11:30:20 2014 +0200 Copy better FontConfig defaults into OS X build. Add fonts directories. Cache in user's home cache. Etc. - build/osx/custom/fonts.conf | 6 +++--- + build/osx/custom/fonts.conf | 6 +++--- build/osx/gimp-2.8-python.bundle | 5 ++--- build/osx/gimp-master-python.bundle | 5 ++--- 3 files changed, 7 insertions(+), 9 deletions(-) commit fcbcb67a7ebbe033d78273d9d442d91d4165e256 Author: Sven Claussner -Date: Sat Jun 14 07:38:07 2014 +0200 +Date: Sat Jun 14 07:38:07 2014 +0200 Fix malformed GIMP JHbuild module on OS X. @@ -5298,7 +6394,7 @@ commit 97053fa1465deaff384e16e33a02e494f6000786 Author: Sven Claussner -Date: Fri Jun 13 20:05:42 2014 +0200 +Date: Fri Jun 13 20:05:42 2014 +0200 OS X build: fetch latest stable GTK 2.24 version @@ -5309,7 +6405,7 @@ commit 0cb54af3cd2237a349ad69fa5081a65272460400 Author: Sven Claussner -Date: Fri Jun 13 20:04:23 2014 +0200 +Date: Fri Jun 13 20:04:23 2014 +0200 OS X build: add missing step to README @@ -5320,7 +6416,7 @@ commit 65442153a9db4d0c84b3c8cd3370c401e570e908 Author: Sven Claussner -Date: Fri Jun 13 19:32:54 2014 +0200 +Date: Fri Jun 13 19:32:54 2014 +0200 Add missing information to po translation files in GIMP and GTK. @@ -5329,239 +6425,239 @@ This commit adds missing "Language:", "Language-Team", "Project-Id-Version" information. - build/osx/gimp.modules | 22 + + build/osx/gimp.modules | 22 + ...ssing-information-to-po-translation-files.patch | 3119 ++++++++++++++++++++ - po-libgimp/az.po | 1 + - po-libgimp/bg.po | 1 + - po-libgimp/br.po | 1 + - po-libgimp/de.po | 1 + - po-libgimp/dz.po | 1 + - po-libgimp/en_CA.po | 1 + - po-libgimp/eo.po | 2 +- - po-libgimp/es.po | 2 +- - po-libgimp/et.po | 1 + - po-libgimp/fa.po | 1 + - po-libgimp/fr.po | 1 + - po-libgimp/ga.po | 1 + - po-libgimp/gl.po | 2 +- - po-libgimp/gu.po | 1 + - po-libgimp/he.po | 1 + - po-libgimp/hr.po | 1 + - po-libgimp/id.po | 1 + - po-libgimp/is.po | 1 + - po-libgimp/km.po | 1 + - po-libgimp/ko.po | 1 + - po-libgimp/mk.po | 1 + - po-libgimp/ms.po | 1 + - po-libgimp/my.po | 1 + - po-libgimp/ne.po | 1 + - po-libgimp/nl.po | 1 + - po-libgimp/nn.po | 1 + - po-libgimp/oc.po | 1 + - po-libgimp/pa.po | 1 + - po-libgimp/rw.po | 1 + - po-libgimp/sk.po | 1 + - po-libgimp/sl.po | 1 + - po-libgimp/ta.po | 1 + - po-libgimp/te.po | 2 +- - po-libgimp/vi.po | 1 + - po-libgimp/xh.po | 1 + - po-libgimp/yi.po | 1 + - po-libgimp/zh_CN.po | 1 + - po-plug-ins/bg.po | 1 + - po-plug-ins/br.po | 1 + - po-plug-ins/da.po | 2 +- - po-plug-ins/dz.po | 1 + - po-plug-ins/en_CA.po | 1 + - po-plug-ins/eo.po | 2 +- - po-plug-ins/es.po | 2 +- - po-plug-ins/et.po | 1 + - po-plug-ins/fa.po | 1 + - po-plug-ins/fr.po | 1 + - po-plug-ins/ga.po | 1 + - po-plug-ins/gl.po | 2 +- - po-plug-ins/gu.po | 1 + - po-plug-ins/he.po | 1 + - po-plug-ins/hr.po | 1 + - po-plug-ins/id.po | 1 + - po-plug-ins/is.po | 1 + - po-plug-ins/it.po | 2 +- - po-plug-ins/km.po | 1 + - po-plug-ins/kn.po | 1 + - po-plug-ins/ko.po | 1 + - po-plug-ins/mk.po | 1 + - po-plug-ins/ms.po | 1 + - po-plug-ins/my.po | 1 + - po-plug-ins/nb.po | 1 + - po-plug-ins/ne.po | 1 + - po-plug-ins/nl.po | 1 + - po-plug-ins/nn.po | 1 + - po-plug-ins/oc.po | 1 + - po-plug-ins/pa.po | 1 + - po-plug-ins/rw.po | 1 + - po-plug-ins/sk.po | 1 + - po-plug-ins/vi.po | 1 + - po-plug-ins/xh.po | 1 + - po-plug-ins/yi.po | 1 + - po-plug-ins/zh_CN.po | 1 + - po-python/az.po | 1 + - po-python/be.po | 2 +- - po-python/bg.po | 1 + - po-python/br.po | 1 + - po-python/de.po | 1 + - po-python/dz.po | 1 + - po-python/en_CA.po | 1 + - po-python/eo.po | 1 + - po-python/es.po | 2 +- - po-python/et.po | 1 + - po-python/eu.po | 1 + - po-python/fa.po | 1 + - po-python/fr.po | 1 + - po-python/ga.po | 1 + - po-python/gu.po | 1 + - po-python/hr.po | 1 + - po-python/id.po | 1 + - po-python/is.po | 1 + - po-python/it.po | 2 +- - po-python/km.po | 1 + - po-python/ko.po | 1 + - po-python/lt.po | 1 + - po-python/mk.po | 1 + - po-python/ms.po | 1 + - po-python/my.po | 1 + - po-python/ne.po | 1 + - po-python/nl.po | 1 + - po-python/nn.po | 1 + - po-python/oc.po | 1 + - po-python/pa.po | 1 + - po-python/rw.po | 1 + - po-python/sk.po | 1 + - po-python/sl.po | 1 + - po-python/te.po | 1 + - po-python/vi.po | 1 + - po-python/xh.po | 1 + - po-python/zh_CN.po | 1 + - po-script-fu/az.po | 2 +- - po-script-fu/br.po | 2 +- - po-script-fu/ca.po | 2 +- - po-script-fu/ca@valencia.po | 2 +- - po-script-fu/da.po | 2 +- - po-script-fu/en_CA.po | 2 +- - po-script-fu/eo.po | 2 +- - po-script-fu/es.po | 2 +- - po-script-fu/fa.po | 2 +- - po-script-fu/fi.po | 2 +- - po-script-fu/fr.po | 2 +- - po-script-fu/ga.po | 2 +- - po-script-fu/gl.po | 2 +- - po-script-fu/is.po | 2 +- - po-script-fu/km.po | 2 +- - po-script-fu/mk.po | 2 +- - po-script-fu/ms.po | 2 +- - po-script-fu/nn.po | 2 +- - po-script-fu/pa.po | 2 +- - po-script-fu/pt.po | 2 +- - po-script-fu/ro.po | 2 +- - po-script-fu/sl.po | 2 +- - po-script-fu/te.po | 2 +- - po-script-fu/zh_CN.po | 2 +- - po-tags/ar.po | 2 +- - po-tags/be.po | 1 + - po-tags/br.po | 1 + - po-tags/ca.po | 1 + - po-tags/da.po | 1 + - po-tags/de.po | 1 + - po-tags/el.po | 3 +- - po-tags/eo.po | 1 + - po-tags/es.po | 1 + - po-tags/eu.po | 2 +- - po-tags/fr.po | 1 + - po-tags/gl.po | 1 + - po-tags/he.po | 3 +- - po-tags/hu.po | 1 + - po-tags/id.po | 1 + - po-tags/it.po | 3 +- - po-tags/lt.po | 1 + - po-tags/lv.po | 2 +- - po-tags/nb.po | 8 +- - po-tags/nn.po | 1 + - po-tags/pt.po | 2 +- - po-tags/pt_BR.po | 2 +- - po-tags/ro.po | 2 +- - po-tags/ru.po | 2 +- - po-tags/sl.po | 1 + - po-tags/sr.po | 2 +- - po-tags/sr@latin.po | 2 +- - po-tags/sv.po | 1 + - po-tags/te.po | 1 + - po-tags/tr.po | 3 +- - po-tags/uk.po | 1 + - po-tags/zh_CN.po | 3 +- - po-tips/bg.po | 1 + - po-tips/br.po | 1 + - po-tips/da.po | 1 + - po-tips/de.po | 1 + - po-tips/dz.po | 1 + - po-tips/en_CA.po | 1 + - po-tips/eo.po | 1 + - po-tips/es.po | 1 + - po-tips/et.po | 1 + - po-tips/fa.po | 1 + - po-tips/fr.po | 1 + - po-tips/gl.po | 1 + - po-tips/gu.po | 1 + - po-tips/he.po | 1 + - po-tips/hr.po | 1 + - po-tips/hu.po | 1 + - po-tips/id.po | 1 + - po-tips/is.po | 1 + - po-tips/it.po | 2 +- - po-tips/km.po | 1 + - po-tips/ko.po | 1 + - po-tips/lt.po | 1 + - po-tips/mk.po | 1 + - po-tips/ms.po | 1 + - po-tips/my.po | 1 + - po-tips/nb.po | 1 + - po-tips/ne.po | 1 + - po-tips/nl.po | 1 + - po-tips/nn.po | 1 + - po-tips/pa.po | 1 + - po-tips/rw.po | 1 + - po-tips/sk.po | 1 + - po-tips/sl.po | 1 + - po-tips/ta.po | 1 + - po-tips/tr.po | 1 + - po-tips/vi.po | 1 + - po-tips/zh_CN.po | 1 + - po/az.po | 2 +- - po/br.po | 1 + - po/en_CA.po | 2 +- - po/eo.po | 2 +- - po/es.po | 2 +- - po/et.po | 2 +- - po/fa.po | 2 +- - po/fr.po | 1 + - po/gd.po | 2 +- - po/gl.po | 2 +- - po/hu.po | 2 +- - po/it.po | 2 +- - po/km.po | 2 +- - po/mk.po | 2 +- - po/ms.po | 2 +- - po/nds.po | 2 +- - po/nn.po | 1 + - po/si.po | 2 +- - po/tt.po | 2 +- - po/zh_CN.po | 1 + - po/zh_HK.po | 2 +- - po/zh_TW.po | 2 +- + po-libgimp/az.po | 1 + + po-libgimp/bg.po | 1 + + po-libgimp/br.po | 1 + + po-libgimp/de.po | 1 + + po-libgimp/dz.po | 1 + + po-libgimp/en_CA.po | 1 + + po-libgimp/eo.po | 2 +- + po-libgimp/es.po | 2 +- + po-libgimp/et.po | 1 + + po-libgimp/fa.po | 1 + + po-libgimp/fr.po | 1 + + po-libgimp/ga.po | 1 + + po-libgimp/gl.po | 2 +- + po-libgimp/gu.po | 1 + + po-libgimp/he.po | 1 + + po-libgimp/hr.po | 1 + + po-libgimp/id.po | 1 + + po-libgimp/is.po | 1 + + po-libgimp/km.po | 1 + + po-libgimp/ko.po | 1 + + po-libgimp/mk.po | 1 + + po-libgimp/ms.po | 1 + + po-libgimp/my.po | 1 + + po-libgimp/ne.po | 1 + + po-libgimp/nl.po | 1 + + po-libgimp/nn.po | 1 + + po-libgimp/oc.po | 1 + + po-libgimp/pa.po | 1 + + po-libgimp/rw.po | 1 + + po-libgimp/sk.po | 1 + + po-libgimp/sl.po | 1 + + po-libgimp/ta.po | 1 + + po-libgimp/te.po | 2 +- + po-libgimp/vi.po | 1 + + po-libgimp/xh.po | 1 + + po-libgimp/yi.po | 1 + + po-libgimp/zh_CN.po | 1 + + po-plug-ins/bg.po | 1 + + po-plug-ins/br.po | 1 + + po-plug-ins/da.po | 2 +- + po-plug-ins/dz.po | 1 + + po-plug-ins/en_CA.po | 1 + + po-plug-ins/eo.po | 2 +- + po-plug-ins/es.po | 2 +- + po-plug-ins/et.po | 1 + + po-plug-ins/fa.po | 1 + + po-plug-ins/fr.po | 1 + + po-plug-ins/ga.po | 1 + + po-plug-ins/gl.po | 2 +- + po-plug-ins/gu.po | 1 + + po-plug-ins/he.po | 1 + + po-plug-ins/hr.po | 1 + + po-plug-ins/id.po | 1 + + po-plug-ins/is.po | 1 + + po-plug-ins/it.po | 2 +- + po-plug-ins/km.po | 1 + + po-plug-ins/kn.po | 1 + + po-plug-ins/ko.po | 1 + + po-plug-ins/mk.po | 1 + + po-plug-ins/ms.po | 1 + + po-plug-ins/my.po | 1 + + po-plug-ins/nb.po | 1 + + po-plug-ins/ne.po | 1 + + po-plug-ins/nl.po | 1 + + po-plug-ins/nn.po | 1 + + po-plug-ins/oc.po | 1 + + po-plug-ins/pa.po | 1 + + po-plug-ins/rw.po | 1 + + po-plug-ins/sk.po | 1 + + po-plug-ins/vi.po | 1 + + po-plug-ins/xh.po | 1 + + po-plug-ins/yi.po | 1 + + po-plug-ins/zh_CN.po | 1 + + po-python/az.po | 1 + + po-python/be.po | 2 +- + po-python/bg.po | 1 + + po-python/br.po | 1 + + po-python/de.po | 1 + + po-python/dz.po | 1 + + po-python/en_CA.po | 1 + + po-python/eo.po | 1 + + po-python/es.po | 2 +- + po-python/et.po | 1 + + po-python/eu.po | 1 + + po-python/fa.po | 1 + + po-python/fr.po | 1 + + po-python/ga.po | 1 + + po-python/gu.po | 1 + + po-python/hr.po | 1 + + po-python/id.po | 1 + + po-python/is.po | 1 + + po-python/it.po | 2 +- + po-python/km.po | 1 + + po-python/ko.po | 1 + + po-python/lt.po | 1 + + po-python/mk.po | 1 + + po-python/ms.po | 1 + + po-python/my.po | 1 + + po-python/ne.po | 1 + + po-python/nl.po | 1 + + po-python/nn.po | 1 + + po-python/oc.po | 1 + + po-python/pa.po | 1 + + po-python/rw.po | 1 + + po-python/sk.po | 1 + + po-python/sl.po | 1 + + po-python/te.po | 1 + + po-python/vi.po | 1 + + po-python/xh.po | 1 + + po-python/zh_CN.po | 1 + + po-script-fu/az.po | 2 +- + po-script-fu/br.po | 2 +- + po-script-fu/ca.po | 2 +- + po-script-fu/ca@valencia.po | 2 +- + po-script-fu/da.po | 2 +- + po-script-fu/en_CA.po | 2 +- + po-script-fu/eo.po | 2 +- + po-script-fu/es.po | 2 +- + po-script-fu/fa.po | 2 +- + po-script-fu/fi.po | 2 +- + po-script-fu/fr.po | 2 +- + po-script-fu/ga.po | 2 +- + po-script-fu/gl.po | 2 +- + po-script-fu/is.po | 2 +- + po-script-fu/km.po | 2 +- + po-script-fu/mk.po | 2 +- + po-script-fu/ms.po | 2 +- + po-script-fu/nn.po | 2 +- + po-script-fu/pa.po | 2 +- + po-script-fu/pt.po | 2 +- + po-script-fu/ro.po | 2 +- + po-script-fu/sl.po | 2 +- + po-script-fu/te.po | 2 +- + po-script-fu/zh_CN.po | 2 +- + po-tags/ar.po | 2 +- + po-tags/be.po | 1 + + po-tags/br.po | 1 + + po-tags/ca.po | 1 + + po-tags/da.po | 1 + + po-tags/de.po | 1 + + po-tags/el.po | 3 +- + po-tags/eo.po | 1 + + po-tags/es.po | 1 + + po-tags/eu.po | 2 +- + po-tags/fr.po | 1 + + po-tags/gl.po | 1 + + po-tags/he.po | 3 +- + po-tags/hu.po | 1 + + po-tags/id.po | 1 + + po-tags/it.po | 3 +- + po-tags/lt.po | 1 + + po-tags/lv.po | 2 +- + po-tags/nb.po | 8 +- + po-tags/nn.po | 1 + + po-tags/pt.po | 2 +- + po-tags/pt_BR.po | 2 +- + po-tags/ro.po | 2 +- + po-tags/ru.po | 2 +- + po-tags/sl.po | 1 + + po-tags/sr.po | 2 +- + po-tags/sr@latin.po | 2 +- + po-tags/sv.po | 1 + + po-tags/te.po | 1 + + po-tags/tr.po | 3 +- + po-tags/uk.po | 1 + + po-tags/zh_CN.po | 3 +- + po-tips/bg.po | 1 + + po-tips/br.po | 1 + + po-tips/da.po | 1 + + po-tips/de.po | 1 + + po-tips/dz.po | 1 + + po-tips/en_CA.po | 1 + + po-tips/eo.po | 1 + + po-tips/es.po | 1 + + po-tips/et.po | 1 + + po-tips/fa.po | 1 + + po-tips/fr.po | 1 + + po-tips/gl.po | 1 + + po-tips/gu.po | 1 + + po-tips/he.po | 1 + + po-tips/hr.po | 1 + + po-tips/hu.po | 1 + + po-tips/id.po | 1 + + po-tips/is.po | 1 + + po-tips/it.po | 2 +- + po-tips/km.po | 1 + + po-tips/ko.po | 1 + + po-tips/lt.po | 1 + + po-tips/mk.po | 1 + + po-tips/ms.po | 1 + + po-tips/my.po | 1 + + po-tips/nb.po | 1 + + po-tips/ne.po | 1 + + po-tips/nl.po | 1 + + po-tips/nn.po | 1 + + po-tips/pa.po | 1 + + po-tips/rw.po | 1 + + po-tips/sk.po | 1 + + po-tips/sl.po | 1 + + po-tips/ta.po | 1 + + po-tips/tr.po | 1 + + po-tips/vi.po | 1 + + po-tips/zh_CN.po | 1 + + po/az.po | 2 +- + po/br.po | 1 + + po/en_CA.po | 2 +- + po/eo.po | 2 +- + po/es.po | 2 +- + po/et.po | 2 +- + po/fa.po | 2 +- + po/fr.po | 1 + + po/gd.po | 2 +- + po/gl.po | 2 +- + po/hu.po | 2 +- + po/it.po | 2 +- + po/km.po | 2 +- + po/mk.po | 2 +- + po/ms.po | 2 +- + po/nds.po | 2 +- + po/nn.po | 1 + + po/si.po | 2 +- + po/tt.po | 2 +- + po/zh_CN.po | 1 + + po/zh_HK.po | 2 +- + po/zh_TW.po | 2 +- 227 files changed, 3374 insertions(+), 73 deletions(-) commit 3bb80a92233d880f1e5ca1004021cd9f64ab1362 Author: Simone Karin Lehmann -Date: Wed Jun 4 19:16:13 2014 +0200 +Date: Wed Jun 4 19:16:13 2014 +0200 OS X build: use the help locale from the system's preferences @@ -5578,7 +6674,7 @@ commit e572f1a85604619d7007bc8ec058a2cf15cc906b Author: Simone Karin Lehmann -Date: Wed Jun 4 19:14:03 2014 +0200 +Date: Wed Jun 4 19:14:03 2014 +0200 OS X build: Remove GVFS and D-Bus dependencies of GIMP 2.8. @@ -5591,9 +6687,9 @@ - Adapt gimp.modules and GIMP launcher. - Add code comments. - build/osx/gimp.modules | 6 ++-- + build/osx/gimp.modules | 6 ++-- build/osx/launcher-2.8-python.sh | 20 ++---------- - plug-ins/help/Makefile.am | 11 +++++-- + plug-ins/help/Makefile.am | 11 +++++-- plug-ins/help/gimphelplocale.c | 70 ++++++++++++++++++++++++++++++++++++++++ plug-ins/help/gimphelpprogress.c | 28 ++++++++++++++++ @@ -5601,7 +6697,7 @@ commit 450b6befd5eddd227ec88d2bd178eadac0eda848 Author: Sven Claussner -Date: Mon Jun 2 20:04:21 2014 +0200 +Date: Mon Jun 2 20:04:21 2014 +0200 OS X build: update README @@ -5613,7 +6709,7 @@ commit b93c5d63e83e4cf8cb95b48db8d5d1ccf53c0b9a Author: Sven Claussner -Date: Sat May 31 15:54:01 2014 +0200 +Date: Sat May 31 15:54:01 2014 +0200 Remove OpenSSL dependency @@ -5628,7 +6724,7 @@ commit f133e2f93a903d697b40ea01ab189aae2b7c9749 Author: Sven Claussner -Date: Thu May 29 17:12:31 2014 +0200 +Date: Thu May 29 17:12:31 2014 +0200 OS X build: fix zlib dependency @@ -5639,35 +6735,35 @@ commit a62368234b1e0572762cd32e6c14e38aac6c453a Author: Sven Claussner -Date: Thu May 29 16:57:13 2014 +0200 +Date: Thu May 29 16:57:13 2014 +0200 OS X build: fix libsecret 0.18 code generation issue The sed command on OS X is too old to handle sed '1i\' properly. Thus replace it by 'echo'. - build/osx/gimp.modules | 7 ++- + build/osx/gimp.modules | 7 ++- .../libsecret-fix-secret-dbus-generation.c.patch | 53 ++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) commit ca5b0cf55ea55a4e7e2dddc3e5f55b3597f61b98 Author: Sven Claussner -Date: Wed May 28 21:46:11 2014 +0200 +Date: Wed May 28 21:46:11 2014 +0200 OS X build: fix libffi misconfiguration Fix libffi's configure to return the real library path instead of an unresolved '$(libdir)' which also caused the glib build step to fail. - build/osx/gimp.modules | 5 ++- + build/osx/gimp.modules | 5 ++- ...-wrong-variable-substitution-in-configure.patch | 46 ++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) commit 8896c1e892b9a6d48af92810462a576c8eb6e7b3 Author: Sven Claussner -Date: Sun May 25 21:32:35 2014 +0200 +Date: Sun May 25 21:32:35 2014 +0200 OS X build: update dependency versions @@ -5679,7 +6775,7 @@ commit 1d5d116aa3e3f52b45c88ce3fe7d5f5cf07f9901 Author: Sven Claussner -Date: Sun May 25 11:21:52 2014 +0200 +Date: Sun May 25 11:21:52 2014 +0200 Use the online help by default @@ -5689,12 +6785,12 @@ app/config/gimpguiconfig.c | 2 +- build/osx/custom/gimprc | 4 ++-- - etc/gimprc | 6 ++++-- + etc/gimprc | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) commit 863bd791ae94c4abbf29c50f1bec79d71e2d7fd1 Author: Sven Claussner -Date: Sun May 25 12:43:21 2014 +0200 +Date: Sun May 25 12:43:21 2014 +0200 Hide the help browser selection listbox if no help browser is installed @@ -5708,15 +6804,15 @@ Based on a patch by Simone Karin Lehmann. app/dialogs/preferences-dialog.c | 26 ++++++++++++++++++++------ - app/pdb/gimppdb.c | 10 ++++++++++ - build/osx/custom/gimprc | 13 ------------- + app/pdb/gimppdb.c | 10 ++++++++++ + build/osx/custom/gimprc | 13 ------------- build/osx/gimp-2.8-python.bundle | 22 ++++++++++++++++------ build/osx/gimp-master-python.bundle | 22 ++++++++++++++++------ 5 files changed, 62 insertions(+), 31 deletions(-) commit e7d4bb5f5b57b115d0acf6252f1b82dd972c91f8 Author: Michael Natterer -Date: Sun May 25 15:23:58 2014 +0200 +Date: Sun May 25 15:23:58 2014 +0200 Use external web browser for the manual if WebKit is unavailable @@ -5729,15 +6825,15 @@ with the system's web browser for now. - build/osx/custom/gimprc | 742 + build/osx/custom/gimprc | 742 +++++++++++++++++++++++++++++++++++- - build/osx/gimp-2.8-python.bundle | 5 +- - build/osx/gimp-master-python.bundle | 5 +- + build/osx/gimp-2.8-python.bundle | 5 +- + build/osx/gimp-master-python.bundle | 5 +- 3 files changed, 747 insertions(+), 5 deletions(-) commit 8c78088e37fa39b8d4891930346440bea8f4d3d0 Author: Sven Claussner -Date: Sun May 25 15:48:09 2014 +0200 +Date: Sun May 25 15:48:09 2014 +0200 Update themes and include them into master @@ -5746,7 +6842,7 @@ commit 1d8abe573db28099aae6dbcb6495b800251add7a Author: Sven Claussner -Date: Sun May 25 01:46:20 2014 +0200 +Date: Sun May 25 01:46:20 2014 +0200 Update GTK+2 to version 2.24.23 @@ -5755,7 +6851,7 @@ commit d4831766aebb050142518f71716eff2b3ef2dd6d Author: Sven Claussner -Date: Sun May 25 01:23:57 2014 +0200 +Date: Sun May 25 01:23:57 2014 +0200 Run GIMP in a D-Bus session @@ -5767,7 +6863,7 @@ This fix updates some packages and ensures that GIMP always runs in a D-Bus session and thus the online help is accessible. - build/osx/gimp.modules | 25 +++++++++---------- + build/osx/gimp.modules | 25 +++++++++---------- build/osx/launcher-2.8-python.sh | 49 +++++++++++++++---------------------- build/osx/launcher-master-python.sh | 49 @@ -5776,21 +6872,21 @@ commit 7eacad654435727e6fffc9fc8ffac1a616cfd761 Author: Sven Claussner -Date: Sat May 24 19:09:38 2014 +0200 +Date: Sat May 24 19:09:38 2014 +0200 Keep separators between menu placeholders Bugfix for missing separators in some menus, for instance in the File menu between 'Send E-Mail' and 'Properties' etc. - build/osx/gimp.modules | 5 ++-- + build/osx/gimp.modules | 5 ++-- ...0003-Keep-separators-between-placeholders.patch | 30 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) commit 75a84295d75f1a623d1e8b62301959407ddfc6ec Author: Sven Claussner -Date: Sat May 24 18:51:28 2014 +0200 +Date: Sat May 24 18:51:28 2014 +0200 Rework GIMP's OS X theme for improved OS X integration @@ -5802,16 +6898,16 @@ update bundler configuration and README, cleanups. - build/osx/README | 5 +---- - build/osx/custom/gtkrc | 17 +++++++---------- + build/osx/README | 5 +---- + build/osx/custom/gtkrc | 17 +++++++---------- build/osx/gimp-2.8-python.bundle | 12 ++++++------ - build/osx/gimp-master-python.bundle | 6 +++--- - build/osx/gimp.modules | 10 ++++++++++ + build/osx/gimp-master-python.bundle | 6 +++--- + build/osx/gimp.modules | 10 ++++++++++ 5 files changed, 27 insertions(+), 23 deletions(-) commit 7a75d4df3b687e8a36684e93ab8402b477b1c6d3 Author: Sven Claussner -Date: Thu May 15 07:39:22 2014 +0200 +Date: Thu May 15 07:39:22 2014 +0200 OS X: translate 'About' in app menu @@ -5822,18 +6918,18 @@ app/actions/dialogs-actions.c | 449 ++++++++++++++++++++---------------------- - po/de.po | 23 ++- + po/de.po | 23 ++- 2 files changed, 230 insertions(+), 242 deletions(-) commit d98a0c22e92a37d3c0f2c736175409ee4ebbc109 Author: Sven Claussner -Date: Thu May 15 06:49:00 2014 +0200 +Date: Thu May 15 06:49:00 2014 +0200 Translate OS X app menu properly. - build/osx/gimp-2.8-python.bundle | 9 +-------- - build/osx/gimp-master-python.bundle | 8 +------- - build/osx/gimp.modules | 18 + build/osx/gimp-2.8-python.bundle | 9 +-------- + build/osx/gimp-master-python.bundle | 8 +------- + build/osx/gimp.modules | 18 +++++++++++++----- ...internationalization-of-App-menu-and-other-s.patch | Bin 0 -> 41273 bytes @@ -5841,7 +6937,7 @@ commit 0e1306e4e07ae8b0f2ed4501fb5eb6aeacd31d04 Author: Sven Claussner -Date: Sun May 11 14:24:42 2014 +0200 +Date: Sun May 11 14:24:42 2014 +0200 OS X build: smaller fixes and cleanups @@ -5849,10 +6945,10 @@ gimp.modules: Add Github. Switch qtk-quartz-engine repo type. Disable gtk-doc generation for glib. - build/osx/README | 15 +- - build/osx/gimp-2.8-python.bundle | 459 ++++---- - build/osx/gimp-master-python.bundle | 461 ++++---- - build/osx/gimp.modules | 8 +- + build/osx/README | 15 +- + build/osx/gimp-2.8-python.bundle | 459 ++++---- + build/osx/gimp-master-python.bundle | 461 ++++---- + build/osx/gimp.modules | 8 +- build/osx/info-2.8-python.plist | 2078 +++++++++++++++++------------------ build/osx/info-master-python.plist | 2078 @@ -5861,7 +6957,7 @@ commit 7e905885fdcb96c129d3e427ba5ffd2415edf43b Author: Sven Claussner -Date: Sun May 11 14:26:28 2014 +0200 +Date: Sun May 11 14:26:28 2014 +0200 Add missing language files to OS X bundler @@ -5875,7 +6971,7 @@ commit ce28ce4ccf3aa749baef1733eaa01c5681b25cf1 Author: Sven Claussner -Date: Sun May 11 15:41:44 2014 +0200 +Date: Sun May 11 15:41:44 2014 +0200 Split OS X launcher into 2.8 and master versions @@ -5883,22 +6979,19 @@ path. Otherwise GIMP master on OS X will not start due to unfound GEGL. - build/osx/README | 8 +-- - build/osx/gimp-2.8-python.bundle | 2 +- - build/osx/gimp-master-python.bundle | 28 ++++----- - build/osx/info-2.8-python.plist | 2 +- - build/osx/info-master-python.plist | 4 +- - build/osx/launcher-2.8-python.sh | 119 - ++++++++++++++++++++++++++++++++++++ - build/osx/launcher-master-python.sh | 119 - ++++++++++++++++++++++++++++++++++++ - build/osx/launcher-python.sh | 119 - ------------------------------------ - 8 files changed, 260 insertions(+), 141 deletions(-) + build/osx/README | 8 +- + build/osx/gimp-2.8-python.bundle | 2 +- + build/osx/gimp-master-python.bundle | 28 ++--- + build/osx/info-2.8-python.plist | 2 +- + build/osx/info-master-python.plist | 4 +- + .../{launcher-python.sh => launcher-2.8-python.sh} | 0 + build/osx/launcher-master-python.sh | 119 + +++++++++++++++++++++ + 7 files changed, 141 insertions(+), 22 deletions(-) commit d417e3a12b888cf331b09361b2d8089adc8a3bc6 Author: Sven Claussner -Date: Sat May 10 07:06:23 2014 +0200 +Date: Sat May 10 07:06:23 2014 +0200 OS X build: update build instructions in README @@ -5912,7 +7005,7 @@ commit 0a3c78239c3bc4752af967252bbbc1fce5f65836 Author: Daniel Sabo -Date: Wed Mar 19 19:03:21 2014 -0700 +Date: Wed Mar 19 19:03:21 2014 -0700 configure: Also search for the -gtk2 version of mac integration @@ -5923,14 +7016,14 @@ f6533db8b739b95ca5d71c2d5ac2b28c54c650bf Resolved conflicts: - configure.ac + configure.ac configure.ac | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) commit 0f68489a7c00c18070a6ffd1c07934adb4fc856f Author: Michael Natterer -Date: Wed Dec 11 00:41:24 2013 +0100 +Date: Wed Dec 11 00:41:24 2013 +0100 app: add some CPPFLAGS in core/Makefile.am to fix the build on OSX @@ -5938,14 +7031,14 @@ 00cd9b4e47dea4b4f51da60cb03fa2d575dcdb88 Resolved conflicts: - app/core/Makefile.am + app/core/Makefile.am app/core/Makefile.am | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit cfcafedeafac8341e903da15697dd37874253c92 Author: Sven Claussner -Date: Thu May 8 07:05:31 2014 +0200 +Date: Thu May 8 07:05:31 2014 +0200 OS X build: replace 2.8.8 target by gimp-osx target @@ -5958,7 +7051,7 @@ commit fede2c94607e4a97ffbc11e98dff515f7a04eef9 Author: Sven Claussner -Date: Thu May 8 06:46:52 2014 +0200 +Date: Thu May 8 06:46:52 2014 +0200 OS X build: fix GVFS dependency @@ -5970,7 +7063,7 @@ commit e3f77abd5b954eb5ebb9680c171ba3b931ec99d9 Author: Sven Claussner -Date: Wed May 7 06:19:05 2014 +0200 +Date: Wed May 7 06:19:05 2014 +0200 OS X build: update and fix libgcrypt and libgpg-error dependencies @@ -5978,14 +7071,14 @@ directory from build, because it introduces new dependencies and we don't need it. - build/osx/gimp.modules | 12 ++++---- - .../0001-libgcrypt-build-without-docs.patch | 35 + build/osx/gimp.modules | 12 ++++---- + .../0001-libgcrypt-build-without-docs.patch | 35 ++++++++++++++++++++++ 2 files changed, 42 insertions(+), 5 deletions(-) commit 86f3b0759be8ad72f78289ca179c34f30a0e5674 Author: Sven Claussner -Date: Wed May 7 05:57:23 2014 +0200 +Date: Wed May 7 05:57:23 2014 +0200 OS X build: format JHBuild module file @@ -5997,7 +7090,7 @@ commit 1e73ee7bde10fbcd897aa77db3a4a1423a7c1ac4 Author: Sven Claussner -Date: Tue May 6 21:41:15 2014 +0200 +Date: Tue May 6 21:41:15 2014 +0200 OSX build readme: fix typo @@ -6006,7 +7099,7 @@ commit 5b4dbe1b48b924b4829162afe7df5a1cf31d18dd Author: Sven Claussner -Date: Tue May 6 20:40:11 2014 +0200 +Date: Tue May 6 20:40:11 2014 +0200 OS X build: fix poppler issues @@ -6021,7 +7114,7 @@ commit ca27d6dc2138a1c62b64f23fb3bf8ad80eca37c1 Author: Sven Claussner -Date: Tue May 6 20:32:21 2014 +0200 +Date: Tue May 6 20:32:21 2014 +0200 OS X build: update OpenSSL dependency @@ -6033,34 +7126,34 @@ commit 0276ea07dce912f6f2cff77afef98bbb5e9c58e1 Author: Sven Claussner -Date: Tue May 6 08:37:08 2014 +0200 +Date: Tue May 6 08:37:08 2014 +0200 OSX build: use autogen-template for different configure syntax Gexiv2 and OpenSSL require an extra syntax to set prefix and libdir. Use JHBuilds autogen-template parameter to set them properly. - build/osx/README | 9 +++++++++ + build/osx/README | 9 +++++++++ build/osx/gimp.modules | 8 +++++--- 2 files changed, 14 insertions(+), 3 deletions(-) commit 7570539c83c9eed5a71bf6ac99bbd1cd571e4b43 Author: Sven Claussner -Date: Sun May 4 14:31:42 2014 +0200 +Date: Sun May 4 14:31:42 2014 +0200 Add OS X build configuration for GIMP master Add configuration for gtk-mac-bundler, add OS X application metadata file. - build/osx/gimp-master-python.bundle | 205 +++++++ + build/osx/gimp-master-python.bundle | 205 +++++++ build/osx/info-master-python.plist | 1093 +++++++++++++++++++++++++++++++++++ 2 files changed, 1298 insertions(+) commit aca529e601966f89f1c8e3b5003b1fe29c19252e Author: Sven Claussner -Date: Sun May 4 15:40:39 2014 +0200 +Date: Sun May 4 15:40:39 2014 +0200 OS X build: fix wrong XCode-Path @@ -6075,7 +7168,7 @@ commit 66e9e6cf176e73a1a8ad9015cb687106658494e4 Author: Sven Claussner -Date: Sun May 4 15:36:42 2014 +0200 +Date: Sun May 4 15:36:42 2014 +0200 OSX JHBuild: fix some issues @@ -6091,23 +7184,20 @@ commit 707e08fe353e372772e69846e1fb8bb7823145b3 Author: Sven Claussner -Date: Sun May 4 15:32:52 2014 +0200 +Date: Sun May 4 15:32:52 2014 +0200 OSX bundler: make launcher more generic Rename the launcher to launcher-python.sh to make it also usable for GIMP-master. - build/osx/gimp-2.8-python.bundle | 2 +- - build/osx/launcher-2.8-python.sh | 119 - --------------------------------------- - build/osx/launcher-python.sh | 119 - +++++++++++++++++++++++++++++++++++++++ - 3 files changed, 120 insertions(+), 120 deletions(-) + build/osx/gimp-2.8-python.bundle | 2 +- + build/osx/{launcher-2.8-python.sh => launcher-python.sh} | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) commit e5d223139734018f27647381c8ff1b5ed4dcd406 Author: Sven Claussner -Date: Sun May 4 15:30:40 2014 +0200 +Date: Sun May 4 15:30:40 2014 +0200 OSX bundler: fix link to .plist file @@ -6118,7 +7208,7 @@ commit 3906cb65e85502410dd781fcbef52bc03fe48178 Author: Sven Claussner -Date: Sun May 4 14:27:28 2014 +0200 +Date: Sun May 4 14:27:28 2014 +0200 Improve OSX build instructions @@ -6136,20 +7226,20 @@ commit 0e951ee35ff8a99b78e4ec9243daa6b9e1f85e29 Author: Sven Claussner -Date: Fri Jul 18 07:20:30 2014 +0200 +Date: Fri Jul 18 07:20:30 2014 +0200 Minor cosmetic cleanup: fix C style comments Replace C++ and Java style comments by C style comments. - plug-ins/metadata/metadata.c | 2 +- - plug-ins/pygimp/gimpmodule.c | 8 ++++---- + plug-ins/metadata/metadata.c | 2 +- + plug-ins/pygimp/gimpmodule.c | 8 ++++---- plug-ins/script-fu/tinyscheme/scheme.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) commit 8bea95cae77286c8bbfbb714ab909b9c4ad2021e Author: Massimo Valentini -Date: Sun Jul 20 16:16:50 2014 +0200 +Date: Sun Jul 20 16:16:50 2014 +0200 Bug 732163 - Flipped pixel columns in TGA @@ -6162,7 +7252,7 @@ commit 4594388060313cc4384f7c6797ea833dad7aba46 Author: Michael Natterer -Date: Thu Jul 10 00:08:14 2014 +0200 +Date: Thu Jul 10 00:08:14 2014 +0200 app: fix handling of guides and sample points in gimpimage-resize.c @@ -6178,7 +7268,7 @@ commit 385e0bc54bd433b7ae5b601ddfb4b397711ac801 Author: André Schutten -Date: Mon Jul 7 13:00:40 2014 +0200 +Date: Mon Jul 7 13:00:40 2014 +0200 Updated Dutch translation 2-8 @@ -6188,7 +7278,7 @@ commit fd85286291cf9a39ccc7f9547092e3b488b68849 Author: Michael Natterer -Date: Wed Jul 2 14:24:02 2014 +0200 +Date: Wed Jul 2 14:24:02 2014 +0200 Bug 727854 - Export file type should not be based on filename extension @@ -6200,14 +7290,14 @@ app/actions/file-commands.c | 11 ++++++----- app/core/gimpimage-private.h | 1 + - app/core/gimpimage.c | 17 +++++++++++++++++ - app/core/gimpimage.h | 3 +++ - app/file/file-save.c | 1 + + app/core/gimpimage.c | 17 +++++++++++++++++ + app/core/gimpimage.h | 3 +++ + app/file/file-save.c | 1 + 5 files changed, 28 insertions(+), 5 deletions(-) commit 916fad5feb2a7c3005541218873b4e124cc453cd Author: Dimitris Spingos -Date: Mon Jun 30 08:33:52 2014 +0300 +Date: Mon Jun 30 08:33:52 2014 +0300 Updated Greek translation @@ -6217,7 +7307,7 @@ commit e422b169f96ce71bf2297c82a14b3577aa41704e Author: Dimitris Spingos -Date: Mon Jun 30 08:28:52 2014 +0300 +Date: Mon Jun 30 08:28:52 2014 +0300 Updated Greek translation @@ -6227,7 +7317,7 @@ commit fb2f63f09994302f1253feca6aa4c850859288f1 Author: Dimitris Spingos -Date: Mon Jun 30 08:24:06 2014 +0300 +Date: Mon Jun 30 08:24:06 2014 +0300 Updated Greek translation @@ -6237,7 +7327,7 @@ commit cd114a162e0b7430213246a50f5277dedce9f79f Author: Michael Natterer -Date: Sun Jun 29 20:54:30 2014 +0200 +Date: Sun Jun 29 20:54:30 2014 +0200 Bug 731362 - Merging layers (outside layer folders)... @@ -6258,7 +7348,7 @@ commit 9b7827482feb84b3a2b590db5aa81cf2ae8fdb6d Author: Michael Natterer -Date: Sat Jun 21 16:52:18 2014 +0200 +Date: Sat Jun 21 16:52:18 2014 +0200 Bug 731765 - "Value Propagate" dialog's "Propagating rate" spinbuttons... @@ -6276,23 +7366,23 @@ commit 39132458059b8b124066b33fc066182ba84e7f54 Author: Daniel Mustieles -Date: Fri Jun 20 14:31:27 2014 +0200 +Date: Fri Jun 20 14:31:27 2014 +0200 Updated Spanish Translation po-plug-ins/es.po | 390 ++--- po-script-fu/es.po | 4091 ++++++++++++++++++++-------------------------------- - po/es.po | 120 +- + po/es.po | 120 +- 3 files changed, 1849 insertions(+), 2752 deletions(-) commit eebe6c2116f08f99c7b4c38dfbd6299759b111e6 Author: João S. O. Bueno -Date: Thu Jun 19 22:15:54 2014 -0300 +Date: Thu Jun 19 22:15:54 2014 -0300 pygimp: Layers retrieved using "parent" have to be GroupLayers - Thanks Seldom Needy for spotting this. + Thanks Seldom Needy for spotting this. (cherry picked from commit f7e1dd2501db4ae7201e225a9b54c5b1e168c9cb) @@ -6301,7 +7391,7 @@ commit 565e725429761b825b06a2393dbe36860d253386 Author: Michael Natterer -Date: Tue Jun 10 02:15:27 2014 +0200 +Date: Tue Jun 10 02:15:27 2014 +0200 Bug 729789 - Exporting to .xjt file creates multi GB file @@ -6313,7 +7403,7 @@ commit 60db2dc41cb714452cda853327f801877ff2c9a4 Author: Michael Natterer -Date: Tue Jun 10 01:35:30 2014 +0200 +Date: Tue Jun 10 01:35:30 2014 +0200 Bug 731389 - gimp-edit-copy causes assertion failure on exit @@ -6327,7 +7417,7 @@ commit 84043c2ed089f992b47cb43b474557dcea0a6022 Author: Massimo Valentini -Date: Sat Jun 7 17:53:55 2014 +0200 +Date: Sat Jun 7 17:53:55 2014 +0200 app: xcf-load fix app/tests/test-xcf @@ -6338,7 +7428,7 @@ commit 07e90e21415676a6286e22e37ccc40b04d833b04 Author: Massimo Valentini -Date: Sat Jun 7 16:33:17 2014 +0200 +Date: Sat Jun 7 16:33:17 2014 +0200 Bug 730396: GIMP crashes loading a XCF it saved @@ -6347,28 +7437,28 @@ (cherry picked from commit a64a319d78455a13d51fc7983fa18ce7ce5549d8) Conflicts: - app/xcf/xcf-load.c + app/xcf/xcf-load.c app/xcf/xcf-load.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) commit ca0b2877d9ef5405dbb2f43007360a8b91b9e680 Author: Massimo Valentini -Date: Fri Jun 6 18:35:25 2014 +0200 +Date: Fri Jun 6 18:35:25 2014 +0200 Bug 730980: GIMP enters an infinite loop loading a truncated xcf (cherry picked from commit fe4502fe0410b25dfac999daad3127263bae7e0d) Conflicts: - app/xcf/xcf-load.c + app/xcf/xcf-load.c app/xcf/xcf-load.c | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) commit 4486e80104a0db925faede68654049e8b329983d Author: PavelNicklasson -Date: Sat May 31 17:40:16 2014 +0000 +Date: Sat May 31 17:40:16 2014 +0000 Updated Swedish translation @@ -6378,11 +7468,11 @@ commit 311f52a774356f0edeb750303a14707bd9b029d1 Author: Lasse Liehu -Date: Fri May 30 15:46:10 2014 +0300 +Date: Fri May 30 15:46:10 2014 +0300 Finnish translation update - po-libgimp/fi.po | 41 +- + po-libgimp/fi.po | 41 +- po-plug-ins/fi.po | 7180 ++++++++++++++++++++++++++++++---------------------- po-python/fi.po | 202 +- @@ -6391,7 +7481,7 @@ commit 120bb726bae84e0591ce8fef9009f9df2953f0cd Author: Lasse Liehu -Date: Fri May 30 15:43:13 2014 +0300 +Date: Fri May 30 15:43:13 2014 +0300 Finnish translation update @@ -6401,7 +7491,7 @@ commit b812f513d476c0bc4bb3b2d08581d18fbab5f1a4 Author: Ed J -Date: Tue May 27 00:55:36 2014 +0100 +Date: Tue May 27 00:55:36 2014 +0100 Doc that gimp-display-new gives execution error if no GIMP GUI. @@ -6412,19 +7502,19 @@ commit c4dc16825b2cad223c2856886a086bc908556ecb Author: Michael Natterer -Date: Sun May 25 15:23:58 2014 +0200 +Date: Sun May 25 15:23:58 2014 +0200 app: default to GIMP_HELP_BROWSER_WEB_BROWSER if there is no webkit (cherry picked from commit f1573c42d2ab9a582cdba6f5a1a242e98530531e) app/config/gimpguiconfig.c | 5 +++++ - configure.ac | 3 +++ + configure.ac | 3 +++ 2 files changed, 8 insertions(+) commit 0229edd72b2317527333d2560fbe9b6b75d178c5 Author: Michael Natterer -Date: Sat May 24 22:41:21 2014 +0200 +Date: Sat May 24 22:41:21 2014 +0200 app: gimp_image_rotate(): fix rotation of sample points @@ -6439,7 +7529,7 @@ commit bba43436418d5eea0ecbe430b84efc6b383a96e8 Author: Ed J -Date: Sat May 24 17:58:37 2014 +0100 +Date: Sat May 24 17:58:37 2014 +0100 Doc NULL return for gimp_display_name() when no GUI. @@ -6448,7 +7538,7 @@ commit d2536c1f8a264cdc1f876501b19b813a0f9e449c Author: Michael Natterer -Date: Wed May 21 21:25:41 2014 +0200 +Date: Wed May 21 21:25:41 2014 +0200 app: add gimp_grid_get_spacing() and gimp_grid_get_offset() @@ -6456,15 +7546,15 @@ (cherry picked from commit 5e2ded502066e7d54a120a0fb03927e41b723453) - app/core/gimpgrid.c | 25 +++++++++++++++++++++++++ - app/core/gimpgrid.h | 8 ++++++++ + app/core/gimpgrid.c | 25 +++++++++++++++++++++++++ + app/core/gimpgrid.h | 8 ++++++++ app/core/gimpimage-snap.c | 37 +++++++------------------------------ app/display/gimpcanvasgrid.c | 14 ++------------ 4 files changed, 42 insertions(+), 42 deletions(-) commit 247267031eb8915641490d1385a74df42e794557 Author: Michael Natterer -Date: Wed May 21 20:43:05 2014 +0200 +Date: Wed May 21 20:43:05 2014 +0200 Bug 588512 - Grid Spacing errors depending on unit @@ -6482,7 +7572,7 @@ commit 2ca91e7271eb1034b23dc507cfb5056771d1af2e Author: Michael Natterer -Date: Mon May 19 03:28:26 2014 +0200 +Date: Mon May 19 03:28:26 2014 +0200 Bug 729068 - Gimp windows state is lost when closed from the window manager @@ -6496,7 +7586,7 @@ commit 8b2246015334a42329917097808cb47614c50a04 Author: PavelNicklasson -Date: Wed May 14 21:47:39 2014 +0000 +Date: Wed May 14 21:47:39 2014 +0000 Updated Swedish translation @@ -6506,7 +7596,7 @@ commit 2886f92bbd9fdbc805a928fda1831294199b4640 Author: Michael Natterer -Date: Tue May 13 21:48:40 2014 +0200 +Date: Tue May 13 21:48:40 2014 +0200 Bug 730071 - Selection bounds miscalculated for multiples of 128 @@ -6521,7 +7611,7 @@ commit e6d314c9fcdec8f9e6f541ea0801b7dec90c2f09 Author: Marco Ciampa -Date: Tue May 13 09:55:34 2014 +0200 +Date: Tue May 13 09:55:34 2014 +0200 Updated italian translation. @@ -6531,7 +7621,7 @@ commit 6f6a51274fb728256fec1ff786124276b8cca8c5 Author: Massimo Valentini -Date: Sat May 10 18:46:31 2014 +0200 +Date: Sat May 10 18:46:31 2014 +0200 Bug 728226: Blending mode of layers in ORA changed upon opening @@ -6542,7 +7632,7 @@ commit f6527993f7ab89eee7ea25eb9c115023a4728f29 Author: Piotr Drąg -Date: Thu May 8 00:09:29 2014 +0200 +Date: Thu May 8 00:09:29 2014 +0200 Updated Polish translation @@ -6552,7 +7642,7 @@ commit b482f819e1a877e17ec83b973dd84a5f8149c186 Author: Piotr Drąg -Date: Wed May 7 18:45:54 2014 +0200 +Date: Wed May 7 18:45:54 2014 +0200 Updated Polish translation @@ -6565,7 +7655,7 @@ commit d053a751503373f976a26cfd7ff6bf8830228180 Author: Massimo Valentini -Date: Wed May 7 18:42:44 2014 +0200 +Date: Wed May 7 18:42:44 2014 +0200 Bug 707239 - Gimp destroys image file when exporting... @@ -6581,7 +7671,7 @@ (cherry picked from commit 7e80e2e3bc77f17dac3fc0f712970a34215a6814) Conflicts: - plug-ins/common/file-tiff-save.c + plug-ins/common/file-tiff-save.c plug-ins/common/file-tiff-save.c | 58 +++++++++++++++++++++++++++++----------- @@ -6589,7 +7679,7 @@ commit fda740f80bfd2498d0db8c98998146eda87a23d4 Author: Piotr Drąg -Date: Mon May 5 21:03:46 2014 +0200 +Date: Mon May 5 21:03:46 2014 +0200 Updated Polish translation @@ -6599,7 +7689,7 @@ commit 9dc2d2f0c0f6cbdfc75601b67b037b0279c6bd47 Author: Massimo Valentini -Date: Mon May 5 08:23:02 2014 +0200 +Date: Mon May 5 08:23:02 2014 +0200 Bug 722487: Something in the attached .gimp-2.8 directory makes... @@ -6610,14 +7700,14 @@ (cherry picked from commit 26738b9ff3491724c29d391bc4eb9b0bfcf2f05e) - app/core/gimpdatafactory.c | 4 ++++ + app/core/gimpdatafactory.c | 4 ++++ app/core/gimptoolpreset-load.c | 14 +++++++++++++- - po/POTFILES.in | 1 + + po/POTFILES.in | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) commit 1225fe3d1f521e74acd5be9a5fcc221c16598624 Author: Sven Claussner -Date: Sun May 4 14:18:51 2014 +0200 +Date: Sun May 4 14:18:51 2014 +0200 Bug 721482 - Add missing language files @@ -6632,7 +7722,7 @@ commit 83c0e41b10c62ec03b8c207048a12b51d61edff9 Author: Sven Claussner -Date: Sun May 4 14:10:51 2014 +0200 +Date: Sun May 4 14:10:51 2014 +0200 Bug 721449 - Remove language black magic in OS X build @@ -6648,17 +7738,17 @@ commit 7136352aec47a134dada5235fa3f2269a3e2cde7 Author: Michael Henning -Date: Sat May 3 11:02:04 2014 -0400 +Date: Sat May 3 11:02:04 2014 -0400 app, libgimp: commit files generated by PDB docs change - app/pdb/layer-cmds.c | 2 +- + app/pdb/layer-cmds.c | 2 +- libgimp/gimplayer_pdb.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) commit f76cf06e946fd06729e5351b59ef5bea9a9b816d Author: Jehan -Date: Sat May 3 18:54:47 2014 +1200 +Date: Sat May 3 18:54:47 2014 +1200 Bug 720052 - Make GIMP recommend a recent gettext. @@ -6672,85 +7762,85 @@ commit 70594251331fd92622a34417c636661527d03b9f Author: Jehan -Date: Sun May 4 00:48:43 2014 +1200 +Date: Sun May 4 00:48:43 2014 +1200 po-script-fu: update all script-fu's po with recent xgettext. Current dev version of gettext has a fix for GIMP's script-fu syntax. See Bug 720052. - po-script-fu/ar.po | 4026 +++++++++++++++++++++------------- - po-script-fu/az.po | 5047 + po-script-fu/ar.po | 4026 +++++++++++++++++++++------------- + po-script-fu/az.po | 5047 +++++++++++++++++++++++++++---------------- - po-script-fu/be.po | 3435 +++++++++++++++-------------- - po-script-fu/bg.po | 3924 +++++++++++++++++---------------- - po-script-fu/br.po | 3683 +++++++++++++++++-------------- - po-script-fu/ca.po | 3453 +++++++++++++++-------------- + po-script-fu/be.po | 3435 +++++++++++++++-------------- + po-script-fu/bg.po | 3924 +++++++++++++++++---------------- + po-script-fu/br.po | 3683 +++++++++++++++++-------------- + po-script-fu/ca.po | 3453 +++++++++++++++-------------- po-script-fu/ca@valencia.po | 3453 +++++++++++++++-------------- - po-script-fu/cs.po | 3436 +++++++++++++++-------------- - po-script-fu/da.po | 3482 +++++++++++++++-------------- - po-script-fu/de.po | 3461 +++++++++++++++-------------- - po-script-fu/dz.po | 4086 +++++++++++++++++++---------------- - po-script-fu/el.po | 4018 +++++++++++++++++++++------------- - po-script-fu/en_CA.po | 3851 ++++++++++++++++++--------------- - po-script-fu/en_GB.po | 3439 +++++++++++++++-------------- - po-script-fu/eo.po | 4015 +++++++++++++++++++++------------- - po-script-fu/es.po | 3468 +++++++++++++++-------------- - po-script-fu/et.po | 2596 +++++++++++++++------- - po-script-fu/eu.po | 3453 +++++++++++++++-------------- - po-script-fu/fa.po | 3801 ++++++++++++++++---------------- - po-script-fu/fi.po | 3832 ++++++++++++++++---------------- - po-script-fu/fr.po | 3451 +++++++++++++++-------------- - po-script-fu/ga.po | 3386 ++++++++++++++++------------- - po-script-fu/gd.po | 2820 +++++++++++++++++++++++- - po-script-fu/gl.po | 3439 +++++++++++++++-------------- - po-script-fu/gu.po | 3718 +++++++++++++++++++------------ - po-script-fu/he.po | 3101 ++++++++++++++------------ - po-script-fu/hr.po | 4223 +++++++++++++++++++++--------------- - po-script-fu/hu.po | 3636 +++++++++++++++++-------------- - po-script-fu/id.po | 2851 +++++++++++++++++++++++- - po-script-fu/is.po | 3156 +++++++++++++++------------ - po-script-fu/it.po | 2732 ++++++++++++++++++++++- - po-script-fu/ja.po | 3616 +++++++++++++++++-------------- - po-script-fu/km.po | 3872 +++++++++++++++++---------------- - po-script-fu/ko.po | 2936 +++++++++++++++++++++++-- - po-script-fu/lt.po | 3595 +++++++++++++++--------------- - po-script-fu/lv.po | 3437 +++++++++++++++-------------- - po-script-fu/mk.po | 3572 ++++++++++++++++-------------- - po-script-fu/ms.po | 4227 +++++++++++++++++++++--------------- - po-script-fu/my.po | 3665 ++++++++++++++++--------------- - po-script-fu/nb.po | 3492 ++++++++++++++++-------------- - po-script-fu/ne.po | 3912 +++++++++++++++++---------------- - po-script-fu/nl.po | 3932 +++++++++++++++++++-------------- - po-script-fu/nn.po | 4059 +++++++++++++++++++++------------- - po-script-fu/oc.po | 3121 +++++++++++++------------- - po-script-fu/pa.po | 3577 ++++++++++++++++-------------- - po-script-fu/pl.po | 3296 ++++++++++++++-------------- - po-script-fu/pt.po | 3461 +++++++++++++++-------------- - po-script-fu/pt_BR.po | 3305 ++++++++++++++-------------- - po-script-fu/ro.po | 4117 +++++++++++++++++++++-------------- - po-script-fu/ru.po | 3441 +++++++++++++++-------------- - po-script-fu/rw.po | 4006 ++++++++++++++++++++-------------- - po-script-fu/sk.po | 3690 +++++++++++++++++++------------ - po-script-fu/sl.po | 3556 ++++++++++++++++-------------- - po-script-fu/sr.po | 2820 +++++++++++++++++++++++- + po-script-fu/cs.po | 3436 +++++++++++++++-------------- + po-script-fu/da.po | 3482 +++++++++++++++-------------- + po-script-fu/de.po | 3461 +++++++++++++++-------------- + po-script-fu/dz.po | 4086 +++++++++++++++++++---------------- + po-script-fu/el.po | 4018 +++++++++++++++++++++------------- + po-script-fu/en_CA.po | 3851 ++++++++++++++++++--------------- + po-script-fu/en_GB.po | 3439 +++++++++++++++-------------- + po-script-fu/eo.po | 4015 +++++++++++++++++++++------------- + po-script-fu/es.po | 3468 +++++++++++++++-------------- + po-script-fu/et.po | 2596 +++++++++++++++------- + po-script-fu/eu.po | 3453 +++++++++++++++-------------- + po-script-fu/fa.po | 3801 ++++++++++++++++---------------- + po-script-fu/fi.po | 3832 ++++++++++++++++---------------- + po-script-fu/fr.po | 3451 +++++++++++++++-------------- + po-script-fu/ga.po | 3386 ++++++++++++++++------------- + po-script-fu/gd.po | 2820 +++++++++++++++++++++++- + po-script-fu/gl.po | 3439 +++++++++++++++-------------- + po-script-fu/gu.po | 3718 +++++++++++++++++++------------ + po-script-fu/he.po | 3101 ++++++++++++++------------ + po-script-fu/hr.po | 4223 +++++++++++++++++++++--------------- + po-script-fu/hu.po | 3636 +++++++++++++++++-------------- + po-script-fu/id.po | 2851 +++++++++++++++++++++++- + po-script-fu/is.po | 3156 +++++++++++++++------------ + po-script-fu/it.po | 2732 ++++++++++++++++++++++- + po-script-fu/ja.po | 3616 +++++++++++++++++-------------- + po-script-fu/km.po | 3872 +++++++++++++++++---------------- + po-script-fu/ko.po | 2936 +++++++++++++++++++++++-- + po-script-fu/lt.po | 3595 +++++++++++++++--------------- + po-script-fu/lv.po | 3437 +++++++++++++++-------------- + po-script-fu/mk.po | 3572 ++++++++++++++++-------------- + po-script-fu/ms.po | 4227 +++++++++++++++++++++--------------- + po-script-fu/my.po | 3665 ++++++++++++++++--------------- + po-script-fu/nb.po | 3492 ++++++++++++++++-------------- + po-script-fu/ne.po | 3912 +++++++++++++++++---------------- + po-script-fu/nl.po | 3932 +++++++++++++++++++-------------- + po-script-fu/nn.po | 4059 +++++++++++++++++++++------------- + po-script-fu/oc.po | 3121 +++++++++++++------------- + po-script-fu/pa.po | 3577 ++++++++++++++++-------------- + po-script-fu/pl.po | 3296 ++++++++++++++-------------- + po-script-fu/pt.po | 3461 +++++++++++++++-------------- + po-script-fu/pt_BR.po | 3305 ++++++++++++++-------------- + po-script-fu/ro.po | 4117 +++++++++++++++++++++-------------- + po-script-fu/ru.po | 3441 +++++++++++++++-------------- + po-script-fu/rw.po | 4006 ++++++++++++++++++++-------------- + po-script-fu/sk.po | 3690 +++++++++++++++++++------------ + po-script-fu/sl.po | 3556 ++++++++++++++++-------------- + po-script-fu/sr.po | 2820 +++++++++++++++++++++++- po-script-fu/sr@latin.po | 2820 +++++++++++++++++++++++- - po-script-fu/sv.po | 3989 ++++++++++++++++++++-------------- - po-script-fu/ta.po | 3465 +++++++++++++++-------------- - po-script-fu/te.po | 2842 +++++++++++++++++++++++- - po-script-fu/tr.po | 3460 +++++++++++++++-------------- - po-script-fu/uk.po | 3440 +++++++++++++++-------------- - po-script-fu/vi.po | 3448 +++++++++++++++-------------- - po-script-fu/xh.po | 4134 +++++++++++++++++++++-------------- - po-script-fu/yi.po | 3254 ++++++++++++++++------------ - po-script-fu/zh_CN.po | 3435 +++++++++++++++-------------- - po-script-fu/zh_HK.po | 3754 +++++++++++++++++++++----------- - po-script-fu/zh_TW.po | 3750 +++++++++++++++++++++----------- + po-script-fu/sv.po | 3989 ++++++++++++++++++++-------------- + po-script-fu/ta.po | 3465 +++++++++++++++-------------- + po-script-fu/te.po | 2842 +++++++++++++++++++++++- + po-script-fu/tr.po | 3460 +++++++++++++++-------------- + po-script-fu/uk.po | 3440 +++++++++++++++-------------- + po-script-fu/vi.po | 3448 +++++++++++++++-------------- + po-script-fu/xh.po | 4134 +++++++++++++++++++++-------------- + po-script-fu/yi.po | 3254 ++++++++++++++++------------ + po-script-fu/zh_CN.po | 3435 +++++++++++++++-------------- + po-script-fu/zh_HK.po | 3754 +++++++++++++++++++++----------- + po-script-fu/zh_TW.po | 3750 +++++++++++++++++++++----------- 66 files changed, 139162 insertions(+), 95806 deletions(-) commit 96fb9ab650a723a0979bfd4534aed9820ca4cf6d Author: Michael Natterer -Date: Thu May 1 20:27:10 2014 +0200 +Date: Thu May 1 20:27:10 2014 +0200 plug-ins: file-pdf-save needs two return values now for the error message @@ -6762,7 +7852,7 @@ commit 57180cd3cc06c4f65a7e8f12b980239fd4ff9bbb Author: Ed J -Date: Sat May 3 08:38:31 2014 +0100 +Date: Sat May 3 08:38:31 2014 +0100 There only *might* be an error string. @@ -6771,7 +7861,7 @@ commit bcb03ad82f5309669522ceecacb5e19568d1b906 Author: Ed J -Date: Sat May 3 03:37:05 2014 +0100 +Date: Sat May 3 03:37:05 2014 +0100 Document other layer_group-relevant procedures in gimp_layer_group_new. @@ -6781,7 +7871,7 @@ commit ef8603bde8f178da5ce5a4408fed9530c571a260 Author: Ed J -Date: Sat May 3 00:44:29 2014 +0100 +Date: Sat May 3 00:44:29 2014 +0100 Document other layer_group-relevant procedures in gimp_layer_group_new. @@ -6791,7 +7881,7 @@ commit 1f527731207118f440279fe21354fa6472ffe6a6 Author: Ed J -Date: Sat May 3 00:12:58 2014 +0100 +Date: Sat May 3 00:12:58 2014 +0100 Document that gimp_run_procedure* on error return a string. @@ -6800,7 +7890,7 @@ commit 0d9951f5ccc7a316b1c0452f7b6ae72baffee4f7 Author: Piotr Drąg -Date: Thu May 1 14:58:09 2014 +0200 +Date: Thu May 1 14:58:09 2014 +0200 Fix typo @@ -6809,7 +7899,7 @@ commit e0a5ba46ebeb81db3d72e1146a8e99f5dc95dbd4 Author: Michael Natterer -Date: Wed Apr 30 02:02:24 2014 +0200 +Date: Wed Apr 30 02:02:24 2014 +0200 app: the FG/BG hardedge gradient didn't have a unique identifier @@ -6820,7 +7910,7 @@ commit d03203973e9898b6fc158cb7316f3e80ee0d499a Author: Hartmut Kuhse -Date: Tue Apr 29 17:46:05 2014 +0200 +Date: Tue Apr 29 17:46:05 2014 +0200 Bug 725577 - file-pdf-save fails to export images larger than 32768 pixels @@ -6837,7 +7927,7 @@ commit ebdd761caeabb48d83fd3aa6cabfa6878553d9e2 Author: Michael Natterer -Date: Tue Apr 29 09:16:19 2014 +0200 +Date: Tue Apr 29 09:16:19 2014 +0200 Bug 729158 - Internal inconsistent state with gimp_image_get_selection... @@ -6855,7 +7945,7 @@ commit 49b85d33c4ee35111478d0a9caa041bac2e2943c Author: Sven Claussner -Date: Sun Apr 27 21:21:14 2014 +0200 +Date: Sun Apr 27 21:21:14 2014 +0200 Update Jenkins tutorial @@ -6866,7 +7956,7 @@ commit f27dca28832029289926b486048cec71fbe15976 Author: Marco Ciampa -Date: Sun Apr 27 00:48:36 2014 +0200 +Date: Sun Apr 27 00:48:36 2014 +0200 Updated italian translation. @@ -6877,7 +7967,7 @@ commit d65efc792708b37499a545237c654f2c934c4b0a Author: Piotr Drąg -Date: Thu Apr 24 04:02:00 2014 +0200 +Date: Thu Apr 24 04:02:00 2014 +0200 Updated Polish translation @@ -6888,7 +7978,7 @@ commit d6e7557001000e6aaf93cee7c4d3379642d72d4a Author: Christian Lehmann -Date: Wed Apr 23 18:07:45 2014 +0200 +Date: Wed Apr 23 18:07:45 2014 +0200 Bug 708098 - Further mitigation for CVE-2012-4245 (script-fu-server) @@ -6901,7 +7991,7 @@ commit 401d21b12412e69f0dc813bb8795082184d9c94e Author: Christian Lehmann -Date: Thu Nov 14 22:58:31 2013 +0100 +Date: Thu Nov 14 22:58:31 2013 +0100 Bug 708098 - Further mitigation for CVE-2012-4245 (script-fu-server) @@ -6919,7 +8009,7 @@ commit 4f83fd3f13631bb6d89cc5c3527fb2ca802f5489 Author: Christian Lehmann -Date: Thu Nov 14 22:48:38 2013 +0100 +Date: Thu Nov 14 22:48:38 2013 +0100 Bug 708098 - Further mitigation for CVE-2012-4245 (script-fu-server) @@ -6934,7 +8024,7 @@ commit 95269e922b486fceb28670fc21073fe1a61c8046 Author: Christian Lehmann -Date: Thu Nov 14 22:43:02 2013 +0100 +Date: Thu Nov 14 22:43:02 2013 +0100 Bug 708098 - Further mitigation for CVE-2012-4245 (script-fu-server) @@ -6948,7 +8038,7 @@ commit accd76b462c0700bf0678143696fb607f5495350 Author: Piotr Drąg -Date: Wed Apr 23 02:24:46 2014 +0200 +Date: Wed Apr 23 02:24:46 2014 +0200 Updated Polish translation @@ -6958,7 +8048,7 @@ commit 8153b94a2b64a1a0d661b26ac046c3dcaa8f5ee7 Author: Michael Natterer -Date: Tue Apr 22 23:02:17 2014 +0200 +Date: Tue Apr 22 23:02:17 2014 +0200 plug-ins: fix the build in file-raw.c @@ -6967,7 +8057,7 @@ commit 8b62ab865be7311aa55e11759f184f54b4f50246 Author: Björn Kautler -Date: Thu Apr 17 03:21:26 2014 +0200 +Date: Thu Apr 17 03:21:26 2014 +0200 Bug 728633 - Improvements to the file-raw plugin @@ -6978,7 +8068,7 @@ commit 6c1b88d912fb73855507433fdf797642ed4646cf Author: Björn Kautler -Date: Tue Apr 15 23:26:44 2014 +0200 +Date: Tue Apr 15 23:26:44 2014 +0200 Bug 728633 - Improvements to the file-raw plugin @@ -6989,7 +8079,7 @@ commit a6dbdf14be55fc247bf419db1716add45f7efffc Author: Hartmut Kuhse -Date: Mon Apr 21 19:20:57 2014 +0200 +Date: Mon Apr 21 19:20:57 2014 +0200 Bug 727832 - file-psd-load infinite loop @@ -7002,7 +8092,7 @@ commit a2449f1b461e524736a1323e3cb8302b3edf2432 Author: Inaki Larranaga Murgoitio -Date: Mon Apr 21 11:11:14 2014 +0200 +Date: Mon Apr 21 11:11:14 2014 +0200 Updated Basque language @@ -7012,7 +8102,7 @@ commit 2c44cb5985f5c1b9c467069adabf853728953ce2 Author: Inaki Larranaga Murgoitio -Date: Mon Apr 21 11:07:21 2014 +0200 +Date: Mon Apr 21 11:07:21 2014 +0200 Updated Basque language @@ -7022,7 +8112,7 @@ commit 3589661191b2d265dc2875d5e61d1e3bf72102b9 Author: Michael Natterer -Date: Fri Apr 18 19:46:41 2014 +0200 +Date: Fri Apr 18 19:46:41 2014 +0200 Bug 724444 - Printing ignores dpi ratio / image proportions, always prints 1:1 @@ -7036,7 +8126,7 @@ commit 1f7df343dc2c0160c7b6255ed0aab12be8c8ec11 Author: Michael Natterer -Date: Fri Apr 18 19:17:56 2014 +0200 +Date: Fri Apr 18 19:17:56 2014 +0200 app: enable scale image's resolution chain button only if xres == yres @@ -7050,7 +8140,7 @@ commit 990b35309f29999fa5523a8213a9035b41b6a434 Author: Michael Natterer -Date: Fri Apr 18 18:43:32 2014 +0200 +Date: Fri Apr 18 18:43:32 2014 +0200 app: enable image new's resolution chain button only if xres == yres @@ -7063,7 +8153,7 @@ commit 0defae9024899cfed7a647c467709ef298bd160e Author: Michael Natterer -Date: Fri Apr 18 17:57:02 2014 +0200 +Date: Fri Apr 18 17:57:02 2014 +0200 app: only enable the resolution chain button if xres and yres are the same @@ -7075,7 +8165,7 @@ commit 878d77d838ac5a590389892dc0574ee693c2f547 Author: Dimitris Spingos -Date: Fri Apr 18 18:05:21 2014 +0300 +Date: Fri Apr 18 18:05:21 2014 +0300 Updated Greek translation @@ -7085,7 +8175,7 @@ commit 8a8c6eaa57737c0614a571e0cafd6a710a0ec4dd Author: Piotr Drąg -Date: Thu Apr 17 01:06:54 2014 +0200 +Date: Thu Apr 17 01:06:54 2014 +0200 Updated Polish translation @@ -7095,7 +8185,7 @@ commit a3cbf8b543d281a1f1f6bd4713c71ccdf9cf41f7 Author: Piotr Drąg -Date: Thu Apr 17 01:03:39 2014 +0200 +Date: Thu Apr 17 01:03:39 2014 +0200 Fix typo @@ -7104,7 +8194,7 @@ commit bf78d6a293998fec1eb5b94d3e83bd024d68cc79 Author: Hartmut Kuhse -Date: Wed Apr 16 11:31:29 2014 +0200 +Date: Wed Apr 16 11:31:29 2014 +0200 Bug 725576 - GIMP crashes on printing large TIFF files Cairo surface creating is limited to 32768. @@ -7114,12 +8204,12 @@ plug-ins/print/print-draw-page.c | 70 +++++++++++++++++++++++++++++----------- plug-ins/print/print-draw-page.h | 3 +- - plug-ins/print/print.c | 16 ++++++--- + plug-ins/print/print.c | 16 ++++++--- 3 files changed, 66 insertions(+), 23 deletions(-) commit bdde26ec394f83ab38700e7dbd04b6d74140e214 Author: Michael Natterer -Date: Tue Apr 15 17:15:32 2014 +0200 +Date: Tue Apr 15 17:15:32 2014 +0200 Bug 726181 - Heal tool mode is ignored - always in "Normal" mode @@ -7132,7 +8222,7 @@ commit c32b008511541b79bb02dac877d24be009ecfad6 Author: Daniel Mustieles -Date: Tue Apr 15 14:21:37 2014 +0200 +Date: Tue Apr 15 14:21:37 2014 +0200 Updated Spanish translation @@ -7142,7 +8232,7 @@ commit e7af7939a0a922c532e9e0d6c9c457d5aa768799 Author: Michael Natterer -Date: Fri Apr 11 16:52:42 2014 +0200 +Date: Fri Apr 11 16:52:42 2014 +0200 Bug 726495 - "Text to path" delivers a path offset from the text @@ -7158,7 +8248,7 @@ commit f13559a360400495f9eb2aa629d9d1e187797169 Author: Michael Natterer -Date: Fri Apr 11 15:25:22 2014 +0200 +Date: Fri Apr 11 15:25:22 2014 +0200 Bug 726761 - Alias PIX image encoding broken @@ -7173,7 +8263,7 @@ commit fb2ecd9f509f92fc6674dc0751bba889c8195b1e Author: Michael Natterer -Date: Wed Apr 9 14:30:46 2014 +0200 +Date: Wed Apr 9 14:30:46 2014 +0200 app: don't create a fallback crosshair in gimp_brush_tool_create_outline() @@ -7198,7 +8288,7 @@ commit ae1a67d3269aa50e4373c256f445167438b480fa Author: Sven Claussner -Date: Sun Apr 6 09:35:24 2014 +0200 +Date: Sun Apr 6 09:35:24 2014 +0200 Add Jenkins tutorial (wip) @@ -7212,11 +8302,11 @@ commit bbf9484f3c9b27bb766a6a5c90226a3c772082af Author: Мирослав Николић -Date: Sat Apr 5 11:51:59 2014 +0200 +Date: Sat Apr 5 11:51:59 2014 +0200 Updated Serbian translation - po-tips/sr.po | 145 + po-tips/sr.po | 145 ++++++++++++++++++++++++++-------------------------- po-tips/sr@latin.po | 143 ++++++++++++++++++++++++++------------------------- @@ -7224,21 +8314,21 @@ commit 29b0cebbac7779a1c252af6933123d9595e96c24 Author: Мирослав Николић -Date: Sat Apr 5 11:50:53 2014 +0200 +Date: Sat Apr 5 11:50:53 2014 +0200 Updated Serbian translation - po-tags/sr.po | 19 +++++++++++-------- + po-tags/sr.po | 19 +++++++++++-------- po-tags/sr@latin.po | 19 +++++++++++-------- 2 files changed, 22 insertions(+), 16 deletions(-) commit 5a4081c46f36f1d07040222ca5b583e460f27849 Author: Мирослав Николић -Date: Sat Apr 5 11:49:59 2014 +0200 +Date: Sat Apr 5 11:49:59 2014 +0200 Updated Serbian translation - po-script-fu/sr.po | 2942 + po-script-fu/sr.po | 2942 +++------------------------------------------- po-script-fu/sr@latin.po | 2942 +++------------------------------------------- @@ -7246,11 +8336,11 @@ commit 8a6cd6443dbf860c7ae6f989deb0ee21a64e407b Author: Мирослав Николић -Date: Sat Apr 5 11:48:50 2014 +0200 +Date: Sat Apr 5 11:48:50 2014 +0200 Updated Serbian translation - po-plug-ins/sr.po | 6891 + po-plug-ins/sr.po | 6891 ++++++++++++++++++++++++----------------------- po-plug-ins/sr@latin.po | 6765 ++++++++++++++++++++++++---------------------- @@ -7258,7 +8348,7 @@ commit 7f98c96ec768e4b58228d9e47b0c53f4be234660 Author: Мирослав Николић -Date: Sat Apr 5 11:47:55 2014 +0200 +Date: Sat Apr 5 11:47:55 2014 +0200 Updated Serbian translation @@ -7270,11 +8360,11 @@ commit 3a384c2e7305a855d89a6b9592d32aca785b3ed5 Author: Мирослав Николић -Date: Sat Apr 5 11:46:56 2014 +0200 +Date: Sat Apr 5 11:46:56 2014 +0200 Updated Serbian translation - po-libgimp/sr.po | 551 + po-libgimp/sr.po | 551 ++++++++++++++++++++++--------------------------- po-libgimp/sr@latin.po | 537 +++++++++++++++++++++-------------------------- @@ -7282,11 +8372,11 @@ commit e16fee9631e1260152c58c88fa58727666b2f935 Author: Мирослав Николић -Date: Sat Apr 5 11:45:45 2014 +0200 +Date: Sat Apr 5 11:45:45 2014 +0200 Updated Serbian translation - po/sr.po | 8413 + po/sr.po | 8413 +++++++++++++++++++------------------------------------- po/sr@latin.po | 8413 +++++++++++++++++++------------------------------------- @@ -7294,7 +8384,7 @@ commit 4ba0c19f548cb09c890845d32b82083fb4372e6a Author: Balázs Úr -Date: Thu Mar 20 16:31:30 2014 +0100 +Date: Thu Mar 20 16:31:30 2014 +0100 Updated Hungarian translation @@ -7304,7 +8394,7 @@ commit 50418b62532bbe49bfcceddcee51b2dd3c8f5efb Author: Balázs Úr -Date: Thu Mar 20 16:15:26 2014 +0100 +Date: Thu Mar 20 16:15:26 2014 +0100 Updated Hungarian translation @@ -7314,7 +8404,7 @@ commit 86385cfa282ee0c9fa137f94a68ec5f6bc613c71 Author: Michael Natterer -Date: Sat Mar 15 17:50:35 2014 +0100 +Date: Sat Mar 15 17:50:35 2014 +0100 Bug 706361 - Printer queue dosn't show the filename of the printing image @@ -7325,14 +8415,14 @@ (cherry picked from commit fea22c345ce0a1b13be3eeb48a9f232f3dee6a43) - app/pdb/image-cmds.c | 8 ++------ + app/pdb/image-cmds.c | 8 ++------ libgimp/gimpimage_pdb.c | 8 ++++++-- tools/pdbgen/pdb/image.pdb | 16 ++++++++-------- 3 files changed, 16 insertions(+), 16 deletions(-) commit a833a30c2cbcac22559ad9646ef06a555bc2ec7e Author: Michael Natterer -Date: Fri Mar 14 17:28:42 2014 +0100 +Date: Fri Mar 14 17:28:42 2014 +0100 app: gimp_procedure_execute(): don't use a NULL plug-ins error message @@ -7348,7 +8438,7 @@ commit 1aa573c3d4c33a470a4473b7dac4e838239690d6 Author: Michael Natterer -Date: Mon Mar 10 01:24:11 2014 +0100 +Date: Mon Mar 10 01:24:11 2014 +0100 app: set the idle_id to 0 in gimp_image_profile_view_query() @@ -7362,7 +8452,7 @@ commit 71e90afd9633f614a5d87fa9dcb6183403a303a5 Author: Michael Natterer -Date: Mon Mar 10 00:12:31 2014 +0100 +Date: Mon Mar 10 00:12:31 2014 +0100 Bug 605872 - Units dropdown list is not updated @@ -7383,7 +8473,7 @@ commit 7c36b30541cc8d44bc861892a0552a8e7d9508fa Author: Christian Kirbach -Date: Sun Mar 9 21:53:03 2014 +0000 +Date: Sun Mar 9 21:53:03 2014 +0000 Updated German translation @@ -7393,7 +8483,7 @@ commit 410ea91e226f01dc6723555534cf3650782aeb64 Author: Michael Natterer -Date: Sat Mar 8 22:38:27 2014 +0100 +Date: Sat Mar 8 22:38:27 2014 +0100 Bug 691169 - Gimp fails to open files with UTF8 characters as filenames... @@ -7411,7 +8501,7 @@ commit 4d4586ae96496805c94f65f5627932120bdccba0 Author: Rūdolfs Mazurs -Date: Thu Mar 6 15:37:16 2014 +0200 +Date: Thu Mar 6 15:37:16 2014 +0200 Fixed Latvian @@ -7420,19 +8510,19 @@ commit 3fb9db7446a6ab2f5441263e28365f5721c13821 Author: Rūdolfs Mazurs -Date: Thu Mar 6 15:27:53 2014 +0200 +Date: Thu Mar 6 15:27:53 2014 +0200 Updated Latvian translation po-plug-ins/lv.po | 1239 ++++++++++++++++++++++++++-------------------------- - po/lv.po | 1244 + po/lv.po | 1244 ++++++++++++++++++++++++++++++----------------------- 2 files changed, 1332 insertions(+), 1151 deletions(-) commit 8a9841850fecc0bd58d3bcf348c138bf77296369 Author: Michael Natterer -Date: Thu Mar 6 11:56:18 2014 +0100 +Date: Thu Mar 6 11:56:18 2014 +0100 Bug 725734 - Themes not alphabetized @@ -7445,7 +8535,7 @@ commit 83d169f5bffc702b6f6162103505b623e77f39e2 Author: João S. O. Bueno -Date: Wed Mar 5 12:36:11 2014 -0300 +Date: Wed Mar 5 12:36:11 2014 -0300 pygimp: fixes creation of GroupLayer objects @@ -7462,7 +8552,7 @@ commit 2aa520f05e25aaa31df2b52a1bff02703f94438c Author: Tiagosdot -Date: Sun Mar 2 23:46:50 2014 +0000 +Date: Sun Mar 2 23:46:50 2014 +0000 Updated Portuguese translation @@ -7472,7 +8562,7 @@ commit ed40c144bcae57348bd97f3bed8478e6b5f2d2b1 Author: Tiagosdot -Date: Sun Mar 2 23:45:49 2014 +0000 +Date: Sun Mar 2 23:45:49 2014 +0000 Updated Portuguese translation @@ -7482,7 +8572,7 @@ commit 99bc7658173febe9653fc4f6224222d369d7880c Author: Tiagosdot -Date: Sun Mar 2 23:42:45 2014 +0000 +Date: Sun Mar 2 23:42:45 2014 +0000 Updated Portuguese translation @@ -7492,7 +8582,7 @@ commit c6f5c24c368c72674a9fe5a04f5a8c076b209204 Author: saul -Date: Thu Feb 27 09:16:49 2014 -0500 +Date: Thu Feb 27 09:16:49 2014 -0500 Bug 725325 - Drag and drop fails for patterns and brushes @@ -7506,7 +8596,7 @@ commit c086e98029411c8c4c78e166e697aad8a5686e92 Author: Michael Natterer -Date: Sat Feb 22 09:40:49 2014 +0100 +Date: Sat Feb 22 09:40:49 2014 +0100 Bug 694340 - EPS resolution capped @ 1440 on import @@ -7519,7 +8609,7 @@ commit 6c9a04e1030bc3efc537ff16d5291f3207fd0672 Author: Jehan -Date: Fri Feb 14 15:50:56 2014 +1300 +Date: Fri Feb 14 15:50:56 2014 +1300 Bug 724338: free the GimpImageFile's icon when its contents is updated. @@ -7533,7 +8623,7 @@ commit 694e3313c8044cfd514fd6a4685351edd3f1aaf4 Author: Michael Henning -Date: Sun Feb 16 10:41:12 2014 -0500 +Date: Sun Feb 16 10:41:12 2014 -0500 plug-ins: Fix build with libpng versions < 1.4. @@ -7546,7 +8636,7 @@ commit 640f11f9c1d4cf45b81fdadc9555d891baab897b Author: Michael Henning -Date: Sat Feb 15 22:55:18 2014 -0500 +Date: Sat Feb 15 22:55:18 2014 -0500 Bug 721135 - Unable to export to .png - error: known incorrect sRGB profile @@ -7563,7 +8653,7 @@ commit 174175f206fe461fab6a91a1749585074368bb6f Author: Michael Natterer -Date: Sat Feb 15 21:29:36 2014 +0100 +Date: Sat Feb 15 21:29:36 2014 +0100 Bug 676522 - Make DND work between images in *one* dockable... @@ -7601,7 +8691,7 @@ commit c767b0ff66e39738c30521aa05bf091cca69e070 Author: Jehan -Date: Mon Dec 23 03:25:05 2013 +1300 +Date: Mon Dec 23 03:25:05 2013 +1300 Bug 622758 - Fix error display for thumbnail creation @@ -7616,7 +8706,7 @@ commit c649efc2b8a528e52e0c139a43848a5fc73625ca Author: Michael Natterer -Date: Thu Feb 13 22:06:12 2014 +0100 +Date: Thu Feb 13 22:06:12 2014 +0100 Bug 724295 - multiple svg gradients in a single file not listed correctly @@ -7631,7 +8721,7 @@ commit 405e50c759d5d0576cf1b0dbdbed0820673919b8 Author: Daniel Sabo -Date: Sat Dec 14 12:56:20 2013 -0800 +Date: Sat Dec 14 12:56:20 2013 -0800 app: Fix on canvas widgets ignoring clicks from tablets - bug 614441 @@ -7643,12 +8733,12 @@ (cherry picked from commit a059c0e7eb73329e1e2661de2b44864531ea1a6b) app/display/gimpdisplayshell-tool-events.c | 18 +++++++++++++++++- - app/display/gimpdisplayshell.h | 2 ++ + app/display/gimpdisplayshell.h | 2 ++ 2 files changed, 19 insertions(+), 1 deletion(-) commit 8fe2d638ce90b3eef416038ef41c29212ebdf9dd Author: Martin Srebotnjak -Date: Mon Feb 10 22:11:07 2014 +0100 +Date: Mon Feb 10 22:11:07 2014 +0100 Updated Slovenian translation @@ -7658,7 +8748,7 @@ commit bdb7d701aed109887265cbb39f16d18ed8ed33e5 Author: Martin Srebotnjak -Date: Mon Feb 10 22:09:03 2014 +0100 +Date: Mon Feb 10 22:09:03 2014 +0100 Updated Slovenian translation @@ -7668,7 +8758,7 @@ commit dbea8d7ba1e2e0361ef71a1d6bf6044d374cea5b Author: Massimo Valentini -Date: Sat Feb 8 17:10:00 2014 +0100 +Date: Sat Feb 8 17:10:00 2014 +0100 Bug 701189: Opening fuzzed .gif-file leads to crash of... @@ -7680,7 +8770,7 @@ commit 073d70fa8cd1beffe5d0a39132ad694437b629bc Author: Michael Natterer -Date: Sat Feb 8 10:18:29 2014 +0100 +Date: Sat Feb 8 10:18:29 2014 +0100 Bug 722400 - GIMP segfaults when trying to save a modified, newly created image @@ -7695,7 +8785,7 @@ commit 1cdd310320bd4000d786feed8f8958e0cb58a6ce Author: Piotr Drąg -Date: Sat Feb 8 03:03:52 2014 +0100 +Date: Sat Feb 8 03:03:52 2014 +0100 Updated LINGUAS @@ -7704,7 +8794,7 @@ commit e8e9daa40bb3754d390f4ef9547263b4dc02ed4d Author: Michael Natterer -Date: Fri Feb 7 21:18:26 2014 +0100 +Date: Fri Feb 7 21:18:26 2014 +0100 Bug 723649 - Increase/Decrease brush size relative actions don't work @@ -7718,17 +8808,17 @@ commit 50aa48f9754bd0fe195c789cb2decff42fc3fc10 Author: akerbeltz -Date: Fri Feb 7 16:05:38 2014 +0000 +Date: Fri Feb 7 16:05:38 2014 +0000 Added Scottish Gaelic translation po-tags/LINGUAS | 1 + - po-tags/gd.po | 31 +++++++++++++++++++++++++++++++ + po-tags/gd.po | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) commit 95e20f0bda35bf768f1beb6ca7d9e43c0978a43c Author: akerbeltz -Date: Fri Feb 7 15:59:50 2014 +0000 +Date: Fri Feb 7 15:59:50 2014 +0000 Added Scottish Gaelic translation @@ -7739,7 +8829,7 @@ commit f12dab6581af25783f493324ac51baf187d40fea Author: akerbeltz -Date: Fri Feb 7 00:35:43 2014 +0000 +Date: Fri Feb 7 00:35:43 2014 +0000 Updated Scottish Gaelic translation @@ -7749,7 +8839,7 @@ commit c15d7bcc8083533fa360c49eafcb48aeb119ce38 Author: Michael Natterer -Date: Thu Feb 6 23:20:39 2014 +0100 +Date: Thu Feb 6 23:20:39 2014 +0100 Bug 721249 - pdb.gimp_context_set_brush_size() dont't work @@ -7766,23 +8856,23 @@ (cherry picked from commit 4d6640ff79ff13ae6d031da477a21c85119b2f15) - app/actions/select-commands.c | 3 ++- + app/actions/select-commands.c | 3 ++- app/actions/vectors-commands.c | 3 ++- - app/core/gimpitem.c | 8 ++++++-- - app/core/gimpitem.h | 2 +- - app/core/gimpstrokeoptions.c | 14 ++++++-------- - app/core/gimpstrokeoptions.h | 2 +- - app/dialogs/stroke-dialog.c | 4 ++-- - app/pdb/edit-cmds.c | 29 +++++++++++++++++++++++------ - app/pdb/gimppdbcontext.c | 4 +++- - app/pdb/paths-cmds.c | 15 ++++++++++++--- - tools/pdbgen/pdb/edit.pdb | 28 ++++++++++++++++++++++------ - tools/pdbgen/pdb/paths.pdb | 15 ++++++++++++--- + app/core/gimpitem.c | 8 ++++++-- + app/core/gimpitem.h | 2 +- + app/core/gimpstrokeoptions.c | 14 ++++++-------- + app/core/gimpstrokeoptions.h | 2 +- + app/dialogs/stroke-dialog.c | 4 ++-- + app/pdb/edit-cmds.c | 29 +++++++++++++++++++++++------ + app/pdb/gimppdbcontext.c | 4 +++- + app/pdb/paths-cmds.c | 15 ++++++++++++--- + tools/pdbgen/pdb/edit.pdb | 28 ++++++++++++++++++++++------ + tools/pdbgen/pdb/paths.pdb | 15 ++++++++++++--- 12 files changed, 92 insertions(+), 35 deletions(-) commit ba0b365ef550d05efd3c328e4ab441c012b0319d Author: akerbeltz -Date: Thu Feb 6 16:34:40 2014 +0000 +Date: Thu Feb 6 16:34:40 2014 +0000 Updated Scottish Gaelic translation @@ -7792,7 +8882,7 @@ commit d94f38c18db41dce4a22a9e55a84c92c2161f169 Author: Michael Natterer -Date: Wed Feb 5 00:54:39 2014 +0100 +Date: Wed Feb 5 00:54:39 2014 +0100 Bug 701159 - Wrong name in transform tool dialogs... @@ -7811,7 +8901,7 @@ commit 72942f4e6b4aa25698b6432f7a20494f61ec3fca Author: Michael Natterer -Date: Tue Feb 4 23:28:01 2014 +0100 +Date: Tue Feb 4 23:28:01 2014 +0100 app: halt the transform tool when switching layer|selection|path transform @@ -7823,7 +8913,7 @@ commit c91f5bd258123bec4de924289dc7dfc4851ad832 Author: Khaled Hosny -Date: Mon Feb 3 19:34:16 2014 +0200 +Date: Mon Feb 3 19:34:16 2014 +0200 Update Arabic translation @@ -7833,7 +8923,7 @@ commit 6c2cd97b868e7742f9a3ade611713e46a1759d1c Author: Kevin Cozens -Date: Mon Feb 3 17:30:04 2014 -0500 +Date: Mon Feb 3 17:30:04 2014 -0500 Removed extraneous 'x' when writing character constants. Fixes bug #721775. @@ -7843,7 +8933,7 @@ commit 6cb5fcafb04c515f8773f81d6867efcedd95688e Author: Michael Natterer -Date: Mon Feb 3 23:05:56 2014 +0100 +Date: Mon Feb 3 23:05:56 2014 +0100 Bug 721249 - pdb.gimp_context_set_brush_size() dont't work @@ -7851,13 +8941,13 @@ (cherry picked from commit 9fe869236bbf178ac9699e0e789f78aa085e5ef6) - app/pdb/paint-tools-cmds.c | 4 ---- + app/pdb/paint-tools-cmds.c | 4 ---- tools/pdbgen/pdb/paint_tools.pdb | 4 ---- 2 files changed, 8 deletions(-) commit eff683373738e600e60e105d7dd44e2e0e482cf4 Author: Rafael Ferreira -Date: Mon Feb 3 21:12:14 2014 +0000 +Date: Mon Feb 3 21:12:14 2014 +0000 Updated Brazilian Portuguese translation @@ -7867,7 +8957,7 @@ commit 76ee47eff95e8dfad303d473c8a54b15720c83c0 Author: Téo Mazars -Date: Thu Jan 30 20:31:26 2014 +0100 +Date: Thu Jan 30 20:31:26 2014 +0100 plug-ins: don't check biClrUsed if bpp > 8 (in bug 697431) @@ -7878,7 +8968,7 @@ commit aed3e3c741000ace5656030697cb0733c1c509ac Author: Michael Natterer -Date: Wed Jan 29 23:40:35 2014 +0100 +Date: Wed Jan 29 23:40:35 2014 +0100 Bug 722034 - Incorrect snapping behaviour for scale tool @@ -7888,12 +8978,12 @@ app/display/gimpcanvashandle.c | 15 +++++++++++++++ app/display/gimpcanvashandle.h | 4 ++++ - app/tools/gimptransformtool.c | 18 ++++++++++++++++++ + app/tools/gimptransformtool.c | 18 ++++++++++++++++++ 3 files changed, 37 insertions(+) commit 523f807d75efdf69473996b0fd7ede07200835c4 Author: Michael Natterer -Date: Mon May 7 14:07:43 2012 +0200 +Date: Mon May 7 14:07:43 2012 +0200 app: set GIMP_CONFIG_PARAM_IGNORE on "confirm-on-close" @@ -7904,7 +8994,7 @@ commit b101f38f0a7cd0b31a8c9c2b90842f75d20e97c0 Author: Michael Natterer -Date: Mon May 7 14:02:36 2012 +0200 +Date: Mon May 7 14:02:36 2012 +0200 app: remove the "confirm-on-close" preference @@ -7914,14 +9004,14 @@ app/config/gimpdisplayconfig.c | 20 +++++++++----------- app/config/gimpdisplayconfig.h | 1 - - app/config/gimprc-blurbs.h | 3 --- + app/config/gimprc-blurbs.h | 3 --- app/dialogs/preferences-dialog.c | 7 ------- app/display/gimpdisplayshell-close.c | 3 +-- 5 files changed, 10 insertions(+), 24 deletions(-) commit 8b6b6add69d3f0d66287a3d2b4e951f28e0d7103 Author: Michael Natterer -Date: Tue Jan 28 18:54:46 2014 +0100 +Date: Tue Jan 28 18:54:46 2014 +0100 Bug 723177 - After opening an ICC profile with a long description... @@ -7936,7 +9026,7 @@ commit 2ec7e24d805d1f524fe455ed08ac641c5244a6e6 Author: Michael Natterer -Date: Sun Jan 26 21:03:28 2014 +0100 +Date: Sun Jan 26 21:03:28 2014 +0100 Bug 722975 - crash when removing tag from palette while filtering by same tag @@ -7959,14 +9049,14 @@ (cherry picked from commit 7fca15c27dd944890a67bb6db90c0b1fd4238f2f) - app/core/gimpdata.c | 2 +- - app/core/gimptagged.c | 2 ++ + app/core/gimpdata.c | 2 +- + app/core/gimptagged.c | 2 ++ app/widgets/gimptagentry.c | 26 ++++++++++++++------------ 3 files changed, 17 insertions(+), 13 deletions(-) commit bcec277211d4f19ef84b97062a1bc54eb9ff17d4 Author: Christian Kirbach -Date: Sun Jan 26 18:19:41 2014 +0100 +Date: Sun Jan 26 18:19:41 2014 +0100 Updated German translation @@ -7976,7 +9066,7 @@ commit bfe77b91a5977054de8bb143af649c0209ce58a0 Author: Aurimas Černius -Date: Sat Jan 11 23:51:18 2014 +0200 +Date: Sat Jan 11 23:51:18 2014 +0200 Updated Lithuanian plug-ins translation @@ -7986,7 +9076,7 @@ commit 0383e84d47ff6e4b0621f987ddf27189bf965feb Author: Aurimas Černius -Date: Sat Jan 11 23:48:18 2014 +0200 +Date: Sat Jan 11 23:48:18 2014 +0200 Updated Lithuanian translation @@ -7996,7 +9086,7 @@ commit 20523c61aca40ac1189c444e77ee73f6aa81bdbb Author: João S. O. Bueno -Date: Thu Jan 9 00:44:55 2014 -0200 +Date: Thu Jan 9 00:44:55 2014 -0200 Creates a FileChooserbutton that can pick new filenames. Fixes #699978 @@ -8006,7 +9096,7 @@ commit bb3b126fb9f9b5565d7e53facc942cc708b50892 Author: João S. O. Bueno -Date: Mon Jan 6 13:01:40 2014 -0200 +Date: Mon Jan 6 13:01:40 2014 -0200 Fixes pt_BR translation for 'clear document history' button @@ -8015,18 +9105,18 @@ commit 166291d7194b42c11e06abade4ac9779f6ecb5fe Author: Dimitris Spingos -Date: Wed Jan 8 09:09:27 2014 +0200 +Date: Wed Jan 8 09:09:27 2014 +0200 Updated Greek translations po-plug-ins/el.po | 954 +++++++++++++++++++++++++++--------------------------- - po/el.po | 136 ++++---- + po/el.po | 136 ++++---- 2 files changed, 559 insertions(+), 531 deletions(-) commit e3a65f2ff5df4c7dd6b48b6e68989f4776e1a90e Author: João S. O. Bueno -Date: Sun Jan 5 04:40:04 2014 -0200 +Date: Sun Jan 5 04:40:04 2014 -0200 Remove accelerator markers from tooltips for python-fu dialogs @@ -8035,7 +9125,7 @@ commit d09db6c286da5d5b223440ad1df3268137e447f9 Author: Konfrare Albert -Date: Sat Jan 4 23:46:49 2014 +0100 +Date: Sat Jan 4 23:46:49 2014 +0100 [l10n] Update Catalan translation @@ -8045,7 +9135,7 @@ commit b4477d8e01e4b03121a9b834d35b69d0d8374638 Author: Michael Natterer -Date: Sat Jan 4 15:45:25 2014 +0100 +Date: Sat Jan 4 15:45:25 2014 +0100 app: add gimp_paint_options_set_default_brush_size() @@ -8056,19 +9146,19 @@ (cherry picked from commit ef858453724f6d4ca105fc9daec038fdff358f30) - app/core/gimpstrokeoptions.c | 19 ++----------------- - app/paint/gimppaintoptions.c | 24 ++++++++++++++++++++++++ - app/paint/gimppaintoptions.h | 3 +++ - app/pdb/context-cmds.c | 8 ++------ - app/pdb/paint-tools-cmds.c | 14 +++----------- + app/core/gimpstrokeoptions.c | 19 ++----------------- + app/paint/gimppaintoptions.c | 24 ++++++++++++++++++++++++ + app/paint/gimppaintoptions.h | 3 +++ + app/pdb/context-cmds.c | 8 ++------ + app/pdb/paint-tools-cmds.c | 14 +++----------- app/tools/gimppaintoptions-gui.c | 10 +--------- - tools/pdbgen/pdb/context.pdb | 10 +++------- + tools/pdbgen/pdb/context.pdb | 10 +++------- tools/pdbgen/pdb/paint_tools.pdb | 14 +++----------- 8 files changed, 41 insertions(+), 61 deletions(-) commit 00a49318fd830f669742e785622ac8be8588d99b Author: Konfrare Albert -Date: Sat Jan 4 01:18:43 2014 +0100 +Date: Sat Jan 4 01:18:43 2014 +0100 [l10n] Update Catalan translation @@ -8078,7 +9168,7 @@ commit efe9900c94be360bc55033b5adaf2975f62ae378 Author: Mark Schmitz -Date: Wed Dec 18 18:35:06 2013 +0100 +Date: Wed Dec 18 18:35:06 2013 +0100 Bug 720711 - gimpressionist: Background paper is not aligned... @@ -8094,7 +9184,7 @@ commit cab66eb377f615695fedd7443d0b5d3fdb6cb48d Author: saul -Date: Wed Dec 25 17:56:43 2013 -0500 +Date: Wed Dec 25 17:56:43 2013 -0500 Bug 721058 - Shadow layer for Drop Shadow filter in wrong stack position @@ -8108,7 +9198,7 @@ commit 117e9f73a8adde303921267f3d8859d95150f5f7 Author: Téo Mazars -Date: Sat Dec 21 12:54:55 2013 +0100 +Date: Sat Dec 21 12:54:55 2013 +0100 plug-ins: fix segfault in apply-canvas @@ -8119,7 +9209,7 @@ commit db602b3b3328275359e5714df33ae449e6e93774 Author: Michael Natterer -Date: Fri Dec 20 13:11:53 2013 +0100 +Date: Fri Dec 20 13:11:53 2013 +0100 Bug 720492 - Letter spacing in Text Tool not reset to default @@ -8132,7 +9222,7 @@ commit 1f3ab73d350af0f8b8de16de46f3f3e4c00f550c Author: Marco Ciampa -Date: Wed Dec 18 17:49:35 2013 +0100 +Date: Wed Dec 18 17:49:35 2013 +0100 Reverted an erroneous translated string @@ -8141,18 +9231,18 @@ commit 7819a4ce6f741d1faecaa570ca19ed97b964b14f Author: Marco Ciampa -Date: Wed Dec 18 16:39:57 2013 +0100 +Date: Wed Dec 18 16:39:57 2013 +0100 Updated italian translation po-plug-ins/it.po | 929 ++++++++++++++++++++++++++++-------------------------- - po/it.po | 48 +-- + po/it.po | 48 +-- 2 files changed, 503 insertions(+), 474 deletions(-) commit 96da39c28e74c57fc6aebddd24629a7c9d8a5aee Author: SimaMoto,RyōTa -Date: Tue Dec 17 22:27:30 2013 +0900 +Date: Tue Dec 17 22:27:30 2013 +0900 Bug 720598 - Mistaken description for 'New Guides from Selection @@ -8167,7 +9257,7 @@ commit 36d15343c22f3078cd14472ea2532c1d75dfd1f2 Author: Rafael Ferreira -Date: Mon Dec 16 05:01:49 2013 -0200 +Date: Mon Dec 16 05:01:49 2013 -0200 Updated Brazilian Portuguese translation for plug-ins @@ -8177,7 +9267,7 @@ commit d253086bfa6ec8c991edf0d543eb18bcc474d120 Author: Seong-ho Cho -Date: Sat Dec 14 04:08:23 2013 +0900 +Date: Sat Dec 14 04:08:23 2013 +0900 Updated Korean translation @@ -8187,7 +9277,7 @@ commit 59ed3ba827a477ff899201cb770cda665d379464 Author: Piotr Drąg -Date: Fri Dec 13 18:48:02 2013 +0100 +Date: Fri Dec 13 18:48:02 2013 +0100 Updated Polish translation @@ -8196,7 +9286,7 @@ commit d326158c618d855f4f7025805f56a13dcad26dfd Author: Daniel Mustieles -Date: Fri Dec 13 17:31:33 2013 +0100 +Date: Fri Dec 13 17:31:33 2013 +0100 Revert "Updated Spanish translation" @@ -8208,7 +9298,7 @@ commit b45d6dff173e975b65658e939723887db3e7b2cb Author: Daniel Mustieles -Date: Thu Dec 12 18:24:22 2013 +0100 +Date: Thu Dec 12 18:24:22 2013 +0100 Updated Spanish translation @@ -8218,7 +9308,7 @@ commit 841b6829570d7b57e052840b5548c7da76f50b4f Author: Daniel Mustieles -Date: Thu Dec 12 11:42:43 2013 +0100 +Date: Thu Dec 12 11:42:43 2013 +0100 Updated Spanish translation @@ -8228,7 +9318,7 @@ commit c1314499ffa6aa4cf7543e00b028d987209fa6fc Author: Jehan -Date: Mon Dec 9 19:31:48 2013 +1300 +Date: Mon Dec 9 19:31:48 2013 +1300 Bug 679214 - widget direction set to system locale, not user-set lang @@ -8242,7 +9332,7 @@ commit 373cee241417200308c5415c3212eca40f80bc46 Author: Joao S. O. Bueno -Date: Thu Dec 12 00:03:07 2013 -0200 +Date: Thu Dec 12 00:03:07 2013 -0200 Updated Brazilian Portuguese translation @@ -8251,7 +9341,7 @@ commit c58491c4e8ff0bf488fc4a74b57f84952dafce8d Author: Rodolfo Ribeiro Gomes -Date: Wed Dec 11 23:55:15 2013 -0200 +Date: Wed Dec 11 23:55:15 2013 -0200 Updated Brazilian Portuguese translation @@ -8261,7 +9351,7 @@ commit 35a5d5ac34691eca67b784c4852ecc94e6d9d784 Author: Rafael Ferreira -Date: Wed Dec 11 23:43:52 2013 -0200 +Date: Wed Dec 11 23:43:52 2013 -0200 Revert "2 small, but important fixes to pt_BR translation" @@ -8275,7 +9365,7 @@ commit 16b0443840dbcca920b520c744c1ba8b9fff9328 Author: João S. O. Bueno -Date: Wed Dec 11 01:58:19 2013 -0200 +Date: Wed Dec 11 01:58:19 2013 -0200 2 small, but important fixes to pt_BR translation @@ -8284,7 +9374,7 @@ commit cf94bb30038aa13ecc225d5d269ea4ad396d1e09 Author: Daniel Mustieles -Date: Tue Dec 10 12:55:44 2013 +0100 +Date: Tue Dec 10 12:55:44 2013 +0100 Updated Spanish translation @@ -8294,7 +9384,7 @@ commit 217660a72cd4d50b9b7a2cb53f3c8e8c071dcd6c Author: SimaMoto,RyōTa -Date: Fri Dec 6 00:36:19 2013 +0900 +Date: Fri Dec 6 00:36:19 2013 +0900 l10n: Update Japanese translation @@ -8304,7 +9394,7 @@ commit cfe5c483f73890470b0e43f51c70b423edf1ce0d Author: Jehan -Date: Thu Dec 5 00:20:32 2013 +1300 +Date: Thu Dec 5 00:20:32 2013 +1300 app: handle migration on OSX of GIMP 2.8.2's config folder. @@ -8321,7 +9411,7 @@ commit d781f516b7186b1496c4e45a905f586446b7b943 Author: Piotr Drąg -Date: Wed Dec 4 19:31:01 2013 +0100 +Date: Wed Dec 4 19:31:01 2013 +0100 Updated Polish translation @@ -8331,7 +9421,7 @@ commit 0ffb3b6753aad00512349bba31bf5113054c6a0e Author: Nils Philippsen -Date: Tue Nov 26 10:49:42 2013 +0100 +Date: Tue Nov 26 10:49:42 2013 +0100 file-xwd: sanity check # of colors and map entries (CVE-2013-1978) @@ -8348,7 +9438,7 @@ commit 7f2322e4ced8ba393abc5a0aa15a607f340f0db8 Author: Nils Philippsen -Date: Thu Nov 14 14:29:01 2013 +0100 +Date: Thu Nov 14 14:29:01 2013 +0100 file-xwd: sanity check colormap size (CVE-2013-1913) @@ -8359,7 +9449,7 @@ commit f1677dea03fa3685887bdcb04f927158cbfeb15c Author: Kevin Cozens -Date: Mon Dec 2 20:17:05 2013 -0500 +Date: Mon Dec 2 20:17:05 2013 -0500 Fixed an error in the close-port function. Closes bug #719396. @@ -8368,7 +9458,7 @@ commit 7fab702e9b52802ab411fa56ad17bac50590ecaf Author: Michael Natterer -Date: Sun Dec 1 23:00:24 2013 +0100 +Date: Sun Dec 1 23:00:24 2013 +0100 Bug 719662 - plug-in-borderaverage returns a garbage alpha value @@ -8381,7 +9471,7 @@ commit 5847d56f365ca5cf3b57601f01924ec609696ec1 Author: Michael Natterer -Date: Sun Dec 1 18:04:51 2013 +0100 +Date: Sun Dec 1 18:04:51 2013 +0100 Bug 719634 - Palette editor not working for New Palettes (cannot drop colors) @@ -8399,7 +9489,7 @@ commit ecefaead96fce52d499dccdb02191b3e93352231 Author: Michael Henning -Date: Sat Nov 30 16:31:57 2013 -0500 +Date: Sat Nov 30 16:31:57 2013 -0500 Bug 719593 - On clang, brush outline is not displayed @@ -8412,7 +9502,7 @@ commit 06771172427ff3a84b18a0b47a0c4d18f515e2b0 Author: Jernej Simončič -Date: Sat Nov 30 18:50:14 2013 +0100 +Date: Sat Nov 30 18:50:14 2013 +0100 Installer: make it possible to override source directories from command line @@ -8423,7 +9513,7 @@ commit dfd62a6659c067d3409a1b08657b1ba71af4c056 Author: SimaMoto,RyōTa -Date: Sat Nov 30 08:58:35 2013 +0900 +Date: Sat Nov 30 08:58:35 2013 +0900 l10n: Update Japanese translation @@ -8433,7 +9523,7 @@ commit 71c144c972d5582522b6d13a4194169916186c7a Author: Michael Natterer -Date: Fri Nov 29 21:57:46 2013 +0100 +Date: Fri Nov 29 21:57:46 2013 +0100 Bug 719560 - Build failure with freetype 2.5.1 @@ -8447,7 +9537,7 @@ commit 4506f777b1f2acfdef4324d1663348335847e693 Author: Dimitris Spingos -Date: Fri Nov 29 13:07:09 2013 +0200 +Date: Fri Nov 29 13:07:09 2013 +0200 Updated Greek translation @@ -8457,7 +9547,7 @@ commit b09f2b4dc8f3c372c1eb0a2c6456aa8e7b1a9ec9 Author: Michael Natterer -Date: Fri Nov 29 00:03:45 2013 +0100 +Date: Fri Nov 29 00:03:45 2013 +0100 devel-docs: clarify where to announce a release in release-howto.txt @@ -8468,7 +9558,7 @@ commit a178f3522532d2822f6f65a6a846a789c88e4b27 Author: Michael Natterer -Date: Thu Nov 28 20:54:30 2013 +0100 +Date: Thu Nov 28 20:54:30 2013 +0100 configure.ac: post release version bump to 2.8.11 @@ -8477,7 +9567,7 @@ commit 9bb7eb05451b344160ea3062ce3f877ecbe9c1b7 Author: Michael Natterer -Date: Thu Nov 28 19:33:16 2013 +0100 +Date: Thu Nov 28 19:33:16 2013 +0100 configure.ac: bump version to 2.8.10 @@ -8486,7 +9576,7 @@ commit 19025ea50823028a3a6eaa91f702156e8d94af7e Author: Michael Natterer -Date: Thu Nov 28 19:21:37 2013 +0100 +Date: Thu Nov 28 19:21:37 2013 +0100 Add test-driver to the toplevel .gitignore @@ -8495,7 +9585,7 @@ commit e8755c60a9b6d185212d053bc8d63f907d87f959 Author: Michael Natterer -Date: Thu Nov 28 19:08:55 2013 +0100 +Date: Thu Nov 28 19:08:55 2013 +0100 NEWS: some updates @@ -8504,7 +9594,7 @@ commit 50bfbd94a3c4aa4e55293c75a091afc88b2f9f20 Author: Michael Natterer -Date: Thu Nov 28 19:08:26 2013 +0100 +Date: Thu Nov 28 19:08:26 2013 +0100 desktop: add gimp.appdata.xml to .gitignore @@ -8513,7 +9603,7 @@ commit fc7fce4bc9ee80a822a607ad88baaa81053bcbe5 Author: Nils Philippsen -Date: Thu Nov 28 17:43:14 2013 +0100 +Date: Thu Nov 28 17:43:14 2013 +0100 initialize length to appease cppcheck @@ -8533,7 +9623,7 @@ commit 779264f237be1464f80343d3121ccea32cc97051 Author: Michael Natterer -Date: Sat Aug 4 03:20:36 2012 +0200 +Date: Sat Aug 4 03:20:36 2012 +0200 Bug 676270 - cppcheck report @@ -8544,17 +9634,17 @@ (cherry picked from commit 47c987b09e21b460e3d7f5c9e706ffaef4f198a3) Conflicts: - app/actions/image-actions.c + app/actions/image-actions.c app/display/gimpmotionbuffer.c | 4 ++-- - app/plug-in/gimpplugin.c | 2 +- - app/tools/gimpmovetool.c | 7 +++---- - app/xcf/xcf-save.c | 5 +++-- + app/plug-in/gimpplugin.c | 2 +- + app/tools/gimpmovetool.c | 7 +++---- + app/xcf/xcf-save.c | 5 +++-- 4 files changed, 9 insertions(+), 9 deletions(-) commit a8bc5b3418407dbc4677b8a9f7855f6ef695101d Author: SimaMoto,RyōTa -Date: Thu Nov 28 23:50:51 2013 +0900 +Date: Thu Nov 28 23:50:51 2013 +0900 l10n: Update Japanese translation @@ -8564,7 +9654,7 @@ commit 39b841ccb1c357bfc773a7e4280081eab14ee265 Author: Daniel Sabo -Date: Thu Nov 28 04:37:15 2013 -0800 +Date: Thu Nov 28 04:37:15 2013 -0800 NEWS: update for 2.8.10 @@ -8573,7 +9663,7 @@ commit dd68c83032a6ae5304322ed370794eb2b8749c25 Author: Christian Kirbach -Date: Sat Nov 23 17:23:53 2013 +0100 +Date: Sat Nov 23 17:23:53 2013 +0100 Updated German translation @@ -8583,7 +9673,7 @@ commit b6f7826f30a7e4b69cf6b9c990056488b922978f Author: Michael Natterer -Date: Fri Nov 22 20:47:16 2013 +0100 +Date: Fri Nov 22 20:47:16 2013 +0100 Bug 715018 - Developer documentation on VBRs incorrect @@ -8596,7 +9686,7 @@ commit 34cef1f37255d1d23a72d8c63a1ba72b0a7d2721 Author: Michael Natterer -Date: Thu Nov 21 23:00:44 2013 +0100 +Date: Thu Nov 21 23:00:44 2013 +0100 Bug 678043 - Single Window Mode does not remember hide docks option @@ -8611,7 +9701,7 @@ commit a1e2439a1e994e7c7f76c73d2636aab97fb6ae16 Author: Piotr Drąg -Date: Thu Nov 21 01:09:35 2013 +0100 +Date: Thu Nov 21 01:09:35 2013 +0100 Updated Polish translation @@ -8620,7 +9710,7 @@ commit 5121a5f6aa229ba3f3da778f34665690acaa4374 Author: Michael Natterer -Date: Wed Nov 20 23:17:40 2013 +0100 +Date: Wed Nov 20 23:17:40 2013 +0100 Bug 704896 - pop ups are annoying when opening multiple files... @@ -8637,7 +9727,7 @@ commit 43238a343c2b48d4fe0670139b3ca78b2cf756eb Author: Daniel Mustieles -Date: Wed Nov 20 18:15:35 2013 +0100 +Date: Wed Nov 20 18:15:35 2013 +0100 Updated Spanish translation @@ -8647,7 +9737,7 @@ commit 97dcb9dc088883afaeaf3425ffd2ecfa3928850b Author: Michael Natterer -Date: Tue Nov 19 21:39:13 2013 +0100 +Date: Tue Nov 19 21:39:13 2013 +0100 pdb: fix gimp_layer_new_from_drawable() PDB wrapper @@ -8657,13 +9747,13 @@ (cherry picked from commit 29d95f4c39463ba644a7a4795c352b06fde529cb) - app/pdb/layer-cmds.c | 5 +---- + app/pdb/layer-cmds.c | 5 +---- tools/pdbgen/pdb/layer.pdb | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) commit b361d18d277e90287620e6ffbbedb1b8cc217d7a Author: Marco Ciampa -Date: Mon Nov 18 18:35:05 2013 +0100 +Date: Mon Nov 18 18:35:05 2013 +0100 Updated italian translation. @@ -8673,19 +9763,19 @@ commit 43f7961c1798efa067f9a33aacea94ba96bf4ad6 Author: Clayton Walker -Date: Sun Nov 17 17:37:17 2013 -0700 +Date: Sun Nov 17 17:37:17 2013 -0700 osx: Update build files, prep for 2.8.8 dmg build/osx/gimp-2.8-python.bundle | 39 +++++++++----- - build/osx/gimp.modules | 110 + build/osx/gimp.modules | 110 ++++++++++++++++++++++++++++++--------- build/osx/launcher-2.8-python.sh | 45 +++++++++++----- 3 files changed, 145 insertions(+), 49 deletions(-) commit 3097b94e614841150c6790c1932f85b51a261812 Author: Jehan -Date: Mon Nov 18 09:44:10 2013 +1300 +Date: Mon Nov 18 09:44:10 2013 +1300 file-export* labels renamed. @@ -8698,7 +9788,7 @@ commit 95465563914b9827254dac4ae26f85b86c9c444a Author: Piotr Drąg -Date: Sun Nov 17 19:14:39 2013 +0100 +Date: Sun Nov 17 19:14:39 2013 +0100 Updated Polish translation @@ -8708,7 +9798,7 @@ commit 1fa53c46708c9ceab34c3b97361f99ca7a5cb531 Author: Michael Natterer -Date: Sun Nov 17 01:22:52 2013 +0100 +Date: Sun Nov 17 01:22:52 2013 +0100 app: gimp_brush_load_brush(): add special error for possible old files @@ -8725,7 +9815,7 @@ commit ad29d7e7405c34e2c0e3ad66c323cef0ec215890 Author: Jernej Simončič -Date: Sun Nov 17 00:18:12 2013 +0100 +Date: Sun Nov 17 00:18:12 2013 +0100 Windows manifest: mark as Windows 8-compatible (only affects theme display in @@ -8736,7 +9826,7 @@ commit 86f31151492fbd256abc5b4cd5b028cd33385a33 Author: Clayton Walker -Date: Sat Nov 16 15:33:56 2013 -0700 +Date: Sat Nov 16 15:33:56 2013 -0700 configure.ac: Remove -Wformat-non-litearl (removed in master) @@ -8745,7 +9835,7 @@ commit b191b2f83f0200c079b701fee8cc1cd888437d40 Author: Michael Natterer -Date: Sat Nov 16 22:59:36 2013 +0100 +Date: Sat Nov 16 22:59:36 2013 +0100 app: add $(GTK_MAC_INTEGRATION_LIBS) to LDADD @@ -8754,7 +9844,7 @@ commit abd16f9b1e3e6bd9260f83241f5ff3035d64b090 Author: Michael Natterer -Date: Sat Nov 16 22:53:16 2013 +0100 +Date: Sat Nov 16 22:53:16 2013 +0100 libgimpwidets: don't pick transparent colors in gimp_pick_button_pick() @@ -8768,21 +9858,20 @@ commit b4fe880e58f3b371c47b900dc46af07618cac386 Author: Michael Henning -Date: Sat Nov 16 10:23:34 2013 -0500 +Date: Sat Nov 16 10:23:34 2013 -0500 desktop: Install the appdata file and also make it translatable. (cherry picked from commit fe3b80d617646e4995626babe36fd3ced83d4671) - desktop/Makefile.am | 12 +++++++----- - desktop/gimp.appdata.xml | 38 -------------------------------------- - desktop/gimp.appdata.xml.in | 38 ++++++++++++++++++++++++++++++++++++++ - po/POTFILES.in | 1 + - 4 files changed, 46 insertions(+), 43 deletions(-) + desktop/Makefile.am | 12 +++++++----- + desktop/{gimp.appdata.xml => gimp.appdata.xml.in} | 12 ++++++------ + po/POTFILES.in | 1 + + 3 files changed, 14 insertions(+), 11 deletions(-) commit 2958f48e6294b6f823a6879f63e0f9a9f825832b Author: SimaMoto,RyōTa -Date: Sat Nov 16 18:09:31 2013 +0900 +Date: Sat Nov 16 18:09:31 2013 +0900 l10n: Update Japanese translation @@ -8792,7 +9881,7 @@ commit 492f9be1457c81c03999beb03ec5e71d204ccf53 Author: Michael Natterer -Date: Sat Nov 16 09:38:29 2013 +0100 +Date: Sat Nov 16 09:38:29 2013 +0100 app: don't ignore the return value of gimp_rectangle_intersect() @@ -8807,7 +9896,7 @@ commit c7bb77c45d51964e1eec7420b4b2ca1e9667cfb9 Author: Michael Natterer -Date: Sat Nov 16 08:51:25 2013 +0100 +Date: Sat Nov 16 08:51:25 2013 +0100 Bug 711476 - Problems using animated GIH brushes @@ -8821,7 +9910,7 @@ commit fab68c6b9b488d9be47247586207584662143842 Author: Clayton Walker -Date: Fri Nov 15 19:16:05 2013 -0700 +Date: Fri Nov 15 19:16:05 2013 -0700 build-osx: Update modules @@ -8831,7 +9920,7 @@ commit de4fceea6c4d06cf837479cdc02deb4a576e8dc0 Author: Jernej Simončič -Date: Mon Nov 11 18:59:19 2013 +0100 +Date: Mon Nov 11 18:59:19 2013 +0100 Installer: set PYTHONPATH environment variable on 32-bit installs, too @@ -8840,7 +9929,7 @@ commit 03509683cbac28fbb4ac1de5034025482df0d577 Author: Martin Husemann -Date: Sun Nov 10 22:17:38 2013 +0100 +Date: Sun Nov 10 22:17:38 2013 +0100 Bug 711795 - execinfo.h functions need -lexecinfo on NetBSD @@ -8854,7 +9943,7 @@ commit fef663774e90bbf5edc47a1f85ad14fcc45f80f1 Author: Michael Natterer -Date: Sun Nov 10 20:51:37 2013 +0100 +Date: Sun Nov 10 20:51:37 2013 +0100 configure: check for gtk-mac-intregration only if GTK+ is built for quartz @@ -8866,7 +9955,7 @@ commit c21e7b581c898692b6721468b0568d705280ad1e Author: Michael Natterer -Date: Sun Nov 10 18:58:23 2013 +0100 +Date: Sun Nov 10 18:58:23 2013 +0100 configure: run check for gtk-mac-integration only on OSX @@ -8875,7 +9964,7 @@ commit 2d548c71df2e62bd345e02f50e5a3c1b08a1cf1e Author: Daniel Sabo -Date: Sat Nov 9 21:00:55 2013 +0100 +Date: Sat Nov 9 21:00:55 2013 +0100 app: Port to gtk-mac-integration @@ -8888,19 +9977,19 @@ (cherry picked from commit e56344294c90e1ba97de5c134b50c4c522f0808f) - app/Makefile.am | 4 +- - app/gui/Makefile.am | 24 +- - app/gui/gui-unique.c | 175 +++++---- - app/gui/gui.c | 82 ++-- + app/Makefile.am | 4 +- + app/gui/Makefile.am | 24 +- + app/gui/gui-unique.c | 175 +++++---- + app/gui/gui.c | 82 ++-- app/gui/ige-mac-menu.c | 988 ------------------------------------------------- app/gui/ige-mac-menu.h | 43 --- - configure.ac | 9 + + configure.ac | 9 + 7 files changed, 176 insertions(+), 1149 deletions(-) commit cf988e7d76b4e59c6ebc808a389315cf102faaee Author: Michael Natterer -Date: Sun Nov 10 00:18:48 2013 +0100 +Date: Sun Nov 10 00:18:48 2013 +0100 plug-ins: pass the format's name again in calls to gimp_export_image() @@ -8910,41 +9999,41 @@ (cherry picked from commit 03df8c6af4ec4e5d547e9fff46d0710b3c262c58) - plug-ins/common/file-aa.c | 10 ++++++---- - plug-ins/common/file-cel.c | 11 ++++++----- + plug-ins/common/file-aa.c | 10 ++++++---- + plug-ins/common/file-cel.c | 11 ++++++----- plug-ins/common/file-csource.c | 6 +++--- - plug-ins/common/file-dicom.c | 4 ++-- - plug-ins/common/file-gbr.c | 8 +++++--- + plug-ins/common/file-dicom.c | 4 ++-- + plug-ins/common/file-gbr.c | 8 +++++--- plug-ins/common/file-gif-save.c | 2 +- - plug-ins/common/file-gih.c | 4 +++- - plug-ins/common/file-header.c | 8 +++++--- - plug-ins/common/file-mng.c | 17 +++++++++-------- - plug-ins/common/file-pat.c | 6 ++++-- - plug-ins/common/file-pcx.c | 9 +++++---- - plug-ins/common/file-pix.c | 8 +++++--- - plug-ins/common/file-png.c | 11 ++++++----- - plug-ins/common/file-pnm.c | 8 ++++---- - plug-ins/common/file-ps.c | 11 +++++++---- - plug-ins/common/file-psp.c | 4 +++- - plug-ins/common/file-sunras.c | 10 ++++++---- - plug-ins/common/file-tga.c | 11 ++++++----- + plug-ins/common/file-gih.c | 4 +++- + plug-ins/common/file-header.c | 8 +++++--- + plug-ins/common/file-mng.c | 17 +++++++++-------- + plug-ins/common/file-pat.c | 6 ++++-- + plug-ins/common/file-pcx.c | 9 +++++---- + plug-ins/common/file-pix.c | 8 +++++--- + plug-ins/common/file-png.c | 11 ++++++----- + plug-ins/common/file-pnm.c | 8 ++++---- + plug-ins/common/file-ps.c | 11 +++++++---- + plug-ins/common/file-psp.c | 4 +++- + plug-ins/common/file-sunras.c | 10 ++++++---- + plug-ins/common/file-tga.c | 11 ++++++----- plug-ins/common/file-tiff-save.c | 12 +++++++----- - plug-ins/common/file-xbm.c | 3 ++- - plug-ins/common/file-xmc.c | 12 +++++++----- - plug-ins/common/file-xpm.c | 11 ++++++----- - plug-ins/common/file-xwd.c | 10 ++++++---- - plug-ins/file-bmp/bmp.c | 16 ++++++++++------ - plug-ins/file-fits/fits.c | 30 ++++++++++++++++-------------- - plug-ins/file-fli/fli-gimp.c | 4 +++- - plug-ins/file-jpeg/jpeg.c | 8 +++++--- - plug-ins/file-psd/psd-save.c | 3 ++- - plug-ins/file-psd/psd.c | 4 +++- - plug-ins/file-sgi/sgi.c | 10 ++++++---- + plug-ins/common/file-xbm.c | 3 ++- + plug-ins/common/file-xmc.c | 12 +++++++----- + plug-ins/common/file-xpm.c | 11 ++++++----- + plug-ins/common/file-xwd.c | 10 ++++++---- + plug-ins/file-bmp/bmp.c | 16 ++++++++++------ + plug-ins/file-fits/fits.c | 30 ++++++++++++++++-------------- + plug-ins/file-fli/fli-gimp.c | 4 +++- + plug-ins/file-jpeg/jpeg.c | 8 +++++--- + plug-ins/file-psd/psd-save.c | 3 ++- + plug-ins/file-psd/psd.c | 4 +++- + plug-ins/file-sgi/sgi.c | 10 ++++++---- 30 files changed, 159 insertions(+), 112 deletions(-) commit cdb0b5816e13843c811abf35635ff4b334f78b14 Author: Michael Natterer -Date: Sun Nov 10 01:54:45 2013 +0100 +Date: Sun Nov 10 01:54:45 2013 +0100 Bug 705457 - Export doesn't handle a single top-level layer group @@ -8961,7 +10050,7 @@ commit adacb2a2a877de7bbbdb68edb6ca8727a7254f5d Author: Michael Natterer -Date: Sun Nov 10 00:02:11 2013 +0100 +Date: Sun Nov 10 00:02:11 2013 +0100 app: add an "interactive" boolean inside gimp_export_image() @@ -8975,7 +10064,7 @@ commit 4563dbcde753705c81b5f6fe63e845e0491f4b39 Author: Piotr Drąg -Date: Sat Nov 9 20:04:28 2013 +0100 +Date: Sat Nov 9 20:04:28 2013 +0100 Updated Polish translation @@ -8985,7 +10074,7 @@ commit e0fa66f6e7a606d0b67584c79f99f23e6fde4990 Author: Michael Natterer -Date: Fri Nov 8 23:26:34 2013 +0100 +Date: Fri Nov 8 23:26:34 2013 +0100 app: add the same D shortcut in the image close dialog @@ -9000,7 +10089,7 @@ commit 627caeb620eee6801d33bdc84a7b79d8c10ba018 Author: Michael Natterer -Date: Fri Nov 8 23:17:22 2013 +0100 +Date: Fri Nov 8 23:17:22 2013 +0100 app: always use D for the shortcut in the quit dialog @@ -9013,7 +10102,7 @@ commit d8fe4a16499e678171d837809908a33cf25df227 Author: Michael Natterer -Date: Fri Nov 8 22:46:10 2013 +0100 +Date: Fri Nov 8 22:46:10 2013 +0100 app: make quitting by keyboard shortcuts easier @@ -9032,7 +10121,7 @@ commit f937dbe63a713ab7161c5d95d5eeeee203eb442b Author: Piotr Drąg -Date: Fri Nov 8 23:03:34 2013 +0100 +Date: Fri Nov 8 23:03:34 2013 +0100 Updated Polish translation @@ -9041,7 +10130,7 @@ commit e803f1930ff26d5d2bb0716d8937b3ef53d6b235 Author: Nils Philippsen -Date: Fri Nov 8 14:02:03 2013 +0100 +Date: Fri Nov 8 14:02:03 2013 +0100 file-bmp: don't close foreign FD in ReadImage() @@ -9052,7 +10141,7 @@ commit 49b05ce3e70726ab7464db863fb281480f072d90 Author: Michael Natterer -Date: Thu Nov 7 19:12:07 2013 +0100 +Date: Thu Nov 7 19:12:07 2013 +0100 app: show file:// uris as filename in the close and quit dialogs @@ -9061,13 +10150,13 @@ (cherry picked from commit beb184e3953bc77553c6fb0c723792ac919ba1a9) - app/dialogs/quit-dialog.c | 21 +++++++++++++++------ + app/dialogs/quit-dialog.c | 21 +++++++++++++++------ app/display/gimpdisplayshell-close.c | 17 +++++++++++------ 2 files changed, 26 insertions(+), 12 deletions(-) commit 4a7bf96e5394c0599757db991a05ddf1fe7f00be Author: Michael Natterer -Date: Thu Nov 7 12:49:03 2013 +0100 +Date: Thu Nov 7 12:49:03 2013 +0100 app: make the "exported to foo" string in the quit dialog nicer @@ -9078,7 +10167,7 @@ commit a28fcb239255f83fffb1b4541db86e451f5ba74f Author: Michael Natterer -Date: Thu Nov 7 11:35:48 2013 +0100 +Date: Thu Nov 7 11:35:48 2013 +0100 app: in the quit dialog, mention if the image has been exported @@ -9094,7 +10183,7 @@ commit 67eb73093679c49692e738620a70ddfc18f0f7bc Author: Michael Natterer -Date: Thu Nov 7 11:32:23 2013 +0100 +Date: Thu Nov 7 11:32:23 2013 +0100 app: add new accessor gimp_container_tree_view_get_name_cell() @@ -9106,7 +10195,7 @@ commit dc8bb4eecf43eadae1bc562def7569e59d6515b7 Author: Nils Philippsen -Date: Thu Nov 7 12:28:28 2013 +0100 +Date: Thu Nov 7 12:28:28 2013 +0100 app: don't ignore return value @@ -9119,7 +10208,7 @@ commit 6abd0f2438dd3b025b1224ab6a473615c17f3418 Author: Nils Philippsen -Date: Thu Nov 7 12:18:25 2013 +0100 +Date: Thu Nov 7 12:18:25 2013 +0100 file-jpeg: fix operator precedence errors @@ -9130,7 +10219,7 @@ commit 8082363e9c887b9f31e43b7fc947e1867f9c087b Author: Nils Philippsen -Date: Thu Nov 7 12:12:55 2013 +0100 +Date: Thu Nov 7 12:12:55 2013 +0100 gimpcolorwheel: comment out ineffectual code @@ -9141,7 +10230,7 @@ commit 5c2f97f9f274bc20eef4ffd55c28156c39254343 Author: Nils Philippsen -Date: Thu Nov 7 11:58:24 2013 +0100 +Date: Thu Nov 7 11:58:24 2013 +0100 file-bmp: don't leak file pointer when erroring out @@ -9153,21 +10242,21 @@ commit d291de0949c13eb2195158f6fbf41da2afe46cb9 Author: Nils Philippsen -Date: Thu Nov 7 11:43:38 2013 +0100 +Date: Thu Nov 7 11:43:38 2013 +0100 color-selector-cmyk-lcms: avoid freeing uninitialized pointer (cherry picked from commit c028580ae08ccf6408910ee6cf83d54308367f36) Conflicts: - modules/color-selector-cmyk.c + modules/color-selector-cmyk.c modules/color-selector-cmyk-lcms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 92a0387adc5a0e78501f6151b1d52c4c96f684a8 Author: Nils Philippsen -Date: Thu Nov 7 11:33:19 2013 +0100 +Date: Thu Nov 7 11:33:19 2013 +0100 lcms: avoid dereferencing null pointers @@ -9178,7 +10267,7 @@ commit dc6ccc17495bcabbd96d4c18616cb4b57bd07ea6 Author: Michael Natterer -Date: Mon Nov 4 23:17:41 2013 +0100 +Date: Mon Nov 4 23:17:41 2013 +0100 Bug 709857 - Lcms plugin crashes if RGB profile does not exist @@ -9193,7 +10282,7 @@ commit 6ee719557b725e6312991fb395cf53e20df351f9 Author: Michael Natterer -Date: Sun Nov 3 19:21:36 2013 +0100 +Date: Sun Nov 3 19:21:36 2013 +0100 configure: post-release version bump to 2.8.9 @@ -9202,18 +10291,18 @@ commit ae90381387126db0ea9c99f1f1144222080458c1 Author: Michael Natterer -Date: Sun Nov 3 19:13:46 2013 +0100 +Date: Sun Nov 3 19:13:46 2013 +0100 Bump version to 2.8.8 and commit regenerated files - configure.ac | 6 +++--- + configure.ac | 6 +++--- docs/gimprc.5.in | 2 +- - etc/gimprc | 2 +- + etc/gimprc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) commit 76dd14f0a5f64fa53cc68328f8cb2be4ea980a1c Author: Michael Natterer -Date: Sun Nov 3 17:58:47 2013 +0100 +Date: Sun Nov 3 17:58:47 2013 +0100 NEWS: update for 2.8.8 @@ -9222,7 +10311,7 @@ commit ec5a879001ff06fcd53c540f26650796efded4fb Author: Michael Natterer -Date: Sun Nov 3 16:04:58 2013 +0100 +Date: Sun Nov 3 16:04:58 2013 +0100 Bug 705797 - Empty right panel cannot be completely closed @@ -9237,7 +10326,7 @@ commit be45e402183886dc1a8d345486de5301b8b8d32d Author: Michael Natterer -Date: Sun Nov 3 15:21:22 2013 +0100 +Date: Sun Nov 3 15:21:22 2013 +0100 Bug 711329 - Artifacts on crop tool's passepartout when set to "allow growing" @@ -9256,7 +10345,7 @@ commit 0273d0d88ae4ce76193b08311009c13e013bfc1f Author: Michael Natterer -Date: Tue Oct 29 19:34:38 2013 +0100 +Date: Tue Oct 29 19:34:38 2013 +0100 Bug 710974 - Convert to Color profile fails on images with layer groups @@ -9272,7 +10361,7 @@ commit 7e0a8eaca7a427e31f93f0286c3f32844f1ce6d2 Author: Martin Srebotnjak -Date: Tue Oct 29 19:19:14 2013 +0100 +Date: Tue Oct 29 19:19:14 2013 +0100 Updated Slovenian translation @@ -9281,7 +10370,7 @@ commit e5356b5ca11bf0c29406dfef656af924a936880d Author: Enrico Nicoletto -Date: Mon Oct 28 21:00:03 2013 -0200 +Date: Mon Oct 28 21:00:03 2013 -0200 Revert "Updated Brazilian Portuguese translation" @@ -9293,7 +10382,7 @@ commit 29814899c3aa757227f86187524126c267ae329c Author: Enrico Nicoletto -Date: Mon Oct 28 20:59:23 2013 -0200 +Date: Mon Oct 28 20:59:23 2013 -0200 Updated Brazilian Portuguese translation @@ -9303,7 +10392,7 @@ commit 5ed30dceb9bdd974ea3430ebcd4fa33ad0949500 Author: Marco Ciampa -Date: Fri Oct 25 17:38:25 2013 +0200 +Date: Fri Oct 25 17:38:25 2013 +0200 Updated italian translation. @@ -9312,7 +10401,7 @@ commit d22ab649ff6c2ea790fd75ce3a05319076b970c1 Author: Piotr Drąg -Date: Thu Oct 24 18:44:52 2013 +0200 +Date: Thu Oct 24 18:44:52 2013 +0200 Updated Polish translation @@ -9321,7 +10410,7 @@ commit 373ef0b5262c995911f3d9ec34d1dd640b1c7390 Author: Jehan -Date: Fri Oct 11 20:36:26 2013 +1300 +Date: Fri Oct 11 20:36:26 2013 +1300 Bug 709878 - test-session-* skipped when xvfb-run is unavailable. @@ -9330,17 +10419,17 @@ documented by automake. (cherry picked from commit 6ee77e5635ced9a9b48959199eca888104f020e6) - app/tests.h | 10 ++++++++++ - app/tests/test-session-2-6-compatibility.c | 11 +++++++++++ + app/tests.h | 10 ++++++++++ + app/tests/test-session-2-6-compatibility.c | 11 +++++++++++ app/tests/test-session-2-8-compatibility-multi-window.c | 12 ++++++++++++ app/tests/test-session-2-8-compatibility-single-window.c | 11 +++++++++++ - configure.ac | 1 + + configure.ac | 1 + 5 files changed, 45 insertions(+) commit 7c0b46a2f45b14267113226b318765f4c0c5d975 Author: Jehan -Date: Fri Oct 25 00:33:11 2013 +1300 +Date: Fri Oct 25 00:33:11 2013 +1300 po: add app/text/gimptextlayout.c to POTFILES.in (cherry picked from commit 1ea2e7f5888ca51d4725009a6dc9238375e9ccf9) @@ -9350,7 +10439,7 @@ commit c79e7f5e8755e66696b98628eb9b555e24c7a4eb Author: Jehan -Date: Sat Aug 31 03:16:44 2013 +1200 +Date: Sat Aug 31 03:16:44 2013 +1200 Bug 662787 - Segfaults when trying to set a large text size @@ -9358,17 +10447,17 @@ up from rendering and alert the user via an error dialog. (cherry picked from commit 2aabbbd9c733a9078d08b15bedef6e9adae1031f) - app/text/gimptext-vectors.c | 9 ++++++++- + app/text/gimptext-vectors.c | 9 ++++++++- app/text/gimptextlayer.c | 24 ++++++++++++++++++++++-- app/text/gimptextlayout.c | 41 ++++++++++++++++++++++++++++++++++++----- - app/text/gimptextlayout.h | 3 ++- - app/tools/gimptexttool.c | 8 +++++++- + app/text/gimptextlayout.h | 3 ++- + app/tools/gimptexttool.c | 8 +++++++- 5 files changed, 75 insertions(+), 10 deletions(-) commit a06b36fb35c36479412310a4a0d4ee2682b79ab9 Author: Michael Natterer -Date: Tue Oct 22 20:35:11 2013 +0200 +Date: Tue Oct 22 20:35:11 2013 +0200 plug-ins: use image/jp2 for JPEG 2000, procedures can only have one mime-type @@ -9380,7 +10469,7 @@ commit d12eb70baeea14680fc671165d6389511279955d Author: Michael Natterer -Date: Sun Oct 20 18:22:47 2013 +0200 +Date: Sun Oct 20 18:22:47 2013 +0200 app: treat an empty ("" not NULL) plug-in proc_install->menu_path as NULL @@ -9397,7 +10486,7 @@ commit 1c44eae8c81902e53b62e1704dbbda07533f4545 Author: Jehan -Date: Tue Oct 8 00:17:56 2013 +1300 +Date: Tue Oct 8 00:17:56 2013 +1300 Bug 675554 - fix overriden language environment variables on Windows. @@ -9413,7 +10502,7 @@ commit 4fbe228da91dea54431d8ce58515f1e6c73b55e9 Author: Daniel Sabo -Date: Fri Oct 11 14:23:01 2013 -0700 +Date: Fri Oct 11 14:23:01 2013 -0700 Update authors.xml @@ -9425,7 +10514,7 @@ commit b8f05cdb5565c9bbf1d4836ed342315fde0c8f44 Author: Michael Natterer -Date: Fri Oct 11 22:52:38 2013 +0200 +Date: Fri Oct 11 22:52:38 2013 +0200 libgimpwidgets: return an opaque color from gimp_pick_button_pick()'s OSX code @@ -9439,7 +10528,7 @@ commit e2f93a777930916cb9487fd7048c62738f6ea2c8 Author: Daniel Sabo -Date: Mon May 28 07:36:36 2012 -0700 +Date: Mon May 28 07:36:36 2012 -0700 Use the Quartz core graphics API to implement gimp_pick_button_pick when building with GDK Quartz. @@ -9451,52 +10540,47 @@ commit faa233666adf5b907a30712ccd476048ecbc5ba9 Author: Clayton Walker -Date: Fri Oct 11 12:38:16 2013 -0600 +Date: Fri Oct 11 12:38:16 2013 -0600 Organize OSX build files - build/osx/README | 104 ++++++++++---------- - build/osx/custom/fonts.conf | 155 ++++++++++++++++++++++++++++++ - build/osx/custom/gimp.desktop | 202 - +++++++++++++++++++++++++++++++++++++++ - build/osx/custom/gimprc | 1 + - build/osx/custom/gtkrc | 14 +++ - build/osx/custom/mimeinfo.cache | 32 +++++++ - build/osx/custom/open.desktop | 7 ++ - build/osx/custom/session.conf | 64 +++++++++++++ - build/osx/fonts.conf | 155 ------------------------------ - build/osx/gimp-2.8-python.bundle | 21 +++- - build/osx/gimprc | 1 - - build/osx/gtkrc | 0 - 12 files changed, 546 insertions(+), 210 deletions(-) + build/osx/README | 104 +++++++++++--------- + build/osx/{ => custom}/fonts.conf | 6 +- + build/osx/custom/gimp.desktop | 202 + ++++++++++++++++++++++++++++++++++++++ + build/osx/{ => custom}/gimprc | 0 + build/osx/custom/gtkrc | 14 +++ + build/osx/custom/mimeinfo.cache | 32 ++++++ + build/osx/custom/open.desktop | 7 ++ + build/osx/custom/session.conf | 64 ++++++++++++ + build/osx/gimp-2.8-python.bundle | 21 +++- + build/osx/gtkrc | 0 + 10 files changed, 393 insertions(+), 57 deletions(-) commit 71ba846f8e858df8bc38925ab8d8c8b2f9ef0306 Author: Clayton Walker -Date: Fri Oct 11 09:23:00 2013 -0600 +Date: Fri Oct 11 09:23:00 2013 -0600 Update osx build scripts. Enable dbus, gvfs, and python for all 2.8.x series builds. Update libs. - build/osx/gimp-2.8-python.bundle | 172 ++++++ - build/osx/gimp-2.8.bundle | 187 ------- - build/osx/gimp.modules | 672 ++++++++++++++--------- - build/osx/gimprc | 4 +- - build/osx/info-2.8-python.plist | 1093 - ++++++++++++++++++++++++++++++++++++++ - build/osx/info-2.8.3.plist | 1093 - -------------------------------------- - build/osx/info-2.8.4.plist | 1093 - -------------------------------------- - build/osx/jhbuildrc-gimp | 12 +- - build/osx/launcher-2.8-python.sh | 211 ++++++++ - build/osx/launcher-2.8.sh | 81 --- - 10 files changed, 1901 insertions(+), 2717 deletions(-) + build/osx/gimp-2.8-python.bundle | 172 +++ + build/osx/gimp-2.8.bundle | 187 ---- + build/osx/gimp.modules | 672 +++++++----- + build/osx/gimprc | 4 +- + .../{info-2.8.4.plist => info-2.8-python.plist} | 8 +- + build/osx/info-2.8.3.plist | 1093 + -------------------- + build/osx/jhbuildrc-gimp | 12 +- + build/osx/launcher-2.8-python.sh | 211 ++++ + build/osx/launcher-2.8.sh | 81 -- + 9 files changed, 812 insertions(+), 1628 deletions(-) commit 0bc0078dec2eaec43a5f52fa5bff4db312303935 Author: Piotr Drąg -Date: Fri Oct 11 15:28:16 2013 +0200 +Date: Fri Oct 11 15:28:16 2013 +0200 Revert "Fix syntaxis in user-visible messages" @@ -9512,7 +10596,7 @@ commit 95b2375ce18a6d5722f582b09e212b89bc0452f7 Author: Piotr Drąg -Date: Fri Oct 11 15:25:32 2013 +0200 +Date: Fri Oct 11 15:25:32 2013 +0200 Revert "Fix syntaxis in a user-visible message" @@ -9527,19 +10611,19 @@ commit 5fb359ae82061bb948c8882483c3a215cdfaad46 Author: Alexandre Prokoudine -Date: Fri Oct 11 10:35:51 2013 +0400 +Date: Fri Oct 11 10:35:51 2013 +0400 Updated Russian translation po-libgimp/ru.po | 18 +- po-plug-ins/ru.po | 2050 +++++++++++++++++++++++----------------------- - po/ru.po | 2319 + po/ru.po | 2319 +++++++++++++++++++++++++++++------------------------ 3 files changed, 2283 insertions(+), 2104 deletions(-) commit 48e4cb708e99bd17b5f5cf7e511141c65131bb82 Author: Alexandre Prokoudine -Date: Fri Oct 11 06:33:44 2013 +0400 +Date: Fri Oct 11 06:33:44 2013 +0400 Fix syntaxis in user-visible messages @@ -9551,7 +10635,7 @@ commit eb3a62c43e012c2914987e1bd3a33c32833d275c Author: Alexandre Prokoudine -Date: Fri Oct 11 06:22:35 2013 +0400 +Date: Fri Oct 11 06:22:35 2013 +0400 Fix syntaxis in a user-visible message @@ -9562,7 +10646,7 @@ commit fe5623c75734ff0bc7a5148413ae4ee589f00f4c Author: Michael Natterer -Date: Sat Oct 5 00:14:14 2013 +0200 +Date: Sat Oct 5 00:14:14 2013 +0200 Bug 703065 - Jpeg file size preview error is back @@ -9576,7 +10660,7 @@ commit a10b60e314bc1c6a7a2248666d7a0fe2dcf11eda Author: Jehan -Date: Mon Sep 30 05:23:23 2013 +1300 +Date: Mon Sep 30 05:23:23 2013 +1300 Bug 681709 - GimpContainer continuously scrolls on dnd failure on Windows. @@ -9587,12 +10671,12 @@ app/widgets/gimpcontainertreeview-dnd.c | 15 +++++++++++++++ app/widgets/gimpcontainertreeview-dnd.h | 4 ++++ - app/widgets/gimpcontainertreeview.c | 3 +++ + app/widgets/gimpcontainertreeview.c | 3 +++ 3 files changed, 22 insertions(+) commit 100ce42c1e2cca9bdeaf1aa6f6bdf039aa030053 Author: Nils Philippsen -Date: Tue Oct 1 12:16:43 2013 +0200 +Date: Tue Oct 1 12:16:43 2013 +0200 configure: use test in a portable way @@ -9603,7 +10687,7 @@ commit e69d287be1f0d23193b9088b6c8f86bb311fd8ea Author: Michael Natterer -Date: Sat Sep 28 17:22:57 2013 +0200 +Date: Sat Sep 28 17:22:57 2013 +0200 Bug 708594 - Alignment Tool Icon not visible on dark background @@ -9621,7 +10705,7 @@ commit f37db5bc34cd3d6c2ae97208645eb2d619fb32d1 Author: Michael Natterer -Date: Mon Sep 23 15:25:47 2013 +0200 +Date: Mon Sep 23 15:25:47 2013 +0200 desktop: indentation and formatting for gimp.appdata.xml @@ -9633,7 +10717,7 @@ commit d2e00b8bd3688879153f330ed55ac5deafa8f8f6 Author: Marco Ciampa -Date: Mon Sep 23 11:03:12 2013 +0200 +Date: Mon Sep 23 11:03:12 2013 +0200 Updated italian translation. @@ -9643,7 +10727,7 @@ commit 372284094f66138d2427b021c619dca64d59e89e Author: Téo Mazars -Date: Sun Sep 22 16:26:10 2013 +0200 +Date: Sun Sep 22 16:26:10 2013 +0200 Bug 677275 - Mosaic Filter produces ugly artifacts @@ -9658,7 +10742,7 @@ commit 1bc91326ce30178f7cce9656993859c70318d8a2 Author: Balázs Úr -Date: Sun Sep 22 10:29:14 2013 +0200 +Date: Sun Sep 22 10:29:14 2013 +0200 Updated Hungarian translation @@ -9668,7 +10752,7 @@ commit 23281bc3f06087673f60924ac9cd737522052ad4 Author: Balázs Úr -Date: Sun Sep 22 10:21:19 2013 +0200 +Date: Sun Sep 22 10:21:19 2013 +0200 Updated Hungarian translation @@ -9678,7 +10762,7 @@ commit 9c0f515f284ce93e2abf43d39425afba58a17645 Author: Jehan -Date: Sat Sep 21 21:51:38 2013 +1200 +Date: Sat Sep 21 21:51:38 2013 +1200 Bug 708521 - Getting rid of cage_complete property on GimpCageTool, redundant with tool_state. @@ -9691,7 +10775,7 @@ commit 42de6e065c153e866196e04b21116f881250b910 Author: Jehan -Date: Sat Sep 21 21:07:29 2013 +1200 +Date: Sat Sep 21 21:07:29 2013 +1200 Bug 708519 - Fix using Backspace to delete a closed cage tool's points. @@ -9702,7 +10786,7 @@ commit 08c7d90823737a19ec31fb655f2ad3893f78924c Author: Jehan -Date: Sat Sep 21 20:43:11 2013 +1200 +Date: Sat Sep 21 20:43:11 2013 +1200 Bug 708517: Assertion on cage tool commit with ENTER + fix cage completion with ENTER. @@ -9717,7 +10801,7 @@ commit 91738c3b93f456a420334380bd0864a48e8dd0d3 Author: Michael Henning -Date: Fri Sep 20 19:05:18 2013 -0400 +Date: Fri Sep 20 19:05:18 2013 -0400 plug-ins: Use the standardized value for deflate compression in tiff-save. @@ -9733,7 +10817,7 @@ commit ebef7983e8fbfab2d6c0bec266ae09e2f91e8a54 Author: Sven Claussner -Date: Fri Sep 20 20:56:19 2013 +0200 +Date: Fri Sep 20 20:56:19 2013 +0200 Add licence comments to AppData file. @@ -9745,7 +10829,7 @@ commit dc9fdc5528fbf9f58f0a94ffb0cde6b0586b918f Author: Timo Jyrinki -Date: Fri Sep 20 21:35:38 2013 +0300 +Date: Fri Sep 20 21:35:38 2013 +0300 Updated Finnish libgimp translation by Juhani Numminen @@ -9755,7 +10839,7 @@ commit 09861b85017fa9a19c1a5eb1cabd314a072cee9b Author: Enrico Nicoletto -Date: Fri Sep 20 14:44:12 2013 -0300 +Date: Fri Sep 20 14:44:12 2013 -0300 Updated Brazilian Portuguese translation @@ -9765,7 +10849,7 @@ commit a90e9ec5e7fbe5ae08ff0ddd4c8c11c8a01d8e13 Author: Jehan -Date: Fri Sep 20 01:54:02 2013 +1200 +Date: Fri Sep 20 01:54:02 2013 +1200 app: disallow a theoretical infinite loop if we run out of ids. @@ -9778,19 +10862,19 @@ commit dfaa321027e81e7e0be10ace1e2cc84de22f0630 Author: Nils Philippsen -Date: Thu Sep 19 17:38:46 2013 +0200 +Date: Thu Sep 19 17:38:46 2013 +0200 lcms: pretty code even better if syntactically correct Thanks to Jehan for spotting this. - modules/display-filter-lcms.c | 2 +- + modules/display-filter-lcms.c | 2 +- modules/display-filter-proof.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit edfba8edfdf3e3bb6983a2123eb9a1b13f700add Author: Michael Natterer -Date: Tue Sep 25 20:56:54 2012 +0200 +Date: Tue Sep 25 20:56:54 2012 +0200 app: don't crash when a color profile has no information @@ -9801,7 +10885,7 @@ commit b2c6bd76145d3c38a01dbd16a5fe587e2f8efbbd Author: Nils Philippsen -Date: Tue Sep 17 16:43:11 2013 +0200 +Date: Tue Sep 17 16:43:11 2013 +0200 Backport lcms 2.x support from master, making it optional. @@ -9819,34 +10903,34 @@ This builds on the following commits from the master branch: - commit c59ab4d817730430b4b037de07abd28281f1dcf7 - Author: Massimo Valentini - AuthorDate: Tue Sep 4 17:53:06 2012 +0200 + commit c59ab4d817730430b4b037de07abd28281f1dcf7 + Author: Massimo Valentini + AuthorDate: Tue Sep 4 17:53:06 2012 +0200 - lcms: oversight + lcms: oversight - commit 8bbfc9e5cf4728b9cafc4edf32ab52c32375f9b7 - Author: Michael Natterer - AuthorDate: Mon Sep 3 20:03:53 2012 +0200 + commit 8bbfc9e5cf4728b9cafc4edf32ab52c32375f9b7 + Author: Michael Natterer + AuthorDate: Mon Sep 3 20:03:53 2012 +0200 - Bug 675558 - switch from lcms-1 to lcms-2 + Bug 675558 - switch from lcms-1 to lcms-2 - Applied modified patch from Hartmut Kuhse which ports - to lcms-2. + Applied modified patch from Hartmut Kuhse which ports + to lcms-2. - configure.ac | 49 ++++++++++++++--- + configure.ac | 49 ++++++++++++++--- modules/color-selector-cmyk-lcms.c | 64 +++++++++++++++++++++- - modules/display-filter-lcms.c | 107 + modules/display-filter-lcms.c | 107 ++++++++++++++++++++++++++++++++++++- modules/display-filter-proof.c | 45 +++++++++++++++- - plug-ins/common/lcms.c | 96 + plug-ins/common/lcms.c | 96 ++++++++++++++++++++++++++++++--- plug-ins/file-jpeg/jpeg-load.c | 19 ++++++- 6 files changed, 360 insertions(+), 20 deletions(-) commit c9c927603bd431d67697e263679440ac1e18c956 Author: Nils Philippsen -Date: Wed Sep 18 13:46:13 2013 +0200 +Date: Wed Sep 18 13:46:13 2013 +0200 include missing header @@ -9855,7 +10939,7 @@ commit 803c2d2b32e6282c389660613f8fa9922a142cac Author: Dimitris Spingos -Date: Wed Sep 18 07:22:05 2013 +0300 +Date: Wed Sep 18 07:22:05 2013 +0300 Updated Greek translation @@ -9865,7 +10949,7 @@ commit cee54bd992a10790e7ae52c04a26ff27826f5e38 Author: Aurimas Černius -Date: Fri Sep 13 22:28:47 2013 +0300 +Date: Fri Sep 13 22:28:47 2013 +0300 Updated Lithuanian plug-ins translation @@ -9875,7 +10959,7 @@ commit 42b40d1e4813cd8db08c26c402c6ed90a81c18da Author: Aurimas Černius -Date: Fri Sep 13 22:26:53 2013 +0300 +Date: Fri Sep 13 22:26:53 2013 +0300 Updated Lithuanian translation @@ -9885,7 +10969,7 @@ commit bf1b779b254e25dae17ab2a2167623eecaf793f8 Author: A S Alam -Date: Fri Sep 13 11:06:05 2013 -0500 +Date: Fri Sep 13 11:06:05 2013 -0500 update Punjabi Translaiton @@ -9895,7 +10979,7 @@ commit a14ce157f33837a70a2dcb166a0c69d0dffa7376 Author: Matej Urbančič -Date: Tue Sep 10 21:19:37 2013 +0200 +Date: Tue Sep 10 21:19:37 2013 +0200 Updated Slovenian translation @@ -9905,7 +10989,7 @@ commit 3c76d330196bfc2aac1a3f8c09be0876bec09433 Author: Michael Natterer -Date: Tue Sep 10 12:06:55 2013 +0200 +Date: Tue Sep 10 12:06:55 2013 +0200 tools: make sure clang is not considered to be visual studio @@ -9918,7 +11002,7 @@ commit c8a7be593bbd27632f655bc61e76f021d04bd5f1 Author: Sven Claussner -Date: Fri Sep 6 15:36:42 2013 +0200 +Date: Fri Sep 6 15:36:42 2013 +0200 German UI translation: fix some inconsistencies @@ -9933,19 +11017,19 @@ commit 31601b3a6b6fc1fd87da9f705fa771f7d4764fa7 Author: Richard Hughes -Date: Thu Sep 5 15:46:07 2013 +0100 +Date: Thu Sep 5 15:46:07 2013 +0100 Add an AppData file for GIMP (cherry picked from commit 5e37536d77310673dac9a720cef761c9372049f0) - desktop/Makefile.am | 3 +++ + desktop/Makefile.am | 3 +++ desktop/gimp.appdata.xml | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) commit 0f8496d873d05dabdd1f6430b0faa75245f8de88 Author: Jehan -Date: Thu Sep 5 23:35:27 2013 +1200 +Date: Thu Sep 5 23:35:27 2013 +1200 Bug 707255 - Open preferences when quitting causes assertion failure @@ -9962,7 +11046,7 @@ commit 175852a407871afdc50e71c2f1f2923a67d89f78 Author: Jehan -Date: Thu Sep 5 22:10:24 2013 +1200 +Date: Thu Sep 5 22:10:24 2013 +1200 Bug 707255 - Open preferences when quitting causes assertion failure. @@ -9978,9 +11062,9 @@ 1 file changed, 10 insertions(+), 6 deletions(-) commit 742da269ee8a03661ed4dd2db31891f9c073af4e -Merge: aa5c186 e1564c4 +Merge: aa5c186a3d e1564c44a8 Author: Sven Claussner -Date: Tue Sep 3 19:34:02 2013 +0200 +Date: Tue Sep 3 19:34:02 2013 +0200 Remove dead item gimptoolpresets.xml in app-docs.sgml @@ -9990,7 +11074,7 @@ commit aa5c186a3dc211fd8c17c55f915edc12a4f658df Author: Michael Natterer -Date: Tue Sep 3 16:00:09 2013 +0200 +Date: Tue Sep 3 16:00:09 2013 +0200 Bug 707354 - Bump Map offsets only go to 1000 regardless of image size @@ -10005,7 +11089,7 @@ commit e1564c44a8f20fb704e29e317f167cf95fe1dc9f Author: Sven Claussner -Date: Mon Sep 2 22:28:30 2013 +0200 +Date: Mon Sep 2 22:28:30 2013 +0200 Remove dead item gimptoolpresets.xml in app-docs.sgml @@ -10018,7 +11102,7 @@ commit 3049999de9ef10eeaaa4b8fc687faa17bc74cd46 Author: Inaki Larranaga Murgoitio -Date: Wed Aug 28 21:14:13 2013 +0200 +Date: Wed Aug 28 21:14:13 2013 +0200 Updated Basque language @@ -10028,7 +11112,7 @@ commit 356e8a3ff26ce8ef8147ac7aa519227d5abc6115 Author: Inaki Larranaga Murgoitio -Date: Wed Aug 28 21:13:15 2013 +0200 +Date: Wed Aug 28 21:13:15 2013 +0200 Updated Basque language @@ -10037,7 +11121,7 @@ commit f6a59f2669103268d89bafb022dcb0f2a8fe066d Author: Inaki Larranaga Murgoitio -Date: Wed Aug 28 21:12:16 2013 +0200 +Date: Wed Aug 28 21:12:16 2013 +0200 Updated Basque language @@ -10047,7 +11131,7 @@ commit d7a7ae051c6b84d3b6028e682336afa89076cd88 Author: Inaki Larranaga Murgoitio -Date: Wed Aug 28 21:10:55 2013 +0200 +Date: Wed Aug 28 21:10:55 2013 +0200 Updated Basque language @@ -10057,7 +11141,7 @@ commit c7b81f1f8ac8f65bfffb0cd974c868f2a8a0c051 Author: Inaki Larranaga Murgoitio -Date: Wed Aug 28 21:01:32 2013 +0200 +Date: Wed Aug 28 21:01:32 2013 +0200 Updated Basque language @@ -10067,7 +11151,7 @@ commit 94db7d46d030e6e8075e106c6118e10acdd1c994 Author: Daniel Mustieles -Date: Tue Aug 27 19:42:16 2013 +0200 +Date: Tue Aug 27 19:42:16 2013 +0200 Updated Spanish translation @@ -10077,7 +11161,7 @@ commit 4d468af5cb15b1c4e3d7c81a383f67a6c46edfe5 Author: Piotr Drąg -Date: Sat Aug 24 02:19:54 2013 +0200 +Date: Sat Aug 24 02:19:54 2013 +0200 Updated Polish translation @@ -10087,7 +11171,7 @@ commit d93fd0a84e70d20e953a42cc8a0c338140d7e858 Author: Michael Natterer -Date: Fri Aug 23 20:35:24 2013 +0200 +Date: Fri Aug 23 20:35:24 2013 +0200 Bug 706221 - File/Save (As) dialog: add a link to the Export dialog... @@ -10099,7 +11183,7 @@ (cherry picked from commit b56145626e1e83ed9e1ffea161fa66aadb9fea24) - app/actions/file-commands.c | 146 ++++++++++++++++++++++------- + app/actions/file-commands.c | 146 ++++++++++++++++++++++------- app/dialogs/file-save-dialog.c | 205 +++++++++++++++++++++++++++++++++-------- app/dialogs/file-save-dialog.h | 3 + @@ -10107,7 +11191,7 @@ commit ded05240e2f1111ead34151fa13e7411b94346d7 Author: Enrico Nicoletto -Date: Fri Aug 23 16:02:22 2013 -0300 +Date: Fri Aug 23 16:02:22 2013 -0300 Revert "Updated Brazilian Portuguese translation" @@ -10121,7 +11205,7 @@ commit d6f50ab1df895aa61dd6a8c0c7c58384f9c4ea7d Author: Enrico Nicoletto -Date: Fri Aug 23 15:58:09 2013 -0300 +Date: Fri Aug 23 15:58:09 2013 -0300 Updated Brazilian Portuguese translation @@ -10131,7 +11215,7 @@ commit 4758321f35bc024eb448209cb575966e33c110fb Author: Enrico Nicoletto -Date: Wed Aug 14 12:34:21 2013 -0300 +Date: Wed Aug 14 12:34:21 2013 -0300 Updated Brazilian Portuguese translation @@ -10140,7 +11224,7 @@ commit 0d57efb47fd8481a67343c4c9ee118c569ae7709 Author: Daniel Mustieles -Date: Wed Aug 14 14:10:37 2013 +0200 +Date: Wed Aug 14 14:10:37 2013 +0200 Updated Spanish translation @@ -10149,7 +11233,7 @@ commit b7e676d5f737fadbd034dfc34ba8b5a557a77079 Author: Piotr Drąg -Date: Sun Aug 11 01:06:40 2013 +0200 +Date: Sun Aug 11 01:06:40 2013 +0200 Updated Polish translation @@ -10158,7 +11242,7 @@ commit 1ecc25a260aac95344c984e4014e429812cafec3 Author: Michael Natterer -Date: Fri Aug 9 21:31:55 2013 +0200 +Date: Fri Aug 9 21:31:55 2013 +0200 app: return a GError when flattening the image failed @@ -10167,13 +11251,13 @@ app/actions/image-commands.c | 13 ++++++++++++- app/core/gimpimage-merge.c | 12 +++++++++--- app/core/gimpimage-merge.h | 3 ++- - app/pdb/image-cmds.c | 2 +- + app/pdb/image-cmds.c | 2 +- tools/pdbgen/pdb/image.pdb | 2 +- 5 files changed, 25 insertions(+), 7 deletions(-) commit d3763fe8b2b0715226ee179b15667c9eb866dbb1 Author: Simon Budig -Date: Fri Aug 9 21:32:42 2013 +0200 +Date: Fri Aug 9 21:32:42 2013 +0200 app: fix crash when flattening an image with no visible layers @@ -10185,7 +11269,7 @@ commit ed6a87b3df2c29081767b93e3327741877aa82c0 Author: Marco Ciampa -Date: Thu Aug 8 16:00:15 2013 +0200 +Date: Thu Aug 8 16:00:15 2013 +0200 Updated italian translation. @@ -10195,7 +11279,7 @@ commit 89cea63de41c110dfa1b80867babc92e5f7c2c13 Author: Enrico Nicoletto -Date: Tue Aug 6 09:45:08 2013 -0300 +Date: Tue Aug 6 09:45:08 2013 -0300 Updated partial Brazilian Portuguese translation @@ -10205,7 +11289,7 @@ commit 5874a6dbc79c9ef5a96df9fbf6db757d81f5b554 Author: Michael Natterer -Date: Sun Aug 4 16:51:31 2013 +0200 +Date: Sun Aug 4 16:51:31 2013 +0200 app: port mtime code in gimp_data_save() to GIO @@ -10218,7 +11302,7 @@ commit d59a31867ab9cde8eff81ad5f68968ba08b4f07c Author: Téo Mazars -Date: Sat Apr 13 17:16:56 2013 +0200 +Date: Sat Apr 13 17:16:56 2013 +0200 Bug 674391 - Indexed colours not exported when save a .bmp @@ -10238,7 +11322,7 @@ commit 4fb7a436bca3e11abfda8bc23818af0f09714b9d Author: Michael Natterer -Date: Fri Aug 2 16:50:00 2013 +0200 +Date: Fri Aug 2 16:50:00 2013 +0200 Bug 704980 - uclibc - base-utils.c: execinfo.h: No such file or directory @@ -10247,12 +11331,12 @@ builds the code that needs it conditionally. app/base/base-utils.c | 4 ++-- - configure.ac | 2 +- + configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit 02a1e57442793d58167dc08b683665e987c905b3 Author: Michael Natterer -Date: Sun Jul 28 02:50:33 2013 +0200 +Date: Sun Jul 28 02:50:33 2013 +0200 Bug 704896 - pop ups are annoying when opening multiple files from... @@ -10268,7 +11352,7 @@ commit 58931c135d7b349f865520e19481f386917d66bc Author: Martin Srebotnjak -Date: Fri Jul 26 21:20:14 2013 +0200 +Date: Fri Jul 26 21:20:14 2013 +0200 Updated Slovenian translation @@ -10278,7 +11362,7 @@ commit 5b995df2ea3d8d526271875ec36684dee43375f3 Author: Dimitris Spingos -Date: Tue Jul 23 17:25:17 2013 +0300 +Date: Tue Jul 23 17:25:17 2013 +0300 Updated Greek translation @@ -10288,7 +11372,7 @@ commit c1d9d0c1298623c161c125743cc3565a3a546b8f Author: Daniel Mustieles -Date: Mon Jul 22 13:45:43 2013 +0200 +Date: Mon Jul 22 13:45:43 2013 +0200 Updated Spanish translation @@ -10298,7 +11382,7 @@ commit ba7e75bd58303c79b50e417f417d933a1d2b2bf5 Author: Piotr Drąg -Date: Tue Jul 16 18:35:29 2013 +0200 +Date: Tue Jul 16 18:35:29 2013 +0200 Bug 679083: proper docs for plug-in-autocrop-layer without string changes @@ -10311,7 +11395,7 @@ commit 5069b788fb2bcadcb05f393ba8a3bec174dcc6f5 Author: Jehan -Date: Tue Jul 16 09:24:09 2013 +0900 +Date: Tue Jul 16 09:24:09 2013 +0900 Revert "Bug 679083: proper documentation for plug-in-autocrop-layer" @@ -10325,7 +11409,7 @@ commit 2e991eb4e01a3b2fe18eaa5a85d6a5e248ed12c1 Author: Piotr Drąg -Date: Mon Jul 15 22:36:22 2013 +0200 +Date: Mon Jul 15 22:36:22 2013 +0200 Updated Polish translation @@ -10335,7 +11419,7 @@ commit 653c4e98df693dbe093d703c93d10582d51b4c9f Author: Michael Natterer -Date: Mon Jul 15 01:22:14 2013 +0200 +Date: Mon Jul 15 01:22:14 2013 +0200 Bug 679195 - Foreground Select Tool Mask Inverted @@ -10347,7 +11431,7 @@ commit 60bf4e367d0357df8eef5dc034f997167aee4d69 Author: Michael Natterer -Date: Mon Jul 15 00:41:43 2013 +0200 +Date: Mon Jul 15 00:41:43 2013 +0200 Bug 700193 - undoing paint tools doesn't update last_coords properly @@ -10359,14 +11443,14 @@ (cherry picked from commit d1795ac2047de73b7a7d4c9fd2666a8b0b4bd12b) app/paint/gimppaintcore-stroke.c | 13 +++++-------- - app/paint/gimppaintcore.c | 4 +++- - app/paint/gimppaintcore.h | 2 +- - app/tools/gimppainttool.c | 15 ++++++++------- + app/paint/gimppaintcore.c | 4 +++- + app/paint/gimppaintcore.h | 2 +- + app/tools/gimppainttool.c | 15 ++++++++------- 4 files changed, 17 insertions(+), 17 deletions(-) commit cb2b4b6751d6621ad3d40ceadbd6514603cce892 Author: Seong-ho Cho -Date: Mon Jul 15 06:50:11 2013 +0900 +Date: Mon Jul 15 06:50:11 2013 +0900 Updated Korean translation @@ -10376,7 +11460,7 @@ commit a1cd4144dffb3f183249b2af17efed6ad11aa6ad Author: Michael Natterer -Date: Sun Jul 14 22:25:44 2013 +0200 +Date: Sun Jul 14 22:25:44 2013 +0200 Bug 704118 - crash on invalid number of PLTE entries @@ -10393,16 +11477,16 @@ (cherry picked from commit 37372555e5820f7f0c3a98ce9975ef66c2d8422c) app/actions/colormap-actions.c | 2 +- - app/core/gimpimage-colormap.c | 36 ++++++++++++++++++++++++++++-------- - app/core/gimpimage-colormap.h | 2 ++ - app/core/gimpimage-convert.c | 2 +- - app/core/gimpimageundo.c | 9 ++++++--- - app/widgets/gimppaletteview.c | 2 +- + app/core/gimpimage-colormap.c | 36 ++++++++++++++++++++++++++++-------- + app/core/gimpimage-colormap.h | 2 ++ + app/core/gimpimage-convert.c | 2 +- + app/core/gimpimageundo.c | 9 ++++++--- + app/widgets/gimppaletteview.c | 2 +- 6 files changed, 39 insertions(+), 14 deletions(-) commit 616e8f2d82ffcf40eaec8034770447e754dbda80 Author: Michael Natterer -Date: Sun Jul 14 13:46:00 2013 +0200 +Date: Sun Jul 14 13:46:00 2013 +0200 Bug 703692 - Unable to Resize Large Left Dock Area @@ -10410,16 +11494,16 @@ thing into a properly reqizable widget and fixes the issues with left dock resizability. - modules/Makefile.am | 2 +- + modules/Makefile.am | 2 +- modules/color-selector-wheel.c | 52 +- - modules/gimpcolorwheel.c | 1484 + modules/gimpcolorwheel.c | 1484 ++++++++++++++++++++++++++++++++++++++++ - modules/gimpcolorwheel.h | 97 +++ + modules/gimpcolorwheel.h | 97 +++ 4 files changed, 1595 insertions(+), 40 deletions(-) commit 3632680049fae535696caffb9d273c1419e99896 Author: Michael Natterer -Date: Sun Jul 14 13:27:57 2013 +0200 +Date: Sun Jul 14 13:27:57 2013 +0200 Bug 703692 - Unable to Resize Large Left Dock Area @@ -10434,7 +11518,7 @@ commit 38ab5f9d64b6e6dadf9468b6bae9b10f07456317 Author: Michael Natterer -Date: Sat Jul 13 18:50:55 2013 +0200 +Date: Sat Jul 13 18:50:55 2013 +0200 Bug 703692 - Unable to Resize Large Left Dock Area @@ -10450,7 +11534,7 @@ commit b283facb890ded45c404749165deeb7413b35ab0 Author: Jehan -Date: Mon Jul 8 22:21:03 2013 +0900 +Date: Mon Jul 8 22:21:03 2013 +0900 Bug 703787 - Crash during switch from multi to single window mode @@ -10469,7 +11553,7 @@ commit 26fb257a191885068b7a478a63009a092aff62f4 Author: Michael Natterer -Date: Fri Jul 12 15:18:38 2013 +0200 +Date: Fri Jul 12 15:18:38 2013 +0200 Bug 703113 - Plug-ins are queried on every launch @@ -10478,14 +11562,14 @@ (cherry picked from commit 767a5a321708c4ca19bbf1e103a3988fcc404cc5) - libgimpbase/Makefile.am | 4 +-- + libgimpbase/Makefile.am | 4 +-- libgimpbase/gimpdatafiles.c | 65 +++++++++++++++++++++++++++------------------ 2 files changed, 41 insertions(+), 28 deletions(-) commit f7fe056e1968c151795be40aa04807b5f06ccedf Author: Jehan -Date: Mon Jul 8 21:19:01 2013 +0900 +Date: Mon Jul 8 21:19:01 2013 +0900 app - call to keep the active shell in single window mode switch out of loop. @@ -10501,7 +11585,7 @@ commit cc836e7c845b2e4035382cc2cc73064bced55dc5 Author: Massimo Valentini -Date: Tue Jul 9 19:41:52 2013 +0200 +Date: Tue Jul 9 19:41:52 2013 +0200 Bug 703806: GIMP crashes when scaling an image @@ -10516,7 +11600,7 @@ commit 588012f48c5c211fd4c535282dd444d2719f2328 Author: Daniel Mustieles -Date: Mon Jul 8 14:03:43 2013 +0200 +Date: Mon Jul 8 14:03:43 2013 +0200 Updated Spanish translation @@ -10526,7 +11610,7 @@ commit 0c4e7686e856a78bc10e7f9bab148c9c1c45e867 Author: Jehan -Date: Sun Jul 7 13:47:37 2013 +0900 +Date: Sun Jul 7 13:47:37 2013 +0900 Bug 703736: when switching from multi to single window mode, tab order is lost. @@ -10537,7 +11621,7 @@ commit 893c73cea48f8788b02567c1f9b995173195eee3 Author: Jehan -Date: Sun Jul 7 23:10:33 2013 +0900 +Date: Sun Jul 7 23:10:33 2013 +0900 Bug 703738: when switching between multi and single window mode, keep the same active shell. @@ -10548,7 +11632,7 @@ commit 42e370e20822b248b86fe2012663109aaa7f7808 Author: Massimo Valentini -Date: Fri Jul 5 18:13:46 2013 +0200 +Date: Fri Jul 5 18:13:46 2013 +0200 app: don't pass NULL to g_object_add_weak_pointer @@ -10565,7 +11649,7 @@ commit 80d11a46a84460ee9ada53266064b0210148fa3c Author: Jehan -Date: Thu Jul 4 22:11:47 2013 +0900 +Date: Thu Jul 4 22:11:47 2013 +0900 Bug 672100: gimptool returns wrong system plugin dir if libdir has been customized. @@ -10579,7 +11663,7 @@ commit dedb0250194d3760c6b89d91d4f739dbd7ed8aaf Author: Jehan -Date: Fri Jul 5 23:58:48 2013 +0900 +Date: Fri Jul 5 23:58:48 2013 +0900 Bug 679083: proper documentation for plug-in-autocrop-layer @@ -10594,7 +11678,7 @@ commit 4e664a011d5b5142c65dd813ee3cb4a324e97ac6 Author: Massimo Valentini -Date: Thu Jul 4 21:36:40 2013 +0200 +Date: Thu Jul 4 21:36:40 2013 +0200 Bug 629941 - GIMP doesn't exit properly when quitting while loading images @@ -10612,7 +11696,7 @@ commit dea99e516b6c796e423da579ea387997a13d4e13 Author: Massimo Valentini -Date: Thu Jul 4 21:05:25 2013 +0200 +Date: Thu Jul 4 21:05:25 2013 +0200 app: file_open_from_command_line(): don't access a dangling display pointer @@ -10626,7 +11710,7 @@ commit 92e9de96ae5e8a8b1ba917db35aaa281c333c058 Author: Michael Natterer -Date: Wed Jul 3 09:26:03 2013 +0200 +Date: Wed Jul 3 09:26:03 2013 +0200 app: view_close_cmd_callback(): don't forbid to close images without layers @@ -10638,7 +11722,7 @@ commit 16e548c12fe90c88751d1cb835887be99215b773 Author: Michael Natterer -Date: Mon Jul 1 19:05:14 2013 +0200 +Date: Mon Jul 1 19:05:14 2013 +0200 libgimpthumb: add GIO_LIBS also to libgimpthumb_2_0_la_LIBADD @@ -10647,7 +11731,7 @@ commit 2654d0d4997c8864284aac1835a5d84a08f7ad1f Author: Michael Natterer -Date: Sat Jun 29 18:14:12 2013 +0200 +Date: Sat Jun 29 18:14:12 2013 +0200 libgimpthumb: use GIO_CFLAGS/LIBS not GLIB_CFLAGS/LIBS @@ -10656,7 +11740,7 @@ commit 4d2316cb3e0395a57821c461135b2e3e3788408d Author: Michael Natterer -Date: Fri Jun 28 22:44:19 2013 +0200 +Date: Fri Jun 28 22:44:19 2013 +0200 Bug 683152 - Preview thumbnails in file open dialog causes error in 2.8.2 @@ -10672,7 +11756,7 @@ commit 3a9f5a354ba006df90a20cd1f4ebbe35a6e38f7d Author: Alexandre Prokoudine -Date: Fri Jun 28 12:29:38 2013 +0400 +Date: Fri Jun 28 12:29:38 2013 +0400 Updates and fixes to Russian translation @@ -10682,7 +11766,7 @@ commit 24223d6663a706b5bca472feda657fb2e58a528a Author: Sven Claussner -Date: Fri Jun 28 09:17:57 2013 +0200 +Date: Fri Jun 28 09:17:57 2013 +0200 Bug 703218 - Typo in German translation @@ -10695,7 +11779,7 @@ commit 3ce15deed94df58ddb4b1e4c9d7f3f713812447f Author: Michael Henning -Date: Wed Jun 26 11:40:01 2013 -0400 +Date: Wed Jun 26 11:40:01 2013 -0400 autogen.sh: also look for automake 1.14 @@ -10706,7 +11790,7 @@ commit bd91caf778602774d6b90fb574fca336c7e03af6 Author: Michael Natterer -Date: Tue Jun 25 19:08:12 2013 +0200 +Date: Tue Jun 25 19:08:12 2013 +0200 app: port GimpImagePropView's file size querying to GIO @@ -10715,7 +11799,7 @@ commit 16b1ff9a09398b2617c6b018ec2e1579157bf2b7 Author: Jernej Simončič -Date: Mon Jun 24 11:11:24 2013 +0200 +Date: Mon Jun 24 11:11:24 2013 +0200 Installer: add libharfbuzz-0.dll to the list of required 32-bit libraries @@ -10725,7 +11809,7 @@ commit 8937d9eb2864ca0d7335b3c6e2463eda86c3969c Author: Michael Natterer -Date: Sat Jun 22 00:12:59 2013 +0200 +Date: Sat Jun 22 00:12:59 2013 +0200 configure: post-release version bump to 2.8.7 @@ -10734,19 +11818,19 @@ commit 82888aaa4b1e65ae23ec0ee591ebed4685df55e8 Author: Michael Natterer -Date: Fri Jun 21 23:22:49 2013 +0200 +Date: Fri Jun 21 23:22:49 2013 +0200 Bump version to 2.8.6 and commit regenerated files - NEWS | 2 +- - configure.ac | 4 ++-- + NEWS | 2 +- + configure.ac | 4 ++-- docs/gimprc.5.in | 2 +- - etc/gimprc | 2 +- + etc/gimprc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) commit 20e4a9c2c35f9bac011f9eb55318719759231267 Author: Téo Mazars -Date: Fri Jun 21 22:27:47 2013 +0200 +Date: Fri Jun 21 22:27:47 2013 +0200 NEWS: add api introduction and fix typo @@ -10755,7 +11839,7 @@ commit f7cbd9de654cd4e94d0b83315482dab2c67b1b82 Author: Téo Mazars -Date: Fri Jun 21 20:09:18 2013 +0200 +Date: Fri Jun 21 20:09:18 2013 +0200 Bug 701410 - Small artifacts appear when performing a selection @@ -10767,7 +11851,7 @@ commit 32c9903a58f67e1eed3cd392e59999826cbd03e2 Author: Michael Natterer -Date: Fri Jun 21 12:44:38 2013 +0200 +Date: Fri Jun 21 12:44:38 2013 +0200 NEWS: updates @@ -10776,20 +11860,20 @@ commit dd9f57f8de34397bf1dddd9f7e274e5af3150053 Author: Michael Natterer -Date: Fri Jun 21 12:43:29 2013 +0200 +Date: Fri Jun 21 12:43:29 2013 +0200 Bug 701335 - Gimp crashing on creating huge clipboard brush Change the maximum size of clipboard patterns and brushes to 1024x1024. - app/core/gimpbrushclipboard.c | 4 ++-- + app/core/gimpbrushclipboard.c | 4 ++-- app/core/gimppatternclipboard.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit ef649f48275dcb1850c2d0c0a60e33b244a8eb42 Author: Michael Natterer -Date: Tue Jun 18 19:05:54 2013 +0200 +Date: Tue Jun 18 19:05:54 2013 +0200 Bug 701803 - Cage Transform raises segmentation fault... @@ -10805,28 +11889,28 @@ commit 731ee3218cbdd3e25303df0ae7e855035f64619b Author: Marco Ciampa -Date: Fri Jun 7 22:28:27 2013 +0200 +Date: Fri Jun 7 22:28:27 2013 +0200 Updated italian translation po-plug-ins/it.po | 470 ++++++++++++++++++++++++++++-------------------------- - po/it.po | 219 +++++++++++++------------ + po/it.po | 219 +++++++++++++------------ 2 files changed, 357 insertions(+), 332 deletions(-) commit bb5f7d6525358a494870888ff7047ecf48e96a5b Author: Stanislav Petrek -Date: Wed Jun 5 21:27:40 2013 +0200 +Date: Wed Jun 5 21:27:40 2013 +0200 Updated slovak translation po-tags/LINGUAS | 2 ++ - po-tags/sk.po | 31 +++++++++++++++++++++++++++++++ + po-tags/sk.po | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) commit 8b7ad24892309ad8dac1c48f7b876ba0a3755cbf Author: Dimitris Spingos -Date: Wed Jun 5 15:15:39 2013 +0300 +Date: Wed Jun 5 15:15:39 2013 +0300 Updated Greek translation @@ -10836,7 +11920,7 @@ commit 4b957cf404e0b9f636befd8cba4726d341852be2 Author: Michael Natterer -Date: Tue Jun 4 16:48:41 2013 +0200 +Date: Tue Jun 4 16:48:41 2013 +0200 Bug 701594 - gimp-image-select-item does not recognize path transformations @@ -10851,7 +11935,7 @@ commit bc411d97c926e0824c5a77ef96416cb6365f1684 Author: Massimo Valentini -Date: Sat Jun 1 17:30:43 2013 +0200 +Date: Sat Jun 1 17:30:43 2013 +0200 Bug 701120: Opening fuzzed .pnm-file causes stack buffer overflow @@ -10864,7 +11948,7 @@ commit ba98aedcb1f03b7307e22b20487d5cc9e7665f54 Author: Massimo Valentini -Date: Sat Jun 1 17:07:24 2013 +0200 +Date: Sat Jun 1 17:07:24 2013 +0200 Bug 680290: -90 degree rotation distortion of layer @@ -10876,13 +11960,13 @@ consistent with INTERPOLATION_NONE app/core/gimp-transform-region.c | 9 +++++++-- - libgimpmath/gimpmatrix.c | 38 + libgimpmath/gimpmatrix.c | 38 ++++++++++++++++++++++---------------- 2 files changed, 29 insertions(+), 18 deletions(-) commit dd8aeeec92a64390a8ece059c62368821a172bfe Author: Michael Natterer -Date: Wed May 29 22:23:38 2013 +0200 +Date: Wed May 29 22:23:38 2013 +0200 Bug 700215 - Gradient name changes do not persist across sessions... @@ -10898,7 +11982,7 @@ commit 27dd1c167bb3c71d9b8a338f26cc78fa96e2c442 Author: Daniel Mustieles -Date: Mon May 27 16:46:41 2013 +0200 +Date: Mon May 27 16:46:41 2013 +0200 Updated Spanish translation @@ -10908,7 +11992,7 @@ commit 45644a44bad32c4294d57cc33a41ab68d9b005bf Author: Piotr Drąg -Date: Sat May 25 18:29:47 2013 +0200 +Date: Sat May 25 18:29:47 2013 +0200 Updated Polish translation @@ -10917,7 +12001,7 @@ commit aa16efe4c96d6e39be8fea4ee6443067b90cae9b Author: Michael Natterer -Date: Sat May 25 16:11:15 2013 +0200 +Date: Sat May 25 16:11:15 2013 +0200 Bug 578695 - gimptool-2.0 does not respect $DESTDIR @@ -10929,7 +12013,7 @@ commit a57ad1a9971ec544c7f934513252a7bb921f47f4 Author: Michael Natterer -Date: Sat May 25 11:21:15 2013 +0200 +Date: Sat May 25 11:21:15 2013 +0200 Bug 700707 - Missing time data in tool-options/*.settings files @@ -10942,7 +12026,7 @@ commit c947260d2db0d761668dd7b16f195f9ed3d458c6 Author: Jehan -Date: Wed Dec 12 15:14:42 2012 +0900 +Date: Wed Dec 12 15:14:42 2012 +0900 actions: dock-close had a default shortcut colliding with view-close. @@ -10958,7 +12042,7 @@ commit 6cda75205a1c1d444efbe1e43ad85f68565f7912 Author: Michael Natterer -Date: Fri Dec 14 09:54:17 2012 +0100 +Date: Fri Dec 14 09:54:17 2012 +0100 app: add the "view" action group to all docks @@ -10970,7 +12054,7 @@ commit ae8749a9a7cfcdf294873bada2c0e664ec0914b5 Author: Michael Natterer -Date: Wed Dec 12 23:26:46 2012 +0100 +Date: Wed Dec 12 23:26:46 2012 +0100 app: can't call view_actions_setup() from file_actions_setup() @@ -10983,7 +12067,7 @@ commit 1380b0696cbae20cbe04742da6ab3926a67674cb Author: Jehan -Date: Wed Dec 12 16:05:39 2012 +0900 +Date: Wed Dec 12 16:05:39 2012 +0900 actions: forgot an include which was triggering an "implicit declaration" warning. @@ -10994,7 +12078,7 @@ commit 22d4cd02fc6b56e342d4645921575b7f3f462a90 Author: Jehan -Date: Mon Nov 26 00:18:00 2012 +0900 +Date: Mon Nov 26 00:18:00 2012 +0900 Bug 685559 - view-close action modified to close only an image view. @@ -11004,15 +12088,15 @@ Additionally all other view actions are available on dock focus. (cherry picked from commit 2ad8634c06814219728bb10fbe59a63afc42fdea) - app/actions/file-actions.c | 3 +++ - app/actions/view-actions.c | 6 +++--- + app/actions/file-actions.c | 3 +++ + app/actions/view-actions.c | 6 +++--- app/actions/view-commands.c | 20 ++++++++++++++++++++ - app/actions/view-commands.h | 2 ++ + app/actions/view-commands.h | 2 ++ 4 files changed, 28 insertions(+), 3 deletions(-) commit 5207a4fcd8fbc97287ba3292965d5e9c81718670 Author: Michael Natterer -Date: Fri May 24 09:23:52 2013 +0200 +Date: Fri May 24 09:23:52 2013 +0200 Bug 700675 - Missing menu locations for registration and other menu... @@ -11027,7 +12111,7 @@ commit b47f4eb777133a706ffb24b8b6726bffe5d9eeca Author: Dov Grobgeld -Date: Sun May 19 23:53:33 2013 +0300 +Date: Sun May 19 23:53:33 2013 +0300 Updated dicom plugin to solve problems with import into external programs (e.g. OsiriX) @@ -11037,7 +12121,7 @@ commit 40726a341d00e4874b1ae24c842a7584a4a087ee Author: Michael Natterer -Date: Sun May 19 21:42:50 2013 +0200 +Date: Sun May 19 21:42:50 2013 +0200 Bug 700653 - Duplicate "(time ...)" values in gimp-curves-tool.settings @@ -11049,13 +12133,13 @@ property doesn't end up in the config file once per channel. (cherry picked from commit 6781439fdc058754a0477dd1fc7b1d654fb90bf7) - app/gegl/gimpcurvesconfig.c | 9 ++++++++- + app/gegl/gimpcurvesconfig.c | 9 ++++++++- app/gegl/gimplevelsconfig.c | 13 ++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) commit 7ee3235bd03e7109d9ae4f856efb0e1f2683ef6c Author: Michael Natterer -Date: Fri May 17 14:41:11 2013 +0200 +Date: Fri May 17 14:41:11 2013 +0200 Bug 688537 - Toolbox occasionally has spaces or tool names after the icons @@ -11069,7 +12153,7 @@ commit 7b42013baef4a24a6242f9fa1be4f84daff0833b Author: Michael Natterer -Date: Tue May 14 02:00:20 2013 +0200 +Date: Tue May 14 02:00:20 2013 +0200 Bug 695687 - GimpSpinScale's label is unreadable on dark themes @@ -11083,7 +12167,7 @@ commit ecb06953ef22e4532b9a449d9d0694452fc3bba9 Author: Michael Henning -Date: Sun May 12 19:36:27 2013 -0400 +Date: Sun May 12 19:36:27 2013 -0400 tests: fix running make check with both parallel make and xvfb @@ -11096,7 +12180,7 @@ commit eb28d90866c8f1dd2955d4b3fd0c0815da1e7f96 Author: Michael Natterer -Date: Mon May 13 00:00:57 2013 +0200 +Date: Mon May 13 00:00:57 2013 +0200 app: change serialization of the right docks width in SWM (again) @@ -11107,15 +12191,15 @@ the deserialization code which might fix bug #700147. (cherry picked from commit a078ca3f5fb2a43191dd2d4de22aefc493edf1ba) - app/display/gimpimagewindow.c | 78 + app/display/gimpimagewindow.c | 78 +++++++++++++--------- - app/tests/gimpdir/sessionrc-2-8-single-window | 2 +- + app/tests/gimpdir/sessionrc-2-8-single-window | 2 +- app/tests/gimpdir/sessionrc-expected-single-window | 2 +- 3 files changed, 47 insertions(+), 35 deletions(-) commit a98b6581e6c2add3d6cb895d7b71d581c236b361 Author: Jehan -Date: Mon Apr 29 07:03:20 2013 +0900 +Date: Mon Apr 29 07:03:20 2013 +0900 Bug 699185 - when moving the pointer fast out of guide scope, do not keep it highlighted. @@ -11136,7 +12220,7 @@ commit 714c232eee4d966f782d8e882cb5645a8feed0f4 Author: Jehan -Date: Sat May 11 09:04:33 2013 +0900 +Date: Sat May 11 09:04:33 2013 +0900 Bug 664584: WM DELETE event in single window mode is synonym to file-quit. @@ -11154,7 +12238,7 @@ commit 7205a25112982ad361795006cccd9022b75e2d6a Author: Michael Natterer -Date: Sat May 11 20:44:04 2013 +0200 +Date: Sat May 11 20:44:04 2013 +0200 app: fix include in test-core, re-closes bug 622054 @@ -11163,20 +12247,20 @@ commit 9625dd92b413b15b146d294434a4d574fcac6b1e Author: Sven Claussner -Date: Thu May 9 02:35:34 2013 +0200 +Date: Thu May 9 02:35:34 2013 +0200 Bug 699886 - Missing menu location for script/plugin Add the missing menu location for script/plugin registration. - modified: app/plug-in/gimppluginprocedure.c + modified: app/plug-in/gimppluginprocedure.c app/plug-in/gimppluginprocedure.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 9937a0a99b2b721859b6c1d35fdad1d0230d965b Author: Massimo Valentini -Date: Sat May 4 18:19:11 2013 +0200 +Date: Sat May 4 18:19:11 2013 +0200 app: don't crash when adjusting quality during an export to jpeg @@ -11188,7 +12272,7 @@ commit a8aef360b9cb7ea0e32deed57d0bba01fe6fc0b2 Author: Michael Natterer -Date: Thu May 2 20:05:35 2013 +0200 +Date: Thu May 2 20:05:35 2013 +0200 app: fix saving/loading of .xcf.gz and other compressed XCFs @@ -11199,13 +12283,13 @@ e99c0045a2ad01d9712d588ea0aa1995791c67a7) app/file/file-procedure.c | 14 ++++++++------ - app/file/file-utils.c | 22 ++++++++++------------ - app/file/file-utils.h | 41 +++++++++++++++++++++-------------------- + app/file/file-utils.c | 22 ++++++++++------------ + app/file/file-utils.h | 41 +++++++++++++++++++++-------------------- 3 files changed, 39 insertions(+), 38 deletions(-) commit e083b6790d789b4081624ea2bf564e4c32716320 Author: Jehan -Date: Mon Apr 29 22:17:18 2013 +0900 +Date: Mon Apr 29 22:17:18 2013 +0900 Revert "app: GimpContainerEntry's text is red when not a valid item." @@ -11218,7 +12302,7 @@ commit 202c8ed76283a8550dd0c1c15caae6049b1aa07a Author: Jehan -Date: Sat Apr 27 11:26:04 2013 +0900 +Date: Sat Apr 27 11:26:04 2013 +0900 app: GimpContainerEntry's text is red when not a valid item. @@ -11232,7 +12316,7 @@ commit e1645fe427cbe86522041ec31076392fca3436a0 Author: Michael Natterer -Date: Sun Apr 28 15:28:18 2013 +0200 +Date: Sun Apr 28 15:28:18 2013 +0200 Bug 699100 - Move tool: space-bar inhibits function of Move tool @@ -11249,7 +12333,7 @@ commit 4d56fbc16b0a1a748c05aa7cca2aa6b80b0a4b92 Author: Rafael Ferreira -Date: Sun Apr 28 09:10:30 2013 -0300 +Date: Sun Apr 28 09:10:30 2013 -0300 Updated Brazilian Portuguese translation @@ -11259,7 +12343,7 @@ commit 54b28a5b6015cc54793695035ff2a0112b76de5b Author: Sven Claussner -Date: Mon Apr 8 21:48:40 2013 +0200 +Date: Mon Apr 8 21:48:40 2013 +0200 Bug 692956 - Bring back 'Color from gradient' option to Paint tools @@ -11267,31 +12351,32 @@ and three Paint tool presets (Airbrush, Paintbrush, Pencil), which use this preset. - new file: data/dynamics/Color-From-Gradient.gdyn - new file: - data/tool-presets/Paint/Airbrush-Color-From-Gradient.gtp - new file: - data/tool-presets/Paint/Paintbrush-Color-From-Gradient.gtp - new file: data/tool-presets/Paint/Pencil-Color-From-Gradient.gtp - modified: data/dynamics/Makefile.am - modified: data/tool-presets/Paint/Makefile.am - modified: AUTHORS - modified: authors.xml - - AUTHORS | 2 + - authors.xml | 1 + - data/dynamics/Color-From-Gradient.gdyn | 93 + new file: data/dynamics/Color-From-Gradient.gdyn + new file: + data/tool-presets/Paint/Airbrush-Color-From-Gradient.gtp + new file: + data/tool-presets/Paint/Paintbrush-Color-From-Gradient.gtp + new file: + data/tool-presets/Paint/Pencil-Color-From-Gradient.gtp + modified: data/dynamics/Makefile.am + modified: data/tool-presets/Paint/Makefile.am + modified: AUTHORS + modified: authors.xml + + AUTHORS | 2 + + authors.xml | 1 + + data/dynamics/Color-From-Gradient.gdyn | 93 ++++++++++++++++++++++ - data/dynamics/Makefile.am | 1 + - .../Paint/Airbrush-Color-From-Gradient.gtp | 24 ++++++ - data/tool-presets/Paint/Makefile.am | 3 + - .../Paint/Paintbrush-Color-From-Gradient.gtp | 24 ++++++ - .../Paint/Pencil-Color-From-Gradient.gtp | 23 ++++++ + data/dynamics/Makefile.am | 1 + + .../Paint/Airbrush-Color-From-Gradient.gtp | 24 ++++++ + data/tool-presets/Paint/Makefile.am | 3 + + .../Paint/Paintbrush-Color-From-Gradient.gtp | 24 ++++++ + .../Paint/Pencil-Color-From-Gradient.gtp | 23 ++++++ 8 files changed, 171 insertions(+) commit 15c79a22ca5cca32c51cd07202bcf3876289ba71 Author: Enrico Nicoletto -Date: Wed Apr 24 00:40:30 2013 -0300 +Date: Wed Apr 24 00:40:30 2013 -0300 Updated Brazilian Portuguese translation @@ -11301,7 +12386,7 @@ commit 9069bd8d79248b9fa778dcc5149d99aff1b914ad Author: Michael Natterer -Date: Tue Apr 23 21:00:17 2013 +0200 +Date: Tue Apr 23 21:00:17 2013 +0200 Bug 688348 - Layer tab and Images tab: not updated on dropping... @@ -11325,7 +12410,7 @@ commit 4cd97c8cf7fdd9b637edde64a535d4e646e2bc86 Author: Michael Natterer -Date: Tue Apr 23 10:26:23 2013 +0200 +Date: Tue Apr 23 10:26:23 2013 +0200 app: make gimp_dock_window_constructed() more readable @@ -11342,7 +12427,7 @@ commit 900cc4108bfa0953bc0c5c2600ae154a0ab593b7 Author: Mikael Magnusson -Date: Tue Apr 23 17:02:45 2013 +0200 +Date: Tue Apr 23 17:02:45 2013 +0200 app: forgot to invert the matrix in corrective mode when transforming the selection. @@ -11352,7 +12437,7 @@ commit 380437e65e5a43ffc916706fd7711e09da5d4ee0 Author: Michael Natterer -Date: Mon Nov 5 19:56:40 2012 +0100 +Date: Mon Nov 5 19:56:40 2012 +0100 app: make GimpContainerEntry robust against reordered parent class destruction @@ -11365,7 +12450,7 @@ commit 019eb591116740b0a4587f0cac4daf24c8b1cb58 Author: Michael Natterer -Date: Sun Apr 21 20:00:28 2013 +0200 +Date: Sun Apr 21 20:00:28 2013 +0200 Bug 697530 - zoom during mouse-pan focuses on wrong location @@ -11378,7 +12463,7 @@ commit ca520161166fd9f11465eb8c86c46ffb01ba8856 Author: Massimo Valentini -Date: Sun Apr 21 17:47:01 2013 +0200 +Date: Sun Apr 21 17:47:01 2013 +0200 Bug 698426: ALL text disappears when changing font ... @@ -11391,7 +12476,7 @@ commit 839734463a96392ad1e2ce26c9c29a8d2fdf1b6e Author: Michael Natterer -Date: Sun Apr 21 17:51:08 2013 +0200 +Date: Sun Apr 21 17:51:08 2013 +0200 Bug 694417 - GIMP Segmentation Faults (Segfault, Crash) after Changing Color... @@ -11413,7 +12498,7 @@ commit 4055ccbe9cb3053c2c8bedabaa31df982fa1b752 Author: Michael Henning -Date: Sat Apr 20 22:13:05 2013 -0400 +Date: Sat Apr 20 22:13:05 2013 -0400 app: fix broken build on windows due to not #including windows.h @@ -11426,7 +12511,7 @@ commit 37757e4e8dff76715a99394380c8809c5c3f0970 Author: Nils Philippsen -Date: Tue Apr 16 11:16:41 2013 +0200 +Date: Tue Apr 16 11:16:41 2013 +0200 app: let the tag popup own its tag objects @@ -11439,25 +12524,25 @@ commit e768d4fa8d7de607ead79ed3390b7b884452bbcc Author: Mukund Sivaraman -Date: Thu Apr 11 20:59:22 2013 +0530 +Date: Thu Apr 11 20:59:22 2013 +0530 imagemap: Rebuild parsers (after .y update) - plug-ins/imagemap/imap_cern_lex.c | 63 ++- + plug-ins/imagemap/imap_cern_lex.c | 63 ++- plug-ins/imagemap/imap_cern_parse.c | 608 +++++++++++++++------------- - plug-ins/imagemap/imap_cern_parse.h | 39 +- - plug-ins/imagemap/imap_csim_lex.c | 63 ++- + plug-ins/imagemap/imap_cern_parse.h | 39 +- + plug-ins/imagemap/imap_csim_lex.c | 63 ++- plug-ins/imagemap/imap_csim_parse.c | 777 ++++++++++++++++++++---------------- - plug-ins/imagemap/imap_csim_parse.h | 41 +- - plug-ins/imagemap/imap_ncsa_lex.c | 63 ++- + plug-ins/imagemap/imap_csim_parse.h | 41 +- + plug-ins/imagemap/imap_ncsa_lex.c | 63 ++- plug-ins/imagemap/imap_ncsa_parse.c | 611 +++++++++++++++------------- - plug-ins/imagemap/imap_ncsa_parse.h | 39 +- + plug-ins/imagemap/imap_ncsa_parse.h | 39 +- 9 files changed, 1246 insertions(+), 1058 deletions(-) commit 03dfb95f13884137a3b9379c6f84c68cebda166e Author: Mukund Sivaraman -Date: Thu Apr 11 14:11:00 2013 +0530 +Date: Thu Apr 11 14:11:00 2013 +0530 imagemap: Don't use strcpy() in unescape_text() (#649172) @@ -11474,7 +12559,7 @@ commit 95a9172bd5aa96f9b3e07091156c38f7d0fb6617 Author: Martin Husemann -Date: Thu Apr 11 14:09:50 2013 +0530 +Date: Thu Apr 11 14:09:50 2013 +0530 imagemap: Unescape simple xml encodings when reading csim format image maps (GB#649172) @@ -11486,7 +12571,7 @@ commit 3aaa69642e218cb495a2cc6691368a901df26e18 Author: Michael Natterer -Date: Wed Apr 10 19:28:49 2013 +0200 +Date: Wed Apr 10 19:28:49 2013 +0200 app: allow to pass NULL to gimp_window_set_primary_focus_widget() (cherry picked from commit 754e4eb91946ebb70ff1f6e81e8e7a694d81573d) @@ -11496,7 +12581,7 @@ commit 53d083c844f0ad81f88d6e64493160c319e519ef Author: Michael Natterer -Date: Tue Apr 9 15:41:20 2013 +0200 +Date: Tue Apr 9 15:41:20 2013 +0200 Bug 675549 - image region does not have focus unless clicked on @@ -11516,7 +12601,7 @@ commit 38d8312fdebee98a20b33807b09d8a832a4b97b7 Author: Téo Mazars -Date: Sun Apr 7 22:29:56 2013 +0200 +Date: Sun Apr 7 22:29:56 2013 +0200 Bug 695418 - Unsharp mask crashes for large radii @@ -11528,13 +12613,13 @@ commit 5f4449e956069c5e2de960a8c8597139d0e2f6cc Author: Милош Поповић -Date: Mon Apr 8 17:02:24 2013 +0200 +Date: Mon Apr 8 17:02:24 2013 +0200 Updated Serbian Translation - po-tips/sr.po | 354 +++--- - po-tips/sr@latin.po | 354 +++--- - po/sr.po | 3359 + po-tips/sr.po | 354 +++--- + po-tips/sr@latin.po | 354 +++--- + po/sr.po | 3359 ++++++++++++++++++++++++++++++--------------------- po/sr@latin.po | 3359 ++++++++++++++++++++++++++++++--------------------- @@ -11542,7 +12627,7 @@ commit 6d4fd657ff26e562db346ed69495db9ee11499b1 Author: Dimitris Spingos -Date: Mon Apr 8 10:32:33 2013 +0300 +Date: Mon Apr 8 10:32:33 2013 +0300 Updated Greek translation @@ -11552,7 +12637,7 @@ commit 0c060b3296be6854446c48e56c8b5d950f13ddbc Author: Martin Srebotnjak -Date: Thu Apr 4 21:04:03 2013 +0200 +Date: Thu Apr 4 21:04:03 2013 +0200 Updated Slovenian translation @@ -11562,7 +12647,7 @@ commit fb38e0a5f9e2881edad43a23769f87913e18d3f2 Author: Pedro Gimeno Fortea -Date: Tue Apr 2 17:23:40 2013 +0200 +Date: Tue Apr 2 17:23:40 2013 +0200 Bug 696958 - In-image preview in Transform tools is off by one screen pixel @@ -11580,7 +12665,7 @@ commit e12243e94e8727d576dac386444bf3218789b1b4 Author: Pedro Gimeno Fortea -Date: Tue Apr 2 16:55:09 2013 +0200 +Date: Tue Apr 2 16:55:09 2013 +0200 app: Two mostly cosmetic changes @@ -11593,7 +12678,7 @@ commit bc1aad3c239e4c7cd860c36b030f8457cdf2b639 Author: Téo Mazars -Date: Thu Feb 21 18:31:12 2013 +0100 +Date: Thu Feb 21 18:31:12 2013 +0100 Bug 683713 - Align visible layers does not work when layers ... @@ -11610,7 +12695,7 @@ commit 7392679be90eecb54cce6dfa151602a314a31e35 Author: Petr Kubiznak -Date: Sun Mar 17 21:33:17 2013 +0100 +Date: Sun Mar 17 21:33:17 2013 +0100 Bug 593167 - Support Windows in gimp_get_default_unit() @@ -11623,7 +12708,7 @@ commit 234e269bc7cd7882ceddfa66b6caa05aac0d9c4a Author: Michael Natterer -Date: Wed Mar 27 22:56:01 2013 +0100 +Date: Wed Mar 27 22:56:01 2013 +0100 tools: increase buffer size in gimptool from 1000 to 4096 (cherry picked from commit fd34fee7f5e0a1b0c56d70fd049707fe67ed65f9) @@ -11633,7 +12718,7 @@ commit e3a524e435ba36693042e4054a03e8267b943025 Author: Michael Natterer -Date: Wed Mar 27 22:28:29 2013 +0100 +Date: Wed Mar 27 22:28:29 2013 +0100 Bug 622054 - Levels Tool gray point picker causes lockup @@ -11642,12 +12727,12 @@ (cherry picked from commit c865d8f1416a6917f120f7aaaa99b9aed7b0f280) app/gegl/gimplevelsconfig.c | 23 +++++++++++++++++------ - app/tests/test-core.c | 36 ++++++++++++++++++++++++++++++++++++ + app/tests/test-core.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 6 deletions(-) commit 333b05be02a39ca3b15ab1318c049fd29fc9d3ef Author: Téo Mazars -Date: Sun Feb 24 16:48:33 2013 +0100 +Date: Sun Feb 24 16:48:33 2013 +0100 Bug 656522 - Scaled Image Rounds Up To Nearest Pixel @@ -11663,7 +12748,7 @@ commit c1502c6ff7c250f2af589127e7dcecf8279068ef Author: Michael Natterer -Date: Tue Mar 26 23:55:40 2013 +0100 +Date: Tue Mar 26 23:55:40 2013 +0100 Bug 692668 - Browse For Patterns @@ -11671,13 +12756,13 @@ pixels. Still arbitrary but much better. (cherry picked from commit 8bc4f008e7469ba89440b663c5d2cca05a91028d) - app/core/gimpbrushclipboard.c | 4 ++-- + app/core/gimpbrushclipboard.c | 4 ++-- app/core/gimppatternclipboard.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit 9594668e86a61c116a17bfcf59dd8968df97e72d Author: Michael Natterer -Date: Tue Mar 26 23:37:16 2013 +0100 +Date: Tue Mar 26 23:37:16 2013 +0100 Bug 692939 - Zealous crop does nothing @@ -11691,7 +12776,7 @@ commit b4ab8184b9fdf41a5d6679f969325b8940216225 Author: Daniel Mustieles -Date: Mon Mar 25 12:27:51 2013 +0100 +Date: Mon Mar 25 12:27:51 2013 +0100 Updated Spanish translation @@ -11701,7 +12786,7 @@ commit 829113a34870b31a0b66c57223d37571fb497657 Author: Christian Kirbach -Date: Mon Mar 25 11:03:32 2013 +0100 +Date: Mon Mar 25 11:03:32 2013 +0100 Updated German translation @@ -11711,7 +12796,7 @@ commit fc7bdc3dfcdf99cf3c356c0d28c7e40b53367eb8 Author: Piotr Drąg -Date: Sun Mar 24 20:46:51 2013 +0100 +Date: Sun Mar 24 20:46:51 2013 +0100 Updated Polish translation @@ -11721,7 +12806,7 @@ commit 1e9ef3ac4cde826a64a9bfe084b6b709b845ec67 Author: Michael Natterer -Date: Sun Mar 24 18:41:57 2013 +0100 +Date: Sun Mar 24 18:41:57 2013 +0100 Bug 694585 - Export directly to remote ftp completes but reports failed @@ -11743,7 +12828,7 @@ commit 37feaa106ed219dc63325c856c262c36941c97fb Author: Daniel Winzen -Date: Sun Mar 24 14:27:05 2013 +0100 +Date: Sun Mar 24 14:27:05 2013 +0100 Updated German translation @@ -11753,7 +12838,7 @@ commit 68e893c099aa9d44b6afb92591c57ef628a715f4 Author: Christian Kirbach -Date: Sun Mar 24 10:30:13 2013 +0100 +Date: Sun Mar 24 10:30:13 2013 +0100 Updated German translation @@ -11763,7 +12848,7 @@ commit c9299082e704ee4815a4d88837e3e598e2d1a825 Author: Téo Mazars -Date: Sat Mar 23 12:28:25 2013 +0100 +Date: Sat Mar 23 12:28:25 2013 +0100 Bug 641951 - Weird spacing with flat brushes @@ -11776,7 +12861,7 @@ commit 2893b1199c5289a5e91439c7615c35e9a833131b Author: Michael Natterer -Date: Sat Mar 23 00:04:51 2013 +0100 +Date: Sat Mar 23 00:04:51 2013 +0100 Bug 695980 - Dereferencing type-punned pointer compile warning @@ -11787,7 +12872,7 @@ commit 061764f8b23d4bd680bf6c8f0b4fe93ee723843c Author: Nils Philippsen -Date: Fri Mar 22 14:06:44 2013 +0100 +Date: Fri Mar 22 14:06:44 2013 +0100 pagecurl: clean up generated header file again (cherry picked from commit 82c3ef5f418a6f7537cdfa2f34d6fab5948fb875) @@ -11797,7 +12882,7 @@ commit 1b53d7cc6188cdbc4660341fdba4976da524ac8c Author: Nils Philippsen -Date: Fri Mar 22 11:36:01 2013 +0100 +Date: Fri Mar 22 11:36:01 2013 +0100 pagecurl: fix build order for generated headers @@ -11809,91 +12894,91 @@ commit 6dc727767b71a54cf92bc2f96dcc046df3a093a5 Author: Michael Natterer -Date: Fri Mar 22 00:05:11 2013 +0100 +Date: Fri Mar 22 00:05:11 2013 +0100 po: some perl magic to fix the license string in all translations - po/am.po | 2 +- - po/ar.po | 2 +- - po/ast.po | 2 +- - po/az.po | 2 +- - po/be.po | 4 ++-- - po/bg.po | 2 +- - po/br.po | 2 +- - po/ca.po | 2 +- + po/am.po | 2 +- + po/ar.po | 2 +- + po/ast.po | 2 +- + po/az.po | 2 +- + po/be.po | 4 ++-- + po/bg.po | 2 +- + po/br.po | 2 +- + po/ca.po | 2 +- po/ca@valencia.po | 2 +- - po/cs.po | 4 ++-- - po/csb.po | 2 +- - po/da.po | 2 +- - po/de.po | 4 ++-- - po/dz.po | 2 +- - po/el.po | 4 ++-- - po/en_CA.po | 2 +- - po/en_GB.po | 4 ++-- - po/eo.po | 4 ++-- - po/es.po | 2 +- - po/et.po | 4 ++-- - po/eu.po | 4 ++-- - po/fa.po | 2 +- - po/fi.po | 4 ++-- - po/fr.po | 4 ++-- - po/ga.po | 2 +- - po/gl.po | 2 +- - po/gu.po | 2 +- - po/he.po | 4 ++-- - po/hi.po | 2 +- - po/hr.po | 2 +- - po/hu.po | 4 ++-- - po/id.po | 2 +- - po/is.po | 2 +- - po/it.po | 4 ++-- - po/ja.po | 4 ++-- - po/ka.po | 2 +- - po/km.po | 2 +- - po/kn.po | 2 +- - po/ko.po | 4 ++-- - po/lt.po | 4 ++-- - po/lv.po | 4 ++-- - po/mk.po | 2 +- - po/ml.po | 4 ++-- - po/ms.po | 2 +- - po/my.po | 2 +- - po/nb.po | 4 ++-- - po/nds.po | 2 +- - po/ne.po | 2 +- - po/nl.po | 4 ++-- - po/nn.po | 4 ++-- - po/oc.po | 2 +- - po/pa.po | 4 ++-- - po/pl.po | 4 ++-- - po/pt.po | 2 +- - po/pt_BR.po | 4 ++-- - po/ro.po | 4 ++-- - po/ru.po | 2 +- - po/rw.po | 2 +- - po/si.po | 2 +- - po/sk.po | 4 ++-- - po/sl.po | 4 ++-- - po/sr.po | 4 ++-- + po/cs.po | 4 ++-- + po/csb.po | 2 +- + po/da.po | 2 +- + po/de.po | 4 ++-- + po/dz.po | 2 +- + po/el.po | 4 ++-- + po/en_CA.po | 2 +- + po/en_GB.po | 4 ++-- + po/eo.po | 4 ++-- + po/es.po | 2 +- + po/et.po | 4 ++-- + po/eu.po | 4 ++-- + po/fa.po | 2 +- + po/fi.po | 4 ++-- + po/fr.po | 4 ++-- + po/ga.po | 2 +- + po/gl.po | 2 +- + po/gu.po | 2 +- + po/he.po | 4 ++-- + po/hi.po | 2 +- + po/hr.po | 2 +- + po/hu.po | 4 ++-- + po/id.po | 2 +- + po/is.po | 2 +- + po/it.po | 4 ++-- + po/ja.po | 4 ++-- + po/ka.po | 2 +- + po/km.po | 2 +- + po/kn.po | 2 +- + po/ko.po | 4 ++-- + po/lt.po | 4 ++-- + po/lv.po | 4 ++-- + po/mk.po | 2 +- + po/ml.po | 4 ++-- + po/ms.po | 2 +- + po/my.po | 2 +- + po/nb.po | 4 ++-- + po/nds.po | 2 +- + po/ne.po | 2 +- + po/nl.po | 4 ++-- + po/nn.po | 4 ++-- + po/oc.po | 2 +- + po/pa.po | 4 ++-- + po/pl.po | 4 ++-- + po/pt.po | 2 +- + po/pt_BR.po | 4 ++-- + po/ro.po | 4 ++-- + po/ru.po | 2 +- + po/rw.po | 2 +- + po/si.po | 2 +- + po/sk.po | 4 ++-- + po/sl.po | 4 ++-- + po/sr.po | 4 ++-- po/sr@latin.po | 4 ++-- - po/sv.po | 4 ++-- - po/ta.po | 2 +- - po/te.po | 4 ++-- - po/th.po | 4 ++-- - po/tr.po | 4 ++-- - po/tt.po | 2 +- - po/uk.po | 4 ++-- - po/vi.po | 4 ++-- - po/xh.po | 2 +- - po/yi.po | 2 +- - po/zh_CN.po | 2 +- - po/zh_HK.po | 4 ++-- - po/zh_TW.po | 4 ++-- + po/sv.po | 4 ++-- + po/ta.po | 2 +- + po/te.po | 4 ++-- + po/th.po | 4 ++-- + po/tr.po | 4 ++-- + po/tt.po | 2 +- + po/uk.po | 4 ++-- + po/vi.po | 4 ++-- + po/xh.po | 2 +- + po/yi.po | 2 +- + po/zh_CN.po | 2 +- + po/zh_HK.po | 4 ++-- + po/zh_TW.po | 4 ++-- 76 files changed, 113 insertions(+), 113 deletions(-) commit 19176e016670999b9ff3cf1d3a1a737b94425630 Author: Michael Natterer -Date: Thu Mar 21 23:59:49 2013 +0100 +Date: Thu Mar 21 23:59:49 2013 +0100 app: remove <> around the gnu.org URL in GIMP_LICENSE @@ -11905,7 +12990,7 @@ commit 8e9c103f8ad9591fe6ca59c55659807ee35a8f9a Author: Daniel Sabo -Date: Thu Mar 21 03:40:01 2013 -0700 +Date: Thu Mar 21 03:40:01 2013 -0700 Set PYTHONHOME in the OSX launcher script @@ -11915,7 +13000,7 @@ commit 15c5a9db32d49b22260ffde0202f39284b99d936 Author: Michael Natterer -Date: Thu Mar 21 01:50:32 2013 +0100 +Date: Thu Mar 21 01:50:32 2013 +0100 Bug 696240 - Changing Gradient From Script-Fu Drop Down Causes GIMP to Crash @@ -11929,7 +13014,7 @@ commit de56ec5e6e578285c7d5729e5b37d62c12ceb66a Author: Javier Silva Ortiz -Date: Tue Mar 19 17:00:12 2013 +0100 +Date: Tue Mar 19 17:00:12 2013 +0100 Updated Spanish translation @@ -11939,7 +13024,7 @@ commit f3f2fd0b185a751d91d5ffc84ea14a6719a29ac1 Author: Dimitris Spingos -Date: Tue Mar 19 12:06:15 2013 +0200 +Date: Tue Mar 19 12:06:15 2013 +0200 Updated Greek translation @@ -11949,7 +13034,7 @@ commit 0c7f5a1ebb6989b9259f38a6164a0adfae4dec4d Author: Piotr Drąg -Date: Mon Mar 18 23:14:46 2013 +0100 +Date: Mon Mar 18 23:14:46 2013 +0100 Updated Polish translation @@ -11959,7 +13044,7 @@ commit 2c14dea9a9af7882a90c1ff5906a97ab284ce0b1 Author: Martin Srebotnjak -Date: Mon Mar 18 17:31:43 2013 +0100 +Date: Mon Mar 18 17:31:43 2013 +0100 Updated Slovenian translation @@ -11969,7 +13054,7 @@ commit 15b88af4f11e556a1c30cd5bc447bb0c7c24d3c6 Author: Nils Philippsen -Date: Mon Mar 18 13:37:17 2013 +0100 +Date: Mon Mar 18 13:37:17 2013 +0100 app: set error in case of error in ICC profile plug-in @@ -11982,14 +13067,14 @@ (cherry picked from commit 096c636b67abd7967da645699948c2bd3f8273fb) Conflicts: - app/plug-in/plug-in-icc-profile.c + app/plug-in/plug-in-icc-profile.c app/plug-in/plug-in-icc-profile.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit ab600d56920975ff2bcfbfe52508cf25af14103a Author: Aurimas Černius -Date: Sun Mar 17 20:10:16 2013 +0200 +Date: Sun Mar 17 20:10:16 2013 +0200 Updated Lithuanian translation @@ -11999,7 +13084,7 @@ commit 4ac92f61da3bc20eaadc0707fe6b4b97f228e2c6 Author: Aurimas Černius -Date: Sun Mar 17 19:32:35 2013 +0200 +Date: Sun Mar 17 19:32:35 2013 +0200 Updated Lithuanian python translation @@ -12009,7 +13094,7 @@ commit 9c4d86b7abb0f234dd2895b38a13babc139bcb69 Author: Aurimas Černius -Date: Sun Mar 17 19:31:37 2013 +0200 +Date: Sun Mar 17 19:31:37 2013 +0200 Updated Lithuanian UI translation @@ -12019,7 +13104,7 @@ commit 75304dcc22e5851c72503b235c81086717cb8cda Author: Balázs Úr -Date: Sat Mar 16 23:01:33 2013 +0100 +Date: Sat Mar 16 23:01:33 2013 +0100 Updated Hungarian translation @@ -12029,7 +13114,7 @@ commit 1bc8d4eb9d0ec9712f983652b17e036a4789b48f Author: Michael Natterer -Date: Thu Mar 14 22:52:34 2013 +0100 +Date: Thu Mar 14 22:52:34 2013 +0100 app: GimpBrushEditor: fix display of spacing for normal brushes @@ -12041,7 +13126,7 @@ commit 32e80d326360adefc90866d3391e642e18e05bf3 Author: Michael Natterer -Date: Wed Mar 13 22:06:42 2013 +0100 +Date: Wed Mar 13 22:06:42 2013 +0100 app: fixed paned packing in GimpDeviceEditor @@ -12053,7 +13138,7 @@ commit de8830ed4bd5bbf10eba981dc390079c0c68aa86 Author: Michael Natterer -Date: Wed Mar 13 10:37:25 2013 +0100 +Date: Wed Mar 13 10:37:25 2013 +0100 Bug 397359 - Can't access color management parameters @@ -12065,14 +13150,14 @@ (cherry picked from commit bc190a6baba1f1205a78c4bd76cdf5eebd7c8bcf) app/display/gimpdisplayshell-filter-dialog.c | 11 ++++++++-- - app/widgets/gimpcolordisplayeditor.c | 30 + app/widgets/gimpcolordisplayeditor.c | 30 +++++++++++++++++++++++++--- - app/widgets/gimpcolordisplayeditor.h | 6 +++++- + app/widgets/gimpcolordisplayeditor.h | 6 +++++- 3 files changed, 41 insertions(+), 6 deletions(-) commit af88c4a6c943eb5db04fa3eea00befb7442a1e58 Author: Mukund Sivaraman -Date: Tue Mar 12 13:08:14 2013 +0530 +Date: Tue Mar 12 13:08:14 2013 +0530 file-gif-load: Fix incorrect out-of-input-bits condition (#695513) @@ -12092,7 +13177,7 @@ commit 2508fa6e82714e72da648cc376d605df6b9a832f Author: Dimitris Spingos -Date: Mon Mar 11 23:47:23 2013 +0200 +Date: Mon Mar 11 23:47:23 2013 +0200 Updated Greek translation @@ -12102,7 +13187,7 @@ commit 3058788666384c4692f1c3e748c75a93182fa502 Author: Gabor Kelemen -Date: Mon Mar 11 16:44:49 2013 +0100 +Date: Mon Mar 11 16:44:49 2013 +0100 Use Hungarian Windows installer translation @@ -12111,7 +13196,7 @@ commit 386a91041b74a392590135f8d7325455800603f8 Author: Gabor Kelemen -Date: Mon Mar 11 16:44:21 2013 +0100 +Date: Mon Mar 11 16:44:21 2013 +0100 Add Hungarian Windows installer translation @@ -12121,7 +13206,7 @@ commit ae5f847a11abcb1ab91babf29f206ad1e559db57 Author: Michael Natterer -Date: Fri Mar 8 23:40:18 2013 +0100 +Date: Fri Mar 8 23:40:18 2013 +0100 Bug 695416 - undefined reference when building devel-docs/tools/widgets.c @@ -12135,7 +13220,7 @@ commit 0ed3b482a422ff684c8921b7de9f44ea7b20345c Author: Kevin Cozens -Date: Sun Dec 30 10:43:50 2012 -0500 +Date: Sun Dec 30 10:43:50 2012 -0500 Fixed MIME_TYPES. Postscript and PDF are compiled conditionally. Fixes #690882. @@ -12146,7 +13231,7 @@ commit bc610c8fbd61e9574a2c378829b6ab91047d61b7 Author: Nils Philippsen -Date: Wed Mar 6 12:16:43 2013 +0100 +Date: Wed Mar 6 12:16:43 2013 +0100 fix bogus overflow warning @@ -12160,7 +13245,7 @@ commit 4e45dd3c4e5fa30bf0acaacd0029fd0949dc80f1 Author: Michael Natterer -Date: Thu Feb 28 01:29:53 2013 +0100 +Date: Thu Feb 28 01:29:53 2013 +0100 app: fix expected single-window sessionrc so tests pass again (cherry picked from commit e6d123445649265570cf1a68a54ee705017a9469) @@ -12170,7 +13255,7 @@ commit 26d40c10c62722f5d1ccbc68c00757cbefd45847 Author: Michael Natterer -Date: Wed Feb 27 23:46:00 2013 +0100 +Date: Wed Feb 27 23:46:00 2013 +0100 Bug 694665 - SWM should distribute remaining space to main frame @@ -12185,7 +13270,7 @@ commit 0d47f71d13525014ca8750fe790668508f071587 Author: Michael Natterer -Date: Wed Feb 27 23:26:49 2013 +0100 +Date: Wed Feb 27 23:26:49 2013 +0100 Bug 686544 - Opening new image window doesn't restore docks @@ -12199,7 +13284,7 @@ commit 62515d555deece44c5f5278715caca420e19e530 Author: Michael Natterer -Date: Sat Feb 23 16:10:19 2013 +0100 +Date: Sat Feb 23 16:10:19 2013 +0100 libgimp: make GIMP_PLUGIN_DEBUG messages always visible again @@ -12212,7 +13297,7 @@ commit cad5827b372525aaa4b590178833f7854c892690 Author: Michael Natterer -Date: Fri Feb 22 21:19:59 2013 +0100 +Date: Fri Feb 22 21:19:59 2013 +0100 Bug 694477 - GimpSizeEntry input validation doesn't snap to min/max values @@ -12228,7 +13313,7 @@ commit e48f61cf01cd3e729fcb72a56110c17b29e57e79 Author: Mikael Magnusson -Date: Fri Feb 22 12:45:50 2013 +0100 +Date: Fri Feb 22 12:45:50 2013 +0100 Makefile.am: Move tools down in SUBDIRS since it now depends on libgimpbase @@ -12238,7 +13323,7 @@ commit 2b56b8937629965a6cb7be645ae0be7576f3aaee Author: Jehan -Date: Wed Feb 20 03:34:01 2013 +0900 +Date: Wed Feb 20 03:34:01 2013 +0900 Bug 694201 - gimptool: update to follow new user directory scheme. @@ -12248,14 +13333,14 @@ commit 55e4f529f9eaedee4c20bc0fdc060d20f980692d Author: Michael Natterer -Date: Mon Feb 18 01:31:07 2013 +0100 +Date: Mon Feb 18 01:31:07 2013 +0100 tests: update expected sessionrc files for the show-button-bar change (cherry picked from commit 8e19da16abbc23e0fac2a1872666fb62d83f1644) - app/tests/gimpdir/sessionrc | 29 + app/tests/gimpdir/sessionrc | 29 ++++++++++++++++------ - app/tests/gimpdir/sessionrc-expected-2-6 | 25 + app/tests/gimpdir/sessionrc-expected-2-6 | 25 ++++++++++++++----- app/tests/gimpdir/sessionrc-expected-multi-window | 29 ++++++++++++++++------ @@ -12264,7 +13349,7 @@ commit 872c9c1680b17f34cfc917ad39dedd118c6180e2 Author: Michael Natterer -Date: Sun Feb 17 16:46:40 2013 +0100 +Date: Sun Feb 17 16:46:40 2013 +0100 Bug 694026 - "Button Bar" state not retained on brushes and dynamics editor @@ -12280,7 +13365,7 @@ commit 76452a01aae5f8c0639f3a758002d72abb320845 Author: Michael Natterer -Date: Sun Feb 17 01:45:20 2013 +0100 +Date: Sun Feb 17 01:45:20 2013 +0100 Bug 693797 - Sample colorize fails when you choose current gradient as target @@ -12295,7 +13380,7 @@ commit d53d7291340d0fca7c7dcc483cc07a914501f28a Author: Téo Mazars -Date: Sat Feb 16 14:09:48 2013 +0100 +Date: Sat Feb 16 14:09:48 2013 +0100 Bug 683153 - Lighting effects - bump mapping: top two rows of pixels are... @@ -12303,15 +13388,15 @@ Init and interpolate the topmost row to avoid the use of a zero array. (cherry picked from commit b4b85cf8535bf9f7e8f4b0123f33741c2efdd7d5) - plug-ins/lighting/lighting-apply.c | 5 +- + plug-ins/lighting/lighting-apply.c | 5 +- plug-ins/lighting/lighting-shade.c | 105 +++++++++++++++++++++++++++++++++++++ - plug-ins/lighting/lighting-shade.h | 3 ++ + plug-ins/lighting/lighting-shade.h | 3 ++ 3 files changed, 111 insertions(+), 2 deletions(-) commit c110220793c76bdb56d5827421d1211b285432c0 Author: Michael Natterer -Date: Sat Feb 16 20:38:15 2013 +0100 +Date: Sat Feb 16 20:38:15 2013 +0100 Bug 693978 - GIMP crashes after changing text preset @@ -12328,7 +13413,7 @@ commit 36cf018f8bc302b9f661c50b90b4b1ee19c7e09d Author: Michael Natterer -Date: Fri Feb 15 18:52:02 2013 +0100 +Date: Fri Feb 15 18:52:02 2013 +0100 Bug 693797 - Sample colorize fails when you choose current gradient as target @@ -12342,7 +13427,7 @@ commit 1de589a791dd031332d3067b117056d9d1ae6610 Author: Michael Natterer -Date: Fri Feb 15 01:00:13 2013 +0100 +Date: Fri Feb 15 01:00:13 2013 +0100 Bug 676927 - Shortcuts with backspace not working if image is focused @@ -12355,7 +13440,7 @@ commit 517dd7d1429d8d9e271169bdd6c375d740534d9b Author: Michael Natterer -Date: Fri Feb 15 00:01:27 2013 +0100 +Date: Fri Feb 15 00:01:27 2013 +0100 Make it harder to "save" to foo.png.gz or "export" to foo.xcf.gz @@ -12366,13 +13451,13 @@ harder now. (cherry picked from commit 086793d040deed9fba3bee0463c078f061968137) - app/file/file-procedure.c | 12 ++++++------ + app/file/file-procedure.c | 12 ++++++------ plug-ins/file-compressor/file-compressor.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) commit 835933efd7af212fe22d52dce502ef1f2167cbd8 Author: Michael Natterer -Date: Wed Feb 13 23:44:36 2013 +0100 +Date: Wed Feb 13 23:44:36 2013 +0100 Bug 680132 - Unable to 'Save As' over smb share @@ -12387,13 +13472,13 @@ I hope... (cherry picked from commit 1ba0cfbf384d5f5785b586ff4f310ff226792690) - app/file/file-procedure.c | 3 ++- + app/file/file-procedure.c | 3 ++- app/plug-in/gimppluginmanager-file.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) commit 1ecf12950b98de7cb9c05528ef1ce400b0509e31 Author: Téo Mazars -Date: Wed Feb 13 10:25:08 2013 +0100 +Date: Wed Feb 13 10:25:08 2013 +0100 Bug 674622 - Misalignment in scaling layers of different sizes @@ -12405,7 +13490,7 @@ commit de883b25a62ae4e9d19852fa69af4a02623a8f14 Author: Téo Mazars -Date: Mon Feb 11 12:47:55 2013 +0100 +Date: Mon Feb 11 12:47:55 2013 +0100 Bug 688068 - Rect selection: "Fixed: Aspect Ratio" doesn't work when... @@ -12418,7 +13503,7 @@ commit 606532f5a8dde1421a0bd948e107004cb839dc07 Author: Téo Mazars -Date: Tue Feb 12 18:36:15 2013 +0100 +Date: Tue Feb 12 18:36:15 2013 +0100 Bug 684330 - Rectangle tool's "fixed size" option is off-by-one @@ -12435,7 +13520,7 @@ commit 6f1b26ddf7fcc69cdbe8af65dbe02c3185cd7c07 Author: Michael Natterer -Date: Wed Feb 6 23:27:37 2013 +0100 +Date: Wed Feb 6 23:27:37 2013 +0100 Bug 692900 - Dragging left canvas border doesn't respect dock borders @@ -12448,7 +13533,7 @@ commit 258a61d70ac19295358291db8aea99e97643295c Author: Michael Natterer -Date: Wed Feb 6 23:23:14 2013 +0100 +Date: Wed Feb 6 23:23:14 2013 +0100 libgimpwidgets: set a min size of 8 chars on GimpColorHexEntry @@ -12461,7 +13546,7 @@ commit 1e53ac0ef264580e16fac262e6fd1d11a0524965 Author: Michael Natterer -Date: Tue Feb 5 21:50:45 2013 +0100 +Date: Tue Feb 5 21:50:45 2013 +0100 Post-release version bump to 2.8.5 @@ -12470,17 +13555,17 @@ commit 88ecd59c3436d302b644a5d25c1938c0e7b60ae0 Author: Michael Natterer -Date: Tue Feb 5 20:43:53 2013 +0100 +Date: Tue Feb 5 20:43:53 2013 +0100 Commit files regenerated by distcheck docs/gimprc.5.in | 2 +- - etc/gimprc | 2 +- + etc/gimprc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 8a9af4cdd75fef5814ee49929369ff08b41c26e6 Author: Michael Natterer -Date: Tue Feb 5 20:05:46 2013 +0100 +Date: Tue Feb 5 20:05:46 2013 +0100 configure: bump version to 2.8.4 @@ -12489,7 +13574,7 @@ commit bd6c3468aa95e871e66384b217e546316d5c89e2 Author: Nils Philippsen -Date: Tue Feb 5 13:54:36 2013 +0100 +Date: Tue Feb 5 13:54:36 2013 +0100 app: fix re-initializing fontconfig in gimp_fonts_reset() @@ -12505,7 +13590,7 @@ commit 6852d01288d6757058d3db3b54b5514713b67a01 Author: Timo Jyrinki -Date: Tue Jan 29 10:35:21 2013 +0200 +Date: Tue Jan 29 10:35:21 2013 +0200 Bug 692646 - Finnish spelling fixes (by Ville Skyttä) @@ -12514,13 +13599,13 @@ +++++++++++++++++++++++++++--------------------------- po-python/fi.po | 12 +++++------ po-script-fu/fi.po | 22 +++++++++++--------- - po-tips/fi.po | 7 ++++--- - po/fi.po | 23 ++++++++++---------- + po-tips/fi.po | 7 ++++--- + po/fi.po | 23 ++++++++++---------- 6 files changed, 78 insertions(+), 72 deletions(-) commit 60c382ff707de7b0caf5193e978632e36e6629f0 Author: Alexandre Prokoudine -Date: Mon Jan 28 09:47:53 2013 +0400 +Date: Mon Jan 28 09:47:53 2013 +0400 Updated Russian translations @@ -12529,26 +13614,26 @@ ++++++++++++++++++++++++++----------------------- po-python/ru.po | 109 +-- po-script-fu/ru.po | 237 ++--- - po-tips/ru.po | 314 +++++-- - po/ru.po | 2445 + po-tips/ru.po | 314 +++++-- + po/ru.po | 2445 ++++++++++++++++++++++++---------------------------- 6 files changed, 2872 insertions(+), 2803 deletions(-) commit de5267f18577e0f7c950bbdb65d02c97f4fc26c4 Author: Massimo Valentini -Date: Sun Jan 27 17:04:02 2013 +0100 +Date: Sun Jan 27 17:04:02 2013 +0100 Bug 639920: Gaussian blur can't work on specified selection In presence of a selection extend the area processed plug-ins/common/blur-gauss-selective.c | 10 +++++++++- - plug-ins/common/blur-gauss.c | 16 ++++++++++++++-- + plug-ins/common/blur-gauss.c | 16 ++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) commit 549b3284d8ac6c30d74febe3b918f82b5f7aa235 Author: Ville Skyttä -Date: Sun Jan 27 12:08:44 2013 +0200 +Date: Sun Jan 27 12:08:44 2013 +0200 Bug 692625 - Use image/x-pcx for PCX in desktop entry @@ -12561,11 +13646,11 @@ commit d2d8563e5e6502c63e121b62a2286e6c8fafe8f0 Author: Clayton Walker -Date: Fri Jan 25 22:24:11 2013 -0700 +Date: Fri Jan 25 22:24:11 2013 -0700 build: Update osx build files and README. - build/osx/README | 39 ++- + build/osx/README | 39 ++- build/osx/gimp.modules | 610 +++++++++++++++++++++++++++++++++-------------- build/osx/jhbuildrc-gimp | 2 +- @@ -12573,7 +13658,7 @@ commit 60f0feb65c107921a1434d197ef85101e9c73bd0 Author: Sven Claussner -Date: Fri Jan 25 22:47:09 2013 +0100 +Date: Fri Jan 25 22:47:09 2013 +0100 Amend NEWS file @@ -12585,7 +13670,7 @@ commit d99881ab41e9d9c78a5a36e0dc959b02d51002dc Author: Michael Natterer -Date: Fri Jan 25 21:16:20 2013 +0100 +Date: Fri Jan 25 21:16:20 2013 +0100 NEWS: updates for 2.8.4 @@ -12594,27 +13679,22 @@ commit d824943b589e6dd89c4a55a588ef3595d105efde Author: Clayton Walker -Date: Thu Jan 24 14:06:41 2013 -0700 +Date: Thu Jan 24 14:06:41 2013 -0700 build: update OSX build files - build/osx/Info.plist | 1088 - ----------------------------------------- - build/osx/gimp-2.8.bundle | 187 ++++++++ - build/osx/gimp-python.bundle | 182 ------- - build/osx/gimp.bundle | 127 ----- - build/osx/info-2.8.3.plist | 1093 - ++++++++++++++++++++++++++++++++++++++++++ - build/osx/info-2.8.4.plist | 1093 - ++++++++++++++++++++++++++++++++++++++++++ - build/osx/launcher-2.8.sh | 84 ++++ - build/osx/launcher-python.sh | 84 ---- - build/osx/launcher.sh | 63 --- - 9 files changed, 2457 insertions(+), 1544 deletions(-) + build/osx/{gimp-python.bundle => gimp-2.8.bundle} | 29 +- + build/osx/gimp.bundle | 127 --- + build/osx/{Info.plist => info-2.8.3.plist} | 11 +- + build/osx/info-2.8.4.plist | 1093 + +++++++++++++++++++++ + build/osx/{launcher-python.sh => launcher-2.8.sh} | 2 +- + build/osx/launcher.sh | 63 -- + 6 files changed, 1119 insertions(+), 206 deletions(-) commit 4b9af783360cc0bcc4141e6a46d3c188dc4b8d73 Author: Jernej Simončič -Date: Mon Jan 21 21:17:45 2013 +0100 +Date: Mon Jan 21 21:17:45 2013 +0100 Windows: #588015 - Make sure that GIMP is Terminal-Server-aware @@ -12623,7 +13703,7 @@ commit 6ee8d39b8c1bffc15a3ff9013cf03520f3b32d91 Author: Jehan -Date: Wed Dec 26 17:41:20 2012 +0900 +Date: Wed Dec 26 17:41:20 2012 +0900 Bug 690728: file-gif-save plug-in crops the actual image the user is working on. @@ -12637,7 +13717,7 @@ commit 1122488403be2c8a1ccaa5cd2aeaab29b9e6138c Author: Martin Srebotnjak -Date: Sat Jan 19 21:45:38 2013 +0100 +Date: Sat Jan 19 21:45:38 2013 +0100 Updated Slovenian translation @@ -12647,7 +13727,7 @@ commit f8c86702e9363370329528f44491012390f988df Author: Massimo Valentini -Date: Sat Feb 18 19:15:33 2012 +0100 +Date: Sat Feb 18 19:15:33 2012 +0100 Bug 670226 - pbm image non-interactive different from interactive @@ -12661,7 +13741,7 @@ commit b31fcbc0f16bd55773e4dae37b5be386b607c4bb Author: Ludovic Rousseau -Date: Sat Jan 19 18:39:15 2013 +0100 +Date: Sat Jan 19 18:39:15 2013 +0100 Bug 675510 - tw_func.h contains windows-specific types @@ -12673,7 +13753,7 @@ commit 6a39d214947da4aba7354d25655065f9d42456c2 Author: Michael Natterer -Date: Fri Jan 18 01:02:31 2013 +0100 +Date: Fri Jan 18 01:02:31 2013 +0100 Bug 689523 - GIMP crashes (segfault) when loading a context with a font... @@ -12688,7 +13768,7 @@ commit 6dcd7c425e3283f6c4d0549981c6f11126198b84 Author: Michael Natterer -Date: Thu Jan 17 19:37:03 2013 +0100 +Date: Thu Jan 17 19:37:03 2013 +0100 Bug 686929 - Newly created toolbox is too tall and too narrow @@ -12703,7 +13783,7 @@ commit c87b59b95f3518d6c0e77b2695ee412ed65fc555 Author: Mukund Sivaraman -Date: Wed Jan 16 17:23:52 2013 +0530 +Date: Wed Jan 16 17:23:52 2013 +0530 imagemap: Don't use fixed size buffer to print statusbar messages (#691386) @@ -12713,7 +13793,7 @@ commit adc8b21b0f7610678add53c7395d72c3be63aecd Author: Michael Henning -Date: Fri Jan 11 20:59:35 2013 -0500 +Date: Fri Jan 11 20:59:35 2013 -0500 plug-ins: fix memory leak in edge-neon @@ -12725,7 +13805,7 @@ commit 5bd861330f6e5d8d09a3b95cb4af8e45cfcca433 Author: Michael Henning -Date: Thu Jan 10 17:02:02 2013 -0500 +Date: Thu Jan 10 17:02:02 2013 -0500 app: fix memory leak in widgets/gimpgradientselect.c @@ -12737,7 +13817,7 @@ commit db4c8239f392c5bef057e9512af16cd658a115a8 Author: Michael Henning -Date: Wed Jan 9 16:59:23 2013 -0500 +Date: Wed Jan 9 16:59:23 2013 -0500 plug-ins: don't free a pointer allocated with g_newa in file-pdf-save @@ -12749,7 +13829,7 @@ commit 67753516b7462bfccb78d0a4bd3b01c1ed88fd57 Author: Nils Philippsen -Date: Wed Jan 9 15:37:30 2013 +0100 +Date: Wed Jan 9 15:37:30 2013 +0100 fix copy-paste error (cherry picked from commit fc625feb4083e75ebd8325d4aa62c2678aeee06c) @@ -12759,7 +13839,7 @@ commit 67cb43963e55bc56c031194209ab693045fa2741 Author: Michael Natterer -Date: Wed Jan 9 00:28:30 2013 +0100 +Date: Wed Jan 9 00:28:30 2013 +0100 Bug 689087 - Drag-and-drop foo.jpg behaves different from 'gimp foo.jpg'... @@ -12770,13 +13850,13 @@ app/display/gimpdisplayshell-dnd.c | 12 +++++----- app/widgets/gimplayertreeview.c | 4 ++-- - app/widgets/gimptoolbox-dnd.c | 48 + app/widgets/gimptoolbox-dnd.c | 48 ++++++++++++++++++-------------------- 3 files changed, 31 insertions(+), 33 deletions(-) commit 121308ee7af880be895aced431642d2bbfa2de15 Author: Michael Henning -Date: Mon Dec 31 13:21:46 2012 -0500 +Date: Mon Dec 31 13:21:46 2012 -0500 plug-ins: fix memory leak in flame/rect.c @@ -12787,7 +13867,7 @@ commit 8432800bdfa6bfc13b468623a81645849f47f323 Author: Michael Natterer -Date: Mon Jan 7 01:32:58 2013 +0100 +Date: Mon Jan 7 01:32:58 2013 +0100 app: don't map several windows language codes to one language string @@ -12802,7 +13882,7 @@ commit 6b017f97d4c06738acbbd7bd2de108e2278c9062 Author: Michael Henning -Date: Fri Jan 4 19:48:23 2013 -0500 +Date: Fri Jan 4 19:48:23 2013 -0500 autogen.sh: also look for automake 1.13 (cherry picked from commit 495b41416b381678bdc94a85e4a89b0a4c970c92) @@ -12812,7 +13892,7 @@ commit fd5676230c328cd1de3bbc3b1b1dafa78107842b Author: Daniel Mustieles -Date: Mon Dec 31 12:20:03 2012 +0100 +Date: Mon Dec 31 12:20:03 2012 +0100 Updated Spanish translation @@ -12824,7 +13904,7 @@ commit 29ca295089abc64233218de0e8127f6d6c630816 Author: Rafael Ferreira -Date: Thu Dec 27 23:14:04 2012 -0200 +Date: Thu Dec 27 23:14:04 2012 -0200 Updated Brazilian Portuguese Translation @@ -12834,7 +13914,7 @@ commit 2226e10b5e4f7b2479fa07833fe318bf51aae326 Author: Piotr Drąg -Date: Thu Dec 27 21:01:49 2012 +0100 +Date: Thu Dec 27 21:01:49 2012 +0100 Updated Polish translation @@ -12844,7 +13924,7 @@ commit acebb4ad205901a9e8029a66ed5bca62cf13bc96 Author: João S. O. Bueno -Date: Fri Dec 21 18:14:21 2012 -0200 +Date: Fri Dec 21 18:14:21 2012 -0200 Addresses bug #690535 - fix brazilian portuguese on Windows @@ -12853,7 +13933,7 @@ commit d90069f029cd93e867125ee261a2e6c639e35226 Author: Daniel Mustieles -Date: Sun Dec 16 13:10:37 2012 +0100 +Date: Sun Dec 16 13:10:37 2012 +0100 Updated Spanish translation @@ -12863,7 +13943,7 @@ commit 205c64d1b8ee9482a5c4eee9ff71c3ab53831805 Author: Michael Natterer -Date: Fri Dec 14 23:02:56 2012 +0100 +Date: Fri Dec 14 23:02:56 2012 +0100 Bug 688746 - Select tool Alt+Shift and Alt+Ctrl dragging modifies... @@ -12878,7 +13958,7 @@ commit 5818b9eac1432268ffa200113e66a3721cb1e41e Author: Michael Natterer -Date: Fri Dec 14 21:12:36 2012 +0100 +Date: Fri Dec 14 21:12:36 2012 +0100 plug-ins: fix indexed palette handling in lcms.c @@ -12891,7 +13971,7 @@ commit a2772a721fcceffdf99cc631c874ecdf2f75ee8a Author: Jehan -Date: Mon Dec 10 20:14:16 2012 +0900 +Date: Mon Dec 10 20:14:16 2012 +0900 Bug 689523: data bootstrap initial values in the text style editor at construction. @@ -12906,7 +13986,7 @@ commit 85fcef0c5ca56e5a68e0f3b8f9a3f6a67263e2af Author: Marco Ciampa -Date: Mon Dec 10 23:07:31 2012 +0100 +Date: Mon Dec 10 23:07:31 2012 +0100 Updated italian translation. @@ -12915,7 +13995,7 @@ commit 772c71721605be443e02aa7c242aa9fac0566302 Author: Marco Ciampa -Date: Mon Dec 10 22:49:44 2012 +0100 +Date: Mon Dec 10 22:49:44 2012 +0100 Updated italian translation. @@ -12924,7 +14004,7 @@ commit e5cee5c56f190f755d0c0fa18636c8abd9a0ebc8 Author: Liam Quin -Date: Thu Dec 6 00:39:10 2012 +0100 +Date: Thu Dec 6 00:39:10 2012 +0100 Bug 689712 - Change default units of rotate colors plugin (rcm) from... @@ -12934,12 +14014,12 @@ plug-ins/color-rotate/color-rotate-dialog.c | 30 +++++++++++++++-------------- - plug-ins/color-rotate/color-rotate.c | 2 +- + plug-ins/color-rotate/color-rotate.c | 2 +- 2 files changed, 17 insertions(+), 15 deletions(-) commit b717e155d90d6c19f7f3acb2186f660819adb564 Author: Mukund Sivaraman -Date: Wed Dec 5 00:45:36 2012 +0530 +Date: Wed Dec 5 00:45:36 2012 +0530 file-tga: Simplify has_alpha expression @@ -12948,7 +14028,7 @@ commit 050fcb4b37ca8b5bd6abcf7d63d74e3d907a1436 Author: Mukund Sivaraman -Date: Tue Dec 4 23:30:26 2012 +0530 +Date: Tue Dec 4 23:30:26 2012 +0530 file-tga: Handle 16-bit palettes with transparency (#687802) @@ -12964,7 +14044,7 @@ commit 0d35348718e787a21864e67719826a90587cd39a Author: Mukund Sivaraman -Date: Tue Dec 4 13:37:57 2012 +0530 +Date: Tue Dec 4 13:37:57 2012 +0530 file-tiff-load: Fix loading of TIFFs containing old-style JPEG images (#688761) @@ -12978,7 +14058,7 @@ commit c6b81f2f4e43308054c3b8b6f5ff2bc1af5bf9d9 Author: Jehan -Date: Sun Nov 25 23:13:35 2012 +0900 +Date: Sun Nov 25 23:13:35 2012 +0900 Bug 685557 - fix closing and saving a new image. @@ -12987,15 +14067,15 @@ 2/ if you switched the visible tab before saving the new image, it would save and close the visible tab, instead of the expected one. - app/actions/file-commands.c | 15 +++++++++------ + app/actions/file-commands.c | 15 +++++++++------ app/dialogs/file-save-dialog.c | 27 +++++++-------------------- - app/widgets/gimpfiledialog.c | 4 +++- - app/widgets/gimpfiledialog.h | 4 +++- + app/widgets/gimpfiledialog.c | 4 +++- + app/widgets/gimpfiledialog.h | 4 +++- 4 files changed, 22 insertions(+), 28 deletions(-) commit 95e400d597f8aac5c11fb263ce8500ae24da80c3 Author: Marek Černocký -Date: Mon Nov 26 10:59:09 2012 +0100 +Date: Mon Nov 26 10:59:09 2012 +0100 Updated Czech translation @@ -13005,7 +14085,7 @@ commit 4e428d923bbd7ef0220f5dba16ef10c76b7f22e9 Author: Marek Černocký -Date: Sun Nov 25 20:06:13 2012 +0100 +Date: Sun Nov 25 20:06:13 2012 +0100 Updated Czech translation @@ -13015,7 +14095,7 @@ commit 34f70ad1927e0a0bfa5b126da570b76286c5b3e1 Author: Michael Natterer -Date: Fri Nov 23 23:29:44 2012 +0100 +Date: Fri Nov 23 23:29:44 2012 +0100 libgimpwidgets: remove all item width logic from GimpPageSelector @@ -13030,7 +14110,7 @@ commit 67a1f9e40c6839ab5103145b8bbe18cce6d53416 Author: Michael Natterer -Date: Fri Nov 23 01:17:52 2012 +0100 +Date: Fri Nov 23 01:17:52 2012 +0100 Bug 688715 - Unconfigured eraser should be set to eraser tool @@ -13038,15 +14118,15 @@ the magic in two places, one of which I missed. (cherry picked from commit 4e340b613bb7bf0730572bb123d67e9fb6671934) - app/widgets/gimpdeviceinfo.c | 21 +++++++++++++++++++++ - app/widgets/gimpdeviceinfo.h | 2 ++ + app/widgets/gimpdeviceinfo.c | 21 +++++++++++++++++++++ + app/widgets/gimpdeviceinfo.h | 2 ++ app/widgets/gimpdevicemanager.c | 14 +------------- - app/widgets/gimpdevices.c | 2 ++ + app/widgets/gimpdevices.c | 2 ++ 4 files changed, 26 insertions(+), 13 deletions(-) commit 54ae57f2900e41fb62b09bf7bfeb7214eb6b55f9 Author: Michael Natterer -Date: Thu Nov 22 23:43:41 2012 +0100 +Date: Thu Nov 22 23:43:41 2012 +0100 Bug 688715 - Unconfigured eraser should be set to eraser tool @@ -13059,7 +14139,7 @@ commit 6d10655c946cbd6f9e8eaf3c2aafbcf8c7fe6a64 Author: Michael Natterer -Date: Mon Nov 19 23:24:40 2012 +0100 +Date: Mon Nov 19 23:24:40 2012 +0100 app: disable maximize_state_in_aux_data because it needs a WM @@ -13068,7 +14148,7 @@ commit 43a1daa5e1ed71687de013499c79bab1edee999f Author: Michael Natterer -Date: Sun Nov 18 20:02:51 2012 +0100 +Date: Sun Nov 18 20:02:51 2012 +0100 Bug 688305 - drag and drop for guides broken if 'gtk-enable-tooltips = 0' is set @@ -13082,7 +14162,7 @@ commit 9c368595116da409280a07394587e65cc8d13290 Author: Massimo Valentini -Date: Thu Nov 15 19:02:43 2012 +0100 +Date: Thu Nov 15 19:02:43 2012 +0100 Bug 688305: drag and drop for guides broken @@ -13091,7 +14171,7 @@ commit d0bb5aea253849a754abae5bfa88244b94c03626 Author: Nils Philippsen -Date: Wed Nov 14 16:43:06 2012 +0100 +Date: Wed Nov 14 16:43:06 2012 +0100 app: remove check which hides conditions that should not happen @@ -13105,7 +14185,7 @@ commit 0e7d59af50ea95650c11ae365cb229a694715f52 Author: Nils Philippsen -Date: Wed Nov 14 16:42:05 2012 +0100 +Date: Wed Nov 14 16:42:05 2012 +0100 app: fix marking file dialogs as transient if opened from context menu @@ -13118,20 +14198,20 @@ commit 7fa86da96dc16534669949bb4141bd6e55bacaa9 Author: Nils Philippsen -Date: Tue Nov 13 16:12:56 2012 +0100 +Date: Tue Nov 13 16:12:56 2012 +0100 app: limit physical memory size by GIMP_MAX_MEMSIZE as well (cherry picked from commit c4365d4c14d1a1fc35210b373119a0870458c46b) Conflicts: - app/config/gimpbaseconfig.c + app/config/gimpbaseconfig.c app/config/gimpbaseconfig.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 7bbd29b182eeda62ae72ec641d3cece26541c12a Author: Michael Natterer -Date: Sat Oct 13 22:44:15 2012 +0200 +Date: Sat Oct 13 22:44:15 2012 +0200 app: limit the pyhsical memory size by G_MAXSIZE @@ -13143,7 +14223,7 @@ commit a766aa9730c619960573d8e58f6cad4726b49494 Author: Michael Natterer -Date: Tue Nov 13 00:45:45 2012 +0100 +Date: Tue Nov 13 00:45:45 2012 +0100 Bug 677776 - filter popup windows get hidden behind main image window @@ -13151,13 +14231,13 @@ script-fu gets properly hidden after the dialog is done. (cherry picked from commit 83de53ee4de56c41694b7196345586e8f6578d23) - plug-ins/script-fu/Makefile.am | 26 ++++++++++++++++++-------- + plug-ins/script-fu/Makefile.am | 26 ++++++++++++++++++-------- plug-ins/script-fu/script-fu-interface.c | 16 ++++++++++++++++ 2 files changed, 34 insertions(+), 8 deletions(-) commit 3291348ac6e6c383112ec0183b4b3d5104d01e03 Author: Michael Natterer -Date: Mon Nov 12 23:42:15 2012 +0100 +Date: Mon Nov 12 23:42:15 2012 +0100 Bug 677776 - filter popup windows get hidden behind main image window @@ -13172,7 +14252,7 @@ commit 606dad32b1fd57a7b30390efc82bca62ecf69ee1 Author: Christian Kirbach -Date: Mon Nov 12 23:57:33 2012 +0100 +Date: Mon Nov 12 23:57:33 2012 +0100 Update German translation @@ -13182,7 +14262,7 @@ commit f63e5671ae1ae8db42f4c1341c9ef6ffb7c7f9b9 Author: Michael Natterer -Date: Mon Nov 12 01:29:22 2012 +0100 +Date: Mon Nov 12 01:29:22 2012 +0100 Bug 676940 - Group children prevent droping layer at bottom of stack @@ -13195,7 +14275,7 @@ commit 982d08492fcceb75b248da92652919fb63073ee8 Author: Michael Natterer -Date: Mon Nov 12 01:24:58 2012 +0100 +Date: Mon Nov 12 01:24:58 2012 +0100 Bug 676940 - Group children prevent droping layer at bottom of stack @@ -13208,7 +14288,7 @@ commit 5db271cc526c52db99bdac0130d4097cd2717dd4 Author: Michael Natterer -Date: Mon Nov 12 00:57:43 2012 +0100 +Date: Mon Nov 12 00:57:43 2012 +0100 Bug 680621 - View menu options are discarded after closing an image @@ -13222,7 +14302,7 @@ commit d29f273566ddc55075a259e4a95b067067d67371 Author: Michael Natterer -Date: Sun Nov 11 21:19:17 2012 +0100 +Date: Sun Nov 11 21:19:17 2012 +0100 Bug 677776 - filter popup windows get hidden behind main image window @@ -13236,7 +14316,7 @@ commit 908a71c4cf28d9d144f8853b32e0da17a6859b10 Author: Michael Natterer -Date: Sun Nov 11 21:09:46 2012 +0100 +Date: Sun Nov 11 21:09:46 2012 +0100 Bug 684003 - When using the main window in secondary monitor... @@ -13246,13 +14326,13 @@ need for OSX specific centering code in GimpDialog (bug 677776). (cherry picked from commit 9e5ed1e70acfef7a488982ae42ea08c32e18a52d) - libgimp/gimpui.c | 39 +++++++++++++++++++++++++++------------ - libgimpwidgets/gimpdialog.c | 4 ---- + libgimp/gimpui.c | 39 +++++++++++++++++++++++++++------------ + libgimpwidgets/gimpdialog.c | 4 ---- 2 files changed, 27 insertions(+), 16 deletions(-) commit 5860b2e8446c5d6ba126beb481ca613e03860c2d Author: Piotr Drąg -Date: Sat Nov 10 00:14:58 2012 +0100 +Date: Sat Nov 10 00:14:58 2012 +0100 Updated Polish translation @@ -13262,7 +14342,7 @@ commit acc610ec8ac95de754338136c70207a6dabae89f Author: Michael Natterer -Date: Sat Nov 10 00:07:23 2012 +0100 +Date: Sat Nov 10 00:07:23 2012 +0100 app: remove redundant code from the last commit (cherry picked from commit f71afd245fdb04c121e67448edb82ad5423e390e) @@ -13272,7 +14352,7 @@ commit 4bbdbb102f12c7227e80ad2af75e6b59031192e4 Author: Peter Mráz -Date: Fri Nov 9 23:39:48 2012 +0100 +Date: Fri Nov 9 23:39:48 2012 +0100 Updated slovak translation @@ -13282,7 +14362,7 @@ commit 50c1e2d872346d06c27664b8cce18457e4faf87e Author: Michael Natterer -Date: Fri Nov 9 23:05:04 2012 +0100 +Date: Fri Nov 9 23:05:04 2012 +0100 Bug 683011 - Text tool discards text attributes in the on-canvas dialog... @@ -13293,15 +14373,15 @@ the tags for font, size or color. (cherry picked from commit abd2e78bdf47f157bcab13587c040d08c89a2fc1) - app/widgets/gimptextbuffer.c | 6 +- - app/widgets/gimptextbuffer.h | 6 ++ + app/widgets/gimptextbuffer.c | 6 +- + app/widgets/gimptextbuffer.h | 6 ++ app/widgets/gimptextstyleeditor.c | 142 +++++++++++++++++++++++++++++--------- 3 files changed, 119 insertions(+), 35 deletions(-) commit 2a77d536aaa4db9f7f1ce17a3a630fb1c2dc960f Author: Michael Natterer -Date: Fri Nov 9 22:06:51 2012 +0100 +Date: Fri Nov 9 22:06:51 2012 +0100 app: make Tab, Shift+Tab and Escape move the focus back to text editing @@ -13316,7 +14396,7 @@ commit e66252cc8a894d0bd79b492f7b0ff9d5cf582933 Author: Daniel Mustieles -Date: Thu Nov 8 12:38:55 2012 +0100 +Date: Thu Nov 8 12:38:55 2012 +0100 Updated Spanish translation @@ -13326,7 +14406,7 @@ commit 2873262fccba12af144ed96ed91be144d92ff2e1 Author: Michael Natterer -Date: Thu Nov 8 00:16:31 2012 +0100 +Date: Thu Nov 8 00:16:31 2012 +0100 Bug 687392 - Memory corruption vulnerability when reading XWD files @@ -13340,7 +14420,7 @@ commit f3de4b4a24e0e50c7a31829c5ad170e3d3ee5edf Author: Michael Natterer -Date: Wed Nov 7 23:44:35 2012 +0100 +Date: Wed Nov 7 23:44:35 2012 +0100 Bug 677776 - filter popup windows get hidden behind main image window @@ -13359,15 +14439,15 @@ Inspired by patches from Simone Karin Lehmann and Daniel Sabo. (cherry picked from commit 0b56aa0d133a9743dca74701a54f21cf9c609f7d) - libgimp/Makefile.am | 14 +++++++++++--- - libgimp/gimp.c | 15 +++++++++++++-- - libgimp/gimpui.c | 8 ++++++++ - libgimpwidgets/gimpdialog.c | 4 ++++ + libgimp/Makefile.am | 14 +++++++++++--- + libgimp/gimp.c | 15 +++++++++++++-- + libgimp/gimpui.c | 8 ++++++++ + libgimpwidgets/gimpdialog.c | 4 ++++ 4 files changed, 36 insertions(+), 5 deletions(-) commit 901f396a5e84505d46de80f2ff69ad4ee42e6204 Author: Michael Natterer -Date: Wed Nov 7 23:21:13 2012 +0100 +Date: Wed Nov 7 23:21:13 2012 +0100 Bug 687851 - Gimp crashes on Colors > Desaturate @@ -13381,7 +14461,7 @@ commit 28d42d3dd7f480f9d452747576f764fcc23c9036 Author: Michael Natterer -Date: Tue Nov 6 22:46:47 2012 +0100 +Date: Tue Nov 6 22:46:47 2012 +0100 Bug 686521 - Zoom Tool Displays Wrong Cursor When Zooming In/Out @@ -13396,7 +14476,7 @@ commit cfacd4f5a6f0dcb61e826d53b970ea96f4ef4c95 Author: Michael Natterer -Date: Tue Nov 6 22:22:02 2012 +0100 +Date: Tue Nov 6 22:22:02 2012 +0100 Bug 687375 - Text tool: unnecessarily insists on having a layer before working @@ -13410,7 +14490,7 @@ commit 9d6e8e23df52be6f00dfb23aa3dab8dbb8f9b16a Author: Michael Natterer -Date: Tue Nov 6 22:10:37 2012 +0100 +Date: Tue Nov 6 22:10:37 2012 +0100 Bug 687673 - The image has been exported to '(null)' when export... @@ -13423,7 +14503,7 @@ commit 0029694f3c3d389c8562c8975c9dbc2450f559f4 Author: Marco Ciampa -Date: Tue Nov 6 10:39:11 2012 +0100 +Date: Tue Nov 6 10:39:11 2012 +0100 Small fix in italian translation. @@ -13432,7 +14512,7 @@ commit 7e06c48a94e26e05db56c54726fa9895aa4e5a0c Author: Marco Ciampa -Date: Tue Nov 6 10:28:56 2012 +0100 +Date: Tue Nov 6 10:28:56 2012 +0100 Small fix in italian translation. @@ -13441,7 +14521,7 @@ commit 9cf76553bd3e3ac9596b19581761bf40fcaf96a9 Author: Rafael Ferreira -Date: Mon Nov 5 12:09:10 2012 -0200 +Date: Mon Nov 5 12:09:10 2012 -0200 Updated Brazilian Portuguese Translation @@ -13451,7 +14531,7 @@ commit b447b8e85f4094641497a02ca3b51372d4c3a543 Author: Michael Natterer -Date: Mon Nov 5 01:44:53 2012 +0100 +Date: Mon Nov 5 01:44:53 2012 +0100 Bug 676667 - Splash image display in splash screen is delayed @@ -13466,7 +14546,7 @@ commit 4f2d0c9ed194d3a840cdcb985d6b05db9d3b2a66 Author: Michael Natterer -Date: Mon Nov 5 01:12:21 2012 +0100 +Date: Mon Nov 5 01:12:21 2012 +0100 Bug 686850 - Help system: GIMP crashes and closes without saving changes @@ -13484,7 +14564,7 @@ commit 3e72a9215e55ab6f7752259e16c6c75a63676c91 Author: Michael Natterer -Date: Sun Nov 4 15:46:51 2012 +0100 +Date: Sun Nov 4 15:46:51 2012 +0100 Bug 687561 - Edit/Modules crashes immediately @@ -13497,7 +14577,7 @@ commit 84461fd7592b79c08ac8cbeb488cdd614f5975e0 Author: Marco Ciampa -Date: Sat Nov 3 00:12:36 2012 +0100 +Date: Sat Nov 3 00:12:36 2012 +0100 Small fix in italian translation. @@ -13506,7 +14586,7 @@ commit 8c0fd99d8909e279dd1447948c6d99b5ec857477 Author: Marco Ciampa -Date: Fri Nov 2 20:30:42 2012 +0100 +Date: Fri Nov 2 20:30:42 2012 +0100 Small typo fixes in italian translation. @@ -13515,7 +14595,7 @@ commit 855246391fc817d5cac3495d79667f39b49e9e70 Author: Michael Natterer -Date: Thu Nov 1 19:23:44 2012 +0100 +Date: Thu Nov 1 19:23:44 2012 +0100 Bug 677733 - Export image: duplicate list item for TIFF export @@ -13531,7 +14611,7 @@ commit fde801cb896cb725eb8de90f59534b618d061c46 Author: Michael Natterer -Date: Thu Nov 1 19:21:24 2012 +0100 +Date: Thu Nov 1 19:21:24 2012 +0100 Bug 677733 - Export image: duplicate list item for TIFF export @@ -13545,7 +14625,7 @@ commit 551679f7c4692000716e7973511a989807204d95 Author: Michael Natterer -Date: Thu Nov 1 19:17:53 2012 +0100 +Date: Thu Nov 1 19:17:53 2012 +0100 Bug 677733 - Export image: duplicate list item for TIFF export @@ -13559,18 +14639,18 @@ commit edf5af1073dd5293c867e0b0612b0b38cc0bd310 Author: Marco Ciampa -Date: Wed Oct 31 22:38:18 2012 +0100 +Date: Wed Oct 31 22:38:18 2012 +0100 Updated italian translation. po-plug-ins/it.po | 133 ++++++++++++++++++++++++++++-------------------------- - po/it.po | 43 +++++++++--------- + po/it.po | 43 +++++++++--------- 2 files changed, 91 insertions(+), 85 deletions(-) commit 6ed49d399752d6e6e4644d038dc61aae99d429ec Author: Michael Natterer -Date: Wed Oct 31 21:14:26 2012 +0100 +Date: Wed Oct 31 21:14:26 2012 +0100 Bug 687256 - Please explain the terms wheel, curve, axis @@ -13582,7 +14662,7 @@ commit a8f96a5e3aed524e0d02a18dfaa4a8ac97dab098 Author: Michael Natterer -Date: Wed Oct 31 16:07:33 2012 +0100 +Date: Wed Oct 31 16:07:33 2012 +0100 app: add a translator comment for _("%s Message") (cherry picked from commit 9efda848181e655df3f31e33dc42e6d5727dff06) @@ -13592,7 +14672,7 @@ commit 7831da547a86fc3ecd98816032428ed0e60cbea4 Author: Massimo Valentini -Date: Tue Oct 30 18:07:06 2012 +0100 +Date: Tue Oct 30 18:07:06 2012 +0100 Bug 676413: Text to Path cuts off without covering the whole layer @@ -13604,7 +14684,7 @@ commit edb712522792d3bd81bf18d6ed25a549242b7644 Author: Marco Ciampa -Date: Mon Oct 29 22:54:37 2012 +0100 +Date: Mon Oct 29 22:54:37 2012 +0100 Updated italian translation. @@ -13614,7 +14694,7 @@ commit d9e83effd405b485085a7d9628e24d976158d4d0 Author: Marco Ciampa -Date: Mon Oct 29 01:23:10 2012 +0100 +Date: Mon Oct 29 01:23:10 2012 +0100 Update italian translation. @@ -13623,7 +14703,7 @@ commit 88a13a874a9819169606f9fecd86888212b41e4c Author: Marco Ciampa -Date: Mon Oct 29 01:05:23 2012 +0100 +Date: Mon Oct 29 01:05:23 2012 +0100 Updated italian translation. @@ -13633,7 +14713,7 @@ commit 4187c415fb5e78cc83bd82910ee8703500859b4c Author: Michael Natterer -Date: Sun Oct 28 23:33:31 2012 +0100 +Date: Sun Oct 28 23:33:31 2012 +0100 Bug 687070 - Modifier+Space doesn't work as shortcut @@ -13647,18 +14727,18 @@ commit c4656035407615a088492162530a1fff96597e27 Author: Dimitris Spingos -Date: Fri Oct 26 18:11:17 2012 +0300 +Date: Fri Oct 26 18:11:17 2012 +0300 Updated Greek translation po-plug-ins/el.po | 254 ++++++++++++++++++++++------------- - po/el.po | 386 + po/el.po | 386 ++++++++++++++++++++++++++++-------------------------- 2 files changed, 361 insertions(+), 279 deletions(-) commit 9821dea3ca7cda63acc6562671cadfd0dd8e33db Author: Marco Ciampa -Date: Thu Oct 25 11:02:08 2012 +0200 +Date: Thu Oct 25 11:02:08 2012 +0200 Small fix in italian translation. @@ -13667,7 +14747,7 @@ commit 19b9ae79dae92e459e434baaf041f3c5b0d960c0 Author: Michael Natterer -Date: Mon Oct 22 19:03:00 2012 +0200 +Date: Mon Oct 22 19:03:00 2012 +0200 Bug 685445 - color-to-alpha plugin crashes (use-after-free) @@ -13676,13 +14756,13 @@ this fixes it. The change in gimpprotocol.c is just cleanup. (cherry picked from commit 0a5059da519ce4831e485ecee37863306c445c73) - libgimp/gimptile.c | 3 +++ + libgimp/gimptile.c | 3 +++ libgimpbase/gimpprotocol.c | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) commit b1a6ac706026afe36357c1ddb450caf7a96b9571 Author: Massimo Valentini -Date: Mon Oct 22 18:16:48 2012 +0200 +Date: Mon Oct 22 18:16:48 2012 +0200 Bug 686379: In the JPEG save dialog, checking/unchecking XMP... @@ -13693,7 +14773,7 @@ commit 66b4aa2d3482f53e4e9037c4ffdc5d267e983a3f Author: Massimo Valentini -Date: Sat Oct 20 16:24:56 2012 +0200 +Date: Sat Oct 20 16:24:56 2012 +0200 Bug 684483 - Text tool: crash after double clicking text @@ -13713,7 +14793,7 @@ commit e41e5ab6437e601482697d7a2f3da514737e3e6f Author: Michael Natterer -Date: Mon Oct 22 14:59:51 2012 +0200 +Date: Mon Oct 22 14:59:51 2012 +0200 Bug 686602 - missing EXIF_CFLAGS when building plug-ins/file-psd @@ -13725,7 +14805,7 @@ commit f45349e74cd7d9f6585613f9ec1e996d342dd407 Author: Michael Henning -Date: Tue Apr 3 20:59:37 2012 -0400 +Date: Tue Apr 3 20:59:37 2012 -0400 app: Save the maximized state of the main window in the sessionrc file. @@ -13735,17 +14815,17 @@ sessionrc, but on the other hand not handling maximized state in sessionrc is worse, therefore merged to 2.8. - app/display/gimpimagewindow.c | 33 +++++++++++- - app/display/gimpimagewindow.h | 1 + - app/tests/gimpdir/sessionrc-2-8-single-window | 3 +- + app/display/gimpimagewindow.c | 33 +++++++++++- + app/display/gimpimagewindow.h | 1 + + app/tests/gimpdir/sessionrc-2-8-single-window | 3 +- app/tests/gimpdir/sessionrc-expected-single-window | 3 +- - app/tests/test-ui.c | 62 + app/tests/test-ui.c | 62 ++++++++++++++++++++++ 5 files changed, 98 insertions(+), 4 deletions(-) commit bc2b0d117dabf50124289208291f9aaceaf76949 Author: Michael Natterer -Date: Sun Oct 21 23:28:30 2012 +0200 +Date: Sun Oct 21 23:28:30 2012 +0200 Bug 686523 - Text tool: text editor not shown on empty text box @@ -13758,18 +14838,18 @@ commit 65aa8321486ca8c9a62445a1a4c796fd671c5ae6 Author: Jernej Simončič -Date: Fri Oct 19 14:17:46 2012 +0200 +Date: Fri Oct 19 14:17:46 2012 +0200 Installer: add Spanish translation - build/windows/installer/gimp3264.iss | 1 + + build/windows/installer/gimp3264.iss | 1 + build/windows/installer/lang/es.setup.isl | 113 ++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+) commit 55d4af3d6b13f3aeb28713bb8b2016b5d7fd2490 Author: Jernej Simončič -Date: Fri Oct 19 14:01:56 2012 +0200 +Date: Fri Oct 19 14:01:56 2012 +0200 Installer: fix non-ASCII characters in ReadyMemo associations text @@ -13778,7 +14858,7 @@ commit 31e2074ce39dc48ab012236d12d46c75cf6e7002 Author: Jernej Simončič -Date: Fri Oct 19 13:51:30 2012 +0200 +Date: Fri Oct 19 13:51:30 2012 +0200 Installer: add Brazillian Portuguese and Russian translations to install script @@ -13788,7 +14868,7 @@ commit f26e5cffe709b6b4cbfeba1ec3ae9dbf3146a439 Author: Jernej Simončič -Date: Fri Oct 19 13:51:06 2012 +0200 +Date: Fri Oct 19 13:51:06 2012 +0200 Installer: fix permissions @@ -13797,7 +14877,7 @@ commit bbe007c8d77f02af2bc6d4cfba343d2f6cafc467 Author: Jernej Simončič -Date: Fri Oct 19 13:50:34 2012 +0200 +Date: Fri Oct 19 13:50:34 2012 +0200 Installer: add Russian translation @@ -13807,7 +14887,7 @@ commit ee38c196e26becfc1174941189c42e440ec7c700 Author: Michael Natterer -Date: Wed Oct 17 11:53:45 2012 +0200 +Date: Wed Oct 17 11:53:45 2012 +0200 plug-ins: fix #ifdefs to fix build error and warnings in screenshot.c (cherry picked from commit bc87bf5fe9223733253253b1364efe1cb614d6d7) @@ -13817,7 +14897,7 @@ commit 8689c3108f9f5ada01edf02e9b43b6a339842d35 Author: Michael Natterer -Date: Tue Oct 16 13:27:12 2012 +0200 +Date: Tue Oct 16 13:27:12 2012 +0200 authors.xml: add Simone Karin Lehmann (cherry picked from commit 1920c2bcab382451e548ebb0132b726e023511cb) @@ -13828,7 +14908,7 @@ commit d895ee7972c9a77cc86ed2ec14d27c6de6aa683b Author: Martin Srebotnjak -Date: Tue Oct 16 08:39:57 2012 +0200 +Date: Tue Oct 16 08:39:57 2012 +0200 Updated Slovenian translation @@ -13838,7 +14918,7 @@ commit 527d24bde3bdf6f10864ede0b9ded72cb3866cc9 Author: João S. O. Bueno -Date: Mon Oct 15 10:00:10 2012 -0300 +Date: Mon Oct 15 10:00:10 2012 -0300 Adding Brazilian Portuguese translation for GIMP-Windows install @@ -13848,7 +14928,7 @@ commit 384851f5eaeb8edec636245fd5a60f25cf3671f8 Author: Michael Natterer -Date: Sun Oct 14 21:31:07 2012 +0200 +Date: Sun Oct 14 21:31:07 2012 +0200 Bug 686103 - Incorrect gimpfu documentation @@ -13861,7 +14941,7 @@ commit f3c1186e5f4849be6468b788a268098ada58f75c Author: Simone Karin Lehmann -Date: Sun Oct 14 17:03:24 2012 +0200 +Date: Sun Oct 14 17:03:24 2012 +0200 Bug 683617 - Can't take screenshots (Mac OS) @@ -13876,7 +14956,7 @@ commit 0ed086d511729c9fca529c9ad9bd76a277de0309 Author: Michael Natterer -Date: Sun Oct 14 15:29:23 2012 +0200 +Date: Sun Oct 14 15:29:23 2012 +0200 Bug 682585 - Edit/Modules: pressing any key crashes gimp @@ -13889,7 +14969,7 @@ commit f9387909f3f8e8a23462dd9cb2bb67d2c9cd459f Author: Massimo Valentini -Date: Sat Oct 13 14:56:47 2012 +0200 +Date: Sat Oct 13 14:56:47 2012 +0200 Bug 592628: Scale Image adds asymmetric artifacts to image edges @@ -13906,7 +14986,7 @@ commit e09233f08074212db8994bfffbca6ec3ecbefe32 Author: Massimo Valentini -Date: Sat Oct 13 14:56:47 2012 +0200 +Date: Sat Oct 13 14:56:47 2012 +0200 Bug 592628: Scale Image adds asymmetric artifacts to image edges @@ -13917,7 +14997,7 @@ commit 9d74224731e74175200958dbb148d079d6c4e79a Author: Massimo Valentini -Date: Sat Oct 13 14:56:46 2012 +0200 +Date: Sat Oct 13 14:56:46 2012 +0200 Bug 433436: transformation tools cause offsets @@ -13926,7 +15006,7 @@ commit e8a02362cd0e7caf3046001be0bd67e0556acd5b Author: Massimo Valentini -Date: Sat Oct 13 14:56:46 2012 +0200 +Date: Sat Oct 13 14:56:46 2012 +0200 app: correct pixel-surround when sampling outside of a drawable @@ -13937,7 +15017,7 @@ commit 7172911becb8f6ce1ded151dd113d727cad0d811 Author: Massimo Valentini -Date: Sat Oct 13 14:56:46 2012 +0200 +Date: Sat Oct 13 14:56:46 2012 +0200 app: properly sample lanczos kernel luts @@ -13946,7 +15026,7 @@ commit defef370c4da8fe299c69377bf0d9996541215dc Author: Massimo Valentini -Date: Sat Oct 13 14:56:46 2012 +0200 +Date: Sat Oct 13 14:56:46 2012 +0200 app: round to the nearest in gdouble -> guchar assignments @@ -13956,7 +15036,7 @@ commit 023850bf0d90bc1c3ce2785a40cb10ce094853a3 Author: Massimo Valentini -Date: Sat Oct 13 14:56:46 2012 +0200 +Date: Sat Oct 13 14:56:46 2012 +0200 app: remove unused code @@ -13969,7 +15049,7 @@ commit 75f470a56a9e4b7e576b51f48d02da35ff103b0d Author: Daniel Mustieles -Date: Sat Oct 13 12:30:18 2012 +0200 +Date: Sat Oct 13 12:30:18 2012 +0200 Updated Spanish translation @@ -13979,7 +15059,7 @@ commit 634ae4a2cff0e3456c54ce0deb22d9757f80f058 Author: Michael Natterer -Date: Sat Oct 13 00:22:21 2012 +0200 +Date: Sat Oct 13 00:22:21 2012 +0200 Bug 686025 - Closing a tab closes wrong tab @@ -13992,7 +15072,7 @@ commit e000f106bf9cfafc588951468fefd43fb3696615 Author: Michael Natterer -Date: Wed Oct 10 23:10:56 2012 +0200 +Date: Wed Oct 10 23:10:56 2012 +0200 Bug 685797 - all python plug-ins are broken after 3b55877a @@ -14007,7 +15087,7 @@ commit d5034258935c2e0a7ae937a456f054d8e9d3c1af Author: Piotr Drąg -Date: Tue Oct 9 15:48:51 2012 +0200 +Date: Tue Oct 9 15:48:51 2012 +0200 Updated Polish translation @@ -14017,7 +15097,7 @@ commit 2cd165a8b8a19b4b340e477b90761e211da52194 Author: Michael Natterer -Date: Tue Oct 9 01:25:42 2012 +0200 +Date: Tue Oct 9 01:25:42 2012 +0200 Bug 682742 - Module manager: turning off modules has no effect @@ -14031,7 +15111,7 @@ commit 4b46d7eb6d3a188d878a036a4e16b5177b801347 Author: Clayton Walker -Date: Mon Oct 8 16:59:43 2012 -0600 +Date: Mon Oct 8 16:59:43 2012 -0600 Bug 685560 - Add iso-codes to osx moduleset @@ -14045,7 +15125,7 @@ commit 220af9ceec58dceeaa587c3b9eb1806f572fcecf Author: Michael Natterer -Date: Mon Oct 8 23:20:54 2012 +0200 +Date: Mon Oct 8 23:20:54 2012 +0200 libgimpbase: on OSX move gimpdir to "~/Library/Application Support" @@ -14058,7 +15138,7 @@ commit 3b55877acad413e0b5893fb2dfcaea8bc55b6ed9 Author: Michael Natterer -Date: Mon Oct 8 22:01:30 2012 +0200 +Date: Mon Oct 8 22:01:30 2012 +0200 Bug 378334 - Plugins with image drop-list crash when image is closed @@ -14071,15 +15151,15 @@ common functionality. (cherry picked from commit 4aaaa1a7fa9d5f80121f07a01adb79d41ab77684) - libgimp/gimpimagecombobox.c | 62 ++++++++++-- + libgimp/gimpimagecombobox.c | 62 ++++++++++-- libgimp/gimpitemcombobox.c | 227 +++++++++++++++++++++++++------------------- - libgimp/gimpitemcombobox.h | 8 +- + libgimp/gimpitemcombobox.h | 8 +- 3 files changed, 187 insertions(+), 110 deletions(-) commit fef53f6064ebea5641337532867df81c82333a02 Author: Michael Natterer -Date: Mon Oct 8 21:32:59 2012 +0200 +Date: Mon Oct 8 21:32:59 2012 +0200 libgimpwidgets: make GimpIntStore behave a bit nicer (don't warn) @@ -14092,7 +15172,7 @@ commit 2ba0519456cb9b77f7ad781946ac68aa9fe5e517 Author: Mukund Sivaraman -Date: Mon Oct 8 09:12:17 2012 +0530 +Date: Mon Oct 8 09:12:17 2012 +0530 file-bmp: Don't use alpha channel with BI_RGB compression type @@ -14104,7 +15184,7 @@ commit 49debcafdc38e8b14e4a8ca890cfe193fdf1fa99 Author: Mukund Sivaraman -Date: Mon Oct 8 08:47:17 2012 +0530 +Date: Mon Oct 8 08:47:17 2012 +0530 file-bmp: Reject compression type BI_ALPHABITFIELDS as unsupported @@ -14119,7 +15199,7 @@ commit cb8cd73f331b4303e246b8c0e2b141ef2c55a5ce Author: Michael Natterer -Date: Sun Oct 7 19:49:33 2012 +0200 +Date: Sun Oct 7 19:49:33 2012 +0200 Bug 635303 - Can't attach a dialog at the bottom of a minimized toolbox @@ -14134,7 +15214,7 @@ commit ec9ed96fd7ed83a2fc792e5a92e913acb74a6240 Author: Michael Natterer -Date: Sun Oct 7 15:18:14 2012 +0200 +Date: Sun Oct 7 15:18:14 2012 +0200 HACKING: patches: recommend git-format-patch, not a repo to fetch from @@ -14146,7 +15226,7 @@ commit 72ae6656e7fd7df5503fbb3bbae563ddb82f7a88 Author: Michael Natterer -Date: Sat Oct 6 18:01:41 2012 +0200 +Date: Sat Oct 6 18:01:41 2012 +0200 app: use g_get_monotonic_time() also for limiting display flushing (cherry picked from commit a9353cd3a21e5224aa330dcf301cb8cebd43ff23) @@ -14156,7 +15236,7 @@ commit cd6fa1d9c90daa8297ad8dc548328bb337e9dd3c Author: Michael Natterer -Date: Sat Oct 6 16:39:14 2012 +0200 +Date: Sat Oct 6 16:39:14 2012 +0200 Bug 663582 - Brush outline is too slow @@ -14171,7 +15251,7 @@ commit 55792c2f30fac01940d0a37990483f0f2d66bce5 Author: Michael Natterer -Date: Sat Oct 6 00:27:49 2012 +0200 +Date: Sat Oct 6 00:27:49 2012 +0200 Bug 663582 - Brush outline is too slow @@ -14185,7 +15265,7 @@ commit 8d6634c8eb485764f0d88be80e164adbed473096 Author: Michael Natterer -Date: Sat Oct 6 00:03:47 2012 +0200 +Date: Sat Oct 6 00:03:47 2012 +0200 Bug 663582 - Brush outline is too slow @@ -14198,7 +15278,7 @@ commit bb1197ed634330ac1b280520e52bdac768975af5 Author: Michael Natterer -Date: Thu Oct 4 23:54:27 2012 +0200 +Date: Thu Oct 4 23:54:27 2012 +0200 Bug 684429 - Unable to edit text: error message states "problems..." @@ -14219,7 +15299,7 @@ commit d4cfda87ff31a75ff9a49dc4779cbfd61cdde2b9 Author: Michael Natterer -Date: Thu Oct 4 22:53:14 2012 +0200 +Date: Thu Oct 4 22:53:14 2012 +0200 libgimpbase: improve warning when a string can't be converted to a GimpUnit @@ -14230,7 +15310,7 @@ commit b03591e4055ccf32631069cf95067a09bf698e42 Author: Michael Natterer -Date: Thu Oct 4 20:42:13 2012 +0200 +Date: Thu Oct 4 20:42:13 2012 +0200 Bug 663582 - Brush outline is too slow @@ -14245,7 +15325,7 @@ commit 7deac97a9a81637884d96a17f8263d3c39c5a337 Author: Michael Natterer -Date: Tue Oct 2 23:07:11 2012 +0200 +Date: Tue Oct 2 23:07:11 2012 +0200 Bug 684945 - Export can incorrectly default to changing format... @@ -14264,7 +15344,7 @@ commit 5f04bf268495508b1cafa6e8b439f4f9b89189ec Author: Michael Natterer -Date: Tue Oct 2 22:11:27 2012 +0200 +Date: Tue Oct 2 22:11:27 2012 +0200 Bug 684923 - Fix script-fu build on OpenBSD/NetBSD @@ -14277,7 +15357,7 @@ commit 018a02d8dadcffbc4ebd337ee35930ebff59091b Author: Michael Natterer -Date: Tue Oct 2 22:00:16 2012 +0200 +Date: Tue Oct 2 22:00:16 2012 +0200 Bug 685086 - hangs while opening damaged XCF file @@ -14290,7 +15370,7 @@ commit f7990128b0e9a79683b71e711e3b91117bd117e7 Author: Rūdolfs Mazurs -Date: Sat Sep 29 13:52:27 2012 +0300 +Date: Sat Sep 29 13:52:27 2012 +0300 Updated Latvian translation @@ -14299,42 +15379,42 @@ commit a6c404d231123b1548027c80e378d4fbde55cca0 Author: Rūdolfs Mazurs -Date: Sat Sep 29 13:46:36 2012 +0300 +Date: Sat Sep 29 13:46:36 2012 +0300 Updated Latvian translation po-libgimp/lv.po | 79 ++-- po-plug-ins/lv.po | 877 +++++++++++++++++++-------------------- po-python/lv.po | 49 ++- - po-tags/lv.po | 14 +- - po-tips/lv.po | 366 ++++++++--------- - po/lv.po | 1187 + po-tags/lv.po | 14 +- + po-tips/lv.po | 366 ++++++++--------- + po/lv.po | 1187 ++++++++++++++++++++++++++--------------------------- 6 files changed, 1282 insertions(+), 1290 deletions(-) commit 027c744227a4b12b32a11cddc41e7bdc41641637 Author: Michael Natterer -Date: Wed Sep 26 23:29:51 2012 +0200 +Date: Wed Sep 26 23:29:51 2012 +0200 Bug 684698 - Preferences-Folders: only 15 folder items accepted Raise "max_paths" from 16 to 256 in all calls to gimp_path_parse(). (cherry picked from commit 2a30a2bb749d02cc25bc8358064f5c7bfed3f8ca) - app/core/gimpdatafactory.c | 6 +++--- - libgimpbase/gimpdatafiles.c | 2 +- - libgimpwidgets/gimppatheditor.c | 4 ++-- + app/core/gimpdatafactory.c | 6 +++--- + libgimpbase/gimpdatafiles.c | 2 +- + libgimpwidgets/gimppatheditor.c | 4 ++-- plug-ins/fractal-explorer/fractal-explorer-dialogs.c | 2 +- - plug-ins/gfig/gfig-dialog.c | 2 +- - plug-ins/gimpressionist/utils.c | 2 +- - plug-ins/gradient-flare/gradient-flare.c | 2 +- - plug-ins/lighting/lighting-ui.c | 4 ++-- - plug-ins/script-fu/scheme-wrapper.c | 2 +- + plug-ins/gfig/gfig-dialog.c | 2 +- + plug-ins/gimpressionist/utils.c | 2 +- + plug-ins/gradient-flare/gradient-flare.c | 2 +- + plug-ins/lighting/lighting-ui.c | 4 ++-- + plug-ins/script-fu/scheme-wrapper.c | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) commit 0bd7875e5b61f3904db9de576b17539141d728f5 Author: Timo Jyrinki -Date: Wed Sep 26 11:54:17 2012 +0300 +Date: Wed Sep 26 11:54:17 2012 +0300 Small Finnish translation fix @@ -14343,7 +15423,7 @@ commit 5745a4fae21d36ac13c12b80b563c5421599adda Author: Michael Natterer -Date: Tue Sep 25 22:01:31 2012 +0200 +Date: Tue Sep 25 22:01:31 2012 +0200 Bug 684785 - typo in log message @@ -14354,7 +15434,7 @@ commit 4942105604f58cdbe0e65b3b5d7497c59119c7da Author: Andika Triwidada -Date: Mon Sep 24 19:24:26 2012 +0700 +Date: Mon Sep 24 19:24:26 2012 +0700 Updated Indonesian translation @@ -14364,18 +15444,18 @@ commit 192ddf18e763adb3331e7ce9fbf1c645ae804565 Author: Piotr Drąg -Date: Sun Sep 23 17:00:01 2012 +0200 +Date: Sun Sep 23 17:00:01 2012 +0200 Added Polish translation of the installer - build/windows/installer/gimp3264.iss | 3 +- + build/windows/installer/gimp3264.iss | 3 +- build/windows/installer/lang/pl.setup.isl | 113 ++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 1 deletion(-) commit c1ed52275d53735e9bc3054edde3959312390688 Author: Ville Pätsi -Date: Fri Sep 21 20:52:07 2012 +0300 +Date: Fri Sep 21 20:52:07 2012 +0300 Support file dates set to before the start of time (cherry picked from commit 9fe4e5fad9d900e04ed28de78a694da5b92110d1) @@ -14385,7 +15465,7 @@ commit b38d44220f2eb47a2e2e7584850a99874242961b Author: Mukund Sivaraman -Date: Fri Sep 21 20:11:31 2012 +0530 +Date: Fri Sep 21 20:11:31 2012 +0530 file-bmp: Fix order of data in RGBA_8888 images @@ -14400,7 +15480,7 @@ commit 2af0e143706128842cae71850f3aa2a3cd418bf7 Author: Mukund Sivaraman -Date: Fri Sep 21 20:09:51 2012 +0530 +Date: Fri Sep 21 20:09:51 2012 +0530 file-bmp: All 16 and 32-bpp files need the masks to be written @@ -14411,7 +15491,7 @@ commit 0d879c2aae651e13e6d2dd0ea51aba172d91cbdc Author: Michael Natterer -Date: Fri Sep 21 10:34:17 2012 +0200 +Date: Fri Sep 21 10:34:17 2012 +0200 app: plug string leak in gimp_image_format_display_uri() (cherry picked from commit 7597b83bd8cb10c57986692098347dd285862c3e) @@ -14421,7 +15501,7 @@ commit c3eda35f106c3e34687625710c987d6cc8db0f54 Author: Seong-ho Cho -Date: Sat Sep 15 20:07:56 2012 +0900 +Date: Sat Sep 15 20:07:56 2012 +0900 Updated Korean translation @@ -14431,7 +15511,7 @@ commit 61aa1ea510db093ab6165272c122af7e896d1bd7 Author: Michael Natterer -Date: Fri Sep 14 11:04:21 2012 +0200 +Date: Fri Sep 14 11:04:21 2012 +0200 Bug 683791 - Free select tool constraint key @@ -14444,7 +15524,7 @@ commit 991d42c85ea94054a6979f853efba187c75e7612 Author: Michael Natterer -Date: Tue Sep 11 20:28:20 2012 +0200 +Date: Tue Sep 11 20:28:20 2012 +0200 Bug 683553 - Spinscale scrollvalues in Brushsize are much too smal @@ -14457,7 +15537,7 @@ commit 844fc444b59a41495973faabdcd7ede400e3fc55 Author: Martin Srebotnjak -Date: Mon Sep 10 15:55:38 2012 +0200 +Date: Mon Sep 10 15:55:38 2012 +0200 Updated Slovenian translation @@ -14467,7 +15547,7 @@ commit c56cf23c82076b18ad90437e9cd4e6b152de721e Author: Taijuin -Date: Mon Sep 10 19:13:56 2012 +0800 +Date: Mon Sep 10 19:13:56 2012 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) @@ -14479,20 +15559,20 @@ commit f628dcf49f8e41ff348f7ac1119d2e334c07b068 Author: Marco Ciampa -Date: Mon Sep 10 12:22:19 2012 +0200 +Date: Mon Sep 10 12:22:19 2012 +0200 Updated italian translation. po-plug-ins/it.po | 214 ++- - po-python/it.po | 10 +- + po-python/it.po | 10 +- po-script-fu/it.po | 3737 ++++++++++++++++++++-------------------------------- - po/it.po | 322 ++--- + po/it.po | 322 ++--- 4 files changed, 1773 insertions(+), 2510 deletions(-) commit 5ab02157944e88f97e90bc14cbb19d50d5ddb46a Author: Michael Natterer -Date: Sun Sep 9 20:08:18 2012 +0200 +Date: Sun Sep 9 20:08:18 2012 +0200 app: add -framework Carbon to LDFLAGS on OSX @@ -14505,7 +15585,7 @@ commit bae709d0a95d62bfc314351e4c68a7e7b542d859 Author: Seong-ho Cho -Date: Sun Sep 9 17:59:41 2012 +0900 +Date: Sun Sep 9 17:59:41 2012 +0900 Updated Korean translation @@ -14515,7 +15595,7 @@ commit 603ae6334b53a64d4c7d69969b0e76472c34fafd Author: Michael Natterer -Date: Sun Sep 9 00:54:49 2012 +0200 +Date: Sun Sep 9 00:54:49 2012 +0200 Bug 655684 - After saving an image with geotags you cannot... @@ -14528,7 +15608,7 @@ commit d4ebc9562d7696fb0e7efa004ca1e65c18d7236d Author: Michael Natterer -Date: Sat Sep 8 12:48:53 2012 +0200 +Date: Sat Sep 8 12:48:53 2012 +0200 app: add a workaround to make GimpModuleDB's "verbose" flag work @@ -14540,7 +15620,7 @@ commit f3a4200e7287971f700194d596efd3eaeae36b72 Author: Michael Natterer -Date: Thu Sep 6 23:55:35 2012 +0200 +Date: Thu Sep 6 23:55:35 2012 +0200 Bug 683462 - cropping with rectangular select tool leaves misaligned... @@ -14553,20 +15633,20 @@ reseting the active tool because of a drawable change. (cherry picked from commit e546f2b43bbe77901516c780428bda40f5af26ba) - app/core/core-enums.c | 2 ++ - app/core/core-enums.h | 1 + + app/core/core-enums.c | 2 ++ + app/core/core-enums.h | 1 + app/display/gimpdisplayshell-tool-events.c | 4 +++- - app/tools/gimpcagetool.c | 3 ++- - app/tools/gimpforegroundselecttool.c | 4 +++- - app/tools/gimpimagemaptool.c | 3 ++- - app/tools/gimpiscissorstool.c | 4 +++- - app/tools/gimprectangleselecttool.c | 1 + - app/tools/gimptransformtool.c | 3 ++- + app/tools/gimpcagetool.c | 3 ++- + app/tools/gimpforegroundselecttool.c | 4 +++- + app/tools/gimpimagemaptool.c | 3 ++- + app/tools/gimpiscissorstool.c | 4 +++- + app/tools/gimprectangleselecttool.c | 1 + + app/tools/gimptransformtool.c | 3 ++- 9 files changed, 19 insertions(+), 6 deletions(-) commit f0dae90f23c9e82d4bf1cab01f820f37627ba23e Author: Nils Philippsen -Date: Thu Sep 6 12:42:48 2012 +0200 +Date: Thu Sep 6 12:42:48 2012 +0200 file-cel: make generating thumbnails more robust @@ -14582,7 +15662,7 @@ commit 029d9ab9a5c36dfa4c03f934e1a9e2fc3de2ce51 Author: Michael Natterer -Date: Wed Sep 5 23:34:59 2012 +0200 +Date: Wed Sep 5 23:34:59 2012 +0200 Revert "Bug 683381 - Inverted alpha behavior of 16-bit Targa files" @@ -14593,7 +15673,7 @@ commit e2915eba7c3bc5761747a46b1e15550d30fe19fa Author: Mike Gran -Date: Tue Sep 4 23:38:42 2012 -0700 +Date: Tue Sep 4 23:38:42 2012 -0700 Bug 683381 - Inverted alpha behavior of 16-bit Targa files @@ -14605,19 +15685,19 @@ commit 06342f26c975150f1892f810680adb2f5425dec4 Author: Bruce Cowan -Date: Wed Sep 5 12:51:09 2012 +0100 +Date: Wed Sep 5 12:51:09 2012 +0100 Updated British English translation po-plug-ins/en_GB.po | 1174 +++++++++++++++++++++++----------------- po-tips/en_GB.po | 351 ++++++------ - po/en_GB.po | 1475 + po/en_GB.po | 1475 ++++++++++++++++++++++++++------------------------ 3 files changed, 1607 insertions(+), 1393 deletions(-) commit e2059dde74878d303a140aa0236a53c3b754d3bc Author: Michael Natterer -Date: Wed Sep 5 13:03:47 2012 +0200 +Date: Wed Sep 5 13:03:47 2012 +0200 Bug 683050 - Copying a layer group to a new xcf results in portions... @@ -14630,7 +15710,7 @@ commit 0e2bce2b82eec153244aa874a1648f73be11798e Author: Michael Natterer -Date: Wed Sep 5 11:29:45 2012 +0200 +Date: Wed Sep 5 11:29:45 2012 +0200 app: make handling of coordinates more robust against broken input drivers @@ -14639,14 +15719,14 @@ mapping to not try to "interpolate" shit like NaN and crash. (cherry picked from commit c7b9728cc8b9c5af28ac04e021246ab23d8f1eba) - app/core/gimpcurve-map.c | 38 + app/core/gimpcurve-map.c | 38 +++++++++++++++++++++++++++---------- - app/widgets/gimpdeviceinfo-coords.c | 2 +- + app/widgets/gimpdeviceinfo-coords.c | 2 +- 2 files changed, 29 insertions(+), 11 deletions(-) commit 20449b1176be614fcb5b78ccf0a4f2e86273a77e Author: taijuin -Date: Wed Sep 5 14:03:58 2012 +0800 +Date: Wed Sep 5 14:03:58 2012 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) @@ -14660,7 +15740,7 @@ commit 2fb04eaeea273ac7a9c677fd988beae6ca06c782 Author: Daniel Mustieles -Date: Mon Sep 3 12:54:15 2012 +0200 +Date: Mon Sep 3 12:54:15 2012 +0200 Updated Spanish translation @@ -14670,7 +15750,7 @@ commit b8cd7348ccf6913dea1c06894d90ec84d50b79ec Author: Michael Natterer -Date: Mon Sep 3 02:17:55 2012 +0200 +Date: Mon Sep 3 02:17:55 2012 +0200 Bug 678452 - Libgimp drawable combo boxes are not aware of layer groups @@ -14686,7 +15766,7 @@ commit 2b5edbabd2f71a324206e6a6a172e28040b4ee7c Author: Piotr Drąg -Date: Mon Sep 3 01:52:20 2012 +0200 +Date: Mon Sep 3 01:52:20 2012 +0200 Updated Polish translation @@ -14695,7 +15775,7 @@ commit b142ec6a358d0bd2aad6b987079d4b517d11fae3 Author: Michael Natterer -Date: Sun Sep 2 23:22:21 2012 +0200 +Date: Sun Sep 2 23:22:21 2012 +0200 Bug 681699 - Inapplicable files are listed with 'All images' filter... @@ -14711,7 +15791,7 @@ commit 4364989869d3cb186544917e3edeee75605ac30e Author: Michael Natterer -Date: Fri Aug 31 18:52:32 2012 +0200 +Date: Fri Aug 31 18:52:32 2012 +0200 build: more Info.plist adjustments @@ -14720,7 +15800,7 @@ commit ebe673ea4949327ea68db45898c7447757bd9482 Author: Michael Natterer -Date: Fri Aug 31 09:06:34 2012 +0200 +Date: Fri Aug 31 09:06:34 2012 +0200 build: fix more Info.plist keys to be as documented @@ -14729,7 +15809,7 @@ commit 625431db60f542d4585ed745a80c362cb8f43883 Author: Michael Natterer -Date: Thu Aug 30 09:48:02 2012 +0200 +Date: Thu Aug 30 09:48:02 2012 +0200 build: CFBundleIdentifier should be org.gimp.gimp not org.gimp.GIMP @@ -14738,7 +15818,7 @@ commit 06439dea64631caf31e8683a2d8a8ab2934bbbc3 Author: Clayton Walker -Date: Wed Aug 29 17:02:03 2012 -0600 +Date: Wed Aug 29 17:02:03 2012 -0600 build: update OSX build files. @@ -14747,18 +15827,18 @@ and cage tool crash. Update gimp-python.bundle to properly rename paths in linked libraries. Update gimp.modules to include svg support. - build/osx/fonts.conf | 155 + build/osx/fonts.conf | 155 +++++++++++++++++++++++++++++++++++++++++++ build/osx/gimp-python.bundle | 45 +++++++------ build/osx/gimp.modules | 31 ++++++--- - build/osx/gimprc | 3 + - build/osx/gtkrc | 1 - + build/osx/gimprc | 3 + + build/osx/gtkrc | 1 - build/osx/launcher-python.sh | 15 ++++- 6 files changed, 216 insertions(+), 34 deletions(-) commit b07473775a0441ea0e7c3b95483457a529b07816 Author: Michael Natterer -Date: Tue Aug 28 19:39:47 2012 +0200 +Date: Tue Aug 28 19:39:47 2012 +0200 build: fix version numbers and bundle identifier in Info.plist @@ -14767,7 +15847,7 @@ commit dc5aa9adbe37c4c73d704284955ea06ddafe7862 Author: Michael Natterer -Date: Tue Aug 28 19:02:28 2012 +0200 +Date: Tue Aug 28 19:02:28 2012 +0200 build: fix typo in osx moduleset: s/popper/poppler/ @@ -14776,7 +15856,7 @@ commit f6c08d94bd332ff1147ccde22e88c4dbacc0da21 Author: Martin Srebotnjak -Date: Tue Aug 28 15:40:46 2012 +0200 +Date: Tue Aug 28 15:40:46 2012 +0200 Updated Slovenian translation @@ -14786,7 +15866,7 @@ commit 2f274f09047532ace6ec622b6c704eb398cb639a Author: Massimo Valentini -Date: Sun Aug 26 17:41:24 2012 +0200 +Date: Sun Aug 26 17:41:24 2012 +0200 Bug 682454: Plug-in crashed @@ -14797,37 +15877,37 @@ starts at exif_data->data and not at exif_data. ==4677== Invalid read of size 1 - ==4677== at 0x4A0A130: memcpy@@GLIBC_2.14 + ==4677== at 0x4A0A130: memcpy@@GLIBC_2.14 (/builddir/build/BUILD/valgrind-3.7.0/memcheck/mc_replace_strmem.c:837) - ==4677== by 0x4E440F8: gimp_write (gimp-2-8/libgimp/gimp.c:1726) - ==4677== by 0x5BDD27E: gimp_wire_write + ==4677== by 0x4E440F8: gimp_write (gimp-2-8/libgimp/gimp.c:1726) + ==4677== by 0x5BDD27E: gimp_wire_write (gimp-2-8/libgimpbase/gimpwire.c:174) - ==4677== by 0x5BD9D41: _gp_params_write + ==4677== by 0x5BD9D41: _gp_params_write (gimp-2-8/libgimpbase/gimpprotocol.c:1748) - ==4677== by 0x5BDDA46: gimp_wire_write_msg + ==4677== by 0x5BDDA46: gimp_wire_write_msg (gimp-2-8/libgimpbase/gimpwire.c:296) - ==4677== by 0x5BDAE17: gp_proc_run_write + ==4677== by 0x5BDAE17: gp_proc_run_write (gimp-2-8/libgimpbase/gimpprotocol.c:305) - ==4677== by 0x4E4513E: gimp_run_procedure2 + ==4677== by 0x4E4513E: gimp_run_procedure2 (gimp-2-8/libgimp/gimp.c:993) - ==4677== by 0x4E4544B: gimp_run_procedure + ==4677== by 0x4E4544B: gimp_run_procedure (gimp-2-8/libgimp/gimp.c:926) - ==4677== by 0x40BD36: gimp_metadata_store_exif + ==4677== by 0x40BD36: gimp_metadata_store_exif (gimp-2-8/plug-ins/file-jpeg/gimpexif.c:69) - ==4677== by 0x406EA4: load_image + ==4677== by 0x406EA4: load_image (gimp-2-8/plug-ins/file-jpeg/jpeg-load.c:343) - ==4677== by 0x405A2E: run (gimp-2-8/plug-ins/file-jpeg/jpeg.c:235) - ==4677== by 0x4E44AD8: gimp_main (gimp-2-8/libgimp/gimp.c:1992) - ==4677== by 0x30A0421734: (below main) (in /usr/lib64/libc-2.15.so) + ==4677== by 0x405A2E: run (gimp-2-8/plug-ins/file-jpeg/jpeg.c:235) + ==4677== by 0x4E44AD8: gimp_main (gimp-2-8/libgimp/gimp.c:1992) + ==4677== by 0x30A0421734: (below main) (in /usr/lib64/libc-2.15.so) ==4677== Address 0x8f75e01 is 1 bytes after a block of size 64 alloc'd - ==4677== at 0x4A06F18: calloc + ==4677== at 0x4A06F18: calloc (/builddir/build/BUILD/valgrind-3.7.0/coregrind/m_replacemalloc/vg_replace_malloc.c:566) - ==4677== by 0x8AC304B: exif_data_new_mem + ==4677== by 0x8AC304B: exif_data_new_mem (/home/massimo/libexif/libexif/exif-data.c:111) - ==4677== by 0x8AC312D: exif_data_new + ==4677== by 0x8AC312D: exif_data_new (/home/massimo/libexif/libexif/exif-data.c:95) - ==4677== by 0x407224: load_image + ==4677== by 0x407224: load_image (gimp-2-8/plug-ins/file-jpeg/jpeg-load.c:311) plug-ins/file-jpeg/gimpexif.c | 4 ++-- @@ -14835,7 +15915,7 @@ commit 1fbdd50249d4857f838d62eb0ef3fa6c5d97d9f0 Author: Alexandre Prokoudine -Date: Sat Aug 25 20:13:28 2012 +0400 +Date: Sat Aug 25 20:13:28 2012 +0400 Adjusted default values in the Drop Shadow script to help people produce less ugly artwork @@ -14845,7 +15925,7 @@ commit d812886cdfd24c044514ef5db158082b69025511 Author: Khaled Hosny -Date: Fri Aug 24 23:35:23 2012 +0200 +Date: Fri Aug 24 23:35:23 2012 +0200 Updated Arabic translation @@ -14855,7 +15935,7 @@ commit 69397a4c0cbfa57f8a733bd7ede221e224620b65 Author: Michael Natterer -Date: Thu Aug 23 22:46:11 2012 +0200 +Date: Thu Aug 23 22:46:11 2012 +0200 configure: post-release version bump to 2.8.3 @@ -14864,17 +15944,17 @@ commit a42a02e1a7419aa7a0de2ab3a32cc0a727eaa5c1 Author: Michael Natterer -Date: Thu Aug 23 21:06:41 2012 +0200 +Date: Thu Aug 23 21:06:41 2012 +0200 app: adapt tests to file_save() API change app/tests/test-save-and-export.c | 9 ++++++--- - app/tests/test-xcf.c | 3 ++- + app/tests/test-xcf.c | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) commit 1ba763e1dcc2c56ea57f24365d9e157a0328894c Author: Mikael Magnusson -Date: Thu Aug 23 20:10:01 2012 +0200 +Date: Thu Aug 23 20:10:01 2012 +0200 NEWS: fix another small typo @@ -14883,18 +15963,18 @@ commit 846ce09b83c5e23c3d52a03693a80780ae1fd43f Author: Michael Natterer -Date: Thu Aug 23 20:08:27 2012 +0200 +Date: Thu Aug 23 20:08:27 2012 +0200 configure: bump version to 2.8.2 and commit regenerated files - configure.ac | 4 ++-- + configure.ac | 4 ++-- docs/gimprc.5.in | 2 +- - etc/gimprc | 2 +- + etc/gimprc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) commit 92d400a2393aeb4c0a5ee10dbe3f71a270476501 Author: Mikael Magnusson -Date: Thu Aug 23 20:07:51 2012 +0200 +Date: Thu Aug 23 20:07:51 2012 +0200 NEWS: fix small typo @@ -14903,7 +15983,7 @@ commit fef532a108c0d72a1fec49a431308b867050e09d Author: Michael Natterer -Date: Thu Aug 23 19:56:15 2012 +0200 +Date: Thu Aug 23 19:56:15 2012 +0200 devel-docs: add the new even/odd micro version policy to release-howto @@ -14912,7 +15992,7 @@ commit f3788ae9c3f553ae47373fcb95140328f5b3a974 Author: Jernej Simončič -Date: Thu Aug 23 19:28:33 2012 +0200 +Date: Thu Aug 23 19:28:33 2012 +0200 Installer: use ${gimp_installation_dir} when setting environment instead of @@ -14923,7 +16003,7 @@ commit 2048d65ac1d5d1460c982fe504c706b9d0c8c597 Author: Michael Natterer -Date: Thu Aug 23 19:27:16 2012 +0200 +Date: Thu Aug 23 19:27:16 2012 +0200 NEWS: update for 2.8.2 @@ -14933,19 +16013,19 @@ commit 037af495adeaf6b6a862c47250c528180d6ca1dd Author: Piotr Drąg -Date: Wed Aug 22 01:44:56 2012 +0200 +Date: Wed Aug 22 01:44:56 2012 +0200 Updated Polish translation po-plug-ins/pl.po | 8 +- - po-tips/pl.po | 374 + po-tips/pl.po | 374 +++++++++++++++++++++++++++--------------------------- - po/pl.po | 248 ++++++++++++++++++------------------ + po/pl.po | 248 ++++++++++++++++++------------------ 3 files changed, 315 insertions(+), 315 deletions(-) commit d16776ecb6dc1edff8b04cba41f54b49908b0c41 Author: Daniel Mustieles -Date: Mon Aug 20 20:07:00 2012 +0200 +Date: Mon Aug 20 20:07:00 2012 +0200 Updated Spanish translation @@ -14954,7 +16034,7 @@ commit 06835ad73c34af58f8a7c31cc282dc954e73bc40 Author: Daniel Mustieles -Date: Mon Aug 20 20:04:46 2012 +0200 +Date: Mon Aug 20 20:04:46 2012 +0200 Updated Spanish translation @@ -14964,7 +16044,7 @@ commit 4e46009b6b3f2661712f1a1044e59faf46b97420 Author: Piotr Drąg -Date: Mon Aug 20 15:02:24 2012 +0200 +Date: Mon Aug 20 15:02:24 2012 +0200 Updated Polish translation @@ -14974,7 +16054,7 @@ commit 6b642a26daaf0204fa9a6cf622a6b459e3a059ef Author: Nils Philippsen -Date: Tue Aug 14 15:27:39 2012 +0200 +Date: Tue Aug 14 15:27:39 2012 +0200 file-gif-load: fix type overflow (CVE-2012-3481) @@ -14987,7 +16067,7 @@ commit 4347b3496abd56d8419f3a14cc97fac25e6f546d Author: Jan Lieskovsky -Date: Tue Aug 14 12:18:22 2012 +0200 +Date: Tue Aug 14 12:18:22 2012 +0200 file-gif-load: limit len and height (CVE-2012-3481) @@ -15000,7 +16080,7 @@ commit a21aceedf1de04afc8fc06109786e9a1431504b9 Author: Nils Philippsen -Date: Fri Jul 13 15:33:27 2012 +0200 +Date: Fri Jul 13 15:33:27 2012 +0200 file-cel: use g_set_error() for errors instead of g_message() (cherry picked from commit 86f4cd39bd493c88a7a19b56d1827d8b911e07f6) @@ -15010,7 +16090,7 @@ commit 89f4c4042f69c2647f854c5824cb583dfadb6834 Author: Nils Philippsen -Date: Fri Jul 13 15:30:44 2012 +0200 +Date: Fri Jul 13 15:30:44 2012 +0200 file-cel: use statically allocated palette buffer (cherry picked from commit 69b98191cf315bcf0f7b8878896c01600e67c124) @@ -15020,7 +16100,7 @@ commit a605d0c4d5c2c77bfe03204423dc3ad70dfa3483 Author: Nils Philippsen -Date: Fri Jul 13 15:20:06 2012 +0200 +Date: Fri Jul 13 15:20:06 2012 +0200 file-cel: validate header data (CVE-2012-3403) (cherry picked from commit b772d1b84c9272bb46ab9a21db4390e6263c9892) @@ -15031,7 +16111,7 @@ commit 3db516f1e7b1be59ab434925256489178376725c Author: Nils Philippsen -Date: Thu Jul 12 15:50:02 2012 +0200 +Date: Thu Jul 12 15:50:02 2012 +0200 file-cel: check fread()/g_fopen() return values and pass on errors (cherry picked from commit 797db58b94c64f418c35d38b7a608d933c8cebef) @@ -15042,7 +16122,7 @@ commit 24130eec55c07ff0ad9e54c9dbac9ca2005565ed Author: Michael Natterer -Date: Tue Aug 14 09:23:16 2012 +0200 +Date: Tue Aug 14 09:23:16 2012 +0200 Bug 681799 - Canvas size doesn't show preview after canceling once @@ -15056,7 +16136,7 @@ commit bf9f91923c12104f6f82899ed689db1040c80a1c Author: Jiro Matsuzawa -Date: Sun Aug 12 12:00:12 2012 +0900 +Date: Sun Aug 12 12:00:12 2012 +0900 [l10n] Update Japanese translation @@ -15067,7 +16147,7 @@ commit f63d58a5544848a6cfff0217630af7ca4ae83067 Author: Muhammet Kara -Date: Thu Aug 9 10:07:00 2012 +0300 +Date: Thu Aug 9 10:07:00 2012 +0300 [l10n]Updated Turkish translation @@ -15077,7 +16157,7 @@ commit 31ef6fb398d38321000249d8b2b889658fd4c89e Author: Praveen Illa -Date: Thu Aug 9 00:17:46 2012 +0530 +Date: Thu Aug 9 00:17:46 2012 +0530 Updated Telugu Translation @@ -15087,7 +16167,7 @@ commit b35c3381b19d302fdfc80e27b3e92ba5775b39cb Author: Praveen Illa -Date: Thu Aug 9 00:01:38 2012 +0530 +Date: Thu Aug 9 00:01:38 2012 +0530 Updated Telugu Translation @@ -15097,7 +16177,7 @@ commit 47b0212a779385669efe9e2ef47223dc1c0a27a8 Author: Piotr Drąg -Date: Wed Aug 8 02:02:56 2012 +0200 +Date: Wed Aug 8 02:02:56 2012 +0200 Updated Polish translation @@ -15106,7 +16186,7 @@ commit b91f60602a0787c5ad996fadf22c7d721ae13e04 Author: Michael Natterer -Date: Tue Aug 7 16:02:43 2012 +0200 +Date: Tue Aug 7 16:02:43 2012 +0200 Bug 678297 - Cannot find Page Setup in Gimp 2.8 @@ -15119,31 +16199,31 @@ plug-ins/print/print-page-setup.c | 20 +++++ plug-ins/print/print-page-setup.h | 11 ++- - plug-ins/print/print.c | 165 + plug-ins/print/print.c | 165 +++++++++++++++++++++++++++++++++++++- - plug-ins/print/print.h | 4 + + plug-ins/print/print.h | 4 + 4 files changed, 193 insertions(+), 7 deletions(-) commit 15c8b3f850047c238278dfe6a8ba1eda4bd949e4 Author: Clayton Walker -Date: Sat Aug 4 18:19:38 2012 -0400 +Date: Sat Aug 4 18:19:38 2012 -0400 Update osx build scripts, readme, and fix font issue - build/osx/Info.plist | 2 + - build/osx/README | 6 +- + build/osx/Info.plist | 2 + + build/osx/README | 6 +- build/osx/gimp-python.bundle | 177 +++++++++++++++++++++++++++++++++ build/osx/gimp.modules | 229 ++++++++++++++++++++++++++++++++++++++----- - build/osx/gtkrc | 2 +- + build/osx/gtkrc | 2 +- build/osx/jhbuildrc-gimp | 2 +- build/osx/launcher-python.sh | 75 ++++++++++++++ - build/osx/launcher.sh | 19 ++-- + build/osx/launcher.sh | 19 ++-- 8 files changed, 478 insertions(+), 34 deletions(-) commit 209116fcadd7b1c44397a906f196c6afa5607575 Author: Michael Natterer -Date: Sat Aug 4 02:18:15 2012 +0200 +Date: Sat Aug 4 02:18:15 2012 +0200 Bug 678732 - gimp-image-insert-layer inserts into a wrong place... @@ -15152,14 +16232,14 @@ supposed to be used when e.g. scripts create layers. (cherry picked from commit e620eb8cefe565d372959eba3aee8dfbb8c5734f) - app/pdb/image-cmds.c | 2 +- + app/pdb/image-cmds.c | 2 +- libgimp/gimpimage_pdb.c | 5 +++-- tools/pdbgen/pdb/image.pdb | 15 ++++++++------- 3 files changed, 12 insertions(+), 10 deletions(-) commit 92f348a96c1beb711b80150600777ee238bf3aa4 Author: Michael Natterer -Date: Sat Aug 4 00:04:47 2012 +0200 +Date: Sat Aug 4 00:04:47 2012 +0200 app: improve error message when failing to load an ABR version 6 brush (cherry picked from commit 47c94fc2280c87cee9c9e735ae1a5a6569e7dc9c) @@ -15169,7 +16249,7 @@ commit 977311dff84b9a17973e25a3f52b37a8b4863875 Author: Michael Natterer -Date: Tue Jul 31 15:14:20 2012 +0200 +Date: Tue Jul 31 15:14:20 2012 +0200 Bug 680432 - metadata.exe keeps dying @@ -15183,7 +16263,7 @@ commit 3445d5f214f9cb64697085541bd449a6b8c56091 Author: Michael Natterer -Date: Mon Jul 30 18:04:27 2012 +0200 +Date: Mon Jul 30 18:04:27 2012 +0200 Bug 669795 - Toolbox can't be shrinked to 1 or 2 columns @@ -15199,7 +16279,7 @@ commit 7fd0895c0ca11368f0fdffed39d197c9c778151c Author: Michael Henning -Date: Sun Jul 29 12:36:31 2012 -0400 +Date: Sun Jul 29 12:36:31 2012 -0400 Bug 680795 - GIMP segfaults in gimp_clipboard_set_buffer when... @@ -15211,7 +16291,7 @@ commit 64b1ade7b05ba3f6523285808b69a96b35fed6f7 Author: Michael Natterer -Date: Mon Jul 30 16:20:11 2012 +0200 +Date: Mon Jul 30 16:20:11 2012 +0200 Bug 586462 - Layer inserts misplaced @@ -15229,14 +16309,14 @@ as completely within image bounds as possible. (cherry picked from commit eda6fa1c14777a534711fe05821ef308023fe4e7) - app/core/gimp-edit.c | 92 + app/core/gimp-edit.c | 92 +++++++++++++++++++++++++------------- app/display/gimpdisplayshell-dnd.c | 34 +++++++++----- 2 files changed, 84 insertions(+), 42 deletions(-) commit 67525e4c6b6a69cc6513d56496c181960c56542f Author: Seong-ho Cho -Date: Sun Jul 29 09:40:48 2012 +0900 +Date: Sun Jul 29 09:40:48 2012 +0900 Update Korean translation @@ -15246,7 +16326,7 @@ commit 7d985af68f41de6eb4932515307d0a12579e1a82 Author: Marco Ciampa -Date: Sat Jul 28 14:12:54 2012 +0200 +Date: Sat Jul 28 14:12:54 2012 +0200 Fixed italian po files plural forms @@ -15254,14 +16334,14 @@ po-plug-ins/it.po | 2 +- po-python/it.po | 1 + po-script-fu/it.po | 1 + - po-tags/it.po | 1 + - po-tips/it.po | 1 + - po/it.po | 2 +- + po-tags/it.po | 1 + + po-tips/it.po | 1 + + po/it.po | 2 +- 7 files changed, 7 insertions(+), 3 deletions(-) commit d400813027e7071fa638712973b4653d470bceda Author: Marco Ciampa -Date: Sat Jul 28 00:03:13 2012 +0200 +Date: Sat Jul 28 00:03:13 2012 +0200 Small fix in italian windows setup translation. @@ -15270,7 +16350,7 @@ commit 049258a70133dea606c498e2b9dcfd465fa13971 Author: Jernej Simončič -Date: Fri Jul 27 22:05:13 2012 +0200 +Date: Fri Jul 27 22:05:13 2012 +0200 Installer: adjust associations label height automatically according to text length @@ -15281,7 +16361,7 @@ commit 757b5709e4fdd02bdc709a0ba1eb3afd86b82693 Author: Jernej Simončič -Date: Fri Jul 27 00:51:49 2012 +0200 +Date: Fri Jul 27 00:51:49 2012 +0200 Installer: include Italian translation in script @@ -15290,7 +16370,7 @@ commit 5f646592a2c5eeec3035ad4c96c925638aaddadd Author: Jernej Simončič -Date: Fri Jul 27 00:49:28 2012 +0200 +Date: Fri Jul 27 00:49:28 2012 +0200 Installer: request restart if files couldn't be deleted during uninstall @@ -15303,7 +16383,7 @@ commit cff132d90bfc375b7a65d76ae7d705191438385a Author: Marco Ciampa -Date: Fri Jul 27 00:36:23 2012 +0200 +Date: Fri Jul 27 00:36:23 2012 +0200 Added Windows installer italian translation. @@ -15313,7 +16393,7 @@ commit cab6d84867bc3f80c30221d597435060b2c16d97 Author: Michael Natterer -Date: Thu Jul 26 18:33:05 2012 +0200 +Date: Thu Jul 26 18:33:05 2012 +0200 Bug 677987 - Don't allow to assign keybindings with arrow keys... @@ -15325,7 +16405,7 @@ commit d6091dbce6f1b60ec606db1e59be7cb069a87477 Author: Michael Natterer -Date: Thu Jul 26 18:17:01 2012 +0200 +Date: Thu Jul 26 18:17:01 2012 +0200 Bug 678890 - Selection box handles do not respond after changing layer @@ -15337,17 +16417,17 @@ set_preserve(TRUE/FALSE) around image changes. (cherry picked from commit 078128bb09dbca458b4f2f98cbf6d4140b357b29) - app/tools/gimpcagetool.c | 8 ++++---- - app/tools/gimpimagemaptool.c | 24 ++++++++++++------------ + app/tools/gimpcagetool.c | 8 ++++---- + app/tools/gimpimagemaptool.c | 24 ++++++++++++------------ app/tools/gimprectangleselecttool.c | 24 ++++++++++++------------ - app/tools/gimptoolcontrol.c | 27 +++++++++++++++++++++++++++ - app/tools/gimptoolcontrol.h | 6 ++++++ - app/tools/gimptransformtool.c | 4 ++-- + app/tools/gimptoolcontrol.c | 27 +++++++++++++++++++++++++++ + app/tools/gimptoolcontrol.h | 6 ++++++ + app/tools/gimptransformtool.c | 4 ++-- 6 files changed, 63 insertions(+), 30 deletions(-) commit 0a450f8e22f3b8d54a7be32f07e7bd51717a162b Author: Michael Natterer -Date: Thu Jul 26 16:26:14 2012 +0200 +Date: Thu Jul 26 16:26:14 2012 +0200 Bug 680531 - Function gimp-context-get-brush-size takes size argument... @@ -15365,28 +16445,19 @@ commit 7506a26940a544980dbd10b0b32dc669e9ba1336 Author: Jernej Simončič -Date: Sat Jul 21 22:50:02 2012 +0200 +Date: Sat Jul 21 22:50:02 2012 +0200 Installer: move language files to a subdirectory - build/windows/installer/de.setup.isl | 113 - ------------------------------ - build/windows/installer/en.setup.isl | 113 - ------------------------------ - build/windows/installer/gimp3264.iss | 6 +- - build/windows/installer/lang/de.setup.isl | 113 - ++++++++++++++++++++++++++++++ - build/windows/installer/lang/en.setup.isl | 113 - ++++++++++++++++++++++++++++++ - build/windows/installer/lang/sl.setup.isl | 105 - +++++++++++++++++++++++++++ - build/windows/installer/sl.setup.isl | 105 - --------------------------- - 7 files changed, 334 insertions(+), 334 deletions(-) + build/windows/installer/gimp3264.iss | 6 +++--- + build/windows/installer/{ => lang}/de.setup.isl | 0 + build/windows/installer/{ => lang}/en.setup.isl | 0 + build/windows/installer/{ => lang}/sl.setup.isl | 0 + 4 files changed, 3 insertions(+), 3 deletions(-) commit a56ae5a82d1621f1a99a6051b62378491be43d1f Author: Michael Muré -Date: Sun May 6 16:42:55 2012 +0900 +Date: Sun May 6 16:42:55 2012 +0900 fix autogen.sh to work with automake 1.12 @@ -15395,7 +16466,7 @@ commit f4ce57aa9709e492666c16259e81625a3e4a7796 Author: Michael Natterer -Date: Tue Jul 17 22:52:49 2012 +0200 +Date: Tue Jul 17 22:52:49 2012 +0200 Bug 676566 - Window title becomes "Untitled" after exporting without saving @@ -15415,23 +16486,23 @@ (cherry picked from commit 220b28677be00ec407ff7f274e395ad934be27af) - app/actions/debug-commands.c | 4 +- - app/actions/file-commands.c | 6 +- - app/actions/windows-actions.c | 18 ++--- - app/core/gimpimage-private.h | 1 + - app/core/gimpimage.c | 133 + app/actions/debug-commands.c | 4 +- + app/actions/file-commands.c | 6 +- + app/actions/windows-actions.c | 18 ++--- + app/core/gimpimage-private.h | 1 + + app/core/gimpimage.c | 133 ++++++++++++++++++++++++++++++++--- - app/core/gimpimage.h | 1 + + app/core/gimpimage.h | 1 + app/display/gimpdisplayshell-title.c | 93 ++---------------------- - app/file/file-open.c | 6 +- - app/file/file-save.c | 2 + - app/pdb/image-cmds.c | 7 +- - tools/pdbgen/pdb/image.pdb | 7 +- + app/file/file-open.c | 6 +- + app/file/file-save.c | 2 + + app/pdb/image-cmds.c | 7 +- + tools/pdbgen/pdb/image.pdb | 7 +- 11 files changed, 153 insertions(+), 125 deletions(-) commit 805790885379551f88955c81800e2631bdd4c168 Author: Jernej Simončič -Date: Mon Jul 16 22:20:12 2012 +0200 +Date: Mon Jul 16 22:20:12 2012 +0200 Installer: handle /32 properly when reboot is needed before install can continue @@ -15441,7 +16512,7 @@ commit a125d8daccd4485a0983ce37a377e4720e90a9a2 Author: Jernej Simončič -Date: Sat Jul 14 16:06:34 2012 +0200 +Date: Sat Jul 14 16:06:34 2012 +0200 Installer: remember /32 switch between runs @@ -15450,7 +16521,7 @@ commit 862bbb829f45d61ebd862dfa51e2d971dac38725 Author: Jernej Simončič -Date: Sat Jul 14 14:16:21 2012 +0200 +Date: Sat Jul 14 14:16:21 2012 +0200 Installer: add /32 command-line parameter to force install of 32-bit version on x64 @@ -15460,7 +16531,7 @@ commit c3e904fab1b29224b7dd55bb5b4af49f34c3b335 Author: Michael Natterer -Date: Sat Jul 14 00:11:17 2012 +0200 +Date: Sat Jul 14 00:11:17 2012 +0200 app: don't ask to confirm reverting "Untitled" when the image was imported @@ -15471,7 +16542,7 @@ commit d8e71085cc4333e5dc948635dea75ec55ec23e6e Author: Michael Natterer -Date: Fri Jul 13 23:50:07 2012 +0200 +Date: Fri Jul 13 23:50:07 2012 +0200 app: create thumbnails also for imported files, not only for XCFs @@ -15485,18 +16556,18 @@ commit d363043370d9f08afa540d89f131c6955804f1a1 Author: Alexandre Prokoudine -Date: Wed Jul 11 20:13:14 2012 +0400 +Date: Wed Jul 11 20:13:14 2012 +0400 Updates and fixes to Russian translation po-plug-ins/ru.po | 222 +++++++--- - po/ru.po | 1278 + po/ru.po | 1278 +++++++++++++++++++++++++++-------------------------- 2 files changed, 811 insertions(+), 689 deletions(-) commit 40deca6c048c7348f9ff2156b37a75fbb700264c Author: Michael Natterer -Date: Mon Jul 9 22:53:17 2012 +0200 +Date: Mon Jul 9 22:53:17 2012 +0200 Bug 679256 - SWM image tabs must have a minimum width @@ -15509,7 +16580,7 @@ commit ee4a81d4189f5f41faec53aa8d97c1eb9c19ef20 Author: Gabor Kelemen -Date: Fri Jul 6 15:27:11 2012 +0200 +Date: Fri Jul 6 15:27:11 2012 +0200 Corrections to the Hungarian translation @@ -15519,7 +16590,7 @@ commit 917e2f9c9067eea0e77263f802c9663a57b8950a Author: Gabor Kelemen -Date: Fri Jul 6 15:18:24 2012 +0200 +Date: Fri Jul 6 15:18:24 2012 +0200 Updated Hungarian translation by Andras Prim @@ -15529,21 +16600,21 @@ commit 5d2933c51caa10c088c061187d79d78aa57699ba Author: Massimo Valentini -Date: Thu Jul 5 18:07:57 2012 +0200 +Date: Thu Jul 5 18:07:57 2012 +0200 app: don't pass a NULL widget to gtk_widget_event C C 1 used to print: (gimp-2.8:1): Gtk-CRITICAL **: IA__gtk_widget_event: - assertion `GTK_IS_WIDGET (widget)' failed + assertion `GTK_IS_WIDGET (widget)' failed app/tools/gimpcurvestool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 05da156b30ce95f5b90c0ec1dcd1a69cb5fcda61 Author: Jernej Simončič -Date: Tue Jul 3 22:10:38 2012 +0200 +Date: Tue Jul 3 22:10:38 2012 +0200 Installer: adjust association buttons width according to text length (German text was way too long for the default button widths) @@ -15557,7 +16628,7 @@ commit 2b6bdfaa041a133ec900561c001cb860c87928c5 Author: Jernej Simončič -Date: Tue Jul 3 22:10:06 2012 +0200 +Date: Tue Jul 3 22:10:06 2012 +0200 Installer: add German translation @@ -15567,7 +16638,7 @@ commit dca5b0896b823abde17826a0b993a12d27a971e9 Author: Piotr Drąg -Date: Mon Jul 2 20:27:38 2012 +0200 +Date: Mon Jul 2 20:27:38 2012 +0200 Updated Polish translation @@ -15577,7 +16648,7 @@ commit b874c8af1e7d06a0ca88459427aaaf0b037702b4 Author: Massimo Valentini -Date: Sat Jun 30 13:05:55 2012 +0200 +Date: Sat Jun 30 13:05:55 2012 +0200 Bug 679082: Crash after using Rotate tool @@ -15586,7 +16657,7 @@ commit ec6db4b994dc7079881d3ab5747f06c0a3fc8773 Author: Timo Jyrinki -Date: Tue Jun 26 20:33:54 2012 +0300 +Date: Tue Jun 26 20:33:54 2012 +0300 Updated po-tips Finnish translation by Janne Peltonen. @@ -15596,18 +16667,18 @@ commit d8b4de413a2d2a6173b2f4fb6fb140500a0f0458 Author: Timo Jyrinki -Date: Tue Jun 26 20:18:26 2012 +0300 +Date: Tue Jun 26 20:18:26 2012 +0300 Updated Finnish translation by Janne Peltonen. po-libgimp/fi.po | 1703 +++++++++++++--------- - po/fi.po | 4146 + po/fi.po | 4146 ++++++++++++++++++++++++++++++------------------------ 2 files changed, 3365 insertions(+), 2484 deletions(-) commit 8a0e26773cbeda8afba43fac63e206d6b7672dcc Author: Marco Ciampa -Date: Mon Jun 25 17:45:47 2012 +0200 +Date: Mon Jun 25 17:45:47 2012 +0200 Updated italian translation. @@ -15617,7 +16688,7 @@ commit bf503ea7dd7b0e4e619b940e76c1dcd57cac3cf0 Author: Massimo Valentini -Date: Sun Jun 24 13:23:10 2012 +0200 +Date: Sun Jun 24 13:23:10 2012 +0200 app: compress motion events up to the first release event @@ -15630,7 +16701,7 @@ commit 313ef397cdf642f9d708f3def99f2ee7ce80a0f7 Author: Massimo Valentini -Date: Thu Jun 21 19:04:31 2012 +0200 +Date: Thu Jun 21 19:04:31 2012 +0200 Bug 677040: PDF export does not appear to handle font size... @@ -15644,7 +16715,7 @@ commit 8f2246578d8f5f9b23dcd85131bbdde934b1f080 Author: Jernej Simončič -Date: Thu Jun 21 00:12:43 2012 +0200 +Date: Thu Jun 21 00:12:43 2012 +0200 Installer: display a warning when color depth < 32BPP @@ -15656,7 +16727,7 @@ commit f3085d2879663a982267f3c959fe80cc0493dd50 Author: Jernej Simončič -Date: Wed Jun 20 17:05:28 2012 +0200 +Date: Wed Jun 20 17:05:28 2012 +0200 Installer: fix permissions, add .gitignore @@ -15666,7 +16737,7 @@ commit b99e80dc90d78c9c1e6b94184fffb496de83ddda Author: Jernej Simončič -Date: Wed Jun 20 17:04:02 2012 +0200 +Date: Wed Jun 20 17:04:02 2012 +0200 Installer: oops, remove duplicate function @@ -15675,21 +16746,21 @@ commit 416dfc458430dc4cd61762c3708e079d7556cac8 Author: Jernej Simončič -Date: Wed Jun 20 16:34:53 2012 +0200 +Date: Wed Jun 20 16:34:53 2012 +0200 Installer: allow override of system-wide configuration files with custom versions during install build/windows/installer/configoverride.isi | 36 +++++++++++++++++ - build/windows/installer/gimp3264.iss | 65 + build/windows/installer/gimp3264.iss | 65 +++++++++++++++++++++++++++++- - build/windows/installer/utils.isi | 9 +++++ + build/windows/installer/utils.isi | 9 +++++ 3 files changed, 109 insertions(+), 1 deletion(-) commit 8be0541df539b0e057bb82c0ec31c97fe365f1d6 Author: Piotr Drąg -Date: Tue Jun 19 21:51:43 2012 +0200 +Date: Tue Jun 19 21:51:43 2012 +0200 Updated Polish translation @@ -15699,7 +16770,7 @@ commit bf8e42330b441202a07461857107779fc126abcb Author: Massimo Valentini -Date: Mon Jun 18 18:14:42 2012 +0200 +Date: Mon Jun 18 18:14:42 2012 +0200 Bug 677375: tools do not strictly follow mouse... @@ -15712,18 +16783,18 @@ commit df1752f2876120567af9c8a1dc3bc69d00fbd950 Author: Dimitris Spingos -Date: Sun Jun 17 12:48:34 2012 +0300 +Date: Sun Jun 17 12:48:34 2012 +0300 Updated 2 Greek translations po-plug-ins/el.po | 370 +++++++++++++++++++++++++++++------------------------- - po/el.po | 227 +++++++++++++++++---------------- + po/el.po | 227 +++++++++++++++++---------------- 2 files changed, 317 insertions(+), 280 deletions(-) commit 6a5b3b61d760f2c97c49c9d9fcdd0ab4a753f2f1 Author: Martin Srebotnjak -Date: Sat Jun 16 22:20:06 2012 +0200 +Date: Sat Jun 16 22:20:06 2012 +0200 Updated Slovenian translation @@ -15733,7 +16804,7 @@ commit b16aab1e8ed68150b42a688b332b1c123acdb103 Author: Daniel Mustieles -Date: Wed Jun 13 10:08:31 2012 +0200 +Date: Wed Jun 13 10:08:31 2012 +0200 Updated Spanish translation @@ -15742,7 +16813,7 @@ commit 9eb45ed8d7a58c345ac8e1027901787e58d32ae5 Author: Mikael Magnusson -Date: Wed Jun 13 02:12:27 2012 +0200 +Date: Wed Jun 13 02:12:27 2012 +0200 metadata: fix length passed to base64 decoder (cherry picked from commit a4cd8637af7e29a3b78fda6034aa1889df050540) @@ -15752,7 +16823,7 @@ commit 310a8c4458d72fdcf4f06922108163a6bd3d8239 Author: Michael Natterer -Date: Tue Jun 12 22:51:32 2012 +0200 +Date: Tue Jun 12 22:51:32 2012 +0200 app: get the help_id from the right action in gimp_editor_add_action_button() @@ -15763,7 +16834,7 @@ commit d81669a671a1a849dff8400e6c1cb6b9fe48bac1 Author: Michael Natterer -Date: Tue Jun 12 22:33:47 2012 +0200 +Date: Tue Jun 12 22:33:47 2012 +0200 Bug 677974 - GIMP suggests XCF as default export format @@ -15778,7 +16849,7 @@ commit 687fbf458312e73c63c4e2a7c3cb49525cd59689 Author: Michael Natterer -Date: Tue Jun 12 21:39:40 2012 +0200 +Date: Tue Jun 12 21:39:40 2012 +0200 Bug 677823 - Shift + mouse click to link all layers does not work @@ -15786,15 +16857,15 @@ "all layers" to the clicked layer's branch in the tree. (cherry picked from commit 67b5a509b6c830e59f0f9edaae78899afc0ec1c8) - app/core/gimpitem-exclusive.c | 91 + app/core/gimpitem-exclusive.c | 91 +++++++++++++++++++++++++++++++++++++++++- - app/core/gimpitem-exclusive.h | 2 + + app/core/gimpitem-exclusive.h | 2 + app/widgets/gimpitemtreeview.c | 2 +- 3 files changed, 92 insertions(+), 3 deletions(-) commit 8ec18b847cd7eba16b6e3048c0ee5fb4e7f6b110 Author: Eulalia -Date: Sun Jun 10 22:56:11 2012 +0200 +Date: Sun Jun 10 22:56:11 2012 +0200 [l10n] Update Catalan translation @@ -15804,7 +16875,7 @@ commit 6b63e85a88bb686005b59710725cbc5c368b5f68 Author: Albert F -Date: Sun Jun 10 22:55:49 2012 +0200 +Date: Sun Jun 10 22:55:49 2012 +0200 [l10n] Update Catalan translation @@ -15814,7 +16885,7 @@ commit a4ecfde635f993a6c196cacbf357623a93bb0e5b Author: Massimo Valentini -Date: Sun Jun 10 17:20:43 2012 +0200 +Date: Sun Jun 10 17:20:43 2012 +0200 Bug 677375: tools do not strictly follow mouse... @@ -15825,7 +16896,7 @@ commit 7212f9973dbf88f627469d7e5ecf5d14e4b7a9fe Author: Kristian Rietveld -Date: Sat Jun 9 22:32:02 2012 +0200 +Date: Sat Jun 9 22:32:02 2012 +0200 Avoid using CMFlattenProfile @@ -15842,7 +16913,7 @@ commit 9783b68d0fcf84e1e784418d0c1194331e1cf0c3 Author: Marco Ciampa -Date: Sat Jun 9 20:31:41 2012 +0200 +Date: Sat Jun 9 20:31:41 2012 +0200 Little italian translation fix. @@ -15851,7 +16922,7 @@ commit 0ba99a05ff162a6894686035398b0a82a348a5d7 Author: Massimo Valentini -Date: Sat Jun 9 15:36:35 2012 +0200 +Date: Sat Jun 9 15:36:35 2012 +0200 Bug 673729: tiff plug in not working 2.8.0-RC1 windows install @@ -15867,7 +16938,7 @@ commit 03f0a1ab57b440f40c9bc685fed778d5b4eea376 Author: Massimo Valentini -Date: Sat Jun 9 15:36:35 2012 +0200 +Date: Sat Jun 9 15:36:35 2012 +0200 Bug 677637: PDF export plug-in does not work @@ -15879,18 +16950,18 @@ commit 41ce828243cd751618ac8ea90916f8aa880faeb4 Author: Massimo Valentini -Date: Sat Jun 9 15:36:34 2012 +0200 +Date: Sat Jun 9 15:36:34 2012 +0200 Bug 645345: 'Color Management' display filter causes performance problems - app/display/gimpcanvasarc.c | 27 +++++++++++++++++++++++---- + app/display/gimpcanvasarc.c | 27 +++++++++++++++++++++++---- app/display/gimpdisplayshell-render.c | 20 ++++++++++++++++---- 2 files changed, 39 insertions(+), 8 deletions(-) commit 2fb8ede280b2d60fbb9b33aec8fed621d013fe0c Author: Gil Forcada -Date: Sat Jun 9 10:32:01 2012 +0200 +Date: Sat Jun 9 10:32:01 2012 +0200 Added nn to LINGUAS @@ -15899,7 +16970,7 @@ commit 25127e10ad39f49c1fdc81e07575787c867e2e8f Author: Kolbjørn Stuestøl -Date: Fri Jun 8 20:47:24 2012 +0200 +Date: Fri Jun 8 20:47:24 2012 +0200 --amend @@ -15908,7 +16979,7 @@ commit df394ffae096e820809d2b5dbfcbe77f7ada4d98 Author: Kolbjørn Stuestøl -Date: Fri Jun 8 20:44:34 2012 +0200 +Date: Fri Jun 8 20:44:34 2012 +0200 Updatet Norwegian 'po/nn.po' translations @@ -15917,7 +16988,7 @@ commit 77db64913da43d35f4dc45808def807c2b0b6455 Author: Kolbjørn Stuestøl -Date: Fri Jun 8 20:27:59 2012 +0200 +Date: Fri Jun 8 20:27:59 2012 +0200 --amend @@ -15926,23 +16997,23 @@ commit 4cd5a2fb22c791f2c0d299ee7a184590de878bb4 Author: Kolbjørn Stuestøl -Date: Fri Jun 8 20:21:10 2012 +0200 +Date: Fri Jun 8 20:21:10 2012 +0200 Updated Norwegian (nn) translations po-libgimp/nn.po | 1599 ++++---- po-plug-ins/nn.po | 6991 ++++++++++++++++++--------------- - po-python/nn.po | 204 +- + po-python/nn.po | 204 +- po-script-fu/nn.po | 4046 ++++++++----------- - po-tags/nn.po | 29 + - po-tips/nn.po | 309 +- - po/nn.po | 10861 + po-tags/nn.po | 29 + + po-tips/nn.po | 309 +- + po/nn.po | 10861 ++++++++++++++++++++++++++++++++------------------- 7 files changed, 13460 insertions(+), 10579 deletions(-) commit 242d71fd730ca832f89efcd3bacf8267ce312106 Author: Michael Natterer -Date: Fri Jun 8 00:21:07 2012 +0200 +Date: Fri Jun 8 00:21:07 2012 +0200 Bug 677262 - move the layer with the arrow keys, broken after... @@ -15957,7 +17028,7 @@ commit 8a85b907ffc9d5772dda177f9d8f18c8ca3e3f9b Author: Michael Natterer -Date: Thu Jun 7 19:44:19 2012 +0200 +Date: Thu Jun 7 19:44:19 2012 +0200 build: include the basic-coretext module when building pango for OSX @@ -15966,7 +17037,7 @@ commit 954f72e4f97d1f5afaa657bfdc9a85e35a19eafc Author: Gabor Kelemen -Date: Thu Jun 7 11:47:27 2012 +0200 +Date: Thu Jun 7 11:47:27 2012 +0200 Add hu to LINGUAS @@ -15975,7 +17046,7 @@ commit d405dbb5ef17fd3a6ebe8adeacf1bc2a8f931287 Author: Gabor Kelemen -Date: Thu Jun 7 10:58:53 2012 +0200 +Date: Thu Jun 7 10:58:53 2012 +0200 Updated Hungarian po-libgimp translation by Andras Prim @@ -15986,7 +17057,7 @@ commit e2a6c5974ad34c45e5403db29e9002ad23ae8eae Author: Gabor Kelemen -Date: Wed Jun 6 23:05:59 2012 +0200 +Date: Wed Jun 6 23:05:59 2012 +0200 Updated Hungarian translation by Andras Prim @@ -15996,7 +17067,7 @@ commit 0474376d234bc3d0901fd5e86f89d778a6473dd8 Author: Michael Natterer -Date: Wed Jun 6 21:21:10 2012 +0200 +Date: Wed Jun 6 21:21:10 2012 +0200 Bug 676804 - file handling DoS for fit file format @@ -16009,7 +17080,7 @@ commit 0e3163858890c92fa630c9644c057bb7637dbf8f Author: Michael Natterer -Date: Wed Jun 6 19:43:42 2012 +0200 +Date: Wed Jun 6 19:43:42 2012 +0200 authors.xml: add Clayton Walker @@ -16019,19 +17090,19 @@ commit 1bf4f74ca5e0e728de26ef3d98f60f54cb4d2cd2 Author: Michael Natterer -Date: Wed Jun 6 19:36:06 2012 +0200 +Date: Wed Jun 6 19:36:06 2012 +0200 menus: really remove the "Use GEGL" menu items this time They were never meant to be in 2.8. menus/image-menu.xml.in | 3 --- - menus/menus.xsl | 4 +--- + menus/menus.xsl | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) commit b121388b03073496a9df713830c16f2eef05ea99 Author: Nils Philippsen -Date: Wed Jun 6 14:07:11 2012 +0200 +Date: Wed Jun 6 14:07:11 2012 +0200 text-brush: fix TypeError exception (rhbz#827826) @@ -16040,7 +17111,7 @@ commit 208e04c66c1711a0b6bbda19d932685c516ff311 Author: Gabor Kelemen -Date: Mon Jun 4 22:07:58 2012 +0200 +Date: Mon Jun 4 22:07:58 2012 +0200 Added Hungarian translation for po-tags @@ -16049,7 +17120,7 @@ commit 81b03011ab48b731ed62c225538a0776094af84a Author: Gabor Kelemen -Date: Mon Jun 4 21:58:46 2012 +0200 +Date: Mon Jun 4 21:58:46 2012 +0200 Updated Hungarian translation for po-tips @@ -16059,7 +17130,7 @@ commit b3e9473efa94e7f59ad581fed8aacab0865762bd Author: Gabor Kelemen -Date: Mon Jun 4 21:55:31 2012 +0200 +Date: Mon Jun 4 21:55:31 2012 +0200 Updated Hungarian po-python translation by Andras Prim @@ -16070,7 +17141,7 @@ commit c3bf36f3d6d64ac400f0c696be5b3d0034fb3601 Author: Massimo Valentini -Date: Mon Jun 4 19:32:41 2012 +0200 +Date: Mon Jun 4 19:32:41 2012 +0200 app: remove a weak ptr when the object lives longer than the ptr @@ -16078,20 +17149,20 @@ in the listview on the right, used to produce (quitting GIMP): ==32359== Invalid write of size 8 - ==32359== at 0x8808DF5: g_nullify_pointer (glib/glib/gutils.c:2099) - ==32359== by 0x8358781: weak_refs_notify + ==32359== at 0x8808DF5: g_nullify_pointer (glib/glib/gutils.c:2099) + ==32359== by 0x8358781: weak_refs_notify (glib/gobject/gobject.c:2469) - ==32359== by 0x4C3730A: gimp_color_display_dispose + ==32359== by 0x4C3730A: gimp_color_display_dispose (gimp-2-8/libgimpwidgets/gimpcolordisplay.c:197) - ==32359== by 0x83596A7: g_object_unref + ==32359== by 0x83596A7: g_object_unref (glib/gobject/gobject.c:2986) - ==32359== by 0x4C37EFA: gimp_color_display_stack_dispose + ==32359== by 0x4C37EFA: gimp_color_display_stack_dispose (gimp-2-8/libgimpwidgets/gimpcolordisplaystack.c:150) - ==32359== by 0x83596A7: g_object_unref + ==32359== by 0x83596A7: g_object_unref (glib/gobject/gobject.c:2986) - ==32359== by 0x53F1C3: gimp_display_shell_filter_set + ==32359== by 0x53F1C3: gimp_display_shell_filter_set (gimp-2-8/app/display/gimpdisplayshell-filter.c:58) - ==32359== by 0x536A50: gimp_display_shell_dispose + ==32359== by 0x536A50: gimp_display_shell_dispose (gimp-2-8/app/display/gimpdisplayshell.c:765) app/widgets/gimpcolordisplayeditor.c | 7 +++++++ @@ -16099,7 +17170,7 @@ commit bf7fa23bebab3cb794c1422fcdf115363ec9ed49 Author: Massimo Valentini -Date: Thu May 31 19:35:27 2012 +0200 +Date: Thu May 31 19:35:27 2012 +0200 Bug 676916: Filename garbled when you save .xcf.bz2... @@ -16110,7 +17181,7 @@ commit 5ac0d10aad273abd1000211774a319a7b0f56c93 Author: Daniel Mustieles -Date: Thu May 31 14:12:30 2012 +0200 +Date: Thu May 31 14:12:30 2012 +0200 Updated Spanish translation @@ -16120,7 +17191,7 @@ commit c66b8c984cdeb677f81bea8c9460f30d14ce5784 Author: Massimo Valentini -Date: Tue May 29 13:10:44 2012 +0200 +Date: Tue May 29 13:10:44 2012 +0200 Bug 676871: GIMP reports false positive plugin crash after... @@ -16131,7 +17202,7 @@ commit e608b47ce8d7fe0127df6cd73f1e6f658cf3802a Author: Mukund Sivaraman -Date: Mon May 28 14:17:30 2012 +0530 +Date: Mon May 28 14:17:30 2012 +0530 file-compressor: Bug #676916 - Use g_open() and g_fopen() instead of libc @@ -16142,7 +17213,7 @@ commit 3019fdc3fbf7c2dabe643cd3f3eb891b02a46fbe Author: Andika Triwidada -Date: Mon May 28 15:12:33 2012 +0700 +Date: Mon May 28 15:12:33 2012 +0700 Updated Indonesian translation of gimp plugins @@ -16152,7 +17223,7 @@ commit 43d2b59849be7fc52d667de3320371d56c6aea25 Author: Andika Triwidada -Date: Mon May 28 14:12:02 2012 +0700 +Date: Mon May 28 14:12:02 2012 +0700 Updated Indonesian translation of gimp-python @@ -16162,7 +17233,7 @@ commit df53bc6646f030220561bfd6d8bb09bbe2ae64ea Author: Andika Triwidada -Date: Mon May 28 14:07:40 2012 +0700 +Date: Mon May 28 14:07:40 2012 +0700 Updated Indonesian translation of script-fu @@ -16172,17 +17243,17 @@ commit 8b0cbad26f179cb0d2e8139e669a25d2dc09cac9 Author: Andika Triwidada -Date: Mon May 28 13:52:05 2012 +0700 +Date: Mon May 28 13:52:05 2012 +0700 Added Indonesian translation of gimp tags po-tags/LINGUAS | 1 + - po-tags/id.po | 29 +++++++++++++++++++++++++++++ + po-tags/id.po | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) commit b02b78bffc562ff6e4d677bb7931ffd515fdc6cd Author: Andika Triwidada -Date: Mon May 28 13:35:53 2012 +0700 +Date: Mon May 28 13:35:53 2012 +0700 Updated Indonesian translation for gimp tips @@ -16192,7 +17263,7 @@ commit 9ce8d4fae2f63576828f80dc156e2fb05f34d510 Author: Michael Natterer -Date: Sun May 27 19:55:42 2012 +0200 +Date: Sun May 27 19:55:42 2012 +0200 Bug 676872 - Image Properties keyboard shortcut Alt+Return Broken @@ -16205,7 +17276,7 @@ commit 668891e7455ff9107901b004e7ce9d422041ef71 Author: Daniel Sabo -Date: Fri May 25 03:42:36 2012 -0700 +Date: Fri May 25 03:42:36 2012 -0700 app: use an idle source to dispatch GTK menu events in ige-mac-menu @@ -16217,7 +17288,7 @@ commit 20c4a131c5950154152e8ceaf683c986fc840e84 Author: Wouter Bolsterlee -Date: Sun May 27 16:39:46 2012 +0200 +Date: Sun May 27 16:39:46 2012 +0200 Updated Dutch translation @@ -16227,7 +17298,7 @@ commit b803915631e225eeefd9b4435ce706142139c395 Author: Wouter Bolsterlee -Date: Sun May 27 16:12:34 2012 +0200 +Date: Sun May 27 16:12:34 2012 +0200 Updated Dutch translation @@ -16237,7 +17308,7 @@ commit 1c910a1b789558e66306546cb108087b39a75045 Author: Wouter -Date: Sun May 27 15:17:32 2012 +0200 +Date: Sun May 27 15:17:32 2012 +0200 Updated Dutch translation @@ -16247,7 +17318,7 @@ commit 3e5cc6ca50ce187b0ee6e3066b023af319aec3f3 Author: Wouter -Date: Sun May 27 14:43:21 2012 +0200 +Date: Sun May 27 14:43:21 2012 +0200 Updated Dutch translation @@ -16257,7 +17328,7 @@ commit 3c6c85c33edcc1c330c71121538323caf9f647cd Author: Wouter -Date: Sun May 27 14:31:46 2012 +0200 +Date: Sun May 27 14:31:46 2012 +0200 Updated Dutch translation @@ -16267,30 +17338,30 @@ commit 5462f0bca00dc7427d3f5e00829bf70f57552beb Author: Jernej Simončič -Date: Sun May 27 11:40:23 2012 +0200 +Date: Sun May 27 11:40:23 2012 +0200 installer: fix permissions build/windows/installer/MessageWithURL.isi | 0 build/windows/installer/associations.isi | 0 - build/windows/installer/gimp3264.iss | 0 - build/windows/installer/utils.isi | 0 + build/windows/installer/gimp3264.iss | 0 + build/windows/installer/utils.isi | 0 4 files changed, 0 insertions(+), 0 deletions(-) commit b50145fb1a27779dd78da3786868a995343a4e09 Author: Jernej Simončič -Date: Sun May 27 11:38:27 2012 +0200 +Date: Sun May 27 11:38:27 2012 +0200 installer: Replace TButton with TNewButton build/windows/installer/MessageWithURL.isi | 4 ++-- build/windows/installer/associations.isi | 6 +++--- - build/windows/installer/gimp3264.iss | 16 ++++++++-------- + build/windows/installer/gimp3264.iss | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) commit 354365857ecec763165d1cbb4cea35c2da90e688 Author: Jernej Simončič -Date: Sat May 26 19:55:08 2012 +0200 +Date: Sat May 26 19:55:08 2012 +0200 Update zlib1.dll in Windows\System32 when it already exists there @@ -16304,7 +17375,7 @@ commit 4437b90b63962209d91719e9a07f37b0ad3603ff Author: Michael Natterer -Date: Fri May 25 21:25:29 2012 +0200 +Date: Fri May 25 21:25:29 2012 +0200 Bug 676821 - No drag layers in "window layers", after commit... @@ -16318,7 +17389,7 @@ commit 0008be84840284e28d95d0975b0137d0ac9ce407 Author: Massimo Valentini -Date: Thu May 24 19:42:42 2012 +0200 +Date: Thu May 24 19:42:42 2012 +0200 Bug 673773: Colour of image changes with zooming @@ -16330,23 +17401,23 @@ commit 37a884a31b45a6e1594d8e2f2eebdfa6ee66329c Author: Clayton Walker -Date: Wed May 23 14:45:56 2012 +0200 +Date: Wed May 23 14:45:56 2012 +0200 Update osx build files and README - build/osx/Info.plist | 1058 + build/osx/Info.plist | 1058 +++++++++++++++++++++++++++++++++++++++++++++- - build/osx/README | 48 +++ - build/osx/README.txt | 36 -- - build/osx/gimp.bundle | 30 +- - build/osx/gtkrc | 2 +- + build/osx/README | 48 +++ + build/osx/README.txt | 36 -- + build/osx/gimp.bundle | 30 +- + build/osx/gtkrc | 2 +- build/osx/jhbuildrc-gimp | 5 +- - build/osx/launcher.sh | 14 +- + build/osx/launcher.sh | 14 +- 7 files changed, 1124 insertions(+), 69 deletions(-) commit ca5549a55e868847e9cd8b43069de5a2cda38698 Author: Michael Natterer -Date: Wed May 23 11:50:32 2012 +0200 +Date: Wed May 23 11:50:32 2012 +0200 libgimpconfig: support $(gimp_installation_dir) in config paths (cherry picked from commit f931f0500639fc21912a549477befe63b4998f60) @@ -16356,7 +17427,7 @@ commit 91665198d4e37e8c3c0f9081635448979f21fbb2 Author: Michael Natterer -Date: Wed May 23 11:49:07 2012 +0200 +Date: Wed May 23 11:49:07 2012 +0200 libgimpbase: add gimp_installation_directory() @@ -16367,13 +17438,13 @@ for proper relocation, I've made an exception. libgimpbase/gimpbase.def | 1 + - libgimpbase/gimpenv.c | 28 +++++++++++++++++++++++----- - libgimpbase/gimpenv.h | 1 + + libgimpbase/gimpenv.c | 28 +++++++++++++++++++++++----- + libgimpbase/gimpenv.h | 1 + 3 files changed, 25 insertions(+), 5 deletions(-) commit 74c20f2222538d5018c18c36e1eb7e502cd92d0b Author: Michael Natterer -Date: Wed May 23 09:44:51 2012 +0200 +Date: Wed May 23 09:44:51 2012 +0200 Bug 676585 - Gimp crashes when writing in Arabic and clicking right arrow @@ -16388,7 +17459,7 @@ commit a4fb9692ae7af6af204962c3db35ec164968a32d Author: Michael Natterer -Date: Wed May 23 01:25:22 2012 +0200 +Date: Wed May 23 01:25:22 2012 +0200 Bug 676522 - Changing tabs in single-window-mode should switch the active image @@ -16401,7 +17472,7 @@ commit e2ad99b98ee7f340ccffaa9de290d7ba4ad17a61 Author: Michael Natterer -Date: Tue May 22 12:58:10 2012 +0200 +Date: Tue May 22 12:58:10 2012 +0200 app: set GimpContainerTreeView->dnd_renderer to NULL more reliably @@ -16414,7 +17485,7 @@ commit 75ac9cc230d27ec267001ad80e706c0c6cb863f1 Author: sebul -Date: Tue May 22 02:40:12 2012 +0900 +Date: Tue May 22 02:40:12 2012 +0900 Updated Korean translation @@ -16424,7 +17495,7 @@ commit ae741b527bbd35a6c4236b32c7a7897eb4341c82 Author: Daniel Winzen -Date: Sun May 20 22:10:53 2012 +0200 +Date: Sun May 20 22:10:53 2012 +0200 Updated German translation @@ -16433,21 +17504,21 @@ commit 6b54e919f49692553434bad7c22799a4882d489c Author: Clayton Walker -Date: Sat May 19 17:41:45 2012 +0200 +Date: Sat May 19 17:41:45 2012 +0200 Files required for building gimp on osx - build/osx/README.txt | 36 +++++ - build/osx/gimp.icns | Bin 0 -> 159919 bytes + build/osx/README.txt | 36 +++++ + build/osx/gimp.icns | Bin 0 -> 159919 bytes build/osx/gimp.modules | 370 +++++++++++++++++++++++++++++++++++++++++++++++ build/osx/jhbuildrc-gimp | 41 ++++++ - build/osx/xcf.icns | Bin 0 -> 120928 bytes + build/osx/xcf.icns | Bin 0 -> 120928 bytes 5 files changed, 447 insertions(+) commit 8a6be41891a7b3e258cf9a0a3d1f424588028bcd Author: Piotr Drąg -Date: Sat May 19 18:07:53 2012 +0200 +Date: Sat May 19 18:07:53 2012 +0200 Updated Polish translation @@ -16456,7 +17527,7 @@ commit 09e80d1a63bb2db8db30e6eef8a9dd9479e995b2 Author: Piotr Drąg -Date: Sat May 19 18:01:21 2012 +0200 +Date: Sat May 19 18:01:21 2012 +0200 Updated Polish translation @@ -16465,7 +17536,7 @@ commit 6899757b092b1d11ae15adfd6ffd2f2a08be5706 Author: Michael Natterer -Date: Fri May 18 18:48:51 2012 +0200 +Date: Fri May 18 18:48:51 2012 +0200 app: make file_save() aware of the difference between overwrite and export @@ -16480,18 +17551,18 @@ Ctrl-S is always invokable even if invisible. (cherry picked from commit 39c18e9a48ccc37710d4b0074d520be70f9a95a3) - app/actions/file-actions.c | 2 +- - app/actions/file-commands.c | 13 ++++++++++--- + app/actions/file-actions.c | 2 +- + app/actions/file-commands.c | 13 ++++++++++--- app/dialogs/file-save-dialog.c | 8 ++++++-- app/dialogs/file-save-dialog.h | 3 ++- - app/file/file-save.c | 17 ++++++++++++++--- - app/file/file-save.h | 3 ++- - app/widgets/gimpdnd-xds.c | 3 ++- + app/file/file-save.c | 17 ++++++++++++++--- + app/file/file-save.h | 3 ++- + app/widgets/gimpdnd-xds.c | 3 ++- 7 files changed, 37 insertions(+), 12 deletions(-) commit 187e20f3673ffd1d437c9aeb1232c4764760616f Author: Massimo Valentini -Date: Fri May 18 17:20:38 2012 +0200 +Date: Fri May 18 17:20:38 2012 +0200 Bug 675981: Export as JPEG "save defaults" "load defaults" doesn't work @@ -16503,7 +17574,7 @@ commit 4fdb1ec90a9c72e17356d1123f3188d6ff9e9b4d Author: Michael Natterer -Date: Thu May 17 23:31:48 2012 +0200 +Date: Thu May 17 23:31:48 2012 +0200 Bug 676279 - Ctrl or Shift causes selection tools to reset... @@ -16517,7 +17588,7 @@ commit c8a3a4f19e402f8166e031cf6de8d1efbd7b974d Author: Jernej Simončič -Date: Thu May 17 17:44:43 2012 +0200 +Date: Thu May 17 17:44:43 2012 +0200 Fix license - it was still GPL2 @@ -16527,7 +17598,7 @@ commit a8070954349642ab1977424d8c7fc2178508b33e Author: Jernej Simončič -Date: Thu May 17 17:43:48 2012 +0200 +Date: Thu May 17 17:43:48 2012 +0200 Fix permissions @@ -16538,7 +17609,7 @@ commit 088c05e77f72de89005b7aabaad8a6eefc48d14c Author: Jernej Simončič -Date: Thu May 17 15:44:16 2012 +0200 +Date: Thu May 17 15:44:16 2012 +0200 Fix language file (XP SP3 required instead of SP2) @@ -16548,7 +17619,7 @@ commit f6ae4c83ae9c67a2b3b0001456e5ba1168d0953e Author: Jernej Simončič -Date: Thu May 17 15:43:28 2012 +0200 +Date: Thu May 17 15:43:28 2012 +0200 Skip asking for install directory when upgrading @@ -16557,7 +17628,7 @@ commit 2a88a5ce02a7de72fe4013e4671577bc7883a49f Author: Christian Kirbach -Date: Thu May 17 14:44:09 2012 +0200 +Date: Thu May 17 14:44:09 2012 +0200 Updated German translation @@ -16567,7 +17638,7 @@ commit 0b14297f0a70493b379820a1f405e4c2d57aa1d4 Author: Christian Kirbach -Date: Thu May 17 14:36:27 2012 +0200 +Date: Thu May 17 14:36:27 2012 +0200 Updated German translation @@ -16577,7 +17648,7 @@ commit 741daccf0238ccbc022b4e047698be0480e0a5be Author: Michael Natterer -Date: Thu May 17 01:14:22 2012 +0200 +Date: Thu May 17 01:14:22 2012 +0200 Revert "app (gimprc): Delete dead assignment" @@ -16592,7 +17663,7 @@ commit be2feeb11175732cb59c2a5acbcc027145310243 Author: Michael Natterer -Date: Thu May 17 00:07:46 2012 +0200 +Date: Thu May 17 00:07:46 2012 +0200 Bug 676164 - Text Tool selects hidden layers @@ -16605,7 +17676,7 @@ commit 82533e773427d7a435a1aff09b03a7b444657aee Author: Daniel Sabo -Date: Wed May 16 22:58:18 2012 +0200 +Date: Wed May 16 22:58:18 2012 +0200 Bug 675875 - Gimp Quartz doesn't respond to file open events from finder @@ -16619,7 +17690,7 @@ commit 942860ae32561163366bcd3fec201a00c82496d2 Author: Wouter Bolsterlee -Date: Wed May 16 00:39:22 2012 +0200 +Date: Wed May 16 00:39:22 2012 +0200 Updated Dutch translation (manual backport from master) @@ -16629,7 +17700,7 @@ commit 29dbea042e479269d5bb3fa061e2f278d0f8558c Author: Daniel Nylander -Date: Wed May 16 00:28:03 2012 +0200 +Date: Wed May 16 00:28:03 2012 +0200 Updated Swedish translation @@ -16639,7 +17710,7 @@ commit 8dc87ae32fecb17aa41d47a05d6770a4666c7c9f Author: Daniel Nylander -Date: Wed May 16 00:26:50 2012 +0200 +Date: Wed May 16 00:26:50 2012 +0200 Updated Swedish translation @@ -16649,7 +17720,7 @@ commit 780e88c353732e1c7397650626c54dc3f323fd79 Author: Daniel Nylander -Date: Wed May 16 00:22:41 2012 +0200 +Date: Wed May 16 00:22:41 2012 +0200 Updated Swedish translation @@ -16659,7 +17730,7 @@ commit 0e5e5c912bcca87729edfbeafe8bd092f3cd51bb Author: Clayton Walker -Date: Tue May 15 23:37:57 2012 +0200 +Date: Tue May 15 23:37:57 2012 +0200 build: start infrastructure to build GIMP.app on OSX @@ -16673,7 +17744,7 @@ commit 8d6004e06305d246258b00ed0baf6ce66748b04d Author: Michael Natterer -Date: Tue May 15 19:46:47 2012 +0200 +Date: Tue May 15 19:46:47 2012 +0200 Bug 676107 - Picking logic doesn't take group visibility into account @@ -16686,7 +17757,7 @@ commit d137a44af3c8f852aa4cf46979a59b7a168867f2 Author: Marco Ciampa -Date: Tue May 15 10:00:24 2012 +0200 +Date: Tue May 15 10:00:24 2012 +0200 Updated italian translation. @@ -16696,7 +17767,7 @@ commit d8f535cc3c6c23cb7bbc5e28b0c70187d11e61d7 Author: Praveen Illa -Date: Tue May 15 11:38:39 2012 +0530 +Date: Tue May 15 11:38:39 2012 +0530 Updated Telugu Translation @@ -16706,7 +17777,7 @@ commit 1e402a46f03d773d8e292033b18f15f7d4ab6fbd Author: Michael Natterer -Date: Mon May 14 01:44:41 2012 +0200 +Date: Mon May 14 01:44:41 2012 +0200 Bug 675994 - Opening image with a saved selection breaks histogram updating @@ -16718,69 +17789,69 @@ selection loading hack. (cherry picked from commit ab4c613a700daed56afbf06331f5c96a862b66b1) - app/core/gimpimage-private.h | 3 +++ - app/core/gimpimage.c | 35 + app/core/gimpimage-private.h | 3 +++ + app/core/gimpimage.c | 35 ++++++++++++++++++++++++++--------- app/widgets/gimphistogrameditor.c | 3 +++ - app/xcf/xcf-load.c | 9 +++------ + app/xcf/xcf-load.c | 9 +++------ 4 files changed, 35 insertions(+), 15 deletions(-) commit 601db438387f6d79aac0312103b28d54e72b87cd Author: Michael Natterer -Date: Mon May 14 00:07:52 2012 +0200 +Date: Mon May 14 00:07:52 2012 +0200 windows/installer: none of the files needs to be executable - build/windows/installer/32on64.isi | 0 - build/windows/installer/32on64.list | 0 - build/windows/installer/MessageWithURL.isi | 0 - build/windows/installer/associations.isi | 0 - build/windows/installer/directories.isi | 0 - build/windows/installer/en.setup.isl | 0 - build/windows/installer/files.isi | 0 - build/windows/installer/gimp3264.iss | 0 - build/windows/installer/gpl+python.rtf | 0 - build/windows/installer/installsplash.bmp | Bin - build/windows/installer/installsplash_small.bmp | Bin - build/windows/installer/rebootcontinue.isi | 0 - build/windows/installer/setup.ini | 0 - build/windows/installer/sl.setup.isl | 0 - build/windows/installer/uninst.isi | 0 - build/windows/installer/utils.isi | 0 - build/windows/installer/version.isi | 0 - build/windows/installer/wilber.bmp | Bin + build/windows/installer/32on64.isi | 0 + build/windows/installer/32on64.list | 0 + build/windows/installer/MessageWithURL.isi | 0 + build/windows/installer/associations.isi | 0 + build/windows/installer/directories.isi | 0 + build/windows/installer/en.setup.isl | 0 + build/windows/installer/files.isi | 0 + build/windows/installer/gimp3264.iss | 0 + build/windows/installer/gpl+python.rtf | 0 + build/windows/installer/installsplash.bmp | Bin + build/windows/installer/installsplash_small.bmp | Bin + build/windows/installer/rebootcontinue.isi | 0 + build/windows/installer/setup.ini | 0 + build/windows/installer/sl.setup.isl | 0 + build/windows/installer/uninst.isi | 0 + build/windows/installer/utils.isi | 0 + build/windows/installer/version.isi | 0 + build/windows/installer/wilber.bmp | Bin build/windows/installer/windows-installer-intro-big.bmp | Bin build/windows/installer/windows-installer-intro-small.bmp | Bin 20 files changed, 0 insertions(+), 0 deletions(-) commit 70ca141159613d40d251a65f3ff7b591eba9e027 Author: Jernej Simončič -Date: Mon May 14 00:01:17 2012 +0200 +Date: Mon May 14 00:01:17 2012 +0200 Windows installer - initial import - build/windows/installer/32on64.isi | 60 + - build/windows/installer/32on64.list | 48 + - build/windows/installer/MessageWithURL.isi | 505 +++++++ - build/windows/installer/associations.isi | 318 +++++ - build/windows/installer/directories.isi | 36 + - build/windows/installer/en.setup.isl | 108 ++ - build/windows/installer/files.isi | 27 + - build/windows/installer/gimp3264.iss | 1382 + build/windows/installer/32on64.isi | 60 + + build/windows/installer/32on64.list | 48 + + build/windows/installer/MessageWithURL.isi | 505 +++++++ + build/windows/installer/associations.isi | 318 +++++ + build/windows/installer/directories.isi | 36 + + build/windows/installer/en.setup.isl | 108 ++ + build/windows/installer/files.isi | 27 + + build/windows/installer/gimp3264.iss | 1382 ++++++++++++++++++++ - build/windows/installer/gpl+python.rtf | 123 ++ - build/windows/installer/installsplash.bmp | Bin 0 -> 770874 + build/windows/installer/gpl+python.rtf | 123 ++ + build/windows/installer/installsplash.bmp | Bin 0 -> 770874 bytes build/windows/installer/installsplash_small.bmp | Bin 0 -> 537174 bytes - build/windows/installer/rebootcontinue.isi | 128 ++ - build/windows/installer/setup.ini | 29 + - build/windows/installer/sl.setup.isl | 100 ++ - build/windows/installer/uninst.isi | 269 ++++ - build/windows/installer/utils.isi | 139 ++ - build/windows/installer/version.isi | 28 + - build/windows/installer/wilber.bmp | Bin 0 -> 4158 bytes - .../installer/windows-installer-intro-big.bmp | Bin 0 -> 221814 + build/windows/installer/rebootcontinue.isi | 128 ++ + build/windows/installer/setup.ini | 29 + + build/windows/installer/sl.setup.isl | 100 ++ + build/windows/installer/uninst.isi | 269 ++++ + build/windows/installer/utils.isi | 139 ++ + build/windows/installer/version.isi | 28 + + build/windows/installer/wilber.bmp | Bin 0 -> 4158 bytes + .../installer/windows-installer-intro-big.bmp | Bin 0 -> 221814 bytes .../installer/windows-installer-intro-small.bmp | Bin 0 -> 154542 bytes @@ -16788,7 +17859,7 @@ commit 36bb8a625bdb561b8eb13ba12d3148416e11aa0e Author: Michael Natterer -Date: Sun May 13 20:19:40 2012 +0200 +Date: Sun May 13 20:19:40 2012 +0200 app: default to half the physical memory for the tile-cache-size setting @@ -16800,7 +17871,7 @@ commit ef9972da7a12fb4ed9bb48206da622ef128ce0b2 Author: Jihui Choi -Date: Mon May 14 00:48:50 2012 +0900 +Date: Mon May 14 00:48:50 2012 +0900 Update Korean translation @@ -16811,7 +17882,7 @@ commit 5a241911b59c87694ff07e0f5bb6d67df69fc3d6 Author: sebul -Date: Mon May 14 00:45:29 2012 +0900 +Date: Mon May 14 00:45:29 2012 +0900 Update Korean translation @@ -16821,7 +17892,7 @@ commit a23a5692cc46bce13a175df268ae1f5a7aac2919 Author: Michael Natterer -Date: Sat May 12 20:56:30 2012 +0200 +Date: Sat May 12 20:56:30 2012 +0200 libgimpbase: implement relocation for OSX @@ -16834,7 +17905,7 @@ commit d8ce061715a362971ab81f0300d150d4af327a0b Author: Michael Natterer -Date: Sat May 12 16:48:05 2012 +0200 +Date: Sat May 12 16:48:05 2012 +0200 libgimpbase: it's "GIMP" not "Gimp" (cherry picked from commit 4805f875ef6b980c1dba2f2bbd724080def1b61e) @@ -16844,19 +17915,19 @@ commit e87b912d706a4ac0ccb162d080efab13ff6ba3d8 Author: Rudolfs Mazurs -Date: Sat May 12 16:24:38 2012 +0300 +Date: Sat May 12 16:24:38 2012 +0300 Updated Latvian translation. po-libgimp/lv.po | 74 +-- po-plug-ins/lv.po | 1239 +++++++++++++++++++++-------------- - po/lv.po | 1883 + po/lv.po | 1883 +++++++++++++++++++++++++++-------------------------- 3 files changed, 1736 insertions(+), 1460 deletions(-) commit 46127dc789762b5ac1b614f7399f5f610394be72 Author: Michael Natterer -Date: Sat May 12 14:39:44 2012 +0200 +Date: Sat May 12 14:39:44 2012 +0200 Move gimpdir and thumbnails to proper places on OSX @@ -16869,18 +17940,18 @@ Remove the obsolete CABON_CFLAGS from all makefiles. (cherry picked from commit 9112d68488f44408774f571e7d8fb48e41402674) - app/Makefile.am | 1 - - app/core/gimp-user-install.c | 25 +++++++++++++++++++------ - configure.ac | 4 ++++ - libgimpbase/Makefile.am | 25 ++++++++++++++++--------- - libgimpbase/gimpenv.c | 25 +++++++++++++++++++++++++ - libgimpthumb/Makefile.am | 11 +++++++++-- + app/Makefile.am | 1 - + app/core/gimp-user-install.c | 25 +++++++++++++++++++------ + configure.ac | 4 ++++ + libgimpbase/Makefile.am | 25 ++++++++++++++++--------- + libgimpbase/gimpenv.c | 25 +++++++++++++++++++++++++ + libgimpthumb/Makefile.am | 11 +++++++++-- libgimpthumb/gimpthumb-utils.c | 34 ++++++++++++++++++++++++++++++---- 7 files changed, 103 insertions(+), 22 deletions(-) commit cb2de506971d8b059a472336cf2d12eb2a8ab226 Author: Michael Muré -Date: Fri May 11 12:34:53 2012 +0900 +Date: Fri May 11 12:34:53 2012 +0900 cage tool: fix handle added in the wrong side of the cage @@ -16893,7 +17964,7 @@ commit f8bcdcb9a58c832de2ac6bec8b1d27ceb68acb67 Author: Michael Muré -Date: Fri May 11 12:02:58 2012 +0900 +Date: Fri May 11 12:02:58 2012 +0900 Bug 675825 - (cage) simply using cage transform tool makes gimp to crash. @@ -16906,7 +17977,7 @@ commit fa8a5a63ab42e8780bc3c379d50b2ac4e6a76463 Author: Michael Henning -Date: Tue May 8 16:39:38 2012 -0400 +Date: Tue May 8 16:39:38 2012 -0400 Bug 568098 - Healing Tool doesn't work at the layer borders. @@ -16918,7 +17989,7 @@ commit e5ef5445590a276ee6113fc78b5466e67a42c023 Author: Michael Natterer -Date: Thu May 10 19:42:05 2012 +0200 +Date: Thu May 10 19:42:05 2012 +0200 app: make the popup previews transient to their parent's toplevel @@ -16931,7 +18002,7 @@ commit 97eaae443076369860a9b4f4137e898b61acdae4 Author: Piotr Drąg -Date: Thu May 10 19:24:42 2012 +0200 +Date: Thu May 10 19:24:42 2012 +0200 Updated Polish translation @@ -16940,7 +18011,7 @@ commit 136cea976f2e8bc00c08a00decd4b4c2e942a721 Author: Daniel Mustieles -Date: Thu May 10 18:06:14 2012 +0200 +Date: Thu May 10 18:06:14 2012 +0200 Updated Spanish translation @@ -16950,7 +18021,7 @@ commit 097ed17822ce0da71e7c56ba3294a8d0b4deb370 Author: Khaled Hosny -Date: Thu May 10 10:16:05 2012 +0200 +Date: Thu May 10 10:16:05 2012 +0200 Fix Arabic translation of tags-locale @@ -16959,7 +18030,7 @@ commit d661bc34031a7843faa36d6701843026c5acc5be Author: Martin Srebotnjak -Date: Thu May 10 09:36:43 2012 +0200 +Date: Thu May 10 09:36:43 2012 +0200 Updated Slovenian translation @@ -16969,7 +18040,7 @@ commit c3d43d8378763216fde4ddb488b9c719b8f03bd9 Author: Martin Srebotnjak -Date: Thu May 10 09:36:07 2012 +0200 +Date: Thu May 10 09:36:07 2012 +0200 Updated Slovenian translation @@ -16979,7 +18050,7 @@ commit 062d38d141907d095b92e7a1adc05cd1bc870be2 Author: Michael Natterer -Date: Thu May 10 01:10:27 2012 +0200 +Date: Thu May 10 01:10:27 2012 +0200 Bug 675399 - Mention that the image was at least exported in the close... @@ -16993,7 +18064,7 @@ commit c4d14752a70cbcc18e57241748c7b3c3da8a250c Author: Michael Natterer -Date: Wed May 9 00:20:06 2012 +0200 +Date: Wed May 9 00:20:06 2012 +0200 Bug 630173 - a dockable open from an existing one appears under it @@ -17006,7 +18077,7 @@ commit 8af18fb9d56d1e6b7f3dad164c52e7a36e216925 Author: Marek Černocký -Date: Tue May 8 21:46:31 2012 +0200 +Date: Tue May 8 21:46:31 2012 +0200 Updated Czech translation @@ -17016,7 +18087,7 @@ commit 7f37903b11e2f4db92814d152484747bf35a582f Author: Michael Natterer -Date: Tue May 8 21:32:09 2012 +0200 +Date: Tue May 8 21:32:09 2012 +0200 app: make GimpContainerPopup transient to its parent toplevel @@ -17029,7 +18100,7 @@ commit 562862a486f0f26a8a812e6c19a845eadfb525f0 Author: Jordi Mallach -Date: Tue May 8 20:27:51 2012 +0200 +Date: Tue May 8 20:27:51 2012 +0200 Fix Catalan translation for “tags-locale”. @@ -17038,7 +18109,7 @@ commit 8ec5e865141925a482d5e187090b97d243aae11c Author: Michael Natterer -Date: Tue May 8 08:08:05 2012 +0200 +Date: Tue May 8 08:08:05 2012 +0200 AUTHORS: commit generated file @@ -17047,7 +18118,7 @@ commit a7c57d016f3534877b6563f012957078cf426229 Author: Sebul -Date: Mon May 7 01:41:41 2012 +0900 +Date: Mon May 7 01:41:41 2012 +0900 Updated Korean translation @@ -17057,7 +18128,7 @@ commit 7ef8a96465eea86944df381c88a6c845de5aea2e Author: Michael Natterer -Date: Sat May 5 21:42:04 2012 +0200 +Date: Sat May 5 21:42:04 2012 +0200 app: don't call gimp_image_flush() when cancelling GimpImageMapTool @@ -17075,7 +18146,7 @@ commit 32a0c6355ea034db485424ff79605eb2bb903bce Author: Michael Natterer -Date: Sat May 5 18:58:04 2012 +0200 +Date: Sat May 5 18:58:04 2012 +0200 app: fix UI tag matching to always work case-insensitively @@ -17084,26 +18155,26 @@ GimpTagPopup to use gimp_tag_compare_with_string(). (cherry picked from commit 30b4fe85105d80bfc67901711a6c54a0561d4a5d) - app/core/gimptag.c | 38 +++++++++++++++++++++++++++++++++++++- - app/core/gimptag.h | 2 ++ + app/core/gimptag.c | 38 +++++++++++++++++++++++++++++++++++++- + app/core/gimptag.h | 2 ++ app/widgets/gimptagentry.c | 18 ++++++++---------- app/widgets/gimptagpopup.c | 23 +++++++++-------------- 4 files changed, 56 insertions(+), 25 deletions(-) commit 1421545bd62fe6f46a65bb555a64f82061ea6f0b Author: Hleb Valoshka <375gnu@gmail.com> -Date: Sat May 5 15:07:02 2012 +0300 +Date: Sat May 5 15:07:02 2012 +0300 Updated Belarusian translation. po-plug-ins/be.po | 182 +- - po/be.po | 5938 + po/be.po | 5938 +++++++++++++++++++++++++---------------------------- 2 files changed, 2932 insertions(+), 3188 deletions(-) commit df1e7763faf40aeefb9e063c00395cd13e80bba6 Author: Sebastian Pipping -Date: Fri May 4 23:10:30 2012 +0200 +Date: Fri May 4 23:10:30 2012 +0200 Fix configure option --with[out]-bzip2 @@ -17112,7 +18183,7 @@ commit 4c66e50763dac2eebfd9b6fc4dd579a8f5df422c Author: Michael Natterer -Date: Sat May 5 00:17:51 2012 +0200 +Date: Sat May 5 00:17:51 2012 +0200 app: make sure Ctrl+E doesn't invoke "Export to" when it's invisible @@ -17121,7 +18192,7 @@ commit 862865e37912f03653de481bc8c4edbb9084c95c Author: Khaled Hosny -Date: Fri May 4 18:19:29 2012 +0200 +Date: Fri May 4 18:19:29 2012 +0200 Updated Arabic translation @@ -17130,7 +18201,7 @@ commit f5b184d0d7c63e9367f88aa596535b9432c14409 Author: Marek Černocký -Date: Fri May 4 15:23:12 2012 +0200 +Date: Fri May 4 15:23:12 2012 +0200 Updated Czech translation @@ -17140,7 +18211,7 @@ commit 4be1d3471bc41618707cd0e3dc76f303c38f5a8b Author: Hleb Valoshka <375gnu@gmail.com> -Date: Fri May 4 12:07:20 2012 +0300 +Date: Fri May 4 12:07:20 2012 +0300 Updated Belarusian translation. @@ -17150,7 +18221,7 @@ commit 547e9ee7137fa24851b4cba0ed1046490d32349e Author: Kiyotaka NISHIBORI -Date: Thu May 3 19:03:36 2012 +0900 +Date: Thu May 3 19:03:36 2012 +0900 [l10n] Update Japanese translation @@ -17160,7 +18231,7 @@ commit 5b59af7c2ec17c1eed8fc71a36244f7106815f25 Author: Michael Natterer -Date: Thu May 3 00:35:03 2012 +0200 +Date: Thu May 3 00:35:03 2012 +0200 libgimp: don't recurse infinitely in gimp_parasite_detach() @@ -17169,17 +18240,17 @@ commit 569c1221379b46f6391531bac6bd36f7decade08 Author: Michael Natterer -Date: Thu May 3 00:25:08 2012 +0200 +Date: Thu May 3 00:25:08 2012 +0200 libgimp: fix docs of deprecated functions libgimp/gimpdrawable.c | 2 +- - libgimp/gimpimage.c | 4 ++-- + libgimp/gimpimage.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit f32706a0d1f587b06cff01a9e32ce8b6c895faee Author: Michael Natterer -Date: Thu May 3 00:24:19 2012 +0200 +Date: Thu May 3 00:24:19 2012 +0200 libgimp: don't recurse infinitely in deprecated gimpvectors functions @@ -17188,7 +18259,7 @@ commit f7cffc0d6c94599415cf6a2097996ee96e9f632b Author: Mikael Magnusson -Date: Wed May 2 17:02:29 2012 +0200 +Date: Wed May 2 17:02:29 2012 +0200 authors.xml: Add Bernhard Stockmann @@ -17197,7 +18268,7 @@ commit 7757edd7021e991781a7ea3bea1db094be825eeb Author: Michael Natterer -Date: Wed May 2 16:49:06 2012 +0200 +Date: Wed May 2 16:49:06 2012 +0200 configure: post-release version bump to 2.8.1 @@ -17206,7 +18277,7 @@ commit 5e9f1dd0ea921ee2db4ae1788495ccea676b1ad8 Author: Alexandre Prokoudine -Date: Wed May 2 18:17:00 2012 +0400 +Date: Wed May 2 18:17:00 2012 +0400 Updated Russian translation @@ -17215,7 +18286,7 @@ commit 98b6c83179c6ffc8e62d188de534da47d5a51e90 Author: Simon Budig -Date: Wed May 2 14:01:49 2012 +0200 +Date: Wed May 2 14:01:49 2012 +0200 new splash for gimp 2.8, made by Bernhard Stockmann @@ -17224,7 +18295,7 @@ commit 3b14851b6d7e95113155fe3d44883d9fea575359 Author: Michael Natterer -Date: Wed May 2 11:43:04 2012 +0200 +Date: Wed May 2 11:43:04 2012 +0200 configure: set version to 2.8.0 @@ -17233,22 +18304,22 @@ commit 88c5ea08855686499240028f850b5b09c93babe2 Author: Dimitris Spingos -Date: Tue May 1 17:01:52 2012 +0400 +Date: Tue May 1 17:01:52 2012 +0400 Updated translation into Greek po-libgimp/el.po | 498 ++++--- po-plug-ins/el.po | 468 ++++--- - po-python/el.po | 53 +- + po-python/el.po | 53 +- po-script-fu/el.po | 3857 +++++++++++++++++++++------------------------------- - po-tips/el.po | 57 +- - po/el.po | 298 ++-- + po-tips/el.po | 57 +- + po/el.po | 298 ++-- 6 files changed, 2193 insertions(+), 3038 deletions(-) commit 0d43a096bb6c32eec53c69cabfffc1b0aab1aad3 Author: Daniel Mustieles -Date: Tue May 1 12:26:03 2012 +0200 +Date: Tue May 1 12:26:03 2012 +0200 Updated Spanish translation @@ -17258,7 +18329,7 @@ commit 3d571311bdef8b938331a9653cd59c75b2ca3254 Author: Piotr Drąg -Date: Sun Apr 29 22:35:10 2012 +0200 +Date: Sun Apr 29 22:35:10 2012 +0200 Updated Polish translation @@ -17268,7 +18339,7 @@ commit c360b634ccf5fca899a4a1b8950d4ba6397f23a4 Author: Marco Ciampa -Date: Sun Apr 29 18:00:15 2012 +0200 +Date: Sun Apr 29 18:00:15 2012 +0200 Small fix in italian translation @@ -17277,7 +18348,7 @@ commit 3bb0c72a91e4ed710567fea333d2ed2a7530e385 Author: Marco Ciampa -Date: Sun Apr 29 16:28:25 2012 +0200 +Date: Sun Apr 29 16:28:25 2012 +0200 Small fix in italian translation @@ -17286,7 +18357,7 @@ commit 5c67789554b0a53e9efc69abfab32da79d70cc72 Author: Marco Ciampa -Date: Sun Apr 29 03:10:17 2012 +0200 +Date: Sun Apr 29 03:10:17 2012 +0200 Updated italian translation @@ -17296,19 +18367,19 @@ commit 824a21ba1e2888dc54461591d27a175581af999b Author: Daniel Korostil -Date: Sun Apr 29 03:20:38 2012 +0300 +Date: Sun Apr 29 03:20:38 2012 +0300 Uploaded Ukranian po-plug-ins/uk.po | 32 ++-- po-script-fu/uk.po | 204 ++++++++++---------- - po/uk.po | 546 + po/uk.po | 546 ++++++++++++++++++++++++++--------------------------- 3 files changed, 391 insertions(+), 391 deletions(-) commit 8934665661c355bb03af0d1163fccd8dcbbe3bfd Author: Michael Natterer -Date: Sun Apr 29 00:36:26 2012 +0200 +Date: Sun Apr 29 00:36:26 2012 +0200 po-plug-ins: add plug-ins/metadata/interface.c to POTFILES.in @@ -17317,7 +18388,7 @@ commit 2a63e54e816e2102587b22b954c8145ae0085790 Author: A S Alam -Date: Sat Apr 28 23:39:45 2012 +0530 +Date: Sat Apr 28 23:39:45 2012 +0530 update Punjabi Translation for gimp @@ -17327,7 +18398,7 @@ commit b5081a67d89d52698f239bc64ebb1bd947641931 Author: Marco Ciampa -Date: Thu Apr 26 11:30:57 2012 +0200 +Date: Thu Apr 26 11:30:57 2012 +0200 Small adj on text tool menu command translation @@ -17336,7 +18407,7 @@ commit 1dea07a0187b1b5a909510210eb7b4c0973aefd7 Author: Marco Ciampa -Date: Thu Apr 26 08:36:36 2012 +0200 +Date: Thu Apr 26 08:36:36 2012 +0200 Another small fix in italian translation. @@ -17345,7 +18416,7 @@ commit c3474d43ceafd6ee11ea70778fdb0ec52de35789 Author: Marco Ciampa -Date: Thu Apr 26 08:35:01 2012 +0200 +Date: Thu Apr 26 08:35:01 2012 +0200 Small typo in italian translation. @@ -17354,17 +18425,17 @@ commit 0f656b9543f3ec3e415a0d4d536bd1ba60be246d Author: Michael Natterer -Date: Tue Apr 24 22:10:49 2012 +0200 +Date: Tue Apr 24 22:10:49 2012 +0200 plug-ins: depend on librsvg >= 2.36.0 and half-undeprecate file-svg - configure.ac | 2 +- + configure.ac | 2 +- plug-ins/common/file-svg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit 8cd272bb8024886822185e9c39be276bf1c97a4e Author: Enrico Schröder -Date: Fri Apr 1 22:19:34 2011 +0200 +Date: Fri Apr 1 22:19:34 2011 +0200 Heal: Make HealTool work when brush is partially outside of layer @@ -17378,7 +18449,7 @@ commit 2920344524aa358c589897c39b0438cc99817b04 Author: Michael Henning -Date: Sat Apr 21 15:59:42 2012 -0400 +Date: Sat Apr 21 15:59:42 2012 -0400 app: Prevent uninitialized values in the heal tool. @@ -17390,7 +18461,7 @@ commit 450f711999bf3775af3031af9dd7e564babf7d1d Author: Åsmund Skjæveland -Date: Tue Apr 24 07:36:12 2012 +0200 +Date: Tue Apr 24 07:36:12 2012 +0200 Updated Norwegian Bokmål translation @@ -17399,7 +18470,7 @@ commit 24e6b20be83f9242ada2e03ddb17dab5145386cf Author: Michael Natterer -Date: Sat Apr 21 22:42:53 2012 +0200 +Date: Sat Apr 21 22:42:53 2012 +0200 Bug 674373 - Resizing Mask size is making gimp to crash @@ -17412,7 +18483,7 @@ commit 75242a03e45ce751656384480e747ca30d728206 Author: João S. O. Bueno -Date: Fri Apr 20 04:49:16 2012 -0300 +Date: Fri Apr 20 04:49:16 2012 -0300 pygimp: adds proper support for layer groups @@ -17420,28 +18491,28 @@ by calling gimp.Item.from_id. This adds a Python GroupLayer class. - plug-ins/pygimp/gimpmodule.c | 11 ++++ - plug-ins/pygimp/pygimp-api.h | 7 ++- + plug-ins/pygimp/gimpmodule.c | 11 ++++ + plug-ins/pygimp/pygimp-api.h | 7 ++- plug-ins/pygimp/pygimp-drawable.c | 112 ++++++++++++++++++++++++++++++++++++++ plug-ins/pygimp/pygimp-image.c | 16 +++--- - plug-ins/pygimp/pygimp.h | 4 ++ + plug-ins/pygimp/pygimp.h | 4 ++ 5 files changed, 141 insertions(+), 9 deletions(-) commit 445b467e1ac99e41ec2643627406e6151a83a67c Author: Daniel Șerbănescu -Date: Thu Apr 19 16:20:33 2012 +0200 +Date: Thu Apr 19 16:20:33 2012 +0200 Updated Romanian Translation po-plug-ins/ro.po | 577 ++++++++++++++++++++++++------------------------------ - po-tips/ro.po | 17 +- + po-tips/ro.po | 17 +- 2 files changed, 259 insertions(+), 335 deletions(-) commit 13f178afd121a0b8f74fc8677a8b4f0511fef104 Author: Daniel Șerbănescu -Date: Thu Apr 19 16:11:57 2012 +0200 +Date: Thu Apr 19 16:11:57 2012 +0200 Updated Romanian Translation @@ -17451,29 +18522,29 @@ commit 1709c0fcc9cfe1b3d3c46b35457a4727b2e278c2 Author: Praveen Illa -Date: Tue Apr 17 00:23:57 2012 +0530 +Date: Tue Apr 17 00:23:57 2012 +0530 Added Telugu Translation - po-libgimp/LINGUAS | 1 + + po-libgimp/LINGUAS | 1 + po-libgimp/te.po | 2093 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 2094 insertions(+) commit 1c205b001d05d46a9322e4de4ae246b895ce0314 Author: Mark Kwidzińsczi -Date: Mon Apr 16 19:55:42 2012 +0200 +Date: Mon Apr 16 19:55:42 2012 +0200 Added Kashubian translation - po/LINGUAS | 1 + + po/LINGUAS | 1 + po/csb.po | 15756 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 15757 insertions(+) commit 864badcfd2ab6b00483b767d641cc397a5579e31 Author: João S. O. Bueno -Date: Mon Apr 16 12:51:23 2012 -0300 +Date: Mon Apr 16 12:51:23 2012 -0300 Updated Brazilian Portuguese translation @@ -17484,12 +18555,12 @@ po-script-fu/pt_BR.po | 1117 ++++---- po-tags/pt_BR.po | 21 +- po-tips/pt_BR.po | 29 +- - po/pt_BR.po | 88 +- + po/pt_BR.po | 88 +- 7 files changed, 5645 insertions(+), 4330 deletions(-) commit 300cf85527ad2462a934d0b5b7047cfacbd6e59a Author: Kiran Kumar Chava -Date: Mon Apr 16 11:27:19 2012 +0530 +Date: Mon Apr 16 11:27:19 2012 +0530 Updated Telugu Translation @@ -17499,7 +18570,7 @@ commit e1dc3c440db0364aaa9151fa7b8274422eacb6f5 Author: João S. O. Bueno -Date: Sun Apr 15 23:14:50 2012 -0300 +Date: Sun Apr 15 23:14:50 2012 -0300 Update Brazilian Portuguese translation @@ -17509,7 +18580,7 @@ commit 257224ff997ff06453bff9c8c1a26da64f4bfc83 Author: Massimo Valentini -Date: Sat Apr 14 18:39:49 2012 +0200 +Date: Sat Apr 14 18:39:49 2012 +0200 Bug 674024: Store in .png does not compress @@ -17520,31 +18591,31 @@ commit cf084021611a8b0536525ee1a8b8865240c3f17e Author: Alan Monfort -Date: Sat Apr 14 12:36:36 2012 +0200 +Date: Sat Apr 14 12:36:36 2012 +0200 Updated Breton translation po-libgimp/br.po | 272 ++++++------ po-plug-ins/br.po | 955 +++++++++++++++++++++------------------ - po-tips/br.po | 198 +++------ - po/br.po | 1275 + po-tips/br.po | 198 +++------ + po/br.po | 1275 ++++++++++++++++++++++++++++------------------------- 4 files changed, 1417 insertions(+), 1283 deletions(-) commit 0025f9f354ac0eec67eb65dd28518b24a72c4a8e Author: Mikael Magnusson -Date: Thu Apr 12 01:27:43 2012 +0200 +Date: Thu Apr 12 01:27:43 2012 +0200 fix typo "equalizee" - app/pdb/color-cmds.c | 2 +- + app/pdb/color-cmds.c | 2 +- libgimp/gimpcolor_pdb.c | 2 +- tools/pdbgen/pdb/color.pdb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit ff6c2807bea09d8e0488658b74ac5d903a9a6bb4 Author: Nils Philippsen -Date: Wed Apr 11 19:04:58 2012 +0200 +Date: Wed Apr 11 19:04:58 2012 +0200 app: add a little more headroom to the smudge buffer @@ -17557,7 +18628,7 @@ commit 2d692fe0fad3b8b6898dee0a996bff192f6011fc Author: Kristjan SCHMIDT -Date: Fri Apr 6 22:27:53 2012 +0200 +Date: Fri Apr 6 22:27:53 2012 +0200 Updated Esperanto translation @@ -17566,7 +18637,7 @@ commit a12c158e171820a4abe37d5a047944b00954e83e Author: Kristjan SCHMIDT -Date: Fri Apr 6 22:19:51 2012 +0200 +Date: Fri Apr 6 22:19:51 2012 +0200 Updated Esperanto translation @@ -17576,7 +18647,7 @@ commit 2568c04dfaa84dc0b7861150e24a38bf97b9d675 Author: Kristjan SCHMIDT -Date: Fri Apr 6 22:03:21 2012 +0200 +Date: Fri Apr 6 22:03:21 2012 +0200 Updated Esperanto translation @@ -17585,7 +18656,7 @@ commit bafd8f5b525a47468d5ff8c14d22d78751377d87 Author: Kristjan SCHMIDT -Date: Fri Apr 6 21:49:41 2012 +0200 +Date: Fri Apr 6 21:49:41 2012 +0200 Updated Esperanto translation @@ -17595,7 +18666,7 @@ commit b1894f7e51c9eb2e3a775866c7f3211ad48b5285 Author: Kristjan SCHMIDT -Date: Fri Apr 6 21:25:26 2012 +0200 +Date: Fri Apr 6 21:25:26 2012 +0200 Updated Esperanto translation @@ -17605,7 +18676,7 @@ commit ee758108995ca35c2430c0859e116f8d4ead53ef Author: Kristjan SCHMIDT -Date: Fri Apr 6 21:06:57 2012 +0200 +Date: Fri Apr 6 21:06:57 2012 +0200 Updated Esperanto translation @@ -17614,7 +18685,7 @@ commit d93464fac79d310ce49e2a490cebf572fdfb4f5f Author: Kristjan SCHMIDT -Date: Fri Apr 6 20:51:41 2012 +0200 +Date: Fri Apr 6 20:51:41 2012 +0200 Updated Esperanto translation @@ -17624,7 +18695,7 @@ commit 1192eed795750583475ea81c74aaf61e8b365fad Author: Kristjan SCHMIDT -Date: Fri Apr 6 18:33:11 2012 +0200 +Date: Fri Apr 6 18:33:11 2012 +0200 Updated Esperanto translation @@ -17633,7 +18704,7 @@ commit 2827589a498152f97dd351e13b1d60ded4e364ff Author: Kristjan SCHMIDT -Date: Fri Apr 6 18:30:46 2012 +0200 +Date: Fri Apr 6 18:30:46 2012 +0200 Updated Esperanto translation @@ -17642,7 +18713,7 @@ commit 87acb49ec244986663a71eedba115bc9c2254971 Author: Kristjan SCHMIDT -Date: Fri Apr 6 18:27:35 2012 +0200 +Date: Fri Apr 6 18:27:35 2012 +0200 Updated Esperanto translation @@ -17652,7 +18723,7 @@ commit 318c470d85f5cccf661c9aa2ab2676e7c1aacf93 Author: Kiyotaka NISHIBORI -Date: Fri Apr 6 22:30:45 2012 +0900 +Date: Fri Apr 6 22:30:45 2012 +0900 [l10n] Update Japanese translation @@ -17662,7 +18733,7 @@ commit 51c1133eb36fd9033d2e161d8ebc71e56c5aa35f Author: Vanessa Gomes de Lima -Date: Thu Apr 5 01:10:02 2012 -0300 +Date: Thu Apr 5 01:10:02 2012 -0300 Updated Brazilian Portuguese translation (partial) @@ -17672,7 +18743,7 @@ commit e1dcba190eac7ec5534e9ae745ff657b6d78a8d6 Author: Michael Natterer -Date: Wed Apr 4 11:35:59 2012 +0200 +Date: Wed Apr 4 11:35:59 2012 +0200 app: don't leak one TempBuf per blurred brush mask/pixmap @@ -17682,7 +18753,7 @@ commit d4af5f825f903ff9071e547e7d7c0fad1ddedca8 Author: Alexandre Prokoudine -Date: Tue Apr 3 18:55:36 2012 +0400 +Date: Tue Apr 3 18:55:36 2012 +0400 po-plug-ins: updated Russian translation @@ -17692,35 +18763,35 @@ commit 382428773f069374e32f6ddc0712712a6d6588f4 Author: Michael Natterer -Date: Tue Apr 3 02:24:14 2012 +0200 +Date: Tue Apr 3 02:24:14 2012 +0200 Changes to generated files due to making dist in 2.8 for the first time docs/gimprc.5.in | 6 +++--- - etc/gimprc | 6 +++--- + etc/gimprc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) commit aeaee84df7d5c4318f2a74c13272a5a30dab7914 Author: Michael Natterer -Date: Tue Apr 3 00:56:41 2012 +0200 +Date: Tue Apr 3 00:56:41 2012 +0200 Update generated gimprc files docs/gimprc.5.in | 7 +++++++ - etc/gimprc | 6 ++++++ + etc/gimprc | 6 ++++++ 2 files changed, 13 insertions(+) commit 531709c8dbfb1691bef8776a42fafb24c2e95d1c Author: Michael Natterer -Date: Tue Apr 3 00:53:04 2012 +0200 +Date: Tue Apr 3 00:53:04 2012 +0200 Depend on ATK 2.2.0, GTK+ 2.24.10, GdkPixbuf 2.24.1 And do some final NEWS adjustments for RC1 INSTALL | 10 +++++----- - NEWS | 24 ++---------------------- + NEWS | 24 ++---------------------- app/gui/gui.c | 2 +- app/sanity.c | 2 +- configure.ac | 6 +++--- @@ -17728,7 +18799,7 @@ commit 36c52537e4a3ffe17538ad502bf92d7fd29f2287 Author: Øyvind Kolås -Date: Mon Apr 2 23:02:30 2012 +0100 +Date: Mon Apr 2 23:02:30 2012 +0100 bump babl req versions to 0.1.10 and gegl to 0.2.0 @@ -17738,7 +18809,7 @@ commit 92529226512f9d0564430783324a2884e7957346 Author: Michael Natterer -Date: Mon Apr 2 12:33:26 2012 +0200 +Date: Mon Apr 2 12:33:26 2012 +0200 Depend on GEGL 0.1.9 and use the new gegk-0.1 pkg-config file @@ -17748,7 +18819,7 @@ commit 90706f84277e23b3b4d100e99ec354385a45b022 Author: Michael Natterer -Date: Mon Apr 2 11:50:47 2012 +0200 +Date: Mon Apr 2 11:50:47 2012 +0200 app: make sure explicitly saved color tool settings don't end up in "recent" @@ -17763,7 +18834,7 @@ commit 657a2661b25b90af45d6ad09d2362c3ed6648ec8 Author: Michael Natterer -Date: Mon Apr 2 11:49:22 2012 +0200 +Date: Mon Apr 2 11:49:22 2012 +0200 app: fix saving of the settings' timestamp in color tool config classes @@ -17772,14 +18843,14 @@ ourselves. app/gegl/gimpcolorbalanceconfig.c | 3 +++ - app/gegl/gimpcurvesconfig.c | 3 +++ + app/gegl/gimpcurvesconfig.c | 3 +++ app/gegl/gimphuesaturationconfig.c | 3 +++ - app/gegl/gimplevelsconfig.c | 3 +++ + app/gegl/gimplevelsconfig.c | 3 +++ 4 files changed, 12 insertions(+) commit 82d7e5a91a1af15faa9ca9bd790cef721bfa5a8a Author: Martin Nordholts -Date: Sun Apr 1 13:42:07 2012 +0200 +Date: Sun Apr 1 13:42:07 2012 +0200 menus: Fix image-menu.xml dependencies @@ -17791,17 +18862,17 @@ commit cce13ecf3696c98d9bfbb15b4c431338da029d97 Author: Alexandre Prokoudine -Date: Sun Apr 1 13:59:22 2012 +0400 +Date: Sun Apr 1 13:59:22 2012 +0400 Added Russian translation of default resources tags in GIMP po-tags/LINGUAS | 1 + - po-tags/ru.po | 30 ++++++++++++++++++++++++++++++ + po-tags/ru.po | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) commit 08cbf159c11a08d377d7322c5bc621ead8924c69 Author: Martin Nordholts -Date: Sun Apr 1 11:44:12 2012 +0200 +Date: Sun Apr 1 11:44:12 2012 +0200 app/tests: Update gegl_buffer_get() code so it builds @@ -17811,7 +18882,7 @@ commit 8d80e6882074ede0ff4fe6934f2470f06783763d Author: Dimitris Spingos (Δημήτρης Σπίγγος) -Date: Sun Apr 1 09:50:52 2012 +0300 +Date: Sun Apr 1 09:50:52 2012 +0300 Updated Greek translation @@ -17821,23 +18892,23 @@ commit 5c706f2942dac72ce2ed62bd6457c6ac7157187a Author: Khaled Hosny -Date: Sun Apr 1 01:23:04 2012 +0200 +Date: Sun Apr 1 01:23:04 2012 +0200 Updated Arabic translation po-libgimp/ar.po | 228 +- po-plug-ins/ar.po | 6348 +++++++++++++++++++++++++++------------------------- - po-python/ar.po | 32 +- + po-python/ar.po | 32 +- po-script-fu/ar.po | 3829 ++++++++++++------------------- - po-tags/ar.po | 13 +- - po-tips/ar.po | 332 +-- - po/ar.po | 973 ++++---- + po-tags/ar.po | 13 +- + po-tips/ar.po | 332 +-- + po/ar.po | 973 ++++---- 7 files changed, 5607 insertions(+), 6148 deletions(-) commit 018b7884d759158e58222dfd1008b601aca4e963 Author: Piotr Drąg -Date: Sat Mar 31 01:38:57 2012 +0200 +Date: Sat Mar 31 01:38:57 2012 +0200 Updated Polish translation @@ -17847,7 +18918,7 @@ commit 817d516da49918555dc1088c08443cc5edef03f9 Author: Michael Natterer -Date: Fri Mar 30 10:13:23 2012 +0200 +Date: Fri Mar 30 10:13:23 2012 +0200 Depend on Babl 0.1.8 @@ -17858,7 +18929,7 @@ commit 1556773582f55b10d0cf51c77a66f4bee8a53cff Author: Michael Natterer -Date: Fri Mar 30 10:09:14 2012 +0200 +Date: Fri Mar 30 10:09:14 2012 +0200 app: don't set another scanner error after gimp_config_deserialize() failed @@ -17870,7 +18941,7 @@ commit 7cbd1c5739d088910ef408182c73838332235b87 Author: Michael Natterer -Date: Fri Mar 30 09:55:45 2012 +0200 +Date: Fri Mar 30 09:55:45 2012 +0200 app: don't dereference a NULL session_info->p->factory_entry @@ -17879,7 +18950,7 @@ commit 814f81b3891e08775e18516a028eb9f64a30e5b7 Author: Øyvind Kolås -Date: Thu Mar 29 22:40:30 2012 +0100 +Date: Thu Mar 29 22:40:30 2012 +0100 app: fix meta-data registration in TileSource op @@ -17888,7 +18959,7 @@ commit 17f92b737961859f2eb6f2de7facaa1b2dea29cf Author: Øyvind Kolås -Date: Thu Mar 29 22:21:05 2012 +0100 +Date: Thu Mar 29 22:21:05 2012 +0100 app: the destroy functions are gone from GEGL, use g_object_unref() instead @@ -17898,55 +18969,55 @@ commit eea7a40dbc1563fd3c7580329a702b93ba9172aa Author: Øyvind Kolås -Date: Thu Mar 29 19:22:22 2012 +0100 +Date: Thu Mar 29 19:22:22 2012 +0100 app: update GeglOps to new GEGL API - app/gegl/gimpoperationadditionmode.c | 6 ++++-- - app/gegl/gimpoperationantierasemode.c | 6 ++++-- - app/gegl/gimpoperationbehindmode.c | 6 ++++-- + app/gegl/gimpoperationadditionmode.c | 6 ++++-- + app/gegl/gimpoperationantierasemode.c | 6 ++++-- + app/gegl/gimpoperationbehindmode.c | 6 ++++-- app/gegl/gimpoperationbrightnesscontrast.c | 8 +++++--- - app/gegl/gimpoperationburnmode.c | 6 ++++-- - app/gegl/gimpoperationcagecoefcalc.c | 8 +++++--- - app/gegl/gimpoperationcagetransform.c | 8 +++++--- - app/gegl/gimpoperationcolorbalance.c | 8 +++++--- + app/gegl/gimpoperationburnmode.c | 6 ++++-- + app/gegl/gimpoperationcagecoefcalc.c | 8 +++++--- + app/gegl/gimpoperationcagetransform.c | 8 +++++--- + app/gegl/gimpoperationcolorbalance.c | 8 +++++--- app/gegl/gimpoperationcolorerasemode.c | 6 ++++-- - app/gegl/gimpoperationcolorize.c | 8 +++++--- - app/gegl/gimpoperationcolormode.c | 6 ++++-- - app/gegl/gimpoperationcurves.c | 8 +++++--- + app/gegl/gimpoperationcolorize.c | 8 +++++--- + app/gegl/gimpoperationcolormode.c | 6 ++++-- + app/gegl/gimpoperationcurves.c | 8 +++++--- app/gegl/gimpoperationdarkenonlymode.c | 6 ++++-- - app/gegl/gimpoperationdesaturate.c | 8 +++++--- + app/gegl/gimpoperationdesaturate.c | 8 +++++--- app/gegl/gimpoperationdifferencemode.c | 6 ++++-- - app/gegl/gimpoperationdissolvemode.c | 6 ++++-- - app/gegl/gimpoperationdividemode.c | 6 ++++-- - app/gegl/gimpoperationdodgemode.c | 6 ++++-- - app/gegl/gimpoperationerasemode.c | 6 ++++-- + app/gegl/gimpoperationdissolvemode.c | 6 ++++-- + app/gegl/gimpoperationdividemode.c | 6 ++++-- + app/gegl/gimpoperationdodgemode.c | 6 ++++-- + app/gegl/gimpoperationerasemode.c | 6 ++++-- app/gegl/gimpoperationgrainextractmode.c | 6 ++++-- app/gegl/gimpoperationgrainmergemode.c | 6 ++++-- - app/gegl/gimpoperationhardlightmode.c | 6 ++++-- - app/gegl/gimpoperationhuemode.c | 6 ++++-- - app/gegl/gimpoperationhuesaturation.c | 8 +++++--- - app/gegl/gimpoperationlevels.c | 8 +++++--- + app/gegl/gimpoperationhardlightmode.c | 6 ++++-- + app/gegl/gimpoperationhuemode.c | 6 ++++-- + app/gegl/gimpoperationhuesaturation.c | 8 +++++--- + app/gegl/gimpoperationlevels.c | 8 +++++--- app/gegl/gimpoperationlightenonlymode.c | 6 ++++-- - app/gegl/gimpoperationmultiplymode.c | 6 ++++-- - app/gegl/gimpoperationoverlaymode.c | 6 ++++-- + app/gegl/gimpoperationmultiplymode.c | 6 ++++-- + app/gegl/gimpoperationoverlaymode.c | 6 ++++-- app/gegl/gimpoperationpointlayermode.c | 8 +++++--- - app/gegl/gimpoperationposterize.c | 8 +++++--- - app/gegl/gimpoperationreplacemode.c | 6 ++++-- + app/gegl/gimpoperationposterize.c | 8 +++++--- + app/gegl/gimpoperationreplacemode.c | 6 ++++-- app/gegl/gimpoperationsaturationmode.c | 6 ++++-- - app/gegl/gimpoperationscreenmode.c | 6 ++++-- - app/gegl/gimpoperationsoftlightmode.c | 6 ++++-- - app/gegl/gimpoperationsubtractmode.c | 6 ++++-- - app/gegl/gimpoperationthreshold.c | 8 +++++--- - app/gegl/gimpoperationtilesink.c | 8 +++++--- - app/gegl/gimpoperationtilesource.c | 9 ++++++--- - app/gegl/gimpoperationvaluemode.c | 6 ++++-- - app/tools/gimpgegltool.c | 7 ++++--- + app/gegl/gimpoperationscreenmode.c | 6 ++++-- + app/gegl/gimpoperationsoftlightmode.c | 6 ++++-- + app/gegl/gimpoperationsubtractmode.c | 6 ++++-- + app/gegl/gimpoperationthreshold.c | 8 +++++--- + app/gegl/gimpoperationtilesink.c | 8 +++++--- + app/gegl/gimpoperationtilesource.c | 9 ++++++--- + app/gegl/gimpoperationvaluemode.c | 6 ++++-- + app/tools/gimpgegltool.c | 7 ++++--- 40 files changed, 175 insertions(+), 95 deletions(-) commit 17729bf6af7e0487befab713683f371249d822dc Author: Simon Budig -Date: Thu Mar 29 03:16:06 2012 +0200 +Date: Thu Mar 29 03:16:06 2012 +0200 app: specify proper BABL format for legacy point filters @@ -17955,7 +19026,7 @@ commit 5f11b748cece92aad3d2fc1ccca78f9e4683d0c0 Author: Øyvind Kolås -Date: Wed Mar 28 12:52:28 2012 +0100 +Date: Wed Mar 28 12:52:28 2012 +0100 app: map lanczos to lohalo when using GEGL @@ -17968,7 +19039,7 @@ commit 6095f335c38c6472350db4c3bc24833b96bf5221 Author: Mikael Magnusson -Date: Tue Mar 27 13:39:33 2012 +0200 +Date: Tue Mar 27 13:39:33 2012 +0200 data: add translator comment for "fuzzy" @@ -17977,7 +19048,7 @@ commit a3774d1cfb6c38442ac3fdf4a4afab7c7b2c208b Author: Øyvind Kolås -Date: Mon Mar 26 19:03:40 2012 +0100 +Date: Mon Mar 26 19:03:40 2012 +0100 app: update to new GEGL API in cage tool @@ -17987,7 +19058,7 @@ commit d60bce5b63d71dbe1a29b360c7628195d614b1ad Author: Rodrigo Padula de Oliveira -Date: Wed Mar 21 06:43:38 2012 -0300 +Date: Wed Mar 21 06:43:38 2012 -0300 Updated Brazilian Portuguese translation @@ -17997,7 +19068,7 @@ commit 7ba8d2f8a8ad7665a661bead246b27a592b2c884 Author: Nils Philippsen -Date: Mon Mar 26 14:30:11 2012 +0200 +Date: Mon Mar 26 14:30:11 2012 +0200 fix German translation of "Linear" (#672847) @@ -18007,7 +19078,7 @@ commit c93edf59f45d0855dc48beedccfe8530d69c22cd Author: Øyvind Kolås -Date: Mon Mar 26 01:22:17 2012 +0100 +Date: Mon Mar 26 01:22:17 2012 +0100 app: adapt to API changes in GEGL @@ -18017,54 +19088,54 @@ commit 011b0589457406cabcb619524bb6df04b3faf1b8 Author: Michael Natterer -Date: Mon Mar 26 01:13:37 2012 +0200 +Date: Mon Mar 26 01:13:37 2012 +0200 app: follow GEGL API changes - app/gegl/gimpoperationadditionmode.c | 6 ++++-- - app/gegl/gimpoperationantierasemode.c | 6 ++++-- - app/gegl/gimpoperationbehindmode.c | 6 ++++-- + app/gegl/gimpoperationadditionmode.c | 6 ++++-- + app/gegl/gimpoperationantierasemode.c | 6 ++++-- + app/gegl/gimpoperationbehindmode.c | 6 ++++-- app/gegl/gimpoperationbrightnesscontrast.c | 6 ++++-- - app/gegl/gimpoperationburnmode.c | 6 ++++-- - app/gegl/gimpoperationcagecoefcalc.c | 10 ++++++---- - app/gegl/gimpoperationcagetransform.c | 11 +++++++---- - app/gegl/gimpoperationcolorbalance.c | 6 ++++-- + app/gegl/gimpoperationburnmode.c | 6 ++++-- + app/gegl/gimpoperationcagecoefcalc.c | 10 ++++++---- + app/gegl/gimpoperationcagetransform.c | 11 +++++++---- + app/gegl/gimpoperationcolorbalance.c | 6 ++++-- app/gegl/gimpoperationcolorerasemode.c | 6 ++++-- - app/gegl/gimpoperationcolorize.c | 6 ++++-- - app/gegl/gimpoperationcolormode.c | 6 ++++-- - app/gegl/gimpoperationcurves.c | 6 ++++-- + app/gegl/gimpoperationcolorize.c | 6 ++++-- + app/gegl/gimpoperationcolormode.c | 6 ++++-- + app/gegl/gimpoperationcurves.c | 6 ++++-- app/gegl/gimpoperationdarkenonlymode.c | 6 ++++-- - app/gegl/gimpoperationdesaturate.c | 6 ++++-- + app/gegl/gimpoperationdesaturate.c | 6 ++++-- app/gegl/gimpoperationdifferencemode.c | 6 ++++-- - app/gegl/gimpoperationdissolvemode.c | 6 ++++-- - app/gegl/gimpoperationdividemode.c | 6 ++++-- - app/gegl/gimpoperationdodgemode.c | 6 ++++-- - app/gegl/gimpoperationerasemode.c | 6 ++++-- + app/gegl/gimpoperationdissolvemode.c | 6 ++++-- + app/gegl/gimpoperationdividemode.c | 6 ++++-- + app/gegl/gimpoperationdodgemode.c | 6 ++++-- + app/gegl/gimpoperationerasemode.c | 6 ++++-- app/gegl/gimpoperationgrainextractmode.c | 6 ++++-- app/gegl/gimpoperationgrainmergemode.c | 6 ++++-- - app/gegl/gimpoperationhardlightmode.c | 6 ++++-- - app/gegl/gimpoperationhuemode.c | 6 ++++-- - app/gegl/gimpoperationhuesaturation.c | 6 ++++-- - app/gegl/gimpoperationlevels.c | 6 ++++-- + app/gegl/gimpoperationhardlightmode.c | 6 ++++-- + app/gegl/gimpoperationhuemode.c | 6 ++++-- + app/gegl/gimpoperationhuesaturation.c | 6 ++++-- + app/gegl/gimpoperationlevels.c | 6 ++++-- app/gegl/gimpoperationlightenonlymode.c | 6 ++++-- - app/gegl/gimpoperationmultiplymode.c | 6 ++++-- - app/gegl/gimpoperationoverlaymode.c | 6 ++++-- + app/gegl/gimpoperationmultiplymode.c | 6 ++++-- + app/gegl/gimpoperationoverlaymode.c | 6 ++++-- app/gegl/gimpoperationpointlayermode.c | 6 ++++-- - app/gegl/gimpoperationposterize.c | 6 ++++-- - app/gegl/gimpoperationreplacemode.c | 6 ++++-- + app/gegl/gimpoperationposterize.c | 6 ++++-- + app/gegl/gimpoperationreplacemode.c | 6 ++++-- app/gegl/gimpoperationsaturationmode.c | 6 ++++-- - app/gegl/gimpoperationscreenmode.c | 6 ++++-- - app/gegl/gimpoperationsoftlightmode.c | 6 ++++-- - app/gegl/gimpoperationsubtractmode.c | 6 ++++-- - app/gegl/gimpoperationthreshold.c | 6 ++++-- - app/gegl/gimpoperationtilesink.c | 10 ++++++---- - app/gegl/gimpoperationtilesource.c | 8 +++++--- - app/gegl/gimpoperationvaluemode.c | 6 ++++-- + app/gegl/gimpoperationscreenmode.c | 6 ++++-- + app/gegl/gimpoperationsoftlightmode.c | 6 ++++-- + app/gegl/gimpoperationsubtractmode.c | 6 ++++-- + app/gegl/gimpoperationthreshold.c | 6 ++++-- + app/gegl/gimpoperationtilesink.c | 10 ++++++---- + app/gegl/gimpoperationtilesource.c | 8 +++++--- + app/gegl/gimpoperationvaluemode.c | 6 ++++-- 39 files changed, 164 insertions(+), 85 deletions(-) commit 79efdabb62f4f20dc7cba259db69916192f1fca9 Author: Carles Ferrando -Date: Sun Mar 25 20:23:42 2012 +0200 +Date: Sun Mar 25 20:23:42 2012 +0200 [l10n]Updated Catalan (Valencian) translation @@ -18074,7 +19145,7 @@ commit 7ea9e86fed2e5b800b9ef0158379329bfa543435 Author: Albert F -Date: Sun Mar 25 20:23:32 2012 +0200 +Date: Sun Mar 25 20:23:32 2012 +0200 [l10n] Updated Catalan translation @@ -18084,7 +19155,7 @@ commit 2425fca96680b41a7980de0e38155ecf4ddba0ac Author: Carles Ferrando -Date: Sun Mar 25 20:20:23 2012 +0200 +Date: Sun Mar 25 20:20:23 2012 +0200 [l10n]Updated Catalan (Valencian) translation @@ -18094,7 +19165,7 @@ commit f158c9d7861a6eb89a19952cd44b8d5b21822695 Author: Albert F -Date: Sun Mar 25 20:20:11 2012 +0200 +Date: Sun Mar 25 20:20:11 2012 +0200 [l10n] Updated Catalan translation @@ -18104,7 +19175,7 @@ commit aa063101df8eb6b4d58415a37e10113900b529ec Author: Daniel Korostil -Date: Sun Mar 25 19:11:44 2012 +0300 +Date: Sun Mar 25 19:11:44 2012 +0300 Uploaded Ukranian @@ -18114,34 +19185,34 @@ commit 0726abfa73b38c6c7eb667ff96ac38e6402e925a Author: Mikael Magnusson -Date: Sun Mar 25 15:03:37 2012 +0200 +Date: Sun Mar 25 15:03:37 2012 +0200 gfig: Don't bother selecting if we're not going to fill the selection - plug-ins/gfig/gfig-circle.c | 33 ++++++++++++++++++--------------- - plug-ins/gfig/gfig-ellipse.c | 27 +++++++++++++++------------ - plug-ins/gfig/gfig-poly.c | 25 ++++++++++++++----------- + plug-ins/gfig/gfig-circle.c | 33 ++++++++++++++++++--------------- + plug-ins/gfig/gfig-ellipse.c | 27 +++++++++++++++------------ + plug-ins/gfig/gfig-poly.c | 25 ++++++++++++++----------- plug-ins/gfig/gfig-rectangle.c | 27 +++++++++++++++------------ - plug-ins/gfig/gfig-star.c | 25 ++++++++++++++----------- + plug-ins/gfig/gfig-star.c | 25 ++++++++++++++----------- 5 files changed, 76 insertions(+), 61 deletions(-) commit 34000d4ce24f19687748d00f9a1f064d9c6f5e4b Author: Alexis Wilhelm -Date: Sun Mar 25 13:24:55 2012 +0200 +Date: Sun Mar 25 13:24:55 2012 +0200 Bug 672793 - GFig cannot paint closed paths outside of the layer - plug-ins/gfig/gfig-circle.c | 27 ++++++++++++++++++++++----- - plug-ins/gfig/gfig-dialog.c | 2 -- - plug-ins/gfig/gfig-ellipse.c | 25 +++++++++++++++++++------ - plug-ins/gfig/gfig-poly.c | 3 ++- + plug-ins/gfig/gfig-circle.c | 27 ++++++++++++++++++++++----- + plug-ins/gfig/gfig-dialog.c | 2 -- + plug-ins/gfig/gfig-ellipse.c | 25 +++++++++++++++++++------ + plug-ins/gfig/gfig-poly.c | 3 ++- plug-ins/gfig/gfig-rectangle.c | 9 ++++++++- - plug-ins/gfig/gfig-star.c | 3 ++- + plug-ins/gfig/gfig-star.c | 3 ++- 6 files changed, 53 insertions(+), 16 deletions(-) commit c3230a7a2fd3b9b2251bc37cd1094259d998f7b3 Author: Michael Natterer -Date: Sat Mar 24 19:42:34 2012 +0100 +Date: Sat Mar 24 19:42:34 2012 +0100 app: forgot to change the actual binary to 2.8 @@ -18150,32 +19221,32 @@ commit ed239a98914f27fa34c6a58439056ef337f9d873 Author: Michael Natterer -Date: Sat Mar 24 19:21:03 2012 +0100 +Date: Sat Mar 24 19:21:03 2012 +0100 Change "2.7" to "2.8" all over the place and set gimp_version to 2.8.0-RC1 INSTALL | 30 +++++++++++++++--------------- - NEWS | 51 ++++++++++++++++++++++++++++++++++++++++++++++++--- + NEWS | 51 ++++++++++++++++++++++++++++++++++++++++++++++++--- README | 14 +++++++------- configure.ac | 10 +++++----- 4 files changed, 75 insertions(+), 30 deletions(-) commit 439f7f579a898d00669e8486f8ccb3fd165e3a23 Author: Michael Natterer -Date: Sat Mar 24 18:52:31 2012 +0100 +Date: Sat Mar 24 18:52:31 2012 +0100 app: s/Babl/const Babl/ - app/gegl/gimpoperationcagetransform.c | 6 +++--- - app/gegl/gimpoperationcagetransform.h | 2 +- + app/gegl/gimpoperationcagetransform.c | 6 +++--- + app/gegl/gimpoperationcagetransform.h | 2 +- app/gegl/gimpoperationpointlayermode.c | 10 +++++----- - app/tools/gimpcagetool.c | 2 +- + app/tools/gimpcagetool.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) commit f28a17f5d3685389d146aa256512d972958b6671 Author: Michael Natterer -Date: Fri Mar 23 16:02:01 2012 +0100 +Date: Fri Mar 23 16:02:01 2012 +0100 menus: also disable config-use-gegl in stable @@ -18184,7 +19255,7 @@ commit b1d09cc7264899b8fec50a2e3a20f57506fa1da8 Author: Alexia Death -Date: Thu Mar 22 19:08:04 2012 +0200 +Date: Thu Mar 22 19:08:04 2012 +0200 data: new splash image @@ -18193,7 +19264,7 @@ commit 3f12312e003545c8878366abd09fb1e8f2a888ed Author: Fran Diéguez -Date: Thu Mar 22 01:22:05 2012 +0100 +Date: Thu Mar 22 01:22:05 2012 +0100 Updated Galician translations @@ -18203,7 +19274,7 @@ commit 6600bb83473ac5a6b670100ca90823113f42ee94 Author: Massimo Valentini -Date: Sun Mar 18 17:03:45 2012 +0100 +Date: Sun Mar 18 17:03:45 2012 +0100 app: silence a harmless critical warning @@ -18217,20 +19288,20 @@ commit 54456b9f870bcfd55755f74eba731114ba4c0a11 Author: Alexandre Prokoudine -Date: Sun Mar 18 21:06:24 2012 +0400 +Date: Sun Mar 18 21:06:24 2012 +0400 Updated Greel translation from Dimitris Spingos po-libgimp/el.po | 678 ++++---- po-plug-ins/el.po | 4464 ++++++++++++++++++++++++++++------------------------- - po-tips/el.po | 331 +++- - po/el.po | 1720 ++++++++------------- + po-tips/el.po | 331 +++- + po/el.po | 1720 ++++++++------------- 4 files changed, 3502 insertions(+), 3691 deletions(-) commit 9fd8a13802a3a2b22faf064f67ed54c73970b127 Author: Kiyotaka NISHIBORI -Date: Sun Mar 18 20:54:01 2012 +0900 +Date: Sun Mar 18 20:54:01 2012 +0900 [l10n] Update Japanese translation @@ -18240,7 +19311,7 @@ commit a7cad5bf8d0523110be6c1b47fe6b7827345c0c7 Author: Marco Ciampa -Date: Sat Mar 17 17:20:42 2012 +0100 +Date: Sat Mar 17 17:20:42 2012 +0100 Updated italian translation @@ -18250,7 +19321,7 @@ commit 1ffd0e8bedec985ea34adf201c9bd0e197a62958 Author: Praveen Illa -Date: Sat Mar 17 00:31:41 2012 +0530 +Date: Sat Mar 17 00:31:41 2012 +0530 Added Telugu Translation @@ -18259,7 +19330,7 @@ commit ced02211b6bfd73b7bd3ce5f81c40365384125d6 Author: Praveen Illa -Date: Sat Mar 17 00:30:33 2012 +0530 +Date: Sat Mar 17 00:30:33 2012 +0530 Added and updated Telugu Translation @@ -18269,7 +19340,7 @@ commit 53d82447136a6a5b8bc87f2d49dde936e8a65ff9 Author: Sebastian Pipping -Date: Wed Mar 14 13:40:19 2012 +0100 +Date: Wed Mar 14 13:40:19 2012 +0100 Introduce configure options to bypass bzip2 and Ghostscript @@ -18281,7 +19352,7 @@ commit 18692f318f50eb70af562ef98c891919ee9cce1e Author: Mikael Magnusson -Date: Tue Mar 13 21:50:04 2012 +0100 +Date: Tue Mar 13 21:50:04 2012 +0100 app: fix header in gimpoperationbrightnesscontrast.[ch] @@ -18291,20 +19362,20 @@ commit a29c0966140a912e6ecf0197d1f04915ac0dcc56 Author: Massimo Valentini -Date: Tue Mar 13 20:42:59 2012 +0100 +Date: Tue Mar 13 20:42:59 2012 +0100 app: initialize also GimpRGB's alpha component Conditional jump or move depends on uninitialised value(s) - ==29000== at 0x4C33CBC: gimp_color_area_set_color + ==29000== at 0x4C33CBC: gimp_color_area_set_color (gimp/libgimpwidgets/gimpcolorarea.c:425) - ==29000== by 0x4C3505B: gimp_color_button_set_color + ==29000== by 0x4C3505B: gimp_color_button_set_color (gimp/libgimpwidgets/gimpcolorbutton.c:642) - ==29000== by 0x5DA5BE: gimp_text_style_editor_set_color + ==29000== by 0x5DA5BE: gimp_text_style_editor_set_color (gimp/app/widgets/gimptextstyleeditor.c:700) - ==29000== by 0x5DB0D4: gimp_text_style_editor_update_idle + ==29000== by 0x5DB0D4: gimp_text_style_editor_update_idle (gimp/app/widgets/gimptextstyleeditor.c:1090) - ==29000== by 0x57E9E95: gdk_threads_dispatch + ==29000== by 0x57E9E95: gdk_threads_dispatch (gtk-2-24/gdk/gdk.c:512) Steps to reproduce: @@ -18321,30 +19392,30 @@ commit 62ebb4a1e55fe580dc62225e3744216737544c17 Author: Massimo Valentini -Date: Tue Mar 13 20:42:31 2012 +0100 +Date: Tue Mar 13 20:42:31 2012 +0100 app: initialize all members of a GimpAnchor Conditional jump or move depends on uninitialised value(s) - ==28817== at 0x6AA386: gimp_coords_manhattan_dist + ==28817== at 0x6AA386: gimp_coords_manhattan_dist (gimp/app/core/gimpcoords.c:175) - ==28817== by 0x6AB428: gimp_coords_bezier_is_straight + ==28817== by 0x6AB428: gimp_coords_bezier_is_straight (gimp/app/core/gimpcoords-interpolate.c:213) - ==28817== by 0x67663B: gimp_bezier_stroke_segment_nearest_point_get + ==28817== by 0x67663B: gimp_bezier_stroke_segment_nearest_point_get (gimp/app/vectors/gimpbezierstroke.c:676) - ==28817== by 0x676C86: gimp_bezier_stroke_nearest_point_get + ==28817== by 0x676C86: gimp_bezier_stroke_nearest_point_get (gimp/app/vectors/gimpbezierstroke.c:631) - ==28817== by 0x4D79E3: gimp_draw_tool_on_vectors_curve + ==28817== by 0x4D79E3: gimp_draw_tool_on_vectors_curve (gimp/app/tools/gimpdrawtool.c:1175) - ==28817== by 0x4D7CD5: gimp_draw_tool_on_vectors + ==28817== by 0x4D7CD5: gimp_draw_tool_on_vectors (gimp/app/tools/gimpdrawtool.c:1242) - ==28817== by 0x511CE7: gimp_vector_tool_oper_update + ==28817== by 0x511CE7: gimp_vector_tool_oper_update (gimp/app/tools/gimpvectortool.c:989) - ==28817== by 0x50B059: gimp_tool_oper_update + ==28817== by 0x50B059: gimp_tool_oper_update (gimp/app/tools/gimptool.c:970) - ==28817== by 0x546F3C: gimp_display_shell_canvas_tool_events + ==28817== by 0x546F3C: gimp_display_shell_canvas_tool_events (gimp/app/display/gimpdisplayshell-tool-events.c:401) - ==28817== by 0x52A42E2: _gtk_marshal_BOOLEAN__BOXED + ==28817== by 0x52A42E2: _gtk_marshal_BOOLEAN__BOXED (gtk-2-24/gtk/gtkmarshalers.c:86) Steps to reproduce: @@ -18358,35 +19429,35 @@ commit a80a63443d37d0a6d2fa4207f610d1deab6722d3 Author: Massimo Valentini -Date: Tue Mar 13 20:41:54 2012 +0100 +Date: Tue Mar 13 20:41:54 2012 +0100 app: initialize a GtkTreeIter Conditional jump or move depends on uninitialised value(s) - ==28871== at 0x4A09863: bcmp + ==28871== at 0x4A09863: bcmp (/builddir/build/BUILD/valgrind-3.6.1/memcheck/mc_replace_strmem.c:692) - ==28871== by 0x4C487C7: gimp_int_store_row_inserted + ==28871== by 0x4C487C7: gimp_int_store_row_inserted (gimp/libgimpwidgets/gimpintstore.c:220) - ==28871== by 0x8342B03: g_closure_invoke + ==28871== by 0x8342B03: g_closure_invoke (glib/gobject/gclosure.c:774) - ==28871== by 0x8353129: signal_emit_unlocked_R + ==28871== by 0x8353129: signal_emit_unlocked_R (glib/gobject/gsignal.c:3232) - ==28871== by 0x835A72A: g_signal_emit_valist + ==28871== by 0x835A72A: g_signal_emit_valist (glib/gobject/gsignal.c:3033) - ==28871== by 0x835A8F1: g_signal_emit (glib/gobject/gsignal.c:3090) - ==28871== by 0x529EF63: gtk_list_store_insert + ==28871== by 0x835A8F1: g_signal_emit (glib/gobject/gsignal.c:3090) + ==28871== by 0x529EF63: gtk_list_store_insert (gtk-2-24/gtk/gtkliststore.c:1039) - ==28871== by 0x5CEB6B: gimp_stroke_editor_constructed + ==28871== by 0x5CEB6B: gimp_stroke_editor_constructed (gimp/app/widgets/gimpstrokeeditor.c:229) - ==28871== by 0x8348222: g_object_newv (glib/gobject/gobject.c:1731) - ==28871== by 0x8348565: g_object_new_valist + ==28871== by 0x8348222: g_object_newv (glib/gobject/gobject.c:1731) + ==28871== by 0x8348565: g_object_new_valist (glib/gobject/gobject.c:1820) - ==28871== by 0x8348873: g_object_new (glib/gobject/gobject.c:1535) - ==28871== by 0x5CEE74: gimp_stroke_editor_new + ==28871== by 0x8348873: g_object_new (glib/gobject/gobject.c:1535) + ==28871== by 0x5CEE74: gimp_stroke_editor_new (gimp/app/widgets/gimpstrokeeditor.c:320) - ==28871== by 0x4C3842: stroke_dialog_new + ==28871== by 0x4C3842: stroke_dialog_new (gimp/app/dialogs/stroke-dialog.c:176) - ==28871== by 0x4A3B5C: select_stroke_cmd_callback + ==28871== by 0x4A3B5C: select_stroke_cmd_callback (gimp/app/actions/select-commands.c:349) Steps to reproduce: @@ -18401,28 +19472,28 @@ commit b262c93048840d0b2f63ad0d14fa107710bd3b25 Author: Michael Natterer -Date: Tue Mar 13 15:02:17 2012 +0100 +Date: Tue Mar 13 15:02:17 2012 +0100 app: create an own GimpOperationBrightnessContrast and use it instead of gegl:brightness-contrast because the GEGL op is giving different reaults. - app/core/gimpdrawable-brightness-contrast.c | 10 +- - app/gegl/Makefile.am | 212 + app/core/gimpdrawable-brightness-contrast.c | 10 +- + app/gegl/Makefile.am | 212 ++++++++++++++-------------- - app/gegl/gimp-gegl-types.h | 104 +++++++------- - app/gegl/gimp-gegl.c | 2 + - app/gegl/gimpbrightnesscontrastconfig.c | 21 --- - app/gegl/gimpbrightnesscontrastconfig.h | 3 - + app/gegl/gimp-gegl-types.h | 104 +++++++------- + app/gegl/gimp-gegl.c | 2 + + app/gegl/gimpbrightnesscontrastconfig.c | 21 --- + app/gegl/gimpbrightnesscontrastconfig.h | 3 - app/gegl/gimpoperationbrightnesscontrast.c | 134 ++++++++++++++++++ - app/gegl/gimpoperationbrightnesscontrast.h | 52 +++++++ - app/tools/gimpbrightnesscontrasttool.c | 16 ++- + app/gegl/gimpoperationbrightnesscontrast.h | 52 +++++++ + app/tools/gimpbrightnesscontrasttool.c | 16 ++- 9 files changed, 364 insertions(+), 190 deletions(-) commit 216133b2d09ce3f06aff50f80be46ec88954b38f Author: Michael Natterer -Date: Tue Mar 13 14:53:09 2012 +0100 +Date: Tue Mar 13 14:53:09 2012 +0100 app: the usual formatting cleanup in GimpTileBackendTileManager @@ -18433,7 +19504,7 @@ commit 2ea41ea3f6c1bbe27da9c7cdf07733056f52ab50 Author: Øyvind Kolås -Date: Tue Mar 13 13:09:42 2012 +0000 +Date: Tue Mar 13 13:09:42 2012 +0000 tests: update API usage of gimptilebackendtilemanager test @@ -18442,7 +19513,7 @@ commit 5d6662ad00e96e9888933b1c53fd28a148a99e03 Author: Øyvind Kolås -Date: Tue Mar 13 12:48:10 2012 +0000 +Date: Tue Mar 13 12:48:10 2012 +0000 gimptilebackendtilemanager: add utility call to construct buffer @@ -18457,7 +19528,7 @@ commit 53624480440835c95ad55a23e449dd9420890f33 Author: Øyvind Kolås -Date: Tue Mar 13 03:17:33 2012 +0000 +Date: Tue Mar 13 03:17:33 2012 +0000 GimpTileBackendTileManager: make it work @@ -18470,7 +19541,7 @@ commit 49a1fb5b9c3a971a7014c831da740d038ccb356f Author: Mukund Sivaraman -Date: Tue Mar 13 13:50:56 2012 +0530 +Date: Tue Mar 13 13:50:56 2012 +0530 INSTALL: Mention Ghostscript next to libgs @@ -18479,7 +19550,7 @@ commit e50e7948038a0efac32c6d6ad6bfe8700492d849 Author: Mukund Sivaraman -Date: Tue Mar 13 13:49:20 2012 +0530 +Date: Tue Mar 13 13:49:20 2012 +0530 INSTALL: Use our canonical way of writing plug-in @@ -18488,7 +19559,7 @@ commit 01c65b61c40b2aba30c2ff08f54a54f7e3773b6b Author: Michael Natterer -Date: Tue Mar 13 02:04:25 2012 +0100 +Date: Tue Mar 13 02:04:25 2012 +0100 devel-docs: update ftp directory in release-howto.txt @@ -18497,7 +19568,7 @@ commit 623319246c6dfc5a14d4bbdb3e2626b65e2f8f21 Author: Michael Natterer -Date: Tue Mar 13 01:42:05 2012 +0100 +Date: Tue Mar 13 01:42:05 2012 +0100 configure: bump version to 2.7.6 @@ -18506,7 +19577,7 @@ commit 0675fd14e915cfe18ccd65d2e73e15dbc4470433 Author: Alexandre Prokoudine -Date: Tue Mar 13 03:58:17 2012 +0400 +Date: Tue Mar 13 03:58:17 2012 +0400 gimp-splash: less irregular mesh gradient grid @@ -18515,7 +19586,7 @@ commit f51d5f7e366c2faa24ef7a0dda91afbd9a9daf14 Author: Michael Natterer -Date: Tue Mar 13 00:04:11 2012 +0100 +Date: Tue Mar 13 00:04:11 2012 +0100 AUTHORS: regenerated @@ -18524,7 +19595,7 @@ commit ed2b82399fe2bcde24b4bf3b1e02df2894ed66d6 Author: Mikael Magnusson -Date: Mon Mar 12 23:40:16 2012 +0100 +Date: Mon Mar 12 23:40:16 2012 +0100 Sort authors.xml @@ -18533,7 +19604,7 @@ commit 0f8fb6bebcfb8c56c2db32dab656f218f67ef70f Author: Mikael Magnusson -Date: Mon Mar 12 22:12:28 2012 +0100 +Date: Mon Mar 12 22:12:28 2012 +0100 Add new contributors for 2.8 @@ -18542,7 +19613,7 @@ commit 47aefcb8ced6aeff457b4f58063000b7c46c6898 Author: Mikael Magnusson -Date: Mon Mar 12 21:58:39 2012 +0100 +Date: Mon Mar 12 21:58:39 2012 +0100 Update last-active fields for known contributors for 2.8 @@ -18551,7 +19622,7 @@ commit dccdbd1b40a352b614446d72d7be86992798c008 Author: Alexia Death -Date: Mon Mar 12 22:09:48 2012 +0200 +Date: Mon Mar 12 22:09:48 2012 +0200 data: Splash image by Alexandre Prokuldine @@ -18560,7 +19631,7 @@ commit ddf0d9e6b76cae2782e47bf4892bdfddf77aa8f2 Author: Michael Natterer -Date: Mon Mar 12 20:26:51 2012 +0100 +Date: Mon Mar 12 20:26:51 2012 +0100 app: use G_GUINT64_FORMAT to print guint64 @@ -18569,7 +19640,7 @@ commit dbc823ae65aeede8d12e8f3316bbe05a1dc063f7 Author: Mikael Magnusson -Date: Mon Mar 12 20:21:09 2012 +0100 +Date: Mon Mar 12 20:21:09 2012 +0100 Fix obligatory typo @@ -18578,7 +19649,7 @@ commit 7ea4fbbba1110b30f0f01988b84cf06296c00063 Author: Michael Natterer -Date: Mon Mar 12 20:12:49 2012 +0100 +Date: Mon Mar 12 20:12:49 2012 +0100 NEWS: updates @@ -18587,13 +19658,13 @@ commit aa7e7c153cbe1d152e1f58c4f95fa0bb5f9d0131 Author: Michael Natterer -Date: Mon Mar 12 20:12:11 2012 +0100 +Date: Mon Mar 12 20:12:11 2012 +0100 app: remove another bunch of one-line GtkTables app/dialogs/image-new-dialog.c | 21 +++++++++++++-------- - app/tools/gimpclonetool.c | 18 ++++++++++-------- - app/tools/gimphealtool.c | 23 +++++++++++++---------- + app/tools/gimpclonetool.c | 18 ++++++++++-------- + app/tools/gimphealtool.c | 23 +++++++++++++---------- app/tools/gimppaintoptions-gui.c | 18 ++++++++++-------- app/tools/gimpperspectiveclonetool.c | 18 ++++++++++-------- app/tools/gimpregionselectoptions.c | 20 +++++++++++--------- @@ -18601,30 +19672,30 @@ commit a9ee07da43c3d489208a443439612ee8472e54ec Author: Michael Natterer -Date: Mon Mar 12 20:11:20 2012 +0100 +Date: Mon Mar 12 20:11:20 2012 +0100 devel-docs: updated so the latest additions and changes show up - devel-docs/app/app-sections.txt | 7 ++++++- + devel-docs/app/app-sections.txt | 7 ++++++- devel-docs/libgimp/libgimp-sections.txt | 26 ++++++++++++++++++++++++++ devel-docs/libgimp/tmpl/gimpenums.sgml | 9 +++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) commit a79e495b32d7ab9883166bcf07088518f90ec668 Author: Seong-ho Cho -Date: Sun Mar 11 02:23:38 2012 +0900 +Date: Sun Mar 11 02:23:38 2012 +0900 Updated Korean translation po-python/ko.po | 197 ++-- po-script-fu/ko.po | 2795 ++++------------------------------------------------ - po-tips/ko.po | 296 ++++-- + po-tips/ko.po | 296 ++++-- 3 files changed, 555 insertions(+), 2733 deletions(-) commit 5e94863c8e7c3cbbe4797ce102ee33c9ded83685 Author: Michael Natterer -Date: Fri Mar 9 20:29:19 2012 +0100 +Date: Fri Mar 9 20:29:19 2012 +0100 app: get rid of a GtkTable in gimp_paint_options_gui(), and some cleanup @@ -18635,7 +19706,7 @@ commit fea46b1c63ef01a718a04e09b26dc7523cd22853 Author: Mikael Magnusson -Date: Fri Mar 9 20:11:23 2012 +0100 +Date: Fri Mar 9 20:11:23 2012 +0100 Fix alignment of configure --help output @@ -18644,7 +19715,7 @@ commit 7fed1b6e93f175c4830670140326495082a2f3fd Author: Massimo Valentini -Date: Fri Mar 9 19:21:44 2012 +0100 +Date: Fri Mar 9 19:21:44 2012 +0100 Bug 651956: Text tool misremembers point size upon reloading file @@ -18666,7 +19737,7 @@ commit 71cb4fbd71b0f29624c982c9bccdea1955e4bf85 Author: Massimo Valentini -Date: Thu Mar 8 18:20:45 2012 +0100 +Date: Thu Mar 8 18:20:45 2012 +0100 Bug 667368: Bug in Histogram egalization @@ -18675,7 +19746,7 @@ commit c7c752f5df77ecce57779e4caa3b683192c22435 Author: Alexis Wilhelm -Date: Wed Feb 15 21:00:27 2012 +0100 +Date: Wed Feb 15 21:00:27 2012 +0100 Bug 541859 - Colour Balance Range to Adjust has no Effect @@ -18684,41 +19755,41 @@ NOTE: this might affect the result of scripts using color-balance - app/base/color-balance.c | 105 + app/base/color-balance.c | 105 +++++++---------------------------- app/gegl/gimpoperationcolorbalance.c | 62 +++++++++++---------- 2 files changed, 52 insertions(+), 115 deletions(-) commit f2f1eab7531332cb7b2bf5bd1e8d8cf4f65182cd Author: Michael Natterer -Date: Mon Mar 5 19:36:59 2012 +0100 +Date: Mon Mar 5 19:36:59 2012 +0100 app: add "ERROR" to the values of enum GimpPdbErrorCode so they are now GIMP_PDB_ERROR_FOO instead of just GIMP_PDB_FOO, because it was just too confusing wrt enum GimpPdbStatusType. - app/pdb/convert-cmds.c | 6 ++-- - app/pdb/floating-sel-cmds.c | 9 +++-- - app/pdb/gimppdb-query.c | 2 +- - app/pdb/gimppdb-utils.c | 70 + app/pdb/convert-cmds.c | 6 ++-- + app/pdb/floating-sel-cmds.c | 9 +++-- + app/pdb/gimppdb-query.c | 2 +- + app/pdb/gimppdb-utils.c | 70 +++++++++++++++++++-------------------- - app/pdb/gimppdb.c | 9 ++--- - app/pdb/gimppdberror.h | 12 +++---- - app/pdb/gimpprocedure.c | 40 +++++++++++++--------- - app/pdb/image-cmds.c | 3 +- - app/pdb/text-layer-cmds.c | 2 +- + app/pdb/gimppdb.c | 9 ++--- + app/pdb/gimppdberror.h | 12 +++---- + app/pdb/gimpprocedure.c | 40 +++++++++++++--------- + app/pdb/image-cmds.c | 3 +- + app/pdb/text-layer-cmds.c | 2 +- app/plug-in/gimpplugin-progress.c | 2 +- app/plug-in/gimppluginprocframe.c | 2 +- - tools/pdbgen/pdb/convert.pdb | 6 ++-- + tools/pdbgen/pdb/convert.pdb | 6 ++-- tools/pdbgen/pdb/floating_sel.pdb | 9 +++-- - tools/pdbgen/pdb/image.pdb | 3 +- + tools/pdbgen/pdb/image.pdb | 3 +- tools/pdbgen/pdb/text_layer.pdb | 2 +- 15 files changed, 99 insertions(+), 78 deletions(-) commit 435feea20ab58b0df2a3d24e0cd5673961acb99d Author: Michael Natterer -Date: Mon Mar 5 19:19:47 2012 +0100 +Date: Mon Mar 5 19:19:47 2012 +0100 app: use gimp_cairo_set_source_rgb() wheh setting a GimpRGB @@ -18727,7 +19798,7 @@ commit 16584605231fbc19f84ad3845b89077aa386b730 Author: Massimo Valentini -Date: Mon Mar 5 18:36:03 2012 +0100 +Date: Mon Mar 5 18:36:03 2012 +0100 app: don't g_assert_not_reached on GIMP_PDB_FAILED errors @@ -18744,7 +19815,7 @@ commit 0c236cbc48ff53b18b4424cfcc1cec9400c35a2f Author: Michael Natterer -Date: Sun Mar 4 20:16:14 2012 +0100 +Date: Sun Mar 4 20:16:14 2012 +0100 app: don't draw the grid if it covers the image entirely @@ -18757,7 +19828,7 @@ commit 64c996918ac1dfefbdb1589339e8d613b24b9acf Author: Daniel Mustieles -Date: Sun Mar 4 19:28:05 2012 +0100 +Date: Sun Mar 4 19:28:05 2012 +0100 Updated Spanish translation @@ -18767,7 +19838,7 @@ commit 4ad0104a43332c3e2d2d857dea67e192c3866c0e Author: Michael Natterer -Date: Sun Mar 4 17:53:54 2012 +0100 +Date: Sun Mar 4 17:53:54 2012 +0100 plug-ins: change more things in maze from uint to int to fix compiler warnings @@ -18777,25 +19848,25 @@ commit 2084b1336955082add85d708135690b12419e899 Author: Ville Sokk -Date: Fri Feb 17 19:56:11 2012 +0200 +Date: Fri Feb 17 19:56:11 2012 +0200 Bug 155733 - need to check return values of gimp_drawable_mask_bounds() Mask intersect fixes for some plug-ins. - plug-ins/common/edge-sobel.c | 29 ++++++++++--------- - plug-ins/common/noise-randomize.c | 42 + plug-ins/common/edge-sobel.c | 29 ++++++++++--------- + plug-ins/common/noise-randomize.c | 42 +++++++++++++--------------- plug-ins/fractal-explorer/fractal-explorer.c | 15 ++++------ - plug-ins/maze/maze.c | 18 ++++++------ - plug-ins/maze/maze.h | 4 +-- - plug-ins/pagecurl/pagecurl.c | 32 ++++++++++----------- + plug-ins/maze/maze.c | 18 ++++++------ + plug-ins/maze/maze.h | 4 +-- + plug-ins/pagecurl/pagecurl.c | 32 ++++++++++----------- 6 files changed, 66 insertions(+), 74 deletions(-) commit 4e8c93246a266845a01bcc5aeba55872c4179afb Author: Martin Srebotnjak -Date: Sat Mar 3 22:15:35 2012 +0100 +Date: Sat Mar 3 22:15:35 2012 +0100 Updated Slovenian translation @@ -18805,7 +19876,7 @@ commit 997e1f3e0c0c744adfed04b6cc6b1c60fb318652 Author: Piotr Drąg -Date: Sat Mar 3 21:14:10 2012 +0100 +Date: Sat Mar 3 21:14:10 2012 +0100 Updated Polish translation @@ -18815,22 +19886,22 @@ commit 082d758a34b04781226d593189e6baf2522f4efe Author: Ville Sokk -Date: Mon Feb 27 19:24:09 2012 +0200 +Date: Mon Feb 27 19:24:09 2012 +0200 Bug 558795 - Using same quick mask color across sessions Add configuration option for quick mask color. - app/config/gimpcoreconfig.c | 14 ++++++++++++++ - app/config/gimpcoreconfig.h | 1 + - app/config/gimprc-blurbs.h | 3 +++ - app/core/gimpimage.c | 2 ++ + app/config/gimpcoreconfig.c | 14 ++++++++++++++ + app/config/gimpcoreconfig.h | 1 + + app/config/gimprc-blurbs.h | 3 +++ + app/core/gimpimage.c | 2 ++ app/dialogs/preferences-dialog.c | 14 ++++++++++++++ 5 files changed, 34 insertions(+) commit 72d60103e5a0096bcaf3ed23cb925154889ffaa0 Author: Michael Natterer -Date: Fri Mar 2 20:09:44 2012 +0100 +Date: Fri Mar 2 20:09:44 2012 +0100 configure: remove the rules for the "gimpinstall" script @@ -18842,7 +19913,7 @@ commit bd591d73cf9e953aca2489aa1b335496f6bb8600 Author: Michael Natterer -Date: Fri Mar 2 12:20:21 2012 +0100 +Date: Fri Mar 2 12:20:21 2012 +0100 libgimp: add gimp_ink_blob_type_get_type() to gimp.def @@ -18851,7 +19922,7 @@ commit b952f80be001903d2042b871d99989a89426dd55 Author: Michael Natterer -Date: Thu Mar 1 12:58:26 2012 +0100 +Date: Thu Mar 1 12:58:26 2012 +0100 Bug 658477 - add PDB support for more paint and ink options @@ -18868,19 +19939,19 @@ app/pdb/gimppdbcontext.c | 22 + app/pdb/gimppdbcontext.h | 1 + app/pdb/internal-procs.c | 2 +- - libgimp/gimp.def | 23 + + libgimp/gimp.def | 23 + libgimp/gimpcontext_pdb.c | 704 +++++++++++++++++++++++ libgimp/gimpcontext_pdb.h | 133 +++-- libgimp/gimpenums.c.tail | 2 + - libgimp/gimpenums.h | 12 + - tools/pdbgen/enums.pl | 10 + + libgimp/gimpenums.h | 12 + + tools/pdbgen/enums.pl | 10 + tools/pdbgen/pdb/context.pdb | 718 ++++++++++++++++++++++- tools/pdbgen/stddefs.pdb | 4 + 13 files changed, 2851 insertions(+), 75 deletions(-) commit c2f68b59a3f3097df185d42b9337c09e6f73decf Author: Massimo Valentini -Date: Tue Feb 28 18:20:10 2012 +0100 +Date: Tue Feb 28 18:20:10 2012 +0100 Bug 670897: Phython-fu does not return parent layer... @@ -18896,7 +19967,7 @@ commit bebcebd1ca22655869bdd0962e6507e2b2f06216 Author: Marco Ciampa -Date: Tue Feb 28 18:08:59 2012 +0100 +Date: Tue Feb 28 18:08:59 2012 +0100 Updated italian translation. @@ -18906,7 +19977,7 @@ commit 0818bcfe4246feaf2f7382a71c56c3bdb483cf4a Author: Daniel Nylander -Date: Tue Feb 28 09:05:26 2012 +0100 +Date: Tue Feb 28 09:05:26 2012 +0100 Updated Swedish translation @@ -18916,7 +19987,7 @@ commit 2677566cfea0e1337e2e78dac2dd2ff86f424761 Author: Martin Srebotnjak -Date: Mon Feb 27 22:35:50 2012 +0100 +Date: Mon Feb 27 22:35:50 2012 +0100 Updated Slovenian translation @@ -18926,7 +19997,7 @@ commit 9ed3cb42f15b28fba75eac0612aca494089cda58 Author: Kiyotaka NISHIBORI -Date: Fri Feb 24 22:11:35 2012 +0900 +Date: Fri Feb 24 22:11:35 2012 +0900 [l10n] Update Japanese translation @@ -18936,7 +20007,7 @@ commit cef8a3e6f349270c0f17180bf6fcd3181b6a0117 Author: Daniel Mustieles -Date: Fri Feb 24 10:27:46 2012 +0100 +Date: Fri Feb 24 10:27:46 2012 +0100 Updated Spanish translation @@ -18945,7 +20016,7 @@ commit 8ea6d3a94fb42bbabdd34ba5257b6f1d91b225e0 Author: Michael Natterer -Date: Fri Feb 24 00:26:14 2012 +0100 +Date: Fri Feb 24 00:26:14 2012 +0100 app: when scaling, use the proper image api to move guides and sample points @@ -18959,7 +20030,7 @@ commit 6f0937a9b57be0c5dc952a7ed3652a7aacb451b9 Author: Piotr Drąg -Date: Thu Feb 23 22:04:28 2012 +0100 +Date: Thu Feb 23 22:04:28 2012 +0100 Updated Polish translation @@ -18968,7 +20039,7 @@ commit e507f406d7abd083dcc8fceb92b984f475a0f525 Author: Richard Bowers -Date: Sun Feb 12 12:28:12 2012 -0500 +Date: Sun Feb 12 12:28:12 2012 -0500 Bug 589229 - Keyboard shortcuts for zoom do not work as expected @@ -18979,7 +20050,7 @@ commit f7aa27a7e86e10346839af020131beaa53709c80 Author: Martin Nordholts -Date: Thu Feb 23 19:29:56 2012 +0100 +Date: Thu Feb 23 19:29:56 2012 +0100 app: Remove "Far from completely implemented!" in SWM action @@ -18992,7 +20063,7 @@ commit b1483144cfcd179f60b256468eb6161fcbb5bf11 Author: Michael Natterer -Date: Wed Feb 22 23:37:32 2012 +0100 +Date: Wed Feb 22 23:37:32 2012 +0100 app: remove unused variable in GimpSpinScale @@ -19001,7 +20072,7 @@ commit aadfc82f1184a207cb77f15f9590360e6cc54caa Author: Michael Natterer -Date: Wed Feb 22 22:46:41 2012 +0100 +Date: Wed Feb 22 22:46:41 2012 +0100 app: various GimpSpinScale fixes @@ -19017,7 +20088,7 @@ commit 0f8dd4ab8867aff49e2ddc50387f7a334126c84c Author: Mikael Magnusson -Date: Wed Feb 22 21:00:52 2012 +0100 +Date: Wed Feb 22 21:00:52 2012 +0100 plug-ins: make preview grid lines less blurry in map-object @@ -19026,7 +20097,7 @@ commit b1dc95baa270ce94ee5304a68ccc7550d099492c Author: Marco Ciampa -Date: Wed Feb 22 13:18:07 2012 +0100 +Date: Wed Feb 22 13:18:07 2012 +0100 Updated italian translation. @@ -19034,12 +20105,12 @@ +++++++++++++++++++++++++------------------------ po-script-fu/it.po | 330 +++++++++++++++++++++++++++-------------------------- - po/it.po | 99 ++++++++-------- + po/it.po | 99 ++++++++-------- 3 files changed, 374 insertions(+), 360 deletions(-) commit 731fa45f2bbc813d2e11b45a912113941b9ba85b Author: Kjartan Maraas -Date: Wed Feb 22 08:40:18 2012 +0100 +Date: Wed Feb 22 08:40:18 2012 +0100 Updated Norwegian bokmål translation @@ -19049,7 +20120,7 @@ commit 55457924a745ff11628b9a5a026177f5174299ec Author: Kjartan Maraas -Date: Tue Feb 21 20:55:05 2012 +0100 +Date: Tue Feb 21 20:55:05 2012 +0100 Updated Norwegian bokmål translation @@ -19059,7 +20130,7 @@ commit a69bfe75380cb3f4ac319ecac690a8e393d69b45 Author: Daniel Mustieles -Date: Tue Feb 21 17:12:10 2012 +0100 +Date: Tue Feb 21 17:12:10 2012 +0100 Updated Spanish translation. @@ -19068,7 +20139,7 @@ commit bbd7d976f2ccf7fb8fc7ca25d111c34f58f8fdb5 Author: Daniel Mustieles -Date: Tue Feb 21 17:09:02 2012 +0100 +Date: Tue Feb 21 17:09:02 2012 +0100 Updated Spanish translation. Fixed bugs #618697 and #618444 @@ -19077,7 +20148,7 @@ commit b95828038d7cc1df5c5d07b09a7adc2d97f77938 Author: Daniel Mustieles -Date: Tue Feb 21 16:58:10 2012 +0100 +Date: Tue Feb 21 16:58:10 2012 +0100 Updated Spanish translation. Fixed bugs #618699 and #618698 @@ -19087,7 +20158,7 @@ commit 96cec46bec21f854d7089e716a660632cb30f7ba Author: Michael Natterer -Date: Tue Feb 21 16:44:14 2012 +0100 +Date: Tue Feb 21 16:44:14 2012 +0100 plug-ins: fix include guards in gfig-types.h @@ -19096,7 +20167,7 @@ commit 71e8fc8c3a863c43c00a649262726c802abb195e Author: Michael Natterer -Date: Tue Feb 21 16:01:53 2012 +0100 +Date: Tue Feb 21 16:01:53 2012 +0100 app: make sure undrawing the selection doesn't leave right/bottom pixel garbage @@ -19109,7 +20180,7 @@ commit fbd746f95a56b45508d4d29932f2c0c2d1493076 Author: Michael Natterer -Date: Tue Feb 21 00:36:18 2012 +0100 +Date: Tue Feb 21 00:36:18 2012 +0100 app: don't rely on gtk_container_remove() to always destroy the child @@ -19122,32 +20193,32 @@ in accessibility code and other crashes we blamed GTK+ for. app/actions/dockable-commands.c | 10 +++++++++- - app/display/gimpimagewindow.c | 27 --------------------------- - app/tools/gimpgegltool.c | 3 +-- - app/widgets/gimpcontainergridview.c | 5 ++--- - app/widgets/gimpcontainerpopup.c | 3 +-- - app/widgets/gimpdock.c | 9 ++++++++- - app/widgets/gimpdockbook.c | 11 +++++++++-- - app/widgets/gimpdockcolumns.c | 9 ++++++++- - app/widgets/gimpeditor.c | 2 +- - app/widgets/gimppanedbox.c | 9 ++++++++- - app/widgets/gimpsessioninfo-dock.c | 4 ++++ + app/display/gimpimagewindow.c | 27 --------------------------- + app/tools/gimpgegltool.c | 3 +-- + app/widgets/gimpcontainergridview.c | 5 ++--- + app/widgets/gimpcontainerpopup.c | 3 +-- + app/widgets/gimpdock.c | 9 ++++++++- + app/widgets/gimpdockbook.c | 11 +++++++++-- + app/widgets/gimpdockcolumns.c | 9 ++++++++- + app/widgets/gimpeditor.c | 2 +- + app/widgets/gimppanedbox.c | 9 ++++++++- + app/widgets/gimpsessioninfo-dock.c | 4 ++++ 11 files changed, 51 insertions(+), 41 deletions(-) commit 29f1f3654a9cd232c93feff5dfc914243687768d Author: Hleb Valoshka <375gnu@gmail.com> -Date: Mon Feb 20 23:01:00 2012 +0300 +Date: Mon Feb 20 23:01:00 2012 +0300 Updated Belarusian translation. po-plug-ins/be.po | 307 +++++++++++++++++++------------------ - po/be.po | 451 + po/be.po | 451 +++++++++++++++++++++++++++--------------------------- 2 files changed, 385 insertions(+), 373 deletions(-) commit 787d957c6156a2f915518e1f9ce9187bf5d0da53 Author: Praveen Arimbrathodiyil -Date: Mon Feb 20 17:19:37 2012 +0530 +Date: Mon Feb 20 17:19:37 2012 +0530 gimp Malayalam translations updated by Sadiq PK @@ -19157,7 +20228,7 @@ commit f21aa4b88c5193c902c847b01a7873870379b981 Author: Kiyotaka NISHIBORI -Date: Mon Feb 20 14:19:17 2012 +0900 +Date: Mon Feb 20 14:19:17 2012 +0900 [l10n] Update Japanese translation @@ -19166,7 +20237,7 @@ commit b46edeb88abc6fb9cf0c8823e6e28433397864aa Author: Martin Srebotnjak -Date: Sun Feb 19 20:54:04 2012 +0100 +Date: Sun Feb 19 20:54:04 2012 +0100 Updated Slovenian translation @@ -19175,7 +20246,7 @@ commit b3e62ca8153b37aa02a1c7882615ea453b99934d Author: Piotr Drąg -Date: Sun Feb 19 20:23:59 2012 +0100 +Date: Sun Feb 19 20:23:59 2012 +0100 Updated Polish translation @@ -19184,7 +20255,7 @@ commit db59314fc35f887e530b7dfd04521a811f54c3a9 Author: Daniel Mustieles -Date: Sun Feb 19 19:17:51 2012 +0100 +Date: Sun Feb 19 19:17:51 2012 +0100 Updated Spanish translation @@ -19194,7 +20265,7 @@ commit 848460d9a5f3f4a6d601dc9b5a54b77218d0d4b5 Author: malay.keshav -Date: Sun Feb 19 22:14:36 2012 +0530 +Date: Sun Feb 19 22:14:36 2012 +0530 about-dialog: Add ifdef GIMP_UNSTABLE around about_dialog_add_unstable_message() @@ -19204,7 +20275,7 @@ commit c63f34ff178553df222e96f436353df8d7152292 Author: Michael Natterer -Date: Sun Feb 19 12:14:10 2012 +0100 +Date: Sun Feb 19 12:14:10 2012 +0100 Bug 670352 - Tool tip for "Zoom Out" and "Zoom In" are not translated @@ -19216,7 +20287,7 @@ commit 9bf7d9d08a6fb172122516c0c4b7bfe0d2301b71 Author: malay.keshav -Date: Sun Feb 19 16:29:51 2012 +0530 +Date: Sun Feb 19 16:29:51 2012 +0530 Rename function (about_dialog_add_unstable_message) @@ -19225,7 +20296,7 @@ commit 4dc1c4e3b84260a41c98995b7fa725916b1b68a8 Author: Martin Srebotnjak -Date: Thu Feb 16 22:07:17 2012 +0100 +Date: Thu Feb 16 22:07:17 2012 +0100 Updated Slovenian translation @@ -19235,57 +20306,57 @@ commit f68acc3946dd941fb7c03c4b5d5bc9f62d816500 Author: Mikael Magnusson -Date: Wed Feb 15 20:23:35 2012 +0100 +Date: Wed Feb 15 20:23:35 2012 +0100 gfig: draw rectangular grid on whole pixels, set correct defaults in combo boxes. - plug-ins/gfig/gfig-dialog.c | 6 +++--- + plug-ins/gfig/gfig-dialog.c | 6 +++--- plug-ins/gfig/gfig-grid.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) commit 8b995fc76dd44d1b64e66bdb4c6f666219a2b7ac Author: Massimo Valentini -Date: Thu Feb 16 17:57:05 2012 +0100 +Date: Thu Feb 16 17:57:05 2012 +0100 gfig: mute compiler warnings - plug-ins/gfig/gfig-arc.c | 7 +++---- + plug-ins/gfig/gfig-arc.c | 7 +++---- plug-ins/gfig/gfig-poly.c | 10 +--------- - plug-ins/gfig/gfig-spiral.c | 2 -- + plug-ins/gfig/gfig-spiral.c | 2 -- 3 files changed, 4 insertions(+), 15 deletions(-) commit 261da8a4ab5f2db6256def0c96ee47426a383051 Author: Massimo Valentini -Date: Thu Feb 16 17:56:52 2012 +0100 +Date: Thu Feb 16 17:56:52 2012 +0100 Bug 642728: Use cairo to draw Gfig - plug-ins/gfig/gfig-arc.c | 58 ++++---------- - plug-ins/gfig/gfig-bezier.c | 63 +++------------ - plug-ins/gfig/gfig-bezier.h | 3 +- - plug-ins/gfig/gfig-circle.c | 52 +++--------- - plug-ins/gfig/gfig-dialog.c | 132 +++++++++++++++--------------- - plug-ins/gfig/gfig-dobject.c | 63 ++++----------- - plug-ins/gfig/gfig-dobject.h | 6 +- - plug-ins/gfig/gfig-ellipse.c | 89 +++------------------ - plug-ins/gfig/gfig-grid.c | 177 + plug-ins/gfig/gfig-arc.c | 58 ++++---------- + plug-ins/gfig/gfig-bezier.c | 63 +++------------ + plug-ins/gfig/gfig-bezier.h | 3 +- + plug-ins/gfig/gfig-circle.c | 52 +++--------- + plug-ins/gfig/gfig-dialog.c | 132 +++++++++++++++--------------- + plug-ins/gfig/gfig-dobject.c | 63 ++++----------- + plug-ins/gfig/gfig-dobject.h | 6 +- + plug-ins/gfig/gfig-ellipse.c | 89 +++------------------ + plug-ins/gfig/gfig-grid.c | 177 ++++++++++++++--------------------------- - plug-ins/gfig/gfig-grid.h | 6 +- - plug-ins/gfig/gfig-line.c | 46 +++-------- - plug-ins/gfig/gfig-poly.c | 59 +++----------- - plug-ins/gfig/gfig-preview.c | 37 +++++---- - plug-ins/gfig/gfig-preview.h | 3 - + plug-ins/gfig/gfig-grid.h | 6 +- + plug-ins/gfig/gfig-line.c | 46 +++-------- + plug-ins/gfig/gfig-poly.c | 59 +++----------- + plug-ins/gfig/gfig-preview.c | 37 +++++---- + plug-ins/gfig/gfig-preview.h | 3 - plug-ins/gfig/gfig-rectangle.c | 77 +++--------------- - plug-ins/gfig/gfig-spiral.c | 42 +++------- - plug-ins/gfig/gfig-star.c | 60 ++++---------- - plug-ins/gfig/gfig.c | 1 - - plug-ins/gfig/gfig.h | 17 ++-- + plug-ins/gfig/gfig-spiral.c | 42 +++------- + plug-ins/gfig/gfig-star.c | 60 ++++---------- + plug-ins/gfig/gfig.c | 1 - + plug-ins/gfig/gfig.h | 17 ++-- 19 files changed, 301 insertions(+), 690 deletions(-) commit a1d7a4dba4bc6ba44f0f07416e3a8236bbd96620 Author: Massimo Valentini -Date: Thu Feb 16 17:56:40 2012 +0100 +Date: Thu Feb 16 17:56:40 2012 +0100 gfig: select the correct layer GimpImageType @@ -19301,17 +20372,17 @@ commit cd002dd0c60e013985220ef3f9764fe3d79bbd88 Author: Mikael Magnusson -Date: Thu Oct 14 17:25:07 2010 +0200 +Date: Thu Oct 14 17:25:07 2010 +0200 app: remove two duplicated variable inits app/composite/gimp-composite-generic.c | 2 +- - app/display/gimpdisplayshell-dnd.c | 2 -- + app/display/gimpdisplayshell-dnd.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) commit 5c19c75f714574cbaa5f561b5ba62d6ebfefa008 Author: Mikael Magnusson -Date: Sun Oct 9 12:37:30 2011 +0200 +Date: Sun Oct 9 12:37:30 2011 +0200 app: fix typo in error message @@ -19320,7 +20391,7 @@ commit 776d2b9e04018a23b96f4aabe7ef8d53332b6a17 Author: Mikael Magnusson -Date: Tue Jul 5 00:23:46 2011 +0200 +Date: Tue Jul 5 00:23:46 2011 +0200 plug-ins: fix debug macro in wget file-uri backend @@ -19329,7 +20400,7 @@ commit 06bb523ee94837e5936f9f765794692f4414abf1 Author: Kiyotaka NISHIBORI -Date: Thu Feb 16 09:21:57 2012 +0900 +Date: Thu Feb 16 09:21:57 2012 +0900 [l10n] Update Japanese translation @@ -19338,7 +20409,7 @@ commit a59f22a6669ce00b8e59f0c717d6f5634784910d Author: Daniel Mustieles -Date: Wed Feb 15 13:00:20 2012 +0100 +Date: Wed Feb 15 13:00:20 2012 +0100 Updated Spanish translation @@ -19348,7 +20419,7 @@ commit 534d1f12156c6d9d18780a3f67eca586ad647db5 Author: Michael Natterer -Date: Tue Feb 14 22:51:01 2012 +0100 +Date: Tue Feb 14 22:51:01 2012 +0100 Bug 670062 - duplicate xml tag @@ -19359,7 +20430,7 @@ commit dec74ea06160363173035e71b7b047491416208a Author: Piotr Drąg -Date: Tue Feb 14 18:38:17 2012 +0100 +Date: Tue Feb 14 18:38:17 2012 +0100 Updated Polish translation @@ -19369,7 +20440,7 @@ commit 50add07774cdf8711dde3b270038ee4f4f9890a1 Author: Khaled Hosny -Date: Tue Feb 14 15:48:20 2012 +0200 +Date: Tue Feb 14 15:48:20 2012 +0200 Typos @@ -19378,7 +20449,7 @@ commit 919d3693654690d52fb467da1e842024f4bdb123 Author: Kiyotaka NISHIBORI -Date: Tue Feb 14 22:07:49 2012 +0900 +Date: Tue Feb 14 22:07:49 2012 +0900 [l10n] Update Japanese translation @@ -19388,7 +20459,7 @@ commit 8559a28fd435e81f5c684c11a2e36dff1a3e504a Author: Michael Natterer -Date: Tue Feb 14 12:18:34 2012 +0100 +Date: Tue Feb 14 12:18:34 2012 +0100 app: don't mess with the dialog's sensitivity while checking the extension @@ -19401,21 +20472,21 @@ commit 7f5a43f3e1301878edd0fa707681abcd92999dc3 Author: Michael Natterer -Date: Tue Feb 14 10:00:26 2012 +0100 +Date: Tue Feb 14 10:00:26 2012 +0100 app: rename GimpToolInfo::menu_path to ::menu_label "path" is a really ancient pre-GtkAction terminology here. - app/actions/tools-actions.c | 4 ++-- + app/actions/tools-actions.c | 4 ++-- app/core/gimptoolinfo.c | 14 +++++++------- - app/core/gimptoolinfo.h | 4 ++-- - app/tools/gimp-tools.c | 6 +++--- + app/core/gimptoolinfo.h | 4 ++-- + app/tools/gimp-tools.c | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) commit f2fc342101d9b6464594bae993fe25f6c5cc7237 Author: Michael Natterer -Date: Tue Feb 14 09:54:29 2012 +0100 +Date: Tue Feb 14 09:54:29 2012 +0100 Bug 670024 - Zoom Tool menu label is not translated @@ -19427,7 +20498,7 @@ commit b93cdd8bc5d03d68af44ca6f7aee9f20ed8f2288 Author: Martin Srebotnjak -Date: Mon Feb 13 22:30:01 2012 +0100 +Date: Mon Feb 13 22:30:01 2012 +0100 Updated Slovenian translation @@ -19437,7 +20508,7 @@ commit bd94635e02a29323f3a4ec8b0417ca21e0599a17 Author: Francisco Vila -Date: Mon Feb 13 12:10:35 2012 +0100 +Date: Mon Feb 13 12:10:35 2012 +0100 Updated Spanish translation @@ -19447,7 +20518,7 @@ commit 43b6d6922c7abd5c1036a709d6fc1db7b68d02eb Author: Christian Krippendorf -Date: Fri Feb 11 08:28:43 2011 +0100 +Date: Fri Feb 11 08:28:43 2011 +0100 Bug 615227 - Undo while scaling layer freezes GIMP @@ -19459,7 +20530,7 @@ commit b3c8cbd5a53516994fe0e661f092fff6902edc97 Author: Michael Natterer -Date: Mon Feb 13 00:11:23 2012 +0100 +Date: Mon Feb 13 00:11:23 2012 +0100 app: remove all docks from GimpImageWindow in dispose() @@ -19471,7 +20542,7 @@ commit f57c9e59fed619731697ea22a9e8821b52aaef38 Author: Piotr Drąg -Date: Sun Feb 12 21:52:43 2012 +0100 +Date: Sun Feb 12 21:52:43 2012 +0100 Updated Polish translation @@ -19481,7 +20552,7 @@ commit f07b9606d833fe36009653be4fc2ae558efa23ad Author: Ville Sokk -Date: Thu Feb 9 20:09:14 2012 +0200 +Date: Thu Feb 9 20:09:14 2012 +0200 Bug 658610 - Warn when importing PNG images with an offse @@ -19493,7 +20564,7 @@ commit ddb1f968b5355bc94db5d279ff76e207998353cf Author: Michael Natterer -Date: Sun Feb 12 18:41:52 2012 +0100 +Date: Sun Feb 12 18:41:52 2012 +0100 app: fix include guards in gimpbrush-transform.h to not use the old filename @@ -19503,7 +20574,7 @@ commit 0b97416971a852ff5c88b97f72efe9e33b3e6721 Author: Michael Natterer -Date: Sun Feb 12 15:09:14 2012 +0100 +Date: Sun Feb 12 15:09:14 2012 +0100 etc: use instead of in the default menurc @@ -19512,7 +20583,7 @@ commit bdc3f7e7e0495b599a712c917d6ab17f05f92164 Author: Michael Natterer -Date: Sun Feb 12 13:51:18 2012 +0100 +Date: Sun Feb 12 13:51:18 2012 +0100 Bug 635615 - Embed page setup dialog in the print dialog @@ -19522,14 +20593,14 @@ plug-ins/print/print-page-layout.c | 16 ++++ plug-ins/print/print-page-setup.c | 17 ---- - plug-ins/print/print-page-setup.h | 9 +-- - plug-ins/print/print.c | 155 + plug-ins/print/print-page-setup.h | 9 +-- + plug-ins/print/print.c | 155 +++---------------------------------- 4 files changed, 32 insertions(+), 165 deletions(-) commit 90065a517ee73d15a962ca64649b4b01a2189dfe Author: Michael Natterer -Date: Sat Feb 11 22:54:06 2012 +0100 +Date: Sat Feb 11 22:54:06 2012 +0100 app: try harder to show filename and file size in Image -> Properties @@ -19541,19 +20612,19 @@ commit 3670fa5dddf65d44d6d496947125628b53bc6aac Author: Michael Natterer -Date: Sat Feb 11 19:10:55 2012 +0100 +Date: Sat Feb 11 19:10:55 2012 +0100 devel-docs: all functions in app/ appear in the docs again \o/ - devel-docs/app/app-docs.sgml | 108 ++- + devel-docs/app/app-docs.sgml | 108 ++- devel-docs/app/app-sections.txt | 1805 +++++++++++++++++++++++++++++++++++---- - devel-docs/app/app.types | 49 ++ + devel-docs/app/app.types | 49 ++ 3 files changed, 1799 insertions(+), 163 deletions(-) commit 0e6b70379429a0f3b2cc67cf3cc9725ae249e539 Author: Michael Natterer -Date: Sat Feb 11 18:12:42 2012 +0100 +Date: Sat Feb 11 18:12:42 2012 +0100 app: remove unused typedef GimpDynamicsOptions @@ -19562,24 +20633,24 @@ commit f70bc837fa159622b3c7f8f9f191d4813f38700c Author: Michael Natterer -Date: Sat Feb 11 17:57:27 2012 +0100 +Date: Sat Feb 11 17:57:27 2012 +0100 app: remove gimpdisplay-utils.[ch], move its only function to gimpdisplay.[ch] - app/actions/windows-actions.c | 1 - - app/display/Makefile.am | 2 - + app/actions/windows-actions.c | 1 - + app/display/Makefile.am | 2 - app/display/gimpdisplay-utils.c | 48 ----------------------- app/display/gimpdisplay-utils.h | 28 -------------- - app/display/gimpdisplay.c | 16 ++++++++ - app/display/gimpdisplay.h | 84 + app/display/gimpdisplay.c | 16 ++++++++ + app/display/gimpdisplay.h | 84 +++++++++++++++++++++-------------------- - app/menus/windows-menu.c | 1 - + app/menus/windows-menu.c | 1 - 7 files changed, 59 insertions(+), 121 deletions(-) commit 4ec7def1d017341870abfd60e9c918a899698f22 Author: Nils Philippsen -Date: Sat Feb 11 16:50:44 2012 +0100 +Date: Sat Feb 11 16:50:44 2012 +0100 put operators on end of line in long expressions @@ -19591,7 +20662,7 @@ commit 56d6c1d432537a21736a5eb0093bb31929ec734c Author: Daniel Șerbănescu -Date: Fri Feb 10 19:57:46 2012 +0100 +Date: Fri Feb 10 19:57:46 2012 +0100 Updated Romanian translation @@ -19602,7 +20673,7 @@ commit eb93f484c8ad8da3606ab1b44ab8a7f143ea089e Author: Daniel Șerbănescu -Date: Fri Feb 10 19:35:57 2012 +0100 +Date: Fri Feb 10 19:35:57 2012 +0100 Updated Romanian translation @@ -19612,7 +20683,7 @@ commit a48a5925b440245177fabe90c5a55c35c63324ac Author: Daniel Șerbănescu -Date: Fri Feb 10 19:12:56 2012 +0100 +Date: Fri Feb 10 19:12:56 2012 +0100 Updated Romanian translation @@ -19621,7 +20692,7 @@ commit cfc049adff912bab661c232ea43913e8fb307bc6 Author: Daniel Șerbănescu -Date: Fri Feb 10 19:05:01 2012 +0100 +Date: Fri Feb 10 19:05:01 2012 +0100 Updated Romanian translation @@ -19631,7 +20702,7 @@ commit 3a151bd1a974281c75611ef800e41cbbca7b9015 Author: Nils Philippsen -Date: Fri Feb 10 15:17:09 2012 +0100 +Date: Fri Feb 10 15:17:09 2012 +0100 app: check top_directory for plausibility @@ -19640,7 +20711,7 @@ commit a5838dc3b5297c962125e3e6f1ffda0a1f01eb52 Author: Daniel Șerbănescu -Date: Fri Feb 10 16:15:07 2012 +0100 +Date: Fri Feb 10 16:15:07 2012 +0100 Updated Romanian translation @@ -19650,7 +20721,7 @@ commit 42107e10e50e5ee87711153951850da564304709 Author: Daniel Șerbănescu -Date: Fri Feb 10 15:51:22 2012 +0100 +Date: Fri Feb 10 15:51:22 2012 +0100 Updated Romanian translation @@ -19660,28 +20731,28 @@ commit 2303d292c3c6917a7aebd02505c15af6e4240ae0 Author: Massimo Valentini -Date: Fri Feb 10 12:24:32 2012 +0100 +Date: Fri Feb 10 12:24:32 2012 +0100 app: initialize var before usage to silence valgrind ==12105== Conditional jump or move depends on uninitialised value(s) - ==12105== at 0x6B069C: gimp_data_set_folder_tags + ==12105== at 0x6B069C: gimp_data_set_folder_tags (gimp/app/core/gimpdata.c:885) - ==12105== by 0x6B155E: gimp_data_factory_load_data + ==12105== by 0x6B155E: gimp_data_factory_load_data (gimp/app/core/gimpdatafactory.c:922) - ==12105== by 0x64F34D0: gimp_datafiles_read_directories + ==12105== by 0x64F34D0: gimp_datafiles_read_directories (gimp/libgimpbase/gimpdatafiles.c:155) - ==12105== by 0x6B1293: gimp_data_factory_data_load + ==12105== by 0x6B1293: gimp_data_factory_data_load (gimp/app/core/gimpdatafactory.c:354) - ==12105== by 0x6B1E1C: gimp_data_factory_data_init + ==12105== by 0x6B1E1C: gimp_data_factory_data_init (gimp/app/core/gimpdatafactory.c:239) - ==12105== by 0x6871D2: gimp_restore (gimp/app/core/gimp.c:952) - ==12105== by 0x47EABA: app_run (gimp/app/app.c:217) - ==12105== by 0x47E64D: main (gimp/app/main.c:440) + ==12105== by 0x6871D2: gimp_restore (gimp/app/core/gimp.c:952) + ==12105== by 0x47EABA: app_run (gimp/app/app.c:217) + ==12105== by 0x47E64D: main (gimp/app/main.c:440) ==12105== Uninitialised value was created by a stack allocation - ==12105== at 0x6B1190: gimp_data_factory_data_load + ==12105== at 0x6B1190: gimp_data_factory_data_load (gimp/app/core/gimpdatafactory.c:319) app/core/gimpdatafactory.c | 2 +- @@ -19689,22 +20760,22 @@ commit 2e3e941de34fa813ae7aab8b7bcdc12052881875 Author: Michael Natterer -Date: Fri Feb 10 01:28:29 2012 +0100 +Date: Fri Feb 10 01:28:29 2012 +0100 devel-docs: make app/ docs build again and update them a bit It's now less bad than before but still a horror. - devel-docs/app/Makefile.am | 1 + - devel-docs/app/app-docs.sgml | 46 +- + devel-docs/app/Makefile.am | 1 + + devel-docs/app/app-docs.sgml | 46 +- devel-docs/app/app-sections.txt | 902 ++++++++++++++++++++++++---------------- - devel-docs/app/app.types | 37 +- + devel-docs/app/app.types | 37 +- 4 files changed, 617 insertions(+), 369 deletions(-) commit 258b3f6623c93f796f41f2fb419cc0c7555c261e Author: Piotr Drąg -Date: Thu Feb 9 22:15:37 2012 +0100 +Date: Thu Feb 9 22:15:37 2012 +0100 Updated Polish translation @@ -19714,7 +20785,7 @@ commit 0e9ed614c3813fcf0d4edb9c22a1c74b3d1aa6fd Author: Piotr Drąg -Date: Thu Feb 9 22:13:24 2012 +0100 +Date: Thu Feb 9 22:13:24 2012 +0100 Updated POTFILES.in @@ -19723,7 +20794,7 @@ commit f0a7d04cfa9c49c8d0df7058a0ad11102aa9dee0 Author: Alexia Death -Date: Thu Feb 9 21:56:36 2012 +0200 +Date: Thu Feb 9 21:56:36 2012 +0200 app: Fix a segfault in paint core @@ -19732,7 +20803,7 @@ commit af6b840aafc0c7ead46288c2cfa88b892d03e3d9 Author: Michael Natterer -Date: Thu Feb 9 20:38:46 2012 +0100 +Date: Thu Feb 9 20:38:46 2012 +0100 Bug 666561 - Clicking on the expand icon next to a group expands the wrong group @@ -19745,7 +20816,7 @@ commit b9942804734ded8d068de9026b2e370a638d376e Author: Massimo Valentini -Date: Thu Feb 9 12:36:43 2012 +0100 +Date: Thu Feb 9 12:36:43 2012 +0100 Bug 668814: Cannot move cursor right in on canvas editor @@ -19757,12 +20828,12 @@ gimptextbuffer.c app/tools/gimptexttool-editor.c | 17 +++++++++++++++-- - app/widgets/gimptextbuffer.c | 2 +- + app/widgets/gimptextbuffer.c | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) commit 0729c25bc03af1490b0061603dca23772dc113b8 Author: Michael Natterer -Date: Thu Feb 9 10:02:49 2012 +0100 +Date: Thu Feb 9 10:02:49 2012 +0100 app: set tags for all subdirectories a data file lives in @@ -19774,15 +20845,15 @@ processed data hierachy's toplevel directory, and pass it to above new function. Also make sure obsolete files don't get folder-tagged. - app/core/gimpdata.c | 123 + app/core/gimpdata.c | 123 ++++++++++++++++++++++++++++++++------------- - app/core/gimpdata.h | 3 ++ + app/core/gimpdata.h | 3 ++ app/core/gimpdatafactory.c | 34 +++++++++++-- 3 files changed, 121 insertions(+), 39 deletions(-) commit 08ed48fffc57aed22db2aa95667935f63c623b2d Author: Martin Renold -Date: Tue Feb 7 22:58:23 2012 +0100 +Date: Tue Feb 7 22:58:23 2012 +0100 Bug 669616 - openraster plugin saves invalid files under some circumstances @@ -19797,7 +20868,7 @@ commit 3d4c7f8d4beeac30ed9e0189ee25d030af79ef30 Author: Hleb Valoshka <375gnu@gmail.com> -Date: Wed Feb 8 10:45:13 2012 +0300 +Date: Wed Feb 8 10:45:13 2012 +0300 Updated Belarusian translation. @@ -19807,18 +20878,18 @@ commit 59ab77d7b1c54b6abf35fd0914beb96a00ae8ab9 Author: Marco Ciampa -Date: Wed Feb 8 08:20:56 2012 +0100 +Date: Wed Feb 8 08:20:56 2012 +0100 Updated italian translation po-plug-ins/it.po | 64 ++++---- - po/it.po | 450 + po/it.po | 450 +++++++++++++++++++++++++++--------------------------- 2 files changed, 256 insertions(+), 258 deletions(-) commit 4cccb20c6e161626a21afc55ab5000bdb6e4e05b Author: Michael Natterer -Date: Wed Feb 8 00:36:03 2012 +0100 +Date: Wed Feb 8 00:36:03 2012 +0100 INSTALL: recommend some more libs to install for optional plugins @@ -19827,7 +20898,7 @@ commit 23ca29855c1327be932b7fdf11ad68bab1febddf Author: Mikael Magnusson -Date: Tue Feb 7 21:03:52 2012 +0100 +Date: Tue Feb 7 21:03:52 2012 +0100 NEWS: Apply some typo fanaticism @@ -19836,7 +20907,7 @@ commit d0d78ed28418dee8625c74ce8d2b2033ef1777b0 Author: Michael Natterer -Date: Tue Feb 7 21:00:44 2012 +0100 +Date: Tue Feb 7 21:00:44 2012 +0100 NEWS: updates @@ -19845,30 +20916,30 @@ commit 2414301799d32e9ecd7b55e84708a4b20a019962 Author: Michael Natterer -Date: Tue Feb 7 20:36:55 2012 +0100 +Date: Tue Feb 7 20:36:55 2012 +0100 Review the last few commits and apply some style fanaticism some completely unrelated, - app/actions/plug-in-actions.c | 4 ++-- - app/core/gimpimage-convert.c | 1 + - app/gui/gimpuiconfigurer.c | 1 + - app/pdb/gimpprocedure.c | 1 + - app/tools/gimpvectortool.c | 30 + app/actions/plug-in-actions.c | 4 ++-- + app/core/gimpimage-convert.c | 1 + + app/gui/gimpuiconfigurer.c | 1 + + app/pdb/gimpprocedure.c | 1 + + app/tools/gimpvectortool.c | 30 +++++++++++++++--------------- - app/vectors/gimpvectors.c | 7 +++---- - app/widgets/gimpcontrollerlist.c | 4 ++-- - app/widgets/gimpdeviceinfoeditor.c | 1 + - app/widgets/gimptagentry.c | 1 + + app/vectors/gimpvectors.c | 7 +++---- + app/widgets/gimpcontrollerlist.c | 4 ++-- + app/widgets/gimpdeviceinfoeditor.c | 1 + + app/widgets/gimptagentry.c | 1 + app/widgets/gimptextbuffer-serialize.c | 1 + - app/widgets/gimptextstyleeditor.c | 7 ++++++- - libgimpwidgets/gimpnumberpairentry.c | 7 ++++++- + app/widgets/gimptextstyleeditor.c | 7 ++++++- + libgimpwidgets/gimpnumberpairentry.c | 7 ++++++- 12 files changed, 40 insertions(+), 25 deletions(-) commit 052bce733b9efddbad9a8514007d60496faf67de Author: Massimo Valentini -Date: Tue Feb 7 17:35:06 2012 +0100 +Date: Tue Feb 7 17:35:06 2012 +0100 Typo @@ -19877,7 +20948,7 @@ commit 7cf2ee6397ac05ca8a925b8667fc313cc321a099 Author: Massimo Valentini -Date: Tue Feb 7 16:56:41 2012 +0100 +Date: Tue Feb 7 16:56:41 2012 +0100 Bug 586451: Alpha Logo scripts incorrectly become... @@ -19888,7 +20959,7 @@ commit 05aa83270d9ec8b6e153dc9759934a2ab40a05ad Author: Massimo Valentini -Date: Tue Feb 7 16:57:21 2012 +0100 +Date: Tue Feb 7 16:57:21 2012 +0100 Bug 554359: text tool should compress undo steps... @@ -19900,61 +20971,61 @@ commit 39368a410dc69fe952a6fe7afb909a9919e4ecdd Author: Massimo Valentini -Date: Tue Feb 7 14:06:12 2012 +0100 +Date: Tue Feb 7 14:06:12 2012 +0100 plugged memory leaks - app/actions/windows-actions.c | 1 + - app/core/gimpimage-convert.c | 1 + - app/core/gimpimage-merge.c | 7 +++---- - app/core/gimpitem-exclusive.c | 2 ++ - app/core/gimpstrokeoptions.c | 6 ++++++ - app/dialogs/about-dialog.c | 22 ++++++++++------------ - app/dialogs/module-dialog.c | 1 + - app/display/gimpcanvaspolygon.c | 3 ++- - app/display/gimpdisplayshell-expose.c | 3 ++- - app/gui/gimpuiconfigurer.c | 1 + - app/paint/gimppaintcore.c | 6 ++++++ - app/pdb/gimpprocedure.c | 1 + - app/pdb/vectors-cmds.c | 3 +++ - app/text/gimptextlayer-xcf.c | 3 +++ - app/text/gimptextlayout.c | 1 + - app/tools/gimpdrawtool.c | 2 +- - app/tools/gimpvectortool.c | 10 ++++++++-- - app/vectors/gimpvectors-import.c | 2 +- - app/vectors/gimpvectors.c | 2 +- - app/widgets/gimpcontrollerlist.c | 2 ++ - app/widgets/gimpdeviceinfoeditor.c | 1 + - app/widgets/gimptagentry.c | 1 + + app/actions/windows-actions.c | 1 + + app/core/gimpimage-convert.c | 1 + + app/core/gimpimage-merge.c | 7 +++---- + app/core/gimpitem-exclusive.c | 2 ++ + app/core/gimpstrokeoptions.c | 6 ++++++ + app/dialogs/about-dialog.c | 22 ++++++++++------------ + app/dialogs/module-dialog.c | 1 + + app/display/gimpcanvaspolygon.c | 3 ++- + app/display/gimpdisplayshell-expose.c | 3 ++- + app/gui/gimpuiconfigurer.c | 1 + + app/paint/gimppaintcore.c | 6 ++++++ + app/pdb/gimpprocedure.c | 1 + + app/pdb/vectors-cmds.c | 3 +++ + app/text/gimptextlayer-xcf.c | 3 +++ + app/text/gimptextlayout.c | 1 + + app/tools/gimpdrawtool.c | 2 +- + app/tools/gimpvectortool.c | 10 ++++++++-- + app/vectors/gimpvectors-import.c | 2 +- + app/vectors/gimpvectors.c | 2 +- + app/widgets/gimpcontrollerlist.c | 2 ++ + app/widgets/gimpdeviceinfoeditor.c | 1 + + app/widgets/gimptagentry.c | 1 + app/widgets/gimptextbuffer-serialize.c | 1 + - app/widgets/gimptextstyleeditor.c | 1 + - app/xcf/xcf-load.c | 11 ++++++++++- - libgimpwidgets/gimpnumberpairentry.c | 1 + - tools/pdbgen/pdb/vectors.pdb | 3 +++ + app/widgets/gimptextstyleeditor.c | 1 + + app/xcf/xcf-load.c | 11 ++++++++++- + libgimpwidgets/gimpnumberpairentry.c | 1 + + tools/pdbgen/pdb/vectors.pdb | 3 +++ 27 files changed, 74 insertions(+), 24 deletions(-) commit 73a3b56ec9918e4aa535026448a76d635e6be5f1 Author: Michael Natterer -Date: Tue Feb 7 09:30:13 2012 +0100 +Date: Tue Feb 7 09:30:13 2012 +0100 data: clean up brushes Makefiles and remove duplicate files - data/brushes/Basic/Makefile.am | 1 + - data/brushes/Legacy/Makefile.am | 1 - - data/brushes/Makefile.am | 1 - - data/brushes/gimp-obsolete-files/Makefile.am | 34 + data/brushes/Basic/Makefile.am | 1 + + data/brushes/Legacy/Makefile.am | 1 - + data/brushes/Makefile.am | 1 - + data/brushes/gimp-obsolete-files/Makefile.am | 34 +++++++++--------------- - data/brushes/gimp-obsolete-files/confetti.gbr | Bin 793 -> 0 bytes - data/brushes/gimp-obsolete-files/confetti.gih | Bin 8076 -> 0 bytes - data/brushes/gimp-obsolete-files/dunes.gbr | Bin 1100 -> 0 bytes - data/brushes/gimp-obsolete-files/galaxy.gbr | Bin 2637 -> 0 bytes + data/brushes/gimp-obsolete-files/confetti.gbr | Bin 793 -> 0 bytes + data/brushes/gimp-obsolete-files/confetti.gih | Bin 8076 -> 0 bytes + data/brushes/gimp-obsolete-files/dunes.gbr | Bin 1100 -> 0 bytes + data/brushes/gimp-obsolete-files/galaxy.gbr | Bin 2637 -> 0 bytes data/brushes/gimp-obsolete-files/galaxy_big.gbr | Bin 10040 -> 0 bytes - data/brushes/gimp-obsolete-files/vine.gih | Bin 116027 -> 0 bytes + data/brushes/gimp-obsolete-files/vine.gih | Bin 116027 -> 0 bytes 10 files changed, 13 insertions(+), 24 deletions(-) commit ec9187e69b64b004189466289549f3c1b9563bea Author: Michael Natterer -Date: Mon Feb 6 22:53:34 2012 +0100 +Date: Mon Feb 6 22:53:34 2012 +0100 Bug 669382 - corrupt png file theme-22.png in Default theme @@ -19965,7 +21036,7 @@ commit 4f61e58bb83b3b0523e2c1760b198ec27536f173 Author: Michael Natterer -Date: Mon Feb 6 22:04:34 2012 +0100 +Date: Mon Feb 6 22:04:34 2012 +0100 app: set the sensitivity of the tool options' preset menu items @@ -19977,7 +21048,7 @@ commit 79d997457b4864e2d991666fa1579ec6c3ec9af9 Author: Michael Natterer -Date: Mon Feb 6 22:03:30 2012 +0100 +Date: Mon Feb 6 22:03:30 2012 +0100 app: set GimpToolPresetEditor insensitive for non-editable presets @@ -19986,7 +21057,7 @@ commit 41b00e2e6b18130c5f1e0abc539a59512cd568f2 Author: Alexia Death -Date: Mon Feb 6 21:56:53 2012 +0200 +Date: Mon Feb 6 21:56:53 2012 +0200 app: Make palette part of paint tools context mask @@ -19995,128 +21066,124 @@ commit fe946a7501f6ed89d9a47f6a866cbf52672484b0 Author: Alexia Death -Date: Mon Feb 6 21:42:47 2012 +0200 +Date: Mon Feb 6 21:42:47 2012 +0200 data: More new brush set cleanup, underscore hunt edition - data/brushes/Basic/1-pixel.vbr | 2 +- - data/brushes/Basic/Block-01.vbr | 2 +- - data/brushes/Basic/Block-02.vbr | 2 +- - data/brushes/Basic/Block-03.vbr | 2 +- - data/brushes/Basic/Hardness-025.vbr | 2 +- - data/brushes/Basic/Hardness-050.vbr | 2 +- - data/brushes/Basic/Hardness-075.vbr | 2 +- - data/brushes/Basic/Hardness-100.vbr | 2 +- - data/brushes/Basic/Star.vbr | 2 +- - data/brushes/Basic/pixel.gbr | Bin 48 -> 48 bytes - data/brushes/Legacy/confetti.gih | Bin 8076 -> 8076 bytes - data/brushes/Legacy/pepper.gbr | Bin 11993 -> + data/brushes/Basic/1-pixel.vbr | 2 +- + data/brushes/Basic/Block-01.vbr | 2 +- + data/brushes/Basic/Block-02.vbr | 2 +- + data/brushes/Basic/Block-03.vbr | 2 +- + data/brushes/Basic/Hardness-025.vbr | 2 +- + data/brushes/Basic/Hardness-050.vbr | 2 +- + data/brushes/Basic/Hardness-075.vbr | 2 +- + data/brushes/Basic/Hardness-100.vbr | 2 +- + data/brushes/Basic/Star.vbr | 2 +- + data/brushes/Basic/pixel.gbr | Bin 48 -> 48 bytes + data/brushes/Legacy/confetti.gih | Bin 8076 -> + 8076 bytes + data/brushes/Legacy/pepper.gbr | Bin 11993 -> 11993 bytes - data/brushes/Media/Acrylic-01.gih | Bin 129909 -> + data/brushes/Media/Acrylic-01.gih | Bin 129909 -> 129909 bytes - data/brushes/Media/Acrylic-02.gih | Bin 129915 -> + data/brushes/Media/Acrylic-02.gih | Bin 129915 -> 129915 bytes - data/brushes/Media/Acrylic-03.gih | Bin 169109 -> + data/brushes/Media/Acrylic-03.gih | Bin 169109 -> 169109 bytes - data/brushes/Media/Acrylic-04.gih | Bin 176715 -> + data/brushes/Media/Acrylic-04.gih | Bin 176715 -> 176715 bytes - data/brushes/Media/Acrylic-05.gih | Bin 590213 -> + data/brushes/Media/Acrylic-05.gih | Bin 590213 -> 590213 bytes - data/brushes/Media/Bristles-01.gbr | Bin 4136 -> 4136 bytes - data/brushes/Media/Bristles-02.gbr | Bin 4136 -> 4136 bytes - data/brushes/Media/Bristles-03.gbr | Bin 940 -> 940 bytes - data/brushes/Media/Oils-01.gbr | Bin 4920 -> 4920 bytes - data/brushes/Media/Oils-02.gbr | Bin 8496 -> 8496 bytes - data/brushes/Media/Oils-03.gbr | Bin 27260 -> + data/brushes/Media/Bristles-01.gbr | Bin 4136 -> + 4136 bytes + data/brushes/Media/Bristles-02.gbr | Bin 4136 -> + 4136 bytes + data/brushes/Media/Bristles-03.gbr | Bin 940 -> 940 bytes + data/brushes/Media/Oils-01.gbr | Bin 4920 -> + 4920 bytes + data/brushes/Media/Oils-02.gbr | Bin 8496 -> + 8496 bytes + data/brushes/Media/Oils-03.gbr | Bin 27260 -> 27260 bytes - data/brushes/Sketch/Chalk-01.gih | Bin 193907 -> + data/brushes/Sketch/Chalk-01.gih | Bin 193907 -> 193907 bytes - data/brushes/Sketch/Chalk-02.gih | Bin 264855 -> + data/brushes/Sketch/Chalk-02.gih | Bin 264855 -> 264855 bytes - data/brushes/Sketch/Chalk-03.gih | Bin 16670 -> + data/brushes/Sketch/Chalk-03.gih | Bin 16670 -> 16670 bytes - data/brushes/Sketch/Charcoal-01.gbr | Bin 4136 -> 4136 bytes - data/brushes/Sketch/Charcoal-02.gbr | Bin 16424 -> + data/brushes/Sketch/Charcoal-01.gbr | Bin 4136 -> + 4136 bytes + data/brushes/Sketch/Charcoal-02.gbr | Bin 16424 -> 16424 bytes - data/brushes/Sketch/Pencil-01.gih | Bin 30518 -> + data/brushes/Sketch/Pencil-01.gih | Bin 30518 -> 30518 bytes - data/brushes/Sketch/Pencil-02.gih | Bin 30518 -> + data/brushes/Sketch/Pencil-02.gih | Bin 30518 -> 30518 bytes - data/brushes/Sketch/Pencil-Scratch.gbr | Bin 4139 -> 4139 bytes - data/brushes/Splatters/Sparks-Hose.gih | Bin 127649 -> + data/brushes/Sketch/Pencil-Scratch.gbr | Bin 4139 -> + 4139 bytes + data/brushes/Splatters/Sparks-Hose.gih | Bin 127649 -> 127644 bytes - data/brushes/Splatters/Splats-01.gih | Bin 156296 -> + data/brushes/Splatters/Splats-01.gih | Bin 156296 -> 156296 bytes - data/brushes/Splatters/Splats-02.gih | Bin 205866 -> + data/brushes/Splatters/Splats-02.gih | Bin 205866 -> 205866 bytes - data/brushes/Splatters/Sponge-01.gbr | Bin 62538 -> + data/brushes/Splatters/Sponge-01.gbr | Bin 62538 -> 62538 bytes - data/brushes/Splatters/Sponge-02.gbr | Bin 28262 -> + data/brushes/Splatters/Sponge-02.gbr | Bin 28262 -> 28262 bytes - data/brushes/Texture/Cell-01.gbr | Bin 27260 -> + data/brushes/Texture/Cell-01.gbr | Bin 27260 -> 27260 bytes - data/brushes/Texture/Cell-02.gbr | Bin 11700 -> + data/brushes/Texture/Cell-02.gbr | Bin 11700 -> 11700 bytes - data/brushes/Texture/Texture-01.gbr | Bin 47964 -> + data/brushes/Texture/Texture-01.gbr | Bin 47964 -> 47964 bytes - data/brushes/Texture/Texture-02.gbr | Bin 40039 -> + data/brushes/Texture/Texture-02.gbr | Bin 40039 -> 40039 bytes - data/brushes/Texture/Texture-Hose-01.gih | Bin 541198 -> + data/brushes/Texture/Texture-Hose-01.gih | Bin 541198 -> 541198 bytes - data/brushes/Texture/Texture-Hose-02.gih | Bin 541219 -> + data/brushes/Texture/Texture-Hose-02.gih | Bin 541219 -> 541219 bytes - data/brushes/Texture/Texture-Hose-03.gih | Bin 360249 -> + data/brushes/Texture/Texture-Hose-03.gih | Bin 360249 -> 360249 bytes - data/brushes/Texture/Vegetation-01.gbr | Bin 28772 -> + data/brushes/Texture/Vegetation-01.gbr | Bin 28772 -> 28772 bytes - data/brushes/Texture/Vegetation-02.gih | Bin 86438 -> + data/brushes/Texture/Vegetation-02.gih | Bin 86438 -> 86438 bytes - data/dynamics/Basic/Basic-Simple.gdyn | 2 +- - data/dynamics/Basic/Dynamics-Random.gdyn | 2 +- - data/dynamics/Basic/Negative-Size-Pressure.gdyn | 2 +- - data/dynamics/Basic/Pen-Generic.gdyn | 2 +- - data/dynamics/Basic/Pencil-Generic.gdyn | 2 +- - data/dynamics/Basic/Pencil-Shader.gdyn | 2 +- - data/dynamics/Basic/Pressure-Opacity.gdyn | 2 +- - data/dynamics/FX/Speed_Size_Opacity.gdyn | 2 +- - data/tool-presets/FX/FX-Confetti.gtp | 2 +- - data/tool-presets/FX/Glow-Lights.gtp | 4 ++-- - data/tool-presets/FX/Smooth-Clone.gtp | 2 +- - data/tool-presets/Paint/Airbrush.gtp | 4 ++-- - data/tool-presets/Paint/Basic-Knife.gtp | 4 ++-- - data/tool-presets/Paint/Basic-Round-Detail.gtp | 4 ++-- - data/tool-presets/Paint/Basic-Round.gtp | 4 ++-- - data/tool-presets/Paint/Bristles.gtp | 4 ++-- - data/tool-presets/Paint/Eraser-Hard.gtp | 4 ++-- - data/tool-presets/Paint/Noise.gtp | 4 ++-- - data/tool-presets/Paint/Smudge-Rough.gtp | 4 ++-- - data/tool-presets/Paint/Smudge-Soft.gtp | 4 ++-- - data/tool-presets/Paint/Soft-Oil.gtp | 4 ++-- - data/tool-presets/Paint/Splatters.gtp | 4 ++-- - data/tool-presets/Paint/Vegetal.gtp | 4 ++-- - data/tool-presets/Sketch/Blue-Pen.gtp | 27 - ++++++++++++++++++++++++ - data/tool-presets/Sketch/Blue_Pen.gtp | 27 - ------------------------ - data/tool-presets/Sketch/Eraser-Soft.gtp | 18 ++++++++++++++++ - data/tool-presets/Sketch/Eraser_Soft.gtp | 18 ---------------- - data/tool-presets/Sketch/Ink-Smooth.gtp | 25 - ++++++++++++++++++++++ - data/tool-presets/Sketch/Ink-Thin.gtp | 22 +++++++++++++++++++ - data/tool-presets/Sketch/Ink_Smooth.gtp | 25 - ---------------------- - data/tool-presets/Sketch/Ink_Thin.gtp | 22 ------------------- - data/tool-presets/Sketch/Makefile.am | 10 ++++----- - data/tool-presets/Sketch/Pencil-Soft.gtp | 26 - +++++++++++++++++++++++ - data/tool-presets/Sketch/Pencil.gtp | 4 ++-- - data/tool-presets/Sketch/Pencil_Soft.gtp | 26 - ----------------------- - 80 files changed, 170 insertions(+), 170 deletions(-) + data/dynamics/Basic/Basic-Simple.gdyn | 2 +- + data/dynamics/Basic/Dynamics-Random.gdyn | 2 +- + data/dynamics/Basic/Negative-Size-Pressure.gdyn | 2 +- + data/dynamics/Basic/Pen-Generic.gdyn | 2 +- + data/dynamics/Basic/Pencil-Generic.gdyn | 2 +- + data/dynamics/Basic/Pencil-Shader.gdyn | 2 +- + data/dynamics/Basic/Pressure-Opacity.gdyn | 2 +- + data/dynamics/FX/Speed_Size_Opacity.gdyn | 2 +- + data/tool-presets/FX/FX-Confetti.gtp | 2 +- + data/tool-presets/FX/Glow-Lights.gtp | 4 ++-- + data/tool-presets/FX/Smooth-Clone.gtp | 2 +- + data/tool-presets/Paint/Airbrush.gtp | 4 ++-- + data/tool-presets/Paint/Basic-Knife.gtp | 4 ++-- + data/tool-presets/Paint/Basic-Round-Detail.gtp | 4 ++-- + data/tool-presets/Paint/Basic-Round.gtp | 4 ++-- + data/tool-presets/Paint/Bristles.gtp | 4 ++-- + data/tool-presets/Paint/Eraser-Hard.gtp | 4 ++-- + data/tool-presets/Paint/Noise.gtp | 4 ++-- + data/tool-presets/Paint/Smudge-Rough.gtp | 4 ++-- + data/tool-presets/Paint/Smudge-Soft.gtp | 4 ++-- + data/tool-presets/Paint/Soft-Oil.gtp | 4 ++-- + data/tool-presets/Paint/Splatters.gtp | 4 ++-- + data/tool-presets/Paint/Vegetal.gtp | 4 ++-- + .../Sketch/{Blue_Pen.gtp => Blue-Pen.gtp} | 4 ++-- + .../Sketch/{Eraser_Soft.gtp => Eraser-Soft.gtp} | 4 ++-- + .../Sketch/{Ink_Smooth.gtp => Ink-Smooth.gtp} | 0 + .../Sketch/{Ink_Thin.gtp => Ink-Thin.gtp} | 0 + data/tool-presets/Sketch/Makefile.am | 10 +++++----- + .../Sketch/{Pencil_Soft.gtp => Pencil-Soft.gtp} | 4 ++-- + data/tool-presets/Sketch/Pencil.gtp | 4 ++-- + 75 files changed, 58 insertions(+), 58 deletions(-) commit f72806bbcd299bee1e26c8956d05b0a05c69adda Author: Michael Natterer -Date: Mon Feb 6 19:28:37 2012 +0100 +Date: Mon Feb 6 19:28:37 2012 +0100 app: fix GimpContainerTreeView name editing so it always works the same @@ -20134,7 +21201,7 @@ commit b4988ef00f4e556403e4b70be7b8b81474b6749f Author: Praveen Illa -Date: Mon Feb 6 13:30:48 2012 +0530 +Date: Mon Feb 6 13:30:48 2012 +0530 Added Telugu translation by Swecha Team @@ -20143,7 +21210,7 @@ commit 8a40421299ba3f54d6217da7e9894224e8ada38d Author: swecha -Date: Mon Feb 6 13:27:18 2012 +0530 +Date: Mon Feb 6 13:27:18 2012 +0530 Updated Telugu Translation @@ -20153,7 +21220,7 @@ commit 947ea55a07edf820ce9aeea0a4eeb423ee45864c Author: Michael Natterer -Date: Mon Feb 6 01:33:01 2012 +0100 +Date: Mon Feb 6 01:33:01 2012 +0100 app: chain up last in gimp_container_tree_view_set_context() @@ -20167,7 +21234,7 @@ commit 3c240bcb3c1945d9e989f2a0a0b1f2a39a2ed033 Author: Michael Natterer -Date: Sun Feb 5 22:28:55 2012 +0100 +Date: Sun Feb 5 22:28:55 2012 +0100 plug-ins: remove unused variable in file-tiff-load.c @@ -20176,7 +21243,7 @@ commit 1b34c9220ca559cb6362f69b09e5152ac3ed2052 Author: Michael Natterer -Date: Sun Feb 5 22:28:09 2012 +0100 +Date: Sun Feb 5 22:28:09 2012 +0100 plug-ins: actually use the return value of fread() in gimppressionist/presets @@ -20186,7 +21253,7 @@ commit 9092c79ca2fb06ba53c2c318a4c9ba13224e83a9 Author: Michael Natterer -Date: Sun Feb 5 22:27:15 2012 +0100 +Date: Sun Feb 5 22:27:15 2012 +0100 plug-ins: remove unused variable in file-pdf-save.c @@ -20195,7 +21262,7 @@ commit b1fe1db7d32fc9b69ab483d86abe30a84ef7522f Author: Francisco Vila -Date: Sun Feb 5 19:14:29 2012 +0100 +Date: Sun Feb 5 19:14:29 2012 +0100 Updated Spanish translation @@ -20205,7 +21272,7 @@ commit f06e712c3c008da7f2c075c4309450c5cd31fe43 Author: Nishibori Kiyotaka -Date: Sun Feb 5 14:47:45 2012 +0900 +Date: Sun Feb 5 14:47:45 2012 +0900 [l10n] Update Japanese translation @@ -20215,7 +21282,7 @@ commit fe923762788dfce56dda9effddb90e6531d76820 Author: Nishibori Kiyotaka -Date: Sun Feb 5 14:45:39 2012 +0900 +Date: Sun Feb 5 14:45:39 2012 +0900 [l10n] Update Japanese translation @@ -20224,7 +21291,7 @@ commit 662c25c9e1d96fd1c00069b220222a7d06a1dedb Author: Nishibori Kiyotaka -Date: Sun Feb 5 14:43:27 2012 +0900 +Date: Sun Feb 5 14:43:27 2012 +0900 [l10n] Update Japanese translation @@ -20233,7 +21300,7 @@ commit a98ea408b85350e83faab079f3c78fc6c5bbdf8c Author: Nishibori Kiyotaka -Date: Sun Feb 5 14:41:29 2012 +0900 +Date: Sun Feb 5 14:41:29 2012 +0900 [l10n] Update Japanese translation @@ -20243,7 +21310,7 @@ commit 44136cd23fc308a8f6054235667e10130c18367c Author: Nishibori Kiyotaka -Date: Sun Feb 5 14:39:14 2012 +0900 +Date: Sun Feb 5 14:39:14 2012 +0900 [l10n] Update Japanese translation @@ -20252,320 +21319,168 @@ commit 7aa12175a4479c949ca69ef37c90d161d8d19b66 Author: Alexia Death -Date: Sat Feb 4 20:59:21 2012 +0200 +Date: Sat Feb 4 20:59:21 2012 +0200 data: More resource updates and cleanup with Ramon - configure.ac | 2 + - data/brushes/10x10square.gbr | Bin 143 -> 0 bytes - data/brushes/10x10squareBlur.gbr | Bin 148 -> 0 bytes - data/brushes/20x20square.gbr | Bin 443 -> 0 bytes - data/brushes/20x20squareBlur.gbr | Bin 448 -> 0 bytes - data/brushes/5x5square.gbr | Bin 66 -> 0 bytes - data/brushes/5x5squareBlur.gbr | Bin 71 -> 0 bytes - data/brushes/Basic/1-pixel.vbr | 10 + - data/brushes/Basic/1_pixel.vbr | 10 - - data/brushes/Basic/Block-01.vbr | 10 + - data/brushes/Basic/Block-02.vbr | 8 + - data/brushes/Basic/Block-03.vbr | 8 + - data/brushes/Basic/Block_01.vbr | 10 - - data/brushes/Basic/Block_02.vbr | 8 - - data/brushes/Basic/Block_03.vbr | 8 - - data/brushes/Basic/Hardness-025.vbr | 8 + - data/brushes/Basic/Hardness-050.vbr | 8 + - data/brushes/Basic/Hardness-075.vbr | 8 + - data/brushes/Basic/Hardness-100.vbr | 8 + - data/brushes/Basic/Hardness_025.vbr | 8 - - data/brushes/Basic/Hardness_050.vbr | 8 - - data/brushes/Basic/Hardness_075.vbr | 8 - - data/brushes/Basic/Hardness_100.vbr | 8 - - data/brushes/Basic/Makefile.am | 16 +- - data/brushes/Basic/Star.vbr | 2 +- - data/brushes/Basic/pixel.gbr | Bin 0 -> 48 bytes - data/brushes/Calligraphic-Brush-0.vbr | 8 - - data/brushes/Calligraphic-Brush-1.vbr | 8 - - data/brushes/Calligraphic-Brush-2.vbr | 8 - - data/brushes/Calligraphic-Brush-3.vbr | 8 - - data/brushes/Calligraphic.vbr | 8 - - data/brushes/Circle-1.vbr | 8 - - data/brushes/Circle-11.vbr | 8 - - data/brushes/Circle-13.vbr | 8 - - data/brushes/Circle-15.vbr | 8 - - data/brushes/Circle-17.vbr | 8 - - data/brushes/Circle-19.vbr | 8 - - data/brushes/Circle-3.vbr | 8 - - data/brushes/Circle-5.vbr | 8 - - data/brushes/Circle-7.vbr | 8 - - data/brushes/Circle-9.vbr | 8 - - data/brushes/Circle-Fuzzy-11.vbr | 8 - - data/brushes/Circle-Fuzzy-13.vbr | 8 - - data/brushes/Circle-Fuzzy-15.vbr | 8 - - data/brushes/Circle-Fuzzy-17.vbr | 8 - - data/brushes/Circle-Fuzzy-19.vbr | 8 - - data/brushes/Circle-Fuzzy-3.vbr | 8 - - data/brushes/Circle-Fuzzy-5.vbr | 8 - - data/brushes/Circle-Fuzzy-7.vbr | 8 - - data/brushes/Circle-Fuzzy-9.vbr | 8 - - data/brushes/Diagonal-Star-11.vbr | 10 - - data/brushes/Diagonal-Star-17.vbr | 10 - - data/brushes/Diagonal-Star-25.vbr | 10 - - data/brushes/Grass1.gih | Bin 250304 -> - 0 bytes - data/brushes/Legacy/.gitignore | 2 + - data/brushes/Legacy/Makefile.am | 15 + - data/brushes/Legacy/confetti.gbr | Bin 0 -> 793 bytes - data/brushes/Legacy/confetti.gih | Bin 0 -> 8076 bytes - data/brushes/Legacy/dunes.gbr | Bin 0 -> 1100 bytes - data/brushes/Legacy/galaxy-big.gbr | Bin 0 -> 10040 bytes - data/brushes/Legacy/galaxy.gbr | Bin 0 -> 2637 bytes - data/brushes/Legacy/pepper.gbr | Bin 0 -> 11993 bytes - data/brushes/Legacy/vine.gih | Bin 0 -> 116027 - bytes - data/brushes/Makefile.am | 70 +-- - data/brushes/Media/Acrylic-01.gih | Bin 0 -> 129909 - bytes - data/brushes/Media/Acrylic-02.gih | Bin 0 -> 129915 - bytes - data/brushes/Media/Acrylic-03.gih | Bin 0 -> 169109 - bytes - data/brushes/Media/Acrylic-04.gih | Bin 0 -> 176715 - bytes - data/brushes/Media/Acrylic-05.gih | Bin 0 -> 590213 + configure.ac | 2 + + data/brushes/Basic/{1_pixel.vbr => 1-pixel.vbr} | 2 +- + data/brushes/Basic/{Block_01.vbr => Block-01.vbr} | 2 +- + data/brushes/Basic/{Block_02.vbr => Block-02.vbr} | 2 +- + data/brushes/Basic/{Block_03.vbr => Block-03.vbr} | 2 +- + .../Basic/{Hardness_025.vbr => Hardness-025.vbr} | 2 +- + .../Basic/{Hardness_050.vbr => Hardness-050.vbr} | 2 +- + .../Basic/{Hardness_075.vbr => Hardness-075.vbr} | 2 +- + .../Basic/{Hardness_100.vbr => Hardness-100.vbr} | 2 +- + data/brushes/Basic/Makefile.am | 16 +- + data/brushes/Basic/Star.vbr | 2 +- + data/brushes/{ => Basic}/pixel.gbr | Bin + data/brushes/Calligraphic.vbr | 8 - + data/brushes/Legacy/.gitignore | 2 + + data/brushes/Legacy/Makefile.am | 15 + + data/brushes/{ => Legacy}/confetti.gbr | Bin + data/brushes/{ => Legacy}/confetti.gih | Bin + data/brushes/{ => Legacy}/dunes.gbr | Bin + .../{galaxy_big.gbr => Legacy/galaxy-big.gbr} | Bin + data/brushes/{ => Legacy}/galaxy.gbr | Bin + data/brushes/Legacy/pepper.gbr | Bin 0 -> 11993 bytes + data/brushes/{ => Legacy}/vine.gih | Bin + data/brushes/Makefile.am | 70 +-- + .../Media/{Acrylic_01.gih => Acrylic-01.gih} | Bin + .../Media/{Acrylic_02.gih => Acrylic-02.gih} | Bin + .../Media/{Acrylic_03.gih => Acrylic-03.gih} | Bin + .../Media/{Acrylic_04.gih => Acrylic-04.gih} | Bin + .../Media/{Acrylic_05.gih => Acrylic-05.gih} | Bin + .../Media/{Bristles_01.gbr => Bristles-01.gbr} | Bin + .../Media/{Bristles_02.gbr => Bristles-02.gbr} | Bin + .../Media/{Bristles_03.gbr => Bristles-03.gbr} | Bin + data/brushes/Media/Makefile.am | 22 +- + data/brushes/Media/{Oils_01.gbr => Oils-01.gbr} | Bin + data/brushes/Media/{Oils_02.gbr => Oils-02.gbr} | Bin + data/brushes/Media/{Oils_03.gbr => Oils-03.gbr} | Bin + data/brushes/Sketch/{Chalk_01.gih => Chalk-01.gih} | Bin + data/brushes/Sketch/{Chalk_02.gih => Chalk-02.gih} | Bin + data/brushes/Sketch/{Chalk_03.gih => Chalk-03.gih} | Bin + .../Sketch/{Charcoal_01.gbr => Charcoal-01.gbr} | Bin + .../Sketch/{Charcoal_02.gbr => Charcoal-02.gbr} | Bin + data/brushes/Sketch/Makefile.am | 16 +- + .../Sketch/{Pencil_01.gih => Pencil-01.gih} | Bin + .../Sketch/{Pencil_02.gih => Pencil-02.gih} | Bin + .../{Pencil_Scratch.gbr => Pencil-Scratch.gbr} | Bin + data/brushes/Splatters/Makefile.am | 10 +- + .../Splatters/{Sparks_Hose.gih => Sparks-Hose.gih} | Bin + .../Splatters/{Splats_01.gih => Splats-01.gih} | Bin + .../Splatters/{Splats_02.gih => Splats-02.gih} | Bin + .../Splatters/{Sponge_01.gbr => Sponge-01.gbr} | Bin + .../Splatters/{Sponge_02.gbr => Sponge-02.gbr} | Bin + data/brushes/Texture/{Cell_01.gbr => Cell-01.gbr} | Bin + data/brushes/Texture/{Cell_02.gbr => Cell-02.gbr} | Bin + data/brushes/{Grass1.gih => Texture/Grass.gih} | Bin + data/brushes/Texture/Makefile.am | 19 +- + .../Texture/{Texture_01.gbr => Texture-01.gbr} | Bin + .../Texture/{Texture_02.gbr => Texture-02.gbr} | Bin + .../{Texture_Hose_01.gih => Texture-Hose-01.gih} | Bin + .../{Texture_Hose_02.gih => Texture-Hose-02.gih} | Bin + .../{Texture_Hose_03.gih => Texture-Hose-03.gih} | Bin + .../{Vegetation_01.gbr => Vegetation-01.gbr} | Bin + .../{Vegetation_02.gih => Vegetation-02.gih} | Bin + data/brushes/gimp-obsolete-files/.gitignore | 2 + + .../{ => gimp-obsolete-files}/10x10square.gbr | Bin + .../{ => gimp-obsolete-files}/10x10squareBlur.gbr | Bin + .../{ => gimp-obsolete-files}/20x20square.gbr | Bin + .../{ => gimp-obsolete-files}/20x20squareBlur.gbr | Bin + .../{ => gimp-obsolete-files}/5x5square.gbr | Bin + .../{ => gimp-obsolete-files}/5x5squareBlur.gbr | Bin + .../Calligraphic-Brush-0.vbr | 0 + .../Calligraphic-Brush-1.vbr | 0 + .../Calligraphic-Brush-2.vbr | 0 + .../Calligraphic-Brush-3.vbr | 0 + .../brushes/{ => gimp-obsolete-files}/Circle-1.vbr | 0 + .../{ => gimp-obsolete-files}/Circle-11.vbr | 0 + .../{ => gimp-obsolete-files}/Circle-13.vbr | 0 + .../{ => gimp-obsolete-files}/Circle-15.vbr | 0 + .../{ => gimp-obsolete-files}/Circle-17.vbr | 0 + .../{ => gimp-obsolete-files}/Circle-19.vbr | 0 + .../brushes/{ => gimp-obsolete-files}/Circle-3.vbr | 0 + .../brushes/{ => gimp-obsolete-files}/Circle-5.vbr | 0 + .../brushes/{ => gimp-obsolete-files}/Circle-7.vbr | 0 + .../brushes/{ => gimp-obsolete-files}/Circle-9.vbr | 0 + .../{ => gimp-obsolete-files}/Circle-Fuzzy-11.vbr | 0 + .../{ => gimp-obsolete-files}/Circle-Fuzzy-13.vbr | 0 + .../{ => gimp-obsolete-files}/Circle-Fuzzy-15.vbr | 0 + .../{ => gimp-obsolete-files}/Circle-Fuzzy-17.vbr | 0 + .../{ => gimp-obsolete-files}/Circle-Fuzzy-19.vbr | 0 + .../{ => gimp-obsolete-files}/Circle-Fuzzy-3.vbr | 0 + .../{ => gimp-obsolete-files}/Circle-Fuzzy-5.vbr | 0 + .../{ => gimp-obsolete-files}/Circle-Fuzzy-7.vbr | 0 + .../{ => gimp-obsolete-files}/Circle-Fuzzy-9.vbr | 0 + .../{ => gimp-obsolete-files}/Diagonal-Star-11.vbr | 0 + .../{ => gimp-obsolete-files}/Diagonal-Star-17.vbr | 0 + .../{ => gimp-obsolete-files}/Diagonal-Star-25.vbr | 0 + data/brushes/gimp-obsolete-files/Grass1.gih | Bin 0 -> 250304 bytes - data/brushes/Media/Acrylic_01.gih | Bin 129909 -> - 0 bytes - data/brushes/Media/Acrylic_02.gih | Bin 129915 -> - 0 bytes - data/brushes/Media/Acrylic_03.gih | Bin 169109 -> - 0 bytes - data/brushes/Media/Acrylic_04.gih | Bin 176715 -> - 0 bytes - data/brushes/Media/Acrylic_05.gih | Bin 590213 -> - 0 bytes - data/brushes/Media/Bristles-01.gbr | Bin 0 -> 4136 bytes - data/brushes/Media/Bristles-02.gbr | Bin 0 -> 4136 bytes - data/brushes/Media/Bristles-03.gbr | Bin 0 -> 940 bytes - data/brushes/Media/Bristles_01.gbr | Bin 4136 -> 0 bytes - data/brushes/Media/Bristles_02.gbr | Bin 4136 -> 0 bytes - data/brushes/Media/Bristles_03.gbr | Bin 940 -> 0 bytes - data/brushes/Media/Makefile.am | 22 +- - data/brushes/Media/Oils-01.gbr | Bin 0 -> 4920 bytes - data/brushes/Media/Oils-02.gbr | Bin 0 -> 8496 bytes - data/brushes/Media/Oils-03.gbr | Bin 0 -> 27260 bytes - data/brushes/Media/Oils_01.gbr | Bin 4920 -> 0 bytes - data/brushes/Media/Oils_02.gbr | Bin 8496 -> 0 bytes - data/brushes/Media/Oils_03.gbr | Bin 27260 -> 0 bytes - data/brushes/Sketch/Chalk-01.gih | Bin 0 -> 193907 - bytes - data/brushes/Sketch/Chalk-02.gih | Bin 0 -> 264855 - bytes - data/brushes/Sketch/Chalk-03.gih | Bin 0 -> 16670 bytes - data/brushes/Sketch/Chalk_01.gih | Bin 193907 -> - 0 bytes - data/brushes/Sketch/Chalk_02.gih | Bin 264855 -> - 0 bytes - data/brushes/Sketch/Chalk_03.gih | Bin 16670 -> 0 bytes - data/brushes/Sketch/Charcoal-01.gbr | Bin 0 -> 4136 bytes - data/brushes/Sketch/Charcoal-02.gbr | Bin 0 -> 16424 bytes - data/brushes/Sketch/Charcoal_01.gbr | Bin 4136 -> 0 bytes - data/brushes/Sketch/Charcoal_02.gbr | Bin 16424 -> 0 bytes - data/brushes/Sketch/Makefile.am | 16 +- - data/brushes/Sketch/Pencil-01.gih | Bin 0 -> 30518 bytes - data/brushes/Sketch/Pencil-02.gih | Bin 0 -> 30518 bytes - data/brushes/Sketch/Pencil-Scratch.gbr | Bin 0 -> 4139 bytes - data/brushes/Sketch/Pencil_01.gih | Bin 30518 -> 0 bytes - data/brushes/Sketch/Pencil_02.gih | Bin 30518 -> 0 bytes - data/brushes/Sketch/Pencil_Scratch.gbr | Bin 4139 -> 0 bytes - data/brushes/SketchBrush-16.gih | Bin 1618 -> 0 bytes - data/brushes/SketchBrush-32.gih | Bin 5458 -> 0 bytes - data/brushes/SketchBrush-64.gih | Bin 20818 -> 0 bytes - data/brushes/Splatters/Makefile.am | 10 +- - data/brushes/Splatters/Sparks-Hose.gih | Bin 0 -> 127649 - bytes - data/brushes/Splatters/Sparks_Hose.gih | Bin 127649 -> - 0 bytes - data/brushes/Splatters/Splats-01.gih | Bin 0 -> 156296 - bytes - data/brushes/Splatters/Splats-02.gih | Bin 0 -> 205866 - bytes - data/brushes/Splatters/Splats_01.gih | Bin 156296 -> - 0 bytes - data/brushes/Splatters/Splats_02.gih | Bin 205866 -> - 0 bytes - data/brushes/Splatters/Sponge-01.gbr | Bin 0 -> 62538 bytes - data/brushes/Splatters/Sponge-02.gbr | Bin 0 -> 28262 bytes - data/brushes/Splatters/Sponge_01.gbr | Bin 62538 -> 0 bytes - data/brushes/Splatters/Sponge_02.gbr | Bin 28262 -> 0 bytes - data/brushes/Texture/Cell-01.gbr | Bin 0 -> 27260 bytes - data/brushes/Texture/Cell-02.gbr | Bin 0 -> 11700 bytes - data/brushes/Texture/Cell_01.gbr | Bin 27260 -> 0 bytes - data/brushes/Texture/Cell_02.gbr | Bin 11700 -> 0 bytes - data/brushes/Texture/Grass.gih | Bin 0 -> 250304 - bytes - data/brushes/Texture/Makefile.am | 19 +- - data/brushes/Texture/Texture-01.gbr | Bin 0 -> 47964 bytes - data/brushes/Texture/Texture-02.gbr | Bin 0 -> 40039 bytes - data/brushes/Texture/Texture-Hose-01.gih | Bin 0 -> 541198 - bytes - data/brushes/Texture/Texture-Hose-02.gih | Bin 0 -> 541219 - bytes - data/brushes/Texture/Texture-Hose-03.gih | Bin 0 -> 360249 - bytes - data/brushes/Texture/Texture_01.gbr | Bin 47964 -> 0 bytes - data/brushes/Texture/Texture_02.gbr | Bin 40039 -> 0 bytes - data/brushes/Texture/Texture_Hose_01.gih | Bin 541198 -> - 0 bytes - data/brushes/Texture/Texture_Hose_02.gih | Bin 541219 -> - 0 bytes - data/brushes/Texture/Texture_Hose_03.gih | Bin 360249 -> - 0 bytes - data/brushes/Texture/Vegetation-01.gbr | Bin 0 -> 28772 bytes - data/brushes/Texture/Vegetation-02.gih | Bin 0 -> 86438 bytes - data/brushes/Texture/Vegetation_01.gbr | Bin 28772 -> 0 bytes - data/brushes/Texture/Vegetation_02.gih | Bin 86438 -> 0 bytes - data/brushes/confetti.gbr | Bin 793 -> 0 bytes - data/brushes/confetti.gih | Bin 8076 -> 0 bytes - data/brushes/dunes.gbr | Bin 1100 -> 0 bytes - data/brushes/feltpen.gih | Bin 118799 -> - 0 bytes - data/brushes/galaxy.gbr | Bin 2637 -> 0 bytes - data/brushes/galaxy_big.gbr | Bin 10040 -> 0 bytes - data/brushes/galaxy_small.gbr | Bin 749 -> 0 bytes - data/brushes/gimp-obsolete-files/.gitignore | 2 + - data/brushes/gimp-obsolete-files/10x10square.gbr | Bin 0 -> 143 bytes - .../gimp-obsolete-files/10x10squareBlur.gbr | Bin 0 -> 148 bytes - data/brushes/gimp-obsolete-files/20x20square.gbr | Bin 0 -> 443 bytes - .../gimp-obsolete-files/20x20squareBlur.gbr | Bin 0 -> 448 bytes - data/brushes/gimp-obsolete-files/5x5square.gbr | Bin 0 -> 66 bytes - data/brushes/gimp-obsolete-files/5x5squareBlur.gbr | Bin 0 -> 71 bytes - .../gimp-obsolete-files/Calligraphic-Brush-0.vbr | 8 + - .../gimp-obsolete-files/Calligraphic-Brush-1.vbr | 8 + - .../gimp-obsolete-files/Calligraphic-Brush-2.vbr | 8 + - .../gimp-obsolete-files/Calligraphic-Brush-3.vbr | 8 + - data/brushes/gimp-obsolete-files/Circle-1.vbr | 8 + - data/brushes/gimp-obsolete-files/Circle-11.vbr | 8 + - data/brushes/gimp-obsolete-files/Circle-13.vbr | 8 + - data/brushes/gimp-obsolete-files/Circle-15.vbr | 8 + - data/brushes/gimp-obsolete-files/Circle-17.vbr | 8 + - data/brushes/gimp-obsolete-files/Circle-19.vbr | 8 + - data/brushes/gimp-obsolete-files/Circle-3.vbr | 8 + - data/brushes/gimp-obsolete-files/Circle-5.vbr | 8 + - data/brushes/gimp-obsolete-files/Circle-7.vbr | 8 + - data/brushes/gimp-obsolete-files/Circle-9.vbr | 8 + - .../gimp-obsolete-files/Circle-Fuzzy-11.vbr | 8 + - .../gimp-obsolete-files/Circle-Fuzzy-13.vbr | 8 + - .../gimp-obsolete-files/Circle-Fuzzy-15.vbr | 8 + - .../gimp-obsolete-files/Circle-Fuzzy-17.vbr | 8 + - .../gimp-obsolete-files/Circle-Fuzzy-19.vbr | 8 + - .../brushes/gimp-obsolete-files/Circle-Fuzzy-3.vbr | 8 + - .../brushes/gimp-obsolete-files/Circle-Fuzzy-5.vbr | 8 + - .../brushes/gimp-obsolete-files/Circle-Fuzzy-7.vbr | 8 + - .../brushes/gimp-obsolete-files/Circle-Fuzzy-9.vbr | 8 + - .../gimp-obsolete-files/Diagonal-Star-11.vbr | 10 + - .../gimp-obsolete-files/Diagonal-Star-17.vbr | 10 + - .../gimp-obsolete-files/Diagonal-Star-25.vbr | 10 + - data/brushes/gimp-obsolete-files/Grass1.gih | Bin 0 -> 250304 - bytes - data/brushes/gimp-obsolete-files/Makefile.am | 57 +++ - .../brushes/gimp-obsolete-files/SketchBrush-16.gih | Bin 0 -> 1618 bytes - .../brushes/gimp-obsolete-files/SketchBrush-32.gih | Bin 0 -> 5458 bytes - .../brushes/gimp-obsolete-files/SketchBrush-64.gih | Bin 0 -> 20818 bytes - data/brushes/gimp-obsolete-files/confetti.gbr | Bin 0 -> 793 bytes - data/brushes/gimp-obsolete-files/confetti.gih | Bin 0 -> 8076 bytes - data/brushes/gimp-obsolete-files/dunes.gbr | Bin 0 -> 1100 bytes - data/brushes/gimp-obsolete-files/feltpen.gih | Bin 0 -> 118799 - bytes - data/brushes/gimp-obsolete-files/galaxy.gbr | Bin 0 -> 2637 bytes + data/brushes/gimp-obsolete-files/Makefile.am | 57 +++ + .../{ => gimp-obsolete-files}/SketchBrush-16.gih | Bin + .../{ => gimp-obsolete-files}/SketchBrush-32.gih | Bin + .../{ => gimp-obsolete-files}/SketchBrush-64.gih | Bin + data/brushes/gimp-obsolete-files/confetti.gbr | Bin 0 -> 793 bytes + data/brushes/gimp-obsolete-files/confetti.gih | Bin 0 -> 8076 bytes + data/brushes/gimp-obsolete-files/dunes.gbr | Bin 0 -> 1100 bytes + data/brushes/{ => gimp-obsolete-files}/feltpen.gih | Bin + data/brushes/gimp-obsolete-files/galaxy.gbr | Bin 0 -> 2637 bytes data/brushes/gimp-obsolete-files/galaxy_big.gbr | Bin 0 -> 10040 bytes - data/brushes/gimp-obsolete-files/galaxy_small.gbr | Bin 0 -> 749 bytes - data/brushes/gimp-obsolete-files/pepper.gbr | Bin 0 -> 11991 bytes - data/brushes/gimp-obsolete-files/pixel.gbr | Bin 0 -> 48 bytes - data/brushes/gimp-obsolete-files/vine.gih | Bin 0 -> 116027 + .../{ => gimp-obsolete-files}/galaxy_small.gbr | Bin + data/brushes/{ => gimp-obsolete-files}/pepper.gbr | Bin + data/brushes/gimp-obsolete-files/pixel.gbr | Bin 0 -> 48 bytes + data/brushes/gimp-obsolete-files/vine.gih | Bin 0 -> 116027 bytes - data/brushes/pepper.gbr | Bin 11991 -> 0 bytes - data/brushes/pixel.gbr | Bin 48 -> 0 bytes - data/brushes/vine.gih | Bin 116027 -> - 0 bytes - data/dynamics/Basic/Basic-Simple.gdyn | 555 - +++++++++++++++++++++ - data/dynamics/Basic/Basic_Simple.gdyn | 555 - --------------------- - data/dynamics/Basic/Dynamics-Random.gdyn | 555 - +++++++++++++++++++++ - data/dynamics/Basic/Dynamics_Random.gdyn | 555 - --------------------- - data/dynamics/Basic/Makefile.am | 14 +- - data/dynamics/Basic/Negative-Size-Pressure.gdyn | 555 - +++++++++++++++++++++ - data/dynamics/Basic/Negative_Size_Pressure.gdyn | 555 - --------------------- - data/dynamics/Basic/Pen-Generic.gdyn | 555 - +++++++++++++++++++++ - data/dynamics/Basic/Pen_Generic.gdyn | 555 - --------------------- - data/dynamics/Basic/Pencil-Generic.gdyn | 555 - +++++++++++++++++++++ - data/dynamics/Basic/Pencil-Shader.gdyn | 555 - +++++++++++++++++++++ - data/dynamics/Basic/Pencil_Generic.gdyn | 555 - --------------------- - data/dynamics/Basic/Pencil_Shader.gdyn | 555 - --------------------- - data/dynamics/Basic/Pressure-Opacity.gdyn | 555 - +++++++++++++++++++++ - data/dynamics/Basic/Pressure_Opacity.gdyn | 555 - --------------------- - data/dynamics/Random-Color.gdyn | 522 - ++++++++++++++++++- - data/tool-presets/.gitignore | 2 + - data/tool-presets/FX/Crop-16-9.gtp | 7 - - data/tool-presets/FX/Crop-Composition.gtp | 9 +- - data/tool-presets/FX/FX-Confetti.gtp | 27 + - data/tool-presets/FX/FX-Radial-Softlight.gtp | 21 + - data/tool-presets/FX/FX_Confetti.gtp | 29 -- - data/tool-presets/FX/FX_Radial_Softlight.gtp | 26 - - data/tool-presets/FX/Fill-Paper.gtp | 23 + - data/tool-presets/FX/Fill_Paper.gtp | 26 - - data/tool-presets/FX/Glow-Lights.gtp | 26 + - data/tool-presets/FX/Glow_Lights.gtp | 28 -- - data/tool-presets/FX/Makefile.am | 10 +- - data/tool-presets/FX/Smooth-Clone.gtp | 21 + - data/tool-presets/FX/Smooth_Clone.gtp | 22 - - data/tool-presets/FX/Vignette.gtp | 16 +- - data/tool-presets/Paint/Airbrush.gtp | 4 +- - data/tool-presets/Paint/Basic-Knife.gtp | 23 + - data/tool-presets/Paint/Basic-Round-Detail.gtp | 20 + - data/tool-presets/Paint/Basic-Round.gtp | 23 + - data/tool-presets/Paint/Basic_Knife.gtp | 25 - - data/tool-presets/Paint/Basic_Round.gtp | 25 - - data/tool-presets/Paint/Basic_Round_Detail.gtp | 22 - - data/tool-presets/Paint/Bristles.gtp | 2 - - data/tool-presets/Paint/Eraser-Hard.gtp | 19 + - data/tool-presets/Paint/Eraser_Hard.gtp | 22 - - data/tool-presets/Paint/Makefile.am | 16 +- - data/tool-presets/Paint/Noise.gtp | 2 - - data/tool-presets/Paint/Smudge-Rough.gtp | 22 + - data/tool-presets/Paint/Smudge-Soft.gtp | 21 + - data/tool-presets/Paint/Smudge_Rough.gtp | 25 - - data/tool-presets/Paint/Smudge_Soft.gtp | 23 - - data/tool-presets/Paint/Soft-Oil.gtp | 23 + - data/tool-presets/Paint/Soft_Oil.gtp | 25 - - data/tool-presets/Paint/Splatters.gtp | 3 - - data/tool-presets/Paint/Structure.gtp | 2 - - data/tool-presets/Paint/Vegetal.gtp | 7 +- - data/tool-presets/Selection/Circle-200px.gtp | 7 - - .../tool-presets/Selection/Feathered-Selection.gtp | 7 - - data/tool-presets/Sketch/Blue_Pen.gtp | 6 +- - data/tool-presets/Sketch/Eraser_Soft.gtp | 5 +- - data/tool-presets/Sketch/Ink_Smooth.gtp | 6 - - data/tool-presets/Sketch/Ink_Thin.gtp | 4 - - data/tool-presets/Sketch/Pencil.gtp | 4 +- - data/tool-presets/Sketch/Pencil_Soft.gtp | 2 - - 256 files changed, 5107 insertions(+), 4692 deletions(-) + .../Basic/{Basic_Simple.gdyn => Basic-Simple.gdyn} | 0 + .../{Dynamics_Random.gdyn => Dynamics-Random.gdyn} | 4 +- + data/dynamics/Basic/Makefile.am | 14 +- + ...e_Pressure.gdyn => Negative-Size-Pressure.gdyn} | 0 + .../Basic/{Pen_Generic.gdyn => Pen-Generic.gdyn} | 0 + .../{Pencil_Generic.gdyn => Pencil-Generic.gdyn} | 0 + .../{Pencil_Shader.gdyn => Pencil-Shader.gdyn} | 0 + ...Pressure_Opacity.gdyn => Pressure-Opacity.gdyn} | 0 + data/dynamics/Random-Color.gdyn | 522 + ++++++++++++++++++++- + data/tool-presets/.gitignore | 2 + + data/tool-presets/FX/Crop-16-9.gtp | 7 - + data/tool-presets/FX/Crop-Composition.gtp | 9 +- + .../FX/{FX_Confetti.gtp => FX-Confetti.gtp} | 4 +- + ...adial_Softlight.gtp => FX-Radial-Softlight.gtp} | 5 - + .../FX/{Fill_Paper.gtp => Fill-Paper.gtp} | 3 - + .../FX/{Glow_Lights.gtp => Glow-Lights.gtp} | 4 +- + data/tool-presets/FX/Makefile.am | 10 +- + .../FX/{Smooth_Clone.gtp => Smooth-Clone.gtp} | 3 +- + data/tool-presets/FX/Vignette.gtp | 16 +- + data/tool-presets/Paint/Airbrush.gtp | 4 +- + .../Paint/{Basic_Knife.gtp => Basic-Knife.gtp} | 4 +- + ...sic_Round_Detail.gtp => Basic-Round-Detail.gtp} | 4 +- + .../Paint/{Basic_Round.gtp => Basic-Round.gtp} | 4 +- + data/tool-presets/Paint/Bristles.gtp | 2 - + .../Paint/{Eraser_Hard.gtp => Eraser-Hard.gtp} | 5 +- + data/tool-presets/Paint/Makefile.am | 16 +- + data/tool-presets/Paint/Noise.gtp | 2 - + .../Paint/{Smudge_Rough.gtp => Smudge-Rough.gtp} | 7 +- + .../Paint/{Smudge_Soft.gtp => Smudge-Soft.gtp} | 4 +- + .../Paint/{Soft_Oil.gtp => Soft-Oil.gtp} | 2 - + data/tool-presets/Paint/Splatters.gtp | 3 - + data/tool-presets/Paint/Structure.gtp | 2 - + data/tool-presets/Paint/Vegetal.gtp | 7 +- + data/tool-presets/Selection/Circle-200px.gtp | 7 - + .../tool-presets/Selection/Feathered-Selection.gtp | 7 - + data/tool-presets/Sketch/Blue_Pen.gtp | 6 +- + data/tool-presets/Sketch/Eraser_Soft.gtp | 5 +- + data/tool-presets/Sketch/Ink_Smooth.gtp | 6 - + data/tool-presets/Sketch/Ink_Thin.gtp | 4 - + data/tool-presets/Sketch/Pencil.gtp | 4 +- + data/tool-presets/Sketch/Pencil_Soft.gtp | 2 - + 150 files changed, 691 insertions(+), 276 deletions(-) commit 6e1618a91085b888e902f4dc77250e31aa3cde05 Author: Martin Srebotnjak -Date: Sat Feb 4 19:48:32 2012 +0100 +Date: Sat Feb 4 19:48:32 2012 +0100 Updated Slovenian translation @@ -20575,7 +21490,7 @@ commit dff066dc5946b2a2ab7ab0a87d61e4513bc71bad Author: Khaled Hosny -Date: Fri Feb 3 07:42:31 2012 +0200 +Date: Fri Feb 3 07:42:31 2012 +0200 Update Arabic translation @@ -20585,7 +21500,7 @@ commit c585737f3a547e8027133b96ae2db52d45a66bcc Author: Alexia Death -Date: Wed Jan 4 21:06:28 2012 +0200 +Date: Wed Jan 4 21:06:28 2012 +0200 app: Add import type as third preference on Export @@ -20594,7 +21509,7 @@ commit 84b048744d311074e2e0e8d79662f264fca3f37c Author: Piotr Drąg -Date: Thu Feb 2 18:50:26 2012 +0100 +Date: Thu Feb 2 18:50:26 2012 +0100 Updated Polish translation @@ -20604,7 +21519,7 @@ commit a0e6941db19736db0262298bc4e65a0ba4919d91 Author: Massimo Valentini -Date: Thu Feb 2 14:11:59 2012 +0100 +Date: Thu Feb 2 14:11:59 2012 +0100 Bug 669188: saving a monochrome bitmap picture ... @@ -20616,7 +21531,7 @@ commit 216470c728b8b39c8c24a8751bfcb75b29db24bd Author: Mukund Sivaraman -Date: Thu Feb 2 21:58:35 2012 +0530 +Date: Thu Feb 2 21:58:35 2012 +0530 file-pdf-load: Change description and button text @@ -20625,7 +21540,7 @@ commit 4f3da64f551f5e6add1c17524ae266225fb01ce6 Author: Mukund Sivaraman -Date: Thu Feb 2 21:56:30 2012 +0530 +Date: Thu Feb 2 21:56:30 2012 +0530 file-pdf-load: Rearrange code slightly to group the font options statements together @@ -20635,7 +21550,7 @@ commit 389c73d4929d883bf2a28499cd9254eb722f1b01 Author: Massimo Valentini -Date: Thu Feb 2 15:04:07 2012 +0100 +Date: Thu Feb 2 15:04:07 2012 +0100 file-pdf-load: Bug 644544: Let GIMP allow to switch off antialiasing in PDF @@ -20646,7 +21561,7 @@ commit 355ce0b6ec3ff489406818b979fd580f1a766624 Author: Mukund Sivaraman -Date: Thu Feb 2 16:30:36 2012 +0530 +Date: Thu Feb 2 16:30:36 2012 +0530 docs: Update the release instructions to be more water-tight @@ -20656,7 +21571,7 @@ commit 17f1f2a2fae24b70a25560dfbe1188b3bde4c699 Author: Michael Natterer -Date: Wed Feb 1 20:38:10 2012 +0100 +Date: Wed Feb 1 20:38:10 2012 +0100 app: use G_N_ELEMENTS() and remove GIMP_N_TAB_STYLE_CANDIDATES define @@ -20665,7 +21580,7 @@ commit f7554c299ef3a235f6b2368a0f227a59602430c4 Author: Alexia Death -Date: Wed Feb 1 21:04:41 2012 +0200 +Date: Wed Feb 1 21:04:41 2012 +0200 app: use deletable flag for sorting user data above system data @@ -20678,26 +21593,26 @@ commit bcb35382c63b7d02998b061e979f9e2230a98098 Author: Alexia Death -Date: Wed Feb 1 00:48:24 2012 +0200 +Date: Wed Feb 1 00:48:24 2012 +0200 data: cleanup default brushes set - data/brushes/Acrylic1.gih | Bin 129906 -> 0 bytes - data/brushes/Acrylic2.gih | Bin 176712 -> 0 bytes - data/brushes/Acrylic3.gih | Bin 129912 -> 0 bytes - data/brushes/Acrylic4.gih | Bin 169106 -> 0 bytes - data/brushes/Chalk1.gih | Bin 193904 -> 0 bytes - data/brushes/Chalk2.gih | Bin 264852 -> 0 bytes + data/brushes/Acrylic1.gih | Bin 129906 -> 0 bytes + data/brushes/Acrylic2.gih | Bin 176712 -> 0 bytes + data/brushes/Acrylic3.gih | Bin 129912 -> 0 bytes + data/brushes/Acrylic4.gih | Bin 169106 -> 0 bytes + data/brushes/Chalk1.gih | Bin 193904 -> 0 bytes + data/brushes/Chalk2.gih | Bin 264852 -> 0 bytes data/brushes/Diagonal-Star.vbr | 10 ---------- - data/brushes/Makefile.am | 17 ++++------------- - data/brushes/Round-Fuzzy.vbr | 8 -------- - data/brushes/Round.vbr | 8 -------- - data/brushes/hsparks.gih | Bin 127644 -> 0 bytes + data/brushes/Makefile.am | 17 ++++------------- + data/brushes/Round-Fuzzy.vbr | 8 -------- + data/brushes/Round.vbr | 8 -------- + data/brushes/hsparks.gih | Bin 127644 -> 0 bytes 11 files changed, 4 insertions(+), 39 deletions(-) commit d11f9d7dbfa00ca3ef150fe54666d7a4717115b2 Author: Michael Natterer -Date: Tue Jan 31 22:00:17 2012 +0100 +Date: Tue Jan 31 22:00:17 2012 +0100 Bug 664885 - Open 'Document History' --> always a additional history tab appears @@ -20712,7 +21627,7 @@ commit 9a4abedb9896357edafef6ef11110ac4a61c15a2 Author: Michael Natterer -Date: Tue Jan 31 21:28:12 2012 +0100 +Date: Tue Jan 31 21:28:12 2012 +0100 plug-ins: fix indentation b0rk from previous commit @@ -20722,7 +21637,7 @@ commit 28710936265c7fa051ae7c547324b32eec283dd8 Author: Kevin Cozens -Date: Tue Jan 31 14:37:43 2012 -0500 +Date: Tue Jan 31 14:37:43 2012 -0500 Bug 669074 - Corrected typo, spotted by David Allen, in BMP file signature. @@ -20733,7 +21648,7 @@ commit 05bca8c62272b2cf966a0ec13daf528ebb826b7b Author: Mukund Sivaraman -Date: Tue Jan 31 19:01:51 2012 +0530 +Date: Tue Jan 31 19:01:51 2012 +0530 build: Make .xz compressed dist tarballs too @@ -20742,86 +21657,82 @@ commit cac442c2dfd72431bd8095df241ea52e281035b8 Author: Michael Natterer -Date: Mon Jan 30 23:52:59 2012 +0100 +Date: Mon Jan 30 23:52:59 2012 +0100 app: port dockable showing in widgets/ to GimpWindowStrategy - app/widgets/gimpcontainerpopup.c | 10 +++++++--- - app/widgets/gimpdevicestatus.c | 12 +++++++++--- - app/widgets/gimptoolbox-image-area.c | 12 +++++++++--- + app/widgets/gimpcontainerpopup.c | 10 +++++++--- + app/widgets/gimpdevicestatus.c | 12 +++++++++--- + app/widgets/gimptoolbox-image-area.c | 12 +++++++++--- app/widgets/gimptoolbox-indicator-area.c | 32 +++++++++++++++++++++++--------- - app/widgets/gimptoolpalette.c | 15 +++++++++------ - app/widgets/gimpviewablebox.c | 9 ++++++--- + app/widgets/gimptoolpalette.c | 15 +++++++++------ + app/widgets/gimpviewablebox.c | 9 ++++++--- 6 files changed, 63 insertions(+), 27 deletions(-) commit 0a68527edcfcb88936b05c5bf16fdb8a3c292158 Author: Michael Natterer -Date: Mon Jan 30 23:33:21 2012 +0100 +Date: Mon Jan 30 23:33:21 2012 +0100 app: move the GimpWindowStrategy interface from display/ to widgets/ - app/actions/data-commands.c | 3 +- - app/actions/dialogs-commands.c | 3 +- - app/actions/edit-commands.c | 2 +- - app/actions/file-commands.c | 1 - - app/actions/select-commands.c | 2 +- - app/actions/tool-options-commands.c | 3 +- - app/actions/view-commands.c | 2 +- - app/display/Makefile.am | 4 +- - app/display/display-types.h | 1 - - app/display/gimpmultiwindowstrategy.c | 2 +- - app/display/gimpsinglewindowstrategy.c | 5 +- - app/display/gimpwindowstrategy.c | 91 - ---------------------------------- - app/display/gimpwindowstrategy.h | 54 -------------------- - app/gui/gui-message.c | 3 +- - app/tools/gimpcolortool.c | 2 +- - app/widgets/Makefile.am | 2 + - app/widgets/gimpwindowstrategy.c | 90 - +++++++++++++++++++++++++++++++++ - app/widgets/gimpwindowstrategy.h | 54 ++++++++++++++++++++ - app/widgets/widgets-types.h | 1 + - 19 files changed, 159 insertions(+), 166 deletions(-) + app/actions/data-commands.c | 3 +-- + app/actions/dialogs-commands.c | 3 +-- + app/actions/edit-commands.c | 2 +- + app/actions/file-commands.c | 1 - + app/actions/select-commands.c | 2 +- + app/actions/tool-options-commands.c | 3 +-- + app/actions/view-commands.c | 2 +- + app/display/Makefile.am | 4 +--- + app/display/display-types.h | 1 - + app/display/gimpmultiwindowstrategy.c | 2 +- + app/display/gimpsinglewindowstrategy.c | 5 ++--- + app/gui/gui-message.c | 3 +-- + app/tools/gimpcolortool.c | 2 +- + app/widgets/Makefile.am | 2 ++ + app/{display => widgets}/gimpwindowstrategy.c | 5 ++--- + app/{display => widgets}/gimpwindowstrategy.h | 0 + app/widgets/widgets-types.h | 1 + + 17 files changed, 17 insertions(+), 24 deletions(-) commit 325bce54a74749725e40139b10cff36601018805 Author: Michael Natterer -Date: Mon Jan 30 23:24:44 2012 +0100 +Date: Mon Jan 30 23:24:44 2012 +0100 app: port dockable showing to using GimpWindowStrategy API so it works right in SWM. Fixed actions/, tools/, and app/ for now. - app/actions/data-commands.c | 10 ++++++++-- - app/actions/edit-commands.c | 11 ++++++++--- - app/actions/file-commands.c | 1 + - app/actions/select-commands.c | 9 ++++++--- + app/actions/data-commands.c | 10 ++++++++-- + app/actions/edit-commands.c | 11 ++++++++--- + app/actions/file-commands.c | 1 + + app/actions/select-commands.c | 9 ++++++--- app/actions/tool-options-commands.c | 34 ++++++++++++++++++++++------------ - app/actions/view-commands.c | 23 ++++++++++++++--------- - app/gui/gui-message.c | 17 ++++++++++++----- - app/tools/gimpcolortool.c | 15 +++++++++------ + app/actions/view-commands.c | 23 ++++++++++++++--------- + app/gui/gui-message.c | 17 ++++++++++++----- + app/tools/gimpcolortool.c | 15 +++++++++------ 8 files changed, 80 insertions(+), 40 deletions(-) commit 79a66d36d2188a2f8553ca80f364089df460932b Author: Michael Natterer -Date: Mon Jan 30 22:59:09 2012 +0100 +Date: Mon Jan 30 22:59:09 2012 +0100 app: rename GimpWindowStrategy::create_dockable_dialog() to ::show_dockable_dialog() because that's what it wlays does, no matter if the dialog has to be created or now. - app/actions/dialogs-commands.c | 10 +++++----- - app/display/gimpmultiwindowstrategy.c | 14 +++++++------- + app/actions/dialogs-commands.c | 10 +++++----- + app/display/gimpmultiwindowstrategy.c | 14 +++++++------- app/display/gimpsinglewindowstrategy.c | 14 +++++++------- - app/display/gimpwindowstrategy.c | 24 ++++++++++++------------ - app/display/gimpwindowstrategy.h | 22 +++++++++++----------- + app/display/gimpwindowstrategy.c | 24 ++++++++++++------------ + app/display/gimpwindowstrategy.h | 22 +++++++++++----------- 5 files changed, 42 insertions(+), 42 deletions(-) commit 4aa866a8b931f9d007bdc8b71ceb50c4ec031a1b Author: Michael Natterer -Date: Mon Jan 30 22:53:43 2012 +0100 +Date: Mon Jan 30 22:53:43 2012 +0100 Bug 664885 - Open 'Document History' --> always a additional history tab appears @@ -20835,7 +21746,7 @@ commit 92693f40b6b61ee88f9de996a419baac0abe8ab2 Author: Michael Natterer -Date: Mon Jan 30 22:51:51 2012 +0100 +Date: Mon Jan 30 22:51:51 2012 +0100 app: allow to pass an identifier list to gimp_dialog_factory_find_widget() @@ -20849,7 +21760,7 @@ commit dcc9eabbd5bea7298d801f5b4c8095cff1d62fe5 Author: Michael Natterer -Date: Sun Jan 29 16:59:22 2012 +0100 +Date: Sun Jan 29 16:59:22 2012 +0100 app: formatting fixes in GimpSmudge @@ -20858,7 +21769,7 @@ commit 993eb1447610ceb2dc804d86a23b978818b818a6 Author: Marco Ciampa -Date: Sat Jan 28 22:10:05 2012 +0100 +Date: Sat Jan 28 22:10:05 2012 +0100 Updated italian translation. @@ -20867,7 +21778,7 @@ commit e373cf1e52aa682158e260dab2c2668c0ff1cfa3 Author: Žygimantas Beručka -Date: Sat Jan 28 13:49:06 2012 +0200 +Date: Sat Jan 28 13:49:06 2012 +0200 Updated Lithuanian translation @@ -20877,7 +21788,7 @@ commit 5454e03ef5b9520057ecb92f0c853bdfeabcf4dd Author: Marco Ciampa -Date: Fri Jan 27 22:36:11 2012 +0100 +Date: Fri Jan 27 22:36:11 2012 +0100 Updated italian translation @@ -20887,7 +21798,7 @@ commit 7eb2bbd11cfb40cdb3ff40ef55c9019ccf9d2914 Author: Francisco Vila -Date: Thu Jan 26 13:29:54 2012 +0100 +Date: Thu Jan 26 13:29:54 2012 +0100 Updated Spanish translation @@ -20897,7 +21808,7 @@ commit cc5596c334feb74ef69c987ea9c83011c4f124d8 Author: Francisco Vila -Date: Thu Jan 26 12:59:37 2012 +0100 +Date: Thu Jan 26 12:59:37 2012 +0100 Updated Spanish translation @@ -20907,7 +21818,7 @@ commit db97f15ad582a6af895f4ee67b6c386198e2bfa5 Author: Martin Srebotnjak -Date: Wed Jan 25 21:38:51 2012 +0100 +Date: Wed Jan 25 21:38:51 2012 +0100 Updated Slovenian translation @@ -20917,7 +21828,7 @@ commit 58defdc380bd4b31251072af6204fad34448db79 Author: Hleb Valoshka <375gnu@gmail.com> -Date: Wed Jan 25 22:48:21 2012 +0300 +Date: Wed Jan 25 22:48:21 2012 +0300 Updated Belarusian translation. @@ -20927,7 +21838,7 @@ commit da14eca758c3c1036ca65236a772487b3228eb85 Author: Franciscos Vila -Date: Wed Jan 25 17:25:31 2012 +0100 +Date: Wed Jan 25 17:25:31 2012 +0100 Updated Spanish translation @@ -20937,7 +21848,7 @@ commit 2c1a2567fe6100f079b10503fb07024a8bc7db2e Author: Franciscos Vila -Date: Wed Jan 25 17:21:58 2012 +0100 +Date: Wed Jan 25 17:21:58 2012 +0100 Updated Spanish translation @@ -20947,7 +21858,7 @@ commit b5e6a60fbf1a32d34178510904e0e6ac128c13eb Author: Piotr Drąg -Date: Wed Jan 25 17:01:06 2012 +0100 +Date: Wed Jan 25 17:01:06 2012 +0100 Updated Polish translation @@ -20957,7 +21868,7 @@ commit 123f499e3045d8eb4c951dab7f44bf82fc6f07dd Author: Michael Natterer -Date: Tue Jan 24 23:36:29 2012 +0100 +Date: Tue Jan 24 23:36:29 2012 +0100 Bug 668600 - "You can drop dockable dialogs here" not translatable @@ -20968,7 +21879,7 @@ commit 569b262e2ddb2e8cf89bd08e92eb40e3533a3741 Author: Michael Natterer -Date: Mon Jan 23 22:40:49 2012 +0100 +Date: Mon Jan 23 22:40:49 2012 +0100 app: various tool options and tool preset fixes @@ -20985,16 +21896,16 @@ that have no effect on the tool. - set GimpToolPresetEditor's toggle insensitive for these properties. - app/core/gimptoolinfo.c | 9 ---- - app/core/gimptooloptions.c | 17 +++++-- - app/core/gimptoolpreset.c | 100 + app/core/gimptoolinfo.c | 9 ---- + app/core/gimptooloptions.c | 17 +++++-- + app/core/gimptoolpreset.c | 100 +++++++++++++++++++++++++++++++------ app/widgets/gimptoolpreseteditor.c | 88 ++++++++++++++++++++++---------- 4 files changed, 160 insertions(+), 54 deletions(-) commit 761b566c4965dca613dc29a3fc6e253cc1e642c1 Author: Alexia Death -Date: Mon Jan 23 23:07:54 2012 +0200 +Date: Mon Jan 23 23:07:54 2012 +0200 data: fix incorect dynamics preset @@ -21003,7 +21914,7 @@ commit 313430b738eb8d48546038133acb193bf8d3dfbc Author: Michael Natterer -Date: Mon Jan 23 00:56:21 2012 +0100 +Date: Mon Jan 23 00:56:21 2012 +0100 app: move all GimpToolPresetEditor members to a private struct @@ -21014,27 +21925,27 @@ commit 6699ed185c96eb0c801e68d347c36d3adf1c0128 Author: Michael Natterer -Date: Sun Jan 22 21:02:36 2012 +0100 +Date: Sun Jan 22 21:02:36 2012 +0100 data: Add .gitignore in the new data directories - data/brushes/.gitignore | 1 - - data/brushes/Basic/.gitignore | 2 ++ - data/brushes/Media/.gitignore | 2 ++ - data/brushes/Sketch/.gitignore | 2 ++ - data/brushes/Splatters/.gitignore | 2 ++ - data/brushes/Texture/.gitignore | 2 ++ - data/dynamics/Basic/.gitignore | 2 ++ - data/dynamics/FX/.gitignore | 2 ++ - data/tool-presets/FX/.gitignore | 2 ++ - data/tool-presets/Paint/.gitignore | 2 ++ + data/brushes/.gitignore | 1 - + data/brushes/Basic/.gitignore | 2 ++ + data/brushes/Media/.gitignore | 2 ++ + data/brushes/Sketch/.gitignore | 2 ++ + data/brushes/Splatters/.gitignore | 2 ++ + data/brushes/Texture/.gitignore | 2 ++ + data/dynamics/Basic/.gitignore | 2 ++ + data/dynamics/FX/.gitignore | 2 ++ + data/tool-presets/FX/.gitignore | 2 ++ + data/tool-presets/Paint/.gitignore | 2 ++ data/tool-presets/Selection/.gitignore | 2 ++ - data/tool-presets/Sketch/.gitignore | 2 ++ + data/tool-presets/Sketch/.gitignore | 2 ++ 12 files changed, 22 insertions(+), 1 deletion(-) commit a77809a13bac064edeb6f1969e18fcc93411d5d5 Author: Michael Natterer -Date: Sun Jan 22 20:45:42 2012 +0100 +Date: Sun Jan 22 20:45:42 2012 +0100 Bug 668447 - Rotate tool: wrong keyboard bindings to rotate image interactively @@ -21046,7 +21957,7 @@ commit e1a819d5642b2c7cc2c97f7d454d0c05653c7d48 Author: Khaled Hosny -Date: Sun Jan 22 21:27:06 2012 +0200 +Date: Sun Jan 22 21:27:06 2012 +0200 Typo @@ -21055,7 +21966,7 @@ commit c3c348e50bd6dab8df1020979bfabb5d1e0afaea Author: Massimo Valentini -Date: Sun Jan 22 17:58:50 2012 +0100 +Date: Sun Jan 22 17:58:50 2012 +0100 Bug 666949: Segfault when reading XCF file @@ -21063,12 +21974,12 @@ app/base/tile-manager.c | 2 +- app/base/tile-private.h | 2 +- - app/base/tile.c | 2 +- + app/base/tile.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit 005b119f1f6fb866066b827a6d4d4946845d1264 Author: Mukund Sivaraman -Date: Sun Jan 22 09:56:08 2012 +0530 +Date: Sun Jan 22 09:56:08 2012 +0530 file-ps: Link to Ghostscript library instead of launching another process @@ -21079,18 +21990,18 @@ commit ebe0bcc9014624247112ab45bfd3f2fba19f652b Author: Mukund Sivaraman -Date: Sun Jan 22 09:14:31 2012 +0530 +Date: Sun Jan 22 09:14:31 2012 +0530 build: Add check for Ghostscript - configure.ac | 20 ++++++++++++++++++++ - plug-ins/common/Makefile.am | 4 +++- + configure.ac | 20 ++++++++++++++++++++ + plug-ins/common/Makefile.am | 4 +++- plug-ins/common/plugin-defs.pl | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) commit 3f7a2dc9a7bc4afb49786740e41d84ef0bcabe88 Author: Mukund Sivaraman -Date: Sun Jan 22 09:04:08 2012 +0530 +Date: Sun Jan 22 09:04:08 2012 +0530 build: Add missing SUBDIRS to data/dynamics/Makefile.am @@ -21099,187 +22010,188 @@ commit 8746d0c51e2ae451d5fd27fdcac2da0fe0c8c0dd Author: Mukund Sivaraman -Date: Sat Jan 21 22:45:16 2012 +0530 +Date: Sat Jan 21 22:45:16 2012 +0530 build: Cleanup trailing whitespace and some other whitespace - data/brushes/Basic/Makefile.am | 2 +- - data/brushes/Media/Makefile.am | 23 +++++++++++------------ - data/brushes/Sketch/Makefile.am | 3 +-- - data/brushes/Splatters/Makefile.am | 11 +++++------ - data/brushes/Texture/Makefile.am | 3 +-- - data/dynamics/Basic/Makefile.am | 5 +---- - data/dynamics/FX/Makefile.am | 5 +---- - data/tool-presets/FX/Makefile.am | 5 +---- - data/tool-presets/Makefile.am | 1 - - data/tool-presets/Paint/Makefile.am | 5 +---- + data/brushes/Basic/Makefile.am | 2 +- + data/brushes/Media/Makefile.am | 23 +++++++++++------------ + data/brushes/Sketch/Makefile.am | 3 +-- + data/brushes/Splatters/Makefile.am | 11 +++++------ + data/brushes/Texture/Makefile.am | 3 +-- + data/dynamics/Basic/Makefile.am | 5 +---- + data/dynamics/FX/Makefile.am | 5 +---- + data/tool-presets/FX/Makefile.am | 5 +---- + data/tool-presets/Makefile.am | 1 - + data/tool-presets/Paint/Makefile.am | 5 +---- data/tool-presets/Selection/Makefile.am | 7 ++----- - data/tool-presets/Sketch/Makefile.am | 6 +----- + data/tool-presets/Sketch/Makefile.am | 6 +----- 12 files changed, 26 insertions(+), 50 deletions(-) commit b8e2b8b0d8c81a1967d027f71e0e4363de75e22c Author: Alexia Death -Date: Sat Jan 21 18:14:34 2012 +0200 +Date: Sat Jan 21 18:14:34 2012 +0200 data: Make new presets from Ramon Miranda install - configure.ac | 11 +++++++++++ - data/Makefile.am | 3 ++- - data/brushes/Makefile.am | 6 +++++- - data/brushes/Media/Makefile.am | 19 +++++++++++++++++++ - data/brushes/Sketch/Makefile.am | 16 ++++++++++++++++ - data/brushes/Splatters/Makefile.am | 13 +++++++++++++ - data/brushes/Texture/Makefile.am | 19 +++++++++++++++++++ - data/dynamics/Basic/Makefile.am | 17 +++++++++++++++++ - data/dynamics/FX/Makefile.am | 13 +++++++++++++ - data/tool-presets/FX/Makefile.am | 18 ++++++++++++++++++ - data/tool-presets/Makefile.am | 8 ++++++++ - data/tool-presets/Paint/Eraser-Hard.gtp | 22 ---------------------- - data/tool-presets/Paint/Eraser_Hard.gtp | 22 ++++++++++++++++++++++ - data/tool-presets/Paint/Makefile.am | 23 +++++++++++++++++++++++ - data/tool-presets/Selection/Makefile.am | 12 ++++++++++++ - data/tool-presets/Sketch/Makefile.am | 17 +++++++++++++++++ - 16 files changed, 215 insertions(+), 24 deletions(-) + configure.ac | 11 +++++++++++ + data/Makefile.am | 3 ++- + data/brushes/Makefile.am | 6 +++++- + data/brushes/Media/Makefile.am | 19 + ++++++++++++++++++ + data/brushes/Sketch/Makefile.am | 16 +++++++++++++++ + data/brushes/Splatters/Makefile.am | 13 ++++++++++++ + data/brushes/Texture/Makefile.am | 19 + ++++++++++++++++++ + data/dynamics/Basic/Makefile.am | 17 ++++++++++++++++ + data/dynamics/FX/Makefile.am | 13 ++++++++++++ + data/tool-presets/FX/Makefile.am | 18 +++++++++++++++++ + data/tool-presets/Makefile.am | 8 ++++++++ + .../Paint/{Eraser-Hard.gtp => Eraser_Hard.gtp} | 0 + data/tool-presets/Paint/Makefile.am | 23 + ++++++++++++++++++++++ + data/tool-presets/Selection/Makefile.am | 12 +++++++++++ + data/tool-presets/Sketch/Makefile.am | 17 ++++++++++++++++ + 15 files changed, 193 insertions(+), 2 deletions(-) commit b4eb72687f50bad7180731ed5c2905171098ad31 Author: Mukund Sivaraman -Date: Sat Jan 21 17:12:11 2012 +0530 +Date: Sat Jan 21 17:12:11 2012 +0530 Rename Hardness 100.vbr -> Hardness_100.vbr - data/brushes/Basic/Hardness 100.vbr | 8 -------- - data/brushes/Basic/Hardness_100.vbr | 8 ++++++++ - data/brushes/Basic/Makefile.am | 2 +- - 3 files changed, 9 insertions(+), 9 deletions(-) + data/brushes/Basic/{Hardness 100.vbr => Hardness_100.vbr} | 0 + data/brushes/Basic/Makefile.am | 2 +- + 2 files changed, 1 insertion(+), 1 deletion(-) commit fa9e792b78840997f4f5fa65fcc91db4da53f7c9 Author: Mukund Sivaraman -Date: Sat Jan 21 17:10:47 2012 +0530 +Date: Sat Jan 21 17:10:47 2012 +0530 build: Install new data files from Ramon Miranda (part 1) - configure.ac | 1 + + configure.ac | 1 + data/brushes/Basic/Makefile.am | 16 ++++++++++++++++ - data/brushes/Makefile.am | 3 +++ + data/brushes/Makefile.am | 3 +++ 3 files changed, 20 insertions(+) commit fb0630cfe86869b440bd09bcbc874c88341caefc Author: Alexia Death -Date: Sat Jan 21 13:30:21 2012 +0200 +Date: Sat Jan 21 13:30:21 2012 +0200 data: New resource files from Ramon Miranda (wo/install) - data/brushes/Basic/1_pixel.vbr | 10 + - data/brushes/Basic/Block_01.vbr | 10 + - data/brushes/Basic/Block_02.vbr | 8 + - data/brushes/Basic/Block_03.vbr | 8 + - data/brushes/Basic/Hardness 100.vbr | 8 + - data/brushes/Basic/Hardness_025.vbr | 8 + - data/brushes/Basic/Hardness_050.vbr | 8 + - data/brushes/Basic/Hardness_075.vbr | 8 + - data/brushes/Basic/Star.vbr | 10 + - data/brushes/Media/Acrylic_01.gih | Bin 0 -> 129909 + data/brushes/Basic/1_pixel.vbr | 10 + + data/brushes/Basic/Block_01.vbr | 10 + + data/brushes/Basic/Block_02.vbr | 8 + + data/brushes/Basic/Block_03.vbr | 8 + + data/brushes/Basic/Hardness 100.vbr | 8 + + data/brushes/Basic/Hardness_025.vbr | 8 + + data/brushes/Basic/Hardness_050.vbr | 8 + + data/brushes/Basic/Hardness_075.vbr | 8 + + data/brushes/Basic/Star.vbr | 10 + + data/brushes/Media/Acrylic_01.gih | Bin 0 -> 129909 bytes - data/brushes/Media/Acrylic_02.gih | Bin 0 -> 129915 + data/brushes/Media/Acrylic_02.gih | Bin 0 -> 129915 bytes - data/brushes/Media/Acrylic_03.gih | Bin 0 -> 169109 + data/brushes/Media/Acrylic_03.gih | Bin 0 -> 169109 bytes - data/brushes/Media/Acrylic_04.gih | Bin 0 -> 176715 + data/brushes/Media/Acrylic_04.gih | Bin 0 -> 176715 bytes - data/brushes/Media/Acrylic_05.gih | Bin 0 -> 590213 + data/brushes/Media/Acrylic_05.gih | Bin 0 -> 590213 bytes - data/brushes/Media/Bristles_01.gbr | Bin 0 -> 4136 bytes - data/brushes/Media/Bristles_02.gbr | Bin 0 -> 4136 bytes - data/brushes/Media/Bristles_03.gbr | Bin 0 -> 940 bytes - data/brushes/Media/Oils_01.gbr | Bin 0 -> 4920 bytes - data/brushes/Media/Oils_02.gbr | Bin 0 -> 8496 bytes - data/brushes/Media/Oils_03.gbr | Bin 0 -> 27260 bytes - data/brushes/Sketch/Chalk_01.gih | Bin 0 -> 193907 + data/brushes/Media/Bristles_01.gbr | Bin 0 -> 4136 bytes + data/brushes/Media/Bristles_02.gbr | Bin 0 -> 4136 bytes + data/brushes/Media/Bristles_03.gbr | Bin 0 -> 940 bytes + data/brushes/Media/Oils_01.gbr | Bin 0 -> 4920 bytes + data/brushes/Media/Oils_02.gbr | Bin 0 -> 8496 bytes + data/brushes/Media/Oils_03.gbr | Bin 0 -> 27260 bytes + data/brushes/Sketch/Chalk_01.gih | Bin 0 -> 193907 bytes - data/brushes/Sketch/Chalk_02.gih | Bin 0 -> 264855 + data/brushes/Sketch/Chalk_02.gih | Bin 0 -> 264855 bytes - data/brushes/Sketch/Chalk_03.gih | Bin 0 -> 16670 bytes - data/brushes/Sketch/Charcoal_01.gbr | Bin 0 -> 4136 bytes - data/brushes/Sketch/Charcoal_02.gbr | Bin 0 -> 16424 bytes - data/brushes/Sketch/Pencil_01.gih | Bin 0 -> 30518 bytes - data/brushes/Sketch/Pencil_02.gih | Bin 0 -> 30518 bytes - data/brushes/Sketch/Pencil_Scratch.gbr | Bin 0 -> 4139 bytes - data/brushes/Splatters/Sparks_Hose.gih | Bin 0 -> 127649 + data/brushes/Sketch/Chalk_03.gih | Bin 0 -> 16670 bytes + data/brushes/Sketch/Charcoal_01.gbr | Bin 0 -> 4136 bytes + data/brushes/Sketch/Charcoal_02.gbr | Bin 0 -> 16424 bytes + data/brushes/Sketch/Pencil_01.gih | Bin 0 -> 30518 bytes + data/brushes/Sketch/Pencil_02.gih | Bin 0 -> 30518 bytes + data/brushes/Sketch/Pencil_Scratch.gbr | Bin 0 -> 4139 bytes + data/brushes/Splatters/Sparks_Hose.gih | Bin 0 -> 127649 bytes - data/brushes/Splatters/Splats_01.gih | Bin 0 -> 156296 + data/brushes/Splatters/Splats_01.gih | Bin 0 -> 156296 bytes - data/brushes/Splatters/Splats_02.gih | Bin 0 -> 205866 + data/brushes/Splatters/Splats_02.gih | Bin 0 -> 205866 bytes - data/brushes/Splatters/Sponge_01.gbr | Bin 0 -> 62538 bytes - data/brushes/Splatters/Sponge_02.gbr | Bin 0 -> 28262 bytes - data/brushes/Texture/Cell_01.gbr | Bin 0 -> 27260 bytes - data/brushes/Texture/Cell_02.gbr | Bin 0 -> 11700 bytes - data/brushes/Texture/Smoke.gbr | Bin 0 -> 28090 bytes - data/brushes/Texture/Structure.gbr | Bin 0 -> 65574 bytes - data/brushes/Texture/Texture_01.gbr | Bin 0 -> 47964 bytes - data/brushes/Texture/Texture_02.gbr | Bin 0 -> 40039 bytes - data/brushes/Texture/Texture_Hose_01.gih | Bin 0 -> 541198 + data/brushes/Splatters/Sponge_01.gbr | Bin 0 -> 62538 bytes + data/brushes/Splatters/Sponge_02.gbr | Bin 0 -> 28262 bytes + data/brushes/Texture/Cell_01.gbr | Bin 0 -> 27260 bytes + data/brushes/Texture/Cell_02.gbr | Bin 0 -> 11700 bytes + data/brushes/Texture/Smoke.gbr | Bin 0 -> 28090 bytes + data/brushes/Texture/Structure.gbr | Bin 0 -> 65574 bytes + data/brushes/Texture/Texture_01.gbr | Bin 0 -> 47964 bytes + data/brushes/Texture/Texture_02.gbr | Bin 0 -> 40039 bytes + data/brushes/Texture/Texture_Hose_01.gih | Bin 0 -> 541198 bytes - data/brushes/Texture/Texture_Hose_02.gih | Bin 0 -> 541219 + data/brushes/Texture/Texture_Hose_02.gih | Bin 0 -> 541219 bytes - data/brushes/Texture/Texture_Hose_03.gih | Bin 0 -> 360249 + data/brushes/Texture/Texture_Hose_03.gih | Bin 0 -> 360249 bytes - data/brushes/Texture/Vegetation_01.gbr | Bin 0 -> 28772 bytes - data/brushes/Texture/Vegetation_02.gih | Bin 0 -> 86438 bytes - data/dynamics/Basic/Basic_Simple.gdyn | 555 + data/brushes/Texture/Vegetation_01.gbr | Bin 0 -> 28772 bytes + data/brushes/Texture/Vegetation_02.gih | Bin 0 -> 86438 bytes + data/dynamics/Basic/Basic_Simple.gdyn | 555 +++++++++++++++++++++ - data/dynamics/Basic/Dynamics_Random.gdyn | 555 + data/dynamics/Basic/Dynamics_Random.gdyn | 555 +++++++++++++++++++++ data/dynamics/Basic/Negative_Size_Pressure.gdyn | 555 +++++++++++++++++++++ - data/dynamics/Basic/Pen_Generic.gdyn | 555 + data/dynamics/Basic/Pen_Generic.gdyn | 555 +++++++++++++++++++++ - data/dynamics/Basic/Pencil_Generic.gdyn | 555 + data/dynamics/Basic/Pencil_Generic.gdyn | 555 +++++++++++++++++++++ - data/dynamics/Basic/Pencil_Shader.gdyn | 555 + data/dynamics/Basic/Pencil_Shader.gdyn | 555 +++++++++++++++++++++ - data/dynamics/Basic/Pressure_Opacity.gdyn | 555 + data/dynamics/Basic/Pressure_Opacity.gdyn | 555 +++++++++++++++++++++ - data/dynamics/FX/Confetti.gdyn | 555 + data/dynamics/FX/Confetti.gdyn | 555 +++++++++++++++++++++ - data/dynamics/FX/Perspective.gdyn | 555 + data/dynamics/FX/Perspective.gdyn | 555 +++++++++++++++++++++ - data/dynamics/FX/Speed_Size_Opacity.gdyn | 555 + data/dynamics/FX/Speed_Size_Opacity.gdyn | 555 +++++++++++++++++++++ - data/tool-presets/FX/Crop-16-9.gtp | 28 ++ - data/tool-presets/FX/Crop-Composition.gtp | 25 + - data/tool-presets/FX/FX_Confetti.gtp | 29 ++ - data/tool-presets/FX/FX_Radial_Softlight.gtp | 26 + - data/tool-presets/FX/Fill_Paper.gtp | 26 + - data/tool-presets/FX/Glow_Lights.gtp | 28 ++ - data/tool-presets/FX/Smooth_Clone.gtp | 22 + - data/tool-presets/FX/Vignette.gtp | 29 ++ - data/tool-presets/Paint/Airbrush.gtp | 23 + - data/tool-presets/Paint/Basic_Knife.gtp | 25 + - data/tool-presets/Paint/Basic_Round.gtp | 25 + + data/tool-presets/FX/Crop-16-9.gtp | 28 ++ + data/tool-presets/FX/Crop-Composition.gtp | 25 + + data/tool-presets/FX/FX_Confetti.gtp | 29 ++ + data/tool-presets/FX/FX_Radial_Softlight.gtp | 26 + + data/tool-presets/FX/Fill_Paper.gtp | 26 + + data/tool-presets/FX/Glow_Lights.gtp | 28 ++ + data/tool-presets/FX/Smooth_Clone.gtp | 22 + + data/tool-presets/FX/Vignette.gtp | 29 ++ + data/tool-presets/Paint/Airbrush.gtp | 23 + + data/tool-presets/Paint/Basic_Knife.gtp | 25 + + data/tool-presets/Paint/Basic_Round.gtp | 25 + data/tool-presets/Paint/Basic_Round_Detail.gtp | 22 + - data/tool-presets/Paint/Bristles.gtp | 25 + - data/tool-presets/Paint/Eraser-Hard.gtp | 22 + - data/tool-presets/Paint/Noise.gtp | 26 + - data/tool-presets/Paint/Smudge_Rough.gtp | 25 + - data/tool-presets/Paint/Smudge_Soft.gtp | 23 + - data/tool-presets/Paint/Soft_Oil.gtp | 25 + - data/tool-presets/Paint/Splatters.gtp | 23 + - data/tool-presets/Paint/Structure.gtp | 21 + - data/tool-presets/Paint/Vegetal.gtp | 26 + - data/tool-presets/Selection/Circle-200px.gtp | 30 ++ + data/tool-presets/Paint/Bristles.gtp | 25 + + data/tool-presets/Paint/Eraser-Hard.gtp | 22 + + data/tool-presets/Paint/Noise.gtp | 26 + + data/tool-presets/Paint/Smudge_Rough.gtp | 25 + + data/tool-presets/Paint/Smudge_Soft.gtp | 23 + + data/tool-presets/Paint/Soft_Oil.gtp | 25 + + data/tool-presets/Paint/Splatters.gtp | 23 + + data/tool-presets/Paint/Structure.gtp | 21 + + data/tool-presets/Paint/Vegetal.gtp | 26 + + data/tool-presets/Selection/Circle-200px.gtp | 30 ++ .../tool-presets/Selection/Feathered-Selection.gtp | 29 ++ - data/tool-presets/Sketch/Blue_Pen.gtp | 29 ++ - data/tool-presets/Sketch/Eraser_Soft.gtp | 21 + - data/tool-presets/Sketch/Ink_Smooth.gtp | 31 ++ - data/tool-presets/Sketch/Ink_Thin.gtp | 26 + - data/tool-presets/Sketch/Pencil.gtp | 27 + - data/tool-presets/Sketch/Pencil_Soft.gtp | 28 ++ + data/tool-presets/Sketch/Blue_Pen.gtp | 29 ++ + data/tool-presets/Sketch/Eraser_Soft.gtp | 21 + + data/tool-presets/Sketch/Ink_Smooth.gtp | 31 ++ + data/tool-presets/Sketch/Ink_Thin.gtp | 26 + + data/tool-presets/Sketch/Pencil.gtp | 27 + + data/tool-presets/Sketch/Pencil_Soft.gtp | 28 ++ 83 files changed, 6373 insertions(+) commit 06f99b7402b53cb8520963cde62b2842bad7bef6 Author: Alexia Death -Date: Fri Jan 20 23:31:45 2012 +0200 +Date: Fri Jan 20 23:31:45 2012 +0200 app: add safety margin to the smudge buffer not to stamp @@ -21288,7 +22200,7 @@ commit 4f04c61ed63388d6617cd9ab0db8772649783e33 Author: Alexia Death -Date: Fri Jan 20 22:46:29 2012 +0200 +Date: Fri Jan 20 22:46:29 2012 +0200 app: fix small logical error in smudge @@ -21297,7 +22209,7 @@ commit 4fe9955b3e828f73d48a56beafbda0e2c9fe3702 Author: Alexia Death -Date: Fri Jan 20 21:11:02 2012 +0200 +Date: Fri Jan 20 21:11:02 2012 +0200 app: fix some brushes not going small enough correctly @@ -21309,7 +22221,7 @@ commit fefad7a251a9b18dc088c0eed3adbeacd757dc5d Author: Alexandre Prokoudine -Date: Fri Jan 20 05:05:25 2012 +0400 +Date: Fri Jan 20 05:05:25 2012 +0400 More improvements to Russian translation @@ -21318,7 +22230,7 @@ commit 396806596faf4a56a1f901a7c1a27fc742b6b972 Author: Alexandre Prokoudine -Date: Fri Jan 20 04:55:19 2012 +0400 +Date: Fri Jan 20 04:55:19 2012 +0400 Improved Russian translation @@ -21328,7 +22240,7 @@ commit ff8cda8138b88c6c0cd5edf34a3c30f84abc5979 Author: Alexia Death -Date: Wed Jan 18 23:45:48 2012 +0200 +Date: Wed Jan 18 23:45:48 2012 +0200 app: With dynamics fix Smudge can handle changing brushes too @@ -21337,7 +22249,7 @@ commit c02170391466b74f34a76053c5e7a8afcba19e51 Author: Michael Natterer -Date: Wed Jan 18 20:53:42 2012 +0100 +Date: Wed Jan 18 20:53:42 2012 +0100 Bug 668077 - Plural forms @@ -21345,12 +22257,12 @@ the constant. Add translator comments. plug-ins/common/file-gif-save.c | 10 +++++++--- - plug-ins/common/file-xmc.c | 3 ++- + plug-ins/common/file-xmc.c | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) commit 1322bed1dfa3262f8fe98001c7636aff3763389c Author: Alexia Death -Date: Tue Jan 17 22:26:32 2012 +0200 +Date: Tue Jan 17 22:26:32 2012 +0200 app: Fix smudge so it can cope with dynamic brushes @@ -21361,7 +22273,7 @@ commit ccee5fd057a92eef4fdba94123ab7122866bc48b Author: Marek Černocký -Date: Tue Jan 17 18:06:36 2012 +0100 +Date: Tue Jan 17 18:06:36 2012 +0100 Updated Czech translation @@ -21370,7 +22282,7 @@ commit 520f1b8f00f0597c7b0b1e103974b1e5364758d1 Author: Marek Černocký -Date: Mon Jan 16 08:32:26 2012 +0100 +Date: Mon Jan 16 08:32:26 2012 +0100 Updated Czech translation @@ -21380,7 +22292,7 @@ commit f5931759243b89bdeddca9bc16c192edb046f267 Author: Michael Natterer -Date: Sun Jan 15 22:54:57 2012 +0100 +Date: Sun Jan 15 22:54:57 2012 +0100 app: GimpCurveView: clean up code and better axis label positioning @@ -21389,7 +22301,7 @@ commit c00457382e1c8ed226b26040463c0e7b355a32b3 Author: Michael Natterer -Date: Sun Jan 15 22:48:55 2012 +0100 +Date: Sun Jan 15 22:48:55 2012 +0100 app: GimpColorFrame: no need to cairo_fill() after pango_cairo_show_layout() @@ -21399,7 +22311,7 @@ commit 8d0016023bbe066f64c119783ee1220147e70b82 Author: Alexia Death -Date: Sun Jan 15 21:36:46 2012 +0200 +Date: Sun Jan 15 21:36:46 2012 +0200 app: fix get/set mixup in curve view @@ -21408,7 +22320,7 @@ commit 1c6a1a2aec24637127869836ebb535b403573961 Author: Albert F -Date: Sun Jan 15 17:48:00 2012 +0100 +Date: Sun Jan 15 17:48:00 2012 +0100 [l10n]Updated Catalan translation @@ -21418,19 +22330,19 @@ commit 3f7ee00469466e060d231c2da32730ebfde875b2 Author: Alexia Death -Date: Sun Jan 15 01:53:40 2012 +0200 +Date: Sun Jan 15 01:53:40 2012 +0200 app: Add axis lables to dynamics curves and curveview - app/widgets/gimpcurveview.c | 137 + app/widgets/gimpcurveview.c | 137 +++++++++++++++++++++++++++++---- - app/widgets/gimpcurveview.h | 11 ++- + app/widgets/gimpcurveview.h | 11 ++- app/widgets/gimpdynamicsoutputeditor.c | 19 ++++- 3 files changed, 151 insertions(+), 16 deletions(-) commit b26216f1d3600bf596ee82c23ef273f3b60ebf4d Author: Michael Natterer -Date: Sat Jan 14 21:28:34 2012 +0100 +Date: Sat Jan 14 21:28:34 2012 +0100 app: gimp_rectangle_tool_auto_shrink(): honor the drawable's offset @@ -21439,7 +22351,7 @@ commit 23ed56d75d89766663e78fbdeb9f8108d5aa28b5 Author: Michael Natterer -Date: Sat Jan 14 20:49:41 2012 +0100 +Date: Sat Jan 14 20:49:41 2012 +0100 app: gimp_data_factory_load_data(): fix handling of obsolete and writable @@ -21454,7 +22366,7 @@ commit e34ee392e6e98f21b48c645616f1108badc62942 Author: Piotr Drąg -Date: Fri Jan 13 21:49:22 2012 +0100 +Date: Fri Jan 13 21:49:22 2012 +0100 file-compressor: Add dir to po-script-fu/POTFILES.skip @@ -21463,7 +22375,7 @@ commit af55474d5d53b32777a27f144272368e5459a333 Author: Mukund Sivaraman -Date: Fri Jan 13 16:25:11 2012 +0530 +Date: Fri Jan 13 16:25:11 2012 +0530 file-compressor: Add dir to po-python/POTFILES.skip @@ -21472,7 +22384,7 @@ commit aff4d24e8c171f3380540f19fcf9267db34cddaf Author: Marek Černocký -Date: Fri Jan 13 03:55:54 2012 +0100 +Date: Fri Jan 13 03:55:54 2012 +0100 Updated Czech translation @@ -21481,7 +22393,7 @@ commit 9f60e9a5348733c87ea1ba7413f425229099bfd8 Author: Mukund Sivaraman -Date: Thu Jan 12 21:10:58 2012 +0530 +Date: Thu Jan 12 21:10:58 2012 +0530 build: Show if file-compressor will be built in configure status @@ -21490,7 +22402,7 @@ commit addab2343b32eb3592c43da55cf535a1793da820 Author: Mukund Sivaraman -Date: Thu Jan 12 19:48:38 2012 +0530 +Date: Thu Jan 12 19:48:38 2012 +0530 file-compressor: Update help text @@ -21499,7 +22411,7 @@ commit 7295ae4c702a983d02eef74b317385345cb1c8d2 Author: Mukund Sivaraman -Date: Thu Jan 12 14:21:36 2012 +0530 +Date: Thu Jan 12 14:21:36 2012 +0530 file-compressor: Fix POTFILES.in entry @@ -21508,7 +22420,7 @@ commit bebf9bbc683a6243927a0626cf2f2867ad96879c Author: Mukund Sivaraman -Date: Thu Jan 12 05:54:18 2012 +0530 +Date: Thu Jan 12 05:54:18 2012 +0530 file-compressor: Rewrite code for students who didn't like sitting in Dijkstra's class @@ -21519,7 +22431,7 @@ commit f2b9b5eaa41d298349552156ed662429652f26fe Author: Mukund Sivaraman -Date: Thu Jan 12 05:29:06 2012 +0530 +Date: Thu Jan 12 05:29:06 2012 +0530 file-compressor: Update comment about requiring gzip and bzip2 @@ -21528,7 +22440,7 @@ commit 42659606d085eb4961c7fb2f2158b7b109753682 Author: Khaled Hosny -Date: Wed Jan 11 22:51:46 2012 +0200 +Date: Wed Jan 11 22:51:46 2012 +0200 Update Arabic translation @@ -21538,7 +22450,7 @@ commit 915da4517dddc040cc68a898d258d272e8ecf691 Author: Alexis Wilhelm -Date: Wed Jan 11 07:58:53 2012 +0100 +Date: Wed Jan 11 07:58:53 2012 +0100 Bug 666853 - Auto shrink selection doesn't work @@ -21548,25 +22460,23 @@ commit 5db85ad9e1bc09b3f477b1010d36c3afdd799d2c Author: Mukund Sivaraman -Date: Wed Jan 11 20:26:04 2012 +0530 +Date: Wed Jan 11 20:26:04 2012 +0530 file-compressor: Move to own directory under plug-ins/ - configure.ac | 4 + - plug-ins/Makefile.am | 7 + - plug-ins/common/Makefile.am | 16 - - plug-ins/common/file-compressor.c | 738 - ----------------------------- - plug-ins/common/plugin-defs.pl | 1 - - plug-ins/file-compressor/.gitignore | 7 + - plug-ins/file-compressor/Makefile.am | 37 ++ - plug-ins/file-compressor/file-compressor.c | 738 - +++++++++++++++++++++++++++++ - 8 files changed, 793 insertions(+), 755 deletions(-) + configure.ac | 4 +++ + plug-ins/Makefile.am | 7 ++++ + plug-ins/common/Makefile.am | 16 ---------- + plug-ins/common/plugin-defs.pl | 1 - + plug-ins/file-compressor/.gitignore | 7 ++++ + plug-ins/file-compressor/Makefile.am | 37 + ++++++++++++++++++++++ + .../{common => file-compressor}/file-compressor.c | 0 + 7 files changed, 55 insertions(+), 17 deletions(-) commit f80892bf507ad1faf102887f71923b4c3fcab6fa Author: Mukund Sivaraman -Date: Wed Jan 11 19:29:32 2012 +0530 +Date: Wed Jan 11 19:29:32 2012 +0530 file-compressor: Use compression libraries instead of programs @@ -21580,14 +22490,14 @@ Windows. It also removes win32-specific code. - configure.ac | 16 ++ + configure.ac | 16 ++ plug-ins/common/file-compressor.c | 539 +++++++++++++++++--------------------- 2 files changed, 262 insertions(+), 293 deletions(-) commit 4ac7bcc6246703cd2ee1b1153eb8ab8373b30c33 Author: Martin Nordholts -Date: Tue Jan 10 21:13:08 2012 +0100 +Date: Tue Jan 10 21:13:08 2012 +0100 app: Add 'create_containers' to gimp_dialog_factory_dialog_new_internal() @@ -21601,7 +22511,7 @@ commit 40d98b79cbf661749a4d9086dee81cc0248d250a Author: Martin Nordholts -Date: Tue Jan 10 20:51:08 2012 +0100 +Date: Tue Jan 10 20:51:08 2012 +0100 app: A '|' in identifiers is not a special case @@ -21611,36 +22521,36 @@ commit 6335190ff74f496c0a805ea7ad7b3f21be983d0c Author: Martin Nordholts -Date: Tue Jan 10 19:43:51 2012 +0100 +Date: Tue Jan 10 19:43:51 2012 +0100 app/tests: The single-window-mode setting is in the sessionrc now We don't need to have a special gimprc because of it. - app/tests/gimp-test-session-utils.c | 11 +---------- - app/tests/gimpdir/Makefile.am | 1 - + app/tests/gimp-test-session-utils.c | 11 +---------- + app/tests/gimpdir/Makefile.am | 1 - app/tests/gimpdir/gimprc-single-window | 12 ------------ - app/tests/test-single-window-mode.c | 7 +------ + app/tests/test-single-window-mode.c | 7 +------ 4 files changed, 2 insertions(+), 29 deletions(-) commit 64d2dc122a8f98d33af6e20805c4e1279cf518c0 Author: Martin Nordholts -Date: Tue Jan 10 19:33:42 2012 +0100 +Date: Tue Jan 10 19:33:42 2012 +0100 app: Add and use gimp_dialog_factory_find_widget() app/actions/context-commands.c | 20 ++++++++++---------- - app/actions/dialogs-actions.c | 5 ++--- + app/actions/dialogs-actions.c | 5 ++--- app/display/gimpdisplayshell-cursor.c | 22 +++++++++++----------- - app/gui/gui-message.c | 12 +++++------- - app/tools/gimpcolortool.c | 18 +++++++++--------- + app/gui/gui-message.c | 12 +++++------- + app/tools/gimpcolortool.c | 18 +++++++++--------- app/widgets/gimpdialogfactory.c | 29 +++++++++++++++++++---------- app/widgets/gimpdialogfactory.h | 2 ++ 7 files changed, 58 insertions(+), 50 deletions(-) commit 7137a4d56d25ae16b344e08ed379cb7f66e0f363 Author: Muhammet Kara -Date: Tue Jan 10 15:48:19 2012 +0200 +Date: Tue Jan 10 15:48:19 2012 +0200 [l10n]Updated Turkish translation @@ -21650,7 +22560,7 @@ commit 72fb271e007d505be0c954a8d4095c0a482fe23e Author: Alexia Death -Date: Mon Jan 9 22:54:05 2012 +0200 +Date: Mon Jan 9 22:54:05 2012 +0200 app: Bug 667241 - Unable to paint after switching away from paint tool using fade tapering @@ -21664,7 +22574,7 @@ commit 899c35e4df457c7814da795803ee0f29d50e824a Author: Michael Natterer -Date: Mon Jan 9 20:49:45 2012 +0100 +Date: Mon Jan 9 20:49:45 2012 +0100 plug-ins: fix coding style in the last commit @@ -21673,7 +22583,7 @@ commit fd66a38dd6cad4f8c68c8cdff657a404d1d36c11 Author: Ulf-D. Ehlert -Date: Mon Jan 9 20:04:28 2012 +0100 +Date: Mon Jan 9 20:04:28 2012 +0100 Bug 653907 - Help-browser fails to sort top-level items @@ -21681,14 +22591,14 @@ provided by the "gimp-help.xml" file). plug-ins/help-browser/dialog.c | 35 +++++++++++++++++++++++++++-------- - plug-ins/help/gimphelpitem.c | 3 +++ - plug-ins/help/gimphelpitem.h | 4 +++- + plug-ins/help/gimphelpitem.c | 3 +++ + plug-ins/help/gimphelpitem.h | 4 +++- plug-ins/help/gimphelplocale.c | 6 +++++- 4 files changed, 38 insertions(+), 10 deletions(-) commit 3e5c0c6a748f44bd280967359cee02bfc4bdf04c Author: Carles Ferrando -Date: Mon Jan 9 00:48:45 2012 +0100 +Date: Mon Jan 9 00:48:45 2012 +0100 [l10n]Updated Catalan (Valencian) translation @@ -21697,7 +22607,7 @@ commit f7c4567054b5bcb70abd823aa5733e38c022da9e Author: Carles Ferrando -Date: Mon Jan 9 00:48:34 2012 +0100 +Date: Mon Jan 9 00:48:34 2012 +0100 [l10n]Updated Catalan (Valencian) translation @@ -21706,7 +22616,7 @@ commit 264858aa4b156c901d97b13cc58e441fe214cbfe Author: Carles Ferrando -Date: Mon Jan 9 00:48:27 2012 +0100 +Date: Mon Jan 9 00:48:27 2012 +0100 [l10n]Updated Catalan (Valencian) translation @@ -21715,7 +22625,7 @@ commit 2d7d6e64b61a653654caaab62fdfb2e5474c07b0 Author: Carles Ferrando -Date: Mon Jan 9 00:48:02 2012 +0100 +Date: Mon Jan 9 00:48:02 2012 +0100 [l10n]Updated Catalan (Valencian) translation @@ -21724,7 +22634,7 @@ commit cca3ecc33d710df0f09c275bfe74a80d0f7154f2 Author: Carles Ferrando -Date: Mon Jan 9 00:47:50 2012 +0100 +Date: Mon Jan 9 00:47:50 2012 +0100 [l10n]Updated Catalan (Valencian) translation @@ -21734,7 +22644,7 @@ commit 76be894dc8668e60dcfeb11ab5a34013e974fe53 Author: Carles Ferrando -Date: Mon Jan 9 00:47:30 2012 +0100 +Date: Mon Jan 9 00:47:30 2012 +0100 [l10n]Updated Catalan (Valencian) translation @@ -21743,7 +22653,7 @@ commit f782e5010e5444bc5a54d2e0f933c86fd48ab747 Author: Carles Ferrando -Date: Mon Jan 9 00:47:00 2012 +0100 +Date: Mon Jan 9 00:47:00 2012 +0100 [l10n]Updated Catalan (Valencian) translation @@ -21753,7 +22663,7 @@ commit e43d76077cbbabbf155e7827a2c5228ebdd534e7 Author: Marco Ciampa -Date: Mon Jan 9 00:07:54 2012 +0100 +Date: Mon Jan 9 00:07:54 2012 +0100 Updated italian translation. @@ -21763,7 +22673,7 @@ commit d0878ca6e7483c3d0b89b0cee4e13b1b0557f470 Author: Martin Srebotnjak -Date: Sun Jan 8 21:53:38 2012 +0100 +Date: Sun Jan 8 21:53:38 2012 +0100 Updated Slovenian translation @@ -21772,7 +22682,7 @@ commit 508978450db16d7799f6df36c7c7737a1532ac50 Author: Martin Srebotnjak -Date: Sun Jan 8 21:51:30 2012 +0100 +Date: Sun Jan 8 21:51:30 2012 +0100 Updated Slovenian translation @@ -21782,7 +22692,7 @@ commit bb797762d1fc48b8467b587dbf502c19863def26 Author: Muhammet Kara -Date: Sun Jan 8 19:55:45 2012 +0200 +Date: Sun Jan 8 19:55:45 2012 +0200 [l10n]Updated Turkish translation @@ -21792,7 +22702,7 @@ commit 126acfc7de82b950ea8de92797370c4ddbf3c225 Author: Mukund Sivaraman -Date: Sun Jan 8 22:13:02 2012 +0530 +Date: Sun Jan 8 22:13:02 2012 +0530 build: Drop atk required version to 2.0.1 @@ -21803,7 +22713,7 @@ commit 3804f518acaa9fb6f7f70499d54d0f1eb3f89117 Author: Muhammet Kara -Date: Sun Jan 8 18:02:50 2012 +0200 +Date: Sun Jan 8 18:02:50 2012 +0200 [l10n]Updated Turkish translation @@ -21813,7 +22723,7 @@ commit d2d5a3db6298a02aa0e539acab0ac718f9e4a397 Author: Mukund Sivaraman -Date: Sun Jan 8 20:16:45 2012 +0530 +Date: Sun Jan 8 20:16:45 2012 +0530 build: Check for atk >= 2.2.0 (bug #667127) @@ -21822,7 +22732,7 @@ commit 04ac72d46fdd1ecf0f9e84a15b81b3bfe577622b Author: Marek Černocký -Date: Sun Jan 8 14:48:42 2012 +0100 +Date: Sun Jan 8 14:48:42 2012 +0100 Updated Czech translation @@ -21832,7 +22742,7 @@ commit 4b0a256819c3ef3222b4572363e8a5928e2425e2 Author: Marek Černocký -Date: Sun Jan 8 13:50:31 2012 +0100 +Date: Sun Jan 8 13:50:31 2012 +0100 Updated Czech translation @@ -21841,7 +22751,7 @@ commit 791b449df2ad15c4cff508fe8af3e2c48636681b Author: Ihar Hrachyshka -Date: Sun Jan 8 15:22:56 2012 +0300 +Date: Sun Jan 8 15:22:56 2012 +0300 Updated Belarusian translation. @@ -21850,7 +22760,7 @@ commit 63c0db45aeffba6dd3aa3b6819b88f45fd675194 Author: Alexia Death -Date: Sun Jan 8 13:43:17 2012 +0200 +Date: Sun Jan 8 13:43:17 2012 +0200 app: For generated brushes scale is applied to radius, so divide by 2 @@ -21859,18 +22769,18 @@ commit e89b9ff72ad4caa177bb3378e3c1fd7c8c723ffa Author: Aurimas Černius -Date: Sun Jan 8 00:25:43 2012 +0200 +Date: Sun Jan 8 00:25:43 2012 +0200 Updated Lithuanian translation po-script-fu/lt.po | 992 +++++++++++++++++++++++++---------------------------- - po/lt.po | 65 ++-- + po/lt.po | 65 ++-- 2 files changed, 506 insertions(+), 551 deletions(-) commit 9668bbb3c941612e48e39898bd345f8d3e138dff Author: Piotr Drąg -Date: Sat Jan 7 23:07:07 2012 +0100 +Date: Sat Jan 7 23:07:07 2012 +0100 Updated Polish translation @@ -21879,7 +22789,7 @@ commit c34239c0bb4d31ae0137ebcf878300f0e2b51c8a Author: Michael Natterer -Date: Sat Jan 7 22:18:22 2012 +0100 +Date: Sat Jan 7 22:18:22 2012 +0100 Bug 667367 - Bad widget hint @@ -21891,7 +22801,7 @@ commit 92e86baa2db1161e409d9bf8be72068fe0008407 Author: Michael Natterer -Date: Sat Jan 7 22:09:18 2012 +0100 +Date: Sat Jan 7 22:09:18 2012 +0100 Bug 667427 - Bad ink shape hint @@ -21904,7 +22814,7 @@ commit f96707dae4fff27afd2bb3ab5d3609166bafdbdf Author: Aurimas Černius -Date: Sat Jan 7 01:39:47 2012 +0200 +Date: Sat Jan 7 01:39:47 2012 +0200 Updated Lithuanian translation @@ -21914,7 +22824,7 @@ commit b0dc61cd2674b974f666b2f9110a568892c83369 Author: Marek Černocký -Date: Fri Jan 6 22:17:10 2012 +0100 +Date: Fri Jan 6 22:17:10 2012 +0100 Updated Czech translation @@ -21924,7 +22834,7 @@ commit 58abe5a24469d318d13ec17bc8c7b59ef30c798f Author: Marek Černocký -Date: Fri Jan 6 19:55:48 2012 +0100 +Date: Fri Jan 6 19:55:48 2012 +0100 Updated Czech translation @@ -21934,7 +22844,7 @@ commit 5f7b4a3bace1021308db2e09c3e00da16b6ccd3c Author: Miroslav Šulc -Date: Fri Jan 6 19:38:21 2012 +0100 +Date: Fri Jan 6 19:38:21 2012 +0100 Updated Czech translation @@ -21944,7 +22854,7 @@ commit 93c2d30f655aa5ff2a6b31965ca160dce53fc533 Author: Marek Černocký -Date: Fri Jan 6 19:36:36 2012 +0100 +Date: Fri Jan 6 19:36:36 2012 +0100 Updated Czech translation @@ -21953,7 +22863,7 @@ commit 404c471c2f76eacc4cfbf2916c0fa3f93105cb4f Author: Marco Ciampa -Date: Thu Jan 5 17:02:37 2012 +0100 +Date: Thu Jan 5 17:02:37 2012 +0100 Updated italian translation. @@ -21963,7 +22873,7 @@ commit c2d26d7e0396546cfc1ca2485065ce903be6a882 Author: Alexia Death -Date: Wed Jan 4 21:56:17 2012 +0200 +Date: Wed Jan 4 21:56:17 2012 +0200 app: Keep canvas in place when image tabs show/hide @@ -21972,7 +22882,7 @@ commit 013de7a4f7c121aa8f7606cfafd1febc3a38337e Author: Praveen Illa -Date: Wed Jan 4 00:26:16 2012 +0530 +Date: Wed Jan 4 00:26:16 2012 +0530 Added Telugu Translation @@ -21981,7 +22891,7 @@ commit 6feb956daa36344d957109646d7fee059f81de33 Author: Praveen Illa -Date: Wed Jan 4 00:25:45 2012 +0530 +Date: Wed Jan 4 00:25:45 2012 +0530 Added Telugu Translation @@ -21991,11 +22901,11 @@ commit ff25a34b2f8e382a741465df317f66bfe1a97774 Author: Alexia Death -Date: Tue Jan 3 19:51:33 2012 +0200 +Date: Tue Jan 3 19:51:33 2012 +0200 Tool preset icons from Przemyslaw "n-pigeon" Golab - themes/Default/images/preferences/Makefile.am | 2 + + themes/Default/images/preferences/Makefile.am | 2 + .../images/preferences/folders-tool-presets-16.png | Bin 0 -> 656 bytes .../images/preferences/folders-tool-presets-22.png | Bin 0 -> 933 bytes .../images/preferences/folders-tool-presets.png | Bin 0 -> 2276 bytes @@ -22010,7 +22920,7 @@ commit bd245dd0ddb9c2c914383859489a419c1682e746 Author: Hleb Valoshka <375gnu@gmail.com> -Date: Mon Jan 2 16:59:26 2012 +0300 +Date: Mon Jan 2 16:59:26 2012 +0300 Updated Belarusian translation. @@ -22020,17 +22930,17 @@ commit 6c84bc06380f6d34e4d731de3f2227491e67e6e7 Author: Aurimas Černius -Date: Sun Jan 1 23:36:36 2012 +0200 +Date: Sun Jan 1 23:36:36 2012 +0200 Updated Lithuanian translation for tags po-tags/LINGUAS | 1 + - po-tags/lt.po | 26 ++++++++++++++++++++++++++ + po-tags/lt.po | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) commit c951a799f98728a87c73799277e39004c35a77b7 Author: Aurimas Černius -Date: Sun Jan 1 23:35:55 2012 +0200 +Date: Sun Jan 1 23:35:55 2012 +0200 Updated Lithuanian translation for tips @@ -22040,7 +22950,7 @@ commit 47e0ddeefa0409756630faf37500812057b6d24f Author: Mustafa AYDIN -Date: Sat Dec 31 20:29:09 2011 +0200 +Date: Sat Dec 31 20:29:09 2011 +0200 [l10n]Updated Turkish translation @@ -22050,7 +22960,7 @@ commit d2076552db050d2362e78f9553917b37a3da8717 Author: Barak Itkin -Date: Sat Dec 31 03:27:47 2011 +0200 +Date: Sat Dec 31 03:27:47 2011 +0200 Fix the bugs in the conversion from drawables to cairo surfaces. @@ -22076,7 +22986,7 @@ commit f17b3e9cd784798d3ffe49837ed42343d551be1f Author: Barak Itkin -Date: Sat Dec 31 01:14:38 2011 +0200 +Date: Sat Dec 31 01:14:38 2011 +0200 Remove the Multi-Page PDF export from File->Create @@ -22089,7 +22999,7 @@ commit d78b38022db8f5fc5a478339d18c11e2b8f14f3f Author: Barak Itkin -Date: Sat Dec 31 00:57:16 2011 +0200 +Date: Sat Dec 31 00:57:16 2011 +0200 Remove the defaults procedured from the PDF export plug-in @@ -22107,7 +23017,7 @@ commit 36549229eadf9e0075d1100e1d414299369ea21c Author: Martin Srebotnjak -Date: Fri Dec 30 16:02:27 2011 +0100 +Date: Fri Dec 30 16:02:27 2011 +0100 Updated Slovenian translation @@ -22117,7 +23027,7 @@ commit b9b4459dc011d72cd30ffec89e89171c66db3722 Author: Mario Blättermann -Date: Thu Dec 29 22:44:48 2011 +0100 +Date: Thu Dec 29 22:44:48 2011 +0100 [l10n] Updated German translation @@ -22127,7 +23037,7 @@ commit c2049634a011e9731ddf4346065b9b9fc48fad9b Author: Mario Blättermann -Date: Thu Dec 29 22:39:10 2011 +0100 +Date: Thu Dec 29 22:39:10 2011 +0100 [l10n] Updated German translation @@ -22137,7 +23047,7 @@ commit bc8c15a80a8ca6bac1c6de42c53b460670dd323c Author: Mario Blättermann -Date: Thu Dec 29 22:30:55 2011 +0100 +Date: Thu Dec 29 22:30:55 2011 +0100 [l10n] Updated German translation @@ -22146,7 +23056,7 @@ commit 60a9a6443a2a74912f412b0177869937e79d245a Author: Mario Blättermann -Date: Thu Dec 29 22:30:04 2011 +0100 +Date: Thu Dec 29 22:30:04 2011 +0100 [l10n] Updated German translation @@ -22156,7 +23066,7 @@ commit d06707a31bd8742b85c7bc953f504ab6fb197a72 Author: Kolbjørn Stuestøl -Date: Thu Dec 29 19:33:04 2011 +0100 +Date: Thu Dec 29 19:33:04 2011 +0100 Updated Norwegian Nynorsk translation @@ -22165,7 +23075,7 @@ commit 5b1bc245afdab44d543a1617bcea1828731be425 Author: Piotr Drąg -Date: Thu Dec 29 18:43:10 2011 +0100 +Date: Thu Dec 29 18:43:10 2011 +0100 Updated Polish translation @@ -22175,7 +23085,7 @@ commit b935db6b573052655b412399681fe6b12d217a9f Author: Nils Philippsen -Date: Thu Dec 29 17:37:02 2011 +0100 +Date: Thu Dec 29 17:37:02 2011 +0100 Updated German plug-ins translation @@ -22185,7 +23095,7 @@ commit ba720461a6ad24588abb9a15ce91a47c52e45f33 Author: Nils Philippsen -Date: Thu Dec 29 16:51:50 2011 +0100 +Date: Thu Dec 29 16:51:50 2011 +0100 file-xmc: reword/fix UI messages @@ -22194,7 +23104,7 @@ commit fcbe7aaa876d9318a75b21150102837b0aa4583f Author: Marek Černocký -Date: Thu Dec 29 09:39:15 2011 +0100 +Date: Thu Dec 29 09:39:15 2011 +0100 Updated Czech translation @@ -22203,7 +23113,7 @@ commit c64ec3b27b009f4fce025d1bfa2fb5da47c048bd Author: Piotr Drąg -Date: Wed Dec 28 19:08:24 2011 +0100 +Date: Wed Dec 28 19:08:24 2011 +0100 Updated Polish translation @@ -22212,23 +23122,23 @@ commit 39f3f6fab158125727b009266965f609e3320b5d Author: Piotr Drąg -Date: Wed Dec 28 02:33:05 2011 +0100 +Date: Wed Dec 28 02:33:05 2011 +0100 Updated Polish translation - po-libgimp/pl.po | 5 +- + po-libgimp/pl.po | 5 +- po-plug-ins/pl.po | 2007 ++++++++++++++++++++++++++-------------------------- - po-python/pl.po | 7 +- - po-script-fu/pl.po | 5 +- - po-tags/pl.po | 8 +- - po-tips/pl.po | 5 +- - po/pl.po | 12 +- + po-python/pl.po | 7 +- + po-script-fu/pl.po | 5 +- + po-tags/pl.po | 8 +- + po-tips/pl.po | 5 +- + po/pl.po | 12 +- 7 files changed, 1024 insertions(+), 1025 deletions(-) commit c0ecb2e9e2b31651c1b5c2909b75242d5ac18ad6 Author: Kiyotaka NISHIBORI -Date: Tue Dec 27 22:48:08 2011 +0900 +Date: Tue Dec 27 22:48:08 2011 +0900 Updated Japanese translation @@ -22237,21 +23147,21 @@ commit 2e206a3fba679281749642ebfb04b16ec249daf9 Author: Nguyễn Thái Ngọc Duy -Date: Tue Dec 27 10:02:33 2011 +0700 +Date: Tue Dec 27 10:02:33 2011 +0700 Updated Vietnamese translations po-libgimp/vi.po | 349 +++++++++++++---------------------------- po-plug-ins/vi.po | 52 ++----- po-script-fu/vi.po | 124 +++++---------- - po-tips/vi.po | 445 + po-tips/vi.po | 445 ++++++++++++++++++++++++++++++++++++----------------- - po/vi.po | 54 +++---- + po/vi.po | 54 +++---- 5 files changed, 495 insertions(+), 529 deletions(-) commit 5413be7872cc4433019c1a3bd002e5755c43b3b7 Author: Nguyễn Thái Ngọc Duy -Date: Tue Dec 27 09:07:48 2011 +0700 +Date: Tue Dec 27 09:07:48 2011 +0700 po*/vi: import from Damned Lies @@ -22259,12 +23169,12 @@ po-plug-ins/vi.po | 2211 ++++++++++++++++++++++------------------------- po-script-fu/vi.po | 2434 ++++++++++++++++++++++++++++++++++------------------ - po/vi.po | 414 ++++----- + po/vi.po | 414 ++++----- 4 files changed, 4295 insertions(+), 2846 deletions(-) commit 07092ce45d9d4dd34049194f84800336549d4977 Author: Nguyễn Thái Ngọc Duy -Date: Tue Dec 27 08:38:26 2011 +0700 +Date: Tue Dec 27 08:38:26 2011 +0700 Updated Vietnamese translations @@ -22274,7 +23184,7 @@ commit 70dc8978c9c38a6a387b1019797b7493af8e70ba Author: Marek Černocký -Date: Mon Dec 26 22:12:20 2011 +0100 +Date: Mon Dec 26 22:12:20 2011 +0100 Updated Czech translation @@ -22284,7 +23194,7 @@ commit 96e011fff791dc69f51133ea587fad25c6db75aa Author: Marek Černocký -Date: Mon Dec 26 21:02:51 2011 +0100 +Date: Mon Dec 26 21:02:51 2011 +0100 Updated Czech translation @@ -22294,7 +23204,7 @@ commit 61f3a0d338d1f3fe2993eaade82bdfec03f6e30d Author: Marek Černocký -Date: Mon Dec 26 15:55:43 2011 +0100 +Date: Mon Dec 26 15:55:43 2011 +0100 Czech translation @@ -22303,7 +23213,7 @@ commit 7da28f7f61a366ab973ba3a2caa01a01de857fe9 Author: Marek Černocký -Date: Mon Dec 26 15:55:26 2011 +0100 +Date: Mon Dec 26 15:55:26 2011 +0100 Added Czech language @@ -22312,18 +23222,18 @@ commit f686bbc7a40ee84d9f339275a3f6f9f18b393589 Author: Muhammet Kara -Date: Mon Dec 26 11:53:33 2011 +0200 +Date: Mon Dec 26 11:53:33 2011 +0200 [l10n]Added Turkish translation po-tips/LINGUAS | 1 + - po-tips/tr.po | 459 + po-tips/tr.po | 459 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 460 insertions(+) commit e80d666656ab96b8413ddf4ffa59158e928d5d18 Author: M. Aydin -Date: Mon Dec 26 11:12:48 2011 +0200 +Date: Mon Dec 26 11:12:48 2011 +0200 [l10n]Updated Turkish translation @@ -22333,7 +23243,7 @@ commit 1b43c8d55d5efbe863eb45aedb86680ade50b345 Author: M. Aydin -Date: Mon Dec 26 10:56:44 2011 +0200 +Date: Mon Dec 26 10:56:44 2011 +0200 [l10n]Updated Turkish translation @@ -22343,17 +23253,17 @@ commit ee018e79aa7c7e8b8c8e4aa620c941b63dff6917 Author: Muhammet Kara -Date: Mon Dec 26 10:22:43 2011 +0200 +Date: Mon Dec 26 10:22:43 2011 +0200 [l10n]Added Turkish translation po-tags/LINGUAS | 1 + - po-tags/tr.po | 28 ++++++++++++++++++++++++++++ + po-tags/tr.po | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) commit 09eefb2805f15bec1fce28efa1e24da00c530dce Author: M. Aydin -Date: Mon Dec 26 10:11:45 2011 +0200 +Date: Mon Dec 26 10:11:45 2011 +0200 [l10n]Updated Turkish translation @@ -22363,7 +23273,7 @@ commit 363d63341ba0d4f7bb762c3afa32ea6c55d37c0b Author: Martin Srebotnjak -Date: Sun Dec 25 08:48:02 2011 +0100 +Date: Sun Dec 25 08:48:02 2011 +0100 Updated Slovenian translation @@ -22372,7 +23282,7 @@ commit e2ede159699d69bbd84caba31477d4676ea2c343 Author: Carles Ferrando -Date: Sat Dec 24 18:58:05 2011 +0100 +Date: Sat Dec 24 18:58:05 2011 +0100 [l10n]Updated Catalan (Valencian) translation @@ -22382,7 +23292,7 @@ commit 162d22d851c90a9267e0bb72bae9dfe56fefa378 Author: Quim Perez i Noguer -Date: Sat Dec 24 18:57:56 2011 +0100 +Date: Sat Dec 24 18:57:56 2011 +0100 [l10n]Updated Catalan translation @@ -22392,7 +23302,7 @@ commit c34bcf0affb482f860f90b305f85fd0d2d028119 Author: Carles Ferrando -Date: Sat Dec 24 17:48:38 2011 +0100 +Date: Sat Dec 24 17:48:38 2011 +0100 [l10n]Updated Catalan (Valencian) translation @@ -22402,7 +23312,7 @@ commit 063cd9e20fc7316f28a1655c9b4292499ec607fa Author: Quim Perez i Noguer -Date: Sat Dec 24 17:48:26 2011 +0100 +Date: Sat Dec 24 17:48:26 2011 +0100 [l10n]Updated Catalan translation @@ -22412,7 +23322,7 @@ commit 2ec6845d7c13bcb97398d8a7e351b60928551633 Author: Carles Ferrando -Date: Sat Dec 24 17:47:42 2011 +0100 +Date: Sat Dec 24 17:47:42 2011 +0100 [l10n]Updated Catalan (Valencian) translation @@ -22422,7 +23332,7 @@ commit 0e21388c30127191a4328bb9a5350fdff48d54f8 Author: Eulàlia Pagès -Date: Sat Dec 24 17:47:30 2011 +0100 +Date: Sat Dec 24 17:47:30 2011 +0100 [l10n]Updated Catalan translation @@ -22432,7 +23342,7 @@ commit 3a29544b4e9e0f01aaf8d799c473c0bdcc554d08 Author: Carles Ferrando -Date: Sat Dec 24 17:46:41 2011 +0100 +Date: Sat Dec 24 17:46:41 2011 +0100 [l10n]Updated Catalan (Valencian) translation @@ -22442,7 +23352,7 @@ commit 254135104b2658bfb5bd4d35bfd13f11d8f7027f Author: Eulàlia Pagès -Date: Sat Dec 24 17:46:38 2011 +0100 +Date: Sat Dec 24 17:46:38 2011 +0100 [l10n]Updated Catalan translation @@ -22452,7 +23362,7 @@ commit 691d831fe8717ff1a37bb4448bc0fe000c1d8dab Author: Carles Ferrando -Date: Sat Dec 24 17:44:59 2011 +0100 +Date: Sat Dec 24 17:44:59 2011 +0100 [l10n]Updated Catalan (Valencian) translation @@ -22462,7 +23372,7 @@ commit eb507f00ed88ffba9306abd3290b0d4638e71bac Author: Albert F -Date: Sat Dec 24 17:44:54 2011 +0100 +Date: Sat Dec 24 17:44:54 2011 +0100 [l10n]Updated Catalan translation @@ -22472,7 +23382,7 @@ commit 2d92f8fab6f1653c34891e59b5e94d8a1c329493 Author: Martin Srebotnjak -Date: Fri Dec 23 20:01:43 2011 +0100 +Date: Fri Dec 23 20:01:43 2011 +0100 Updated Slovenian translation @@ -22482,30 +23392,30 @@ commit 39a1c4340de4be9910a25f63f574c6c0ed1f92b5 Author: Hleb Valoshka <375gnu@gmail.com> -Date: Fri Dec 23 21:14:24 2011 +0300 +Date: Fri Dec 23 21:14:24 2011 +0300 Updated Belarusian translation. po-plug-ins/be.po | 117 ++++++++++++++++++++++++++++++++++++++++++++---------- - po/be.po | 19 ++++----- + po/be.po | 19 ++++----- 2 files changed, 107 insertions(+), 29 deletions(-) commit e046056059817884c3baa9043c8c568233621e0f Author: Mukund Sivaraman -Date: Fri Dec 23 14:47:34 2011 +0530 +Date: Fri Dec 23 14:47:34 2011 +0530 Bug #666751: Replace M_PI with G_PI - app/gegl/gimpoperationcagecoefcalc.c | 6 +++--- - plug-ins/imagemap/imap_main.c | 2 +- - plug-ins/lighting/lighting-preview.c | 4 ++-- + app/gegl/gimpoperationcagecoefcalc.c | 6 +++--- + plug-ins/imagemap/imap_main.c | 2 +- + plug-ins/lighting/lighting-preview.c | 4 ++-- plug-ins/map-object/map-object-preview.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) commit f8ea776649545db6b56ca288e937878ea3b6dc59 Author: Marco Ciampa -Date: Fri Dec 23 09:04:08 2011 +0100 +Date: Fri Dec 23 09:04:08 2011 +0100 Updated italian translation. @@ -22515,7 +23425,7 @@ commit 511a00903198731380c9e8fde955b8043e03f644 Author: Kiyotaka NISHIBORI -Date: Fri Dec 23 12:42:58 2011 +0900 +Date: Fri Dec 23 12:42:58 2011 +0900 Updated Japanese translation @@ -22525,7 +23435,7 @@ commit 6f284b9de3f944fa3c199443a8f5b2d4646f684f Author: Bruce Cowan -Date: Thu Dec 22 19:21:52 2011 +0000 +Date: Thu Dec 22 19:21:52 2011 +0000 Updated British English translation @@ -22534,12 +23444,12 @@ ++++++++++++++++++++++++++----------------------- po-script-fu/en_GB.po | 55 +- po-tips/en_GB.po | 23 +- - po/en_GB.po | 1495 +++++++++++++++++----------------- + po/en_GB.po | 1495 +++++++++++++++++----------------- 5 files changed, 2093 insertions(+), 1899 deletions(-) commit 15d0b4fa379f6b7060ab4adfd1fe8b56f7a4261a Author: Kevin Cozens -Date: Wed Dec 14 12:08:38 2011 -0500 +Date: Wed Dec 14 12:08:38 2011 -0500 Fix link error when newer versions of required libs are installed locally @@ -22553,7 +23463,7 @@ commit f1d31f244bad583a4c78bd5edcb2eb713b18c8e9 Author: Jiro Matsuzawa -Date: Wed Dec 21 23:37:55 2011 +0900 +Date: Wed Dec 21 23:37:55 2011 +0900 Fixed Bug 666608. @@ -22562,7 +23472,7 @@ commit 997991ad2bd5eda3029d24c0319b3f121f7ed6c7 Author: Khaled Hosny -Date: Wed Dec 21 00:07:54 2011 +0200 +Date: Wed Dec 21 00:07:54 2011 +0200 Update Arabic translation @@ -22572,7 +23482,7 @@ commit 11457675eb978eac1db34f848e73343df6c51a4f Author: Kiyotaka NISHIBORI -Date: Mon Dec 19 21:39:30 2011 +0900 +Date: Mon Dec 19 21:39:30 2011 +0900 Updated Japanese translation @@ -22582,7 +23492,7 @@ commit 48d15bc2ff3d52ef147a2738063c5fbe7a6d8cf2 Author: Kiyotaka NISHIBORI -Date: Mon Dec 19 21:38:07 2011 +0900 +Date: Mon Dec 19 21:38:07 2011 +0900 Updated Japanese translation @@ -22592,7 +23502,7 @@ commit 867c9c28e7514121703b5087040f5c42e13d3b1b Author: Kiyotaka NISHIBORI -Date: Mon Dec 19 21:36:51 2011 +0900 +Date: Mon Dec 19 21:36:51 2011 +0900 Updated Japanese translation @@ -22602,7 +23512,7 @@ commit 0a38cd39a2699af325ccd3f67ea6ce5137e7ec3b Author: Kiyotaka NISHIBORI -Date: Mon Dec 19 21:35:34 2011 +0900 +Date: Mon Dec 19 21:35:34 2011 +0900 Updated Japanese translation @@ -22612,7 +23522,7 @@ commit 900fc19e7856cf62b9625fce15b5743635242d2d Author: Kiyotaka NISHIBORI -Date: Mon Dec 19 21:33:53 2011 +0900 +Date: Mon Dec 19 21:33:53 2011 +0900 Updated Japanese translation @@ -22622,7 +23532,7 @@ commit e47e67c2f0efc4304654a654d878aac003b6a7e2 Author: Kiyotaka NISHIBORI -Date: Mon Dec 19 21:29:01 2011 +0900 +Date: Mon Dec 19 21:29:01 2011 +0900 Updated Japanese translation @@ -22632,7 +23542,7 @@ commit c15c3f4828527d9836de0ba168b4bfe00669cc21 Author: Victor Oliveira -Date: Sun Dec 18 19:55:31 2011 -0200 +Date: Sun Dec 18 19:55:31 2011 -0200 Some prototypes added in twain and win-snap @@ -22642,7 +23552,7 @@ commit 54f46cea00f10adaf3fb3a3cd464181859495e2f Author: Michael Natterer -Date: Sun Dec 18 01:37:48 2011 +0100 +Date: Sun Dec 18 01:37:48 2011 +0100 NEWS: updates @@ -22651,7 +23561,7 @@ commit d43b127484a70441561cbe7a4f8166ffe516362a Author: Michael Natterer -Date: Sun Dec 18 01:24:29 2011 +0100 +Date: Sun Dec 18 01:24:29 2011 +0100 app: move all prefs menu items to the mac application menu @@ -22662,127 +23572,127 @@ commit 361b66c396a731de2f50c34f756f658503d2bca1 Author: Rudolfs Mazurs -Date: Sun Dec 18 00:23:41 2011 +0200 +Date: Sun Dec 18 00:23:41 2011 +0200 Updated Latvian translation. po-libgimp/lv.po | 12 ++++++------ po-plug-ins/lv.po | 18 +++++++++--------- po-script-fu/lv.po | 15 ++++++++------- - po/lv.po | 16 +++++++++------- + po/lv.po | 16 +++++++++------- 4 files changed, 32 insertions(+), 29 deletions(-) commit 3ecc27db8d64dd8934c42873b0fd37d655d0fc3d Author: Hleb Valoshka <375gnu@gmail.com> -Date: Sat Dec 17 17:30:52 2011 +0300 +Date: Sat Dec 17 17:30:52 2011 +0300 Updated Belarusian translation. po-plug-ins/be.po | 485 ++++------------------------ - po-tips/be.po | 12 +- - po/be.po | 927 + po-tips/be.po | 12 +- + po/be.po | 927 ++++-------------------------------------------------- 3 files changed, 125 insertions(+), 1299 deletions(-) commit 3687d980da832bbd1c4d0344cf2c3a4a9cb3db16 Author: Rudolfs Mazurs -Date: Sat Dec 17 01:22:56 2011 +0200 +Date: Sat Dec 17 01:22:56 2011 +0200 Updated Latvian translation. po-libgimp/lv.po | 101 +-- po-plug-ins/lv.po | 2093 ++++++++++++++++++++++++++++------------------------ - po-python/lv.po | 13 +- - po-script-fu/lv.po | 49 +- - po-tips/lv.po | 53 +- - po/lv.po | 1703 +++++++++++++++++++++--------------------- + po-python/lv.po | 13 +- + po-script-fu/lv.po | 49 +- + po-tips/lv.po | 53 +- + po/lv.po | 1703 +++++++++++++++++++++--------------------- 6 files changed, 2099 insertions(+), 1913 deletions(-) commit 056e09a6cb437829cf4f20e97116989ddb2529f3 Author: Michael Natterer -Date: Fri Dec 16 15:53:56 2011 +0100 +Date: Fri Dec 16 15:53:56 2011 +0100 Remove the makefile.msc build system, it is unmaintained since 2008 - Makefile.am | 4 +- - app/Makefile.am | 3 - - app/actions/Makefile.am | 2 - - app/actions/makefile.msc | 128 ----- - app/base/Makefile.am | 2 - - app/base/makefile.msc | 79 ---- - app/composite/Makefile.am | 1 - - app/composite/makefile.msc | 70 --- - app/config/Makefile.am | 3 - - app/config/makefile.msc | 78 ---- - app/core/Makefile.am | 1 - - app/core/makefile.msc | 261 ----------- - app/dialogs/Makefile.am | 3 +- - app/dialogs/makefile.msc | 89 ---- - app/display/Makefile.am | 2 - - app/display/makefile.msc | 85 ---- - app/file/Makefile.am | 2 - - app/file/makefile.msc | 56 --- - app/gegl/makefile.msc | 88 ---- - app/gui/Makefile.am | 4 +- - app/gui/makefile.msc | 79 ---- - app/makefile.msc | 168 ------- - app/menus/Makefile.am | 2 - - app/menus/makefile.msc | 57 --- - app/paint-funcs/Makefile.am | 2 - - app/paint-funcs/makefile.msc | 60 --- - app/paint/Makefile.am | 2 - - app/paint/makefile.msc | 95 ---- - app/pdb/Makefile.am | 2 - - app/pdb/makefile.msc | 121 ----- - app/plug-in/Makefile.am | 2 - - app/plug-in/makefile.msc | 80 ---- - app/text/Makefile.am | 2 - - app/text/makefile.msc | 79 ---- - app/tools/Makefile.am | 2 - - app/tools/makefile.msc | 150 ------ - app/vectors/Makefile.am | 2 - - app/vectors/makefile.msc | 66 --- - app/widgets/Makefile.am | 2 - - app/widgets/makefile.msc | 231 --------- - app/xcf/Makefile.am | 2 - - app/xcf/makefile.msc | 53 --- - cursors/Makefile.am | 3 +- - cursors/makefile.msc | 76 --- - gimpdefs.msc | 25 - - libgimp/Makefile.am | 1 - - libgimp/makefile.msc | 215 --------- - libgimpbase/Makefile.am | 1 - - libgimpbase/makefile.msc | 89 ---- - libgimpcolor/Makefile.am | 1 - - libgimpcolor/makefile.msc | 46 -- - libgimpconfig/Makefile.am | 1 - - libgimpconfig/makefile.msc | 50 -- - libgimpmath/Makefile.am | 1 - - libgimpmath/makefile.msc | 39 -- - libgimpmodule/Makefile.am | 1 - - libgimpmodule/makefile.msc | 78 ---- - libgimpthumb/Makefile.am | 1 - - libgimpthumb/makefile.msc | 56 --- - libgimpwidgets/Makefile.am | 1 - - libgimpwidgets/makefile.msc | 126 ----- - makefile.msc | 68 --- - menus/Makefile.am | 3 +- - menus/makefile.msc | 33 -- - modules/Makefile.am | 3 - - modules/makefile.msc | 117 ----- - plug-ins/Makefile.am | 4 - - plug-ins/makefile.msc | 929 + Makefile.am | 4 +- + app/Makefile.am | 3 - + app/actions/Makefile.am | 2 - + app/actions/makefile.msc | 128 ----- + app/base/Makefile.am | 2 - + app/base/makefile.msc | 79 ---- + app/composite/Makefile.am | 1 - + app/composite/makefile.msc | 70 --- + app/config/Makefile.am | 3 - + app/config/makefile.msc | 78 ---- + app/core/Makefile.am | 1 - + app/core/makefile.msc | 261 ----------- + app/dialogs/Makefile.am | 3 +- + app/dialogs/makefile.msc | 89 ---- + app/display/Makefile.am | 2 - + app/display/makefile.msc | 85 ---- + app/file/Makefile.am | 2 - + app/file/makefile.msc | 56 --- + app/gegl/makefile.msc | 88 ---- + app/gui/Makefile.am | 4 +- + app/gui/makefile.msc | 79 ---- + app/makefile.msc | 168 ------- + app/menus/Makefile.am | 2 - + app/menus/makefile.msc | 57 --- + app/paint-funcs/Makefile.am | 2 - + app/paint-funcs/makefile.msc | 60 --- + app/paint/Makefile.am | 2 - + app/paint/makefile.msc | 95 ---- + app/pdb/Makefile.am | 2 - + app/pdb/makefile.msc | 121 ----- + app/plug-in/Makefile.am | 2 - + app/plug-in/makefile.msc | 80 ---- + app/text/Makefile.am | 2 - + app/text/makefile.msc | 79 ---- + app/tools/Makefile.am | 2 - + app/tools/makefile.msc | 150 ------ + app/vectors/Makefile.am | 2 - + app/vectors/makefile.msc | 66 --- + app/widgets/Makefile.am | 2 - + app/widgets/makefile.msc | 231 --------- + app/xcf/Makefile.am | 2 - + app/xcf/makefile.msc | 53 --- + cursors/Makefile.am | 3 +- + cursors/makefile.msc | 76 --- + gimpdefs.msc | 25 - + libgimp/Makefile.am | 1 - + libgimp/makefile.msc | 215 --------- + libgimpbase/Makefile.am | 1 - + libgimpbase/makefile.msc | 89 ---- + libgimpcolor/Makefile.am | 1 - + libgimpcolor/makefile.msc | 46 -- + libgimpconfig/Makefile.am | 1 - + libgimpconfig/makefile.msc | 50 -- + libgimpmath/Makefile.am | 1 - + libgimpmath/makefile.msc | 39 -- + libgimpmodule/Makefile.am | 1 - + libgimpmodule/makefile.msc | 78 ---- + libgimpthumb/Makefile.am | 1 - + libgimpthumb/makefile.msc | 56 --- + libgimpwidgets/Makefile.am | 1 - + libgimpwidgets/makefile.msc | 126 ----- + makefile.msc | 68 --- + menus/Makefile.am | 3 +- + menus/makefile.msc | 33 -- + modules/Makefile.am | 3 - + modules/makefile.msc | 117 ----- + plug-ins/Makefile.am | 4 - + plug-ins/makefile.msc | 929 ------------------------------------- - plug-ins/pygimp/Makefile.am | 3 +- - plug-ins/pygimp/makefile.msc | 87 ---- - themes/Default/images/Makefile.am | 4 +- + plug-ins/pygimp/Makefile.am | 3 +- + plug-ins/pygimp/makefile.msc | 87 ---- + themes/Default/images/Makefile.am | 4 +- themes/Default/images/makefile.msc | 349 -------------- 72 files changed, 7 insertions(+), 4624 deletions(-) commit 42a5f8f83407659ee9dd356a5f7b078e4670156a Author: Michael Natterer -Date: Fri Dec 16 09:40:54 2011 +0100 +Date: Fri Dec 16 09:40:54 2011 +0100 Bug 666065 - "you can drop dockable dialog" of the toolbox @@ -22795,7 +23705,7 @@ commit fde82c64b8f5dc239f6d4bdd968792baf722aa44 Author: Michael Natterer -Date: Thu Dec 15 22:37:00 2011 +0100 +Date: Thu Dec 15 22:37:00 2011 +0100 Bug 666308 - Can't leave fullscreen-mode when are no opened images @@ -22809,7 +23719,7 @@ commit 51a8e668248c08e50158d7713926e45e8644b5a2 Author: Michael Natterer -Date: Thu Dec 15 22:35:44 2011 +0100 +Date: Thu Dec 15 22:35:44 2011 +0100 app: reduce nesting in gimp_display_shell_canvas_no_image_events() @@ -22818,7 +23728,7 @@ commit cf3a06bf27b8731b6243364d2a901dea5d0a163b Author: Žygimantas Beručka -Date: Tue Dec 13 23:29:42 2011 +0200 +Date: Tue Dec 13 23:29:42 2011 +0200 Updated Lithuanian translation @@ -22828,7 +23738,7 @@ commit cdc8f86310b1942cb4d5ba4f139d2307c2162516 Author: Žygimantas Beručka -Date: Tue Dec 13 18:06:37 2011 +0200 +Date: Tue Dec 13 18:06:37 2011 +0200 Updated Lithuanian translation @@ -22838,7 +23748,7 @@ commit 6b8b6b9b872abd8681533e6a472b9265c7d67c39 Author: Christian Kirbach -Date: Tue Dec 13 09:26:43 2011 +0100 +Date: Tue Dec 13 09:26:43 2011 +0100 Updated German plug-ins translation @@ -22848,41 +23758,41 @@ commit 1808e4cbc3a62a205ff9497286a99d394398cc5b Author: Mukund Sivaraman -Date: Mon Dec 12 23:40:55 2011 +0530 +Date: Mon Dec 12 23:40:55 2011 +0530 build: Fix the location of the libm dependency The plug-ins use symbols in libm and that's why -lm is necessary, not because libgimpmath uses it. - plug-ins/color-rotate/Makefile.am | 3 ++- - plug-ins/flame/Makefile.am | 3 ++- - plug-ins/fractal-explorer/Makefile.am | 3 ++- - plug-ins/gfig/Makefile.am | 3 ++- - plug-ins/gimpressionist/Makefile.am | 3 ++- - plug-ins/gradient-flare/Makefile.am | 3 ++- - plug-ins/ifs-compose/Makefile.am | 3 ++- - plug-ins/imagemap/Makefile.am | 3 ++- - plug-ins/lighting/Makefile.am | 3 ++- - plug-ins/map-object/Makefile.am | 3 ++- - plug-ins/pagecurl/Makefile.am | 3 ++- + plug-ins/color-rotate/Makefile.am | 3 ++- + plug-ins/flame/Makefile.am | 3 ++- + plug-ins/fractal-explorer/Makefile.am | 3 ++- + plug-ins/gfig/Makefile.am | 3 ++- + plug-ins/gimpressionist/Makefile.am | 3 ++- + plug-ins/gradient-flare/Makefile.am | 3 ++- + plug-ins/ifs-compose/Makefile.am | 3 ++- + plug-ins/imagemap/Makefile.am | 3 ++- + plug-ins/lighting/Makefile.am | 3 ++- + plug-ins/map-object/Makefile.am | 3 ++- + plug-ins/pagecurl/Makefile.am | 3 ++- plug-ins/selection-to-path/Makefile.am | 3 ++- 12 files changed, 24 insertions(+), 12 deletions(-) commit 49057bcbad52f23ee37396662eaf38964d476875 Author: Piotr Drąg -Date: Sun Dec 11 23:37:08 2011 +0100 +Date: Sun Dec 11 23:37:08 2011 +0100 Updated Polish translation po-plug-ins/pl.po | 1310 ++++++++++++++++++++++++----------------------------- - po/pl.po | 17 +- + po/pl.po | 17 +- 2 files changed, 601 insertions(+), 726 deletions(-) commit d7c83ff89fb5d97ee3942858d2a1ff6f6755cf7c Author: Piotr Drąg -Date: Sun Dec 11 20:42:38 2011 +0100 +Date: Sun Dec 11 20:42:38 2011 +0100 Updated Polish translation @@ -22891,17 +23801,17 @@ commit 2271f6fe9673301d01d16d5bd8ac00c98ef476a3 Author: Michael Natterer -Date: Sun Dec 11 20:36:48 2011 +0100 +Date: Sun Dec 11 20:36:48 2011 +0100 Bump version to 2.7.5 - NEWS | 7 +++++++ + NEWS | 7 +++++++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) commit 443a1dc69ffaf66136e8c046b1f16b2ed5b943f4 Author: Piotr Drąg -Date: Sun Dec 11 20:29:14 2011 +0100 +Date: Sun Dec 11 20:29:14 2011 +0100 Updated Polish translation @@ -22911,7 +23821,7 @@ commit d7801b7b65b93b4c3e7816490582c71220a784b4 Author: Nils Philippsen -Date: Mon Dec 12 00:29:23 2011 +0530 +Date: Mon Dec 12 00:29:23 2011 +0530 selection-to-path: explicitly specify library dependencies @@ -22920,7 +23830,7 @@ commit ddddde80846e785122a5b6d032907546629391b5 Author: Nils Philippsen -Date: Mon Dec 12 00:28:35 2011 +0530 +Date: Mon Dec 12 00:28:35 2011 +0530 pagecurl: explicitly specify library dependencies @@ -22929,7 +23839,7 @@ commit df52d7a325cc46f847916bda2f2777b1973bd1a2 Author: Nils Philippsen -Date: Mon Dec 12 00:26:18 2011 +0530 +Date: Mon Dec 12 00:26:18 2011 +0530 map-object: explicitly specify library dependencies @@ -22938,7 +23848,7 @@ commit 4ed2e957dd933aea29360fd8db906e2cc954ff2d Author: Nils Philippsen -Date: Mon Dec 12 00:24:57 2011 +0530 +Date: Mon Dec 12 00:24:57 2011 +0530 lighting: explicitly specify library dependencies @@ -22947,7 +23857,7 @@ commit 09a6c7cf675e5236ec6ca2c1eb171c0bcc7578a0 Author: Nils Philippsen -Date: Thu Feb 25 15:11:04 2010 +0100 +Date: Thu Feb 25 15:11:04 2010 +0100 imagemap: explicitly specify library dependencies @@ -22956,7 +23866,7 @@ commit 92ad8e06343659c25a66a6a7beece3c6089a246b Author: Nils Philippsen -Date: Thu Feb 25 15:11:04 2010 +0100 +Date: Thu Feb 25 15:11:04 2010 +0100 ifs-compose: explicitly specify library dependencies @@ -22965,7 +23875,7 @@ commit d6089f5061c461ab874b629c4d0b1ef0878466ff Author: Nils Philippsen -Date: Thu Feb 25 15:11:04 2010 +0100 +Date: Thu Feb 25 15:11:04 2010 +0100 gradient-flare: explicitly specify library dependencies @@ -22974,7 +23884,7 @@ commit e091944b7b3572b6560b08af1c37bf0fd232a983 Author: Nils Philippsen -Date: Mon Dec 12 00:23:00 2011 +0530 +Date: Mon Dec 12 00:23:00 2011 +0530 gimpressionist: explicitly specify library dependencies @@ -22983,7 +23893,7 @@ commit fdcd625bc939e50e0491e4c8e0f8d96aa1c5ebed Author: Nils Philippsen -Date: Thu Feb 25 15:11:04 2010 +0100 +Date: Thu Feb 25 15:11:04 2010 +0100 gfig: explicitly specify library dependencies @@ -22992,7 +23902,7 @@ commit 911c150b49abf1d6469ef12f20df7c81e687e506 Author: Nils Philippsen -Date: Thu Feb 25 15:11:04 2010 +0100 +Date: Thu Feb 25 15:11:04 2010 +0100 fractal-explorer: explicitly specify library dependencies @@ -23001,7 +23911,7 @@ commit d4e937fafc68c9b26762976037710ca1ed9f7a11 Author: Nils Philippsen -Date: Thu Feb 25 15:36:20 2010 +0100 +Date: Thu Feb 25 15:36:20 2010 +0100 flame: explicitly specify library dependencies @@ -23010,7 +23920,7 @@ commit a53e1f5018e7c3c3991e04de2c9883a4c7e30ba4 Author: Nils Philippsen -Date: Thu Feb 25 15:11:04 2010 +0100 +Date: Thu Feb 25 15:11:04 2010 +0100 color-rotate: explicitly specify library dependencies @@ -23019,7 +23929,7 @@ commit be414f232199500d49c13cc229fe7a71e2abb468 Author: Mikael Magnusson -Date: Sun Dec 11 19:16:55 2011 +0100 +Date: Sun Dec 11 19:16:55 2011 +0100 NEWS: Fix some stuff @@ -23028,7 +23938,7 @@ commit bea8b939594aac6918786a58698bd3f21b193219 Author: Massimo Valentini -Date: Sun Dec 11 17:11:25 2011 +0100 +Date: Sun Dec 11 17:11:25 2011 +0100 app: use projection and not image sizes @@ -23045,7 +23955,7 @@ commit 5046f167fdd823a64fffb8bd8bc3a48eeaa6dd74 Author: Michael Natterer -Date: Sun Dec 11 16:39:01 2011 +0100 +Date: Sun Dec 11 16:39:01 2011 +0100 app: remove checks for grab time consistency @@ -23057,7 +23967,7 @@ commit 121776a9a967faf29249f12ed394928ba0f1fd30 Author: Michael Natterer -Date: Sun Dec 11 02:46:46 2011 +0100 +Date: Sun Dec 11 02:46:46 2011 +0100 NEWS: updates @@ -23066,7 +23976,7 @@ commit a25bfabc43f8546542cdbfe3f7fc57e598c9c478 Author: Michael Natterer -Date: Sun Dec 11 02:44:14 2011 +0100 +Date: Sun Dec 11 02:44:14 2011 +0100 app: properly memory manage GimpColorSelectorPalette's context @@ -23078,7 +23988,7 @@ commit 94c322ff70c2c8b1dd41865dd2f1f6afc1b3db28 Author: Michael Natterer -Date: Sun Dec 11 02:43:14 2011 +0100 +Date: Sun Dec 11 02:43:14 2011 +0100 libgimpwidgets: set GimpColorSelector's config to NULL in dispose() @@ -23089,7 +23999,7 @@ commit 12a8eec4442fe30cf9aa4c0359c6b0828c03f27e Author: Michael Natterer -Date: Sun Dec 11 02:41:01 2011 +0100 +Date: Sun Dec 11 02:41:01 2011 +0100 libgimpwidgets: keep GimpColorNotebook->selectors in a consistent state @@ -23104,7 +24014,7 @@ commit 8569c6e2f7ebe2204bc01b682397f2cd125393d9 Author: Michael Natterer -Date: Sat Dec 10 23:22:08 2011 +0100 +Date: Sat Dec 10 23:22:08 2011 +0100 app: don't request motion hints on the canvas @@ -23112,42 +24022,42 @@ app/display/gimpdisplayshell-tool-events.c | 30 ------------------------------ - app/display/gimpdisplayshell.c | 13 ++++++------- - app/tools/gimptoolcontrol.c | 4 ++-- - app/tools/tools-enums.h | 1 - + app/display/gimpdisplayshell.c | 13 ++++++------- + app/tools/gimptoolcontrol.c | 4 ++-- + app/tools/tools-enums.h | 1 - 4 files changed, 8 insertions(+), 40 deletions(-) commit 3f4754d124bc001732a656dd88af770c0cd997e5 Author: Michael Natterer -Date: Sat Dec 10 23:16:06 2011 +0100 +Date: Sat Dec 10 23:16:06 2011 +0100 app: set GimpToolControl->motion_mode to COMPRESS for move and color picker app/tools/gimpcolorpickertool.c | 7 +++++-- - app/tools/gimpmovetool.c | 2 ++ + app/tools/gimpmovetool.c | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) commit 57dd302ee820811566537dab28d0f7e22c7a9106 Author: Michael Natterer -Date: Sat Dec 10 23:15:03 2011 +0100 +Date: Sat Dec 10 23:15:03 2011 +0100 app: don't redundantly set GimpToolControl->scroll_lock to FALSE app/tools/gimpeditselectiontool.c | 4 +--- app/tools/gimpfreeselecttool.c | 1 - - app/tools/gimpvectortool.c | 1 - + app/tools/gimpvectortool.c | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) commit 180cb656ae8107d448452baad30ea7d938e722f9 Author: Michael Natterer -Date: Sat Dec 10 21:51:05 2011 +0100 +Date: Sat Dec 10 21:51:05 2011 +0100 Remove more gdk_pointer_grab() where they are not strictly needed and replace them by gtk_grab_add()/remove(). - app/widgets/gimpdasheditor.c | 8 +++----- + app/widgets/gimpdasheditor.c | 8 +++----- app/widgets/gimphistogramview.c | 7 ++----- libgimpwidgets/gimpcolorselect.c | 18 ++++-------------- libgimpwidgets/gimpoffsetarea.c | 36 @@ -23156,7 +24066,7 @@ commit 022af2610e7636e24c61da20915aca60072d24b9 Author: Michael Natterer -Date: Fri Dec 9 23:21:22 2011 +0100 +Date: Fri Dec 9 23:21:22 2011 +0100 app: GimpDisplayShell: fix type of the new grab time members @@ -23165,7 +24075,7 @@ commit 7da455214d60ecbd6672a14b402e938042a24508 Author: Michael Natterer -Date: Fri Dec 9 22:34:44 2011 +0100 +Date: Fri Dec 9 22:34:44 2011 +0100 app: merge if() madness into one single even bigger madness @@ -23174,7 +24084,7 @@ commit 5ec2bd7287c0551c030a348b8b75e8545f5c06da Author: Alexia Death -Date: Fri Dec 9 23:26:22 2011 +0200 +Date: Fri Dec 9 23:26:22 2011 +0200 app: improve ignoring other buttons while one down @@ -23183,7 +24093,7 @@ commit 435b5b4386f567ec6c8755ff924d028075d40dfa Author: Michael Natterer -Date: Fri Dec 9 20:54:24 2011 +0100 +Date: Fri Dec 9 20:54:24 2011 +0100 app: move variable to local scope in gimp_display_shell_canvas_tool_events() @@ -23193,7 +24103,7 @@ commit ea49a7b466ec32fcad3b366a5bc63365e1744260 Author: Michael Natterer -Date: Fri Dec 9 20:53:11 2011 +0100 +Date: Fri Dec 9 20:53:11 2011 +0100 app: ignore new button events on the canvas while another button is down @@ -23206,7 +24116,7 @@ commit 01f92a3b486bbc2b8aac1771e613e07cb36d7f43 Author: Michael Natterer -Date: Fri Dec 9 20:20:02 2011 +0100 +Date: Fri Dec 9 20:20:02 2011 +0100 app: get rid of server grabs for almost all canvas interaction @@ -23232,17 +24142,17 @@ Bug 644351 - Gimp misses some strokes especially when drawing fast Bug 645747 - Gimp is now unusable on xfce4 - app/display/gimpdisplayshell-grab.c | 84 + app/display/gimpdisplayshell-grab.c | 84 ++++++++++++++---------------- app/display/gimpdisplayshell-tool-events.c | 80 +++++++++++++--------------- - app/display/gimpdisplayshell.h | 2 + - app/widgets/gimpdeviceinfo-coords.c | 25 +++++++++ + app/display/gimpdisplayshell.h | 2 + + app/widgets/gimpdeviceinfo-coords.c | 25 +++++++++ 4 files changed, 100 insertions(+), 91 deletions(-) commit b06bc636307d90f621712c0d8b0db4f5604c72a8 Author: Kevin Cozens -Date: Mon Dec 5 17:04:07 2011 -0500 +Date: Mon Dec 5 17:04:07 2011 -0500 Corrected TinyScheme version number shown in Script-Fu console. @@ -23251,36 +24161,36 @@ commit fc1e451a072737e60ce259b726276c382ced956f Author: Claude Paroz -Date: Fri Dec 9 14:54:15 2011 +0100 +Date: Fri Dec 9 14:54:15 2011 +0100 Updated French translations po-libgimp/fr.po | 229 +++---- po-plug-ins/fr.po | 1745 ++++++++++++++++++++++++++++------------------------ - po-script-fu/fr.po | 8 +- - po-tips/fr.po | 99 ++- - po/fr.po | 75 ++- + po-script-fu/fr.po | 8 +- + po-tips/fr.po | 99 ++- + po/fr.po | 75 ++- 5 files changed, 1138 insertions(+), 1018 deletions(-) commit d1e2df4843d1ad035f1d99d2a82fb5a76a2652f8 Author: Alan Monfort -Date: Fri Dec 9 03:52:44 2011 +0100 +Date: Fri Dec 9 03:52:44 2011 +0100 Updated Breton translation - po-libgimp/br.po | 2 +- + po-libgimp/br.po | 2 +- po-plug-ins/br.po | 6510 +++++++++++++++++++++++++++------------------------- - po-python/br.po | 82 +- + po-python/br.po | 82 +- po-script-fu/br.po | 435 ++-- - po-tips/br.po | 2 +- - po/br.po | 3632 ++++++++++++++++------------- + po-tips/br.po | 2 +- + po/br.po | 3632 ++++++++++++++++------------- 6 files changed, 5734 insertions(+), 4929 deletions(-) commit 77f30d8e50501178769e1f589e6aa6db2f85da33 Author: Martin Srebotnjak -Date: Thu Dec 8 17:21:30 2011 +0100 +Date: Thu Dec 8 17:21:30 2011 +0100 Updated Slovenian translation @@ -23289,18 +24199,18 @@ commit 9318e2434fcca632565c129dfb0d143d1eb722a8 Author: Marco Ciampa -Date: Wed Dec 7 23:19:22 2011 +0100 +Date: Wed Dec 7 23:19:22 2011 +0100 Update italian translation. po-plug-ins/it.po | 32 +++++++------ - po-tips/it.po | 133 + po-tips/it.po | 133 +++++++++++++++++++++++++++--------------------------- 2 files changed, 84 insertions(+), 81 deletions(-) commit e16de744a556848b2264f743826db4113367fd1d Author: Michael Natterer -Date: Wed Dec 7 19:09:31 2011 +0100 +Date: Wed Dec 7 19:09:31 2011 +0100 plug-ins: use g_message, not gimp_message in file-pdf-load @@ -23311,7 +24221,7 @@ commit b4ae9ff73adb018adb45ce1565afbecb2b132015 Author: Martin Srebotnjak -Date: Wed Dec 7 18:55:25 2011 +0100 +Date: Wed Dec 7 18:55:25 2011 +0100 Updated Slovenian translation @@ -23320,7 +24230,7 @@ commit 48f68b86b84c37d2b8fb638f99b6ba34defb49e7 Author: Martin Srebotnjak -Date: Wed Dec 7 18:52:44 2011 +0100 +Date: Wed Dec 7 18:52:44 2011 +0100 Updated Slovenian translation @@ -23329,7 +24239,7 @@ commit 0068b287986eb26ada950b62f5222cb24f36c3aa Author: Martin Srebotnjak -Date: Wed Dec 7 18:52:15 2011 +0100 +Date: Wed Dec 7 18:52:15 2011 +0100 Updated Slovenian translation @@ -23339,7 +24249,7 @@ commit 643d627d787fe27a20c4f15815266c7620a881e2 Author: Martin Srebotnjak -Date: Wed Dec 7 18:51:54 2011 +0100 +Date: Wed Dec 7 18:51:54 2011 +0100 Updated Slovenian translation @@ -23348,7 +24258,7 @@ commit 8d68ef15e93448f2ec02f3bae734ec4f9ab376d9 Author: Mukund Sivaraman -Date: Wed Dec 7 18:23:26 2011 +0530 +Date: Wed Dec 7 18:23:26 2011 +0530 file-pdf-load: Return execution error when no pages exist @@ -23357,7 +24267,7 @@ commit 7f0e71dbf2debb27b71d1f54106411382420f8e4 Author: Karthikeyan S -Date: Wed Dec 7 17:57:28 2011 +0530 +Date: Wed Dec 7 17:57:28 2011 +0530 file-pdf-load: Fix possible uninitialised variable access @@ -23370,7 +24280,7 @@ commit e3f939f9a12d7a76f19a8570dfaf998c6e0487fc Author: Daniel Korostil -Date: Wed Dec 7 12:08:44 2011 +0200 +Date: Wed Dec 7 12:08:44 2011 +0200 Uploaded Ukranian @@ -23380,7 +24290,7 @@ commit 76852a5b7f68b4bb374dd1823d2a1e895ddee05c Author: Daniel Korostil -Date: Wed Dec 7 12:00:30 2011 +0200 +Date: Wed Dec 7 12:00:30 2011 +0200 Uploaded Ukranian @@ -23389,7 +24299,7 @@ commit 94ef0702079e4920038326300c6cfbe577af33f0 Author: Daniel Korostil -Date: Wed Dec 7 11:56:07 2011 +0200 +Date: Wed Dec 7 11:56:07 2011 +0200 Uploaded Ukranian @@ -23399,7 +24309,7 @@ commit 714fc4aa98fe8ea0e37441849c2a9c9ddf441cc1 Author: Daniel Korostil -Date: Wed Dec 7 11:15:56 2011 +0200 +Date: Wed Dec 7 11:15:56 2011 +0200 Uploaded Ukranian @@ -23409,7 +24319,7 @@ commit 567ccd93a0ceb229b2882bad21566493360e2952 Author: Daniel Korostil -Date: Wed Dec 7 11:13:07 2011 +0200 +Date: Wed Dec 7 11:13:07 2011 +0200 Uploaded Ukranian @@ -23418,7 +24328,7 @@ commit 421f2a96c7950281175c21434e3781f707bfe4c5 Author: Daniel Korostil -Date: Wed Dec 7 11:10:23 2011 +0200 +Date: Wed Dec 7 11:10:23 2011 +0200 Uploaded Ukranian @@ -23428,7 +24338,7 @@ commit 921922e95d84fafde86954ed6ef2b079ece2c4b1 Author: Mukund Sivaraman -Date: Wed Dec 7 10:30:59 2011 +0530 +Date: Wed Dec 7 10:30:59 2011 +0530 libgimp: Change comment to point at correct alternate function @@ -23437,7 +24347,7 @@ commit 20f34d3e111b3dcb7c3630d188090abc50764eae Author: Mukund Sivaraman -Date: Wed Dec 7 10:30:35 2011 +0530 +Date: Wed Dec 7 10:30:35 2011 +0530 pygimp: Mark some functions and methods as deprecated @@ -23446,7 +24356,7 @@ commit 4300612962717a168e3b3cfdf30327ca68976e01 Author: Michael Natterer -Date: Tue Dec 6 22:32:23 2011 +0100 +Date: Tue Dec 6 22:32:23 2011 +0100 app: separate handling of reverse-gradient from paint dynamics @@ -23463,7 +24373,7 @@ commit 1b5a0f9d9d8c5ba29523e8446e43e040d239b4ca Author: Mukund Sivaraman -Date: Wed Dec 7 01:38:33 2011 +0530 +Date: Wed Dec 7 01:38:33 2011 +0530 build: Add -Werror=missing-prototypes to CFLAGS where possible @@ -23472,19 +24382,19 @@ commit 7aa91bdae38311815e0f0a8ee7f45ef615e53dc3 Author: Daniel Mustieles -Date: Tue Dec 6 20:48:30 2011 +0100 +Date: Tue Dec 6 20:48:30 2011 +0100 Updated Spanish translation po-script-fu/es.po | 15 +++-- - po-tips/es.po | 23 ++++--- - po/es.po | 180 + po-tips/es.po | 23 ++++--- + po/es.po | 180 +++++++++++++++++++++++++++++------------------------ 3 files changed, 121 insertions(+), 97 deletions(-) commit 07939818efa889290bbbfa72fedf7e421d2b8b96 Author: Piotr Drąg -Date: Tue Dec 6 20:29:15 2011 +0100 +Date: Tue Dec 6 20:29:15 2011 +0100 Updated Polish translation @@ -23493,7 +24403,7 @@ commit 2d4eda444d74f58f68c45ca12be7e83eb240bf80 Author: Mukund Sivaraman -Date: Wed Dec 7 00:47:25 2011 +0530 +Date: Wed Dec 7 00:47:25 2011 +0530 gimp-tips: Update tip about save vs. export @@ -23502,7 +24412,7 @@ commit 791c0a7da8d43a6bc0e103f25a82497ef50deb53 Author: Mukund Sivaraman -Date: Wed Dec 7 00:13:56 2011 +0530 +Date: Wed Dec 7 00:13:56 2011 +0530 pygimp: Delete duplicate COPYING (same as top-level) @@ -23515,7 +24425,7 @@ commit 64a4e4ef6f197956f0381f6a7042ae355c5b6df6 Author: Piotr Drąg -Date: Tue Dec 6 19:52:30 2011 +0100 +Date: Tue Dec 6 19:52:30 2011 +0100 Updated Polish translation @@ -23524,12 +24434,12 @@ po-python/pl.po | 49 ++++--- po-script-fu/pl.po | 385 +++++++++++++++++++++++++------------------------- - po-tips/pl.po | 147 ++++++++++--------- + po-tips/pl.po | 147 ++++++++++--------- 4 files changed, 425 insertions(+), 561 deletions(-) commit 2abbbb403485d6433b7ad649da971eea43fc5104 Author: Mukund Sivaraman -Date: Tue Dec 6 23:56:41 2011 +0530 +Date: Tue Dec 6 23:56:41 2011 +0530 pygimp: Delete obsolete and empty AUTHORS file @@ -23538,7 +24448,7 @@ commit 945176268450409af9323a996fb49217887d6925 Author: Mukund Sivaraman -Date: Tue Dec 6 23:51:39 2011 +0530 +Date: Tue Dec 6 23:51:39 2011 +0530 pygimp: Remove obsolete and out-of-place INSTALL file @@ -23548,7 +24458,7 @@ commit 798b4d18cff704729d5a45e1a80b26bea2d84685 Author: Mukund Sivaraman -Date: Tue Dec 6 23:47:50 2011 +0530 +Date: Tue Dec 6 23:47:50 2011 +0530 file-svg: Update help text of file-svg-load-thumb @@ -23557,7 +24467,7 @@ commit 1d15105c3f825a8ddb34873c7247e0ad871169f9 Author: Marco Ciampa -Date: Tue Dec 6 17:02:47 2011 +0100 +Date: Tue Dec 6 17:02:47 2011 +0100 Updated italian translation. @@ -23567,7 +24477,7 @@ commit 5c67d250ca414b6ca030c39b5952a0880e8493da Author: Mukund Sivaraman -Date: Tue Dec 6 21:18:56 2011 +0530 +Date: Tue Dec 6 21:18:56 2011 +0530 file-bmp: Unmark string from translation @@ -23576,7 +24486,7 @@ commit 04285710106abbff52e7d426f052c9f10f57eaac Author: Mukund Sivaraman -Date: Tue Dec 6 21:08:13 2011 +0530 +Date: Tue Dec 6 21:08:13 2011 +0530 file-pdf-save: Update help text to match that of file-pdf-load @@ -23585,7 +24495,7 @@ commit 50630241de20797c20fa84fa2f6dd0fab69be474 Author: Mukund Sivaraman -Date: Tue Dec 6 21:07:56 2011 +0530 +Date: Tue Dec 6 21:07:56 2011 +0530 file-pdf-load: Remove punctuation @@ -23594,7 +24504,7 @@ commit 29250f501c37880d3c39efd81b5cf0315fdf3665 Author: Michael Natterer -Date: Tue Dec 6 16:38:58 2011 +0100 +Date: Tue Dec 6 16:38:58 2011 +0100 AUTHORS: commit generated change @@ -23603,7 +24513,7 @@ commit b90de98c11e8960e9b6936f5f483ca8955106a87 Author: Mukund Sivaraman -Date: Tue Dec 6 21:04:06 2011 +0530 +Date: Tue Dec 6 21:04:06 2011 +0530 file-pdf-load: Mark string for translation @@ -23612,7 +24522,7 @@ commit 11ba7411b4a76a676c4780664fb30be6588ea94e Author: Mukund Sivaraman -Date: Tue Dec 6 21:03:02 2011 +0530 +Date: Tue Dec 6 21:03:02 2011 +0530 file-pdf-load: Update help text of file-pdf-load @@ -23621,7 +24531,7 @@ commit e78ea68f69402a956993007d90afde692d8e607b Author: Mukund Sivaraman -Date: Tue Dec 6 20:48:09 2011 +0530 +Date: Tue Dec 6 20:48:09 2011 +0530 file-png: Display a readable string when error message is unavailable @@ -23630,7 +24540,7 @@ commit e410fe09e78451574c06f562902ccd3e92990216 Author: Mukund Sivaraman -Date: Tue Dec 6 20:47:37 2011 +0530 +Date: Tue Dec 6 20:47:37 2011 +0530 file-png: Mark string for translation @@ -23639,7 +24549,7 @@ commit deea484a7053cec5780ee6cfbc1478166f574d67 Author: Mukund Sivaraman -Date: Tue Dec 6 20:43:55 2011 +0530 +Date: Tue Dec 6 20:43:55 2011 +0530 file-pnm: Write help text for file-pnm-load @@ -23648,7 +24558,7 @@ commit 7af0494495375f96941e1737a8f0a4f9521fcf0f Author: Mukund Sivaraman -Date: Tue Dec 6 20:42:30 2011 +0530 +Date: Tue Dec 6 20:42:30 2011 +0530 file-pnm: Fix strings including case changes @@ -23657,7 +24567,7 @@ commit 2452183de11aa1edc9a932bf04aa1b8aca407abf Author: Mukund Sivaraman -Date: Tue Dec 6 20:37:42 2011 +0530 +Date: Tue Dec 6 20:37:42 2011 +0530 file-pnm: ASCII is an acronym @@ -23666,7 +24576,7 @@ commit cbb5389bf2d50809699f3cbb3a10e8595bae4c28 Author: Alexandre Prokoudine -Date: Tue Dec 6 02:50:29 2011 +0400 +Date: Tue Dec 6 02:50:29 2011 +0400 Updated Russian translation @@ -23676,32 +24586,32 @@ commit e2bbf8398b564805bb1a93cf7ec853b90a440dec Author: Hleb Valoshka <375gnu@gmail.com> -Date: Mon Dec 5 15:14:18 2011 +0100 +Date: Mon Dec 5 15:14:18 2011 +0100 Updated Belarusian translation. po-libgimp/be.po | 77 +++-- po-plug-ins/be.po | 725 ++++++++++++++++++++++++++++++++------- po-script-fu/be.po | 200 ++++++++++- - po/be.po | 981 + po/be.po | 981 ++++++++++++++++++++++++++++++++++++++++++++++++----- 4 files changed, 1742 insertions(+), 241 deletions(-) commit d8649efea09888a6e8b31444d80ca66aaf2c7559 Author: Marco Ciampa -Date: Mon Dec 5 15:14:18 2011 +0100 +Date: Mon Dec 5 15:14:18 2011 +0100 Updated italian translation. po-plug-ins/it.po | 165 ++++++++++++++++++++++++++++-------------------------- po-python/it.po | 55 ++++++++++-------- - po/it.po | 67 +++++++++++++--------- + po/it.po | 67 +++++++++++++--------- 3 files changed, 158 insertions(+), 129 deletions(-) commit 3227744f5c8a8be1dd4a6f1fba28766e4d56d045 Author: Alexandre Prokoudine -Date: Mon Dec 5 17:59:07 2011 +0400 +Date: Mon Dec 5 17:59:07 2011 +0400 Marked "View > Use GEGL" for translation, spotted by Cristian Secară. @@ -23713,18 +24623,18 @@ commit a22507363c44defb145c9ee100b84dff46247110 Author: Alexandre Prokoudine -Date: Mon Dec 5 11:59:00 2011 +0400 +Date: Mon Dec 5 11:59:00 2011 +0400 NEWS now mentions that PSD loader is capable of reading working paths now. The patch sender is added to authors.xml. - NEWS | 1 + + NEWS | 1 + authors.xml | 1 + 2 files changed, 2 insertions(+) commit 889a1ece60fc847cd35e58d7c87f60b42e592250 Author: Alexia Death -Date: Sun Dec 4 23:07:51 2011 +0200 +Date: Sun Dec 4 23:07:51 2011 +0200 NEWS: fix some spelling and grammar @@ -23733,23 +24643,23 @@ commit f173a673cdab142f8d38bf908fb0c6a7023b1d2d Author: Piotr Drąg -Date: Sun Dec 4 22:01:09 2011 +0100 +Date: Sun Dec 4 22:01:09 2011 +0100 Updated Polish translation - po-libgimp/pl.po | 68 +- + po-libgimp/pl.po | 68 +- po-plug-ins/pl.po | 1994 ++++++++++++++++++++++++++++------------------------ - po-python/pl.po | 2 +- - po-script-fu/pl.po | 15 +- - po-tags/pl.po | 2 +- - po-tips/pl.po | 2 +- - po/pl.po | 1638 +++++++++++++++++++++--------------------- + po-python/pl.po | 2 +- + po-script-fu/pl.po | 15 +- + po-tags/pl.po | 2 +- + po-tips/pl.po | 2 +- + po/pl.po | 1638 +++++++++++++++++++++--------------------- 7 files changed, 1973 insertions(+), 1748 deletions(-) commit 090852538bfc58b366b729eefeceba89dfa4940d Author: Alexia Death -Date: Sun Dec 4 22:59:27 2011 +0200 +Date: Sun Dec 4 22:59:27 2011 +0200 NEWS: add informaion about subfolder tagging @@ -23758,7 +24668,7 @@ commit 105e9a7c045ff16ddc6335a5fb8ada2981ca59c5 Author: Martin Srebotnjak -Date: Sun Dec 4 21:43:08 2011 +0100 +Date: Sun Dec 4 21:43:08 2011 +0100 Updated Slovenian translation @@ -23767,7 +24677,7 @@ commit 8d86875b122f1b974a45bd879b3ac5aa11c27dc9 Author: Martin Srebotnjak -Date: Sun Dec 4 21:42:34 2011 +0100 +Date: Sun Dec 4 21:42:34 2011 +0100 Updated Slovenian translation @@ -23776,7 +24686,7 @@ commit a4df6e5ea22be4f5a0ebd948a97f74d7aa827b7f Author: Martin Srebotnjak -Date: Sun Dec 4 21:38:36 2011 +0100 +Date: Sun Dec 4 21:38:36 2011 +0100 Updated Slovenian translation @@ -23786,7 +24696,7 @@ commit 15bf47c578283df70e60147748ec74744401f5f9 Author: Martin Srebotnjak -Date: Sun Dec 4 21:38:15 2011 +0100 +Date: Sun Dec 4 21:38:15 2011 +0100 Updated Slovenian translation @@ -23796,7 +24706,7 @@ commit a2be001d5ef9e8c167e001f737048bd6b97e00f1 Author: Martin Srebotnjak -Date: Sun Dec 4 21:37:15 2011 +0100 +Date: Sun Dec 4 21:37:15 2011 +0100 Updated Slovenian translation @@ -23806,7 +24716,7 @@ commit 87c01e4a0a29731896a71f7889f78855290fad6c Author: Alexandre Prokoudine -Date: Sun Dec 4 23:01:14 2011 +0400 +Date: Sun Dec 4 23:01:14 2011 +0400 Updated Russian translation @@ -23814,12 +24724,12 @@ po-python/ru.po | 25 +-- po-script-fu/ru.po | 465 ++++++++++++++++++++++++++++++++++------------------- - po/ru.po | 50 +++--- + po/ru.po | 50 +++--- 4 files changed, 389 insertions(+), 253 deletions(-) commit 06d5b9e9df02f5a26e7a039999e4e8868bfceefd Author: Michael Natterer -Date: Sun Dec 4 19:24:33 2011 +0100 +Date: Sun Dec 4 19:24:33 2011 +0100 app: fix indentation in gimptextool-editor.c @@ -23828,7 +24738,7 @@ commit aa9806c6871d2a5de1b5a670e7d074e6be38d6be Author: Alexia Death -Date: Fri Dec 2 22:09:06 2011 +0200 +Date: Fri Dec 2 22:09:06 2011 +0200 app: Make resource subfolders elements in the tag cloud @@ -23840,16 +24750,16 @@ * Removes a check for existing tags when objects are added to tag cache - app/core/gimpdata.c | 35 ++++++++++++++++++ - app/core/gimptag.c | 35 ++++++++++++++++++ - app/core/gimptag.h | 7 ++++ + app/core/gimpdata.c | 35 ++++++++++++++++++ + app/core/gimptag.c | 35 ++++++++++++++++++ + app/core/gimptag.h | 7 ++++ app/core/gimptagcache.c | 94 +++++++++++++++++++++++++------------------------ 4 files changed, 125 insertions(+), 46 deletions(-) commit b6767ba0a6f84331589897d4df7bcb0aa23cf50f Author: Khaled Hosny -Date: Sun Dec 4 15:42:05 2011 +0200 +Date: Sun Dec 4 15:42:05 2011 +0200 Typo @@ -23858,7 +24768,7 @@ commit 1d3ae408b678ab41e96d567a8c57eec2f74fe96e Author: Mukund Sivaraman -Date: Sun Dec 4 10:25:27 2011 +0530 +Date: Sun Dec 4 10:25:27 2011 +0530 libgimpbase: Fix macro name so the dllexports happen on win32 @@ -23867,7 +24777,7 @@ commit b9e7198f89098a03f0b1262d34eb684769cace99 Author: Alexandre Prokoudine -Date: Sun Dec 4 03:05:45 2011 +0400 +Date: Sun Dec 4 03:05:45 2011 +0400 Removed i18n from the list of issues. It's done now. @@ -23876,7 +24786,7 @@ commit 4b897a894c06e23e9e65bbec7215f0ef00f77b3e Author: Alexandre Prokoudine -Date: Sun Dec 4 03:01:38 2011 +0400 +Date: Sun Dec 4 03:01:38 2011 +0400 Part of a user visible message is moved to a tooltip in file-pdf-save.c @@ -23886,7 +24796,7 @@ commit dcf84f391089a626ddd45da931ad5194a58c0358 Author: Michael Natterer -Date: Sat Dec 3 23:56:51 2011 +0100 +Date: Sat Dec 3 23:56:51 2011 +0100 app: set the correct resolution on the text style overlay's size entry @@ -23895,7 +24805,7 @@ commit 26b6c9dadd2446b539ab6bcc2b55ae7f4d8dcf95 Author: Michael Natterer -Date: Sat Dec 3 23:38:29 2011 +0100 +Date: Sat Dec 3 23:38:29 2011 +0100 devel-docs: update .gitignore @@ -23904,7 +24814,7 @@ commit 408595d9d56fd29a0d0e20e55f12a58e195b09a9 Author: Michael Natterer -Date: Sat Dec 3 23:36:24 2011 +0100 +Date: Sat Dec 3 23:36:24 2011 +0100 devel-docs: update .gitignore @@ -23913,7 +24823,7 @@ commit cb61dea8fe28e5b23a382db1a39e67938aafba44 Author: Michael Natterer -Date: Sat Dec 3 23:34:28 2011 +0100 +Date: Sat Dec 3 23:34:28 2011 +0100 plug-ins: fix the PDF save procedures' labels @@ -23922,7 +24832,7 @@ commit 022db7b6392f51dc8eb4d9d8aafd4a47cb5167f5 Author: Alexandre Prokoudine -Date: Sun Dec 4 01:37:18 2011 +0400 +Date: Sun Dec 4 01:37:18 2011 +0400 Added contextual separation for a user visible message @@ -23931,7 +24841,7 @@ commit 2a55c1cc5233db888c5afd8ced36ded38feee493 Author: Alexandre Prokoudine -Date: Sun Dec 4 01:02:30 2011 +0400 +Date: Sun Dec 4 01:02:30 2011 +0400 Menu items from file-pdf-save.c are now translatable @@ -23940,7 +24850,7 @@ commit 4d35037805f24b2bedc0e3f10abd57d377bb6b70 Author: Alexandre Prokoudine -Date: Sun Dec 4 00:23:58 2011 +0400 +Date: Sun Dec 4 00:23:58 2011 +0400 Updated Russian translation @@ -23950,7 +24860,7 @@ commit ed1ed0e6bc9bfa72ee255b9820fc960f71b2abc9 Author: Michael Natterer -Date: Thu Dec 1 21:12:55 2011 +0100 +Date: Thu Dec 1 21:12:55 2011 +0100 app: make destroying a GimpFilteredContainer not crash @@ -23971,7 +24881,7 @@ commit 70376b752833e4c7853af412e9cc2f92831a7ec1 Author: Michael Natterer -Date: Thu Dec 1 20:34:18 2011 +0100 +Date: Thu Dec 1 20:34:18 2011 +0100 app: GimpTagCache: move variable to local scope @@ -23980,7 +24890,7 @@ commit af0570372d8a542b79a0608325c7e9dffda821fe Author: Michael Natterer -Date: Thu Dec 1 20:24:00 2011 +0100 +Date: Thu Dec 1 20:24:00 2011 +0100 app: GimpTagEntry formatting cleanup, no logic changes @@ -23990,7 +24900,7 @@ commit a174f5d44ab076aed99958c3ff901ae00dd8a406 Author: Mukund Sivaraman -Date: Thu Dec 1 22:23:16 2011 +0530 +Date: Thu Dec 1 22:23:16 2011 +0530 file-svg: Remove obsolete code which was put in to handle librsvg API breakage @@ -24002,7 +24912,7 @@ commit 1d9ca9cdca707b254744f9ca51327fe54945ac6d Author: Michael Natterer -Date: Thu Dec 1 12:07:43 2011 +0100 +Date: Thu Dec 1 12:07:43 2011 +0100 app: remove gtk_check_version(2,24,7) code from GimpActionGroup @@ -24012,34 +24922,34 @@ commit 2b1b04bf72295fb338e6ebafdcc4a739a34006ed Author: Michael Natterer -Date: Thu Dec 1 11:36:25 2011 +0100 +Date: Thu Dec 1 11:36:25 2011 +0100 configure: depend on librsvg >= 2.34.2 because old versions use deprecated GLib stuff in their headers. Don't #undef G_DISABLE_DEPRECATED in file-svg. - configure.ac | 2 +- + configure.ac | 2 +- plug-ins/common/file-svg.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) commit 79a4f71884e49f03ebd6c0e06b6e964fb597717b Author: Michael Natterer -Date: Thu Dec 1 11:24:18 2011 +0100 +Date: Thu Dec 1 11:24:18 2011 +0100 configure: depend on webkitgtk >= 1.6.1 because old versions use deprecated GLib stuff in their headers. Don't #undef G_DISABLE_DEPRECATED in help-browser and web-page. - configure.ac | 2 +- - plug-ins/common/web-page.c | 1 - + configure.ac | 2 +- + plug-ins/common/web-page.c | 1 - plug-ins/help-browser/dialog.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) commit 2afc3419e5515bd19f699a154e6a6755d85c35b6 Author: Simon Budig -Date: Thu Dec 1 11:05:09 2011 +0100 +Date: Thu Dec 1 11:05:09 2011 +0100 fix the rgb565 mode of the raw plugin. @@ -24052,31 +24962,31 @@ commit 9781aa65ea3079297e3ac7a3f40c4b7ed4c08564 Author: Michael Natterer -Date: Tue Sep 13 11:39:24 2011 +0200 +Date: Tue Sep 13 11:39:24 2011 +0200 Bug 658467 - Replace g_format_size_for_display() by g_format_size() Use g_format_size() instead of g_format_size_for_display() because the latter is deprecated. - app/actions/edit-commands.c | 2 +- - app/core/gimpimagefile.c | 2 +- - app/dialogs/image-new-dialog.c | 4 ++-- - app/dialogs/image-scale-dialog.c | 4 ++-- - app/display/gimpdisplayshell-title.c | 5 +---- - app/widgets/gimpimagepropview.c | 7 +++---- - app/widgets/gimptemplateeditor.c | 2 +- - app/widgets/gimpthumbbox.c | 2 +- - libgimpbase/gimpmemsize.c | 6 +++--- - plug-ins/file-jpeg/jpeg-save.c | 2 +- - plug-ins/file-uri/uri-backend-gvfs.c | 6 +++--- + app/actions/edit-commands.c | 2 +- + app/core/gimpimagefile.c | 2 +- + app/dialogs/image-new-dialog.c | 4 ++-- + app/dialogs/image-scale-dialog.c | 4 ++-- + app/display/gimpdisplayshell-title.c | 5 +---- + app/widgets/gimpimagepropview.c | 7 +++---- + app/widgets/gimptemplateeditor.c | 2 +- + app/widgets/gimpthumbbox.c | 2 +- + libgimpbase/gimpmemsize.c | 6 +++--- + plug-ins/file-jpeg/jpeg-save.c | 2 +- + plug-ins/file-uri/uri-backend-gvfs.c | 6 +++--- plug-ins/file-uri/uri-backend-libcurl.c | 4 ++-- - plug-ins/file-uri/uri-backend-wget.c | 4 ++-- + plug-ins/file-uri/uri-backend-wget.c | 4 ++-- 13 files changed, 23 insertions(+), 27 deletions(-) commit 6cff213038ab9affc1e1bacfd8748438b142992a Author: Michael Natterer -Date: Wed Nov 30 23:32:00 2011 +0100 +Date: Wed Nov 30 23:32:00 2011 +0100 configure: depend on GLib >= 2.30.2 @@ -24088,7 +24998,7 @@ commit 1ef3fe7f07d784929eb5165a3d3a030d194bda5a Author: Mike Melancon -Date: Wed Nov 30 23:17:09 2011 +0100 +Date: Wed Nov 30 23:17:09 2011 +0100 Bug 643348 - Working Path not imported from a PSD @@ -24101,20 +25011,20 @@ commit 7068a15f19d081c0e3ad53406c305d8d31f98f9f Author: Marco Ciampa -Date: Wed Nov 30 22:06:09 2011 +0100 +Date: Wed Nov 30 22:06:09 2011 +0100 Updated italian translation. po-libgimp/it.po | 497 ++++++++-------- po-plug-ins/it.po | 1637 ++++++++++++++++++++++++++++------------------------ - po-script-fu/it.po | 55 +- - po/it.po | 1018 ++++++++++++++++---------------- + po-script-fu/it.po | 55 +- + po/it.po | 1018 ++++++++++++++++---------------- 4 files changed, 1674 insertions(+), 1533 deletions(-) commit 2c4bec813df72260ffd714817224d6e33607791a Author: Massimo Valentini -Date: Wed Nov 30 21:13:26 2011 +0100 +Date: Wed Nov 30 21:13:26 2011 +0100 plug-ins: Properly init international framework @@ -24123,7 +25033,7 @@ commit 9bab1671c663081aedc3ca2e9ecd356b3028d61b Author: Mukund Sivaraman -Date: Thu Dec 1 01:13:53 2011 +0530 +Date: Thu Dec 1 01:13:53 2011 +0530 file-pdf-save: Fix punctuation @@ -24132,7 +25042,7 @@ commit 0eccda70c0819c391c44518a9f126771f345c119 Author: Mukund Sivaraman -Date: Thu Dec 1 01:13:11 2011 +0530 +Date: Thu Dec 1 01:13:11 2011 +0530 file-pdf-save: Mark string for translation @@ -24141,7 +25051,7 @@ commit 3a63a827893ce971c2a6f12ded02d314bbf8e82b Author: Mukund Sivaraman -Date: Thu Dec 1 01:12:35 2011 +0530 +Date: Thu Dec 1 01:12:35 2011 +0530 file-pdf-save: Just use the PDF_DEBUG case as default @@ -24150,7 +25060,7 @@ commit de0014f2cc1d03f63d0e85a61ed86c1f75f16ae7 Author: Mukund Sivaraman -Date: Thu Dec 1 01:09:51 2011 +0530 +Date: Thu Dec 1 01:09:51 2011 +0530 file-pdf-save: Fix bogus C code @@ -24159,7 +25069,7 @@ commit 65f21e95a7031037c1887cba73e675592cdbc9bb Author: Mukund Sivaraman -Date: Thu Dec 1 01:02:13 2011 +0530 +Date: Thu Dec 1 01:02:13 2011 +0530 file-pdf-save: Remove trailing space @@ -24168,7 +25078,7 @@ commit 7394a60a9344645e141b9f9dac3a6c36f4472dbb Author: Mikael Magnusson -Date: Wed Nov 30 20:22:49 2011 +0100 +Date: Wed Nov 30 20:22:49 2011 +0100 Partially revert "INSTALL: remove trailing whitespace" @@ -24181,18 +25091,18 @@ commit a4e8509f9d209c5338f40db562bcbfc1d1798eea Author: Nils Philippsen -Date: Wed Nov 30 19:03:52 2011 +0100 +Date: Wed Nov 30 19:03:52 2011 +0100 INSTALL: remove trailing whitespace - INSTALL | 2 +- + INSTALL | 2 +- data/images/gimp-splash.png | Bin 173865 -> 186902 bytes data/images/gimp_splash.png | Bin 0 -> 101249 bytes 3 files changed, 1 insertion(+), 1 deletion(-) commit 168858aa8e178ea580673d9c10bc7d8d3f54adcf Author: Daniel Korostil -Date: Wed Nov 30 13:34:36 2011 +0200 +Date: Wed Nov 30 13:34:36 2011 +0200 Uploaded Ukranian @@ -24201,7 +25111,7 @@ commit 8b936805ca5f86a53df82e5d57a6897c1a6a541c Author: Alexandre Prokoudine -Date: Tue Nov 29 05:33:51 2011 +0400 +Date: Tue Nov 29 05:33:51 2011 +0400 Even more translatable messages in file-pdf-save.c @@ -24210,7 +25120,7 @@ commit 372e677c63d2c4dc5878efc26896b0966ccfc89a Author: Alexandre Prokoudine -Date: Tue Nov 29 05:27:02 2011 +0400 +Date: Tue Nov 29 05:27:02 2011 +0400 User visible messages in file-pdf-save.c are translatable now @@ -24219,7 +25129,7 @@ commit 263e02a6b82603cb0cf02d84dc3447d964a1809d Author: Mario Blättermann -Date: Mon Nov 28 20:44:34 2011 +0100 +Date: Mon Nov 28 20:44:34 2011 +0100 [l10n] Updated German translation @@ -24229,7 +25139,7 @@ commit 0e901776e6d43ff861eb3603fe076d88423bb8f4 Author: Michael Natterer -Date: Mon Nov 28 01:32:49 2011 +0100 +Date: Mon Nov 28 01:32:49 2011 +0100 Bug 664728 - XCF files with only one layer not loading properly @@ -24242,7 +25152,7 @@ commit 22a832b357173b58e23fb8556094b4ce1372a42f Author: Daniel Korostil -Date: Mon Nov 28 02:14:50 2011 +0200 +Date: Mon Nov 28 02:14:50 2011 +0200 Uploaded Ukranian @@ -24251,7 +25161,7 @@ commit 0b1f62f5cee6cad93e46640a1b2366bcd19a8cd7 Author: Alexandre Prokoudine -Date: Sun Nov 27 18:08:45 2011 +0400 +Date: Sun Nov 27 18:08:45 2011 +0400 Even shorter translatable messags in file-pdf-save.c @@ -24260,7 +25170,7 @@ commit 5e0765d53b0e152bfe4c5b2f3b0862dec30bfe86 Author: Alexandre Prokoudine -Date: Sun Nov 27 17:56:28 2011 +0400 +Date: Sun Nov 27 17:56:28 2011 +0400 Shorter, concise translatable messages in file-pdf-save.c @@ -24269,7 +25179,7 @@ commit 5cb29d44a6c40823aaaf4621ad4fdb02509249be Author: Alexandre Prokoudine -Date: Sun Nov 27 16:31:09 2011 +0400 +Date: Sun Nov 27 16:31:09 2011 +0400 Added file-pdf-save.c to the list of files with translatable messages @@ -24278,7 +25188,7 @@ commit af2b2aa272c82de11a9b9179929627adb4f6b649 Author: Richard Popeliš -Date: Sun Nov 27 00:54:55 2011 +0100 +Date: Sun Nov 27 00:54:55 2011 +0100 Updated Slovak translation for libgimp @@ -24288,7 +25198,7 @@ commit b5097c2c8a623946bf4b7b3f5eb8753fae2e8b7c Author: Ville Pätsi -Date: Sat Nov 26 15:55:21 2011 +0200 +Date: Sat Nov 26 15:55:21 2011 +0200 INSTALL: Fix typo in required Cairo version @@ -24297,32 +25207,32 @@ commit ebbad408853457d25182f2e855d83fd7f82f3e6c Author: Michael Natterer -Date: Fri Nov 25 21:39:55 2011 +0100 +Date: Fri Nov 25 21:39:55 2011 +0100 Doc fixes in both source comments and gtk-doc files - devel-docs/libgimp/Makefile.am | 1 + - devel-docs/libgimp/libgimp-docs.sgml | 1 + - devel-docs/libgimp/libgimp-sections.txt | 17 +++++++++-- - .../libgimpconfig/libgimpconfig-sections.txt | 1 + - devel-docs/libgimpwidgets/Makefile.am | 1 + + devel-docs/libgimp/Makefile.am | 1 + + devel-docs/libgimp/libgimp-docs.sgml | 1 + + devel-docs/libgimp/libgimp-sections.txt | 17 +++++++++-- + .../libgimpconfig/libgimpconfig-sections.txt | 1 + + devel-docs/libgimpwidgets/Makefile.am | 1 + .../libgimpwidgets/libgimpwidgets-sections.txt | 20 +++++++++++++ - devel-docs/libgimpwidgets/tmpl/gimpstock.sgml | 35 + devel-docs/libgimpwidgets/tmpl/gimpstock.sgml | 35 ++++++++++++++++++++-- - libgimp/gimp.c | 16 +++++----- - libgimp/gimpdrawable.c | 2 +- - libgimp/gimpexport.c | 2 +- - libgimp/gimppixelrgn.c | 4 +-- - libgimp/gimpprogress.c | 4 +-- - libgimp/gimpvectors.c | 2 +- - libgimpbase/gimputils.c | 2 +- - libgimpconfig/gimpconfigwriter.c | 2 +- - libgimpwidgets/gimpdialog.c | 2 +- + libgimp/gimp.c | 16 +++++----- + libgimp/gimpdrawable.c | 2 +- + libgimp/gimpexport.c | 2 +- + libgimp/gimppixelrgn.c | 4 +-- + libgimp/gimpprogress.c | 4 +-- + libgimp/gimpvectors.c | 2 +- + libgimpbase/gimputils.c | 2 +- + libgimpconfig/gimpconfigwriter.c | 2 +- + libgimpwidgets/gimpdialog.c | 2 +- 16 files changed, 90 insertions(+), 22 deletions(-) commit c08a47c5e51ba45983dd0df341ec00d025099df3 Author: Michael Natterer -Date: Fri Nov 25 14:01:03 2011 +0100 +Date: Fri Nov 25 14:01:03 2011 +0100 README: remove reference to the gimp-announce mailing list @@ -24333,7 +25243,7 @@ commit 9cd3e005aad399028f3242046e1538d2c90ffee5 Author: Michael Natterer -Date: Fri Nov 25 13:57:28 2011 +0100 +Date: Fri Nov 25 13:57:28 2011 +0100 app: fix the PDB GimpBrushSelect dialog @@ -24346,7 +25256,7 @@ commit 2d260e8de17a078f994fab26588abf1cbf6d6db6 Author: Michael Natterer -Date: Thu Nov 24 22:15:54 2011 +0100 +Date: Thu Nov 24 22:15:54 2011 +0100 script-fu: opacity in SF-BRUSH is 0..100 since at least GIMP 2.2 @@ -24356,7 +25266,7 @@ commit 31d443a4657f0916457e15c7a2423fcf5f7bfc9a Author: Michael Natterer -Date: Thu Nov 24 22:05:00 2011 +0100 +Date: Thu Nov 24 22:05:00 2011 +0100 app: don't let applying a tool preset overwrite the tool option's name @@ -24368,7 +25278,7 @@ commit 72c89397e4a6fee5c3615ec51268607d7923f8e8 Author: Kevin Cozens -Date: Wed Nov 23 12:42:07 2011 -0500 +Date: Wed Nov 23 12:42:07 2011 -0500 Removed #include that is now included by another include statement @@ -24377,7 +25287,7 @@ commit 88befd308292c23b83405f9236c9085cf7be72e9 Author: Michael Natterer -Date: Wed Nov 23 20:55:55 2011 +0100 +Date: Wed Nov 23 20:55:55 2011 +0100 Bug 664591 - Spyrogimp script crashes GIMP @@ -24390,7 +25300,7 @@ commit 53427d7b7eb225c7326b6a13169c7ecb886f6f98 Author: Matej Urbančič -Date: Tue Nov 22 20:32:07 2011 +0100 +Date: Tue Nov 22 20:32:07 2011 +0100 Updated Slovenian translation @@ -24399,7 +25309,7 @@ commit 4c77eae870476fa4dec4e3f82babc5570b1369fc Author: txhuy -Date: Mon Nov 21 21:17:42 2011 +0700 +Date: Mon Nov 21 21:17:42 2011 +0700 po-plug-ins: updated Vietnamese translation @@ -24409,7 +25319,7 @@ commit 8f4ea1b663e679220d5542e01c6f754064719e05 Author: Nguyễn Thái Ngọc Duy -Date: Mon Nov 21 12:10:16 2011 +0700 +Date: Mon Nov 21 12:10:16 2011 +0700 po-plug-ins/vi.po: import from Damned Lies @@ -24419,19 +25329,19 @@ commit 140d0052557ee3c4bb68df83375e61d6252e94ab Author: Fran Diéguez -Date: Mon Nov 21 14:59:13 2011 +0100 +Date: Mon Nov 21 14:59:13 2011 +0100 Updated Galician translations po-libgimp/gl.po | 223 ++----- - po-script-fu/gl.po | 29 +- - po/gl.po | 1683 + po-script-fu/gl.po | 29 +- + po/gl.po | 1683 +++++++++++++++++++++++++++------------------------- 3 files changed, 941 insertions(+), 994 deletions(-) commit 0ab89a42a6c5fb524904521440dcc3572ac83743 Author: Michael Natterer -Date: Sun Nov 20 17:26:52 2011 +0100 +Date: Sun Nov 20 17:26:52 2011 +0100 NEWS: typo @@ -24440,7 +25350,7 @@ commit 5c77b7829343d799a33005abf369596f02fa3fec Author: Michael Natterer -Date: Sun Nov 20 17:20:31 2011 +0100 +Date: Sun Nov 20 17:20:31 2011 +0100 NEWS: updates @@ -24449,7 +25359,7 @@ commit 383f9e274f2926a993e65c0d51bbe4d62ab2b5db Author: Mario Blättermann -Date: Sat Nov 19 21:32:28 2011 +0100 +Date: Sat Nov 19 21:32:28 2011 +0100 [l10n] Updated German translation @@ -24459,7 +25369,7 @@ commit 367354925763fba163ead17c0c7a8eb03514579b Author: Michael Natterer -Date: Sat Nov 19 18:16:39 2011 +0100 +Date: Sat Nov 19 18:16:39 2011 +0100 Depend on lots of newer library versions @@ -24478,7 +25388,7 @@ commit 82480557eaa381dc142aa90731017c1f72fdab30 Author: Massimo Valentini -Date: Fri Nov 18 18:36:29 2011 +0100 +Date: Fri Nov 18 18:36:29 2011 +0100 app: silence a harmless Gimp-Tools-CRITICAL @@ -24487,14 +25397,14 @@ show a Gimp-Tools-CRITICAL **: gimp_draw_tool_add_path: ... - assertion `desc != NULL' failed + assertion `desc != NULL' failed app/tools/gimpvectortool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c34348a2cd297d163d5078dec5693c49d0595037 Author: Massimo Valentini -Date: Fri Nov 18 18:36:00 2011 +0100 +Date: Fri Nov 18 18:36:00 2011 +0100 app: silence a harmless Gimp-Core-CRITICAL @@ -24502,14 +25412,14 @@ GIMP used to print: Gimp-Core-CRITICAL **: gimp_container_get_child_index: ... - assertion `GIMP_IS_CONTAINER (container)' failed + assertion `GIMP_IS_CONTAINER (container)' failed app/widgets/gimpcontainertreeview-dnd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 0f08e870f44ee51d14ef21b3a06d94e63ad570ce Author: Michael Natterer -Date: Fri Nov 18 16:40:49 2011 +0100 +Date: Fri Nov 18 16:40:49 2011 +0100 plug-ins: set the format strings on the PDF loader's resolution menu @@ -24520,7 +25430,7 @@ commit 262cc1c9463210d7a4502029401c5da417860549 Author: Michael Natterer -Date: Fri Nov 18 09:39:03 2011 +0100 +Date: Fri Nov 18 09:39:03 2011 +0100 Bug 664316 - Searchpath separator required @@ -24531,7 +25441,7 @@ commit df3e43b71fe0b9374f3c14aed1e25470d5a06d7b Author: Kevin Cozens -Date: Thu Nov 17 19:38:28 2011 -0500 +Date: Thu Nov 17 19:38:28 2011 -0500 Call progress_end() when the plug-in has finished. @@ -24540,7 +25450,7 @@ commit 296cd0552c176bc63e5c88b74dce8fb6d9442b41 Author: Benjamín Valero Espinosa -Date: Thu Nov 17 16:48:05 2011 +0100 +Date: Thu Nov 17 16:48:05 2011 +0100 Updated Spanish translation @@ -24550,7 +25460,7 @@ commit ca17c91d9e168619e7b129a8a25d1fac6454fd71 Author: Michael Natterer -Date: Thu Nov 17 00:17:46 2011 +0100 +Date: Thu Nov 17 00:17:46 2011 +0100 app: don't unparent the menu_button in gimp_dockbook_dispose() @@ -24562,26 +25472,26 @@ commit 8a20035ea06c9e45f412b3a1378dfa57804da52b Author: Michael Natterer -Date: Wed Nov 16 23:13:03 2011 +0100 +Date: Wed Nov 16 23:13:03 2011 +0100 Bug 661313 - "None" string needs differentiation (message context) Add translation context to all "None". - plug-ins/common/align-layers.c | 4 ++-- - plug-ins/common/cml-explorer.c | 2 +- - plug-ins/common/file-ps.c | 12 ++++++------ - plug-ins/common/file-psp.c | 6 +++--- - plug-ins/file-fits/fits.c | 2 +- + plug-ins/common/align-layers.c | 4 ++-- + plug-ins/common/cml-explorer.c | 2 +- + plug-ins/common/file-ps.c | 12 ++++++------ + plug-ins/common/file-psp.c | 6 +++--- + plug-ins/file-fits/fits.c | 2 +- plug-ins/fractal-explorer/fractal-explorer-dialogs.c | 18 +++++++++--------- - plug-ins/lighting/lighting-ui.c | 8 ++++---- - plug-ins/print/print-page-layout.c | 8 ++++---- + plug-ins/lighting/lighting-ui.c | 8 ++++---- + plug-ins/print/print-page-layout.c | 8 ++++---- 8 files changed, 30 insertions(+), 30 deletions(-) commit 3669acf0be8cbc7e9ae324d1f675fa480d38b37c Author: Michael Natterer -Date: Wed Nov 16 22:38:39 2011 +0100 +Date: Wed Nov 16 22:38:39 2011 +0100 Bug 658904 - Wrong behaviour in hidding layers with shift + left mouse click @@ -24596,7 +25506,7 @@ commit d38ded387d28173a342a7d475a39995271f7ca6e Author: Michael Natterer -Date: Wed Nov 16 21:32:29 2011 +0100 +Date: Wed Nov 16 21:32:29 2011 +0100 Bug 663121 - guides are below rotate/transform/shear/perspective preview @@ -24609,14 +25519,14 @@ app/display/gimpdisplayshell-items.c | 26 ++++++++++++++++ app/display/gimpdisplayshell-items.h | 29 +++++++++-------- app/display/gimpdisplayshell.h | 1 + - app/tools/gimpdrawtool.c | 60 + app/tools/gimpdrawtool.c | 60 +++++++++++++++++++++++++++++------- - app/tools/gimpdrawtool.h | 6 ++++ + app/tools/gimpdrawtool.h | 6 ++++ 5 files changed, 99 insertions(+), 23 deletions(-) commit ffc9948d6e2e99a0d65181774b628c2710923f8c Author: Michael Natterer -Date: Wed Nov 16 21:10:43 2011 +0100 +Date: Wed Nov 16 21:10:43 2011 +0100 app: add a canvas group for tool items @@ -24626,14 +25536,14 @@ app/display/gimpdisplayshell-items.c | 24 ++++++++++++++++++++++++ app/display/gimpdisplayshell-items.h | 17 +++++++++++------ app/display/gimpdisplayshell.h | 1 + - app/tools/gimpdrawtool.c | 4 ++-- - app/tools/gimpsourcetool.c | 20 ++++++++++---------- - app/tools/gimptool-progress.c | 4 ++-- + app/tools/gimpdrawtool.c | 4 ++-- + app/tools/gimpsourcetool.c | 20 ++++++++++---------- + app/tools/gimptool-progress.c | 4 ++-- 6 files changed, 50 insertions(+), 20 deletions(-) commit 57755ee75a3e55375607b831be193674a21d8783 Author: A_Kabanov -Date: Tue Nov 15 00:25:09 2011 +0400 +Date: Tue Nov 15 00:25:09 2011 +0400 Fixed Russian translation @@ -24643,7 +25553,7 @@ commit 0a0de7ec3b0398e256e338de1934ca5b9c39d110 Author: Claude Paroz -Date: Mon Nov 14 17:57:08 2011 +0100 +Date: Mon Nov 14 17:57:08 2011 +0100 Updated French translation @@ -24653,7 +25563,7 @@ commit e128fdedfeac8dc5f1e7e2b7ab6081781f20cbf0 Author: Daniel Mustieles -Date: Thu Nov 10 16:24:45 2011 +0100 +Date: Thu Nov 10 16:24:45 2011 +0100 Updated Spanish translation @@ -24662,7 +25572,7 @@ commit a11e8d1f7961a501514b21858cc4d2a62b4d5222 Author: Daniel Mustieles -Date: Thu Nov 10 16:24:22 2011 +0100 +Date: Thu Nov 10 16:24:22 2011 +0100 Updated Spanish translation @@ -24672,7 +25582,7 @@ commit d8224503bc7516495459e1f19d89cbb6f89800ad Author: Dimitris Spingos -Date: Thu Nov 10 15:42:25 2011 +0200 +Date: Thu Nov 10 15:42:25 2011 +0200 l10n: Updated Greek translation for gimp @@ -24682,9 +25592,9 @@ commit 4911777c0369249c304dbf1f534b0c8340edbc8d Author: Kevin Cozens -Date: Wed Nov 9 19:14:10 2011 -0500 +Date: Wed Nov 9 19:14:10 2011 -0500 - slide.scm: Don't use deprecated procedures (Fixes bug #647834) + slide.scm: Don't use deprecated procedures (Fixes bug #647834) Spotted by, and patch from, Alexis Wilhelm with white space changes and @@ -24695,7 +25605,7 @@ commit 0d65fd7ba8b3838fe411764e7ef6bf0aa27299ad Author: Michael Natterer -Date: Wed Nov 9 23:59:22 2011 +0100 +Date: Wed Nov 9 23:59:22 2011 +0100 autogen.sh: remove trailing ^M from the #!/bin/sh line... wtf @@ -24704,7 +25614,7 @@ commit 245c22f767841eefeaef42d22b43d4cdf039bbee Author: Michael Natterer -Date: Wed Nov 9 23:32:41 2011 +0100 +Date: Wed Nov 9 23:32:41 2011 +0100 app: port gimp-log to also work with latest GLib @@ -24715,7 +25625,7 @@ commit e5f6a6d9eab26fb659d8132ee21b468a8d10ed12 Author: Kevin Cozens -Date: Wed Nov 9 15:44:25 2011 -0500 +Date: Wed Nov 9 15:44:25 2011 -0500 distress-select.scm: Limit threshold to 1-254 to avoid loss of selection @@ -24726,82 +25636,82 @@ commit 27bef34bd550320706b90a4fa29130c7022b2111 Author: Kevin Cozens -Date: Wed Nov 9 02:42:34 2011 -0500 +Date: Wed Nov 9 02:42:34 2011 -0500 Don't change global context and protect scripts from global context settings. - plug-ins/script-fu/scripts/add-bevel.scm | 1 + - plug-ins/script-fu/scripts/alien-glow-arrow.scm | 3 +- - plug-ins/script-fu/scripts/alien-glow-logo.scm | 3 +- - plug-ins/script-fu/scripts/alien-neon-logo.scm | 1 + - plug-ins/script-fu/scripts/basic1-logo.scm | 1 + - plug-ins/script-fu/scripts/basic2-logo.scm | 1 + - .../script-fu/scripts/beveled-pattern-arrow.scm | 3 +- - .../script-fu/scripts/beveled-pattern-bullet.scm | 3 +- - .../script-fu/scripts/beveled-pattern-heading.scm | 1 + - plug-ins/script-fu/scripts/blended-logo.scm | 1 + - plug-ins/script-fu/scripts/bovinated-logo.scm | 1 + - plug-ins/script-fu/scripts/burn-in-anim.scm | 2 +- - plug-ins/script-fu/scripts/camo.scm | 1 + - plug-ins/script-fu/scripts/carve-it.scm | 1 + - plug-ins/script-fu/scripts/carved-logo.scm | 1 + - plug-ins/script-fu/scripts/chip-away.scm | 1 + - plug-ins/script-fu/scripts/chrome-it.scm | 1 + - plug-ins/script-fu/scripts/chrome-logo.scm | 1 + - plug-ins/script-fu/scripts/circuit.scm | 1 + - plug-ins/script-fu/scripts/coffee.scm | 3 +- - plug-ins/script-fu/scripts/contactsheet.scm | 1 + - plug-ins/script-fu/scripts/coolmetal-logo.scm | 1 + - plug-ins/script-fu/scripts/crystal-logo.scm | 1 + + plug-ins/script-fu/scripts/add-bevel.scm | 1 + + plug-ins/script-fu/scripts/alien-glow-arrow.scm | 3 +- + plug-ins/script-fu/scripts/alien-glow-logo.scm | 3 +- + plug-ins/script-fu/scripts/alien-neon-logo.scm | 1 + + plug-ins/script-fu/scripts/basic1-logo.scm | 1 + + plug-ins/script-fu/scripts/basic2-logo.scm | 1 + + .../script-fu/scripts/beveled-pattern-arrow.scm | 3 +- + .../script-fu/scripts/beveled-pattern-bullet.scm | 3 +- + .../script-fu/scripts/beveled-pattern-heading.scm | 1 + + plug-ins/script-fu/scripts/blended-logo.scm | 1 + + plug-ins/script-fu/scripts/bovinated-logo.scm | 1 + + plug-ins/script-fu/scripts/burn-in-anim.scm | 2 +- + plug-ins/script-fu/scripts/camo.scm | 1 + + plug-ins/script-fu/scripts/carve-it.scm | 1 + + plug-ins/script-fu/scripts/carved-logo.scm | 1 + + plug-ins/script-fu/scripts/chip-away.scm | 1 + + plug-ins/script-fu/scripts/chrome-it.scm | 1 + + plug-ins/script-fu/scripts/chrome-logo.scm | 1 + + plug-ins/script-fu/scripts/circuit.scm | 1 + + plug-ins/script-fu/scripts/coffee.scm | 3 +- + plug-ins/script-fu/scripts/contactsheet.scm | 1 + + plug-ins/script-fu/scripts/coolmetal-logo.scm | 1 + + plug-ins/script-fu/scripts/crystal-logo.scm | 1 + plug-ins/script-fu/scripts/distress-selection.scm | 100 ++++---- - plug-ins/script-fu/scripts/drop-shadow.scm | 1 + - plug-ins/script-fu/scripts/frosty-logo.scm | 1 + - plug-ins/script-fu/scripts/glossy.scm | 7 +- - plug-ins/script-fu/scripts/glowing-logo.scm | 1 + - plug-ins/script-fu/scripts/gradient-bevel-logo.scm | 1 + - plug-ins/script-fu/scripts/i26-gunya2.scm | 1 + - plug-ins/script-fu/scripts/land.scm | 42 +-- - plug-ins/script-fu/scripts/lava.scm | 1 + - plug-ins/script-fu/scripts/line-nova.scm | 3 +- - plug-ins/script-fu/scripts/mkbrush.scm | 2 +- - plug-ins/script-fu/scripts/neon-logo.scm | 1 + - plug-ins/script-fu/scripts/news-text.scm | 1 + + plug-ins/script-fu/scripts/drop-shadow.scm | 1 + + plug-ins/script-fu/scripts/frosty-logo.scm | 1 + + plug-ins/script-fu/scripts/glossy.scm | 7 +- + plug-ins/script-fu/scripts/glowing-logo.scm | 1 + + plug-ins/script-fu/scripts/gradient-bevel-logo.scm | 1 + + plug-ins/script-fu/scripts/i26-gunya2.scm | 1 + + plug-ins/script-fu/scripts/land.scm | 42 +-- + plug-ins/script-fu/scripts/lava.scm | 1 + + plug-ins/script-fu/scripts/line-nova.scm | 3 +- + plug-ins/script-fu/scripts/mkbrush.scm | 2 +- + plug-ins/script-fu/scripts/neon-logo.scm | 1 + + plug-ins/script-fu/scripts/news-text.scm | 1 + plug-ins/script-fu/scripts/perspective-shadow.scm | 283 +++++++++++---------- - plug-ins/script-fu/scripts/predator.scm | 3 + - plug-ins/script-fu/scripts/pupi-button.scm | 2 +- - plug-ins/script-fu/scripts/round-corners.scm | 3 +- - plug-ins/script-fu/scripts/select-to-brush.scm | 1 + - plug-ins/script-fu/scripts/select-to-image.scm | 1 + - plug-ins/script-fu/scripts/selection-round.scm | 3 +- - plug-ins/script-fu/scripts/sota-chrome-logo.scm | 2 +- - plug-ins/script-fu/scripts/speed-text.scm | 1 + - plug-ins/script-fu/scripts/starscape-logo.scm | 1 + - plug-ins/script-fu/scripts/t-o-p-logo.scm | 1 + - plug-ins/script-fu/scripts/test-sphere.scm | 2 +- - plug-ins/script-fu/scripts/text-circle.scm | 1 + - plug-ins/script-fu/scripts/textured-logo.scm | 2 +- - plug-ins/script-fu/scripts/tileblur.scm | 6 +- - plug-ins/script-fu/scripts/title-header.scm | 3 +- - plug-ins/script-fu/scripts/truchet.scm | 1 + - plug-ins/script-fu/scripts/xach-effect.scm | 1 + + plug-ins/script-fu/scripts/predator.scm | 3 + + plug-ins/script-fu/scripts/pupi-button.scm | 2 +- + plug-ins/script-fu/scripts/round-corners.scm | 3 +- + plug-ins/script-fu/scripts/select-to-brush.scm | 1 + + plug-ins/script-fu/scripts/select-to-image.scm | 1 + + plug-ins/script-fu/scripts/selection-round.scm | 3 +- + plug-ins/script-fu/scripts/sota-chrome-logo.scm | 2 +- + plug-ins/script-fu/scripts/speed-text.scm | 1 + + plug-ins/script-fu/scripts/starscape-logo.scm | 1 + + plug-ins/script-fu/scripts/t-o-p-logo.scm | 1 + + plug-ins/script-fu/scripts/test-sphere.scm | 2 +- + plug-ins/script-fu/scripts/text-circle.scm | 1 + + plug-ins/script-fu/scripts/textured-logo.scm | 2 +- + plug-ins/script-fu/scripts/tileblur.scm | 6 +- + plug-ins/script-fu/scripts/title-header.scm | 3 +- + plug-ins/script-fu/scripts/truchet.scm | 1 + + plug-ins/script-fu/scripts/xach-effect.scm | 1 + 54 files changed, 275 insertions(+), 238 deletions(-) commit 05d4e788300a3a796e4b1b85b5871bad91c1e6f7 Author: Alexis Wilhelm -Date: Sat Nov 5 20:13:02 2011 +0100 +Date: Sat Nov 5 20:13:02 2011 +0100 Removed use of deprecated functions in two Script-Fu scripts (bug #647834) - plug-ins/script-fu/scripts/crystal-logo.scm | 6 +++--- + plug-ins/script-fu/scripts/crystal-logo.scm | 6 +++--- plug-ins/script-fu/scripts/select-to-image.scm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) commit 176773dcfe07e15c38d8a7802353d4603d75c9c6 Author: Kevin Cozens -Date: Sun Nov 6 15:55:45 2011 -0500 +Date: Sun Nov 6 15:55:45 2011 -0500 Second stage in removing use of deprecated functions in Script-Fu scripts @@ -24809,65 +25719,65 @@ Applied most of the mega patch from br0cc0li (see bug #647834) with additional de-tabbing and changes in whitespace. - plug-ins/script-fu/scripts/3dTruchet.scm | 8 +- - plug-ins/script-fu/scripts/addborder.scm | 46 +++--- - plug-ins/script-fu/scripts/alien-glow-arrow.scm | 4 +- - plug-ins/script-fu/scripts/alien-glow-bar.scm | 5 +- - plug-ins/script-fu/scripts/alien-glow-bullet.scm | 8 +- - plug-ins/script-fu/scripts/alien-glow-button.scm | 9 +- - plug-ins/script-fu/scripts/alien-glow-logo.scm | 4 +- - plug-ins/script-fu/scripts/alien-neon-logo.scm | 4 +- - plug-ins/script-fu/scripts/basic1-logo.scm | 2 +- - plug-ins/script-fu/scripts/basic2-logo.scm | 2 +- - plug-ins/script-fu/scripts/beveled-button.scm | 10 +- + plug-ins/script-fu/scripts/3dTruchet.scm | 8 +- + plug-ins/script-fu/scripts/addborder.scm | 46 +++--- + plug-ins/script-fu/scripts/alien-glow-arrow.scm | 4 +- + plug-ins/script-fu/scripts/alien-glow-bar.scm | 5 +- + plug-ins/script-fu/scripts/alien-glow-bullet.scm | 8 +- + plug-ins/script-fu/scripts/alien-glow-button.scm | 9 +- + plug-ins/script-fu/scripts/alien-glow-logo.scm | 4 +- + plug-ins/script-fu/scripts/alien-neon-logo.scm | 4 +- + plug-ins/script-fu/scripts/basic1-logo.scm | 2 +- + plug-ins/script-fu/scripts/basic2-logo.scm | 2 +- + plug-ins/script-fu/scripts/beveled-button.scm | 10 +- .../script-fu/scripts/beveled-pattern-arrow.scm | 12 +- - .../script-fu/scripts/beveled-pattern-bullet.scm | 8 +- - .../script-fu/scripts/beveled-pattern-button.scm | 5 +- - .../script-fu/scripts/beveled-pattern-hrule.scm | 5 +- - plug-ins/script-fu/scripts/blended-logo.scm | 11 +- - plug-ins/script-fu/scripts/bovinated-logo.scm | 2 +- - plug-ins/script-fu/scripts/burn-in-anim.scm | 11 +- - plug-ins/script-fu/scripts/chalk.scm | 3 +- - plug-ins/script-fu/scripts/chip-away.scm | 6 +- - plug-ins/script-fu/scripts/chrome-logo.scm | 6 +- - plug-ins/script-fu/scripts/coffee.scm | 7 +- - plug-ins/script-fu/scripts/coolmetal-logo.scm | 28 ++-- - plug-ins/script-fu/scripts/drop-shadow.scm | 7 +- - plug-ins/script-fu/scripts/erase-rows.scm | 8 +- - plug-ins/script-fu/scripts/frosty-logo.scm | 127 ++++++++-------- - plug-ins/script-fu/scripts/glossy.scm | 8 +- - plug-ins/script-fu/scripts/glowing-logo.scm | 6 +- - plug-ins/script-fu/scripts/gradient-bevel-logo.scm | 2 +- - plug-ins/script-fu/scripts/i26-gunya2.scm | 2 +- - plug-ins/script-fu/scripts/lava.scm | 4 +- - plug-ins/script-fu/scripts/line-nova.scm | 20 +-- - plug-ins/script-fu/scripts/mkbrush.scm | 35 +++-- - plug-ins/script-fu/scripts/neon-logo.scm | 160 + .../script-fu/scripts/beveled-pattern-bullet.scm | 8 +- + .../script-fu/scripts/beveled-pattern-button.scm | 5 +- + .../script-fu/scripts/beveled-pattern-hrule.scm | 5 +- + plug-ins/script-fu/scripts/blended-logo.scm | 11 +- + plug-ins/script-fu/scripts/bovinated-logo.scm | 2 +- + plug-ins/script-fu/scripts/burn-in-anim.scm | 11 +- + plug-ins/script-fu/scripts/chalk.scm | 3 +- + plug-ins/script-fu/scripts/chip-away.scm | 6 +- + plug-ins/script-fu/scripts/chrome-logo.scm | 6 +- + plug-ins/script-fu/scripts/coffee.scm | 7 +- + plug-ins/script-fu/scripts/coolmetal-logo.scm | 28 ++-- + plug-ins/script-fu/scripts/drop-shadow.scm | 7 +- + plug-ins/script-fu/scripts/erase-rows.scm | 8 +- + plug-ins/script-fu/scripts/frosty-logo.scm | 127 ++++++++-------- + plug-ins/script-fu/scripts/glossy.scm | 8 +- + plug-ins/script-fu/scripts/glowing-logo.scm | 6 +- + plug-ins/script-fu/scripts/gradient-bevel-logo.scm | 2 +- + plug-ins/script-fu/scripts/i26-gunya2.scm | 2 +- + plug-ins/script-fu/scripts/lava.scm | 4 +- + plug-ins/script-fu/scripts/line-nova.scm | 20 +-- + plug-ins/script-fu/scripts/mkbrush.scm | 35 +++-- + plug-ins/script-fu/scripts/neon-logo.scm | 160 ++++++++++----------- - plug-ins/script-fu/scripts/news-text.scm | 2 +- + plug-ins/script-fu/scripts/news-text.scm | 2 +- plug-ins/script-fu/scripts/perspective-shadow.scm | 20 +-- - plug-ins/script-fu/scripts/predator.scm | 6 +- - plug-ins/script-fu/scripts/pupi-button.scm | 11 +- - plug-ins/script-fu/scripts/round-corners.scm | 25 ++-- - plug-ins/script-fu/scripts/select-to-brush.scm | 4 +- + plug-ins/script-fu/scripts/predator.scm | 6 +- + plug-ins/script-fu/scripts/pupi-button.scm | 11 +- + plug-ins/script-fu/scripts/round-corners.scm | 25 ++-- + plug-ins/script-fu/scripts/select-to-brush.scm | 4 +- plug-ins/script-fu/scripts/selection-round.scm | 119 +++++++-------- - plug-ins/script-fu/scripts/sota-chrome-logo.scm | 9 +- - plug-ins/script-fu/scripts/speed-text.scm | 4 +- - plug-ins/script-fu/scripts/starscape-logo.scm | 6 +- - plug-ins/script-fu/scripts/swirly-pattern.scm | 11 +- - plug-ins/script-fu/scripts/t-o-p-logo.scm | 12 +- - plug-ins/script-fu/scripts/test-sphere.scm | 15 +- - plug-ins/script-fu/scripts/text-circle.scm | 30 ++-- - plug-ins/script-fu/scripts/textured-logo.scm | 10 +- - plug-ins/script-fu/scripts/title-header.scm | 11 +- - plug-ins/script-fu/scripts/truchet.scm | 22 ++- - plug-ins/script-fu/scripts/weave.scm | 39 +++-- - plug-ins/script-fu/scripts/xach-effect.scm | 2 +- + plug-ins/script-fu/scripts/sota-chrome-logo.scm | 9 +- + plug-ins/script-fu/scripts/speed-text.scm | 4 +- + plug-ins/script-fu/scripts/starscape-logo.scm | 6 +- + plug-ins/script-fu/scripts/swirly-pattern.scm | 11 +- + plug-ins/script-fu/scripts/t-o-p-logo.scm | 12 +- + plug-ins/script-fu/scripts/test-sphere.scm | 15 +- + plug-ins/script-fu/scripts/text-circle.scm | 30 ++-- + plug-ins/script-fu/scripts/textured-logo.scm | 10 +- + plug-ins/script-fu/scripts/title-header.scm | 11 +- + plug-ins/script-fu/scripts/truchet.scm | 22 ++- + plug-ins/script-fu/scripts/weave.scm | 39 +++-- + plug-ins/script-fu/scripts/xach-effect.scm | 2 +- 53 files changed, 498 insertions(+), 445 deletions(-) commit 0bd1c2f09f54359d192e190467b06bb6deea8e66 Author: Kevin Cozens -Date: Thu Nov 3 22:29:49 2011 -0400 +Date: Thu Nov 3 22:29:49 2011 -0400 Fix previous script-fu deprecation commit due to overzealous update script. @@ -24877,7 +25787,7 @@ commit a85d21b0757dee9c3175aaa3069212179213281b Author: Kevin Cozens -Date: Thu Nov 3 20:57:52 2011 -0400 +Date: Thu Nov 3 20:57:52 2011 -0400 Fixed typo in name text of PROP_SAMPLE_CRITERION enum. @@ -24886,7 +25796,7 @@ commit 02aa7cb3709d3d5c7f357adceb9792abf7a182ae Author: Francisco Vila -Date: Mon Nov 7 15:45:54 2011 +0100 +Date: Mon Nov 7 15:45:54 2011 +0100 Updated Spanish translation @@ -24896,7 +25806,7 @@ commit e2d220953e29e124ed68799470553814e0ec7cc8 Author: Francisco Vila -Date: Mon Nov 7 15:45:28 2011 +0100 +Date: Mon Nov 7 15:45:28 2011 +0100 Updated Spanish translation @@ -24906,7 +25816,7 @@ commit 64db540a96b66a299cb97925c832a8bacd3fc32d Author: Nguyễn Vũ Hưng -Date: Mon Nov 7 12:50:34 2011 +0700 +Date: Mon Nov 7 12:50:34 2011 +0700 Updated Vietnamese translation @@ -24916,7 +25826,7 @@ commit 44752a0f099b2a473a3c15266eeb6b0d73f59bf3 Author: Michael Natterer -Date: Sun Nov 6 17:33:20 2011 +0100 +Date: Sun Nov 6 17:33:20 2011 +0100 pdbgen: make it work with a read-only srcdir @@ -24925,43 +25835,43 @@ actually changed, which should never happen on distcheck. tools/pdbgen/Makefile.am | 8 ++++++-- - tools/pdbgen/app.pl | 15 ++++++++------- + tools/pdbgen/app.pl | 15 ++++++++------- tools/pdbgen/enumcode.pl | 13 +++++++------ tools/pdbgen/enumgen.pl | 9 +++++---- - tools/pdbgen/lib.pl | 15 ++++++++------- + tools/pdbgen/lib.pl | 15 ++++++++------- tools/pdbgen/pdbgen.pl | 6 ++++-- - tools/pdbgen/util.pl | 8 +++++++- + tools/pdbgen/util.pl | 8 +++++++- 7 files changed, 45 insertions(+), 29 deletions(-) commit 3821eb1a56309a8f83008974412721f602db8949 Author: Michael Natterer -Date: Sat Nov 5 21:13:16 2011 +0100 +Date: Sat Nov 5 21:13:16 2011 +0100 app: update test sessionrc files for the moved session config properties - app/tests/gimpdir/sessionrc-2-8-multi-window | 2 ++ - app/tests/gimpdir/sessionrc-2-8-single-window | 2 ++ - app/tests/gimpdir/sessionrc-expected | 2 ++ - app/tests/gimpdir/sessionrc-expected-2-6 | 2 ++ + app/tests/gimpdir/sessionrc-2-8-multi-window | 2 ++ + app/tests/gimpdir/sessionrc-2-8-single-window | 2 ++ + app/tests/gimpdir/sessionrc-expected | 2 ++ + app/tests/gimpdir/sessionrc-expected-2-6 | 2 ++ app/tests/gimpdir/sessionrc-expected-multi-window | 2 ++ app/tests/gimpdir/sessionrc-expected-single-window | 2 ++ 6 files changed, 12 insertions(+) commit 60defd6c9ba3c16a76c39443acd043acb11cec95 Author: Michael Natterer -Date: Sat Nov 5 20:52:17 2011 +0100 +Date: Sat Nov 5 20:52:17 2011 +0100 Regenerate gimprc.5.in and default gimprc after session property moving docs/gimprc.5.in | 11 ----------- - etc/gimprc | 9 --------- + etc/gimprc | 9 --------- 2 files changed, 20 deletions(-) commit bcb45524b7defd05265d1039198f32281e0f3811 Author: Michael Natterer -Date: Sat Nov 5 17:52:45 2011 +0100 +Date: Sat Nov 5 17:52:45 2011 +0100 Bug 657505 - Strange behaviour with SWM @@ -24976,12 +25886,12 @@ +++++++++++++++++++++++++++++++--------------- app/config/gimpguiconfig.h | 7 +++-- app/dialogs/tips-dialog.c | 8 +++--- - app/gui/session.c | 59 ++++++++++++++++++++++++++++++++------ + app/gui/session.c | 59 ++++++++++++++++++++++++++++++++------ 4 files changed, 107 insertions(+), 38 deletions(-) commit 847deffc86a0831f21fb161ecc779e5f1b950706 Author: Michael Natterer -Date: Sat Nov 5 17:02:51 2011 +0100 +Date: Sat Nov 5 17:02:51 2011 +0100 libgimpbase: add gimp_scanner_parse_boolean() @@ -24995,7 +25905,7 @@ commit 5b4db22ae1b3d3c9aa7a91cb64e29e4f1b15ed18 Author: Alexia Death -Date: Sat Nov 5 13:44:39 2011 +0200 +Date: Sat Nov 5 13:44:39 2011 +0200 data: New dev splash @@ -25004,7 +25914,7 @@ commit a547cc0940a983914fe439f7c261901c3fd10e59 Author: Michael Natterer -Date: Fri Nov 4 01:32:50 2011 +0100 +Date: Fri Nov 4 01:32:50 2011 +0100 app: don't leak GimpViewRendererImagefile's GtkIconInfo @@ -25013,7 +25923,7 @@ commit f39399c9fc3140824bbbdfe8dc58488ffe18be1b Author: Michael Natterer -Date: Fri Nov 4 01:32:17 2011 +0100 +Date: Fri Nov 4 01:32:17 2011 +0100 app: don't leak GimpInkOption's GtkSizeGroup @@ -25022,7 +25932,7 @@ commit 15cf0e9659a025ec4b504ea764ced38bf6eab5ce Author: Michael Natterer -Date: Fri Nov 4 01:31:45 2011 +0100 +Date: Fri Nov 4 01:31:45 2011 +0100 app: don't leak all GParamSpecs of GimpProcedures @@ -25031,7 +25941,7 @@ commit 76638a6c675869b3015092f41efe4680ae3ba18b Author: Michael Natterer -Date: Fri Nov 4 01:31:13 2011 +0100 +Date: Fri Nov 4 01:31:13 2011 +0100 app: don't leak the GRand used in GimpOperationPointLayerMode @@ -25040,7 +25950,7 @@ commit fb87cd1c5d39d863a12745684728ab12edf1f0db Author: Michael Natterer -Date: Fri Nov 4 01:30:40 2011 +0100 +Date: Fri Nov 4 01:30:40 2011 +0100 app: don't leak the list returned by gimp_get_image_windows() @@ -25049,7 +25959,7 @@ commit e46aee647dcf2062f524e74ebc7b4ebc0410191f Author: Michael Natterer -Date: Thu Nov 3 22:47:12 2011 +0100 +Date: Thu Nov 3 22:47:12 2011 +0100 libgimp: missed to commit a generated comment change @@ -25058,7 +25968,7 @@ commit eced91274652581b1a40aae431650543886090cb Author: Michael Natterer -Date: Wed Nov 2 23:50:53 2011 +0100 +Date: Wed Nov 2 23:50:53 2011 +0100 Bug 607928 - Switching from levels to curves does not result in same changes @@ -25072,7 +25982,7 @@ commit 834225803a8bf7517345ee65335afd45d7ef2328 Author: Massimo Valentini -Date: Wed Nov 2 17:49:49 2011 +0100 +Date: Wed Nov 2 17:49:49 2011 +0100 Bug 662219 Rotate does not rotate; the image is ... @@ -25086,7 +25996,7 @@ commit 5e015aebbaaa663d03cc6f47a58cbeaf56b08418 Author: Kevin Cozens -Date: Sun Oct 30 02:37:26 2011 -0400 +Date: Sun Oct 30 02:37:26 2011 -0400 First stage in removing use of deprecated functions in Script-Fu scripts @@ -25096,25 +26006,25 @@ the new procedure where the new procedure takes the same argument list. - plug-ins/script-fu/scripts/blended-logo.scm | 2 +- - plug-ins/script-fu/scripts/chrome-logo.scm | 6 +++--- - plug-ins/script-fu/scripts/copy-visible.scm | 2 +- - plug-ins/script-fu/scripts/drop-shadow.scm | 2 +- - plug-ins/script-fu/scripts/frosty-logo.scm | 2 +- + plug-ins/script-fu/scripts/blended-logo.scm | 2 +- + plug-ins/script-fu/scripts/chrome-logo.scm | 6 +++--- + plug-ins/script-fu/scripts/copy-visible.scm | 2 +- + plug-ins/script-fu/scripts/drop-shadow.scm | 2 +- + plug-ins/script-fu/scripts/frosty-logo.scm | 2 +- plug-ins/script-fu/scripts/perspective-shadow.scm | 2 +- - plug-ins/script-fu/scripts/reverse-layers.scm | 2 +- - plug-ins/script-fu/scripts/round-corners.scm | 4 ++-- + plug-ins/script-fu/scripts/reverse-layers.scm | 2 +- + plug-ins/script-fu/scripts/round-corners.scm | 4 ++-- plug-ins/script-fu/scripts/script-fu-set-cmap.scm | 2 +- - plug-ins/script-fu/scripts/script-fu-util.scm | 2 +- + plug-ins/script-fu/scripts/script-fu-util.scm | 2 +- plug-ins/script-fu/scripts/selection-round.scm | 4 ++-- - plug-ins/script-fu/scripts/slide.scm | 4 ++-- - plug-ins/script-fu/scripts/textured-logo.scm | 2 +- - plug-ins/script-fu/scripts/title-header.scm | 6 +++--- + plug-ins/script-fu/scripts/slide.scm | 4 ++-- + plug-ins/script-fu/scripts/textured-logo.scm | 2 +- + plug-ins/script-fu/scripts/title-header.scm | 6 +++--- 14 files changed, 21 insertions(+), 21 deletions(-) commit c166e494ceaac79933d2c0b2a9d812a9b1465507 Author: Michael Natterer -Date: Wed Nov 2 00:31:23 2011 +0100 +Date: Wed Nov 2 00:31:23 2011 +0100 Bug 662948 - Wilber is squeezed @@ -25126,7 +26036,7 @@ commit d1346d5eb4da8f7a6a8296d5c69fd810719a5905 Author: Michael Natterer -Date: Tue Nov 1 17:49:00 2011 +0100 +Date: Tue Nov 1 17:49:00 2011 +0100 pdb: distribute enums.pl @@ -25138,17 +26048,17 @@ commit 634cf6d6203db608450f61447b669291fd472dd5 Author: Michael Natterer -Date: Mon Oct 31 22:22:19 2011 +0100 +Date: Mon Oct 31 22:22:19 2011 +0100 pdb: add gimp-dynamics-refresh and gimp-dynamics-get-list - app/pdb/Makefile.am | 1 + + app/pdb/Makefile.am | 1 + app/pdb/dynamics-cmds.c | 140 ++++++++++++++++++++++++++++++++++++++++++ app/pdb/internal-procs.c | 3 +- app/pdb/internal-procs.h | 1 + - libgimp/Makefile.am | 2 + - libgimp/gimp.def | 2 + + libgimp/Makefile.am | 2 + + libgimp/gimp.def | 2 + libgimp/gimp_pdb_headers.h | 1 + libgimp/gimpdynamics_pdb.c | 109 ++++++++++++++++++++++++++++++++ libgimp/gimpdynamics_pdb.h | 42 +++++++++++++ @@ -25159,20 +26069,20 @@ commit 6ee7b221533ba4d35a6b94af26693dfa8b1831a8 Author: Michael Natterer -Date: Mon Oct 31 22:08:53 2011 +0100 +Date: Mon Oct 31 22:08:53 2011 +0100 pdb: use the newly added GimpPDBContext paint options for painting so all paint context settings take part in the push/pop logic. - app/pdb/paint-tools-cmds.c | 188 ++++++++++++++++++++-------------- + app/pdb/paint-tools-cmds.c | 188 ++++++++++++++++++++-------------- tools/pdbgen/pdb/paint_tools.pdb | 215 ++++++++++++++++++++++----------------- 2 files changed, 234 insertions(+), 169 deletions(-) commit 01344f811da0d6545d87a74f70648b8e7ced0609 Author: Michael Natterer -Date: Mon Oct 31 21:07:08 2011 +0100 +Date: Mon Oct 31 21:07:08 2011 +0100 pdb: add dynamics accessors to the context procedures @@ -25181,7 +26091,7 @@ app/pdb/gimppdb-utils.c | 35 +++++++++++++++ app/pdb/gimppdb-utils.h | 4 ++ app/pdb/internal-procs.c | 2 +- - libgimp/gimp.def | 2 + + libgimp/gimp.def | 2 + libgimp/gimpcontext_pdb.c | 68 ++++++++++++++++++++++++++++ libgimp/gimpcontext_pdb.h | 2 + tools/pdbgen/pdb/context.pdb | 64 +++++++++++++++++++++++++++ @@ -25189,7 +26099,7 @@ commit 5144e7e47c7f589080df092e22459fb88911f045 Author: Michael Natterer -Date: Sat Oct 29 23:51:50 2011 +0200 +Date: Sat Oct 29 23:51:50 2011 +0200 configure: the right way to check for maintainer-mode is $USE_MAINTAINER_MODE @@ -25199,7 +26109,7 @@ commit 553e05ec6e292eed8e5f6491304676574a334a64 Author: Michael Natterer -Date: Sat Oct 29 23:39:46 2011 +0200 +Date: Sat Oct 29 23:39:46 2011 +0200 app: add a function to get the paint options from GimpPDBContext @@ -25209,7 +26119,7 @@ commit b1108c0bd7ab90691265bf862a6bcd2ea0ff363b Author: Michael Natterer -Date: Sat Oct 29 22:43:00 2011 +0200 +Date: Sat Oct 29 22:43:00 2011 +0200 app: add a complete set of paint options to GimpPDBContext @@ -25223,7 +26133,7 @@ commit 30dfb22a5b2700eac2dc057b40e82621811f7c6b Author: Mattias Põldaru -Date: Sat Oct 29 20:56:56 2011 +0300 +Date: Sat Oct 29 20:56:56 2011 +0300 [l10n] Updated Estonian translation @@ -25232,7 +26142,7 @@ commit 30f638516ed11331002781266b04d0d221e837a2 Author: Michael Natterer -Date: Sat Oct 29 19:37:58 2011 +0200 +Date: Sat Oct 29 19:37:58 2011 +0200 app: add gimp_get_paint_info_iter(), I need it later for PDB context fixing @@ -25243,18 +26153,18 @@ commit ad83b656a7b22857b1275f0d503eafa38024c457 Author: Michael Natterer -Date: Fri Oct 28 09:33:30 2011 +0200 +Date: Fri Oct 28 09:33:30 2011 +0200 app: port the client side of the unique impl to GDBus app/Makefile.am | 1 - - app/unique.c | 98 + app/unique.c | 98 +++++++++++++++++++++++++++++---------------------------- 2 files changed, 50 insertions(+), 49 deletions(-) commit 9adf67e2a58b7c38988897d633fd671bcae99813 Author: Michael Natterer -Date: Thu Oct 27 09:32:48 2011 +0200 +Date: Thu Oct 27 09:32:48 2011 +0200 plug-ins: remove unused "labels" variable, leftover from GtkTree code @@ -25263,7 +26173,7 @@ commit 018cdc7a996cab3099b5e45e1cfd94cabbf97123 Author: Mukund Sivaraman -Date: Thu Oct 27 14:45:59 2011 +0530 +Date: Thu Oct 27 14:45:59 2011 +0530 metadata: Change sign of data type @@ -25272,7 +26182,7 @@ commit 91d786d7ba087aea608413d52211e34c32315176 Author: Nguyễn Thái Ngọc Duy -Date: Wed Oct 26 10:54:45 2011 +1100 +Date: Wed Oct 26 10:54:45 2011 +1100 po/vi: fix accelerators @@ -25282,7 +26192,7 @@ commit 450edc6fb08c524fafdfe038a2043cb42fc5d15b Author: Nguyễn Vũ Hưng -Date: Wed Oct 26 10:07:52 2011 +1100 +Date: Wed Oct 26 10:07:52 2011 +1100 Updated Vietnamese translation @@ -25292,7 +26202,7 @@ commit 7465ab46d5856b88ce4031749519dd08de7ff27b Author: Nguyễn Vũ Hưng -Date: Wed Oct 26 09:50:53 2011 +1100 +Date: Wed Oct 26 09:50:53 2011 +1100 Updated Vietnamese translation @@ -25302,7 +26212,7 @@ commit f672db7fffcb4aabe123719e7c6ade64b4972885 Author: Nguyễn Thái Ngọc Duy -Date: Wed Oct 26 08:36:52 2011 +1100 +Date: Wed Oct 26 08:36:52 2011 +1100 po/vi: import from Damned Lies @@ -25312,7 +26222,7 @@ commit b99e0f90c85f3a9a9912aea814894a35487da2a8 Author: Michael Natterer -Date: Wed Oct 19 21:33:49 2011 +0200 +Date: Wed Oct 19 21:33:49 2011 +0200 configure: fix check for _NL_MEASUREMENT_MEASUREMENT @@ -25321,7 +26231,7 @@ commit b2272853fda84e5d48f112dd236d1b7ef980f6b8 Author: Michael Natterer -Date: Mon Oct 17 21:52:58 2011 +0200 +Date: Mon Oct 17 21:52:58 2011 +0200 NEWS: updates @@ -25330,7 +26240,7 @@ commit f92df81a47da588986c69e36bdf82aa6335559be Author: Michael Natterer -Date: Mon Oct 17 21:47:01 2011 +0200 +Date: Mon Oct 17 21:47:01 2011 +0200 Bug 630028 - Improvement of the healing tool @@ -25345,7 +26255,7 @@ commit 6d62beef13fbb6aaa3dbfa9e27ba5d7eb00bde40 Author: Michael Natterer -Date: Mon Oct 17 18:54:34 2011 +0200 +Date: Mon Oct 17 18:54:34 2011 +0200 Revert "build: Strip out G/GDK/GTK_DISABLE_DEPRECATED" @@ -25359,7 +26269,7 @@ commit f9e61620868ed4c3642a80081ec97ae5e1ac45d5 Author: Javier Jardón -Date: Mon Oct 17 17:21:51 2011 +0100 +Date: Mon Oct 17 17:21:51 2011 +0100 build: Strip out G/GDK/GTK_DISABLE_DEPRECATED @@ -25370,7 +26280,7 @@ commit 2f0c55b12b281aaa5524ab66d331faccc94a369c Author: Javier Jardón -Date: Mon Oct 17 02:22:21 2011 +0100 +Date: Mon Oct 17 02:22:21 2011 +0100 configure.ac: aclocal flags are already honored in Makefile.am @@ -25379,7 +26289,7 @@ commit 3a057396834801e183a6a78f431971a40a8f617e Author: Javier Jardón -Date: Mon Oct 17 01:56:10 2011 +0100 +Date: Mon Oct 17 01:56:10 2011 +0100 configure.ac: Replace AM_CONFIG_HEADER deprecated macro @@ -25390,7 +26300,7 @@ commit de9c5fda0061b2b06a2b78480e1942889893945c Author: Javier Jardón -Date: Mon Oct 17 01:55:06 2011 +0100 +Date: Mon Oct 17 01:55:06 2011 +0100 configure.ac: Use new libtool syntax @@ -25399,7 +26309,7 @@ commit c581b6147ee8506d73e6aa067cd91651f6e11df4 Author: Javier Jardón -Date: Mon Oct 17 01:52:54 2011 +0100 +Date: Mon Oct 17 01:52:54 2011 +0100 configure.ac: Do not use AC_ISC_POSIX macro @@ -25412,7 +26322,7 @@ commit 14b3f594f930d2f2de285fa86910bbe9dc02f50b Author: Javier Jardón -Date: Mon Oct 17 01:51:58 2011 +0100 +Date: Mon Oct 17 01:51:58 2011 +0100 configure.ac: Replace AC_HELP_STRING deprecated macro @@ -25421,7 +26331,7 @@ commit 5132df3a6d438aa4d050f74880b0c5c1d31a4503 Author: Javier Jardón -Date: Mon Oct 17 01:48:38 2011 +0100 +Date: Mon Oct 17 01:48:38 2011 +0100 configure.ac: Replace AC_TRY_RUN deprecated macro @@ -25430,7 +26340,7 @@ commit 41dc8f1d5908bdd311ef239a0a2d5be825590377 Author: Javier Jardón -Date: Mon Oct 17 01:40:35 2011 +0100 +Date: Mon Oct 17 01:40:35 2011 +0100 configure.ac: Replace deprecated AC_TRY_LINK macro @@ -25439,7 +26349,7 @@ commit 4bf2a84e14a5c3140e2f8af9410f9c42e37b287d Author: Javier Jardón -Date: Mon Oct 17 01:29:35 2011 +0100 +Date: Mon Oct 17 01:29:35 2011 +0100 configure.ac: Replace deprecated AC_TRY_CPP macro @@ -25448,7 +26358,7 @@ commit 75476493f480e8fd40df92f8ab3a942d7fd1a9ea Author: Javier Jardón -Date: Mon Oct 17 01:22:21 2011 +0100 +Date: Mon Oct 17 01:22:21 2011 +0100 configure.ac: Replace deprecated AC_TRY_COMPILE macro @@ -25457,7 +26367,7 @@ commit 464966dbaace9e20fb3ef27af3bf36d798316aa4 Author: Javier Jardón -Date: Mon Oct 17 01:02:59 2011 +0100 +Date: Mon Oct 17 01:02:59 2011 +0100 configure.ac: Remove AC_TYPE_SIGNAL @@ -25468,7 +26378,7 @@ commit cc5a1cff7239d63fd60e2aa09ffb0e12e1ebdef8 Author: Javier Jardón -Date: Mon Oct 17 01:01:16 2011 +0100 +Date: Mon Oct 17 01:01:16 2011 +0100 Makefile.ac: honer aclocal flags @@ -25477,7 +26387,7 @@ commit 71c7301f18ab936fe65ec4a462787b6ffa826f4e Author: Michael Natterer -Date: Mon Oct 17 02:23:02 2011 +0200 +Date: Mon Oct 17 02:23:02 2011 +0200 configure: remove cruft found by Javier Jardon @@ -25486,20 +26396,20 @@ commit 23f517e54a0805b185e296c6c83d6c74878f2e93 Author: Hleb Valoshka <375gnu@gmail.com> -Date: Sun Oct 16 13:50:12 2011 +0300 +Date: Sun Oct 16 13:50:12 2011 +0300 Updated Belarusian translation. po-plug-ins/be.po | 1962 +++++++++++++++++++++------------------------------- po-script-fu/be.po | 207 +----- - po-tips/be.po | 60 +- - po/be.po | 192 +++-- + po-tips/be.po | 60 +- + po/be.po | 192 +++-- 4 files changed, 911 insertions(+), 1510 deletions(-) commit 8459f648abe1381bd625d05b18715189010fad66 Author: Hleb Valoshka <375gnu@gmail.com> -Date: Sat Oct 15 21:15:51 2011 +0300 +Date: Sat Oct 15 21:15:51 2011 +0300 Updated Belarusian translation. @@ -25509,26 +26419,26 @@ commit d32e1ed35111d2efea84420817fa8d602a7d8ad3 Author: Martin Nordholts -Date: Sat Oct 15 13:19:04 2011 +0200 +Date: Sat Oct 15 13:19:04 2011 +0200 app/tests: Simplify Use g_test_add_func() and g_test_add_data_func(). - app/tests/test-gimptilebackendtilemanager.c | 16 +----- - app/tests/test-save-and-export.c | 39 +++---------- - app/tests/test-session-2-6-compatibility.c | 16 +----- + app/tests/test-gimptilebackendtilemanager.c | 16 +----- + app/tests/test-save-and-export.c | 39 +++---------- + app/tests/test-session-2-6-compatibility.c | 16 +----- .../test-session-2-8-compatibility-multi-window.c | 17 +----- .../test-session-2-8-compatibility-single-window.c | 17 +----- - app/tests/test-single-window-mode.c | 18 +----- - app/tests/test-ui.c | 64 + app/tests/test-single-window-mode.c | 18 +----- + app/tests/test-ui.c | 64 ++++++---------------- - app/tests/test-xcf.c | 29 ++-------- + app/tests/test-xcf.c | 29 ++-------- 8 files changed, 42 insertions(+), 174 deletions(-) commit 16aae588b90f65267e145a489c62b84f44b74691 Author: Michael Natterer -Date: Thu Oct 13 11:30:02 2011 +0200 +Date: Thu Oct 13 11:30:02 2011 +0200 app: no need to move that assignment @@ -25539,7 +26449,7 @@ commit a8dd4b39f2680d881666505982dd1f051ba20bbb Author: Mukund Sivaraman -Date: Thu Oct 13 10:43:09 2011 +0530 +Date: Thu Oct 13 10:43:09 2011 +0530 Revert "app (histogram): Fix bad loop condition" @@ -25550,7 +26460,7 @@ commit 23907a297f891e7ff05c59546d28580e2c6b7743 Author: Mukund Sivaraman -Date: Thu Oct 13 10:39:59 2011 +0530 +Date: Thu Oct 13 10:39:59 2011 +0530 app (histogram): Fix bad loop condition @@ -25559,7 +26469,7 @@ commit d047b1ca41bc22444c4323fabc5c472316df6247 Author: Mukund Sivaraman -Date: Thu Oct 13 10:32:12 2011 +0530 +Date: Thu Oct 13 10:32:12 2011 +0530 app (widgets): Init child_allocation, or garbage is added to action_allocation.y @@ -25569,7 +26479,7 @@ commit 5b7cd667f21bdad82de6a144dd22d203e4dd7b56 Author: Mukund Sivaraman -Date: Thu Oct 13 10:22:32 2011 +0530 +Date: Thu Oct 13 10:22:32 2011 +0530 libgimpcolor: Add an assert at start of gimp_render_sub_pixel() @@ -25581,7 +26491,7 @@ commit c4be5b1a4fd797d79de96be72d6d87c3cdb5a963 Author: Mukund Sivaraman -Date: Thu Oct 13 10:20:34 2011 +0530 +Date: Thu Oct 13 10:20:34 2011 +0530 engrave: Fix condition as average[] is initialized based on num_channels @@ -25591,7 +26501,7 @@ commit 35a62be10a9e6c7c9925d417398eb8e4279be0d0 Author: Mukund Sivaraman -Date: Thu Oct 13 10:15:29 2011 +0530 +Date: Thu Oct 13 10:15:29 2011 +0530 engrave: Rename variable color_n to num_channels @@ -25600,7 +26510,7 @@ commit ff6727ae6666a9cc1efeba0f080e9f6124aff520 Author: Mukund Sivaraman -Date: Wed Oct 12 20:46:06 2011 +0530 +Date: Wed Oct 12 20:46:06 2011 +0530 libgimpcolor: Remove function pointer checks as they're checked by caller @@ -25613,7 +26523,7 @@ commit 846392b66cb4a1ae9108d06244877e630d13680d Author: Michael Natterer -Date: Wed Oct 12 11:13:41 2011 +0200 +Date: Wed Oct 12 11:13:41 2011 +0200 app: move the "exclusive visible" logic to the core @@ -25622,17 +26532,17 @@ to have, but was always utterly useless. Prove me wrong and I will revive it. - app/core/Makefile.am | 2 + - app/core/gimpitem-exclusive.c | 160 + app/core/Makefile.am | 2 + + app/core/gimpitem-exclusive.c | 160 +++++++++++++++++++++++++++++++++++++++++ - app/core/gimpitem-exclusive.h | 29 ++++++++ + app/core/gimpitem-exclusive.h | 29 ++++++++ app/widgets/gimpitemtreeview.c | 117 ++++-------------------------- - po/POTFILES.in | 1 + + po/POTFILES.in | 1 + 5 files changed, 204 insertions(+), 105 deletions(-) commit abaf846578b71bf7db77b78ce740a3b39b4554ad Author: Mukund Sivaraman -Date: Wed Oct 12 19:30:58 2011 +0530 +Date: Wed Oct 12 19:30:58 2011 +0530 Revert "app (selectiontool): Drop dead code" @@ -25645,7 +26555,7 @@ commit d881e40bb06a3e16b9ac56de5b847edfb4a705db Author: Mukund Sivaraman -Date: Wed Oct 12 19:24:09 2011 +0530 +Date: Wed Oct 12 19:24:09 2011 +0530 file-psp: Move vars to local blocks (much needed) @@ -25655,7 +26565,7 @@ commit b6dd07821eb743f12fc8e4cd26d8bf030c4918c4 Author: Mukund Sivaraman -Date: Wed Oct 12 19:20:56 2011 +0530 +Date: Wed Oct 12 19:20:56 2011 +0530 file-psp: Remove redundant assignment @@ -25664,7 +26574,7 @@ commit 7a37bb109ba74eaa26568a05ab5ffe11edf427a0 Author: Mukund Sivaraman -Date: Wed Oct 12 19:11:54 2011 +0530 +Date: Wed Oct 12 19:11:54 2011 +0530 fractal-explorer: Delete dead variable and assignment @@ -25673,7 +26583,7 @@ commit 58ba62a12dd969ce8c32a1ef337a11a9d01e9c45 Author: Mukund Sivaraman -Date: Wed Oct 12 19:07:08 2011 +0530 +Date: Wed Oct 12 19:07:08 2011 +0530 file-cel: Drop dead assignment @@ -25682,7 +26592,7 @@ commit aaffc108211177751d7ecf68323e1064ae465775 Author: Mukund Sivaraman -Date: Wed Oct 12 19:04:47 2011 +0530 +Date: Wed Oct 12 19:04:47 2011 +0530 file-dicom: Drop dead variable and assignment @@ -25691,7 +26601,7 @@ commit d9f1a9eec6be4310876fc519bb68e729c82c10ef Author: Mukund Sivaraman -Date: Wed Oct 12 19:02:49 2011 +0530 +Date: Wed Oct 12 19:02:49 2011 +0530 app: Drop redundant assignment @@ -25700,7 +26610,7 @@ commit baa861cd6650dd7050dddcf60128fb014bc25e02 Author: Mukund Sivaraman -Date: Wed Oct 12 19:01:54 2011 +0530 +Date: Wed Oct 12 19:01:54 2011 +0530 print: Delete dead variable and assignment @@ -25709,7 +26619,7 @@ commit 6044e1f953aa5152ba84f340a8ab2a3030050539 Author: Mukund Sivaraman -Date: Wed Oct 12 18:59:44 2011 +0530 +Date: Wed Oct 12 18:59:44 2011 +0530 warp: Drop dead variable and assignment @@ -25718,7 +26628,7 @@ commit 46e1e6ec1d1c2eecc6bf6079cf656878d2e6598c Author: Mukund Sivaraman -Date: Wed Oct 12 18:29:39 2011 +0530 +Date: Wed Oct 12 18:29:39 2011 +0530 app (histogram): Drop redundant assignment @@ -25727,7 +26637,7 @@ commit e0a60f0e23ba71a812ba9478c4767df8765ee87a Author: Mukund Sivaraman -Date: Wed Oct 12 18:28:55 2011 +0530 +Date: Wed Oct 12 18:28:55 2011 +0530 Revert "app (histogram): Delete redundant assignments" @@ -25738,7 +26648,7 @@ commit f76c6e299750c10f307f6ac30bbbaca949e945ae Author: Mukund Sivaraman -Date: Wed Oct 12 18:25:17 2011 +0530 +Date: Wed Oct 12 18:25:17 2011 +0530 Revert "file-xpm: Plug a leak" @@ -25749,7 +26659,7 @@ commit 7b9f0037efa7628837735cac675b9e6ab9f3982d Author: Mukund Sivaraman -Date: Wed Oct 12 17:27:19 2011 +0530 +Date: Wed Oct 12 17:27:19 2011 +0530 gimpressionist: Drop dead variable and assignment @@ -25758,7 +26668,7 @@ commit ceb44876e7f9f77e8268aea17d454604029a14ca Author: Mukund Sivaraman -Date: Wed Oct 12 17:25:44 2011 +0530 +Date: Wed Oct 12 17:25:44 2011 +0530 mosaic: Drop unnecessary assignment @@ -25767,7 +26677,7 @@ commit 14796ef622db04c9298fc963f8d3b89d17d2184d Author: Mukund Sivaraman -Date: Wed Oct 12 17:23:44 2011 +0530 +Date: Wed Oct 12 17:23:44 2011 +0530 file-xmc: Drop redundant assignment @@ -25776,7 +26686,7 @@ commit 324ad1e42685d64a40028dce565b7774ee3134e6 Author: Mukund Sivaraman -Date: Wed Oct 12 17:21:23 2011 +0530 +Date: Wed Oct 12 17:21:23 2011 +0530 libgimpwidgets: Drop redundant assignment @@ -25785,7 +26695,7 @@ commit 740609f35242b6855b8aa84ca608734fcbfee4c4 Author: Mukund Sivaraman -Date: Wed Oct 12 17:17:22 2011 +0530 +Date: Wed Oct 12 17:17:22 2011 +0530 file-xjt: Drop erroneous initialization @@ -25794,7 +26704,7 @@ commit c0083d24e61def3640a62c121f595b1cd5974235 Author: Mukund Sivaraman -Date: Wed Oct 12 17:15:04 2011 +0530 +Date: Wed Oct 12 17:15:04 2011 +0530 app (selectiontool): Drop dead code @@ -25803,7 +26713,7 @@ commit 3793c1f1ecfc00693b6165029fb92b619bd4e88e Author: Mukund Sivaraman -Date: Wed Oct 12 17:11:39 2011 +0530 +Date: Wed Oct 12 17:11:39 2011 +0530 app (histogram): Delete redundant assignments @@ -25812,7 +26722,7 @@ commit 357f0263b826a24856e1b3935395830f6b07f4df Author: Mukund Sivaraman -Date: Wed Oct 12 17:08:21 2011 +0530 +Date: Wed Oct 12 17:08:21 2011 +0530 semi-flatten: Drop dead variable and assignment @@ -25821,7 +26731,7 @@ commit 892b526cc0c0e6cdca56ac68907d0c286f6bbdc0 Author: Mukund Sivaraman -Date: Wed Oct 12 17:05:21 2011 +0530 +Date: Wed Oct 12 17:05:21 2011 +0530 file-xjt: Drop erroneous initialization @@ -25830,7 +26740,7 @@ commit 971b77d8c9a9f35d78756d75808bc6aa51a9b0ae Author: Mukund Sivaraman -Date: Wed Oct 12 17:02:46 2011 +0530 +Date: Wed Oct 12 17:02:46 2011 +0530 imagemap: Move variable to local block and delete dead assignment @@ -25839,7 +26749,7 @@ commit 0cb9ffa0ecf748d328f8230037e6f75de4044a8d Author: Mukund Sivaraman -Date: Wed Oct 12 17:00:26 2011 +0530 +Date: Wed Oct 12 17:00:26 2011 +0530 libgimp: Drop dead assignment @@ -25848,7 +26758,7 @@ commit 1d5029170c0d90cdefbaa3432ef71694c3ff7e2c Author: Mukund Sivaraman -Date: Wed Oct 12 16:57:09 2011 +0530 +Date: Wed Oct 12 16:57:09 2011 +0530 file-gif-save: Drop dead variable and assignments @@ -25857,7 +26767,7 @@ commit 3ed78b90719e0e1bffa82671c803cb65ede1e659 Author: Mukund Sivaraman -Date: Wed Oct 12 16:55:58 2011 +0530 +Date: Wed Oct 12 16:55:58 2011 +0530 warp: Move variable to local block and drop dead assignment @@ -25866,7 +26776,7 @@ commit 196b495a3d52de5f56ac43e0f31c5ab5aa604c0b Author: Mukund Sivaraman -Date: Wed Oct 12 16:52:46 2011 +0530 +Date: Wed Oct 12 16:52:46 2011 +0530 warp: Delete dead variable and assignment @@ -25875,7 +26785,7 @@ commit cea29187f796cfd586e0e7bb8e9374bebbd91556 Author: Mukund Sivaraman -Date: Wed Oct 12 16:51:11 2011 +0530 +Date: Wed Oct 12 16:51:11 2011 +0530 file-xpm: Plug a leak @@ -25884,7 +26794,7 @@ commit cbf35fd5faf373c8cd914684409f3435a5904823 Author: Mukund Sivaraman -Date: Wed Oct 12 16:47:53 2011 +0530 +Date: Wed Oct 12 16:47:53 2011 +0530 gimpressionist: Move variable to local block and drop dead assignment @@ -25893,7 +26803,7 @@ commit ee63574db013718f026c3e79a0827b1cc33f6e16 Author: Mukund Sivaraman -Date: Tue Oct 11 10:31:58 2011 +0530 +Date: Tue Oct 11 10:31:58 2011 +0530 plugin-browser: Delete dead variable and assignment @@ -25902,7 +26812,7 @@ commit 6e4a5b199681aad2ed78e77d0af6979473c153fb Author: Mukund Sivaraman -Date: Tue Oct 11 10:29:55 2011 +0530 +Date: Tue Oct 11 10:29:55 2011 +0530 app (display): Drop redundant assignments @@ -25911,7 +26821,7 @@ commit 586c35819f55b0ed7f49d0ad85f355dda200ed37 Author: Mukund Sivaraman -Date: Tue Oct 11 10:25:07 2011 +0530 +Date: Tue Oct 11 10:25:07 2011 +0530 gimpressionist: Move variable to local block and delete redundant assignment @@ -25921,7 +26831,7 @@ commit f40453be3c90b6e9157c5b6f25c278948e5f90b4 Author: Mukund Sivaraman -Date: Tue Oct 11 10:22:24 2011 +0530 +Date: Tue Oct 11 10:22:24 2011 +0530 file-png: Remove redundant assignment @@ -25930,7 +26840,7 @@ commit e0298effdf758f5beb9c01dfe161d33448f4130c Author: Mukund Sivaraman -Date: Tue Oct 11 10:22:00 2011 +0530 +Date: Tue Oct 11 10:22:00 2011 +0530 file-png: Move comment to correct function @@ -25939,7 +26849,7 @@ commit 6fa60ddfe6fc926999ad2683cdcd5aaf878d34dc Author: Mukund Sivaraman -Date: Tue Oct 11 10:19:43 2011 +0530 +Date: Tue Oct 11 10:19:43 2011 +0530 warp: Delete dead variables and assignments @@ -25948,7 +26858,7 @@ commit f79d4707a274316eb7c2418c542331366c511b68 Author: Mukund Sivaraman -Date: Tue Oct 11 10:16:49 2011 +0530 +Date: Tue Oct 11 10:16:49 2011 +0530 unit-editor: Drop dead variable and assignment @@ -25957,7 +26867,7 @@ commit 5da37ccdc66b16542780f5ebe4230efadedd75e7 Author: Mukund Sivaraman -Date: Tue Oct 11 10:15:35 2011 +0530 +Date: Tue Oct 11 10:15:35 2011 +0530 web-browser: Drop dead variable and assignment @@ -25966,7 +26876,7 @@ commit 9f5665d0bdb6a09c4761671026023cf0a7f7df6a Author: Mukund Sivaraman -Date: Tue Oct 11 10:13:48 2011 +0530 +Date: Tue Oct 11 10:13:48 2011 +0530 noise-rgb: Drop dead variable and assignment @@ -25975,7 +26885,7 @@ commit b832b282585a4827dc6b107bf47ec777ceeebf00 Author: Mukund Sivaraman -Date: Tue Oct 11 10:12:48 2011 +0530 +Date: Tue Oct 11 10:12:48 2011 +0530 file-tiff-load: Move var declaration and remove dead assignment @@ -25984,7 +26894,7 @@ commit fb4747b832e820014d071d469bba279b42d2fec1 Author: Mukund Sivaraman -Date: Tue Oct 11 10:08:59 2011 +0530 +Date: Tue Oct 11 10:08:59 2011 +0530 app (actions): Rewrite code to conditionally declare vars @@ -25993,7 +26903,7 @@ commit f3d6e1ce8c547deed4fca412c96a8421e153b697 Author: Mukund Sivaraman -Date: Tue Oct 11 10:04:43 2011 +0530 +Date: Tue Oct 11 10:04:43 2011 +0530 file-xwd: Delete dead variable and assignment @@ -26002,7 +26912,7 @@ commit 238736fb8f95d7288aa8721823e19f10a54d79a0 Author: Mukund Sivaraman -Date: Tue Oct 11 10:01:36 2011 +0530 +Date: Tue Oct 11 10:01:36 2011 +0530 sphere-designer: Don't compute sqrt() unless absolutely necessary @@ -26011,7 +26921,7 @@ commit 1558c3ffa5c615c06db699ace609eeb72c8cb5ae Author: Mukund Sivaraman -Date: Tue Oct 11 09:59:34 2011 +0530 +Date: Tue Oct 11 09:59:34 2011 +0530 sphere-designer: Remove dead variable and assignment @@ -26020,7 +26930,7 @@ commit 6ea66d8142e8e9fbb63fde61415c8c09718a0d80 Author: Mukund Sivaraman -Date: Tue Oct 11 09:57:55 2011 +0530 +Date: Tue Oct 11 09:57:55 2011 +0530 qbist: Delete dead variable and assignment @@ -26029,7 +26939,7 @@ commit 3f62941c78b28379e52d67b3d60bd014da0e0b37 Author: Mukund Sivaraman -Date: Tue Oct 11 09:56:46 2011 +0530 +Date: Tue Oct 11 09:56:46 2011 +0530 color-rotate: Delete dead variables and assignments @@ -26038,7 +26948,7 @@ commit 1a11ad079a6fc2d421a55dfe10e2ff05c767fede Author: Mukund Sivaraman -Date: Tue Oct 11 09:15:52 2011 +0530 +Date: Tue Oct 11 09:15:52 2011 +0530 po: Rename file in POTFILES.in to match renamed .c file @@ -26047,7 +26957,7 @@ commit ab2dad46408918de1ecd88c1ff321e2d40081858 Author: Massimo Valentini -Date: Mon Oct 10 18:24:02 2011 +0200 +Date: Mon Oct 10 18:24:02 2011 +0200 Bug 639630: Windows builds can not use >4GB tile cache @@ -26061,7 +26971,7 @@ commit 90a4886ce4130d5946a24ca8fa300065c3e0c066 Author: Mukund Sivaraman -Date: Mon Oct 10 10:11:40 2011 +0530 +Date: Mon Oct 10 10:11:40 2011 +0530 curve-bend: Delete dead variable and assignment @@ -26070,7 +26980,7 @@ commit 2e988adc6692e0f329c0751a298ba52fdce047c4 Author: Mukund Sivaraman -Date: Mon Oct 10 10:10:08 2011 +0530 +Date: Mon Oct 10 10:10:08 2011 +0530 edge-neon: Comment out unused variable and assignment @@ -26079,7 +26989,7 @@ commit 1c9231a44a99f3aeb2f06c6f0b5fc992c9f31e0d Author: Mukund Sivaraman -Date: Mon Oct 10 10:08:12 2011 +0530 +Date: Mon Oct 10 10:08:12 2011 +0530 app (plug-in): Remove duplicate assignment @@ -26088,7 +26998,7 @@ commit 3725041760321e355de08974a4b2b2302e22aab4 Author: Mukund Sivaraman -Date: Mon Oct 10 10:06:36 2011 +0530 +Date: Mon Oct 10 10:06:36 2011 +0530 file-xjt: Remove redundant and erroneous pre-assignment @@ -26097,7 +27007,7 @@ commit 70a6f7e6bfdf36ed88422bc4b7f5046c39cf9e14 Author: Mukund Sivaraman -Date: Mon Oct 10 10:05:05 2011 +0530 +Date: Mon Oct 10 10:05:05 2011 +0530 file-gif-save: Delete dead variables and assignments @@ -26106,7 +27016,7 @@ commit 089040e6c13e250d06755f56f4d5b2e1107d4cf8 Author: Mukund Sivaraman -Date: Mon Oct 10 10:03:43 2011 +0530 +Date: Mon Oct 10 10:03:43 2011 +0530 antialias: Delete dead variable and assignment @@ -26115,7 +27025,7 @@ commit 852646a1c24b6ff1805d2e8f17e50faeb6137788 Author: Mukund Sivaraman -Date: Mon Oct 10 10:02:34 2011 +0530 +Date: Mon Oct 10 10:02:34 2011 +0530 unsharp-mask: Delete dead variable and assignment @@ -26124,7 +27034,7 @@ commit 4829464f58c844e9110d3d44588b6c7f92447d39 Author: Mukund Sivaraman -Date: Mon Oct 10 10:01:30 2011 +0530 +Date: Mon Oct 10 10:01:30 2011 +0530 iwarp: Delete dead variables and assignments @@ -26133,7 +27043,7 @@ commit a3b5f677fa7eabaf376d952dfb0b6d0e908292f9 Author: Mukund Sivaraman -Date: Mon Oct 10 09:59:23 2011 +0530 +Date: Mon Oct 10 09:59:23 2011 +0530 warp: Delete dead variable and assignment @@ -26142,7 +27052,7 @@ commit 9ab50f28e35677e1e7f4ce96993afb3401753ad3 Author: Mukund Sivaraman -Date: Mon Oct 10 09:57:58 2011 +0530 +Date: Mon Oct 10 09:57:58 2011 +0530 help-browser: Delete dead variable and assignment @@ -26151,7 +27061,7 @@ commit 6fe92ac75be83576b1cd97a5b218af5ff7e29dda Author: Mukund Sivaraman -Date: Mon Oct 10 09:56:32 2011 +0530 +Date: Mon Oct 10 09:56:32 2011 +0530 file-ps: Change list of ifs to switch @@ -26160,7 +27070,7 @@ commit 0a5954d8e0cd639db85d2736ccc3d5399b2780d7 Author: Mukund Sivaraman -Date: Mon Oct 10 09:54:08 2011 +0530 +Date: Mon Oct 10 09:54:08 2011 +0530 screenshot: Delete dead variable @@ -26169,7 +27079,7 @@ commit e18430e118db1faff26995053760e13ecfc35473 Author: Mukund Sivaraman -Date: Mon Oct 10 09:53:24 2011 +0530 +Date: Mon Oct 10 09:53:24 2011 +0530 app (actions): Remove dead variables and code @@ -26178,7 +27088,7 @@ commit 7b25fdc298c8e6bf94e48f4e9173cf1538960211 Author: Mukund Sivaraman -Date: Mon Oct 10 09:49:54 2011 +0530 +Date: Mon Oct 10 09:49:54 2011 +0530 sphere-designer: Remove dead variable and assignment @@ -26187,7 +27097,7 @@ commit 1d1fd1a35d16916a43635a7949e2cf1e74f292de Author: Mukund Sivaraman -Date: Mon Oct 10 09:46:57 2011 +0530 +Date: Mon Oct 10 09:46:57 2011 +0530 blinds: Remove dead variables and assignments @@ -26196,7 +27106,7 @@ commit e922a7bfda27f9ff0e995b186b8a158bd7405aa7 Author: Mukund Sivaraman -Date: Sun Oct 9 15:40:31 2011 +0530 +Date: Sun Oct 9 15:40:31 2011 +0530 app: Update Jarvis march implementation @@ -26215,7 +27125,7 @@ commit fffd1920e2cde29c7d43e6ff352b4de2d26f16d6 Author: Michael Natterer -Date: Mon Oct 10 00:17:20 2011 +0200 +Date: Mon Oct 10 00:17:20 2011 +0200 app: don't hardcode MOD2 in GimpContainerTreeView either @@ -26223,14 +27133,14 @@ all modifiers used for "useful" things on the current platform, like in the commit below. - app/widgets/gimpcontainertreeview.c | 5 +---- + app/widgets/gimpcontainertreeview.c | 5 +---- app/widgets/gimpwidgets-utils.c | 14 ++++++++++++++ - app/widgets/gimpwidgets-utils.h | 1 + + app/widgets/gimpwidgets-utils.h | 1 + 3 files changed, 16 insertions(+), 4 deletions(-) commit 6bee9df474766001f7904b7ae54553e7d1a2f5ef Author: Michael Natterer -Date: Sun Oct 9 23:59:40 2011 +0200 +Date: Sun Oct 9 23:59:40 2011 +0200 libgimpwidgets: don't hardcode GDK_MOD2_MASK for extended clicked @@ -26243,75 +27153,72 @@ commit 6c660e7ad505b153cc397cf8273b653841efde0a Author: Michael Natterer -Date: Sun Oct 9 22:12:32 2011 +0200 +Date: Sun Oct 9 22:12:32 2011 +0200 app: add property GimpDataFactoryView:action-group and remove the public gimp_data_factory_view_construct(). - app/widgets/gimpbrushfactoryview.c | 8 +- - app/widgets/gimpdatafactoryview.c | 259 + app/widgets/gimpbrushfactoryview.c | 8 +- + app/widgets/gimpdatafactoryview.c | 259 +++++++++++++++++--------------- - app/widgets/gimpdatafactoryview.h | 6 - - app/widgets/gimpdynamicsfactoryview.c | 32 ++-- - app/widgets/gimppatternfactoryview.c | 8 +- + app/widgets/gimpdatafactoryview.h | 6 - + app/widgets/gimpdynamicsfactoryview.c | 32 ++-- + app/widgets/gimppatternfactoryview.c | 8 +- app/widgets/gimptoolpresetfactoryview.c | 8 +- 6 files changed, 153 insertions(+), 168 deletions(-) commit b3db7e6c4e79a891b8d4ec3342cc2bb030b18712 Author: Michael Natterer -Date: Sun Oct 9 21:55:58 2011 +0200 +Date: Sun Oct 9 21:55:58 2011 +0200 app: rename all tool-preset dialog related things to "tool presets" not just "tool preset". It's also "brushes", "patterns" etc. and not just "brush" or "pattern". - app/actions/Makefile.am | 4 +- - app/actions/actions.c | 8 +- - app/actions/tool-preset-actions.c | 131 - -------------------------------- - app/actions/tool-preset-actions.h | 27 ------- - app/actions/tool-presets-actions.c | 131 - ++++++++++++++++++++++++++++++++ - app/actions/tool-presets-actions.h | 27 +++++++ - app/menus/menus.c | 8 +- - app/menus/plug-in-menus.c | 4 +- - app/widgets/gimptoolpresetfactoryview.c | 6 +- - menus/Makefile.am | 2 +- - menus/tool-preset-menu.xml | 16 ---- - menus/tool-presets-menu.xml | 16 ++++ - 12 files changed, 190 insertions(+), 190 deletions(-) + app/actions/Makefile.am | 4 +- + app/actions/actions.c | 8 +-- + ...ool-preset-actions.c => tool-presets-actions.c} | 72 + +++++++++++----------- + ...ool-preset-actions.h => tool-presets-actions.h} | 10 +-- + app/menus/menus.c | 8 +-- + app/menus/plug-in-menus.c | 4 +- + app/widgets/gimptoolpresetfactoryview.c | 6 +- + menus/Makefile.am | 2 +- + menus/tool-preset-menu.xml | 16 ----- + menus/tool-presets-menu.xml | 16 +++++ + 10 files changed, 73 insertions(+), 73 deletions(-) commit 04e8ae843523120ef9c39ac69e823dace1640fcd Author: Michael Natterer -Date: Sun Oct 9 21:45:02 2011 +0200 +Date: Sun Oct 9 21:45:02 2011 +0200 app: add menu-related properties to GimpContainerEditor and remove the public gimp_container_editor_construct(), so this class behaves like a proper object now. - app/widgets/gimpbrushfactoryview.c | 8 ++- - app/widgets/gimpbufferview.c | 11 +--- - app/widgets/gimpcontainereditor.c | 110 + app/widgets/gimpbrushfactoryview.c | 8 ++- + app/widgets/gimpbufferview.c | 11 +--- + app/widgets/gimpcontainereditor.c | 110 +++++++++++++++++++++++++------- - app/widgets/gimpcontainereditor.h | 8 --- - app/widgets/gimpcontainerpopup.c | 3 - - app/widgets/gimpdatafactoryview.c | 21 ++---- - app/widgets/gimpdatafactoryview.h | 5 +- - app/widgets/gimpdocumentview.c | 14 ++-- - app/widgets/gimpdynamicsfactoryview.c | 8 ++- - app/widgets/gimpfontview.c | 16 ++--- - app/widgets/gimpimageview.c | 14 ++-- - app/widgets/gimppatternfactoryview.c | 8 ++- - app/widgets/gimptemplateview.c | 14 ++-- + app/widgets/gimpcontainereditor.h | 8 --- + app/widgets/gimpcontainerpopup.c | 3 - + app/widgets/gimpdatafactoryview.c | 21 ++---- + app/widgets/gimpdatafactoryview.h | 5 +- + app/widgets/gimpdocumentview.c | 14 ++-- + app/widgets/gimpdynamicsfactoryview.c | 8 ++- + app/widgets/gimpfontview.c | 16 ++--- + app/widgets/gimpimageview.c | 14 ++-- + app/widgets/gimppatternfactoryview.c | 8 ++- + app/widgets/gimptemplateview.c | 14 ++-- app/widgets/gimptoolpresetfactoryview.c | 8 ++- 14 files changed, 146 insertions(+), 102 deletions(-) commit 4ba905052bb466a5035d6e8a80944494da67ce5f Author: Michael Natterer -Date: Sun Oct 9 21:19:14 2011 +0200 +Date: Sun Oct 9 21:19:14 2011 +0200 app: remove most code from the public gimp_container_editor_construct() @@ -26324,32 +27231,32 @@ commit 5f3b3dafb9e4532ca6cf7e9e5a53b75c56d3bdfc Author: Michael Natterer -Date: Sun Oct 9 21:04:49 2011 +0200 +Date: Sun Oct 9 21:04:49 2011 +0200 app: add view-size and view-border-width props to GimpContainerEditor and remove them from the various public construct() functions. - app/widgets/gimpbrushfactoryview.c | 9 ++--- - app/widgets/gimpbufferview.c | 17 +++++++--- - app/widgets/gimpcontainereditor.c | 58 + app/widgets/gimpbrushfactoryview.c | 9 ++--- + app/widgets/gimpbufferview.c | 17 +++++++--- + app/widgets/gimpcontainereditor.c | 58 +++++++++++++++++++++++++-------- - app/widgets/gimpcontainereditor.h | 2 -- - app/widgets/gimpcontainerpopup.c | 10 +++--- - app/widgets/gimpdatafactoryview.c | 23 ++++++------- - app/widgets/gimpdatafactoryview.h | 2 -- - app/widgets/gimpdocumentview.c | 15 ++++++--- - app/widgets/gimpdynamicsfactoryview.c | 9 ++--- - app/widgets/gimpfontview.c | 15 ++++++--- - app/widgets/gimpimageview.c | 15 ++++++--- - app/widgets/gimppatternfactoryview.c | 9 ++--- - app/widgets/gimptemplateview.c | 14 +++++--- + app/widgets/gimpcontainereditor.h | 2 -- + app/widgets/gimpcontainerpopup.c | 10 +++--- + app/widgets/gimpdatafactoryview.c | 23 ++++++------- + app/widgets/gimpdatafactoryview.h | 2 -- + app/widgets/gimpdocumentview.c | 15 ++++++--- + app/widgets/gimpdynamicsfactoryview.c | 9 ++--- + app/widgets/gimpfontview.c | 15 ++++++--- + app/widgets/gimpimageview.c | 15 ++++++--- + app/widgets/gimppatternfactoryview.c | 9 ++--- + app/widgets/gimptemplateview.c | 14 +++++--- app/widgets/gimptoolpresetfactoryview.c | 9 ++--- 14 files changed, 135 insertions(+), 72 deletions(-) commit bef55fbb6610379e714ef59f47189059e9459f32 Author: Michael Natterer -Date: Sun Oct 9 20:40:56 2011 +0200 +Date: Sun Oct 9 20:40:56 2011 +0200 app: add view-type, container and context props to GimpContainerEditor @@ -26357,43 +27264,43 @@ change construction in GimpDataFactoryView slightly because of GObject construct property constraints. - app/widgets/gimpbrushfactoryview.c | 5 +- - app/widgets/gimpbufferview.c | 8 +- - app/widgets/gimpcontainereditor.c | 180 + app/widgets/gimpbrushfactoryview.c | 5 +- + app/widgets/gimpbufferview.c | 8 +- + app/widgets/gimpcontainereditor.c | 180 ++++++++++++++++++++++++++++---- - app/widgets/gimpcontainereditor.h | 10 +- - app/widgets/gimpcontainerpopup.c | 10 +- - app/widgets/gimpdatafactoryview.c | 42 +++++--- - app/widgets/gimpdatafactoryview.h | 2 - - app/widgets/gimpdocumentview.c | 11 +- - app/widgets/gimpdynamicsfactoryview.c | 10 +- - app/widgets/gimpfontview.c | 11 +- - app/widgets/gimpimageview.c | 11 +- - app/widgets/gimppatternfactoryview.c | 8 +- - app/widgets/gimptemplateview.c | 11 +- + app/widgets/gimpcontainereditor.h | 10 +- + app/widgets/gimpcontainerpopup.c | 10 +- + app/widgets/gimpdatafactoryview.c | 42 +++++--- + app/widgets/gimpdatafactoryview.h | 2 - + app/widgets/gimpdocumentview.c | 11 +- + app/widgets/gimpdynamicsfactoryview.c | 10 +- + app/widgets/gimpfontview.c | 11 +- + app/widgets/gimpimageview.c | 11 +- + app/widgets/gimppatternfactoryview.c | 8 +- + app/widgets/gimptemplateview.c | 11 +- app/widgets/gimptoolpresetfactoryview.c | 8 +- 14 files changed, 253 insertions(+), 74 deletions(-) commit 3bf3b55536254c1f4a1414e82cdbff00eab2bb80 Author: Michael Natterer -Date: Sun Oct 9 19:08:31 2011 +0200 +Date: Sun Oct 9 19:08:31 2011 +0200 app: add property GimpDataFactoryView:data-factors and remove it from the evil public construct() function. - app/widgets/gimpbrushfactoryview.c | 5 +- - app/widgets/gimpdatafactoryview.c | 107 + app/widgets/gimpbrushfactoryview.c | 5 +- + app/widgets/gimpdatafactoryview.c | 107 ++++++++++++++++++++++++++++---- - app/widgets/gimpdatafactoryview.h | 1 - - app/widgets/gimpdynamicsfactoryview.c | 15 ++--- - app/widgets/gimppatternfactoryview.c | 5 +- + app/widgets/gimpdatafactoryview.h | 1 - + app/widgets/gimpdynamicsfactoryview.c | 15 ++--- + app/widgets/gimppatternfactoryview.c | 5 +- app/widgets/gimptoolpresetfactoryview.c | 5 +- 6 files changed, 112 insertions(+), 26 deletions(-) commit 1aa75af9bf2178598cc103c1d48b51087f88d78b Author: Michael Natterer -Date: Sun Oct 9 17:46:00 2011 +0200 +Date: Sun Oct 9 17:46:00 2011 +0200 app: fix indentation in dialogs-constructors.c @@ -26402,7 +27309,7 @@ commit 3f68280f4a64d2912008ebc4ee662023bd29b8c2 Author: ipraveen -Date: Sun Oct 9 15:00:30 2011 +0530 +Date: Sun Oct 9 15:00:30 2011 +0530 Added Telugu Translation @@ -26411,7 +27318,7 @@ commit bfab2d44d19fb888faddbe1a82745f8735a68d9d Author: ipraveen -Date: Sun Oct 9 15:00:07 2011 +0530 +Date: Sun Oct 9 15:00:07 2011 +0530 Updated Telugu Translation @@ -26420,19 +27327,19 @@ commit 11239c4b1731a3f4cb071d1c51a0af95a206bec8 Author: Michael Natterer -Date: Sun Oct 9 00:27:53 2011 +0200 +Date: Sun Oct 9 00:27:53 2011 +0200 app: don't use g_list_length() to check if a list is empty app/display/gimpsinglewindowstrategy.c | 2 +- - app/widgets/gimpdockwindow.c | 2 +- - app/widgets/gimppanedbox.c | 21 ++++++++++----------- - app/widgets/gimptoolbox.c | 2 +- + app/widgets/gimpdockwindow.c | 2 +- + app/widgets/gimppanedbox.c | 21 ++++++++++----------- + app/widgets/gimptoolbox.c | 2 +- 4 files changed, 13 insertions(+), 14 deletions(-) commit d310dacbb12a6159d87ea2adba20d795aeb54868 Author: Michael Natterer -Date: Sun Oct 9 00:18:56 2011 +0200 +Date: Sun Oct 9 00:18:56 2011 +0200 app: remove "foo && " from "foo && GTK_IS_FOO (foo)" @@ -26441,7 +27348,7 @@ commit 94d2ee7bcb5672928e16333c44421b0f49982196 Author: Michael Natterer -Date: Sat Oct 8 20:28:38 2011 +0200 +Date: Sat Oct 8 20:28:38 2011 +0200 pdb: restore the ability to reset the dither matrix to default @@ -26451,7 +27358,7 @@ commit 02038d5dd3092e09831f9a86cd85577bb7ce7a6d Author: Michael Natterer -Date: Sat Oct 8 16:30:07 2011 +0200 +Date: Sat Oct 8 16:30:07 2011 +0200 pdb: set_dither_matrix(): check that the matrix array has the right size @@ -26464,54 +27371,54 @@ commit 42756159b5d26672b2f600b94b5db562fda3fd61 Author: Mukund Sivaraman -Date: Sat Oct 8 19:25:10 2011 +0530 +Date: Sat Oct 8 19:25:10 2011 +0530 pdb: Mark more pdb args as dead, and regen code - app/pdb/drawable-transform-cmds.c | 4 ---- - app/pdb/floating-sel-cmds.c | 7 ------- - app/pdb/image-cmds.c | 5 ----- - app/pdb/paths-cmds.c | 2 -- - app/pdb/text-layer-cmds.c | 2 -- - app/pdb/text-tool-cmds.c | 18 ------------------ + app/pdb/drawable-transform-cmds.c | 4 ---- + app/pdb/floating-sel-cmds.c | 7 ------- + app/pdb/image-cmds.c | 5 ----- + app/pdb/paths-cmds.c | 2 -- + app/pdb/text-layer-cmds.c | 2 -- + app/pdb/text-tool-cmds.c | 18 ------------------ tools/pdbgen/pdb/drawable_transform.pdb | 4 ++-- - tools/pdbgen/pdb/floating_sel.pdb | 4 ++-- - tools/pdbgen/pdb/image.pdb | 2 +- - tools/pdbgen/pdb/paths.pdb | 2 +- - tools/pdbgen/pdb/text_layer.pdb | 2 +- - tools/pdbgen/pdb/text_tool.pdb | 18 +++++++++--------- + tools/pdbgen/pdb/floating_sel.pdb | 4 ++-- + tools/pdbgen/pdb/image.pdb | 2 +- + tools/pdbgen/pdb/paths.pdb | 2 +- + tools/pdbgen/pdb/text_layer.pdb | 2 +- + tools/pdbgen/pdb/text_tool.pdb | 18 +++++++++--------- 12 files changed, 16 insertions(+), 54 deletions(-) commit 61660b33d0c63c8f45d76c1f38eb32564957d001 Author: Mukund Sivaraman -Date: Sat Oct 8 19:13:03 2011 +0530 +Date: Sat Oct 8 19:13:03 2011 +0530 pdb: Mark various pdb args as dead, and regen code - app/pdb/convert-cmds.c | 2 -- - app/pdb/drawable-transform-cmds.c | 10 ---------- - app/pdb/floating-sel-cmds.c | 7 ------- - app/pdb/text-tool-cmds.c | 16 ---------------- - tools/pdbgen/pdb/convert.pdb | 2 +- + app/pdb/convert-cmds.c | 2 -- + app/pdb/drawable-transform-cmds.c | 10 ---------- + app/pdb/floating-sel-cmds.c | 7 ------- + app/pdb/text-tool-cmds.c | 16 ---------------- + tools/pdbgen/pdb/convert.pdb | 2 +- tools/pdbgen/pdb/drawable_transform.pdb | 10 +++++----- - tools/pdbgen/pdb/floating_sel.pdb | 4 ++-- - tools/pdbgen/pdb/text_tool.pdb | 16 ++++++++-------- + tools/pdbgen/pdb/floating_sel.pdb | 4 ++-- + tools/pdbgen/pdb/text_tool.pdb | 16 ++++++++-------- 8 files changed, 16 insertions(+), 51 deletions(-) commit 64692904393d02d3161fec52f58907502b853296 Author: Mukund Sivaraman -Date: Sat Oct 8 19:02:09 2011 +0530 +Date: Sat Oct 8 19:02:09 2011 +0530 pdb: Add functionality to drop codegen for dead args - app/pdb/text-tool-cmds.c | 2 -- - tools/pdbgen/app.pl | 6 ++++-- + app/pdb/text-tool-cmds.c | 2 -- + tools/pdbgen/app.pl | 6 ++++-- tools/pdbgen/pdb/text_tool.pdb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) commit c8eac767e6cca945b2ee213109e09293e9d1b342 Author: Mukund Sivaraman -Date: Sat Oct 8 18:38:14 2011 +0530 +Date: Sat Oct 8 18:38:14 2011 +0530 file-xwd: Indent code @@ -26520,7 +27427,7 @@ commit ba71d7b40fd01208446017f88228d56eef9726e2 Author: Mukund Sivaraman -Date: Sat Oct 8 18:37:58 2011 +0530 +Date: Sat Oct 8 18:37:58 2011 +0530 file-xwd: Don't bother with return value of set_pixelmap() @@ -26529,7 +27436,7 @@ commit 76937912238ff35889695549605e65e70523439f Author: Mukund Sivaraman -Date: Sat Oct 8 18:33:04 2011 +0530 +Date: Sat Oct 8 18:33:04 2011 +0530 curve-bend: Remove redundant assignment and move variable to local block @@ -26539,7 +27446,7 @@ commit 16f7aafdbb37effb6b51b95381d5397a30a8ac64 Author: Mukund Sivaraman -Date: Sat Oct 8 18:30:21 2011 +0530 +Date: Sat Oct 8 18:30:21 2011 +0530 file-jp2-load: Delete dead variable and assignment @@ -26548,7 +27455,7 @@ commit 58252b23d3dadfe19866ea9bfc86db706c21c2ca Author: Mukund Sivaraman -Date: Sat Oct 8 18:28:00 2011 +0530 +Date: Sat Oct 8 18:28:00 2011 +0530 app (vectors): Remove redundant assignment @@ -26557,7 +27464,7 @@ commit f18946484f018dd192ef7b5deba4e298189cb312 Author: Mukund Sivaraman -Date: Sat Oct 8 18:25:58 2011 +0530 +Date: Sat Oct 8 18:25:58 2011 +0530 color-rotate: Remove dead assignment @@ -26566,7 +27473,7 @@ commit 9a3ee43ff68bd1e6e5b37812ada61ef851e171fb Author: Mukund Sivaraman -Date: Sat Oct 8 18:24:55 2011 +0530 +Date: Sat Oct 8 18:24:55 2011 +0530 app: Remove redundant assignment @@ -26575,7 +27482,7 @@ commit e05af3cafb2fd606a1093855d0b2553e1cea4a6e Author: Mukund Sivaraman -Date: Sat Oct 8 18:22:06 2011 +0530 +Date: Sat Oct 8 18:22:06 2011 +0530 app (vectors): Delete dead assignments @@ -26584,7 +27491,7 @@ commit 1b52b1d3fa23263dc2b2d84d83a1f69f9c0eb9b9 Author: Mukund Sivaraman -Date: Sat Oct 8 18:18:32 2011 +0530 +Date: Sat Oct 8 18:18:32 2011 +0530 nl-filt: Remove inline from functions @@ -26593,7 +27500,7 @@ commit ea88059cf483d10e5f35811b9a51fa816ab7f944 Author: Mukund Sivaraman -Date: Sat Oct 8 18:18:02 2011 +0530 +Date: Sat Oct 8 18:18:02 2011 +0530 nl-filter: Remove dead assignment @@ -26602,7 +27509,7 @@ commit dd33ca10eaf3cfe0b7e4086411f9b02fc72f752c Author: Mukund Sivaraman -Date: Sat Oct 8 18:15:40 2011 +0530 +Date: Sat Oct 8 18:15:40 2011 +0530 tile: Delete dead variables and assignments @@ -26611,7 +27518,7 @@ commit a7e218ba51bd28470851b5fe3fcb5cd895e26657 Author: Mukund Sivaraman -Date: Sat Oct 8 18:12:51 2011 +0530 +Date: Sat Oct 8 18:12:51 2011 +0530 file-psd: Delete dead variable and assignment @@ -26620,7 +27527,7 @@ commit 875043dbb4e8f9afb4bd030215befb016b712bb4 Author: Mukund Sivaraman -Date: Sat Oct 8 18:11:36 2011 +0530 +Date: Sat Oct 8 18:11:36 2011 +0530 warp: Delete dead variable and assignment @@ -26629,7 +27536,7 @@ commit b7c303e5c2e9b1c30a95e8b56e8e58984b57ff8f Author: Mukund Sivaraman -Date: Sat Oct 8 18:10:09 2011 +0530 +Date: Sat Oct 8 18:10:09 2011 +0530 app (fonts-actions): Delete dead variables and code @@ -26638,7 +27545,7 @@ commit 9a86ba6393a600069a2e8d30d3bfaceadcadd0ac Author: Mukund Sivaraman -Date: Sat Oct 8 18:07:31 2011 +0530 +Date: Sat Oct 8 18:07:31 2011 +0530 flame: Remove static condition @@ -26647,7 +27554,7 @@ commit 68704eeb0bc366d09352a13c832ea2518e1cb36d Author: Mukund Sivaraman -Date: Sat Oct 8 18:05:39 2011 +0530 +Date: Sat Oct 8 18:05:39 2011 +0530 flame: Remove dead assignment @@ -26656,7 +27563,7 @@ commit 2712cb110989d9343a33e0f3f6d1f564edd23f5e Author: Mukund Sivaraman -Date: Sat Oct 8 18:03:03 2011 +0530 +Date: Sat Oct 8 18:03:03 2011 +0530 file-ps: Delete dead variable and assignment @@ -26665,7 +27572,7 @@ commit 54b0e414793c8ca2ae93f65f81b3c37c5362e2be Author: Mukund Sivaraman -Date: Sat Oct 8 08:19:22 2011 +0530 +Date: Sat Oct 8 08:19:22 2011 +0530 despeckle: Rename variables for better clarity @@ -26674,7 +27581,7 @@ commit ca650844c216c05234ed333a62bfe69989624bec Author: Massimo Valentini -Date: Fri Oct 7 20:05:52 2011 +0200 +Date: Fri Oct 7 20:05:52 2011 +0200 xcf: use only one bit to save expanded state @@ -26685,7 +27592,7 @@ commit 89d3869760646a925f3441d124c95d40e0d498b9 Author: Michael Natterer -Date: Fri Oct 7 01:25:15 2011 +0200 +Date: Fri Oct 7 01:25:15 2011 +0200 app: update GimpBlendTool's status when Alt is pressed/released @@ -26694,7 +27601,7 @@ commit 374f4e56281349a52b7d2a949b862baca479accc Author: Michael Natterer -Date: Fri Oct 7 01:01:23 2011 +0200 +Date: Fri Oct 7 01:01:23 2011 +0200 app: let GimpContainerTreeView's parent class handle MOD2-click @@ -26703,7 +27610,7 @@ commit e5edb1188d7f8ec4557dd410df1a137c1530a5a5 Author: Michael Natterer -Date: Fri Oct 7 00:51:17 2011 +0200 +Date: Fri Oct 7 00:51:17 2011 +0200 app: more s/GDK_CONTROL_MASK/gimp_get_toggle_behavior_mask()/ @@ -26715,7 +27622,7 @@ commit e2feb0c16fabc1f1f0d6c98be339235cf79ff056 Author: Michael Natterer -Date: Fri Oct 7 00:48:55 2011 +0200 +Date: Fri Oct 7 00:48:55 2011 +0200 app: use gtk_widget_get_modifier_mask() in GimpWindow @@ -26726,7 +27633,7 @@ commit efd9906e85b10cc89847aa4d0c151741bbbbf4d7 Author: Michael Natterer -Date: Fri Oct 7 00:33:47 2011 +0200 +Date: Fri Oct 7 00:33:47 2011 +0200 app: remove gimp_get_mod_separator(), it's unused now @@ -26736,7 +27643,7 @@ commit 23dca3b52282baa3e273a45599395e5e95777a34 Author: Michael Natterer -Date: Fri Oct 7 00:29:52 2011 +0200 +Date: Fri Oct 7 00:29:52 2011 +0200 app: don't use gimp_get_mod_reparator() for the source tool status @@ -26751,18 +27658,18 @@ commit a38faefba7833e056ec01a082a4a620be13028fb Author: Michael Natterer -Date: Thu Oct 6 23:59:49 2011 +0200 +Date: Thu Oct 6 23:59:49 2011 +0200 app: use toggle_behavior_mask not CONTROL to trigger zoom-on-scroll app/display/gimpdisplayshell-tool-events.c | 2 +- - app/widgets/gimpgradienteditor.c | 4 ++-- - app/widgets/gimpnavigationview.c | 3 ++- + app/widgets/gimpgradienteditor.c | 4 ++-- + app/widgets/gimpnavigationview.c | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) commit 1bff8224ad208edd91f057251c432824c8510332 Author: Michael Natterer -Date: Thu Oct 6 23:51:10 2011 +0200 +Date: Thu Oct 6 23:51:10 2011 +0200 app: use the toggle_behavior_mask instead of CONTROL to pick BG @@ -26774,7 +27681,7 @@ commit 2ee5dbb98c2b260df56b2f88dd4e10a35fd7b402 Author: Michael Natterer -Date: Thu Oct 6 23:31:13 2011 +0200 +Date: Thu Oct 6 23:31:13 2011 +0200 app: use toggle_behavior_mask instead of CONTROL in GimpThumbBox @@ -26786,7 +27693,7 @@ commit c7d9988a7f600790c0056a446536c1b8cf407ea4 Author: Michael Natterer -Date: Thu Oct 6 22:53:42 2011 +0200 +Date: Thu Oct 6 22:53:42 2011 +0200 app: make gimp_suggest_modifiers() work on OSX @@ -26799,7 +27706,7 @@ commit 6d1b5c4241ff98f7c6d4f181c800be0d7da4ebc8 Author: Michael Natterer -Date: Thu Oct 6 22:26:43 2011 +0200 +Date: Thu Oct 6 22:26:43 2011 +0200 app: pull virtual modifier replacement into gimp_get_mod_string() @@ -26807,15 +27714,15 @@ modifiers when displaying a modifier string (and in some other cases, but these are all handled internally by GTK+). - app/actions/layers-actions.c | 2 -- + app/actions/layers-actions.c | 2 -- app/tools/gimpselectionoptions.c | 2 +- - app/widgets/gimpeditor.c | 2 +- + app/widgets/gimpeditor.c | 2 +- app/widgets/gimpwidgets-utils.c | 2 ++ 4 files changed, 4 insertions(+), 4 deletions(-) commit 9fff65f1b274336cf1d477f5fad97194046d459e Author: Michael Natterer -Date: Thu Oct 6 22:24:41 2011 +0200 +Date: Thu Oct 6 22:24:41 2011 +0200 libgimpwidgets: emit GimpButton::extended-clicked() also on MOD2-click @@ -26826,7 +27733,7 @@ commit 38b8f0596d68f3f482b3c039e131b5c7a29083cc Author: Michael Natterer -Date: Thu Oct 6 21:59:07 2011 +0200 +Date: Thu Oct 6 21:59:07 2011 +0200 app: use the new modifier API instead of constants in all tools @@ -26834,42 +27741,42 @@ of CONTROL are gone. Should work exactly as before on Win/X11, and still has some glitches on OSX. - app/tools/gimpaligntool.c | 27 +++++++++++------ - app/tools/gimpblendtool.c | 9 +++--- - app/tools/gimpbucketfilloptions.c | 25 ++++++++------- - app/tools/gimpbucketfilltool.c | 3 +- - app/tools/gimpcolorpickeroptions.c | 15 +++++---- - app/tools/gimpcolorpickertool.c | 13 +++++--- - app/tools/gimpconvolvetool.c | 22 +++++++++----- - app/tools/gimpcurvestool.c | 5 +-- - app/tools/gimpdodgeburntool.c | 22 +++++++++----- - app/tools/gimpeditselectiontool.c | 7 +++-- - app/tools/gimpflipoptions.c | 19 +++++++----- - app/tools/gimpfliptool.c | 3 +- + app/tools/gimpaligntool.c | 27 +++++++++++------ + app/tools/gimpblendtool.c | 9 +++--- + app/tools/gimpbucketfilloptions.c | 25 ++++++++------- + app/tools/gimpbucketfilltool.c | 3 +- + app/tools/gimpcolorpickeroptions.c | 15 +++++---- + app/tools/gimpcolorpickertool.c | 13 +++++--- + app/tools/gimpconvolvetool.c | 22 +++++++++----- + app/tools/gimpcurvestool.c | 5 +-- + app/tools/gimpdodgeburntool.c | 22 +++++++++----- + app/tools/gimpeditselectiontool.c | 7 +++-- + app/tools/gimpflipoptions.c | 19 +++++++----- + app/tools/gimpfliptool.c | 3 +- app/tools/gimpforegroundselectoptions.c | 29 ++++++++++-------- - app/tools/gimpforegroundselecttool.c | 3 +- - app/tools/gimpfreeselecttool.c | 9 ++++-- - app/tools/gimpmagnifyoptions.c | 15 +++++---- - app/tools/gimpmagnifytool.c | 3 +- - app/tools/gimpmeasuretool.c | 31 +++++++++++-------- - app/tools/gimpmovetool.c | 12 +++++--- - app/tools/gimppainttool.c | 21 +++++++------ - app/tools/gimpperspectiveclonetool.c | 9 ++++-- - app/tools/gimprectangleselecttool.c | 16 +++++++--- - app/tools/gimprectangletool.c | 4 ++- - app/tools/gimpselectionoptions.c | 21 ++++++++----- - app/tools/gimpselectiontool.c | 54 + app/tools/gimpforegroundselecttool.c | 3 +- + app/tools/gimpfreeselecttool.c | 9 ++++-- + app/tools/gimpmagnifyoptions.c | 15 +++++---- + app/tools/gimpmagnifytool.c | 3 +- + app/tools/gimpmeasuretool.c | 31 +++++++++++-------- + app/tools/gimpmovetool.c | 12 +++++--- + app/tools/gimppainttool.c | 21 +++++++------ + app/tools/gimpperspectiveclonetool.c | 9 ++++-- + app/tools/gimprectangleselecttool.c | 16 +++++++--- + app/tools/gimprectangletool.c | 4 ++- + app/tools/gimpselectionoptions.c | 21 ++++++++----- + app/tools/gimpselectiontool.c | 54 ++++++++++++++++----------------- - app/tools/gimpsourcetool.c | 15 ++++++--- - app/tools/gimptransformoptions.c | 9 ++++-- - app/tools/gimptransformtool.c | 3 +- - app/tools/gimpvectoroptions.c | 11 ++++--- - app/tools/gimpvectortool.c | 25 +++++---------- + app/tools/gimpsourcetool.c | 15 ++++++--- + app/tools/gimptransformoptions.c | 9 ++++-- + app/tools/gimptransformtool.c | 3 +- + app/tools/gimpvectoroptions.c | 11 ++++--- + app/tools/gimpvectortool.c | 25 +++++---------- 30 files changed, 269 insertions(+), 191 deletions(-) commit 59f4396c7ba110b4dbe3ea5845f67df4d292a8d4 Author: Michael Natterer -Date: Thu Oct 6 21:05:12 2011 +0200 +Date: Thu Oct 6 21:05:12 2011 +0200 app: use the toggle_behavior modifier instead of GDK_CONTROL_MASK @@ -26880,7 +27787,7 @@ commit da2410148c08e444324df7d6f7d96634d2943ef5 Author: Alexia Death -Date: Thu Oct 6 20:16:08 2011 +0300 +Date: Thu Oct 6 20:16:08 2011 +0300 Revert "app: initalize rectangle tool respecting size constrants" @@ -26892,7 +27799,7 @@ commit 970782cfef9c853b458cc8273ebd237d15c8ae2c Author: Alexia Death -Date: Thu Oct 6 20:16:06 2011 +0300 +Date: Thu Oct 6 20:16:06 2011 +0300 Revert "app: prevent executing rectangle tool on the creating click" @@ -26903,7 +27810,7 @@ commit c8cde4095251d391d395c0d6aaf91012a1d05cf6 Author: Alexia Death -Date: Thu Oct 6 20:16:04 2011 +0300 +Date: Thu Oct 6 20:16:04 2011 +0300 Revert "app: handle motion right just created size fixed rects" @@ -26915,7 +27822,7 @@ commit 3ad505b124aade1ad3859cbfb4267c117504a960 Author: Alexia Death -Date: Thu Oct 6 20:15:57 2011 +0300 +Date: Thu Oct 6 20:15:57 2011 +0300 Revert "app: rect tool changes made for suppressed execute need to be applied" @@ -26927,7 +27834,7 @@ commit 11db46808489c4cd667da5f31ea6edd89d45a89b Author: Alexia Death -Date: Thu Oct 6 20:15:53 2011 +0300 +Date: Thu Oct 6 20:15:53 2011 +0300 Revert "NEWS: Update about rectangle tool changes" @@ -26938,7 +27845,7 @@ commit bb16f57505103b89ab5d3aeab551768dd2392387 Author: Alexia Death -Date: Thu Oct 6 20:14:53 2011 +0300 +Date: Thu Oct 6 20:14:53 2011 +0300 Revert "NEWS: Fix typo in previous commit" @@ -26949,21 +27856,21 @@ commit 7ebcf3f755f30441a9db843f6c587eaf1788d2f0 Author: Mukund Sivaraman -Date: Thu Oct 6 20:19:11 2011 +0530 +Date: Thu Oct 6 20:19:11 2011 +0530 metadata: Use glib base64 decoder instead of local copy - plug-ins/metadata/Makefile.am | 17 --- - plug-ins/metadata/base64.c | 236 + plug-ins/metadata/Makefile.am | 17 --- + plug-ins/metadata/base64.c | 236 ----------------------------------------- - plug-ins/metadata/base64.h | 41 ------- + plug-ins/metadata/base64.h | 41 ------- plug-ins/metadata/testbase64.c | 166 ----------------------------- - plug-ins/metadata/xmp-parse.c | 16 ++- + plug-ins/metadata/xmp-parse.c | 16 ++- 5 files changed, 11 insertions(+), 465 deletions(-) commit e55ceea11a8a96abc1d91e75cfd06da87bb91ed1 Author: Michael Natterer -Date: Thu Oct 6 16:43:23 2011 +0200 +Date: Thu Oct 6 16:43:23 2011 +0200 app: handle MOD2 in GimpTool's generic modifier code @@ -26975,7 +27882,7 @@ commit f4141d69428cf9584abd3d8066c49003e5b5c60b Author: Michael Natterer -Date: Thu Oct 6 16:42:42 2011 +0200 +Date: Thu Oct 6 16:42:42 2011 +0200 app: add a utility function that returns the "constrain" modifier @@ -26985,7 +27892,7 @@ commit c0610697cb87a96dcea216ba60d51a7cb68b6cdf Author: Michael Natterer -Date: Thu Oct 6 10:24:49 2011 +0200 +Date: Thu Oct 6 10:24:49 2011 +0200 app: remove widget parameter from gimp_modifiers_to_channel_op() @@ -26999,7 +27906,7 @@ commit 10a9c660f8605f27fb665e410805bd9b61d69601 Author: Michael Natterer -Date: Thu Oct 6 10:20:23 2011 +0200 +Date: Thu Oct 6 10:20:23 2011 +0200 app: add utility functions which return modifier masks @@ -27012,7 +27919,7 @@ commit 197dddb5d5d1adc63178d5b4a03cc763100c0784 Author: Mukund Sivaraman -Date: Thu Oct 6 19:54:58 2011 +0530 +Date: Thu Oct 6 19:54:58 2011 +0530 wind: Delete dead assignment @@ -27021,7 +27928,7 @@ commit 7fbc0fe540ff1cf9ac5fef4b5e0d64687466556a Author: Mukund Sivaraman -Date: Thu Oct 6 19:51:04 2011 +0530 +Date: Thu Oct 6 19:51:04 2011 +0530 file-psd: Delete dead variable and assignment @@ -27030,7 +27937,7 @@ commit b613969d8b6f2014f3e020f6a2a817b7b6cff57c Author: Mukund Sivaraman -Date: Thu Oct 6 19:49:47 2011 +0530 +Date: Thu Oct 6 19:49:47 2011 +0530 file-psd: Move variables to local block @@ -27039,7 +27946,7 @@ commit c9e7186a3568e81cfbbf4da973a8f61ae4f675f8 Author: Mukund Sivaraman -Date: Thu Oct 6 19:45:32 2011 +0530 +Date: Thu Oct 6 19:45:32 2011 +0530 app: Conditionally assign show_menu @@ -27048,7 +27955,7 @@ commit d5c1e096433063169d62b1591a84f729109591ad Author: Mukund Sivaraman -Date: Thu Oct 6 19:42:47 2011 +0530 +Date: Thu Oct 6 19:42:47 2011 +0530 file-gif-save: Delete dead variables and assignments @@ -27057,7 +27964,7 @@ commit 030695b8d01cebecaa54453bac93663b5e06a9ea Author: Mukund Sivaraman -Date: Thu Oct 6 19:39:59 2011 +0530 +Date: Thu Oct 6 19:39:59 2011 +0530 contrast-retinex: Delete redundant assignment and move variable to local block @@ -27067,7 +27974,7 @@ commit db40cca290a7d319190aa83d1c7abab17822be80 Author: Mukund Sivaraman -Date: Thu Oct 6 19:35:21 2011 +0530 +Date: Thu Oct 6 19:35:21 2011 +0530 file-xwd: Change if statements list to a switch @@ -27076,7 +27983,7 @@ commit 957ca36576e2ec594ab6983bec144d016218d8c9 Author: Mukund Sivaraman -Date: Thu Oct 6 19:34:05 2011 +0530 +Date: Thu Oct 6 19:34:05 2011 +0530 file-xwd: Remove dead variable and assignment @@ -27085,7 +27992,7 @@ commit 1dfec7dac84d348694d1542b94f1be936bde5107 Author: Mukund Sivaraman -Date: Thu Oct 6 19:32:56 2011 +0530 +Date: Thu Oct 6 19:32:56 2011 +0530 sphere-designer: Remove useless variable @@ -27094,7 +28001,7 @@ commit cf19e68205303813ba74c1a30db10fa04d24d929 Author: Mukund Sivaraman -Date: Thu Oct 6 19:30:49 2011 +0530 +Date: Thu Oct 6 19:30:49 2011 +0530 warp: Delete dead variable and assignment @@ -27103,7 +28010,7 @@ commit 9e4627730aa356fe2f0174fb4ec19aa5f06776c6 Author: Mukund Sivaraman -Date: Thu Oct 6 19:26:06 2011 +0530 +Date: Thu Oct 6 19:26:06 2011 +0530 file-sunras: Delete dead variable and assignment @@ -27112,7 +28019,7 @@ commit b3337ee8655d20d538bd0f706b932686a38e2c06 Author: Mukund Sivaraman -Date: Thu Oct 6 19:24:56 2011 +0530 +Date: Thu Oct 6 19:24:56 2011 +0530 metadata: Delete dead assignment and move variable to local block @@ -27121,7 +28028,7 @@ commit d6d2a0bbd15f25d820631b4db6236f6a42b4b49c Author: Mukund Sivaraman -Date: Thu Oct 6 19:23:06 2011 +0530 +Date: Thu Oct 6 19:23:06 2011 +0530 app (gimprc): Delete dead assignment @@ -27130,7 +28037,7 @@ commit 599c077548f625b7ba153f7c86e20355f696c6b6 Author: Mukund Sivaraman -Date: Thu Oct 6 19:21:14 2011 +0530 +Date: Thu Oct 6 19:21:14 2011 +0530 edge: Delete dead variables and assignments @@ -27139,7 +28046,7 @@ commit b11bc202f1712a073d4f9f8961c6a481fad157bf Author: Mukund Sivaraman -Date: Thu Oct 6 18:59:31 2011 +0530 +Date: Thu Oct 6 18:59:31 2011 +0530 semi-flatten: Remove dead variable and assignment @@ -27148,7 +28055,7 @@ commit 5deb726dfba4a7ac592b1134a280c717f794c40d Author: Mukund Sivaraman -Date: Thu Oct 6 18:58:25 2011 +0530 +Date: Thu Oct 6 18:58:25 2011 +0530 gimpressionist: Remove 'step' variable which is equal to 'i' @@ -27157,7 +28064,7 @@ commit e04edfa8e213cbd89d46a6ed4f44a6fb84f6d02d Author: Mukund Sivaraman -Date: Thu Oct 6 09:11:53 2011 +0530 +Date: Thu Oct 6 09:11:53 2011 +0530 depth-merge: Delete redundant assignment @@ -27166,7 +28073,7 @@ commit 61c47bf8655d8fb153fe839bd8cad97db8c67210 Author: Mukund Sivaraman -Date: Thu Oct 6 09:10:33 2011 +0530 +Date: Thu Oct 6 09:10:33 2011 +0530 mosaic: Remove dead variable and assignment @@ -27175,7 +28082,7 @@ commit e3b8d9885e175779d4984ba6b26c709f12b89d3d Author: Mukund Sivaraman -Date: Thu Oct 6 09:08:22 2011 +0530 +Date: Thu Oct 6 09:08:22 2011 +0530 rotate: Remove redundant assignment @@ -27184,7 +28091,7 @@ commit b5288df912f4a51186d12d7a0b192a756751aca1 Author: Mukund Sivaraman -Date: Thu Oct 6 09:06:27 2011 +0530 +Date: Thu Oct 6 09:06:27 2011 +0530 convolution-matrix: Remove dead code and variable @@ -27193,7 +28100,7 @@ commit 7048d9e46e18e221044442b36b1655deef295804 Author: Mukund Sivaraman -Date: Thu Oct 6 09:04:43 2011 +0530 +Date: Thu Oct 6 09:04:43 2011 +0530 tinyscheme: Remove dead assignment @@ -27202,7 +28109,7 @@ commit 29e7d032a3f50cda7af4b765b9da8a0b1fef664e Author: Mukund Sivaraman -Date: Thu Oct 6 09:01:51 2011 +0530 +Date: Thu Oct 6 09:01:51 2011 +0530 app (file-save-dialog): Remove dead code and variables @@ -27211,7 +28118,7 @@ commit 4b75e13518c7d7692dee61020d78521886b6071a Author: Mukund Sivaraman -Date: Thu Oct 6 08:53:34 2011 +0530 +Date: Thu Oct 6 08:53:34 2011 +0530 polar-coords: Remove redundant assignment @@ -27220,7 +28127,7 @@ commit c4b709cdce00394bc868d0a75509f018d3bf00fa Author: Mukund Sivaraman -Date: Thu Oct 6 08:51:07 2011 +0530 +Date: Thu Oct 6 08:51:07 2011 +0530 edge: Remove dead variable and assignment @@ -27229,7 +28136,7 @@ commit 12f6dba895a03d1133926517f799d87b90d50824 Author: Mukund Sivaraman -Date: Thu Oct 6 08:49:21 2011 +0530 +Date: Thu Oct 6 08:49:21 2011 +0530 file-sunras: Use precomputed hdr_entries instead of recomputing it @@ -27238,7 +28145,7 @@ commit 13cd1f6f801a0f439e7f6a0b6d6d5d7d33b5917f Author: Mukund Sivaraman -Date: Thu Oct 6 08:41:42 2011 +0530 +Date: Thu Oct 6 08:41:42 2011 +0530 blur-motion: Move variables into inner block, where they're used @@ -27247,7 +28154,7 @@ commit 37d81cd3962b5b00e0aab4a0dbd5b3e5c5dd1bb3 Author: Mukund Sivaraman -Date: Thu Oct 6 08:38:46 2011 +0530 +Date: Thu Oct 6 08:38:46 2011 +0530 film: Remove dead assignment (and variable) @@ -27256,7 +28163,7 @@ commit ad3633110a0b569b73eb7c21f600e7c1a6726fb9 Author: Mukund Sivaraman -Date: Thu Oct 6 08:37:41 2011 +0530 +Date: Thu Oct 6 08:37:41 2011 +0530 app: Remove duplicate assignment @@ -27265,7 +28172,7 @@ commit 3699475be9fa61f7311133b6db13c50ed9c29268 Author: Mukund Sivaraman -Date: Thu Oct 6 08:34:55 2011 +0530 +Date: Thu Oct 6 08:34:55 2011 +0530 app (xcf): Remove duplicate assignment @@ -27274,7 +28181,7 @@ commit bdd7a934a72d9383127f4704b27ee104781c073b Author: Mukund Sivaraman -Date: Thu Oct 6 08:33:26 2011 +0530 +Date: Thu Oct 6 08:33:26 2011 +0530 file-gif-load: Conditionally compile debug code @@ -27283,7 +28190,7 @@ commit 91bcc3dff4a03d80a1b1caaba96740650798ab40 Author: Mukund Sivaraman -Date: Thu Oct 6 08:29:36 2011 +0530 +Date: Thu Oct 6 08:29:36 2011 +0530 file-sgi: Remove redundant assignment @@ -27292,7 +28199,7 @@ commit 245b4482ebad4c094c0d0d3e2a4dbeff7b016a53 Author: Mukund Sivaraman -Date: Thu Oct 6 08:27:57 2011 +0530 +Date: Thu Oct 6 08:27:57 2011 +0530 file-tiff-load: Remove function's dead args @@ -27301,7 +28208,7 @@ commit bf31425640b53ac301b907b9f96d9e4fd96b483c Author: Mukund Sivaraman -Date: Thu Oct 6 08:25:04 2011 +0530 +Date: Thu Oct 6 08:25:04 2011 +0530 file-sunras: Remove dead assignment (and variable) @@ -27310,7 +28217,7 @@ commit 990a4bd2712c957e8fb70f85194f3e6eca33d433 Author: Michael Natterer -Date: Wed Oct 5 23:40:44 2011 +0200 +Date: Wed Oct 5 23:40:44 2011 +0200 app: don't forget to move the start handle in GimpBlendTool @@ -27321,7 +28228,7 @@ commit e8250320d50acb867090bb1e0e0bcad8ed521054 Author: Michael Natterer -Date: Wed Oct 5 20:04:42 2011 +0200 +Date: Wed Oct 5 20:04:42 2011 +0200 app: use gdk_event_triggers_context_menu() for the image menu @@ -27333,7 +28240,7 @@ commit c18c21f651b0fa5ac9869c52768a686ff8ae6ac0 Author: Michael Natterer -Date: Wed Oct 5 19:44:24 2011 +0200 +Date: Wed Oct 5 19:44:24 2011 +0200 app: treat Meta_L and Meta_R as tool-relevant modifiers @@ -27344,7 +28251,7 @@ commit 4b3d3fe431440bfe76d57e2cd9edb24a612efa21 Author: Michael Natterer -Date: Wed Oct 5 19:25:29 2011 +0200 +Date: Wed Oct 5 19:25:29 2011 +0200 app: port the channels and paths dialog to portable selection modifiers @@ -27357,7 +28264,7 @@ commit f22d6b9d3bd014127e14fae4d2424a2bef961369 Author: Michael Natterer -Date: Wed Oct 5 19:24:44 2011 +0200 +Date: Wed Oct 5 19:24:44 2011 +0200 app: use the portable EXTEND_SELECTION modifier instead of SHIFT @@ -27366,7 +28273,7 @@ commit ad27b30525c26c75bfb0b3fb4a6b86456f51a9e2 Author: Michael Natterer -Date: Wed Oct 5 19:22:25 2011 +0200 +Date: Wed Oct 5 19:22:25 2011 +0200 app: get the "add" and "subtract" modifiers from the new portable API @@ -27379,7 +28286,7 @@ commit 16d4d6fa9442a7dc3b8d8a777b19aaaa3a758cc4 Author: Michael Natterer -Date: Wed Oct 5 19:21:24 2011 +0200 +Date: Wed Oct 5 19:21:24 2011 +0200 app: replace virtual modifiers before displaying them as GimpEditor tooltip @@ -27389,7 +28296,7 @@ commit 9e44a199e5b914b27b7b72f22a0bd994eba9bca6 Author: Michael Natterer -Date: Wed Oct 5 19:19:14 2011 +0200 +Date: Wed Oct 5 19:19:14 2011 +0200 app: use gimp_modifiers_to_channel_op() @@ -27401,7 +28308,7 @@ commit fdf103ce0824c1c63061e4fd488db1dde65403c2 Author: Michael Natterer -Date: Wed Oct 5 19:15:17 2011 +0200 +Date: Wed Oct 5 19:15:17 2011 +0200 app: add more modifier utility functions to gimpwidgets-utils.[ch] @@ -27422,7 +28329,7 @@ commit f45cccbc8282a0023de36b5b2ac61aabbfb14662 Author: Michael Natterer -Date: Wed Oct 5 18:47:37 2011 +0200 +Date: Wed Oct 5 18:47:37 2011 +0200 app: make gimp_get_mod_string() a bit nicer @@ -27432,7 +28339,7 @@ commit 643dceec0247b33e739d2bef55e3a12306fa7bef Author: Mukund Sivaraman -Date: Wed Oct 5 09:25:21 2011 +0530 +Date: Wed Oct 5 09:25:21 2011 +0530 libgimpwidgets: Add missing symbols to gimpwidgets.def @@ -27441,14 +28348,14 @@ commit 3982ddc39b654d43ae010a718785015efbc12da2 Author: Michael Natterer -Date: Wed Oct 5 01:28:45 2011 +0200 +Date: Wed Oct 5 01:28:45 2011 +0200 app: implement gimp_get_mod_string() using gtk_accelerator_get_label() so it can handle all modifiers (also Mac ones). Remove gimp_get_mod_name_shift,control,alt(). - app/tools/gimpsourcetool.c | 2 +- + app/tools/gimpsourcetool.c | 2 +- app/widgets/gimpwidgets-utils.c | 136 ++++++++++------------------------------ app/widgets/gimpwidgets-utils.h | 3 - @@ -27456,7 +28363,7 @@ commit 1459f5bb612124051db640d63122a9b305b4f2bc Author: Michael Natterer -Date: Tue Oct 4 23:51:54 2011 +0200 +Date: Tue Oct 4 23:51:54 2011 +0200 app: unparent GimpDockBook's menu button in dispose() not finalize() @@ -27469,7 +28376,7 @@ commit 29a6c71f002aed4845479f9b46cdb2cdf58bc623 Author: Michael Natterer -Date: Tue Oct 4 23:36:21 2011 +0200 +Date: Tue Oct 4 23:36:21 2011 +0200 app: don't use GNU-only options when generating git-version.h @@ -27478,7 +28385,7 @@ commit 6e6a70b7f84ba2b76c4267e7ee4cec19dc9fd758 Author: Michael Natterer -Date: Tue Oct 4 23:09:09 2011 +0200 +Date: Tue Oct 4 23:09:09 2011 +0200 libgimpwidgets: add some modifier abstraction API to gimp3migration.[ch] @@ -27492,7 +28399,7 @@ commit 26fdf29dcb35cb973ccda413a4071a5b2453fb55 Author: Mukund Sivaraman -Date: Tue Oct 4 18:42:13 2011 +0530 +Date: Tue Oct 4 18:42:13 2011 +0530 Update NEWS for gimptool scripts dir fix @@ -27501,7 +28408,7 @@ commit 2ea49c594c99c11706bbdda7160e9cd5298e3e1c Author: Mukund Sivaraman -Date: Tue Oct 4 18:29:28 2011 +0530 +Date: Tue Oct 4 18:29:28 2011 +0530 gimptool: Use GIMP_PLUGIN_VERSION instead of GIMP_API_VERSION for scripts dir @@ -27511,7 +28418,7 @@ commit eb11a466ac1851d4ebd4f1219a3546d12c60fb09 Author: Mukund Sivaraman -Date: Tue Oct 4 18:28:52 2011 +0530 +Date: Tue Oct 4 18:28:52 2011 +0530 gimptool: Replace path generation code with glib functions @@ -27521,7 +28428,7 @@ commit 4e056e79d25eed1ce2476de02d021f58e7cc2f0b Author: Mukund Sivaraman -Date: Tue Oct 4 18:11:29 2011 +0530 +Date: Tue Oct 4 18:11:29 2011 +0530 gimptool: Fix system script dir path @@ -27530,7 +28437,7 @@ commit 1c730f94ac46c25d691d89c17b7aa8dda9c26b07 Author: Mukund Sivaraman -Date: Tue Oct 4 14:55:41 2011 +0530 +Date: Tue Oct 4 14:55:41 2011 +0530 app (paint-funcs): Delete dead assignment and move variable @@ -27539,7 +28446,7 @@ commit f5e51fe31aee4778dcaa5fb645ff291bee240089 Author: Mukund Sivaraman -Date: Tue Oct 4 14:53:53 2011 +0530 +Date: Tue Oct 4 14:53:53 2011 +0530 warp: Remove dead variable and assignment @@ -27548,7 +28455,7 @@ commit 433e1dcb77876568db038cd0f0950d2975627dc7 Author: Mukund Sivaraman -Date: Tue Oct 4 14:49:30 2011 +0530 +Date: Tue Oct 4 14:49:30 2011 +0530 mosaic: Delete dead variable and assignment @@ -27557,7 +28464,7 @@ commit c70b2437145bdfec6fac2353f0beeb30de2d4e68 Author: Mukund Sivaraman -Date: Tue Oct 4 14:46:39 2011 +0530 +Date: Tue Oct 4 14:46:39 2011 +0530 lens-distortion: Delete dead variable and assignment @@ -27566,7 +28473,7 @@ commit 0a3c8c5c86f6af2709312ced08f0be97c325b84a Author: Mukund Sivaraman -Date: Tue Oct 4 14:44:56 2011 +0530 +Date: Tue Oct 4 14:44:56 2011 +0530 app (siox): Delete redundant total initializer @@ -27575,7 +28482,7 @@ commit 4a686eba0f7c77462b7ac9655b6f1ce5f2902354 Author: Mukund Sivaraman -Date: Tue Oct 4 14:40:24 2011 +0530 +Date: Tue Oct 4 14:40:24 2011 +0530 libgimpcolor: Delete unnecessary h initializer @@ -27587,7 +28494,7 @@ commit f9cebd40a70a73f888a505d158d48a25565f817d Author: Mukund Sivaraman -Date: Tue Oct 4 14:37:36 2011 +0530 +Date: Tue Oct 4 14:37:36 2011 +0530 app (tool-preset-editor): Delete dead code and variables @@ -27596,7 +28503,7 @@ commit c87e232f57819e6766f54537c2e71bba9eb22313 Author: Mukund Sivaraman -Date: Tue Oct 4 14:34:29 2011 +0530 +Date: Tue Oct 4 14:34:29 2011 +0530 noise-randomize: Delete dead assignment and variable @@ -27605,7 +28512,7 @@ commit 0afe030552fb818c2e0aff1348af30fb51d9016a Author: Mukund Sivaraman -Date: Tue Oct 4 14:33:42 2011 +0530 +Date: Tue Oct 4 14:33:42 2011 +0530 libgimpwidgets: Remove dead assignments @@ -27614,7 +28521,7 @@ commit ce86fbff050b25fe2fa13ec06b46bbd0eaf5f811 Author: Mukund Sivaraman -Date: Tue Oct 4 14:30:00 2011 +0530 +Date: Tue Oct 4 14:30:00 2011 +0530 convolution-matrix: Remove dead assignment and move variable @@ -27623,7 +28530,7 @@ commit f5369a9158f86505dc031988e94495c822e9fed7 Author: Mukund Sivaraman -Date: Tue Oct 4 14:27:53 2011 +0530 +Date: Tue Oct 4 14:27:53 2011 +0530 noise-randomize: Remove dead assignment and variable @@ -27632,7 +28539,7 @@ commit a966a9ba2ebc6017c6cab2eb0e37ffd213339507 Author: Mukund Sivaraman -Date: Tue Oct 4 14:24:49 2011 +0530 +Date: Tue Oct 4 14:24:49 2011 +0530 file-ps: Remove dead assignment (and variable) @@ -27641,7 +28548,7 @@ commit b45868c0817c6156d9802cfc10323432badc1fcc Author: Mukund Sivaraman -Date: Tue Oct 4 14:23:58 2011 +0530 +Date: Tue Oct 4 14:23:58 2011 +0530 file-csource: Remove dead assignments (and variable) @@ -27650,7 +28557,7 @@ commit 566e2bf0afa83be067d73ac8dbb87eadaae5cde5 Author: Mukund Sivaraman -Date: Tue Oct 4 14:20:25 2011 +0530 +Date: Tue Oct 4 14:20:25 2011 +0530 channel-mixer: Remove dead assignment (and variable) @@ -27659,7 +28566,7 @@ commit b5c08c1c04585df0222830c591c620d1d9c59960 Author: Mukund Sivaraman -Date: Tue Oct 4 14:18:43 2011 +0530 +Date: Tue Oct 4 14:18:43 2011 +0530 jigsaw: Remove dead assignments (and variables) @@ -27668,7 +28575,7 @@ commit ed8beff406d3635f319c7f4ee52f13cbdfc4d196 Author: Mukund Sivaraman -Date: Tue Oct 4 14:16:20 2011 +0530 +Date: Tue Oct 4 14:16:20 2011 +0530 qbist: Remove dead assignment (and variable) @@ -27677,7 +28584,7 @@ commit 916e44fe58258102752c58ea7c1ea76951316159 Author: Mukund Sivaraman -Date: Tue Oct 4 14:15:13 2011 +0530 +Date: Tue Oct 4 14:15:13 2011 +0530 libgimpconfig: Remove dead assignment @@ -27686,7 +28593,7 @@ commit 9780fe04be80fa3215a5baf1540d9ee69b47e0c1 Author: Mukund Sivaraman -Date: Tue Oct 4 14:14:18 2011 +0530 +Date: Tue Oct 4 14:14:18 2011 +0530 apply-canvas: Remove dead assignments (and variable) @@ -27695,7 +28602,7 @@ commit aa0df78d6c40c8f0cd066c4637eb590e40fd8777 Author: Alexia Death -Date: Mon Oct 3 19:27:27 2011 +0300 +Date: Mon Oct 3 19:27:27 2011 +0300 NEWS: Fix typo in previous commit @@ -27704,7 +28611,7 @@ commit 61e18ec424a2f4d6f7d022cfe1d73731eadc13fc Author: Alexia Death -Date: Mon Oct 3 19:18:09 2011 +0300 +Date: Mon Oct 3 19:18:09 2011 +0300 NEWS: Update about rectangle tool changes @@ -27713,7 +28620,7 @@ commit c04c011be1dc72a186af022c328391ffec8127f8 Author: Jakub Steiner -Date: Mon Oct 3 17:45:22 2011 +0200 +Date: Mon Oct 3 17:45:22 2011 +0200 cage tool icon: align properly to grid. @@ -27729,7 +28636,7 @@ commit c149d17a16b7c070df0a263537dc62f2e2febb54 Author: Mukund Sivaraman -Date: Mon Oct 3 19:15:00 2011 +0530 +Date: Mon Oct 3 19:15:00 2011 +0530 contrast-retinex: Remove dead assignment @@ -27738,7 +28645,7 @@ commit 9a39d84e960cedd8922513ed61bc7c10c2059398 Author: Mukund Sivaraman -Date: Mon Oct 3 19:13:22 2011 +0530 +Date: Mon Oct 3 19:13:22 2011 +0530 app: Remove dead assignment @@ -27747,7 +28654,7 @@ commit fc3f59872d121999db48c9c201b36866069646a0 Author: Mukund Sivaraman -Date: Mon Oct 3 19:10:55 2011 +0530 +Date: Mon Oct 3 19:10:55 2011 +0530 help-browser: Remove dead assignment (and variable) @@ -27756,7 +28663,7 @@ commit cb3abfc190d5621a9f742bf8b4e476200d307ca4 Author: Mukund Sivaraman -Date: Mon Oct 3 19:08:04 2011 +0530 +Date: Mon Oct 3 19:08:04 2011 +0530 mosaic: Remove dead assignment (and variable) @@ -27765,7 +28672,7 @@ commit f33dcf2df21c506902e3dfe961e3358a9e8f6872 Author: Mukund Sivaraman -Date: Mon Oct 3 19:06:37 2011 +0530 +Date: Mon Oct 3 19:06:37 2011 +0530 app: Don't care about return value of g_string_append() @@ -27774,7 +28681,7 @@ commit a35813ffd7e9ace958ecd2141097ed1dc8888fa5 Author: Mukund Sivaraman -Date: Mon Oct 3 19:01:15 2011 +0530 +Date: Mon Oct 3 19:01:15 2011 +0530 file-ico: Move image_ID into local blocks @@ -27783,7 +28690,7 @@ commit 123bb1e5ada7ce558e9c396d9174508b00c56987 Author: Mukund Sivaraman -Date: Mon Oct 3 18:59:39 2011 +0530 +Date: Mon Oct 3 18:59:39 2011 +0530 file-ico: Remove dead assignment (and variable) @@ -27792,7 +28699,7 @@ commit aac5be344f703fd4a7a722760c07d81182d6b3cf Author: Mukund Sivaraman -Date: Mon Oct 3 18:57:48 2011 +0530 +Date: Mon Oct 3 18:57:48 2011 +0530 file-gif-save: Remove dead assignments (and variables) @@ -27801,7 +28708,7 @@ commit af547cc0c7da393c4214c9024afab73ad9364c02 Author: Mukund Sivaraman -Date: Mon Oct 3 18:56:14 2011 +0530 +Date: Mon Oct 3 18:56:14 2011 +0530 file-gif-save: Remove dead assignments (and variables) @@ -27810,7 +28717,7 @@ commit 7d465f0a629def1986799f4659da07bef5523c2d Author: Mukund Sivaraman -Date: Mon Oct 3 18:53:32 2011 +0530 +Date: Mon Oct 3 18:53:32 2011 +0530 gimpressionist: Remove dead assignment (and variable) @@ -27819,7 +28726,7 @@ commit d72c6f6cf55f09408108466f0821286215cc8a96 Author: Mukund Sivaraman -Date: Mon Oct 3 18:52:13 2011 +0530 +Date: Mon Oct 3 18:52:13 2011 +0530 wind: Remove dead assignments (and variables) @@ -27828,7 +28735,7 @@ commit 6bfae7f8d1addc9c3aceb5a711c8906a671a6ade Author: Mukund Sivaraman -Date: Mon Oct 3 18:50:23 2011 +0530 +Date: Mon Oct 3 18:50:23 2011 +0530 waves: Remove dead assignments (and variables) @@ -27837,7 +28744,7 @@ commit c0e873cd8aa1d9258ea672261a057b3115b019bf Author: Mukund Sivaraman -Date: Mon Oct 3 18:48:56 2011 +0530 +Date: Mon Oct 3 18:48:56 2011 +0530 file-pdf-save: Remove dead assignment (and variable) @@ -27846,7 +28753,7 @@ commit 3a4243a61f37f72a67083af82e08bf87f03fb9e4 Author: Mukund Sivaraman -Date: Mon Oct 3 18:46:24 2011 +0530 +Date: Mon Oct 3 18:46:24 2011 +0530 file-ps: Remove dead assignments (and variables) @@ -27855,7 +28762,7 @@ commit 9343018ad91ba49107ce71c5f6c554615990da08 Author: Mukund Sivaraman -Date: Mon Oct 3 18:44:27 2011 +0530 +Date: Mon Oct 3 18:44:27 2011 +0530 file-faxg3: Remove dead assignment (and variable) @@ -27864,7 +28771,7 @@ commit da075e95231cf955e2d1aeb467c3b9fa3b27ab66 Author: Mukund Sivaraman -Date: Mon Oct 3 18:42:15 2011 +0530 +Date: Mon Oct 3 18:42:15 2011 +0530 apply-canvas: Remove dead assignment @@ -27873,7 +28780,7 @@ commit cd2b6107c3ee6cbbb802b3a140db8921b1e1ea18 Author: Mukund Sivaraman -Date: Mon Oct 3 18:39:42 2011 +0530 +Date: Mon Oct 3 18:39:42 2011 +0530 file-gif-save: Remove dead assignment (and variable) @@ -27882,7 +28789,7 @@ commit 01daf311b44a91d8ccc7695d0ea356565c154135 Author: Mukund Sivaraman -Date: Mon Oct 3 13:29:02 2011 +0530 +Date: Mon Oct 3 13:29:02 2011 +0530 app: Remove redundant assignments @@ -27891,7 +28798,7 @@ commit be850d1507818b60aa4517679fdc2a9f872ebf25 Author: Mukund Sivaraman -Date: Mon Oct 3 13:21:44 2011 +0530 +Date: Mon Oct 3 13:21:44 2011 +0530 mosaic: Remove dead assignments (and variables) @@ -27900,7 +28807,7 @@ commit 5643bd510411c1e0f8738be61891d4b71cd4446c Author: Mukund Sivaraman -Date: Mon Oct 3 13:18:39 2011 +0530 +Date: Mon Oct 3 13:18:39 2011 +0530 selection-to-path: Remove dead assignments (and variable) @@ -27909,7 +28816,7 @@ commit 3a8d248404ae61b2a40c17b094a31bbb6a0d5016 Author: Mukund Sivaraman -Date: Mon Oct 3 13:16:16 2011 +0530 +Date: Mon Oct 3 13:16:16 2011 +0530 plugin-browser: Free leaf_ptr when done @@ -27918,7 +28825,7 @@ commit 3630b3857ae011c4dc5950993181c7086b121779 Author: Mukund Sivaraman -Date: Mon Oct 3 13:15:23 2011 +0530 +Date: Mon Oct 3 13:15:23 2011 +0530 plugin-browser: Remove dead assignments (and variable) @@ -27927,7 +28834,7 @@ commit 9dd857d996d5b036ce71c645889814de1b843559 Author: Mukund Sivaraman -Date: Mon Oct 3 13:11:09 2011 +0530 +Date: Mon Oct 3 13:11:09 2011 +0530 app: Remove dead assignments (and variable) @@ -27936,7 +28843,7 @@ commit 2d56f6445daa287ed653b10b0f14cf6bce1a02d3 Author: Mukund Sivaraman -Date: Mon Oct 3 13:08:17 2011 +0530 +Date: Mon Oct 3 13:08:17 2011 +0530 file-xwd: Remove dead assignments (and variable) @@ -27945,7 +28852,7 @@ commit 0ccaaf821613844524bd006ba6d8bc435d7aa0ab Author: Mukund Sivaraman -Date: Mon Oct 3 13:05:30 2011 +0530 +Date: Mon Oct 3 13:05:30 2011 +0530 app: Remove dead assignments (and variable) @@ -27954,7 +28861,7 @@ commit 13eadb00dd9eaacf34cfb4cda110020d76b51205 Author: Mukund Sivaraman -Date: Mon Oct 3 12:56:24 2011 +0530 +Date: Mon Oct 3 12:56:24 2011 +0530 warp: Remove dead assignment @@ -27963,7 +28870,7 @@ commit ea12d8da4d8cc8ff598dbbf159a204dfec4138c6 Author: Mukund Sivaraman -Date: Mon Oct 3 12:55:10 2011 +0530 +Date: Mon Oct 3 12:55:10 2011 +0530 metadata: Remove ns_prefix decl (it is conditionally used) @@ -27972,7 +28879,7 @@ commit 327e02537a371f0278cb695a6f5bf6629231e187 Author: Mukund Sivaraman -Date: Mon Oct 3 12:52:46 2011 +0530 +Date: Mon Oct 3 12:52:46 2011 +0530 sphere-designer: Lessen code @@ -27981,7 +28888,7 @@ commit 581767bb844e6276e7976b32578647cc6a6593c4 Author: Mukund Sivaraman -Date: Mon Oct 3 12:51:15 2011 +0530 +Date: Mon Oct 3 12:51:15 2011 +0530 sphere-designer: Remove dead assignment @@ -27990,7 +28897,7 @@ commit b873e732c049795cbeb140b6f94b2d1ffefc92a3 Author: Mukund Sivaraman -Date: Mon Oct 3 12:49:45 2011 +0530 +Date: Mon Oct 3 12:49:45 2011 +0530 file-xwd: Remove dead assignments @@ -27999,7 +28906,7 @@ commit b321f4ec517f11f68db80da046282be405317e21 Author: Mukund Sivaraman -Date: Mon Oct 3 12:49:06 2011 +0530 +Date: Mon Oct 3 12:49:06 2011 +0530 file-gif-save: Remove dead assignments @@ -28008,7 +28915,7 @@ commit a485bac7bc7e03c076c2c0c2fe9d32c9653e782c Author: Mukund Sivaraman -Date: Mon Oct 3 12:47:16 2011 +0530 +Date: Mon Oct 3 12:47:16 2011 +0530 mosaic: Remove dead assignments @@ -28017,7 +28924,7 @@ commit ea7abb2922dbdc34a29c2c2a359d005b616f2178 Author: Mukund Sivaraman -Date: Mon Oct 3 11:18:22 2011 +0530 +Date: Mon Oct 3 11:18:22 2011 +0530 file-psd: Remove unused but set variable (fill) @@ -28026,7 +28933,7 @@ commit 803d6c9d7cbb2f927fbfd8c05f57f4765196e54a Author: Mukund Sivaraman -Date: Mon Oct 3 11:12:41 2011 +0530 +Date: Mon Oct 3 11:12:41 2011 +0530 file-gih: Remove unused but set variable @@ -28035,7 +28942,7 @@ commit cf4d2709082a31339fba3f04ddbce4f24a831c0a Author: Mukund Sivaraman -Date: Mon Oct 3 11:08:16 2011 +0530 +Date: Mon Oct 3 11:08:16 2011 +0530 file-pnm: Handle psvals.raw as boolean valued int @@ -28044,7 +28951,7 @@ commit 74dd0196e533d1b922c5d6e4e30adb52f2c0dc58 Author: Mukund Sivaraman -Date: Mon Oct 3 11:06:55 2011 +0530 +Date: Mon Oct 3 11:06:55 2011 +0530 sharpen: Handle img_bpp outside bounds (to shut up static analyzer) @@ -28053,7 +28960,7 @@ commit 077dc13c4e8318e2be3c582d608a49fa7abc1b09 Author: Mukund Sivaraman -Date: Mon Oct 3 11:03:06 2011 +0530 +Date: Mon Oct 3 11:03:06 2011 +0530 curve-bend: Remove dead code @@ -28062,7 +28969,7 @@ commit c7466e4f8af1f2b087076435b9fcf669505345b8 Author: Mukund Sivaraman -Date: Mon Oct 3 11:00:22 2011 +0530 +Date: Mon Oct 3 11:00:22 2011 +0530 file-psd: Move run_mode decl to where it is conditionally used @@ -28071,7 +28978,7 @@ commit 211dfb0ce1f62cadeadf4daebe232694bc20927f Author: Mukund Sivaraman -Date: Mon Oct 3 10:59:48 2011 +0530 +Date: Mon Oct 3 10:59:48 2011 +0530 file-jpeg: Fix format specifiers @@ -28080,7 +28987,7 @@ commit 60d2536bd151a3e04272a490f590f8f3173b0e32 Author: Martin Nordholts -Date: Mon Oct 3 07:07:10 2011 +0200 +Date: Mon Oct 3 07:07:10 2011 +0200 libgimpwidgets: Sort gimpwidgets.def @@ -28091,21 +28998,21 @@ commit 16ca43e4c86f6236fa89bf41abacb6cd0b688ee8 Author: Martin Nordholts -Date: Sun Oct 2 18:41:11 2011 +0200 +Date: Sun Oct 2 18:41:11 2011 +0200 Revert "app: Add /gimptilebackendtilemanager/basic_write unit test" This reverts commit e4d6726bde0be63fe80fb1c92922681239faf6ea. We need a GEGL release to depend on first. - app/gegl/gimptilebackendtilemanager.c | 24 +++++---- + app/gegl/gimptilebackendtilemanager.c | 24 +++++---- app/tests/test-gimptilebackendtilemanager.c | 84 +++++------------------------ 2 files changed, 27 insertions(+), 81 deletions(-) commit e4d6726bde0be63fe80fb1c92922681239faf6ea Author: Martin Nordholts -Date: Sun Oct 2 07:24:41 2011 +0200 +Date: Sun Oct 2 07:24:41 2011 +0200 app: Add /gimptilebackendtilemanager/basic_write unit test @@ -28116,14 +29023,14 @@ Note that these tests currently do not work with GIMP's "effective tile size" optimization. - app/gegl/gimptilebackendtilemanager.c | 24 ++++----- + app/gegl/gimptilebackendtilemanager.c | 24 ++++----- app/tests/test-gimptilebackendtilemanager.c | 84 ++++++++++++++++++++++++----- 2 files changed, 81 insertions(+), 27 deletions(-) commit f1d4dde36a7b2293fef6e60f4cc5b55e1605d5fb Author: Michael Natterer -Date: Sun Oct 2 16:23:59 2011 +0200 +Date: Sun Oct 2 16:23:59 2011 +0200 libgimpwidgets: add gdk_event_triggers_context_menu() to gimp3migration.[ch] @@ -28133,31 +29040,31 @@ app/display/gimpdisplayshell-callbacks.c | 2 +- app/display/gimpdisplayshell-tool-events.c | 4 ++-- - app/widgets/gimpcolorpanel.c | 2 +- - app/widgets/gimpcomponenteditor.c | 2 +- - app/widgets/gimpcontainergridview.c | 2 +- - app/widgets/gimpcontainertreeview.c | 4 ++-- - app/widgets/gimperrorconsole.c | 2 +- - app/widgets/gimpgradienteditor.c | 2 +- - app/widgets/gimppaletteview.c | 2 +- - app/widgets/gimpview.c | 2 +- - libgimpwidgets/gimp3migration.c | 28 ++++++++++++++++++++++ - libgimpwidgets/gimp3migration.h | 10 ++++++++ - libgimpwidgets/gimpcolorbutton.c | 4 ++-- - libgimpwidgets/gimpwidgets.c | 37 + app/widgets/gimpcolorpanel.c | 2 +- + app/widgets/gimpcomponenteditor.c | 2 +- + app/widgets/gimpcontainergridview.c | 2 +- + app/widgets/gimpcontainertreeview.c | 4 ++-- + app/widgets/gimperrorconsole.c | 2 +- + app/widgets/gimpgradienteditor.c | 2 +- + app/widgets/gimppaletteview.c | 2 +- + app/widgets/gimpview.c | 2 +- + libgimpwidgets/gimp3migration.c | 28 ++++++++++++++++++++++ + libgimpwidgets/gimp3migration.h | 10 ++++++++ + libgimpwidgets/gimpcolorbutton.c | 4 ++-- + libgimpwidgets/gimpwidgets.c | 37 ------------------------------ - libgimpwidgets/gimpwidgets.def | 6 ++++- - libgimpwidgets/gimpwidgets.h | 2 -- - plug-ins/common/animation-play.c | 2 +- - plug-ins/common/colormap-remap.c | 2 +- - plug-ins/help-browser/dialog.c | 2 +- - plug-ins/ifs-compose/ifs-compose.c | 2 +- - plug-ins/imagemap/imap_main.c | 6 +++-- + libgimpwidgets/gimpwidgets.def | 6 ++++- + libgimpwidgets/gimpwidgets.h | 2 -- + plug-ins/common/animation-play.c | 2 +- + plug-ins/common/colormap-remap.c | 2 +- + plug-ins/help-browser/dialog.c | 2 +- + plug-ins/ifs-compose/ifs-compose.c | 2 +- + plug-ins/imagemap/imap_main.c | 6 +++-- 21 files changed, 65 insertions(+), 60 deletions(-) commit fb6fea3b11dae5debf104ed99ef4141705497ed5 Author: Mukund Sivaraman -Date: Sun Oct 2 19:43:57 2011 +0530 +Date: Sun Oct 2 19:43:57 2011 +0530 imagemap: Add missing include for gtk_box_new() @@ -28166,7 +29073,7 @@ commit e79f90d3b6df4d98b3534d5b26477f9d5ad78709 Author: Mukund Sivaraman -Date: Sun Oct 2 19:14:47 2011 +0530 +Date: Sun Oct 2 19:14:47 2011 +0530 app: Fix assignment (may be confused as compound assignment) @@ -28175,7 +29082,7 @@ commit 38c412ea4ffccd6ab529f3be9cd263bdc0c77ecc Author: Michael Natterer -Date: Sun Oct 2 15:13:18 2011 +0200 +Date: Sun Oct 2 15:13:18 2011 +0200 configure: don't add G_DISABLE_DEPRECATED for GLIb 2.30 @@ -28186,7 +29093,7 @@ commit 7d083ce4578ecbb2c754da53922702b65f5ff131 Author: Mukund Sivaraman -Date: Sun Oct 2 18:35:26 2011 +0530 +Date: Sun Oct 2 18:35:26 2011 +0530 app: Don't overload head_size with different meanings @@ -28207,38 +29114,38 @@ commit f007ce352d8aca06ce7233500cbd456e9ea79b88 Author: Michael Natterer -Date: Sun Oct 2 14:33:44 2011 +0200 +Date: Sun Oct 2 14:33:44 2011 +0200 libgimpwidgets: add gtk_separator_new() to gimp3migration.[ch] and use it all over the place. - devel-docs/tools/widgets.c | 2 +- + devel-docs/tools/widgets.c | 2 +- libgimpwidgets/gimp3migration.c | 9 +++++++++ libgimpwidgets/gimp3migration.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) commit 2c175b068d358b7973f47c46191f85abe4d5f41e Author: Michael Natterer -Date: Sun Oct 2 14:29:40 2011 +0200 +Date: Sun Oct 2 14:29:40 2011 +0200 libgimpwidgets: add gtk_paned_new() to gimp3migration.[ch] and use it all over the place. - app/display/gimpimagewindow.c | 4 ++-- + app/display/gimpimagewindow.c | 4 ++-- app/widgets/gimpcolordisplayeditor.c | 2 +- - app/widgets/gimppanedbox.c | 4 +--- + app/widgets/gimppanedbox.c | 4 +--- libgimpwidgets/gimp3migration.c | 9 +++++++++ libgimpwidgets/gimp3migration.h | 1 + - plug-ins/common/bump-map.c | 2 +- - plug-ins/common/newsprint.c | 2 +- + plug-ins/common/bump-map.c | 2 +- + plug-ins/common/newsprint.c | 2 +- plug-ins/help-browser/dialog.c | 2 +- 8 files changed, 17 insertions(+), 9 deletions(-) commit 19b9bfd1896e2a99f62d8fb36d95816dc73e15cb Author: Michael Natterer -Date: Sun Oct 2 14:09:45 2011 +0200 +Date: Sun Oct 2 14:09:45 2011 +0200 libgimpwidgets: add gtk_scale_new() to gimp3migration.[ch] @@ -28246,27 +29153,27 @@ to GtkAdjustment*. app/actions/gradient-editor-commands.c | 12 +++--- - app/display/gimpnavigationeditor.c | 3 +- - app/tools/gimpcolorbalancetool.c | 2 +- - app/tools/gimprotatetool.c | 2 +- - libgimpwidgets/gimp3migration.c | 10 +++++ - libgimpwidgets/gimp3migration.h | 2 + - libgimpwidgets/gimpscaleentry.c | 3 +- - modules/color-selector-water.c | 16 ++++---- - plug-ins/common/file-mng.c | 53 ++++++++++++++------------ - plug-ins/common/filter-pack.c | 38 ++++++++++--------- - plug-ins/gfig/gfig-dialog.c | 16 ++++---- - plug-ins/gimpressionist/brush.c | 45 +++++++++++----------- - plug-ins/gimpressionist/orientmap.c | 69 + app/display/gimpnavigationeditor.c | 3 +- + app/tools/gimpcolorbalancetool.c | 2 +- + app/tools/gimprotatetool.c | 2 +- + libgimpwidgets/gimp3migration.c | 10 +++++ + libgimpwidgets/gimp3migration.h | 2 + + libgimpwidgets/gimpscaleentry.c | 3 +- + modules/color-selector-water.c | 16 ++++---- + plug-ins/common/file-mng.c | 53 ++++++++++++++------------ + plug-ins/common/filter-pack.c | 38 ++++++++++--------- + plug-ins/gfig/gfig-dialog.c | 16 ++++---- + plug-ins/gimpressionist/brush.c | 45 +++++++++++----------- + plug-ins/gimpressionist/orientmap.c | 69 +++++++++++++++++----------------- - plug-ins/gimpressionist/sizemap.c | 40 ++++++++++---------- - plug-ins/ifs-compose/ifs-compose.c | 26 ++++++------- - plug-ins/maze/maze-dialog.c | 20 +++++----- + plug-ins/gimpressionist/sizemap.c | 40 ++++++++++---------- + plug-ins/ifs-compose/ifs-compose.c | 26 ++++++------- + plug-ins/maze/maze-dialog.c | 20 +++++----- 16 files changed, 185 insertions(+), 172 deletions(-) commit 16817c666fec3826e7949e7e45f476cd035637bc Author: Michael Natterer -Date: Sun Oct 2 13:18:10 2011 +0200 +Date: Sun Oct 2 13:18:10 2011 +0200 libgimpwidgets: add gtk_scrollbar_new() to gimp3migration.[ch] @@ -28282,7 +29189,7 @@ commit 1c3736ffd51628cc4f7765b8816c80d3eb54aff8 Author: Mario Blättermann -Date: Sun Oct 2 13:46:31 2011 +0200 +Date: Sun Oct 2 13:46:31 2011 +0200 [l10n] Updated German translation @@ -28292,7 +29199,7 @@ commit 5c1aa6ce0f8229ae607f20c230e531f381880580 Author: Fran Dieguez -Date: Sun Oct 2 01:19:04 2011 +0200 +Date: Sun Oct 2 01:19:04 2011 +0200 Updated Galician translations @@ -28302,27 +29209,27 @@ commit 8c35d17e907c6bfb3a3d87ca7aab56c2decba055 Author: Gil Forcada -Date: Sat Oct 1 19:57:26 2011 +0200 +Date: Sat Oct 1 19:57:26 2011 +0200 [l10n]Added Catalan (Valencian) translation - po-tags/LINGUAS | 1 + + po-tags/LINGUAS | 1 + po-tags/ca@valencia.po | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) commit 0e198039a80a57eb4325c0a4b72d53c6937abf66 Author: Eulàlia Pagès -Date: Sat Oct 1 19:57:22 2011 +0200 +Date: Sat Oct 1 19:57:22 2011 +0200 [l10n]Added Catalan translation po-tags/LINGUAS | 1 + - po-tags/ca.po | 25 +++++++++++++++++++++++++ + po-tags/ca.po | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) commit c1257432e1d84d7e71e5ff90f284b83058d8f28d Author: Carles Ferrando -Date: Sat Oct 1 19:54:48 2011 +0200 +Date: Sat Oct 1 19:54:48 2011 +0200 [l10n]Updated Catalan (Valencian) translation @@ -28332,7 +29239,7 @@ commit 0289e356d3e2307b5c2989d7ea889c3b030bb811 Author: Albert -Date: Sat Oct 1 19:52:53 2011 +0200 +Date: Sat Oct 1 19:52:53 2011 +0200 [l10n]Updated Catalan translation @@ -28342,7 +29249,7 @@ commit eff20af915a6084a8e6f39351ce8f438bb9f8960 Author: Alexia Death -Date: Sat Oct 1 17:07:27 2011 +0300 +Date: Sat Oct 1 17:07:27 2011 +0300 app: rect tool changes made for suppressed execute need to be applied @@ -28351,7 +29258,7 @@ commit c8fa2c99e8036eb0920cd11f4ec7aa832b9aef4d Author: Alexia Death -Date: Sat Oct 1 14:19:51 2011 +0300 +Date: Sat Oct 1 14:19:51 2011 +0300 app: handle motion right just created size fixed rects @@ -28361,7 +29268,7 @@ commit 5a99bf4f47eb252116e965c8337beee5e6a7af8e Author: Alexia Death -Date: Sat Oct 1 14:17:12 2011 +0300 +Date: Sat Oct 1 14:17:12 2011 +0300 app: prevent executing rectangle tool on the creating click @@ -28370,18 +29277,18 @@ commit 1f66a4217729243742ed2c7d44f48e7213989c5a Author: Jorge González -Date: Sat Oct 1 14:02:40 2011 +0200 +Date: Sat Oct 1 14:02:40 2011 +0200 Updated Spanish translation po-plug-ins/es.po | 341 ++++++++++++----------- - po/es.po | 818 + po/es.po | 818 ++++++++++++++++++++++++++++-------------------------- 2 files changed, 595 insertions(+), 564 deletions(-) commit ef7060251c8cfeadf56e7286acdf00c1967e8eb8 Author: Alexia Death -Date: Sat Oct 1 11:45:11 2011 +0300 +Date: Sat Oct 1 11:45:11 2011 +0300 app: initalize rectangle tool respecting size constrants @@ -28391,7 +29298,7 @@ commit 890b9abf940345245242c1cadf9cb0ef8a0208a3 Author: Mukund Sivaraman -Date: Sat Oct 1 13:13:49 2011 +0530 +Date: Sat Oct 1 13:13:49 2011 +0530 libgimpcolor: Remove conditions which are always true @@ -28400,7 +29307,7 @@ commit f342b504838c84ad1914dace3bcb9d880d1111a2 Author: Michael Natterer -Date: Fri Sep 30 15:43:02 2011 +0200 +Date: Fri Sep 30 15:43:02 2011 +0200 libgimpwidgets: add gtk_button_box_new() to gimp3migration.[ch] @@ -28413,14 +29320,14 @@ libgimpwidgets/gimpwidgets.def | 1 + plug-ins/common/cml-explorer.c | 4 ++-- plug-ins/common/file-pdf-save.c | 2 +- - plug-ins/common/newsprint.c | 2 +- - plug-ins/common/qbist.c | 2 +- - plug-ins/flame/flame.c | 2 +- + plug-ins/common/newsprint.c | 2 +- + plug-ins/common/qbist.c | 2 +- + plug-ins/flame/flame.c | 2 +- 10 files changed, 22 insertions(+), 10 deletions(-) commit a7604f706d5c36743ed6b62868814f1d86228c62 Author: Mukund Sivaraman -Date: Fri Sep 30 18:30:41 2011 +0530 +Date: Fri Sep 30 18:30:41 2011 +0530 file-jpeg: Save and restore use_orig_quality @@ -28429,179 +29336,179 @@ commit aa2a876d22693d2e46c938a56a23e1e6e1b3253d Author: Mukund Sivaraman -Date: Fri Sep 30 18:29:54 2011 +0530 +Date: Fri Sep 30 18:29:54 2011 +0530 file-jpeg: Rename load_save_defaults() to load_defaults() plug-ins/file-jpeg/jpeg-save.c | 4 ++-- plug-ins/file-jpeg/jpeg-save.h | 2 +- - plug-ins/file-jpeg/jpeg.c | 2 +- + plug-ins/file-jpeg/jpeg.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) commit dcb4c6e34a9956802eb958408a5c7fddf169d2a7 Author: Michael Natterer -Date: Fri Sep 30 12:17:53 2011 +0200 +Date: Fri Sep 30 12:17:53 2011 +0200 plug-ins: use gtk_box_new() - plug-ins/color-rotate/color-rotate-dialog.c | 26 ++++++++--------- - plug-ins/common/alien-map.c | 6 ++-- - plug-ins/common/animation-play.c | 6 ++-- - plug-ins/common/apply-canvas.c | 2 +- - plug-ins/common/blinds.c | 4 +-- - plug-ins/common/blur-gauss-selective.c | 2 +- - plug-ins/common/blur-gauss.c | 4 +-- - plug-ins/common/blur-motion.c | 6 ++-- - plug-ins/common/border-average.c | 6 ++-- - plug-ins/common/bump-map.c | 10 +++---- - plug-ins/common/cartoon.c | 2 +- - plug-ins/common/channel-mixer.c | 8 +++--- - plug-ins/common/checkerboard.c | 4 +-- - plug-ins/common/cml-explorer.c | 10 +++---- - plug-ins/common/color-cube-analyze.c | 4 +-- - plug-ins/common/color-exchange.c | 6 ++-- - plug-ins/common/color-to-alpha.c | 4 +-- - plug-ins/common/colorify.c | 2 +- - plug-ins/common/colormap-remap.c | 2 +- - plug-ins/common/compose.c | 8 +++--- - plug-ins/common/contrast-retinex.c | 2 +- - plug-ins/common/convolution-matrix.c | 18 ++++++------ - plug-ins/common/cubism.c | 2 +- - plug-ins/common/curve-bend.c | 20 ++++++------- - plug-ins/common/decompose.c | 6 ++-- - plug-ins/common/deinterlace.c | 2 +- - plug-ins/common/depth-merge.c | 4 +-- - plug-ins/common/despeckle.c | 4 +-- - plug-ins/common/destripe.c | 2 +- - plug-ins/common/diffraction.c | 4 +-- - plug-ins/common/displace.c | 4 +-- - plug-ins/common/edge-dog.c | 2 +- - plug-ins/common/edge-neon.c | 2 +- - plug-ins/common/edge-sobel.c | 2 +- - plug-ins/common/edge.c | 4 +-- - plug-ins/common/emboss.c | 2 +- - plug-ins/common/engrave.c | 2 +- - plug-ins/common/file-aa.c | 2 +- - plug-ins/common/file-csource.c | 2 +- - plug-ins/common/file-gih.c | 4 +-- - plug-ins/common/file-html-table.c | 6 ++-- - plug-ins/common/file-mng.c | 8 +++--- - plug-ins/common/file-pdf-load.c | 4 +-- - plug-ins/common/file-pdf-save.c | 8 +++--- - plug-ins/common/file-ps.c | 18 ++++++------ - plug-ins/common/file-raw.c | 4 +-- - plug-ins/common/file-svg.c | 10 +++---- - plug-ins/common/file-tga.c | 4 +-- - plug-ins/common/file-tiff-load.c | 2 +- - plug-ins/common/file-tiff-save.c | 4 +-- - plug-ins/common/file-wmf.c | 10 +++---- - plug-ins/common/file-xbm.c | 2 +- - plug-ins/common/file-xmc.c | 2 +- - plug-ins/common/film.c | 19 +++++++------ - plug-ins/common/filter-pack.c | 16 +++++------ - plug-ins/common/fractal-trace.c | 4 +-- - plug-ins/common/grid.c | 4 +-- - plug-ins/common/hot.c | 4 +-- - plug-ins/common/illusion.c | 2 +- - plug-ins/common/iwarp.c | 13 +++++---- - plug-ins/common/jigsaw.c | 2 +- - plug-ins/common/lcms.c | 10 +++---- - plug-ins/common/lens-apply.c | 6 ++-- - plug-ins/common/lens-distortion.c | 2 +- - plug-ins/common/lens-flare.c | 4 +-- - plug-ins/common/mail.c | 2 +- - plug-ins/common/max-rgb.c | 2 +- - plug-ins/common/mosaic.c | 6 ++-- - plug-ins/common/newsprint.c | 20 ++++++------- - plug-ins/common/nl-filter.c | 2 +- - plug-ins/common/noise-hsv.c | 2 +- - plug-ins/common/noise-randomize.c | 2 +- - plug-ins/common/noise-rgb.c | 4 +-- - plug-ins/common/noise-solid.c | 2 +- - plug-ins/common/noise-spread.c | 2 +- - plug-ins/common/nova.c | 4 +-- - plug-ins/common/oilify.c | 2 +- - plug-ins/common/photocopy.c | 2 +- - plug-ins/common/pixelize.c | 2 +- - plug-ins/common/plasma.c | 2 +- - plug-ins/common/polar-coords.c | 5 ++-- - plug-ins/common/qbist.c | 2 +- - plug-ins/common/red-eye-removal.c | 2 +- - plug-ins/common/ripple.c | 4 +-- - plug-ins/common/sample-colorize.c | 18 ++++++------ - plug-ins/common/screenshot.c | 12 ++++---- - plug-ins/common/sharpen.c | 2 +- - plug-ins/common/shift.c | 2 +- - plug-ins/common/sinus.c | 20 ++++++------- - plug-ins/common/softglow.c | 2 +- - plug-ins/common/sparkle.c | 6 ++-- - plug-ins/common/sphere-designer.c | 22 ++++++++------- - plug-ins/common/threshold-alpha.c | 2 +- - plug-ins/common/tile-glass.c | 2 +- - plug-ins/common/tile-paper.c | 6 ++-- - plug-ins/common/tile-small.c | 11 ++++---- - plug-ins/common/tile.c | 2 +- - plug-ins/common/unsharp-mask.c | 2 +- - plug-ins/common/value-propagate.c | 6 ++-- - plug-ins/common/van-gogh-lic.c | 4 +-- - plug-ins/common/video.c | 6 ++-- - plug-ins/common/warp.c | 6 ++-- - plug-ins/common/waves.c | 2 +- - plug-ins/common/web-page.c | 10 +++---- - plug-ins/common/whirl-pinch.c | 2 +- - plug-ins/common/wind.c | 2 +- - plug-ins/file-bmp/bmp-write.c | 10 +++---- - plug-ins/file-fits/fits.c | 2 +- - plug-ins/file-ico/ico-dialog.c | 8 +++--- - plug-ins/file-jpeg/jpeg-exif.c | 6 ++-- - plug-ins/file-jpeg/jpeg-save.c | 6 ++-- - plug-ins/flame/flame.c | 16 +++++------ + plug-ins/color-rotate/color-rotate-dialog.c | 26 ++++++++--------- + plug-ins/common/alien-map.c | 6 ++-- + plug-ins/common/animation-play.c | 6 ++-- + plug-ins/common/apply-canvas.c | 2 +- + plug-ins/common/blinds.c | 4 +-- + plug-ins/common/blur-gauss-selective.c | 2 +- + plug-ins/common/blur-gauss.c | 4 +-- + plug-ins/common/blur-motion.c | 6 ++-- + plug-ins/common/border-average.c | 6 ++-- + plug-ins/common/bump-map.c | 10 +++---- + plug-ins/common/cartoon.c | 2 +- + plug-ins/common/channel-mixer.c | 8 +++--- + plug-ins/common/checkerboard.c | 4 +-- + plug-ins/common/cml-explorer.c | 10 +++---- + plug-ins/common/color-cube-analyze.c | 4 +-- + plug-ins/common/color-exchange.c | 6 ++-- + plug-ins/common/color-to-alpha.c | 4 +-- + plug-ins/common/colorify.c | 2 +- + plug-ins/common/colormap-remap.c | 2 +- + plug-ins/common/compose.c | 8 +++--- + plug-ins/common/contrast-retinex.c | 2 +- + plug-ins/common/convolution-matrix.c | 18 ++++++------ + plug-ins/common/cubism.c | 2 +- + plug-ins/common/curve-bend.c | 20 ++++++------- + plug-ins/common/decompose.c | 6 ++-- + plug-ins/common/deinterlace.c | 2 +- + plug-ins/common/depth-merge.c | 4 +-- + plug-ins/common/despeckle.c | 4 +-- + plug-ins/common/destripe.c | 2 +- + plug-ins/common/diffraction.c | 4 +-- + plug-ins/common/displace.c | 4 +-- + plug-ins/common/edge-dog.c | 2 +- + plug-ins/common/edge-neon.c | 2 +- + plug-ins/common/edge-sobel.c | 2 +- + plug-ins/common/edge.c | 4 +-- + plug-ins/common/emboss.c | 2 +- + plug-ins/common/engrave.c | 2 +- + plug-ins/common/file-aa.c | 2 +- + plug-ins/common/file-csource.c | 2 +- + plug-ins/common/file-gih.c | 4 +-- + plug-ins/common/file-html-table.c | 6 ++-- + plug-ins/common/file-mng.c | 8 +++--- + plug-ins/common/file-pdf-load.c | 4 +-- + plug-ins/common/file-pdf-save.c | 8 +++--- + plug-ins/common/file-ps.c | 18 ++++++------ + plug-ins/common/file-raw.c | 4 +-- + plug-ins/common/file-svg.c | 10 +++---- + plug-ins/common/file-tga.c | 4 +-- + plug-ins/common/file-tiff-load.c | 2 +- + plug-ins/common/file-tiff-save.c | 4 +-- + plug-ins/common/file-wmf.c | 10 +++---- + plug-ins/common/file-xbm.c | 2 +- + plug-ins/common/file-xmc.c | 2 +- + plug-ins/common/film.c | 19 +++++++------ + plug-ins/common/filter-pack.c | 16 +++++------ + plug-ins/common/fractal-trace.c | 4 +-- + plug-ins/common/grid.c | 4 +-- + plug-ins/common/hot.c | 4 +-- + plug-ins/common/illusion.c | 2 +- + plug-ins/common/iwarp.c | 13 +++++---- + plug-ins/common/jigsaw.c | 2 +- + plug-ins/common/lcms.c | 10 +++---- + plug-ins/common/lens-apply.c | 6 ++-- + plug-ins/common/lens-distortion.c | 2 +- + plug-ins/common/lens-flare.c | 4 +-- + plug-ins/common/mail.c | 2 +- + plug-ins/common/max-rgb.c | 2 +- + plug-ins/common/mosaic.c | 6 ++-- + plug-ins/common/newsprint.c | 20 ++++++------- + plug-ins/common/nl-filter.c | 2 +- + plug-ins/common/noise-hsv.c | 2 +- + plug-ins/common/noise-randomize.c | 2 +- + plug-ins/common/noise-rgb.c | 4 +-- + plug-ins/common/noise-solid.c | 2 +- + plug-ins/common/noise-spread.c | 2 +- + plug-ins/common/nova.c | 4 +-- + plug-ins/common/oilify.c | 2 +- + plug-ins/common/photocopy.c | 2 +- + plug-ins/common/pixelize.c | 2 +- + plug-ins/common/plasma.c | 2 +- + plug-ins/common/polar-coords.c | 5 ++-- + plug-ins/common/qbist.c | 2 +- + plug-ins/common/red-eye-removal.c | 2 +- + plug-ins/common/ripple.c | 4 +-- + plug-ins/common/sample-colorize.c | 18 ++++++------ + plug-ins/common/screenshot.c | 12 ++++---- + plug-ins/common/sharpen.c | 2 +- + plug-ins/common/shift.c | 2 +- + plug-ins/common/sinus.c | 20 ++++++------- + plug-ins/common/softglow.c | 2 +- + plug-ins/common/sparkle.c | 6 ++-- + plug-ins/common/sphere-designer.c | 22 ++++++++------- + plug-ins/common/threshold-alpha.c | 2 +- + plug-ins/common/tile-glass.c | 2 +- + plug-ins/common/tile-paper.c | 6 ++-- + plug-ins/common/tile-small.c | 11 ++++---- + plug-ins/common/tile.c | 2 +- + plug-ins/common/unsharp-mask.c | 2 +- + plug-ins/common/value-propagate.c | 6 ++-- + plug-ins/common/van-gogh-lic.c | 4 +-- + plug-ins/common/video.c | 6 ++-- + plug-ins/common/warp.c | 6 ++-- + plug-ins/common/waves.c | 2 +- + plug-ins/common/web-page.c | 10 +++---- + plug-ins/common/whirl-pinch.c | 2 +- + plug-ins/common/wind.c | 2 +- + plug-ins/file-bmp/bmp-write.c | 10 +++---- + plug-ins/file-fits/fits.c | 2 +- + plug-ins/file-ico/ico-dialog.c | 8 +++--- + plug-ins/file-jpeg/jpeg-exif.c | 6 ++-- + plug-ins/file-jpeg/jpeg-save.c | 6 ++-- + plug-ins/flame/flame.c | 16 +++++------ .../fractal-explorer/fractal-explorer-dialogs.c | 33 ++++++++++++---------- - plug-ins/gfig/gfig-bezier.c | 2 +- - plug-ins/gfig/gfig-dialog.c | 20 ++++++------- - plug-ins/gfig/gfig-preview.c | 9 +++--- - plug-ins/gimpressionist/brush.c | 10 +++---- - plug-ins/gimpressionist/color.c | 2 +- - plug-ins/gimpressionist/general.c | 10 +++---- - plug-ins/gimpressionist/gimpressionist.c | 2 +- - plug-ins/gimpressionist/orientation.c | 12 ++++---- - plug-ins/gimpressionist/orientmap.c | 9 +++--- - plug-ins/gimpressionist/paper.c | 6 ++-- - plug-ins/gimpressionist/placement.c | 2 +- - plug-ins/gimpressionist/presets.c | 14 ++++----- - plug-ins/gimpressionist/preview.c | 5 ++-- - plug-ins/gimpressionist/size.c | 12 ++++---- - plug-ins/gimpressionist/sizemap.c | 5 ++-- - plug-ins/gradient-flare/gradient-flare.c | 26 ++++++++--------- - plug-ins/help-browser/dialog.c | 6 ++-- - plug-ins/ifs-compose/ifs-compose.c | 14 ++++----- - plug-ins/imagemap/imap_browse.c | 2 +- - plug-ins/imagemap/imap_cmd_gimp_guides.c | 6 ++-- - plug-ins/imagemap/imap_cmd_guides.c | 2 +- - plug-ins/imagemap/imap_default_dialog.c | 2 +- - plug-ins/imagemap/imap_edit_area_info.c | 6 ++-- - plug-ins/imagemap/imap_grid.c | 2 +- - plug-ins/imagemap/imap_main.c | 4 +-- - plug-ins/imagemap/imap_polygon.c | 4 ++- - plug-ins/imagemap/imap_preferences.c | 4 +-- - plug-ins/imagemap/imap_selection.c | 2 +- - plug-ins/imagemap/imap_settings.c | 2 +- - plug-ins/imagemap/imap_statusbar.c | 4 ++- - plug-ins/lighting/lighting-ui.c | 20 ++++++------- - plug-ins/map-object/map-object-ui.c | 28 + plug-ins/gfig/gfig-bezier.c | 2 +- + plug-ins/gfig/gfig-dialog.c | 20 ++++++------- + plug-ins/gfig/gfig-preview.c | 9 +++--- + plug-ins/gimpressionist/brush.c | 10 +++---- + plug-ins/gimpressionist/color.c | 2 +- + plug-ins/gimpressionist/general.c | 10 +++---- + plug-ins/gimpressionist/gimpressionist.c | 2 +- + plug-ins/gimpressionist/orientation.c | 12 ++++---- + plug-ins/gimpressionist/orientmap.c | 9 +++--- + plug-ins/gimpressionist/paper.c | 6 ++-- + plug-ins/gimpressionist/placement.c | 2 +- + plug-ins/gimpressionist/presets.c | 14 ++++----- + plug-ins/gimpressionist/preview.c | 5 ++-- + plug-ins/gimpressionist/size.c | 12 ++++---- + plug-ins/gimpressionist/sizemap.c | 5 ++-- + plug-ins/gradient-flare/gradient-flare.c | 26 ++++++++--------- + plug-ins/help-browser/dialog.c | 6 ++-- + plug-ins/ifs-compose/ifs-compose.c | 14 ++++----- + plug-ins/imagemap/imap_browse.c | 2 +- + plug-ins/imagemap/imap_cmd_gimp_guides.c | 6 ++-- + plug-ins/imagemap/imap_cmd_guides.c | 2 +- + plug-ins/imagemap/imap_default_dialog.c | 2 +- + plug-ins/imagemap/imap_edit_area_info.c | 6 ++-- + plug-ins/imagemap/imap_grid.c | 2 +- + plug-ins/imagemap/imap_main.c | 4 +-- + plug-ins/imagemap/imap_polygon.c | 4 ++- + plug-ins/imagemap/imap_preferences.c | 4 +-- + plug-ins/imagemap/imap_selection.c | 2 +- + plug-ins/imagemap/imap_settings.c | 2 +- + plug-ins/imagemap/imap_statusbar.c | 4 ++- + plug-ins/lighting/lighting-ui.c | 20 ++++++------- + plug-ins/map-object/map-object-ui.c | 28 +++++++++--------- - plug-ins/maze/maze-dialog.c | 10 +++---- - plug-ins/pagecurl/pagecurl.c | 5 ++-- - plug-ins/print/print-page-layout.c | 14 ++++----- - plug-ins/script-fu/script-fu-console.c | 4 +-- - plug-ins/script-fu/script-fu-interface.c | 4 +-- - plug-ins/win-snap/winsnap.c | 4 +-- + plug-ins/maze/maze-dialog.c | 10 +++---- + plug-ins/pagecurl/pagecurl.c | 5 ++-- + plug-ins/print/print-page-layout.c | 14 ++++----- + plug-ins/script-fu/script-fu-console.c | 4 +-- + plug-ins/script-fu/script-fu-interface.c | 4 +-- + plug-ins/win-snap/winsnap.c | 4 +-- 151 files changed, 497 insertions(+), 475 deletions(-) commit cb242a484e296d095c7728088334813dab6ef2ac Author: Martin Nordholts -Date: Mon Sep 19 06:33:49 2011 +0200 +Date: Mon Sep 19 06:33:49 2011 +0200 app: Add basic GimpTileBackendTileManager unit test @@ -28609,30 +29516,30 @@ GimpTileBackendTileManager enough to make it pass. Still a lot of work left to do, this was just to get things up and running. - app/gegl/gimptilebackendtilemanager.c | 122 + app/gegl/gimptilebackendtilemanager.c | 122 ++++++++++------------------ - app/gegl/gimptilebackendtilemanager.h | 2 +- - app/tests/.gitignore | 1 + - app/tests/Makefile.am | 1 + + app/gegl/gimptilebackendtilemanager.h | 2 +- + app/tests/.gitignore | 1 + + app/tests/Makefile.am | 1 + app/tests/test-gimptilebackendtilemanager.c | 103 +++++++++++++++++++++++ 5 files changed, 147 insertions(+), 82 deletions(-) commit 06a16afa7d05d2bc4ad1bba147fd7813bed34cea Author: Martin Nordholts -Date: Fri Sep 30 10:28:18 2011 +0200 +Date: Fri Sep 30 10:28:18 2011 +0200 app: Add GimpTileBackendTileManagerPrivate Also do some minor cleanup. - app/gegl/gimp-gegl-types.h | 5 +++++ + app/gegl/gimp-gegl-types.h | 5 +++++ app/gegl/gimptilebackendtilemanager.c | 21 ++++++++++++++++----- app/gegl/gimptilebackendtilemanager.h | 6 +++--- 3 files changed, 24 insertions(+), 8 deletions(-) commit 93a0d51d16fd8ce0a10c91ddd47b34d111ad82d4 Author: Michael Natterer -Date: Fri Sep 30 11:41:43 2011 +0200 +Date: Fri Sep 30 11:41:43 2011 +0200 devel-docs: use gtk_box_new() @@ -28642,121 +29549,121 @@ commit 3e336199b9bf2360d034fa8ad9d3f170920e70dc Author: Michael Natterer -Date: Fri Sep 30 11:29:11 2011 +0200 +Date: Fri Sep 30 11:29:11 2011 +0200 app: use gtk_box_new() - app/actions/gradient-editor-commands.c | 4 ++-- - app/dialogs/channel-options-dialog.c | 4 ++-- - app/dialogs/convert-dialog.c | 8 ++++---- - app/dialogs/fade-dialog.c | 2 +- - app/dialogs/file-open-location-dialog.c | 6 +++--- - app/dialogs/image-merge-layers-dialog.c | 2 +- - app/dialogs/image-new-dialog.c | 2 +- - app/dialogs/keyboard-shortcuts-dialog.c | 2 +- - app/dialogs/layer-add-mask-dialog.c | 2 +- - app/dialogs/layer-options-dialog.c | 2 +- - app/dialogs/module-dialog.c | 4 ++-- - app/dialogs/offset-dialog.c | 6 +++--- - app/dialogs/palette-import-dialog.c | 6 +++--- - app/dialogs/preferences-dialog.c | 28 + app/actions/gradient-editor-commands.c | 4 ++-- + app/dialogs/channel-options-dialog.c | 4 ++-- + app/dialogs/convert-dialog.c | 8 ++++---- + app/dialogs/fade-dialog.c | 2 +- + app/dialogs/file-open-location-dialog.c | 6 +++--- + app/dialogs/image-merge-layers-dialog.c | 2 +- + app/dialogs/image-new-dialog.c | 2 +- + app/dialogs/keyboard-shortcuts-dialog.c | 2 +- + app/dialogs/layer-add-mask-dialog.c | 2 +- + app/dialogs/layer-options-dialog.c | 2 +- + app/dialogs/module-dialog.c | 4 ++-- + app/dialogs/offset-dialog.c | 6 +++--- + app/dialogs/palette-import-dialog.c | 6 +++--- + app/dialogs/preferences-dialog.c | 28 ++++++++++++++-------------- - app/dialogs/print-size-dialog.c | 4 ++-- - app/dialogs/resize-dialog.c | 6 +++--- - app/dialogs/resolution-calibrate-dialog.c | 4 ++-- - app/dialogs/scale-dialog.c | 6 +++--- - app/dialogs/stroke-dialog.c | 6 +++--- - app/dialogs/template-options-dialog.c | 2 +- - app/dialogs/tips-dialog.c | 8 ++++---- - app/dialogs/vectors-import-dialog.c | 2 +- - app/dialogs/vectors-options-dialog.c | 4 ++-- - app/display/gimpcursorview.c | 18 +++++++++++++----- - app/display/gimpdisplayshell-layer-select.c | 4 +++- - app/display/gimpdisplayshell-scale-dialog.c | 4 ++-- - app/display/gimpdisplayshell.c | 6 +++--- - app/display/gimpimagewindow.c | 6 +++--- - app/display/gimpnavigationeditor.c | 2 +- - app/gui/splash.c | 3 ++- - app/tools/gimpalignoptions.c | 16 ++++++++-------- - app/tools/gimpblendoptions.c | 2 +- - app/tools/gimpbucketfilloptions.c | 2 +- - app/tools/gimpcolorbalancetool.c | 4 ++-- - app/tools/gimpcolorizetool.c | 2 +- - app/tools/gimpcolorpickertool.c | 2 +- - app/tools/gimpcurvestool.c | 11 ++++++----- - app/tools/gimpflipoptions.c | 2 +- - app/tools/gimpforegroundselectoptions.c | 4 ++-- - app/tools/gimpgegltool.c | 2 +- - app/tools/gimphuesaturationtool.c | 6 +++--- - app/tools/gimpimagemaptool-settings.c | 2 +- - app/tools/gimpimagemaptool.c | 4 ++-- - app/tools/gimpinkoptions-gui.c | 6 +++--- - app/tools/gimplevelstool.c | 24 ++++++++++++------------ - app/tools/gimpmoveoptions.c | 2 +- - app/tools/gimppaintoptions-gui.c | 14 +++++++------- - app/tools/gimpperspectiveclonetool.c | 2 +- - app/tools/gimprectangleoptions.c | 12 ++++++------ - app/tools/gimpselectionoptions.c | 2 +- - app/tools/gimptextoptions.c | 6 +++--- - app/tools/gimptexttool.c | 2 +- - app/tools/gimpthresholdtool.c | 4 ++-- - app/tools/gimptooloptions-gui.c | 4 +++- - app/tools/gimptransformoptions.c | 4 ++-- - app/widgets/gimpactioneditor.c | 2 +- - app/widgets/gimpbrusheditor.c | 4 ++-- - app/widgets/gimpbufferview.c | 2 +- - app/widgets/gimpcolordisplayeditor.c | 13 +++++++------ - app/widgets/gimpcoloreditor.c | 8 +++++--- - app/widgets/gimpcolorframe.c | 7 ++++--- - app/widgets/gimpcontrollereditor.c | 6 +++--- - app/widgets/gimpcontrollerlist.c | 5 +++-- - app/widgets/gimpdeviceeditor.c | 4 ++-- - app/widgets/gimpdeviceinfoeditor.c | 8 ++++---- - app/widgets/gimpdevicestatus.c | 6 +++--- - app/widgets/gimpdnd.c | 2 +- - app/widgets/gimpdock.c | 4 ++-- - app/widgets/gimpdockable.c | 2 +- - app/widgets/gimpdockwindow.c | 4 ++-- - app/widgets/gimpeditor.c | 4 +++- - app/widgets/gimperrordialog.c | 2 +- - app/widgets/gimpgradienteditor.c | 6 +++--- - app/widgets/gimpgrideditor.c | 4 ++-- - app/widgets/gimphistogrambox.c | 6 +++--- - app/widgets/gimphistogrameditor.c | 2 +- - app/widgets/gimpimagecommenteditor.c | 2 +- - app/widgets/gimpitemtreeview.c | 6 +++--- - app/widgets/gimppaletteeditor.c | 2 +- - app/widgets/gimpsettingsbox.c | 3 ++- - app/widgets/gimpsizebox.c | 6 +++--- - app/widgets/gimpstrokeeditor.c | 4 ++-- - app/widgets/gimptemplateeditor.c | 10 +++++----- - app/widgets/gimptextstyleeditor.c | 4 ++-- - app/widgets/gimpthumbbox.c | 7 ++++--- - app/widgets/gimptoolbox.c | 2 +- - app/widgets/gimptooloptionseditor.c | 2 +- - app/widgets/gimptoolpreseteditor.c | 4 ++-- - app/widgets/gimpviewablebox.c | 8 ++++---- - app/widgets/gimpviewabledialog.c | 4 ++-- - app/widgets/gimpwidgets-constructors.c | 2 +- - app/widgets/gimpwidgets-utils.c | 6 +++--- + app/dialogs/print-size-dialog.c | 4 ++-- + app/dialogs/resize-dialog.c | 6 +++--- + app/dialogs/resolution-calibrate-dialog.c | 4 ++-- + app/dialogs/scale-dialog.c | 6 +++--- + app/dialogs/stroke-dialog.c | 6 +++--- + app/dialogs/template-options-dialog.c | 2 +- + app/dialogs/tips-dialog.c | 8 ++++---- + app/dialogs/vectors-import-dialog.c | 2 +- + app/dialogs/vectors-options-dialog.c | 4 ++-- + app/display/gimpcursorview.c | 18 +++++++++++++----- + app/display/gimpdisplayshell-layer-select.c | 4 +++- + app/display/gimpdisplayshell-scale-dialog.c | 4 ++-- + app/display/gimpdisplayshell.c | 6 +++--- + app/display/gimpimagewindow.c | 6 +++--- + app/display/gimpnavigationeditor.c | 2 +- + app/gui/splash.c | 3 ++- + app/tools/gimpalignoptions.c | 16 ++++++++-------- + app/tools/gimpblendoptions.c | 2 +- + app/tools/gimpbucketfilloptions.c | 2 +- + app/tools/gimpcolorbalancetool.c | 4 ++-- + app/tools/gimpcolorizetool.c | 2 +- + app/tools/gimpcolorpickertool.c | 2 +- + app/tools/gimpcurvestool.c | 11 ++++++----- + app/tools/gimpflipoptions.c | 2 +- + app/tools/gimpforegroundselectoptions.c | 4 ++-- + app/tools/gimpgegltool.c | 2 +- + app/tools/gimphuesaturationtool.c | 6 +++--- + app/tools/gimpimagemaptool-settings.c | 2 +- + app/tools/gimpimagemaptool.c | 4 ++-- + app/tools/gimpinkoptions-gui.c | 6 +++--- + app/tools/gimplevelstool.c | 24 ++++++++++++------------ + app/tools/gimpmoveoptions.c | 2 +- + app/tools/gimppaintoptions-gui.c | 14 +++++++------- + app/tools/gimpperspectiveclonetool.c | 2 +- + app/tools/gimprectangleoptions.c | 12 ++++++------ + app/tools/gimpselectionoptions.c | 2 +- + app/tools/gimptextoptions.c | 6 +++--- + app/tools/gimptexttool.c | 2 +- + app/tools/gimpthresholdtool.c | 4 ++-- + app/tools/gimptooloptions-gui.c | 4 +++- + app/tools/gimptransformoptions.c | 4 ++-- + app/widgets/gimpactioneditor.c | 2 +- + app/widgets/gimpbrusheditor.c | 4 ++-- + app/widgets/gimpbufferview.c | 2 +- + app/widgets/gimpcolordisplayeditor.c | 13 +++++++------ + app/widgets/gimpcoloreditor.c | 8 +++++--- + app/widgets/gimpcolorframe.c | 7 ++++--- + app/widgets/gimpcontrollereditor.c | 6 +++--- + app/widgets/gimpcontrollerlist.c | 5 +++-- + app/widgets/gimpdeviceeditor.c | 4 ++-- + app/widgets/gimpdeviceinfoeditor.c | 8 ++++---- + app/widgets/gimpdevicestatus.c | 6 +++--- + app/widgets/gimpdnd.c | 2 +- + app/widgets/gimpdock.c | 4 ++-- + app/widgets/gimpdockable.c | 2 +- + app/widgets/gimpdockwindow.c | 4 ++-- + app/widgets/gimpeditor.c | 4 +++- + app/widgets/gimperrordialog.c | 2 +- + app/widgets/gimpgradienteditor.c | 6 +++--- + app/widgets/gimpgrideditor.c | 4 ++-- + app/widgets/gimphistogrambox.c | 6 +++--- + app/widgets/gimphistogrameditor.c | 2 +- + app/widgets/gimpimagecommenteditor.c | 2 +- + app/widgets/gimpitemtreeview.c | 6 +++--- + app/widgets/gimppaletteeditor.c | 2 +- + app/widgets/gimpsettingsbox.c | 3 ++- + app/widgets/gimpsizebox.c | 6 +++--- + app/widgets/gimpstrokeeditor.c | 4 ++-- + app/widgets/gimptemplateeditor.c | 10 +++++----- + app/widgets/gimptextstyleeditor.c | 4 ++-- + app/widgets/gimpthumbbox.c | 7 ++++--- + app/widgets/gimptoolbox.c | 2 +- + app/widgets/gimptooloptionseditor.c | 2 +- + app/widgets/gimptoolpreseteditor.c | 4 ++-- + app/widgets/gimpviewablebox.c | 8 ++++---- + app/widgets/gimpviewabledialog.c | 4 ++-- + app/widgets/gimpwidgets-constructors.c | 2 +- + app/widgets/gimpwidgets-utils.c | 6 +++--- 92 files changed, 250 insertions(+), 227 deletions(-) commit 4373dccdc1f1fb306fbd1f8f26fb49b1af52f1dd Author: Michael Natterer -Date: Fri Sep 30 10:59:40 2011 +0200 +Date: Fri Sep 30 10:59:40 2011 +0200 modules: use gtk_box_new() - modules/color-selector-water.c | 2 +- - modules/display-filter-color-blind.c | 2 +- - modules/display-filter-gamma.c | 2 +- + modules/color-selector-water.c | 2 +- + modules/display-filter-color-blind.c | 2 +- + modules/display-filter-gamma.c | 2 +- modules/display-filter-high-contrast.c | 2 +- - modules/display-filter-lcms.c | 2 +- + modules/display-filter-lcms.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) commit 31fccf8272827ebaa1419a23fda2e52cbff495a1 Author: Martin Srebotnjak -Date: Fri Sep 30 10:57:50 2011 +0200 +Date: Fri Sep 30 10:57:50 2011 +0200 Updated Slovenian translation @@ -28766,62 +29673,62 @@ commit 72b0ef397f6d502175bb87fca44eb84a80b595fc Author: Michael Natterer -Date: Fri Sep 30 10:53:32 2011 +0200 +Date: Fri Sep 30 10:53:32 2011 +0200 libgimp: use gtk_box_new() libgimp/gimpbrushselectbutton.c | 2 +- - libgimp/gimpexport.c | 10 +++++----- + libgimp/gimpexport.c | 10 +++++----- libgimp/gimpfontselectbutton.c | 2 +- - libgimp/gimpmenu.c | 6 ++++-- + libgimp/gimpmenu.c | 6 ++++-- libgimp/gimppaletteselectbutton.c | 2 +- libgimp/gimppatternselectbutton.c | 2 +- - libgimp/gimpprocview.c | 6 +++--- - libgimp/gimpzoompreview.c | 2 +- + libgimp/gimpprocview.c | 6 +++--- + libgimp/gimpzoompreview.c | 2 +- 8 files changed, 17 insertions(+), 15 deletions(-) commit 83eb6fdc9e2b60753a57de441aa979a979c2c3e8 Author: Michael Natterer -Date: Fri Sep 30 10:50:50 2011 +0200 +Date: Fri Sep 30 10:50:50 2011 +0200 libgimpwidgets: use gtk_box_new() - libgimpwidgets/gimpbrowser.c | 6 +++--- - libgimpwidgets/gimpcolornotebook.c | 3 ++- - libgimpwidgets/gimpcolorselect.c | 5 +++-- + libgimpwidgets/gimpbrowser.c | 6 +++--- + libgimpwidgets/gimpcolornotebook.c | 3 ++- + libgimpwidgets/gimpcolorselect.c | 5 +++-- libgimpwidgets/gimpcolorselection.c | 14 +++++++------- - libgimpwidgets/gimpenumwidgets.c | 5 +++-- - libgimpwidgets/gimphelpui.c | 2 +- - libgimpwidgets/gimpoldwidgets.c | 3 ++- - libgimpwidgets/gimppageselector.c | 6 +++--- - libgimpwidgets/gimppatheditor.c | 6 ++++-- - libgimpwidgets/gimppreview.c | 2 +- - libgimpwidgets/gimpquerybox.c | 4 ++-- - libgimpwidgets/gimpunitmenu.c | 2 +- - libgimpwidgets/gimpwidgets.c | 10 +++++----- + libgimpwidgets/gimpenumwidgets.c | 5 +++-- + libgimpwidgets/gimphelpui.c | 2 +- + libgimpwidgets/gimpoldwidgets.c | 3 ++- + libgimpwidgets/gimppageselector.c | 6 +++--- + libgimpwidgets/gimppatheditor.c | 6 ++++-- + libgimpwidgets/gimppreview.c | 2 +- + libgimpwidgets/gimpquerybox.c | 4 ++-- + libgimpwidgets/gimpunitmenu.c | 2 +- + libgimpwidgets/gimpwidgets.c | 10 +++++----- 13 files changed, 37 insertions(+), 31 deletions(-) commit 030413b9f6b6a8907dd6c5b3829eb25cdc2f9221 Author: Michael Natterer -Date: Fri Sep 30 10:45:00 2011 +0200 +Date: Fri Sep 30 10:45:00 2011 +0200 libgimpwidgets: add gimp3migration.[ch] to help the gtk3-port branch This is such a hack, but entirely safe when linking against GTK+ 2.x. Please ignore the uglyness. - libgimpwidgets/Makefile.am | 7 +++++-- + libgimpwidgets/Makefile.am | 7 +++++-- libgimpwidgets/gimp3migration.c | 39 +++++++++++++++++++++++++++++++++++++++ libgimpwidgets/gimp3migration.h | 40 ++++++++++++++++++++++++++++++++++++++++ libgimpwidgets/gimpwidgets.def | 1 + - libgimpwidgets/gimpwidgets.h | 1 + + libgimpwidgets/gimpwidgets.h | 1 + 5 files changed, 86 insertions(+), 2 deletions(-) commit 2b2ecd1af12527d36d030da585a3bcde3bc498ee Author: Martin Nordholts -Date: Fri Sep 30 07:55:55 2011 +0200 +Date: Fri Sep 30 07:55:55 2011 +0200 app/tests: Remove static Gimp *gimp @@ -28834,7 +29741,7 @@ commit a324206a3e693dbd7bcc481b3650ca198332d2e3 Author: Nils Philippsen -Date: Thu Sep 22 16:42:37 2011 +0200 +Date: Thu Sep 22 16:42:37 2011 +0200 script-fu: link libtinyscheme with libm if necessary @@ -28850,7 +29757,7 @@ commit b6310f88cf16650e5e063dbf8661e836484c63f3 Author: Nils Philippsen -Date: Fri Sep 30 06:55:24 2011 +0530 +Date: Fri Sep 30 06:55:24 2011 +0530 script-fu: explicitly specify library dependencies @@ -28862,43 +29769,43 @@ commit ac6d4e453604731273d25b93f3636c2a375dacae Author: Alexia Death -Date: Thu Sep 29 21:08:27 2011 +0300 +Date: Thu Sep 29 21:08:27 2011 +0300 app: Add folder variants of the dynamics icon - themes/Default/images/preferences/Makefile.am | 2 + + themes/Default/images/preferences/Makefile.am | 2 + .../images/preferences/folders-dynamics-16.png | Bin 0 -> 722 bytes .../images/preferences/folders-dynamics-22.png | Bin 0 -> 997 bytes - .../images/preferences/folders-dynamics.png | Bin 0 -> 2062 bytes - .../images/preferences/folders-dynamics.svg | 566 + .../images/preferences/folders-dynamics.png | Bin 0 -> 2062 bytes + .../images/preferences/folders-dynamics.svg | 566 +++++++++++++++++++++ 5 files changed, 568 insertions(+) commit cd2a1a92fc05590b662c1b7fbaa5641394eb3831 Author: Alexia Death -Date: Thu Sep 29 20:19:49 2011 +0300 +Date: Thu Sep 29 20:19:49 2011 +0300 app: Add configurable path for tool presets in preferences app/dialogs/preferences-dialog.c | 4 ++++ - app/widgets/gimphelp-ids.h | 1 + + app/widgets/gimphelp-ids.h | 1 + 2 files changed, 5 insertions(+) commit d34bbaec2d11ad3f730d0b99e94b4f80fb16e8a3 Author: Michael Natterer -Date: Wed Sep 28 23:27:49 2011 +0200 +Date: Wed Sep 28 23:27:49 2011 +0200 app: #undef G_DISABLE_DEPRECATED where GStaticMutex is used because it's deprecated in GLib 2.30. - app/base/gimphistogram.c | 1 + + app/base/gimphistogram.c | 1 + app/gegl/gimpoperationtilesink.c | 1 + 2 files changed, 2 insertions(+) commit 7401cc38d106410dd66fe23f05225cea0d2600a1 Author: Alexandre Prokoudine -Date: Wed Sep 28 02:46:33 2011 +0400 +Date: Wed Sep 28 02:46:33 2011 +0400 Updated Russian translation @@ -28907,7 +29814,7 @@ commit 5769acd3db0c726914c2a399e59b71eb4d8a9d7d Author: Mukund Sivaraman -Date: Tue Sep 27 19:22:50 2011 +0530 +Date: Tue Sep 27 19:22:50 2011 +0530 file-png: Add comments about the struct checks @@ -28916,7 +29823,7 @@ commit 3b6ab5a48cd366ede815f31dddf11a36c4a9217a Author: Michael Natterer -Date: Mon Sep 26 22:35:45 2011 +0200 +Date: Mon Sep 26 22:35:45 2011 +0200 Bug 660067 - GIMP crashes after Wacom tablet's hot unplug @@ -28930,18 +29837,18 @@ commit 7aebf7ee6514c7e1e7ca1a716ae64921a868e4d0 Author: Marco Ciampa -Date: Mon Sep 26 08:25:22 2011 +0200 +Date: Mon Sep 26 08:25:22 2011 +0200 Updated italian translation po-plug-ins/it.po | 395 +++++++++++++++++++++++++++++------------------------- - po/it.po | 275 +++++++++++++++++-------------------- + po/it.po | 275 +++++++++++++++++-------------------- 2 files changed, 334 insertions(+), 336 deletions(-) commit 0f03ed9e05f322075e9836dc9d6ec7f909948702 Author: Massimo Valentini -Date: Sun Sep 25 21:57:20 2011 +0200 +Date: Sun Sep 25 21:57:20 2011 +0200 Bug 616416: hidden layer groups appear again after an image change @@ -28952,54 +29859,54 @@ and a PROP_GROUP_ITEM_FLAGS to load/save the expanded state of layer_groups and use them. - app/core/gimpgrouplayer.c | 24 +++++++++ - app/core/gimpviewable.c | 23 ++++++++ - app/core/gimpviewable.h | 7 +++ + app/core/gimpgrouplayer.c | 24 +++++++++ + app/core/gimpviewable.c | 23 ++++++++ + app/core/gimpviewable.h | 7 +++ app/widgets/gimpcontainertreeview.c | 104 ++++++++++++++++++++++++++++++++---- - app/xcf/xcf-load.c | 17 ++++-- - app/xcf/xcf-private.h | 3 +- - app/xcf/xcf-save.c | 22 ++++++++ + app/xcf/xcf-load.c | 17 ++++-- + app/xcf/xcf-private.h | 3 +- + app/xcf/xcf-save.c | 22 ++++++++ 7 files changed, 186 insertions(+), 14 deletions(-) commit a67bb11cf5fb9cc90436f24522ac89c68527d242 Author: Massimo Valentini -Date: Sun Sep 25 21:49:36 2011 +0200 +Date: Sun Sep 25 21:49:36 2011 +0200 Revert "Bug 616416: hidden layer groups appear again after an image change" This reverts commit 359c9c22d9445699ea4a010038658efe74d8f4d7. - app/core/gimpgrouplayer.c | 24 --------- - app/core/gimpviewable.c | 23 -------- - app/core/gimpviewable.h | 7 --- + app/core/gimpgrouplayer.c | 24 --------- + app/core/gimpviewable.c | 23 -------- + app/core/gimpviewable.h | 7 --- app/widgets/gimpcontainertreeview.c | 104 ++++-------------------------------- - app/xcf/xcf-load.c | 17 ++---- - app/xcf/xcf-private.h | 3 +- - app/xcf/xcf-save.c | 22 -------- + app/xcf/xcf-load.c | 17 ++---- + app/xcf/xcf-private.h | 3 +- + app/xcf/xcf-save.c | 22 -------- 7 files changed, 14 insertions(+), 186 deletions(-) commit 359c9c22d9445699ea4a010038658efe74d8f4d7 Author: Massimo Valentini -Date: Sun Sep 25 21:37:44 2011 +0200 +Date: Sun Sep 25 21:37:44 2011 +0200 Bug 616416: hidden layer groups appear again after an image change - app/core/gimpgrouplayer.c | 24 +++++++++ - app/core/gimpviewable.c | 23 ++++++++ - app/core/gimpviewable.h | 7 +++ + app/core/gimpgrouplayer.c | 24 +++++++++ + app/core/gimpviewable.c | 23 ++++++++ + app/core/gimpviewable.h | 7 +++ app/widgets/gimpcontainertreeview.c | 104 ++++++++++++++++++++++++++++++++---- - app/xcf/xcf-load.c | 17 ++++-- - app/xcf/xcf-private.h | 3 +- - app/xcf/xcf-save.c | 22 ++++++++ + app/xcf/xcf-load.c | 17 ++++-- + app/xcf/xcf-private.h | 3 +- + app/xcf/xcf-save.c | 22 ++++++++ 7 files changed, 186 insertions(+), 14 deletions(-) commit a1a32282edda90331eb1a04cf97839d83457dcb2 Author: Martin Srebotnjak -Date: Sun Sep 25 20:30:43 2011 +0200 +Date: Sun Sep 25 20:30:43 2011 +0200 Updated Slovenian translation @@ -29008,7 +29915,7 @@ commit 075d7f0de78497d22aaf57ed8fcfb6a4e10e3e35 Author: Martin Srebotnjak -Date: Sun Sep 25 20:29:14 2011 +0200 +Date: Sun Sep 25 20:29:14 2011 +0200 Updated Slovenian translation @@ -29018,24 +29925,24 @@ commit e071bfa3b6eae78b9e81d22d9dc584701173d6bc Author: Michael Natterer -Date: Sat Sep 24 16:35:59 2011 +0200 +Date: Sat Sep 24 16:35:59 2011 +0200 Bug 656716 - Have a procedure to get a layer from its name Add gimp_image_get_[layer|channel|vectors]_by_name(). - app/pdb/image-cmds.c | 201 + app/pdb/image-cmds.c | 201 +++++++++++++++++++++++++++++++++++++++++++++ - app/pdb/internal-procs.c | 2 +- - libgimp/gimp.def | 3 + + app/pdb/internal-procs.c | 2 +- + libgimp/gimp.def | 3 + libgimp/gimpimage_pdb.c | 108 ++++++++++++++++++++++++ - libgimp/gimpimage_pdb.h | 6 ++ + libgimp/gimpimage_pdb.h | 6 ++ tools/pdbgen/pdb/image.pdb | 96 +++++++++++++++++++++- 6 files changed, 414 insertions(+), 2 deletions(-) commit 624e99041be497df35ffb1b6bf638c7df5ec4d16 Author: Michael Natterer -Date: Sat Sep 24 16:20:50 2011 +0200 +Date: Sat Sep 24 16:20:50 2011 +0200 app: remove unused variable in gimp_image_map_tool_initialize() @@ -29044,7 +29951,7 @@ commit c3c40fd45f2c40c26aee5d1947d7cc8f0a577586 Author: Michael Natterer -Date: Sat Sep 24 10:56:50 2011 +0200 +Date: Sat Sep 24 10:56:50 2011 +0200 Bug 545910 - crash when selecting a font after a search @@ -29057,7 +29964,7 @@ commit 23978ecec326dff969a6e889a16dff3d3cb0b224 Author: Kevin Cozens -Date: Fri Sep 23 19:04:32 2011 -0400 +Date: Fri Sep 23 19:04:32 2011 -0400 Optimized append to make it an O(n) operation (See Sourceforge bug #3400290) @@ -29069,7 +29976,7 @@ commit fc811f3708fbd911d40b88a1bd02e7921126bd24 Author: Kevin Cozens -Date: Mon Sep 5 23:22:21 2011 -0400 +Date: Mon Sep 5 23:22:21 2011 -0400 Applied changes from SVN version 87 of official version of TinyScheme @@ -29086,7 +29993,7 @@ commit 599f6e839074f668fee4fc75bb96f3261423cb11 Author: Kevin Cozens -Date: Sun Sep 4 16:46:13 2011 -0400 +Date: Sun Sep 4 16:46:13 2011 -0400 Fixing formatting of files and removed tabs. @@ -29098,7 +30005,7 @@ commit b61b8782d0f4a1d3ded17db5f9bc1e1bd8a032cf Author: Kevin Cozens -Date: Sun Sep 4 16:33:39 2011 -0400 +Date: Sun Sep 4 16:33:39 2011 -0400 R5RS compatability fix for expt. (See SourceForge bug #3399332) Based on the patch from Doug Currie. @@ -29109,7 +30016,7 @@ commit 69f55d0fb015b46e6f48ef699d1db6a23a0031f4 Author: Michael Natterer -Date: Sat Sep 24 00:55:37 2011 +0200 +Date: Sat Sep 24 00:55:37 2011 +0200 Bug 152259 - Revert button in GimpDataEditor is not implemented @@ -29120,7 +30027,7 @@ commit fdb69d20d5df8438426e42a562992c837faa405c Author: Mikael Magnusson -Date: Sat Sep 24 00:44:14 2011 +0200 +Date: Sat Sep 24 00:44:14 2011 +0200 Revert accidental usage of gtk_box @@ -29129,7 +30036,7 @@ commit 9ec15d898d1d33c83854f4cf1368303f8d6994b9 Author: Michael Natterer -Date: Fri Sep 23 23:51:56 2011 +0200 +Date: Fri Sep 23 23:51:56 2011 +0200 NEWS: updated @@ -29138,7 +30045,7 @@ commit 4e3c3089313544f2ec21f345123be1bc80ce0461 Author: Michael Natterer -Date: Fri Sep 23 23:45:10 2011 +0200 +Date: Fri Sep 23 23:45:10 2011 +0200 Bug 658902 - Show different icon for visible layer group members of... @@ -29151,7 +30058,7 @@ commit d995fefb7c729fd0c3eb995f665b16825e13bf8a Author: Michael Natterer -Date: Fri Sep 23 23:43:42 2011 +0200 +Date: Fri Sep 23 23:43:42 2011 +0200 app: add gimp_item_is_visible() @@ -29159,12 +30066,12 @@ and all its parents are visible). app/core/gimpitem.c | 18 ++++++++++++++++++ - app/core/gimpitem.h | 1 + + app/core/gimpitem.h | 1 + 2 files changed, 19 insertions(+) commit bc4fa9a8c4defdd39b5ede34e5fb69bdbe9ee33e Author: Michael Natterer -Date: Fri Sep 23 23:42:09 2011 +0200 +Date: Fri Sep 23 23:42:09 2011 +0200 libgimpwidgets: support GtkCellRendererToggle's "inconsistent" state @@ -29175,7 +30082,7 @@ commit 0e1d07d1292eb98d8917ad18c5c1d92da097c6ed Author: Michael Natterer -Date: Fri Sep 23 23:09:26 2011 +0200 +Date: Fri Sep 23 23:09:26 2011 +0200 Bug 659446 - Missing plural handling for... @@ -29187,7 +30094,7 @@ commit 989ac15a9793bbc4301f5a50e61c6103319a9f9b Author: Michael Natterer -Date: Fri Sep 23 22:45:32 2011 +0200 +Date: Fri Sep 23 22:45:32 2011 +0200 Bug 659348 - Provide a translation comment for "Empty" @@ -29196,7 +30103,7 @@ commit 944f6a529d14e25f5ef449c3705934316f2c38c2 Author: Michael Natterer -Date: Fri Sep 23 22:34:25 2011 +0200 +Date: Fri Sep 23 22:34:25 2011 +0200 Bug 656512 - Moving a floating selection - objects disappear @@ -29209,7 +30116,7 @@ commit 578e6402b84523f660da0a0f9a731a226411e209 Author: Michael Natterer -Date: Fri Sep 23 22:24:23 2011 +0200 +Date: Fri Sep 23 22:24:23 2011 +0200 app: don't detach the floating selection if it's not attached @@ -29223,7 +30130,7 @@ commit 208fedd7ea0a19ec3d356a082c9283030c2a0657 Author: Michael Natterer -Date: Fri Sep 23 21:58:00 2011 +0200 +Date: Fri Sep 23 21:58:00 2011 +0200 app: don't add GimpLayer's source node to two different parents @@ -29238,7 +30145,7 @@ commit e8f64664c90b124b609cebd3b3ddf7a89f225658 Author: Michael Natterer -Date: Fri Sep 23 19:55:24 2011 +0200 +Date: Fri Sep 23 19:55:24 2011 +0200 app: properly detach floating selection in dispose() @@ -29248,12 +30155,12 @@ only makes it crash later, but makes sense as separate commit. app/core/gimpdrawable.c | 16 +++++++++++++--- - app/core/gimplayer.c | 7 +++++++ + app/core/gimplayer.c | 7 +++++++ 2 files changed, 20 insertions(+), 3 deletions(-) commit 5c8ded8960350905e6b66181322e34b323fbe82d Author: Michael Natterer -Date: Fri Sep 23 19:31:50 2011 +0200 +Date: Fri Sep 23 19:31:50 2011 +0200 app: let the drawable keep around a pointer to its floating selection @@ -29264,17 +30171,17 @@ and makes the crash fix in the next commit much much simpler. app/core/gimpdrawable-private.h | 1 + - app/core/gimpdrawable.c | 55 + app/core/gimpdrawable.c | 55 ++++++++++++++++++--------------------- - app/core/gimpdrawable.h | 6 ++--- + app/core/gimpdrawable.h | 6 ++--- app/core/gimpfloatingselundo.c | 4 +-- - app/core/gimpimage.c | 13 ++++----- + app/core/gimpimage.c | 13 ++++----- app/core/gimplayer-floating-sel.c | 4 +-- 6 files changed, 38 insertions(+), 45 deletions(-) commit 00c446fc6e65040360dbd61bba482fec29645651 Author: Michael Natterer -Date: Thu Sep 22 21:04:08 2011 +0200 +Date: Thu Sep 22 21:04:08 2011 +0200 plug-ins: remove NONINTERACTIVE from print's PDB docs, it's not supported @@ -29284,7 +30191,7 @@ commit 281c4cebb237e2272277fabdcc6ee7c75723ca41 Author: Massimo Valentini -Date: Thu Sep 22 13:42:13 2011 +0200 +Date: Thu Sep 22 13:42:13 2011 +0200 Bug 659804: wrong tooltips in the Align tool options @@ -29293,7 +30200,7 @@ commit 91c25e1477a5e57012fd91885fecdbed2f603521 Author: Martin Srebotnjak -Date: Thu Sep 22 18:10:46 2011 +0200 +Date: Thu Sep 22 18:10:46 2011 +0200 Updated Slovenian translation @@ -29303,7 +30210,7 @@ commit ff2b9ee727586b431e17f283825be3444b5ef496 Author: Mukund Sivaraman -Date: Wed Sep 21 17:16:54 2011 +0530 +Date: Wed Sep 21 17:16:54 2011 +0530 file-png: Return correct type of error value @@ -29312,7 +30219,7 @@ commit 1ac6c7b85c461b29fc84c9ed5446e7ae98102e00 Author: Mukund Sivaraman -Date: Wed Sep 21 17:08:53 2011 +0530 +Date: Wed Sep 21 17:08:53 2011 +0530 file-png: Check that PNG structs are created properly @@ -29325,18 +30232,18 @@ commit 3145c80aba6d1a93845c014fc6d9ce93e644ee78 Author: Alexandre Prokoudine -Date: Wed Sep 21 08:46:54 2011 +0400 +Date: Wed Sep 21 08:46:54 2011 +0400 Updates and fixes to Russian translation po-plug-ins/ru.po | 531 ++++++++++++++++++----------------- - po/ru.po | 821 + po/ru.po | 821 ++++++++++++++++++++++++++++-------------------------- 2 files changed, 713 insertions(+), 639 deletions(-) commit b300e389d2c12174e7853f0251e6e9789ee23c6a Author: Massimo Valentini -Date: Tue Sep 20 12:17:43 2011 +0200 +Date: Tue Sep 20 12:17:43 2011 +0200 Bug 659052: stroke path with a pattern always uses the Pine pattern @@ -29345,7 +30252,7 @@ commit f794c078be44c975eef3e4240679abd2a3803822 Author: Simos Xenitellis -Date: Tue Sep 20 00:27:58 2011 +0300 +Date: Tue Sep 20 00:27:58 2011 +0300 l10n: Replaced ... with … for Greek translation @@ -29355,18 +30262,18 @@ commit 0aa896450c87000afa6297670435c966e3663eb6 Author: Simos Xenitellis -Date: Tue Sep 20 00:20:58 2011 +0300 +Date: Tue Sep 20 00:20:58 2011 +0300 l10n: Removed combining diacritics from Greek translation po-libgimp/el.po | 58 ++++++++++----------- - po/el.po | 150 + po/el.po | 150 +++++++++++++++++++++++++++---------------------------- 2 files changed, 104 insertions(+), 104 deletions(-) commit 294c97d19abe334d89509b80f54dfac3166c3b89 Author: Bruno Brouard -Date: Mon Sep 19 23:00:47 2011 +0200 +Date: Mon Sep 19 23:00:47 2011 +0200 Updated French translation @@ -29376,7 +30283,7 @@ commit 439e8b0bf15991fa7a977b5ee841d753e7eec63c Author: Nils Philippsen -Date: Sat Sep 17 00:13:08 2011 +0200 +Date: Sat Sep 17 00:13:08 2011 +0200 app/text: nuke gimpfont-utils.[ch] @@ -29385,18 +30292,18 @@ a much higher version anyway). See Pango bug #166540 (at GNOME Bugzilla). - app/text/Makefile.am | 2 - - app/text/gimpfont-utils.c | 81 + app/text/Makefile.am | 2 - + app/text/gimpfont-utils.c | 81 ----------------------------------------- - app/text/gimpfont-utils.h | 35 ------------------ - app/text/gimpfontlist.c | 29 +-------------- - app/text/gimptext-compat.c | 4 +- + app/text/gimpfont-utils.h | 35 ------------------ + app/text/gimpfontlist.c | 29 +-------------- + app/text/gimptext-compat.c | 4 +- devel-docs/app/app-sections.txt | 6 --- 6 files changed, 2 insertions(+), 155 deletions(-) commit fa529db76b0793f5bfff143ef335becc132ee4f5 Author: Dr.T.Vasudevan -Date: Mon Sep 19 19:10:05 2011 +0530 +Date: Mon Sep 19 19:10:05 2011 +0530 updated Tamil translation @@ -29406,7 +30313,7 @@ commit 82f3e55365972c3a9cfbd7932e05772e5bc9d9e3 Author: Bruno Brouard -Date: Mon Sep 19 12:05:17 2011 +0200 +Date: Mon Sep 19 12:05:17 2011 +0200 Updated French translation @@ -29416,7 +30323,7 @@ commit 5c44821c796aed5eac47709792d4f7546f155827 Author: Julien Hardelin -Date: Mon Sep 19 11:56:18 2011 +0200 +Date: Mon Sep 19 11:56:18 2011 +0200 Updated French translation (python/script-fu) @@ -29427,7 +30334,7 @@ commit d92cd2f6c84b309b13e5efa5cd5a9e723be1b995 Author: Michael Natterer -Date: Mon Sep 19 00:45:36 2011 +0200 +Date: Mon Sep 19 00:45:36 2011 +0200 Add gimp_button_event_triggers_context_menu() and use it @@ -29437,30 +30344,30 @@ app/display/gimpdisplayshell-callbacks.c | 6 ++--- app/display/gimpdisplayshell-tool-events.c | 5 +++- - app/widgets/gimpcolorpanel.c | 2 +- - app/widgets/gimpcomponenteditor.c | 26 ++++++------------- - app/widgets/gimpcontainergridview.c | 13 +++------- - app/widgets/gimpcontainertreeview.c | 40 + app/widgets/gimpcolorpanel.c | 2 +- + app/widgets/gimpcomponenteditor.c | 26 ++++++------------- + app/widgets/gimpcontainergridview.c | 13 +++------- + app/widgets/gimpcontainertreeview.c | 40 +++++++++++------------------- - app/widgets/gimperrorconsole.c | 2 +- - app/widgets/gimpgradienteditor.c | 15 ++++------- - app/widgets/gimppaletteview.c | 24 ++++++------------ - app/widgets/gimpview.c | 13 ++++++---- - libgimpwidgets/gimpcolorbutton.c | 3 ++- - libgimpwidgets/gimpwidgets.c | 37 + app/widgets/gimperrorconsole.c | 2 +- + app/widgets/gimpgradienteditor.c | 15 ++++------- + app/widgets/gimppaletteview.c | 24 ++++++------------ + app/widgets/gimpview.c | 13 ++++++---- + libgimpwidgets/gimpcolorbutton.c | 3 ++- + libgimpwidgets/gimpwidgets.c | 37 +++++++++++++++++++++++++++ - libgimpwidgets/gimpwidgets.def | 1 + - libgimpwidgets/gimpwidgets.h | 2 ++ - plug-ins/common/animation-play.c | 2 +- - plug-ins/common/colormap-remap.c | 2 +- - plug-ins/help-browser/dialog.c | 2 +- - plug-ins/ifs-compose/ifs-compose.c | 25 ++++++++----------- - plug-ins/imagemap/imap_main.c | 18 ++++++++------ + libgimpwidgets/gimpwidgets.def | 1 + + libgimpwidgets/gimpwidgets.h | 2 ++ + plug-ins/common/animation-play.c | 2 +- + plug-ins/common/colormap-remap.c | 2 +- + plug-ins/help-browser/dialog.c | 2 +- + plug-ins/ifs-compose/ifs-compose.c | 25 ++++++++----------- + plug-ins/imagemap/imap_main.c | 18 ++++++++------ 19 files changed, 124 insertions(+), 114 deletions(-) commit f8a2644b13fb7ea279dd21cf32844c5f519b2133 Author: Michael Natterer -Date: Sun Sep 18 01:29:51 2011 +0200 +Date: Sun Sep 18 01:29:51 2011 +0200 app: sanitize event->button checking in GimpNavigationView @@ -29472,7 +30379,7 @@ commit 7afa8665c1e600fe239c66d0a9752dced376afc2 Author: Joe Hansen -Date: Sun Sep 18 17:31:39 2011 +0200 +Date: Sun Sep 18 17:31:39 2011 +0200 Updated Danish translation of gimp-script-fu @@ -29482,7 +30389,7 @@ commit 601d74f859bf6a2cb35b9f5794db14871e5b35f2 Author: Kenneth Nielsen -Date: Sun Sep 18 17:30:29 2011 +0200 +Date: Sun Sep 18 17:30:29 2011 +0200 Added da to list of languages for gimp-tags @@ -29491,7 +30398,7 @@ commit 6ac9562c08a906e2badf75202ca8da104671d0b6 Author: Joe Hansen -Date: Sun Sep 18 17:29:58 2011 +0200 +Date: Sun Sep 18 17:29:58 2011 +0200 Added Danish translation of gimp-tags @@ -29500,7 +30407,7 @@ commit 07024e01e7e503c3d6f802f44fbc1844f6083709 Author: Joe Hansen -Date: Sun Sep 18 17:28:36 2011 +0200 +Date: Sun Sep 18 17:28:36 2011 +0200 Update Danish translation of gimp-python @@ -29510,7 +30417,7 @@ commit 34168cbb5508d0eb07f700c65fd2227751e01200 Author: Joe Hansen -Date: Sun Sep 18 17:27:42 2011 +0200 +Date: Sun Sep 18 17:27:42 2011 +0200 Update Danish translation of libgimp @@ -29520,7 +30427,7 @@ commit d74f5efdc22ee791fec970ceb5e3991d2b83f3d2 Author: Gitte Illum Petersen -Date: Thu Apr 21 11:46:47 2011 +0200 +Date: Thu Apr 21 11:46:47 2011 +0200 Update Danish translation @@ -29530,7 +30437,7 @@ commit 9199432edaf4b4c040d896b40f29ad06d52c265a Author: Massimo Valentini -Date: Sun Sep 18 15:44:17 2011 +0200 +Date: Sun Sep 18 15:44:17 2011 +0200 Bug 659376: wrong behavior of the channel visibility button @@ -29539,30 +30446,30 @@ commit ecacdbc7cd9b76b6d7de2ff7a4eef244419a9855 Author: Mukund Sivaraman -Date: Sun Sep 18 08:09:03 2011 +0530 +Date: Sun Sep 18 08:09:03 2011 +0530 file-jpeg: Conditionally compile files with EXIF related code plug-ins/file-jpeg/Makefile.am | 15 +++++++++++---- - plug-ins/file-jpeg/gimpexif.c | 5 ----- - plug-ins/file-jpeg/gimpexif.h | 4 ---- + plug-ins/file-jpeg/gimpexif.c | 5 ----- + plug-ins/file-jpeg/gimpexif.h | 4 ---- plug-ins/file-jpeg/jpeg-exif.c | 5 ----- plug-ins/file-jpeg/jpeg-exif.h | 4 ---- 5 files changed, 11 insertions(+), 22 deletions(-) commit bd3faae04cdc5e8af381551a6ada928017074e6e Author: Mukund Sivaraman -Date: Sun Sep 18 08:08:16 2011 +0530 +Date: Sun Sep 18 08:08:16 2011 +0530 file-jpeg: Include gimpexif.h only if HAVE_LIBEXIF plug-ins/file-jpeg/jpeg-load.c | 3 +-- - plug-ins/file-jpeg/jpeg.c | 2 +- + plug-ins/file-jpeg/jpeg.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) commit cbed71eb30dd3fed2c81c423010b905570bab8e6 Author: Mukund Sivaraman -Date: Sun Sep 18 08:07:32 2011 +0530 +Date: Sun Sep 18 08:07:32 2011 +0530 file-jpeg: Conditionally declare orientation @@ -29571,23 +30478,23 @@ commit dfdf05a5788e576bff5340fdd13e3e62d0575bf0 Author: Mukund Sivaraman -Date: Sun Sep 18 08:00:20 2011 +0530 +Date: Sun Sep 18 08:00:20 2011 +0530 file-jpeg: Add header cladding - plug-ins/file-jpeg/gimpexif.h | 5 +++++ + plug-ins/file-jpeg/gimpexif.h | 5 +++++ plug-ins/file-jpeg/jpeg-exif.h | 5 +++++ - plug-ins/file-jpeg/jpeg-icc.h | 5 +++++ + plug-ins/file-jpeg/jpeg-icc.h | 5 +++++ plug-ins/file-jpeg/jpeg-load.h | 5 +++++ plug-ins/file-jpeg/jpeg-quality.h | 5 +++++ plug-ins/file-jpeg/jpeg-save.h | 5 +++++ plug-ins/file-jpeg/jpeg-settings.h | 5 +++++ - plug-ins/file-jpeg/jpeg.h | 6 ++++++ + plug-ins/file-jpeg/jpeg.h | 6 ++++++ 8 files changed, 41 insertions(+) commit 50b093d92c6b43ee2485bbd3f70a0eb213cf671b Author: Mukund Sivaraman -Date: Sun Sep 18 07:22:38 2011 +0530 +Date: Sun Sep 18 07:22:38 2011 +0530 file-jpeg: Move define to header file @@ -29597,7 +30504,7 @@ commit f6b70ec3e9b9dc379a09dbb85c9fb64ba6ce8137 Author: Mukund Sivaraman -Date: Sun Sep 18 07:22:06 2011 +0530 +Date: Sun Sep 18 07:22:06 2011 +0530 file-jpeg: Remove unused define @@ -29606,7 +30513,7 @@ commit 536d6a527cc173adb7a84c7baa0c418595ccbccb Author: Mukund Sivaraman -Date: Sun Sep 18 07:21:30 2011 +0530 +Date: Sun Sep 18 07:21:30 2011 +0530 file-jpeg: Create jpeg-exif.h and move EXIF protos to it @@ -29616,43 +30523,43 @@ ++++++++++++++++++++++++++++++++++++++++ plug-ins/file-jpeg/jpeg-load.c | 3 +++ plug-ins/file-jpeg/jpeg-save.c | 3 +++ - plug-ins/file-jpeg/jpeg.c | 3 +++ - plug-ins/file-jpeg/jpeg.h | 25 ------------------------- + plug-ins/file-jpeg/jpeg.c | 3 +++ + plug-ins/file-jpeg/jpeg.h | 25 ------------------------- 7 files changed, 51 insertions(+), 26 deletions(-) commit 2aae54226c1284ebfd325264a045270c019a2c43 Author: Mukund Sivaraman -Date: Sun Sep 18 07:04:44 2011 +0530 +Date: Sun Sep 18 07:04:44 2011 +0530 build: Rename HAVE_EXIF define to HAVE_LIBEXIF - configure.ac | 2 +- - plug-ins/file-jpeg/gimpexif.c | 4 ++-- - plug-ins/file-jpeg/gimpexif.h | 4 ++-- - plug-ins/file-jpeg/jpeg-exif.c | 4 ++-- - plug-ins/file-jpeg/jpeg-load.c | 24 ++++++++++++------------ - plug-ins/file-jpeg/jpeg-load.h | 4 ++-- - plug-ins/file-jpeg/jpeg-save.c | 26 +++++++++++++------------- - plug-ins/file-jpeg/jpeg-settings.c | 4 ++-- - plug-ins/file-jpeg/jpeg.c | 22 +++++++++++----------- - plug-ins/file-jpeg/jpeg.h | 4 ++-- + configure.ac | 2 +- + plug-ins/file-jpeg/gimpexif.c | 4 ++-- + plug-ins/file-jpeg/gimpexif.h | 4 ++-- + plug-ins/file-jpeg/jpeg-exif.c | 4 ++-- + plug-ins/file-jpeg/jpeg-load.c | 24 ++++++++++++------------ + plug-ins/file-jpeg/jpeg-load.h | 4 ++-- + plug-ins/file-jpeg/jpeg-save.c | 26 +++++++++++++------------- + plug-ins/file-jpeg/jpeg-settings.c | 4 ++-- + plug-ins/file-jpeg/jpeg.c | 22 +++++++++++----------- + plug-ins/file-jpeg/jpeg.h | 4 ++-- plug-ins/file-psd/psd-image-res-load.c | 12 ++++++------ - plug-ins/makefile.msc | 2 +- + plug-ins/makefile.msc | 2 +- 12 files changed, 56 insertions(+), 56 deletions(-) commit e6edc7d83349600e5dff289c894df9c079bf2399 Author: Mukund Sivaraman -Date: Sun Sep 18 06:50:43 2011 +0530 +Date: Sun Sep 18 06:50:43 2011 +0530 build: Rename BUILD_METADATA conditional to HAVE_LIBEXIF - configure.ac | 2 +- + configure.ac | 2 +- plug-ins/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 7656e2bda1bcacbc2874a664b007aa0585461326 Author: Michael Natterer -Date: Sat Sep 17 23:23:30 2011 +0200 +Date: Sat Sep 17 23:23:30 2011 +0200 app: make gimp_window_key_press_event() do the right thing on a Mac @@ -29666,7 +30573,7 @@ commit f67c592f0ef90b5d932d79f6633de8881294153b Author: Marco Ciampa -Date: Sat Sep 17 01:17:09 2011 +0200 +Date: Sat Sep 17 01:17:09 2011 +0200 Updated italian translation @@ -29676,7 +30583,7 @@ commit 6b0e77eafe3728ef03c2696e826589a4d8e8af14 Author: Michael Natterer -Date: Fri Sep 16 23:23:40 2011 +0200 +Date: Fri Sep 16 23:23:40 2011 +0200 app: adapt ige-mac-menu.c to the change to META as primary modifier @@ -29685,7 +30592,7 @@ commit ed00cff9d3d4e52a7fb5769496d3879ae8a46a91 Author: Michael Natterer -Date: Fri Sep 16 23:23:01 2011 +0200 +Date: Fri Sep 16 23:23:01 2011 +0200 app: don't use image_window->menubar if it's NULL @@ -29694,30 +30601,30 @@ commit 3066a8228a1273ad37a30d095e8ce94faceb1cdc Author: Michael Natterer -Date: Fri Sep 16 22:56:08 2011 +0200 +Date: Fri Sep 16 22:56:08 2011 +0200 app: use instead of in accelerator strings but generically change it back to for GTK+ < 2.24.7. This enables using the Command modifier on OSX, - app/actions/dialogs-actions.c | 10 +++---- + app/actions/dialogs-actions.c | 10 +++---- app/actions/drawable-actions.c | 2 +- - app/actions/edit-actions.c | 24 +++++++-------- - app/actions/file-actions.c | 18 ++++++------ - app/actions/image-actions.c | 6 ++-- - app/actions/layers-actions.c | 6 ++-- - app/actions/plug-in-actions.c | 4 +-- - app/actions/select-actions.c | 8 ++--- - app/actions/tools-actions.c | 4 +-- - app/actions/view-actions.c | 12 ++++---- - app/widgets/gimpactiongroup.c | 67 + app/actions/edit-actions.c | 24 +++++++-------- + app/actions/file-actions.c | 18 ++++++------ + app/actions/image-actions.c | 6 ++-- + app/actions/layers-actions.c | 6 ++-- + app/actions/plug-in-actions.c | 4 +-- + app/actions/select-actions.c | 8 ++--- + app/actions/tools-actions.c | 4 +-- + app/actions/view-actions.c | 12 ++++---- + app/widgets/gimpactiongroup.c | 67 ++++++++++++++++++++++++++++++------------ 11 files changed, 96 insertions(+), 65 deletions(-) commit 5a46d1e247b0c42a77efcd1750c80722f5972c0d Author: Dr.T.Vasudevan -Date: Fri Sep 16 17:46:10 2011 +0530 +Date: Fri Sep 16 17:46:10 2011 +0530 updated Tamil translation @@ -29727,7 +30634,7 @@ commit 10f7484cd7c6a7528ee34702ed7cdc489d5fce4e Author: Dr.T.Vasudevan -Date: Fri Sep 16 17:34:53 2011 +0530 +Date: Fri Sep 16 17:34:53 2011 +0530 updated Tamil translation @@ -29737,7 +30644,7 @@ commit 5a4708627e584da0e21895a47fdfe7944c94aa60 Author: Marco Ciampa -Date: Fri Sep 16 01:23:27 2011 +0200 +Date: Fri Sep 16 01:23:27 2011 +0200 Small fix in italian translation @@ -29746,7 +30653,7 @@ commit 62d9ba7ab340e8bff0cbcc54f06ee5008ad7112b Author: Marco Ciampa -Date: Fri Sep 16 00:51:27 2011 +0200 +Date: Fri Sep 16 00:51:27 2011 +0200 Small fix in italian translation, thanks to Stefano Ferri, again @@ -29755,7 +30662,7 @@ commit 8424aafc05a57b9262e07b5098b8ecd41bf8a5cd Author: Martin Nordholts -Date: Thu Sep 15 06:45:03 2011 +0200 +Date: Thu Sep 15 06:45:03 2011 +0200 Bug 659084 - git-version.h can't be generated from shallow repositories @@ -29763,13 +30670,13 @@ Pass --always to git describe so git-version.h can be generated also from shallow (--depth 1) repositories. Cause found by Kenny Stuart. - NEWS | 2 +- + NEWS | 2 +- app/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 3484309e4924d2da0c99637630181b6aba9a75da Author: Inaki Larranaga Murgoitio -Date: Thu Sep 15 18:32:13 2011 +0200 +Date: Thu Sep 15 18:32:13 2011 +0200 Updated Basque language @@ -29779,17 +30686,17 @@ commit de9011d9448d649837e8d9f96d75585c2a51bade Author: Inaki Larranaga Murgoitio -Date: Thu Sep 15 18:24:01 2011 +0200 +Date: Thu Sep 15 18:24:01 2011 +0200 Added Basque language po-tags/LINGUAS | 1 + - po-tags/eu.po | 26 ++++++++++++++++++++++++++ + po-tags/eu.po | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) commit 519b2c60f0f859c3c44a8de997e6008510dd86a1 Author: Inaki Larranaga Murgoitio -Date: Thu Sep 15 18:22:10 2011 +0200 +Date: Thu Sep 15 18:22:10 2011 +0200 Updated Basque language @@ -29799,7 +30706,7 @@ commit b52182eb8dd16d6413271bdcf7f2882ee0969c61 Author: Inaki Larranaga Murgoitio -Date: Thu Sep 15 18:20:31 2011 +0200 +Date: Thu Sep 15 18:20:31 2011 +0200 Updated Basque language @@ -29809,7 +30716,7 @@ commit c2a132dd42abc20f165eb7686c8562a564e843d9 Author: Inaki Larranaga Murgoitio -Date: Thu Sep 15 18:02:52 2011 +0200 +Date: Thu Sep 15 18:02:52 2011 +0200 Updated Basque language @@ -29819,7 +30726,7 @@ commit 3d1b6dfae973bef3035ce516b411063075526f37 Author: Inaki Larranaga Murgoitio -Date: Thu Sep 15 17:35:50 2011 +0200 +Date: Thu Sep 15 17:35:50 2011 +0200 Updated Basque language @@ -29829,7 +30736,7 @@ commit cb5ff4f253f400939b0fdcec98cbb46cdd38d6f6 Author: Inaki Larranaga Murgoitio -Date: Thu Sep 15 17:04:30 2011 +0200 +Date: Thu Sep 15 17:04:30 2011 +0200 Updated Basque language @@ -29839,7 +30746,7 @@ commit 003773f52aa494d1c2f5eb54a63a7d2a46d29801 Author: Inaki Larranaga Murgoitio -Date: Thu Sep 15 17:03:25 2011 +0200 +Date: Thu Sep 15 17:03:25 2011 +0200 Updated Basque language @@ -29849,19 +30756,19 @@ commit 023db8449cbd48bb10442a1a095dd760844756e9 Author: dmustieles -Date: Thu Sep 15 10:54:19 2011 +0200 +Date: Thu Sep 15 10:54:19 2011 +0200 Updated Spanish translation po-libgimp/es.po | 246 +++++++++++++++++++++++++++--------------------------- po-plug-ins/es.po | 18 ++-- - po/es.po | 18 ++-- + po/es.po | 18 ++-- 3 files changed, 140 insertions(+), 142 deletions(-) commit 0bd8fe65336b6657797b2e0e25cf4ec15c45dc5b Author: Marco Ciampa -Date: Thu Sep 15 10:38:41 2011 +0200 +Date: Thu Sep 15 10:38:41 2011 +0200 Small fix in italian translation @@ -29870,7 +30777,7 @@ commit 9cfa0a5ddeb065905b1598774b057071023a8efc Author: Michael Natterer -Date: Thu Sep 15 09:04:38 2011 +0200 +Date: Thu Sep 15 09:04:38 2011 +0200 app: use a smaller icon for the image tabs' close button @@ -29882,13 +30789,13 @@ commit d32fa80d1d98156a2825bf1380d24b0fd186f649 Author: Alexia Death -Date: Wed Sep 14 20:42:52 2011 +0300 +Date: Wed Sep 14 20:42:52 2011 +0300 app: Move smooth to painttool and clean up the rest app/paint/gimpairbrush.c | 2 +- app/paint/gimpbrushcore.c | 4 +- - app/paint/gimpink.c | 8 +-- + app/paint/gimpink.c | 8 +-- app/paint/gimppaintcore.c | 140 +++++++++++++++++++++++----------------------- app/paint/gimppaintcore.h | 5 +- @@ -29897,7 +30804,7 @@ commit fea6d2e5b171493ec1a46a48af6661d25bcfe38e Author: Martin Nordholts -Date: Tue Sep 13 09:09:37 2011 +0200 +Date: Tue Sep 13 09:09:37 2011 +0200 app: Add pixel_regions_free() @@ -29906,7 +30813,7 @@ commit 27feccc4a4e405795fc9e3555226562b652d01b4 Author: Massimo Valentini -Date: Tue Sep 13 18:03:30 2011 +0200 +Date: Tue Sep 13 18:03:30 2011 +0200 Do not access transform tool handles if NULL or stales @@ -29922,7 +30829,7 @@ commit 83e3e58ebc147bed300d82a0bd62010572e0fc34 Author: Martin Nordholts -Date: Tue Sep 13 06:34:08 2011 +0200 +Date: Tue Sep 13 06:34:08 2011 +0200 app: Remove PixelRegionIterator::dirty_tiles @@ -29943,7 +30850,7 @@ commit 2c09e339d78aa635c7f24d45cd877c796f11cd0c Author: Changwoo Ryu -Date: Tue Sep 13 11:22:43 2011 +0900 +Date: Tue Sep 13 11:22:43 2011 +0900 Updated Korean translation @@ -29953,7 +30860,7 @@ commit 4c7fe3b725638e6e4cd4389bb7270cfd6f2d6ccc Author: Mukund Sivaraman -Date: Tue Sep 13 00:54:26 2011 +0530 +Date: Tue Sep 13 00:54:26 2011 +0530 build: Remove --enable-maintainer-mode as it's now the default @@ -29962,37 +30869,37 @@ commit 6080c111614d0dd4f42dc73ae97d7d3d640eb6ee Author: Mukund Sivaraman -Date: Tue Sep 13 00:33:33 2011 +0530 +Date: Tue Sep 13 00:33:33 2011 +0530 Revert "Bug #658816 - Add a spellchecker to the comment editor" This reverts commit 978c96bbc6d709936ff9a3a88a68d24f4d69b497, which is probably not such a great idea. - app/Makefile.am | 4 ---- - app/widgets/Makefile.am | 4 ---- + app/Makefile.am | 4 ---- + app/widgets/Makefile.am | 4 ---- app/widgets/gimpimagecommenteditor.c | 9 --------- - configure.ac | 24 ------------------------ + configure.ac | 24 ------------------------ 4 files changed, 41 deletions(-) commit 978c96bbc6d709936ff9a3a88a68d24f4d69b497 Author: Mukund Sivaraman -Date: Mon Sep 12 19:34:51 2011 +0530 +Date: Mon Sep 12 19:34:51 2011 +0530 Bug #658816 - Add a spellchecker to the comment editor This is an initial version and can be improved. Something is better than nothing. :) - app/Makefile.am | 4 ++++ - app/widgets/Makefile.am | 4 ++++ + app/Makefile.am | 4 ++++ + app/widgets/Makefile.am | 4 ++++ app/widgets/gimpimagecommenteditor.c | 9 +++++++++ - configure.ac | 24 ++++++++++++++++++++++++ + configure.ac | 24 ++++++++++++++++++++++++ 4 files changed, 41 insertions(+) commit 159ee0381d4ff7f03e0cc2a91dc42c2530d56073 Author: Alexia Death -Date: Sun Sep 11 22:46:57 2011 +0300 +Date: Sun Sep 11 22:46:57 2011 +0300 app: Complete the reversal of last patch @@ -30001,7 +30908,7 @@ commit 79dfee2c9ea3db1f6a12246b005a3fc57fb9b40a Author: Alexia Death -Date: Sun Sep 11 22:31:59 2011 +0300 +Date: Sun Sep 11 22:31:59 2011 +0300 Revert "app: Remove obsolete way of keeping track of last painted dab" @@ -30013,7 +30920,7 @@ commit 8beec385ee9ded19bf0134cd595d8687355428db Author: Alexia Death -Date: Sun Sep 11 21:48:25 2011 +0300 +Date: Sun Sep 11 21:48:25 2011 +0300 app: silence a warning in ink tool @@ -30022,7 +30929,7 @@ commit 8f11e8743dd284087f4f74724e4c9a54fd935d7c Author: Alexia Death -Date: Sun Sep 11 21:47:37 2011 +0300 +Date: Sun Sep 11 21:47:37 2011 +0300 app: Don't mark coord done untill its actually been painted @@ -30031,7 +30938,7 @@ commit 87e41daa2436508ca42852a26ee9c1ac8099057f Author: Hleb Valoshka <375gnu@gmail.com> -Date: Sun Sep 11 19:41:31 2011 +0300 +Date: Sun Sep 11 19:41:31 2011 +0300 Updated Belarusian translation. @@ -30040,7 +30947,7 @@ commit 840ed634615b72977379d6814ee33bf28eb57877 Author: Hleb Valoshka <375gnu@gmail.com> -Date: Sun Sep 11 16:28:07 2011 +0300 +Date: Sun Sep 11 16:28:07 2011 +0300 Updated Belarusian translation. @@ -30049,7 +30956,7 @@ commit c360c538739fb7f53178641fd1669f380e652c47 Author: Alexia Death -Date: Sun Sep 11 16:18:59 2011 +0300 +Date: Sun Sep 11 16:18:59 2011 +0300 app: Fix ink tool smooth handling @@ -30058,23 +30965,23 @@ commit 90b0e232f8608fe4558561288d0b73dbea99303c Author: Hleb Valoshka <375gnu@gmail.com> -Date: Sun Sep 11 16:14:13 2011 +0300 +Date: Sun Sep 11 16:14:13 2011 +0300 Updated Belarusian translation. po-libgimp/be.po | 412 ++-- po-plug-ins/be.po | 6569 ++++++++++++++++++++++++++-------------------------- - po-python/be.po | 66 +- + po-python/be.po | 66 +- po-script-fu/be.po | 330 ++- - po-tips/be.po | 301 ++- - po/be.po | 6132 + po-tips/be.po | 301 ++- + po/be.po | 6132 +++++++++++++++++++++++++++--------------------- 6 files changed, 7637 insertions(+), 6173 deletions(-) commit 1b62a7bff3e4d9f2e141b87ef3403ac902310074 Author: Alexia Death -Date: Sun Sep 11 13:18:26 2011 +0300 +Date: Sun Sep 11 13:18:26 2011 +0300 app: Remove obsolete way of keeping track of last painted dab @@ -30084,7 +30991,7 @@ commit 9711995d88de9d8fd4198578c5ea204f98fc6bcd Author: Alexia Death -Date: Sun Sep 11 13:19:46 2011 +0300 +Date: Sun Sep 11 13:19:46 2011 +0300 app: remove duplicate call to coord smooth @@ -30097,7 +31004,7 @@ commit e7e6bec1d1a86bc53bd141b8a3c1d725f29d844a Author: Dimitris Spingos -Date: Sun Sep 11 10:51:25 2011 +0300 +Date: Sun Sep 11 10:51:25 2011 +0300 l10n: Updated Greek translation for po-script-fu @@ -30107,7 +31014,7 @@ commit 2e5ee1a5a0ab8059f291debd6d090f063723b849 Author: Dimitris Spingos -Date: Sun Sep 11 10:50:50 2011 +0300 +Date: Sun Sep 11 10:50:50 2011 +0300 l10n: Updated Greek translation for po-python @@ -30117,7 +31024,7 @@ commit ad68d0300188bb635fbb38a2efc184d9559804a8 Author: Dimitris Spingos -Date: Sun Sep 11 10:50:14 2011 +0300 +Date: Sun Sep 11 10:50:14 2011 +0300 l10n: Updated Greek translation for po-plug-ins @@ -30127,7 +31034,7 @@ commit 5eaf8fbd9b6fba9ea4351455f72b4916e9b75584 Author: Jenny Petoumenou -Date: Sun Sep 11 10:48:58 2011 +0300 +Date: Sun Sep 11 10:48:58 2011 +0300 l10n: Updated Greek translation for po-libgimp @@ -30137,7 +31044,7 @@ commit 2528f656b52784ced94912f2ab60f8587e0ecc79 Author: Alexia Death -Date: Sat Sep 10 21:39:55 2011 +0300 +Date: Sat Sep 10 21:39:55 2011 +0300 app: remove call to possibly buggy and un-needed scale clamp @@ -30146,14 +31053,14 @@ moon bug, I have just a guess to go by however, testing revealed no regressions, so pushing. - app/core/gimpbrush.c | 12 ------------ - app/core/gimpbrush.h | 3 --- + app/core/gimpbrush.c | 12 ------------ + app/core/gimpbrush.h | 3 --- app/paint/gimpbrushcore.c | 2 -- 3 files changed, 17 deletions(-) commit 67053601d5857750934f68f1eb8a19513c14e31c Author: Javier Jardón -Date: Sat Sep 10 15:35:14 2011 +0100 +Date: Sat Sep 10 15:35:14 2011 +0100 configure.ac: Use maintainer mode by default @@ -30165,7 +31072,7 @@ commit 2d93e70b38174dcd09b546bee4becedc2e5788cc Author: Daniel Korostil -Date: Fri Sep 9 22:35:28 2011 +0300 +Date: Fri Sep 9 22:35:28 2011 +0300 Uploaded Ukranian @@ -30175,7 +31082,7 @@ commit a5c1ef119427efa01c48cb9b63d0528b497cd27d Author: Daniel Korostil -Date: Fri Sep 9 15:09:51 2011 +0300 +Date: Fri Sep 9 15:09:51 2011 +0300 Uploaded Ukranian @@ -30185,7 +31092,7 @@ commit 56608b0f4059dd5d25b5210dfa3f0c9c1394d8b6 Author: Daniel Korostil -Date: Fri Sep 9 13:37:46 2011 +0300 +Date: Fri Sep 9 13:37:46 2011 +0300 Uploaded Ukranian @@ -30194,7 +31101,7 @@ commit 3b1e784a951fb5622fe637ea05fca8c21eb081b1 Author: Martin Nordholts -Date: Fri Sep 9 07:01:58 2011 +0200 +Date: Fri Sep 9 07:01:58 2011 +0200 NEWS: Update @@ -30203,7 +31110,7 @@ commit 8b8e67ffe286d78044266fae45141b90d93855a9 Author: Massimo Valentini -Date: Thu Sep 8 18:30:23 2011 +0200 +Date: Thu Sep 8 18:30:23 2011 +0200 Bug 656129: Warnings: render_image_tile_fault: assertion `tile[4]... @@ -30214,7 +31121,7 @@ commit 7c127fdb0caf9d594e735f65727d2d17553f9b6c Author: Daniel Korostil -Date: Thu Sep 8 14:56:08 2011 +0300 +Date: Thu Sep 8 14:56:08 2011 +0300 Uploaded Ukranian @@ -30224,7 +31131,7 @@ commit 172e1d7c404c2f00467c5be1aec8e6ac7a6a383d Author: Daniel Korostil -Date: Thu Sep 8 13:47:05 2011 +0300 +Date: Thu Sep 8 13:47:05 2011 +0300 Uploaded Ukranian @@ -30234,7 +31141,7 @@ commit ca8a98c70614737ec1ba54bf49c1410a408e4c31 Author: Daniel Korostil -Date: Thu Sep 8 13:42:05 2011 +0300 +Date: Thu Sep 8 13:42:05 2011 +0300 Uploaded Ukranian @@ -30244,7 +31151,7 @@ commit adb8d2939c7ac0f42a7b299d85f987bfea324d10 Author: Daniel Korostil -Date: Thu Sep 8 13:23:21 2011 +0300 +Date: Thu Sep 8 13:23:21 2011 +0300 Uploaded Ukranian @@ -30254,34 +31161,34 @@ commit 6945ef477a9ef309b41787145ee2a03cd9dfc354 Author: Rudolfs Mazurs -Date: Thu Sep 8 00:15:32 2011 +0300 +Date: Thu Sep 8 00:15:32 2011 +0300 Updated Latvian translation. po-plug-ins/lv.po | 147 ++++--- - po-script-fu/lv.po | 38 +- - po/lv.po | 1216 + po-script-fu/lv.po | 38 +- + po/lv.po | 1216 +++++++++++++++++++++++++++------------------------- 3 files changed, 733 insertions(+), 668 deletions(-) commit 50acd95e9d718a55f2cf7d256c482a5dd725cc4a Author: Martin Nordholts -Date: Wed Sep 7 16:00:48 2011 +0200 +Date: Wed Sep 7 16:00:48 2011 +0200 app: Use pixel_region_has_alpha() For increased readability. app/base/color-balance.c | 2 +- - app/base/colorize.c | 2 +- - app/base/desaturate.c | 9 ++++++--- + app/base/colorize.c | 2 +- + app/base/desaturate.c | 9 ++++++--- app/base/hue-saturation.c | 2 +- - app/base/threshold.c | 2 +- + app/base/threshold.c | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) commit 7a2208d1bd597ff3dbd5ff1905908919c6b7e212 Author: Daniel Korostil -Date: Wed Sep 7 14:32:12 2011 +0300 +Date: Wed Sep 7 14:32:12 2011 +0300 Uploaded Ukranian @@ -30291,7 +31198,7 @@ commit 9f1187f6a5318a757355b69e8fdd384119313a55 Author: Martin Nordholts -Date: Wed Sep 7 11:47:41 2011 +0200 +Date: Wed Sep 7 11:47:41 2011 +0200 app: Prefix TileManager functions @@ -30302,30 +31209,30 @@ for consistency. - app/base/pixel-region.c | 8 ++++-- - app/base/siox.c | 4 +-- - app/base/tile-manager.c | 38 ++++++++++++------------- - app/base/tile-manager.h | 48 + app/base/pixel-region.c | 8 ++++-- + app/base/siox.c | 4 +-- + app/base/tile-manager.c | 38 ++++++++++++------------- + app/base/tile-manager.h | 48 ++++++++++++++++---------------- - app/core/gimp-transform-region.c | 16 ++++++----- - app/core/gimpdrawable.c | 3 +- - app/core/gimpimagemap.c | 8 +++--- - app/core/gimpprojection.c | 2 +- + app/core/gimp-transform-region.c | 16 ++++++----- + app/core/gimpdrawable.c | 3 +- + app/core/gimpimagemap.c | 8 +++--- + app/core/gimpprojection.c | 2 +- app/display/gimpcanvastransformpreview.c | 42 ++++++++++++++++------------ - app/gimpcore.def | 2 +- - app/paint-funcs/scale-region.c | 3 +- - devel-docs/app/app-sections.txt | 8 +++--- + app/gimpcore.def | 2 +- + app/paint-funcs/scale-region.c | 3 +- + devel-docs/app/app-sections.txt | 8 +++--- 12 files changed, 97 insertions(+), 85 deletions(-) commit e4204e453ac1fa9b692d4d8fa345b808d9076e10 Author: Mukund Sivaraman -Date: Tue Sep 6 23:12:36 2011 +0530 +Date: Tue Sep 6 23:12:36 2011 +0530 app: Move language specific code into language.[ch] app/Makefile.am | 2 + - app/app.c | 711 + app/app.c | 711 +----------------------------------------------------- app/language.c | 735 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -30335,7 +31242,7 @@ commit 4eb09f53ef1adff35d848d2458eea1bdce87fe47 Author: Daniel Korostil -Date: Tue Sep 6 19:32:58 2011 +0300 +Date: Tue Sep 6 19:32:58 2011 +0300 Uploaded Ukranian @@ -30345,7 +31252,7 @@ commit 72d916b78d20887585552590cc296f0292e268ec Author: Sílvia Miranda -Date: Mon Sep 5 21:44:24 2011 +0200 +Date: Mon Sep 5 21:44:24 2011 +0200 [l10n]Minor fix in Catalan translation @@ -30354,7 +31261,7 @@ commit 6095a9967fdb75c0800d4b03bd88e4708c37a06a Author: Massimo Valentini -Date: Mon Sep 5 18:27:34 2011 +0200 +Date: Mon Sep 5 18:27:34 2011 +0200 app: Use of GimpViewableDialog with a NULL viewable is depecrated! @@ -30366,7 +31273,7 @@ commit 3e1ae37bcc10669207a1c1475a5adc34bba8856e Author: Daniel Nylander -Date: Sun Sep 4 14:31:39 2011 +0200 +Date: Sun Sep 4 14:31:39 2011 +0200 Updated Swedish translation @@ -30376,7 +31283,7 @@ commit 2087d42e3fb4d3ff8935b05077d3e18cf3bbdf9f Author: Daniel Nylander -Date: Sun Sep 4 14:26:46 2011 +0200 +Date: Sun Sep 4 14:26:46 2011 +0200 Updated Swedish translation @@ -30385,7 +31292,7 @@ commit 80555179587051424b2a0fdf00bbc4e99c3e9b5f Author: Daniel Nylander -Date: Sat Sep 3 19:29:47 2011 +0200 +Date: Sat Sep 3 19:29:47 2011 +0200 Updated Swedish translation @@ -30395,7 +31302,7 @@ commit abb91bdf420dd659e230d6b47f1d5d5829b8cb06 Author: Daniel Nylander -Date: Sat Sep 3 19:28:51 2011 +0200 +Date: Sat Sep 3 19:28:51 2011 +0200 Updated Swedish translation @@ -30405,7 +31312,7 @@ commit 172e26cee6b891ad5178a4ba58d5aa80b1ab6e6b Author: Daniel Nylander -Date: Sat Sep 3 18:37:31 2011 +0200 +Date: Sat Sep 3 18:37:31 2011 +0200 Updated Swedish translation @@ -30414,7 +31321,7 @@ commit a4591aae11a0aee45e461e1ba9c5f617fe2f1f76 Author: Michael Natterer -Date: Sat Sep 3 10:14:52 2011 +0200 +Date: Sat Sep 3 10:14:52 2011 +0200 app: GimpPerspectiveCloneTool: don't start an already active draw tool @@ -30423,7 +31330,7 @@ commit 820b9ea45948cf31083f82ae91cc3c0fe8ca5daa Author: Lucian Adrian Grijincu -Date: Fri Sep 2 20:22:17 2011 +0300 +Date: Fri Sep 2 20:22:17 2011 +0300 po-tips: Updated Romanian translation @@ -30432,7 +31339,7 @@ commit 5f8f7e6b57ee404dac604c7b3a24eb0395168268 Author: Lucian Adrian Grijincu -Date: Fri Sep 2 20:22:06 2011 +0300 +Date: Fri Sep 2 20:22:06 2011 +0300 po-tips: Updated Romanian translation @@ -30441,7 +31348,7 @@ commit 4a982cfec8a46f6c02e985b96ad448316d6ab893 Author: Lucian Adrian Grijincu -Date: Fri Sep 2 20:21:45 2011 +0300 +Date: Fri Sep 2 20:21:45 2011 +0300 po-script-fu: Updated Romanian translation @@ -30451,7 +31358,7 @@ commit 5e192ef752e67f121c82d234f5583ffcac762cde Author: Lucian Adrian Grijincu -Date: Fri Sep 2 20:21:33 2011 +0300 +Date: Fri Sep 2 20:21:33 2011 +0300 po-script-fu: Updated Romanian translation @@ -30461,7 +31368,7 @@ commit adb1de556fe3e607e6d0d9d4005505bc74bcbc22 Author: Lucian Adrian Grijincu -Date: Fri Sep 2 20:20:50 2011 +0300 +Date: Fri Sep 2 20:20:50 2011 +0300 po-python: Updated Romanian translation @@ -30470,7 +31377,7 @@ commit 82559b130faf5a1dccef674f494367c56b8cc2ab Author: Lucian Adrian Grijincu -Date: Fri Sep 2 20:20:20 2011 +0300 +Date: Fri Sep 2 20:20:20 2011 +0300 po-python: Updated Romanian translation @@ -30480,7 +31387,7 @@ commit 2dd7aa584640a5851a2932d37b6318987cac8888 Author: Lucian Adrian Grijincu -Date: Fri Sep 2 20:19:57 2011 +0300 +Date: Fri Sep 2 20:19:57 2011 +0300 po-plug-ins: Updated Romanian translation @@ -30490,7 +31397,7 @@ commit b32dd7cadf3d4994fd42a6234b085700c48487cd Author: Lucian Adrian Grijincu -Date: Fri Sep 2 20:19:43 2011 +0300 +Date: Fri Sep 2 20:19:43 2011 +0300 po-plug-ins: Updated Romanian translation @@ -30500,7 +31407,7 @@ commit feb537058de4334838027d37fec90c04c7ca7a13 Author: Lucian Adrian Grijincu -Date: Fri Sep 2 20:18:41 2011 +0300 +Date: Fri Sep 2 20:18:41 2011 +0300 po-libgimp: Updated Romanian translation @@ -30509,7 +31416,7 @@ commit 13de1746bb043e0a3ee09a915411a032192e08ef Author: Lucian Adrian Grijincu -Date: Fri Sep 2 20:18:25 2011 +0300 +Date: Fri Sep 2 20:18:25 2011 +0300 po-libgimp: Updated Romanian translation @@ -30519,7 +31426,7 @@ commit 5f9822c3e23a2c56e89ce1615e92ec5408db8414 Author: Lucian Adrian Grijincu -Date: Fri Sep 2 20:09:24 2011 +0300 +Date: Fri Sep 2 20:09:24 2011 +0300 po: Updated Romanian translation @@ -30529,7 +31436,7 @@ commit 903bbc4edde8535cd0ee81e04d9b7146228cd230 Author: Lucian Adrian Grijincu -Date: Fri Sep 2 20:09:01 2011 +0300 +Date: Fri Sep 2 20:09:01 2011 +0300 po: Updated Romanian translation @@ -30539,7 +31446,7 @@ commit 940d334f232254d6fa93347def71f6370edacb02 Author: Daniel Korostil -Date: Fri Sep 2 19:17:21 2011 +0300 +Date: Fri Sep 2 19:17:21 2011 +0300 Uploaded Ukranian @@ -30549,7 +31456,7 @@ commit 779756bc51975c5c158d49a98b1e4142530d658f Author: Massimo Valentini -Date: Fri Sep 2 18:07:34 2011 +0200 +Date: Fri Sep 2 18:07:34 2011 +0200 app: draw Wilber as in gimp-2.6 @@ -30563,7 +31470,7 @@ commit 351423a2ef7552908d067d2915122ea2641eaffd Author: Michael Natterer -Date: Fri Sep 2 00:14:21 2011 +0200 +Date: Fri Sep 2 00:14:21 2011 +0200 app: put utility function in #ifdef HAVE_ICO_CODES in preferences-dialog.c @@ -30573,7 +31480,7 @@ commit f6d106705e79f3ecc2409f5a14ec5b0493985a2a Author: Michael Natterer -Date: Fri Sep 2 00:12:10 2011 +0200 +Date: Fri Sep 2 00:12:10 2011 +0200 app: move variable to local scope in GimpTextOptions @@ -30582,7 +31489,7 @@ commit 0351c13a36b01e45be65c616a6d52b28445247af Author: Michael Natterer -Date: Thu Sep 1 21:25:00 2011 +0200 +Date: Thu Sep 1 21:25:00 2011 +0200 Bug 624642 - 'GtkAccelLabel' has no member named 'accel_closure' @@ -30598,7 +31505,7 @@ commit b40e1c44b6f0eeeab023eb12ea3d05e5bc0c4e88 Author: Michael Natterer -Date: Thu Sep 1 21:17:26 2011 +0200 +Date: Thu Sep 1 21:17:26 2011 +0200 configure: let the test for TWAIN fail on 64 bit OSX @@ -30611,7 +31518,7 @@ commit 87b38809ff4f6424d25b7440ece5afb38f81d548 Author: Martin Srebotnjak -Date: Thu Sep 1 19:19:19 2011 +0200 +Date: Thu Sep 1 19:19:19 2011 +0200 Updated Slovenian translation @@ -30621,7 +31528,7 @@ commit b650f89a6320050bf95bb2ae4ac812d51bc25b3e Author: Martin Srebotnjak -Date: Thu Sep 1 19:18:55 2011 +0200 +Date: Thu Sep 1 19:18:55 2011 +0200 Updated Slovenian translation @@ -30631,7 +31538,7 @@ commit fdf9f9f2e675d6bda663e46ca4257bccd0349040 Author: Martin Srebotnjak -Date: Thu Sep 1 19:18:34 2011 +0200 +Date: Thu Sep 1 19:18:34 2011 +0200 Updated Slovenian translation @@ -30640,7 +31547,7 @@ commit 262241cb21ec390c00f0e2976637852ad532d369 Author: Mukund Sivaraman -Date: Wed Aug 31 22:26:21 2011 +0530 +Date: Wed Aug 31 22:26:21 2011 +0530 script-fu: Don't print leading space when printing vectors @@ -30649,7 +31556,7 @@ commit db008cbb88f89f7da32a87b3174d59ab5e9527a3 Author: Martin Nordholts -Date: Wed Aug 31 18:41:11 2011 +0200 +Date: Wed Aug 31 18:41:11 2011 +0200 app: Single-window mode does not require a restart @@ -30658,7 +31565,7 @@ commit 35524c7c5ca4d91bc34bdb1a4c637d957ad07ccf Author: Massimo Valentini -Date: Wed Aug 31 18:04:25 2011 +0200 +Date: Wed Aug 31 18:04:25 2011 +0200 plug-ins/gfig: silence a warning and commit on close @@ -30678,7 +31585,7 @@ commit 5441577f2bfa6c3ff281ec12b687e5a985f3dd68 Author: Mukund Sivaraman -Date: Wed Aug 31 11:49:05 2011 +0530 +Date: Wed Aug 31 11:49:05 2011 +0530 app: Update comment in last commit @@ -30687,7 +31594,7 @@ commit c9a9b1211cab22583e08c3119cce3f85a8bf4684 Author: Jernej Simončič -Date: Wed Aug 31 03:55:22 2011 +0530 +Date: Wed Aug 31 03:55:22 2011 +0530 app: Force a default language on Win32 @@ -30697,7 +31604,7 @@ commit 01a24fb4f75ecd22a3fc8ba7ef15053c5472fc65 Author: Kevin Cozens -Date: Tue Aug 30 16:53:17 2011 -0400 +Date: Tue Aug 30 16:53:17 2011 -0400 R5RS compatability fixes for integer? and round (SourceForge bug #3400284) @@ -30707,7 +31614,7 @@ commit a8966b8485a2ca6d2f9edea5824e649a5b73e39d Author: Kevin Cozens -Date: Tue Aug 30 12:00:00 2011 -0400 +Date: Tue Aug 30 12:00:00 2011 -0400 R5RS compatability fix for expt (SourceForge bug #3399332) @@ -30716,7 +31623,7 @@ commit 7ab6704f78667970fec18344c094e2ef2a055f96 Author: Kevin Cozens -Date: Mon Aug 29 17:24:28 2011 -0400 +Date: Mon Aug 29 17:24:28 2011 -0400 R5RS fix adds decimal point for inexact in atom2str (SourceForge bug #3395548) @@ -30726,7 +31633,7 @@ commit 6af99d4793c7908a171ff047006fc65d79128691 Author: Kevin Cozens -Date: Mon Aug 29 17:10:58 2011 -0400 +Date: Mon Aug 29 17:10:58 2011 -0400 R5RS compatibility fix for min and max (take 2) (SourceForge bug #3399331) @@ -30738,7 +31645,7 @@ commit 5d3be5be3c1b66d44f7d7ae919db9c1768a8c1b9 Author: Kevin Cozens -Date: Mon Aug 29 16:08:47 2011 -0400 +Date: Mon Aug 29 16:08:47 2011 -0400 R5RS compatability fix for append by Doug Currie. (SourceForge bug #3400202) @@ -30749,7 +31656,7 @@ commit 5d61a737a7a6006f88566b36040db4fabb87db92 Author: Kevin Cozens -Date: Mon Aug 29 15:21:28 2011 -0400 +Date: Mon Aug 29 15:21:28 2011 -0400 R5RS compatibility fix for min and max (SourceForge bug #3399331) They are required to return inexact when any argument is inexact. @@ -30761,7 +31668,7 @@ commit f524d20360f37bf891ea55ac2363c3d31b839839 Author: Michael Schumacher -Date: Mon Aug 29 22:19:58 2011 +0200 +Date: Mon Aug 29 22:19:58 2011 +0200 Added plug-ins.ico to EXTRA_DIST @@ -30770,27 +31677,27 @@ commit 595cca4c0f8d4e2100a4afcf98c3de6928290c24 Author: Милош Поповић -Date: Mon Aug 29 21:23:41 2011 +0200 +Date: Mon Aug 29 21:23:41 2011 +0200 Updated Serbian translation - po-libgimp/sr.po | 521 +++-- + po-libgimp/sr.po | 521 +++-- po-libgimp/sr@latin.po | 521 +++-- - po-plug-ins/sr.po | 5669 + po-plug-ins/sr.po | 5669 ++++++++++++++++++++++++---------------------- po-plug-ins/sr@latin.po | 5669 ++++++++++++++++++++++++---------------------- - po-python/sr.po | 100 +- - po-python/sr@latin.po | 100 +- - po-script-fu/sr.po | 719 +++--- + po-python/sr.po | 100 +- + po-python/sr@latin.po | 100 +- + po-script-fu/sr.po | 719 +++--- po-script-fu/sr@latin.po | 719 +++--- - po/sr.po | 4683 +++++++++++++++++++++----------------- - po/sr@latin.po | 4683 +++++++++++++++++++++----------------- + po/sr.po | 4683 +++++++++++++++++++++----------------- + po/sr@latin.po | 4683 +++++++++++++++++++++----------------- 10 files changed, 12500 insertions(+), 10884 deletions(-) commit 7f449a38b448d4300a8fa1eb0c7b7c9b9ea4dad2 Author: Francisco Vila -Date: Mon Aug 29 20:56:00 2011 +0200 +Date: Mon Aug 29 20:56:00 2011 +0200 Updated Spanish translation @@ -30800,7 +31707,7 @@ commit 9dcb6e6406ce4a064ea7b6ec6415b77629d481b3 Author: Francisco Vila -Date: Mon Aug 29 20:55:38 2011 +0200 +Date: Mon Aug 29 20:55:38 2011 +0200 Updated Spanish translation @@ -30809,7 +31716,7 @@ commit 2cf06cc95d8254391cc2f355201362ae27282de2 Author: Francisco Vila -Date: Mon Aug 29 20:54:56 2011 +0200 +Date: Mon Aug 29 20:54:56 2011 +0200 Updated Spanish translation @@ -30819,7 +31726,7 @@ commit a1b69f8f9ede96c55c60b21edc6aeb5335df3ea4 Author: Michael Natterer -Date: Mon Aug 29 20:27:56 2011 +0200 +Date: Mon Aug 29 20:27:56 2011 +0200 libgimpbase: fix Win32 import/export of the gimp_foo_version variables @@ -30831,7 +31738,7 @@ commit fe20e7b181bb182ee55502e1af4c653d9256f3cb Author: Kevin Cozens -Date: Mon Aug 29 14:06:18 2011 -0400 +Date: Mon Aug 29 14:06:18 2011 -0400 Added closing brace that got lost when applying fix for modulo procedure. @@ -30841,7 +31748,7 @@ commit 15747002157959d697069ad7d3c0c813d30b3e0e Author: Kevin Cozens -Date: Mon Aug 29 12:39:24 2011 -0400 +Date: Mon Aug 29 12:39:24 2011 -0400 R5RS compatibility fix for the modulo procedure (SourceForge bug #3395547) @@ -30851,7 +31758,7 @@ commit a21bba4cab58605e166cefd48cc8059f11e071fe Author: Kevin Cozens -Date: Fri Aug 26 01:47:58 2011 -0400 +Date: Fri Aug 26 01:47:58 2011 -0400 Added missing #if in opdefines.h around get and put (from SVN TinyScheme r75) @@ -30861,7 +31768,7 @@ commit c556a8fdabac00f663b9bc9a69afd7ce46986f82 Author: Kevin Cozens -Date: Mon Aug 29 13:53:29 2011 -0400 +Date: Mon Aug 29 13:53:29 2011 -0400 Fixed deprecation warning and script breakage (see bug #646993) @@ -30876,7 +31783,7 @@ commit a1fbf3766f5b957ebc4014ab43130417c43fbab0 Author: Ihar Hrachyshka -Date: Mon Aug 29 13:49:59 2011 +0300 +Date: Mon Aug 29 13:49:59 2011 +0300 Added missing be to LINGUAS. @@ -30885,7 +31792,7 @@ commit 0f0bb336a86946cb22861e265d1a7def0af45b71 Author: Martin Nordholts -Date: Mon Aug 29 03:17:04 2011 +0200 +Date: Mon Aug 29 03:17:04 2011 +0200 devel-docs: Add gegl-porting-plan.txt @@ -30897,15 +31804,15 @@ be done. This is not only for ourselves, but will also be useful for non-core contributors. - NEWS | 2 +- - devel-docs/Makefile.am | 1 + + NEWS | 2 +- + devel-docs/Makefile.am | 1 + devel-docs/gegl-porting-plan.txt | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) commit 8e7484942a2b5f953ca37222819071c8c433fd7c Author: Martin Nordholts -Date: Mon Aug 29 02:50:04 2011 +0200 +Date: Mon Aug 29 02:50:04 2011 +0200 app: Remove COWSHOW debug output @@ -30917,7 +31824,7 @@ commit b112b08ddb426454116a60a151378befaee371b8 Author: Michael Natterer -Date: Sun Aug 28 20:06:54 2011 +0200 +Date: Sun Aug 28 20:06:54 2011 +0200 NEWS: updated @@ -30926,23 +31833,23 @@ commit 841c8a7ebe7871d5a67111e1b873ecbd4d70b563 Author: Bruce Cowan -Date: Sat Aug 27 13:49:19 2011 +0100 +Date: Sat Aug 27 13:49:19 2011 +0100 String review: fix some spelling and formatting issues - app/actions/select-actions.c | 2 +- - app/paint/gimppaintoptions.c | 2 +- - app/tools/gimpmagnifyoptions.c | 2 +- - plug-ins/common/file-html-table.c | 4 ++-- - plug-ins/common/file-xmc.c | 8 ++++---- - plug-ins/file-psd/psd-load.c | 2 +- + app/actions/select-actions.c | 2 +- + app/paint/gimppaintoptions.c | 2 +- + app/tools/gimpmagnifyoptions.c | 2 +- + plug-ins/common/file-html-table.c | 4 ++-- + plug-ins/common/file-xmc.c | 8 ++++---- + plug-ins/file-psd/psd-load.c | 2 +- plug-ins/script-fu/scripts/chrome-it.scm | 2 +- plug-ins/script-fu/scripts/line-nova.scm | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) commit c7614f182b173d238bb9e5bd36f2d826d989b471 Author: Bruce Cowan -Date: Sun Aug 28 19:05:11 2011 +0100 +Date: Sun Aug 28 19:05:11 2011 +0100 Partially revert "Fixed gettext issues in galician translations" @@ -30956,7 +31863,7 @@ commit 944c5bf22b7f94ac4fde7d5619bb1b09a1706413 Author: Martin Srebotnjak -Date: Sun Aug 28 19:43:21 2011 +0200 +Date: Sun Aug 28 19:43:21 2011 +0200 Updated Slovenian translation @@ -30965,7 +31872,7 @@ commit 05abbf7a19a96bd7f1dd4df1ae8e2253a8524f4f Author: Martin Srebotnjak -Date: Sun Aug 28 19:42:41 2011 +0200 +Date: Sun Aug 28 19:42:41 2011 +0200 Updated Slovenian translation @@ -30975,7 +31882,7 @@ commit 314d802eb027e3585653a7fe8bf9a4e2a4f2cb99 Author: Martin Nordholts -Date: Sun Aug 28 12:32:10 2011 +0200 +Date: Sun Aug 28 12:32:10 2011 +0200 app: Remove tile_manager_tiles_per_col() and _per_row() @@ -30989,7 +31896,7 @@ commit b85c0cc813dab785cbf9a84f6a0bc3e51d7a17c9 Author: Martin Srebotnjak -Date: Sun Aug 28 08:30:33 2011 +0200 +Date: Sun Aug 28 08:30:33 2011 +0200 Updated Slovenian translation @@ -30999,7 +31906,7 @@ commit 8405eb4f007ee7068cc42c77d4fff300d328eaa8 Author: Martin Srebotnjak -Date: Sun Aug 28 08:28:32 2011 +0200 +Date: Sun Aug 28 08:28:32 2011 +0200 Updated Slovenian translation @@ -31009,7 +31916,7 @@ commit 64d9c8b4e8cbdf9aa41b698f860876c0b0a19364 Author: Martin Srebotnjak -Date: Sun Aug 28 08:27:49 2011 +0200 +Date: Sun Aug 28 08:27:49 2011 +0200 Updated Slovenian translation @@ -31019,18 +31926,18 @@ commit f866a1dc084d50091fc741ea2eab03b3379fc1d8 Author: Fran Dieguez -Date: Sun Aug 28 03:44:28 2011 +0200 +Date: Sun Aug 28 03:44:28 2011 +0200 Fixed gettext issues in galician translations po/en_GB.po | 4537 ++++++++++++++++++++++++++--------------------------------- - po/gl.po | 5 +- + po/gl.po | 5 +- 2 files changed, 1990 insertions(+), 2552 deletions(-) commit 88dc36cdbfb47693fc87ef3977dfff712fef2087 Author: Fran Dieguez -Date: Sun Aug 28 03:38:38 2011 +0200 +Date: Sun Aug 28 03:38:38 2011 +0200 Updated Galician translations for UI, tags, script-fu, tips and libgimp @@ -31038,27 +31945,27 @@ po-libgimp/gl.po | 1645 +++++++----- po-python/gl.po | 195 +- po-script-fu/gl.po | 807 +++--- - po-tags/LINGUAS | 1 + - po-tags/gl.po | 28 + - po/gl.po | 7584 + po-tags/LINGUAS | 1 + + po-tags/gl.po | 28 + + po/gl.po | 7584 ++++++++++++++++++++++------------------------------ 6 files changed, 4795 insertions(+), 5465 deletions(-) commit 527500ef97f75218cbc278e36c96d97ca2da298e Author: Bruce Cowan -Date: Sat Aug 27 13:27:02 2011 +0100 +Date: Sat Aug 27 13:27:02 2011 +0100 Updated British English translation po-plug-ins/en_GB.po | 5498 ++++++++++++++++++++++++++------------------------ po-python/en_GB.po | 72 +- - po/en_GB.po | 4537 +++++++++++++++++++++++------------------ + po/en_GB.po | 4537 +++++++++++++++++++++++------------------ 3 files changed, 5403 insertions(+), 4704 deletions(-) commit 5a7c517574e11893139930f6190a0e6c2a325704 Author: Michael Natterer -Date: Sat Aug 27 08:37:30 2011 +0200 +Date: Sat Aug 27 08:37:30 2011 +0200 app: improve the undo strings of the transform tools @@ -31066,19 +31973,19 @@ undo strings by dynamic ones returned by a new virtual function of GimpTransformTool. - app/tools/gimpfliptool.c | 32 ++++++++++++++++++++++++------ + app/tools/gimpfliptool.c | 32 ++++++++++++++++++++++++------ app/tools/gimpperspectivetool.c | 19 ++++++++++++------ - app/tools/gimprotatetool.c | 37 +++++++++++++++++++++++----------- - app/tools/gimpscaletool.c | 29 ++++++++++++++++++--------- - app/tools/gimpsheartool.c | 44 + app/tools/gimprotatetool.c | 37 +++++++++++++++++++++++----------- + app/tools/gimpscaletool.c | 29 ++++++++++++++++++--------- + app/tools/gimpsheartool.c | 44 +++++++++++++++++++++++++++++++---------- - app/tools/gimptransformtool.c | 7 +++++-- - app/tools/gimptransformtool.h | 2 +- + app/tools/gimptransformtool.c | 7 +++++-- + app/tools/gimptransformtool.h | 2 +- 7 files changed, 124 insertions(+), 46 deletions(-) commit 7fea63a2834cd2ebdf5137526d940fcecfadf350 Author: Martin Nordholts -Date: Fri Aug 12 18:09:01 2011 +0200 +Date: Fri Aug 12 18:09:01 2011 +0200 Bug 653757 - Bitmap export in Gimp 2.6.11 vs Bitmap Export in Gimp 2.7.3 @@ -31088,14 +31995,14 @@ information. Unity 3D and BlitzMax have been reported to not support such BMP images. - NEWS | 2 +- + NEWS | 2 +- plug-ins/file-bmp/bmp-write.c | 98 +++++++++++++++++++++++++++++++------------ 2 files changed, 73 insertions(+), 27 deletions(-) commit c272a3a03802713e1b72b6df164a9d33bd0fce14 Author: Martin Nordholts -Date: Fri Aug 26 08:13:46 2011 +0200 +Date: Fri Aug 26 08:13:46 2011 +0200 app: Repair git-version.h generation @@ -31110,37 +32017,37 @@ commit b3622ad93cfcdb5c77eadc606726404a8a60227d Author: Piotr Drąg -Date: Thu Aug 25 21:32:31 2011 +0200 +Date: Thu Aug 25 21:32:31 2011 +0200 Updated Polish translation po-libgimp/pl.po | 1720 +++-- po-plug-ins/pl.po | 18118 +++++++++++++++++++++++++++------------------------ - po-python/pl.po | 281 +- - po-script-fu/pl.po | 913 ++- - po-tags/LINGUAS | 1 + - po-tags/pl.po | 32 + - po-tips/pl.po | 112 +- - po/pl.po | 6411 ++++++++++-------- + po-python/pl.po | 281 +- + po-script-fu/pl.po | 913 ++- + po-tags/LINGUAS | 1 + + po-tags/pl.po | 32 + + po-tips/pl.po | 112 +- + po/pl.po | 6411 ++++++++++-------- 8 files changed, 15046 insertions(+), 12542 deletions(-) commit a11989542a8d3eef7530748fd8a2ccf775995c93 Author: Martin Nordholts -Date: Wed Aug 24 22:47:58 2011 +0200 +Date: Wed Aug 24 22:47:58 2011 +0200 app: Add a close button to image window tabs It takes a bit more space, but it needs to be easy to close images. - NEWS | 39 +++++++++++++++++++++++ + NEWS | 39 +++++++++++++++++++++++ app/display/gimpimagewindow.c | 72 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 98 insertions(+), 13 deletions(-) commit bf4ce56ade1ba5fd72f013ef1cf1e49ba9cf6daa Author: Michael Natterer -Date: Sun Aug 21 21:49:26 2011 +0200 +Date: Sun Aug 21 21:49:26 2011 +0200 configure: bump version to 2.7.4 @@ -31149,7 +32056,7 @@ commit 4c9a2f17295f2c57d81530bd77f557e23b65ec25 Author: Michael Natterer -Date: Sun Aug 21 17:43:39 2011 +0200 +Date: Sun Aug 21 17:43:39 2011 +0200 app: remove trailing whitespace in GimpToolPalette @@ -31158,7 +32065,7 @@ commit 6074c89462416f0a56e0af29767a82baeeb487c7 Author: Martin Nordholts -Date: Sat Aug 20 17:59:02 2011 +0200 +Date: Sat Aug 20 17:59:02 2011 +0200 NEWS: Update @@ -31167,7 +32074,7 @@ commit 80beaa6b5a78feca3f8173f27a838120f25eca0f Author: Martin Nordholts -Date: Sat Aug 20 15:01:46 2011 +0200 +Date: Sat Aug 20 15:01:46 2011 +0200 Bug 612931 - Moving individual layer in layer group not possible with Move Tool in 'pick a layer' mode @@ -31175,13 +32082,13 @@ When using GimpPickable::get_opacity_at(), don't consider group layers as having content. - app/core/gimpgrouplayer.c | 26 +++++++++++++++++++++++++- + app/core/gimpgrouplayer.c | 26 +++++++++++++++++++++++++- app/core/gimpimage-pick-layer.c | 3 +-- 2 files changed, 26 insertions(+), 3 deletions(-) commit 743f6a503565da2a90271173ec75aed79b248b10 Author: Michael Natterer -Date: Sat Aug 20 08:43:29 2011 +0200 +Date: Sat Aug 20 08:43:29 2011 +0200 app: fix typo: s/Dynamicss/Dynamics/ @@ -31190,7 +32097,7 @@ commit 94d28679c3fbee3210e8c2494ab03a0aa0731808 Author: Christian Kirbach -Date: Fri Aug 19 21:55:03 2011 +0200 +Date: Fri Aug 19 21:55:03 2011 +0200 [l10n] Updated German translation @@ -31200,7 +32107,7 @@ commit ce3db28f5abe3667a97be3ad2d44a0794efecb16 Author: Nelson A. de Oliveira -Date: Wed Aug 17 14:13:42 2011 -0300 +Date: Wed Aug 17 14:13:42 2011 -0300 Fix some memleaks @@ -31210,21 +32117,21 @@ commit c0208e70c00c9199197b9fb5cae2c4b8eea616f5 Author: Martin Nordholts -Date: Tue Aug 16 22:17:25 2011 +0200 +Date: Tue Aug 16 22:17:25 2011 +0200 app: Resurrect "You can drop dockable dialogs here" Resurrect the help string "You can drop dockable dialogs here" inside GimpPanedBox. It got killed when we removed GimpDockSeparator. - NEWS | 2 + + NEWS | 2 + app/widgets/gimppanedbox.c | 147 +++++++++++++++++++++++++++++++++++---------- 2 files changed, 116 insertions(+), 33 deletions(-) commit 6d3047f6a91ea20f5369259265998426a4d76fe2 Author: Mikael Magnusson -Date: Tue Aug 16 19:02:56 2011 +0200 +Date: Tue Aug 16 19:02:56 2011 +0200 app: add missing space in help string @@ -31233,17 +32140,17 @@ commit b74c7d0ff602c27a6eb7fbcf2d6a25ccf6eab89c Author: Martin Nordholts -Date: Sat Aug 13 23:03:03 2011 +0200 +Date: Sat Aug 13 23:03:03 2011 +0200 Bug 656471 - GIMP crashes when File > Properties - app/pdb/image-cmds.c | 4 +++- + app/pdb/image-cmds.c | 4 +++- tools/pdbgen/pdb/image.pdb | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) commit bed3ca0ada35999871ff93eba376ef252a5302c0 Author: Mikael Magnusson -Date: Sat Aug 13 13:32:23 2011 +0200 +Date: Sat Aug 13 13:32:23 2011 +0200 app: fix right-click cancel after a reset in transformtool @@ -31252,17 +32159,17 @@ commit 0d17a5c70931a723068f5187909ef6a35e4526f1 Author: Martin Nordholts -Date: Fri Aug 12 21:26:01 2011 +0200 +Date: Fri Aug 12 21:26:01 2011 +0200 Update gimprc docs/gimprc.5.in | 6 ++++++ - etc/gimprc | 5 +++++ + etc/gimprc | 5 +++++ 2 files changed, 11 insertions(+) commit da37e9ff3ea0599bd615e55e8a6fd6b75b409be1 Author: Eric Grivel -Date: Fri Aug 12 21:15:16 2011 +0200 +Date: Fri Aug 12 21:15:16 2011 +0200 Bug 596410 - gimp-image-get-filename returns NULL for imported files @@ -31270,34 +32177,34 @@ the GIMP 2.6 days. Add new functions gimp_image_get_xcf_uri(), gimp_image_get_exported_uri() and gimp_image_get_imported_uri(). - AUTHORS | 1 + - NEWS | 1 + - app/core/gimpimage.c | 28 +++++++ - app/core/gimpimage.h | 1 + - app/pdb/image-cmds.c | 183 + AUTHORS | 1 + + NEWS | 1 + + app/core/gimpimage.c | 28 +++++++ + app/core/gimpimage.h | 1 + + app/pdb/image-cmds.c | 183 ++++++++++++++++++++++++++++++++++++++++++++- - app/pdb/internal-procs.c | 2 +- - authors.xml | 1 + - libgimp/gimp.def | 3 + + app/pdb/internal-procs.c | 2 +- + authors.xml | 1 + + libgimp/gimp.def | 3 + libgimp/gimpimage_pdb.c | 115 +++++++++++++++++++++++++++- - libgimp/gimpimage_pdb.h | 3 + + libgimp/gimpimage_pdb.h | 3 + tools/pdbgen/pdb/image.pdb | 122 ++++++++++++++++++++++++++++-- 11 files changed, 446 insertions(+), 14 deletions(-) commit 0f58d779c1c8c16e1166883d78cfb54e4ed47c77 Author: Martin Nordholts -Date: Fri Aug 12 20:18:45 2011 +0200 +Date: Fri Aug 12 20:18:45 2011 +0200 pdb: Untabify image.pdb - app/pdb/image-cmds.c | 2 +- + app/pdb/image-cmds.c | 2 +- tools/pdbgen/pdb/image.pdb | 1044 ++++++++++++++++++++++---------------------- 2 files changed, 523 insertions(+), 523 deletions(-) commit bb02019aa0cc3faaba6b09bbb334d5b36c167996 Author: Martin Nordholts -Date: Fri Aug 12 18:39:50 2011 +0200 +Date: Fri Aug 12 18:39:50 2011 +0200 plug-ins: Remember BMP options across invocations @@ -31309,7 +32216,7 @@ commit 698d9ea28ed71ff86b32b698c6a3526041b77bb8 Author: Martin Nordholts -Date: Fri Aug 12 17:40:35 2011 +0200 +Date: Fri Aug 12 17:40:35 2011 +0200 plug-ins: bmp-write.c: encoded -> use_run_length_encoding @@ -31318,7 +32225,7 @@ commit 376ad788c1a1c31d40f18494889c383f6909ebfc Author: Nils Philippsen -Date: Thu Aug 4 12:51:42 2011 +0200 +Date: Thu Aug 4 12:51:42 2011 +0200 file-gif-load: fix heap corruption and buffer overflow (CVE-2011-2896) @@ -31327,7 +32234,7 @@ commit b1a3de761362db982c0ddfaff60ab4a3c4267f32 Author: Nils Philippsen -Date: Thu Aug 4 12:47:44 2011 +0200 +Date: Thu Aug 4 12:47:44 2011 +0200 file-gif-load: ensure return value of LZWReadByte() is <= 255 @@ -31336,7 +32243,7 @@ commit c6f0a66de88d39299996efb5617748ccf73d2463 Author: Alexia Death -Date: Thu Aug 11 17:17:13 2011 +0300 +Date: Thu Aug 11 17:17:13 2011 +0300 app: fix wheel input weirdness hack - corrected in driver @@ -31345,7 +32252,7 @@ commit b9ccf189b49ac2a272c00ee038df7da8a287213a Author: Martin Nordholts -Date: Tue Aug 9 20:23:51 2011 +0200 +Date: Tue Aug 9 20:23:51 2011 +0200 Bug 650348 - Window unmaximizes when a document is closed @@ -31357,19 +32264,19 @@ State Window mode Images opened ------------------------------------------ - s1 swm 0 - s2 swm >0 - s3 mwm 0 - s4 mwm >0 + s1 swm 0 + s2 swm >0 + s3 mwm 0 + s4 mwm >0 The transitions are: Transition Description ------------------------------------------- - t1 Enter single-window mode (swm) - t2 Enter multi-window mwm (mwm) - t3 Open an image - t4 Close an image + t1 Enter single-window mode (swm) + t2 Enter multi-window mwm (mwm) + t3 Open an image + t4 Close an image When thinking of it like this, it is pretty easy to see when to call gimp_image_window_session_clear() and when to call @@ -31377,14 +32284,14 @@ gimp_image_window_set_entry_id() and handle all transitions in gimp_image_window_session_update(). - NEWS | 2 + + NEWS | 2 + app/display/gimpimagewindow.c | 113 +++++++++++++++++++++++------------------- 2 files changed, 65 insertions(+), 50 deletions(-) commit a5ef51137d0b06a697efa36b23b2beaf9e5a99be Author: Martin Nordholts -Date: Tue Aug 9 19:51:36 2011 +0200 +Date: Tue Aug 9 19:51:36 2011 +0200 Revert "app: #include "gimptoolpalette.h" in gimptoolpalette.c" @@ -31396,7 +32303,7 @@ commit 4f913949d3e74b1b2c9854c83a9b566df36a574f Author: Michael Muré -Date: Tue Aug 9 13:59:15 2011 +0200 +Date: Tue Aug 9 13:59:15 2011 +0200 cage tool options: better description for the fill plain color option @@ -31405,7 +32312,7 @@ commit 7e3c3af87f7eb9ea49e38a5a6601686b58f6617c Author: Michael Muré -Date: Tue Aug 9 13:33:05 2011 +0200 +Date: Tue Aug 9 13:33:05 2011 +0200 unmark technical string for translation in the cage tool gegl ops @@ -31415,7 +32322,7 @@ commit 2fd159ae069a5ee7c2809996ce0dd8c6e9d63228 Author: Martin Nordholts -Date: Sun Aug 7 20:49:49 2011 +0200 +Date: Sun Aug 7 20:49:49 2011 +0200 app: Only initialize tools once @@ -31424,7 +32331,7 @@ commit 1a8a806d4369e857b071b59876e3c12d2aeb6b21 Author: Martin Nordholts -Date: Sun Aug 7 19:49:37 2011 +0200 +Date: Sun Aug 7 19:49:37 2011 +0200 app: Make GimpToolbox use parent UI manager @@ -31436,16 +32343,16 @@ this cased problems talked about in bug 646794 (case 2). app/widgets/gimptoolbox-indicator-area.c | 6 +- - app/widgets/gimptoolbox.c | 72 +--------- - app/widgets/gimptoolbox.h | 1 - - app/widgets/gimptoolpalette.c | 239 + app/widgets/gimptoolbox.c | 72 +--------- + app/widgets/gimptoolbox.h | 1 - + app/widgets/gimptoolpalette.c | 239 ++++++++----------------------- - app/widgets/gimptoolpalette.h | 6 +- + app/widgets/gimptoolpalette.h | 6 +- 5 files changed, 72 insertions(+), 252 deletions(-) commit 77ac7ffa90ab9df2ccb346dcf9fc3362b0475117 Author: Martin Nordholts -Date: Sun Aug 7 19:03:10 2011 +0200 +Date: Sun Aug 7 19:03:10 2011 +0200 app: Add gimp_tool_palette_initialize_tools() @@ -31455,7 +32362,7 @@ commit c19560b08c4c8d63658f7807a75588c57ab083f1 Author: Martin Nordholts -Date: Sun Aug 7 18:36:45 2011 +0200 +Date: Sun Aug 7 18:36:45 2011 +0200 app: #include "gimptoolpalette.h" in gimptoolpalette.c @@ -31466,7 +32373,7 @@ commit a5029b8c4c98be98cbdea86f8b048fbb255e946f Author: Martin Nordholts -Date: Sun Aug 7 18:02:55 2011 +0200 +Date: Sun Aug 7 18:02:55 2011 +0200 app: Remove dead GimpToolPalette code @@ -31475,7 +32382,7 @@ commit f8e840d85b9a1d59ca9099147ff9085eba9354e8 Author: Martin Nordholts -Date: Sun Aug 7 17:04:36 2011 +0200 +Date: Sun Aug 7 17:04:36 2011 +0200 app: Document GimpUIManager a bit @@ -31484,7 +32391,7 @@ commit 71af0311deb60c330e2d821f03e4a466e7b48e38 Author: Martin Nordholts -Date: Fri Aug 5 01:59:49 2011 +0200 +Date: Fri Aug 5 01:59:49 2011 +0200 Bug 645120 - Disable color tools overlay dialogs @@ -31493,7 +32400,7 @@ commit 875471d6bd6e426c924cca7bdbf797c98470448c Author: Martin Nordholts -Date: Fri Aug 5 01:48:43 2011 +0200 +Date: Fri Aug 5 01:48:43 2011 +0200 app: Don't create empty dock windows when switching off swm @@ -31502,21 +32409,21 @@ commit 4080caf9990e99cc1323ae50f4f04b73ac3b7455 Author: Martin Nordholts -Date: Fri Aug 5 01:47:31 2011 +0200 +Date: Fri Aug 5 01:47:31 2011 +0200 app: Handle docks more clever when switching on swm When switching on single-window mode, put docks in the image window depending on what side of the window they originally had. - NEWS | 2 + + NEWS | 2 + app/gui/gimpuiconfigurer.c | 93 ++++++++++++++++++++++++++++++---------------- 2 files changed, 62 insertions(+), 33 deletions(-) commit dbf6b4d94402a76443caf15b8e58d3479dd728fa Author: Martin Nordholts -Date: Fri Aug 5 01:17:46 2011 +0200 +Date: Fri Aug 5 01:17:46 2011 +0200 app: Fix warning @@ -31525,7 +32432,7 @@ commit cb86ffb1e86013d8211fc2f3149e002ec7791fc2 Author: Michael Schumacher -Date: Thu Aug 4 23:13:10 2011 +0200 +Date: Thu Aug 4 23:13:10 2011 +0200 Use GTK_CFLAGS instead of GLIB_CFLAGS to fix a compile problem @@ -31534,7 +32441,7 @@ commit 143a04b2d0531507afefdd2a19531f51dfb93562 Author: Martin Nordholts -Date: Thu Aug 4 21:42:43 2011 +0200 +Date: Thu Aug 4 21:42:43 2011 +0200 app: Keep original GimpDockColumns size when moving out to a dock window @@ -31548,7 +32455,7 @@ commit 537dae8de75530f6daaa3c4f322595a6fac67752 Author: Martin Nordholts -Date: Thu Aug 4 21:09:50 2011 +0200 +Date: Thu Aug 4 21:09:50 2011 +0200 app: Remove more gimp-remote stuff @@ -31559,7 +32466,7 @@ commit 1ab5c311453e80e05a16e300f07ea0314a3310a9 Author: Martin Nordholts -Date: Thu Jul 21 10:59:11 2011 +0200 +Date: Thu Jul 21 10:59:11 2011 +0200 app: Fix copy paste error in gimp_ui_configurer_move_docks_to_window() @@ -31568,7 +32475,7 @@ commit 4335e126228077ecbe145b5a09edc0583f2ccb75 Author: Marco Ciampa -Date: Wed Aug 3 14:31:08 2011 +0200 +Date: Wed Aug 3 14:31:08 2011 +0200 Updated italian translation @@ -31578,7 +32485,7 @@ commit 44b6bae87444e94ac67299be85ac6217f6c8b3af Author: Rudolfs Mazurs -Date: Wed Aug 3 01:20:39 2011 +0300 +Date: Wed Aug 3 01:20:39 2011 +0300 Added Latvian translation. @@ -31587,7 +32494,7 @@ commit 7820742d9ab63875bd9cde23cc57ae7078c6f095 Author: Rudolfs Mazurs -Date: Wed Aug 3 01:19:00 2011 +0300 +Date: Wed Aug 3 01:19:00 2011 +0300 Added Latvian translation. @@ -31599,25 +32506,25 @@ po-script-fu/LINGUAS | 1 + po-script-fu/lv.po | 2840 +++++++++++ po-tags/LINGUAS | 1 + - po-tags/lv.po | 28 + + po-tags/lv.po | 28 + po-tips/LINGUAS | 1 + - po-tips/lv.po | 307 ++ + po-tips/lv.po | 307 ++ 10 files changed, 16367 insertions(+) commit 5790757d2bbaabfa0f2b69cdd014a68b25d78184 Author: Rudolfs Mazurs -Date: Wed Aug 3 01:13:34 2011 +0300 +Date: Wed Aug 3 01:13:34 2011 +0300 Updated Latvian translation. po-libgimp/lv.po | 296 ++---- - po/lv.po | 2785 + po/lv.po | 2785 +++++++++++++++++++++++++++++++----------------------- 2 files changed, 1710 insertions(+), 1371 deletions(-) commit 6d489824d8f4967be1f049c0e82d4453845584e9 Author: Marco Ciampa -Date: Tue Aug 2 23:34:48 2011 +0200 +Date: Tue Aug 2 23:34:48 2011 +0200 Updated italian translation @@ -31627,7 +32534,7 @@ commit f8dd7febcf712315f04ba7d471eebb624a0bfa3a Author: Michael Natterer -Date: Tue Aug 2 16:37:40 2011 +0200 +Date: Tue Aug 2 16:37:40 2011 +0200 NEWS: updates @@ -31636,7 +32543,7 @@ commit 762428501d7054d550c5e6f600ec19f928c2feb3 Author: Michael Natterer -Date: Tue Aug 2 16:34:00 2011 +0200 +Date: Tue Aug 2 16:34:00 2011 +0200 app: remove excess newlines from gimppaintoptions-gui.c @@ -31645,7 +32552,7 @@ commit 5726141905d4ec22d1916225e9e4853bceea7a7e Author: Michael Natterer -Date: Tue Aug 2 10:46:53 2011 +0200 +Date: Tue Aug 2 10:46:53 2011 +0200 app: use g_object_bind_property() in GimpBucketFillOptions @@ -31657,7 +32564,7 @@ commit 2b4160b60dbf409b13127dd026f2af24d2b8c836 Author: Marco Ciampa -Date: Mon Aug 1 23:22:41 2011 +0200 +Date: Mon Aug 1 23:22:41 2011 +0200 Updated italian translation @@ -31667,7 +32574,7 @@ commit 0453f264dae2d487d3d54b5ab639c4d56950584a Author: Michael Natterer -Date: Sun Jul 31 22:52:06 2011 +0200 +Date: Sun Jul 31 22:52:06 2011 +0200 app: a space was missing in GimpMeasureOptions' tooltip @@ -31676,7 +32583,7 @@ commit a836c0f2c9a13823c5484b1e2c9e10ae5876b898 Author: Martin Nordholts -Date: Wed Jul 20 23:58:42 2011 +0200 +Date: Wed Jul 20 23:58:42 2011 +0200 app: Distribute dock windows better when switching off swm @@ -31686,14 +32593,14 @@ the upper left corner of the screen, and the right docks to the upper right corner. - NEWS | 2 ++ + NEWS | 2 ++ app/gui/gimpuiconfigurer.c | 83 ++++++++++++++++++++++++++++++---------------- 2 files changed, 56 insertions(+), 29 deletions(-) commit a683219d276004419fe007eb06538b4bb2e84620 Author: Sven Neumann -Date: Sun Jul 31 17:56:56 2011 +0200 +Date: Sun Jul 31 17:56:56 2011 +0200 Update build documentation for removal of gimp-remote @@ -31702,7 +32609,7 @@ commit b83d25b1df0620f73dd82a8cb4e69541483a1ee6 Author: Alexandre Prokoudine -Date: Sun Jul 31 02:49:10 2011 +0400 +Date: Sun Jul 31 02:49:10 2011 +0400 Updated Russian translation @@ -31712,7 +32619,7 @@ commit d2596eb892473821868207c86573da889e38cda2 Author: Alexandre Prokoudine -Date: Sun Jul 31 02:42:30 2011 +0400 +Date: Sun Jul 31 02:42:30 2011 +0400 Updated Russian translation @@ -31722,7 +32629,7 @@ commit 1b2ae6fd9ed7149ba309cb4b903fe73e37177a2c Author: Michael Natterer -Date: Sun Jul 31 00:25:43 2011 +0200 +Date: Sun Jul 31 00:25:43 2011 +0200 app: clean up the transform options' preview and guides UI @@ -31732,7 +32639,7 @@ commit e9bf7ba6dce2fe5653af441f4edafea0e60cb535 Author: Michael Natterer -Date: Sun Jul 31 00:25:04 2011 +0200 +Date: Sun Jul 31 00:25:04 2011 +0200 app: rename the "Tool toggle" frame in zoom options to "Direction" @@ -31741,7 +32648,7 @@ commit e13557b7dd082ba286a67a1a2f9d8f7604be48e5 Author: Michael Natterer -Date: Sat Jul 30 19:07:24 2011 +0200 +Date: Sat Jul 30 19:07:24 2011 +0200 po: remove gimp-remote from POTFILES.in @@ -31750,53 +32657,53 @@ commit 2356aad3dac38d665b6f785bc76b49f82fb45128 Author: Michael Natterer -Date: Sat Jul 30 18:59:39 2011 +0200 +Date: Sat Jul 30 18:59:39 2011 +0200 Remove gimp-remote for good, it has been disabled since 2008 - configure.ac | 26 +--- - docs/.gitignore | 1 - - docs/Makefile.am | 4 +- - docs/gimp-remote.1.in | 87 ------------- - tools/.gitignore | 3 +- - tools/Makefile.am | 30 +---- + configure.ac | 26 +--- + docs/.gitignore | 1 - + docs/Makefile.am | 4 +- + docs/gimp-remote.1.in | 87 ------------- + tools/.gitignore | 3 +- + tools/Makefile.am | 30 +---- tools/gimp-remote-x11.c | 331 ------------------------------------------------ - tools/gimp-remote.c | 267 -------------------------------------- - tools/gimp-remote.h | 37 ------ + tools/gimp-remote.c | 267 -------------------------------------- + tools/gimp-remote.h | 37 ------ 9 files changed, 4 insertions(+), 782 deletions(-) commit 172c3eb935a2719fc9474cf4b3289f5e87caf7be Author: Martin Nordholts -Date: Wed Jul 20 16:29:45 2011 +0200 +Date: Wed Jul 20 16:29:45 2011 +0200 app/tests: Add single-window mode specific tests - app/tests/.gitignore | 1 + - app/tests/Makefile.am | 1 + + app/tests/.gitignore | 1 + + app/tests/Makefile.am | 1 + app/tests/test-single-window-mode.c | 175 ++++++++++++++++++++++++++++++++++++ 3 files changed, 177 insertions(+) commit 3ce4c49314210f993f4fba47d8b1e6c0e9a403cb Author: Martin Nordholts -Date: Wed Jul 20 16:31:12 2011 +0200 +Date: Wed Jul 20 16:31:12 2011 +0200 app: Handle special case "Toolbox" in GimpSingleWindowStrategy The special case isn't pretty, but the current design can't handle it nicely. This is not the first special case for the toolbox. - app/actions/dialogs-actions.c | 40 ++++++++++++++++----- - app/display/gimpimagewindow.c | 36 +++++++++++++++++++ - app/display/gimpimagewindow.h | 2 ++ + app/actions/dialogs-actions.c | 40 ++++++++++++++++----- + app/display/gimpimagewindow.c | 36 +++++++++++++++++++ + app/display/gimpimagewindow.h | 2 ++ app/display/gimpsinglewindowstrategy.c | 64 +++++++++++++++++++++++++--------- 4 files changed, 116 insertions(+), 26 deletions(-) commit 066cdf6d740ffe15cd53cb49228b7d655a3cecb6 Author: Martin Nordholts -Date: Wed Jul 20 16:31:03 2011 +0200 +Date: Wed Jul 20 16:31:03 2011 +0200 app: Pass gimp to gui_restore_after_callback() @@ -31808,7 +32715,7 @@ commit f839270b354ac9849e1040bd0a3e074e22552ae8 Author: Michael Muré -Date: Sat Jul 30 11:55:28 2011 +0200 +Date: Sat Jul 30 11:55:28 2011 +0200 operationcagetransform & operationcagecoefcalc: s/Gimp/GIMP/ in descritpion string @@ -31819,7 +32726,7 @@ commit f084732ac2d84b1ae6c34300a32672f5314a00b0 Author: Bruno Gurgel -Date: Thu Jul 28 15:42:21 2011 -0300 +Date: Thu Jul 28 15:42:21 2011 -0300 Added Brazilian Portuguese translation @@ -31829,7 +32736,7 @@ commit baeb83500caafe1ff7e40463c5f40e9bc454baff Author: Alexandre Prokoudine -Date: Thu Jul 28 16:43:39 2011 +0400 +Date: Thu Jul 28 16:43:39 2011 +0400 Tile Glass plug-in relocated @@ -31841,7 +32748,7 @@ commit 6308f0229a2235c0651a49a84309544d70491f6d Author: Alexandre Prokoudine -Date: Thu Jul 28 16:06:59 2011 +0400 +Date: Thu Jul 28 16:06:59 2011 +0400 Apply Lens filter relocated in menu @@ -31853,7 +32760,7 @@ commit 314717f4bbfbb94a36883dc5a75a4d03aa7037e9 Author: Michael Natterer -Date: Wed Jul 27 23:15:02 2011 +0200 +Date: Wed Jul 27 23:15:02 2011 +0200 app: clean up GimpTransformOptions' preview controls @@ -31865,13 +32772,13 @@ app/tools/gimptransformoptions.c | 138 +++++++++++++++++---------------------- app/tools/gimptransformoptions.h | 2 +- - app/tools/tools-enums.c | 33 ---------- - app/tools/tools-enums.h | 13 ---- + app/tools/tools-enums.c | 33 ---------- + app/tools/tools-enums.h | 13 ---- 4 files changed, 60 insertions(+), 126 deletions(-) commit d092573a3bee31e22789b0e52892ad24a888a4ce Author: Michael Natterer -Date: Wed Jul 27 22:24:10 2011 +0200 +Date: Wed Jul 27 22:24:10 2011 +0200 app: fix GimpTransformOptions::clip's tooltip @@ -31880,7 +32787,7 @@ commit 3704b8cd5972ae153f16570a8fcc1ae82bc9f9f5 Author: Michael Natterer -Date: Wed Jul 27 22:23:43 2011 +0200 +Date: Wed Jul 27 22:23:43 2011 +0200 app: GimpTransformOptions::clip is enum GimpTransformResize, not gboolean @@ -31890,17 +32797,17 @@ commit 97c5a2817d7e47164da8619d9943e6c10e2a7677 Author: Michael Natterer -Date: Wed Jul 27 20:21:58 2011 +0200 +Date: Wed Jul 27 20:21:58 2011 +0200 app: s/GTK_IS_VBOX/GTK_IS_BOX/ to simplify the gtk3-port branch - app/dialogs/about-dialog.c | 4 ++-- + app/dialogs/about-dialog.c | 4 ++-- app/widgets/gimpwidgets-utils.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) commit 9c6338900ec0b97284a438ddee8511f8d84193ff Author: Michael Natterer -Date: Wed Jul 27 19:53:34 2011 +0200 +Date: Wed Jul 27 19:53:34 2011 +0200 libgimp*: don't derive from GtkHBox and GtkVBox in libgimp either @@ -31908,28 +32815,28 @@ change unless somebody is using the headers in ways that are totally wrong. - libgimp/gimpselectbutton.c | 5 ++++- - libgimp/gimpselectbutton.h | 6 +++--- - libgimpwidgets/gimpcolorselection.c | 5 ++++- - libgimpwidgets/gimpcolorselection.h | 4 ++-- - libgimpwidgets/gimpcolorselector.c | 5 ++++- + libgimp/gimpselectbutton.c | 5 ++++- + libgimp/gimpselectbutton.h | 6 +++--- + libgimpwidgets/gimpcolorselection.c | 5 ++++- + libgimpwidgets/gimpcolorselection.h | 4 ++-- + libgimpwidgets/gimpcolorselector.c | 5 ++++- libgimpwidgets/gimpcolorselector.h | 10 +++++----- - libgimpwidgets/gimpfileentry.c | 5 ++++- - libgimpwidgets/gimpfileentry.h | 4 ++-- - libgimpwidgets/gimphintbox.c | 13 ++++++++----- - libgimpwidgets/gimpmemsizeentry.c | 5 ++++- + libgimpwidgets/gimpfileentry.c | 5 ++++- + libgimpwidgets/gimpfileentry.h | 4 ++-- + libgimpwidgets/gimphintbox.c | 13 ++++++++----- + libgimpwidgets/gimpmemsizeentry.c | 5 ++++- libgimpwidgets/gimpmemsizeentry.h | 18 +++++++++--------- - libgimpwidgets/gimppageselector.c | 5 ++++- - libgimpwidgets/gimppageselector.h | 4 ++-- - libgimpwidgets/gimppatheditor.c | 5 ++++- - libgimpwidgets/gimppatheditor.h | 4 ++-- - libgimpwidgets/gimppreview.c | 7 +++++-- - libgimpwidgets/gimppreview.h | 4 ++-- + libgimpwidgets/gimppageselector.c | 5 ++++- + libgimpwidgets/gimppageselector.h | 4 ++-- + libgimpwidgets/gimppatheditor.c | 5 ++++- + libgimpwidgets/gimppatheditor.h | 4 ++-- + libgimpwidgets/gimppreview.c | 7 +++++-- + libgimpwidgets/gimppreview.h | 4 ++-- 17 files changed, 68 insertions(+), 41 deletions(-) commit 220d06324d9870d2dc151279263eddb4474f9ab2 Author: Massimo Valentini -Date: Tue Jul 26 18:44:16 2011 +0200 +Date: Tue Jul 26 18:44:16 2011 +0200 Bug 648265 - tile cache size larger than 2G causes... @@ -31942,7 +32849,7 @@ commit 2ba3673359cddd2bba4cae7d6ae68fc2daae2222 Author: Michael Muré -Date: Mon Jul 25 15:20:53 2011 +0200 +Date: Mon Jul 25 15:20:53 2011 +0200 gegl-tool: blacklist lens-correct and hstack since they can't be used with the gegl tool. @@ -31954,42 +32861,42 @@ commit 421ca4114e8ac85cd4c2dba16e897bcf2af7c9e3 Author: Alexander Hämmerle -Date: Sun Jul 24 22:09:21 2011 +0200 +Date: Sun Jul 24 22:09:21 2011 +0200 Bug 641187 - GIMP needs a left-handed cursor option Add a cursor-handedness setting and flip the cursor when it's set to left-handed. - app/config/config-enums.c | 29 ++++++++++++++++++ - app/config/config-enums.h | 11 +++++++ - app/config/gimpguiconfig.c | 12 ++++++++ - app/config/gimpguiconfig.h | 1 + - app/config/gimprc-blurbs.h | 3 ++ + app/config/config-enums.c | 29 ++++++++++++++++++ + app/config/config-enums.h | 11 +++++++ + app/config/gimpguiconfig.c | 12 ++++++++ + app/config/gimpguiconfig.h | 1 + + app/config/gimprc-blurbs.h | 3 ++ app/dialogs/preferences-dialog.c | 5 ++- app/display/gimpdisplayshell-cursor.c | 26 ++++++++++------ app/display/gimpdisplayshell.c | 11 ++++--- app/display/gimpdisplayshell.h | 3 +- - app/widgets/gimpcursor.c | 57 + app/widgets/gimpcursor.c | 57 +++++++++++++++++++++++++++++++++-- - app/widgets/gimpcursor.h | 2 ++ + app/widgets/gimpcursor.h | 2 ++ app/widgets/gimpdialogfactory.c | 1 + 12 files changed, 141 insertions(+), 20 deletions(-) commit 6b78436f56f218a339eb95e3b764cd64c11fcb4c Author: Michael Natterer -Date: Sun Jul 24 19:07:51 2011 +0200 +Date: Sun Jul 24 19:07:51 2011 +0200 app: implement all rectangle guides options for the transform guides app/display/gimpcanvastransformguides.c | 101 ++++++++++++++++++++++++++++++-- - app/tools/gimptransformoptions.c | 2 +- + app/tools/gimptransformoptions.c | 2 +- 2 files changed, 96 insertions(+), 7 deletions(-) commit c2e6f246875ff99c066264a4da9a6d1a17ff6be2 Author: Michael Natterer -Date: Sun Jul 24 18:42:13 2011 +0200 +Date: Sun Jul 24 18:42:13 2011 +0200 app: add GimpCanvasTransformGuides and use them in the transform tool @@ -31997,19 +32904,19 @@ number of canvas items used for the transform grid from possibly gazillions to one. - app/display/Makefile.am | 2 + + app/display/Makefile.am | 2 + app/display/gimpcanvastransformguides.c | 511 ++++++++++++++++++++++++++++++++ app/display/gimpcanvastransformguides.h | 67 +++++ - app/tools/gimpdrawtool.c | 26 ++ - app/tools/gimpdrawtool.h | 8 + - app/tools/gimptransformtool.c | 149 +--------- - app/tools/gimptransformtool.h | 8 - + app/tools/gimpdrawtool.c | 26 ++ + app/tools/gimpdrawtool.h | 8 + + app/tools/gimptransformtool.c | 149 +--------- + app/tools/gimptransformtool.h | 8 - 7 files changed, 622 insertions(+), 149 deletions(-) commit 43788feb50e1e241e7ad8bf1040929ce0247fd5a Author: Michael Natterer -Date: Sun Jul 24 18:01:21 2011 +0200 +Date: Sun Jul 24 18:01:21 2011 +0200 app: remove enum GimpTransformGridType @@ -32017,14 +32924,14 @@ app/tools/gimptransformoptions.c | 8 +++++--- app/tools/gimptransformoptions.h | 2 +- - app/tools/gimptransformtool.c | 8 ++++---- - app/tools/tools-enums.c | 29 ----------------------------- - app/tools/tools-enums.h | 11 ----------- + app/tools/gimptransformtool.c | 8 ++++---- + app/tools/tools-enums.c | 29 ----------------------------- + app/tools/tools-enums.h | 11 ----------- 5 files changed, 10 insertions(+), 48 deletions(-) commit be5c0df1738ceaba92dd97c87d2b9e9920446bad Author: Michael Natterer -Date: Sun Jul 24 17:49:31 2011 +0200 +Date: Sun Jul 24 17:49:31 2011 +0200 app: add "n-lines" property to GimpCanvasRectangleGuides @@ -32034,26 +32941,26 @@ app/display/gimpcanvasrectangleguides.c | 71 ++++++++++++++++++++++----------- app/display/gimpcanvasrectangleguides.h | 6 ++- - app/tools/gimpdrawtool.c | 2 +- + app/tools/gimpdrawtool.c | 2 +- 3 files changed, 53 insertions(+), 26 deletions(-) commit f7a390d5d00a000c39bf48043a11328dc78f7fd9 Author: Michael Natterer -Date: Sun Jul 24 17:47:08 2011 +0200 +Date: Sun Jul 24 17:47:08 2011 +0200 app: add N_LINES and SPACING to enum GimpGuidesType but don't show them in the rectangle options UI, this is just a step towards unifying the enums. - app/display/display-enums.c | 4 ++++ - app/display/display-enums.h | 4 +++- + app/display/display-enums.c | 4 ++++ + app/display/display-enums.h | 4 +++- app/tools/gimprectangleoptions.c | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) commit 2ebf1b555a7a8c50c74cba4fc47486505f7183d5 Author: Michael Muré -Date: Sat Jul 23 20:14:45 2011 +0200 +Date: Sat Jul 23 20:14:45 2011 +0200 gegltool: blacklist contrast-curve, fill-path and vector-stroke since curve and path are not supported by the UI @@ -32063,21 +32970,21 @@ commit 5b5b64b4abd3b0b725afe68130e29aa3af61a172 Author: Kolbjørn Stuestøl -Date: Fri Jul 22 13:54:55 2011 +0200 +Date: Fri Jul 22 13:54:55 2011 +0200 Updated Norwegian Nynorsk translation - po-libgimp/nn.po | 49 +- + po-libgimp/nn.po | 49 +- po-plug-ins/nn.po | 7106 ++++++++++++++++-------------- - po-python/nn.po | 97 +- - po-script-fu/nn.po | 251 +- - po/nn.po | 12217 + po-python/nn.po | 97 +- + po-script-fu/nn.po | 251 +- + po/nn.po | 12217 +++++++++++++++++---------------------------------- 5 files changed, 7840 insertions(+), 11880 deletions(-) commit d697c0bdb9de5b2bb5b5572b8a04a4751b1947f9 Author: Massimo Valentini -Date: Tue Jul 19 13:00:07 2011 +0200 +Date: Tue Jul 19 13:00:07 2011 +0200 app/core: do not offset cairo_path_data_t's headers @@ -32088,7 +32995,7 @@ commit fef951ef2e388333896f3b6f7d3153dc03445846 Author: Kjartan Maraas -Date: Mon Jul 18 23:26:59 2011 +0200 +Date: Mon Jul 18 23:26:59 2011 +0200 Add nb translation @@ -32097,7 +33004,7 @@ commit 2bcd4eb40c2592637704989b89ef69f68998f0e4 Author: Kjartan Maraas -Date: Mon Jul 18 23:26:48 2011 +0200 +Date: Mon Jul 18 23:26:48 2011 +0200 Add nb @@ -32106,7 +33013,7 @@ commit c8969066da9c2d9bb65e0a2e1f86a64f41e00ad0 Author: Kjartan Maraas -Date: Mon Jul 18 23:24:55 2011 +0200 +Date: Mon Jul 18 23:24:55 2011 +0200 Updated Norwegian bokmål translation @@ -32116,7 +33023,7 @@ commit f485f1c40c6afda56771649bf41def020bf089af Author: Kjartan Maraas -Date: Mon Jul 18 23:21:25 2011 +0200 +Date: Mon Jul 18 23:21:25 2011 +0200 Updated Norwegian bokmål translation @@ -32126,7 +33033,7 @@ commit 846c9586fe68fb0eb9b5da4bf291faada036b2a0 Author: Kjartan Maraas -Date: Mon Jul 18 23:20:16 2011 +0200 +Date: Mon Jul 18 23:20:16 2011 +0200 Updated Norwegian bokmål translation @@ -32136,7 +33043,7 @@ commit eadceef99ba69990a2c6f827fe7570fdc1e49602 Author: Massimo Valentini -Date: Mon Jul 18 20:40:23 2011 +0200 +Date: Mon Jul 18 20:40:23 2011 +0200 plug-ins: fix a typo in noise-randomize @@ -32148,7 +33055,7 @@ commit f53f8432f82fb7d74747d590930a38d164930738 Author: Martin Nordholts -Date: Sun Jul 17 15:33:50 2011 +0200 +Date: Sun Jul 17 15:33:50 2011 +0200 plug-ins: Fix libcurl URI backend compilation @@ -32157,7 +33064,7 @@ commit 50bf895ba3c1348515294831424584cc9a27b033 Author: Jennie Petoumenou -Date: Mon Jul 11 10:55:30 2011 +0300 +Date: Mon Jul 11 10:55:30 2011 +0300 l10n: Updated Greek translation for gimp po-tags @@ -32166,7 +33073,7 @@ commit 055404400ae8988581ba47df06d973de530d062e Author: Mukund Sivaraman -Date: Fri Jul 8 22:38:48 2011 +0530 +Date: Fri Jul 8 22:38:48 2011 +0530 build: Disable warnings about portable make rules @@ -32175,7 +33082,7 @@ commit 204d70739d490b379453a6a7a95016fdd6b919da Author: Martin Nordholts -Date: Tue Jul 5 22:10:57 2011 +0200 +Date: Tue Jul 5 22:10:57 2011 +0200 plug-ins: Stop using gtk_range_set_update_policy() in gfig @@ -32184,7 +33091,7 @@ commit 008a845aea88cf2ecde3aedbab2b763ecbf69e60 Author: Martin Nordholts -Date: Tue Jul 5 21:32:13 2011 +0200 +Date: Tue Jul 5 21:32:13 2011 +0200 app: Undeprecate GimpNavigationEditor @@ -32195,7 +33102,7 @@ commit ef5cc5fdee00d20bb74c52a1f409a14d85818f97 Author: Martin Nordholts -Date: Tue Jul 5 18:38:09 2011 +0200 +Date: Tue Jul 5 18:38:09 2011 +0200 devel-docs: Undeprecate tools/shooter.c @@ -32204,7 +33111,7 @@ commit 1c0115ec954215978531b374c33f4097a5d2d7df Author: Martin Nordholts -Date: Tue Jul 5 17:39:41 2011 +0200 +Date: Tue Jul 5 17:39:41 2011 +0200 Fix some warnings @@ -32214,7 +33121,7 @@ commit b8740d285d4689fbacfa8ba8f83649f593de2e8b Author: Mikael Magnusson -Date: Tue Jul 5 19:53:22 2011 +0200 +Date: Tue Jul 5 19:53:22 2011 +0200 plug-ins: remove curl/types.h include in curl uri backend which was removed in 7.21.7 @@ -32224,7 +33131,7 @@ commit 039d4636f84ade6387216e347f5af597f43b99fc Author: Mikael Magnusson -Date: Tue Jul 5 19:52:33 2011 +0200 +Date: Tue Jul 5 19:52:33 2011 +0200 plug-ins: add ftp and gopher support to curl uri backend @@ -32234,7 +33141,7 @@ commit 520d8529120c38095a6053e6634d0039ce889ba4 Author: Mikael Magnusson -Date: Tue Jul 5 00:13:13 2011 +0200 +Date: Tue Jul 5 00:13:13 2011 +0200 plug-ins: add --progress=dot to work with newer wgets, and add ftp support @@ -32247,7 +33154,7 @@ commit 14420e6cc5d7c0cd817aec38453dcd2be54d47d9 Author: Martin Nordholts -Date: Sun Jul 3 21:30:39 2011 +0200 +Date: Sun Jul 3 21:30:39 2011 +0200 Update NEWS @@ -32258,7 +33165,7 @@ commit 1aa91d0b0d1ec6d7a91b1b61feeb938c56d96d7c Author: Martin Nordholts -Date: Sun Jul 3 21:24:22 2011 +0200 +Date: Sun Jul 3 21:24:22 2011 +0200 app: Remove fixme @@ -32269,7 +33176,7 @@ commit 07556242b01e6638c94cc544758d86274e0d5451 Author: Martin Nordholts -Date: Sun Jul 3 20:55:03 2011 +0200 +Date: Sun Jul 3 20:55:03 2011 +0200 app: Make positioning of new dockables depend on window mode @@ -32280,26 +33187,26 @@ created. In single-window mode, they should appear inside the single image window. In multi-window mode, a new dock window is created. - app/actions/dialogs-commands.c | 14 +++- - app/core/gimp-gui.c | 11 +++ - app/core/gimp-gui.h | 2 + - app/display/Makefile.am | 8 ++- - app/display/display-types.h | 29 ++++---- - app/display/gimpimagewindow.c | 53 +++++++++++++++ - app/display/gimpimagewindow.h | 66 +++++++++--------- - app/display/gimpmultiwindowstrategy.c | 86 ++++++++++++++++++++++++ - app/display/gimpmultiwindowstrategy.h | 54 +++++++++++++++ + app/actions/dialogs-commands.c | 14 +++- + app/core/gimp-gui.c | 11 +++ + app/core/gimp-gui.h | 2 + + app/display/Makefile.am | 8 ++- + app/display/display-types.h | 29 ++++---- + app/display/gimpimagewindow.c | 53 +++++++++++++++ + app/display/gimpimagewindow.h | 66 +++++++++--------- + app/display/gimpmultiwindowstrategy.c | 86 ++++++++++++++++++++++++ + app/display/gimpmultiwindowstrategy.h | 54 +++++++++++++++ app/display/gimpsinglewindowstrategy.c | 119 +++++++++++++++++++++++++++++++++ app/display/gimpsinglewindowstrategy.h | 54 +++++++++++++++ - app/display/gimpwindowstrategy.c | 91 +++++++++++++++++++++++++ - app/display/gimpwindowstrategy.h | 54 +++++++++++++++ - app/gui/gui-vtable.c | 13 ++++ + app/display/gimpwindowstrategy.c | 91 +++++++++++++++++++++++++ + app/display/gimpwindowstrategy.h | 54 +++++++++++++++ + app/gui/gui-vtable.c | 13 ++++ 14 files changed, 605 insertions(+), 49 deletions(-) commit 682eabfd5b39f07540cb6d979eaf7c9642672565 Author: Martin Nordholts -Date: Sun Jul 3 20:34:42 2011 +0200 +Date: Sun Jul 3 20:34:42 2011 +0200 app: Add gimp_dock_columns_create_dock_and_dockbook() @@ -32310,19 +33217,19 @@ commit 91b7043aef42d5bdca53fc6f377bca963017d2c5 Author: Martin Nordholts -Date: Sun Jul 3 16:36:38 2011 +0200 +Date: Sun Jul 3 16:36:38 2011 +0200 app: Add gimp_dockbook_add_from_dialog_factory() app/actions/dockable-commands.c | 31 +++------------------------ - app/widgets/gimpdockbook.c | 46 + app/widgets/gimpdockbook.c | 46 +++++++++++++++++++++++++++++++++++++++++ - app/widgets/gimpdockbook.h | 3 +++ + app/widgets/gimpdockbook.h | 3 +++ 3 files changed, 52 insertions(+), 28 deletions(-) commit a4107165033cb3cbe05e19d16763cfd4789c7a0a Author: Martin Nordholts -Date: Sun Jul 3 16:36:53 2011 +0200 +Date: Sun Jul 3 16:36:53 2011 +0200 app: Remove unused variable @@ -32331,7 +33238,7 @@ commit 6c880859ea1562b2de55cdf287625ae2c3a8fe6c Author: Martin Nordholts -Date: Sun Jul 3 11:24:29 2011 +0200 +Date: Sun Jul 3 11:24:29 2011 +0200 app/tests: Fix sporadic '/gimp-ui/repeatedly_switch_window_mode' failure @@ -32341,7 +33248,7 @@ commit 5bf5f91d1a117d9880ff86950db5d5ff7a8ab42e Author: Carles Ferrando -Date: Sat Jul 2 20:00:43 2011 +0200 +Date: Sat Jul 2 20:00:43 2011 +0200 [l10n]Updated Catalan (Valencian) translation @@ -32351,7 +33258,7 @@ commit fee93a0e21e58215099411ba725f570c17a70bf5 Author: Albert -Date: Sat Jul 2 20:00:37 2011 +0200 +Date: Sat Jul 2 20:00:37 2011 +0200 [l10n]Updated Catalan translation @@ -32361,18 +33268,18 @@ commit e16cdb177753b915e79af4baf1be9f92effb59ae Author: Dimitris Spingos -Date: Fri Jul 1 16:57:39 2011 +0300 +Date: Fri Jul 1 16:57:39 2011 +0300 l10n: Added Greek translation for gimp-tips po-tips/LINGUAS | 1 + - po-tips/el.po | 132 + po-tips/el.po | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+) commit 8c0dc1c44e86185c7fcba595549fa2bc88f6cc91 Author: Martin Nordholts -Date: Thu Jun 30 23:54:23 2011 +0200 +Date: Thu Jun 30 23:54:23 2011 +0200 NEWS for "app: Make 'Export to' fall back to 'Export...'" @@ -32383,7 +33290,7 @@ commit c73bdc097188a926f01062a009f9f22ff32dad4e Author: Martin Nordholts -Date: Thu Jun 30 23:44:50 2011 +0200 +Date: Thu Jun 30 23:44:50 2011 +0200 app: Make 'Export to' fall back to 'Export...' @@ -32396,14 +33303,14 @@ [Gimp-developer] Isn't this behaviour unintuative? http://lists.xcf.berkeley.edu/lists/gimp-developer/2011-June/026885.html - app/actions/actions-types.h | 3 ++- - app/actions/file-actions.c | 6 +++--- + app/actions/actions-types.h | 3 ++- + app/actions/file-actions.c | 6 +++--- app/actions/file-commands.c | 20 ++++++++++++++++---- 3 files changed, 21 insertions(+), 8 deletions(-) commit 9866d70c6836b6a13df3e073382e8feea381a7d7 Author: Martin Nordholts -Date: Thu Jun 30 23:28:33 2011 +0200 +Date: Thu Jun 30 23:28:33 2011 +0200 app: image && drawable -> drawable @@ -32416,32 +33323,32 @@ commit aab6079804d3eb430c6b6b7d21489a9a47042746 Author: Dimitris Spingos -Date: Thu Jun 30 19:02:56 2011 +0300 +Date: Thu Jun 30 19:02:56 2011 +0300 l10n: Added Greek translation for gimp po-tags po-tags/LINGUAS | 1 + - po-tags/el.po | 28 ++++++++++++++++++++++++++++ + po-tags/el.po | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) commit 8b57ef51ccf17eda3c23d5ea811fdd9a723eb0ab Author: Michael Natterer -Date: Thu Jun 30 09:27:43 2011 +0200 +Date: Thu Jun 30 09:27:43 2011 +0200 app: clean up the new brush outline stuff a bit - app/display/display-enums.h | 3 ++- - app/display/gimpcanvaspath.c | 18 ++++++++++-------- - app/display/gimpcanvaspath.h | 4 ++-- + app/display/display-enums.h | 3 ++- + app/display/gimpcanvaspath.c | 18 ++++++++++-------- + app/display/gimpcanvaspath.h | 4 ++-- app/display/gimpdisplayshell-handlers.c | 4 ++-- - app/display/gimpdisplayshell-style.c | 4 ++-- - app/tools/gimpbrushtool.c | 3 ++- - app/tools/gimpdrawtool.c | 2 +- + app/display/gimpdisplayshell-style.c | 4 ++-- + app/tools/gimpbrushtool.c | 3 ++- + app/tools/gimpdrawtool.c | 2 +- 7 files changed, 21 insertions(+), 17 deletions(-) commit e7ade3f8eca30edb63db4dde075540a3676aea67 Author: Alexia Death -Date: Wed Jun 29 23:51:10 2011 +0300 +Date: Wed Jun 29 23:51:10 2011 +0300 app: add an assert and dirty fix a segfault when starting with SWM @@ -32454,26 +33361,26 @@ commit 3c3657f780abdb281514ba93af51a518bacb4054 Author: Alexia Death -Date: Wed Jun 29 21:00:28 2011 +0300 +Date: Wed Jun 29 21:00:28 2011 +0300 app: Refactor path code to support styles and add outline style for use in brush outline - app/display/display-enums.c | 31 ++++++++++++++++++++++++ - app/display/display-enums.h | 11 +++++++++ - app/display/gimpcanvaspath.c | 42 + app/display/display-enums.c | 31 ++++++++++++++++++++++++ + app/display/display-enums.h | 11 +++++++++ + app/display/gimpcanvaspath.c | 42 ++++++++++++++++++++------------- - app/display/gimpcanvaspath.h | 4 ++-- + app/display/gimpcanvaspath.h | 4 ++-- app/display/gimpdisplayshell-handlers.c | 4 ++-- - app/display/gimpdisplayshell-style.c | 28 ++++++++++++++++++++++ - app/display/gimpdisplayshell-style.h | 5 +++- - app/tools/gimpbrushtool.c | 2 +- - app/tools/gimpdrawtool.c | 2 +- + app/display/gimpdisplayshell-style.c | 28 ++++++++++++++++++++++ + app/display/gimpdisplayshell-style.h | 5 +++- + app/tools/gimpbrushtool.c | 2 +- + app/tools/gimpdrawtool.c | 2 +- 9 files changed, 106 insertions(+), 23 deletions(-) commit 40e564711c1735717b69c6b04bdbd7f8542c0527 Author: Michael Muré -Date: Tue Jun 28 23:24:06 2011 +0200 +Date: Tue Jun 28 23:24:06 2011 +0200 gimpcagetool: remove unused parameter for gimp_cage_tool_compute_coef @@ -32482,7 +33389,7 @@ commit 9ae0dc034b7791c15479649f71ef4cda8caaf34e Author: Martin Nordholts -Date: Tue Jun 28 08:53:45 2011 +0200 +Date: Tue Jun 28 08:53:45 2011 +0200 Make 'w' a mnemonic for File -> Overwrite ... @@ -32496,7 +33403,7 @@ commit 9281f67f32aa431efb8a0679b42b292ea25768db Author: Evgenia Petoumenou -Date: Mon Jun 27 14:04:05 2011 +0300 +Date: Mon Jun 27 14:04:05 2011 +0300 Updated Greek translation for gimp @@ -32506,7 +33413,7 @@ commit ce4ab710f6bffbd7e46283f7c5bdc03bf924f824 Author: Michael Natterer -Date: Sun Jun 26 23:39:05 2011 +0200 +Date: Sun Jun 26 23:39:05 2011 +0200 modules: gimp_input_device_store_add(): bail out if the device has no parent @@ -32517,7 +33424,7 @@ commit df448eb171ec8ff9ade67866f0c00d095d53e433 Author: Michael Natterer -Date: Sun Jun 26 23:37:32 2011 +0200 +Date: Sun Jun 26 23:37:32 2011 +0200 app: GimpTransformTool: remove members handle_w and handle_h @@ -32532,7 +33439,7 @@ commit e0e2befd172f6ba2ffac2d586c6eae91c3275a0f Author: Michael Natterer -Date: Thu Jun 23 19:21:08 2011 +0200 +Date: Thu Jun 23 19:21:08 2011 +0200 Bug 651462 - On first attempt to save tool preset, stops with an error @@ -32543,25 +33450,23 @@ commit f1bb40166b1061f630fab615f658310c25abf423 Author: Michael Natterer -Date: Thu Jun 23 16:30:58 2011 +0200 +Date: Thu Jun 23 16:30:58 2011 +0200 Bug 592364 - Use GUdev rather than deprecated HAL for GIMP GIMP was probably the only user of libhal on most systems, this had to stop. Ported the linux-input module to GUdev. - configure.ac | 30 +-- - modules/Makefile.am | 6 +- - modules/controller-linux-input.c | 8 +- - modules/gimpinputdevicestore-gudev.c | 433 - +++++++++++++++++++++++++++++++++ - modules/gimpinputdevicestore-hal.c | 459 - ----------------------------------- - 5 files changed, 455 insertions(+), 481 deletions(-) + configure.ac | 30 +-- + modules/Makefile.am | 6 +- + modules/controller-linux-input.c | 8 +- + ...icestore-hal.c => gimpinputdevicestore-gudev.c} | 266 + ++++++++++----------- + 4 files changed, 142 insertions(+), 168 deletions(-) commit cccddce106ad83b5b13aa02309c3298bfc5275ac Author: Michael Natterer -Date: Thu Jun 23 16:26:55 2011 +0200 +Date: Thu Jun 23 16:26:55 2011 +0200 modules: fix indentation in controller-dx-dinput.c @@ -32570,20 +33475,20 @@ commit 8ed5002e4aba103fb503bf1b4c3819ffe700f8f0 Author: Michael Natterer -Date: Tue Jun 21 22:13:58 2011 +0200 +Date: Tue Jun 21 22:13:58 2011 +0200 plug-ins: #undef G_DISABLE_DEPRECATED for webkit and rsvg because they use G_CONST_RETURN which is deprecated in glib master. - plug-ins/common/file-svg.c | 1 + - plug-ins/common/web-page.c | 1 + + plug-ins/common/file-svg.c | 1 + + plug-ins/common/web-page.c | 1 + plug-ins/help-browser/dialog.c | 1 + 3 files changed, 3 insertions(+) commit dd0042f76bb7fd941a70c9d85968d9c2523cdedc Author: Michael Natterer -Date: Sun Jun 19 23:31:29 2011 +0200 +Date: Sun Jun 19 23:31:29 2011 +0200 app: implement error handling in gimp_imagefile_icon_callback() @@ -32595,22 +33500,22 @@ commit ab607a0adcdca6fe88833937b429f731b4c4bc11 Author: Michael Natterer -Date: Sun Jun 19 23:06:33 2011 +0200 +Date: Sun Jun 19 23:06:33 2011 +0200 app: add gimp_imagegile_get_gicon() which uses async API and can't block and use it in gimp_view_renderer_imagefile_get_icon(). - app/core/gimpimagefile.c | 93 + app/core/gimpimagefile.c | 93 +++++++++++++++++++++++++++++++++ - app/core/gimpimagefile.h | 1 + + app/core/gimpimagefile.h | 1 + app/widgets/gimpviewrendererimagefile.c | 38 +++----------- 3 files changed, 102 insertions(+), 30 deletions(-) commit 276ceddec9c9ca1aafb3774ed85c5e99f63b113a Author: Michael Natterer -Date: Sun Jun 19 22:20:50 2011 +0200 +Date: Sun Jun 19 22:20:50 2011 +0200 app: GimpViewRendererImagefile: don't call g_file_query_info ("standard::icon") @@ -32624,7 +33529,7 @@ commit c39ca0f74f2bb49b5dd843765b738b635e182065 Author: Massimo Valentini -Date: Fri Jun 17 19:02:08 2011 +0200 +Date: Fri Jun 17 19:02:08 2011 +0200 Initialize two GtkTreeIter @@ -32636,7 +33541,7 @@ commit fe6e0c19134018fbb8c80303c71168809f62e215 Author: Massimo Valentini -Date: Fri Jun 17 17:52:39 2011 +0200 +Date: Fri Jun 17 17:52:39 2011 +0200 Bug 646794 - Get rid of valgrind warnings when changing window mode @@ -32645,7 +33550,7 @@ commit 3c28ed4303da6adc4804237151d34bf94545c1c2 Author: Michael Natterer -Date: Thu Jun 16 20:20:39 2011 +0200 +Date: Thu Jun 16 20:20:39 2011 +0200 app: speed up GimpTagCache saving @@ -32656,7 +33561,7 @@ commit 580b5ba624b8947f31f53baef5c77c97815313f3 Author: Mikael Magnusson -Date: Thu Jun 16 14:01:42 2011 +0200 +Date: Thu Jun 16 14:01:42 2011 +0200 plug-ins: Disable one more debug statement in pygimp/pygimp-pdb.c @@ -32665,7 +33570,7 @@ commit e5c137a13959f9539d914a403e61c0ff7e0cc841 Author: Mukund Sivaraman -Date: Wed Jun 15 13:46:19 2011 +0530 +Date: Wed Jun 15 13:46:19 2011 +0530 Update NEWS @@ -32674,35 +33579,32 @@ commit f55f26c9b8c2a0cd3c22d88fac85558e8689803e Author: Martin Nordholts -Date: Thu May 19 07:10:22 2011 +0200 +Date: Thu May 19 07:10:22 2011 +0200 app/tests: Add single-window mode session files test Rename and copy some session files and add a single-window mode session files test. - app/tests/.gitignore | 1 + - app/tests/Makefile.am | 3 +- - app/tests/gimp-test-session-utils.c | 14 ++- - app/tests/gimp-test-session-utils.h | 3 +- - app/tests/gimpdir/Makefile.am | 21 +++-- - app/tests/gimpdir/gimprc-single-window | 12 +++ - app/tests/gimpdir/sessionrc-2-8 | 103 - --------------------- - app/tests/gimpdir/sessionrc-2-8-multi-window | 103 - +++++++++++++++++++++ - app/tests/gimpdir/sessionrc-2-8-single-window | 60 ++++++++++++ + app/tests/.gitignore | 1 + + app/tests/Makefile.am | 3 +- + app/tests/gimp-test-session-utils.c | 14 ++- + app/tests/gimp-test-session-utils.h | 3 +- + app/tests/gimpdir/Makefile.am | 21 +++-- + app/tests/gimpdir/gimprc-single-window | 12 +++ + .../{sessionrc-2-8 => sessionrc-2-8-multi-window} | 0 + app/tests/gimpdir/sessionrc-2-8-single-window | 60 ++++++++++++ app/tests/gimpdir/sessionrc-expected-multi-window | 103 +++++++++++++++++++++ app/tests/gimpdir/sessionrc-expected-single-window | 60 ++++++++++++ - app/tests/test-session-2-6-compatibility.c | 3 +- - .../test-session-2-8-compatibility-multi-window.c | 9 +- + app/tests/test-session-2-6-compatibility.c | 3 +- + .../test-session-2-8-compatibility-multi-window.c | 9 +- .../test-session-2-8-compatibility-single-window.c | 69 ++++++++++++++ - 14 files changed, 443 insertions(+), 121 deletions(-) + 13 files changed, 340 insertions(+), 18 deletions(-) commit e74d2209303b82009b70ddc8e954c911c9e84fd2 Author: Martin Nordholts -Date: Tue Jun 14 22:37:00 2011 +0200 +Date: Tue Jun 14 22:37:00 2011 +0200 app: Restore docks in an idle handler @@ -32714,14 +33616,14 @@ Also add a required call to gimp_test_run_mainloop_until_idle() because of this in the 'automatic_tab_style' test. - app/tests/test-ui.c | 2 + + app/tests/test-ui.c | 2 + app/widgets/gimpsessioninfo.c | 143 +++++++++++++++++++++++++++--------------- 2 files changed, 95 insertions(+), 50 deletions(-) commit 00d6f8e6555d439142414c44d7cad19b7b0b82a0 Author: Martin Nordholts -Date: Tue Jun 14 22:15:01 2011 +0200 +Date: Tue Jun 14 22:15:01 2011 +0200 Move gimp_session_info_clear_info() into gimp_session_info_restore() @@ -32731,34 +33633,34 @@ app/actions/windows-commands.c | 1 - app/widgets/gimpdialogfactory.c | 1 - - app/widgets/gimpsessioninfo.c | 2 ++ + app/widgets/gimpsessioninfo.c | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-) commit f73092bb41e66cb2d2bc42a991d56867c5f4c6f6 Author: Martin Nordholts -Date: Mon Jun 6 20:04:20 2011 +0200 +Date: Mon Jun 6 20:04:20 2011 +0200 app/tests: Add gimp_init_for_gui_testing_with_rc() app/tests.c | 48 ++++++++++++++++++++++++++++++++++++------------ - app/tests.h | 6 ++++-- + app/tests.h | 6 ++++-- 2 files changed, 40 insertions(+), 14 deletions(-) commit 0a20d9bdbdf3e65e684e72ee6731e0f6ce5ed2c0 Author: Mukund Sivaraman -Date: Fri Jun 10 23:40:23 2011 +0530 +Date: Fri Jun 10 23:40:23 2011 +0530 file-jpeg: Rename misnamed macros plug-ins/file-jpeg/jpeg-save.c | 30 +++++++++++++++--------------- plug-ins/file-jpeg/jpeg-settings.c | 8 ++++---- - plug-ins/file-jpeg/jpeg.c | 6 +++--- - plug-ins/file-jpeg/jpeg.h | 8 ++++---- + plug-ins/file-jpeg/jpeg.c | 6 +++--- + plug-ins/file-jpeg/jpeg.h | 8 ++++---- 4 files changed, 26 insertions(+), 26 deletions(-) commit f3c395f9dfa4bd1bd86462043d77b96db511407c Author: Mukund Sivaraman -Date: Fri Jun 10 23:37:09 2011 +0530 +Date: Fri Jun 10 23:37:09 2011 +0530 file-jpeg: (save) Change default subsampling labels @@ -32771,7 +33673,7 @@ commit f03aef5a5ee2884646a105c7c49691a819e212a5 Author: Mukund Sivaraman -Date: Fri Jun 10 23:34:44 2011 +0530 +Date: Fri Jun 10 23:34:44 2011 +0530 file-jpeg: (save) Change default restart MCU rows to 16 @@ -32784,7 +33686,7 @@ commit 4e0a48fabce65fed5e8e6c684b0dcea8703fa84a Author: Mukund Sivaraman -Date: Fri Jun 10 23:33:11 2011 +0530 +Date: Fri Jun 10 23:33:11 2011 +0530 file-jpeg: (save) Change the label for restart interval @@ -32809,12 +33711,12 @@ is not something that can easily be explained to a layperson. plug-ins/file-jpeg/jpeg-save.c | 2 +- - plug-ins/file-jpeg/jpeg.c | 2 +- + plug-ins/file-jpeg/jpeg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 4b3a1c6680ba6890b5b35fb8ba6e3e46e7257097 Author: Mukund Sivaraman -Date: Fri Jun 10 23:25:05 2011 +0530 +Date: Fri Jun 10 23:25:05 2011 +0530 file-jpeg: (save) Change default coding mode to progressive @@ -32835,7 +33737,7 @@ commit dd912b1cb954e5d9e5bc569075de8b0e904a4ad2 Author: Mukund Sivaraman -Date: Fri Jun 10 23:16:51 2011 +0530 +Date: Fri Jun 10 23:16:51 2011 +0530 file-jpeg: (save) Change default compression level to 90 @@ -32847,7 +33749,7 @@ commit 24c88e0fcfbeecf50ae7ac40a67ddfdf33096aa9 Author: Mukund Sivaraman -Date: Fri Jun 10 23:15:43 2011 +0530 +Date: Fri Jun 10 23:15:43 2011 +0530 file-jpeg: (save) Change default subsampling to best quality @@ -32860,7 +33762,7 @@ commit b1a2c736bf7e6c75ca1af4b4c3330172dddb269e Author: Nils Philippsen -Date: Fri Jun 10 18:06:02 2011 +0200 +Date: Fri Jun 10 18:06:02 2011 +0200 app: guard against crash due to quitting while DND is processed @@ -32876,7 +33778,7 @@ commit 7f626b9877ab7246546fa3b31aef4b3866f1a4ad Author: Michael Natterer -Date: Wed Jun 8 21:34:43 2011 +0200 +Date: Wed Jun 8 21:34:43 2011 +0200 app: fix applying paint tool presets when gobal brush/dynamics are used @@ -32886,7 +33788,7 @@ commit 9eba5b9311d6296b9a2c15e9e23d0d174cf183f3 Author: Michael Natterer -Date: Tue Jun 7 21:25:22 2011 +0200 +Date: Tue Jun 7 21:25:22 2011 +0200 app: refactor the tool_manager brush options sharing code @@ -32896,7 +33798,7 @@ commit 86e09e03d636ca88e0df18b67007631e3faa6e11 Author: Michael Natterer -Date: Mon Jun 6 22:38:51 2011 +0200 +Date: Mon Jun 6 22:38:51 2011 +0200 app: make sure GimpToolPresetEditor is in a sane state initially @@ -32908,18 +33810,18 @@ commit f7b3209d2db5f6493a90d77b46508802c06c36d6 Author: Michael Muré -Date: Mon Jun 6 19:25:23 2011 +0200 +Date: Mon Jun 6 19:25:23 2011 +0200 take care of i18n for the cage tool app/gegl/gimpoperationcagecoefcalc.c | 7 +++++-- app/gegl/gimpoperationcagetransform.c | 11 +++++++---- - po/POTFILES.in | 2 ++ + po/POTFILES.in | 2 ++ 3 files changed, 14 insertions(+), 6 deletions(-) commit bb39703c7a1decb1abedf4df4381bb24c8da55c1 Author: Martin Nordholts -Date: Mon Jun 6 15:50:32 2011 +0200 +Date: Mon Jun 6 15:50:32 2011 +0200 app: Update appearance after adding dock @@ -32932,7 +33834,7 @@ commit 6301b8651ddc41abb1e40d6971e894a2ae813d58 Author: Kristjan SCHMIDT -Date: Sun Jun 5 18:13:31 2011 +0200 +Date: Sun Jun 5 18:13:31 2011 +0200 Updated Esperanto translation @@ -32942,7 +33844,7 @@ commit 7a1f2cc8d272ced4c99304238fcd9e50389f57f6 Author: Kristjan SCHMIDT -Date: Sun Jun 5 18:00:10 2011 +0200 +Date: Sun Jun 5 18:00:10 2011 +0200 Updated Esperanto translation @@ -32952,7 +33854,7 @@ commit 0b633099dfeedf1205eb5385f1bea6e078bb7ab4 Author: Christian Kirbach -Date: Sun Jun 5 15:06:11 2011 +0200 +Date: Sun Jun 5 15:06:11 2011 +0200 [l10n] Updated German plug-ins translation @@ -32962,7 +33864,7 @@ commit 6b3c398f09b3f8df972d754204fe56ae42e90f2d Author: Alexia Death -Date: Sun Jun 5 15:12:23 2011 +0300 +Date: Sun Jun 5 15:12:23 2011 +0300 app: prevent segfault on startup when in swm and preset editor is active @@ -32972,23 +33874,23 @@ commit ea27c7bc838a093f5b158bf4027c3de1d55ecff2 Author: Michael Natterer -Date: Sat Jun 4 17:16:21 2011 +0200 +Date: Sat Jun 4 17:16:21 2011 +0200 app: add the MIN4() and MAX4() macros to gimp-utils.h instead of having them in 5 .c files. - app/core/gimp-transform-resize.c | 5 ++--- - app/core/gimp-utils.h | 4 ++++ + app/core/gimp-transform-resize.c | 5 ++--- + app/core/gimp-utils.h | 4 ++++ app/display/gimpcanvastransformpreview.c | 4 +--- - app/paint/gimpperspectiveclone.c | 5 +---- - app/tools/gimptransformtool.c | 3 +-- - app/widgets/gimpoverlaychild.c | 5 ++--- + app/paint/gimpperspectiveclone.c | 5 +---- + app/tools/gimptransformtool.c | 3 +-- + app/widgets/gimpoverlaychild.c | 5 ++--- 6 files changed, 11 insertions(+), 15 deletions(-) commit b399ad910a50274d11ebe8d44af93eb05ed7ac18 Author: Michael Natterer -Date: Sat Jun 4 17:10:48 2011 +0200 +Date: Sat Jun 4 17:10:48 2011 +0200 NEWS: updates @@ -32997,7 +33899,7 @@ commit a2a95bc16e717d8f2e660073ed72c8a0ccaa9358 Author: Martin Nordholts -Date: Wed May 11 22:08:41 2011 +0200 +Date: Wed May 11 22:08:41 2011 +0200 app: Don't disable single-window mode right before exiting @@ -33009,22 +33911,22 @@ commit 42c2c747d8f88f95fb487b321bdaadafd31f1af6 Author: Martin Nordholts -Date: Tue May 31 23:49:24 2011 +0200 +Date: Tue May 31 23:49:24 2011 +0200 Bug 603848 - Single-window mode is not properly session managed yet Make GimpImageWindow implement GimpDockContainer and GimpSessionManaged so that GIMP can be started in single-window mode. - NEWS | 1 + - app/dialogs/dialogs.c | 36 +++++- + NEWS | 1 + + app/dialogs/dialogs.c | 36 +++++- app/display/gimpimagewindow.c | 270 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 303 insertions(+), 4 deletions(-) commit 75259bf4bbb8d07db6200522b558a9564c1aca7a Author: Martin Nordholts -Date: Sat May 14 17:08:01 2011 +0200 +Date: Sat May 14 17:08:01 2011 +0200 app: Call gimp_image_window_session_update() early @@ -33038,7 +33940,7 @@ commit d27b7a985c3a09bedf6a87394406829d75546773 Author: Michael Natterer -Date: Fri Jun 3 09:46:10 2011 +0200 +Date: Fri Jun 3 09:46:10 2011 +0200 app: make gimp_selection_tool_start_edit() much easier to use correctly @@ -33054,14 +33956,14 @@ app/tools/gimpfreeselecttool.c | 92 +++++++++---------------------------- app/tools/gimprectangleselecttool.c | 26 +---------- - app/tools/gimpregionselecttool.c | 9 ++-- - app/tools/gimpselectiontool.c | 12 +++-- - app/tools/gimpselectiontool.h | 1 + + app/tools/gimpregionselecttool.c | 9 ++-- + app/tools/gimpselectiontool.c | 12 +++-- + app/tools/gimpselectiontool.h | 1 + 5 files changed, 38 insertions(+), 102 deletions(-) commit 52cd1b90433038764a6801aae90615dac9ef2e8f Author: Alexia Death -Date: Thu Jun 2 21:16:54 2011 +0300 +Date: Thu Jun 2 21:16:54 2011 +0300 app: share brush modifiers along with the brush or dynamics @@ -33073,7 +33975,7 @@ commit 8bb72a6b47115750e454e48fecb9e8e9dfcb5972 Author: Christian Kirbach -Date: Wed Jun 1 22:37:37 2011 +0200 +Date: Wed Jun 1 22:37:37 2011 +0200 [l10n] Updated German po-python translation @@ -33083,7 +33985,7 @@ commit b712a9c2e5e531df6421cae7c53cdf219020ee5b Author: Christian Kirbach -Date: Wed Jun 1 00:33:02 2011 +0200 +Date: Wed Jun 1 00:33:02 2011 +0200 [l10n] Actually add de.po - Sorry for the spam @@ -33092,7 +33994,7 @@ commit 4e63d150d324a434105728a8ea71f7c7eb0a5058 Author: Christian Kirbach -Date: Wed Jun 1 00:27:48 2011 +0200 +Date: Wed Jun 1 00:27:48 2011 +0200 [l10n] Actually add 'de' to LINGUAS @@ -33101,7 +34003,7 @@ commit cf8269351f59fd1708722272b5222048af98b69f Author: Christian Kirbach -Date: Wed Jun 1 00:27:08 2011 +0200 +Date: Wed Jun 1 00:27:08 2011 +0200 Revert "[l10n] Added German po-tags translation" @@ -33112,49 +34014,49 @@ commit dc39d20a464b7cc2ebaefc9046680e48cf0c7a16 Author: Christian Kirbach -Date: Wed Jun 1 00:14:23 2011 +0200 +Date: Wed Jun 1 00:14:23 2011 +0200 [l10n] Added German po-tags translation - Updated corresponding LINGUAS file + Updated corresponding LINGUAS file po-tags/de.po | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) commit 1bff2c8df2a3dc95c6bfaf105b3fbaaca736106a Author: Michael Natterer -Date: Tue May 31 23:17:29 2011 +0200 +Date: Tue May 31 23:17:29 2011 +0200 app: sprinkle const qualifiers in the tool event callback functions - app/display/gimpdisplayshell-grab.c | 8 +-- - app/display/gimpdisplayshell-grab.h | 8 +-- + app/display/gimpdisplayshell-grab.c | 8 +-- + app/display/gimpdisplayshell-grab.h | 8 +-- app/display/gimpdisplayshell-tool-events.c | 102 ++++++++++++++--------------- - app/widgets/gimpdeviceinfo-coords.c | 4 +- - app/widgets/gimpdeviceinfo-coords.h | 4 +- + app/widgets/gimpdeviceinfo-coords.c | 4 +- + app/widgets/gimpdeviceinfo-coords.h | 4 +- 5 files changed, 63 insertions(+), 63 deletions(-) commit bed298be13109d880113691230d0609a7913616c Author: Martin Nordholts -Date: Tue May 31 17:40:10 2011 +0200 +Date: Tue May 31 17:40:10 2011 +0200 app: Remember column width in multi-column dock windows - NEWS | 1 + - app/tests/gimpdir/sessionrc | 3 ++- + NEWS | 1 + + app/tests/gimpdir/sessionrc | 3 ++- app/tests/gimpdir/sessionrc-2-8 | 3 ++- app/tests/gimpdir/sessionrc-expected | 3 ++- app/widgets/gimpsessioninfo-book.c | 20 +++----------------- app/widgets/gimpsessioninfo-dock.c | 29 +++++++++++++++++++++++++++-- app/widgets/gimpsessioninfo-dock.h | 3 +++ - app/widgets/gimpsessioninfo.c | 27 +++++++++++++++++++++++---- + app/widgets/gimpsessioninfo.c | 27 +++++++++++++++++++++++---- app/widgets/gimpwidgets-utils.c | 22 ++++++++++++++++++++++ app/widgets/gimpwidgets-utils.h | 2 ++ 10 files changed, 87 insertions(+), 26 deletions(-) commit 981546c02e9532de96a892804393c50ae82993c8 Author: Martin Nordholts -Date: Tue May 31 22:57:24 2011 +0200 +Date: Tue May 31 22:57:24 2011 +0200 app/tests: Make sessionrc-2-6 more realistic @@ -33165,8 +34067,8 @@ The downside is that we need a separate 'expected'-file, but we need to live with that. - app/tests/gimpdir/Makefile.am | 1 + - app/tests/gimpdir/sessionrc-2-6 | 9 --- + app/tests/gimpdir/Makefile.am | 1 + + app/tests/gimpdir/sessionrc-2-6 | 9 --- app/tests/gimpdir/sessionrc-expected-2-6 | 93 ++++++++++++++++++++++++++++++ app/tests/test-session-2-6-compatibility.c | 2 +- @@ -33174,47 +34076,47 @@ commit b4ed281f9a289f897c578cee15b7488588a8f7a7 Author: Martin Nordholts -Date: Tue May 31 22:36:04 2011 +0200 +Date: Tue May 31 22:36:04 2011 +0200 app: Call gimp_session_info_aux_set_list() generically gimp_session_info_aux_set_list() is not a per-GimpDialogRestoreFunc thing. - app/dialogs/dialogs.c | 4 ---- + app/dialogs/dialogs.c | 4 ---- app/widgets/gimpsessioninfo.c | 12 ++++-------- app/widgets/gimpsessioninfo.h | 1 - 3 files changed, 4 insertions(+), 13 deletions(-) commit 6fc587c643c9d2dce8d96a20e1c2f7465c1cc785 Author: Martin Nordholts -Date: Mon May 30 08:19:53 2011 +0200 +Date: Mon May 30 08:19:53 2011 +0200 app: Add GimpSessionManaged Add a GimpSessionManaged interface to generalize gimp_session_info_aux_get_list() and gimp_session_info_aux_set_list(). - NEWS | 1 + - app/dialogs/dialogs.c | 7 +- - app/widgets/Makefile.am | 2 + - app/widgets/gimpdockable.c | 86 +++++++++++++------- - app/widgets/gimpdockable.h | 4 - - app/widgets/gimpdockwindow.c | 144 + NEWS | 1 + + app/dialogs/dialogs.c | 7 +- + app/widgets/Makefile.am | 2 + + app/widgets/gimpdockable.c | 86 +++++++++++++------- + app/widgets/gimpdockable.h | 4 - + app/widgets/gimpdockwindow.c | 144 +++++++++++++++++++-------------- - app/widgets/gimpdockwindow.h | 3 - - app/widgets/gimpsessioninfo-aux.c | 26 +----- - app/widgets/gimpsessioninfo-aux.h | 4 - + app/widgets/gimpdockwindow.h | 3 - + app/widgets/gimpsessioninfo-aux.c | 26 +----- + app/widgets/gimpsessioninfo-aux.h | 4 - app/widgets/gimpsessioninfo-dockable.c | 8 +- - app/widgets/gimpsessioninfo.c | 7 +- - app/widgets/gimpsessionmanaged.c | 114 ++++++++++++++++++++++++++ - app/widgets/gimpsessionmanaged.h | 50 ++++++++++++ - app/widgets/widgets-types.h | 1 + + app/widgets/gimpsessioninfo.c | 7 +- + app/widgets/gimpsessionmanaged.c | 114 ++++++++++++++++++++++++++ + app/widgets/gimpsessionmanaged.h | 50 ++++++++++++ + app/widgets/widgets-types.h | 1 + 14 files changed, 322 insertions(+), 135 deletions(-) commit da18c1114ba7552be1f7f123de3e636c62d7f08c Author: Michael Natterer -Date: Tue May 31 09:24:14 2011 +0200 +Date: Tue May 31 09:24:14 2011 +0200 app: gimpdisplayshell-tool-events.c: move Tab handling to a utility function @@ -33228,7 +34130,7 @@ commit 8e5f18fb9e1ceb3a94d2f39d567a0b55da00648f Author: Michael Natterer -Date: Mon May 30 23:46:50 2011 +0200 +Date: Mon May 30 23:46:50 2011 +0200 app: make Alt+Tab and Alt+Shift+Tab cycle through all open displays @@ -33236,16 +34138,16 @@ multi-window mode because in single-window we can already cycle through all tabs with Ctrl+PageUp/Down. - app/actions/windows-actions.c | 28 +++++++++++----- - app/actions/windows-commands.c | 52 + app/actions/windows-actions.c | 28 +++++++++++----- + app/actions/windows-commands.c | 52 +++++++++++++++++++++++++++--- - app/actions/windows-commands.h | 5 +++ + app/actions/windows-commands.h | 5 +++ app/display/gimpdisplayshell-tool-events.c | 38 ++++++++++++++++++++-- 4 files changed, 109 insertions(+), 14 deletions(-) commit edad544e733e49c136ace2e40e3c0d8208d27474 Author: Michael Natterer -Date: Mon May 30 23:39:39 2011 +0200 +Date: Mon May 30 23:39:39 2011 +0200 app: don't redundantly check for (foo && GIMP_IS_FOO (foo)) in GimpSessionInfo @@ -33255,7 +34157,7 @@ commit 697cd677f4bfe64eb538d606d0f004e302c60da3 Author: Alexandre Prokoudine -Date: Sat May 28 20:17:37 2011 +0400 +Date: Sat May 28 20:17:37 2011 +0400 Updated Russian translation @@ -33264,12 +34166,12 @@ po-plug-ins/ru.po | 5247 +++++++++++++++++++++++++++-------------------------- - po/ru.po | 3684 +++++++++++++++++++++---------------- + po/ru.po | 3684 +++++++++++++++++++++---------------- 2 files changed, 4749 insertions(+), 4182 deletions(-) commit 10aa3921a031abd721efc6ae097da3a4cb6ecbfc Author: Martin Nordholts -Date: Sat May 14 18:16:31 2011 +0200 +Date: Sat May 14 18:16:31 2011 +0200 app: Rememeber if image windows are opened @@ -33277,15 +34179,15 @@ gimp_session_info_restore() code to run for the single-image window once that code is in place. - app/dialogs/dialogs.c | 2 +- + app/dialogs/dialogs.c | 2 +- app/tests/gimpdir/sessionrc-2-8 | 3 ++- app/tests/gimpdir/sessionrc-expected | 3 ++- - app/widgets/gimpsessioninfo.c | 21 ++++++++++++--------- + app/widgets/gimpsessioninfo.c | 21 ++++++++++++--------- 4 files changed, 17 insertions(+), 12 deletions(-) commit a456a70bfd794b9bf27df1404029828cb98b70ec Author: Martin Nordholts -Date: Fri May 27 22:26:17 2011 +0200 +Date: Fri May 27 22:26:17 2011 +0200 app/tests: Add test for gimp_session_info_read_geometry() fix @@ -33300,7 +34202,7 @@ commit 93fd257c522bc54dae42398ddc351a8b0285c8de Author: Martin Nordholts -Date: Thu May 26 08:06:20 2011 +0200 +Date: Thu May 26 08:06:20 2011 +0200 app: Give configure event info to gimp_session_info_read_geometry() @@ -33317,13 +34219,13 @@ multi-window mode. app/widgets/gimpdialogfactory.c | 2 +- - app/widgets/gimpsessioninfo.c | 31 ++++++++++++++++++++++++------- - app/widgets/gimpsessioninfo.h | 3 ++- + app/widgets/gimpsessioninfo.c | 31 ++++++++++++++++++++++++------- + app/widgets/gimpsessioninfo.h | 3 ++- 3 files changed, 27 insertions(+), 9 deletions(-) commit cd7238940406248f833665df5a2042b6dc9368dd Author: Martin Nordholts -Date: Thu May 26 17:59:59 2011 +0200 +Date: Thu May 26 17:59:59 2011 +0200 app/tests: Add '/gimp-ui/close_image' @@ -33335,7 +34237,7 @@ commit 2095c9307bf86b08780a439e5f4ba3d7c4c9b355 Author: Martin Nordholts -Date: Thu May 26 17:42:52 2011 +0200 +Date: Thu May 26 17:42:52 2011 +0200 app/tests: Fix typo in gimp-app-test-utils.c @@ -33344,7 +34246,7 @@ commit 396d5fd5e8b531e29f0de7e5a4bdec11a9cd980a Author: Martin Nordholts -Date: Fri May 27 17:16:04 2011 +0200 +Date: Fri May 27 17:16:04 2011 +0200 app: Add a 'restore_func' to GimpDialogFactoryEntry @@ -33361,18 +34263,18 @@ So, add a 'restore_func' member to GimpRestoreDialogFunc of type GimpRestoreDialogFunc and move the code there. - app/dialogs/dialogs.c | 231 + app/dialogs/dialogs.c | 231 +++++++++++++++++++++++++--------------- app/widgets/gimpdialogfactory.c | 32 +++--- app/widgets/gimpdialogfactory.h | 30 +++--- - app/widgets/gimpsessioninfo.c | 34 +++--- - app/widgets/gimpsessioninfo.h | 1 + - app/widgets/widgets-types.h | 31 +++--- + app/widgets/gimpsessioninfo.c | 34 +++--- + app/widgets/gimpsessioninfo.h | 1 + + app/widgets/widgets-types.h | 31 +++--- 6 files changed, 210 insertions(+), 149 deletions(-) commit c73ff51b82c601579100dca55efd288bf6f6c2f5 Author: Michael Natterer -Date: Thu May 26 21:48:40 2011 +0200 +Date: Thu May 26 21:48:40 2011 +0200 menus: use one template for unstable menus instead of two @@ -33381,7 +34283,7 @@ commit e2dbadd01e803b817146096bba26ae61743a4d90 Author: Christian Kirbach -Date: Thu May 26 21:08:26 2011 +0200 +Date: Thu May 26 21:08:26 2011 +0200 [l10n] Updated German libgimp translation @@ -33391,7 +34293,7 @@ commit 1bc9ca2d13598e418a635e9739780ded48eedbb3 Author: Michael Natterer -Date: Thu May 26 20:44:55 2011 +0200 +Date: Thu May 26 20:44:55 2011 +0200 menus: filter out view-use-gegl for stable releases @@ -33404,7 +34306,7 @@ commit 5c195d1c6169ccf06483452c99ed8a6897bf6808 Author: Øyvind Kolås -Date: Fri May 20 17:21:37 2011 +0100 +Date: Fri May 20 17:21:37 2011 +0100 menus: add back use gegl for view - so it can be tested during dev. @@ -33417,17 +34319,17 @@ commit ddf09b3a36adc1e93b27c604cc713d09fdaf741d Author: Massimo Valentini -Date: Thu May 26 19:49:17 2011 +0200 +Date: Thu May 26 19:49:17 2011 +0200 Fixes two minor issues when builddir != srcdir - Makefile.am | 2 +- + Makefile.am | 2 +- app/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit 71bedb0ccd521ba7b5839ebb758e730b6a654a70 Author: Massimo Valentini -Date: Thu May 26 19:28:47 2011 +0200 +Date: Thu May 26 19:28:47 2011 +0200 app: clear current path from the context after copying it @@ -33438,7 +34340,7 @@ commit 13716023837e5cdaa97ae979828d5938eb153ddb Author: Massimo Valentini -Date: Thu May 26 19:54:01 2011 +0200 +Date: Thu May 26 19:54:01 2011 +0200 app: call cairo_surface_flush before drawing directly @@ -33447,7 +34349,7 @@ commit b55752d0d47fcd3fbf542e055c2294e74229d254 Author: Daniel Mustieles -Date: Thu May 26 20:13:32 2011 +0200 +Date: Thu May 26 20:13:32 2011 +0200 Updated Spanish translation @@ -33456,7 +34358,7 @@ commit 69a4634836a30106257e1888303ad0cfba7d7d94 Author: Daniel Mustieles -Date: Thu May 26 20:06:22 2011 +0200 +Date: Thu May 26 20:06:22 2011 +0200 Updated Spanish translation @@ -33466,7 +34368,7 @@ commit 92e3b5532f5bbf29c0548a15695f8f13511d96f5 Author: Michael Natterer -Date: Wed May 25 23:03:16 2011 +0200 +Date: Wed May 25 23:03:16 2011 +0200 app: update the color picker tool's dialog properly @@ -33479,7 +34381,7 @@ commit d4cf31b82db6d0d3056bca9a8e64fe1851409f45 Author: Daniel Mustieles -Date: Wed May 25 19:14:09 2011 +0200 +Date: Wed May 25 19:14:09 2011 +0200 Updated Spanish translation @@ -33489,7 +34391,7 @@ commit d320a085465fb458e8a320263c2f5d021eaf156a Author: Daniel Mustieles -Date: Wed May 25 19:12:58 2011 +0200 +Date: Wed May 25 19:12:58 2011 +0200 Updated Spanish translation @@ -33499,7 +34401,7 @@ commit a6a6dd880a220be177c945914798156ebe560861 Author: Michael Natterer -Date: Wed May 25 10:23:02 2011 +0200 +Date: Wed May 25 10:23:02 2011 +0200 app: use hline/vline utility functions in GimpCanvasRectangleGuides @@ -33509,7 +34411,7 @@ commit 0d510bfa231a8c7dcde6a205fc07d2e6715cde55 Author: Michael Muré -Date: Tue May 24 23:35:28 2011 +0200 +Date: Tue May 24 23:35:28 2011 +0200 fix a typo in cage tool @@ -33518,7 +34420,7 @@ commit c1c20e4c3866008b81c80663e7c0b7280553bab6 Author: Michael Natterer -Date: Tue May 24 20:49:05 2011 +0200 +Date: Tue May 24 20:49:05 2011 +0200 app: fix GimpCanvasRectangleGuides' extents @@ -33527,27 +34429,27 @@ commit ef15fd8623e292f9c1a3440c2e6d661b3b65c3cf Author: massimo v -Date: Tue May 24 18:50:16 2011 +0200 +Date: Tue May 24 18:50:16 2011 +0200 app: remove deprecated gtk_range_set_update_policy app/tools/gimpforegroundselectoptions.c | 20 ++++++-------------- - app/tools/gimpforegroundselecttool.c | 11 +++++++---- + app/tools/gimpforegroundselecttool.c | 11 +++++++---- 2 files changed, 13 insertions(+), 18 deletions(-) commit 63cc68561a7f5ec55454a1c7365a287afe5be0a6 Author: massimo v -Date: Tue May 24 18:25:19 2011 +0200 +Date: Tue May 24 18:25:19 2011 +0200 app: SIOX memory leaks - app/base/siox.c | 2 ++ + app/base/siox.c | 2 ++ app/tools/gimpforegroundselecttool.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) commit 6c85014473bb8bb12481be0c9b86a882f9949642 Author: Michael Natterer -Date: Tue May 24 20:11:34 2011 +0200 +Date: Tue May 24 20:11:34 2011 +0200 app: gimpalignoptions.c: fix typo s/distrubution/distribution/ @@ -33556,21 +34458,21 @@ commit ba324c06f54ad351f1fd22193a9a97ea63b08fb1 Author: Dave Lichterman -Date: Fri Apr 8 02:38:40 2011 -0700 +Date: Fri Apr 8 02:38:40 2011 -0700 Bug 569550 - Can not handle PSD layers/groups Add support to file-psd plugin for layer group reading. plug-ins/file-psd/psd-layer-res-load.c | 30 ++++----------- - plug-ins/file-psd/psd-load.c | 68 + plug-ins/file-psd/psd-load.c | 68 +++++++++++++++++++++++++++++++--- - plug-ins/file-psd/psd.h | 5 ++- + plug-ins/file-psd/psd.h | 5 ++- 3 files changed, 74 insertions(+), 29 deletions(-) commit f657361db04de69ce003328724c59e3f942d7d15 Author: Nils Philippsen -Date: Fri May 13 17:08:02 2011 +0200 +Date: Fri May 13 17:08:02 2011 +0200 file-psp: fix overflow protection (CVE-2011-1782) @@ -33582,7 +34484,7 @@ commit 4e6f43a890457415efb856883c29015a4bef310b Author: Michael Natterer -Date: Sun May 22 22:09:09 2011 +0200 +Date: Sun May 22 22:09:09 2011 +0200 app: add new item class GimpCanvasRectangleGuides and use it @@ -33590,18 +34492,18 @@ drawing problems because in image coordinates, lines can't be aligned correctly with rectangles. - app/display/Makefile.am | 2 + + app/display/Makefile.am | 2 + app/display/gimpcanvasrectangleguides.c | 431 ++++++++++++++++++++++++++++++++ app/display/gimpcanvasrectangleguides.h | 67 +++++ - app/tools/gimpdrawtool.c | 22 ++ - app/tools/gimpdrawtool.h | 6 + - app/tools/gimprectangletool.c | 154 ++---------- + app/tools/gimpdrawtool.c | 22 ++ + app/tools/gimpdrawtool.h | 6 + + app/tools/gimprectangletool.c | 154 ++---------- 6 files changed, 542 insertions(+), 140 deletions(-) commit 6b34f79e519a3082ef9c55e95bff80d8593fbd4d Author: Michael Natterer -Date: Sun May 22 17:52:53 2011 +0200 +Date: Sun May 22 17:52:53 2011 +0200 app: gimp_rectangle_tool_draw(): lose "pub_" from local rectangle variables @@ -33614,7 +34516,7 @@ commit 8407d30c8c249b9ad3ab710be5f34c658ad2c99a Author: Jon Nordby -Date: Tue May 17 01:29:40 2011 +0200 +Date: Tue May 17 01:29:40 2011 +0200 plug-ins: Support layermodes in OpenRaster files @@ -33624,7 +34526,7 @@ commit a98753a6f6ec02117ce54a376d4c367ea2fc5479 Author: Michael Natterer -Date: Sun May 22 14:53:23 2011 +0200 +Date: Sun May 22 14:53:23 2011 +0200 po: add app/display/display-enums.c to POTFILES.in @@ -33633,7 +34535,7 @@ commit 2f51c8afd472a0b41ba3129deeb08c6f7e4ecd63 Author: Michael Natterer -Date: Fri May 20 19:48:11 2011 +0200 +Date: Fri May 20 19:48:11 2011 +0200 app: GimpRectangleToolPrivate: don't keep a copy of the guides type around @@ -33645,26 +34547,26 @@ commit 0dcdfe9e80daf0c412ecf8e9e0c34886bd2b80ac Author: Michael Natterer -Date: Fri May 20 19:41:48 2011 +0200 +Date: Fri May 20 19:41:48 2011 +0200 app: move enum GimpRectangleGuide from tools/ to display/ and rename it to enum GimpGuidesType. - app/display/display-enums.c | 37 + app/display/display-enums.c | 37 +++++++++++++++++++++++++++++++++++++ - app/display/display-enums.h | 15 +++++++++++++++ + app/display/display-enums.h | 15 +++++++++++++++ app/tools/gimprectangleoptions.c | 4 ++-- app/tools/gimprectangleoptions.h | 2 +- - app/tools/gimprectangletool.c | 14 +++++++------- - app/tools/tools-enums.c | 37 + app/tools/gimprectangletool.c | 14 +++++++------- + app/tools/tools-enums.c | 37 ------------------------------------- - app/tools/tools-enums.h | 15 --------------- + app/tools/tools-enums.h | 15 --------------- 7 files changed, 62 insertions(+), 62 deletions(-) commit da380504bf3300a07ec956bcc23bb43437d6d352 Author: Michael Natterer -Date: Fri May 20 19:15:31 2011 +0200 +Date: Fri May 20 19:15:31 2011 +0200 app: don't call gimp_tool_control_halt() in gimp_rectangle_tool_halt() @@ -33676,7 +34578,7 @@ commit 9aae53802fc354867504ad5ae8b11ef98e3e93d9 Author: Michael Natterer -Date: Fri May 20 19:06:57 2011 +0200 +Date: Fri May 20 19:06:57 2011 +0200 app: s/filepath/filename/ in order to avoid introducing new terminology @@ -33687,7 +34589,7 @@ commit 9325120291b6935b8178d9975c1681c90576607f Author: Martin Nordholts -Date: Fri May 20 18:19:56 2011 +0200 +Date: Fri May 20 18:19:56 2011 +0200 app/tests: Distribute new session files @@ -33696,7 +34598,7 @@ commit 2d5ffd4f2e317e72c23a9e11d291eba32d609321 Author: Martin Nordholts -Date: Sat May 14 16:00:00 2011 +0200 +Date: Sat May 14 16:00:00 2011 +0200 app: Add the concept of 'side' of a dock @@ -33708,7 +34610,7 @@ app/widgets/gimpdockcontainer.c | 25 +++++++++++++++++++ app/widgets/gimpdockcontainer.h | 26 +++++++++++-------- - app/widgets/gimpdockwindow.c | 17 +++++++++++++ + app/widgets/gimpdockwindow.c | 17 +++++++++++++ app/widgets/gimpsessioninfo-dock.c | 51 ++++++++++++++++++++++++++++++++++++++ app/widgets/gimpsessioninfo-dock.h | 9 +++++-- @@ -33716,7 +34618,7 @@ commit d00196dc7db7f3dc3af599089dd582cf3562a5e7 Author: Martin Nordholts -Date: Thu May 19 06:42:46 2011 +0200 +Date: Thu May 19 06:42:46 2011 +0200 plug-ins: Disable debug output from pygimp/pygimp-pdb.c @@ -33728,7 +34630,7 @@ commit 726ec88c26ddd92709e172a133993405691a8da5 Author: Martin Nordholts -Date: Wed May 18 21:17:17 2011 +0200 +Date: Wed May 18 21:17:17 2011 +0200 plug-ins: Fix PyGIMP item warnings @@ -33738,7 +34640,7 @@ commit 87e69d23122cef7c145a4d2e0bc619034183ca46 Author: Martin Nordholts -Date: Wed May 18 21:06:20 2011 +0200 +Date: Wed May 18 21:06:20 2011 +0200 app/tests: Add test for GIMP 2.8 multi window session files @@ -33753,26 +34655,25 @@ namely test-session-2-8-compatibility-multi-window.c. Copy and rename sessionrc files accordingly. - app/tests/.gitignore | 3 +- - app/tests/Makefile.am | 20 +- - app/tests/gimp-test-session-utils.c | 243 + app/tests/.gitignore | 3 +- + app/tests/Makefile.am | 20 ++-- + ...sion-management.c => gimp-test-session-utils.c} | 64 +++++++------ + app/tests/gimp-test-session-utils.h | 28 ++++++ + app/tests/gimpdir/dockrc | 2 + + app/tests/gimpdir/dockrc-2-6 | 42 +++++++++ + app/tests/gimpdir/dockrc-2-8 | 44 +++++++++ + app/tests/gimpdir/sessionrc | 39 ++++---- + app/tests/gimpdir/sessionrc-2-6 | 100 ++++++++++++++++++++ - app/tests/gimp-test-session-utils.h | 28 +++ - app/tests/gimpdir/dockrc | 2 + - app/tests/gimpdir/dockrc-2-6 | 42 ++++ - app/tests/gimpdir/dockrc-2-8 | 44 ++++ - app/tests/gimpdir/sessionrc | 39 ++-- - app/tests/gimpdir/sessionrc-2-6 | 100 +++++++++ - app/tests/gimpdir/sessionrc-2-8 | 101 +++++++++ - app/tests/test-session-2-6-compatibility.c | 68 ++++++ - .../test-session-2-8-compatibility-multi-window.c | 68 ++++++ - app/tests/test-session-management.c | 245 - --------------------- - 13 files changed, 729 insertions(+), 274 deletions(-) + app/tests/gimpdir/sessionrc-2-8 | 101 + +++++++++++++++++++++ + app/tests/test-session-2-6-compatibility.c | 68 ++++++++++++++ + .../test-session-2-8-compatibility-multi-window.c | 68 ++++++++++++++ + 12 files changed, 517 insertions(+), 62 deletions(-) commit 4121ac37389139be39ac3e2a5b7ec588a00a080c Author: Martin Nordholts -Date: Mon May 16 20:03:20 2011 +0200 +Date: Mon May 16 20:03:20 2011 +0200 app: Use GLib test framework in test-session-management.c @@ -33785,7 +34686,7 @@ commit e255998775a43e0cfb62f2627e7c0d72fcd8ec72 Author: Martin Nordholts -Date: Tue May 17 21:01:24 2011 +0200 +Date: Tue May 17 21:01:24 2011 +0200 app/tests: Expose gimp_test_utils_set_env_to_subpath() @@ -33795,7 +34696,7 @@ commit 091360fac48cf5da796640d1751e3e2770632bbe Author: Martin Nordholts -Date: Mon May 16 07:11:44 2011 +0200 +Date: Mon May 16 07:11:44 2011 +0200 app: For testing, support to override names of "sessionrc" and "dockrc" @@ -33809,7 +34710,7 @@ commit 3efa2062c517e3365efc1f1f7a22a0016a85f35c Author: Massimo Valentini -Date: Wed May 18 08:41:10 2011 +0200 +Date: Wed May 18 08:41:10 2011 +0200 Bug 650426 - Missing call to cairo_surface_flush @@ -33820,7 +34721,7 @@ commit 3e51484b188d5a9a42c730bd7162b270a81f064f Author: Michael Natterer -Date: Tue May 17 23:18:19 2011 +0200 +Date: Tue May 17 23:18:19 2011 +0200 app: fix off-by-one x2,y2 in gimp_rectangle_tool_draw_guides() @@ -33832,7 +34733,7 @@ commit a75a9d94696474f6c7cc1c101ef16bc67886553e Author: Michael Natterer -Date: Tue May 17 14:55:57 2011 +0200 +Date: Tue May 17 14:55:57 2011 +0200 app: when opening an image, don't unref it if no display could be created @@ -33846,7 +34747,7 @@ commit cebd34293c35f25a88553ffa4140a9f9397e2c32 Author: Michael Natterer -Date: Tue May 17 14:54:40 2011 +0200 +Date: Tue May 17 14:54:40 2011 +0200 app: don't populate the tool preset factory with data in no-interface mode @@ -33858,7 +34759,7 @@ commit 84dcf6281e76721d1ec6bc12964c8c2cca623aee Author: João S. O. Bueno -Date: Mon May 16 10:10:41 2011 -0400 +Date: Mon May 16 10:10:41 2011 -0400 pygimp: add public Item.from_id method @@ -33867,13 +34768,13 @@ sets base for refactoring pygimp object methods into pure Python. - plug-ins/pygimp/pygimp-item.c | 24 ++++++++++++++++++------ + plug-ins/pygimp/pygimp-item.c | 24 ++++++++++++++++++------ plug-ins/pygimp/pygimp-vectors.c | 2 +- 2 files changed, 19 insertions(+), 7 deletions(-) commit 3de6cc5f74f5bb3b06e908d399a141f073e23380 Author: João S. O. Bueno -Date: Mon May 16 01:34:18 2011 -0400 +Date: Mon May 16 01:34:18 2011 -0400 pygimp: Creates the "gimp.Item" class @@ -33882,38 +34783,38 @@ Still not working properly, as PDB calls returns raw integer ID's instead of proper Python objects. - plug-ins/pygimp/Makefile.am | 1 + - plug-ins/pygimp/gimpmodule.c | 5 ++ - plug-ins/pygimp/pygimp-api.h | 7 +- + plug-ins/pygimp/Makefile.am | 1 + + plug-ins/pygimp/gimpmodule.c | 5 ++ + plug-ins/pygimp/pygimp-api.h | 7 +- plug-ins/pygimp/pygimp-drawable.c | 2 +- - plug-ins/pygimp/pygimp-item.c | 137 + plug-ins/pygimp/pygimp-item.c | 137 ++++++++++++++++++++++++++++++++++++++ - plug-ins/pygimp/pygimp-pdb.c | 23 ++++++- + plug-ins/pygimp/pygimp-pdb.c | 23 ++++++- plug-ins/pygimp/pygimp-vectors.c | 2 +- - plug-ins/pygimp/pygimp.h | 4 ++ + plug-ins/pygimp/pygimp.h | 4 ++ 8 files changed, 177 insertions(+), 4 deletions(-) commit ab3fe1027542d4955df1d447a853fb5e297a4dc1 Author: Michael Natterer -Date: Sun May 15 21:12:49 2011 +0200 +Date: Sun May 15 21:12:49 2011 +0200 plug-ins: remove some more -Wunused-but-set-variable - plug-ins/common/blur-motion.c | 9 ++++----- - plug-ins/common/border-average.c | 4 ---- - plug-ins/common/bump-map.c | 2 -- - plug-ins/common/color-exchange.c | 3 +-- - plug-ins/file-ico/ico-load.c | 6 ++---- - plug-ins/file-jpeg/jpeg-save.c | 16 +++++++--------- - plug-ins/file-xjt/xjpeg.c | 3 --- - plug-ins/imagemap/imap_main.c | 3 +-- + plug-ins/common/blur-motion.c | 9 ++++----- + plug-ins/common/border-average.c | 4 ---- + plug-ins/common/bump-map.c | 2 -- + plug-ins/common/color-exchange.c | 3 +-- + plug-ins/file-ico/ico-load.c | 6 ++---- + plug-ins/file-jpeg/jpeg-save.c | 16 +++++++--------- + plug-ins/file-xjt/xjpeg.c | 3 --- + plug-ins/imagemap/imap_main.c | 3 +-- plug-ins/map-object/map-object-preview.c | 26 ++++---------------------- - plug-ins/pagecurl/pagecurl.c | 3 +-- + plug-ins/pagecurl/pagecurl.c | 3 +-- 10 files changed, 20 insertions(+), 55 deletions(-) commit ab0b88b5db06f48113063b799bf8d2966ae05c12 Author: Michael Natterer -Date: Sun May 15 17:00:41 2011 +0200 +Date: Sun May 15 17:00:41 2011 +0200 app: replace the last GtkObject members by GtkAdjustment @@ -33922,14 +34823,14 @@ app/display/gimpnavigationeditor.c | 2 +- app/tools/gimpcolorbalancetool.c | 14 +++++++------- - app/widgets/gimpbrushselect.c | 3 +-- + app/widgets/gimpbrushselect.c | 3 +-- app/widgets/gimpgradienteditor.c | 22 +++++++++++----------- app/widgets/gimpgradienteditor.h | 2 +- 5 files changed, 21 insertions(+), 22 deletions(-) commit 5642297109d76705f852253f52275a13129a30cc Author: Michael Natterer -Date: Sun May 15 01:47:21 2011 +0200 +Date: Sun May 15 01:47:21 2011 +0200 app: fix PDB parameter type mapping for GIMP_TYPE_ITEM_ID @@ -33940,18 +34841,18 @@ commit cf4a4bf5a667b4b624695ab9fbaec75847646774 Author: Martin Nordholts -Date: Fri May 13 21:09:27 2011 +0200 +Date: Fri May 13 21:09:27 2011 +0200 app: Make gimp_session_info_dock_restore() take a GimpDockContainer app/widgets/gimpsessioninfo-dock.c | 11 +++++------ app/widgets/gimpsessioninfo-dock.h | 2 +- - app/widgets/gimpsessioninfo.c | 2 +- + app/widgets/gimpsessioninfo.c | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) commit 7edf717baee93025c312a0049a6d5f2e59bd1e74 Author: Martin Nordholts -Date: Fri May 13 21:02:05 2011 +0200 +Date: Fri May 13 21:02:05 2011 +0200 app: Add image_window boolean to GimpDialogFactoryEntry @@ -33959,15 +34860,15 @@ FOREIGN_NOT_HIDEABLE() to IMAGE_WINDOW(). We need to treat image windows a bit special when we restore a single-window mode session. - app/dialogs/dialogs.c | 20 +++++++++++++++----- + app/dialogs/dialogs.c | 20 +++++++++++++++----- app/widgets/gimpdialogfactory.c | 2 ++ app/widgets/gimpdialogfactory.h | 4 ++++ - app/widgets/gimpsessioninfo.c | 3 ++- + app/widgets/gimpsessioninfo.c | 3 ++- 4 files changed, 23 insertions(+), 6 deletions(-) commit 0f19471e22820e336f9f2966caa1d6a2bdd62aa7 Author: Martin Nordholts -Date: Wed May 11 18:06:59 2011 +0200 +Date: Wed May 11 18:06:59 2011 +0200 app: Make GimpDockContainer::get_docks() return a new list @@ -33975,16 +34876,16 @@ pointer to a list so that GimpImageWindow can implement it (who needs to merge its two GimpDockColumns lists). - app/gui/gimpuiconfigurer.c | 21 +++++++++++++++------ - app/tests/test-ui.c | 11 +++++++++-- + app/gui/gimpuiconfigurer.c | 21 +++++++++++++++------ + app/tests/test-ui.c | 11 +++++++++-- app/widgets/gimpdockcontainer.c | 7 +++++++ - app/widgets/gimpdockwindow.c | 18 +++++++++--------- - app/widgets/gimpsessioninfo.c | 7 ++++++- + app/widgets/gimpdockwindow.c | 18 +++++++++--------- + app/widgets/gimpsessioninfo.c | 7 ++++++- 5 files changed, 46 insertions(+), 18 deletions(-) commit 00c2d15a3aaddc4460dafeebd86c57ef68e9c26e Author: Martin Nordholts -Date: Fri May 13 19:32:16 2011 +0200 +Date: Fri May 13 19:32:16 2011 +0200 app: Add GimpDockContainer::add_dock() @@ -33993,14 +34894,14 @@ app/widgets/gimpdockcontainer.c | 24 ++++++++ app/widgets/gimpdockcontainer.h | 16 ++++-- - app/widgets/gimpdockwindow.c | 113 + app/widgets/gimpdockwindow.c | 113 +++++++++++++++++++++---------------- - app/widgets/gimpsessioninfo-dock.c | 6 +- + app/widgets/gimpsessioninfo-dock.c | 6 +- 4 files changed, 101 insertions(+), 58 deletions(-) commit ab1b50ad4a27ec4e3b6ada96a926f817e52f4a2f Author: Martin Nordholts -Date: Fri May 13 18:56:03 2011 +0200 +Date: Fri May 13 18:56:03 2011 +0200 app: Add GimpDockContainer::get_ui_manager() @@ -34008,33 +34909,33 @@ implement it. Primary client is session restoration code. app/widgets/gimpdialogfactory.c | 6 +++++- - app/widgets/gimpdock.c | 9 +++++++-- - app/widgets/gimpdockbook.c | 11 ++++++++--- + app/widgets/gimpdock.c | 9 +++++++-- + app/widgets/gimpdockbook.c | 11 ++++++++--- app/widgets/gimpdockcontainer.c | 26 ++++++++++++++++++++++++-- app/widgets/gimpdockcontainer.h | 8 +++++--- - app/widgets/gimpdockwindow.c | 26 +++++++++++++++++--------- - app/widgets/gimpdockwindow.h | 1 - + app/widgets/gimpdockwindow.c | 26 +++++++++++++++++--------- + app/widgets/gimpdockwindow.h | 1 - app/widgets/gimpsessioninfo-dock.c | 12 +++++++----- app/widgets/gimpwidgets-utils.c | 27 +++++++++++++++------------ 9 files changed, 88 insertions(+), 38 deletions(-) commit d15cebe649a11988156eccb3e7292cc5175d023c Author: João S. O. Bueno -Date: Fri May 13 10:27:37 2011 -0400 +Date: Fri May 13 10:27:37 2011 -0400 plug-ins: Fix procedure and file name, list file for translation - plug-ins/pygimp/plug-ins/Makefile.am | 2 +- - plug-ins/pygimp/plug-ins/css-gradients.py | 104 - ---------------------- - plug-ins/pygimp/plug-ins/gradients-save-as-css.py | 104 - ++++++++++++++++++++++ - po-python/POTFILES.in | 1 + - 4 files changed, 106 insertions(+), 105 deletions(-) + plug-ins/pygimp/plug-ins/Makefile.am | + 2 +- + plug-ins/pygimp/plug-ins/{css-gradients.py => gradients-save-as-css.py} + | 2 +- + po-python/POTFILES.in | + 1 + + 3 files changed, 3 insertions(+), 2 deletions(-) commit 896e29c5f1326480aadd94ea98a89d6126cd5779 Author: Michael Natterer -Date: Thu May 12 21:21:26 2011 +0200 +Date: Thu May 12 21:21:26 2011 +0200 app: gimp_session_info_dock_restore(): remove empty dockbooks after restoring @@ -34049,7 +34950,7 @@ commit 6bf7f7e42957230cf86d72e2ccf8d059fb6c01ac Author: Michael Natterer -Date: Thu May 12 21:12:59 2011 +0200 +Date: Thu May 12 21:12:59 2011 +0200 app: ref the session info in gimp_dialog_factory_add_session_info() @@ -34057,13 +34958,13 @@ doing it and fixes another warning when restoring a dock fails. app/actions/windows-commands.c | 6 +++++- - app/gui/session.c | 4 ++-- + app/gui/session.c | 4 ++-- app/widgets/gimpdialogfactory.c | 7 +++++-- 3 files changed, 12 insertions(+), 5 deletions(-) commit 9e60dd547dd307cfec95a597dd5536e486e7e871 Author: Michael Natterer -Date: Thu May 12 20:53:21 2011 +0200 +Date: Thu May 12 20:53:21 2011 +0200 app: keep a ref to the session info in gimp_session_info_restore() @@ -34075,7 +34976,7 @@ commit 68a56a861ef680a441f70f7932d05ceec95e2155 Author: Michael Natterer -Date: Thu May 12 20:29:05 2011 +0200 +Date: Thu May 12 20:29:05 2011 +0200 app: gimp_session_info_book_restore(): don't set a non-existing current page @@ -34090,7 +34991,7 @@ commit 80cf95319e559e9d601ac6cc494bea14faf477f5 Author: Michael Natterer -Date: Thu May 12 20:24:32 2011 +0200 +Date: Thu May 12 20:24:32 2011 +0200 app: gimp_session_info_dockable_restore(): don't return existing singletons @@ -34103,18 +35004,18 @@ commit f37394cd0f6972bda77f5115a82039b168a1c051 Author: Kristjan SCHMIDT -Date: Thu May 12 20:59:13 2011 +0200 +Date: Thu May 12 20:59:13 2011 +0200 Add Esperanto translation - po-plug-ins/LINGUAS | 1 + + po-plug-ins/LINGUAS | 1 + po-plug-ins/eo.po | 12688 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 12689 insertions(+) commit 4245b6bbe18a3ee770e80153ed9aa95a292cb641 Author: João S. O. Bueno -Date: Thu May 12 13:47:50 2011 -0400 +Date: Thu May 12 13:47:50 2011 -0400 plug-ins: Create save Gradient as CSS3 python-script @@ -34122,14 +35023,14 @@ CSS3 gradients, conformant to w3c and current existing implementations: mozilla and webkit. - plug-ins/pygimp/plug-ins/Makefile.am | 1 + + plug-ins/pygimp/plug-ins/Makefile.am | 1 + plug-ins/pygimp/plug-ins/css-gradients.py | 104 ++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+) commit c70dc8f86d89f6ff2c40dfe9ceaf25120ada622c Author: Martin Nordholts -Date: Thu May 12 06:34:33 2011 +0200 +Date: Thu May 12 06:34:33 2011 +0200 app: Add NULL check in gimp_dock_container_get_docks() @@ -34138,7 +35039,7 @@ commit 3286ba8ba8c2ad892dbf1a649ad8ca759525610b Author: Martin Nordholts -Date: Thu May 12 06:27:24 2011 +0200 +Date: Thu May 12 06:27:24 2011 +0200 Update NEWS @@ -34147,7 +35048,7 @@ commit 9f7ad1cea0ff4e27647e0bcd2251639695def40d Author: Mukund Sivaraman -Date: Thu May 12 08:44:30 2011 +0530 +Date: Thu May 12 08:44:30 2011 +0530 Update NEWS about libpng @@ -34156,23 +35057,23 @@ commit 05cd8670c37466ec71deef8d508d2cc087ed054f Author: Michael Natterer -Date: Wed May 11 22:12:26 2011 +0200 +Date: Wed May 11 22:12:26 2011 +0200 libgimpwidgets: deprecate gimp_toggle_button_sensitive_update() Use g_object_bind_property() instead. .../libgimpwidgets/libgimpwidgets-sections.txt | 2 +- - libgimpwidgets/gimpoldwidgets.c | 2 ++ - libgimpwidgets/gimpoldwidgets.h | 6 +++-- - libgimpwidgets/gimpwidgets.c | 29 + libgimpwidgets/gimpoldwidgets.c | 2 ++ + libgimpwidgets/gimpoldwidgets.h | 6 +++-- + libgimpwidgets/gimpwidgets.c | 29 ++++++++++++++-------- - libgimpwidgets/gimpwidgets.h | 2 -- + libgimpwidgets/gimpwidgets.h | 2 -- 5 files changed, 26 insertions(+), 15 deletions(-) commit 80e18bdee0c5d6d8bdcb39f7e1cd8857497ecd00 Author: Mikael Magnusson -Date: Wed May 11 22:09:21 2011 +0200 +Date: Wed May 11 22:09:21 2011 +0200 app: Fix tooltip for "Use editor" checkbox @@ -34181,50 +35082,50 @@ commit 3184c0f3391f6f34949e3d4cd5bfd7b7a7a47d2e Author: Michael Natterer -Date: Wed May 11 11:43:19 2011 +0200 +Date: Wed May 11 11:43:19 2011 +0200 app: use g_object_bind_property() to set sensitivity here too - app/dialogs/convert-dialog.c | 5 +++-- - app/dialogs/preferences-dialog.c | 10 ++++++---- - app/dialogs/stroke-dialog.c | 34 + app/dialogs/convert-dialog.c | 5 +++-- + app/dialogs/preferences-dialog.c | 10 ++++++---- + app/dialogs/stroke-dialog.c | 34 ++++++++++++---------------------- - app/tools/gimpcoloroptions.c | 6 +++--- + app/tools/gimpcoloroptions.c | 6 +++--- app/tools/gimprectangleselectoptions.c | 13 +++++++------ - app/widgets/gimpwidgets-utils.c | 10 +++------- + app/widgets/gimpwidgets-utils.c | 10 +++------- 6 files changed, 34 insertions(+), 44 deletions(-) commit 77b615e899ee76278278fcfd4ab99f61b1a3abd1 Author: Michael Natterer -Date: Wed May 11 11:41:26 2011 +0200 +Date: Wed May 11 11:41:26 2011 +0200 plug-ins: use g_object_bind_property() to set widgets sensitive depending on toggle buttons instead of libgimpwidgets' "set_sensitive" hack. - plug-ins/common/displace.c | 32 + plug-ins/common/displace.c | 32 ++++++++++++++++++-------------- - plug-ins/common/file-gif-save.c | 9 ++++----- - plug-ins/common/file-html-table.c | 5 +++-- - plug-ins/common/file-ps.c | 5 +++-- - plug-ins/common/file-svg.c | 14 +++++--------- - plug-ins/common/file-xbm.c | 10 ++++++---- - plug-ins/common/film.c | 13 ++++++++----- - plug-ins/common/iwarp.c | 10 ++++++---- - plug-ins/common/oilify.c | 10 ++++++---- - plug-ins/common/ripple.c | 5 +++-- - plug-ins/common/screenshot.c | 13 ++++++++----- - plug-ins/common/tile-paper.c | 8 ++++---- - plug-ins/common/tile-small.c | 25 +++++++++++++++---------- + plug-ins/common/file-gif-save.c | 9 ++++----- + plug-ins/common/file-html-table.c | 5 +++-- + plug-ins/common/file-ps.c | 5 +++-- + plug-ins/common/file-svg.c | 14 +++++--------- + plug-ins/common/file-xbm.c | 10 ++++++---- + plug-ins/common/film.c | 13 ++++++++----- + plug-ins/common/iwarp.c | 10 ++++++---- + plug-ins/common/oilify.c | 10 ++++++---- + plug-ins/common/ripple.c | 5 +++-- + plug-ins/common/screenshot.c | 13 ++++++++----- + plug-ins/common/tile-paper.c | 8 ++++---- + plug-ins/common/tile-small.c | 25 +++++++++++++++---------- plug-ins/gradient-flare/gradient-flare.c | 11 +++++++---- - plug-ins/lighting/lighting-ui.c | 10 ++++++---- - plug-ins/map-object/map-object-ui.c | 5 +++-- + plug-ins/lighting/lighting-ui.c | 10 ++++++---- + plug-ins/map-object/map-object-ui.c | 5 +++-- 16 files changed, 105 insertions(+), 80 deletions(-) commit 6d421f9d4dcce00b832233c6745a4c76256e8375 Author: Martin Nordholts -Date: Mon May 9 18:27:32 2011 +0200 +Date: Mon May 9 18:27:32 2011 +0200 app: Add and use gimp_session_info_get_info_with_widget() @@ -34239,7 +35140,7 @@ commit 4b9243fc605798a177b1ff713722c0f91b5171bc Author: Martin Nordholts -Date: Mon May 9 18:03:18 2011 +0200 +Date: Mon May 9 18:03:18 2011 +0200 app: Make GimpDockWindow implement GimpDockContainer @@ -34248,7 +35149,7 @@ interface when we start to session manage docks in single-window mode. app/gui/gimpuiconfigurer.c | 15 +++++++----- - app/tests/test-ui.c | 9 ++++--- + app/tests/test-ui.c | 9 ++++--- app/widgets/gimpdockwindow.c | 57 ++++++++++++++++++++++++++++--------------- app/widgets/gimpdockwindow.h | 1 - @@ -34257,7 +35158,7 @@ commit 2287b6e008e1d5f4cfce5c1f7d5ecc4e305a6891 Author: Martin Nordholts -Date: Mon May 9 08:14:23 2011 +0200 +Date: Mon May 9 08:14:23 2011 +0200 app: Add a GimpDockContainer interface @@ -34265,16 +35166,16 @@ GimpImageWindow (in single-window mode). Introduce a GimpDockContainer interface so we can cope with these in an abstract way. - app/widgets/Makefile.am | 2 ++ + app/widgets/Makefile.am | 2 ++ app/widgets/gimpdockcontainer.c | 77 +++++++++++++++++++++++++++++++++++++++++ app/widgets/gimpdockcontainer.h | 46 ++++++++++++++++++++++++ - app/widgets/widgets-types.h | 1 + + app/widgets/widgets-types.h | 1 + 4 files changed, 126 insertions(+) commit 1d12dc8e866b2640b19ccf0ebd3d533ced70bab4 Author: Martin Nordholts -Date: Mon May 9 08:06:59 2011 +0200 +Date: Mon May 9 08:06:59 2011 +0200 app: Sort widgets/widgets-types.h @@ -34284,7 +35185,7 @@ commit e91890f659fc79441f11f1e88d97c9e86090c276 Author: Michael Natterer -Date: Sun May 8 21:38:53 2011 +0200 +Date: Sun May 8 21:38:53 2011 +0200 app: always use the first display's image window as single-window @@ -34296,7 +35197,7 @@ commit f93398b4cf89277f3629a47758c5b9e78a0488e5 Author: Mukund Sivaraman -Date: Sun May 8 23:33:08 2011 +0530 +Date: Sun May 8 23:33:08 2011 +0530 file-bmp: Fix typo in comment @@ -34305,7 +35206,7 @@ commit b3a4a00d29a30385fec154853149a52f1a1a325f Author: Mukund Sivaraman -Date: Sun May 8 22:57:39 2011 +0530 +Date: Sun May 8 22:57:39 2011 +0530 file-bmp: Use BITMAPV5HEADER structure (bug #649741) @@ -34315,7 +35216,7 @@ commit a713175375ab3ee08eda59c3851e20f0b6da13a4 Author: Mukund Sivaraman -Date: Sun May 8 22:10:20 2011 +0530 +Date: Sun May 8 22:10:20 2011 +0530 file-bmp: Rewrite code @@ -34324,7 +35225,7 @@ commit 4978f370fe230e1be2775ea0481f699276e646f9 Author: Mukund Sivaraman -Date: Sun May 8 21:22:31 2011 +0530 +Date: Sun May 8 21:22:31 2011 +0530 file-bmp: Rewrite code @@ -34333,7 +35234,7 @@ commit 3b71b71c4cddc561e2b258a5226a2dfa6b95a6bf Author: Michael Natterer -Date: Sun May 8 00:00:55 2011 +0200 +Date: Sun May 8 00:00:55 2011 +0200 app: always add ALT+number accelerators to the image window menu items @@ -34349,7 +35250,7 @@ commit 1ebd2b5113791b7fcb599d0da9d1a94549cb4dd1 Author: Michael Natterer -Date: Sat May 7 23:54:54 2011 +0200 +Date: Sat May 7 23:54:54 2011 +0200 Revert "app: Make alt+[number] switch tabs in single-window mode" @@ -34360,7 +35261,7 @@ commit d7b8f8e81f9bc7191261c143d5d7026464a85eb7 Author: Michael Natterer -Date: Sat May 7 22:33:05 2011 +0200 +Date: Sat May 7 22:33:05 2011 +0200 app: formatting in gimpdisplayshell-selection.c @@ -34369,7 +35270,7 @@ commit cd81632ad022c9513bcd4bf469118cd1d865505e Author: Kristjan SCHMIDT -Date: Sat May 7 19:36:19 2011 +0200 +Date: Sat May 7 19:36:19 2011 +0200 Updated Esperanto translation @@ -34378,7 +35279,7 @@ commit 03a3d01fb317a3eb08c98b217a42d51e70c9b4e0 Author: Kristjan SCHMIDT -Date: Sat May 7 19:30:27 2011 +0200 +Date: Sat May 7 19:30:27 2011 +0200 Updated Esperanto translation @@ -34388,7 +35289,7 @@ commit 0654b73964f3eb0fe91ba175ae0b02c23a606d72 Author: Mukund Sivaraman -Date: Sat May 7 06:44:22 2011 +0530 +Date: Sat May 7 06:44:22 2011 +0530 gradient-map: Free gradient_name when done using it @@ -34397,7 +35298,7 @@ commit 24ac01bfa92b0bdb94e13b7cc58e78e2be5fc6c7 Author: Mukund Sivaraman -Date: Sat May 7 05:51:30 2011 +0530 +Date: Sat May 7 05:51:30 2011 +0530 app: Fix corruption while in use of imported uri @@ -34406,7 +35307,7 @@ commit 9e771c3160a821fe2a7810429b3c818df954df53 Author: Mikael Magnusson -Date: Fri May 6 22:21:34 2011 +0200 +Date: Fri May 6 22:21:34 2011 +0200 file-uri: use correct variable type @@ -34421,7 +35322,7 @@ commit 604d50fc36cc7b90feccf482b60f8d43255f670f Author: Michael Natterer -Date: Sat May 7 01:11:56 2011 +0200 +Date: Sat May 7 01:11:56 2011 +0200 Bug 155733 - need to check return values of gimp_drawable_mask_bounds() @@ -34430,21 +35331,21 @@ plug-ins. plug-ins/color-rotate/color-rotate.c | 36 +++++++++-------- - plug-ins/common/blur-gauss.c | 29 +++++--------- - plug-ins/common/blur-motion.c | 11 ++---- - plug-ins/common/bump-map.c | 12 ++++-- + plug-ins/common/blur-gauss.c | 29 +++++--------- + plug-ins/common/blur-motion.c | 11 ++---- + plug-ins/common/bump-map.c | 12 ++++-- plug-ins/common/color-exchange.c | 14 +++---- - plug-ins/common/cubism.c | 10 +++-- - plug-ins/common/depth-merge.c | 75 + plug-ins/common/cubism.c | 10 +++-- + plug-ins/common/depth-merge.c | 75 +++++++++++++++++++----------------- - plug-ins/common/destripe.c | 15 ++++---- - plug-ins/common/diffraction.c | 25 +++++++----- - plug-ins/common/displace.c | 24 ++++++------ + plug-ins/common/destripe.c | 15 ++++---- + plug-ins/common/diffraction.c | 25 +++++++----- + plug-ins/common/displace.c | 24 ++++++------ 10 files changed, 128 insertions(+), 123 deletions(-) commit a4cf150191072bbfd796ec697f2ad83c4ec70c77 Author: Mikael Magnusson -Date: Fri May 6 23:37:31 2011 +0200 +Date: Fri May 6 23:37:31 2011 +0200 Bug 649610 - Gimp does not initialize as long as the splash screen is not mapped @@ -34457,7 +35358,7 @@ commit 759fad8189c9790dcef5efe727092f99d3461792 Author: Yoshinori Yamakawa -Date: Sun Apr 10 18:39:22 2011 +0900 +Date: Sun Apr 10 18:39:22 2011 +0900 file-psd: Make file-psd-save embed color profile @@ -34466,7 +35367,7 @@ commit 1a025e4fbd56afe7c55bd33579c072da7565550e Author: Mukund Sivaraman -Date: Fri May 6 19:47:41 2011 +0530 +Date: Fri May 6 19:47:41 2011 +0530 selection-to-path: Fix an uninitialized variable @@ -34475,7 +35376,7 @@ commit 904d3452b9087bcdc6366cf98b4b2d04b1fc6a37 Author: Mukund Sivaraman -Date: Fri May 6 19:33:20 2011 +0530 +Date: Fri May 6 19:33:20 2011 +0530 file-mng: Indent some code @@ -34484,7 +35385,7 @@ commit 5b999ab3f9c5e1bb5937111bb1d2fb4222381b98 Author: Mukund Sivaraman -Date: Fri May 6 17:51:09 2011 +0530 +Date: Fri May 6 17:51:09 2011 +0530 file-png: Indent some code @@ -34493,17 +35394,17 @@ commit 252c88c3a9ccb8f54233352489855227dc1d2e44 Author: Kristjan SCHMIDT -Date: Fri May 6 15:54:30 2011 +0200 +Date: Fri May 6 15:54:30 2011 +0200 Add Esperanto translation po-tags/LINGUAS | 1 + - po-tags/eo.po | 26 ++++++++++++++++++++++++++ + po-tags/eo.po | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) commit cf2bf03fe75f0ad5d497b0aca5de9a7d29292d89 Author: Kristjan SCHMIDT -Date: Fri May 6 15:44:16 2011 +0200 +Date: Fri May 6 15:44:16 2011 +0200 Updated Esperanto translation @@ -34513,7 +35414,7 @@ commit 17c5e114c3df3aeabe5316f7a85da67f21f65961 Author: Mukund Sivaraman -Date: Fri May 6 16:28:25 2011 +0530 +Date: Fri May 6 16:28:25 2011 +0530 file-mng: Call png_set_*() functions after png_set_IHDR() @@ -34523,7 +35424,7 @@ commit cbc2ffc7c2cd2103c81064d56b135fd66987422c Author: Mukund Sivaraman -Date: Fri May 6 16:17:56 2011 +0530 +Date: Fri May 6 16:17:56 2011 +0530 file-mng: Specify the interlace type explicitly @@ -34532,7 +35433,7 @@ commit dfc11599d1f1641deb73d96ab47ba42eb77c34bc Author: Martin Nordholts -Date: Fri May 6 07:29:01 2011 +0200 +Date: Fri May 6 07:29:01 2011 +0200 app: Small --dump-pdb-procedures-deprecated cleanup @@ -34541,7 +35442,7 @@ commit d9264c6bd54b0824e4c113402b1d61df831601f2 Author: Martin Nordholts -Date: Fri May 6 07:21:34 2011 +0200 +Date: Fri May 6 07:21:34 2011 +0200 app/tests: Fixup test-gimpidtable.c @@ -34552,7 +35453,7 @@ commit b69a053245db0a9e601515fab486c6af35e99d43 Author: Daniel Mustieles -Date: Thu May 5 19:51:55 2011 +0200 +Date: Thu May 5 19:51:55 2011 +0200 Updated Spanish translation @@ -34562,7 +35463,7 @@ commit 3cf5f4a5533b1dd19ff6809f69e48940fc135319 Author: Daniel Mustieles -Date: Thu May 5 19:28:28 2011 +0200 +Date: Thu May 5 19:28:28 2011 +0200 Updated Spanish translation @@ -34572,7 +35473,7 @@ commit ae654a7aaea25a1ae445b702f57792562e1d3763 Author: Mukund Sivaraman -Date: Thu May 5 20:47:53 2011 +0530 +Date: Thu May 5 20:47:53 2011 +0530 file-png: Update comment for png_set_IHDR() @@ -34581,7 +35482,7 @@ commit fbbeb8d629eb78728396025432bb8be2078461fe Author: Mukund Sivaraman -Date: Thu May 5 20:36:45 2011 +0530 +Date: Thu May 5 20:36:45 2011 +0530 file-png: Call png_set_*() functions after png_set_IHDR() @@ -34591,7 +35492,7 @@ commit dbecc7b7053e0b8429eb00ab0a732d252c688381 Author: Mukund Sivaraman -Date: Thu May 5 20:15:02 2011 +0530 +Date: Thu May 5 20:15:02 2011 +0530 file-png: Move setting the comment text after IHDR is set @@ -34601,7 +35502,7 @@ commit 4fa2bbabf9959dc8bebc45fe263e737198c30e99 Author: Mukund Sivaraman -Date: Thu May 5 18:53:11 2011 +0530 +Date: Thu May 5 18:53:11 2011 +0530 file-png: Specify the interlace type explicitly @@ -34610,21 +35511,21 @@ commit f660236a4fa5069cb4cf2b93b841d6dd2477237e Author: Michael Natterer -Date: Thu May 5 12:49:38 2011 +0200 +Date: Thu May 5 12:49:38 2011 +0200 plug-ins: remove some -Wunused-but-set-variable - plug-ins/common/sharpen.c | 2 -- - plug-ins/common/tile-seamless.c | 4 +--- - plug-ins/common/tile-small.c | 10 ++++------ - plug-ins/common/value-propagate.c | 3 --- - plug-ins/file-fits/fits.c | 4 ---- + plug-ins/common/sharpen.c | 2 -- + plug-ins/common/tile-seamless.c | 4 +--- + plug-ins/common/tile-small.c | 10 ++++------ + plug-ins/common/value-propagate.c | 3 --- + plug-ins/file-fits/fits.c | 4 ---- plug-ins/script-fu/script-fu-interface.c | 2 -- 6 files changed, 5 insertions(+), 20 deletions(-) commit b77b94d3edca9af5ccb70edcf39ea02f2aed0680 Author: Michael Natterer -Date: Thu May 5 12:19:25 2011 +0200 +Date: Thu May 5 12:19:25 2011 +0200 app: don't rely on gimp_brush_tool_create_outline() returning an outline @@ -34636,18 +35537,18 @@ commit 5a1a3209e9a55dd02cc53c52b31a311453aafd26 Author: Mukund Sivaraman -Date: Thu May 5 09:48:02 2011 +0530 +Date: Thu May 5 09:48:02 2011 +0530 Move libpng specific warning CFLAGS to PNG_CFLAGS - configure.ac | 10 +++------- - plug-ins/common/Makefile.am | 2 ++ + configure.ac | 10 +++------- + plug-ins/common/Makefile.am | 2 ++ plug-ins/common/plugin-defs.pl | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) commit 28983a5158196eb634050f8e22439cc7fc640b6a Author: Martin Nordholts -Date: Thu May 5 00:58:08 2011 +0200 +Date: Thu May 5 00:58:08 2011 +0200 app: Add a "check-for-deprecated-procedures-in-script-fu" make target @@ -34663,13 +35564,13 @@ make -C plug-ins/script-fu check-for-deprecated-procedures-in-script-fu - NEWS | 1 + + NEWS | 1 + plug-ins/script-fu/Makefile.am | 15 +++++++++++++++ 2 files changed, 16 insertions(+) commit ed011014297bc507399d138b0b30ad3f986109cf Author: Martin Nordholts -Date: Thu May 5 00:33:19 2011 +0200 +Date: Thu May 5 00:33:19 2011 +0200 app: Add hidden --dump-pdb-procedures-deprecated option @@ -34682,7 +35583,7 @@ commit 3474a385f28050e14cc899135dd0d68fb0a9182c Author: Martin Nordholts -Date: Mon May 2 18:17:02 2011 +0200 +Date: Mon May 2 18:17:02 2011 +0200 app: Add gimp_pdb_get_deprecated_procedures() @@ -34692,7 +35593,7 @@ commit be91f01291a01f7c242cab6c223b58bb8c8af33c Author: Martin Nordholts -Date: Thu May 5 00:08:37 2011 +0200 +Date: Thu May 5 00:08:37 2011 +0200 app: Add gimp_procedure_name_compare() @@ -34702,7 +35603,7 @@ commit a942de57585ad035232f140580c0801fbb972def Author: Martin Nordholts -Date: Thu May 5 00:36:53 2011 +0200 +Date: Thu May 5 00:36:53 2011 +0200 Update NEWS @@ -34711,7 +35612,7 @@ commit 91550117c7b702c663878e2a6864296c366ee3d2 Author: Michael Natterer -Date: Wed May 4 23:25:55 2011 +0200 +Date: Wed May 4 23:25:55 2011 +0200 app: fix GimpSourceTool's source position drawing for other displays @@ -34728,7 +35629,7 @@ commit c4097d4ff4b23d3f3a60f430ff37e7a87f6063e4 Author: Martin Nordholts -Date: Wed May 4 23:14:21 2011 +0200 +Date: Wed May 4 23:14:21 2011 +0200 app: void * -> gpointer in GimpIdTable @@ -34739,7 +35640,7 @@ commit 0d529f79566a2a81aeb94fb833ad9a69946dd36c Author: Martin Nordholts -Date: Wed May 4 22:14:13 2011 +0200 +Date: Wed May 4 22:14:13 2011 +0200 app: Use GimpIdTable @@ -34751,26 +35652,26 @@ commit 9fefa22efe70e484fc7c92708ed8efe023e4d219 Author: Martin Nordholts -Date: Wed May 4 07:24:23 2011 +0200 +Date: Wed May 4 07:24:23 2011 +0200 app: Add GimpIdTable utility class Not written in Vala... ;) - app/core/Makefile.am | 2 + - app/core/core-types.h | 1 + + app/core/Makefile.am | 2 + + app/core/core-types.h | 1 + app/core/gimpidtable.c | 224 +++++++++++++++++++++++++++++++++++++++++ app/core/gimpidtable.h | 68 +++++++++++++ - app/tests/.gitignore | 1 + - app/tests/Makefile.am | 1 + + app/tests/.gitignore | 1 + + app/tests/Makefile.am | 1 + app/tests/test-gimpidtable.c | 232 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 529 insertions(+) commit 85c0fd1166ce4121e164ed1aeabf78ea4ae76b5e Author: Michael Natterer -Date: Wed May 4 22:40:40 2011 +0200 +Date: Wed May 4 22:40:40 2011 +0200 app: replace gimp_dock_get_dock_columns() by gtk_widget_get_ancestor() @@ -34780,7 +35681,7 @@ commit 929aca96861c2bb7b52bf997a03e6e051b1a732d Author: Kristjan SCHMIDT -Date: Wed May 4 19:38:46 2011 +0200 +Date: Wed May 4 19:38:46 2011 +0200 Updated Esperanto translation @@ -34790,7 +35691,7 @@ commit ee69c8f21e3af33fbb987af3d960e8868117d5e4 Author: Michael Natterer -Date: Tue May 3 22:03:15 2011 +0200 +Date: Tue May 3 22:03:15 2011 +0200 NEWS: Updated @@ -34799,7 +35700,7 @@ commit 60c94c69b93af20782958eb013dc83686ea27520 Author: Nils Philippsen -Date: Tue May 3 12:14:53 2011 +0200 +Date: Tue May 3 12:14:53 2011 +0200 gimp-remote: don't use deprecated gdk_window_foreign_new_for_display() @@ -34810,23 +35711,23 @@ commit 62e3e88ea16ef6c98839fa8726cbe7c889a46ea1 Author: Nils Philippsen -Date: Tue May 3 12:11:48 2011 +0200 +Date: Tue May 3 12:11:48 2011 +0200 gimp-remote: include gimpbase.h rather than gimpversion.h this is a followup to commit 844df2b4dfe16395bfbfc2f83f653644783fbf96 tools/gimp-remote-x11.c | 2 +- - tools/gimp-remote.c | 2 +- + tools/gimp-remote.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 989b85988b89106719420bb102406feaf117b656 Author: Michael Muré -Date: Tue May 3 00:45:39 2011 +0200 +Date: Tue May 3 00:45:39 2011 +0200 Cage tool: allow to add handle by clicking on an edge - NEWS | 3 +- + NEWS | 3 +- app/tools/gimpcagetool.c | 129 ++++++++++++++++++++++++++++++++++++++++------- app/tools/gimpcagetool.h | 1 + @@ -34834,7 +35735,7 @@ commit cc247b3e6660e7ac9db0994ab4da1f7956388073 Author: Michael Muré -Date: Thu Apr 21 11:44:47 2011 +0200 +Date: Thu Apr 21 11:44:47 2011 +0200 Cage tool: in cage mode, remove selected handles when hitting backspace @@ -34844,7 +35745,7 @@ commit bcd76a3d5b0f574bf0df9493eb5f5a51d5531973 Author: Michael Muré -Date: Thu Apr 21 11:22:12 2011 +0200 +Date: Thu Apr 21 11:22:12 2011 +0200 GimpCageConfig: add function to remove all selected points @@ -34854,7 +35755,7 @@ commit b0cedaa677cdf99e26b8feff490324659a669e1c Author: Michael Muré -Date: Wed Apr 20 19:50:38 2011 +0200 +Date: Wed Apr 20 19:50:38 2011 +0200 GimpCageConfig: add function to add and remove point at arbitrary index @@ -34865,7 +35766,7 @@ commit 909e7833a39c5ead18c732039a842dcec29f5c84 Author: Michael Natterer -Date: Mon May 2 13:53:58 2011 +0200 +Date: Mon May 2 13:53:58 2011 +0200 app: remove some more -Wunused-but-set-variable @@ -34875,7 +35776,7 @@ commit c4e44dc09805b14c0fd91c4fc1cc67534952bee3 Author: Mukund Sivaraman -Date: Mon May 2 07:43:48 2011 +0530 +Date: Mon May 2 07:43:48 2011 +0530 Show the compiler option that caused a warning @@ -34884,56 +35785,56 @@ commit c35ff719a70637051bb2ddda8028dd17d1e32797 Author: Michael Natterer -Date: Sun May 1 23:23:19 2011 +0200 +Date: Sun May 1 23:23:19 2011 +0200 app/libgimp*: remove stuff found by -Wunused-but-set-variable - app/actions/drawable-actions.c | 2 - - app/actions/image-actions.c | 2 - - app/actions/vectors-actions.c | 2 - - app/config/gimprc-serialize.c | 9 +-- - app/core/gimpbrush-load.c | 7 +- - app/core/gimpbrushpipe.c | 7 +- - app/core/gimpbuffer.c | 4 -- - app/core/gimpchannelpropundo.c | 2 - - app/core/gimpcurve-save.c | 4 +- - app/core/gimpdrawable-bucket-fill.c | 3 - - app/core/gimpdrawable-transform.c | 3 - - app/core/gimpdrawable.c | 6 +- - app/core/gimplayerpropundo.c | 2 - - app/core/gimpundo.c | 4 -- - app/dialogs/fade-dialog.c | 7 +- - app/display/gimpdisplayshell-scale.c | 18 +---- - app/display/gimpimagewindow.c | 27 ++++---- - app/paint-funcs/paint-funcs-generic.h | 3 - - app/paint/gimppaintcore-stroke.c | 3 - - app/paint/gimpsmudge.c | 3 - - app/tools/gimpimagemaptool.c | 3 - - app/tools/gimpiscissorstool.c | 4 +- - app/tools/gimprectangleselecttool.c | 4 -- - app/tools/gimprectangletool.c | 117 + app/actions/drawable-actions.c | 2 - + app/actions/image-actions.c | 2 - + app/actions/vectors-actions.c | 2 - + app/config/gimprc-serialize.c | 9 +-- + app/core/gimpbrush-load.c | 7 +- + app/core/gimpbrushpipe.c | 7 +- + app/core/gimpbuffer.c | 4 -- + app/core/gimpchannelpropundo.c | 2 - + app/core/gimpcurve-save.c | 4 +- + app/core/gimpdrawable-bucket-fill.c | 3 - + app/core/gimpdrawable-transform.c | 3 - + app/core/gimpdrawable.c | 6 +- + app/core/gimplayerpropundo.c | 2 - + app/core/gimpundo.c | 4 -- + app/dialogs/fade-dialog.c | 7 +- + app/display/gimpdisplayshell-scale.c | 18 +---- + app/display/gimpimagewindow.c | 27 ++++---- + app/paint-funcs/paint-funcs-generic.h | 3 - + app/paint/gimppaintcore-stroke.c | 3 - + app/paint/gimpsmudge.c | 3 - + app/tools/gimpimagemaptool.c | 3 - + app/tools/gimpiscissorstool.c | 4 +- + app/tools/gimprectangleselecttool.c | 4 -- + app/tools/gimprectangletool.c | 117 +++++++++++--------------------- - app/vectors/gimpbezierstroke.c | 25 +++---- - app/vectors/gimpvectorspropundo.c | 6 +- - app/widgets/gimpdockbook.c | 29 +++----- - app/widgets/gimpdynamicseditor.c | 29 ++++---- - app/widgets/gimpdynamicsfactoryview.c | 3 - - app/widgets/gimpitemtreeview.c | 7 +- - app/widgets/gimpoverlaydialog.c | 4 +- - app/widgets/gimppaletteeditor.c | 3 - - app/widgets/gimptagentry.c | 14 +--- - app/widgets/gimptemplateview.c | 2 - + app/vectors/gimpbezierstroke.c | 25 +++---- + app/vectors/gimpvectorspropundo.c | 6 +- + app/widgets/gimpdockbook.c | 29 +++----- + app/widgets/gimpdynamicseditor.c | 29 ++++---- + app/widgets/gimpdynamicsfactoryview.c | 3 - + app/widgets/gimpitemtreeview.c | 7 +- + app/widgets/gimpoverlaydialog.c | 4 +- + app/widgets/gimppaletteeditor.c | 3 - + app/widgets/gimptagentry.c | 14 +--- + app/widgets/gimptemplateview.c | 2 - app/widgets/gimptoolpresetfactoryview.c | 3 - - app/widgets/gtkhwrapbox.c | 4 -- - app/xcf/xcf-load.c | 3 - - libgimp/gimpzoompreview.c | 13 ++-- - libgimpwidgets/gimpcolornotebook.c | 5 +- - libgimpwidgets/gimppageselector.c | 5 -- + app/widgets/gtkhwrapbox.c | 4 -- + app/xcf/xcf-load.c | 3 - + libgimp/gimpzoompreview.c | 13 ++-- + libgimpwidgets/gimpcolornotebook.c | 5 +- + libgimpwidgets/gimppageselector.c | 5 -- 40 files changed, 112 insertions(+), 289 deletions(-) commit 092e26935b60307d002528e13fdc7c9ff1903a4c Author: Michael Natterer -Date: Sun May 1 23:19:49 2011 +0200 +Date: Sun May 1 23:19:49 2011 +0200 app: GimpForegroundSelectToolUndo: shorten local variable names @@ -34943,7 +35844,7 @@ commit 99df9e114e16a1272c3f492b434adcf4075f6592 Author: Michael Natterer -Date: Sun May 1 22:36:25 2011 +0200 +Date: Sun May 1 22:36:25 2011 +0200 app: GimpCanvasLayerBoundary: actually use the figured "edit_mask" boolean @@ -34958,17 +35859,17 @@ commit 2b1807054f67b91467f4643162f3305b23fb7a28 Author: Michael Natterer -Date: Sun May 1 11:24:26 2011 +0200 +Date: Sun May 1 11:24:26 2011 +0200 libgimp*: update .def files after cairo functions moved between libs - libgimpcolor/gimpcolor.def | 3 +++ + libgimpcolor/gimpcolor.def | 3 +++ libgimpwidgets/gimpwidgets.def | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) commit c579ec9754acc7784798e479cc015bc67cfe0f89 Author: Mukund Sivaraman -Date: Fri Apr 29 15:00:28 2011 +0530 +Date: Fri Apr 29 15:00:28 2011 +0530 libgimpcolor: Include cairo.h in test program @@ -34977,115 +35878,115 @@ commit 856c89a84537069cb9517ba7bce15a9ede0e18a6 Author: Michael Natterer -Date: Thu Apr 28 19:59:52 2011 +0200 +Date: Thu Apr 28 19:59:52 2011 +0200 libgimp: add guards that #error out if individual files are included - libgimp/Makefile.am | 3 ++- - libgimp/gimp.h | 5 ++++- - libgimp/gimp_pdb.h | 4 ++++ - libgimp/gimp_pdb_headers.h | 4 ++++ - libgimp/gimpaspectpreview.h | 4 ++++ - libgimp/gimpbrush_pdb.h | 4 ++++ - libgimp/gimpbrushes.h | 4 ++++ - libgimp/gimpbrushes_pdb.h | 4 ++++ - libgimp/gimpbrushmenu.h | 4 ++++ - libgimp/gimpbrushselect.h | 4 ++++ - libgimp/gimpbrushselect_pdb.h | 4 ++++ + libgimp/Makefile.am | 3 ++- + libgimp/gimp.h | 5 ++++- + libgimp/gimp_pdb.h | 4 ++++ + libgimp/gimp_pdb_headers.h | 4 ++++ + libgimp/gimpaspectpreview.h | 4 ++++ + libgimp/gimpbrush_pdb.h | 4 ++++ + libgimp/gimpbrushes.h | 4 ++++ + libgimp/gimpbrushes_pdb.h | 4 ++++ + libgimp/gimpbrushmenu.h | 4 ++++ + libgimp/gimpbrushselect.h | 4 ++++ + libgimp/gimpbrushselect_pdb.h | 4 ++++ libgimp/gimpbrushselectbutton.h | 4 ++++ - libgimp/gimpbuffer_pdb.h | 4 ++++ - libgimp/gimpchannel.h | 4 ++++ - libgimp/gimpchannel_pdb.h | 4 ++++ - libgimp/gimpcolor_pdb.h | 4 ++++ - libgimp/gimpcontext_pdb.h | 4 ++++ - libgimp/gimpconvert_pdb.h | 4 ++++ - libgimp/gimpdisplay_pdb.h | 4 ++++ - libgimp/gimpdrawable.h | 4 ++++ - libgimp/gimpdrawable_pdb.h | 4 ++++ - libgimp/gimpdrawablepreview.h | 4 ++++ + libgimp/gimpbuffer_pdb.h | 4 ++++ + libgimp/gimpchannel.h | 4 ++++ + libgimp/gimpchannel_pdb.h | 4 ++++ + libgimp/gimpcolor_pdb.h | 4 ++++ + libgimp/gimpcontext_pdb.h | 4 ++++ + libgimp/gimpconvert_pdb.h | 4 ++++ + libgimp/gimpdisplay_pdb.h | 4 ++++ + libgimp/gimpdrawable.h | 4 ++++ + libgimp/gimpdrawable_pdb.h | 4 ++++ + libgimp/gimpdrawablepreview.h | 4 ++++ libgimp/gimpdrawabletransform_pdb.h | 4 ++++ - libgimp/gimpedit_pdb.h | 4 ++++ - libgimp/gimpexport.h | 4 ++++ - libgimp/gimpfileops_pdb.h | 4 ++++ - libgimp/gimpfloatingsel_pdb.h | 4 ++++ - libgimp/gimpfontmenu.h | 4 ++++ - libgimp/gimpfonts_pdb.h | 4 ++++ - libgimp/gimpfontselect.h | 4 ++++ - libgimp/gimpfontselect_pdb.h | 4 ++++ + libgimp/gimpedit_pdb.h | 4 ++++ + libgimp/gimpexport.h | 4 ++++ + libgimp/gimpfileops_pdb.h | 4 ++++ + libgimp/gimpfloatingsel_pdb.h | 4 ++++ + libgimp/gimpfontmenu.h | 4 ++++ + libgimp/gimpfonts_pdb.h | 4 ++++ + libgimp/gimpfontselect.h | 4 ++++ + libgimp/gimpfontselect_pdb.h | 4 ++++ libgimp/gimpfontselectbutton.h | 4 ++++ - libgimp/gimpgimprc.h | 4 ++++ - libgimp/gimpgimprc_pdb.h | 4 ++++ - libgimp/gimpgradient_pdb.h | 4 ++++ - libgimp/gimpgradientmenu.h | 4 ++++ - libgimp/gimpgradients.h | 4 ++++ - libgimp/gimpgradients_pdb.h | 4 ++++ - libgimp/gimpgradientselect.h | 4 ++++ + libgimp/gimpgimprc.h | 4 ++++ + libgimp/gimpgimprc_pdb.h | 4 ++++ + libgimp/gimpgradient_pdb.h | 4 ++++ + libgimp/gimpgradientmenu.h | 4 ++++ + libgimp/gimpgradients.h | 4 ++++ + libgimp/gimpgradients_pdb.h | 4 ++++ + libgimp/gimpgradientselect.h | 4 ++++ libgimp/gimpgradientselect_pdb.h | 4 ++++ libgimp/gimpgradientselectbutton.h | 4 ++++ - libgimp/gimpgrid_pdb.h | 4 ++++ - libgimp/gimpguides_pdb.h | 4 ++++ - libgimp/gimphelp_pdb.h | 4 ++++ - libgimp/gimpimage.h | 4 ++++ - libgimp/gimpimage_pdb.h | 4 ++++ - libgimp/gimpimagecombobox.h | 5 ++++- - libgimp/gimpimageselect_pdb.h | 4 ++++ - libgimp/gimpitem_pdb.h | 4 ++++ - libgimp/gimpitemcombobox.h | 5 ++++- + libgimp/gimpgrid_pdb.h | 4 ++++ + libgimp/gimpguides_pdb.h | 4 ++++ + libgimp/gimphelp_pdb.h | 4 ++++ + libgimp/gimpimage.h | 4 ++++ + libgimp/gimpimage_pdb.h | 4 ++++ + libgimp/gimpimagecombobox.h | 5 ++++- + libgimp/gimpimageselect_pdb.h | 4 ++++ + libgimp/gimpitem_pdb.h | 4 ++++ + libgimp/gimpitemcombobox.h | 5 ++++- libgimp/gimpitemtransform_pdb.h | 4 ++++ - libgimp/gimplayer.h | 4 ++++ - libgimp/gimplayer_pdb.h | 4 ++++ - libgimp/gimpmenu.h | 4 ++++ - libgimp/gimpmessage_pdb.h | 4 ++++ - libgimp/gimppainttools_pdb.h | 4 ++++ - libgimp/gimppalette.h | 4 ++++ - libgimp/gimppalette_pdb.h | 4 ++++ - libgimp/gimppalettemenu.h | 4 ++++ - libgimp/gimppalettes.h | 4 ++++ - libgimp/gimppalettes_pdb.h | 4 ++++ - libgimp/gimppaletteselect.h | 4 ++++ + libgimp/gimplayer.h | 4 ++++ + libgimp/gimplayer_pdb.h | 4 ++++ + libgimp/gimpmenu.h | 4 ++++ + libgimp/gimpmessage_pdb.h | 4 ++++ + libgimp/gimppainttools_pdb.h | 4 ++++ + libgimp/gimppalette.h | 4 ++++ + libgimp/gimppalette_pdb.h | 4 ++++ + libgimp/gimppalettemenu.h | 4 ++++ + libgimp/gimppalettes.h | 4 ++++ + libgimp/gimppalettes_pdb.h | 4 ++++ + libgimp/gimppaletteselect.h | 4 ++++ libgimp/gimppaletteselect_pdb.h | 4 ++++ libgimp/gimppaletteselectbutton.h | 4 ++++ - libgimp/gimppaths_pdb.h | 4 ++++ - libgimp/gimppattern_pdb.h | 4 ++++ - libgimp/gimppatternmenu.h | 4 ++++ - libgimp/gimppatterns.h | 4 ++++ - libgimp/gimppatterns_pdb.h | 4 ++++ - libgimp/gimppatternselect.h | 4 ++++ + libgimp/gimppaths_pdb.h | 4 ++++ + libgimp/gimppattern_pdb.h | 4 ++++ + libgimp/gimppatternmenu.h | 4 ++++ + libgimp/gimppatterns.h | 4 ++++ + libgimp/gimppatterns_pdb.h | 4 ++++ + libgimp/gimppatternselect.h | 4 ++++ libgimp/gimppatternselect_pdb.h | 4 ++++ libgimp/gimppatternselectbutton.h | 4 ++++ - libgimp/gimppixbuf.h | 5 ++++- - libgimp/gimppixelfetcher.h | 5 +++++ - libgimp/gimppixelrgn.h | 4 ++++ - libgimp/gimpplugin.h | 4 ++++ - libgimp/gimpplugin_pdb.h | 4 ++++ + libgimp/gimppixbuf.h | 5 ++++- + libgimp/gimppixelfetcher.h | 5 +++++ + libgimp/gimppixelrgn.h | 4 ++++ + libgimp/gimpplugin.h | 4 ++++ + libgimp/gimpplugin_pdb.h | 4 ++++ libgimp/gimpprocbrowserdialog.h | 4 ++++ - libgimp/gimpproceduraldb.h | 4 ++++ + libgimp/gimpproceduraldb.h | 4 ++++ libgimp/gimpproceduraldb_pdb.h | 4 ++++ - libgimp/gimpprocview.h | 4 ++++ - libgimp/gimpprogress.h | 4 ++++ - libgimp/gimpprogress_pdb.h | 4 ++++ - libgimp/gimpprogressbar.h | 4 ++++ - libgimp/gimpregioniterator.h | 4 ++++ - libgimp/gimpselectbutton.h | 4 ++++ - libgimp/gimpselection.h | 4 ++++ - libgimp/gimpselection_pdb.h | 4 ++++ + libgimp/gimpprocview.h | 4 ++++ + libgimp/gimpprogress.h | 4 ++++ + libgimp/gimpprogress_pdb.h | 4 ++++ + libgimp/gimpprogressbar.h | 4 ++++ + libgimp/gimpregioniterator.h | 4 ++++ + libgimp/gimpselectbutton.h | 4 ++++ + libgimp/gimpselection.h | 4 ++++ + libgimp/gimpselection_pdb.h | 4 ++++ libgimp/gimpselectiontools_pdb.h | 4 ++++ - libgimp/gimptextlayer_pdb.h | 4 ++++ - libgimp/gimptexttool_pdb.h | 4 ++++ - libgimp/gimptile.h | 4 ++++ + libgimp/gimptextlayer_pdb.h | 4 ++++ + libgimp/gimptexttool_pdb.h | 4 ++++ + libgimp/gimptile.h | 4 ++++ libgimp/gimptransformtools_pdb.h | 4 ++++ - libgimp/gimpui.h | 4 ++++ - libgimp/gimpundo_pdb.h | 4 ++++ - libgimp/gimpunit_pdb.h | 4 ++++ - libgimp/gimpvectors.h | 4 ++++ - libgimp/gimpvectors_pdb.h | 4 ++++ - libgimp/gimpzoompreview.h | 4 ++++ - tools/pdbgen/lib.pl | 8 ++++++++ + libgimp/gimpui.h | 4 ++++ + libgimp/gimpundo_pdb.h | 4 ++++ + libgimp/gimpunit_pdb.h | 4 ++++ + libgimp/gimpvectors.h | 4 ++++ + libgimp/gimpvectors_pdb.h | 4 ++++ + libgimp/gimpzoompreview.h | 4 ++++ + tools/pdbgen/lib.pl | 8 ++++++++ 100 files changed, 403 insertions(+), 5 deletions(-) commit 5c7660c6cce17e5cf9b018d9650272e1fbd93ac3 Author: Michael Natterer -Date: Thu Apr 28 19:58:51 2011 +0200 +Date: Thu Apr 28 19:58:51 2011 +0200 plug-ins: don't #include in bmp-read.c @@ -35094,7 +35995,7 @@ commit 2337d44018731d231768b27ee2fab16a40dbf6e7 Author: Michael Natterer -Date: Thu Apr 28 19:34:22 2011 +0200 +Date: Thu Apr 28 19:34:22 2011 +0200 libgimpbase: s/LIBGIMP_COMPILATION/GIMP_BASE_COMPILATION/ in gimpenv.* @@ -35107,7 +36008,7 @@ commit 564c124921cad21accacbaebabe59e67d3e9c43b Author: Michael Natterer -Date: Thu Apr 28 17:58:45 2011 +0200 +Date: Thu Apr 28 17:58:45 2011 +0200 devel-docs: make GimpUnitComboBox/GimpUnitStore show up properly @@ -35117,7 +36018,7 @@ commit 1de19c8b5764634e415fb93a9d00ce492f1720f4 Author: Michael Natterer -Date: Thu Apr 28 17:57:40 2011 +0200 +Date: Thu Apr 28 17:57:40 2011 +0200 libgimpwidgets: clean up class struct and add gtk-doc section comment @@ -35127,7 +36028,7 @@ commit cc47b2a6002d3dcf643899ded7bd0a47818c5983 Author: Michael Natterer -Date: Thu Apr 28 15:50:39 2011 +0200 +Date: Thu Apr 28 15:50:39 2011 +0200 libgimpwidgets/color: move the cairo color utility functions to libgimpcolor @@ -35135,120 +36036,120 @@ Add CAIRO_CFLAGS to a lot of Makefiles to make this possible, and because they pull in cairo via the libgimp headers. - app/base/Makefile.am | 1 + - app/base/color-balance.c | 1 + - app/base/colorize.c | 1 + - app/base/desaturate.c | 1 + - app/base/hue-saturation.c | 1 + - app/base/levels.c | 1 + - app/base/temp-buf.c | 1 + - app/composite/Makefile.am | 1 + - app/composite/gimp-composite-generic.c | 1 + - app/config/Makefile.am | 1 + - app/config/gimpconfig-dump.c | 1 + - app/config/gimpdisplayconfig.c | 1 + - app/config/gimpdisplayoptions.c | 1 + - app/config/gimprc-deserialize.c | 1 + - app/core/gimp-utils.c | 1 + - app/core/gimpchannel-project.c | 1 + - app/core/gimpchannel.c | 1 + - app/core/gimpcontext.c | 1 + - app/core/gimpdrawable-blend.c | 1 + - app/core/gimpdrawable-bucket-fill.c | 1 + - app/core/gimpdrawable-convert.c | 1 + - app/core/gimpdrawable-offset.c | 1 + - app/core/gimpdrawable.c | 1 + - app/core/gimpgradient-load.c | 1 + - app/core/gimpgradient.c | 1 + - app/core/gimpgrid.c | 3 +- - app/core/gimpimage-colormap.c | 1 + - app/core/gimpimage-contiguous-region.c | 1 + - app/core/gimpimage-convert.c | 1 + - app/core/gimpimage-merge.c | 1 + - app/core/gimpimage-quick-mask.c | 1 + - app/core/gimpimage.c | 1 + - app/core/gimpimageundo.c | 1 + - app/core/gimppalette-import.c | 1 + - app/core/gimppalette-load.c | 1 + - app/core/gimppalette-save.c | 1 + - app/core/gimppalette.c | 1 + - app/core/gimpparamspecs-duplicate.c | 1 + - app/core/gimppickable.c | 1 + - app/display/gimpcanvastransformpreview.c | 1 + - app/display/gimpdisplayshell-render.c | 1 + - app/gegl/Makefile.am | 1 + - app/gegl/gimpcolorbalanceconfig.c | 1 + - app/gegl/gimpcurvesconfig.c | 1 + - app/gegl/gimphuesaturationconfig.c | 1 + - app/gegl/gimplevelsconfig.c | 1 + - app/gegl/gimpoperationcagetransform.c | 1 + - app/gegl/gimpoperationcolorbalance.c | 1 + - app/gegl/gimpoperationcolorize.c | 1 + - app/gegl/gimpoperationcurves.c | 1 + - app/gegl/gimpoperationdesaturate.c | 1 + - app/gegl/gimpoperationhuesaturation.c | 1 + - app/gegl/gimpoperationlevels.c | 1 + - app/gegl/gimpoperationpointlayermode.c | 1 + - app/gegl/gimpoperationposterize.c | 1 + - app/gegl/gimpoperationthreshold.c | 1 + - app/paint-funcs/Makefile.am | 1 + - app/paint-funcs/paint-funcs.c | 1 + - app/paint/Makefile.am | 1 + - app/paint/gimpairbrush.c | 1 + - app/paint/gimperaser.c | 2 - - app/paint/gimppaintbrush.c | 1 + - app/pdb/Makefile.am | 1 + - app/pdb/channel-cmds.c | 2 + - app/pdb/context-cmds.c | 2 + - app/pdb/gimp-pdb-compat.c | 1 + - app/pdb/gimppdb.c | 1 - - app/pdb/gimpprocedure.c | 1 - - app/pdb/gradient-cmds.c | 1 + - app/pdb/grid-cmds.c | 2 + - app/pdb/image-cmds.c | 2 + - app/pdb/image-select-cmds.c | 2 + - app/pdb/palette-cmds.c | 1 + - app/pdb/palettes-cmds.c | 1 + - app/pdb/selection-tools-cmds.c | 2 + - app/pdb/text-layer-cmds.c | 2 + - app/plug-in/Makefile.am | 1 + - app/plug-in/plug-in-params.c | 1 + - app/text/gimptext-parasite.c | 1 + - app/text/gimptext.c | 2 +- - app/text/gimptextlayer.c | 6 +- - app/widgets/gimpcurveview.c | 3 +- - app/xcf/Makefile.am | 1 + - app/xcf/xcf-load.c | 1 + - app/xcf/xcf-save.c | 1 + - devel-docs/libgimpcolor/libgimpcolor-docs.sgml | 1 + + app/base/Makefile.am | 1 + + app/base/color-balance.c | 1 + + app/base/colorize.c | 1 + + app/base/desaturate.c | 1 + + app/base/hue-saturation.c | 1 + + app/base/levels.c | 1 + + app/base/temp-buf.c | 1 + + app/composite/Makefile.am | 1 + + app/composite/gimp-composite-generic.c | 1 + + app/config/Makefile.am | 1 + + app/config/gimpconfig-dump.c | 1 + + app/config/gimpdisplayconfig.c | 1 + + app/config/gimpdisplayoptions.c | 1 + + app/config/gimprc-deserialize.c | 1 + + app/core/gimp-utils.c | 1 + + app/core/gimpchannel-project.c | 1 + + app/core/gimpchannel.c | 1 + + app/core/gimpcontext.c | 1 + + app/core/gimpdrawable-blend.c | 1 + + app/core/gimpdrawable-bucket-fill.c | 1 + + app/core/gimpdrawable-convert.c | 1 + + app/core/gimpdrawable-offset.c | 1 + + app/core/gimpdrawable.c | 1 + + app/core/gimpgradient-load.c | 1 + + app/core/gimpgradient.c | 1 + + app/core/gimpgrid.c | 3 +- + app/core/gimpimage-colormap.c | 1 + + app/core/gimpimage-contiguous-region.c | 1 + + app/core/gimpimage-convert.c | 1 + + app/core/gimpimage-merge.c | 1 + + app/core/gimpimage-quick-mask.c | 1 + + app/core/gimpimage.c | 1 + + app/core/gimpimageundo.c | 1 + + app/core/gimppalette-import.c | 1 + + app/core/gimppalette-load.c | 1 + + app/core/gimppalette-save.c | 1 + + app/core/gimppalette.c | 1 + + app/core/gimpparamspecs-duplicate.c | 1 + + app/core/gimppickable.c | 1 + + app/display/gimpcanvastransformpreview.c | 1 + + app/display/gimpdisplayshell-render.c | 1 + + app/gegl/Makefile.am | 1 + + app/gegl/gimpcolorbalanceconfig.c | 1 + + app/gegl/gimpcurvesconfig.c | 1 + + app/gegl/gimphuesaturationconfig.c | 1 + + app/gegl/gimplevelsconfig.c | 1 + + app/gegl/gimpoperationcagetransform.c | 1 + + app/gegl/gimpoperationcolorbalance.c | 1 + + app/gegl/gimpoperationcolorize.c | 1 + + app/gegl/gimpoperationcurves.c | 1 + + app/gegl/gimpoperationdesaturate.c | 1 + + app/gegl/gimpoperationhuesaturation.c | 1 + + app/gegl/gimpoperationlevels.c | 1 + + app/gegl/gimpoperationpointlayermode.c | 1 + + app/gegl/gimpoperationposterize.c | 1 + + app/gegl/gimpoperationthreshold.c | 1 + + app/paint-funcs/Makefile.am | 1 + + app/paint-funcs/paint-funcs.c | 1 + + app/paint/Makefile.am | 1 + + app/paint/gimpairbrush.c | 1 + + app/paint/gimperaser.c | 2 - + app/paint/gimppaintbrush.c | 1 + + app/pdb/Makefile.am | 1 + + app/pdb/channel-cmds.c | 2 + + app/pdb/context-cmds.c | 2 + + app/pdb/gimp-pdb-compat.c | 1 + + app/pdb/gimppdb.c | 1 - + app/pdb/gimpprocedure.c | 1 - + app/pdb/gradient-cmds.c | 1 + + app/pdb/grid-cmds.c | 2 + + app/pdb/image-cmds.c | 2 + + app/pdb/image-select-cmds.c | 2 + + app/pdb/palette-cmds.c | 1 + + app/pdb/palettes-cmds.c | 1 + + app/pdb/selection-tools-cmds.c | 2 + + app/pdb/text-layer-cmds.c | 2 + + app/plug-in/Makefile.am | 1 + + app/plug-in/plug-in-params.c | 1 + + app/text/gimptext-parasite.c | 1 + + app/text/gimptext.c | 2 +- + app/text/gimptextlayer.c | 6 +- + app/widgets/gimpcurveview.c | 3 +- + app/xcf/Makefile.am | 1 + + app/xcf/xcf-load.c | 1 + + app/xcf/xcf-save.c | 1 + + devel-docs/libgimpcolor/libgimpcolor-docs.sgml | 1 + devel-docs/libgimpcolor/libgimpcolor-sections.txt | 12 ++ - .../libgimpwidgets/libgimpwidgets-sections.txt | 7 - - libgimp/gimplayer.c | 4 - - libgimpcolor/Makefile.am | 14 +- - libgimpcolor/gimpcairocolor.c | 142 + .../libgimpwidgets/libgimpwidgets-sections.txt | 7 - + libgimp/gimplayer.c | 4 - + libgimpcolor/Makefile.am | 14 +- + libgimpcolor/gimpcairocolor.c | 142 +++++++++++++++++++ - libgimpcolor/gimpcairocolor.h | 156 + libgimpcolor/gimpcairocolor.h | 156 +++++++++++++++++++++ - libgimpcolor/gimpcolor.h | 1 + - libgimpconfig/Makefile.am | 2 + - libgimpconfig/gimpcolorconfig.c | 1 + - libgimpconfig/gimpconfig-deserialize.c | 1 + - libgimpconfig/gimpconfig-serialize.c | 1 + - libgimpconfig/gimpscanner.c | 1 + - libgimpwidgets/gimpcairo-utils.c | 99 ------------- - libgimpwidgets/gimpcairo-utils.h | 133 + libgimpcolor/gimpcolor.h | 1 + + libgimpconfig/Makefile.am | 2 + + libgimpconfig/gimpcolorconfig.c | 1 + + libgimpconfig/gimpconfig-deserialize.c | 1 + + libgimpconfig/gimpconfig-serialize.c | 1 + + libgimpconfig/gimpscanner.c | 1 + + libgimpwidgets/gimpcairo-utils.c | 99 ------------- + libgimpwidgets/gimpcairo-utils.h | 133 ------------------ - modules/display-filter-color-blind.c | 1 + - modules/display-filter-gamma.c | 1 + - modules/display-filter-high-contrast.c | 1 + - modules/display-filter-proof.c | 1 + - plug-ins/pygimp/pygimpcolor.h | 1 + - tools/pdbgen/pdb.pl | 2 +- + modules/display-filter-color-blind.c | 1 + + modules/display-filter-gamma.c | 1 + + modules/display-filter-high-contrast.c | 1 + + modules/display-filter-proof.c | 1 + + plug-ins/pygimp/pygimpcolor.h | 1 + + tools/pdbgen/pdb.pl | 2 +- 106 files changed, 428 insertions(+), 257 deletions(-) commit 268930f48996d4dea01cd7a94c88bc85c6d29020 Author: Michael Natterer -Date: Thu Apr 28 14:53:49 2011 +0200 +Date: Thu Apr 28 14:53:49 2011 +0200 libgimpwidgets: gimp_pixmap_button_new, gimp_unit_menu_update -> gimpoldwidgets @@ -35256,19 +36157,19 @@ where they belog. gimp_unit_menu_update() is newly deprecated. .../libgimpwidgets/libgimpwidgets-sections.txt | 4 +- - libgimpwidgets/gimpoldwidgets.c | 96 + libgimpwidgets/gimpoldwidgets.c | 96 +++++++++++++++++++++ - libgimpwidgets/gimpoldwidgets.h | 22 +++-- - libgimpwidgets/gimppropwidgets.c | 3 + - libgimpwidgets/gimpunitmenu.c | 3 + - libgimpwidgets/gimpwidgets.c | 99 + libgimpwidgets/gimpoldwidgets.h | 22 +++-- + libgimpwidgets/gimppropwidgets.c | 3 + + libgimpwidgets/gimpunitmenu.c | 3 + + libgimpwidgets/gimpwidgets.c | 99 ---------------------- - libgimpwidgets/gimpwidgets.h | 11 --- + libgimpwidgets/gimpwidgets.h | 11 --- 7 files changed, 121 insertions(+), 117 deletions(-) commit 844df2b4dfe16395bfbfc2f83f653644783fbf96 Author: Michael Natterer -Date: Thu Apr 28 14:30:41 2011 +0200 +Date: Thu Apr 28 14:30:41 2011 +0200 libgimp*: add guards that #error out if individual files are included @@ -35280,155 +36181,155 @@ to maintain app/'s include policy that is very likely to error out if wrong things are included. - configure.ac | 4 ++++ - libgimpbase/Makefile.am | 3 ++- - libgimpbase/gimpbase.h | 2 ++ - libgimpbase/gimpchecks.h | 4 ++++ - libgimpbase/gimpcpuaccel.h | 4 ++++ - libgimpbase/gimpdatafiles.h | 4 ++++ - libgimpbase/gimpenv.h | 4 ++++ - libgimpbase/gimplimits.h | 4 ++++ - libgimpbase/gimpmemsize.h | 4 ++++ - libgimpbase/gimpparasite.h | 4 ++++ - libgimpbase/gimprectangle.h | 4 ++++ - libgimpbase/gimpunit.h | 4 ++++ - libgimpbase/gimputils.h | 4 ++++ - libgimpcolor/Makefile.am | 3 ++- + configure.ac | 4 ++++ + libgimpbase/Makefile.am | 3 ++- + libgimpbase/gimpbase.h | 2 ++ + libgimpbase/gimpchecks.h | 4 ++++ + libgimpbase/gimpcpuaccel.h | 4 ++++ + libgimpbase/gimpdatafiles.h | 4 ++++ + libgimpbase/gimpenv.h | 4 ++++ + libgimpbase/gimplimits.h | 4 ++++ + libgimpbase/gimpmemsize.h | 4 ++++ + libgimpbase/gimpparasite.h | 4 ++++ + libgimpbase/gimprectangle.h | 4 ++++ + libgimpbase/gimpunit.h | 4 ++++ + libgimpbase/gimputils.h | 4 ++++ + libgimpcolor/Makefile.am | 3 ++- libgimpcolor/gimpadaptivesupersample.h | 4 ++++ - libgimpcolor/gimpbilinear.h | 4 ++++ - libgimpcolor/gimpcmyk.h | 4 ++++ - libgimpcolor/gimpcolor.h | 2 ++ - libgimpcolor/gimpcolormanaged.h | 4 ++++ - libgimpcolor/gimpcolorspace.h | 4 ++++ - libgimpcolor/gimphsl.h | 4 ++++ - libgimpcolor/gimphsv.h | 4 ++++ - libgimpcolor/gimprgb.h | 4 ++++ - libgimpconfig/Makefile.am | 5 +++-- - libgimpconfig/gimpcolorconfig-enums.c | 2 +- - libgimpconfig/gimpcolorconfig.c | 1 + - libgimpconfig/gimpcolorconfig.h | 4 ++++ + libgimpcolor/gimpbilinear.h | 4 ++++ + libgimpcolor/gimpcmyk.h | 4 ++++ + libgimpcolor/gimpcolor.h | 2 ++ + libgimpcolor/gimpcolormanaged.h | 4 ++++ + libgimpcolor/gimpcolorspace.h | 4 ++++ + libgimpcolor/gimphsl.h | 4 ++++ + libgimpcolor/gimphsv.h | 4 ++++ + libgimpcolor/gimprgb.h | 4 ++++ + libgimpconfig/Makefile.am | 5 +++-- + libgimpconfig/gimpcolorconfig-enums.c | 2 +- + libgimpconfig/gimpcolorconfig.c | 1 + + libgimpconfig/gimpcolorconfig.h | 4 ++++ libgimpconfig/gimpconfig-deserialize.h | 4 ++++ - libgimpconfig/gimpconfig-error.h | 4 ++++ - libgimpconfig/gimpconfig-iface.h | 4 ++++ - libgimpconfig/gimpconfig-params.h | 4 ++++ - libgimpconfig/gimpconfig-path.h | 5 ++++- - libgimpconfig/gimpconfig-serialize.h | 4 ++++ - libgimpconfig/gimpconfig-utils.h | 4 ++++ - libgimpconfig/gimpconfig.h | 2 ++ - libgimpconfig/gimpconfigwriter.h | 4 ++++ - libgimpconfig/gimpscanner.h | 4 ++++ - libgimpmath/Makefile.am | 3 ++- - libgimpmath/gimpmath.h | 6 ++++++ - libgimpmath/gimpmatrix.h | 4 ++++ - libgimpmath/gimpmd5.h | 4 ++++ - libgimpmath/gimpvector.h | 4 ++++ - libgimpmodule/Makefile.am | 3 ++- - libgimpmodule/gimpmodule.h | 4 ++++ - libgimpmodule/gimpmoduledb.h | 4 ++++ - libgimpthumb/Makefile.am | 3 ++- - libgimpthumb/gimpthumb-error.h | 4 ++++ - libgimpthumb/gimpthumb-utils.h | 4 ++++ - libgimpthumb/gimpthumb.h | 5 ++++- - libgimpthumb/gimpthumbnail.h | 4 ++++ - libgimpwidgets/Makefile.am | 3 ++- - libgimpwidgets/gimpbrowser.h | 4 ++++ - libgimpwidgets/gimpbutton.h | 4 ++++ - libgimpwidgets/gimpcairo-utils.h | 4 ++++ + libgimpconfig/gimpconfig-error.h | 4 ++++ + libgimpconfig/gimpconfig-iface.h | 4 ++++ + libgimpconfig/gimpconfig-params.h | 4 ++++ + libgimpconfig/gimpconfig-path.h | 5 ++++- + libgimpconfig/gimpconfig-serialize.h | 4 ++++ + libgimpconfig/gimpconfig-utils.h | 4 ++++ + libgimpconfig/gimpconfig.h | 2 ++ + libgimpconfig/gimpconfigwriter.h | 4 ++++ + libgimpconfig/gimpscanner.h | 4 ++++ + libgimpmath/Makefile.am | 3 ++- + libgimpmath/gimpmath.h | 6 ++++++ + libgimpmath/gimpmatrix.h | 4 ++++ + libgimpmath/gimpmd5.h | 4 ++++ + libgimpmath/gimpvector.h | 4 ++++ + libgimpmodule/Makefile.am | 3 ++- + libgimpmodule/gimpmodule.h | 4 ++++ + libgimpmodule/gimpmoduledb.h | 4 ++++ + libgimpthumb/Makefile.am | 3 ++- + libgimpthumb/gimpthumb-error.h | 4 ++++ + libgimpthumb/gimpthumb-utils.h | 4 ++++ + libgimpthumb/gimpthumb.h | 5 ++++- + libgimpthumb/gimpthumbnail.h | 4 ++++ + libgimpwidgets/Makefile.am | 3 ++- + libgimpwidgets/gimpbrowser.h | 4 ++++ + libgimpwidgets/gimpbutton.h | 4 ++++ + libgimpwidgets/gimpcairo-utils.h | 4 ++++ libgimpwidgets/gimpcellrenderercolor.h | 4 ++++ libgimpwidgets/gimpcellrenderertoggle.h | 4 ++++ - libgimpwidgets/gimpchainbutton.h | 4 ++++ - libgimpwidgets/gimpcolorarea.h | 4 ++++ - libgimpwidgets/gimpcolorbutton.h | 4 ++++ - libgimpwidgets/gimpcolordisplay.h | 4 ++++ + libgimpwidgets/gimpchainbutton.h | 4 ++++ + libgimpwidgets/gimpcolorarea.h | 4 ++++ + libgimpwidgets/gimpcolorbutton.h | 4 ++++ + libgimpwidgets/gimpcolordisplay.h | 4 ++++ libgimpwidgets/gimpcolordisplaystack.h | 4 ++++ - libgimpwidgets/gimpcolorhexentry.h | 4 ++++ - libgimpwidgets/gimpcolornotebook.h | 4 ++++ + libgimpwidgets/gimpcolorhexentry.h | 4 ++++ + libgimpwidgets/gimpcolornotebook.h | 4 ++++ libgimpwidgets/gimpcolorprofilecombobox.h | 4 ++++ libgimpwidgets/gimpcolorprofilestore.h | 4 ++++ - libgimpwidgets/gimpcolorscale.h | 7 +++---- - libgimpwidgets/gimpcolorscales.h | 4 ++++ - libgimpwidgets/gimpcolorselection.h | 4 ++++ - libgimpwidgets/gimpcolorselector.h | 4 ++++ - libgimpwidgets/gimpdialog.h | 4 ++++ - libgimpwidgets/gimpenumcombobox.h | 4 ++++ - libgimpwidgets/gimpenumlabel.h | 6 ++++++ - libgimpwidgets/gimpenumstore.h | 5 +++++ - libgimpwidgets/gimpenumwidgets.h | 6 ++++++ - libgimpwidgets/gimpfileentry.h | 4 ++++ - libgimpwidgets/gimpframe.h | 4 ++++ - libgimpwidgets/gimphelpui.h | 4 ++++ - libgimpwidgets/gimphintbox.h | 4 ++++ - libgimpwidgets/gimpintcombobox.h | 4 ++++ - libgimpwidgets/gimpintstore.h | 4 ++++ - libgimpwidgets/gimpmemsizeentry.h | 4 ++++ - libgimpwidgets/gimpnumberpairentry.h | 4 ++++ - libgimpwidgets/gimpoffsetarea.h | 4 ++++ - libgimpwidgets/gimpoldwidgets.h | 14 +++++++++----- - libgimpwidgets/gimppageselector.h | 4 ++++ - libgimpwidgets/gimppatheditor.h | 4 ++++ - libgimpwidgets/gimppickbutton.h | 4 ++++ - libgimpwidgets/gimppixmap.h | 4 ++++ - libgimpwidgets/gimppreview.h | 4 ++++ - libgimpwidgets/gimppreviewarea.h | 4 ++++ - libgimpwidgets/gimppropwidgets.h | 4 ++++ - libgimpwidgets/gimpquerybox.h | 4 ++++ - libgimpwidgets/gimpruler.h | 4 ++++ - libgimpwidgets/gimpscaleentry.h | 4 ++++ - libgimpwidgets/gimpscrolledpreview.h | 4 ++++ - libgimpwidgets/gimpsizeentry.h | 4 ++++ - libgimpwidgets/gimpstock.h | 4 ++++ - libgimpwidgets/gimpstringcombobox.h | 4 ++++ - libgimpwidgets/gimpunitcombobox.h | 8 ++++++++ - libgimpwidgets/gimpunitmenu.h | 4 ++++ - libgimpwidgets/gimpunitstore.h | 8 ++++++++ - libgimpwidgets/gimpwidgets-error.h | 4 ++++ - libgimpwidgets/gimpwidgets.h | 2 ++ - libgimpwidgets/gimpzoommodel.h | 4 ++++ + libgimpwidgets/gimpcolorscale.h | 7 +++---- + libgimpwidgets/gimpcolorscales.h | 4 ++++ + libgimpwidgets/gimpcolorselection.h | 4 ++++ + libgimpwidgets/gimpcolorselector.h | 4 ++++ + libgimpwidgets/gimpdialog.h | 4 ++++ + libgimpwidgets/gimpenumcombobox.h | 4 ++++ + libgimpwidgets/gimpenumlabel.h | 6 ++++++ + libgimpwidgets/gimpenumstore.h | 5 +++++ + libgimpwidgets/gimpenumwidgets.h | 6 ++++++ + libgimpwidgets/gimpfileentry.h | 4 ++++ + libgimpwidgets/gimpframe.h | 4 ++++ + libgimpwidgets/gimphelpui.h | 4 ++++ + libgimpwidgets/gimphintbox.h | 4 ++++ + libgimpwidgets/gimpintcombobox.h | 4 ++++ + libgimpwidgets/gimpintstore.h | 4 ++++ + libgimpwidgets/gimpmemsizeentry.h | 4 ++++ + libgimpwidgets/gimpnumberpairentry.h | 4 ++++ + libgimpwidgets/gimpoffsetarea.h | 4 ++++ + libgimpwidgets/gimpoldwidgets.h | 14 +++++++++----- + libgimpwidgets/gimppageselector.h | 4 ++++ + libgimpwidgets/gimppatheditor.h | 4 ++++ + libgimpwidgets/gimppickbutton.h | 4 ++++ + libgimpwidgets/gimppixmap.h | 4 ++++ + libgimpwidgets/gimppreview.h | 4 ++++ + libgimpwidgets/gimppreviewarea.h | 4 ++++ + libgimpwidgets/gimppropwidgets.h | 4 ++++ + libgimpwidgets/gimpquerybox.h | 4 ++++ + libgimpwidgets/gimpruler.h | 4 ++++ + libgimpwidgets/gimpscaleentry.h | 4 ++++ + libgimpwidgets/gimpscrolledpreview.h | 4 ++++ + libgimpwidgets/gimpsizeentry.h | 4 ++++ + libgimpwidgets/gimpstock.h | 4 ++++ + libgimpwidgets/gimpstringcombobox.h | 4 ++++ + libgimpwidgets/gimpunitcombobox.h | 8 ++++++++ + libgimpwidgets/gimpunitmenu.h | 4 ++++ + libgimpwidgets/gimpunitstore.h | 8 ++++++++ + libgimpwidgets/gimpwidgets-error.h | 4 ++++ + libgimpwidgets/gimpwidgets.h | 2 ++ + libgimpwidgets/gimpzoommodel.h | 4 ++++ 104 files changed, 408 insertions(+), 20 deletions(-) commit ee03177be8e9b40c4baa781320b63fc6f261f91e Author: Michael Natterer -Date: Thu Apr 28 14:24:59 2011 +0200 +Date: Thu Apr 28 14:24:59 2011 +0200 libgimp: don't include individual files from libgimp* - libgimp/gimpaspectpreview.h | 2 -- - libgimp/gimpdrawablepreview.h | 2 -- - libgimp/gimplayer.c | 2 ++ + libgimp/gimpaspectpreview.h | 2 -- + libgimp/gimpdrawablepreview.h | 2 -- + libgimp/gimplayer.c | 2 ++ libgimp/gimpprocbrowserdialog.h | 2 -- - libgimp/gimpzoompreview.h | 2 -- + libgimp/gimpzoompreview.h | 2 -- 5 files changed, 2 insertions(+), 8 deletions(-) commit 2af539020ba188555772d6bb4190bd6d6dbbc267 Author: Michael Natterer -Date: Thu Apr 28 14:23:33 2011 +0200 +Date: Thu Apr 28 14:23:33 2011 +0200 app: don't include individual files from libgimp* - app/base/levels.c | 4 +--- - app/core/core-types.h | 1 - - app/paint/gimpperspectiveclone.h | 1 - - app/text/gimptext.h | 1 - - app/text/gimptextlayer-transform.c | 2 ++ - app/text/gimptextlayer.c | 5 ++++- - app/tools/gimpperspectiveclonetool.c | 1 + - app/tools/gimpperspectivetool.c | 1 + - app/tools/gimpsheartool.c | 1 + - app/tools/gimptransformtool.h | 1 - - app/widgets/gimpcolorpanel.c | 1 + - app/widgets/gimpcolorpanel.h | 3 --- + app/base/levels.c | 4 +--- + app/core/core-types.h | 1 - + app/paint/gimpperspectiveclone.h | 1 - + app/text/gimptext.h | 1 - + app/text/gimptextlayer-transform.c | 2 ++ + app/text/gimptextlayer.c | 5 ++++- + app/tools/gimpperspectiveclonetool.c | 1 + + app/tools/gimpperspectivetool.c | 1 + + app/tools/gimpsheartool.c | 1 + + app/tools/gimptransformtool.h | 1 - + app/widgets/gimpcolorpanel.c | 1 + + app/widgets/gimpcolorpanel.h | 3 --- app/widgets/gimpcolorselectorpalette.h | 3 --- - app/widgets/gimpiconpicker.c | 2 ++ - app/widgets/gimpmessagebox.c | 2 +- - app/widgets/gimppdbdialog.h | 2 -- - app/widgets/gimpprogressdialog.h | 6 ------ - app/widgets/gimpviewablebutton.h | 5 ----- - app/widgets/gimpviewabledialog.h | 2 -- + app/widgets/gimpiconpicker.c | 2 ++ + app/widgets/gimpmessagebox.c | 2 +- + app/widgets/gimppdbdialog.h | 2 -- + app/widgets/gimpprogressdialog.h | 6 ------ + app/widgets/gimpviewablebutton.h | 5 ----- + app/widgets/gimpviewabledialog.h | 2 -- 19 files changed, 14 insertions(+), 30 deletions(-) commit b2aad5ef14be0828a56756b492b4018635551d48 Author: Michael Natterer -Date: Thu Apr 28 13:25:25 2011 +0200 +Date: Thu Apr 28 13:25:25 2011 +0200 libgimpmath: move the GipmVector and GimpMatrix structs to gimpmathtypes.h @@ -35445,27 +36346,27 @@ commit 3d7e51c52f16aabd148537b94957877423fce34d Author: Michael Natterer -Date: Thu Apr 28 13:09:30 2011 +0200 +Date: Thu Apr 28 13:09:30 2011 +0200 libgimp: #include "libgimpbase/gimpbase.h" instead of individual files - libgimp/gimp.c | 5 +---- + libgimp/gimp.c | 5 +---- libgimp/gimpunitcache.c | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) commit 8364672b1181e7edb34e2efcbc59605f4f3b35aa Author: Michael Natterer -Date: Thu Apr 28 12:47:38 2011 +0200 +Date: Thu Apr 28 12:47:38 2011 +0200 tools: #include "libgimpbase/gimpbase.h" and not just gimpversion.h - tools/gimptool.c | 4 ++-- + tools/gimptool.c | 4 ++-- tools/test-clipboard.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit 81911a7b0260a64dc8bda69f6440441f69041fb4 Author: Michael Natterer -Date: Thu Apr 28 01:59:38 2011 +0200 +Date: Thu Apr 28 01:59:38 2011 +0200 app: allow to drop buffers and components to empty displays @@ -35476,7 +36377,7 @@ commit 10b4155b9585439e7e2467af9d3b892bc2da96ea Author: Michael Natterer -Date: Thu Apr 28 01:56:37 2011 +0200 +Date: Thu Apr 28 01:56:37 2011 +0200 app: never make Edit -> Buffers -> Paste Named insensitive @@ -35488,7 +36389,7 @@ commit 69d3aa5b36a2bd451da816fd1bb7c5f2a2e15ee9 Author: Michael Natterer -Date: Thu Apr 28 01:44:48 2011 +0200 +Date: Thu Apr 28 01:44:48 2011 +0200 Bug 648820 - drag and drop grayscale/greyscale image causes image corruption @@ -35501,7 +36402,7 @@ commit 92ce59e1c1846bdc15d7136fc5e3e72bb5b76232 Author: Michael Natterer -Date: Thu Apr 28 01:27:04 2011 +0200 +Date: Thu Apr 28 01:27:04 2011 +0200 app: gimp_layer_new_from_pixbuf(): refuse to create layers of wrong type @@ -35511,7 +36412,7 @@ commit b05555e0bac69afe96d9a5e82802e96e411f2e3c Author: Martin Srebotnjak -Date: Wed Apr 27 19:47:26 2011 +0200 +Date: Wed Apr 27 19:47:26 2011 +0200 Updated Slovenian translation @@ -35521,7 +36422,7 @@ commit 7f635464b0c41fce1a5709997a7116c8f93f95dc Author: Mukund Sivaraman -Date: Wed Apr 27 21:12:40 2011 +0530 +Date: Wed Apr 27 21:12:40 2011 +0530 imagemap: Rebuild scanners @@ -35533,7 +36434,7 @@ commit 56f08d682bc055d4c94a7d6607b7a7fed6edfe35 Author: Mukund Sivaraman -Date: Wed Apr 27 21:11:57 2011 +0530 +Date: Wed Apr 27 21:11:57 2011 +0530 imagemap: Add lexer options to not generate input and yyunput @@ -35544,7 +36445,7 @@ commit 6877a14caf7a4e430384cb9ca66f0585a76a47f2 Author: Mukund Sivaraman -Date: Wed Apr 27 20:35:56 2011 +0530 +Date: Wed Apr 27 20:35:56 2011 +0530 Fix gtk-doc for gimp_layer_new_from_surface() @@ -35553,7 +36454,7 @@ commit 7c879dfa99b29369bd6d01a198a86b95ae2288d3 Author: Mukund Sivaraman -Date: Wed Apr 27 06:10:14 2011 +0530 +Date: Wed Apr 27 06:10:14 2011 +0530 libgimpwidgets: Add back gtk-doc comment for @stack @@ -35562,7 +36463,7 @@ commit 8868a044ea266618e06c984e5ac500db59f0c1cf Author: Mukund Sivaraman -Date: Tue Apr 26 15:19:43 2011 +0530 +Date: Tue Apr 26 15:19:43 2011 +0530 file-mng: Rename more variables @@ -35571,7 +36472,7 @@ commit c6a60d79c451f9f13825443fc1836f2fbd492c51 Author: Mukund Sivaraman -Date: Tue Apr 26 15:18:45 2011 +0530 +Date: Tue Apr 26 15:18:45 2011 +0530 file-mng: Don't access inside PNG structs directly @@ -35581,7 +36482,7 @@ commit 5b5d88a2f1d9f0e37d07b24148f76a14d0f2789b Author: Mukund Sivaraman -Date: Tue Apr 26 15:18:27 2011 +0530 +Date: Tue Apr 26 15:18:27 2011 +0530 file-png: Get num_colors properly before passing it on @@ -35590,7 +36491,7 @@ commit 838ba0b78e6c2a1d60a00da52c89f6bc5ddd5385 Author: Mukund Sivaraman -Date: Tue Apr 26 15:00:07 2011 +0530 +Date: Tue Apr 26 15:00:07 2011 +0530 file-mng: Rename variables @@ -35600,7 +36501,7 @@ commit 92684a25e95ce3da7954140b6f88f2cbfe3cd62d Author: Mukund Sivaraman -Date: Tue Apr 26 08:06:27 2011 +0530 +Date: Tue Apr 26 08:06:27 2011 +0530 file-png: Don't access inside PNG structs directly (contd.) @@ -35610,7 +36511,7 @@ commit 4c26f37611fab83e61fd8575f21d46def755a9f7 Author: Mukund Sivaraman -Date: Tue Apr 26 06:49:21 2011 +0530 +Date: Tue Apr 26 06:49:21 2011 +0530 Add additional libpng warning flags @@ -35623,7 +36524,7 @@ commit be78ba448f47d172e87b491df85de38bc86f0e9c Author: Mukund Sivaraman -Date: Mon Apr 25 21:03:12 2011 +0530 +Date: Mon Apr 25 21:03:12 2011 +0530 file-xmc: Flush each drawable @@ -35632,7 +36533,7 @@ commit a1c7606d51541ba0a99f556de90d3f79d1a2ca00 Author: Mukund Sivaraman -Date: Mon Apr 25 20:12:54 2011 +0530 +Date: Mon Apr 25 20:12:54 2011 +0530 file-png: Conditionally declare text_length @@ -35641,7 +36542,7 @@ commit f610aa4375213d556bc6881ce00fecbb67d50aec Author: Mukund Sivaraman -Date: Mon Apr 25 20:09:15 2011 +0530 +Date: Mon Apr 25 20:09:15 2011 +0530 file-png: Don't access inside PNG structs directly @@ -35651,7 +36552,7 @@ commit e75cfd044a579bcc2c6290092b787e0135e84331 Author: Martin Nordholts -Date: Mon Apr 25 16:03:10 2011 +0200 +Date: Mon Apr 25 16:03:10 2011 +0200 app: Sort core/.gitignore @@ -35660,7 +36561,7 @@ commit 4f96dd311e1549b1b08f6aeb34be85aa49e3d4f7 Author: Mukund Sivaraman -Date: Mon Apr 25 19:35:35 2011 +0530 +Date: Mon Apr 25 19:35:35 2011 +0530 libgimpwidgets: Remove incorrect gtk-doc @@ -35669,7 +36570,7 @@ commit d04efe3a03179f2d64d4e38bc3aef927520aa8e3 Author: Mukund Sivaraman -Date: Mon Apr 25 19:34:02 2011 +0530 +Date: Mon Apr 25 19:34:02 2011 +0530 libappwidgets: Initialize arrays before use @@ -35678,7 +36579,7 @@ commit 27db4d9fc07f4d9329a502cf38265dc63da01a72 Author: Mukund Sivaraman -Date: Mon Apr 25 19:32:08 2011 +0530 +Date: Mon Apr 25 19:32:08 2011 +0530 libgimpwidgets: Fix typo in array index @@ -35687,7 +36588,7 @@ commit a31d8dab793ed594eb024ca4090878d0142e9e46 Author: Mukund Sivaraman -Date: Mon Apr 25 19:29:55 2011 +0530 +Date: Mon Apr 25 19:29:55 2011 +0530 Revert "libgimpwidgets: Don't use light[3] and dark[3] as they're both uninitialized" @@ -35699,7 +36600,7 @@ commit cdb66ccbdc6d14dcf2c451b20648b52bf41efea9 Author: Mukund Sivaraman -Date: Mon Apr 25 19:19:25 2011 +0530 +Date: Mon Apr 25 19:19:25 2011 +0530 app: Reformat dirty protos @@ -35709,7 +36610,7 @@ commit 54e2d5fb6831cb15e45d83bdcd3f13ba5afdf85c Author: Mukund Sivaraman -Date: Mon Apr 25 19:16:28 2011 +0530 +Date: Mon Apr 25 19:16:28 2011 +0530 app: Use a properly typed callback function @@ -35721,7 +36622,7 @@ commit 10b37cbcaac6be60cf176fa3808b62033894606f Author: Mukund Sivaraman -Date: Mon Apr 25 19:10:04 2011 +0530 +Date: Mon Apr 25 19:10:04 2011 +0530 app: Remove unused variables @@ -35730,27 +36631,27 @@ commit d8a98bf7b363035ba28d23e491da5ea46a5693dd Author: Mukund Sivaraman -Date: Mon Apr 25 14:30:58 2011 +0530 +Date: Mon Apr 25 14:30:58 2011 +0530 imagemap: Rebuild parsers plug-ins/imagemap/imap_cern_lex.c | 1668 +++++++++++++++++----------------- - plug-ins/imagemap/imap_cern_parse.c | 900 +++++++++--------- - plug-ins/imagemap/imap_cern_parse.h | 43 +- + plug-ins/imagemap/imap_cern_parse.c | 900 +++++++++--------- + plug-ins/imagemap/imap_cern_parse.h | 43 +- plug-ins/imagemap/imap_csim_lex.c | 1718 +++++++++++++++++------------------ plug-ins/imagemap/imap_csim_parse.c | 1159 ++++++++++++----------- - plug-ins/imagemap/imap_csim_parse.h | 43 +- + plug-ins/imagemap/imap_csim_parse.h | 43 +- plug-ins/imagemap/imap_ncsa_lex.c | 1702 +++++++++++++++++----------------- - plug-ins/imagemap/imap_ncsa_parse.c | 919 ++++++++++--------- - plug-ins/imagemap/imap_ncsa_parse.h | 43 +- + plug-ins/imagemap/imap_ncsa_parse.c | 919 ++++++++++--------- + plug-ins/imagemap/imap_ncsa_parse.h | 43 +- 9 files changed, 4158 insertions(+), 4037 deletions(-) commit 58002ed20e30611a1001fca6ac30e286b82a8224 Author: Mukund Sivaraman -Date: Sat Apr 23 07:02:02 2011 +0530 +Date: Sat Apr 23 07:02:02 2011 +0530 imagemap: Fix protos @@ -35761,7 +36662,7 @@ commit d272159194babed24a3cb3156eecf79e87b4ff96 Author: Michael Natterer -Date: Tue Oct 19 13:46:31 2010 +0200 +Date: Tue Oct 19 13:46:31 2010 +0200 libgimpwidgets: use gdk_cairo_set_source_window() instead of source_pixmap() @@ -35771,7 +36672,7 @@ commit 1f78e8e0c6a3172b16b091c93978083763c2f796 Author: Michael Natterer -Date: Fri Apr 22 00:06:22 2011 +0200 +Date: Fri Apr 22 00:06:22 2011 +0200 plug-ins: screenshot: don't pass NULL to gdk_keymap_get_entries_for_keyval() @@ -35784,7 +36685,7 @@ commit be642b1e14d6f11963dcf20540fffe43d25741c8 Author: Michael Natterer -Date: Thu Apr 21 21:09:32 2011 +0200 +Date: Thu Apr 21 21:09:32 2011 +0200 plug-ins: screenshot: use Cairo to make the screenshot @@ -35796,7 +36697,7 @@ commit 1616151b0e8935e4f90e238e96ea001028dee737 Author: Michael Natterer -Date: Thu Apr 21 21:07:50 2011 +0200 +Date: Thu Apr 21 21:07:50 2011 +0200 libgimp: remove opacity and mode parameters from gimp_layer_new_from_surface() @@ -35804,14 +36705,14 @@ They are passed as default values in almost all cases, and can simply be set later if needed. - libgimp/gimplayer.c | 6 +----- - libgimp/gimplayer.h | 2 -- + libgimp/gimplayer.c | 6 +----- + libgimp/gimplayer.h | 2 -- plug-ins/common/file-pdf-load.c | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) commit 4988a972572a90f719984b91870e560e9cb5120c Author: Martin Nordholts -Date: Thu Apr 21 19:56:42 2011 +0200 +Date: Thu Apr 21 19:56:42 2011 +0200 app: Add gimp_dock_set_id() @@ -35821,7 +36722,7 @@ commit c84d26667b2aea8f72957b7734efdd7ae06ac866 Author: Martin Nordholts -Date: Wed Apr 20 21:46:17 2011 +0200 +Date: Wed Apr 20 21:46:17 2011 +0200 app: Add missing gimp_dock_get_id() implementation @@ -35830,7 +36731,7 @@ commit f75f61779c0415e30c941da2b6a6a4001d03e1f0 Author: Martin Nordholts -Date: Wed Apr 20 07:46:56 2011 +0200 +Date: Wed Apr 20 07:46:56 2011 +0200 app: GimpSessionInfoDock::identifier -> dock_type @@ -35841,12 +36742,12 @@ app/widgets/gimpsessioninfo-dock.c | 18 +++++++++--------- app/widgets/gimpsessioninfo-dock.h | 10 ++++++---- - app/widgets/gimpsessioninfo.c | 14 +++++++------- + app/widgets/gimpsessioninfo.c | 14 +++++++------- 3 files changed, 22 insertions(+), 20 deletions(-) commit b18d63800042fe23ba6ac50aae630bd3a2810f90 Author: Alexandre Prokoudine -Date: Thu Apr 21 15:28:05 2011 +0400 +Date: Thu Apr 21 15:28:05 2011 +0400 More tooltips for tools options @@ -35854,14 +36755,14 @@ text tool and Bucket Fill tool. app/tools/gimpbucketfilloptions.c | 9 ++++++--- - app/tools/gimpflipoptions.c | 3 ++- - app/tools/gimptextoptions.c | 12 ++++++++---- + app/tools/gimpflipoptions.c | 3 ++- + app/tools/gimptextoptions.c | 12 ++++++++---- app/tools/gimptransformoptions.c | 26 +++++++++++++++++--------- 4 files changed, 33 insertions(+), 17 deletions(-) commit 1cd5ab7356cc54281333d0106f3346021d303ae6 Author: Christian Kirbach -Date: Thu Apr 21 13:02:56 2011 +0200 +Date: Thu Apr 21 13:02:56 2011 +0200 [l10n] Updated German translation @@ -35871,7 +36772,7 @@ commit a0ff9810412ef7e9ee9f9d0325adf93601270f75 Author: Mukund Sivaraman -Date: Thu Apr 21 14:22:13 2011 +0530 +Date: Thu Apr 21 14:22:13 2011 +0530 libgimpwidgets: Don't use light[3] and dark[3] as they're both uninitialized @@ -35883,7 +36784,7 @@ commit aaea0805e124a73008f7ec2d621f94e954996759 Author: Mukund Sivaraman -Date: Thu Apr 21 14:08:36 2011 +0530 +Date: Thu Apr 21 14:08:36 2011 +0530 app: Initialize orig_tiles to NULL for GIMP_TRANSFORM_TYPE_PATH case @@ -35892,7 +36793,7 @@ commit e999122e0b20b6ccd6bde3ce039bb64068fc0019 Author: Mukund Sivaraman -Date: Thu Apr 21 13:57:13 2011 +0530 +Date: Thu Apr 21 13:57:13 2011 +0530 file-pdf-load: Update attribution, removing bogus copyright @@ -35901,7 +36802,7 @@ commit dcd447f5836529ab8503db7d542dabc13e2876dc Author: Mukund Sivaraman -Date: Thu Apr 21 11:08:29 2011 +0530 +Date: Thu Apr 21 11:08:29 2011 +0530 map-object: Fix aliasing warnings @@ -35910,7 +36811,7 @@ commit 36ccc9292d31e3f761c094689b5a940edf0ef061 Author: Mukund Sivaraman -Date: Thu Apr 21 10:57:03 2011 +0530 +Date: Thu Apr 21 10:57:03 2011 +0530 ifs-compose: Don't use deprecated gtk_range_set_update_policy() @@ -35920,7 +36821,7 @@ commit 7bdadd80ba479d6ff904e276d805e16f6b940ee2 Author: Mukund Sivaraman -Date: Thu Apr 21 07:48:25 2011 +0530 +Date: Thu Apr 21 07:48:25 2011 +0530 file-pdf-load: Use better API + cleanups @@ -35934,20 +36835,20 @@ commit 79f29530bdc61c4cfecfe81314a8dc8616a8b4bd Author: Mukund Sivaraman -Date: Thu Apr 21 06:55:21 2011 +0530 +Date: Thu Apr 21 06:55:21 2011 +0530 Bump poppler required version to 0.12.4 The calls that return cairo surfaces are now required, so the version bump is required. - configure.ac | 2 +- + configure.ac | 2 +- plug-ins/common/file-pdf-load.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) commit 58016e0a02d982c4e8e2b1779d7a98310e6b6c43 Author: Alexandre Prokoudine -Date: Thu Apr 21 02:41:59 2011 +0400 +Date: Thu Apr 21 02:41:59 2011 +0400 More tooltips for tools options @@ -35958,41 +36859,41 @@ Changed a bunch of _() to N_() in Foreground Select tool's options as per agreement with mitch. - app/tools/gimpalignoptions.c | 9 ++++++--- - app/tools/gimpcolorpickeroptions.c | 11 ++++++++--- - app/tools/gimpcropoptions.c | 10 +++++++--- + app/tools/gimpalignoptions.c | 9 ++++++--- + app/tools/gimpcolorpickeroptions.c | 11 ++++++++--- + app/tools/gimpcropoptions.c | 10 +++++++--- app/tools/gimpforegroundselectoptions.c | 19 +++++++++++-------- - app/tools/gimpiscissorsoptions.c | 4 +++- - app/tools/gimpmagnifyoptions.c | 7 +++++-- - app/tools/gimpmeasureoptions.c | 4 +++- + app/tools/gimpiscissorsoptions.c | 4 +++- + app/tools/gimpmagnifyoptions.c | 7 +++++-- + app/tools/gimpmeasureoptions.c | 4 +++- 7 files changed, 43 insertions(+), 21 deletions(-) commit 374dd50c43cca559a4888224f8fd6322fb26115d Author: Michael Natterer -Date: Wed Apr 20 23:58:00 2011 +0200 +Date: Wed Apr 20 23:58:00 2011 +0200 libgimp: add gimp_layer_new_from_surface() and to enable that, make libgimp depend on Cairo. - configure.ac | 6 +- + configure.ac | 6 +- devel-docs/libgimp/libgimp-sections.txt | 1 + - gimp.pc.in | 2 +- - libgimp/Makefile.am | 1 + - libgimp/gimp.def | 1 + - libgimp/gimp.h | 1 + - libgimp/gimplayer.c | 157 + gimp.pc.in | 2 +- + libgimp/Makefile.am | 1 + + libgimp/gimp.def | 1 + + libgimp/gimp.h | 1 + + libgimp/gimplayer.c | 157 ++++++++++++++++++++++++++++++++ - libgimp/gimplayer.h | 7 ++ - plug-ins/common/Makefile.am | 20 ++++ - plug-ins/common/mkgen.pl | 2 +- - plug-ins/file-faxg3/Makefile.am | 2 + - plug-ins/help/Makefile.am | 2 + + libgimp/gimplayer.h | 7 ++ + plug-ins/common/Makefile.am | 20 ++++ + plug-ins/common/mkgen.pl | 2 +- + plug-ins/file-faxg3/Makefile.am | 2 + + plug-ins/help/Makefile.am | 2 + 12 files changed, 198 insertions(+), 4 deletions(-) commit bdc08aae83180a6f56e0cfe6c35e888302cef7cb Author: Michael Natterer -Date: Wed Apr 20 23:54:32 2011 +0200 +Date: Wed Apr 20 23:54:32 2011 +0200 libgimp: move pixbuf functions from gimpui.def to gimp.def @@ -36002,7 +36903,7 @@ commit 058c0b2a0ddce7551241d725fc9f50695c47fa96 Author: Michael Natterer -Date: Wed Apr 20 23:38:49 2011 +0200 +Date: Wed Apr 20 23:38:49 2011 +0200 libgimp: s/GLIB_CFLAGS/GDK_PIXBUF_CFLAGS/ for libgimp in Makefile.am @@ -36013,7 +36914,7 @@ commit 27d312b11025f9184d72b7d3da4508e7886072af Author: Michael Natterer -Date: Wed Apr 20 22:19:09 2011 +0200 +Date: Wed Apr 20 22:19:09 2011 +0200 app: call gimp_tool_control_halt() early in transform_tool_button_release() @@ -36027,23 +36928,23 @@ commit c5b44f6bd034544a20ec3d0ae6b8e352fe830e1f Author: Alexandre Prokoudine -Date: Thu Apr 21 00:17:31 2011 +0400 +Date: Thu Apr 21 00:17:31 2011 +0400 More tooltips for tools options Added previously missing tooltips for rectangular and region selection based tools. - app/tools/gimprectangleoptions.c | 44 + app/tools/gimprectangleoptions.c | 44 +++++++++++++++++++++++----------- app/tools/gimprectangleselectoptions.c | 9 ++++--- - app/tools/gimpregionselectoptions.c | 3 ++- - app/tools/gimpselectionoptions.c | 6 +++-- + app/tools/gimpregionselectoptions.c | 3 ++- + app/tools/gimpselectionoptions.c | 6 +++-- 4 files changed, 42 insertions(+), 20 deletions(-) commit 6354bc6ea199a5d04c19e20787d5dc654b632c45 Author: 神州散人 -Date: Thu Apr 21 03:09:04 2011 +0800 +Date: Thu Apr 21 03:09:04 2011 +0800 update zh_CN translation of plugins @@ -36053,7 +36954,7 @@ commit 2068498b5c9f51ba4224bf394221281294a915b4 Author: Alexia Death -Date: Wed Apr 20 22:00:35 2011 +0300 +Date: Wed Apr 20 22:00:35 2011 +0300 app: fix a bug with smooth affecting spacing @@ -36062,7 +36963,7 @@ commit 316c9fdd457940f0828ed188ed168d84999dd972 Author: Alexandre Prokoudine -Date: Wed Apr 20 22:45:16 2011 +0400 +Date: Wed Apr 20 22:45:16 2011 +0400 Reworded the Increment's tooltip @@ -36074,7 +36975,7 @@ commit c406aad20896581a96365e289a4262b462f1a122 Author: YunQiang Su -Date: Thu Apr 21 02:32:51 2011 +0800 +Date: Thu Apr 21 02:32:51 2011 +0800 update zh_CN translation script-fu @@ -36084,7 +36985,7 @@ commit 3eee39c8fbe70a947b51a15795860399de180d91 Author: Alexandre Prokoudine -Date: Wed Apr 20 22:24:19 2011 +0400 +Date: Wed Apr 20 22:24:19 2011 +0400 Terminology fixes and missing tooltips @@ -36092,13 +36993,13 @@ and the options themselves now have tooltips that had been missing. - app/paint/gimppaintoptions.c | 20 ++++++++++---------- + app/paint/gimppaintoptions.c | 20 ++++++++++---------- app/tools/gimppaintoptions-gui.c | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) commit 4a8fa1ab2a0284beff3fd83c531711c36585cd70 Author: Michael Natterer -Date: Wed Apr 20 20:12:21 2011 +0200 +Date: Wed Apr 20 20:12:21 2011 +0200 app: make GimpSpinScale RTL aware @@ -36108,7 +37009,7 @@ commit 26bf2b0cd733a7dc1187a205f69f8c0da8e39867 Author: Michael Natterer -Date: Wed Apr 20 20:04:35 2011 +0200 +Date: Wed Apr 20 20:04:35 2011 +0200 Make libgimp depend on GdkPixbuf @@ -36117,43 +37018,43 @@ it belongs. Change gimp-2.0.pc accordingly, adapt plug-in Makefiles and update devel-docs. - configure.ac | 2 + - devel-docs/libgimp/libgimp-docs.sgml | 2 +- + configure.ac | 2 + + devel-docs/libgimp/libgimp-docs.sgml | 2 +- devel-docs/libgimp/libgimp-sections.txt | 2 +- - gimp.pc.in | 2 +- - libgimp/Makefile.am | 4 +- - libgimp/gimp.h | 3 +- - libgimp/gimplayer.c | 116 + gimp.pc.in | 2 +- + libgimp/Makefile.am | 4 +- + libgimp/gimp.h | 3 +- + libgimp/gimplayer.c | 116 +++++++++++++++++++++++++++++++ - libgimp/gimplayer.h | 8 +++ - libgimp/gimppixbuf.c | 118 + libgimp/gimplayer.h | 8 +++ + libgimp/gimppixbuf.c | 118 -------------------------------- - libgimp/gimppixbuf.h | 9 --- - libgimp/gimpui.h | 1 - - plug-ins/common/Makefile.am | 40 +++++------ - plug-ins/common/mkgen.pl | 6 +- - plug-ins/file-faxg3/Makefile.am | 6 +- - plug-ins/help/Makefile.am | 6 +- + libgimp/gimppixbuf.h | 9 --- + libgimp/gimpui.h | 1 - + plug-ins/common/Makefile.am | 40 +++++------ + plug-ins/common/mkgen.pl | 6 +- + plug-ins/file-faxg3/Makefile.am | 6 +- + plug-ins/help/Makefile.am | 6 +- 15 files changed, 163 insertions(+), 162 deletions(-) commit 5d771014d40d4c5bff8813aea004235931f5d759 Author: Michael Muré -Date: Wed Apr 20 18:40:13 2011 +0200 +Date: Wed Apr 20 18:40:13 2011 +0200 GimpCageConfig: use a GArray to store cage's point, to make easier further improvement - app/gegl/gimpcageconfig.c | 314 + app/gegl/gimpcageconfig.c | 314 ++++++++++++++++++++-------------- - app/gegl/gimpcageconfig.h | 8 +- + app/gegl/gimpcageconfig.h | 8 +- app/gegl/gimpoperationcagecoefcalc.c | 29 ++-- app/gegl/gimpoperationcagetransform.c | 41 ++--- - app/tools/gimpcagetool.c | 26 +-- + app/tools/gimpcagetool.c | 26 +-- 5 files changed, 248 insertions(+), 170 deletions(-) commit 9b3e1c91fd2eac69da6947ec9c7fbf10096ba237 Author: Mukund Sivaraman -Date: Wed Apr 20 18:55:44 2011 +0530 +Date: Wed Apr 20 18:55:44 2011 +0530 file-pdf-load: Don't use deprecated API (bug #646947) @@ -36163,7 +37064,7 @@ commit ae2ab1ff3bceb82328cf5c0a970c911507f1e4cb Author: Alexandre Prokoudine -Date: Wed Apr 20 13:20:42 2011 +0400 +Date: Wed Apr 20 13:20:42 2011 +0400 Fixed a typo @@ -36174,7 +37075,7 @@ commit 3edf0cb531a00b9a19f977ffebe418ed59c7eba9 Author: Michael Natterer -Date: Wed Apr 20 00:43:30 2011 +0200 +Date: Wed Apr 20 00:43:30 2011 +0200 app: GimpSpinScale: don't create two cairo_t in expose() @@ -36183,7 +37084,7 @@ commit 59ea89234ff3f03038793601672ac416cf6f7f7f Author: Michael Natterer -Date: Wed Apr 20 00:31:59 2011 +0200 +Date: Wed Apr 20 00:31:59 2011 +0200 app: GimpRuler: clip position marker drawing to the ruler's allocation @@ -36194,7 +37095,7 @@ commit 3bf15d32e676b67978b5d5e16afefeb18b1f8184 Author: Michael Natterer -Date: Mon Apr 18 22:21:29 2011 +0200 +Date: Mon Apr 18 22:21:29 2011 +0200 app: use GimpSpinScales in GimpBrushEditor @@ -36205,7 +37106,7 @@ commit 4d438a89deb0a5d9d2320373f82a7de8b7283c53 Author: Alexia Death -Date: Mon Apr 18 22:53:05 2011 +0300 +Date: Mon Apr 18 22:53:05 2011 +0300 app: restore brush size scale silder visible range to 1000 @@ -36214,7 +37115,7 @@ commit 85509f4ffb62c837e5b70c228f3c723c8f23027e Author: Michael Natterer -Date: Mon Apr 18 21:49:23 2011 +0200 +Date: Mon Apr 18 21:49:23 2011 +0200 app: GimpScaleComboBox: don't derive from GtkComboBoxEntry @@ -36229,7 +37130,7 @@ commit 4d3e6b062d10a7491678c1ba72409d1fd69e530f Author: Michael Natterer -Date: Mon Apr 18 21:35:41 2011 +0200 +Date: Mon Apr 18 21:35:41 2011 +0200 app: limit the paint options' fade length scale to 1000 @@ -36238,7 +37139,7 @@ commit 6dd463fb02acaa2d83935dd22ec32eb716ed07da Author: Michael Natterer -Date: Mon Apr 18 21:21:45 2011 +0200 +Date: Mon Apr 18 21:21:45 2011 +0200 app: gimp_spin_scale_change_value(): remove "+ lower" from step calculation @@ -36250,19 +37151,19 @@ commit 6a3fe9f9c520a06b596434ab14b95074798e0b4c Author: Michael Natterer -Date: Mon Apr 18 21:10:47 2011 +0200 +Date: Mon Apr 18 21:10:47 2011 +0200 app: restore the original brush size upper limit of 10000 but restrict the tool options sclae to 500. - app/paint/gimppaintoptions.c | 2 +- + app/paint/gimppaintoptions.c | 2 +- app/tools/gimppaintoptions-gui.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) commit bfcecd2ef073b538411f294dcb17b481709bbc5a Author: Michael Natterer -Date: Mon Apr 18 21:04:05 2011 +0200 +Date: Mon Apr 18 21:04:05 2011 +0200 app: GimpBrushFactoryView: use a GimpSpinScale for spacing @@ -36274,7 +37175,7 @@ commit d300ec655686aeeb36e219373f25601e253a4dd2 Author: Michael Natterer -Date: Mon Apr 18 21:01:48 2011 +0200 +Date: Mon Apr 18 21:01:48 2011 +0200 app: add a "scale_limit" API to GimpSpinScale @@ -36285,12 +37186,12 @@ app/widgets/gimpspinscale.c | 115 ++++++++++++++++++++++++++++++++++++++++---- - app/widgets/gimpspinscale.h | 18 +++++-- + app/widgets/gimpspinscale.h | 18 +++++-- 2 files changed, 118 insertions(+), 15 deletions(-) commit bc56060148ec461bd6d5f579f7ba540e4b940a60 Author: Michael Natterer -Date: Mon Apr 18 20:41:02 2011 +0200 +Date: Mon Apr 18 20:41:02 2011 +0200 app: GimpLayerTreeView: use a GimpSpinScale for opacity @@ -36299,7 +37200,7 @@ commit 26d50b533bc46802cb2c5b797abd9c225835481e Author: Michael Natterer -Date: Mon Apr 18 20:40:10 2011 +0200 +Date: Mon Apr 18 20:40:10 2011 +0200 app: gimp_item_tree_view_add_options(): allow NULL labels @@ -36311,7 +37212,7 @@ commit 36becbacc61e15c9484c1fe8aaab092fc76eb702 Author: Michael Natterer -Date: Mon Apr 18 19:54:48 2011 +0200 +Date: Mon Apr 18 19:54:48 2011 +0200 NEWS: start 2.7.3 section @@ -36320,7 +37221,7 @@ commit 5b14564d8ef6ec0fd64e3f1d3b1ad6f23d14084a Author: Michael Natterer -Date: Mon Apr 18 15:54:03 2011 +0200 +Date: Mon Apr 18 15:54:03 2011 +0200 app: GimpMotionBuffer: remove empty constructed() @@ -36331,21 +37232,21 @@ commit 534b48cb0d5eeb669efdc97607612759cf6670f4 Author: Michael Natterer -Date: Mon Apr 18 13:13:51 2011 +0200 +Date: Mon Apr 18 13:13:51 2011 +0200 app: add gimp_motion_buffer_get_last_motion_time() and use it The last poking into the buffer is gone now. app/display/gimpdisplayshell-tool-events.c | 14 ++++++---- - app/display/gimpmotionbuffer.c | 8 ++++++ - app/display/gimpmotionbuffer.h | 45 + app/display/gimpmotionbuffer.c | 8 ++++++ + app/display/gimpmotionbuffer.h | 45 +++++++++++++++--------------- 3 files changed, 40 insertions(+), 27 deletions(-) commit d305d000ff50d9d85b40d24df31dd832567d497a Author: Michael Natterer -Date: Mon Apr 18 11:35:51 2011 +0200 +Date: Mon Apr 18 11:35:51 2011 +0200 app: struct GimpMotionBufferClass: parent_class had the wrong type @@ -36354,7 +37255,7 @@ commit e028195cf38a4fddd6a79a06400f5d528913496c Author: Michael Natterer -Date: Mon Apr 18 11:31:38 2011 +0200 +Date: Mon Apr 18 11:31:38 2011 +0200 app: rename process_stroke() and process_hover() to request_foo() @@ -36362,13 +37263,13 @@ the emission of "stroke" and "hover" signals. app/display/gimpdisplayshell-tool-events.c | 6 +++--- - app/display/gimpmotionbuffer.c | 6 +++--- - app/display/gimpmotionbuffer.h | 4 ++-- + app/display/gimpmotionbuffer.c | 6 +++--- + app/display/gimpmotionbuffer.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) commit 3fbbb9b333acddac6ebbb370fd7b24a4616c152f Author: Michael Natterer -Date: Mon Apr 18 11:08:24 2011 +0200 +Date: Mon Apr 18 11:08:24 2011 +0200 app: GimpMotionBuffer API cleanup and refactoring @@ -36389,32 +37290,32 @@ by calling process_stroke() and "hover" signals by calling process_hover() - app/core/gimpmarshal.list | 1 + + app/core/gimpmarshal.list | 1 + app/display/gimpdisplayshell-tool-events.c | 55 +++++++++++++-------- app/display/gimpdisplayshell-tool-events.h | 7 ++- - app/display/gimpdisplayshell.c | 7 ++- - app/display/gimpmotionbuffer.c | 79 + app/display/gimpdisplayshell.c | 7 ++- + app/display/gimpmotionbuffer.c | 79 +++++++++++++++++++++--------- - app/display/gimpmotionbuffer.h | 20 ++++---- + app/display/gimpmotionbuffer.h | 20 ++++---- 6 files changed, 112 insertions(+), 57 deletions(-) commit d62cf6503091751535e4946eea880960cd5ded5d Author: Michael Natterer -Date: Mon Apr 18 01:09:57 2011 +0200 +Date: Mon Apr 18 01:09:57 2011 +0200 app: rename gimp_motion_buffer_eval_event() to motion_event() because it's feeding it motion events. app/display/gimpdisplayshell-tool-events.c | 36 ++++++++-------- - app/display/gimpmotionbuffer.c | 66 + app/display/gimpmotionbuffer.c | 66 +++++++++++++++--------------- - app/display/gimpmotionbuffer.h | 8 ++-- + app/display/gimpmotionbuffer.h | 8 ++-- 3 files changed, 55 insertions(+), 55 deletions(-) commit 6f865eda2bea63ec3551eb68342e7f04e42bd5ba Author: Michael Natterer -Date: Mon Apr 18 00:29:32 2011 +0200 +Date: Mon Apr 18 00:29:32 2011 +0200 app: add start_stroke() and finish_stroke() API to GimpMotionBuffer @@ -36425,42 +37326,42 @@ callback will ignore the events if the tool is not active). app/display/gimpdisplayshell-tool-events.c | 26 ++++++++++---------- - app/display/gimpmotionbuffer.c | 38 + app/display/gimpmotionbuffer.c | 38 +++++++++++++++++++++--------- - app/display/gimpmotionbuffer.h | 6 ++++- + app/display/gimpmotionbuffer.h | 6 ++++- 3 files changed, 45 insertions(+), 25 deletions(-) commit 99f5dc9f18e1da3b9b36e92a162e5216dc68c5ab Author: Michael Natterer -Date: Mon Apr 18 00:09:06 2011 +0200 +Date: Mon Apr 18 00:09:06 2011 +0200 app: move GimpCagePoint from core-types.h to gegl/ and remove the orphaned GimpCagePreview typedef from gimp-gegl-types.h. - app/core/core-types.h | 12 +----------- + app/core/core-types.h | 12 +----------- app/gegl/gimp-gegl-types.h | 6 +++++- app/gegl/gimpcageconfig.h | 11 +++++++++++ 3 files changed, 17 insertions(+), 12 deletions(-) commit 6a1b93be1cb66e680142a483944b4b3303a98939 Author: Michael Natterer -Date: Sun Apr 17 23:44:45 2011 +0200 +Date: Sun Apr 17 23:44:45 2011 +0200 app: don't include "libgimpmath/gimpvectors.h" in any header It's types are generally known because it's already included in core-types.h. - app/core/gimpbrush.h | 1 - - app/core/gimpcurve.h | 1 - + app/core/gimpbrush.h | 1 - + app/core/gimpcurve.h | 1 - app/paint/gimppaintcore.h | 1 - 3 files changed, 3 deletions(-) commit e3b1ed7728f56592560e0f3f0fc287b3c1ef248d Author: Michael Natterer -Date: Sun Apr 17 22:00:18 2011 +0200 +Date: Sun Apr 17 22:00:18 2011 +0200 app: remove the timeout in GObject::dispose() @@ -36469,7 +37370,7 @@ commit e822fb0d95c0982ac34b028c343388ca39676fd9 Author: Michael Natterer -Date: Sun Apr 17 21:58:03 2011 +0200 +Date: Sun Apr 17 21:58:03 2011 +0200 app: separate the queue flushing function from the timeout function @@ -36482,7 +37383,7 @@ commit 334e4c5d718fb964969475ccea417b74c20d079d Author: Michael Natterer -Date: Sun Apr 17 21:46:29 2011 +0200 +Date: Sun Apr 17 21:46:29 2011 +0200 app: move process_event_queue() and flush_event_queue() to GimpMotionBuffer @@ -36491,18 +37392,18 @@ to happen. In GimpDisplayShell, connect to GimpMotionBuffer::motion() and call the tool. - app/core/gimpmarshal.list | 1 + + app/core/gimpmarshal.list | 1 + app/display/gimpdisplayshell-tool-events.c | 122 ++++++----------------------- - app/display/gimpdisplayshell-tool-events.h | 5 ++ - app/display/gimpdisplayshell.c | 4 + - app/display/gimpmotionbuffer.c | 90 ++++++++++++++++++++- - app/display/gimpmotionbuffer.h | 37 +++++---- + app/display/gimpdisplayshell-tool-events.h | 5 ++ + app/display/gimpdisplayshell.c | 4 + + app/display/gimpmotionbuffer.c | 90 ++++++++++++++++++++- + app/display/gimpmotionbuffer.h | 37 +++++---- 6 files changed, 143 insertions(+), 116 deletions(-) commit d784ca0a59aaefd2ee7d3e2f908e57d0492717a3 Author: Michael Natterer -Date: Sun Apr 17 21:12:02 2011 +0200 +Date: Sun Apr 17 21:12:02 2011 +0200 app: don't PAUSE/RESUME the active tool around sending it motion events @@ -36517,7 +37418,7 @@ commit 9f61a7d2a14d0b17fdfe00b0a1950546e4bca293 Author: Michael Natterer -Date: Sun Apr 17 20:43:55 2011 +0200 +Date: Sun Apr 17 20:43:55 2011 +0200 app: siplify gimp_display_shell_process_event_queue() @@ -36529,7 +37430,7 @@ commit fae058976765af5443cf2e9ac4208b599bd28c2a Author: Michael Natterer -Date: Sun Apr 17 20:27:54 2011 +0200 +Date: Sun Apr 17 20:27:54 2011 +0200 app: minor cleanup gimp_motion_buffer_eval_event(), no logic change @@ -36538,20 +37439,20 @@ commit bb3eac557d6a52fc1e21c7cd143eaba99f06f7d9 Author: Michael Natterer -Date: Sun Apr 17 20:20:18 2011 +0200 +Date: Sun Apr 17 20:20:18 2011 +0200 app: add gimp_motion_buffer_pop_event_queue() and use it instead of accessing and removing the queue's first element menually. app/display/gimpdisplayshell-tool-events.c | 12 +++++------- - app/display/gimpmotionbuffer.c | 18 +++++++++++++++++- - app/display/gimpmotionbuffer.h | 12 +++++++----- + app/display/gimpmotionbuffer.c | 18 +++++++++++++++++- + app/display/gimpmotionbuffer.h | 12 +++++++----- 3 files changed, 29 insertions(+), 13 deletions(-) commit aa7c31b802d5c51ab36d666fd323b6e4bf8c34ad Author: Michael Natterer -Date: Sun Apr 17 19:59:31 2011 +0200 +Date: Sun Apr 17 19:59:31 2011 +0200 app: s/gdouble inertia_factor/gboolean event_fill/ in eval_event() @@ -36560,16 +37461,16 @@ events. app/display/gimpdisplayshell-tool-events.c | 21 ++++++++++++--------- - app/display/gimpmotionbuffer.c | 11 +---------- - app/display/gimpmotionbuffer.h | 2 +- - app/tools/gimppainttool.c | 3 --- - app/tools/gimptool.c | 1 - - app/tools/gimptool.h | 2 -- + app/display/gimpmotionbuffer.c | 11 +---------- + app/display/gimpmotionbuffer.h | 2 +- + app/tools/gimppainttool.c | 3 --- + app/tools/gimptool.c | 1 - + app/tools/gimptool.h | 2 -- 6 files changed, 14 insertions(+), 26 deletions(-) commit 41b469fcf53fd9dbdeee307733e2c9a3095e1c0a Author: Michael Natterer -Date: Sun Apr 17 19:34:02 2011 +0200 +Date: Sun Apr 17 19:34:02 2011 +0200 app: gimp_motion_buffer_eval_event(): always set last_read_motion_time @@ -36582,7 +37483,7 @@ commit 7ab72eb54a4b7940c99e9ec896c44f36795b7713 Author: Michael Natterer -Date: Sun Apr 17 19:21:46 2011 +0200 +Date: Sun Apr 17 19:21:46 2011 +0200 app: flush the event queue unconditionally on BUTTON_RELEASE @@ -36596,19 +37497,19 @@ commit 2dbaf7f49093d0a9ffc97d1c9146652dd7bd8122 Author: Michael Natterer -Date: Sun Apr 17 19:05:49 2011 +0200 +Date: Sun Apr 17 19:05:49 2011 +0200 app: set "last_read_motion_time" in gimp_motion_buffer_eval_event() because it is called whenever we process a newly received event. app/display/gimpdisplayshell-tool-events.c | 5 ----- - app/display/gimpmotionbuffer.c | 2 ++ + app/display/gimpmotionbuffer.c | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) commit e09520fb084bca1bd818389fc510f9638a2565b9 Author: Michael Natterer -Date: Sun Apr 17 18:53:42 2011 +0200 +Date: Sun Apr 17 18:53:42 2011 +0200 app: add GimpMotionBuffer class to swallow all the event smoothing code @@ -36617,21 +37518,20 @@ GimpDisplayShell, so everything looks more ugly than before, but I wanted the member moving separate from any refactorings. - app/display/Makefile.am | 4 +- - app/display/display-types.h | 1 + - app/display/gimpdisplayshell-coords.c | 305 -------------------- - app/display/gimpdisplayshell-coords.h | 30 -- - app/display/gimpdisplayshell-tool-events.c | 78 ++--- - app/display/gimpdisplayshell.c | 16 +- - app/display/gimpdisplayshell.h | 17 +- - app/display/gimpmotionbuffer.c | 438 - +++++++++++++++++++++++++++++ - app/display/gimpmotionbuffer.h | 84 ++++++ - 9 files changed, 574 insertions(+), 399 deletions(-) + app/display/Makefile.am | 4 +- + app/display/display-types.h | 1 + + app/display/gimpdisplayshell-coords.h | 30 --- + app/display/gimpdisplayshell-tool-events.c | 78 +++--- + app/display/gimpdisplayshell.c | 16 +- + app/display/gimpdisplayshell.h | 17 +- + ...impdisplayshell-coords.c => gimpmotionbuffer.c} | 263 + ++++++++++++++++----- + app/display/gimpmotionbuffer.h | 84 +++++++ + 8 files changed, 334 insertions(+), 159 deletions(-) commit 3d7e0f2fef4da32dae09515b9ffb18cf560be903 Author: Martin Nordholts -Date: Sun Apr 17 09:38:18 2011 +0200 +Date: Sun Apr 17 09:38:18 2011 +0200 devel-docs: Add commit-rules.txt @@ -36640,7 +37540,7 @@ commit 139fb874a3088b6591721a967e2ba44920877d0c Author: Kevin Cozens -Date: Sat Apr 16 14:50:10 2011 -0400 +Date: Sat Apr 16 14:50:10 2011 -0400 Fixed grammatical error in help text for gimp-context-set-feather-radius @@ -36652,22 +37552,22 @@ commit b04c6889acd0aec72c4c6d4ff221c424e6ed1a15 Author: Michael Natterer -Date: Sat Apr 16 20:21:52 2011 +0200 +Date: Sat Apr 16 20:21:52 2011 +0200 app: remove the STRICT_TOOL_CHECKS define and ifdefs Tools behave more predictably than before already, and whatever remaining warnings will be sorted out before 2.8. - app/tools/gimpdrawtool.c | 7 ------- - app/tools/gimptool.c | 26 -------------------------- - app/tools/gimptool.h | 3 --- - app/tools/gimptoolcontrol.c | 5 +---- + app/tools/gimpdrawtool.c | 7 ------- + app/tools/gimptool.c | 26 -------------------------- + app/tools/gimptool.h | 3 --- + app/tools/gimptoolcontrol.c | 5 +---- 4 files changed, 1 insertion(+), 40 deletions(-) commit f0a52f1db9688a19f60b0d354ab426d48f1f741d Author: Michael Natterer -Date: Sat Apr 16 15:17:22 2011 +0200 +Date: Sat Apr 16 15:17:22 2011 +0200 Bug 646316 - Hinting change to medium on first edit of text field @@ -36681,7 +37581,7 @@ commit 70f4cec9cb2b9661988dd84856de49acf1458ed2 Author: Martin Nordholts -Date: Sat Apr 16 13:22:10 2011 +0200 +Date: Sat Apr 16 13:22:10 2011 +0200 Add missing NEWS item for 2.7.2 @@ -36692,7 +37592,7 @@ commit 854dd5b6ad9f0649331325c97d8d010d1b48ffe3 Author: Mikael Magnusson -Date: Sat Apr 16 11:52:38 2011 +0200 +Date: Sat Apr 16 11:52:38 2011 +0200 app: correct cast for spinbutton @@ -36701,7 +37601,7 @@ commit 109baa820fb3048cb707bd48205bf26f8b7d2bab Author: Michael Natterer -Date: Sat Apr 16 02:26:57 2011 +0200 +Date: Sat Apr 16 02:26:57 2011 +0200 authors: add Benjamin Otte, lots and lots of cairo help @@ -36711,7 +37611,7 @@ commit 924d647284b3b945cbd51eed778513c8af3df0a0 Author: Michael Natterer -Date: Sat Apr 16 02:09:37 2011 +0200 +Date: Sat Apr 16 02:09:37 2011 +0200 app: set GimpSpinScale to numeric-only input @@ -36723,7 +37623,7 @@ commit bebccfc95a7e558124e67f43d46b3a65151f220b Author: Mikael Magnusson -Date: Sat Apr 16 01:35:35 2011 +0200 +Date: Sat Apr 16 01:35:35 2011 +0200 Bug 647897 - Marching ants only visible in single window mode @@ -36736,7 +37636,7 @@ commit 88b916a4abc6c17ed9450946d15e1f3b13724c53 Author: Michael Schumacher -Date: Fri Apr 15 21:55:34 2011 +0200 +Date: Fri Apr 15 21:55:34 2011 +0200 Different resource rule approach @@ -36744,12 +37644,12 @@ This reintroduces some warnings, but fixes the build again. build/windows/gimprc-plug-ins.rule | 6 +++--- - build/windows/gimprc.rule | 6 +++--- + build/windows/gimprc.rule | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) commit 84c75da338a4379415adad081daf773ddf20d00a Author: Mikael Magnusson -Date: Fri Apr 15 00:22:48 2011 +0200 +Date: Fri Apr 15 00:22:48 2011 +0200 authors: add myself @@ -36759,7 +37659,7 @@ commit ab9e8e94b3d31d0db9bc4ac9616456bd7181c314 Author: Michael Natterer -Date: Fri Apr 15 00:21:47 2011 +0200 +Date: Fri Apr 15 00:21:47 2011 +0200 NEWS: it's 2.7.2 not 2.7.1, argh... @@ -36768,7 +37668,7 @@ commit d7fcf384734649cdacd22b5ea16afd36b5b6748e Author: Michael Natterer -Date: Thu Apr 14 23:04:02 2011 +0200 +Date: Thu Apr 14 23:04:02 2011 +0200 devel-docs: minor update to release-howto.txt @@ -36777,7 +37677,7 @@ commit 822faacd5bad36a1fa2142f765967132ea6cc206 Author: Michael Natterer -Date: Thu Apr 14 23:02:58 2011 +0200 +Date: Thu Apr 14 23:02:58 2011 +0200 configure.ac: Bump version to 2.7.3 @@ -36786,7 +37686,7 @@ commit d41df9631c41caa1d4794cdf742cf045d9180df8 Author: Michael Natterer -Date: Thu Apr 14 22:37:58 2011 +0200 +Date: Thu Apr 14 22:37:58 2011 +0200 devel-docs: Update .gitignore in libgimpwidgets/tmpl @@ -36795,22 +37695,22 @@ commit d2828cb279e0ae5a5d99fbb7c3353a02db86bfab Author: Michael Natterer -Date: Thu Apr 14 22:01:33 2011 +0200 +Date: Thu Apr 14 22:01:33 2011 +0200 devel-docs: add lots of missing functions to foo-sections.txt - devel-docs/libgimp/libgimp-sections.txt | 9 ++++ + devel-docs/libgimp/libgimp-sections.txt | 9 ++++ devel-docs/libgimpbase/libgimpbase-sections.txt | 2 + devel-docs/libgimpmath/libgimpmath-sections.txt | 9 ++++ devel-docs/libgimpwidgets/libgimpwidgets-docs.sgml | 6 ++- .../libgimpwidgets/libgimpwidgets-sections.txt | 51 ++++++++++++++++++++++ - devel-docs/libgimpwidgets/tmpl/gimpstock.sgml | 7 +++ + devel-docs/libgimpwidgets/tmpl/gimpstock.sgml | 7 +++ 6 files changed, 82 insertions(+), 2 deletions(-) commit f4dcfbb72e426ed859d45cee6c38bf8d86561ced Author: Michael Natterer -Date: Thu Apr 14 21:37:07 2011 +0200 +Date: Thu Apr 14 21:37:07 2011 +0200 INSTALL: update required GEGL and babl versions @@ -36819,7 +37719,7 @@ commit b67aa5fe8b2f19b03af329b63b565faf7b30b660 Author: Michael Natterer -Date: Thu Apr 14 21:27:29 2011 +0200 +Date: Thu Apr 14 21:27:29 2011 +0200 devel-docs: add --name-space=gimp to MKDB_OPTIONS @@ -36834,26 +37734,26 @@ commit 83bbb67781d098618417938a3cda0e87220f53a2 Author: Michael Natterer -Date: Thu Apr 14 21:16:40 2011 +0200 +Date: Thu Apr 14 21:16:40 2011 +0200 plug-ins: #undef GDK_DISABLE_DEPRECATED so we are 64 bit safe will revert after 2.7.2 so we see the warnings again. plug-ins/common/animation-play.c | 1 + - plug-ins/gfig/gfig-arc.c | 1 + - plug-ins/gfig/gfig-circle.c | 1 + - plug-ins/gfig/gfig-dialog.c | 1 + - plug-ins/gfig/gfig-ellipse.c | 1 + - plug-ins/gfig/gfig-grid.c | 2 ++ - plug-ins/gfig/gfig-line.c | 1 + - plug-ins/gfig/gfig-preview.c | 1 + + plug-ins/gfig/gfig-arc.c | 1 + + plug-ins/gfig/gfig-circle.c | 1 + + plug-ins/gfig/gfig-dialog.c | 1 + + plug-ins/gfig/gfig-ellipse.c | 1 + + plug-ins/gfig/gfig-grid.c | 2 ++ + plug-ins/gfig/gfig-line.c | 1 + + plug-ins/gfig/gfig-preview.c | 1 + plug-ins/gfig/gfig-rectangle.c | 1 + 9 files changed, 10 insertions(+) commit 780d2b8e58cc7bcba70dcf4c28a24b4e03d11c1a Author: Michael Natterer -Date: Thu Apr 14 21:03:11 2011 +0200 +Date: Thu Apr 14 21:03:11 2011 +0200 autogen.sh: require automake >= 1.10 and default to 1.11 @@ -36865,7 +37765,7 @@ commit 919598a141c221649aec5a1344ea1a0d9f8292ee Author: Mikael Magnusson -Date: Thu Apr 14 01:20:51 2011 +0200 +Date: Thu Apr 14 01:20:51 2011 +0200 NEWS: fix new typo @@ -36874,7 +37774,7 @@ commit fbadcc96b753c51431b2a35a4456d7e464b8ce2a Author: Michael Natterer -Date: Thu Apr 14 01:17:38 2011 +0200 +Date: Thu Apr 14 01:17:38 2011 +0200 NEWS: should be up-to-date now @@ -36883,7 +37783,7 @@ commit 83e4b0791980336b739aa31c743ace3b8d60cf4a Author: Mikael Magnusson -Date: Wed Apr 13 23:02:54 2011 +0200 +Date: Wed Apr 13 23:02:54 2011 +0200 NEWS: fix typos @@ -36892,7 +37792,7 @@ commit ede0d26b911d8516861399c888a3fe67425c9750 Author: Michael Natterer -Date: Wed Apr 13 21:25:10 2011 +0200 +Date: Wed Apr 13 21:25:10 2011 +0200 app: gimp_data_create_filename(): avoid evil characters in the filename @@ -36905,7 +37805,7 @@ commit f1c20cb165d2db8702a9f6ba61d32b590ae88979 Author: Kevin Cozens -Date: Wed Apr 13 13:38:04 2011 -0400 +Date: Wed Apr 13 13:38:04 2011 -0400 Fixed modulo function which affected 'random' procedure. (See bug #647541) @@ -36915,7 +37815,7 @@ commit f64ff09d4ba753db1e5fe9ace74553eb1cad8d92 Author: Khaled Hosny -Date: Wed Mar 23 18:13:08 2011 +0200 +Date: Wed Mar 23 18:13:08 2011 +0200 Updated Arabic translation @@ -36925,7 +37825,7 @@ commit 3be0234190d1b7821fc95035f6253ec98295e56e Author: 神州散人 -Date: Tue Apr 12 23:19:14 2011 +0800 +Date: Tue Apr 12 23:19:14 2011 +0800 Initial Simplified Chinese translaton @@ -36935,7 +37835,7 @@ commit 846cc27207b62bf64cb7fce4f3bb1dffedb53c71 Author: Michael Natterer -Date: Tue Apr 12 13:59:39 2011 +0200 +Date: Tue Apr 12 13:59:39 2011 +0200 app: implement begin_use()/end_use() in GimpBrushPipe @@ -36946,7 +37846,7 @@ commit 5a4a741936959833fb640dffc34952d53a946e41 Author: Michael Natterer -Date: Tue Apr 12 13:59:04 2011 +0200 +Date: Tue Apr 12 13:59:04 2011 +0200 app: virtualize GimpBrush::begin_use() and ::end_use() @@ -36957,18 +37857,18 @@ commit 391c74899c59e6b5fb8355f20061554d3927ddde Author: Michael Natterer -Date: Tue Apr 12 09:06:22 2011 +0200 +Date: Tue Apr 12 09:06:22 2011 +0200 app: rename gimp_brush_start_use() to gimp_brush_begin_use() - app/core/gimpbrush.c | 4 ++-- - app/core/gimpbrush.h | 2 +- + app/core/gimpbrush.c | 4 ++-- + app/core/gimpbrush.h | 2 +- app/paint/gimpbrushcore.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) commit 7ace5f95714ae2e88440f98835aa5813183ce271 Author: Michael Natterer -Date: Tue Apr 12 00:26:47 2011 +0200 +Date: Tue Apr 12 00:26:47 2011 +0200 plug-ins: port screenshot to cairo_region_t @@ -36978,7 +37878,7 @@ commit cb7acfaf7abfa0c9135b9173104d7ec8c76437b9 Author: Michael Natterer -Date: Tue Apr 12 00:16:38 2011 +0200 +Date: Tue Apr 12 00:16:38 2011 +0200 plug-ins: forgot some GdkNativeWindow @@ -36987,7 +37887,7 @@ commit ce25d9ef642a5cc75d6469cb81a39fac4c72cfcc Author: Michael Natterer -Date: Mon Apr 11 23:58:03 2011 +0200 +Date: Mon Apr 11 23:58:03 2011 +0200 plug-ins: don't use gdk_window_foreign_new_for_display() in screenshot @@ -36999,26 +37899,26 @@ commit 7e6c0267906f558242d546e799503c2a0cfaeb44 Author: Michael Natterer -Date: Mon Apr 11 23:43:03 2011 +0200 +Date: Mon Apr 11 23:43:03 2011 +0200 Globally use GDK_KEY_foo, remove the compat defines from widgets-enums.h - app/widgets/widgets-types.h | 37 + app/widgets/widgets-types.h | 37 ---------------------------------- - libgimpwidgets/gimpcolorhexentry.c | 6 +++--- - libgimpwidgets/gimphelpui.c | 6 +++--- - libgimpwidgets/gimpnumberpairentry.c | 6 +++--- - libgimpwidgets/gimppickbutton.c | 2 +- - plug-ins/common/screenshot.c | 4 ++-- - plug-ins/help-browser/dialog.c | 10 ++++----- - plug-ins/imagemap/imap_main.c | 18 ++++++++--------- + libgimpwidgets/gimpcolorhexentry.c | 6 +++--- + libgimpwidgets/gimphelpui.c | 6 +++--- + libgimpwidgets/gimpnumberpairentry.c | 6 +++--- + libgimpwidgets/gimppickbutton.c | 2 +- + plug-ins/common/screenshot.c | 4 ++-- + plug-ins/help-browser/dialog.c | 10 ++++----- + plug-ins/imagemap/imap_main.c | 18 ++++++++--------- plug-ins/script-fu/script-fu-console.c | 22 ++++++++++---------- 9 files changed, 37 insertions(+), 74 deletions(-) commit 3440f8c7e827312b1a14cca2c7c4de02824c77f3 Author: Michael Natterer -Date: Mon Apr 11 23:19:27 2011 +0200 +Date: Mon Apr 11 23:19:27 2011 +0200 libgimpwidgets: no need any longer to set GtkDialog:has-separator to FALSE @@ -37028,7 +37928,7 @@ commit 50fd91cdf9bcd8d2029b3d7fa96afe9e013e82b7 Author: Michael Natterer -Date: Mon Apr 11 23:18:57 2011 +0200 +Date: Mon Apr 11 23:18:57 2011 +0200 NEWS: much more updates @@ -37038,7 +37938,7 @@ commit f7646fd171dfd322a1e2a071e2220d1248b443f0 Author: Michael Natterer -Date: Sun Apr 10 22:43:03 2011 +0200 +Date: Sun Apr 10 22:43:03 2011 +0200 app: gimpdrawable-stroke.c: don't try to fill a dot or a line @@ -37047,7 +37947,7 @@ commit 0f91a11b75eff0eca764cc03542f0b41a27510a7 Author: Michael Natterer -Date: Sun Apr 10 22:42:39 2011 +0200 +Date: Sun Apr 10 22:42:39 2011 +0200 app: use GimpBezierDesc in gimp_channel_select_vectors() too @@ -37057,7 +37957,7 @@ commit f316269f7175c1dee1a47509940b163cea83763c Author: Michael Natterer -Date: Sun Apr 10 19:37:20 2011 +0200 +Date: Sun Apr 10 19:37:20 2011 +0200 app: stroke vectors by gimp_vectors_get_bezier(); gimp_scan_convert_add_bezier() @@ -37068,105 +37968,105 @@ commit 8ff66342b866481c6a3d5bd61954d5f83795a026 Author: Mikael Magnusson -Date: Sun Apr 10 19:05:08 2011 +0200 +Date: Sun Apr 10 19:05:08 2011 +0200 plug-ins: set progress to 1.0 when done - plug-ins/color-rotate/color-rotate.c | 1 + - plug-ins/common/animation-optimize.c | 1 + - plug-ins/common/antialias.c | 2 +- - plug-ins/common/apply-canvas.c | 1 + - plug-ins/common/blinds.c | 1 + + plug-ins/color-rotate/color-rotate.c | 1 + + plug-ins/common/animation-optimize.c | 1 + + plug-ins/common/antialias.c | 2 +- + plug-ins/common/apply-canvas.c | 1 + + plug-ins/common/blinds.c | 1 + plug-ins/common/blur-gauss-selective.c | 1 + - plug-ins/common/blur-gauss.c | 1 + - plug-ins/common/bump-map.c | 1 + - plug-ins/common/cartoon.c | 1 + - plug-ins/common/color-exchange.c | 1 + - plug-ins/common/compose.c | 1 + - plug-ins/common/convolution-matrix.c | 1 + - plug-ins/common/curve-bend.c | 1 + - plug-ins/common/decompose.c | 1 + - plug-ins/common/deinterlace.c | 1 + - plug-ins/common/depth-merge.c | 1 + - plug-ins/common/destripe.c | 1 + - plug-ins/common/displace.c | 1 + - plug-ins/common/edge-laplace.c | 1 + - plug-ins/common/edge-neon.c | 1 + - plug-ins/common/edge-sobel.c | 1 + - plug-ins/common/engrave.c | 1 + - plug-ins/common/file-cel.c | 2 ++ - plug-ins/common/file-dicom.c | 1 + - plug-ins/common/file-gif-load.c | 1 + - plug-ins/common/file-gif-save.c | 17 +++++++++-------- - plug-ins/common/file-html-table.c | 1 + - plug-ins/common/file-pat.c | 1 + - plug-ins/common/file-pcx.c | 2 ++ - plug-ins/common/file-pdf-load.c | 3 ++- - plug-ins/common/file-pix.c | 3 +++ - plug-ins/common/file-png.c | 2 ++ - plug-ins/common/file-ps.c | 6 ++++++ - plug-ins/common/file-raw.c | 1 + - plug-ins/common/file-sunras.c | 1 + - plug-ins/common/file-tga.c | 2 ++ - plug-ins/common/file-xbm.c | 2 ++ - plug-ins/common/file-xmc.c | 2 ++ - plug-ins/common/file-xpm.c | 2 ++ - plug-ins/common/file-xwd.c | 3 +++ - plug-ins/common/film.c | 1 + - plug-ins/common/grid.c | 1 + - plug-ins/common/hot.c | 1 + - plug-ins/common/iwarp.c | 2 ++ - plug-ins/common/jigsaw.c | 1 + - plug-ins/common/lens-apply.c | 1 + - plug-ins/common/lens-flare.c | 1 + - plug-ins/common/newsprint.c | 1 + - plug-ins/common/nl-filter.c | 1 + - plug-ins/common/nova.c | 2 ++ - plug-ins/common/oilify.c | 1 + - plug-ins/common/photocopy.c | 1 + - plug-ins/common/pixelize.c | 2 ++ - plug-ins/common/plasma.c | 2 ++ - plug-ins/common/qbist.c | 1 + - plug-ins/common/red-eye-removal.c | 1 + - plug-ins/common/sample-colorize.c | 2 ++ - plug-ins/common/sharpen.c | 1 + - plug-ins/common/shift.c | 1 + - plug-ins/common/sinus.c | 1 + - plug-ins/common/smooth-palette.c | 1 + - plug-ins/common/softglow.c | 1 + - plug-ins/common/sphere-designer.c | 1 + - plug-ins/common/tile-glass.c | 1 + - plug-ins/common/tile-paper.c | 1 + - plug-ins/common/tile-seamless.c | 1 + - plug-ins/common/tile-small.c | 1 + - plug-ins/common/tile.c | 1 + - plug-ins/common/van-gogh-lic.c | 1 + - plug-ins/common/warp.c | 3 +++ - plug-ins/common/whirl-pinch.c | 1 + - plug-ins/common/wind.c | 2 ++ - plug-ins/file-bmp/bmp-read.c | 2 +- - plug-ins/file-bmp/bmp-write.c | 2 +- - plug-ins/file-fits/fits.c | 3 +++ - plug-ins/file-fli/fli-gimp.c | 2 ++ - plug-ins/file-sgi/sgi.c | 4 +++- - plug-ins/file-uri/uri-backend-gvfs.c | 1 + - plug-ins/file-xjt/xjpeg.c | 4 ++++ - plug-ins/flame/flame.c | 1 + + plug-ins/common/blur-gauss.c | 1 + + plug-ins/common/bump-map.c | 1 + + plug-ins/common/cartoon.c | 1 + + plug-ins/common/color-exchange.c | 1 + + plug-ins/common/compose.c | 1 + + plug-ins/common/convolution-matrix.c | 1 + + plug-ins/common/curve-bend.c | 1 + + plug-ins/common/decompose.c | 1 + + plug-ins/common/deinterlace.c | 1 + + plug-ins/common/depth-merge.c | 1 + + plug-ins/common/destripe.c | 1 + + plug-ins/common/displace.c | 1 + + plug-ins/common/edge-laplace.c | 1 + + plug-ins/common/edge-neon.c | 1 + + plug-ins/common/edge-sobel.c | 1 + + plug-ins/common/engrave.c | 1 + + plug-ins/common/file-cel.c | 2 ++ + plug-ins/common/file-dicom.c | 1 + + plug-ins/common/file-gif-load.c | 1 + + plug-ins/common/file-gif-save.c | 17 +++++++++-------- + plug-ins/common/file-html-table.c | 1 + + plug-ins/common/file-pat.c | 1 + + plug-ins/common/file-pcx.c | 2 ++ + plug-ins/common/file-pdf-load.c | 3 ++- + plug-ins/common/file-pix.c | 3 +++ + plug-ins/common/file-png.c | 2 ++ + plug-ins/common/file-ps.c | 6 ++++++ + plug-ins/common/file-raw.c | 1 + + plug-ins/common/file-sunras.c | 1 + + plug-ins/common/file-tga.c | 2 ++ + plug-ins/common/file-xbm.c | 2 ++ + plug-ins/common/file-xmc.c | 2 ++ + plug-ins/common/file-xpm.c | 2 ++ + plug-ins/common/file-xwd.c | 3 +++ + plug-ins/common/film.c | 1 + + plug-ins/common/grid.c | 1 + + plug-ins/common/hot.c | 1 + + plug-ins/common/iwarp.c | 2 ++ + plug-ins/common/jigsaw.c | 1 + + plug-ins/common/lens-apply.c | 1 + + plug-ins/common/lens-flare.c | 1 + + plug-ins/common/newsprint.c | 1 + + plug-ins/common/nl-filter.c | 1 + + plug-ins/common/nova.c | 2 ++ + plug-ins/common/oilify.c | 1 + + plug-ins/common/photocopy.c | 1 + + plug-ins/common/pixelize.c | 2 ++ + plug-ins/common/plasma.c | 2 ++ + plug-ins/common/qbist.c | 1 + + plug-ins/common/red-eye-removal.c | 1 + + plug-ins/common/sample-colorize.c | 2 ++ + plug-ins/common/sharpen.c | 1 + + plug-ins/common/shift.c | 1 + + plug-ins/common/sinus.c | 1 + + plug-ins/common/smooth-palette.c | 1 + + plug-ins/common/softglow.c | 1 + + plug-ins/common/sphere-designer.c | 1 + + plug-ins/common/tile-glass.c | 1 + + plug-ins/common/tile-paper.c | 1 + + plug-ins/common/tile-seamless.c | 1 + + plug-ins/common/tile-small.c | 1 + + plug-ins/common/tile.c | 1 + + plug-ins/common/van-gogh-lic.c | 1 + + plug-ins/common/warp.c | 3 +++ + plug-ins/common/whirl-pinch.c | 1 + + plug-ins/common/wind.c | 2 ++ + plug-ins/file-bmp/bmp-read.c | 2 +- + plug-ins/file-bmp/bmp-write.c | 2 +- + plug-ins/file-fits/fits.c | 3 +++ + plug-ins/file-fli/fli-gimp.c | 2 ++ + plug-ins/file-sgi/sgi.c | 4 +++- + plug-ins/file-uri/uri-backend-gvfs.c | 1 + + plug-ins/file-xjt/xjpeg.c | 4 ++++ + plug-ins/flame/flame.c | 1 + plug-ins/fractal-explorer/fractal-explorer.c | 1 + - plug-ins/gimpressionist/gimp.c | 1 + + plug-ins/gimpressionist/gimp.c | 1 + plug-ins/gradient-flare/gradient-flare.c | 1 + - plug-ins/lighting/lighting-apply.c | 2 ++ + plug-ins/lighting/lighting-apply.c | 2 ++ plug-ins/map-object/map-object-apply.c | 1 + - plug-ins/maze/maze-algorithms.c | 2 ++ - plug-ins/maze/maze.c | 1 + - plug-ins/pagecurl/pagecurl.c | 2 ++ - plug-ins/print/print-draw-page.c | 2 ++ + plug-ins/maze/maze-algorithms.c | 2 ++ + plug-ins/maze/maze.c | 1 + + plug-ins/pagecurl/pagecurl.c | 2 ++ + plug-ins/print/print-draw-page.c | 2 ++ plug-ins/selection-to-path/pxl-outline.c | 2 ++ 90 files changed, 136 insertions(+), 13 deletions(-) commit 7552d1aa8b69474b161e59096d35e7a114fb1d94 Author: Mikael Magnusson -Date: Sun Apr 10 16:35:51 2011 +0200 +Date: Sun Apr 10 16:35:51 2011 +0200 plug-ins: nova, draw cross and use mouse events properly when the preview allocation is larger than the area @@ -37176,7 +38076,7 @@ commit 2fbc0b3389eeb7fdd42db978702d2427ece37847 Author: Mikael Magnusson -Date: Sun Apr 10 16:16:35 2011 +0200 +Date: Sun Apr 10 16:16:35 2011 +0200 plug-ins: plasma, port to gimp_drawable_mask_intersect @@ -37185,7 +38085,7 @@ commit bb9efebbaf74d172a8ba08105fa4afb3e144cf9b Author: Michael Natterer -Date: Sun Apr 10 19:19:43 2011 +0200 +Date: Sun Apr 10 19:19:43 2011 +0200 app: use the new GimpBezierDesc APIs for stroking a selection @@ -37197,7 +38097,7 @@ commit 8c3698eccc695640720712525479885051e84358 Author: Michael Natterer -Date: Sun Apr 10 19:16:31 2011 +0200 +Date: Sun Apr 10 19:16:31 2011 +0200 app: add gimp_bezier_desc_translate() which translates all points @@ -37210,7 +38110,7 @@ commit 1a4ffb3d21b2e05ef2656b38a848deafb9f7b27e Author: Michael Natterer -Date: Sun Apr 10 19:07:04 2011 +0200 +Date: Sun Apr 10 19:07:04 2011 +0200 app: add gimp_scan_convert_add_bezier() which adds a GimpBezierDesc @@ -37222,32 +38122,32 @@ commit fde934ac5859ee13d4304e6df9059183bad6f92e Author: Michael Natterer -Date: Sun Apr 10 18:15:16 2011 +0200 +Date: Sun Apr 10 18:15:16 2011 +0200 app: s/GdkRectangle/cairo_rectangle_int_t/ in all GimpCanvasItems - app/display/gimpcanvasarc.c | 8 ++++---- - app/display/gimpcanvasboundary.c | 4 ++-- - app/display/gimpcanvascorner.c | 8 ++++---- - app/display/gimpcanvascursor.c | 4 ++-- - app/display/gimpcanvasgrid.c | 12 ++++++------ - app/display/gimpcanvasguide.c | 8 ++++---- - app/display/gimpcanvashandle.c | 4 ++-- - app/display/gimpcanvasline.c | 8 ++++---- - app/display/gimpcanvaspassepartout.c | 15 ++++++++------- - app/display/gimpcanvaspath.c | 8 ++++---- - app/display/gimpcanvaspen.c | 6 +++--- - app/display/gimpcanvaspolygon.c | 4 ++-- - app/display/gimpcanvasprogress.c | 8 ++++---- - app/display/gimpcanvasrectangle.c | 14 +++++++------- - app/display/gimpcanvassamplepoint.c | 8 ++++---- - app/display/gimpcanvastextcursor.c | 4 ++-- + app/display/gimpcanvasarc.c | 8 ++++---- + app/display/gimpcanvasboundary.c | 4 ++-- + app/display/gimpcanvascorner.c | 8 ++++---- + app/display/gimpcanvascursor.c | 4 ++-- + app/display/gimpcanvasgrid.c | 12 ++++++------ + app/display/gimpcanvasguide.c | 8 ++++---- + app/display/gimpcanvashandle.c | 4 ++-- + app/display/gimpcanvasline.c | 8 ++++---- + app/display/gimpcanvaspassepartout.c | 15 ++++++++------- + app/display/gimpcanvaspath.c | 8 ++++---- + app/display/gimpcanvaspen.c | 6 +++--- + app/display/gimpcanvaspolygon.c | 4 ++-- + app/display/gimpcanvasprogress.c | 8 ++++---- + app/display/gimpcanvasrectangle.c | 14 +++++++------- + app/display/gimpcanvassamplepoint.c | 8 ++++---- + app/display/gimpcanvastextcursor.c | 4 ++-- app/display/gimpcanvastransformpreview.c | 10 +++++----- 17 files changed, 67 insertions(+), 66 deletions(-) commit d0e07a2b1f173db31953b819a2955b9604bc7420 Author: Michael Natterer -Date: Sun Apr 10 13:11:37 2011 +0200 +Date: Sun Apr 10 13:11:37 2011 +0200 Bug 155733 - need to check return values of gimp_drawable_mask_bounds() @@ -37260,7 +38160,7 @@ commit a4aa6add4393af0d61efa4be4d736d2ed2da1223 Author: Martin Nordholts -Date: Sun Apr 10 11:53:31 2011 +0200 +Date: Sun Apr 10 11:53:31 2011 +0200 app/tests: Assert on existance of files before trying to open them @@ -37272,7 +38172,7 @@ commit 71276755102a73688bd19ef32f8bc80d56c71905 Author: Martin Nordholts -Date: Sun Apr 10 11:32:50 2011 +0200 +Date: Sun Apr 10 11:32:50 2011 +0200 desktop: Don't forget to dist 64x64 version of gimp.png @@ -37281,37 +38181,37 @@ commit 27ac2a3c38e66b7d7752637310064461e8ac2e11 Author: Martin Nordholts -Date: Sat Apr 9 19:51:51 2011 +0200 +Date: Sat Apr 9 19:51:51 2011 +0200 app: Make GimpEditor instance members private app/actions/gradient-editor-commands.c | 40 +++--- - app/actions/tool-options-commands.c | 14 +-- - app/display/gimpnavigationeditor.c | 24 ++-- - app/widgets/gimpbufferview.c | 3 +- - app/widgets/gimpchanneltreeview.c | 4 +- - app/widgets/gimpcolormapeditor.c | 2 +- - app/widgets/gimpcontainereditor.c | 6 +- - app/widgets/gimpdataeditor.c | 6 +- - app/widgets/gimpdatafactoryview.c | 3 +- - app/widgets/gimpdocumentview.c | 3 +- - app/widgets/gimpeditor.c | 216 + app/actions/tool-options-commands.c | 14 +-- + app/display/gimpnavigationeditor.c | 24 ++-- + app/widgets/gimpbufferview.c | 3 +- + app/widgets/gimpchanneltreeview.c | 4 +- + app/widgets/gimpcolormapeditor.c | 2 +- + app/widgets/gimpcontainereditor.c | 6 +- + app/widgets/gimpdataeditor.c | 6 +- + app/widgets/gimpdatafactoryview.c | 3 +- + app/widgets/gimpdocumentview.c | 3 +- + app/widgets/gimpeditor.c | 216 +++++++++++++++++++++------------ - app/widgets/gimpeditor.h | 23 ++-- - app/widgets/gimpfontview.c | 3 +- - app/widgets/gimpimageeditor.c | 12 +- - app/widgets/gimpimageview.c | 2 +- - app/widgets/gimpitemtreeview.c | 10 +- - app/widgets/gimplayertreeview.c | 10 +- - app/widgets/gimppaletteeditor.c | 6 +- - app/widgets/gimptemplateview.c | 3 +- - app/widgets/gimptooloptionseditor.c | 11 +- - app/widgets/gimpvectorstreeview.c | 6 +- + app/widgets/gimpeditor.h | 23 ++-- + app/widgets/gimpfontview.c | 3 +- + app/widgets/gimpimageeditor.c | 12 +- + app/widgets/gimpimageview.c | 2 +- + app/widgets/gimpitemtreeview.c | 10 +- + app/widgets/gimplayertreeview.c | 10 +- + app/widgets/gimppaletteeditor.c | 6 +- + app/widgets/gimptemplateview.c | 3 +- + app/widgets/gimptooloptionseditor.c | 11 +- + app/widgets/gimpvectorstreeview.c | 6 +- 21 files changed, 236 insertions(+), 171 deletions(-) commit 1a3315feac50e80c3c1a887843428b7b4af0d967 Author: Mukund Sivaraman -Date: Sun Apr 10 13:06:12 2011 +0530 +Date: Sun Apr 10 13:06:12 2011 +0530 web-page: Use GimpIntComboBox and avoid a lot of excess code @@ -37321,7 +38221,7 @@ commit b75b7de0647d1ab63e4b1465dcdcbfb2cea86b0a Author: Michael Natterer -Date: Sun Apr 10 03:46:02 2011 +0200 +Date: Sun Apr 10 03:46:02 2011 +0200 app: fix drawing artifacts in GimpCanvasRectangle @@ -37335,7 +38235,7 @@ commit cad5c1e2fb8c28516bd775c325c7eb78fc5ccac3 Author: Michael Natterer -Date: Sun Apr 10 03:44:49 2011 +0200 +Date: Sun Apr 10 03:44:49 2011 +0200 app: indentation in GimpCanvasArc @@ -37344,7 +38244,7 @@ commit c2156778764025144a7f86358f613ca812fd2ce4 Author: Michael Natterer -Date: Sun Apr 10 02:00:40 2011 +0200 +Date: Sun Apr 10 02:00:40 2011 +0200 libgimpwidgets: turn GimpRuler into a no-window widget @@ -37356,7 +38256,7 @@ commit 30a45c05e48918b1855b83a1dae4140c1fc9f421 Author: Michael Natterer -Date: Sat Apr 9 23:15:23 2011 +0200 +Date: Sat Apr 9 23:15:23 2011 +0200 app: turn double buffering off/on when filling/emptying the display @@ -37364,13 +38264,13 @@ have full control over buffering when we are rendering images, but let GTK+ handle a flicker-free wilber itself. - app/display/gimpcanvas.c | 1 - + app/display/gimpcanvas.c | 1 - app/display/gimpdisplayshell.c | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) commit 22bcec1818e06af7a493e022fce69de3da36eb0b Author: Ville Pätsi -Date: Sat Apr 9 23:13:38 2011 +0300 +Date: Sat Apr 9 23:13:38 2011 +0300 INSTALL: Update required library versions @@ -37379,7 +38279,7 @@ commit 1a9434cef1a9bd3d7e3c719f3f8a3fceab358fe7 Author: Michael Natterer -Date: Sat Apr 9 21:04:40 2011 +0200 +Date: Sat Apr 9 21:04:40 2011 +0200 app: set the rulers as track widgets for each other @@ -37391,7 +38291,7 @@ commit 7415ef3a8e7a3b579f2834e2520ac55e40ad4103 Author: Martin Nordholts -Date: Sat Apr 9 19:12:01 2011 +0200 +Date: Sat Apr 9 19:12:01 2011 +0200 libgimp: Update gimp.def @@ -37400,7 +38300,7 @@ commit d52157b565527c3a024f16cdfbe09a3fcaa1063b Author: Michael Natterer -Date: Sat Apr 9 08:30:23 2011 +0200 +Date: Sat Apr 9 08:30:23 2011 +0200 Bug 647235 - app/widgets/gimpcairo-wilber.c parses path data every time @@ -37413,17 +38313,17 @@ commit 918a254f3f50f5affae8c0418e2e4c9592805570 Author: Michael Natterer -Date: Fri Apr 8 21:34:00 2011 +0200 +Date: Fri Apr 8 21:34:00 2011 +0200 devel-docs: fix the build, and micro doc updates devel-docs/app/app-sections.txt | 17 +++++++++-------- - devel-docs/app/app.types | 2 +- + devel-docs/app/app.types | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) commit 3ab59f1bff865a1f0e50b23a09dc4f7f4220b038 Author: Michael Natterer -Date: Fri Apr 8 21:22:55 2011 +0200 +Date: Fri Apr 8 21:22:55 2011 +0200 app: don't try to add a NULL boundary to GimpBrush's boundary cache @@ -37432,7 +38332,7 @@ commit 6e65d1a3920a1ab6f6500102736d4ffba9b4a7c0 Author: Michael Natterer -Date: Fri Apr 8 21:18:39 2011 +0200 +Date: Fri Apr 8 21:18:39 2011 +0200 app: coding styls cleanup in core/gimpbrush-transform.[ch] @@ -37443,7 +38343,7 @@ commit 5562f840b61cb86ad4e4a937df7fb956357287bb Author: Michael Natterer -Date: Fri Apr 8 20:53:17 2011 +0200 +Date: Fri Apr 8 20:53:17 2011 +0200 Bug 646718 - gimp_curve_set_curve: assertion `y >= 0 && y <= 1.0' failed @@ -37457,190 +38357,190 @@ commit 8c4d99f883b13a248fd57d414bb130331b4042a3 Author: Michael Natterer -Date: Fri Apr 8 20:31:34 2011 +0200 +Date: Fri Apr 8 20:31:34 2011 +0200 Bug 645456 - Inconsistent window (role) naming scheme Applied patch from Christoph Kappel which adds a "gimp-" prefix to all plug-in dialog window roles. - plug-ins/color-rotate/color-rotate-dialog.c | 2 +- - plug-ins/color-rotate/color-rotate.h | 1 + - plug-ins/common/alien-map.c | 3 ++- - plug-ins/common/align-layers.c | 3 ++- - plug-ins/common/animation-play.c | 1 + - plug-ins/common/apply-canvas.c | 3 ++- - plug-ins/common/blinds.c | 3 ++- - plug-ins/common/blur-gauss-selective.c | 3 ++- - plug-ins/common/blur-gauss.c | 3 ++- - plug-ins/common/blur-motion.c | 3 ++- - plug-ins/common/border-average.c | 3 ++- - plug-ins/common/bump-map.c | 3 ++- - plug-ins/common/cartoon.c | 3 ++- - plug-ins/common/channel-mixer.c | 3 ++- - plug-ins/common/checkerboard.c | 3 ++- - plug-ins/common/cml-explorer.c | 5 +++-- - plug-ins/common/color-cube-analyze.c | 3 ++- - plug-ins/common/color-exchange.c | 3 ++- - plug-ins/common/color-to-alpha.c | 3 ++- - plug-ins/common/colorify.c | 3 ++- - plug-ins/common/colormap-remap.c | 3 ++- - plug-ins/common/compose.c | 3 ++- - plug-ins/common/contrast-retinex.c | 3 ++- - plug-ins/common/convolution-matrix.c | 3 ++- - plug-ins/common/cubism.c | 3 ++- - plug-ins/common/curve-bend.c | 3 ++- - plug-ins/common/decompose.c | 3 ++- - plug-ins/common/deinterlace.c | 3 ++- - plug-ins/common/depth-merge.c | 3 ++- - plug-ins/common/despeckle.c | 3 ++- - plug-ins/common/destripe.c | 3 ++- - plug-ins/common/diffraction.c | 3 ++- - plug-ins/common/displace.c | 3 ++- - plug-ins/common/edge-dog.c | 3 ++- - plug-ins/common/edge-laplace.c | 1 + - plug-ins/common/edge-neon.c | 3 ++- - plug-ins/common/edge-sobel.c | 3 ++- - plug-ins/common/edge.c | 3 ++- - plug-ins/common/emboss.c | 3 ++- - plug-ins/common/engrave.c | 3 ++- - plug-ins/common/file-aa.c | 1 + - plug-ins/common/file-cel.c | 1 + - plug-ins/common/file-csource.c | 1 + - plug-ins/common/file-desktop-link.c | 1 + - plug-ins/common/file-dicom.c | 1 + - plug-ins/common/file-gbr.c | 1 + - plug-ins/common/file-gif-save.c | 1 + - plug-ins/common/file-gih.c | 1 + - plug-ins/common/file-header.c | 1 + - plug-ins/common/file-html-table.c | 1 + - plug-ins/common/file-mng.c | 1 + - plug-ins/common/file-pat.c | 1 + - plug-ins/common/file-pcx.c | 1 + - plug-ins/common/file-pdf-load.c | 3 ++- - plug-ins/common/file-pdf-save.c | 5 +++-- - plug-ins/common/file-pix.c | 1 + - plug-ins/common/file-png.c | 1 + - plug-ins/common/file-pnm.c | 1 + - plug-ins/common/file-ps.c | 3 ++- - plug-ins/common/file-psp.c | 1 + - plug-ins/common/file-raw.c | 3 ++- - plug-ins/common/file-sunras.c | 1 + - plug-ins/common/file-svg.c | 3 ++- - plug-ins/common/file-tga.c | 1 + - plug-ins/common/file-tiff-load.c | 3 ++- - plug-ins/common/file-tiff-save.c | 1 + - plug-ins/common/file-wmf.c | 3 ++- - plug-ins/common/file-xbm.c | 1 + - plug-ins/common/file-xmc.c | 1 + - plug-ins/common/file-xpm.c | 1 + - plug-ins/common/file-xwd.c | 1 + - plug-ins/common/film.c | 3 ++- - plug-ins/common/filter-pack.c | 3 ++- - plug-ins/common/fractal-trace.c | 3 ++- - plug-ins/common/gradient-map.c | 1 + - plug-ins/common/grid.c | 3 ++- - plug-ins/common/hot.c | 3 ++- - plug-ins/common/illusion.c | 3 ++- - plug-ins/common/iwarp.c | 3 ++- - plug-ins/common/jigsaw.c | 3 ++- - plug-ins/common/lcms.c | 5 +++-- - plug-ins/common/lens-apply.c | 3 ++- - plug-ins/common/lens-distortion.c | 3 ++- - plug-ins/common/lens-flare.c | 3 ++- - plug-ins/common/mail.c | 3 ++- - plug-ins/common/max-rgb.c | 3 ++- - plug-ins/common/mosaic.c | 3 ++- - plug-ins/common/newsprint.c | 3 ++- - plug-ins/common/nl-filter.c | 3 ++- - plug-ins/common/noise-hsv.c | 3 ++- - plug-ins/common/noise-randomize.c | 3 ++- - plug-ins/common/noise-rgb.c | 3 ++- - plug-ins/common/noise-solid.c | 3 ++- - plug-ins/common/noise-spread.c | 3 ++- - plug-ins/common/nova.c | 3 ++- - plug-ins/common/oilify.c | 3 ++- - plug-ins/common/photocopy.c | 3 ++- - plug-ins/common/pixelize.c | 3 ++- - plug-ins/common/plasma.c | 3 ++- - plug-ins/common/plugin-browser.c | 3 ++- - plug-ins/common/polar-coords.c | 3 ++- - plug-ins/common/procedure-browser.c | 1 + - plug-ins/common/qbist.c | 3 ++- - plug-ins/common/red-eye-removal.c | 3 ++- - plug-ins/common/ripple.c | 3 ++- - plug-ins/common/sample-colorize.c | 3 ++- - plug-ins/common/screenshot.c | 3 ++- - plug-ins/common/sharpen.c | 3 ++- - plug-ins/common/shift.c | 3 ++- - plug-ins/common/sinus.c | 3 ++- - plug-ins/common/smooth-palette.c | 3 ++- - plug-ins/common/softglow.c | 3 ++- - plug-ins/common/sparkle.c | 3 ++- - plug-ins/common/sphere-designer.c | 3 ++- - plug-ins/common/threshold-alpha.c | 3 ++- - plug-ins/common/tile-glass.c | 3 ++- - plug-ins/common/tile-paper.c | 3 ++- - plug-ins/common/tile-small.c | 3 ++- - plug-ins/common/tile.c | 3 ++- - plug-ins/common/unit-editor.c | 5 +++-- - plug-ins/common/unsharp-mask.c | 3 ++- - plug-ins/common/value-propagate.c | 3 ++- - plug-ins/common/van-gogh-lic.c | 3 ++- - plug-ins/common/video.c | 3 ++- - plug-ins/common/warp.c | 3 ++- - plug-ins/common/waves.c | 3 ++- - plug-ins/common/web-browser.c | 1 + - plug-ins/common/web-page.c | 3 ++- - plug-ins/common/whirl-pinch.c | 3 ++- - plug-ins/common/wind.c | 3 ++- - plug-ins/file-bmp/bmp.h | 1 + - plug-ins/file-fits/fits.c | 3 ++- - plug-ins/file-fli/fli-gimp.c | 3 ++- - plug-ins/file-ico/ico.h | 1 + - plug-ins/file-jpeg/jpeg-exif.c | 2 +- - plug-ins/file-jpeg/jpeg.h | 1 + - plug-ins/file-psd/psd-save.c | 1 + - plug-ins/file-psd/psd.h | 1 + - plug-ins/file-sgi/sgi.c | 1 + - plug-ins/file-uri/uri.c | 1 + - plug-ins/file-xjt/xjt.c | 1 + - plug-ins/flame/flame.c | 5 +++-- + plug-ins/color-rotate/color-rotate-dialog.c | 2 +- + plug-ins/color-rotate/color-rotate.h | 1 + + plug-ins/common/alien-map.c | 3 ++- + plug-ins/common/align-layers.c | 3 ++- + plug-ins/common/animation-play.c | 1 + + plug-ins/common/apply-canvas.c | 3 ++- + plug-ins/common/blinds.c | 3 ++- + plug-ins/common/blur-gauss-selective.c | 3 ++- + plug-ins/common/blur-gauss.c | 3 ++- + plug-ins/common/blur-motion.c | 3 ++- + plug-ins/common/border-average.c | 3 ++- + plug-ins/common/bump-map.c | 3 ++- + plug-ins/common/cartoon.c | 3 ++- + plug-ins/common/channel-mixer.c | 3 ++- + plug-ins/common/checkerboard.c | 3 ++- + plug-ins/common/cml-explorer.c | 5 +++-- + plug-ins/common/color-cube-analyze.c | 3 ++- + plug-ins/common/color-exchange.c | 3 ++- + plug-ins/common/color-to-alpha.c | 3 ++- + plug-ins/common/colorify.c | 3 ++- + plug-ins/common/colormap-remap.c | 3 ++- + plug-ins/common/compose.c | 3 ++- + plug-ins/common/contrast-retinex.c | 3 ++- + plug-ins/common/convolution-matrix.c | 3 ++- + plug-ins/common/cubism.c | 3 ++- + plug-ins/common/curve-bend.c | 3 ++- + plug-ins/common/decompose.c | 3 ++- + plug-ins/common/deinterlace.c | 3 ++- + plug-ins/common/depth-merge.c | 3 ++- + plug-ins/common/despeckle.c | 3 ++- + plug-ins/common/destripe.c | 3 ++- + plug-ins/common/diffraction.c | 3 ++- + plug-ins/common/displace.c | 3 ++- + plug-ins/common/edge-dog.c | 3 ++- + plug-ins/common/edge-laplace.c | 1 + + plug-ins/common/edge-neon.c | 3 ++- + plug-ins/common/edge-sobel.c | 3 ++- + plug-ins/common/edge.c | 3 ++- + plug-ins/common/emboss.c | 3 ++- + plug-ins/common/engrave.c | 3 ++- + plug-ins/common/file-aa.c | 1 + + plug-ins/common/file-cel.c | 1 + + plug-ins/common/file-csource.c | 1 + + plug-ins/common/file-desktop-link.c | 1 + + plug-ins/common/file-dicom.c | 1 + + plug-ins/common/file-gbr.c | 1 + + plug-ins/common/file-gif-save.c | 1 + + plug-ins/common/file-gih.c | 1 + + plug-ins/common/file-header.c | 1 + + plug-ins/common/file-html-table.c | 1 + + plug-ins/common/file-mng.c | 1 + + plug-ins/common/file-pat.c | 1 + + plug-ins/common/file-pcx.c | 1 + + plug-ins/common/file-pdf-load.c | 3 ++- + plug-ins/common/file-pdf-save.c | 5 +++-- + plug-ins/common/file-pix.c | 1 + + plug-ins/common/file-png.c | 1 + + plug-ins/common/file-pnm.c | 1 + + plug-ins/common/file-ps.c | 3 ++- + plug-ins/common/file-psp.c | 1 + + plug-ins/common/file-raw.c | 3 ++- + plug-ins/common/file-sunras.c | 1 + + plug-ins/common/file-svg.c | 3 ++- + plug-ins/common/file-tga.c | 1 + + plug-ins/common/file-tiff-load.c | 3 ++- + plug-ins/common/file-tiff-save.c | 1 + + plug-ins/common/file-wmf.c | 3 ++- + plug-ins/common/file-xbm.c | 1 + + plug-ins/common/file-xmc.c | 1 + + plug-ins/common/file-xpm.c | 1 + + plug-ins/common/file-xwd.c | 1 + + plug-ins/common/film.c | 3 ++- + plug-ins/common/filter-pack.c | 3 ++- + plug-ins/common/fractal-trace.c | 3 ++- + plug-ins/common/gradient-map.c | 1 + + plug-ins/common/grid.c | 3 ++- + plug-ins/common/hot.c | 3 ++- + plug-ins/common/illusion.c | 3 ++- + plug-ins/common/iwarp.c | 3 ++- + plug-ins/common/jigsaw.c | 3 ++- + plug-ins/common/lcms.c | 5 +++-- + plug-ins/common/lens-apply.c | 3 ++- + plug-ins/common/lens-distortion.c | 3 ++- + plug-ins/common/lens-flare.c | 3 ++- + plug-ins/common/mail.c | 3 ++- + plug-ins/common/max-rgb.c | 3 ++- + plug-ins/common/mosaic.c | 3 ++- + plug-ins/common/newsprint.c | 3 ++- + plug-ins/common/nl-filter.c | 3 ++- + plug-ins/common/noise-hsv.c | 3 ++- + plug-ins/common/noise-randomize.c | 3 ++- + plug-ins/common/noise-rgb.c | 3 ++- + plug-ins/common/noise-solid.c | 3 ++- + plug-ins/common/noise-spread.c | 3 ++- + plug-ins/common/nova.c | 3 ++- + plug-ins/common/oilify.c | 3 ++- + plug-ins/common/photocopy.c | 3 ++- + plug-ins/common/pixelize.c | 3 ++- + plug-ins/common/plasma.c | 3 ++- + plug-ins/common/plugin-browser.c | 3 ++- + plug-ins/common/polar-coords.c | 3 ++- + plug-ins/common/procedure-browser.c | 1 + + plug-ins/common/qbist.c | 3 ++- + plug-ins/common/red-eye-removal.c | 3 ++- + plug-ins/common/ripple.c | 3 ++- + plug-ins/common/sample-colorize.c | 3 ++- + plug-ins/common/screenshot.c | 3 ++- + plug-ins/common/sharpen.c | 3 ++- + plug-ins/common/shift.c | 3 ++- + plug-ins/common/sinus.c | 3 ++- + plug-ins/common/smooth-palette.c | 3 ++- + plug-ins/common/softglow.c | 3 ++- + plug-ins/common/sparkle.c | 3 ++- + plug-ins/common/sphere-designer.c | 3 ++- + plug-ins/common/threshold-alpha.c | 3 ++- + plug-ins/common/tile-glass.c | 3 ++- + plug-ins/common/tile-paper.c | 3 ++- + plug-ins/common/tile-small.c | 3 ++- + plug-ins/common/tile.c | 3 ++- + plug-ins/common/unit-editor.c | 5 +++-- + plug-ins/common/unsharp-mask.c | 3 ++- + plug-ins/common/value-propagate.c | 3 ++- + plug-ins/common/van-gogh-lic.c | 3 ++- + plug-ins/common/video.c | 3 ++- + plug-ins/common/warp.c | 3 ++- + plug-ins/common/waves.c | 3 ++- + plug-ins/common/web-browser.c | 1 + + plug-ins/common/web-page.c | 3 ++- + plug-ins/common/whirl-pinch.c | 3 ++- + plug-ins/common/wind.c | 3 ++- + plug-ins/file-bmp/bmp.h | 1 + + plug-ins/file-fits/fits.c | 3 ++- + plug-ins/file-fli/fli-gimp.c | 3 ++- + plug-ins/file-ico/ico.h | 1 + + plug-ins/file-jpeg/jpeg-exif.c | 2 +- + plug-ins/file-jpeg/jpeg.h | 1 + + plug-ins/file-psd/psd-save.c | 1 + + plug-ins/file-psd/psd.h | 1 + + plug-ins/file-sgi/sgi.c | 1 + + plug-ins/file-uri/uri.c | 1 + + plug-ins/file-xjt/xjt.c | 1 + + plug-ins/flame/flame.c | 5 +++-- plug-ins/fractal-explorer/fractal-explorer-dialogs.c | 2 +- - plug-ins/fractal-explorer/fractal-explorer.c | 2 +- - plug-ins/fractal-explorer/fractal-explorer.h | 1 + - plug-ins/gfig/gfig-dialog.c | 6 +++--- - plug-ins/gfig/gfig.h | 1 + - plug-ins/gimpressionist/gimpressionist.c | 2 +- - plug-ins/gimpressionist/gimpressionist.h | 1 + - plug-ins/gimpressionist/orientmap.c | 2 +- - plug-ins/gimpressionist/presets.c | 2 +- - plug-ins/gimpressionist/sizemap.c | 2 +- - plug-ins/gradient-flare/gradient-flare.c | 5 +++-- - plug-ins/help-browser/help-browser.c | 1 + - plug-ins/ifs-compose/ifs-compose.c | 5 +++-- - plug-ins/imagemap/imap_default_dialog.c | 2 +- - plug-ins/imagemap/imap_main.h | 1 + - plug-ins/lighting/lighting-main.h | 1 + - plug-ins/lighting/lighting-ui.c | 2 +- - plug-ins/map-object/map-object-main.h | 1 + - plug-ins/map-object/map-object-ui.c | 2 +- - plug-ins/maze/maze-dialog.c | 2 +- - plug-ins/maze/maze.h | 1 + - plug-ins/metadata/interface.c | 2 +- - plug-ins/metadata/metadata.h | 1 + - plug-ins/pagecurl/pagecurl.c | 3 ++- - plug-ins/print/print.c | 1 + - plug-ins/script-fu/script-fu-console.c | 2 +- - plug-ins/script-fu/script-fu-interface.c | 2 +- - plug-ins/script-fu/script-fu-server.c | 2 +- + plug-ins/fractal-explorer/fractal-explorer.c | 2 +- + plug-ins/fractal-explorer/fractal-explorer.h | 1 + + plug-ins/gfig/gfig-dialog.c | 6 +++--- + plug-ins/gfig/gfig.h | 1 + + plug-ins/gimpressionist/gimpressionist.c | 2 +- + plug-ins/gimpressionist/gimpressionist.h | 1 + + plug-ins/gimpressionist/orientmap.c | 2 +- + plug-ins/gimpressionist/presets.c | 2 +- + plug-ins/gimpressionist/sizemap.c | 2 +- + plug-ins/gradient-flare/gradient-flare.c | 5 +++-- + plug-ins/help-browser/help-browser.c | 1 + + plug-ins/ifs-compose/ifs-compose.c | 5 +++-- + plug-ins/imagemap/imap_default_dialog.c | 2 +- + plug-ins/imagemap/imap_main.h | 1 + + plug-ins/lighting/lighting-main.h | 1 + + plug-ins/lighting/lighting-ui.c | 2 +- + plug-ins/map-object/map-object-main.h | 1 + + plug-ins/map-object/map-object-ui.c | 2 +- + plug-ins/maze/maze-dialog.c | 2 +- + plug-ins/maze/maze.h | 1 + + plug-ins/metadata/interface.c | 2 +- + plug-ins/metadata/metadata.h | 1 + + plug-ins/pagecurl/pagecurl.c | 3 ++- + plug-ins/print/print.c | 1 + + plug-ins/script-fu/script-fu-console.c | 2 +- + plug-ins/script-fu/script-fu-interface.c | 2 +- + plug-ins/script-fu/script-fu-server.c | 2 +- plug-ins/selection-to-path/selection-to-path.c | 3 ++- - plug-ins/win-snap/winsnap.c | 3 ++- + plug-ins/win-snap/winsnap.c | 3 ++- 172 files changed, 288 insertions(+), 133 deletions(-) commit 77b76ca945da93650ba2642eba2c4e4c6f868606 Author: Mukund Sivaraman -Date: Fri Apr 8 18:33:42 2011 +0530 +Date: Fri Apr 8 18:33:42 2011 +0530 web-page: Update progress to 1.0 when complete @@ -37649,7 +38549,7 @@ commit 335047fc7f9d5139d4da979b4c57f0a0b9da42c5 Author: Mukund Sivaraman -Date: Fri Apr 8 18:08:06 2011 +0530 +Date: Fri Apr 8 18:08:06 2011 +0530 web-page: Fix use of deprecated API @@ -37658,7 +38558,7 @@ commit 71541db52dc48958d68e481aa00bf4138d00ed17 Author: Mikael Magnusson -Date: Fri Apr 8 13:37:32 2011 +0200 +Date: Fri Apr 8 13:37:32 2011 +0200 app: Make scale timer output depend on GIMP_UNSTABLE @@ -37667,17 +38567,17 @@ commit 61476aa20a1a1f7e75f73ff6d7f4e25b0b3a25f9 Author: Mikael Magnusson -Date: Fri Apr 8 03:09:15 2011 +0200 +Date: Fri Apr 8 03:09:15 2011 +0200 Remove two stray semicolons making if bodies always run - app/actions/window-commands.c | 2 +- + app/actions/window-commands.c | 2 +- plug-ins/pygimp/pygimp-vectors.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit cabb6ab4d9672ce7419abbdf6df1f559593369d9 Author: Michael Natterer -Date: Fri Apr 8 12:30:50 2011 +0200 +Date: Fri Apr 8 12:30:50 2011 +0200 app: add the GdkPixbuf and Cairo versions to the output of "gimp -v" @@ -37686,7 +38586,7 @@ commit a5204631f34d0c108a13289985d2c369be65980e Author: Martin Nordholts -Date: Fri Apr 8 08:01:48 2011 +0200 +Date: Fri Apr 8 08:01:48 2011 +0200 app/tests: Use plug-ins from build dir, in particular file-png @@ -37701,7 +38601,7 @@ commit 5f48111af98f05fdab2d7c944d28ddd7fb9d2174 Author: Martin Nordholts -Date: Fri Apr 8 07:58:28 2011 +0200 +Date: Fri Apr 8 07:58:28 2011 +0200 app: Support using plug-ins from build dir @@ -37717,7 +38617,7 @@ commit bf1eca22a6ae9a06f5a91635eef3277c1a0d8ba7 Author: Kevin Cozens -Date: Thu Apr 7 21:57:22 2011 -0400 +Date: Thu Apr 7 21:57:22 2011 -0400 Added PDB procedure gimp-context-set-defaults to reset context settings @@ -37731,13 +38631,13 @@ commit 0d617dabea6efbb8c7e90c6eb253ca9891d0c209 Author: Kevin Cozens -Date: Thu Apr 7 11:38:24 2011 -0400 +Date: Thu Apr 7 11:38:24 2011 -0400 Fixed a typo (prodecure -> procedure) - app/pdb/image-select-cmds.c | 14 +++++++------- - app/pdb/item-transform-cmds.c | 18 +++++++++--------- - libgimp/gimpimageselect_pdb.c | 14 +++++++------- + app/pdb/image-select-cmds.c | 14 +++++++------- + app/pdb/item-transform-cmds.c | 18 +++++++++--------- + libgimp/gimpimageselect_pdb.c | 14 +++++++------- libgimp/gimpitemtransform_pdb.c | 18 +++++++++--------- tools/pdbgen/pdb/image_select.pdb | 14 +++++++------- tools/pdbgen/pdb/item_transform.pdb | 18 +++++++++--------- @@ -37745,22 +38645,22 @@ commit fcbc5eebebbf433ed005297aca3219d40ef58e97 Author: Michael Natterer -Date: Thu Apr 7 23:48:08 2011 +0200 +Date: Thu Apr 7 23:48:08 2011 +0200 app: add an edit button the the tool options' brush etc. selectors which makes getting to the editor dialogs much easier. - app/tools/gimpblendoptions.c | 3 +- + app/tools/gimpblendoptions.c | 3 +- app/tools/gimppaintoptions-gui.c | 9 ++- - app/widgets/gimpviewablebox.c | 126 + app/widgets/gimpviewablebox.c | 126 +++++++++++++++++++++++++++++++-------- - app/widgets/gimpviewablebox.h | 12 ++-- + app/widgets/gimpviewablebox.h | 12 ++-- 4 files changed, 117 insertions(+), 33 deletions(-) commit 4a73ac68693c647ed601cc65fab4059189d3e0c9 Author: Michael Natterer -Date: Thu Apr 7 23:47:27 2011 +0200 +Date: Thu Apr 7 23:47:27 2011 +0200 app: add a newline @@ -37769,7 +38669,7 @@ commit 3298b53d7f2b67f515ccdfb4259c7b5a43b581f6 Author: Martin Nordholts -Date: Tue Mar 15 18:31:20 2011 +0100 +Date: Tue Mar 15 18:31:20 2011 +0100 Temporarily remove View -> Use GEGL @@ -37781,7 +38681,7 @@ commit 6b5e495841002ae3575ca2421a2dc015e403ec68 Author: Martin Nordholts -Date: Tue Mar 15 08:20:32 2011 +0100 +Date: Tue Mar 15 08:20:32 2011 +0100 app: Remove comments about cachelines in GimpDisplayShell @@ -37793,21 +38693,21 @@ commit 3b243bdcfe7e3bf703cf66ad785d0236e62b0ca4 Author: Martin Nordholts -Date: Tue Mar 15 08:18:48 2011 +0100 +Date: Tue Mar 15 08:18:48 2011 +0100 app: Add gimp_display_get_action_name() utility function - app/actions/windows-actions.c | 7 +++--- - app/display/Makefile.am | 2 ++ + app/actions/windows-actions.c | 7 +++--- + app/display/Makefile.am | 2 ++ app/display/gimpdisplay-utils.c | 48 +++++++++++++++++++++++++++++++++++++++++ app/display/gimpdisplay-utils.h | 28 ++++++++++++++++++++++++ - app/menus/windows-menu.c | 4 ++-- + app/menus/windows-menu.c | 4 ++-- 5 files changed, 83 insertions(+), 6 deletions(-) commit 5cea6b067fa9fb9649b058cf8c22d4822de5eaf3 Author: Mikael Magnusson -Date: Wed Apr 6 23:49:34 2011 +0200 +Date: Wed Apr 6 23:49:34 2011 +0200 Alias the icon for mouse controller to gimp-cursor for now @@ -37816,7 +38716,7 @@ commit b00cb3be79a39e4e234f26a902db4b314bab46d2 Author: Mikael Magnusson -Date: Wed Apr 6 23:40:56 2011 +0200 +Date: Wed Apr 6 23:40:56 2011 +0200 Remove stray semicolon @@ -37825,27 +38725,27 @@ commit ac403ce11d15fd74747b14a46f4eef2a6821d85b Author: Mikael Magnusson -Date: Wed Apr 6 23:12:32 2011 +0200 +Date: Wed Apr 6 23:12:32 2011 +0200 Add a controller for binding mouse buttons app/display/gimpdisplayshell-tool-events.c | 12 ++ - app/widgets/Makefile.am | 2 + - app/widgets/gimpcontrollerlist.c | 12 ++ - app/widgets/gimpcontrollermouse.c | 306 + app/widgets/Makefile.am | 2 + + app/widgets/gimpcontrollerlist.c | 12 ++ + app/widgets/gimpcontrollermouse.c | 306 +++++++++++++++++++++++++++++ - app/widgets/gimpcontrollermouse.h | 57 ++++++ - app/widgets/gimpcontrollers.c | 19 ++ - app/widgets/gimpcontrollers.h | 1 + - app/widgets/gimphelp-ids.h | 1 + - app/widgets/widgets-types.h | 1 + - libgimpwidgets/gimpstock.h | 1 + - po/POTFILES.in | 1 + + app/widgets/gimpcontrollermouse.h | 57 ++++++ + app/widgets/gimpcontrollers.c | 19 ++ + app/widgets/gimpcontrollers.h | 1 + + app/widgets/gimphelp-ids.h | 1 + + app/widgets/widgets-types.h | 1 + + libgimpwidgets/gimpstock.h | 1 + + po/POTFILES.in | 1 + 11 files changed, 413 insertions(+) commit 7fae1b3c50fb18303bb5b4b612f1ff1263425d65 Author: Michael Natterer -Date: Wed Apr 6 22:50:20 2011 +0200 +Date: Wed Apr 6 22:50:20 2011 +0200 app: update the tool's state after the wheel controller has handled the event @@ -37856,7 +38756,7 @@ commit febc1da4be436155fd3f9bb050fbed13f999106f Author: Michael Natterer -Date: Wed Apr 6 22:44:08 2011 +0200 +Date: Wed Apr 6 22:44:08 2011 +0200 app: ignore button 1 release if we have no pointer grab @@ -37867,7 +38767,7 @@ commit 14d30fd7957b6290102dd4ef38ae437c7050e747 Author: Michael Natterer -Date: Wed Apr 6 22:30:44 2011 +0200 +Date: Wed Apr 6 22:30:44 2011 +0200 app: ignore button releases while another button's action is going on @@ -37879,7 +38779,7 @@ commit 754d45c357b780861112cde7f6179b2486d5b7ff Author: Michael Natterer -Date: Wed Apr 6 21:35:29 2011 +0200 +Date: Wed Apr 6 21:35:29 2011 +0200 app: completely ignore focus change events while we have a grab @@ -37893,7 +38793,7 @@ commit 18286d29ecd50451866a3bf66229cf150ea2ea52 Author: Martin Nordholts -Date: Wed Apr 6 21:05:13 2011 +0200 +Date: Wed Apr 6 21:05:13 2011 +0200 app/tests: Use gdk_window_get_display() @@ -37905,7 +38805,7 @@ commit cb6b821c70251ebfa298aff3e6d570c31504fe27 Author: Michael Natterer -Date: Wed Apr 6 20:40:26 2011 +0200 +Date: Wed Apr 6 20:40:26 2011 +0200 app: tool_manager: correctly preserve tool state across a push/pop @@ -37920,7 +38820,7 @@ commit 9778b6a4400cc33ab412e751297c02cf48923078 Author: Michael Natterer -Date: Wed Apr 6 20:33:23 2011 +0200 +Date: Wed Apr 6 20:33:23 2011 +0200 app: GimpEditSelectionTool: activate the tool *after* pushing it @@ -37932,7 +38832,7 @@ commit b659aec9a742b02c57117d85b5020939cc89decc Author: Michael Natterer -Date: Wed Apr 6 20:30:29 2011 +0200 +Date: Wed Apr 6 20:30:29 2011 +0200 app: GimpMoveTool: activate the tool before starting GimpEditSelectionTool @@ -37945,7 +38845,7 @@ commit 3eb096b239a893181ed6a3a635858be554ea14bf Author: Mikael Magnusson -Date: Wed Apr 6 20:18:14 2011 +0200 +Date: Wed Apr 6 20:18:14 2011 +0200 Revert "libgimpwidgets: avoid using a function only available since GTK+ 2.22" @@ -37959,7 +38859,7 @@ commit 24ee3370b839fcedd902f9b6e03b54b0a565f76c Author: Michael Natterer -Date: Wed Apr 6 19:58:24 2011 +0200 +Date: Wed Apr 6 19:58:24 2011 +0200 Depend on GTK+ >= 2.24.3, cairo >= 1.20.1, gdk-pixbuf >= 2.22.1 @@ -37968,40 +38868,40 @@ all sorts of conditional compiling based on GDK_CHECK_VERSION() and CAIRO_VERSION. - app/display/display-types.h | 17 -------------- - app/display/gimpdisplayshell-expose.c | 33 +++++++++++---------------- - app/gui/gui.c | 4 ++-- - app/sanity.c | 39 + app/display/display-types.h | 17 -------------- + app/display/gimpdisplayshell-expose.c | 33 +++++++++++---------------- + app/gui/gui.c | 4 ++-- + app/sanity.c | 39 ++++++++++++++++++++++++++++++-- - app/widgets/gimpoverlaychild.c | 6 ----- - app/widgets/gimpspinscale.c | 8 ------- - app/widgets/gimptagentry.c | 5 ---- - app/widgets/gimpwidgets-utils.c | 11 --------- - configure.ac | 22 ++++++++++++++---- - libgimp/gimpui.c | 11 --------- - libgimpwidgets/gimppropwidgets.c | 7 ------ - libgimpwidgets/gimpruler.c | 10 -------- - plug-ins/common/animation-play.c | 16 ------------- - plug-ins/common/file-gih.c | 9 -------- - plug-ins/common/file-ps.c | 8 ------- - plug-ins/common/screenshot.c | 4 ---- + app/widgets/gimpoverlaychild.c | 6 ----- + app/widgets/gimpspinscale.c | 8 ------- + app/widgets/gimptagentry.c | 5 ---- + app/widgets/gimpwidgets-utils.c | 11 --------- + configure.ac | 22 ++++++++++++++---- + libgimp/gimpui.c | 11 --------- + libgimpwidgets/gimppropwidgets.c | 7 ------ + libgimpwidgets/gimpruler.c | 10 -------- + plug-ins/common/animation-play.c | 16 ------------- + plug-ins/common/file-gih.c | 9 -------- + plug-ins/common/file-ps.c | 8 ------- + plug-ins/common/screenshot.c | 4 ---- plug-ins/script-fu/script-fu-interface.c | 9 -------- 17 files changed, 69 insertions(+), 150 deletions(-) commit a83876040de71606cc9b2ed2db6ab47fe7390853 Author: Michael Natterer -Date: Wed Apr 6 09:15:50 2011 +0200 +Date: Wed Apr 6 09:15:50 2011 +0200 app: make GimpBrushCache debug spew depend on GIMP_LOG=brush-cache app/core/gimpbrushcache.c | 7 +++++-- - app/gimp-log.c | 3 ++- - app/gimp-log.h | 4 +++- + app/gimp-log.c | 3 ++- + app/gimp-log.h | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) commit 0315f483e6f1b6ed296c959646131a1ce9ebbec6 Author: Michael Natterer -Date: Wed Apr 6 09:11:25 2011 +0200 +Date: Wed Apr 6 09:11:25 2011 +0200 app: some general GimpPaintCore cleanup @@ -38013,7 +38913,7 @@ commit 5c55f8e8976b7b64df49a40716ecd2f4e0d94750 Author: Mukund Sivaraman -Date: Wed Apr 6 11:58:58 2011 +0530 +Date: Wed Apr 6 11:58:58 2011 +0530 app: Fix Alt+0 case when switching tabs @@ -38022,7 +38922,7 @@ commit 110b3daa973c9ad53ee6f1a60d59d67f2da0ba7b Author: Mukund Sivaraman -Date: Wed Apr 6 11:52:10 2011 +0530 +Date: Wed Apr 6 11:52:10 2011 +0530 app: Make alt+[number] switch tabs in single-window mode @@ -38031,7 +38931,7 @@ commit 21b8007b297030f5f44bbba3390891193e807d02 Author: Michael Natterer -Date: Tue Apr 5 22:11:27 2011 +0200 +Date: Tue Apr 5 22:11:27 2011 +0200 app: add GimpBrushCache which stores brush stuff based on transform parameters @@ -38043,23 +38943,23 @@ const qualifiers because GimpBrush returns const pointers now for trasnformed stuff. - app/core/Makefile.am | 2 + - app/core/core-types.h | 1 + + app/core/Makefile.am | 2 + + app/core/core-types.h | 1 + app/core/gimpbrush-boundary.c | 6 +- - app/core/gimpbrush.c | 269 ++++++++++++++++++++++++-------- - app/core/gimpbrush.h | 109 ++++++------- + app/core/gimpbrush.c | 269 ++++++++++++++++++++++++-------- + app/core/gimpbrush.h | 109 ++++++------- app/core/gimpbrushcache.c | 232 ++++++++++++++++++++++++++++ app/core/gimpbrushcache.h | 87 +++++++++++ app/paint/gimpbrushcore.c | 351 ++++++++++++++++-------------------------- app/paint/gimpbrushcore.h | 108 ++++++------- - app/paint/gimpheal.c | 10 +- + app/paint/gimpheal.c | 10 +- app/tools/gimpbrushtool.c | 17 +- 11 files changed, 781 insertions(+), 411 deletions(-) commit 8d5ac2c780be5f32b611de3b4c19677c283c2e37 Author: Michael Natterer -Date: Tue Apr 5 22:10:12 2011 +0200 +Date: Tue Apr 5 22:10:12 2011 +0200 app: make TempBuf parameter of temp_buf_get_data() const @@ -38069,7 +38969,7 @@ commit 67755ab9873bee29ac34c47118057eb27280776c Author: Martin Nordholts -Date: Tue Apr 5 22:00:14 2011 +0200 +Date: Tue Apr 5 22:00:14 2011 +0200 app/tests: Update include for gimp_display_shell_canvas_tool_events() @@ -38078,21 +38978,21 @@ commit e2226e9933cd37fcf494cab18d53563f982634a7 Author: Michael Natterer -Date: Tue Apr 5 19:18:26 2011 +0200 +Date: Tue Apr 5 19:18:26 2011 +0200 app: add gimp_brush_start_use() and gimp_brush_end_use() and use them in GimpBrushCore when setting/unsetting a brush. They will be used for managing some caches inside GimpBrush. - app/core/gimpbrush.c | 22 ++++++++++++++++++++++ - app/core/gimpbrush.h | 5 +++++ + app/core/gimpbrush.c | 22 ++++++++++++++++++++++ + app/core/gimpbrush.h | 5 +++++ app/paint/gimpbrushcore.c | 3 +++ 3 files changed, 30 insertions(+) commit c8c1b4ece67cb9515b98d4c664887aef4034d616 Author: Michael Natterer -Date: Tue Apr 5 19:09:56 2011 +0200 +Date: Tue Apr 5 19:09:56 2011 +0200 app: remove gimp_brush_spacing_changed(), it should never have been public @@ -38103,7 +39003,7 @@ commit a50f668d8784c328ccc8ea50118070cfa70323c9 Author: Michael Natterer -Date: Tue Apr 5 19:05:55 2011 +0200 +Date: Tue Apr 5 19:05:55 2011 +0200 app: GimpBrushCore: simplify brush and dynamics setting @@ -38116,19 +39016,19 @@ commit 054957a1eea994391042095cb3d69ae9bbce73d9 Author: Michael Natterer -Date: Tue Apr 5 15:16:06 2011 +0200 +Date: Tue Apr 5 15:16:06 2011 +0200 app: s/nbrushes/n_brushes/ in GimpBrushPipe - app/core/gimpbrushpipe-load.c | 12 ++++++------ - app/core/gimpbrushpipe.c | 12 ++++++------ - app/core/gimpbrushpipe.h | 2 +- - app/widgets/gimpviewrendererbrush.c | 2 +- + app/core/gimpbrushpipe-load.c | 12 ++++++------ + app/core/gimpbrushpipe.c | 12 ++++++------ + app/core/gimpbrushpipe.h | 2 +- + app/widgets/gimpviewrendererbrush.c | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) commit 7db7cc111ccebb2a02b0bb1450241bc90f05d488 Author: Michael Natterer -Date: Tue Apr 5 14:52:44 2011 +0200 +Date: Tue Apr 5 14:52:44 2011 +0200 app: clean up gimpbrush-boundary.c a bit and prepare for outline approximation @@ -38139,7 +39039,7 @@ commit 7f6d06d3e9338621d3e7fad7cd17e74d6635aa54 Author: Michael Muré -Date: Tue Apr 5 10:18:07 2011 +0200 +Date: Tue Apr 5 10:18:07 2011 +0200 cagetool: fix buffer leak @@ -38148,7 +39048,7 @@ commit 2200b800335c0d0fc52d6a41c39c25ca877dd256 Author: Michael Muré -Date: Mon Apr 4 23:33:53 2011 +0200 +Date: Mon Apr 4 23:33:53 2011 +0200 cagetool: fix the restoration of the image when going back to edit mode @@ -38158,7 +39058,7 @@ commit ec25c6be4297f2a588ce52b5f180502d5c3c44b3 Author: Michael Muré -Date: Mon Apr 4 21:35:18 2011 +0200 +Date: Mon Apr 4 21:35:18 2011 +0200 cage tool: fix transformed area going away when setting a cage, going back to edit mode, edit the cage then going to deform mode @@ -38168,7 +39068,7 @@ commit eda5cdf6662fd87e309bc4922dde239ddef51882 Author: Michael Natterer -Date: Mon Apr 4 22:06:32 2011 +0200 +Date: Mon Apr 4 22:06:32 2011 +0200 app: add gimp_bezier_desc_new_from_bound_segs() to GimpBezierDesc @@ -38183,7 +39083,7 @@ commit 46819a05da14ab89755ec6fa45f00a9c5f5cd8f7 Author: Michael Natterer -Date: Mon Apr 4 21:41:46 2011 +0200 +Date: Mon Apr 4 21:41:46 2011 +0200 app: fix transformation in GimpCanvasPath @@ -38192,7 +39092,7 @@ commit d008fcd588fd123fb411053c0bc835b19f930d46 Author: Michael Natterer -Date: Mon Apr 4 21:24:41 2011 +0200 +Date: Mon Apr 4 21:24:41 2011 +0200 app: remove the entire brush boundary code from GimpBrushCore @@ -38203,7 +39103,7 @@ commit 647a576cd4ad2e39201c683ff1ee442ad66e8f53 Author: Michael Natterer -Date: Mon Apr 4 21:14:57 2011 +0200 +Date: Mon Apr 4 21:14:57 2011 +0200 app: use the new brush boundary API in GimpBrushTool @@ -38213,42 +39113,42 @@ commit cf52b10e9bb9faaf1238e545a7a8c725fdea1ffd Author: Michael Natterer -Date: Mon Apr 4 21:11:39 2011 +0200 +Date: Mon Apr 4 21:11:39 2011 +0200 app: implement gimp_brush_transform_boundary() There is infinite room for optimization, but the API and pixel-perfect functionality is there, which is step one. - app/core/Makefile.am | 2 + + app/core/Makefile.am | 2 + app/core/gimpbrush-boundary.c | 204 ++++++++++++++++++++++++++++++++++++++++++ app/core/gimpbrush-boundary.h | 31 +++++++ - app/core/gimpbrush.c | 14 ++- - app/core/gimpbrush.h | 8 +- + app/core/gimpbrush.c | 14 ++- + app/core/gimpbrush.h | 8 +- 5 files changed, 255 insertions(+), 4 deletions(-) commit 99e0e73fc65eb5b1431dbd27e01027d971c23386 Author: Michael Natterer -Date: Mon Apr 4 20:58:38 2011 +0200 +Date: Mon Apr 4 20:58:38 2011 +0200 app: add "x" and "y" properties to GimpCanvasPath so paths can be rendered at any position. Pass 0,0 from all places that draw GimpVectors. - app/display/gimpcanvaspath.c | 40 + app/display/gimpcanvaspath.c | 40 +++++++++++++++++++++++++++++++-- - app/display/gimpcanvaspath.h | 2 ++ + app/display/gimpcanvaspath.h | 2 ++ app/display/gimpdisplayshell-handlers.c | 1 + - app/tools/gimpdrawtool.c | 6 +++-- - app/tools/gimpdrawtool.h | 4 +++- - app/tools/gimpvectortool.c | 2 +- + app/tools/gimpdrawtool.c | 6 +++-- + app/tools/gimpdrawtool.h | 4 +++- + app/tools/gimpvectortool.c | 2 +- 6 files changed, 49 insertions(+), 6 deletions(-) commit 9e1db5dc92204a3de1af73a2f824b9212e53cf00 Author: Michael Natterer -Date: Mon Apr 4 19:21:25 2011 +0200 +Date: Mon Apr 4 19:21:25 2011 +0200 app: add empty stub gimp_brush_transform_boundary() @@ -38261,7 +39161,7 @@ commit 7d39d800fcdc2f7f69ff23847de081c7fa993218 Author: Michael Natterer -Date: Mon Apr 4 19:20:04 2011 +0200 +Date: Mon Apr 4 19:20:04 2011 +0200 app: GimpColorTool and GimpMoveTool: don't start the draw tool twice @@ -38273,7 +39173,7 @@ commit ac9b487795989c7fe5f279657cdb2651aec7a766 Author: Michael Natterer -Date: Mon Apr 4 18:57:48 2011 +0200 +Date: Mon Apr 4 18:57:48 2011 +0200 app: fix GimpBrush transform parameter names and coding style @@ -38283,28 +39183,24 @@ commit 8b4870dad787705b7441f5742f43442804235030 Author: Michael Natterer -Date: Mon Apr 4 18:40:12 2011 +0200 +Date: Mon Apr 4 18:40:12 2011 +0200 app: move GimpBezierDesc from app/vectors/ to app/core/ - app/core/Makefile.am | 2 ++ - app/core/core-types.h | 18 ++++++++++ - app/core/gimpbezierdesc.c | 78 - ++++++++++++++++++++++++++++++++++++++++++ - app/core/gimpbezierdesc.h | 37 ++++++++++++++++++++ - app/display/gimpcanvaspath.c | 3 +- - app/vectors/Makefile.am | 2 -- - app/vectors/gimpbezierdesc.c | 78 - ------------------------------------------ - app/vectors/gimpbezierdesc.h | 37 -------------------- - app/vectors/gimpbezierstroke.c | 2 +- - app/vectors/gimpvectors.c | 2 +- - app/vectors/vectors-types.h | 20 ++--------- - 11 files changed, 140 insertions(+), 139 deletions(-) + app/core/Makefile.am | 2 ++ + app/core/core-types.h | 18 ++++++++++++++++++ + app/{vectors => core}/gimpbezierdesc.c | 2 +- + app/{vectors => core}/gimpbezierdesc.h | 0 + app/display/gimpcanvaspath.c | 3 +-- + app/vectors/Makefile.am | 2 -- + app/vectors/gimpbezierstroke.c | 2 +- + app/vectors/gimpvectors.c | 2 +- + app/vectors/vectors-types.h | 20 ++------------------ + 9 files changed, 26 insertions(+), 25 deletions(-) commit c65c956b7e318f7d8ad60c61bab6dbae17260ff8 Author: Mukund Sivaraman -Date: Mon Apr 4 18:28:36 2011 +0530 +Date: Mon Apr 4 18:28:36 2011 +0530 Add cscope effects to .gitignore @@ -38313,7 +39209,7 @@ commit 95a32f48b3b4a74ce27d20b5bf298e460c3146dd Author: Mukund Sivaraman -Date: Mon Apr 4 18:07:49 2011 +0530 +Date: Mon Apr 4 18:07:49 2011 +0530 web-page: Use a GtkSizeGroup with labels @@ -38322,7 +39218,7 @@ commit 46e43f739d72ff525ca98f3a323c8c406481062a Author: Michael Natterer -Date: Mon Apr 4 10:36:47 2011 +0200 +Date: Mon Apr 4 10:36:47 2011 +0200 NEWS: catch up until end of october @@ -38331,41 +39227,41 @@ commit 492e0f9cfd64724ef6ab5ef76d6b2db2a1a7e19e Author: Michael Natterer -Date: Mon Apr 4 08:19:12 2011 +0200 +Date: Mon Apr 4 08:19:12 2011 +0200 app: some more mostly cosmetic tool cleanup - app/tools/gimpcroptool.c | 25 +---- - app/tools/gimpcroptool.h | 12 +++ - app/tools/gimpeditselectiontool.c | 11 +- - app/tools/gimpellipseselecttool.c | 5 - - app/tools/gimpfliptool.c | 6 +- - app/tools/gimpfreeselecttool.c | 4 +- - app/tools/gimpfreeselecttool.h | 2 - - app/tools/gimpgegltool.c | 14 +-- - app/tools/gimphealtool.h | 1 - - app/tools/gimpmagnifytool.c | 12 +-- - app/tools/gimpmagnifytool.h | 2 +- - app/tools/gimpmeasuretool.c | 2 +- - app/tools/gimpmovetool.c | 11 +- - app/tools/gimpmovetool.h | 2 +- - app/tools/gimppainttool.h | 14 +-- - app/tools/gimpperspectivetool.c | 5 + - app/tools/gimprectangleselecttool.c | 6 +- - app/tools/gimprectangleselecttool.h | 2 +- - app/tools/gimpsourcetool.c | 7 +- - app/tools/gimpsourcetool.h | 2 +- - app/tools/gimptexttool.h | 2 +- - app/tools/gimptool.h | 204 + app/tools/gimpcroptool.c | 25 +---- + app/tools/gimpcroptool.h | 12 +++ + app/tools/gimpeditselectiontool.c | 11 +- + app/tools/gimpellipseselecttool.c | 5 - + app/tools/gimpfliptool.c | 6 +- + app/tools/gimpfreeselecttool.c | 4 +- + app/tools/gimpfreeselecttool.h | 2 - + app/tools/gimpgegltool.c | 14 +-- + app/tools/gimphealtool.h | 1 - + app/tools/gimpmagnifytool.c | 12 +-- + app/tools/gimpmagnifytool.h | 2 +- + app/tools/gimpmeasuretool.c | 2 +- + app/tools/gimpmovetool.c | 11 +- + app/tools/gimpmovetool.h | 2 +- + app/tools/gimppainttool.h | 14 +-- + app/tools/gimpperspectivetool.c | 5 + + app/tools/gimprectangleselecttool.c | 6 +- + app/tools/gimprectangleselecttool.h | 2 +- + app/tools/gimpsourcetool.c | 7 +- + app/tools/gimpsourcetool.h | 2 +- + app/tools/gimptexttool.h | 2 +- + app/tools/gimptool.h | 204 ++++++++++++++++++------------------ - app/tools/gimptransformtool.h | 2 +- - app/tools/gimpvectortool.c | 1 - - app/tools/gimpvectortool.h | 11 +- + app/tools/gimptransformtool.h | 2 +- + app/tools/gimpvectortool.c | 1 - + app/tools/gimpvectortool.h | 11 +- 25 files changed, 178 insertions(+), 187 deletions(-) commit 39fa147c1793f369ce7f144a4a923c029d717606 Author: Michael Natterer -Date: Mon Apr 4 01:10:44 2011 +0200 +Date: Mon Apr 4 01:10:44 2011 +0200 app: unset GimpSpinScale's context sensitive cursor when the pointer leaves @@ -38376,7 +39272,7 @@ commit d4316902a2d1ab3f83f8be9faae31938f1b27598 Author: Enrico Schröder -Date: Thu Mar 31 22:41:10 2011 +0200 +Date: Thu Mar 31 22:41:10 2011 +0200 app: DodgeBurn/Convolve: Fix error in behavior of modifier keys @@ -38394,36 +39290,36 @@ commit 036c5aff73043b1e0a3e028316c4c140058e5f46 Author: Michael Natterer -Date: Mon Apr 4 00:08:57 2011 +0200 +Date: Mon Apr 4 00:08:57 2011 +0200 app: constify "color" parameter in GimpColorTool::picked() app/tools/gimpcolorpickertool.c | 8 ++++---- - app/tools/gimpcolortool.c | 4 ++-- - app/tools/gimpcolortool.h | 2 +- - app/tools/gimpcurvestool.c | 4 ++-- - app/tools/gimplevelstool.c | 4 ++-- + app/tools/gimpcolortool.c | 4 ++-- + app/tools/gimpcolortool.h | 2 +- + app/tools/gimpcurvestool.c | 4 ++-- + app/tools/gimplevelstool.c | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) commit ea34b145e8cc83bdd9ae1780d886ad067eb6eae1 Author: Michael Natterer -Date: Mon Apr 4 00:01:30 2011 +0200 +Date: Mon Apr 4 00:01:30 2011 +0200 app: some random tool cleanup - app/tools/gimpairbrushtool.c | 2 +- - app/tools/gimpaligntool.c | 4 ++-- - app/tools/gimpblendtool.c | 2 -- + app/tools/gimpairbrushtool.c | 2 +- + app/tools/gimpaligntool.c | 4 ++-- + app/tools/gimpblendtool.c | 2 -- app/tools/gimpbrightnesscontrasttool.c | 1 - - app/tools/gimpbrushtool.c | 6 +++--- - app/tools/gimpbycolorselecttool.c | 4 ++-- - app/tools/gimpcagetool.h | 1 - - app/tools/gimpcolortool.c | 2 +- + app/tools/gimpbrushtool.c | 6 +++--- + app/tools/gimpbycolorselecttool.c | 4 ++-- + app/tools/gimpcagetool.h | 1 - + app/tools/gimpcolortool.c | 2 +- 8 files changed, 9 insertions(+), 13 deletions(-) commit 32c6177c1ecd3b3e90fe95f953af72baddfffed3 Author: Michael Natterer -Date: Sun Apr 3 23:42:26 2011 +0200 +Date: Sun Apr 3 23:42:26 2011 +0200 app: gimp_canvas_sample_point_set(): x and y are integers not doubles @@ -38433,7 +39329,7 @@ commit 70e5cf57a118cb307d04f8f6f2dbf1e626b2756e Author: Michael Natterer -Date: Sun Apr 3 23:32:06 2011 +0200 +Date: Sun Apr 3 23:32:06 2011 +0200 app: move GimpColorPickerTool's shutdown code to control(HALT) @@ -38442,7 +39338,7 @@ commit cd596d43d6b5ed38deb3a586a1a2127cdff5a98a Author: Martin Srebotnjak -Date: Sun Apr 3 19:59:36 2011 +0200 +Date: Sun Apr 3 19:59:36 2011 +0200 Updated Slovenian translation @@ -38452,7 +39348,7 @@ commit 9c02e522ead8a92193a2895a8e10c13986e25cf1 Author: Martin Srebotnjak -Date: Sun Apr 3 19:53:21 2011 +0200 +Date: Sun Apr 3 19:53:21 2011 +0200 Updated Slovenian translation @@ -38462,7 +39358,7 @@ commit 6d73eead5403a5ff253e84e5077f91c0880d9ef7 Author: Michael Natterer -Date: Sun Apr 3 19:34:31 2011 +0200 +Date: Sun Apr 3 19:34:31 2011 +0200 app: emit "notify::tool-options" when GimpToolPreset's options change @@ -38474,7 +39370,7 @@ commit fce5c7ea2623ea491314c4caf1537305f36eea27 Author: Michael Natterer -Date: Sun Apr 3 19:01:13 2011 +0200 +Date: Sun Apr 3 19:01:13 2011 +0200 app: add "gboolean focus_in" to gimp_display_shell_update_focus() @@ -38487,7 +39383,7 @@ commit c227fef9e0ce7c40a12cdf4549f2ca901ffa81b7 Author: Martin Nordholts -Date: Sun Apr 3 18:53:12 2011 +0200 +Date: Sun Apr 3 18:53:12 2011 +0200 devel-docs: Remove gimp-schedule.ods @@ -38500,7 +39396,7 @@ commit 5a76519c883ddc30d7089310d916fe5e6299e2e3 Author: Michael Natterer -Date: Sun Apr 3 18:52:24 2011 +0200 +Date: Sun Apr 3 18:52:24 2011 +0200 app: call gimp_display_shell_update_focus() in more cases @@ -38511,7 +39407,7 @@ commit a0641d73d6cb23122fe054767579a76129cae603 Author: Michael Natterer -Date: Sun Apr 3 18:42:50 2011 +0200 +Date: Sun Apr 3 18:42:50 2011 +0200 app: remove the hackish "button_press_before_focus" from GimpDisplayShell @@ -38528,12 +39424,12 @@ app/display/gimpdisplayshell-tool-events.c | 58 +++++++----------------------- - app/display/gimpdisplayshell.h | 2 -- + app/display/gimpdisplayshell.h | 2 -- 2 files changed, 12 insertions(+), 48 deletions(-) commit b468bb5ec9c5a4820a44f96ca871b1b6aaf34924 Author: Michael Natterer -Date: Sun Apr 3 18:27:03 2011 +0200 +Date: Sun Apr 3 18:27:03 2011 +0200 app: add gimp_display_shell_initialize_tool() in tool-events.c @@ -38545,7 +39441,7 @@ commit f0a317209d0f5377b6b70bb14a0e576739de46fa Author: Daniel Nylander -Date: Sun Apr 3 18:11:33 2011 +0200 +Date: Sun Apr 3 18:11:33 2011 +0200 Updated Swedish translation @@ -38555,7 +39451,7 @@ commit 42ec53df842476ff41217fd44bb3b7a0124fb0d4 Author: Daniel Nylander -Date: Sun Apr 3 18:01:53 2011 +0200 +Date: Sun Apr 3 18:01:53 2011 +0200 Updated Swedish translation @@ -38565,7 +39461,7 @@ commit a11faa1c1469d849ce0b3e31e2310265d852804e Author: Daniel Nylander -Date: Sun Apr 3 18:00:35 2011 +0200 +Date: Sun Apr 3 18:00:35 2011 +0200 Updated Swedish translation @@ -38575,7 +39471,7 @@ commit dea9176121b153641cb78ff7451d19dbac4f8611 Author: Michael Natterer -Date: Sun Apr 3 17:59:35 2011 +0200 +Date: Sun Apr 3 17:59:35 2011 +0200 app: fix initial navigation popup position @@ -38586,7 +39482,7 @@ commit 6b42cd0669e258a874a6a73d0bc6a782e21cb743 Author: Daniel Nylander -Date: Sun Apr 3 17:58:07 2011 +0200 +Date: Sun Apr 3 17:58:07 2011 +0200 Updated Swedish translation @@ -38596,7 +39492,7 @@ commit 81005fd2fd8609b35a54ae51e7c04d25a4aeb9d4 Author: Daniel Nylander -Date: Sun Apr 3 17:57:11 2011 +0200 +Date: Sun Apr 3 17:57:11 2011 +0200 Updated Swedish translation @@ -38606,7 +39502,7 @@ commit a8f552da2fb3887f75aa0c7502a54ddcd003e292 Author: Martin Nordholts -Date: Sun Apr 3 16:54:34 2011 +0200 +Date: Sun Apr 3 16:54:34 2011 +0200 Bug 646371 - The wrong file gets saved when exporting with overwrite @@ -38615,14 +39511,14 @@ Also add an automatic regression test. - app/file/file-save.c | 6 ++++ + app/file/file-save.c | 6 ++++ app/tests/test-save-and-export.c | 67 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) commit 8bbc475eabe2d687089bce714e157d1861701ed7 Author: Alexia Death -Date: Sun Apr 3 12:11:45 2011 +0300 +Date: Sun Apr 3 12:11:45 2011 +0300 Revert "app: initialize GimpToolPreset's tool options from the user context" @@ -38638,7 +39534,7 @@ commit b9c21da13a01298dbe285cae5395d136a767ea40 Author: Dr.T.Vasudevan -Date: Sun Apr 3 14:39:55 2011 +0530 +Date: Sun Apr 3 14:39:55 2011 +0530 Updated Tamil translation @@ -38647,7 +39543,7 @@ commit df0e0313ba0f2dcbdc8baf0921a0417b8e00f3c1 Author: Dr.T.Vasudevan -Date: Sun Apr 3 14:37:09 2011 +0530 +Date: Sun Apr 3 14:37:09 2011 +0530 Updated Tamil translation @@ -38657,7 +39553,7 @@ commit b458b1b5c07332705c2413c613c31f1444a8b7fa Author: Michael Natterer -Date: Sun Apr 3 00:47:41 2011 +0200 +Date: Sun Apr 3 00:47:41 2011 +0200 app: initialize GimpToolPreset's tool options from the user context @@ -38669,7 +39565,7 @@ commit 64b9ac3f6cf01d428a17960c1182e65ea8d53605 Author: Michael Natterer -Date: Sun Apr 3 00:40:41 2011 +0200 +Date: Sun Apr 3 00:40:41 2011 +0200 app: move the GimpTextTool shutdown code to control(HALT) @@ -38678,7 +39574,7 @@ commit 6de9615154645fdec0af5d69051ca23011a553c1 Author: Michael Natterer -Date: Sun Apr 3 00:32:59 2011 +0200 +Date: Sun Apr 3 00:32:59 2011 +0200 app: bail out in gimp_blend_tool_initialize() if there is no gradient @@ -38687,7 +39583,7 @@ commit b1a0486bdad180f911f658d5501c9c0044112f42 Author: Martin Srebotnjak -Date: Sat Apr 2 19:42:39 2011 +0200 +Date: Sat Apr 2 19:42:39 2011 +0200 Updated Slovenian translation @@ -38696,7 +39592,7 @@ commit 61025c6023653bc2b42746b73e6468f0a47ede60 Author: Michael Natterer -Date: Sat Apr 2 15:38:55 2011 +0200 +Date: Sat Apr 2 15:38:55 2011 +0200 Bug 624824 - use gtk-image-menu-item-set-always-show-image on some menu items @@ -38709,17 +39605,17 @@ - Open images app/actions/drawable-actions.c | 9 +++++++++ - app/actions/edit-actions.c | 9 +++++++++ - app/actions/file-actions.c | 2 ++ - app/actions/image-actions.c | 9 +++++++++ - app/actions/windows-actions.c | 3 +++ - app/widgets/gimpactiongroup.c | 23 +++++++++++++++++++++++ - app/widgets/gimpactiongroup.h | 3 +++ + app/actions/edit-actions.c | 9 +++++++++ + app/actions/file-actions.c | 2 ++ + app/actions/image-actions.c | 9 +++++++++ + app/actions/windows-actions.c | 3 +++ + app/widgets/gimpactiongroup.c | 23 +++++++++++++++++++++++ + app/widgets/gimpactiongroup.h | 3 +++ 7 files changed, 58 insertions(+) commit 9ec725c2977cbb90bfeaeb47c49b762f2f29dcdf Author: Michael Natterer -Date: Sat Apr 2 11:58:29 2011 +0200 +Date: Sat Apr 2 11:58:29 2011 +0200 app: move the GimpIscissorsTool shutdown code to control(HALT) @@ -38729,7 +39625,7 @@ commit 3056cdbc434c288c8e2b9a204b3f97c8afcdf9c2 Author: Michael Natterer -Date: Sat Apr 2 11:40:56 2011 +0200 +Date: Sat Apr 2 11:40:56 2011 +0200 app: remove the entire IscissorsDraw enum and member @@ -38743,7 +39639,7 @@ commit 6f4be58716eabf4274aa16aa9e1adca568908711 Author: Michael Natterer -Date: Sat Apr 2 08:29:53 2011 +0200 +Date: Sat Apr 2 08:29:53 2011 +0200 app: GimpFreeSelectTool: highlight the hovered handle @@ -38752,7 +39648,7 @@ commit efbbe3973405c5b77e2e82d72525dcde13ad6aeb Author: Michael Natterer -Date: Sat Apr 2 08:24:24 2011 +0200 +Date: Sat Apr 2 08:24:24 2011 +0200 app: rmove gimp_free_select_tool_update_button_state() @@ -38764,7 +39660,7 @@ commit 7a6bf9b5fef7d67c8c21f1b7cb020018094eaa70 Author: Michael Natterer -Date: Fri Apr 1 15:39:37 2011 +0200 +Date: Fri Apr 1 15:39:37 2011 +0200 app: generically call gimp_tool_control(HALT) in GObject::dispose() @@ -38776,7 +39672,7 @@ commit 880572860ac0b64fbf73af287e6d63c61e17e2b2 Author: Michael Natterer -Date: Fri Apr 1 15:38:48 2011 +0200 +Date: Fri Apr 1 15:38:48 2011 +0200 app: move shutdown code from gimp_image_map_tool_response() to control(HALT) @@ -38786,7 +39682,7 @@ commit d90de689fbf63afdf945fb930a4f0e9a0ac9612a Author: Michael Natterer -Date: Fri Apr 1 15:13:06 2011 +0200 +Date: Fri Apr 1 15:13:06 2011 +0200 app: GimpCageTool: in CAGE_CHANGE mode, switch to DEFORM when enter is pressed @@ -38796,7 +39692,7 @@ commit a7f32f2290071a25a3ef30d59d281ad41507c5d2 Author: Michael Natterer -Date: Fri Apr 1 15:06:34 2011 +0200 +Date: Fri Apr 1 15:06:34 2011 +0200 app: move shutdown code from gimp_cage_tool_halt() to control(HALT) @@ -38806,7 +39702,7 @@ commit 813392cafdf6e2774c0e2ab768991b0907c63af8 Author: Michael Natterer -Date: Fri Apr 1 15:02:28 2011 +0200 +Date: Fri Apr 1 15:02:28 2011 +0200 app: move shutdown code from gimp_free_select_tool_halt() to control(HALT) @@ -38817,7 +39713,7 @@ commit 8ca28f19a36ba39f25395c856863e0d2a57549a9 Author: Michael Natterer -Date: Fri Apr 1 14:49:25 2011 +0200 +Date: Fri Apr 1 14:49:25 2011 +0200 app: move shutdown code from gimp_measure_tool_halt() to control(HALT) @@ -38826,7 +39722,7 @@ commit 931d2110c6c0d3ce555ca64e977d88739bb77368 Author: Michael Natterer -Date: Fri Apr 1 13:43:26 2011 +0200 +Date: Fri Apr 1 13:43:26 2011 +0200 app: move shutdown code from gimp_align_tool_halt() to control(HALT) @@ -38838,7 +39734,7 @@ commit eb9fefe50563d14999dd466595cddb7e51cc2bdb Author: Michael Natterer -Date: Fri Apr 1 13:03:01 2011 +0200 +Date: Fri Apr 1 13:03:01 2011 +0200 app; move GimpTransformTool's shutdown code to control(HALT) @@ -38850,7 +39746,7 @@ commit 8a69d4f63921a9a50725f257fc87aecc81d3ac42 Author: Michael Natterer -Date: Fri Apr 1 13:01:06 2011 +0200 +Date: Fri Apr 1 13:01:06 2011 +0200 app: fix GimpCanvasProgress' position, extents, and drawing, gah... @@ -38859,7 +39755,7 @@ commit c48c77b2e07566908b199b21d38f2fe6dcb9ab54 Author: Michael Natterer -Date: Fri Apr 1 12:24:58 2011 +0200 +Date: Fri Apr 1 12:24:58 2011 +0200 app: NULLify GimpRectangleOptions widget pointers upon destruction @@ -38871,7 +39767,7 @@ commit 0c7cd5b8a108e0c16c008ed8822461b4f3b7d768 Author: Michael Natterer -Date: Fri Apr 1 11:35:19 2011 +0200 +Date: Fri Apr 1 11:35:19 2011 +0200 app: GimpPaintTool: don't call paint_core_paint(FINISH) in control(HALT) @@ -38885,7 +39781,7 @@ commit e1bc19faf619ba367b84da620328d4c071d8ee47 Author: Michael Natterer -Date: Fri Apr 1 11:01:36 2011 +0200 +Date: Fri Apr 1 11:01:36 2011 +0200 app: make state checks on tool much more strict @@ -38894,15 +39790,15 @@ permanent new warnings for 2.8. See STRICT_TOOL_CHECKS in gimptool.h. app/tools/gimpdrawtool.c | 10 +++++++- - app/tools/gimptool.c | 56 + app/tools/gimptool.c | 56 ++++++++++++++++++++++++++++++++++++++++++--- - app/tools/gimptool.h | 3 +++ - app/tools/gimptoolcontrol.c | 4 ++-- + app/tools/gimptool.h | 3 +++ + app/tools/gimptoolcontrol.c | 4 ++-- 4 files changed, 67 insertions(+), 6 deletions(-) commit 82805309dbf987e46d5a3941b2f85a90349f30ae Author: Martin Srebotnjak -Date: Fri Apr 1 19:34:36 2011 +0200 +Date: Fri Apr 1 19:34:36 2011 +0200 Updated Slovenian translation @@ -38912,7 +39808,7 @@ commit ebc8096d5b868cd26b6ab3413006036966afa5a0 Author: Martin Srebotnjak -Date: Fri Apr 1 19:22:39 2011 +0200 +Date: Fri Apr 1 19:22:39 2011 +0200 Updated Slovenian translation @@ -38922,7 +39818,7 @@ commit 4b06a439530b983d957df0bc526e636a7405ba57 Author: Mukund Sivaraman -Date: Fri Apr 1 17:01:24 2011 +0530 +Date: Fri Apr 1 17:01:24 2011 +0530 web-page: Add a default font size combo @@ -38932,7 +39828,7 @@ commit a1142827dfb37b142541103ca91135d01b8d0537 Author: Mukund Sivaraman -Date: Fri Apr 1 16:34:56 2011 +0530 +Date: Fri Apr 1 16:34:56 2011 +0530 web-page: Move global variables into webpagevals struct @@ -38942,7 +39838,7 @@ commit 796038b216d8f333b880150a5185a3b84f26a94d Author: Mukund Sivaraman -Date: Fri Apr 1 16:24:02 2011 +0530 +Date: Fri Apr 1 16:24:02 2011 +0530 web-page: Append GIMP to the user agent string @@ -38951,7 +39847,7 @@ commit d03d804b92d57bffc496da3597718d484c2da647 Author: Mikael Magnusson -Date: Thu Mar 31 18:09:05 2011 +0200 +Date: Thu Mar 31 18:09:05 2011 +0200 plug-ins: gfig, do cancel stuff when the dialog is closed @@ -38960,7 +39856,7 @@ commit af74ee79e2a304fa58879969f5b630bb54af2f62 Author: Mukund Sivaraman -Date: Fri Apr 1 05:35:52 2011 +0530 +Date: Fri Apr 1 05:35:52 2011 +0530 web-page: Ankh said 2048 bytes, not 1024 bytes @@ -38969,7 +39865,7 @@ commit e9224d41d5ad48b4749dd5cda6de834352f5301b Author: Mukund Sivaraman -Date: Fri Apr 1 05:21:39 2011 +0530 +Date: Fri Apr 1 05:21:39 2011 +0530 web-page: Increase maximum URL len @@ -38978,7 +39874,7 @@ commit 0b6491f94ca9a7045f4889fee62ad3d9a8ff8efa Author: Mukund Sivaraman -Date: Fri Apr 1 05:21:26 2011 +0530 +Date: Fri Apr 1 05:21:26 2011 +0530 web-page: Untabify code @@ -38987,7 +39883,7 @@ commit 488b73ca7d9e2100c34497c43078bd037ec6eb8c Author: Mukund Sivaraman -Date: Fri Apr 1 04:51:21 2011 +0530 +Date: Fri Apr 1 04:51:21 2011 +0530 web-page: Save and restore plug-in data @@ -38996,7 +39892,7 @@ commit a4fb10a5afa9badaf59cf38a208a1155dccb4764 Author: Mukund Sivaraman -Date: Fri Apr 1 04:13:33 2011 +0530 +Date: Fri Apr 1 04:13:33 2011 +0530 web-page: Change quote style yet again @@ -39005,7 +39901,7 @@ commit 24c117082f3f96a8143db4ddf9a81c0b188182e0 Author: Michael Muré -Date: Sun Mar 27 11:34:17 2011 +0200 +Date: Sun Mar 27 11:34:17 2011 +0200 gimp:cage-transform : prepare optimisation for when the Gegl bug #645810 is solved @@ -39015,7 +39911,7 @@ commit 3a50ac686fe87691324ae9751874a96a52cfbdce Author: Francisco vila -Date: Thu Mar 31 20:14:42 2011 +0200 +Date: Thu Mar 31 20:14:42 2011 +0200 Updated Spanish translation @@ -39025,7 +39921,7 @@ commit d85642dd579c8dac1c105924b81807d51c205893 Author: Mukund Sivaraman -Date: Thu Mar 31 15:17:53 2011 +0530 +Date: Thu Mar 31 15:17:53 2011 +0530 web-page: Don't clean image by default @@ -39034,7 +39930,7 @@ commit 9d8cef0628c9dcb62b8f90fa0b1aae7c38c19812 Author: Mukund Sivaraman -Date: Thu Mar 31 14:50:47 2011 +0530 +Date: Thu Mar 31 14:50:47 2011 +0530 web-page: Update TODO @@ -39043,7 +39939,7 @@ commit 4387ffde065e9ed1ba48b8be92d4152986225ab4 Author: Mukund Sivaraman -Date: Thu Mar 31 14:47:28 2011 +0530 +Date: Thu Mar 31 14:47:28 2011 +0530 web-page: Do better error handling @@ -39053,7 +39949,7 @@ commit 8b3c7ace4655fe5ca335ccbacbc6e1b7ecc72dfd Author: Mukund Sivaraman -Date: Thu Mar 31 14:47:15 2011 +0530 +Date: Thu Mar 31 14:47:15 2011 +0530 web-page: Change quote style @@ -39062,7 +39958,7 @@ commit e4daf561ac7c32922932ef36349c2122af3cbd19 Author: Michael Natterer -Date: Thu Mar 31 10:21:55 2011 +0200 +Date: Thu Mar 31 10:21:55 2011 +0200 app: return TRUE after handling double and triple click tool events @@ -39073,7 +39969,7 @@ commit 46931ec0d4cb238d2916bccb95750bee99b56b3a Author: Mukund Sivaraman -Date: Thu Mar 31 12:33:41 2011 +0530 +Date: Thu Mar 31 12:33:41 2011 +0530 web-page: Fix PDB data type of URL @@ -39082,7 +39978,7 @@ commit 2b814b71483a5b146d91fb82d60750eb4ff9f6ef Author: Mukund Sivaraman -Date: Thu Mar 31 12:04:17 2011 +0530 +Date: Thu Mar 31 12:04:17 2011 +0530 web-page: Don't update progress too often @@ -39091,7 +39987,7 @@ commit 8f560f5ca994526191677eb249f9266b446d82fa Author: Michael Natterer -Date: Thu Mar 31 08:15:38 2011 +0200 +Date: Thu Mar 31 08:15:38 2011 +0200 po: add app/tools/gimpalignoptions.c to POTFILES.in @@ -39100,7 +39996,7 @@ commit f81c3b1f2c3718a3343da15d1424df9883fd1224 Author: Mukund Sivaraman -Date: Thu Mar 31 09:24:48 2011 +0530 +Date: Thu Mar 31 09:24:48 2011 +0530 web-page: Report progress when a webpage is being downloaded @@ -39109,7 +40005,7 @@ commit 6c353096bb73370fcaf57d4d3e7d3fd0d5fd2098 Author: Mukund Sivaraman -Date: Thu Mar 31 09:24:01 2011 +0530 +Date: Thu Mar 31 09:24:01 2011 +0530 web-page: Convert tabs to spaces @@ -39118,7 +40014,7 @@ commit 5d035ae55790d997b5eb3bea66ef128db60a441d Author: Mukund Sivaraman -Date: Thu Mar 31 09:09:31 2011 +0530 +Date: Thu Mar 31 09:09:31 2011 +0530 web-page: Update TODO @@ -39127,7 +40023,7 @@ commit c7a1846ec8915e800f9702086259cffdab5ed6d0 Author: Mukund Sivaraman -Date: Thu Mar 31 09:05:57 2011 +0530 +Date: Thu Mar 31 09:05:57 2011 +0530 web-page: Make a well-formed URL if necessary @@ -39136,7 +40032,7 @@ commit d2e836a644b579c38f449de70c73c79291e8fc50 Author: Mukund Sivaraman -Date: Thu Mar 31 08:53:28 2011 +0530 +Date: Thu Mar 31 08:53:28 2011 +0530 web-page: Update TODO list @@ -39145,7 +40041,7 @@ commit 93e0140cd4884abbb416c3ae8446de1e2d5ff616 Author: Mukund Sivaraman -Date: Thu Mar 31 08:51:13 2011 +0530 +Date: Thu Mar 31 08:51:13 2011 +0530 web-page: Add width entry widget @@ -39154,7 +40050,7 @@ commit 0382e204d9f8ead707afda39f83926930518d0f3 Author: Mukund Sivaraman -Date: Thu Mar 31 08:41:53 2011 +0530 +Date: Thu Mar 31 08:41:53 2011 +0530 web-page: Return correct flag when action is cancelled @@ -39163,7 +40059,7 @@ commit 37c745ee9c1ecde55bbf67e61db9f37bec03ba50 Author: Alan Monfort -Date: Thu Mar 31 04:54:24 2011 +0200 +Date: Thu Mar 31 04:54:24 2011 +0200 Updated Breton translation @@ -39173,7 +40069,7 @@ commit 6a046d09e44ed4facd570cea2c18fc335a33b49b Author: Michael Natterer -Date: Wed Mar 30 23:38:14 2011 +0200 +Date: Wed Mar 30 23:38:14 2011 +0200 app: GimpBrushTool: don't split brush setting in two callbacks @@ -39185,21 +40081,21 @@ commit 0db785c36aaf8c694c6dd9f2d3b57e7a0b79beab Author: Michael Natterer -Date: Wed Mar 30 22:13:31 2011 +0200 +Date: Wed Mar 30 22:13:31 2011 +0200 app: don't call control_activate()/control_halt() in GimpRectangleTool Instead, call it in all implementors. - app/tools/gimpcroptool.c | 4 ++++ + app/tools/gimpcroptool.c | 4 ++++ app/tools/gimprectangleselecttool.c | 19 ++++++++----------- - app/tools/gimprectangletool.c | 4 ---- - app/tools/gimptexttool.c | 5 ++++- + app/tools/gimprectangletool.c | 4 ---- + app/tools/gimptexttool.c | 5 ++++- 4 files changed, 16 insertions(+), 16 deletions(-) commit 884e4868a4b087c5e20509f2ecb773d2ad36c0e3 Author: Michael Natterer -Date: Wed Mar 30 21:47:27 2011 +0200 +Date: Wed Mar 30 21:47:27 2011 +0200 app: fix calls to control_activate() and control_halt() in GimpIScissorsTool @@ -39209,7 +40105,7 @@ commit 5f939bd1b64b5790cbecf7f42ec64c8428a56704 Author: Mukund Sivaraman -Date: Thu Mar 31 01:02:52 2011 +0530 +Date: Thu Mar 31 01:02:52 2011 +0530 web-page: Add web-page.c to po-plug-ins/POTFILES.in @@ -39218,7 +40114,7 @@ commit 55f80cd7589acc7617728ddb8f80274dfac43350 Author: Michael Natterer -Date: Wed Mar 30 21:24:04 2011 +0200 +Date: Wed Mar 30 21:24:04 2011 +0200 app: fix GimpForegroundSelectTool pen cursor drawing @@ -39231,22 +40127,22 @@ commit e9befddbba6fb42c5c0b8faf20f5bb0f882e4a1c Author: Mukund Sivaraman -Date: Thu Mar 31 00:39:37 2011 +0530 +Date: Thu Mar 31 00:39:37 2011 +0530 Add the web-page plug-in - configure.ac | 5 +- - plug-ins/common/.gitignore | 2 + - plug-ins/common/Makefile.am | 24 ++- - plug-ins/common/gimprc.common | 1 + + configure.ac | 5 +- + plug-ins/common/.gitignore | 2 + + plug-ins/common/Makefile.am | 24 ++- + plug-ins/common/gimprc.common | 1 + plug-ins/common/plugin-defs.pl | 1 + - plug-ins/common/web-page.c | 350 + plug-ins/common/web-page.c | 350 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 381 insertions(+), 2 deletions(-) commit cc63337be56d7b26608ef1eb1ca4ecdf72180b4b Author: Michael Natterer -Date: Wed Mar 30 20:39:00 2011 +0200 +Date: Wed Mar 30 20:39:00 2011 +0200 app: simplify gimp_foreground_select_tool_oper_update() a lot @@ -39259,7 +40155,7 @@ commit 1b520fe35592da26e163aa92155dbd944d64f1bf Author: Michael Natterer -Date: Wed Mar 30 20:28:18 2011 +0200 +Date: Wed Mar 30 20:28:18 2011 +0200 NEWS: updated until end of september, need a break now... @@ -39269,7 +40165,7 @@ commit 92d7c7d8d9d2dc606422d5370c7ad48d244d64af Author: Michael Natterer -Date: Wed Mar 30 20:20:47 2011 +0200 +Date: Wed Mar 30 20:20:47 2011 +0200 app: change about dialog role from "about-dialog" to "gimp-about" @@ -39278,7 +40174,7 @@ commit 074e2c088a4a59ca7d744a131745a869bb1017d7 Author: Enrico Schröder -Date: Wed Mar 30 18:22:21 2011 +0200 +Date: Wed Mar 30 18:22:21 2011 +0200 app: GimpRectangleTool: Rounding error when moving/resizing with keyboard @@ -39297,7 +40193,7 @@ commit aae8787ee338b929cda20bca90c688ccaf6ddbc4 Author: Enrico Schröder -Date: Tue Mar 29 23:16:32 2011 +0200 +Date: Tue Mar 29 23:16:32 2011 +0200 app: SIOX: algorithm ignores color sensitivity changes @@ -39314,7 +40210,7 @@ commit 2e406872c415c29a3f247232ea046c0d81377a8d Author: Michael Natterer -Date: Wed Mar 30 19:18:29 2011 +0200 +Date: Wed Mar 30 19:18:29 2011 +0200 app: GimpBrushTool: don't set a BAD cursor permanently @@ -39326,7 +40222,7 @@ commit 96c8c35575f85ecf1ca215ff952f9870ee15dd37 Author: Michael Natterer -Date: Wed Mar 30 19:01:11 2011 +0200 +Date: Wed Mar 30 19:01:11 2011 +0200 app: GimpFreeSelectTool: remove if (tool->display != display) checks @@ -39338,7 +40234,7 @@ commit 9755d7d06c26545b963d2be6dd57b9522dabf887 Author: Michael Natterer -Date: Wed Mar 30 15:05:33 2011 +0200 +Date: Wed Mar 30 15:05:33 2011 +0200 app: GimpForegroundSelectTool: call control_activate() unconditionally @@ -39347,7 +40243,7 @@ commit 3d2fb51a6367a97d60ad8f71e9856ebb3574bb5e Author: Michael Natterer -Date: Wed Mar 30 12:08:38 2011 +0200 +Date: Wed Mar 30 12:08:38 2011 +0200 app: GimpEditSelectionTool: call control_halt() in button_release() @@ -39359,7 +40255,7 @@ commit 6899b0bf609233628f81823e17975595e5c303c8 Author: Michael Natterer -Date: Wed Mar 30 11:51:51 2011 +0200 +Date: Wed Mar 30 11:51:51 2011 +0200 app: GimpCageTool: go to deform mode only if the user clicked the first handle @@ -39371,7 +40267,7 @@ commit f585788e466fb559f123fcbf5f92ef944e9f6987 Author: Michael Natterer -Date: Wed Mar 30 11:48:05 2011 +0200 +Date: Wed Mar 30 11:48:05 2011 +0200 app: tool control cleanup in GimpCageTool @@ -39384,7 +40280,7 @@ commit 28c48b185783dd5f7a54232fabfbe51cf148b854 Author: Michael Natterer -Date: Wed Mar 30 11:44:12 2011 +0200 +Date: Wed Mar 30 11:44:12 2011 +0200 app: GimpBrightnessContrastTool: don't call gimp_tool_control_pause()/resume() @@ -39396,7 +40292,7 @@ commit d92b22c567e2eadee34a7913da021a6d6e6af09d Author: Michael Natterer -Date: Tue Mar 29 22:39:34 2011 +0200 +Date: Tue Mar 29 22:39:34 2011 +0200 app: #include "widgets-types.h" so the GDK_KEY_foo defines are there @@ -39405,61 +40301,61 @@ commit 1cdaa2846feaa724c74261a997d3d9d8ad2e816e Author: Michael Natterer -Date: Tue Mar 29 18:53:02 2011 +0200 +Date: Tue Mar 29 18:53:02 2011 +0200 app: some forgotten s/GDK_foo/GDK_KEY_foo/ app/tests/test-save-and-export.c | 1 - - app/tests/test-tools.c | 2 +- - app/tests/test-ui.c | 4 ++-- - app/widgets/gimpcurveview.c | 10 +++++----- - app/widgets/widgets-types.h | 2 ++ + app/tests/test-tools.c | 2 +- + app/tests/test-ui.c | 4 ++-- + app/widgets/gimpcurveview.c | 10 +++++----- + app/widgets/widgets-types.h | 2 ++ 5 files changed, 10 insertions(+), 9 deletions(-) commit 7c60bb51813d12339640a7c826a677499afa02e9 Author: Michael Natterer -Date: Tue Mar 29 15:27:25 2011 +0200 +Date: Tue Mar 29 15:27:25 2011 +0200 app: use more of the new GDK_KEY_foo key names and move the compat defines from display-enums.h to widgets-enums.h - app/display/display-types.h | 23 ------------- + app/display/display-types.h | 23 ------------- app/display/gimpscalecombobox.c | 8 ++--- - app/tools/gimpcagetool.c | 10 +++--- + app/tools/gimpcagetool.c | 10 +++--- app/tools/gimpeditselectiontool.c | 24 +++++++------- app/tools/gimpforegroundselecttool.c | 8 ++--- app/tools/gimpfreeselecttool.c | 10 +++--- - app/tools/gimpimagemaptool.c | 10 +++--- - app/tools/gimpiscissorstool.c | 8 ++--- - app/tools/gimpmeasuretool.c | 2 +- - app/tools/gimpmovetool.c | 1 - - app/tools/gimprectangletool.c | 16 ++++----- - app/tools/gimprotatetool.c | 8 ++--- - app/tools/gimpselectiontool.c | 1 - + app/tools/gimpimagemaptool.c | 10 +++--- + app/tools/gimpiscissorstool.c | 8 ++--- + app/tools/gimpmeasuretool.c | 2 +- + app/tools/gimpmovetool.c | 1 - + app/tools/gimprectangletool.c | 16 ++++----- + app/tools/gimprotatetool.c | 8 ++--- + app/tools/gimpselectiontool.c | 1 - app/tools/gimptexttool-editor.c | 14 ++++---- - app/tools/gimptransformtool.c | 10 +++--- - app/tools/gimpvectortool.c | 28 ++++++++-------- - app/widgets/gimpcoloreditor.c | 1 - + app/tools/gimptransformtool.c | 10 +++--- + app/tools/gimpvectortool.c | 28 ++++++++-------- + app/widgets/gimpcoloreditor.c | 1 - app/widgets/gimpcontainergridview.c | 8 ++--- app/widgets/gimpcontainerpopup.c | 12 +++---- app/widgets/gimpcontainertreeview.c | 2 +- app/widgets/gimpcontrollerkeyboard.c | 64 ++++++++++++++++++------------------ - app/widgets/gimpcurveview.c | 6 ++-- - app/widgets/gimpdataeditor.c | 2 +- + app/widgets/gimpcurveview.c | 6 ++-- + app/widgets/gimpdataeditor.c | 2 +- app/widgets/gimpnavigationview.c | 8 ++--- app/widgets/gimpoverlaydialog.c | 2 +- - app/widgets/gimppaletteview.c | 10 +++--- - app/widgets/gimptagentry.c | 22 ++++++------- - app/widgets/gimptextproxy.c | 12 +++---- - app/widgets/gimpuimanager.c | 2 +- - app/widgets/widgets-types.h | 35 ++++++++++++++++++++ + app/widgets/gimppaletteview.c | 10 +++--- + app/widgets/gimptagentry.c | 22 ++++++------- + app/widgets/gimptextproxy.c | 12 +++---- + app/widgets/gimpuimanager.c | 2 +- + app/widgets/widgets-types.h | 35 ++++++++++++++++++++ 30 files changed, 188 insertions(+), 179 deletions(-) commit 2468f9fd557af1a74d1d303ce07b6b772312de1f Author: Michael Natterer -Date: Tue Mar 29 15:16:17 2011 +0200 +Date: Tue Mar 29 15:16:17 2011 +0200 app: cancel the align tool on Escape, and some more cleanup @@ -39470,7 +40366,7 @@ commit bb5dea615bbab9f42a8b5d4a7214c9ad6db17b37 Author: Michael Natterer -Date: Tue Mar 29 14:32:00 2011 +0200 +Date: Tue Mar 29 14:32:00 2011 +0200 app: some more cleanup and namespacing in GimpAlignTool @@ -39480,7 +40376,7 @@ commit 0c8ff468f64e8b62afd99f03b5b79b453e7d2d0f Author: Michael Natterer -Date: Tue Mar 29 14:00:10 2011 +0200 +Date: Tue Mar 29 14:00:10 2011 +0200 app: remove empty GimpTool::initialize() impl from GimpAlignTool @@ -39489,7 +40385,7 @@ commit f7bb4afbd8a3fb1fec1a56d957c458f775636c48 Author: Michael Natterer -Date: Tue Mar 29 13:58:23 2011 +0200 +Date: Tue Mar 29 13:58:23 2011 +0200 app: add gimp_image_pick_layer_by_bounds() and use it in GimpAlignTool @@ -39498,13 +40394,13 @@ app/core/gimpimage-pick-layer.c | 42 ++++++++++++++++ app/core/gimpimage-pick-layer.h | 15 +++--- - app/tools/gimpaligntool.c | 105 + app/tools/gimpaligntool.c | 105 +++++++++++++--------------------------- 3 files changed, 85 insertions(+), 77 deletions(-) commit 08e409d6e3cd8e96cc54be95a2b2ee3283ae4504 Author: Michael Natterer -Date: Tue Mar 29 13:26:18 2011 +0200 +Date: Tue Mar 29 13:26:18 2011 +0200 app: move the GimpAlignTool options GUI to GimpAlignOptions @@ -39521,7 +40417,7 @@ commit c38eb0df4a805bc4eadae7c8e1cc1b9dba40a7ef Author: Michael Natterer -Date: Tue Mar 29 12:45:54 2011 +0200 +Date: Tue Mar 29 12:45:54 2011 +0200 app: core-enums.h: fix type macros of the align type enums @@ -39530,7 +40426,7 @@ commit f32e285ea31bfd0279a7f4b3caaa916be5fe1043 Author: Michael Natterer -Date: Tue Mar 29 09:16:22 2011 +0200 +Date: Tue Mar 29 09:16:22 2011 +0200 app: more cleanup in GimpMeasureTool @@ -39544,7 +40440,7 @@ commit f59eeb95e73e80b76644a24aef21754b9bb37070 Author: Michael Natterer -Date: Tue Mar 29 08:52:09 2011 +0200 +Date: Tue Mar 29 08:52:09 2011 +0200 app: remove GimpMeasureTool:active_handle and use the existing :point @@ -39552,12 +40448,12 @@ app/tools/gimpmeasuretool.c | 121 +++++++++++++++++++++----------------------- - app/tools/gimpmeasuretool.h | 1 - + app/tools/gimpmeasuretool.h | 1 - 2 files changed, 59 insertions(+), 63 deletions(-) commit afb68c1cea4d7f5873e98626cbf09f040a459d7b Author: Mikael Magnusson -Date: Tue Mar 29 00:23:10 2011 +0200 +Date: Tue Mar 29 00:23:10 2011 +0200 app: fix return value from NULL to FALSE @@ -39566,7 +40462,7 @@ commit 2b9b737686e314a10e23f713807d057d47961586 Author: Michael Natterer -Date: Mon Mar 28 20:44:30 2011 +0200 +Date: Mon Mar 28 20:44:30 2011 +0200 app: add gimp_measure_tool_oper_update() which should have always been there @@ -39576,23 +40472,23 @@ app/tools/gimpmeasuretool.c | 106 +++++++++++++++++++++++++++++++++++--------- - app/tools/gimpmeasuretool.h | 1 + + app/tools/gimpmeasuretool.h | 1 + 2 files changed, 87 insertions(+), 20 deletions(-) commit 44a6e4f07acf0479f7aca522c738f5657aacf77f Author: Michael Natterer -Date: Mon Mar 28 20:13:18 2011 +0200 +Date: Mon Mar 28 20:13:18 2011 +0200 app: use gimp_canvas_item_hit() in GimpMeasureTool app/tools/gimpmeasuretool.c | 56 +++++++++++++++++++-------------------------- - app/tools/gimpmeasuretool.h | 2 ++ + app/tools/gimpmeasuretool.h | 2 ++ 2 files changed, 25 insertions(+), 33 deletions(-) commit 4e066ccde28e5a12d83b785cc259ccbeb5928b91 Author: Joaquín Aramendía -Date: Mon Mar 28 19:11:23 2011 +0200 +Date: Mon Mar 28 19:11:23 2011 +0200 Updated Spanish translation @@ -39602,7 +40498,7 @@ commit 365902b582731b64ff329cdb9df9b0c746449fee Author: Michael Natterer -Date: Mon Mar 28 18:55:08 2011 +0200 +Date: Mon Mar 28 18:55:08 2011 +0200 app: use gimp_canvas_item_hit() in gimp_transform_tool_oper_update() @@ -39615,53 +40511,53 @@ commit e03a25caeb56959e82f36c9e7efecdd61358a6df Author: Michael Natterer -Date: Mon Mar 28 18:54:02 2011 +0200 +Date: Mon Mar 28 18:54:02 2011 +0200 app: add virtual function gboolean GimpCanvasItem::hit() and implement it for GimpCanvasHandle and GimpCanvasGroup. - app/display/gimpcanvasgroup.c | 24 +++++++++++++++++++++ + app/display/gimpcanvasgroup.c | 24 +++++++++++++++++++++ app/display/gimpcanvashandle.c | 49 ++++++++++++++++++++++++++++++++++++++++++ - app/display/gimpcanvasitem.c | 28 ++++++++++++++++++++++++ - app/display/gimpcanvasitem.h | 9 ++++++++ + app/display/gimpcanvasitem.c | 28 ++++++++++++++++++++++++ + app/display/gimpcanvasitem.h | 9 ++++++++ 4 files changed, 110 insertions(+) commit b529d556fa02fd15c2c364c6a15d974dc8c38d56 Author: Michael Natterer -Date: Mon Mar 28 15:15:43 2011 +0200 +Date: Mon Mar 28 15:15:43 2011 +0200 app: add and use more GimpCanvasItem setters - app/display/gimpcanvascursor.c | 12 +++++++----- - app/display/gimpcanvascursor.h | 10 +++++----- - app/display/gimpcanvasguide.c | 17 +++++++++++++++++ - app/display/gimpcanvasguide.h | 4 ++++ - app/display/gimpcanvaspath.c | 19 +++++++++++++++++-- - app/display/gimpcanvaspath.h | 5 ++++- - app/display/gimpcanvassamplepoint.c | 17 +++++++++++++++++ - app/display/gimpcanvassamplepoint.h | 4 ++++ - app/display/gimpdisplayshell-cursor.c | 6 +++--- + app/display/gimpcanvascursor.c | 12 +++++++----- + app/display/gimpcanvascursor.h | 10 +++++----- + app/display/gimpcanvasguide.c | 17 +++++++++++++++++ + app/display/gimpcanvasguide.h | 4 ++++ + app/display/gimpcanvaspath.c | 19 +++++++++++++++++-- + app/display/gimpcanvaspath.h | 5 ++++- + app/display/gimpcanvassamplepoint.c | 17 +++++++++++++++++ + app/display/gimpcanvassamplepoint.h | 4 ++++ + app/display/gimpdisplayshell-cursor.c | 6 +++--- app/display/gimpdisplayshell-handlers.c | 22 +++++----------------- - app/display/gimpdisplayshell.c | 22 +++++++++++----------- + app/display/gimpdisplayshell.c | 22 +++++++++++----------- 11 files changed, 94 insertions(+), 44 deletions(-) commit d96091d514a4fc4f8ffcaa87aadcf98b0500ca6a Author: Michael Natterer -Date: Mon Mar 28 12:22:29 2011 +0200 +Date: Mon Mar 28 12:22:29 2011 +0200 app: port GimpMagnifyTool away from draw_tool_pause()/resume() app/display/gimpcanvasrectangle.c | 21 +++++++++++++++++++++ app/display/gimpcanvasrectangle.h | 6 ++++++ - app/tools/gimpmagnifytool.c | 31 +++++++++++++++++++++++-------- - app/tools/gimpmagnifytool.h | 8 +++++--- + app/tools/gimpmagnifytool.c | 31 +++++++++++++++++++++++-------- + app/tools/gimpmagnifytool.h | 8 +++++--- 4 files changed, 55 insertions(+), 11 deletions(-) commit accc12a3ca813e5640bdeb64dce7f11c50821222 Author: Michael Natterer -Date: Mon Mar 28 12:20:36 2011 +0200 +Date: Mon Mar 28 12:20:36 2011 +0200 app: change GimpCanvasItem setters to take GimpCanvasItem* @@ -39672,15 +40568,15 @@ app/display/gimpcanvashandle.c | 20 ++++++++++---------- app/display/gimpcanvashandle.h | 4 ++-- - app/display/gimpcanvasline.c | 6 +++--- - app/display/gimpcanvasline.h | 2 +- - app/tools/gimpblendtool.c | 4 ++-- - app/tools/gimpmeasuretool.c | 3 +-- + app/display/gimpcanvasline.c | 6 +++--- + app/display/gimpcanvasline.h | 2 +- + app/tools/gimpblendtool.c | 4 ++-- + app/tools/gimpmeasuretool.c | 3 +-- 6 files changed, 19 insertions(+), 20 deletions(-) commit aa5d2f8082e5c3e26c42b49e9ccf7e1e58cb0cdb Author: Michael Natterer -Date: Mon Mar 28 11:08:40 2011 +0200 +Date: Mon Mar 28 11:08:40 2011 +0200 app: port GimpBlendTool to pause()/resume()-less drawing @@ -39692,16 +40588,16 @@ app/display/gimpcanvashandle.c | 21 +++++++++++++ app/display/gimpcanvashandle.h | 26 +++++++++------- - app/display/gimpcanvasline.c | 21 +++++++++++++ - app/display/gimpcanvasline.h | 6 ++++ - app/tools/gimpblendtool.c | 70 + app/display/gimpcanvasline.c | 21 +++++++++++++ + app/display/gimpcanvasline.h | 6 ++++ + app/tools/gimpblendtool.c | 70 ++++++++++++++++++++++++++---------------- - app/tools/gimpblendtool.h | 22 +++++++------ + app/tools/gimpblendtool.h | 22 +++++++------ 6 files changed, 120 insertions(+), 46 deletions(-) commit 1c0fe73da4733cd51c658836a6121a89204b46ec Author: Michael Natterer -Date: Mon Mar 28 10:16:00 2011 +0200 +Date: Mon Mar 28 10:16:00 2011 +0200 app: gimp_transform_tool_draw(): initialize the array of handles to NULL @@ -39713,7 +40609,7 @@ commit 20bed2c609a6edb816a1fffeb7ab017a6c183b1b Author: Michael Natterer -Date: Mon Mar 28 02:18:00 2011 +0200 +Date: Mon Mar 28 02:18:00 2011 +0200 app: add gimp_draw_tool_add_transform_preview() and use it @@ -39724,7 +40620,7 @@ commit fd80b90cf0515cc1a16b706390f5d74f7e9ba1e1 Author: Michael Natterer -Date: Mon Mar 28 02:10:33 2011 +0200 +Date: Mon Mar 28 02:10:33 2011 +0200 app: more minor GimpTransformTool cleanup @@ -39733,7 +40629,7 @@ commit 9f6b60c29d4ca25782f9bb981d5ef08127299dfc Author: Michael Natterer -Date: Mon Mar 28 01:27:02 2011 +0200 +Date: Mon Mar 28 01:27:02 2011 +0200 app: draw the perspective clone handles only when they can be used @@ -39743,18 +40639,18 @@ commit 4097825f3c3864f08367e7b7b701440cbae08431 Author: Michael Natterer -Date: Mon Mar 28 01:20:16 2011 +0200 +Date: Mon Mar 28 01:20:16 2011 +0200 app: some more code removal and cleanup in the transform classes app/tools/gimpperspectiveclonetool.c | 16 +--------------- app/tools/gimpperspectiveclonetool.h | 3 +-- - app/tools/gimptransformtool.c | 29 ++++------------------------- + app/tools/gimptransformtool.c | 29 ++++------------------------- 3 files changed, 6 insertions(+), 42 deletions(-) commit dde7d6c0ee2bf34d12db81461bd0f9c018356dfe Author: Michael Natterer -Date: Mon Mar 28 01:08:24 2011 +0200 +Date: Mon Mar 28 01:08:24 2011 +0200 app: remove lots of junk from GimpPerspectiveCloneTool @@ -39767,7 +40663,7 @@ commit 707c5e961a8ffd998592add1857f8922e7d75d2e Author: Rudolfs Mazurs -Date: Mon Mar 28 02:06:15 2011 +0300 +Date: Mon Mar 28 02:06:15 2011 +0300 Updated Latvian translation. @@ -39776,18 +40672,18 @@ commit a7c4e00d3c126b092b45fb49ae3acd9bf0c51cf6 Author: Rudolfs Mazurs -Date: Mon Mar 28 02:04:38 2011 +0300 +Date: Mon Mar 28 02:04:38 2011 +0300 Updated Latvian translation. po-libgimp/lv.po | 1756 ++++++++++------- - po/lv.po | 5640 + po/lv.po | 5640 ++++++++++++++++++++++-------------------------------- 2 files changed, 3271 insertions(+), 4125 deletions(-) commit babc2186c57b65f3a486015ba29ee9cc5ba6d838 Author: Michael Natterer -Date: Mon Mar 28 00:50:46 2011 +0200 +Date: Mon Mar 28 00:50:46 2011 +0200 app: move the enum of indexes into the trans_info array to the .c files @@ -39797,14 +40693,14 @@ app/core/gimpdrawable-transform.h | 13 ------------- app/tools/gimpperspectiveclonetool.c | 14 ++++++++++++++ app/tools/gimpperspectivetool.c | 14 ++++++++++++++ - app/tools/gimprotatetool.c | 11 +++++++---- - app/tools/gimpscaletool.c | 14 ++++++++++++++ - app/tools/gimpsheartool.c | 9 ++++++--- + app/tools/gimprotatetool.c | 11 +++++++---- + app/tools/gimpscaletool.c | 14 ++++++++++++++ + app/tools/gimpsheartool.c | 9 ++++++--- 6 files changed, 55 insertions(+), 20 deletions(-) commit 06e0183f967ee62695cd448ad204a67b196dd592 Author: Michael Natterer -Date: Mon Mar 28 00:39:39 2011 +0200 +Date: Mon Mar 28 00:39:39 2011 +0200 app: right-align the perspective matrix labels with the right API @@ -39815,7 +40711,7 @@ commit d36887644d456ed60cf824a125c988ece3a4c62f Author: Michael Natterer -Date: Mon Mar 28 00:13:14 2011 +0200 +Date: Mon Mar 28 00:13:14 2011 +0200 app: highlight the active transform tool handle @@ -39826,7 +40722,7 @@ commit 32f240fa4a4771c9ae9e67545e7f3d558640822d Author: Michael Natterer -Date: Sun Mar 27 23:57:12 2011 +0200 +Date: Sun Mar 27 23:57:12 2011 +0200 app: prepare GimpTransformTool for highlighting the handles @@ -39836,7 +40732,7 @@ commit 18929f0865feeb115eabb5c581f6e3a7f12ba3d8 Author: Michael Natterer -Date: Sun Mar 27 23:18:28 2011 +0200 +Date: Sun Mar 27 23:18:28 2011 +0200 app: lay out the GimpTransformOptions GUI more uniformly @@ -39845,52 +40741,52 @@ commit 8512675088dce12ffd17ccaec00af3378666026c Author: Michael Natterer -Date: Sun Mar 27 23:12:11 2011 +0200 +Date: Sun Mar 27 23:12:11 2011 +0200 app: rename GimpTransformTool::recalc() to ::recalc_matrix() app/tools/gimpperspectivetool.c | 6 +++--- - app/tools/gimprotatetool.c | 10 +++++----- - app/tools/gimpscaletool.c | 8 ++++---- - app/tools/gimpsheartool.c | 10 +++++----- - app/tools/gimptransformtool.c | 20 ++++++++++---------- - app/tools/gimptransformtool.h | 6 +++--- + app/tools/gimprotatetool.c | 10 +++++----- + app/tools/gimpscaletool.c | 8 ++++---- + app/tools/gimpsheartool.c | 10 +++++----- + app/tools/gimptransformtool.c | 20 ++++++++++---------- + app/tools/gimptransformtool.h | 6 +++--- 6 files changed, 30 insertions(+), 30 deletions(-) commit fb2ba3f289058367f434da595849e0cdbcb913ff Author: Michael Natterer -Date: Sun Mar 27 22:39:31 2011 +0200 +Date: Sun Mar 27 22:39:31 2011 +0200 app: remove display parameters from all virtual GimpTransformTool functions - app/tools/gimpfliptool.c | 2 -- + app/tools/gimpfliptool.c | 2 -- app/tools/gimpperspectivetool.c | 18 ++++++------------ - app/tools/gimprotatetool.c | 27 +++++++++++---------------- - app/tools/gimpscaletool.c | 21 ++++++++------------- - app/tools/gimpsheartool.c | 22 ++++++++-------------- - app/tools/gimptransformtool.c | 27 ++++++++++----------------- - app/tools/gimptransformtool.h | 13 ++++--------- + app/tools/gimprotatetool.c | 27 +++++++++++---------------- + app/tools/gimpscaletool.c | 21 ++++++++------------- + app/tools/gimpsheartool.c | 22 ++++++++-------------- + app/tools/gimptransformtool.c | 27 ++++++++++----------------- + app/tools/gimptransformtool.h | 13 ++++--------- 7 files changed, 47 insertions(+), 83 deletions(-) commit eb4f01039a4a9a746ccc39ca599418c90ff2a497 Author: Michael Natterer -Date: Sun Mar 27 22:04:33 2011 +0200 +Date: Sun Mar 27 22:04:33 2011 +0200 app: add utility function gimp_transform_polygon_is_convex() and use it in GimpTransformTool and GimpCanvasTransformPreview. - app/core/gimp-transform-utils.c | 27 ++++++ - app/core/gimp-transform-utils.h | 139 + app/core/gimp-transform-utils.c | 27 ++++++ + app/core/gimp-transform-utils.h | 139 ++++++++++++++++--------------- app/display/gimpcanvastransformpreview.c | 16 ++-- - app/tools/gimptransformtool.c | 21 ++--- + app/tools/gimptransformtool.c | 21 ++--- 4 files changed, 111 insertions(+), 92 deletions(-) commit caa8cdd4c1d62f3dcf457fa3c9e94fea23b6dcb1 Author: Michael Natterer -Date: Sun Mar 27 21:49:34 2011 +0200 +Date: Sun Mar 27 21:49:34 2011 +0200 app: add gimp_transform_options_show_preview() @@ -39900,13 +40796,13 @@ app/tools/gimptransformoptions.c | 11 +++++++++ app/tools/gimptransformoptions.h | 6 +++-- - app/tools/gimptransformtool.c | 48 + app/tools/gimptransformtool.c | 48 ++++++++++++++++++++++------------------ 3 files changed, 41 insertions(+), 24 deletions(-) commit 8a09fd1f342f6c5cf8cded6e580b3abc016894b4 Author: Michael Natterer -Date: Sun Mar 27 21:19:38 2011 +0200 +Date: Sun Mar 27 21:19:38 2011 +0200 app: refactor GimpCanvasTransformPreview to not know GimpTransformTool any more @@ -39919,12 +40815,12 @@ app/display/gimpcanvastransformpreview.c | 308 +++++++++++++++++++++++-------- app/display/gimpcanvastransformpreview.h | 8 +- - app/tools/gimptransformtool.c | 9 +- + app/tools/gimptransformtool.c | 9 +- 3 files changed, 245 insertions(+), 80 deletions(-) commit 1e11a279b2edbc0f02e561f47d0347351b2ff5d9 Author: Michael Natterer -Date: Sun Mar 27 21:13:31 2011 +0200 +Date: Sun Mar 27 21:13:31 2011 +0200 libgimpmath: add a boxed type and a GParamSpec for GimpMatrix3 @@ -39936,7 +40832,7 @@ commit 6fe9430cab11493c6db49ad1faf720b5faa01590 Author: Michael Natterer -Date: Sun Mar 27 17:38:49 2011 +0200 +Date: Sun Mar 27 17:38:49 2011 +0200 app: remove members "type" and "direction" from GimpTransformTool @@ -39951,7 +40847,7 @@ commit 1d9f95ac980a154207d10a2ba6138d738f56c4c9 Author: Michael Natterer -Date: Sun Mar 27 16:54:21 2011 +0200 +Date: Sun Mar 27 16:54:21 2011 +0200 app: code cleanup and streamlining in GimpCanvasTransformPreview @@ -39962,7 +40858,7 @@ commit 92aeeadecffa319685ecaabc03927c9fcd10f07d Author: Michael Natterer -Date: Sun Mar 27 16:53:48 2011 +0200 +Date: Sun Mar 27 16:53:48 2011 +0200 app: remove unused macros from gimpdrawable-transform.c @@ -39971,7 +40867,7 @@ commit f09be52c1b19188ef20170dd9c6cd927db94630b Author: Michael Natterer -Date: Sun Mar 27 16:40:41 2011 +0200 +Date: Sun Mar 27 16:40:41 2011 +0200 app: turn the transform preview into a GimpCanvasItem @@ -39979,27 +40875,25 @@ GimpTransformTool a lot less complex. As a nice side effect, the preview is now always 100% in sync with the grid and handles. - app/display/Makefile.am | 4 +- - app/display/gimpcanvastransformpreview.c | 1311 - +++++++++++++++++++++++++++++ - app/display/gimpcanvastransformpreview.h | 59 ++ - app/display/gimpdisplayshell-appearance.c | 17 - - app/display/gimpdisplayshell-appearance.h | 4 - - app/display/gimpdisplayshell-callbacks.c | 6 - - app/display/gimpdisplayshell-preview.c | 1170 - ------------------------- - app/display/gimpdisplayshell-preview.h | 26 - - app/display/gimpdisplayshell.h | 1 - - app/tools/gimprotatetool.c | 4 - - app/tools/gimpscaletool.c | 2 - - app/tools/gimpsheartool.c | 4 - - app/tools/gimptransformtool.c | 206 +---- - app/tools/gimptransformtool.h | 7 +- - 14 files changed, 1396 insertions(+), 1425 deletions(-) + app/display/Makefile.am | 4 +- + ...hell-preview.c => gimpcanvastransformpreview.c} | 629 + +++++++++++++-------- + app/display/gimpcanvastransformpreview.h | 59 ++ + app/display/gimpdisplayshell-appearance.c | 17 - + app/display/gimpdisplayshell-appearance.h | 4 - + app/display/gimpdisplayshell-callbacks.c | 6 - + app/display/gimpdisplayshell-preview.h | 26 - + app/display/gimpdisplayshell.h | 1 - + app/tools/gimprotatetool.c | 4 - + app/tools/gimpscaletool.c | 2 - + app/tools/gimpsheartool.c | 4 - + app/tools/gimptransformtool.c | 206 +------ + app/tools/gimptransformtool.h | 7 +- + 13 files changed, 470 insertions(+), 499 deletions(-) commit 4d9952cf5438c78fa3bcb9706258dd91f83cf49f Author: Mukund Sivaraman -Date: Sun Mar 27 04:15:09 2011 +0530 +Date: Sun Mar 27 04:15:09 2011 +0530 Add extra optimization flags for super performance @@ -40008,7 +40902,7 @@ commit cf28e07b6485f05b3698e87d783623293764c390 Author: Michael Natterer -Date: Sat Mar 26 22:32:35 2011 +0100 +Date: Sat Mar 26 22:32:35 2011 +0100 app: move enum TransformAction from tools-enums.h to gimptransformtool.h @@ -40022,7 +40916,7 @@ commit f632c4a8aa6b451d2231333cd07554fb0c138f22 Author: Michael Natterer -Date: Sat Mar 26 22:14:07 2011 +0100 +Date: Sat Mar 26 22:14:07 2011 +0100 app: transform the transform grid lines on the fly @@ -40035,7 +40929,7 @@ commit 74f276fe4fb3f982d63eefa4a3326a9c91a286a4 Author: Michael Natterer -Date: Sat Mar 26 21:53:06 2011 +0100 +Date: Sat Mar 26 21:53:06 2011 +0100 app: make sure GimpTransformTool draws correctly after options changes @@ -40044,7 +40938,7 @@ commit deafe3d341f6bb162da90ff6782ca4ce5738679a Author: Michael Natterer -Date: Sat Mar 26 20:40:35 2011 +0100 +Date: Sat Mar 26 20:40:35 2011 +0100 app: remove some entirely useless members from GimpTransformTool @@ -40054,7 +40948,7 @@ commit 6c524ea1dbdf12475d867d916e604fed03fd8a0d Author: Michael Natterer -Date: Sat Mar 26 19:47:44 2011 +0100 +Date: Sat Mar 26 19:47:44 2011 +0100 app: GimpSessionInfo: use brute force to position dialogs @@ -40073,7 +40967,7 @@ commit c629cbeb892fdc19a15f75713ad1f7517fcbea82 Author: Michael Natterer -Date: Sat Mar 26 19:32:59 2011 +0100 +Date: Sat Mar 26 19:32:59 2011 +0100 app: some formatting cleanup in GimpDialogFactory @@ -40083,7 +40977,7 @@ commit 6606d10be107c7b27439379ef5072c1269ceeb0e Author: Michael Natterer -Date: Sat Mar 26 18:57:31 2011 +0100 +Date: Sat Mar 26 18:57:31 2011 +0100 app: gimp_transform_tool_transform(): don't unref NULL orig_tiles @@ -40092,7 +40986,7 @@ commit ae72971866a2973f5e5d62369f351f340d274c63 Author: Michael Natterer -Date: Sat Mar 26 18:45:58 2011 +0100 +Date: Sat Mar 26 18:45:58 2011 +0100 app: pass the orig_tiles and their offset to GimpTransformTool::transform() @@ -40102,16 +40996,16 @@ code. Disable more code in GimpTransformToolUndo but keep it around even though it does nothing at the moment. - app/tools/gimpfliptool.c | 14 +++-- - app/tools/gimptransformtool.c | 119 + app/tools/gimpfliptool.c | 14 +++-- + app/tools/gimptransformtool.c | 119 ++++++++++++++++---------------------- - app/tools/gimptransformtool.h | 7 +-- + app/tools/gimptransformtool.h | 7 +-- app/tools/gimptransformtoolundo.c | 10 +++- 4 files changed, 71 insertions(+), 79 deletions(-) commit 88ee23aa291e1f67452853b9cc95722e339d8fa6 Author: Michael Natterer -Date: Sat Mar 26 18:37:34 2011 +0100 +Date: Sat Mar 26 18:37:34 2011 +0100 app: move some of the new tile offset variables to local scopes @@ -40121,7 +41015,7 @@ commit 047d31fa68605bdb9001593dd3196c1f8cecf2ae Author: Michael Natterer -Date: Sat Mar 26 16:50:38 2011 +0100 +Date: Sat Mar 26 16:50:38 2011 +0100 app: gimp_drawable_transform: place new the tiles at offset_x, offset_y @@ -40133,7 +41027,7 @@ commit 647f0ada2af7b91c7b5110b46a0230cd3f79f112 Author: Mukund Sivaraman -Date: Sat Mar 26 15:09:59 2011 +0530 +Date: Sat Mar 26 15:09:59 2011 +0530 Add support for reading 16-bit raw PPM files @@ -40146,7 +41040,7 @@ commit bc8d5f84d6a31c54e1bcee71ac66be55fa5e50cf Author: Michael Natterer -Date: Sat Mar 26 08:30:15 2011 +0100 +Date: Sat Mar 26 08:30:15 2011 +0100 app: remove the "offset" API from TileManager @@ -40158,29 +41052,29 @@ with GeglBuffers. app/base/tile-manager-private.h | 2 - - app/base/tile-manager.c | 23 --------- - app/base/tile-manager.h | 7 --- - app/core/gimp-edit.c | 8 +++- + app/base/tile-manager.c | 23 --------- + app/base/tile-manager.h | 7 --- + app/core/gimp-edit.c | 8 +++- app/core/gimp-transform-region.c | 6 ++- app/core/gimp-transform-region.h | 2 + - app/core/gimpbuffer.c | 11 ++++- - app/core/gimpbuffer.h | 8 +++- + app/core/gimpbuffer.c | 11 ++++- + app/core/gimpbuffer.h | 8 +++- app/core/gimpdrawable-transform.c | 99 ++++++++++++++++++++++++++++++--------- app/core/gimpdrawable-transform.h | 20 +++++++- - app/core/gimpdrawable.c | 49 +++++++------------ - app/core/gimpselection.c | 10 ++-- - app/core/gimpselection.h | 2 + + app/core/gimpdrawable.c | 49 +++++++------------ + app/core/gimpselection.c | 10 ++-- + app/core/gimpselection.h | 2 + app/paint/gimpperspectiveclone.c | 3 +- - app/tools/gimpfliptool.c | 14 ++++-- - app/tools/gimptransformtool.c | 34 ++++++++++---- - app/tools/gimptransformtool.h | 6 ++- - app/widgets/gimpclipboard.c | 3 +- + app/tools/gimpfliptool.c | 14 ++++-- + app/tools/gimptransformtool.c | 34 ++++++++++---- + app/tools/gimptransformtool.h | 6 ++- + app/widgets/gimpclipboard.c | 3 +- 18 files changed, 192 insertions(+), 115 deletions(-) commit 41ab7d8e10e54cbb5d10acbfd18e93a272f07ef5 Author: Mukund Sivaraman -Date: Sat Mar 26 10:55:21 2011 +0530 +Date: Sat Mar 26 10:55:21 2011 +0530 Remove broken include @@ -40189,11 +41083,11 @@ commit 6ec5190da202ff1266030a50607fbad436c51e34 Author: Michael Natterer -Date: Sat Mar 26 00:10:19 2011 +0100 +Date: Sat Mar 26 00:10:19 2011 +0100 app: remove unused files base/tile-manager-crop.[ch] - app/base/Makefile.am | 2 - + app/base/Makefile.am | 2 - app/base/tile-manager-crop.c | 159 ------------------------------------------- app/base/tile-manager-crop.h | 26 ------- @@ -40201,23 +41095,23 @@ commit 9424d42d36ddd467ec43e7efe29370307f569f65 Author: Michael Natterer -Date: Fri Mar 25 22:35:46 2011 +0100 +Date: Fri Mar 25 22:35:46 2011 +0100 pdb: apply recent fixes to the deprecated transform procedures Don't transform the tiles of group layers, use the item transform API instead. Go the same code path if there is no selection. - app/pdb/drawable-transform-cmds.c | 331 + app/pdb/drawable-transform-cmds.c | 331 ++++++++++++++++++++++++-------- - app/pdb/transform-tools-cmds.c | 129 ++++++++++--- + app/pdb/transform-tools-cmds.c | 129 ++++++++++--- tools/pdbgen/pdb/drawable_transform.pdb | 81 ++++++-- - tools/pdbgen/pdb/transform_tools.pdb | 129 ++++++++++--- + tools/pdbgen/pdb/transform_tools.pdb | 129 ++++++++++--- 4 files changed, 505 insertions(+), 165 deletions(-) commit 1a359a138db8e993b9346d6a01f6ebf983859498 Author: Michael Natterer -Date: Fri Mar 25 22:03:14 2011 +0100 +Date: Fri Mar 25 22:03:14 2011 +0100 pdb: don't recommend deprecated replacement procedures for deprecated procedures @@ -40230,18 +41124,18 @@ commit 4d7dbe233de6f8deca76b45121486226765014f7 Author: Michael Natterer -Date: Fri Mar 25 21:57:56 2011 +0100 +Date: Fri Mar 25 21:57:56 2011 +0100 pdb: do the same optimization as in the transform tool in the commit below - app/pdb/item-transform-cmds.c | 29 ++++++++++++++++++++--------- + app/pdb/item-transform-cmds.c | 29 ++++++++++++++++++++--------- tools/pdbgen/pdb/item_transform.pdb | 11 ++++++++--- 2 files changed, 28 insertions(+), 12 deletions(-) commit 3ed87015a66489dbd53a96473778dd6d2653d1b4 Author: Michael Natterer -Date: Fri Mar 25 21:50:58 2011 +0100 +Date: Fri Mar 25 21:50:58 2011 +0100 app: if there is no selection, don't cut/transform/paste in the transform tool @@ -40256,7 +41150,7 @@ commit bef6d5716a92e3b629f0d626499ab2fe03e2d15d Author: Michael Natterer -Date: Fri Mar 25 21:35:19 2011 +0100 +Date: Fri Mar 25 21:35:19 2011 +0100 app: use a tool progress for GimpTransformTool @@ -40265,7 +41159,7 @@ commit f078a7416c163e743bd19f6f5c0a250a08e8c4c8 Author: Michael Natterer -Date: Fri Mar 25 21:32:08 2011 +0100 +Date: Fri Mar 25 21:32:08 2011 +0100 app: remove some junk from GimpTransformTool @@ -40279,7 +41173,7 @@ commit a5549ece52fc411200cbeb98750b388452516f5c Author: Michael Natterer -Date: Fri Mar 25 21:28:21 2011 +0100 +Date: Fri Mar 25 21:28:21 2011 +0100 app: don't pause/resume the shell (and the active tool) around expose() @@ -40293,7 +41187,7 @@ commit 6fdcc5f46518240f4e339768911ed49792cdf2aa Author: Michael Natterer -Date: Fri Mar 25 15:41:53 2011 +0100 +Date: Fri Mar 25 15:41:53 2011 +0100 app: add a progress indicator for cage transform @@ -40305,13 +41199,13 @@ app/gegl/gimpoperationcagetransform.c | 32 +++++++++++++++++++++++++++++++- app/gegl/gimpoperationcagetransform.h | 2 ++ - app/tools/gimpcagetool.c | 33 + app/tools/gimpcagetool.c | 33 ++++++++++++++++++++++++++++++++- 3 files changed, 65 insertions(+), 2 deletions(-) commit 41b905baa883b4b9b84019575a3fbce61e9b5d6d Author: Michael Natterer -Date: Fri Mar 25 10:55:07 2011 +0100 +Date: Fri Mar 25 10:55:07 2011 +0100 app: make GimpTool implement the GimpProgress interface properly @@ -40319,19 +41213,19 @@ code to standard progress code, and use the tool progress also in blend. - app/tools/Makefile.am | 2 + + app/tools/Makefile.am | 2 + app/tools/gimpblendtool.c | 2 +- app/tools/gimpcagetool.c | 12 ++- app/tools/gimptool-progress.c | 191 ++++++++++++++++++++++++++++++++++++++++++ app/tools/gimptool-progress.h | 28 +++++++ - app/tools/gimptool.c | 70 +--------------- - app/tools/gimptool.h | 7 -- + app/tools/gimptool.c | 70 +--------------- + app/tools/gimptool.h | 7 -- 7 files changed, 234 insertions(+), 78 deletions(-) commit 8daee72518af49ec57126ee421a7700253c2eb81 Author: Michael Natterer -Date: Fri Mar 25 10:18:56 2011 +0100 +Date: Fri Mar 25 10:18:56 2011 +0100 app: various GimpCageTool fixes @@ -40346,45 +41240,45 @@ commit e9dd30127ac4eb44a6504c80e4dc38bcdc926635 Author: Michael Natterer -Date: Fri Mar 25 09:48:26 2011 +0100 +Date: Fri Mar 25 09:48:26 2011 +0100 app: add an on-canvas progress facility to GimpTool and use it in GimpCageTool. app/tools/gimpcagetool.c | 49 ++++++++++------------------------- - app/tools/gimptool.c | 66 + app/tools/gimptool.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ - app/tools/gimptool.h | 11 ++++++++ + app/tools/gimptool.h | 11 ++++++++ 3 files changed, 90 insertions(+), 36 deletions(-) commit 927ce61ce1be865783b7e7561921a7fa56f99fec Author: Michael Natterer -Date: Thu Mar 24 21:54:40 2011 +0100 +Date: Thu Mar 24 21:54:40 2011 +0100 app: use a data delete dialog in the tool options' preset delete menu app/actions/tool-options-commands.c | 13 +++++++++---- - app/dialogs/data-delete-dialog.c | 4 ++-- + app/dialogs/data-delete-dialog.c | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) commit 920d1a42e91d76e8acb662c0cc8456bd2a5992cc Author: Michael Natterer -Date: Thu Mar 24 21:46:40 2011 +0100 +Date: Thu Mar 24 21:46:40 2011 +0100 app: move the GimpData delete confirm dialog to its own files - app/actions/data-commands.c | 107 ++------------------------ - app/dialogs/Makefile.am | 2 + + app/actions/data-commands.c | 107 ++------------------------ + app/dialogs/Makefile.am | 2 + app/dialogs/data-delete-dialog.c | 158 +++++++++++++++++++++++++++++++++++++++ app/dialogs/data-delete-dialog.h | 28 +++++++ - po/POTFILES.in | 1 + + po/POTFILES.in | 1 + 5 files changed, 196 insertions(+), 100 deletions(-) commit afa8a416c9e2b3aa65eb9dde75b838360cb2e0d6 Author: Michael Natterer -Date: Thu Mar 24 20:20:24 2011 +0100 +Date: Thu Mar 24 20:20:24 2011 +0100 app: don't crash if GimpBrushTool has no dynamics to paint a brush outline @@ -40397,7 +41291,7 @@ commit 8b87e633b37f6e577366ec9bbd5407fe0ff852fa Author: Michael Muré -Date: Thu Mar 24 19:57:47 2011 +0100 +Date: Thu Mar 24 19:57:47 2011 +0100 gimp:cage-transform : iterate over y then x, to follow memory organisation @@ -40407,7 +41301,7 @@ commit b6ef32f580e1c0acb55e0700de47c6fb56918682 Author: Michael Muré -Date: Thu Mar 24 19:38:14 2011 +0100 +Date: Thu Mar 24 19:38:14 2011 +0100 gimp:cage-transform : when pre-filling the buffer, do a check if the pixel is @@ -40418,7 +41312,7 @@ commit 635d1ba37dc28cc8472c6803b366a23110bb6b1c Author: Michael Muré -Date: Thu Mar 24 19:13:39 2011 +0100 +Date: Thu Mar 24 19:13:39 2011 +0100 gimp:cage-transform : fusion of two loop that didn't need to be seperate @@ -40428,7 +41322,7 @@ commit b87e5c10b3594a5482468a93c6f936a81981cf2a Author: Michael Muré -Date: Thu Mar 24 18:22:36 2011 +0100 +Date: Thu Mar 24 18:22:36 2011 +0100 gimp:cagetransform : move a call to babl_format_n outside of loops @@ -40437,7 +41331,7 @@ commit 5a5f47d903f05c4a90749be6ecfd13a053c76a15 Author: Mikael Magnusson -Date: Thu Mar 24 16:56:23 2011 +0100 +Date: Thu Mar 24 16:56:23 2011 +0100 cagetool: move malloc out of inner loop @@ -40446,7 +41340,7 @@ commit b590804212e54522b8bfe254f2c83cb6f6e4b61f Author: Michael Natterer -Date: Thu Mar 24 13:10:43 2011 +0100 +Date: Thu Mar 24 13:10:43 2011 +0100 app: move GimpFilteredContainer's match logic to a utility function @@ -40456,7 +41350,7 @@ commit aec66d0c267c3061d5de84c17f3d3d810068b8e4 Author: Michael Natterer -Date: Thu Mar 24 12:28:45 2011 +0100 +Date: Thu Mar 24 12:28:45 2011 +0100 app: make GimpTaggedContainer properly memory manage the filter list @@ -40464,15 +41358,15 @@ validly be NULL obvious by adding utility functions gimp_tag_or_null_ref/unref(). - app/core/gimptag.c | 34 ++++++++++++++++++++++++++++++++++ - app/core/gimptag.h | 3 +++ + app/core/gimptag.c | 34 ++++++++++++++++++++++++++++++++++ + app/core/gimptag.h | 3 +++ app/core/gimptaggedcontainer.c | 29 ++++++++++++++++++++++++++--- - app/widgets/gimptagentry.c | 2 ++ + app/widgets/gimptagentry.c | 2 ++ 4 files changed, 65 insertions(+), 3 deletions(-) commit 7eda388fec73c963aad97dbfe71c869c36130635 Author: Michael Natterer -Date: Thu Mar 24 09:55:32 2011 +0100 +Date: Thu Mar 24 09:55:32 2011 +0100 app: fix possible GimpTagEntry crash by keeping the query idle ID around @@ -40485,7 +41379,7 @@ commit ac7aab23769f1b8033c31cfb3dbdf9b9e3c5811f Author: Michael Natterer -Date: Thu Mar 24 09:43:21 2011 +0100 +Date: Thu Mar 24 09:43:21 2011 +0100 app: forgot to remove member GimpTaggedContainer:src_container @@ -40494,7 +41388,7 @@ commit d64eae8c4ed5a663c98d19ed7c61e7e6b9f12680 Author: Michael Natterer -Date: Thu Mar 24 09:13:02 2011 +0100 +Date: Thu Mar 24 09:13:02 2011 +0100 app: use gimp_tagged_has_tag() instead of imlementing the same @@ -40506,7 +41400,7 @@ commit 39d206705861bff990ddd8fe60990efab1d9fde9 Author: Michael Natterer -Date: Thu Mar 24 09:10:59 2011 +0100 +Date: Thu Mar 24 09:10:59 2011 +0100 app: add gimp_tagged_has_tag(), and some cleanup in GimpTagged @@ -40516,7 +41410,7 @@ commit c0624324440f6d868f71d3a861421f140843b375 Author: Mukund Sivaraman -Date: Thu Mar 24 11:29:23 2011 +0530 +Date: Thu Mar 24 11:29:23 2011 +0530 Fix size_t format modifier yet again @@ -40524,13 +41418,13 @@ the POSIX `z' modifier for size_t arguments. Yay! plug-ins/common/sphere-designer.c | 2 +- - plug-ins/gfig/gfig-style.c | 6 +++++- + plug-ins/gfig/gfig-style.c | 6 +++++- plug-ins/lighting/lighting-ui.c | 8 ++++---- 3 files changed, 10 insertions(+), 6 deletions(-) commit 36e03dafc1076979dec99dccd00e990f1468245b Author: Mukund Sivaraman -Date: Thu Mar 24 11:05:18 2011 +0530 +Date: Thu Mar 24 11:05:18 2011 +0530 Remove deleted file from POTFILES.in @@ -40539,7 +41433,7 @@ commit d6c4d211907bc0c910c1cb544d8bd73e0ab97337 Author: Mukund Sivaraman -Date: Tue Mar 22 23:28:42 2011 +0530 +Date: Tue Mar 22 23:28:42 2011 +0530 Use guints for flags @@ -40548,7 +41442,7 @@ commit 3cd16c798d24b2684bc091b6d67003092d23141d Author: Timo Jyrinki -Date: Thu Mar 24 02:36:20 2011 +0200 +Date: Thu Mar 24 02:36:20 2011 +0200 Update Finnish translation (major quick review of the roughly 50% of fuzzy translations and a few untranslated ones, leaving ca. 90 @@ -40560,20 +41454,20 @@ commit 1659f62e2c79b6026f80911624359cd818b32ac5 Author: Michael Natterer -Date: Wed Mar 23 22:29:00 2011 +0100 +Date: Wed Mar 23 22:29:00 2011 +0100 app: small style cleanup in the merged cage code - app/gegl/gimpcageconfig.c | 71 ++++---- - app/gegl/gimpcageconfig.h | 1 + + app/gegl/gimpcageconfig.c | 71 ++++---- + app/gegl/gimpcageconfig.h | 1 + app/gegl/gimpoperationcagetransform.c | 4 +- - app/tools/gimpcagetool.c | 295 + app/tools/gimpcagetool.c | 295 ++++++++++++++++++++-------------- 4 files changed, 215 insertions(+), 156 deletions(-) commit f2d5831ee28e9abb1f15af0e0cf806294cf015a4 Author: Michael Natterer -Date: Wed Mar 23 22:12:49 2011 +0100 +Date: Wed Mar 23 22:12:49 2011 +0100 app: virtualize the add/remove/freeze/thaw logic of GimpFilteredContainer @@ -40590,7 +41484,7 @@ commit 014a333d271053ff34793f217af8a73e778f9d65 Author: Michael Natterer -Date: Wed Mar 23 21:51:56 2011 +0100 +Date: Wed Mar 23 21:51:56 2011 +0100 app: fix GimpTaggedContainer's base class @@ -40604,7 +41498,7 @@ commit b49fdd4fd0276b511f36ef3d8329482f52dac6dd Author: Michael Natterer -Date: Wed Mar 23 20:57:04 2011 +0100 +Date: Wed Mar 23 20:57:04 2011 +0100 app: fix GimpTaggedContainer to work with multiple views @@ -40619,15 +41513,15 @@ 1 file changed, 119 insertions(+), 147 deletions(-) commit 2aeac1cf4e0d7d179406f2fbf0911ec519074e16 -Merge: 91195e8 fe7aa4e +Merge: 91195e8593 fe7aa4e113 Author: Michael Muré -Date: Wed Mar 23 20:07:17 2011 +0100 +Date: Wed Mar 23 20:07:17 2011 +0100 Merge branch 'soc-2010-cage-2' commit 91195e859392395526e12fd6ffe47610d059c7e5 Author: Michael Natterer -Date: Wed Mar 23 09:27:29 2011 +0100 +Date: Wed Mar 23 09:27:29 2011 +0100 app: remove the old tool presets system @@ -40636,26 +41530,26 @@ Turn the tool options dialog's preset Save/Restore/Edit/Delete menus and buttons into shortcuts for managing the active tool's presets. - app/actions/tool-options-actions.c | 82 +++++---- + app/actions/tool-options-actions.c | 82 +++++---- app/actions/tool-options-commands.c | 192 +++++++++------------- - app/actions/tool-options-commands.h | 36 ++-- - app/core/Makefile.am | 2 - - app/core/core-types.h | 1 - - app/core/gimptoolinfo.c | 26 ++- - app/core/gimptoolinfo.h | 2 +- - app/core/gimptoolpresets.c | 320 + app/actions/tool-options-commands.h | 36 ++-- + app/core/Makefile.am | 2 - + app/core/core-types.h | 1 - + app/core/gimptoolinfo.c | 26 ++- + app/core/gimptoolinfo.h | 2 +- + app/core/gimptoolpresets.c | 320 ------------------------------------ - app/core/gimptoolpresets.h | 66 -------- - app/menus/tool-options-menu.c | 13 +- - app/tools/gimp-tools.c | 5 +- - app/widgets/gimphelp-ids.h | 2 +- + app/core/gimptoolpresets.h | 66 -------- + app/menus/tool-options-menu.c | 13 +- + app/tools/gimp-tools.c | 5 +- + app/widgets/gimphelp-ids.h | 2 +- app/widgets/gimptooloptionseditor.c | 131 ++++----------- - menus/tool-options-menu.xml | 10 +- + menus/tool-options-menu.xml | 10 +- 14 files changed, 202 insertions(+), 686 deletions(-) commit f3a99ed8f7311818f0ad46832e9ff1a7172c2362 Author: Michael Natterer -Date: Tue Mar 22 23:41:42 2011 +0100 +Date: Tue Mar 22 23:41:42 2011 +0100 app: turn GimpFilteredContainer into a general purpose filter @@ -40666,7 +41560,7 @@ commit 051ef0ebcb826153d06725d4f4c48d61b39353da Author: Michael Natterer -Date: Tue Mar 22 23:11:46 2011 +0100 +Date: Tue Mar 22 23:11:46 2011 +0100 app: add GimpTaggedContainer @@ -40674,8 +41568,8 @@ no other change. #if 0 GimpFilteredContainer for now and use GimpTaggedContainer instead all over the place. - app/core/Makefile.am | 2 + - app/core/core-types.h | 1 + + app/core/Makefile.am | 2 + + app/core/core-types.h | 1 + app/core/gimpfilteredcontainer.c | 2 + app/core/gimpfilteredcontainer.h | 2 + app/core/gimptaggedcontainer.c | 596 @@ -40684,14 +41578,14 @@ app/widgets/gimpcombotagentry.c | 54 ++-- app/widgets/gimpcombotagentry.h | 4 +- app/widgets/gimpdatafactoryview.c | 41 +-- - app/widgets/gimptagentry.c | 20 +- - app/widgets/gimptagentry.h | 43 +-- - app/widgets/gimptagpopup.c | 48 +-- + app/widgets/gimptagentry.c | 20 +- + app/widgets/gimptagentry.h | 43 +-- + app/widgets/gimptagpopup.c | 48 +-- 12 files changed, 778 insertions(+), 104 deletions(-) commit 49710c1cd455487291c3ea4868c4e645e3bacc7e Author: Michael Natterer -Date: Tue Mar 22 22:26:30 2011 +0100 +Date: Tue Mar 22 22:26:30 2011 +0100 app: cosmetic cleanups in GimpFilteredContainer @@ -40700,7 +41594,7 @@ commit 7cf14bd390643977867dadf2492bba62102a552b Author: Michael Natterer -Date: Tue Mar 22 22:09:03 2011 +0100 +Date: Tue Mar 22 22:09:03 2011 +0100 app: allow to change GimpToolPreset's icon @@ -40714,22 +41608,22 @@ commit fa9453eea13b8117607b162f1c3034b6fffb4599 Author: Michael Natterer -Date: Tue Mar 22 15:20:03 2011 +0100 +Date: Tue Mar 22 15:20:03 2011 +0100 app: add gimp_prop_icon_picker_new() and use it in GimpTemplateEditor instead of handling the icon picker manually. - app/widgets/gimppropwidgets.c | 99 + app/widgets/gimppropwidgets.c | 99 ++++++++++++++++++++++++++++++++++++++++ - app/widgets/gimppropwidgets.h | 3 ++ + app/widgets/gimppropwidgets.h | 3 ++ app/widgets/gimptemplateeditor.c | 43 +++-------------- 3 files changed, 108 insertions(+), 37 deletions(-) commit ab9cb53be8bff22ee3d058d27376b9b91135be0d Author: Michael Natterer -Date: Tue Mar 22 15:08:11 2011 +0100 +Date: Tue Mar 22 15:08:11 2011 +0100 app: gimp_tool_preset_new(): ignore the passed name @@ -40742,7 +41636,7 @@ commit 28aa26fb281d3d4c0bb5b674fb10ca901bf81071 Author: Michael Natterer -Date: Mon Mar 21 23:40:05 2011 +0100 +Date: Mon Mar 21 23:40:05 2011 +0100 Bug 635038 - Fails to build on GNU/Hurd @@ -40754,7 +41648,7 @@ commit 569299523e178cada9e849f11c75c155d996ab2d Author: Michael Natterer -Date: Mon Mar 21 22:58:59 2011 +0100 +Date: Mon Mar 21 22:58:59 2011 +0100 Bug 641529 - Image Map plugin. The name of 2 buttons are not too clear @@ -40766,7 +41660,7 @@ commit 33dd20750f9eb848af64d0a00bbed08452a3b143 Author: Michael Natterer -Date: Mon Mar 21 21:49:08 2011 +0100 +Date: Mon Mar 21 21:49:08 2011 +0100 Bug 645456 - Inconsistent window (role) naming scheme @@ -40777,7 +41671,7 @@ commit ee6a0290405878d3be6b21023a4e8f617c06df9e Author: Mukund Sivaraman -Date: Mon Mar 21 22:49:48 2011 +0530 +Date: Mon Mar 21 22:49:48 2011 +0530 Add -fno-common to CFLAGS @@ -40788,13 +41682,13 @@ If you see GIMP crash strangely (i.e, apart from the usual crashes), please go see a head doctor. - configure.ac | 3 +++ + configure.ac | 3 +++ plug-ins/metadata/gimpxmpmodelwidget.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) commit cc04620b96b2c80b682dba6c890ff5b9b2277c37 Author: Omari Stephens -Date: Mon Mar 21 14:37:28 2011 +0000 +Date: Mon Mar 21 14:37:28 2011 +0000 Adjust Bug 559716 bugfix to not test exact double equality @@ -40803,7 +41697,7 @@ commit ec1108d62a671279779514c66dab15b0ca65c24b Author: Michael Natterer -Date: Mon Mar 21 14:38:26 2011 +0100 +Date: Mon Mar 21 14:38:26 2011 +0100 Bug 559716 - Changing crop size in Crop Tool Options can make UI unresponsive @@ -40820,7 +41714,7 @@ commit a90961ef4a1cd3f2669df94154c02ac219d10ae4 Author: Michael Natterer -Date: Mon Mar 21 01:00:37 2011 +0100 +Date: Mon Mar 21 01:00:37 2011 +0100 app: make GimpTextStyleEditor look a bit nicer @@ -40832,7 +41726,7 @@ commit 38287ba9f446aeff672cb0ec2fa9a223687de8dc Author: Michael Natterer -Date: Sun Mar 20 23:59:19 2011 +0100 +Date: Sun Mar 20 23:59:19 2011 +0100 app: GimpTextTool: use the highlight color for the selected text @@ -40841,7 +41735,7 @@ commit a7d62a11b5959934cdf893d3041843b816cadbbf Author: Francisco Vila -Date: Sun Mar 20 21:08:39 2011 +0100 +Date: Sun Mar 20 21:08:39 2011 +0100 Updated Spanish translation @@ -40851,31 +41745,31 @@ commit 6378e9fc4ddefd85d6b66efd7495d7a3b85f8ec8 Author: Michael Natterer -Date: Sun Mar 20 18:27:11 2011 +0100 +Date: Sun Mar 20 18:27:11 2011 +0100 app: rename member GimpImageMapTool->shell to ->dialog "shell" has confused me once too often today... app/tools/gimpbrightnesscontrasttool.c | 2 +- - app/tools/gimpcolorbalancetool.c | 2 +- - app/tools/gimpcolorizetool.c | 2 +- - app/tools/gimpcurvestool.c | 2 +- - app/tools/gimpdesaturatetool.c | 2 +- - app/tools/gimpgegltool.c | 2 +- - app/tools/gimphuesaturationtool.c | 2 +- - app/tools/gimpimagemaptool-settings.c | 4 +- - app/tools/gimpimagemaptool.c | 82 + app/tools/gimpcolorbalancetool.c | 2 +- + app/tools/gimpcolorizetool.c | 2 +- + app/tools/gimpcurvestool.c | 2 +- + app/tools/gimpdesaturatetool.c | 2 +- + app/tools/gimpgegltool.c | 2 +- + app/tools/gimphuesaturationtool.c | 2 +- + app/tools/gimpimagemaptool-settings.c | 4 +- + app/tools/gimpimagemaptool.c | 82 +++++++++++++++++----------------- - app/tools/gimpimagemaptool.h | 4 +- - app/tools/gimplevelstool.c | 4 +- - app/tools/gimpposterizetool.c | 2 +- - app/tools/gimpthresholdtool.c | 2 +- + app/tools/gimpimagemaptool.h | 4 +- + app/tools/gimplevelstool.c | 4 +- + app/tools/gimpposterizetool.c | 2 +- + app/tools/gimpthresholdtool.c | 2 +- 13 files changed, 56 insertions(+), 56 deletions(-) commit 4149452279b1f6cdff4ef77c59f24dc90ed87a89 Author: Michael Natterer -Date: Sun Mar 20 18:15:42 2011 +0100 +Date: Sun Mar 20 18:15:42 2011 +0100 Bug 643155 - Tool dialogs don't stay on top of the image window @@ -40897,7 +41791,7 @@ commit 13bedf69e2e0d57a250fffab19d7dbe19e83bd0c Author: Michael Natterer -Date: Sun Mar 20 16:57:23 2011 +0100 +Date: Sun Mar 20 16:57:23 2011 +0100 app: minor cleanups in GimpColorPickerTool @@ -40906,31 +41800,27 @@ commit 1f5e1803340c3542efb6ee447609153d6f7ef170 Author: Michael Natterer -Date: Sun Mar 20 13:34:03 2011 +0100 +Date: Sun Mar 20 13:34:03 2011 +0100 app: move GimpToolDialog from app/widgets/ to app/display/ Zero logic changes yet, just a rename. - app/display/Makefile.am | 4 +- - app/display/display-types.h | 2 + - app/display/gimptooldialog.c | 105 - ++++++++++++++++++++++++++++++++++++++++ - app/display/gimptooldialog.h | 51 +++++++++++++++++++ - app/tools/gimpcolorpickertool.c | 2 +- - app/tools/gimpimagemaptool.c | 2 +- - app/tools/gimpmeasuretool.c | 2 +- - app/tools/gimptransformtool.c | 2 +- - app/widgets/Makefile.am | 2 - - app/widgets/gimptooldialog.c | 104 - --------------------------------------- - app/widgets/gimptooldialog.h | 51 ------------------- - app/widgets/widgets-types.h | 1 - - 12 files changed, 165 insertions(+), 163 deletions(-) + app/display/Makefile.am | 4 +++- + app/display/display-types.h | 2 ++ + app/{widgets => display}/gimptooldialog.c | 5 +++-- + app/{widgets => display}/gimptooldialog.h | 0 + app/tools/gimpcolorpickertool.c | 2 +- + app/tools/gimpimagemaptool.c | 2 +- + app/tools/gimpmeasuretool.c | 2 +- + app/tools/gimptransformtool.c | 2 +- + app/widgets/Makefile.am | 2 -- + app/widgets/widgets-types.h | 1 - + 10 files changed, 12 insertions(+), 10 deletions(-) commit 384689b761ffc21fb848de94098a31bc2191073f Author: Michael Natterer -Date: Sun Mar 20 13:21:59 2011 +0100 +Date: Sun Mar 20 13:21:59 2011 +0100 libgimpwidgets: add a private struct to GimpDialog and use it for help stuff @@ -40943,20 +41833,20 @@ commit c469dbb206c9b1dea260e9a0b2a682040519edf4 Author: Michael Natterer -Date: Sun Mar 20 12:44:03 2011 +0100 +Date: Sun Mar 20 12:44:03 2011 +0100 libgimpwidgets: turn GimpDialog's "parent" into a property and remove the parent peoperty from GimpViewableDialog. app/widgets/gimpviewabledialog.c | 32 ++++++++----------------- - libgimpwidgets/gimpdialog.c | 50 + libgimpwidgets/gimpdialog.c | 50 +++++++++++++++++++++++++++++----------- 2 files changed, 46 insertions(+), 36 deletions(-) commit 6d97fd3887938ab50380881f6c83e1cefd1b481b Author: Michael Natterer -Date: Sun Mar 20 12:37:01 2011 +0100 +Date: Sun Mar 20 12:37:01 2011 +0100 app: use a size entry instead of a spinbutton in GimpTextStyleEditor @@ -40969,7 +41859,7 @@ commit 5f546938b63836db7739fe98be811544c11bac60 Author: Alexia Death -Date: Sat Mar 19 23:27:08 2011 +0200 +Date: Sat Mar 19 23:27:08 2011 +0200 app: Fix whitespace in last commit @@ -40978,7 +41868,7 @@ commit 6d6ab78d2ab9e4803c500d4f2ff6b58c776a0437 Author: Alexia Death -Date: Sat Mar 19 23:26:34 2011 +0200 +Date: Sat Mar 19 23:26:34 2011 +0200 app: Fix stroking brush size to brush default @@ -40987,23 +41877,23 @@ commit ce606d956187a827cc3e2e34d70b63898c6b1be4 Author: Alexia Death -Date: Sat Mar 19 22:48:17 2011 +0200 +Date: Sat Mar 19 22:48:17 2011 +0200 app: Fix a dynamics leak from new pdb fix - app/pdb/paint-tools-cmds.c | 2 ++ + app/pdb/paint-tools-cmds.c | 2 ++ tools/pdbgen/pdb/paint_tools.pdb | 2 ++ 2 files changed, 4 insertions(+) commit 5d5430e110e1deb376e6bef09eeee7975dcc4fc6 Author: Alexia Death -Date: Sat Mar 19 17:12:14 2011 +0200 +Date: Sat Mar 19 17:12:14 2011 +0200 app: Fix pdb size and dynamics brush stuff [ Mikael: deduplicated brush size setting and fixed some whitespace ] - app/pdb/paint-tools-cmds.c | 43 + app/pdb/paint-tools-cmds.c | 43 ++++++++++++++++++++++++++++++++++++---- tools/pdbgen/pdb/paint_tools.pdb | 43 ++++++++++++++++++++++++++++++++++++---- @@ -41011,7 +41901,7 @@ commit b3a597c7de16d41a36c0340d08bddfe1d2c86588 Author: Michael Natterer -Date: Sat Mar 19 16:43:09 2011 +0100 +Date: Sat Mar 19 16:43:09 2011 +0100 Revert "app: Fix pdb size and dynamics issues" @@ -41023,31 +41913,31 @@ commit bb80dfdc8eb0373a1a598ec5d149be50b7271073 Author: Michael Natterer -Date: Sat Mar 19 16:42:53 2011 +0100 +Date: Sat Mar 19 16:42:53 2011 +0100 Revert "app: Fix pdb properly this time" This reverts commit 1a8edd7d1da2fb59e265c7dce3f25d9470c75e74. - app/pdb/paint-tools-cmds.c | 94 ++++++++-------- + app/pdb/paint-tools-cmds.c | 94 ++++++++-------- tools/pdbgen/pdb/paint_tools.pdb | 226 +-------------------------------------- 2 files changed, 50 insertions(+), 270 deletions(-) commit 1a8edd7d1da2fb59e265c7dce3f25d9470c75e74 Author: Alexia Death -Date: Sat Mar 19 17:12:14 2011 +0200 +Date: Sat Mar 19 17:12:14 2011 +0200 app: Fix pdb properly this time - app/pdb/paint-tools-cmds.c | 94 ++++++++-------- + app/pdb/paint-tools-cmds.c | 94 ++++++++-------- tools/pdbgen/pdb/paint_tools.pdb | 226 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 270 insertions(+), 50 deletions(-) commit 9bae2a15cbcff4d23fb59c9bf99bb278acba81f5 Author: Alexia Death -Date: Sat Mar 19 15:13:32 2011 +0200 +Date: Sat Mar 19 15:13:32 2011 +0200 app: Fix pdb size and dynamics issues @@ -41057,7 +41947,7 @@ commit 4f62bdf4365c72489ad33ecd4d1d776fc19fc09b Author: Michael Natterer -Date: Sat Mar 19 10:11:47 2011 +0100 +Date: Sat Mar 19 10:11:47 2011 +0100 app: paint the text cursor in the highlight color @@ -41068,7 +41958,7 @@ commit 0789ee2669620710e1962d825c2341c16ec7a426 Author: Michael Natterer -Date: Fri Mar 18 22:57:13 2011 +0100 +Date: Fri Mar 18 22:57:13 2011 +0100 app: add a 1px FG border around overlay frames @@ -41080,7 +41970,7 @@ commit 28b6057b1adf90bd88f02c2847c5ed4b1284d16c Author: Michael Natterer -Date: Fri Mar 18 22:56:37 2011 +0100 +Date: Fri Mar 18 22:56:37 2011 +0100 themes: remove the experimental dark style for overlay widgets @@ -41090,7 +41980,7 @@ commit 140c9aae91e2671a02e1b146d69715b39cbeb145 Author: Michael Natterer -Date: Fri Mar 18 22:13:34 2011 +0100 +Date: Fri Mar 18 22:13:34 2011 +0100 Bug 625273 - Insert Font and font-size into the Texteditor's Menubar @@ -41105,7 +41995,7 @@ commit f09360ba801f5a274cbef5e092ef93745ded34b4 Author: Michael Natterer -Date: Fri Mar 18 21:39:28 2011 +0100 +Date: Fri Mar 18 21:39:28 2011 +0100 app: GimpTextLayout: use the unit conversion functions from gimpunit.[ch] @@ -41120,7 +42010,7 @@ commit caa3b9f4bf2b18ebefa8cf142b8ba03165e1121e Author: Michael Natterer -Date: Fri Mar 18 21:34:27 2011 +0100 +Date: Fri Mar 18 21:34:27 2011 +0100 libgimpbase: add gimp_units_to_points() @@ -41135,25 +42025,25 @@ commit ecbfb4a9e87bd8c90f26f1dc1545b15e447c834f Author: Michael Natterer -Date: Fri Mar 18 21:16:53 2011 +0100 +Date: Fri Mar 18 21:16:53 2011 +0100 app: add a GimpText property and construct param to GimpTextStyleEditor which will be used to get default values from. - app/tools/gimptextoptions.c | 4 +++- - app/tools/gimptextoptions.h | 1 + + app/tools/gimptextoptions.c | 4 +++- + app/tools/gimptextoptions.h | 1 + app/tools/gimptexttool-editor.c | 4 +++- - app/widgets/gimptexteditor.c | 6 +++++- - app/widgets/gimptexteditor.h | 1 + + app/widgets/gimptexteditor.c | 6 +++++- + app/widgets/gimptexteditor.h | 1 + app/widgets/gimptextstyleeditor.c | 24 ++++++++++++++++++++++++ app/widgets/gimptextstyleeditor.h | 2 ++ 7 files changed, 39 insertions(+), 3 deletions(-) commit 10893e6bfab387854b03cf8c34dd683da1735ad8 Author: Michael Natterer -Date: Fri Mar 18 20:41:38 2011 +0100 +Date: Fri Mar 18 20:41:38 2011 +0100 Revert "Add some extra compiler warnings to CFLAGS" @@ -41165,7 +42055,7 @@ commit f47645dc51d2b1b27afa32cfab54abb2e59570e8 Author: Mukund Sivaraman -Date: Fri Mar 18 22:16:31 2011 +0530 +Date: Fri Mar 18 22:16:31 2011 +0530 Add some extra compiler warnings to CFLAGS @@ -41174,7 +42064,7 @@ commit 61aa1854fd5d42ba91342188098d30efb0a7fec4 Author: Michael Natterer -Date: Fri Mar 18 15:42:50 2011 +0100 +Date: Fri Mar 18 15:42:50 2011 +0100 app: make GimpSpinScale's slow part change the value 10x slower than the fast part @@ -41185,7 +42075,7 @@ commit f1d1bb610de959c82278baff51157eb8b7ca8571 Author: Michael Natterer -Date: Fri Mar 18 15:07:44 2011 +0100 +Date: Fri Mar 18 15:07:44 2011 +0100 app: experimentally add fine-tuning to GimpSpinScale @@ -41197,23 +42087,23 @@ commit df731912a51839b8c143a23fc8461c342290db2f Author: Michael Natterer -Date: Fri Mar 18 12:58:32 2011 +0100 +Date: Fri Mar 18 12:58:32 2011 +0100 app: add a GimpTextStyleEditor to the text tool's editor dialog so it's an alternative to on-screen editing for esoteric use cases that can do everything on-screen editing is capable of. - app/tools/gimptextoptions.c | 10 ++++++++-- - app/tools/gimptextoptions.h | 5 ++++- + app/tools/gimptextoptions.c | 10 ++++++++-- + app/tools/gimptextoptions.h | 5 ++++- app/tools/gimptexttool-editor.c | 10 ++++++++-- - app/widgets/gimptexteditor.c | 15 ++++++++++++++- - app/widgets/gimptexteditor.h | 5 ++++- + app/widgets/gimptexteditor.c | 15 ++++++++++++++- + app/widgets/gimptexteditor.h | 5 ++++- 5 files changed, 38 insertions(+), 7 deletions(-) commit 6e45d788f81ffead4308e3943c3591d6ecb471e0 Author: Michael Natterer -Date: Fri Mar 18 09:27:54 2011 +0100 +Date: Fri Mar 18 09:27:54 2011 +0100 plug-ins: undeprecate most of file-xjt @@ -41222,7 +42112,7 @@ commit 422248d42a10b594df3476958ed85d3cd3b3c871 Author: Kevin Cozens -Date: Thu Mar 17 21:42:12 2011 -0400 +Date: Thu Mar 17 21:42:12 2011 -0400 Fixed cut and paste error that put R5RS fix before the setting of a variable. @@ -41232,7 +42122,7 @@ commit f13abfa3f077d14d9026197af02fb7f35943e00d Author: Michael Natterer -Date: Fri Mar 18 02:31:20 2011 +0100 +Date: Fri Mar 18 02:31:20 2011 +0100 app: change image parameter in gimp_text_layout_new() to xres,yres @@ -41248,7 +42138,7 @@ commit 1c8149a553c5cc4532cffe9c7266298de502c3bf Author: Michael Natterer -Date: Fri Mar 18 00:51:05 2011 +0100 +Date: Fri Mar 18 00:51:05 2011 +0100 Bug 632568 - 'gimp-drawable-transform-rotate-simple' makes GIMP crash in some cases @@ -41257,13 +42147,13 @@ negative width/height if source and dest regions don't overlap. app/core/gimpdrawable-transform.c | 13 +++++++---- - app/tests/test-core.c | 49 + app/tests/test-core.c | 49 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 4 deletions(-) commit 94fa7a04713cf9d826e95f5eca49f88e7930dbdb Author: Mukund Sivaraman -Date: Fri Mar 18 03:44:08 2011 +0530 +Date: Fri Mar 18 03:44:08 2011 +0530 file-jpeg: Validate ExifRational.denominator before division @@ -41272,7 +42162,7 @@ commit 9538f4d61f187b0fea293a729852533cc8477349 Author: Mukund Sivaraman -Date: Fri Mar 18 03:38:16 2011 +0530 +Date: Fri Mar 18 03:38:16 2011 +0530 file-jpeg: Bug #594282 - Set image resolution from EXIF if available @@ -41280,12 +42170,12 @@ +++++++++++++++++++++++++++++++++++++++ plug-ins/file-jpeg/jpeg-load.c | 64 +++++++++++++++++++++++++++++++++++++++--- - plug-ins/file-jpeg/jpeg.h | 5 ++++ + plug-ins/file-jpeg/jpeg.h | 5 ++++ 3 files changed, 125 insertions(+), 4 deletions(-) commit 97bf01569aae866d0772e48d08f421d455d18738 Author: Kevin Cozens -Date: Wed Mar 16 19:18:41 2011 -0400 +Date: Wed Mar 16 19:18:41 2011 -0400 Minor R5RS compatibility fix for the expt procedure. @@ -41294,7 +42184,7 @@ commit 5c07d3b52da954503f5ecf4786ef8f1ca9c29e33 Author: Kevin Cozens -Date: Sun Mar 6 17:33:32 2011 -0500 +Date: Sun Mar 6 17:33:32 2011 -0500 Added a getenv procedure to the ftx extension of Script-Fu. @@ -41303,7 +42193,7 @@ commit e24795f16784009ae6681e330cb2621df1271c48 Author: Michael Natterer -Date: Thu Mar 17 22:00:38 2011 +0100 +Date: Thu Mar 17 22:00:38 2011 +0100 Bug 600554 - Implement layer group transforms @@ -41311,13 +42201,13 @@ gimp_item_transform()/rotate()/... directly instead of going through the wrong cut/transform/paste code path. - app/pdb/item-transform-cmds.c | 27 ++++++++++++++++++--------- - tools/pdbgen/pdb/item_transform.pdb | 9 ++++++--- + app/pdb/item-transform-cmds.c | 27 ++++++++++++++++++--------- + tools/pdbgen/pdb/item_transform.pdb | 9 ++++++--- 2 files changed, 24 insertions(+), 12 deletions(-) commit 503acbae5434b0d74f5ade0e5509dc06cb11d795 Author: Michael Natterer -Date: Thu Mar 17 21:52:43 2011 +0100 +Date: Thu Mar 17 21:52:43 2011 +0100 Bug 600554 - Implement layer group transforms @@ -41337,7 +42227,7 @@ commit d3153960dfc49bcbdd4a860a260fd0385368811a Author: Michael Natterer -Date: Thu Mar 17 21:39:11 2011 +0100 +Date: Thu Mar 17 21:39:11 2011 +0100 app: rename gimp_transform_tool_doit() to gimp_transform_tool_transform() @@ -41347,7 +42237,7 @@ commit d7c66c66d07d40d4dca1c8089d3f671549c0efab Author: Michael Natterer -Date: Thu Mar 17 21:03:20 2011 +0100 +Date: Thu Mar 17 21:03:20 2011 +0100 Bug 142697 - Dock separators move between sessions @@ -41359,7 +42249,7 @@ commit 0d0ffd12650cac3154bf6762bf3364ab1116bde1 Author: Martin Nordholts -Date: Thu Mar 17 20:23:09 2011 +0100 +Date: Thu Mar 17 20:23:09 2011 +0100 Bug 644891 - Ctrl+e crashes gimp @@ -41371,7 +42261,7 @@ commit 584f9a35e78ed37eaefc55a09639a69ebe4909d2 Author: Mukund Sivaraman -Date: Fri Mar 18 00:04:51 2011 +0530 +Date: Fri Mar 18 00:04:51 2011 +0530 Use correct format string for size_t args @@ -41380,7 +42270,7 @@ commit 2deb14c9befbadaf23384fd1a9be0b0047ea3e56 Author: Mukund Sivaraman -Date: Fri Mar 18 00:02:07 2011 +0530 +Date: Fri Mar 18 00:02:07 2011 +0530 Use correct format string for size_t args @@ -41389,7 +42279,7 @@ commit 9bbfac5c592f8fb33e3cbe5fa7b61feef9dc7351 Author: Mukund Sivaraman -Date: Fri Mar 18 00:00:31 2011 +0530 +Date: Fri Mar 18 00:00:31 2011 +0530 Use correct format string for size_t args @@ -41398,7 +42288,7 @@ commit 56d8850d3818d9bdb4db47c0705a668c19c0a001 Author: Mukund Sivaraman -Date: Thu Mar 17 23:53:07 2011 +0530 +Date: Thu Mar 17 23:53:07 2011 +0530 Use a proper int to pointer cast @@ -41407,7 +42297,7 @@ commit bd74617756eb5416ffd9d15568a988a8d7086060 Author: Michael Natterer -Date: Thu Mar 17 19:21:07 2011 +0100 +Date: Thu Mar 17 19:21:07 2011 +0100 Bug 643174 - GIMP fails to execute 'Palette to Gradient' function @@ -41419,20 +42309,20 @@ commit ac5cd62af556e9b83596039c43d3395cf08621ea Author: Michael Natterer -Date: Thu Mar 17 15:58:46 2011 +0100 +Date: Thu Mar 17 15:58:46 2011 +0100 plug-ins: don't use %ld to print simple integer values I have no clue why %ld was used here, the values are really small... plug-ins/common/sphere-designer.c | 2 +- - plug-ins/gfig/gfig-style.c | 2 +- + plug-ins/gfig/gfig-style.c | 2 +- plug-ins/lighting/lighting-ui.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) commit e26c2777c5bad2797348dcbcb3173541cba86c43 Author: Michael Natterer -Date: Thu Mar 17 15:57:46 2011 +0100 +Date: Thu Mar 17 15:57:46 2011 +0100 plug-ins: use GimpImageType instead of GimpImageBaseType in value-propagate @@ -41445,7 +42335,7 @@ commit d7c1788f2cc9292f3151b9df2c9db3c602f28f85 Author: Michael Natterer -Date: Thu Mar 17 15:56:53 2011 +0100 +Date: Thu Mar 17 15:56:53 2011 +0100 plug-ins: use gdk_window_get_width/height() on GTK+ >= 2.24 @@ -41454,7 +42344,7 @@ commit 98e5c32f009962e0c5de7718749e38e1a630cd73 Author: Michael Natterer -Date: Thu Mar 17 15:44:47 2011 +0100 +Date: Thu Mar 17 15:44:47 2011 +0100 plug-ins: compare gimp_image_base_type() to GIMP_RGB, not GIMP_RGB_IMAGE @@ -41466,7 +42356,7 @@ commit d23c0d3fdff42e26a8010eb4532e77d99e155404 Author: Michael Natterer -Date: Thu Mar 17 15:29:43 2011 +0100 +Date: Thu Mar 17 15:29:43 2011 +0100 plug-ins: add a typedef for IfsCompose's token enum @@ -41477,7 +42367,7 @@ commit c6e35435adba1cb8e1b9e8d2ceabe6ae024dc429 Author: Michael Natterer -Date: Thu Mar 17 15:28:41 2011 +0100 +Date: Thu Mar 17 15:28:41 2011 +0100 libgimpwidgets: don't treat -1 as value of enum PangoAttrType @@ -41486,20 +42376,20 @@ commit 075c7d4a4d5639b48158a65b8167ab6969eb95bd Author: Michael Natterer -Date: Thu Mar 17 15:10:17 2011 +0100 +Date: Thu Mar 17 15:10:17 2011 +0100 app: avoid the deprecated gdk_drawable_get_size() on GTK+ >= 2.24 Use gdk_window_get_width/height() instead. app/widgets/gimpoverlaychild.c | 5 +++++ - app/widgets/gimpspinscale.c | 9 +++++++++ - app/widgets/gimptagentry.c | 5 +++++ + app/widgets/gimpspinscale.c | 9 +++++++++ + app/widgets/gimptagentry.c | 5 +++++ 3 files changed, 19 insertions(+) commit fdde231869017b281dbc7af7343d48063527544d Author: Michael Natterer -Date: Thu Mar 17 15:09:19 2011 +0100 +Date: Thu Mar 17 15:09:19 2011 +0100 app: use gtk_widget_get_allocation() instead of gdk_drawable_get_size() @@ -41509,7 +42399,7 @@ commit 42b2498a0610914a7c77bde91739ef42eedbb821 Author: Michael Natterer -Date: Thu Mar 17 14:42:44 2011 +0100 +Date: Thu Mar 17 14:42:44 2011 +0100 app: add a cast when comparing GdkCursorType with GimpCursorType @@ -41518,7 +42408,7 @@ commit b725eaa682f6b5f2c19720e30bf9409751594eb7 Author: Michael Natterer -Date: Thu Mar 17 14:41:34 2011 +0100 +Date: Thu Mar 17 14:41:34 2011 +0100 libgimpwidgets: don't mix GimpWidgetHelpType and GtkWidgetHelpType @@ -41529,20 +42419,20 @@ commit bdf8d3d776907b2f862335f77b9c3153b2a3176e Author: Michael Natterer -Date: Thu Mar 17 14:31:39 2011 +0100 +Date: Thu Mar 17 14:31:39 2011 +0100 plug-ins: add some GTK_CHECK_VERSION(2,24,0) and use the new GtkComboBoxText - plug-ins/common/animation-play.c | 16 ++++++++++++++++ - plug-ins/common/file-gih.c | 9 +++++++++ - plug-ins/common/file-ps.c | 10 ++++++++++ + plug-ins/common/animation-play.c | 16 ++++++++++++++++ + plug-ins/common/file-gih.c | 9 +++++++++ + plug-ins/common/file-ps.c | 10 ++++++++++ plug-ins/script-fu/script-fu-interface.c | 11 ++++++++++- 4 files changed, 45 insertions(+), 1 deletion(-) commit 41b1bd36da98da67c61b3b2bf1598608a575712f Author: Alexia Death -Date: Wed Mar 16 22:06:39 2011 +0200 +Date: Wed Mar 16 22:06:39 2011 +0200 app: Fix smooth intreaction with airbrush @@ -41554,7 +42444,7 @@ commit c07811f0a3dcc8a24799e83b512864c2e062fe45 Author: Michael Natterer -Date: Wed Mar 16 02:06:21 2011 +0100 +Date: Wed Mar 16 02:06:21 2011 +0100 app: remove unused variables in gimp_drawable_duplicate() @@ -41563,50 +42453,50 @@ commit 9f30550f9a629d12d79d73323ef2b57ca0cd76a4 Author: Michael Natterer -Date: Wed Mar 16 02:01:24 2011 +0100 +Date: Wed Mar 16 02:01:24 2011 +0100 app: move drawable->type to private app/core/gimpdrawable-private.h | 24 +++++++++++++----------- - app/core/gimpdrawable.c | 24 +++++++++++------------- - app/core/gimpdrawable.h | 4 +--- - app/core/gimpgrouplayer.c | 3 ++- - app/text/gimptextlayer-xcf.c | 3 +-- - app/xcf/xcf-load.c | 2 +- + app/core/gimpdrawable.c | 24 +++++++++++------------- + app/core/gimpdrawable.h | 4 +--- + app/core/gimpgrouplayer.c | 3 ++- + app/text/gimptextlayer-xcf.c | 3 +-- + app/xcf/xcf-load.c | 2 +- 6 files changed, 29 insertions(+), 31 deletions(-) commit 591f029c67bb5af3bd86c0a79bdb8e829f473439 Author: Marco Ciampa -Date: Wed Mar 16 00:38:41 2011 +0100 +Date: Wed Mar 16 00:38:41 2011 +0100 Updated italian translation po-plug-ins/it.po | 1105 +++++++++++++++++++++++++++-------------------------- - po/it.po | 809 ++++++++++++++++++++------------------- + po/it.po | 809 ++++++++++++++++++++------------------- 2 files changed, 986 insertions(+), 928 deletions(-) commit a62071e9ebc0e2555f9738e539221c9931f24c76 Author: Michael Natterer -Date: Wed Mar 16 00:16:31 2011 +0100 +Date: Wed Mar 16 00:16:31 2011 +0100 app: remove mamber GimpDrawable::bytes because it's always the same as GIMP_IMAGE_TYPE_BYTES(drawable->type) - app/core/gimpchannel.c | 8 +++++--- + app/core/gimpchannel.c | 8 +++++--- app/core/gimpdrawable-shadow.c | 12 ++++++++---- - app/core/gimpdrawable.c | 24 ++++++++++++------------ - app/core/gimpdrawable.h | 1 - - app/core/gimpgrouplayer.c | 3 +-- - app/core/gimpimage-convert.c | 4 ++-- - app/text/gimptextlayer-xcf.c | 3 +-- - app/text/gimptextlayer.c | 2 +- + app/core/gimpdrawable.c | 24 ++++++++++++------------ + app/core/gimpdrawable.h | 1 - + app/core/gimpgrouplayer.c | 3 +-- + app/core/gimpimage-convert.c | 4 ++-- + app/text/gimptextlayer-xcf.c | 3 +-- + app/text/gimptextlayer.c | 2 +- 8 files changed, 30 insertions(+), 27 deletions(-) commit f4b311d5586d03158b5470f541451ba1d7c1ee6e Author: Michael Natterer -Date: Tue Mar 15 22:43:49 2011 +0100 +Date: Tue Mar 15 22:43:49 2011 +0100 devel-docs: add newly generated templates to .gitignore @@ -41615,7 +42505,7 @@ commit 54c772541729d02d25e35d880fd6131e709290fc Author: Michael Natterer -Date: Mon Mar 14 14:28:08 2011 +0100 +Date: Mon Mar 14 14:28:08 2011 +0100 app: GimpTextTool: remove disabled testing code @@ -41624,7 +42514,7 @@ commit 22808b996fa6a9f9198483d018ef1cc6c171cde8 Author: Michael Natterer -Date: Mon Mar 14 14:12:43 2011 +0100 +Date: Mon Mar 14 14:12:43 2011 +0100 app: GimpTextOptions: implement GimpToolOptions::reset() @@ -41637,7 +42527,7 @@ commit 90058cded79d8092d59477d4ab8a411a7adc3d98 Author: Michael Natterer -Date: Mon Mar 14 13:05:30 2011 +0100 +Date: Mon Mar 14 13:05:30 2011 +0100 app: add missing tooltips in the text style overlay widget @@ -41646,7 +42536,7 @@ commit 75548264d08b1cff2bef978a94bd05f24037fdbf Author: Michael Natterer -Date: Mon Mar 14 12:58:34 2011 +0100 +Date: Mon Mar 14 12:58:34 2011 +0100 app: set the text option's unit menu to "plural" @@ -41658,7 +42548,7 @@ commit 14c4e7cd6763bb515c28d76fed18849ee07d60ae Author: Claude Paroz -Date: Sun Mar 13 20:14:33 2011 +0100 +Date: Sun Mar 13 20:14:33 2011 +0100 Updated French translation @@ -41670,7 +42560,7 @@ commit 8184296b3cf7308921962af71b54a604070f717d Author: Michael Natterer -Date: Sun Mar 13 02:14:44 2011 +0100 +Date: Sun Mar 13 02:14:44 2011 +0100 app: add gimp_container_get_neighbor_of() to GimpContainer @@ -41678,19 +42568,19 @@ Move the additional GimpContext logic of the old function into the callers, but use the new function in more places. - app/actions/data-commands.c | 19 +++++++++++++------ + app/actions/data-commands.c | 19 +++++++++++++------ app/actions/templates-commands.c | 12 +++++++----- - app/core/gimp-utils.c | 30 ------------------------------ - app/core/gimp-utils.h | 4 ---- - app/core/gimpcontainer.c | 26 ++++++++++++++++++++++++++ - app/core/gimpcontainer.h | 3 +++ + app/core/gimp-utils.c | 30 ------------------------------ + app/core/gimp-utils.h | 4 ---- + app/core/gimpcontainer.c | 26 ++++++++++++++++++++++++++ + app/core/gimpcontainer.h | 3 +++ app/widgets/gimpcontainerview-utils.c | 13 ++++++------- app/widgets/gimpsettingseditor.c | 23 ++++++----------------- 8 files changed, 61 insertions(+), 69 deletions(-) commit 183e1e9aaed5d6c7aa126eb97454f92e7e724578 Author: Daniel Korostil -Date: Fri Mar 11 12:26:07 2011 +0200 +Date: Fri Mar 11 12:26:07 2011 +0200 Uploaded Ukranian @@ -41699,44 +42589,33 @@ commit ef06dfd0960734fdfb414bdefee8e8afac134b41 Author: Martin Nordholts -Date: Thu Mar 10 20:54:33 2011 +0100 +Date: Thu Mar 10 20:54:33 2011 +0100 Revert "Add distdir to POTFILES.skip" This reverts commit 0656172b3d723e69987714884f92cf05fa8ff6e3. intltool-update doesn't support $buildir/POTFILES.skip :( - configure.ac | 7 ------- - po-libgimp/.gitignore | 1 - - po-libgimp/POTFILES.skip | 7 +++++++ - po-libgimp/POTFILES.skip.in | 8 -------- - po-plug-ins/.gitignore | 1 - - po-plug-ins/POTFILES.skip | 20 ++++++++++++++++++ - po-plug-ins/POTFILES.skip.in | 21 ------------------- - po-python/.gitignore | 1 - - po-python/POTFILES.skip | 45 - +++++++++++++++++++++++++++++++++++++++++ - po-python/POTFILES.skip.in | 46 - ------------------------------------------ - po-script-fu/.gitignore | 1 - - po-script-fu/POTFILES.skip | 46 - ++++++++++++++++++++++++++++++++++++++++++ - po-script-fu/POTFILES.skip.in | 47 - ------------------------------------------- - po-tags/.gitignore | 1 - - po-tags/POTFILES.skip | 13 ++++++++++++ - po-tags/POTFILES.skip.in | 14 ------------- - po-tips/.gitignore | 1 - - po-tips/POTFILES.skip | 13 ++++++++++++ - po-tips/POTFILES.skip.in | 14 ------------- - po/.gitignore | 1 - - po/POTFILES.skip | 12 +++++++++++ - po/POTFILES.skip.in | 13 ------------ - 22 files changed, 156 insertions(+), 177 deletions(-) + configure.ac | 7 ------- + po-libgimp/.gitignore | 1 - + po-libgimp/{POTFILES.skip.in => POTFILES.skip} | 1 - + po-plug-ins/.gitignore | 1 - + po-plug-ins/{POTFILES.skip.in => POTFILES.skip} | 1 - + po-python/.gitignore | 1 - + po-python/{POTFILES.skip.in => POTFILES.skip} | 1 - + po-script-fu/.gitignore | 1 - + po-script-fu/{POTFILES.skip.in => POTFILES.skip} | 1 - + po-tags/.gitignore | 1 - + po-tags/{POTFILES.skip.in => POTFILES.skip} | 1 - + po-tips/.gitignore | 1 - + po-tips/{POTFILES.skip.in => POTFILES.skip} | 1 - + po/.gitignore | 1 - + po/{POTFILES.skip.in => POTFILES.skip} | 1 - + 15 files changed, 21 deletions(-) commit a57b27c2c384feffb53dc6361429c0a74659c801 Author: Claude Paroz -Date: Thu Mar 10 20:27:53 2011 +0100 +Date: Thu Mar 10 20:27:53 2011 +0100 Updated French translation @@ -41748,7 +42627,7 @@ commit 0656172b3d723e69987714884f92cf05fa8ff6e3 Author: Martin Nordholts -Date: Thu Mar 10 16:47:34 2011 +0100 +Date: Thu Mar 10 16:47:34 2011 +0100 Add distdir to POTFILES.skip @@ -41765,47 +42644,36 @@ this list of left out files has been written in the current directory. - configure.ac | 7 +++++++ - po-libgimp/.gitignore | 1 + - po-libgimp/POTFILES.skip | 7 ------- - po-libgimp/POTFILES.skip.in | 8 ++++++++ - po-plug-ins/.gitignore | 1 + - po-plug-ins/POTFILES.skip | 20 ------------------ - po-plug-ins/POTFILES.skip.in | 21 +++++++++++++++++++ - po-python/.gitignore | 1 + - po-python/POTFILES.skip | 45 - ----------------------------------------- - po-python/POTFILES.skip.in | 46 - ++++++++++++++++++++++++++++++++++++++++++ - po-script-fu/.gitignore | 1 + - po-script-fu/POTFILES.skip | 46 - ------------------------------------------ - po-script-fu/POTFILES.skip.in | 47 - +++++++++++++++++++++++++++++++++++++++++++ - po-tags/.gitignore | 1 + - po-tags/POTFILES.skip | 13 ------------ - po-tags/POTFILES.skip.in | 14 +++++++++++++ - po-tips/.gitignore | 1 + - po-tips/POTFILES.skip | 13 ------------ - po-tips/POTFILES.skip.in | 14 +++++++++++++ - po/.gitignore | 1 + - po/POTFILES.skip | 12 ----------- - po/POTFILES.skip.in | 13 ++++++++++++ - 22 files changed, 177 insertions(+), 156 deletions(-) + configure.ac | 7 +++++++ + po-libgimp/.gitignore | 1 + + po-libgimp/{POTFILES.skip => POTFILES.skip.in} | 1 + + po-plug-ins/.gitignore | 1 + + po-plug-ins/{POTFILES.skip => POTFILES.skip.in} | 1 + + po-python/.gitignore | 1 + + po-python/{POTFILES.skip => POTFILES.skip.in} | 1 + + po-script-fu/.gitignore | 1 + + po-script-fu/{POTFILES.skip => POTFILES.skip.in} | 1 + + po-tags/.gitignore | 1 + + po-tags/{POTFILES.skip => POTFILES.skip.in} | 1 + + po-tips/.gitignore | 1 + + po-tips/{POTFILES.skip => POTFILES.skip.in} | 1 + + po/.gitignore | 1 + + po/{POTFILES.skip => POTFILES.skip.in} | 1 + + 15 files changed, 21 insertions(+) commit 01a52b8d00b4f6eed58067226b2b4daef5b2f5a2 Author: Martin Nordholts -Date: Thu Mar 10 08:08:35 2011 +0100 +Date: Thu Mar 10 08:08:35 2011 +0100 Update gimprc docs/gimprc.5.in | 18 +++++++++--------- - etc/gimprc | 16 ++++++++-------- + etc/gimprc | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) commit b81276ca83e6ec4c7df32c8f611f441d1dfc59ad Author: Mikael Magnusson -Date: Wed Mar 9 15:35:52 2011 +0100 +Date: Wed Mar 9 15:35:52 2011 +0100 app: fix goption warning @@ -41822,7 +42690,7 @@ commit 18fd05d33fe01b2d762025a9f40ba5943cf3cf01 Author: Martin Nordholts -Date: Wed Mar 9 07:41:09 2011 +0100 +Date: Wed Mar 9 07:41:09 2011 +0100 libgimp: Update and sort gimp.def with parasite API changes @@ -41831,7 +42699,7 @@ commit 166c76b62d543487285a63a6d657a226240fd176 Author: Massimo Valentini -Date: Wed Mar 9 07:30:15 2011 +0100 +Date: Wed Mar 9 07:30:15 2011 +0100 Bug 630069 - In single-window mode, canvas badly positioned in all successive tabs @@ -41849,7 +42717,7 @@ commit 50419c855e6f5bc3bc3277581214cb0d8d8f11e8 Author: Claude Paroz -Date: Tue Mar 8 22:36:55 2011 +0100 +Date: Tue Mar 8 22:36:55 2011 +0100 Updated French translation @@ -41861,18 +42729,18 @@ commit 62f2ae80c850d39e7ed103ecfacc081c9616d6d0 Author: Michael Natterer -Date: Tue Mar 8 18:10:59 2011 +0100 +Date: Tue Mar 8 18:10:59 2011 +0100 app: move GimpItem's width and height members to private app/core/gimpitem.c | 53 ++++++++++++++++++++++++++++------------------------- - app/core/gimpitem.h | 4 +--- + app/core/gimpitem.h | 4 +--- 2 files changed, 29 insertions(+), 28 deletions(-) commit f7ce31d62f122a707a54f263ea41bcdbe84eae7f Author: Michael Natterer -Date: Tue Mar 8 18:04:23 2011 +0100 +Date: Tue Mar 8 18:04:23 2011 +0100 app: fake the size of a gruop layer by overriding GimpViewable::get_size() @@ -41885,36 +42753,36 @@ commit 5bd1b318afc6c8646c4f5d29c9e384ee296bc33c Author: Michael Natterer -Date: Tue Mar 8 17:15:47 2011 +0100 +Date: Tue Mar 8 17:15:47 2011 +0100 app: cosmetic cleanup - app/core/gimpitem.c | 1 - + app/core/gimpitem.c | 1 - app/core/gimpviewable.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) commit b1d6f1b0fd9a240f2500e4ac4cc7485ea82c0e6c Author: Michael Natterer -Date: Tue Mar 8 17:12:39 2011 +0100 +Date: Tue Mar 8 17:12:39 2011 +0100 app: lose "default" from protected GimpViewRenderer rendering API and rename render_surface() to render_temp_buf(). - app/widgets/gimpviewrenderer.c | 139 + app/widgets/gimpviewrenderer.c | 139 ++++++++++++++++---------------- - app/widgets/gimpviewrenderer.h | 11 ++- - app/widgets/gimpviewrendererbrush.c | 18 ++--- - app/widgets/gimpviewrendererbuffer.c | 4 +- + app/widgets/gimpviewrenderer.h | 11 ++- + app/widgets/gimpviewrendererbrush.c | 18 ++--- + app/widgets/gimpviewrendererbuffer.c | 4 +- app/widgets/gimpviewrendererdrawable.c | 8 +- - app/widgets/gimpviewrendererimage.c | 10 +-- + app/widgets/gimpviewrendererimage.c | 10 +-- app/widgets/gimpviewrendererimagefile.c | 2 +- - app/widgets/gimpviewrendererlayer.c | 2 +- + app/widgets/gimpviewrendererlayer.c | 2 +- 8 files changed, 97 insertions(+), 97 deletions(-) commit a2d27983d65b9ae2071fabc20202bc6e8e836866 Author: Michael Natterer -Date: Tue Mar 8 17:03:30 2011 +0100 +Date: Tue Mar 8 17:03:30 2011 +0100 app: remove widget parameter from gimp_view_renderer_default_render_surface() @@ -41926,18 +42794,18 @@ commit 2281645f5b5a391656629fa54e5b21487607bed4 Author: Michael Natterer -Date: Tue Mar 8 16:50:58 2011 +0100 +Date: Tue Mar 8 16:50:58 2011 +0100 app: remove unused function temp_buf_new_check() app/base/temp-buf.c | 63 ----------------------------------------------------- - app/base/temp-buf.h | 4 ---- + app/base/temp-buf.h | 4 ---- 2 files changed, 67 deletions(-) commit 3e93f45703b9e3761ea4efed7e0678c97b5438da Author: Michael Natterer -Date: Tue Mar 8 16:38:25 2011 +0100 +Date: Tue Mar 8 16:38:25 2011 +0100 app: keep the preview TempBuf and GdkPixbuf in GimpViewablePrivate @@ -41949,7 +42817,7 @@ commit 383cc27f308df94478466d2e2694bacc377963da Author: Michael Natterer -Date: Tue Mar 8 16:23:53 2011 +0100 +Date: Tue Mar 8 16:23:53 2011 +0100 app: move all GimpViewable members to private @@ -41960,42 +42828,42 @@ commit bb6436cb4421433a081e3f744659ca6ab588b561 Author: Michael Natterer -Date: Tue Mar 8 14:31:04 2011 +0100 +Date: Tue Mar 8 14:31:04 2011 +0100 libgimp: deprecate and rename the global pararasite functions just as it was done for items and images. Remove the "parasite" PDB group completely. - app/pdb/Makefile.am | 1 - - app/pdb/gimp-cmds.c | 202 ++++++++++++++++++++++++++++++++++ - app/pdb/gimp-pdb-compat.c | 6 +- - app/pdb/internal-procs.c | 1 - - app/pdb/internal-procs.h | 1 - - app/pdb/parasite-cmds.c | 241 + app/pdb/Makefile.am | 1 - + app/pdb/gimp-cmds.c | 202 ++++++++++++++++++++++++++++++++++ + app/pdb/gimp-pdb-compat.c | 6 +- + app/pdb/internal-procs.c | 1 - + app/pdb/internal-procs.h | 1 - + app/pdb/parasite-cmds.c | 241 ----------------------------------------- - libgimp/Makefile.am | 2 - - libgimp/gimp.c | 60 ++++++++++ - libgimp/gimp.h | 13 ++- - libgimp/gimp_pdb.c | 134 +++++++++++++++++++++++ - libgimp/gimp_pdb.h | 8 +- - libgimp/gimp_pdb_headers.h | 1 - - libgimp/gimpparasite_pdb.c | 166 ---------------------------- - libgimp/gimpparasite_pdb.h | 40 ------- - plug-ins/common/file-dicom.c | 2 +- - plug-ins/common/file-png.c | 4 +- + libgimp/Makefile.am | 2 - + libgimp/gimp.c | 60 ++++++++++ + libgimp/gimp.h | 13 ++- + libgimp/gimp_pdb.c | 134 +++++++++++++++++++++++ + libgimp/gimp_pdb.h | 8 +- + libgimp/gimp_pdb_headers.h | 1 - + libgimp/gimpparasite_pdb.c | 166 ---------------------------- + libgimp/gimpparasite_pdb.h | 40 ------- + plug-ins/common/file-dicom.c | 2 +- + plug-ins/common/file-png.c | 4 +- plug-ins/file-jpeg/jpeg-exif.c | 4 +- plug-ins/file-jpeg/jpeg-save.c | 4 +- - plug-ins/pygimp/gimpmodule.c | 12 +- - tools/pdbgen/Makefile.am | 1 - - tools/pdbgen/groups.pl | 1 - - tools/pdbgen/pdb/gimp.pdb | 108 +++++++++++++++++- - tools/pdbgen/pdb/parasite.pdb | 130 ---------------------- + plug-ins/pygimp/gimpmodule.c | 12 +- + tools/pdbgen/Makefile.am | 1 - + tools/pdbgen/groups.pl | 1 - + tools/pdbgen/pdb/gimp.pdb | 108 +++++++++++++++++- + tools/pdbgen/pdb/parasite.pdb | 130 ---------------------- 23 files changed, 535 insertions(+), 607 deletions(-) commit db6f3dfe8938c601cbc0ef930b9997ef49f8c570 Author: Michael Natterer -Date: Tue Mar 8 14:21:57 2011 +0100 +Date: Tue Mar 8 14:21:57 2011 +0100 plug-ins: fix glitch in image parasite function renaming @@ -42004,118 +42872,109 @@ commit 7fae2b2d40c52182195bb7fefe46567f41d65a54 Author: Michael Natterer -Date: Tue Mar 8 13:58:56 2011 +0100 +Date: Tue Mar 8 13:58:56 2011 +0100 libgimp: rename the "misc" pdb group to "gimp" So we finally have a proper place for PDB procedures that don't act on an object like image, item, ... - app/pdb/Makefile.am | 2 +- - app/pdb/gimp-cmds.c | 171 - +++++++++++++++++++++++++++++++++++++++++++++ - app/pdb/internal-procs.c | 2 +- - app/pdb/internal-procs.h | 2 +- - app/pdb/misc-cmds.c | 171 - --------------------------------------------- - libgimp/Makefile.am | 4 +- - libgimp/gimp_pdb.c | 94 +++++++++++++++++++++++++ - libgimp/gimp_pdb.h | 37 ++++++++++ - libgimp/gimp_pdb_headers.h | 2 +- - libgimp/gimpmisc_pdb.c | 94 ------------------------- - libgimp/gimpmisc_pdb.h | 37 ---------- - tools/pdbgen/Makefile.am | 2 +- - tools/pdbgen/groups.pl | 2 +- - tools/pdbgen/lib.pl | 13 +++- - tools/pdbgen/pdb/gimp.pdb | 106 ++++++++++++++++++++++++++++ - tools/pdbgen/pdb/misc.pdb | 106 ---------------------------- - 16 files changed, 426 insertions(+), 419 deletions(-) + app/pdb/Makefile.am | 2 +- + app/pdb/{misc-cmds.c => gimp-cmds.c} | 2 +- + app/pdb/internal-procs.c | 2 +- + app/pdb/internal-procs.h | 2 +- + libgimp/Makefile.am | 4 ++-- + libgimp/{gimpmisc_pdb.c => gimp_pdb.c} | 6 +++--- + libgimp/{gimpmisc_pdb.h => gimp_pdb.h} | 8 ++++---- + libgimp/gimp_pdb_headers.h | 2 +- + tools/pdbgen/Makefile.am | 2 +- + tools/pdbgen/groups.pl | 2 +- + tools/pdbgen/lib.pl | 13 ++++++++++--- + tools/pdbgen/pdb/{misc.pdb => gimp.pdb} | 2 +- + 12 files changed, 27 insertions(+), 20 deletions(-) commit 95e498e0c0cd825cabebfbb3bc87700e7b9359ff Author: Michael Natterer -Date: Tue Mar 8 13:42:05 2011 +0100 +Date: Tue Mar 8 13:42:05 2011 +0100 libgimp: rename gimp_pdb.h to gimp_pdb_headers.h - libgimp/Makefile.am | 2 +- - libgimp/gimp.h | 2 +- - libgimp/gimp_pdb.h | 77 - ---------------------------------------------- - libgimp/gimp_pdb_headers.h | 77 - ++++++++++++++++++++++++++++++++++++++++++++++ - tools/pdbgen/lib.pl | 10 +++--- - 5 files changed, 84 insertions(+), 84 deletions(-) + libgimp/Makefile.am | 2 +- + libgimp/gimp.h | 2 +- + libgimp/{gimp_pdb.h => gimp_pdb_headers.h} | 8 ++++---- + tools/pdbgen/lib.pl | 10 +++++----- + 4 files changed, 11 insertions(+), 11 deletions(-) commit 87646e9ace8ce74ffe2fb8a22e6bce1fdfe64e61 Author: Michael Natterer -Date: Tue Mar 8 13:19:21 2011 +0100 +Date: Tue Mar 8 13:19:21 2011 +0100 libgimp: deprecate and rename the image parasite functions in exactly the way the drawable functios were turned into item ones. - app/pdb/gimp-pdb-compat.c | 6 +- - app/pdb/image-cmds.c | 242 + app/pdb/gimp-pdb-compat.c | 6 +- + app/pdb/image-cmds.c | 242 ++++++++++++++++++++++++++++++++ - app/pdb/parasite-cmds.c | 243 + app/pdb/parasite-cmds.c | 243 --------------------------------- - libgimp/gimp.def | 4 + - libgimp/gimpimage.c | 68 +++++++++ - libgimp/gimpimage.h | 99 ++++++++------ - libgimp/gimpimage_pdb.c | 148 ++++++++++++++++++++ - libgimp/gimpimage_pdb.h | 8 ++ - libgimp/gimpparasite_pdb.c | 145 -------------------- - libgimp/gimpparasite_pdb.h | 19 +-- - plug-ins/common/compose.c | 4 +- - plug-ins/common/decompose.c | 2 +- - plug-ins/common/file-csource.c | 6 +- - plug-ins/common/file-dicom.c | 6 +- - plug-ins/common/file-gbr.c | 8 +- - plug-ins/common/file-gif-load.c | 2 +- - plug-ins/common/file-gif-save.c | 4 +- - plug-ins/common/file-gih.c | 12 +- - plug-ins/common/file-jp2-load.c | 2 +- - plug-ins/common/file-pat.c | 8 +- - plug-ins/common/file-png.c | 20 +-- - plug-ins/common/file-psp.c | 4 +- - plug-ins/common/file-tiff-load.c | 6 +- - plug-ins/common/file-tiff-save.c | 10 +- - plug-ins/common/file-xbm.c | 8 +- - plug-ins/common/file-xmc.c | 14 +- - plug-ins/common/lcms.c | 8 +- - plug-ins/common/screenshot.c | 2 +- - plug-ins/file-jpeg/gimpexif.c | 6 +- - plug-ins/file-jpeg/jpeg-load.c | 4 +- - plug-ins/file-jpeg/jpeg-save.c | 4 +- - plug-ins/file-jpeg/jpeg-settings.c | 10 +- - plug-ins/file-jpeg/jpeg.c | 18 +-- + libgimp/gimp.def | 4 + + libgimp/gimpimage.c | 68 +++++++++ + libgimp/gimpimage.h | 99 ++++++++------ + libgimp/gimpimage_pdb.c | 148 ++++++++++++++++++++ + libgimp/gimpimage_pdb.h | 8 ++ + libgimp/gimpparasite_pdb.c | 145 -------------------- + libgimp/gimpparasite_pdb.h | 19 +-- + plug-ins/common/compose.c | 4 +- + plug-ins/common/decompose.c | 2 +- + plug-ins/common/file-csource.c | 6 +- + plug-ins/common/file-dicom.c | 6 +- + plug-ins/common/file-gbr.c | 8 +- + plug-ins/common/file-gif-load.c | 2 +- + plug-ins/common/file-gif-save.c | 4 +- + plug-ins/common/file-gih.c | 12 +- + plug-ins/common/file-jp2-load.c | 2 +- + plug-ins/common/file-pat.c | 8 +- + plug-ins/common/file-png.c | 20 +-- + plug-ins/common/file-psp.c | 4 +- + plug-ins/common/file-tiff-load.c | 6 +- + plug-ins/common/file-tiff-save.c | 10 +- + plug-ins/common/file-xbm.c | 8 +- + plug-ins/common/file-xmc.c | 14 +- + plug-ins/common/lcms.c | 8 +- + plug-ins/common/screenshot.c | 2 +- + plug-ins/file-jpeg/gimpexif.c | 6 +- + plug-ins/file-jpeg/jpeg-load.c | 4 +- + plug-ins/file-jpeg/jpeg-save.c | 4 +- + plug-ins/file-jpeg/jpeg-settings.c | 10 +- + plug-ins/file-jpeg/jpeg.c | 18 +-- plug-ins/file-psd/psd-image-res-load.c | 16 +-- - plug-ins/file-psd/psd-load.c | 7 +- - plug-ins/file-xjt/xjt.c | 10 +- - plug-ins/metadata/exif-decode.c | 2 +- - plug-ins/metadata/metadata.c | 4 +- - plug-ins/print/print-utils.c | 4 +- - plug-ins/pygimp/pygimp-drawable.c | 2 +- - plug-ins/pygimp/pygimp-image.c | 12 +- - tools/pdbgen/pdb/image.pdb | 116 +++++++++++++++- - tools/pdbgen/pdb/parasite.pdb | 114 +--------------- + plug-ins/file-psd/psd-load.c | 7 +- + plug-ins/file-xjt/xjt.c | 10 +- + plug-ins/metadata/exif-decode.c | 2 +- + plug-ins/metadata/metadata.c | 4 +- + plug-ins/print/print-utils.c | 4 +- + plug-ins/pygimp/pygimp-drawable.c | 2 +- + plug-ins/pygimp/pygimp-image.c | 12 +- + tools/pdbgen/pdb/image.pdb | 116 +++++++++++++++- + tools/pdbgen/pdb/parasite.pdb | 114 +--------------- 43 files changed, 765 insertions(+), 672 deletions(-) commit e69ecba23706bcf24951918e20496194d15758a8 Author: Michael Natterer -Date: Tue Mar 8 11:32:49 2011 +0100 +Date: Tue Mar 8 11:32:49 2011 +0100 app: move all GimpSettingsBox members to private app/tools/gimpimagemaptool-settings.c | 5 +- - app/widgets/gimpsettingsbox.c | 355 + app/widgets/gimpsettingsbox.c | 355 ++++++++++++++++++++-------------- - app/widgets/gimpsettingsbox.h | 23 +-- + app/widgets/gimpsettingsbox.h | 23 +-- 3 files changed, 218 insertions(+), 165 deletions(-) commit b8d148283baf91da2350a26b7b18a11acc4d6901 Author: Michael Natterer -Date: Tue Mar 8 02:32:14 2011 +0100 +Date: Tue Mar 8 02:32:14 2011 +0100 app: move all GimpSettingsEditor members to private @@ -42126,72 +42985,72 @@ commit fcfb7cf160d09d9261b7b9d91d9385107e5a29a5 Author: Michael Natterer -Date: Mon Mar 7 17:10:18 2011 +0100 +Date: Mon Mar 7 17:10:18 2011 +0100 Use the new g_[s]list_free_full() instead of foreach() and free() - app/core/gimpdata.c | 3 +-- - app/core/gimpimage.c | 14 +++++--------- - app/core/gimppalette-import.c | 3 +-- - app/core/gimppalette.c | 4 ++-- - app/core/gimppreviewcache.c | 4 +--- - app/core/gimptagcache.c | 3 +-- - app/dialogs/file-open-dialog.c | 3 +-- - app/display/gimpcanvasgroup.c | 3 +-- - app/display/gimpscalecombobox.c | 5 ++--- - app/display/gimpstatusbar.c | 4 ++-- - app/gui/splash.c | 3 +-- - app/pdb/gimppdb.c | 5 +---- - app/plug-in/gimpplugindef.c | 3 +-- + app/core/gimpdata.c | 3 +-- + app/core/gimpimage.c | 14 +++++--------- + app/core/gimppalette-import.c | 3 +-- + app/core/gimppalette.c | 4 ++-- + app/core/gimppreviewcache.c | 4 +--- + app/core/gimptagcache.c | 3 +-- + app/dialogs/file-open-dialog.c | 3 +-- + app/display/gimpcanvasgroup.c | 3 +-- + app/display/gimpscalecombobox.c | 5 ++--- + app/display/gimpstatusbar.c | 4 ++-- + app/gui/splash.c | 3 +-- + app/pdb/gimppdb.c | 5 +---- + app/plug-in/gimpplugindef.c | 3 +-- app/plug-in/gimppluginmanager-restore.c | 3 +-- - app/plug-in/gimppluginmanager.c | 9 ++++----- - app/plug-in/gimppluginprocedure.c | 29 + app/plug-in/gimppluginmanager.c | 9 ++++----- + app/plug-in/gimppluginprocedure.c | 29 +++++++--------------------- - app/plug-in/gimppluginprocframe.c | 4 ++-- - app/plug-in/plug-in-rc.c | 3 +-- - app/tools/gimp-tools.c | 3 +-- - app/vectors/gimpstroke.c | 3 +-- - app/vectors/gimpvectors.c | 6 ++---- - app/widgets/gimpcontainericonview.c | 6 ++---- + app/plug-in/gimppluginprocframe.c | 4 ++-- + app/plug-in/plug-in-rc.c | 3 +-- + app/tools/gimp-tools.c | 3 +-- + app/vectors/gimpstroke.c | 3 +-- + app/vectors/gimpvectors.c | 6 ++---- + app/widgets/gimpcontainericonview.c | 6 ++---- app/widgets/gimpcontainertreeview-dnd.c | 3 +-- - app/widgets/gimpcontainertreeview.c | 6 ++---- - app/widgets/gimpdialogfactory.c | 4 ++-- - app/widgets/gimpdnd.c | 6 ++---- - app/widgets/gimpfileprocview.c | 3 +-- - app/widgets/gimpiconpicker.c | 3 +-- - app/widgets/gimpmenufactory.c | 3 +-- - app/widgets/gimpselectiondata.c | 3 +-- - app/widgets/gimpsessioninfo-book.c | 5 ++--- - app/widgets/gimpsessioninfo-dock.c | 6 ++---- + app/widgets/gimpcontainertreeview.c | 6 ++---- + app/widgets/gimpdialogfactory.c | 4 ++-- + app/widgets/gimpdnd.c | 6 ++---- + app/widgets/gimpfileprocview.c | 3 +-- + app/widgets/gimpiconpicker.c | 3 +-- + app/widgets/gimpmenufactory.c | 3 +-- + app/widgets/gimpselectiondata.c | 3 +-- + app/widgets/gimpsessioninfo-book.c | 5 ++--- + app/widgets/gimpsessioninfo-dock.c | 6 ++---- app/widgets/gimpsessioninfo-dockable.c | 4 ++-- - app/widgets/gimpsessioninfo.c | 10 ++++------ - app/widgets/gimptagentry.c | 3 +-- + app/widgets/gimpsessioninfo.c | 10 ++++------ + app/widgets/gimptagentry.c | 3 +-- app/widgets/gimptextbuffer-serialize.c | 3 +-- - app/widgets/gimpthumbbox.c | 3 +-- - libgimpbase/gimpenv.c | 3 +-- - libgimpwidgets/gimppageselector.c | 6 ++---- - libgimpwidgets/gimpwidgets-private.c | 3 +-- - plug-ins/common/file-dicom.c | 9 ++------- + app/widgets/gimpthumbbox.c | 3 +-- + libgimpbase/gimpenv.c | 3 +-- + libgimpwidgets/gimppageselector.c | 6 ++---- + libgimpwidgets/gimpwidgets-private.c | 3 +-- + plug-ins/common/file-dicom.c | 9 ++------- plug-ins/fractal-explorer/fractal-explorer.c | 3 +-- - plug-ins/gfig/gfig-dialog.c | 3 +-- - plug-ins/gfig/gfig-dobject.c | 5 ++--- - plug-ins/gimpressionist/utils.c | 9 +-------- + plug-ins/gfig/gfig-dialog.c | 3 +-- + plug-ins/gfig/gfig-dobject.c | 5 ++--- + plug-ins/gimpressionist/utils.c | 9 +-------- plug-ins/gradient-flare/gradient-flare.c | 6 ++---- - plug-ins/help-browser/dialog.c | 4 ++-- - plug-ins/help-browser/help-browser.c | 3 +-- - plug-ins/help/gimp-help-lookup.c | 3 +-- - plug-ins/help/help.c | 3 +-- + plug-ins/help-browser/dialog.c | 4 ++-- + plug-ins/help-browser/help-browser.c | 3 +-- + plug-ins/help/gimp-help-lookup.c | 3 +-- + plug-ins/help/help.c | 3 +-- plug-ins/ifs-compose/ifs-compose-storage.c | 3 +-- - plug-ins/imagemap/imap_mru.c | 7 +++---- - plug-ins/imagemap/imap_polygon.c | 7 +++---- - plug-ins/imagemap/imap_selection.c | 5 ++--- - plug-ins/script-fu/script-fu-script.c | 5 ++--- + plug-ins/imagemap/imap_mru.c | 7 +++---- + plug-ins/imagemap/imap_polygon.c | 7 +++---- + plug-ins/imagemap/imap_selection.c | 5 ++--- + plug-ins/script-fu/script-fu-script.c | 5 ++--- plug-ins/script-fu/script-fu-scripts.c | 9 +++------ 56 files changed, 97 insertions(+), 187 deletions(-) commit 514a5548cdcaf5a60f47067007936dc58055132b Author: Michael Natterer -Date: Mon Mar 7 15:43:45 2011 +0100 +Date: Mon Mar 7 15:43:45 2011 +0100 configure: require GLib >= 2.28.1 @@ -42201,7 +43060,7 @@ commit 801405d097ba240cf413e8c5b8e15665c6edea88 Author: Michael Natterer -Date: Mon Mar 7 15:43:15 2011 +0100 +Date: Mon Mar 7 15:43:15 2011 +0100 devel-docs: fix the build of the scanner binaries @@ -42211,19 +43070,19 @@ commit c5b82ec5320500e4f0f020f0e63bf4fd78e5f774 Author: Julien Hardelin -Date: Mon Mar 7 16:17:41 2011 +0100 +Date: Mon Mar 7 16:17:41 2011 +0100 Updated French translation (libgimp/tags) po-libgimp/fr.po | 484 +++++++++++++++++++++++++++++-------------------------- po-tags/LINGUAS | 1 + - po-tags/fr.po | 26 +++ + po-tags/fr.po | 26 +++ 3 files changed, 279 insertions(+), 232 deletions(-) commit ca1cc32e52a3d38439dc197cf43ef704a1d456c1 Author: Michael Natterer -Date: Sun Mar 6 11:51:24 2011 +0100 +Date: Sun Mar 6 11:51:24 2011 +0100 libgimpwidgets: use GtkComboBoxText when building against GTK+ >= 2.24 @@ -42232,7 +43091,7 @@ commit 58cc35a0e993a4715727101bd896f72cb6f452e4 Author: Mikael Magnusson -Date: Sat Mar 5 22:17:56 2011 +0100 +Date: Sat Mar 5 22:17:56 2011 +0100 plug-ins: map-object, remove newlayer option from pdb @@ -42244,158 +43103,158 @@ commit fc7bd98d927a99bbc83a8b85af9bbef4654e923c Author: Michael Natterer -Date: Sat Mar 5 21:00:28 2011 +0100 +Date: Sat Mar 5 21:00:28 2011 +0100 app: move all GimpStrokeOptions members to private - app/core/gimpchannel.c | 15 ++-- + app/core/gimpchannel.c | 15 ++-- app/core/gimpdrawable-stroke.c | 21 +++-- - app/core/gimpstrokeoptions.c | 192 + app/core/gimpstrokeoptions.c | 192 +++++++++++++++++++++++++++++++++-------- - app/core/gimpstrokeoptions.h | 56 ++++++------ - app/dialogs/stroke-dialog.c | 6 +- - app/vectors/gimpvectors.c | 15 ++-- - app/widgets/gimpdasheditor.c | 6 +- + app/core/gimpstrokeoptions.h | 56 ++++++------ + app/dialogs/stroke-dialog.c | 6 +- + app/vectors/gimpvectors.c | 15 ++-- + app/widgets/gimpdasheditor.c | 6 +- app/widgets/gimpstrokeeditor.c | 6 +- 8 files changed, 228 insertions(+), 89 deletions(-) commit 5ad45dae039e348700f92db378c206d2ed82e0b5 Author: Michael Natterer -Date: Sat Mar 5 20:26:41 2011 +0100 +Date: Sat Mar 5 20:26:41 2011 +0100 app: move all GimpFillOptions members to private app/core/gimpdrawable-stroke.c | 16 +++++++----- - app/core/gimpfilloptions.c | 56 + app/core/gimpfilloptions.c | 56 ++++++++++++++++++++++++++++++++++-------- - app/core/gimpfilloptions.h | 18 ++++++-------- + app/core/gimpfilloptions.h | 18 ++++++-------- 3 files changed, 63 insertions(+), 27 deletions(-) commit 38fd77f5e9ecba4216cca2f956e8d1714621d8c7 Author: Michael Natterer -Date: Sat Mar 5 10:59:56 2011 +0100 +Date: Sat Mar 5 10:59:56 2011 +0100 plug-ins: some more s/gtk_container_add/gtk_box_pack_start/ - plug-ins/common/bump-map.c | 4 ++-- - plug-ins/common/channel-mixer.c | 6 +++--- - plug-ins/common/checkerboard.c | 2 +- - plug-ins/common/colormap-remap.c | 2 +- - plug-ins/common/curve-bend.c | 4 ++-- - plug-ins/common/file-xmc.c | 2 +- - plug-ins/common/iwarp.c | 4 ++-- - plug-ins/common/newsprint.c | 2 +- - plug-ins/common/sinus.c | 4 ++-- - plug-ins/common/van-gogh-lic.c | 6 +++--- - plug-ins/file-bmp/bmp-write.c | 4 ++-- - plug-ins/gimpressionist/orientmap.c | 8 ++++---- - plug-ins/gimpressionist/presets.c | 2 +- - plug-ins/imagemap/imap_cmd_guides.c | 4 ++-- + plug-ins/common/bump-map.c | 4 ++-- + plug-ins/common/channel-mixer.c | 6 +++--- + plug-ins/common/checkerboard.c | 2 +- + plug-ins/common/colormap-remap.c | 2 +- + plug-ins/common/curve-bend.c | 4 ++-- + plug-ins/common/file-xmc.c | 2 +- + plug-ins/common/iwarp.c | 4 ++-- + plug-ins/common/newsprint.c | 2 +- + plug-ins/common/sinus.c | 4 ++-- + plug-ins/common/van-gogh-lic.c | 6 +++--- + plug-ins/file-bmp/bmp-write.c | 4 ++-- + plug-ins/gimpressionist/orientmap.c | 8 ++++---- + plug-ins/gimpressionist/presets.c | 2 +- + plug-ins/imagemap/imap_cmd_guides.c | 4 ++-- plug-ins/imagemap/imap_default_dialog.c | 12 ++++++------ plug-ins/imagemap/imap_edit_area_info.c | 8 ++++---- - plug-ins/imagemap/imap_main.c | 10 +++++----- - plug-ins/imagemap/imap_selection.c | 10 +++++----- + plug-ins/imagemap/imap_main.c | 10 +++++----- + plug-ins/imagemap/imap_selection.c | 10 +++++----- 18 files changed, 47 insertions(+), 47 deletions(-) commit 97a73ea83fb0b928cd086ab782f537803e7255b5 Author: Michael Natterer -Date: Fri Mar 4 10:44:58 2011 +0100 +Date: Fri Mar 4 10:44:58 2011 +0100 app: use gtk_box_pack_start() to pack a dialog's toplevel container instead of gtk_container_add()'s because otherwise the widget will not expand in GTK+ 3.x - plug-ins/common/alien-map.c | 4 ++-- - plug-ins/common/apply-canvas.c | 4 ++-- - plug-ins/common/blinds.c | 4 ++-- - plug-ins/common/blur-gauss-selective.c | 4 ++-- - plug-ins/common/blur-gauss.c | 4 ++-- - plug-ins/common/blur-motion.c | 4 ++-- - plug-ins/common/border-average.c | 4 ++-- - plug-ins/common/bump-map.c | 4 ++-- - plug-ins/common/cartoon.c | 4 ++-- - plug-ins/common/channel-mixer.c | 4 ++-- - plug-ins/common/checkerboard.c | 4 ++-- - plug-ins/common/color-exchange.c | 4 ++-- - plug-ins/common/color-to-alpha.c | 4 ++-- - plug-ins/common/colorify.c | 4 ++-- - plug-ins/common/colormap-remap.c | 4 ++-- - plug-ins/common/compose.c | 4 ++-- - plug-ins/common/contrast-retinex.c | 4 ++-- - plug-ins/common/convolution-matrix.c | 4 ++-- - plug-ins/common/cubism.c | 4 ++-- - plug-ins/common/curve-bend.c | 4 ++-- - plug-ins/common/deinterlace.c | 4 ++-- - plug-ins/common/despeckle.c | 4 ++-- - plug-ins/common/destripe.c | 4 ++-- - plug-ins/common/displace.c | 4 ++-- - plug-ins/common/edge-dog.c | 4 ++-- - plug-ins/common/edge-neon.c | 4 ++-- - plug-ins/common/edge-sobel.c | 4 ++-- - plug-ins/common/edge.c | 4 ++-- - plug-ins/common/emboss.c | 4 ++-- - plug-ins/common/engrave.c | 4 ++-- - plug-ins/common/file-csource.c | 4 ++-- - plug-ins/common/file-gif-save.c | 5 +++-- - plug-ins/common/file-mng.c | 4 ++-- - plug-ins/common/file-pdf-load.c | 4 ++-- - plug-ins/common/file-raw.c | 4 ++-- - plug-ins/common/file-tiff-load.c | 4 ++-- - plug-ins/common/film.c | 4 ++-- - plug-ins/common/fractal-trace.c | 4 ++-- - plug-ins/common/grid.c | 4 ++-- - plug-ins/common/illusion.c | 4 ++-- - plug-ins/common/jigsaw.c | 4 ++-- - plug-ins/common/lcms.c | 4 ++-- - plug-ins/common/lens-apply.c | 4 ++-- - plug-ins/common/lens-distortion.c | 4 ++-- - plug-ins/common/lens-flare.c | 4 ++-- - plug-ins/common/max-rgb.c | 4 ++-- - plug-ins/common/mosaic.c | 4 ++-- - plug-ins/common/newsprint.c | 4 ++-- - plug-ins/common/nl-filter.c | 4 ++-- - plug-ins/common/noise-hsv.c | 4 ++-- - plug-ins/common/noise-randomize.c | 4 ++-- - plug-ins/common/noise-rgb.c | 4 ++-- - plug-ins/common/noise-solid.c | 4 ++-- - plug-ins/common/noise-spread.c | 4 ++-- - plug-ins/common/nova.c | 4 ++-- - plug-ins/common/oilify.c | 4 ++-- - plug-ins/common/photocopy.c | 4 ++-- - plug-ins/common/pixelize.c | 4 ++-- - plug-ins/common/plasma.c | 4 ++-- - plug-ins/common/plugin-browser.c | 4 ++-- - plug-ins/common/polar-coords.c | 4 ++-- - plug-ins/common/red-eye-removal.c | 4 ++-- - plug-ins/common/ripple.c | 4 ++-- - plug-ins/common/sharpen.c | 4 ++-- - plug-ins/common/shift.c | 4 ++-- - plug-ins/common/softglow.c | 4 ++-- - plug-ins/common/sparkle.c | 4 ++-- - plug-ins/common/sphere-designer.c | 4 ++-- - plug-ins/common/threshold-alpha.c | 4 ++-- - plug-ins/common/tile-glass.c | 4 ++-- - plug-ins/common/tile-paper.c | 4 ++-- - plug-ins/common/unit-editor.c | 4 ++-- - plug-ins/common/unsharp-mask.c | 4 ++-- - plug-ins/common/value-propagate.c | 4 ++-- - plug-ins/common/van-gogh-lic.c | 4 ++-- - plug-ins/common/waves.c | 4 ++-- - plug-ins/common/whirl-pinch.c | 4 ++-- - plug-ins/common/wind.c | 4 ++-- - plug-ins/file-bmp/bmp-write.c | 4 ++-- - plug-ins/gfig/gfig-dialog.c | 8 ++++---- - plug-ins/gimpressionist/gimpressionist.c | 4 ++-- - plug-ins/gimpressionist/orientmap.c | 4 ++-- - plug-ins/gimpressionist/presets.c | 4 ++-- - plug-ins/gimpressionist/sizemap.c | 4 ++-- + plug-ins/common/alien-map.c | 4 ++-- + plug-ins/common/apply-canvas.c | 4 ++-- + plug-ins/common/blinds.c | 4 ++-- + plug-ins/common/blur-gauss-selective.c | 4 ++-- + plug-ins/common/blur-gauss.c | 4 ++-- + plug-ins/common/blur-motion.c | 4 ++-- + plug-ins/common/border-average.c | 4 ++-- + plug-ins/common/bump-map.c | 4 ++-- + plug-ins/common/cartoon.c | 4 ++-- + plug-ins/common/channel-mixer.c | 4 ++-- + plug-ins/common/checkerboard.c | 4 ++-- + plug-ins/common/color-exchange.c | 4 ++-- + plug-ins/common/color-to-alpha.c | 4 ++-- + plug-ins/common/colorify.c | 4 ++-- + plug-ins/common/colormap-remap.c | 4 ++-- + plug-ins/common/compose.c | 4 ++-- + plug-ins/common/contrast-retinex.c | 4 ++-- + plug-ins/common/convolution-matrix.c | 4 ++-- + plug-ins/common/cubism.c | 4 ++-- + plug-ins/common/curve-bend.c | 4 ++-- + plug-ins/common/deinterlace.c | 4 ++-- + plug-ins/common/despeckle.c | 4 ++-- + plug-ins/common/destripe.c | 4 ++-- + plug-ins/common/displace.c | 4 ++-- + plug-ins/common/edge-dog.c | 4 ++-- + plug-ins/common/edge-neon.c | 4 ++-- + plug-ins/common/edge-sobel.c | 4 ++-- + plug-ins/common/edge.c | 4 ++-- + plug-ins/common/emboss.c | 4 ++-- + plug-ins/common/engrave.c | 4 ++-- + plug-ins/common/file-csource.c | 4 ++-- + plug-ins/common/file-gif-save.c | 5 +++-- + plug-ins/common/file-mng.c | 4 ++-- + plug-ins/common/file-pdf-load.c | 4 ++-- + plug-ins/common/file-raw.c | 4 ++-- + plug-ins/common/file-tiff-load.c | 4 ++-- + plug-ins/common/film.c | 4 ++-- + plug-ins/common/fractal-trace.c | 4 ++-- + plug-ins/common/grid.c | 4 ++-- + plug-ins/common/illusion.c | 4 ++-- + plug-ins/common/jigsaw.c | 4 ++-- + plug-ins/common/lcms.c | 4 ++-- + plug-ins/common/lens-apply.c | 4 ++-- + plug-ins/common/lens-distortion.c | 4 ++-- + plug-ins/common/lens-flare.c | 4 ++-- + plug-ins/common/max-rgb.c | 4 ++-- + plug-ins/common/mosaic.c | 4 ++-- + plug-ins/common/newsprint.c | 4 ++-- + plug-ins/common/nl-filter.c | 4 ++-- + plug-ins/common/noise-hsv.c | 4 ++-- + plug-ins/common/noise-randomize.c | 4 ++-- + plug-ins/common/noise-rgb.c | 4 ++-- + plug-ins/common/noise-solid.c | 4 ++-- + plug-ins/common/noise-spread.c | 4 ++-- + plug-ins/common/nova.c | 4 ++-- + plug-ins/common/oilify.c | 4 ++-- + plug-ins/common/photocopy.c | 4 ++-- + plug-ins/common/pixelize.c | 4 ++-- + plug-ins/common/plasma.c | 4 ++-- + plug-ins/common/plugin-browser.c | 4 ++-- + plug-ins/common/polar-coords.c | 4 ++-- + plug-ins/common/red-eye-removal.c | 4 ++-- + plug-ins/common/ripple.c | 4 ++-- + plug-ins/common/sharpen.c | 4 ++-- + plug-ins/common/shift.c | 4 ++-- + plug-ins/common/softglow.c | 4 ++-- + plug-ins/common/sparkle.c | 4 ++-- + plug-ins/common/sphere-designer.c | 4 ++-- + plug-ins/common/threshold-alpha.c | 4 ++-- + plug-ins/common/tile-glass.c | 4 ++-- + plug-ins/common/tile-paper.c | 4 ++-- + plug-ins/common/unit-editor.c | 4 ++-- + plug-ins/common/unsharp-mask.c | 4 ++-- + plug-ins/common/value-propagate.c | 4 ++-- + plug-ins/common/van-gogh-lic.c | 4 ++-- + plug-ins/common/waves.c | 4 ++-- + plug-ins/common/whirl-pinch.c | 4 ++-- + plug-ins/common/wind.c | 4 ++-- + plug-ins/file-bmp/bmp-write.c | 4 ++-- + plug-ins/gfig/gfig-dialog.c | 8 ++++---- + plug-ins/gimpressionist/gimpressionist.c | 4 ++-- + plug-ins/gimpressionist/orientmap.c | 4 ++-- + plug-ins/gimpressionist/presets.c | 4 ++-- + plug-ins/gimpressionist/sizemap.c | 4 ++-- plug-ins/selection-to-path/selection-to-path.c | 4 ++-- 85 files changed, 173 insertions(+), 172 deletions(-) commit 616285fa7de28937df3f1f732e86085371c6a6ac Author: Michael Natterer -Date: Fri Mar 4 01:49:32 2011 +0100 +Date: Fri Mar 4 01:49:32 2011 +0100 app: fix possible warning when removing layers, channels or vectors @@ -42406,7 +43265,7 @@ commit 7a47e36c636f5db32a0b18571cc2408cf6415f8d Author: Michael Natterer -Date: Thu Mar 3 22:38:50 2011 +0100 +Date: Thu Mar 3 22:38:50 2011 +0100 app: fix "grabbing" of extended devices @@ -42419,7 +43278,7 @@ commit e3c0a4e5492439ce4e50ea49eea4f62324221fa4 Author: Michael Natterer -Date: Thu Mar 3 18:43:56 2011 +0100 +Date: Thu Mar 3 18:43:56 2011 +0100 app: move all GimpDynamics members to private @@ -42428,11 +43287,11 @@ app/core/gimpdynamics.h | 14 +-- app/paint/gimpairbrush.c | 36 ++++--- app/paint/gimpbrushcore.c | 157 +++++++++++++++++------------- - app/paint/gimpclone.c | 41 ++++---- + app/paint/gimpclone.c | 41 ++++---- app/paint/gimpconvolve.c | 15 ++- app/paint/gimpdodgeburn.c | 34 ++++--- app/paint/gimperaser.c | 36 ++++--- - app/paint/gimpheal.c | 32 +++--- + app/paint/gimpheal.c | 32 +++--- app/paint/gimppaintbrush.c | 24 +++-- app/paint/gimppaintoptions.c | 15 ++- app/paint/gimpsmudge.c | 44 ++++++--- @@ -42441,7 +43300,7 @@ commit c31d675ac19f379652f81a1fd543dab0d69dcd65 Author: Michael Natterer -Date: Thu Mar 3 11:48:35 2011 +0100 +Date: Thu Mar 3 11:48:35 2011 +0100 app: move all GimpDynamicsOutput members to private @@ -42452,7 +43311,7 @@ commit 672286515ce6d727ddd18f38309c633c28d7a0a8 Author: Michael Natterer -Date: Thu Mar 3 11:32:45 2011 +0100 +Date: Thu Mar 3 11:32:45 2011 +0100 app: remove gimp_data_name_compare() prototype, the function doesn't exist @@ -42462,7 +43321,7 @@ commit 21ad9d33b76f49f5be55248f98b40dd80027003b Author: Michael Natterer -Date: Thu Mar 3 10:57:38 2011 +0100 +Date: Thu Mar 3 10:57:38 2011 +0100 app: don't ref the layer mask twice when keeping it around while loading @@ -42475,7 +43334,7 @@ commit 8512e67cfd515787a9e525d76d8478f5d0365ce0 Author: Daniel Korostil -Date: Thu Mar 3 10:47:07 2011 +0200 +Date: Thu Mar 3 10:47:07 2011 +0200 Uploaded Ukranian @@ -42484,61 +43343,61 @@ commit c913c1512adad92c90da2eaad2a5d72c3630c8d4 Author: Mikael Magnusson -Date: Wed Mar 2 20:53:35 2011 +0100 +Date: Wed Mar 2 20:53:35 2011 +0100 libgimp, plug-ins: change the parasite function calls in more places devel-docs/libgimp/libgimp-sections.txt | 4 ++-- - libgimp/gimp.def | 4 ++-- - plug-ins/pygimp/pygimp-drawable.c | 5 +++-- - plug-ins/pygimp/pygimp-vectors.c | 5 +++-- + libgimp/gimp.def | 4 ++-- + plug-ins/pygimp/pygimp-drawable.c | 5 +++-- + plug-ins/pygimp/pygimp-vectors.c | 5 +++-- 4 files changed, 10 insertions(+), 8 deletions(-) commit fe7aa4e1137576551f0e0f42c920b1c3da851619 -Merge: 7056d38 c550eae +Merge: 7056d38681 c550eae5e1 Author: Michael Muré -Date: Wed Mar 2 15:08:11 2011 +0100 +Date: Wed Mar 2 15:08:11 2011 +0100 Merge branch 'master' into soc-2010-cage-2 commit c550eae5e1e1194d305bf768f710e656a32b7920 Author: Michael Natterer -Date: Wed Mar 2 12:26:04 2011 +0100 +Date: Wed Mar 2 12:26:04 2011 +0100 app: move all GimpImagefile members to private - app/actions/documents-commands.c | 7 +- - app/core/gimpimagefile.c | 201 + app/actions/documents-commands.c | 7 +- + app/core/gimpimagefile.c | 201 ++++++++++++++++++++------------ - app/core/gimpimagefile.h | 10 +- - app/widgets/gimpthumbbox.c | 11 +- + app/core/gimpimagefile.h | 10 +- + app/widgets/gimpthumbbox.c | 11 +- app/widgets/gimpviewrendererimagefile.c | 13 ++- 5 files changed, 148 insertions(+), 94 deletions(-) commit 5b09e61c46dce0506c628a5b23b2fa726b89b5b0 Author: Michael Natterer -Date: Wed Mar 2 10:16:43 2011 +0100 +Date: Wed Mar 2 10:16:43 2011 +0100 app: move all GimpTemplate members to private - app/core/gimp.c | 4 +- - app/core/gimpimage-new.c | 29 +++--- - app/core/gimpimage.c | 9 +- - app/core/gimptemplate.c | 196 + app/core/gimp.c | 4 +- + app/core/gimpimage-new.c | 29 +++--- + app/core/gimpimage.c | 9 +- + app/core/gimptemplate.c | 196 +++++++++++++++++++++++++++-------- - app/core/gimptemplate.h | 41 ++++---- + app/core/gimptemplate.h | 41 ++++---- app/dialogs/image-new-dialog.c | 14 ++- app/dialogs/preferences-dialog.c | 4 +- - app/pdb/gimprc-cmds.c | 2 +- + app/pdb/gimprc-cmds.c | 2 +- app/widgets/gimpimagecommenteditor.c | 13 ++- app/widgets/gimptemplateeditor.c | 75 +++++++++----- - app/xcf/xcf-load.c | 6 +- - tools/pdbgen/pdb/gimprc.pdb | 2 +- + app/xcf/xcf-load.c | 6 +- + tools/pdbgen/pdb/gimprc.pdb | 2 +- 12 files changed, 273 insertions(+), 122 deletions(-) commit b435e55d14a5d21aa533e479838441d584b828f0 Author: Kevin Cozens -Date: Wed Mar 2 02:55:43 2011 -0500 +Date: Wed Mar 2 02:55:43 2011 -0500 Applied modified version of second patch for bug #642939. Original patch supplied by Nelson A. de Oliveira. Modified to not @@ -42548,73 +43407,73 @@ Additional scripts were changed to not pass -1 to gimp-image-insert-layer. - plug-ins/script-fu/scripts/3dTruchet.scm | 10 +++++----- - plug-ins/script-fu/scripts/add-bevel.scm | 2 +- - plug-ins/script-fu/scripts/addborder.scm | 2 +- - plug-ins/script-fu/scripts/alien-glow-arrow.scm | 6 +++--- - plug-ins/script-fu/scripts/alien-glow-bar.scm | 6 +++--- - plug-ins/script-fu/scripts/alien-glow-bullet.scm | 6 +++--- - plug-ins/script-fu/scripts/alien-glow-button.scm | 6 +++--- - plug-ins/script-fu/scripts/beveled-button.scm | 4 ++-- - plug-ins/script-fu/scripts/beveled-pattern-arrow.scm | 4 ++-- - plug-ins/script-fu/scripts/beveled-pattern-bullet.scm | 4 ++-- - plug-ins/script-fu/scripts/beveled-pattern-button.scm | 4 ++-- + plug-ins/script-fu/scripts/3dTruchet.scm | 10 +++++----- + plug-ins/script-fu/scripts/add-bevel.scm | 2 +- + plug-ins/script-fu/scripts/addborder.scm | 2 +- + plug-ins/script-fu/scripts/alien-glow-arrow.scm | 6 +++--- + plug-ins/script-fu/scripts/alien-glow-bar.scm | 6 +++--- + plug-ins/script-fu/scripts/alien-glow-bullet.scm | 6 +++--- + plug-ins/script-fu/scripts/alien-glow-button.scm | 6 +++--- + plug-ins/script-fu/scripts/beveled-button.scm | 4 ++-- + plug-ins/script-fu/scripts/beveled-pattern-arrow.scm | 4 ++-- + plug-ins/script-fu/scripts/beveled-pattern-bullet.scm | 4 ++-- + plug-ins/script-fu/scripts/beveled-pattern-button.scm | 4 ++-- plug-ins/script-fu/scripts/beveled-pattern-heading.scm | 4 ++-- - plug-ins/script-fu/scripts/beveled-pattern-hrule.scm | 4 ++-- - plug-ins/script-fu/scripts/blend-anim.scm | 8 ++++---- - plug-ins/script-fu/scripts/burn-in-anim.scm | 4 ++-- - plug-ins/script-fu/scripts/carve-it.scm | 4 ++-- - plug-ins/script-fu/scripts/carved-logo.scm | 2 +- - plug-ins/script-fu/scripts/chrome-it.scm | 12 ++++++------ - plug-ins/script-fu/scripts/circuit.scm | 2 +- - plug-ins/script-fu/scripts/clothify.scm | 4 ++-- - plug-ins/script-fu/scripts/coffee.scm | 2 +- - plug-ins/script-fu/scripts/contactsheet.scm | 4 ++-- - plug-ins/script-fu/scripts/crystal-logo.scm | 10 +++++----- - plug-ins/script-fu/scripts/difference-clouds.scm | 2 +- - plug-ins/script-fu/scripts/distress-selection.scm | 2 +- - plug-ins/script-fu/scripts/drop-shadow.scm | 2 +- - plug-ins/script-fu/scripts/flatland.scm | 4 ++-- - plug-ins/script-fu/scripts/font-map.scm | 4 ++-- - plug-ins/script-fu/scripts/frosty-logo.scm | 8 ++++---- - plug-ins/script-fu/scripts/fuzzyborder.scm | 4 ++-- - plug-ins/script-fu/scripts/gradient-example.scm | 2 +- - plug-ins/script-fu/scripts/grid-system.scm | 2 +- - plug-ins/script-fu/scripts/i26-gunya2.scm | 6 +++--- - plug-ins/script-fu/scripts/lava.scm | 2 +- - plug-ins/script-fu/scripts/mkbrush.scm | 8 ++++---- - plug-ins/script-fu/scripts/neon-logo.scm | 2 +- - plug-ins/script-fu/scripts/news-text.scm | 4 ++-- - plug-ins/script-fu/scripts/old-photo.scm | 2 +- - plug-ins/script-fu/scripts/perspective-shadow.scm | 2 +- - plug-ins/script-fu/scripts/predator.scm | 2 +- - plug-ins/script-fu/scripts/pupi-button.scm | 4 ++-- - plug-ins/script-fu/scripts/rendermap.scm | 4 ++-- - plug-ins/script-fu/scripts/ripply-anim.scm | 4 ++-- - plug-ins/script-fu/scripts/round-corners.scm | 2 +- - plug-ins/script-fu/scripts/script-fu-util.scm | 2 +- - plug-ins/script-fu/scripts/select-to-brush.scm | 2 +- - plug-ins/script-fu/scripts/select-to-image.scm | 2 +- - plug-ins/script-fu/scripts/select-to-pattern.scm | 2 +- - plug-ins/script-fu/scripts/slide.scm | 4 ++-- - plug-ins/script-fu/scripts/sota-chrome-logo.scm | 10 +++++----- - plug-ins/script-fu/scripts/speed-text.scm | 4 ++-- - plug-ins/script-fu/scripts/spinning-globe.scm | 2 +- - plug-ins/script-fu/scripts/swirltile.scm | 2 +- - plug-ins/script-fu/scripts/swirly-pattern.scm | 2 +- - plug-ins/script-fu/scripts/test-sphere.scm | 2 +- - plug-ins/script-fu/scripts/text-circle.scm | 2 +- - plug-ins/script-fu/scripts/title-header.scm | 8 ++++---- - plug-ins/script-fu/scripts/truchet.scm | 8 ++++---- - plug-ins/script-fu/scripts/unsharp-mask.scm | 10 +++++----- - plug-ins/script-fu/scripts/waves-anim.scm | 2 +- - plug-ins/script-fu/scripts/weave.scm | 6 +++--- - plug-ins/script-fu/scripts/xach-effect.scm | 4 ++-- + plug-ins/script-fu/scripts/beveled-pattern-hrule.scm | 4 ++-- + plug-ins/script-fu/scripts/blend-anim.scm | 8 ++++---- + plug-ins/script-fu/scripts/burn-in-anim.scm | 4 ++-- + plug-ins/script-fu/scripts/carve-it.scm | 4 ++-- + plug-ins/script-fu/scripts/carved-logo.scm | 2 +- + plug-ins/script-fu/scripts/chrome-it.scm | 12 ++++++------ + plug-ins/script-fu/scripts/circuit.scm | 2 +- + plug-ins/script-fu/scripts/clothify.scm | 4 ++-- + plug-ins/script-fu/scripts/coffee.scm | 2 +- + plug-ins/script-fu/scripts/contactsheet.scm | 4 ++-- + plug-ins/script-fu/scripts/crystal-logo.scm | 10 +++++----- + plug-ins/script-fu/scripts/difference-clouds.scm | 2 +- + plug-ins/script-fu/scripts/distress-selection.scm | 2 +- + plug-ins/script-fu/scripts/drop-shadow.scm | 2 +- + plug-ins/script-fu/scripts/flatland.scm | 4 ++-- + plug-ins/script-fu/scripts/font-map.scm | 4 ++-- + plug-ins/script-fu/scripts/frosty-logo.scm | 8 ++++---- + plug-ins/script-fu/scripts/fuzzyborder.scm | 4 ++-- + plug-ins/script-fu/scripts/gradient-example.scm | 2 +- + plug-ins/script-fu/scripts/grid-system.scm | 2 +- + plug-ins/script-fu/scripts/i26-gunya2.scm | 6 +++--- + plug-ins/script-fu/scripts/lava.scm | 2 +- + plug-ins/script-fu/scripts/mkbrush.scm | 8 ++++---- + plug-ins/script-fu/scripts/neon-logo.scm | 2 +- + plug-ins/script-fu/scripts/news-text.scm | 4 ++-- + plug-ins/script-fu/scripts/old-photo.scm | 2 +- + plug-ins/script-fu/scripts/perspective-shadow.scm | 2 +- + plug-ins/script-fu/scripts/predator.scm | 2 +- + plug-ins/script-fu/scripts/pupi-button.scm | 4 ++-- + plug-ins/script-fu/scripts/rendermap.scm | 4 ++-- + plug-ins/script-fu/scripts/ripply-anim.scm | 4 ++-- + plug-ins/script-fu/scripts/round-corners.scm | 2 +- + plug-ins/script-fu/scripts/script-fu-util.scm | 2 +- + plug-ins/script-fu/scripts/select-to-brush.scm | 2 +- + plug-ins/script-fu/scripts/select-to-image.scm | 2 +- + plug-ins/script-fu/scripts/select-to-pattern.scm | 2 +- + plug-ins/script-fu/scripts/slide.scm | 4 ++-- + plug-ins/script-fu/scripts/sota-chrome-logo.scm | 10 +++++----- + plug-ins/script-fu/scripts/speed-text.scm | 4 ++-- + plug-ins/script-fu/scripts/spinning-globe.scm | 2 +- + plug-ins/script-fu/scripts/swirltile.scm | 2 +- + plug-ins/script-fu/scripts/swirly-pattern.scm | 2 +- + plug-ins/script-fu/scripts/test-sphere.scm | 2 +- + plug-ins/script-fu/scripts/text-circle.scm | 2 +- + plug-ins/script-fu/scripts/title-header.scm | 8 ++++---- + plug-ins/script-fu/scripts/truchet.scm | 8 ++++---- + plug-ins/script-fu/scripts/unsharp-mask.scm | 10 +++++----- + plug-ins/script-fu/scripts/waves-anim.scm | 2 +- + plug-ins/script-fu/scripts/weave.scm | 6 +++--- + plug-ins/script-fu/scripts/xach-effect.scm | 4 ++-- 62 files changed, 130 insertions(+), 130 deletions(-) commit 403630fd5799c68cad1330289d457ea8f5f7ed47 Author: Kevin Cozens -Date: Wed Mar 2 02:21:50 2011 -0500 +Date: Wed Mar 2 02:21:50 2011 -0500 Applied modified version of first patch for bug #642939. Original patch supplied by Nelson A. de Oliveira. Modified to not @@ -42622,25 +43481,25 @@ -1 "insanity" for invalid/none layer ID's in scripts per IRC discussion. - plug-ins/script-fu/scripts/camo.scm | 15 +++++++-------- + plug-ins/script-fu/scripts/camo.scm | 15 +++++++-------- plug-ins/script-fu/scripts/circuit.scm | 10 +--------- - plug-ins/script-fu/scripts/land.scm | 6 +++--- + plug-ins/script-fu/scripts/land.scm | 6 +++--- plug-ins/script-fu/scripts/tileblur.scm | 8 +++++--- 4 files changed, 16 insertions(+), 23 deletions(-) commit 8438bc5bb7b048edb39721888195f30015cdb908 Author: Kevin Cozens -Date: Tue Mar 1 17:06:59 2011 -0500 +Date: Tue Mar 1 17:06:59 2011 -0500 Commiting auto-generated files with recently corrected PDB help text. - app/pdb/image-cmds.c | 6 +++--- + app/pdb/image-cmds.c | 6 +++--- libgimp/gimpimage_pdb.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) commit b890cd39afc1b94fcdeb0e0a2279a8cb1d49aadb Author: Kevin Cozens -Date: Tue Mar 1 11:09:56 2011 -0500 +Date: Tue Mar 1 11:09:56 2011 -0500 Correction to help text for the gimp-insert-layer-* PDB procedures. @@ -42649,7 +43508,7 @@ commit 7faaf4df4118de870c1938d5f50a9c44e9d50d5a Author: Michael Natterer -Date: Tue Mar 1 22:19:48 2011 +0100 +Date: Tue Mar 1 22:19:48 2011 +0100 libgimp: rename the newly added item parasite functions @@ -42659,22 +43518,22 @@ Also changed the signature of gimp-item-get-parasite-list's C wrapper in libgimp to be sane. - app/pdb/gimp-pdb-compat.c | 8 ++-- - app/pdb/item-cmds.c | 40 ++++++++++---------- - libgimp/gimpdrawable.c | 8 ++-- - libgimp/gimpitem_pdb.c | 35 ++++++++---------- - libgimp/gimpitem_pdb.h | 75 + app/pdb/gimp-pdb-compat.c | 8 ++-- + app/pdb/item-cmds.c | 40 ++++++++++---------- + libgimp/gimpdrawable.c | 8 ++-- + libgimp/gimpitem_pdb.c | 35 ++++++++---------- + libgimp/gimpitem_pdb.h | 75 +++++++++++++++++++------------------- - libgimp/gimpvectors.c | 8 ++-- - plug-ins/gfig/gfig-dialog.c | 2 +- - plug-ins/gfig/gfig.c | 2 +- + libgimp/gimpvectors.c | 8 ++-- + plug-ins/gfig/gfig-dialog.c | 2 +- + plug-ins/gfig/gfig.c | 2 +- plug-ins/ifs-compose/ifs-compose.c | 4 +- - tools/pdbgen/pdb/item.pdb | 10 ++--- + tools/pdbgen/pdb/item.pdb | 10 ++--- 10 files changed, 95 insertions(+), 97 deletions(-) commit 0bb5a76405de0d9638c44b025729b32426c907bb Author: Michael Natterer -Date: Tue Mar 1 17:11:22 2011 +0100 +Date: Tue Mar 1 17:11:22 2011 +0100 app: fix wilber dawing offset on widgets that don't have a window @@ -42683,19 +43542,19 @@ commit ebe4b4102f734c8f0e256c62a0b91103da490ca5 Author: Michael Natterer -Date: Tue Mar 1 17:05:58 2011 +0100 +Date: Tue Mar 1 17:05:58 2011 +0100 Bug 643587 - Opening two xcf with vectors crashes gimp Fix the crash and the warning pointed out in the bug. - app/display/gimpcanvaspath.c | 2 +- + app/display/gimpcanvaspath.c | 2 +- app/display/gimpdisplayshell-handlers.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) commit 30e847c921f445800673b4a9b74412371d9198b3 Author: Michael Natterer -Date: Tue Mar 1 15:32:08 2011 +0100 +Date: Tue Mar 1 15:32:08 2011 +0100 app: forgot to implement dragging from GimpContainerIconView @@ -42705,7 +43564,7 @@ commit f45e171f093bfa2753e843de954e2a2d93e01086 Author: Michael Natterer -Date: Tue Mar 1 14:53:54 2011 +0100 +Date: Tue Mar 1 14:53:54 2011 +0100 app: place the gimpview-popup at the button event's root coordinates @@ -42716,7 +43575,7 @@ commit f82daa557aef4cdf03fb17526716e10770d7f7f3 Author: Michael Natterer -Date: Tue Mar 1 13:28:58 2011 +0100 +Date: Tue Mar 1 13:28:58 2011 +0100 app: pack stuff in boxes instead of tables in GimpDeviceStatus @@ -42728,21 +43587,21 @@ commit 30100cf6135bed8c70e6618a8717a3c4a5c955bc Author: Michael Natterer -Date: Tue Mar 1 12:31:17 2011 +0100 +Date: Tue Mar 1 12:31:17 2011 +0100 app: add new widget GimpIconPicker, ripped out of GimpTemplateEditor - app/widgets/Makefile.am | 2 + - app/widgets/gimpiconpicker.c | 301 + app/widgets/Makefile.am | 2 + + app/widgets/gimpiconpicker.c | 301 +++++++++++++++++++++++++++++++++++++++ - app/widgets/gimpiconpicker.h | 55 +++++++ + app/widgets/gimpiconpicker.h | 55 +++++++ app/widgets/gimptemplateeditor.c | 90 +++--------- - app/widgets/widgets-types.h | 1 + + app/widgets/widgets-types.h | 1 + 5 files changed, 379 insertions(+), 70 deletions(-) commit f0f94ba6a14da5c9d728de24f4856a703bfe5f4c Author: Michael Natterer -Date: Tue Mar 1 11:50:16 2011 +0100 +Date: Tue Mar 1 11:50:16 2011 +0100 app: move all GimpTemplateEditor members to private @@ -42755,7 +43614,7 @@ commit d3a83c9940a019cc1b8766365f2ddc354ea2f646 Author: Michael Natterer -Date: Tue Mar 1 01:29:35 2011 +0100 +Date: Tue Mar 1 01:29:35 2011 +0100 app: fix export and delete sensitivity in GimpSettingsEditor @@ -42767,7 +43626,7 @@ commit 145db8d57c5a55e39881799e868a9eadf925e99c Author: Michael Natterer -Date: Tue Mar 1 00:56:23 2011 +0100 +Date: Tue Mar 1 00:56:23 2011 +0100 Bug 639305 - Image tabs pushes toolbox to left @@ -42779,7 +43638,7 @@ commit 9b5dc7559a36660f0718b8193a336ac577d89b21 Author: Michael Natterer -Date: Mon Feb 28 21:04:42 2011 +0100 +Date: Mon Feb 28 21:04:42 2011 +0100 app: set GimpFreeSelectTool active only while mouse-1 is down @@ -42790,7 +43649,7 @@ commit 9cac8e7b42005c8f61de18033355aec4df2f0ca6 Author: Michael Natterer -Date: Mon Feb 28 17:36:53 2011 +0100 +Date: Mon Feb 28 17:36:53 2011 +0100 app: GimpDeviceStatus: don't call gdk_display_get_name() on a NULL display @@ -42800,7 +43659,7 @@ commit 3a767c0c155de9c41b8d748b546defeaeed483e8 Author: Michael Natterer -Date: Mon Feb 28 16:43:21 2011 +0100 +Date: Mon Feb 28 16:43:21 2011 +0100 app: get rid of the arrow in GimpDeviceStatus @@ -42814,7 +43673,7 @@ commit a1712a0ec74bce53e56fdde2033ac9b79d763a29 Author: Michael Natterer -Date: Mon Feb 28 16:08:12 2011 +0100 +Date: Mon Feb 28 16:08:12 2011 +0100 app: emit "changed" when GimpDeviceInfo's device gets (un)set @@ -42823,7 +43682,7 @@ commit b21f5be73f9ae90e88eb6ca8a7f65af8b4d844fa Author: Michael Natterer -Date: Mon Feb 28 15:55:02 2011 +0100 +Date: Mon Feb 28 15:55:02 2011 +0100 app: use GimpDeviceInfo's accessors @@ -42832,7 +43691,7 @@ commit c49a7113e5dba2c15853da3c0cc25facc11856cd Author: Michael Natterer -Date: Mon Feb 28 15:48:13 2011 +0100 +Date: Mon Feb 28 15:48:13 2011 +0100 app: set the device manager's sort_func via g_object_new() @@ -42844,7 +43703,7 @@ commit ee844c6395ab2c92617f856568cd68008e0e7147 Author: Michael Natterer -Date: Mon Feb 28 14:37:00 2011 +0100 +Date: Mon Feb 28 14:37:00 2011 +0100 app: GimpDeviceManager refactoring part two @@ -42856,18 +43715,18 @@ - cleanup in gimpdevices.c app/display/gimpdisplayshell-tool-events.c | 35 +++++++++++---- - app/gui/gui.c | 34 -------------- - app/widgets/gimpdeviceeditor.c | 9 ++-- - app/widgets/gimpdevices.c | 72 + app/gui/gui.c | 34 -------------- + app/widgets/gimpdeviceeditor.c | 9 ++-- + app/widgets/gimpdevices.c | 72 ++++++++++-------------------- - app/widgets/gimpdevices.h | 31 +++++++------ - app/widgets/gimpdevicestatus.c | 33 +++++++++----- - app/widgets/gimpdevicestatus.h | 3 +- + app/widgets/gimpdevices.h | 31 +++++++------ + app/widgets/gimpdevicestatus.c | 33 +++++++++----- + app/widgets/gimpdevicestatus.h | 3 +- 7 files changed, 95 insertions(+), 122 deletions(-) commit 21a0e55005d63c42189534a1181e731c3fc9cb8f Author: Michael Natterer -Date: Mon Feb 28 12:57:15 2011 +0100 +Date: Mon Feb 28 12:57:15 2011 +0100 app: device manager refactoring part one @@ -42875,32 +43734,32 @@ gimpdevices.c, but leave all functions in gimpdevices.c there as wrappers in order to make rebasing in gtk3-port simpler. - app/gui/gui.c | 20 ++- - app/widgets/Makefile.am | 2 + + app/gui/gui.c | 20 ++- + app/widgets/Makefile.am | 2 + app/widgets/gimpdevicemanager.c | 362 ++++++++++++++++++++++++++++++++++++++++ app/widgets/gimpdevicemanager.h | 63 +++++++ - app/widgets/gimpdevices.c | 214 +++--------------------- - app/widgets/gimpdevices.h | 36 ++-- - app/widgets/widgets-types.h | 1 + + app/widgets/gimpdevices.c | 214 +++--------------------- + app/widgets/gimpdevices.h | 36 ++-- + app/widgets/widgets-types.h | 1 + 7 files changed, 480 insertions(+), 218 deletions(-) commit 4f59bb343198582d685a0babdccd1b5b69bf607d Author: Michael Natterer -Date: Mon Feb 28 00:41:48 2011 +0100 +Date: Mon Feb 28 00:41:48 2011 +0100 Bug 581338 - Layer size does not change using the pdb 'gimp-text-layer-resize' Fix the fix: use box-unit, not unit, for the box extents. - app/pdb/text-layer-cmds.c | 4 ++-- + app/pdb/text-layer-cmds.c | 4 ++-- tools/pdbgen/pdb/text_layer.pdb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit 3bf3aa55a100f25ab1b74fc6e74b55aa3a10d644 Author: Daniel Nylander -Date: Sun Feb 27 18:27:00 2011 +0100 +Date: Sun Feb 27 18:27:00 2011 +0100 Updated Swedish translation @@ -42910,7 +43769,7 @@ commit d136b9f7d2b85add3c491349b559f7629b68d670 Author: Michael Natterer -Date: Sun Feb 27 12:16:51 2011 +0100 +Date: Sun Feb 27 12:16:51 2011 +0100 app: redo the last commit and call proximity_in() at all logical places @@ -42924,7 +43783,7 @@ commit 75add92218195581127908f5b9ccf8b7d9b14de8 Author: Michael Natterer -Date: Sun Feb 27 12:08:09 2011 +0100 +Date: Sun Feb 27 12:08:09 2011 +0100 app: add utility functions proximity_in() and proximity_out() @@ -42938,7 +43797,7 @@ commit ca618093cff81ce22e829fbd5aefe24634b41442 Author: Michael Natterer -Date: Sun Feb 27 11:49:54 2011 +0100 +Date: Sun Feb 27 11:49:54 2011 +0100 app: don't show the line to the next free select point when not in proximity @@ -42952,7 +43811,7 @@ commit 955fecc3cd5db5eced102d3a5511b297ed5488d1 Author: Michael Natterer -Date: Sun Feb 27 11:08:36 2011 +0100 +Date: Sun Feb 27 11:08:36 2011 +0100 app: replace a wrong G_LIKELY() by G_UNLIKELY() in tool_events() @@ -42961,7 +43820,7 @@ commit 80de76006da44d98417d8be263c7745e33103279 Author: Mattias Põldaru -Date: Sat Feb 26 17:26:19 2011 +0200 +Date: Sat Feb 26 17:26:19 2011 +0200 [l10n] Updated Estonian translation @@ -42970,7 +43829,7 @@ commit 85af450b3cd8a5fab213cbc9bb670d25614da02f Author: Michael Natterer -Date: Thu Feb 24 16:54:39 2011 +0100 +Date: Thu Feb 24 16:54:39 2011 +0100 app: forgot to #include "widgets/gimpwidgets-utils.h" @@ -42979,21 +43838,21 @@ commit c11b0d2a79265f1ae9318f40b491a5e5aa8c3992 Author: Michael Natterer -Date: Thu Feb 24 12:34:57 2011 +0100 +Date: Thu Feb 24 12:34:57 2011 +0100 app: move tool event debug output to a utility function to reduce clutter in gimp_display_shell_canvas_tool_events(). app/display/gimpdisplayshell-tool-events.c | 43 +----------- - app/widgets/gimpwidgets-utils.c | 103 + app/widgets/gimpwidgets-utils.c | 103 +++++++++++++++++++++++++++++ - app/widgets/gimpwidgets-utils.h | 2 + + app/widgets/gimpwidgets-utils.h | 2 + 3 files changed, 108 insertions(+), 40 deletions(-) commit ef905d4b9e6c9d98cfdc5441731c677025267f5a Author: Michael Natterer -Date: Mon Oct 18 21:22:16 2010 +0200 +Date: Mon Oct 18 21:22:16 2010 +0200 app: pick another GDK_KEY_foo key name commit from gtk3-port @@ -43002,7 +43861,7 @@ commit de8a07703a996ab29eb4f59819d7e2c9e0ae0c7d Author: Michael Natterer -Date: Wed Feb 23 07:13:45 2011 +0100 +Date: Wed Feb 23 07:13:45 2011 +0100 app: name display scrollbar callbacks like the signal they are handling @@ -43014,12 +43873,12 @@ app/display/gimpdisplayshell-callbacks.c | 42 ++++++++++++++++---------------- app/display/gimpdisplayshell-callbacks.h | 2 +- - app/display/gimpdisplayshell.c | 2 +- + app/display/gimpdisplayshell.c | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) commit 3c0453b3c0fc93d0ef00b51f1e53424b55021bdc Author: Michael Natterer -Date: Wed Feb 23 06:22:24 2011 +0100 +Date: Wed Feb 23 06:22:24 2011 +0100 app: clean up static functions in the new tool-events.c file @@ -43029,26 +43888,26 @@ commit c09ad998a46f281a910f1e17542b04d4f3a5851a Author: Michael Natterer -Date: Wed Feb 23 05:21:06 2011 +0100 +Date: Wed Feb 23 05:21:06 2011 +0100 app: split tool event handling out into an own file it was simply getting too hairy in the callbacks.c file. - app/display/Makefile.am | 2 + + app/display/Makefile.am | 2 + app/display/gimpdisplayshell-callbacks.c | 1776 +-------------------------- - app/display/gimpdisplayshell-callbacks.h | 14 - + app/display/gimpdisplayshell-callbacks.h | 14 - app/display/gimpdisplayshell-tool-events.c | 1807 ++++++++++++++++++++++++++++ - app/display/gimpdisplayshell-tool-events.h | 38 + - app/display/gimpdisplayshell.c | 1 + - app/display/gimpimagewindow.c | 2 +- + app/display/gimpdisplayshell-tool-events.h | 38 + + app/display/gimpdisplayshell.c | 1 + + app/display/gimpimagewindow.c | 2 +- 7 files changed, 1851 insertions(+), 1789 deletions(-) commit 09947733d69eeffaecb802ab14bbc084cc06bca6 Author: Michael Natterer -Date: Wed Feb 23 04:47:26 2011 +0100 +Date: Wed Feb 23 04:47:26 2011 +0100 app: use some of the new GDK_KEY_foo #defines from GTK+ 2.22 @@ -43056,14 +43915,14 @@ refactoring there without making rebasing the gtk3-port branch almost impossible. - app/display/display-types.h | 23 ++++++ + app/display/display-types.h | 23 ++++++ app/display/gimpdisplayshell-callbacks.c | 120 +++++++++++++++---------------- 2 files changed, 83 insertions(+), 60 deletions(-) commit 203440521a33ea26ae89987498931a841bd403f9 Author: Mikael Magnusson -Date: Wed Feb 23 23:14:33 2011 +0100 +Date: Wed Feb 23 23:14:33 2011 +0100 plug-ins: imagemap, init map type to the default type set in preferences @@ -43073,7 +43932,7 @@ commit f78f791eaa7911b75b9342d23fcb611f3501e9eb Author: Alexia Death -Date: Wed Feb 23 23:46:58 2011 +0200 +Date: Wed Feb 23 23:46:58 2011 +0200 theme: new dynamics icon from Przemysław Gołąb @@ -43085,7 +43944,7 @@ commit 60392ce9cf5c8cf31e8ec6959056d21a3243632f Author: Martin Srebotnjak -Date: Wed Feb 23 18:44:39 2011 +0100 +Date: Wed Feb 23 18:44:39 2011 +0100 Updated Slovenian translation @@ -43095,7 +43954,7 @@ commit 2e3eba1c494c6c8f58afe05f7df61baabe72f9a2 Author: Martin Srebotnjak -Date: Wed Feb 23 18:44:08 2011 +0100 +Date: Wed Feb 23 18:44:08 2011 +0100 Updated Slovenian translation @@ -43105,7 +43964,7 @@ commit 6ea2f4881a236fa392fbdba9574e1d367105c3db Author: Mikael Magnusson -Date: Wed Feb 23 12:59:56 2011 +0100 +Date: Wed Feb 23 12:59:56 2011 +0100 plug-ins: imagemap, Don't show popup menu when button 1 is pressed @@ -43117,7 +43976,7 @@ commit cc3f1e8a24a372a66a5c66e7852c82378ac1c64e Author: Mikael Magnusson -Date: Wed Feb 23 12:55:27 2011 +0100 +Date: Wed Feb 23 12:55:27 2011 +0100 plug-ins: imagemap, don't run execute for sash when redoing @@ -43129,148 +43988,148 @@ commit 8621807a9f848c226fef3dac2987f38c9cc2db04 Author: Mikael Magnusson -Date: Mon Feb 21 15:45:26 2011 +0100 +Date: Mon Feb 21 15:45:26 2011 +0100 plug-ins: imagemap, port to cairo - plug-ins/imagemap/imap_circle.c | 18 ++-- - plug-ins/imagemap/imap_cmd_gimp_guides.c | 2 +- - plug-ins/imagemap/imap_cmd_insert_point.c | 4 +- - plug-ins/imagemap/imap_cmd_move.c | 9 +- + plug-ins/imagemap/imap_circle.c | 18 ++-- + plug-ins/imagemap/imap_cmd_gimp_guides.c | 2 +- + plug-ins/imagemap/imap_cmd_insert_point.c | 4 +- + plug-ins/imagemap/imap_cmd_move.c | 9 +- plug-ins/imagemap/imap_cmd_move_sash.c | 11 +- plug-ins/imagemap/imap_cmd_select_region.c | 15 +-- - plug-ins/imagemap/imap_edit_area_info.c | 4 +- - plug-ins/imagemap/imap_grid.c | 62 +++++------ - plug-ins/imagemap/imap_grid.h | 2 +- - plug-ins/imagemap/imap_main.c | 166 + plug-ins/imagemap/imap_edit_area_info.c | 4 +- + plug-ins/imagemap/imap_grid.c | 62 +++++------ + plug-ins/imagemap/imap_grid.h | 2 +- + plug-ins/imagemap/imap_main.c | 166 +++++++++++------------------ - plug-ins/imagemap/imap_main.h | 17 ++- - plug-ins/imagemap/imap_misc.c | 4 +- - plug-ins/imagemap/imap_misc.h | 2 +- - plug-ins/imagemap/imap_object.c | 59 ++++++---- - plug-ins/imagemap/imap_object.h | 10 +- - plug-ins/imagemap/imap_polygon.c | 12 +-- - plug-ins/imagemap/imap_preferences.c | 29 +++-- - plug-ins/imagemap/imap_preferences.h | 4 +- - plug-ins/imagemap/imap_preview.c | 67 ++++++------ - plug-ins/imagemap/imap_preview.h | 8 +- - plug-ins/imagemap/imap_rectangle.c | 31 +++--- + plug-ins/imagemap/imap_main.h | 17 ++- + plug-ins/imagemap/imap_misc.c | 4 +- + plug-ins/imagemap/imap_misc.h | 2 +- + plug-ins/imagemap/imap_object.c | 59 ++++++---- + plug-ins/imagemap/imap_object.h | 10 +- + plug-ins/imagemap/imap_polygon.c | 12 +-- + plug-ins/imagemap/imap_preferences.c | 29 +++-- + plug-ins/imagemap/imap_preferences.h | 4 +- + plug-ins/imagemap/imap_preview.c | 67 ++++++------ + plug-ins/imagemap/imap_preview.h | 8 +- + plug-ins/imagemap/imap_rectangle.c | 31 +++--- 21 files changed, 251 insertions(+), 285 deletions(-) commit e012caf1a3ed3f1b8294765c896817327da3e15f Author: Mikael Magnusson -Date: Mon Feb 21 11:51:47 2011 +0100 +Date: Mon Feb 21 11:51:47 2011 +0100 plug-ins: imagemap, tabs to spaces - plug-ins/imagemap/imap_browse.c | 26 +- - plug-ins/imagemap/imap_cern_lex.c | 1642 + plug-ins/imagemap/imap_browse.c | 26 +- + plug-ins/imagemap/imap_cern_lex.c | 1642 +++++++++++++-------------- - plug-ins/imagemap/imap_cern_parse.c | 554 ++++----- - plug-ins/imagemap/imap_cern_parse.h | 2 +- - plug-ins/imagemap/imap_circle.c | 44 +- - plug-ins/imagemap/imap_cmd_clear.c | 12 +- - plug-ins/imagemap/imap_cmd_copy.c | 6 +- - plug-ins/imagemap/imap_cmd_copy_object.c | 8 +- - plug-ins/imagemap/imap_cmd_create.c | 8 +- - plug-ins/imagemap/imap_cmd_cut.c | 8 +- - plug-ins/imagemap/imap_cmd_cut_object.c | 8 +- - plug-ins/imagemap/imap_cmd_delete.c | 8 +- - plug-ins/imagemap/imap_cmd_delete_point.c | 16 +- - plug-ins/imagemap/imap_cmd_edit_object.c | 4 +- - plug-ins/imagemap/imap_cmd_gimp_guides.c | 68 +- - plug-ins/imagemap/imap_cmd_guides.c | 56 +- - plug-ins/imagemap/imap_cmd_insert_point.c | 20 +- - plug-ins/imagemap/imap_cmd_move.c | 10 +- - plug-ins/imagemap/imap_cmd_move_down.c | 10 +- - plug-ins/imagemap/imap_cmd_move_sash.c | 14 +- - plug-ins/imagemap/imap_cmd_move_selected.c | 6 +- - plug-ins/imagemap/imap_cmd_move_to_front.c | 12 +- - plug-ins/imagemap/imap_cmd_move_up.c | 8 +- - plug-ins/imagemap/imap_cmd_object_down.c | 4 +- - plug-ins/imagemap/imap_cmd_object_move.c | 4 +- - plug-ins/imagemap/imap_cmd_object_up.c | 4 +- - plug-ins/imagemap/imap_cmd_paste.c | 8 +- - plug-ins/imagemap/imap_cmd_select.c | 2 +- - plug-ins/imagemap/imap_cmd_select_all.c | 8 +- - plug-ins/imagemap/imap_cmd_select_next.c | 8 +- - plug-ins/imagemap/imap_cmd_select_prev.c | 8 +- - plug-ins/imagemap/imap_cmd_select_region.c | 28 +- - plug-ins/imagemap/imap_cmd_send_to_back.c | 12 +- - plug-ins/imagemap/imap_cmd_unselect.c | 4 +- - plug-ins/imagemap/imap_cmd_unselect_all.c | 8 +- - plug-ins/imagemap/imap_command.c | 50 +- - plug-ins/imagemap/imap_command.h | 10 +- - plug-ins/imagemap/imap_commands.h | 6 +- - plug-ins/imagemap/imap_csim_lex.c | 1692 + plug-ins/imagemap/imap_cern_parse.c | 554 ++++----- + plug-ins/imagemap/imap_cern_parse.h | 2 +- + plug-ins/imagemap/imap_circle.c | 44 +- + plug-ins/imagemap/imap_cmd_clear.c | 12 +- + plug-ins/imagemap/imap_cmd_copy.c | 6 +- + plug-ins/imagemap/imap_cmd_copy_object.c | 8 +- + plug-ins/imagemap/imap_cmd_create.c | 8 +- + plug-ins/imagemap/imap_cmd_cut.c | 8 +- + plug-ins/imagemap/imap_cmd_cut_object.c | 8 +- + plug-ins/imagemap/imap_cmd_delete.c | 8 +- + plug-ins/imagemap/imap_cmd_delete_point.c | 16 +- + plug-ins/imagemap/imap_cmd_edit_object.c | 4 +- + plug-ins/imagemap/imap_cmd_gimp_guides.c | 68 +- + plug-ins/imagemap/imap_cmd_guides.c | 56 +- + plug-ins/imagemap/imap_cmd_insert_point.c | 20 +- + plug-ins/imagemap/imap_cmd_move.c | 10 +- + plug-ins/imagemap/imap_cmd_move_down.c | 10 +- + plug-ins/imagemap/imap_cmd_move_sash.c | 14 +- + plug-ins/imagemap/imap_cmd_move_selected.c | 6 +- + plug-ins/imagemap/imap_cmd_move_to_front.c | 12 +- + plug-ins/imagemap/imap_cmd_move_up.c | 8 +- + plug-ins/imagemap/imap_cmd_object_down.c | 4 +- + plug-ins/imagemap/imap_cmd_object_move.c | 4 +- + plug-ins/imagemap/imap_cmd_object_up.c | 4 +- + plug-ins/imagemap/imap_cmd_paste.c | 8 +- + plug-ins/imagemap/imap_cmd_select.c | 2 +- + plug-ins/imagemap/imap_cmd_select_all.c | 8 +- + plug-ins/imagemap/imap_cmd_select_next.c | 8 +- + plug-ins/imagemap/imap_cmd_select_prev.c | 8 +- + plug-ins/imagemap/imap_cmd_select_region.c | 28 +- + plug-ins/imagemap/imap_cmd_send_to_back.c | 12 +- + plug-ins/imagemap/imap_cmd_unselect.c | 4 +- + plug-ins/imagemap/imap_cmd_unselect_all.c | 8 +- + plug-ins/imagemap/imap_command.c | 50 +- + plug-ins/imagemap/imap_command.h | 10 +- + plug-ins/imagemap/imap_commands.h | 6 +- + plug-ins/imagemap/imap_csim_lex.c | 1692 ++++++++++++++-------------- - plug-ins/imagemap/imap_csim_parse.c | 726 ++++++------ - plug-ins/imagemap/imap_csim_parse.h | 2 +- - plug-ins/imagemap/imap_default_dialog.c | 12 +- - plug-ins/imagemap/imap_default_dialog.h | 32 +- - plug-ins/imagemap/imap_edit_area_info.c | 42 +- - plug-ins/imagemap/imap_edit_area_info.h | 52 +- - plug-ins/imagemap/imap_file.c | 4 +- - plug-ins/imagemap/imap_grid.c | 16 +- - plug-ins/imagemap/imap_main.c | 8 +- - plug-ins/imagemap/imap_main.h | 10 +- - plug-ins/imagemap/imap_menu.c | 32 +- - plug-ins/imagemap/imap_menu.h | 2 +- - plug-ins/imagemap/imap_menu_funcs.c | 8 +- - plug-ins/imagemap/imap_menu_funcs.h | 6 +- - plug-ins/imagemap/imap_misc.c | 2 +- - plug-ins/imagemap/imap_mru.c | 4 +- - plug-ins/imagemap/imap_mru.h | 2 +- - plug-ins/imagemap/imap_ncsa_lex.c | 1676 + plug-ins/imagemap/imap_csim_parse.c | 726 ++++++------ + plug-ins/imagemap/imap_csim_parse.h | 2 +- + plug-ins/imagemap/imap_default_dialog.c | 12 +- + plug-ins/imagemap/imap_default_dialog.h | 32 +- + plug-ins/imagemap/imap_edit_area_info.c | 42 +- + plug-ins/imagemap/imap_edit_area_info.h | 52 +- + plug-ins/imagemap/imap_file.c | 4 +- + plug-ins/imagemap/imap_grid.c | 16 +- + plug-ins/imagemap/imap_main.c | 8 +- + plug-ins/imagemap/imap_main.h | 10 +- + plug-ins/imagemap/imap_menu.c | 32 +- + plug-ins/imagemap/imap_menu.h | 2 +- + plug-ins/imagemap/imap_menu_funcs.c | 8 +- + plug-ins/imagemap/imap_menu_funcs.h | 6 +- + plug-ins/imagemap/imap_misc.c | 2 +- + plug-ins/imagemap/imap_mru.c | 4 +- + plug-ins/imagemap/imap_mru.h | 2 +- + plug-ins/imagemap/imap_ncsa_lex.c | 1676 +++++++++++++-------------- - plug-ins/imagemap/imap_ncsa_parse.c | 570 +++++----- - plug-ins/imagemap/imap_ncsa_parse.h | 2 +- - plug-ins/imagemap/imap_object.c | 196 ++-- - plug-ins/imagemap/imap_object.h | 92 +- - plug-ins/imagemap/imap_object_popup.c | 6 +- - plug-ins/imagemap/imap_object_popup.h | 2 +- - plug-ins/imagemap/imap_polygon.c | 86 +- - plug-ins/imagemap/imap_preferences.c | 128 +-- - plug-ins/imagemap/imap_preferences.h | 28 +- - plug-ins/imagemap/imap_preview.c | 192 ++-- - plug-ins/imagemap/imap_preview.h | 14 +- - plug-ins/imagemap/imap_rectangle.c | 74 +- - plug-ins/imagemap/imap_selection.c | 72 +- - plug-ins/imagemap/imap_selection.h | 22 +- - plug-ins/imagemap/imap_settings.c | 36 +- - plug-ins/imagemap/imap_source.c | 6 +- - plug-ins/imagemap/imap_statusbar.c | 18 +- - plug-ins/imagemap/imap_stock.c | 12 +- - plug-ins/imagemap/imap_table.c | 6 +- - plug-ins/imagemap/imap_table.h | 12 +- - plug-ins/imagemap/imap_taglist.c | 4 +- + plug-ins/imagemap/imap_ncsa_parse.c | 570 +++++----- + plug-ins/imagemap/imap_ncsa_parse.h | 2 +- + plug-ins/imagemap/imap_object.c | 196 ++-- + plug-ins/imagemap/imap_object.h | 92 +- + plug-ins/imagemap/imap_object_popup.c | 6 +- + plug-ins/imagemap/imap_object_popup.h | 2 +- + plug-ins/imagemap/imap_polygon.c | 86 +- + plug-ins/imagemap/imap_preferences.c | 128 +-- + plug-ins/imagemap/imap_preferences.h | 28 +- + plug-ins/imagemap/imap_preview.c | 192 ++-- + plug-ins/imagemap/imap_preview.h | 14 +- + plug-ins/imagemap/imap_rectangle.c | 74 +- + plug-ins/imagemap/imap_selection.c | 72 +- + plug-ins/imagemap/imap_selection.h | 22 +- + plug-ins/imagemap/imap_settings.c | 36 +- + plug-ins/imagemap/imap_source.c | 6 +- + plug-ins/imagemap/imap_statusbar.c | 18 +- + plug-ins/imagemap/imap_stock.c | 12 +- + plug-ins/imagemap/imap_table.c | 6 +- + plug-ins/imagemap/imap_table.h | 12 +- + plug-ins/imagemap/imap_taglist.c | 4 +- 78 files changed, 4310 insertions(+), 4310 deletions(-) commit 8f294661b2eb43627ff215df8cdd7e6bb982ac59 Author: Michael Natterer -Date: Tue Feb 22 17:32:33 2011 +0100 +Date: Tue Feb 22 17:32:33 2011 +0100 app: don't #include "core/gimpprogress.h" when not needed - app/core/gimp.c | 1 - + app/core/gimp.c | 1 - app/tools/gimpvectortool.c | 1 - 2 files changed, 2 deletions(-) commit ac9ffde8807d6d4d455d3f51b9197f55f68f3963 Author: Michael Natterer -Date: Tue Feb 22 16:27:18 2011 +0100 +Date: Tue Feb 22 16:27:18 2011 +0100 app: formatting and other minor cleanups app/display/gimpdisplayshell-callbacks.c | 7 ++- - app/display/gimpdisplayshell-coords.c | 86 + app/display/gimpdisplayshell-coords.c | 86 +++++++++++++++----------------- - app/widgets/gimpwidgets-utils.c | 29 +++++------ + app/widgets/gimpwidgets-utils.c | 29 +++++------ 3 files changed, 55 insertions(+), 67 deletions(-) commit 7a8600e6bd841f9e635c00435a5628a4754bd08f Author: Michael Natterer -Date: Tue Feb 22 07:19:26 2011 +0100 +Date: Tue Feb 22 07:19:26 2011 +0100 app: use gdk_flush() in gimp_widget_flush_expose() @@ -43283,7 +44142,7 @@ commit ca2fde395070869fd178288b9e9a81aab5bea8af Author: Michael Natterer -Date: Tue Feb 22 01:57:52 2011 +0100 +Date: Tue Feb 22 01:57:52 2011 +0100 app: move default icon assignment a few lines up @@ -43292,7 +44151,7 @@ commit b19645db4954a8fc8db83817dc7cd2e45e840efb Author: Barak Itkin -Date: Mon Feb 21 00:07:19 2011 +0200 +Date: Mon Feb 21 00:07:19 2011 +0200 script-fu: Use gimp-image-select-item instead of gimp-item-to-selection @@ -43303,22 +44162,22 @@ as a parameter). - plug-ins/script-fu/scripts/add-bevel.scm | 4 ++-- + plug-ins/script-fu/scripts/add-bevel.scm | 4 ++-- plug-ins/script-fu/scripts/beveled-pattern-heading.scm | 6 +++--- - plug-ins/script-fu/scripts/burn-in-anim.scm | 4 ++-- - plug-ins/script-fu/scripts/carve-it.scm | 10 +++++----- - plug-ins/script-fu/scripts/carved-logo.scm | 10 +++++----- - plug-ins/script-fu/scripts/chrome-it.scm | 4 ++-- - plug-ins/script-fu/scripts/circuit.scm | 6 +++--- - plug-ins/script-fu/scripts/distress-selection.scm | 2 +- - plug-ins/script-fu/scripts/drop-shadow.scm | 2 +- - plug-ins/script-fu/scripts/perspective-shadow.scm | 2 +- - plug-ins/script-fu/scripts/xach-effect.scm | 8 ++++---- + plug-ins/script-fu/scripts/burn-in-anim.scm | 4 ++-- + plug-ins/script-fu/scripts/carve-it.scm | 10 +++++----- + plug-ins/script-fu/scripts/carved-logo.scm | 10 +++++----- + plug-ins/script-fu/scripts/chrome-it.scm | 4 ++-- + plug-ins/script-fu/scripts/circuit.scm | 6 +++--- + plug-ins/script-fu/scripts/distress-selection.scm | 2 +- + plug-ins/script-fu/scripts/drop-shadow.scm | 2 +- + plug-ins/script-fu/scripts/perspective-shadow.scm | 2 +- + plug-ins/script-fu/scripts/xach-effect.scm | 8 ++++---- 11 files changed, 29 insertions(+), 29 deletions(-) commit 56dd924b9c138e8da6020ea88708d0806f195158 Author: Alexia Death -Date: Sun Feb 20 18:47:02 2011 +0200 +Date: Sun Feb 20 18:47:02 2011 +0200 app: add default dynamics icon @@ -43327,7 +44186,7 @@ commit 4030e3f446d8aa9b5b3c027b9e8405ba0019a782 Author: Michael Natterer -Date: Sun Feb 20 16:58:03 2011 +0100 +Date: Sun Feb 20 16:58:03 2011 +0100 app: make gimp_display_shell_flush_event_queue() private @@ -43338,7 +44197,7 @@ commit 2260b1556855d518fc9d96c6665f5d1fe9cf2361 Author: Mikael Magnusson -Date: Sun Feb 20 16:43:36 2011 +0100 +Date: Sun Feb 20 16:43:36 2011 +0100 plug-ins: lighting, use an expose handler and remove unneeded backbuf @@ -43350,7 +44209,7 @@ commit 9151899aabf917a2a65e6c40c0f1e56952c0e530 Author: Michael Natterer -Date: Sun Feb 20 16:33:46 2011 +0100 +Date: Sun Feb 20 16:33:46 2011 +0100 app: move variable to local scope in gimp_display_shell_canvas_tool_events() @@ -43360,7 +44219,7 @@ commit 36cc10c4dc093a0abdb548ffe11cef01eb2d4c9c Author: Michael Natterer -Date: Sun Feb 20 16:29:20 2011 +0100 +Date: Sun Feb 20 16:29:20 2011 +0100 app: rename gimp_display_shell_[un]transform_coordiante() to _coords() @@ -43373,7 +44232,7 @@ commit 4bf3a136e0ad5613a51a7aa2fac822a69416de60 Author: Michael Natterer -Date: Sun Feb 20 16:23:17 2011 +0100 +Date: Sun Feb 20 16:23:17 2011 +0100 app: factor out GimpDisplayShell tool event retrieval and untransforming @@ -43384,7 +44243,7 @@ commit 7bb58aedf99ea739ddc5698e933e184e84d55a1f Author: Michael Natterer -Date: Sun Feb 20 16:11:20 2011 +0100 +Date: Sun Feb 20 16:11:20 2011 +0100 app: make input GimpCoords const in gimpdisplayshell-transform.[ch] @@ -43394,7 +44253,7 @@ commit d3008824018d22941a784a868f968510e95a69b2 Author: Michael Natterer -Date: Sun Feb 20 15:38:16 2011 +0100 +Date: Sun Feb 20 15:38:16 2011 +0100 app: factor out GimpDisplayShell cursor updating to a utility function @@ -43404,26 +44263,26 @@ commit 87750d993e3d013af39639334919ea5e72cbec42 Author: Mikael Magnusson -Date: Sun Feb 20 15:23:22 2011 +0100 +Date: Sun Feb 20 15:23:22 2011 +0100 plug-ins: tabs to spaces in map-object - plug-ins/map-object/arcball.c | 68 +++--- - plug-ins/map-object/arcball.h | 8 +- + plug-ins/map-object/arcball.c | 68 +++--- + plug-ins/map-object/arcball.h | 8 +- plug-ins/map-object/map-object-apply.c | 74 +++--- plug-ins/map-object/map-object-image.c | 46 ++-- plug-ins/map-object/map-object-image.h | 36 +-- - plug-ins/map-object/map-object-main.c | 38 ++-- + plug-ins/map-object/map-object-main.c | 38 ++-- plug-ins/map-object/map-object-preview.c | 198 ++++++++-------- plug-ins/map-object/map-object-shade.c | 292 ++++++++++++------------ plug-ins/map-object/map-object-shade.h | 12 +- - plug-ins/map-object/map-object-ui.c | 378 + plug-ins/map-object/map-object-ui.c | 378 +++++++++++++++---------------- 10 files changed, 575 insertions(+), 575 deletions(-) commit 0f1da6677cc3653a2817461898f74ea2fe4620b1 Author: Mikael Magnusson -Date: Sun Feb 20 15:22:31 2011 +0100 +Date: Sun Feb 20 15:22:31 2011 +0100 plug-ins: pass the cairo_t from expose handler to drawing functions in map-object @@ -43435,7 +44294,7 @@ commit f7bb5f460ca725e36339b781526e1b48ccaabb28 Author: Michael Natterer -Date: Sun Feb 20 14:43:09 2011 +0100 +Date: Sun Feb 20 14:43:09 2011 +0100 app: rename the functions dealing with GimpDisplayShell's software cursor @@ -43445,14 +44304,14 @@ cursor. app/display/gimpdisplayshell-callbacks.c | 16 ++++++------- - app/display/gimpdisplayshell-cursor.c | 14 ++++++------ - app/display/gimpdisplayshell-cursor.h | 39 + app/display/gimpdisplayshell-cursor.c | 14 ++++++------ + app/display/gimpdisplayshell-cursor.h | 39 +++++++++++++++++++------------- 3 files changed, 38 insertions(+), 31 deletions(-) commit 72638e3a8f99473f72b18ecd050454adb1384aff Author: Xandru Armesto -Date: Sun Feb 20 14:16:40 2011 +0100 +Date: Sun Feb 20 14:16:40 2011 +0100 Updating Asturian translation @@ -43462,7 +44321,7 @@ commit fc1ae9e430e3c25bdfc40e0e659d147b51dfbc17 Author: Mikael Magnusson -Date: Sun Feb 20 13:49:58 2011 +0100 +Date: Sun Feb 20 13:49:58 2011 +0100 plug-ins: better name for new layers in map-object @@ -43473,18 +44332,18 @@ commit cf7902b1aba48400e4dbe99588f41658c6b75cb2 Author: Mikael Magnusson -Date: Sun Feb 20 13:02:50 2011 +0100 +Date: Sun Feb 20 13:02:50 2011 +0100 plug-ins: cleanup map-object a bit plug-ins/map-object/map-object-preview.c | 6 --- - plug-ins/map-object/map-object-ui.c | 71 + plug-ins/map-object/map-object-ui.c | 71 +++++++++++++++++--------------- 2 files changed, 37 insertions(+), 40 deletions(-) commit 8be41fa9b7607bff008cb3d2ed05b0472c297c4a Author: Mikael Magnusson -Date: Sun Feb 20 13:31:23 2011 +0100 +Date: Sun Feb 20 13:31:23 2011 +0100 plug-ins: fix directional light mode in map-object @@ -43493,21 +44352,21 @@ commit 5bd9de23b88dad65cdec1fa8d6698590875dd25a Author: Mikael Magnusson -Date: Sat Feb 19 19:49:34 2011 +0100 +Date: Sat Feb 19 19:49:34 2011 +0100 plug-ins: add back wireframe mode using cairo - plug-ins/map-object/map-object-main.c | 3 +- - plug-ins/map-object/map-object-main.h | 1 + + plug-ins/map-object/map-object-main.c | 3 +- + plug-ins/map-object/map-object-main.h | 1 + plug-ins/map-object/map-object-preview.c | 467 ++++++++++++++++++++++++++++++- plug-ins/map-object/map-object-preview.h | 7 + - plug-ins/map-object/map-object-ui.c | 32 ++- + plug-ins/map-object/map-object-ui.c | 32 ++- 5 files changed, 496 insertions(+), 14 deletions(-) commit 492ab89b4e8d169394ef2f27745db813390ccf6a Author: Mikael Magnusson -Date: Sun Feb 20 13:20:38 2011 +0100 +Date: Sun Feb 20 13:20:38 2011 +0100 plug-ins: use an undo group in map-object @@ -43516,7 +44375,7 @@ commit e2710c83715c39f0e1e67fed0e701cce018230f8 Author: Mikael Magnusson -Date: Sun Feb 20 13:00:13 2011 +0100 +Date: Sun Feb 20 13:00:13 2011 +0100 plug-ins: add "Create New Layer" option to map-object @@ -43524,14 +44383,14 @@ ++++++++++++++-------------------- plug-ins/map-object/map-object-image.c | 2 +- plug-ins/map-object/map-object-image.h | 2 +- - plug-ins/map-object/map-object-main.c | 9 ++++--- - plug-ins/map-object/map-object-main.h | 1 + - plug-ins/map-object/map-object-ui.c | 13 +++++++++ + plug-ins/map-object/map-object-main.c | 9 ++++--- + plug-ins/map-object/map-object-main.h | 1 + + plug-ins/map-object/map-object-ui.c | 13 +++++++++ 6 files changed, 41 insertions(+), 34 deletions(-) commit 0344cb4a425adcd9e7133e4ec2b54c09dd43a01d Author: Mikael Magnusson -Date: Sun Feb 20 09:11:31 2011 +0100 +Date: Sun Feb 20 09:11:31 2011 +0100 plug-ins: fix pdb input validation in map-object @@ -43540,7 +44399,7 @@ commit b338aa0e71b45d858aeb52d3528ed0c30ae88b1d Author: Michael Natterer -Date: Sun Feb 20 13:16:46 2011 +0100 +Date: Sun Feb 20 13:16:46 2011 +0100 app: forgot precondition checks in gimpdisplayshell-grab.c @@ -43549,7 +44408,7 @@ commit d504eeb048952347e101581481caaa476013f7c2 Author: Michael Natterer -Date: Sat Feb 19 14:46:23 2011 +0100 +Date: Sat Feb 19 14:46:23 2011 +0100 app: move GimpDisplayShell pointer/keyboard grabbing to utility functions @@ -43559,31 +44418,31 @@ assuming that grabbing always succeeds and running into an inconsistent state that can cause all sorts of problems. - app/display/Makefile.am | 2 + + app/display/Makefile.am | 2 + app/display/gimpdisplayshell-callbacks.c | 104 ++++++++++++++--------------- - app/display/gimpdisplayshell-grab.c | 109 + app/display/gimpdisplayshell-grab.c | 109 +++++++++++++++++++++++++++++++ - app/display/gimpdisplayshell-grab.h | 36 ++++++++++ - app/display/gimpdisplayshell.h | 3 + + app/display/gimpdisplayshell-grab.h | 36 ++++++++++ + app/display/gimpdisplayshell.h | 3 + 5 files changed, 203 insertions(+), 51 deletions(-) commit a6b77aafb2c863ae86d64443a8ffcc86e2461bf2 Author: Khaled Hosny -Date: Sat Feb 19 18:18:43 2011 +0200 +Date: Sat Feb 19 18:18:43 2011 +0200 Updated Arabic translation po-libgimp/ar.po | 462 +++++------ po-plug-ins/ar.po | 2151 +++++++++++++++++++++++++++------------------------- - po-python/ar.po | 48 +- + po-python/ar.po | 48 +- po-script-fu/ar.po | 611 +++++++++------ 4 files changed, 1733 insertions(+), 1539 deletions(-) commit 85474bff18f99f6bbcf02d5955884d591eff26a1 Author: Mikael Magnusson -Date: Sun Feb 13 17:49:27 2011 +0100 +Date: Sun Feb 13 17:49:27 2011 +0100 plug-ins: remove backbuffer from map-object @@ -43593,7 +44452,7 @@ commit e7cebf8943e903fdc62804ff47c59fe7a02157c8 Author: Francisco Vila -Date: Thu Feb 17 20:53:44 2011 +0100 +Date: Thu Feb 17 20:53:44 2011 +0100 Updated Spanish translation @@ -43602,7 +44461,7 @@ commit 3237c072dd2ade96c87f5d1732d7313b684da1cc Author: Francisco Vila -Date: Thu Feb 17 20:51:58 2011 +0100 +Date: Thu Feb 17 20:51:58 2011 +0100 Updated Spanish translation @@ -43612,20 +44471,20 @@ commit 8333dfde7b1fa3150bf49e938c1f11c987b911d3 Author: Michael Natterer -Date: Wed Feb 16 22:51:02 2011 +0100 +Date: Wed Feb 16 22:51:02 2011 +0100 Add some #if GTK_CHECK_VERSION (2, 24, 0) for creating foreign window so we don't use deprecated API and make the gtk3 port simpler. app/widgets/gimpwidgets-utils.c | 31 +++++++++++++++++++++++--- - libgimp/gimpui.c | 49 + libgimp/gimpui.c | 49 ++++++++++++++++++++++++++++++++--------- 2 files changed, 67 insertions(+), 13 deletions(-) commit 2827819f855e7489070583962aedab3f2e232627 Author: Michael Natterer -Date: Wed Feb 16 22:01:54 2011 +0100 +Date: Wed Feb 16 22:01:54 2011 +0100 plug-ins: remove light marker clearing apparatur from map-object @@ -43638,7 +44497,7 @@ commit d3efd7773276460133abc6044e1fd96b882c182f Author: Francisco Vila -Date: Tue Feb 15 21:37:33 2011 +0100 +Date: Tue Feb 15 21:37:33 2011 +0100 Updated Spanish translation @@ -43647,7 +44506,7 @@ commit 4ec309d5625b1784f82f140e30553fb239ca0fd8 Author: Michael Natterer -Date: Tue Feb 15 21:28:13 2011 +0100 +Date: Tue Feb 15 21:28:13 2011 +0100 pygimp: use the new properties instead of hacking around @@ -43656,7 +44515,7 @@ commit 5dcb50ed7dd1ff55f992c67f62d2343f3a3c18e0 Author: Michael Natterer -Date: Tue Feb 15 21:26:11 2011 +0100 +Date: Tue Feb 15 21:26:11 2011 +0100 libgimpwidgets: add properties GimpEnumLabel:enum-type and :enum-value @@ -43666,7 +44525,7 @@ commit 0d22fee22010ea135e1ded48c263a4702848aa6d Author: Michael Natterer -Date: Tue Feb 15 20:55:57 2011 +0100 +Date: Tue Feb 15 20:55:57 2011 +0100 pygimp: use the new width/height properties instead of poking into the button @@ -43676,19 +44535,19 @@ commit 31b4d3801e756cf0c4571aa7a4d73c0674f482b3 Author: Michael Natterer -Date: Tue Feb 15 20:54:52 2011 +0100 +Date: Tue Feb 15 20:54:52 2011 +0100 libgimpwidgets: add properties GimpColorButton:area-width and :area-height - app/widgets/gimpcolorpanel.c | 22 ++++++------- + app/widgets/gimpcolorpanel.c | 22 ++++++------- libgimpwidgets/gimpcolorbutton.c | 67 ++++++++++++++++++++++++++++++++-------- 2 files changed, 64 insertions(+), 25 deletions(-) commit 7907a496a5a7e87d855354c04b3e8368a3a14e1d Author: Michael Natterer -Date: Tue Feb 15 18:52:33 2011 +0100 +Date: Tue Feb 15 18:52:33 2011 +0100 pygimp: use the new "channel" property instead of poking into the scale @@ -43698,7 +44557,7 @@ commit e44d3b46ef38de20454afd839e60eeef8f73b44a Author: Michael Natterer -Date: Tue Feb 15 18:52:00 2011 +0100 +Date: Tue Feb 15 18:52:00 2011 +0100 libgimpwidgets: make GimpColorScale:channel a property @@ -43708,7 +44567,7 @@ commit c3ff71df8bd4fc260b06f9a89a106947736b2844 Author: Michael Natterer -Date: Tue Feb 15 18:48:38 2011 +0100 +Date: Tue Feb 15 18:48:38 2011 +0100 app: connect the blob editor's and the ink option's properties explicitly @@ -43722,7 +44581,7 @@ commit b7313a07bb58a28c5bb86e2dc1090ce24bae0a62 Author: Francisco Vila -Date: Mon Feb 14 23:28:49 2011 +0100 +Date: Mon Feb 14 23:28:49 2011 +0100 Updated Spanish translation @@ -43732,7 +44591,7 @@ commit 48ec15890e1751dede061f6d1f469b6508c13439 Author: Simon Budig -Date: Mon Feb 14 21:46:31 2011 +0100 +Date: Mon Feb 14 21:46:31 2011 +0100 file-psp: fix for bogus input data. Fixes bug #639203 @@ -43741,18 +44600,18 @@ commit 7fb0300e1cfdb98a3bde54dbc73a0f3eda375162 Author: Simon Budig -Date: Tue Jan 11 23:28:16 2011 +0100 +Date: Tue Jan 11 23:28:16 2011 +0100 fixes for some buffer overflow problems (see bug #639203) plug-ins/common/sphere-designer.c | 5 ++++- - plug-ins/gfig/gfig-style.c | 8 +++++++- + plug-ins/gfig/gfig-style.c | 8 +++++++- plug-ins/lighting/lighting-ui.c | 27 +++++++++++++++++++++++---- 3 files changed, 34 insertions(+), 6 deletions(-) commit 8136bdb9146c1e989b67512ad9cdcc9cf1f78074 Author: Alexia Death -Date: Mon Feb 14 21:16:48 2011 +0200 +Date: Mon Feb 14 21:16:48 2011 +0200 app: fix an error in aspect ratio dynamics @@ -43761,18 +44620,18 @@ commit 95f14f5de86cf07ae14ba27807b71e9841a14978 Author: Michael Natterer -Date: Mon Feb 14 20:01:08 2011 +0100 +Date: Mon Feb 14 20:01:08 2011 +0100 app: add an "edit-name" binding signal and default to F2 app/widgets/gimpcontainertreeview.c | 70 +++++++++++++++++++++++++++++++++++++ - app/widgets/gimpcontainertreeview.h | 6 ++++ + app/widgets/gimpcontainertreeview.h | 6 ++++ 2 files changed, 76 insertions(+) commit 2d419a0cb1e4135caddf7f2a1795947db39bcda5 Author: Saul Goode -Date: Tue Jan 25 22:26:36 2011 -0500 +Date: Tue Jan 25 22:26:36 2011 -0500 Bug 640612 - Sample Colorize does not function non-interactively @@ -43783,18 +44642,18 @@ commit 44c4ec2fc8b266210ae0ea454723a9f3a4d309d4 Author: Michael Natterer -Date: Mon Feb 14 14:15:34 2011 +0100 +Date: Mon Feb 14 14:15:34 2011 +0100 devel-docs: update libgimp docs with the new functions - devel-docs/libgimp/libgimp-docs.sgml | 2 + + devel-docs/libgimp/libgimp-docs.sgml | 2 + devel-docs/libgimp/libgimp-sections.txt | 70 +++++++++++++++++++++++++++++++-- 2 files changed, 68 insertions(+), 4 deletions(-) commit 543b97bfb30b1b5290e2a0e1073de7705f205dab Author: Michael Natterer -Date: Mon Feb 14 10:38:32 2011 +0100 +Date: Mon Feb 14 10:38:32 2011 +0100 Bug 641761 - "Smooth Stroke" option in Blend tool @@ -43805,7 +44664,7 @@ commit b8a60d22159c66c15ae63f0e6817d76d1333c0e3 Author: Michael Natterer -Date: Mon Feb 14 09:55:24 2011 +0100 +Date: Mon Feb 14 09:55:24 2011 +0100 Bug 640219 - gimp(1) manpage fixes @@ -43817,7 +44676,7 @@ commit 02477f556333fcccd5ff3afd18f977ea8155d6a1 Author: Michael Natterer -Date: Mon Feb 14 09:45:59 2011 +0100 +Date: Mon Feb 14 09:45:59 2011 +0100 Bug 625167 - Problem exporting floating selections from within layer groups @@ -43831,20 +44690,20 @@ layers dialog and pass it down to the core, but default to TRUE here so. - app/actions/image-commands.c | 18 +++++++++------- - app/core/gimpimage-merge.c | 37 + app/actions/image-commands.c | 18 +++++++++------- + app/core/gimpimage-merge.c | 37 ++++++++++++++++++++------------- - app/core/gimpimage-merge.h | 1 + + app/core/gimpimage-merge.h | 1 + app/dialogs/image-merge-layers-dialog.c | 23 +++++++++++++++++--- app/dialogs/image-merge-layers-dialog.h | 2 ++ - app/file/file-open.c | 3 ++- - app/pdb/image-cmds.c | 3 ++- - tools/pdbgen/pdb/image.pdb | 3 ++- + app/file/file-open.c | 3 ++- + app/pdb/image-cmds.c | 3 ++- + tools/pdbgen/pdb/image.pdb | 3 ++- 8 files changed, 62 insertions(+), 28 deletions(-) commit 4807a1848a39c4514e9545b37914d3463ec8fb9b Author: Michael Natterer -Date: Mon Feb 14 01:45:16 2011 +0100 +Date: Mon Feb 14 01:45:16 2011 +0100 app: don't make flatten and merge insensitive if there is a floating selection @@ -43854,7 +44713,7 @@ commit d9dd65529ff52dd04262985c8681de004cdf0b01 Author: Michael Natterer -Date: Mon Feb 14 01:43:55 2011 +0100 +Date: Mon Feb 14 01:43:55 2011 +0100 app: include floating selection removal in the layer merge undo group @@ -43867,7 +44726,7 @@ commit 9f89bda3b113a8d5020aceda1562c4eff08eb78b Author: Michael Natterer -Date: Mon Feb 14 01:25:45 2011 +0100 +Date: Mon Feb 14 01:25:45 2011 +0100 app: when removing groups, check if the active item was in the group @@ -43878,13 +44737,13 @@ commit 14536326789b9615378a086a9768227af4bf5f09 Author: Michael Natterer -Date: Sun Feb 13 22:48:00 2011 +0100 +Date: Sun Feb 13 22:48:00 2011 +0100 app: add GimpTileBackendTileManager which does nothing so far but will help GEGL migration a lot. - app/gegl/Makefile.am | 2 + + app/gegl/Makefile.am | 2 + app/gegl/gimptilebackendtilemanager.c | 431 ++++++++++++++++++++++++++++++++++ app/gegl/gimptilebackendtilemanager.h | 58 +++++ @@ -43892,7 +44751,7 @@ commit 063e9e54eebca27293cd0dbd84bc32d47f651b26 Author: Michael Natterer -Date: Sun Feb 13 21:58:51 2011 +0100 +Date: Sun Feb 13 21:58:51 2011 +0100 Require GEGL 0.1.6 @@ -43902,7 +44761,7 @@ commit 6256856a284350ee2aa7a85cb5de702979692ac1 Author: Khaled Hosny -Date: Sun Feb 13 22:51:55 2011 +0200 +Date: Sun Feb 13 22:51:55 2011 +0200 Updated Arabic translation @@ -43912,17 +44771,17 @@ commit cb615737d33030c0634b08d8dbad8379f6024347 Author: Michael Natterer -Date: Sun Feb 13 21:33:26 2011 +0100 +Date: Sun Feb 13 21:33:26 2011 +0100 app: save-before-committing! - app/pdb/text-layer-cmds.c | 7 ++++--- + app/pdb/text-layer-cmds.c | 7 ++++--- tools/pdbgen/pdb/text_layer.pdb | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) commit 40be8ad0894f256721600265353eac47f0ef4c34 Author: Michael Natterer -Date: Sun Feb 13 21:27:34 2011 +0100 +Date: Sun Feb 13 21:27:34 2011 +0100 Bug 581338 - Layer size does not change using the pdb 'gimp-text-layer-resize' @@ -43931,13 +44790,13 @@ the text layer's unit when setting the text box' width and height. Spotted by Massimo. - app/pdb/text-layer-cmds.c | 14 ++++++++++++-- + app/pdb/text-layer-cmds.c | 14 ++++++++++++-- tools/pdbgen/pdb/text_layer.pdb | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) commit 29716bccecd9bab9d33936a38f481d80d07483f9 Author: Kevin Cozens -Date: Sun Feb 13 14:02:46 2011 -0500 +Date: Sun Feb 13 14:02:46 2011 -0500 Changed deprecation message to state name of replacement procedure @@ -43946,7 +44805,7 @@ commit a604a12eb56854a592c4b238fc6b973a86a2a230 Author: Michael Natterer -Date: Sun Feb 13 18:31:14 2011 +0100 +Date: Sun Feb 13 18:31:14 2011 +0100 libgimp: fix the docs of gimp_vectors_to_selection() @@ -43957,7 +44816,7 @@ commit 92b6d704483417e77f58f31dc59bccb22f69de8e Author: Michael Natterer -Date: Sun Feb 13 18:29:08 2011 +0100 +Date: Sun Feb 13 18:29:08 2011 +0100 libgimp: remove the layer/channel/vectors raise/lower/position procedures @@ -43965,19 +44824,19 @@ and add them to the list of compat_procs instead. app/pdb/gimp-pdb-compat.c | 195 +-- - app/pdb/image-cmds.c | 3283 + app/pdb/image-cmds.c | 3283 +++++++++++++++++--------------------------- - app/pdb/internal-procs.c | 2 +- - libgimp/gimpimage.c | 222 +++ - libgimp/gimpimage.h | 64 +- + app/pdb/internal-procs.c | 2 +- + libgimp/gimpimage.c | 222 +++ + libgimp/gimpimage.h | 64 +- libgimp/gimpimage_pdb.c | 407 ------ - libgimp/gimpimage_pdb.h | 28 - + libgimp/gimpimage_pdb.h | 28 - tools/pdbgen/pdb/image.pdb | 327 +---- 8 files changed, 1628 insertions(+), 2900 deletions(-) commit 6818dae23e0c069f59d693dbf5e268086d1163e4 Author: Michael Natterer -Date: Sun Feb 13 17:39:44 2011 +0100 +Date: Sun Feb 13 17:39:44 2011 +0100 libgimp: remove the drawable and vectors parasite PDB functions completely @@ -43994,14 +44853,14 @@ libgimp/gimpdrawable.h | 57 ++--- libgimp/gimpparasite_pdb.c | 279 ------------------------ libgimp/gimpparasite_pdb.h | 48 ++--- - libgimp/gimpvectors.c | 74 +++++++ - libgimp/gimpvectors.h | 37 ++-- + libgimp/gimpvectors.c | 74 +++++++ + libgimp/gimpvectors.h | 37 ++-- tools/pdbgen/pdb/parasite.pdb | 195 +---------------- 10 files changed, 221 insertions(+), 1035 deletions(-) commit b4c9987de66645b3764f813dea2fd3a49360cdbe Author: Michael Natterer -Date: Sun Feb 13 17:28:30 2011 +0100 +Date: Sun Feb 13 17:28:30 2011 +0100 libgimp: move the item parasite functions to the parasites files @@ -44010,27 +44869,27 @@ are not GimpItemParasites, they are GimpParasites attached to GimpItems, just as layers are attached to images). - app/pdb/item-cmds.c | 244 +++++++++++++++++++++++++++++++ - app/pdb/parasite-cmds.c | 291 + app/pdb/item-cmds.c | 244 +++++++++++++++++++++++++++++++ + app/pdb/parasite-cmds.c | 291 +++---------------------------------- - libgimp/gimp.def | 8 +- - libgimp/gimpdrawable.c | 2 +- - libgimp/gimpitem_pdb.c | 152 +++++++++++++++++++ - libgimp/gimpitem_pdb.h | 67 +++++---- - libgimp/gimpparasite_pdb.c | 168 +-------------------- - libgimp/gimpparasite_pdb.h | 9 -- - plug-ins/gfig/gfig-dialog.c | 2 +- - plug-ins/gfig/gfig.c | 4 +- - plug-ins/ifs-compose/ifs-compose.c | 4 +- - plug-ins/pygimp/pygimp-drawable.c | 8 +- - plug-ins/pygimp/pygimp-vectors.c | 8 +- - tools/pdbgen/pdb/item.pdb | 114 ++++++++++++++- - tools/pdbgen/pdb/parasite.pdb | 128 +--------------- + libgimp/gimp.def | 8 +- + libgimp/gimpdrawable.c | 2 +- + libgimp/gimpitem_pdb.c | 152 +++++++++++++++++++ + libgimp/gimpitem_pdb.h | 67 +++++---- + libgimp/gimpparasite_pdb.c | 168 +-------------------- + libgimp/gimpparasite_pdb.h | 9 -- + plug-ins/gfig/gfig-dialog.c | 2 +- + plug-ins/gfig/gfig.c | 4 +- + plug-ins/ifs-compose/ifs-compose.c | 4 +- + plug-ins/pygimp/pygimp-drawable.c | 8 +- + plug-ins/pygimp/pygimp-vectors.c | 8 +- + tools/pdbgen/pdb/item.pdb | 114 ++++++++++++++- + tools/pdbgen/pdb/parasite.pdb | 128 +--------------- 15 files changed, 605 insertions(+), 604 deletions(-) commit aa667f790ec2028802bc7faec09d0ec34ac8f6bc Author: Michael Natterer -Date: Sun Feb 13 17:11:20 2011 +0100 +Date: Sun Feb 13 17:11:20 2011 +0100 app: rename gimp_image_select_fuzzy() to gimp_image_select_contiguous_color() @@ -44038,23 +44897,23 @@ and update all documentation accordingly. Also reorder the gimp_image_select procedures. - app/pdb/context-cmds.c | 12 +- - app/pdb/image-select-cmds.c | 378 + app/pdb/context-cmds.c | 12 +- + app/pdb/image-select-cmds.c | 378 +++++++++++++++++------------------ app/pdb/selection-tools-cmds.c | 12 +- - libgimp/gimp.def | 2 +- - libgimp/gimpcontext_pdb.c | 21 +- - libgimp/gimpimageselect_pdb.c | 229 ++++++++++----------- - libgimp/gimpimageselect_pdb.h | 72 +++---- + libgimp/gimp.def | 2 +- + libgimp/gimpcontext_pdb.c | 21 +- + libgimp/gimpimageselect_pdb.c | 229 ++++++++++----------- + libgimp/gimpimageselect_pdb.h | 72 +++---- libgimp/gimpselectiontools_pdb.c | 4 +- - tools/pdbgen/pdb/context.pdb | 18 +- + tools/pdbgen/pdb/context.pdb | 18 +- tools/pdbgen/pdb/image_select.pdb | 240 +++++++++++----------- tools/pdbgen/pdb/selection_tools.pdb | 4 +- 11 files changed, 497 insertions(+), 495 deletions(-) commit d650117dfb151f080233d10071f6c1583540a4bd Author: Ulf-D. Ehlert -Date: Sat Oct 9 20:13:53 2010 +0200 +Date: Sat Oct 9 20:13:53 2010 +0200 Bug 625571 - Request context tags for reasonable translation on some plug-ins @@ -44064,13 +44923,13 @@ 1dfa7b5e (2010-07-29). plug-ins/color-rotate/color-rotate-dialog.c | 4 ++-- - plug-ins/common/mail.c | 4 ++-- - plug-ins/file-fli/fli-gimp.c | 8 ++++---- + plug-ins/common/mail.c | 4 ++-- + plug-ins/file-fli/fli-gimp.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) commit 20279459ddb005f2243768346df7e0269c8d016a Author: Eric Grivel -Date: Thu Jan 27 12:57:50 2011 -0500 +Date: Thu Jan 27 12:57:50 2011 -0500 Bug 634183 - GIMP crashes when editing very high images @@ -44081,30 +44940,30 @@ commit 491e55c4e426c0ae6fe6a3f0c96dc4df8cb41cc9 Author: Michael Natterer -Date: Sun Feb 13 14:16:32 2011 +0100 +Date: Sun Feb 13 14:16:32 2011 +0100 plug-ins: move the expose handler to map-pbject-preview.c plug-ins/map-object/map-object-preview.c | 9 ++++++--- plug-ins/map-object/map-object-preview.h | 13 +++++++------ - plug-ins/map-object/map-object-ui.c | 8 ++++---- + plug-ins/map-object/map-object-ui.c | 8 ++++---- 3 files changed, 17 insertions(+), 13 deletions(-) commit 9912e3f4eeede5182c2c5edadbf8fce75c1bf2f5 Author: Michael Natterer -Date: Sun Feb 13 14:12:08 2011 +0100 +Date: Sun Feb 13 14:12:08 2011 +0100 plug-ins: separate preview computation from drawing in map-object plug-ins/map-object/map-object-preview.c | 60 +++++++++++++++++++------------- plug-ins/map-object/map-object-preview.h | 9 ++--- - plug-ins/map-object/map-object-ui.c | 32 ++++++++++++----- + plug-ins/map-object/map-object-ui.c | 32 ++++++++++++----- 3 files changed, 60 insertions(+), 41 deletions(-) commit 5173b8559c79afebaa732f5c3629dd723ed3492d Author: Mikael Magnusson -Date: Sun Feb 13 08:43:05 2011 +0100 +Date: Sun Feb 13 08:43:05 2011 +0100 lighting: remove useless function call @@ -44113,34 +44972,34 @@ commit e68df278538e1692a2844122889bf85c45595983 Author: Mikael Magnusson -Date: Sun Feb 13 08:59:02 2011 +0100 +Date: Sun Feb 13 08:59:02 2011 +0100 map-object: put the y value in the y spinner plug-ins/map-object/map-object-preview.c | 2 +- - plug-ins/map-object/map-object-ui.c | 2 +- + plug-ins/map-object/map-object-ui.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 49fc3a125e30b9ff630d958707f3dc088691d398 Author: Mikael Magnusson -Date: Sun Feb 13 10:00:48 2011 +0100 +Date: Sun Feb 13 10:00:48 2011 +0100 lighting: port to cairo, replace wireframe with live preview plug-ins/map-object/map-object-image.c | 13 +- plug-ins/map-object/map-object-image.h | 4 +- - plug-ins/map-object/map-object-main.c | 2 +- - plug-ins/map-object/map-object-main.h | 2 +- + plug-ins/map-object/map-object-main.c | 2 +- + plug-ins/map-object/map-object-main.h | 2 +- plug-ins/map-object/map-object-preview.c | 823 ++++--------------------------- plug-ins/map-object/map-object-preview.h | 23 - - plug-ins/map-object/map-object-ui.c | 139 ++---- - plug-ins/map-object/map-object-ui.h | 1 - + plug-ins/map-object/map-object-ui.c | 139 ++---- + plug-ins/map-object/map-object-ui.h | 1 - 8 files changed, 155 insertions(+), 852 deletions(-) commit 221f6d0085e036f674b902449969146f4ff9c036 Author: Martin Nordholts -Date: Sun Feb 13 10:32:31 2011 +0100 +Date: Sun Feb 13 10:32:31 2011 +0100 plug-ins: file-uri/uri.c initialize backends non-interactvely @@ -44154,7 +45013,7 @@ commit f54e5388fbced20f06e697d62206b07e2fb83639 Author: Martin Nordholts -Date: Sat Feb 12 22:37:46 2011 +0100 +Date: Sat Feb 12 22:37:46 2011 +0100 configure.ac: Add --without-xvfb-run @@ -44163,7 +45022,7 @@ commit 8e49a5fafb899dbc2e37380bd922b202ee8e4b8c Author: Mikael Magnusson -Date: Sat Feb 12 18:16:05 2011 +0100 +Date: Sat Feb 12 18:16:05 2011 +0100 app: fix a typo @@ -44172,7 +45031,7 @@ commit 014cc2140e7074d09684e36aa16241932960fc17 Author: Michael Natterer -Date: Sat Feb 12 15:20:46 2011 +0100 +Date: Sat Feb 12 15:20:46 2011 +0100 libgimp: document which context setting affects what prodecures @@ -44184,11 +45043,11 @@ commit b33076bea51ce0503f33c2723259b7e1fa082e10 Author: Michael Natterer -Date: Fri Feb 11 21:15:31 2011 +0100 +Date: Fri Feb 11 21:15:31 2011 +0100 libgimp: document which context settings affect the new transform API - app/pdb/item-transform-cmds.c | 18 +++++++------- + app/pdb/item-transform-cmds.c | 18 +++++++------- libgimp/gimpitemtransform_pdb.c | 49 ++++++++++++++++++++++++++++++------- tools/pdbgen/pdb/item_transform.pdb | 34 +++++++++++++++++++++++++ @@ -44196,7 +45055,7 @@ commit ec196a8ac4d930d10326cdbffebaa987dd14bc04 Author: Michael Natterer -Date: Thu Feb 10 20:05:50 2011 +0100 +Date: Thu Feb 10 20:05:50 2011 +0100 app: allow to set a color for GimpCurveView's primary curve @@ -44204,17 +45063,17 @@ without code duplication. Also change the color of the yellow curve in the dynamics output editor to orange because yellow is hardly visible. - app/tools/gimpcurvestool.c | 66 + app/tools/gimpcurvestool.c | 66 ++++++++++++++-------------------- - app/widgets/gimpcurveview.c | 19 ++++++++-- - app/widgets/gimpcurveview.h | 4 ++- - app/widgets/gimpdeviceinfoeditor.c | 2 +- + app/widgets/gimpcurveview.c | 19 ++++++++-- + app/widgets/gimpcurveview.h | 4 ++- + app/widgets/gimpdeviceinfoeditor.c | 2 +- app/widgets/gimpdynamicsoutputeditor.c | 6 ++-- 5 files changed, 49 insertions(+), 48 deletions(-) commit b5a706b3c367d79eebba018890fa59453d68c887 Author: Martin Nordholts -Date: Wed Feb 9 23:48:32 2011 +0100 +Date: Wed Feb 9 23:48:32 2011 +0100 build: Update buildbot/suppressed-warnings.txt, warning was fixed @@ -44223,7 +45082,7 @@ commit 8bf46b3efbf72d70b25e72460cc117e39ff97b50 Author: Martin Nordholts -Date: Wed Feb 9 23:48:18 2011 +0100 +Date: Wed Feb 9 23:48:18 2011 +0100 app/tests: Cleanup temp files after tests @@ -44232,12 +45091,12 @@ "can't overwrite file" errors. app/tests/test-save-and-export.c | 5 +++++ - app/tests/test-xcf.c | 6 +++++- + app/tests/test-xcf.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) commit 3ba055462856eed64bf55fa6c5f49591af965cb8 Author: Michael Natterer -Date: Wed Feb 9 09:26:06 2011 +0100 +Date: Wed Feb 9 09:26:06 2011 +0100 app: use proper vivid colors for the background curves @@ -44250,7 +45109,7 @@ commit 6c7e24c9b3b2b6c03deab489b72bbc939e59952c Author: Michael Natterer -Date: Wed Feb 9 09:25:34 2011 +0100 +Date: Wed Feb 9 09:25:34 2011 +0100 libgimpwidgets: don't draw a focus line to indicate "selected" @@ -44261,7 +45120,7 @@ commit d2d6edc687bd56ac2cf1e56e9d827b35369236e1 Author: Kevin Cozens -Date: Wed Feb 9 01:36:24 2011 -0500 +Date: Wed Feb 9 01:36:24 2011 -0500 Eliminated compiler warning (from SVN version 71 of the TinyScheme project) @@ -44271,7 +45130,7 @@ commit aaee95d5457e99fb7cc330aff331763af99a3225 Author: Michael Natterer -Date: Wed Feb 9 01:07:48 2011 +0100 +Date: Wed Feb 9 01:07:48 2011 +0100 app: experimentally color the background curves @@ -44281,7 +45140,7 @@ commit 6c252921afac1045785064db8e3b6349e6f06772 Author: Michael Natterer -Date: Wed Feb 9 00:27:25 2011 +0100 +Date: Wed Feb 9 00:27:25 2011 +0100 app: handle the inputs generically in GimpDynamicsOutputEditor @@ -44293,7 +45152,7 @@ commit 5a28791cfb700802800e9c590e6849dfd7a071f2 Author: Michael Natterer -Date: Wed Feb 9 00:24:43 2011 +0100 +Date: Wed Feb 9 00:24:43 2011 +0100 app: connect to the background curves' "dirty" signal in GimpCurveView @@ -44305,7 +45164,7 @@ commit 2ed861fb8da169331ae3b2523e75060454fcf34f Author: Michael Natterer -Date: Tue Feb 8 22:09:52 2011 +0100 +Date: Tue Feb 8 22:09:52 2011 +0100 Bug 638795 - Brush Dynamics Curve editor stutters @@ -44321,7 +45180,7 @@ commit 9e3aa5c1d248d13199d3a10107fec574f5c9553e Author: Alexia Death -Date: Tue Feb 8 22:10:34 2011 +0200 +Date: Tue Feb 8 22:10:34 2011 +0200 app: Clean up event eval @@ -44331,7 +45190,7 @@ commit f0f47e8d4747872966a09dc96296a86d5d4cf336 Author: Alexia Death -Date: Tue Feb 8 21:20:49 2011 +0200 +Date: Tue Feb 8 21:20:49 2011 +0200 app: Remove a bit of code from event eval @@ -44340,22 +45199,22 @@ commit b7def692fc3fa4f4bb40058f21ffd5371d877d83 Author: Hleb Valoshka <375gnu@gmail.com> -Date: Tue Feb 8 11:34:08 2011 +0200 +Date: Tue Feb 8 11:34:08 2011 +0200 Updated Belarusian translation po-libgimp/be.po | 459 ++--- po-plug-ins/be.po | 2495 +++++++++++++------------- - po-python/be.po | 53 +- + po-python/be.po | 53 +- po-script-fu/be.po | 602 ++++--- - po-tags/be.po | 28 + - po/be.po | 4958 + po-tags/be.po | 28 + + po/be.po | 4958 +++++++++++++++++++++++----------------------------- 6 files changed, 4120 insertions(+), 4475 deletions(-) commit e3b5c55ca2a832ad42c7f8744c607f48376166c9 Author: Michael Natterer -Date: Tue Feb 8 09:35:38 2011 +0100 +Date: Tue Feb 8 09:35:38 2011 +0100 Bug 597117 - impossible to drop a group as a sibling inside a group @@ -44366,24 +45225,24 @@ app/widgets/gimpcontainertreeview-dnd.c | 30 ++++++++++++++++++++++++------ - app/widgets/gimpdrawabletreeview.c | 5 +---- - app/widgets/gimpitemtreeview.c | 6 +++++- + app/widgets/gimpdrawabletreeview.c | 5 +---- + app/widgets/gimpitemtreeview.c | 6 +++++- 3 files changed, 30 insertions(+), 11 deletions(-) commit 21dbff186f899fe699df6b461f697e4d11ee5968 Author: Michael Natterer -Date: Tue Feb 8 09:05:00 2011 +0100 +Date: Tue Feb 8 09:05:00 2011 +0100 devel-docs: some updates - devel-docs/app/app-docs.sgml | 28 +++ + devel-docs/app/app-docs.sgml | 28 +++ devel-docs/app/app-sections.txt | 442 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 440 insertions(+), 30 deletions(-) commit 5f16d2ccc34bc67f88747a98618e198960188048 Author: Martin Nordholts -Date: Tue Feb 8 08:15:18 2011 +0100 +Date: Tue Feb 8 08:15:18 2011 +0100 build: Update buildbot/suppressed-warnings.txt for scheme.c @@ -44392,7 +45251,7 @@ commit fac7d4dd64602b051cadb0ab0de001a5c23025ff Author: Kevin Cozens -Date: Mon Feb 7 15:29:31 2011 -0500 +Date: Mon Feb 7 15:29:31 2011 -0500 Pulled in final changes from 1.40 release of the separate TinyScheme project. @@ -44403,7 +45262,7 @@ project. plug-ins/script-fu/scripts/script-fu.init | 229 +++++++------- - plug-ins/script-fu/tinyscheme/CHANGES | 502 + plug-ins/script-fu/tinyscheme/CHANGES | 502 ++++++++++++++++++------------ plug-ins/script-fu/tinyscheme/Manual.txt | 51 +-- plug-ins/script-fu/tinyscheme/init.scm | 113 ++++--- @@ -44412,19 +45271,19 @@ commit 526c42dc3565ce1c0a7bc6914e614fa6ac6ea01d Author: Kevin Cozens -Date: Mon Feb 7 03:30:13 2011 -0500 +Date: Mon Feb 7 03:30:13 2011 -0500 Optionally report error line (from SVN r63 of official TinyScheme) plug-ins/script-fu/tinyscheme/scheme-private.h | 4 + - plug-ins/script-fu/tinyscheme/scheme.c | 112 + plug-ins/script-fu/tinyscheme/scheme.c | 112 ++++++++++++++++++++++--- - plug-ins/script-fu/tinyscheme/scheme.h | 5 ++ + plug-ins/script-fu/tinyscheme/scheme.h | 5 ++ 3 files changed, 111 insertions(+), 10 deletions(-) commit 7597d99c8d813427d09f7c9cdbb1bafaf4e0dbab Author: Kevin Cozens -Date: Mon Feb 7 02:19:20 2011 -0500 +Date: Mon Feb 7 02:19:20 2011 -0500 Added unwind-protect (from SVN r57 of official version of TinyScheme). @@ -44434,7 +45293,7 @@ commit 3873aa5cac960061f905ffd6bed44b5a3c995166 Author: Michael Natterer -Date: Mon Feb 7 19:38:23 2011 +0100 +Date: Mon Feb 7 19:38:23 2011 +0100 app: gimp_data_duplicate() reset name, filename, writable and deletable @@ -44448,7 +45307,7 @@ commit 99cce88e49940241867d2e67b2c47b2a74924fa0 Author: Michael Natterer -Date: Mon Feb 7 14:08:11 2011 +0100 +Date: Mon Feb 7 14:08:11 2011 +0100 devel-docs: reorder libs so the app docs build again @@ -44457,7 +45316,7 @@ commit 708555a378d95589263816a499759fbd99d1ba68 Author: Michael Natterer -Date: Mon Feb 7 11:35:58 2011 +0100 +Date: Mon Feb 7 11:35:58 2011 +0100 app: keep a reference to channels and vectors around removing them @@ -44470,22 +45329,22 @@ commit 18b9ba1c877be5e259a2ed92c22f3f4a069b4741 Author: Barak Itkin -Date: Mon Feb 7 03:26:37 2011 +0200 +Date: Mon Feb 7 03:26:37 2011 +0200 app: Add some comment documentation to code - app/core/gimp-units.c | 4 ++++ + app/core/gimp-units.c | 4 ++++ app/core/gimp-user-install.c | 4 ++++ app/core/gimpimagemap.c | 16 ++++++++++++++++ app/core/gimppickable.c | 6 ++++++ app/core/gimptemplate.c | 3 +++ - app/core/gimpunit.c | 4 ++++ + app/core/gimpunit.c | 4 ++++ app/tools/gimpimagemaptool.c | 7 +++++++ 7 files changed, 44 insertions(+) commit a12af14a596fc67d27b4a263ed7e4d7676a698e0 Author: Michael Natterer -Date: Mon Feb 7 00:52:34 2011 +0100 +Date: Mon Feb 7 00:52:34 2011 +0100 app: don't forget to free the layer's new name @@ -44494,7 +45353,7 @@ commit 0d2de3e7c159d71637caa653df0db7d499ba167f Author: Michael Natterer -Date: Mon Feb 7 00:50:54 2011 +0100 +Date: Mon Feb 7 00:50:54 2011 +0100 app: don't gimp_object_set_name() on the image's layer after opening @@ -44506,7 +45365,7 @@ commit ef28d7fee66b0b5d66c175c45bf17980ff4ba757 Author: Michael Natterer -Date: Sun Feb 6 23:56:24 2011 +0100 +Date: Sun Feb 6 23:56:24 2011 +0100 app: don't gimp_object_set_name() on an item that's attached to an image @@ -44518,15 +45377,15 @@ commit 6db80c765d032197a01663da12ed9754fa2640d6 Author: peter sikking, m+mi works -Date: Sun Feb 6 20:21:20 2011 +0100 +Date: Sun Feb 6 20:21:20 2011 +0100 remove garbage I injected - app/.DS_Store | Bin 6148 -> 0 bytes - data/.DS_Store | Bin 6148 -> 0 bytes + app/.DS_Store | Bin 6148 -> 0 bytes + data/.DS_Store | Bin 6148 -> 0 bytes plug-ins/common/file-pdf | 130 ----------------------------------------------- - plug-ins/common/gee | 130 + plug-ins/common/gee | 130 ----------------------------------------------- plug-ins/common/gee-zoom | 130 ----------------------------------------------- @@ -44534,16 +45393,16 @@ commit 7cb5c67bc8ddd5c8a816c18f667510da54824b1e Author: peter sikking, m+mi works -Date: Sun Feb 6 19:57:59 2011 +0100 +Date: Sun Feb 6 19:57:59 2011 +0100 removing references to ps-menurc - app/.DS_Store | Bin 0 -> 6148 bytes - data/.DS_Store | Bin 0 -> 6148 bytes - etc/Makefile.am | 1 - + app/.DS_Store | Bin 0 -> 6148 bytes + data/.DS_Store | Bin 0 -> 6148 bytes + etc/Makefile.am | 1 - plug-ins/common/file-pdf | 130 +++++++++++++++++++++++++++++++++++++++++++++++ - plug-ins/common/gee | 130 + plug-ins/common/gee | 130 +++++++++++++++++++++++++++++++++++++++++++++++ plug-ins/common/gee-zoom | 130 +++++++++++++++++++++++++++++++++++++++++++++++ @@ -44551,7 +45410,7 @@ commit 691c0d9e6de2f783895de20efbe9255b6e05ab33 Author: peter sikking, m+mi works -Date: Sun Feb 6 18:49:44 2011 +0100 +Date: Sun Feb 6 18:49:44 2011 +0100 Both unsupported in UI and sending all the wrong signals ("GIMP is ps clone"), this file is gone... @@ -44564,7 +45423,7 @@ commit 92f130fbc3f2449fce328d82dcf0b4e5e0b192ea Author: Michael Natterer -Date: Sun Feb 6 13:26:25 2011 +0100 +Date: Sun Feb 6 13:26:25 2011 +0100 app: also run device history coords through the axis mapping curve function @@ -44574,7 +45433,7 @@ commit ad40695bab90aa97aee4829aaa8a46461efd1c33 Author: Michael Natterer -Date: Sun Feb 6 12:58:05 2011 +0100 +Date: Sun Feb 6 12:58:05 2011 +0100 configure: save all changes before committing... @@ -44583,7 +45442,7 @@ commit 8d8c6bb9ea9b5e3a7df5c58a94c0304c6b08a0e4 Author: Michael Natterer -Date: Sun Feb 6 12:50:14 2011 +0100 +Date: Sun Feb 6 12:50:14 2011 +0100 configure: build with DISABLE_DEPRECATED also for GTK+ 2.24 @@ -44594,12 +45453,12 @@ in the current development cycle. app/display/gimpscalecombobox.h | 2 +- - configure.ac | 34 ++++++++++++++++++---------------- + configure.ac | 34 ++++++++++++++++++---------------- 2 files changed, 19 insertions(+), 17 deletions(-) commit f4af9b549eb4e8431a2686f45339385ca262bb3f Author: Michael Natterer -Date: Sun Feb 6 12:07:55 2011 +0100 +Date: Sun Feb 6 12:07:55 2011 +0100 Globally switch to saying "window_id" instead of just "window" @@ -44608,33 +45467,33 @@ place. This is more obvious and consistent and keeps the diff to the gtk3-port branch smaller. - app/core/gimp-gui.c | 54 +++---- - app/core/gimp-gui.h | 270 + app/core/gimp-gui.c | 54 +++---- + app/core/gimp-gui.h | 270 ++++++++++++++++---------------- - app/core/gimppdbprogress.c | 42 ++--- - app/core/gimpprogress.c | 6 +- - app/core/gimpprogress.h | 44 +++--- - app/core/gimpsubprogress.c | 63 ++++---- - app/display/gimpdisplay.c | 99 ++++++------ + app/core/gimppdbprogress.c | 42 ++--- + app/core/gimpprogress.c | 6 +- + app/core/gimpprogress.h | 44 +++--- + app/core/gimpsubprogress.c | 63 ++++---- + app/display/gimpdisplay.c | 99 ++++++------ app/display/gimpdisplayshell-progress.c | 22 +-- - app/gui/gui-message.c | 6 +- - app/gui/gui-vtable.c | 166 ++++++++++---------- - app/pdb/display-cmds.c | 2 +- - app/pdb/progress-cmds.c | 2 +- - app/plug-in/gimpplugin-progress.c | 4 +- - app/plug-in/gimpplugin-progress.h | 38 ++--- - app/widgets/gimpfiledialog.c | 22 +-- - app/widgets/gimphelp.c | 12 +- - app/widgets/gimpwidgets-utils.c | 14 +- - app/widgets/gimpwidgets-utils.h | 2 +- - libgimp/gimpprogressbar.c | 6 +- - tools/pdbgen/pdb/display.pdb | 2 +- - tools/pdbgen/pdb/progress.pdb | 2 +- + app/gui/gui-message.c | 6 +- + app/gui/gui-vtable.c | 166 ++++++++++---------- + app/pdb/display-cmds.c | 2 +- + app/pdb/progress-cmds.c | 2 +- + app/plug-in/gimpplugin-progress.c | 4 +- + app/plug-in/gimpplugin-progress.h | 38 ++--- + app/widgets/gimpfiledialog.c | 22 +-- + app/widgets/gimphelp.c | 12 +- + app/widgets/gimpwidgets-utils.c | 14 +- + app/widgets/gimpwidgets-utils.h | 2 +- + libgimp/gimpprogressbar.c | 6 +- + tools/pdbgen/pdb/display.pdb | 2 +- + tools/pdbgen/pdb/progress.pdb | 2 +- 21 files changed, 439 insertions(+), 439 deletions(-) commit 16b020fc42243e84ca4ba3c3e1e95169924088dd Author: Michael Natterer -Date: Sun Feb 6 11:22:23 2011 +0100 +Date: Sun Feb 6 11:22:23 2011 +0100 app: clean up paint core cleanup @@ -44643,7 +45502,7 @@ commit 012eb1dd930e125d89c33cbe903fcacce11c6997 Author: Michael Natterer -Date: Sun Feb 6 02:36:24 2011 +0100 +Date: Sun Feb 6 02:36:24 2011 +0100 app: zero the reallocated keys and axes arrays in GimpDeviceInfo @@ -44652,7 +45511,7 @@ commit 4fd56d96404f293a3e3ae7bd05ba4a725325e005 Author: Michael Natterer -Date: Sun Feb 6 02:35:52 2011 +0100 +Date: Sun Feb 6 02:35:52 2011 +0100 libgimpwidgets: don't pass around uninitialized memory in GimpRuler @@ -44661,7 +45520,7 @@ commit e309d3cdf8a8b4ccbe836bcab8a4766f98182aca Author: Michael Natterer -Date: Sun Feb 6 01:01:54 2011 +0100 +Date: Sun Feb 6 01:01:54 2011 +0100 app: check that the model is not NULL before using it in GimpContainerComboBox @@ -44675,7 +45534,7 @@ commit 11ac0296b963c06fc8dac72793bd751a2f348476 Author: Michael Natterer -Date: Sun Feb 6 00:59:52 2011 +0100 +Date: Sun Feb 6 00:59:52 2011 +0100 app: ref/unref the context in gimp_image_editor_set_context() @@ -44684,16 +45543,16 @@ commit 1931cca5ab57f1cfac85075e37f5da1cbdccd9dc Author: Michael Natterer -Date: Fri Feb 4 18:41:41 2011 +0100 +Date: Fri Feb 4 18:41:41 2011 +0100 libgimp: deprecate the entire old gimp_foo_select() API It's now completely replaced by the new gimp_image_select_foo() functions. - app/pdb/image-select-cmds.c | 4 +- + app/pdb/image-select-cmds.c | 4 +- app/pdb/selection-tools-cmds.c | 38 +++++++-------- - libgimp/gimpimageselect_pdb.c | 3 +- + libgimp/gimpimageselect_pdb.c | 3 +- libgimp/gimpselectiontools_pdb.c | 79 ++----------------------------- libgimp/gimpselectiontools_pdb.h | 4 +- tools/pdbgen/pdb/selection_tools.pdb | 92 @@ -44702,22 +45561,22 @@ commit bc5e0a79ab9ef0411a634cdc952d4edd16a6f252 Author: Michael Natterer -Date: Fri Feb 4 18:37:01 2011 +0100 +Date: Fri Feb 4 18:37:01 2011 +0100 libgimp: remove "select-transparent" parameters from the new selection API and use the sample-transparent setting from GimpPDBContext instead. - app/pdb/image-select-cmds.c | 22 +++------------------- - libgimp/gimpimageselect_pdb.c | 13 ++++--------- - libgimp/gimpimageselect_pdb.h | 6 ++---- + app/pdb/image-select-cmds.c | 22 +++------------------- + libgimp/gimpimageselect_pdb.c | 13 ++++--------- + libgimp/gimpimageselect_pdb.h | 6 ++---- tools/pdbgen/pdb/image_select.pdb | 22 ++++++++-------------- 4 files changed, 17 insertions(+), 46 deletions(-) commit d3a291d2dfea3691a9875b7dcba1a30871efcff8 Author: Michael Natterer -Date: Fri Feb 4 18:32:32 2011 +0100 +Date: Fri Feb 4 18:32:32 2011 +0100 pdb: add "sample-transparent" as GimpPDBContext property @@ -44728,7 +45587,7 @@ app/pdb/gimppdbcontext.c | 14 +++++++ app/pdb/gimppdbcontext.h | 1 + app/pdb/internal-procs.c | 2 +- - libgimp/gimp.def | 2 + + libgimp/gimp.def | 2 + libgimp/gimpcontext_pdb.c | 67 ++++++++++++++++++++++++++++++++ libgimp/gimpcontext_pdb.h | 2 + tools/pdbgen/pdb/context.pdb | 57 +++++++++++++++++++++++++++ @@ -44736,22 +45595,22 @@ commit c15488d10a4324e2fa82cd56290cdda04ee1629e Author: Michael Natterer -Date: Fri Feb 4 15:45:17 2011 +0100 +Date: Fri Feb 4 15:45:17 2011 +0100 libgimp: remove "threshold" parameters from the new selection API and use the sample-threshold setting from GimpPDBContext instead. - app/pdb/image-select-cmds.c | 30 +++++++------------------- - libgimp/gimpimageselect_pdb.c | 44 + app/pdb/image-select-cmds.c | 30 +++++++------------------- + libgimp/gimpimageselect_pdb.c | 44 ++++++++++++++++++--------------------- - libgimp/gimpimageselect_pdb.h | 2 -- + libgimp/gimpimageselect_pdb.h | 2 -- tools/pdbgen/pdb/image_select.pdb | 32 +++++++++++++--------------- 4 files changed, 41 insertions(+), 67 deletions(-) commit 2e16d932ecd2647d6d2f816e1594d7eaef807e63 Author: Michael Natterer -Date: Fri Feb 4 15:36:56 2011 +0100 +Date: Fri Feb 4 15:36:56 2011 +0100 pdb: add "sample-threshold" as GimpPDBContext property @@ -44762,7 +45621,7 @@ app/pdb/gimppdbcontext.c | 29 +++++++ app/pdb/gimppdbcontext.h | 1 + app/pdb/internal-procs.c | 2 +- - libgimp/gimp.def | 4 + + libgimp/gimp.def | 4 + libgimp/gimpcontext_pdb.c | 132 +++++++++++++++++++++++++++++- libgimp/gimpcontext_pdb.h | 96 +++++++++++----------- tools/pdbgen/pdb/context.pdb | 118 ++++++++++++++++++++++++++- @@ -44770,21 +45629,21 @@ commit f76bcab2216ea26f14f8eb6a919312bcbf3e5cb8 Author: Michael Natterer -Date: Fri Feb 4 15:19:44 2011 +0100 +Date: Fri Feb 4 15:19:44 2011 +0100 app: move "default-threshold" from GimpGuiConfig to GimpCoreConfig - app/config/gimpcoreconfig.c | 11 +++++++++++ - app/config/gimpcoreconfig.h | 1 + - app/config/gimpguiconfig.c | 11 ----------- - app/config/gimpguiconfig.h | 1 - - app/tools/gimpbucketfilloptions.c | 4 ++-- - app/tools/gimpregionselectoptions.c | 4 ++-- + app/config/gimpcoreconfig.c | 11 +++++++++++ + app/config/gimpcoreconfig.h | 1 + + app/config/gimpguiconfig.c | 11 ----------- + app/config/gimpguiconfig.h | 1 - + app/tools/gimpbucketfilloptions.c | 4 ++-- + app/tools/gimpregionselectoptions.c | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) commit 1cf5295d2e3b9bfa9b82d933a68d5f2a491928cd Author: Alexia Death -Date: Sun Feb 6 00:17:32 2011 +0200 +Date: Sun Feb 6 00:17:32 2011 +0200 app: Fix couple of bugs in smooth code @@ -44793,7 +45652,7 @@ commit 54792780fc3014e8c0236e400301f4625259692f Author: Martin Renold -Date: Sat Jan 22 14:00:01 2011 +0100 +Date: Sat Jan 22 14:00:01 2011 +0100 plug-ins: openraster fix for non-ascii layer names @@ -44807,19 +45666,19 @@ commit a1166819821853e3017b0eeaf23c8ea692708791 Author: Michael Natterer -Date: Thu Feb 3 22:29:25 2011 +0100 +Date: Thu Feb 3 22:29:25 2011 +0100 app: move all GimpGroupLayer members to a private struct - app/actions/view-commands.c | 2 +- + app/actions/view-commands.c | 2 +- app/core/gimpgrouplayer.c | 338 +++++++++++++++++++++++++------------------- - app/core/gimpgrouplayer.h | 22 ++- + app/core/gimpgrouplayer.h | 22 ++- 3 files changed, 199 insertions(+), 163 deletions(-) commit 1efd387354bc63dfd51e70659b9c37537d09b0a0 Author: Alexandre Prokoudine -Date: Fri Feb 4 00:28:15 2011 +0300 +Date: Fri Feb 4 00:28:15 2011 +0300 Fix to Normalize translation suggested by Alex Pasyada @@ -44829,7 +45688,7 @@ commit f8e8952147479438edd4fd634036ebc473546b00 Author: Michael Natterer -Date: Thu Feb 3 19:46:58 2011 +0100 +Date: Thu Feb 3 19:46:58 2011 +0100 app: clean up dynamics duplicate implementation @@ -44838,7 +45697,7 @@ commit 7e6d2542f22f7168abc7160fc0960e405e2eb607 Author: Martin Srebotnjak -Date: Thu Feb 3 09:03:04 2011 +0100 +Date: Thu Feb 3 09:03:04 2011 +0100 Updated Slovenian translation @@ -44848,7 +45707,7 @@ commit 93f63335dc2faa2fe9aca6c8efa2cd9297c1abf4 Author: Martin Nordholts -Date: Thu Feb 3 08:04:26 2011 +0100 +Date: Thu Feb 3 08:04:26 2011 +0100 app: End core/gimpdynamics.c with newline @@ -44859,22 +45718,22 @@ commit 3e0d0b862a8777bd8d650969cd4d1370e836d45e Author: Martin Nordholts -Date: Wed Feb 2 19:20:08 2011 +0100 +Date: Wed Feb 2 19:20:08 2011 +0100 app/tests: Add test-save-and-export Add some regression tests for how the URIs associated with an image is handled during, save, import etc. - app/tests/.gitignore | 1 + - app/tests/Makefile.am | 1 + + app/tests/.gitignore | 1 + + app/tests/Makefile.am | 1 + app/tests/test-save-and-export.c | 323 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 325 insertions(+) commit 6c6cf7a881de1796bc8e43a47eee3e7624a9986a Author: Martin Nordholts -Date: Wed Feb 2 22:08:52 2011 +0100 +Date: Wed Feb 2 22:08:52 2011 +0100 app: Move import and export URI updates to file_save() @@ -44885,12 +45744,12 @@ This change also simplifies unit testing. app/dialogs/file-save-dialog.c | 33 +++++++++------------------------ - app/file/file-save.c | 13 +++++++++++++ + app/file/file-save.c | 13 +++++++++++++ 2 files changed, 22 insertions(+), 24 deletions(-) commit 1702822720ecdd82b56b6b95eba91ad5023fb29d Author: Martin Nordholts -Date: Wed Feb 2 20:16:31 2011 +0100 +Date: Wed Feb 2 20:16:31 2011 +0100 app: Fix copy-paste error in file-save-dialog.c @@ -44902,7 +45761,7 @@ commit b370a0ebe63cac0728197ae5d9868bed9fcf4ae0 Author: Petr Ovtchenkov -Date: Wed Feb 2 19:19:56 2011 +0100 +Date: Wed Feb 2 19:19:56 2011 +0100 app: Support building with GTK 2.24 for gimpscalecombobox.h @@ -44911,88 +45770,88 @@ commit 3728f6f7d7f127521f663db71fbad0a192c71d9b Author: Martin Nordholts -Date: Thu Jan 27 17:25:22 2011 +0100 +Date: Thu Jan 27 17:25:22 2011 +0100 app/tests: Add gimp_test_utils_create_image_from_dalog() app/tests/gimp-app-test-utils.c | 59 +++++++++++++++++++++++++++++++++++++++++ app/tests/gimp-app-test-utils.h | 2 ++ - app/tests/test-ui.c | 47 +++----------------------------- + app/tests/test-ui.c | 47 +++----------------------------- 3 files changed, 65 insertions(+), 43 deletions(-) commit 6ea36f3383bc2a138d8bb9d3d37fb4f06ede9bdc Author: Martin Nordholts -Date: Wed Jan 26 20:49:00 2011 +0100 +Date: Wed Jan 26 20:49:00 2011 +0100 app: Use gimp_image_set_uri() I forgot to do this... app/actions/debug-commands.c | 3 +-- - app/file/file-open.c | 4 ++-- + app/file/file-open.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) commit 366cddc856eb300d598d28ee9523b0bcaee622c3 Author: Martin Nordholts -Date: Wed Jan 26 20:45:32 2011 +0100 +Date: Wed Jan 26 20:45:32 2011 +0100 app: gimp_image_get/set_imported/exported/save_a_copy_uri() Add more proper core API for GimpImage URI management. - app/actions/file-actions.c | 6 +- - app/actions/file-commands.c | 14 ++--- - app/core/gimpimage.c | 107 + app/actions/file-actions.c | 6 +- + app/actions/file-commands.c | 14 ++--- + app/core/gimpimage.c | 107 +++++++++++++++++++++++++++++++++++ - app/core/gimpimage.h | 14 ++++- + app/core/gimpimage.h | 14 ++++- app/dialogs/file-save-dialog.c | 14 +---- app/display/gimpdisplayshell-title.c | 10 ++-- - app/file/file-open.c | 3 +- - app/file/gimp-file.h | 6 -- - app/widgets/gimpfiledialog.c | 30 ++++------ + app/file/file-open.c | 3 +- + app/file/gimp-file.h | 6 -- + app/widgets/gimpfiledialog.c | 30 ++++------ 9 files changed, 143 insertions(+), 61 deletions(-) commit 8d61a61c0eb53c0c9e7095afad34a4e3f013faaf Author: Martin Nordholts -Date: Wed Jan 26 20:07:35 2011 +0100 +Date: Wed Jan 26 20:07:35 2011 +0100 app: Remove GIMP_FILE_EXPORT_TO_URI_KEY Remove GIMP_FILE_EXPORT_TO_URI_KEY which is always identical to GIMP_FILE_EXPORT_URI_KEY. - app/actions/file-actions.c | 14 +++++++------- - app/actions/file-commands.c | 2 +- + app/actions/file-actions.c | 14 +++++++------- + app/actions/file-commands.c | 2 +- app/dialogs/file-save-dialog.c | 5 ----- app/display/gimpdisplayshell-title.c | 2 +- - app/file/gimp-file.h | 1 - + app/file/gimp-file.h | 1 - 5 files changed, 9 insertions(+), 15 deletions(-) commit d4493175011bf5fec0ed57bf29d966267b8d41b9 Author: Martin Nordholts -Date: Wed Jan 26 18:32:17 2011 +0100 +Date: Wed Jan 26 18:32:17 2011 +0100 app: Add and use gimp_image_get_string_untitled() - app/core/gimpimage.c | 14 +++++++++++++- - app/core/gimpimage.h | 2 ++ + app/core/gimpimage.c | 14 +++++++++++++- + app/core/gimpimage.h | 2 ++ app/widgets/gimpfiledialog.c | 4 ++-- 3 files changed, 17 insertions(+), 3 deletions(-) commit 60a77f6db2a0d25b7f32864afa61ebc26cb643d9 Author: Alexia Death -Date: Wed Feb 2 21:47:23 2011 +0200 +Date: Wed Feb 2 21:47:23 2011 +0200 app: Fix and enable duplicate for dynamics - app/core/gimpdynamics.c | 18 ++++++++++++++++++ + app/core/gimpdynamics.c | 18 ++++++++++++++++++ app/widgets/gimpdynamicsfactoryview.c | 2 -- 2 files changed, 18 insertions(+), 2 deletions(-) commit 6a08376d4962e7c583e662709ce25d89f0d9dba0 Author: Michael Natterer -Date: Wed Feb 2 19:40:20 2011 +0100 +Date: Wed Feb 2 19:40:20 2011 +0100 app: add new virtual function GimpItem::unset_removed() @@ -45009,7 +45868,7 @@ commit 0af966b63fcc55b36380d6538dfb30000f71fef9 Author: Nils Philippsen -Date: Wed Feb 2 17:11:28 2011 +0100 +Date: Wed Feb 2 17:11:28 2011 +0100 Bug 641259 - [abrt] gimp-2:2.6.11-1.fc14: py-slice.py:172:slice:TypeError: integer argument expected, got float @@ -45021,7 +45880,7 @@ commit a69cd7467d24c91558140473c5f0a81e59239754 Author: Martin Nordholts -Date: Wed Feb 2 08:33:39 2011 +0100 +Date: Wed Feb 2 08:33:39 2011 +0100 app/tests: Update gimpdir/tags.xml @@ -45033,7 +45892,7 @@ commit ed872c7c6e53a187e76e06f9a081c91370466f92 Author: Omari Stephens -Date: Sun Jan 30 21:34:19 2011 +0100 +Date: Sun Jan 30 21:34:19 2011 +0100 Bug 599065 - PNG output: omit unwanted chunks (sRGB) @@ -45046,7 +45905,7 @@ commit 75593c3fea32daccf633bb95f8d8c43c90d9cf7d Author: Alexia Death -Date: Wed Feb 2 01:04:24 2011 +0200 +Date: Wed Feb 2 01:04:24 2011 +0200 app: Fix missing outline with aspect 0.0 @@ -45055,17 +45914,17 @@ commit 418632916ac33e0b9b6144c8e72ccbb8c33b4384 Author: Alexia Death -Date: Wed Feb 2 00:58:09 2011 +0200 +Date: Wed Feb 2 00:58:09 2011 +0200 app: Fix outline offset app/core/gimpbrush-transform.c | 4 ++-- - app/paint/gimpbrushcore.c | 7 ++++--- + app/paint/gimpbrushcore.c | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) commit 6a89db0f5313041cf7f39a477134bb88885d8a73 Author: Alexia Death -Date: Wed Feb 2 00:33:08 2011 +0200 +Date: Wed Feb 2 00:33:08 2011 +0200 app: Minor aspect ratio fixes @@ -45075,7 +45934,7 @@ commit 40e11d7ad1ea68da980b460247ef10d872fd9d41 Author: Michael Natterer -Date: Tue Feb 1 14:15:46 2011 +0100 +Date: Tue Feb 1 14:15:46 2011 +0100 app: pass the image to g_object_new() in gimp_text_layer_from_layer() @@ -45084,7 +45943,7 @@ commit eacd80446d68b40e40f2e36d052ab74abf7aacb8 Author: Michael Natterer -Date: Tue Feb 1 12:47:24 2011 +0100 +Date: Tue Feb 1 12:47:24 2011 +0100 app: finally get rid of gimp_item_configure() and drawable_configure() @@ -45094,10 +45953,10 @@ app/core/gimpdrawable.c | 62 ++++++++++++------------- app/core/gimpdrawable.h | 15 +++--- app/core/gimpgrouplayer.c | 13 +++--- - app/core/gimpitem.c | 114 + app/core/gimpitem.c | 114 ++++++++++++++++++++++------------------------ - app/core/gimpitem.h | 14 +++--- - app/core/gimplayer.c | 12 ++--- + app/core/gimpitem.h | 14 +++--- + app/core/gimplayer.c | 12 ++--- app/core/gimplayermask.c | 18 ++++---- app/core/gimpselection.c | 13 ++---- app/text/gimptextlayer.c | 13 +++--- @@ -45106,7 +45965,7 @@ commit ccd3beb8ff3bdf8aa0c14cef315a00cb7064c1af Author: Michael Natterer -Date: Tue Feb 1 10:46:53 2011 +0100 +Date: Tue Feb 1 10:46:53 2011 +0100 app: don't use gimp_drawable_configure() in gimp_drawable_duplicate() @@ -45117,7 +45976,7 @@ commit 5c8ec234ccc6440e4c3718dd14c9d283709596fa Author: Michael Natterer -Date: Tue Feb 1 10:28:10 2011 +0100 +Date: Tue Feb 1 10:28:10 2011 +0100 app: add "image" as construct property to GimpItem @@ -45129,10 +45988,10 @@ app/core/gimpdrawable.c | 5 +- app/core/gimpdrawable.h | 1 - app/core/gimpgrouplayer.c | 5 +- - app/core/gimpitem.c | 149 + app/core/gimpitem.c | 149 ++++++++++++++++++++++++++++------------------ - app/core/gimpitem.h | 1 - - app/core/gimplayer.c | 5 +- + app/core/gimpitem.h | 1 - + app/core/gimplayer.c | 5 +- app/core/gimplayermask.c | 5 +- app/core/gimpselection.c | 5 +- app/text/gimptextlayer.c | 5 +- @@ -45141,7 +46000,7 @@ commit 12e531f512b03bc401930fe3af9158fc571d7e2c Author: Michael Natterer -Date: Mon Jan 31 23:53:59 2011 +0100 +Date: Mon Jan 31 23:53:59 2011 +0100 app: gimp_item_replace_item(): if the item has an ID, remove it from the item hash @@ -45151,7 +46010,7 @@ commit e893e3130c6fe208d9694cf122dfe1cf9721af79 Author: Michael Natterer -Date: Mon Jan 31 23:52:41 2011 +0100 +Date: Mon Jan 31 23:52:41 2011 +0100 app: don't leak the item's old parasite list in gimp_item_replace_item() @@ -45161,44 +46020,44 @@ commit ad88eb55a27ce9771ffb1727b7b7315a555f738f Author: Michael Natterer -Date: Mon Jan 31 23:51:18 2011 +0100 +Date: Mon Jan 31 23:51:18 2011 +0100 app: add accessors for GimpItem::parasites and move it to private app/core/gimpimage-merge.c | 34 +++++++++-------- - app/core/gimpitem.c | 91 + app/core/gimpitem.c | 91 +++++++++++++++++++++++++++++++++++----------- - app/core/gimpitem.h | 6 ++- - app/xcf/xcf-save.c | 27 +++++++++----- + app/core/gimpitem.h | 6 ++- + app/xcf/xcf-save.c | 27 +++++++++----- 4 files changed, 108 insertions(+), 50 deletions(-) commit af160141dbc7c8640ef6952e7748cd70bde6538f Author: Michael Natterer -Date: Sun Jan 30 21:57:45 2011 +0100 +Date: Sun Jan 30 21:57:45 2011 +0100 app: add gimp_item_unset_removed() and move item->removed to private - app/core/gimpimage.c | 6 ++++-- - app/core/gimpitem.c | 26 +++++++++++++++++++++----- - app/core/gimpitem.h | 3 +-- + app/core/gimpimage.c | 6 ++++-- + app/core/gimpitem.c | 26 +++++++++++++++++++++----- + app/core/gimpitem.h | 3 +-- app/core/gimpitemtree.c | 2 +- - app/core/gimplayer.c | 2 +- + app/core/gimplayer.c | 2 +- 5 files changed, 28 insertions(+), 11 deletions(-) commit fd655490e8488dd2b34227b11d18713d1ef6d76c Author: Michael Natterer -Date: Sun Jan 30 21:49:51 2011 +0100 +Date: Sun Jan 30 21:49:51 2011 +0100 app: move most of GimpItem's members to a private struct app/core/gimpitem.c | 319 ++++++++++++++++++++++++++++++++++------------------ - app/core/gimpitem.h | 14 --- + app/core/gimpitem.h | 14 --- 2 files changed, 212 insertions(+), 121 deletions(-) commit f63a8fcfe67bad6ea89fe6c98afb069da0955fdf Author: Michael Natterer -Date: Sun Jan 30 20:43:01 2011 +0100 +Date: Sun Jan 30 20:43:01 2011 +0100 app: remove some leftover dead code @@ -45209,26 +46068,26 @@ commit 90419e067206de85b7e30e11dbd6e0f6b0fc97fc Author: Michael Natterer -Date: Sun Jan 30 20:40:43 2011 +0100 +Date: Sun Jan 30 20:40:43 2011 +0100 app: add "gboolean push_undo" to gimp_item_parasite_attach/detach() and use this API instead of manually fiddling with the item's GimpParasiteList. - app/core/gimpitem.c | 37 ++++++++++++++++++++++++------------- - app/core/gimpitem.h | 6 ++++-- + app/core/gimpitem.c | 37 ++++++++++++++++++++++++------------- + app/core/gimpitem.h | 6 ++++-- app/core/gimpitempropundo.c | 5 ++--- app/pdb/parasite-cmds.c | 12 ++++++------ app/text/gimptextlayer-xcf.c | 5 ++++- app/text/gimptextlayer.c | 11 +++++++---- - app/xcf/xcf-load.c | 6 +++--- + app/xcf/xcf-load.c | 6 +++--- tools/pdbgen/pdb/parasite.pdb | 12 ++++++------ 8 files changed, 56 insertions(+), 38 deletions(-) commit 96efc7ea1c7bcbfb0858074ffabeec5098101022 Author: Michael Natterer -Date: Sun Jan 30 19:36:27 2011 +0100 +Date: Sun Jan 30 19:36:27 2011 +0100 app: reset an item's "removed" state as it is added to its parent container @@ -45236,9 +46095,9 @@ and not "manually" from the resp. undo functions. app/core/gimpchannelundo.c | 2 -- - app/core/gimpimage.c | 9 +++++++++ + app/core/gimpimage.c | 9 +++++++++ app/core/gimpitemtree.c | 4 ++++ - app/core/gimplayer.c | 4 ++++ + app/core/gimplayer.c | 4 ++++ app/core/gimplayermaskundo.c | 2 -- app/core/gimplayerundo.c | 9 --------- app/vectors/gimpvectorsundo.c | 2 -- @@ -45246,7 +46105,7 @@ commit 0428be29449a84a38f0782d3214126f184830d89 Author: Michael Natterer -Date: Sun Jan 30 19:26:32 2011 +0100 +Date: Sun Jan 30 19:26:32 2011 +0100 app: add gimp_item_replace_item() which is a bad hack and documented as such @@ -45254,15 +46113,15 @@ in order to get rid of fiddling with GimpItem internals inside gimptextlayer-xcf.c - app/core/gimpitem.c | 72 + app/core/gimpitem.c | 72 ++++++++++++++++++++++++++++++++++++++++---- - app/core/gimpitem.h | 3 ++ + app/core/gimpitem.h | 3 ++ app/text/gimptextlayer-xcf.c | 36 ++-------------------- 3 files changed, 71 insertions(+), 40 deletions(-) commit cfecdc8b705592b98b01211b13c1231126946899 Author: Michael Natterer -Date: Sun Jan 30 18:58:05 2011 +0100 +Date: Sun Jan 30 18:58:05 2011 +0100 app: use accessors instead of using GimpItem members directly @@ -45271,7 +46130,7 @@ commit 21144d1599ac2a4e69ac16670815e93f35351e32 Author: Martin Srebotnjak -Date: Sat Jan 29 20:12:51 2011 +0100 +Date: Sat Jan 29 20:12:51 2011 +0100 Updated Slovenian translation @@ -45281,7 +46140,7 @@ commit 974d7cb67ad27c3f6ede85838bd127e03925b557 Author: Martin Srebotnjak -Date: Sat Jan 29 20:11:54 2011 +0100 +Date: Sat Jan 29 20:11:54 2011 +0100 Updated Slovenian translation @@ -45291,7 +46150,7 @@ commit 9793ecc7fb84b164b94302f2470fda40b23e2ffb Author: Martin Nordholts -Date: Fri Jan 28 07:55:55 2011 +0100 +Date: Fri Jan 28 07:55:55 2011 +0100 authors.dtd: Update @@ -45300,17 +46159,17 @@ commit 6463d2a8c5aa100e180bb81660855aadf9b82df0 Author: Martin Nordholts -Date: Thu Jan 27 22:03:41 2011 +0100 +Date: Thu Jan 27 22:03:41 2011 +0100 Also put maintainers separately in AUTHORS - AUTHORS | 8 ++++++-- + AUTHORS | 8 ++++++-- authors.xsl | 11 +++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) commit 70f88c43206addd1684bf9e79510feef1cc6e9b4 Author: Michael Natterer -Date: Thu Jan 27 21:36:58 2011 +0100 +Date: Thu Jan 27 21:36:58 2011 +0100 app: don't update the highlight when the rectangle tool is resumed @@ -45321,30 +46180,30 @@ commit 1205a6aedd83cea8ccb43007dd2354eeaf5eae65 Author: Michael Natterer -Date: Thu Jan 27 20:01:28 2011 +0100 +Date: Thu Jan 27 20:01:28 2011 +0100 pdb: add "sample-criterion" as property to the PDB context See commit below - app/pdb/context-cmds.c | 93 + app/pdb/context-cmds.c | 93 +++++++++++++++++++++++++++++++++++++++ - app/pdb/gimppdbcontext.c | 15 +++++++ - app/pdb/gimppdbcontext.h | 1 + - app/pdb/image-select-cmds.c | 28 +++--------- - app/pdb/internal-procs.c | 2 +- - libgimp/gimp.def | 4 ++ - libgimp/gimpcontext_pdb.c | 66 +++++++++++++++++++++++++++ - libgimp/gimpcontext_pdb.h | 2 + - libgimp/gimpimageselect_pdb.c | 46 +++++++++---------- - libgimp/gimpimageselect_pdb.h | 82 +++++++++++++++++----------------- - tools/pdbgen/pdb/context.pdb | 56 +++++++++++++++++++++++ + app/pdb/gimppdbcontext.c | 15 +++++++ + app/pdb/gimppdbcontext.h | 1 + + app/pdb/image-select-cmds.c | 28 +++--------- + app/pdb/internal-procs.c | 2 +- + libgimp/gimp.def | 4 ++ + libgimp/gimpcontext_pdb.c | 66 +++++++++++++++++++++++++++ + libgimp/gimpcontext_pdb.h | 2 + + libgimp/gimpimageselect_pdb.c | 46 +++++++++---------- + libgimp/gimpimageselect_pdb.h | 82 +++++++++++++++++----------------- + tools/pdbgen/pdb/context.pdb | 56 +++++++++++++++++++++++ tools/pdbgen/pdb/image_select.pdb | 22 ++++----- 12 files changed, 312 insertions(+), 105 deletions(-) commit bb6083a1eb7ee4ac59bec0ff1f4828b9ba660da3 Author: Michael Natterer -Date: Thu Jan 27 19:37:13 2011 +0100 +Date: Thu Jan 27 19:37:13 2011 +0100 pdb: add "sample-merged" as property to the PDB context @@ -45353,23 +46212,23 @@ API - update procedure documentation - app/pdb/context-cmds.c | 91 + app/pdb/context-cmds.c | 91 +++++++++++++++++++++++++++++++++++++++ - app/pdb/gimppdbcontext.c | 14 ++++++ - app/pdb/gimppdbcontext.h | 1 + - app/pdb/image-select-cmds.c | 45 +++++++------------ - app/pdb/internal-procs.c | 2 +- - libgimp/gimpcontext_pdb.c | 68 +++++++++++++++++++++++++++++ - libgimp/gimpcontext_pdb.h | 2 + - libgimp/gimpimageselect_pdb.c | 30 ++++++------- - libgimp/gimpimageselect_pdb.h | 2 - - tools/pdbgen/pdb/context.pdb | 58 +++++++++++++++++++++++++ + app/pdb/gimppdbcontext.c | 14 ++++++ + app/pdb/gimppdbcontext.h | 1 + + app/pdb/image-select-cmds.c | 45 +++++++------------ + app/pdb/internal-procs.c | 2 +- + libgimp/gimpcontext_pdb.c | 68 +++++++++++++++++++++++++++++ + libgimp/gimpcontext_pdb.h | 2 + + libgimp/gimpimageselect_pdb.c | 30 ++++++------- + libgimp/gimpimageselect_pdb.h | 2 - + tools/pdbgen/pdb/context.pdb | 58 +++++++++++++++++++++++++ tools/pdbgen/pdb/image_select.pdb | 47 ++++++++++---------- 11 files changed, 286 insertions(+), 74 deletions(-) commit ab5bd03a9c47a275ab2d3b7e47aafdcb9a89ea0d Author: Martin Nordholts -Date: Thu Jan 27 18:48:30 2011 +0100 +Date: Thu Jan 27 18:48:30 2011 +0100 Show maintainers after creators in About-dialog @@ -45378,12 +46237,12 @@ app/dialogs/about-dialog.c | 7 +++++-- app/dialogs/authors.xsl | 12 ++++++++++++ - authors.xml | 5 +++-- + authors.xml | 5 +++-- 3 files changed, 20 insertions(+), 4 deletions(-) commit 285a42eef305679ad3619ddf14d44ee81f641d4a Author: Martin Nordholts -Date: Thu Jan 27 18:35:01 2011 +0100 +Date: Thu Jan 27 18:35:01 2011 +0100 app: Calculate number of creators in about dialog @@ -45393,7 +46252,7 @@ commit d6fbe5acd47b21fb36b01162b28c78cde841011a Author: Bartosz Kosiorek -Date: Wed Jan 26 16:58:47 2011 +0100 +Date: Wed Jan 26 16:58:47 2011 +0100 Updated Polish translation @@ -45403,7 +46262,7 @@ commit 70dc45cc2f933e5e1ea766a25fa1582510e4a6e6 Author: Bartosz Kosiorek -Date: Wed Jan 26 16:57:49 2011 +0100 +Date: Wed Jan 26 16:57:49 2011 +0100 Updated Polish translation @@ -45412,7 +46271,7 @@ commit 94d64a836026f3e080b7dfb7919ce06d29f2a228 Author: Marco Ciampa -Date: Wed Jan 26 15:31:06 2011 +0100 +Date: Wed Jan 26 15:31:06 2011 +0100 Updated italian translation. @@ -45422,26 +46281,26 @@ commit 480d6e0cf23bd38d7cdfd8b103a11c4dd9e0be63 Author: Martin Nordholts -Date: Wed Jan 26 08:19:39 2011 +0100 +Date: Wed Jan 26 08:19:39 2011 +0100 app: Add and use gimp_image_get_uri() - app/actions/file-actions.c | 2 +- - app/actions/file-commands.c | 8 ++++---- + app/actions/file-actions.c | 2 +- + app/actions/file-commands.c | 8 ++++---- app/core/gimpimage-duplicate.c | 2 +- - app/core/gimpimage.c | 20 ++++++++++++++++++-- - app/core/gimpimage.h | 3 ++- + app/core/gimpimage.c | 20 ++++++++++++++++++-- + app/core/gimpimage.h | 3 ++- app/display/gimpdisplayshell-close.c | 2 +- - app/file/file-utils.c | 2 +- - app/pdb/image-cmds.c | 2 +- - app/widgets/gimpfiledialog.c | 10 +++++----- + app/file/file-utils.c | 2 +- + app/pdb/image-cmds.c | 2 +- + app/widgets/gimpfiledialog.c | 10 +++++----- app/widgets/gimpimagepropview.c | 2 +- - tools/pdbgen/pdb/image.pdb | 2 +- + tools/pdbgen/pdb/image.pdb | 2 +- 11 files changed, 36 insertions(+), 19 deletions(-) commit d9b24bb1f385d356c15cbc3bba0f940034a55c9e Author: Martin Nordholts -Date: Wed Jan 26 08:05:34 2011 +0100 +Date: Wed Jan 26 08:05:34 2011 +0100 plug-ins: Fix warning about usage of uninitialized variable @@ -45450,24 +46309,24 @@ commit ac773489e437fcdefd5b85903069441c881b8926 Author: Martin Nordholts -Date: Wed Jan 26 07:55:14 2011 +0100 +Date: Wed Jan 26 07:55:14 2011 +0100 app: gimp_image_get_uri() -> gimp_image_get_uri_or_untitled() - app/actions/debug-commands.c | 2 +- - app/actions/file-commands.c | 2 +- - app/actions/windows-actions.c | 2 +- - app/core/gimpimage.c | 14 +++++++++++--- - app/core/gimpimage.h | 2 +- + app/actions/debug-commands.c | 2 +- + app/actions/file-commands.c | 2 +- + app/actions/windows-actions.c | 2 +- + app/core/gimpimage.c | 14 +++++++++++--- + app/core/gimpimage.h | 2 +- app/display/gimpdisplayshell-title.c | 2 +- - app/file/file-open.c | 2 +- - app/gimpcore.def | 2 +- - app/widgets/gimpfiledialog.c | 4 ++-- + app/file/file-open.c | 2 +- + app/gimpcore.def | 2 +- + app/widgets/gimpfiledialog.c | 4 ++-- 9 files changed, 20 insertions(+), 12 deletions(-) commit 0cbb8ac0bf68c18e59708576312b31b031195b33 Author: Martin Nordholts -Date: Wed Jan 26 06:33:10 2011 +0100 +Date: Wed Jan 26 06:33:10 2011 +0100 libgimpwidgets: Update gimpwidgets.def @@ -45476,7 +46335,7 @@ commit 835d92e4ad510da33ef9e027af74683e3e2e8edb Author: Martin Nordholts -Date: Wed Jan 26 06:26:36 2011 +0100 +Date: Wed Jan 26 06:26:36 2011 +0100 libgimpwidgets: Fix gtk-doc warning @@ -45485,23 +46344,23 @@ commit 452819143a7ef9af446e5df30a468730cadf0949 Author: Alexia Death -Date: Tue Jan 25 23:27:23 2011 +0200 +Date: Tue Jan 25 23:27:23 2011 +0200 app: half-sane aspect ratio implementation app/core/gimpbrush-transform.c | 12 ++++----- - app/core/gimpbrush.c | 14 ++++------- - app/core/gimpbrushgenerated.c | 16 ++++++------ - app/core/gimpdynamicsoutput.c | 53 + app/core/gimpbrush.c | 14 ++++------- + app/core/gimpbrushgenerated.c | 16 ++++++------ + app/core/gimpdynamicsoutput.c | 53 +++++++++++++++++++++------------------- - app/paint/gimpbrushcore.c | 43 ++++++++++++++++++++------------ - app/paint/gimppaintoptions.c | 4 +-- + app/paint/gimpbrushcore.c | 43 ++++++++++++++++++++------------ + app/paint/gimppaintoptions.c | 4 +-- app/tools/gimppaintoptions-gui.c | 2 +- 7 files changed, 77 insertions(+), 67 deletions(-) commit 5cae0bf65c9720c3b7b142240724c42e18bbca14 Author: Omari Stephens -Date: Sun Jan 23 07:28:33 2011 +0000 +Date: Sun Jan 23 07:28:33 2011 +0000 Bug 630748 - display filters do not work @@ -45509,24 +46368,24 @@ includes logic changes to the display filters to deal with cairo's ARGB32 pre-multiplied buffer format. - app/display/gimpdisplayshell-render.c | 31 ++++---- - libgimpwidgets/gimpcolordisplay.c | 43 +++++++++++ - libgimpwidgets/gimpcolordisplay.h | 9 ++- + app/display/gimpdisplayshell-render.c | 31 ++++---- + libgimpwidgets/gimpcolordisplay.c | 43 +++++++++++ + libgimpwidgets/gimpcolordisplay.h | 9 ++- libgimpwidgets/gimpcolordisplaystack.c | 42 +++++++++++ libgimpwidgets/gimpcolordisplaystack.h | 38 +++++----- - modules/display-filter-color-blind.c | 131 + modules/display-filter-color-blind.c | 131 +++++++++++++++++---------------- - modules/display-filter-gamma.c | 85 +++++++++++---------- + modules/display-filter-gamma.c | 85 +++++++++++---------- modules/display-filter-high-contrast.c | 83 +++++++++++---------- - modules/display-filter-lcms.c | 119 + modules/display-filter-lcms.c | 119 ++++++++++++++++++------------ - modules/display-filter-proof.c | 112 +++++++++++++++++----------- - plug-ins/pygimp/gimpui.defs | 20 +++++ + modules/display-filter-proof.c | 112 +++++++++++++++++----------- + plug-ins/pygimp/gimpui.defs | 20 +++++ 11 files changed, 444 insertions(+), 269 deletions(-) commit 47eaecdc9d08ad2282a6db780c0fb62b85bcd69d Author: Michael Natterer -Date: Tue Jan 25 19:28:30 2011 +0100 +Date: Tue Jan 25 19:28:30 2011 +0100 libgimp: deprecate a bunch of old selection API @@ -45536,18 +46395,18 @@ I have figured how to put the parameter overkill of the remaining functions into context properties. - app/pdb/image-select-cmds.c | 10 +++---- + app/pdb/image-select-cmds.c | 10 +++---- app/pdb/selection-tools-cmds.c | 42 ++++++++++++++-------------- - libgimp/gimpimageselect_pdb.c | 22 +++++++++++---- + libgimp/gimpimageselect_pdb.c | 22 +++++++++++---- libgimp/gimpselectiontools_pdb.c | 48 +++++--------------------------- libgimp/gimpselectiontools_pdb.h | 4 +++ - plug-ins/common/screenshot.c | 6 ++-- - plug-ins/gfig/gfig-circle.c | 16 ++++++----- - plug-ins/gfig/gfig-ellipse.c | 16 ++++++----- - plug-ins/gfig/gfig-poly.c | 14 ++++++---- + plug-ins/common/screenshot.c | 6 ++-- + plug-ins/gfig/gfig-circle.c | 16 ++++++----- + plug-ins/gfig/gfig-ellipse.c | 16 ++++++----- + plug-ins/gfig/gfig-poly.c | 14 ++++++---- plug-ins/gfig/gfig-rectangle.c | 16 ++++++----- - plug-ins/gfig/gfig-star.c | 14 ++++++---- + plug-ins/gfig/gfig-star.c | 14 ++++++---- tools/pdbgen/pdb/image_select.pdb | 19 +++++++++++++ tools/pdbgen/pdb/selection_tools.pdb | 54 +++--------------------------------- @@ -45555,7 +46414,7 @@ commit 14276add926540712d450033c1720e9588e58726 Author: Omari Stephens -Date: Mon Jan 24 18:49:08 2011 +0000 +Date: Mon Jan 24 18:49:08 2011 +0000 Add missing parens around macro arguments @@ -45564,26 +46423,26 @@ commit 9703bed2ef220e0427f31f9334284e67cabeef7d Author: Michael Natterer -Date: Mon Jan 24 14:53:42 2011 +0100 +Date: Mon Jan 24 14:53:42 2011 +0100 libgimp: reorder the parameters of the new and unused gimp-image-select API Make the common "image" and "operation" parameters come first. - app/pdb/image-select-cmds.c | 172 + app/pdb/image-select-cmds.c | 172 +++++++++++++++++++------------------- - libgimp/gimpimageselect_pdb.c | 52 ++++++------ - libgimp/gimpimageselect_pdb.h | 24 +++--- - plug-ins/common/lcms.c | 2 +- - plug-ins/file-xjt/xjt.c | 5 +- + libgimp/gimpimageselect_pdb.c | 52 ++++++------ + libgimp/gimpimageselect_pdb.h | 24 +++--- + plug-ins/common/lcms.c | 2 +- + plug-ins/file-xjt/xjt.c | 5 +- plug-ins/pygimp/pygimp-vectors.c | 2 +- tools/pdbgen/pdb/image_select.pdb | 38 ++++----- 7 files changed, 148 insertions(+), 147 deletions(-) commit e5a9d0a181f03af870515a11c832365b0a4fc910 Author: Martin Nordholts -Date: Mon Jan 24 08:11:35 2011 +0100 +Date: Mon Jan 24 08:11:35 2011 +0100 Update build/buildbot/suppressed-warnings.txt @@ -45594,7 +46453,7 @@ commit 3c95ed31e07f9f2d1d1de01a705770d6b5baabaf Author: Martin Nordholts -Date: Mon Jan 24 08:10:01 2011 +0100 +Date: Mon Jan 24 08:10:01 2011 +0100 Fix compiler warning about missing newline @@ -45603,7 +46462,7 @@ commit eaba504f2a2c32fcd4750063ec65d3b284c2e7f7 Author: Pedro Barreira -Date: Mon Jan 24 00:31:09 2011 +0000 +Date: Mon Jan 24 00:31:09 2011 +0000 Updated Portuguese translation @@ -45613,17 +46472,17 @@ commit c09edb25cf6aa917bbccfba6ebaa42fbf3b4ca5b Author: Pedro Barreira -Date: Mon Jan 24 00:28:50 2011 +0000 +Date: Mon Jan 24 00:28:50 2011 +0000 Updated Portuguese translation po-tags/LINGUAS | 1 + - po-tags/pt.po | 28 ++++++++++++++++++++++++++++ + po-tags/pt.po | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) commit ed41d0e5fc0dbe72674811a9f83412978486ec26 Author: Pedro Barreira -Date: Mon Jan 24 00:25:44 2011 +0000 +Date: Mon Jan 24 00:25:44 2011 +0000 Updated Portuguese translation @@ -45633,7 +46492,7 @@ commit b5e7fc5fe4126aa56a2f5b70c113d1f58884da71 Author: Pedro Barreira -Date: Mon Jan 24 00:22:35 2011 +0000 +Date: Mon Jan 24 00:22:35 2011 +0000 Updated Portuguese translation @@ -45643,7 +46502,7 @@ commit 8ae83cf576eb2f8b43c314d50aa7451a8b96b0c9 Author: Pedro Barreira -Date: Mon Jan 24 00:05:30 2011 +0000 +Date: Mon Jan 24 00:05:30 2011 +0000 Updated Portuguese translation @@ -45653,7 +46512,7 @@ commit 5cf87ebc8206118c855f3ddc969ad3d58e8f157e Author: Pedro Barreira -Date: Sun Jan 23 23:57:06 2011 +0000 +Date: Sun Jan 23 23:57:06 2011 +0000 Updated Portuguese translation @@ -45663,7 +46522,7 @@ commit 5f9bd0c0441f763a5f96f19618486663002f4b66 Author: Alexia Death -Date: Sun Jan 23 18:14:25 2011 +0200 +Date: Sun Jan 23 18:14:25 2011 +0200 app: add reset buttons to all brush settings sliders @@ -45673,7 +46532,7 @@ commit f7af619f5daa55fe98355aaa213a7b1c8b3608a7 Author: Khaled Hosny -Date: Sun Jan 23 14:10:16 2011 +0200 +Date: Sun Jan 23 14:10:16 2011 +0200 Updated Arabic translation @@ -45683,7 +46542,7 @@ commit e41b5699ddea5fea24e967e842b90d05910677d9 Author: Alexia Death -Date: Sun Jan 23 12:21:26 2011 +0200 +Date: Sun Jan 23 12:21:26 2011 +0200 app: remove some dead code in imagehoses @@ -45692,7 +46551,7 @@ commit 3ef31e4cc82e57b29aa3d682d0ab6df08a8bb19e Author: Michael Natterer -Date: Sun Jan 23 00:30:58 2011 +0100 +Date: Sun Jan 23 00:30:58 2011 +0100 libgimpwidgets: use new GdkWindow API only when available @@ -45701,7 +46560,7 @@ commit 33479c1086c3181307ad0fe5b3c8ab53ebfd4c01 Author: Michael Natterer -Date: Sat Jan 22 23:54:25 2011 +0100 +Date: Sat Jan 22 23:54:25 2011 +0100 app: use gegl_node_has_pad() instead of gegl_node_get_pad() @@ -45710,7 +46569,7 @@ commit 3e38686693e704d777b27f3d25ef1551ec7f3c2d Author: Michael Natterer -Date: Sat Jan 22 23:53:38 2011 +0100 +Date: Sat Jan 22 23:53:38 2011 +0100 app: also bump the babl and gegl versions in sanity.c @@ -45719,7 +46578,7 @@ commit 27179d62197eb71744c0610036ce13d873a8a1e3 Author: Michael Natterer -Date: Fri Jan 21 18:18:44 2011 +0100 +Date: Fri Jan 21 18:18:44 2011 +0100 app: don't duplicate code when setting GimpSpinScale's cursor @@ -45728,7 +46587,7 @@ commit 49ed64c69e12192030fcb820b23751513065fd4e Author: Alexia Death -Date: Sun Jan 23 00:09:56 2011 +0200 +Date: Sun Jan 23 00:09:56 2011 +0200 app: remove dupilcate angle and velocity calculation from imagehoses @@ -45737,7 +46596,7 @@ commit 7056d386810b62e8a011fdd29b39082f4ae74e68 Author: Michael Muré -Date: Sat Jan 22 15:38:35 2011 +0100 +Date: Sat Jan 22 15:38:35 2011 +0100 cagetool: implement rubber band selection for edit mode, if the cage is closed @@ -45747,7 +46606,7 @@ commit aa98319f1b9a8979de8a1804be69ec680c9dfed2 Author: Michael Muré -Date: Sat Jan 22 00:44:35 2011 +0100 +Date: Sat Jan 22 00:44:35 2011 +0100 cage tool: implement options_notify to allow switching back to edit mode @@ -45761,7 +46620,7 @@ commit d80c9474cb8a960f56c734e14f94a69484939ed0 Author: Michael Muré -Date: Sun Jan 16 19:53:10 2011 +0100 +Date: Sun Jan 16 19:53:10 2011 +0100 cagetool: fix regression causing non affine-invariant transformation + update in print_cage debug function @@ -45771,7 +46630,7 @@ commit 3f581c37b613ee98013c602ed77de87f66e26f44 Author: Michael Muré -Date: Tue Jan 11 15:34:28 2011 +0100 +Date: Tue Jan 11 15:34:28 2011 +0100 cagetool: fix a drawing bug when adding point to the cage while moving cursor @@ -45781,7 +46640,7 @@ commit f379f3c467a8c733341bb21c3a9182da8ffe8b7b Author: Michael Muré -Date: Mon Jan 10 18:24:27 2011 +0100 +Date: Mon Jan 10 18:24:27 2011 +0100 fix rubber band selection for layer with offset @@ -45790,7 +46649,7 @@ commit e7d219d3871f5c24e0ec7ebccde5bdac26cc73f9 Author: Michael Muré -Date: Mon Jan 10 14:55:38 2011 +0100 +Date: Mon Jan 10 14:55:38 2011 +0100 Cage tool: add rubber band selection for deform mode @@ -45803,7 +46662,7 @@ commit dd28e1fe0278cf0e0ddb076e8aaa4d8b73500218 Author: Michael Muré -Date: Sun Jan 2 16:15:55 2011 +0100 +Date: Sun Jan 2 16:15:55 2011 +0100 Implementation of the multi-selection in the cage tool and refactoring that come with. @@ -45812,7 +46671,7 @@ that affect all the selected point in CageConfig with commit/reset displacement. - app/core/core-types.h | 1 + + app/core/core-types.h | 1 + app/gegl/gimpcageconfig.c | 298 +++++++++++++++++++++++++++++++++------------- app/gegl/gimpcageconfig.h | 22 ++-- @@ -45822,24 +46681,24 @@ commit 006c7ab9f4f6f369f1f8cf2e63932528bd48301e Author: Michael Muré -Date: Fri Dec 31 00:50:08 2010 +0100 +Date: Fri Dec 31 00:50:08 2010 +0100 refactor of the GimpCageConfig with a custom GimpCagePoint data structure - app/core/core-types.h | 12 ++- - app/gegl/gimpcageconfig.c | 156 + app/core/core-types.h | 12 ++- + app/gegl/gimpcageconfig.c | 156 +++++++++++++--------------------- - app/gegl/gimpcageconfig.h | 45 +++++----- + app/gegl/gimpcageconfig.h | 45 +++++----- app/gegl/gimpoperationcagecoefcalc.c | 4 +- app/gegl/gimpoperationcagetransform.c | 12 +-- - app/tools/gimpcagetool.c | 63 ++++++++------ - app/tools/gimpcagetool.h | 2 +- + app/tools/gimpcagetool.c | 63 ++++++++------ + app/tools/gimpcagetool.h | 2 +- 7 files changed, 139 insertions(+), 155 deletions(-) commit 23193cba2f1690d730f70834dc71f7aa3e38cfae Author: Michael Muré -Date: Fri Dec 17 14:49:37 2010 +0100 +Date: Fri Dec 17 14:49:37 2010 +0100 Rewrite of the cage tool as a state machine @@ -45852,7 +46711,7 @@ commit 927b743ac21396bac4c8fa660fa00d63223e61d9 Author: Francisco Vila -Date: Sat Jan 22 10:59:30 2011 +0100 +Date: Sat Jan 22 10:59:30 2011 +0100 Updated Spanish translation @@ -45861,7 +46720,7 @@ commit 783e73226c7bd8d1766a0337425e3976e486f329 Author: Francisco Vila -Date: Sat Jan 22 10:56:36 2011 +0100 +Date: Sat Jan 22 10:56:36 2011 +0100 Updated Spanish translation @@ -45870,7 +46729,7 @@ commit 202395bc98b418c0b1bed63b713e2e98e80eb11b Author: Francisco Vila -Date: Sat Jan 22 10:54:15 2011 +0100 +Date: Sat Jan 22 10:54:15 2011 +0100 Updated Spanish translation @@ -45880,7 +46739,7 @@ commit 18a803aff4e3b7e560c9d9f56f36719c04b04be2 Author: Francisco Vila -Date: Sat Jan 22 10:46:24 2011 +0100 +Date: Sat Jan 22 10:46:24 2011 +0100 Updated Spanish translation @@ -45890,7 +46749,7 @@ commit b334e1cb6fd6e2c33e8d222b4a22d304217a37f7 Author: Francisco Vila -Date: Sat Jan 22 10:44:37 2011 +0100 +Date: Sat Jan 22 10:44:37 2011 +0100 Updated Spanish translation @@ -45899,7 +46758,7 @@ commit c2176f465951966b1be2fd96cbf2d2224d3c0e32 Author: Francisco Vila -Date: Sat Jan 22 10:44:26 2011 +0100 +Date: Sat Jan 22 10:44:26 2011 +0100 Added Spanish translation @@ -45908,7 +46767,7 @@ commit 5f34d0b3503284352310471a50167a91aec3806f Author: Francisco Vila -Date: Sat Jan 22 10:42:18 2011 +0100 +Date: Sat Jan 22 10:42:18 2011 +0100 Updated Spanish translation @@ -45918,7 +46777,7 @@ commit 3cf6d8c2b3f67f8368a80134abd52dd646a9b844 Author: Alexandre Prokoudine -Date: Sat Jan 22 00:53:05 2011 +0300 +Date: Sat Jan 22 00:53:05 2011 +0300 Fix for caret return in Russian translation, as spotted by zend @@ -45927,7 +46786,7 @@ commit 79d187fbb342ead52ea9e5af662c2c3c826d86f3 Author: Øyvind Kolås -Date: Fri Jan 21 12:49:22 2011 +0000 +Date: Fri Jan 21 12:49:22 2011 +0000 bump GEGL and babl requirements to 0.1.4 @@ -45940,7 +46799,7 @@ commit 022cc99fe4c2f2a42d32494f9cf63a05d51e7cc8 Author: Francisco Vila -Date: Thu Jan 20 20:45:08 2011 +0100 +Date: Thu Jan 20 20:45:08 2011 +0100 Updated Spanish translation @@ -45950,7 +46809,7 @@ commit 2d62fc65a9ae7cd124a0ce6d74ab7a8d40289796 Author: Francisco Vila -Date: Thu Jan 20 20:43:44 2011 +0100 +Date: Thu Jan 20 20:43:44 2011 +0100 Updated Spanish translation @@ -45960,7 +46819,7 @@ commit d155be622d6b1987f0c52181b4d1c22ac4b631ca Author: Michael Natterer -Date: Thu Jan 20 20:23:14 2011 +0100 +Date: Thu Jan 20 20:23:14 2011 +0100 libgimpwidgets: fix ruler motion event tracking on offscreen overlays @@ -45969,15 +46828,15 @@ ruler's coordinate system when updating the marker. app/display/gimpdisplayshell.c | 8 +- - libgimpwidgets/gimpruler.c | 239 + libgimpwidgets/gimpruler.c | 239 ++++++++++++++++++++++++++++++++++++----- - libgimpwidgets/gimpruler.h | 38 ++++--- + libgimpwidgets/gimpruler.h | 38 ++++--- libgimpwidgets/gimpwidgets.def | 2 + 4 files changed, 239 insertions(+), 48 deletions(-) commit e27b5f6da2d40fdfbc863dab0067a41173aa9a6b Author: Michael Natterer -Date: Thu Jan 20 14:57:28 2011 +0100 +Date: Thu Jan 20 14:57:28 2011 +0100 app: remove unused variable in gimp_channel_tree_view_constructed() @@ -45986,7 +46845,7 @@ commit 4186d0114fd0bd2ae29490c01d9e240ea1c0bdfe Author: Michael Natterer -Date: Wed Jan 19 19:43:10 2011 +0100 +Date: Wed Jan 19 19:43:10 2011 +0100 app: add comment to improve readability @@ -45995,7 +46854,7 @@ commit 550669962b0d26b578ae3667fab782507d7e06ef Author: Michael Natterer -Date: Wed Jan 19 19:07:13 2011 +0100 +Date: Wed Jan 19 19:07:13 2011 +0100 622863 - Input Devices list is not resizeable @@ -46004,13 +46863,13 @@ app/widgets/gimpdeviceeditor.c | 8 +++----- app/widgets/gimpdeviceeditor.h | 4 ++-- - themes/Default/gtkrc | 1 + - themes/Small/gtkrc | 1 + + themes/Default/gtkrc | 1 + + themes/Small/gtkrc | 1 + 4 files changed, 7 insertions(+), 7 deletions(-) commit 8a8e8c6fad2580805c5bba7331548f7ed5528c93 Author: Kevin Cozens -Date: Wed Jan 19 15:30:47 2011 -0500 +Date: Wed Jan 19 15:30:47 2011 -0500 Fixed OP_INTEGERP op-code to match version in Tinyscheme 1.40 @@ -46026,18 +46885,18 @@ commit eb04265ce3d14759b9114a0bee87fbb527d74b34 Author: Michael Natterer -Date: Mon Jan 17 23:20:01 2011 +0100 +Date: Mon Jan 17 23:20:01 2011 +0100 app: gimp_brush_core_clamp_brush_scale() -> gimp_brush_clamp_scale() - app/core/gimpbrush.c | 12 ++++++++++++ - app/core/gimpbrush.h | 3 +++ + app/core/gimpbrush.c | 12 ++++++++++++ + app/core/gimpbrush.h | 3 +++ app/paint/gimpbrushcore.c | 18 +++--------------- 3 files changed, 18 insertions(+), 15 deletions(-) commit 403edb853f20671750d2705e63067e07d5708729 Author: Bartosz Kosiorek -Date: Mon Jan 17 16:36:13 2011 +0100 +Date: Mon Jan 17 16:36:13 2011 +0100 Updated Polish translation @@ -46046,7 +46905,7 @@ commit d4c6a1a3b7c83b20200734a5813b6137bfc763f2 Author: Bartosz Kosiorek -Date: Mon Jan 17 16:35:52 2011 +0100 +Date: Mon Jan 17 16:35:52 2011 +0100 Updated Polish translation @@ -46056,7 +46915,7 @@ commit 368ba5459c94b70e95095049980257a9a4b693b1 Author: Bartosz Kosiorek -Date: Mon Jan 17 16:35:12 2011 +0100 +Date: Mon Jan 17 16:35:12 2011 +0100 Updated Polish translation @@ -46065,7 +46924,7 @@ commit 10cb47144a084a4677947a6ad570a5afb97ced20 Author: Bartosz Kosiorek -Date: Mon Jan 17 16:34:29 2011 +0100 +Date: Mon Jan 17 16:34:29 2011 +0100 Updated Polish translation @@ -46075,7 +46934,7 @@ commit 9f71f7aff353ac06df5943551fc1478c644cf899 Author: Bartosz Kosiorek -Date: Mon Jan 17 16:32:27 2011 +0100 +Date: Mon Jan 17 16:32:27 2011 +0100 Updated Polish translation @@ -46085,7 +46944,7 @@ commit 5c471ecea3e18118de8fa68a0220cab0b35531d3 Author: Kevin Cozens -Date: Sun Jan 16 23:09:24 2011 -0500 +Date: Sun Jan 16 23:09:24 2011 -0500 Fixed an out of place line in the comment block at the start of the file. @@ -46095,7 +46954,7 @@ commit f571ebf2470ef057abec64ed66095f9462c8e016 Author: Kevin Cozens -Date: Sun Jan 16 16:26:57 2011 -0500 +Date: Sun Jan 16 16:26:57 2011 -0500 Fix for SourceForge bug #2826594 (allow reverse to work on empty list). @@ -46108,7 +46967,7 @@ commit 73f9f652bcc3e60ff39df862d2775d88eaf5e5eb Author: Kevin Cozens -Date: Sun Jan 2 01:46:58 2011 -0500 +Date: Sun Jan 2 01:46:58 2011 -0500 Added URL to document referenced in comment block at top of file. @@ -46117,73 +46976,73 @@ commit 202124c438435ed543a035505a8bc83b603458cb Author: Michael Natterer -Date: Fri Jan 14 09:38:11 2011 +0100 +Date: Fri Jan 14 09:38:11 2011 +0100 app: implement GObject::constructed() instead of ::constructor() - app/widgets/gimpactiongroup.c | 46 ++++----- - app/widgets/gimpbrusheditor.c | 19 ++-- - app/widgets/gimpbrushselect.c | 72 +++++++------- - app/widgets/gimpchanneltreeview.c | 57 +++++------- - app/widgets/gimpcolormapeditor.c | 22 ++--- - app/widgets/gimpcombotagentry.c | 24 ++--- - app/widgets/gimpcontainericonview.c | 30 ++---- - app/widgets/gimpcontainertreestore.c | 52 +++++------ - app/widgets/gimpcontainertreeview.c | 30 ++---- - app/widgets/gimpcontrollereditor.c | 74 +++++++-------- - app/widgets/gimpcontrollerkeyboard.c | 19 ++-- - app/widgets/gimpcontrollerlist.c | 53 +++++------ - app/widgets/gimpcontrollerwheel.c | 19 ++-- - app/widgets/gimpdataeditor.c | 90 ++++++++---------- - app/widgets/gimpdeviceeditor.c | 85 ++++++++--------- - app/widgets/gimpdeviceinfo.c | 46 ++++----- - app/widgets/gimpdeviceinfoeditor.c | 85 ++++++++--------- - app/widgets/gimpdevicestatus.c | 22 ++--- - app/widgets/gimpdockwindow.c | 119 +++++++++++------------- - app/widgets/gimpdrawabletreeview.c | 28 ++---- - app/widgets/gimpdynamicseditor.c | 19 ++-- + app/widgets/gimpactiongroup.c | 46 ++++----- + app/widgets/gimpbrusheditor.c | 19 ++-- + app/widgets/gimpbrushselect.c | 72 +++++++------- + app/widgets/gimpchanneltreeview.c | 57 +++++------- + app/widgets/gimpcolormapeditor.c | 22 ++--- + app/widgets/gimpcombotagentry.c | 24 ++--- + app/widgets/gimpcontainericonview.c | 30 ++---- + app/widgets/gimpcontainertreestore.c | 52 +++++------ + app/widgets/gimpcontainertreeview.c | 30 ++---- + app/widgets/gimpcontrollereditor.c | 74 +++++++-------- + app/widgets/gimpcontrollerkeyboard.c | 19 ++-- + app/widgets/gimpcontrollerlist.c | 53 +++++------ + app/widgets/gimpcontrollerwheel.c | 19 ++-- + app/widgets/gimpdataeditor.c | 90 ++++++++---------- + app/widgets/gimpdeviceeditor.c | 85 ++++++++--------- + app/widgets/gimpdeviceinfo.c | 46 ++++----- + app/widgets/gimpdeviceinfoeditor.c | 85 ++++++++--------- + app/widgets/gimpdevicestatus.c | 22 ++--- + app/widgets/gimpdockwindow.c | 119 +++++++++++------------- + app/widgets/gimpdrawabletreeview.c | 28 ++---- + app/widgets/gimpdynamicseditor.c | 19 ++-- app/widgets/gimpdynamicsoutputeditor.c | 82 ++++++++-------- - app/widgets/gimpeditor.c | 88 ++++++++---------- - app/widgets/gimperrorconsole.c | 22 ++--- - app/widgets/gimpfilleditor.c | 40 ++++---- - app/widgets/gimpfontselect.c | 22 ++--- - app/widgets/gimpgradienteditor.c | 22 ++--- - app/widgets/gimpgradientselect.c | 58 +++++------- - app/widgets/gimpgrideditor.c | 165 + app/widgets/gimpeditor.c | 88 ++++++++---------- + app/widgets/gimperrorconsole.c | 22 ++--- + app/widgets/gimpfilleditor.c | 40 ++++---- + app/widgets/gimpfontselect.c | 22 ++--- + app/widgets/gimpgradienteditor.c | 22 ++--- + app/widgets/gimpgradientselect.c | 58 +++++------- + app/widgets/gimpgrideditor.c | 165 ++++++++++++++++----------------- - app/widgets/gimpimageparasiteview.c | 116 +++++++++++------------ - app/widgets/gimpimagepropview.c | 92 +++++++++--------- - app/widgets/gimpitemtreeview.c | 31 ++----- - app/widgets/gimplanguageentry.c | 22 ++--- - app/widgets/gimplanguagestore.c | 33 +++---- - app/widgets/gimplayertreeview.c | 27 ++---- - app/widgets/gimpmessagebox.c | 62 ++++++------- - app/widgets/gimppaletteeditor.c | 22 ++--- - app/widgets/gimppaletteselect.c | 22 ++--- - app/widgets/gimppatternselect.c | 22 ++--- - app/widgets/gimppdbdialog.c | 62 ++++++------- + app/widgets/gimpimageparasiteview.c | 116 +++++++++++------------ + app/widgets/gimpimagepropview.c | 92 +++++++++--------- + app/widgets/gimpitemtreeview.c | 31 ++----- + app/widgets/gimplanguageentry.c | 22 ++--- + app/widgets/gimplanguagestore.c | 33 +++---- + app/widgets/gimplayertreeview.c | 27 ++---- + app/widgets/gimpmessagebox.c | 62 ++++++------- + app/widgets/gimppaletteeditor.c | 22 ++--- + app/widgets/gimppaletteselect.c | 22 ++--- + app/widgets/gimppatternselect.c | 22 ++--- + app/widgets/gimppdbdialog.c | 62 ++++++------- app/widgets/gimpprofilechooserdialog.c | 25 ++--- - app/widgets/gimpsamplepointeditor.c | 48 ++++------ - app/widgets/gimpselectioneditor.c | 22 ++--- - app/widgets/gimpsettingsbox.c | 22 ++--- - app/widgets/gimpsettingseditor.c | 74 +++++++-------- - app/widgets/gimpsizebox.c | 54 +++++------ - app/widgets/gimpstrokeeditor.c | 126 ++++++++++++------------- - app/widgets/gimptagpopup.c | 135 +++++++++++++-------------- - app/widgets/gimptemplateeditor.c | 22 ++--- - app/widgets/gimptextbuffer.c | 32 +++---- - app/widgets/gimptextstyleeditor.c | 22 ++--- - app/widgets/gimptooloptionseditor.c | 38 +++----- - app/widgets/gimptoolpreseteditor.c | 43 ++++----- - app/widgets/gimptranslationstore.c | 33 +++---- - app/widgets/gimpuimanager.c | 22 ++--- - app/widgets/gimpundoeditor.c | 58 +++++------- - app/widgets/gimpvectorstreeview.c | 31 +++---- + app/widgets/gimpsamplepointeditor.c | 48 ++++------ + app/widgets/gimpselectioneditor.c | 22 ++--- + app/widgets/gimpsettingsbox.c | 22 ++--- + app/widgets/gimpsettingseditor.c | 74 +++++++-------- + app/widgets/gimpsizebox.c | 54 +++++------ + app/widgets/gimpstrokeeditor.c | 126 ++++++++++++------------- + app/widgets/gimptagpopup.c | 135 +++++++++++++-------------- + app/widgets/gimptemplateeditor.c | 22 ++--- + app/widgets/gimptextbuffer.c | 32 +++---- + app/widgets/gimptextstyleeditor.c | 22 ++--- + app/widgets/gimptooloptionseditor.c | 38 +++----- + app/widgets/gimptoolpreseteditor.c | 43 ++++----- + app/widgets/gimptranslationstore.c | 33 +++---- + app/widgets/gimpuimanager.c | 22 ++--- + app/widgets/gimpundoeditor.c | 58 +++++------- + app/widgets/gimpvectorstreeview.c | 31 +++---- 57 files changed, 1176 insertions(+), 1652 deletions(-) commit 0a1a2915d0da823bc2cf988d498ad31844346dd4 Author: Michael Natterer -Date: Fri Jan 14 09:37:31 2011 +0100 +Date: Fri Jan 14 09:37:31 2011 +0100 plug-ins: implement GObject::constructed() instead of ::constructor() @@ -46195,7 +47054,7 @@ commit cad3778eeaca428db7e25412d724805d0fd235f0 Author: Øyvind Kolås -Date: Thu Jan 13 23:02:50 2011 +0000 +Date: Thu Jan 13 23:02:50 2011 +0000 gegl-tool: remove render ops from blacklist @@ -46208,102 +47067,102 @@ commit 503a9cebcea7d5b70a38b9a8c1623e3e9c30cdf7 Author: Michael Natterer -Date: Thu Jan 13 10:06:07 2011 +0100 +Date: Thu Jan 13 10:06:07 2011 +0100 app: implement GObject::constructed() instead of ::constructor() - app/tools/gimpaligntool.c | 32 +++------ - app/tools/gimpbrushtool.c | 96 ++++++++++++-------------- - app/tools/gimpcolorpickertool.c | 82 ++++++++++------------ - app/tools/gimpcroptool.c | 114 + app/tools/gimpaligntool.c | 32 +++------ + app/tools/gimpbrushtool.c | 96 ++++++++++++-------------- + app/tools/gimpcolorpickertool.c | 82 ++++++++++------------ + app/tools/gimpcroptool.c | 114 +++++++++++++++---------------- - app/tools/gimpforegroundselecttool.c | 22 ++---- + app/tools/gimpforegroundselecttool.c | 22 ++---- app/tools/gimpforegroundselecttoolundo.c | 46 ++++++------- - app/tools/gimpimagemaptool.c | 23 +++---- - app/tools/gimppainttool.c | 28 +++----- - app/tools/gimpperspectiveclonetool.c | 32 ++++----- - app/tools/gimprectangleselecttool.c | 25 +++---- - app/tools/gimptexttool.c | 25 +++---- - app/tools/gimptransformtool.c | 28 +++----- - app/tools/gimptransformtoolundo.c | 50 ++++++-------- + app/tools/gimpimagemaptool.c | 23 +++---- + app/tools/gimppainttool.c | 28 +++----- + app/tools/gimpperspectiveclonetool.c | 32 ++++----- + app/tools/gimprectangleselecttool.c | 25 +++---- + app/tools/gimptexttool.c | 25 +++---- + app/tools/gimptransformtool.c | 28 +++----- + app/tools/gimptransformtoolundo.c | 50 ++++++-------- 13 files changed, 249 insertions(+), 354 deletions(-) commit c1b357564810fd7e300a32b9fc07821768d8a7b4 Author: Michael Natterer -Date: Wed Jan 12 23:06:03 2011 +0100 +Date: Wed Jan 12 23:06:03 2011 +0100 app: implement GObject::constructed() instead of ::constructor() app/display/gimpdisplayshell.c | 22 +++++---------- - app/paint/gimpinkundo.c | 32 +++++++++------------- - app/paint/gimppaintcoreundo.c | 50 +++++++++++++++------------------- - app/text/gimptextundo.c | 56 + app/paint/gimpinkundo.c | 32 +++++++++------------- + app/paint/gimppaintcoreundo.c | 50 +++++++++++++++------------------- + app/text/gimptextundo.c | 56 +++++++++++++++++---------------------- app/vectors/gimpvectorsmodundo.c | 36 ++++++++++--------------- app/vectors/gimpvectorspropundo.c | 31 ++++++++-------------- - app/vectors/gimpvectorsundo.c | 52 + app/vectors/gimpvectorsundo.c | 52 +++++++++++++++--------------------- 7 files changed, 110 insertions(+), 169 deletions(-) commit 5e4eee4653cdb27794d272a4ec9da8041a9cc9c6 Author: Michael Natterer -Date: Wed Jan 12 22:53:58 2011 +0100 +Date: Wed Jan 12 22:53:58 2011 +0100 app: implement GObject::constructed() instead of ::constructor() - app/core/gimpbrushclipboard.c | 22 ++++-------- + app/core/gimpbrushclipboard.c | 22 ++++-------- app/core/gimpchannelpropundo.c | 28 ++++++--------- - app/core/gimpchannelundo.c | 52 +++++++++++---------------- - app/core/gimpcontext.c | 18 ++++------ - app/core/gimpdata.c | 66 +++++++++++++++------------------- + app/core/gimpchannelundo.c | 52 +++++++++++---------------- + app/core/gimpcontext.c | 18 ++++------ + app/core/gimpdata.c | 66 +++++++++++++++------------------- app/core/gimpdrawablemodundo.c | 57 +++++++++++++---------------- - app/core/gimpdrawablestack.c | 78 + app/core/gimpdrawablestack.c | 78 ++++++++++++++++++---------------------- - app/core/gimpdrawableundo.c | 56 +++++++++++++---------------- + app/core/gimpdrawableundo.c | 56 +++++++++++++---------------- app/core/gimpfilteredcontainer.c | 25 ++++--------- app/core/gimpfloatingselundo.c | 28 ++++++--------- - app/core/gimpgrouplayerundo.c | 28 ++++++--------- - app/core/gimpguideundo.c | 50 +++++++++++--------------- - app/core/gimpimage.c | 25 +++++-------- - app/core/gimpimageundo.c | 56 +++++++++++++---------------- - app/core/gimpitempropundo.c | 56 +++++++++++++---------------- - app/core/gimpitemstack.c | 30 ++++++---------- - app/core/gimpitemtree.c | 57 +++++++++++++---------------- - app/core/gimpitemundo.c | 44 ++++++++++------------- + app/core/gimpgrouplayerundo.c | 28 ++++++--------- + app/core/gimpguideundo.c | 50 +++++++++++--------------- + app/core/gimpimage.c | 25 +++++-------- + app/core/gimpimageundo.c | 56 +++++++++++++---------------- + app/core/gimpitempropundo.c | 56 +++++++++++++---------------- + app/core/gimpitemstack.c | 30 ++++++---------- + app/core/gimpitemtree.c | 57 +++++++++++++---------------- + app/core/gimpitemundo.c | 44 ++++++++++------------- app/core/gimplayermaskpropundo.c | 26 ++++++-------- - app/core/gimplayermaskundo.c | 56 +++++++++++++---------------- - app/core/gimplayerpropundo.c | 28 ++++++--------- - app/core/gimplayerundo.c | 52 +++++++++++---------------- - app/core/gimpmaskundo.c | 36 ++++++++----------- + app/core/gimplayermaskundo.c | 56 +++++++++++++---------------- + app/core/gimplayerpropundo.c | 28 ++++++--------- + app/core/gimplayerundo.c | 52 +++++++++++---------------- + app/core/gimpmaskundo.c | 36 ++++++++----------- app/core/gimppatternclipboard.c | 22 ++++-------- - app/core/gimppdbprogress.c | 22 ++++-------- + app/core/gimppdbprogress.c | 22 ++++-------- app/core/gimpsamplepointundo.c | 50 +++++++++++--------------- - app/core/gimptoolpreset.c | 22 ++++-------- - app/core/gimpundo.c | 22 ++++-------- + app/core/gimptoolpreset.c | 22 ++++-------- + app/core/gimpundo.c | 22 ++++-------- 28 files changed, 441 insertions(+), 671 deletions(-) commit 8d2d16ac258da5cc1a0f7f7cb3bda4455b797f2a Author: Michael Natterer -Date: Wed Jan 12 22:03:33 2011 +0100 +Date: Wed Jan 12 22:03:33 2011 +0100 libgimp*: implement GObject::constructed() instead of ::constructor() - libgimp/gimpaspectpreview.c | 20 +++++-------- - libgimp/gimpdrawablepreview.c | 20 +++++-------- - libgimp/gimpzoompreview.c | 24 +++++---------- - libgimpwidgets/gimpchainbutton.c | 22 +++++--------- - libgimpwidgets/gimpcolordisplay.c | 21 +++++-------- + libgimp/gimpaspectpreview.c | 20 +++++-------- + libgimp/gimpdrawablepreview.c | 20 +++++-------- + libgimp/gimpzoompreview.c | 24 +++++---------- + libgimpwidgets/gimpchainbutton.c | 22 +++++--------- + libgimpwidgets/gimpcolordisplay.c | 21 +++++-------- libgimpwidgets/gimpcolorprofilestore.c | 22 +++++--------- - libgimpwidgets/gimpdialog.c | 55 + libgimpwidgets/gimpdialog.c | 55 ++++++++++++++++------------------ - libgimpwidgets/gimphintbox.c | 42 +++++++++++--------------- - libgimpwidgets/gimpintstore.c | 42 ++++++++++---------------- - libgimpwidgets/gimpstringcombobox.c | 39 ++++++++++-------------- + libgimpwidgets/gimphintbox.c | 42 +++++++++++--------------- + libgimpwidgets/gimpintstore.c | 42 ++++++++++---------------- + libgimpwidgets/gimpstringcombobox.c | 39 ++++++++++-------------- 10 files changed, 118 insertions(+), 189 deletions(-) commit 229007106e3fbdadbc7bb731124601f65b7e7de7 Author: Michael Natterer -Date: Tue Jan 11 15:38:23 2011 +0100 +Date: Tue Jan 11 15:38:23 2011 +0100 app: don't pass the GtkStyle to gimp_curve_view_draw_grid() @@ -46316,19 +47175,19 @@ commit 803df9b58ab5d7b4c90f3ffbd72ada762fe1ffd9 Author: Alexia Death -Date: Sun Jan 9 22:53:11 2011 +0200 +Date: Sun Jan 9 22:53:11 2011 +0200 app: Make smooth paint core internal app/paint/gimpbrushcore.c | 6 ------ - app/paint/gimpink.c | 26 +++++++++++--------------- + app/paint/gimpink.c | 26 +++++++++++--------------- app/paint/gimppaintcore.c | 30 +++++++++++++++++------------- app/paint/gimppaintcore.h | 4 ---- 4 files changed, 28 insertions(+), 38 deletions(-) commit 292ac61056f4a732f7633f442fe9b07df8b1d348 Author: Michael Natterer -Date: Sun Jan 9 21:42:51 2011 +0100 +Date: Sun Jan 9 21:42:51 2011 +0100 Bug 638042 - Undo/Redo name for toggling "Disable Layer Mask" is incorrect @@ -46341,7 +47200,7 @@ commit 0f4bb64625c151d17d14819fbab5b507fa14b3b9 Author: Pedro Barreira -Date: Sun Jan 9 19:52:29 2011 +0000 +Date: Sun Jan 9 19:52:29 2011 +0000 Updated Portuguese translation @@ -46351,7 +47210,7 @@ commit 4073505aed5c74a55b68e1d843978d812a1f4704 Author: Pedro Barreira -Date: Sun Jan 9 18:35:03 2011 +0000 +Date: Sun Jan 9 18:35:03 2011 +0000 Updated Portuguese translation @@ -46361,7 +47220,7 @@ commit 70574877d3dd78c477a60302e395a31de20df750 Author: Michael Natterer -Date: Sun Jan 9 00:21:10 2011 +0100 +Date: Sun Jan 9 00:21:10 2011 +0100 app: use GimpSpinScale for the new smoothing options @@ -46374,23 +47233,23 @@ commit c29aefccc2f1d5e406926bd494927078025d2dee Author: Michael Natterer -Date: Sat Jan 8 22:18:56 2011 +0100 +Date: Sat Jan 8 22:18:56 2011 +0100 app: fix coding style in the new smoothing code - app/paint/gimpbrushcore.c | 10 ++++--- - app/paint/gimpink.c | 15 +++++----- - app/paint/gimpink.h | 5 ++-- - app/paint/gimppaintcore.c | 65 + app/paint/gimpbrushcore.c | 10 ++++--- + app/paint/gimpink.c | 15 +++++----- + app/paint/gimpink.h | 5 ++-- + app/paint/gimppaintcore.c | 65 +++++++++++++++++++++------------------- - app/paint/gimppaintcore.h | 1 - - app/paint/gimppaintoptions.c | 35 +++++++++++----------- + app/paint/gimppaintcore.h | 1 - + app/paint/gimppaintoptions.c | 35 +++++++++++----------- app/tools/gimppaintoptions-gui.c | 6 ++-- 7 files changed, 72 insertions(+), 65 deletions(-) commit efd6c905722088e60431d28659e67e19ad64d17b Author: Michael Natterer -Date: Sat Jan 8 21:56:40 2011 +0100 +Date: Sat Jan 8 21:56:40 2011 +0100 plug-ins: remove calls to gtk_range_set_update_policy() where useless @@ -46400,13 +47259,13 @@ plug-ins/common/color-exchange.c | 14 -------------- plug-ins/common/contrast-retinex.c | 7 ------- - plug-ins/common/file-mng.c | 3 --- - plug-ins/common/filter-pack.c | 2 -- + plug-ins/common/file-mng.c | 3 --- + plug-ins/common/filter-pack.c | 2 -- 4 files changed, 26 deletions(-) commit 413dc0331d6a4949191353fe628c56187ed4f819 Author: Michael Natterer -Date: Sat Jan 8 21:55:25 2011 +0100 +Date: Sat Jan 8 21:55:25 2011 +0100 libgimpwidgets: don't call gtk_dialog_set_has_separator() @@ -46418,24 +47277,24 @@ commit 339deed1da1ec89d65a4993c85d0d2af96ea0d5e Author: Alexia Death -Date: Fri Jan 7 20:45:29 2011 +0200 +Date: Fri Jan 7 20:45:29 2011 +0200 app: Clean up smooth so it would be acceptable for master - app/paint/gimpbrushcore.c | 8 +-- - app/paint/gimpink.c | 7 +- - app/paint/gimpink.h | 1 - - app/paint/gimppaintcore.c | 78 +++++++++++++++++++-- - app/paint/gimppaintcore.h | 8 ++- - app/paint/gimppaintoptions.c | 143 + app/paint/gimpbrushcore.c | 8 +-- + app/paint/gimpink.c | 7 +- + app/paint/gimpink.h | 1 - + app/paint/gimppaintcore.c | 78 +++++++++++++++++++-- + app/paint/gimppaintcore.h | 8 ++- + app/paint/gimppaintoptions.c | 143 +++++---------------------------------- - app/paint/gimppaintoptions.h | 25 +------ + app/paint/gimppaintoptions.h | 25 +------ app/tools/gimppaintoptions-gui.c | 12 ++-- 8 files changed, 108 insertions(+), 174 deletions(-) commit 082aa272a4915127144b44a3faf2b2f3754525e1 Author: Alexia Death -Date: Fri Oct 22 21:47:36 2010 +0900 +Date: Fri Oct 22 21:47:36 2010 +0900 app: G-Pen algorithm for GIMP trunk. Now smoothing function works for Ink and Brush tools. @@ -46446,20 +47305,20 @@ in email fields. Original author is tarai, from gimp painter project in sourceforge. - app/paint/gimpbrushcore.c | 7 +- - app/paint/gimpink.c | 28 +++--- - app/paint/gimpink.h | 6 +- - app/paint/gimppaintcore.c | 7 ++ - app/paint/gimppaintcore.h | 3 + - app/paint/gimppaintoptions.c | 178 + app/paint/gimpbrushcore.c | 7 +- + app/paint/gimpink.c | 28 +++--- + app/paint/gimpink.h | 6 +- + app/paint/gimppaintcore.c | 7 ++ + app/paint/gimppaintcore.h | 3 + + app/paint/gimppaintoptions.c | 178 +++++++++++++++++++++++++++++++++++++-- - app/paint/gimppaintoptions.h | 32 +++++++ + app/paint/gimppaintoptions.h | 32 +++++++ app/tools/gimppaintoptions-gui.c | 50 +++++++++-- 8 files changed, 282 insertions(+), 29 deletions(-) commit 73b5e1d8a6deddba9f349c9ed32467f1db1cfe20 Author: Michael Natterer -Date: Fri Jan 7 19:38:34 2011 +0100 +Date: Fri Jan 7 19:38:34 2011 +0100 libgimpwidgets: remove commented-out code @@ -46468,7 +47327,7 @@ commit 4aa36044f70b6e813b58e49e63a2ab1647f4df53 Author: Michael Natterer -Date: Fri Jan 7 19:33:45 2011 +0100 +Date: Fri Jan 7 19:33:45 2011 +0100 app: no need to set GTK_UPDATE_DELAYED on the levels scale @@ -46479,21 +47338,21 @@ commit 6d6ec380858c4db25611f6f9cf21fdeb8957a382 Author: Michael Natterer -Date: Fri Jan 7 17:18:48 2011 +0100 +Date: Fri Jan 7 17:18:48 2011 +0100 app: no need to set a GtkRange's update-policy to CONTINUOUS because it's the default. app/tools/gimpbrightnesscontrasttool.c | 5 ----- - app/tools/gimpcolorbalancetool.c | 1 - - app/tools/gimpcolorizetool.c | 7 ------- - app/tools/gimphuesaturationtool.c | 13 ------------- + app/tools/gimpcolorbalancetool.c | 1 - + app/tools/gimpcolorizetool.c | 7 ------- + app/tools/gimphuesaturationtool.c | 13 ------------- 4 files changed, 26 deletions(-) commit 0f0da4c7120031a3fd43e39f364bc653f41039b4 Author: Michael Natterer -Date: Fri Jan 7 15:09:17 2011 +0100 +Date: Fri Jan 7 15:09:17 2011 +0100 app: various gradient editor changes and fixes @@ -46502,16 +47361,16 @@ - move the color area left of the labels now that the toggle is gone app/actions/gradient-editor-commands.c | 4 +- - app/widgets/gimpgradienteditor.c | 70 + app/widgets/gimpgradienteditor.c | 70 +++++++++------------------------- - app/widgets/gimpgradienteditor.h | 3 -- + app/widgets/gimpgradienteditor.h | 3 -- app/widgets/gimpviewrenderergradient.c | 6 +-- app/widgets/gimpviewrenderergradient.h | 3 +- 5 files changed, 21 insertions(+), 65 deletions(-) commit 60ebedb31940110a62d8a9e3c513d3d83ed01b07 Author: Michael Natterer -Date: Fri Jan 7 15:06:56 2011 +0100 +Date: Fri Jan 7 15:06:56 2011 +0100 libgimpwidgets: no need to set a GtkRange's update-policy to CONTINUOUS @@ -46523,18 +47382,18 @@ commit c294c5f12c620a2938ad3edbaf5bb65712e8852e Author: Alan Monfort -Date: Thu Jan 6 18:16:31 2011 +0100 +Date: Thu Jan 6 18:16:31 2011 +0100 Updated breton translation po-script-fu/br.po | 405 +++++---------- - po/br.po | 1423 + po/br.po | 1423 +++++++++++++++++++++++++--------------------------- 2 files changed, 832 insertions(+), 996 deletions(-) commit 527f282cf2436075b94bb53fca7b540eaf81ebe4 Author: Joe Hansen -Date: Sun Jan 2 10:34:32 2011 +0100 +Date: Sun Jan 2 10:34:32 2011 +0100 Updated Danish translation @@ -46544,7 +47403,7 @@ commit 386695fdf48560e3802448493f0d8752d6f46cb5 Author: Tryneeds-Chinese -Date: Sat Jan 1 19:47:51 2011 +0800 +Date: Sat Jan 1 19:47:51 2011 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) @@ -46558,15 +47417,15 @@ po-script-fu/zh_TW.po | 30 +- po-tags/zh_HK.po | 4 +- po-tags/zh_TW.po | 2 +- - po/zh_HK.po | 3196 + po/zh_HK.po | 3196 ++++++++++++++++++++++++---------------------- - po/zh_TW.po | 3406 + po/zh_TW.po | 3406 ++++++++++++++++++++++++++----------------------- 12 files changed, 4608 insertions(+), 4306 deletions(-) commit fcf644e26fe8a369d1b85251a2eb8d0a0b911c6f Author: Alexandre Prokoudine -Date: Fri Dec 31 23:49:17 2010 +0300 +Date: Fri Dec 31 23:49:17 2010 +0300 Updated Russian translation @@ -46576,7 +47435,7 @@ commit 430a6db6fbcb69924b7e39d556e25ff35f3f0905 Author: 神州散人 -Date: Thu Dec 30 16:19:26 2010 +0000 +Date: Thu Dec 30 16:19:26 2010 +0000 Update Chinese (China) translation. @@ -46586,7 +47445,7 @@ commit 68be37aefa3dd51ceb1841a5fd1b3f4fb7f80362 Author: mike2718 -Date: Thu Dec 30 16:16:04 2010 +0000 +Date: Thu Dec 30 16:16:04 2010 +0000 Update Chinese (China) translation. @@ -46596,7 +47455,7 @@ commit 97541579e8206ee2435ac753a515220eaa7a3303 Author: Wouter Bolsterlee -Date: Thu Dec 30 02:53:04 2010 +0100 +Date: Thu Dec 30 02:53:04 2010 +0100 Typo fix in Dutch translation @@ -46605,7 +47464,7 @@ commit 1d35d90698896f4953b8b96be7c400c886d5c861 Author: Petr Kovar -Date: Mon Dec 27 21:57:27 2010 +0100 +Date: Mon Dec 27 21:57:27 2010 +0100 Update Czech translation by Miroslav Sulc @@ -46617,7 +47476,7 @@ commit b7399f827dbea5ee54333b52f1698c38019f4320 Author: Marco Ciampa -Date: Mon Dec 20 22:46:51 2010 +0100 +Date: Mon Dec 20 22:46:51 2010 +0100 Updated italian translation. @@ -46627,7 +47486,7 @@ commit 5caee48645ad833550577e1f46dcfb32b8e3d078 Author: Michael Natterer -Date: Mon Dec 20 19:59:22 2010 +0100 +Date: Mon Dec 20 19:59:22 2010 +0100 app: run all input axes through gimp_device_info_map_axis() @@ -46636,12 +47495,12 @@ app/widgets/gimpdeviceinfo-coords.c | 38 ++++++++++++++++++------------------- - app/widgets/gimpdeviceinfo.c | 23 +++++++++++++++++----- + app/widgets/gimpdeviceinfo.c | 23 +++++++++++++++++----- 2 files changed, 36 insertions(+), 25 deletions(-) commit bfbe938fa34781fbb0bb36693a4e983e62f47bb8 Author: Mattias Põldaru -Date: Mon Dec 20 15:32:05 2010 +0200 +Date: Mon Dec 20 15:32:05 2010 +0200 [l10n] Updated Estonian translation @@ -46651,7 +47510,7 @@ commit 62b0e96609885bca657baca1fc2497a865649368 Author: Michael Natterer -Date: Sun Dec 19 21:23:54 2010 +0100 +Date: Sun Dec 19 21:23:54 2010 +0100 app: add gimp_devices_add_widget() @@ -46661,24 +47520,24 @@ affected widgets except for the canvas. app/display/gimpdisplayshell.c | 8 +++----- - app/widgets/gimpdevices.c | 17 ++++++++++++++++- - app/widgets/gimpdevices.h | 3 +++ - app/widgets/gimptoolbox.c | 7 +------ + app/widgets/gimpdevices.c | 17 ++++++++++++++++- + app/widgets/gimpdevices.h | 3 +++ + app/widgets/gimptoolbox.c | 7 +------ 4 files changed, 23 insertions(+), 12 deletions(-) commit e82e40033a9d90956aff5159331af51fed3ad436 Author: Michael Natterer -Date: Sun Dec 19 20:39:18 2010 +0100 +Date: Sun Dec 19 20:39:18 2010 +0100 app: some cosmetic cleanup in the item's node handling code app/core/gimpdrawable.c | 13 +++++-------- - app/core/gimpitem.c | 7 ++----- + app/core/gimpitem.c | 7 ++----- 2 files changed, 7 insertions(+), 13 deletions(-) commit 1e013e774cf331e18c871c74f0d128ad4c96c15c Author: Michael Natterer -Date: Sat Dec 18 23:28:20 2010 +0100 +Date: Sat Dec 18 23:28:20 2010 +0100 app: some cleanup in gimp_paned_box_position_drop_indicator() @@ -46687,7 +47546,7 @@ commit cac40f2db9dc5ff3d0cf081e592f4ddae9547903 Author: Michael Natterer -Date: Sat Dec 18 22:42:09 2010 +0100 +Date: Sat Dec 18 22:42:09 2010 +0100 app: make themes_apply_theme() private, it's only used in themes.c @@ -46697,7 +47556,7 @@ commit 0e55c5e4d81b402f217b47f31855d77f5f8b6aa0 Author: Mikael Magnusson -Date: Sat Dec 18 00:31:22 2010 +0100 +Date: Sat Dec 18 00:31:22 2010 +0100 libgimpwidgets: avoid using a function only available since GTK+ 2.22 @@ -46706,7 +47565,7 @@ commit 780579554a352b43060e378eee91ae27d8f4c8d8 Author: Mikael Magnusson -Date: Fri Dec 17 22:51:41 2010 +0100 +Date: Fri Dec 17 22:51:41 2010 +0100 libgimpwidgets: undef GDK_DISABLE_DEPRECATED in gimppixmap.c @@ -46715,7 +47574,7 @@ commit 2471f37660aa859ce0c0a8a89903723fab1740be Author: Mikael Magnusson -Date: Fri Dec 17 22:49:55 2010 +0100 +Date: Fri Dec 17 22:49:55 2010 +0100 libgimpwidgets: port the ruler from deprecated gdk to cairo @@ -46727,7 +47586,7 @@ commit 644a272f19a04a7e65c52ab425129e90af1f02e0 Author: Mikael Magnusson -Date: Fri Dec 17 22:24:56 2010 +0100 +Date: Fri Dec 17 22:24:56 2010 +0100 libgimpwidgets: port gimppreviewarea from deprecated gdk to cairo @@ -46739,7 +47598,7 @@ commit 44ceeb246e4db6e59f2e0eb245e96a0d3ae9a19d Author: Øyvind Kolås -Date: Fri Dec 17 03:20:01 2010 +0000 +Date: Fri Dec 17 03:20:01 2010 +0000 app: serialize signals from gimpoperationtilesink @@ -46753,7 +47612,7 @@ commit 4609bab1dd27e7b971754e8b380435484e4226d2 Author: Michael Natterer -Date: Thu Dec 9 23:45:00 2010 +0100 +Date: Thu Dec 9 23:45:00 2010 +0100 app: use gtk_entry_set_width_chars() to override GtkEntry's default width @@ -46763,7 +47622,7 @@ commit bb91ba9d01fd06ca1c346b8b79100dfd5fdce340 Author: Michael Natterer -Date: Thu Dec 9 22:56:58 2010 +0100 +Date: Thu Dec 9 22:56:58 2010 +0100 app: update the device name's style when devices get added/removed @@ -46776,7 +47635,7 @@ commit 9c98b0b8046bbe4e1bf43e072dcd918f31d7e37b Author: Michael Natterer -Date: Thu Dec 9 22:02:24 2010 +0100 +Date: Thu Dec 9 22:02:24 2010 +0100 app: sort present devices to the beginning of the device list @@ -46787,7 +47646,7 @@ commit 6e2d56a9b8756d2def025c739252660804dc4dfc Author: Michael Natterer -Date: Thu Dec 9 21:46:01 2010 +0100 +Date: Thu Dec 9 21:46:01 2010 +0100 app: don't reverse the device list after loading, it's sorted by name @@ -46796,7 +47655,7 @@ commit 8bc0e569eca3209fe5a679f06ed3b3bcd00bb4cd Author: Michael Natterer -Date: Thu Dec 9 21:45:04 2010 +0100 +Date: Thu Dec 9 21:45:04 2010 +0100 app: use gimp_object_name_collate() when sorting device names @@ -46805,7 +47664,7 @@ commit d91a1d5b6c81eea058e246b85a2f33eb3f1bc720 Author: Michael Natterer -Date: Thu Dec 9 20:55:53 2010 +0100 +Date: Thu Dec 9 20:55:53 2010 +0100 app: don't call g_object_set_data() on a NULL object @@ -46814,7 +47673,7 @@ commit 43c593bb3c5f947b4bcff5d86154b9ddcc936387 Author: Michael Natterer -Date: Thu Dec 9 15:29:57 2010 +0100 +Date: Thu Dec 9 15:29:57 2010 +0100 app: remove obsolete linking workarounds, they break the build on OSX @@ -46823,7 +47682,7 @@ commit 8a2a18b7925890f32a9e52b31add4e598acb895e Author: Rob Antonishen -Date: Wed Dec 8 14:37:24 2010 -0500 +Date: Wed Dec 8 14:37:24 2010 -0500 Increased maximum radius to 500 in unsharp-mask plugin @@ -46832,7 +47691,7 @@ commit 60242667be7038fbeb9e1782f5594d3828c927ee Author: Mikael Magnusson -Date: Wed Dec 8 10:18:09 2010 +0100 +Date: Wed Dec 8 10:18:09 2010 +0100 app: don't use -1 for geometry hints where not allowed @@ -46841,7 +47700,7 @@ commit 748fac5c0070fa617839851035ba92456dc0fac7 Author: Michael Natterer -Date: Tue Dec 7 19:57:13 2010 +0100 +Date: Tue Dec 7 19:57:13 2010 +0100 app: g_printerr() a warning if grabbing fails @@ -46854,7 +47713,7 @@ commit 0ba0b637f25597998095974d6ebccd23b7e35aed Author: Michael Natterer -Date: Mon Dec 6 10:23:15 2010 +0100 +Date: Mon Dec 6 10:23:15 2010 +0100 app: add gimp_devices_check_callback() with the signature of an event callback @@ -46868,7 +47727,7 @@ commit e50f6aaf0fcba3eaba844a7ce499de27e50a1b09 Author: Michael Natterer -Date: Mon Dec 6 10:18:32 2010 +0100 +Date: Mon Dec 6 10:18:32 2010 +0100 app: make gimp_devices_select_device() private @@ -46879,7 +47738,7 @@ commit eb0591f97dca152ec827db083f910b6a9ea16369 Author: Alexia Death -Date: Wed Dec 1 19:28:32 2010 +0200 +Date: Wed Dec 1 19:28:32 2010 +0200 New splash screen made by Alexia Death @@ -46888,7 +47747,7 @@ commit d6f28f2274b8def5ed583bd6a33ce902042fbcfb Author: Michael Natterer -Date: Mon Nov 29 22:04:56 2010 +0100 +Date: Mon Nov 29 22:04:56 2010 +0100 Bug 550662 - DND prefers text/plain over text/svg+xml, should be other way around @@ -46899,12 +47758,12 @@ app/display/gimpdisplayshell-dnd.c | 6 +++--- app/widgets/gimplayertreeview.c | 4 ++-- - app/widgets/gimptoolbox-dnd.c | 8 ++++---- + app/widgets/gimptoolbox-dnd.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) commit 4b729086a9f36a978e8e9355da1dce930fec0c44 Author: Michael Natterer -Date: Mon Nov 29 15:41:38 2010 +0100 +Date: Mon Nov 29 15:41:38 2010 +0100 app: cast GtkTargetEntry.target to gchar* when freeing it @@ -46915,19 +47774,19 @@ commit c3dfe847cf7b6859780e1e13b6c202a58e2f433b Author: Marco Ciampa -Date: Mon Nov 29 09:31:57 2010 +0100 +Date: Mon Nov 29 09:31:57 2010 +0100 Updated italian translation po-plug-ins/it.po | 839 ++++++++++++++++++---------------- - po-script-fu/it.po | 28 +- - po/it.po | 1296 + po-script-fu/it.po | 28 +- + po/it.po | 1296 +++++++++++++++++++++++++++------------------------- 3 files changed, 1119 insertions(+), 1044 deletions(-) commit 36de5a2ab1f4917d4c28baa08167bbce80252868 Author: Michael Natterer -Date: Sun Nov 28 15:28:28 2010 +0100 +Date: Sun Nov 28 15:28:28 2010 +0100 Bug 630376 - Crash with text layer / text tools stay on canvas when text info is discarded @@ -46939,7 +47798,7 @@ commit 0b38824448cf7f509822abed0dbd885ae0da11d7 Author: Michael Natterer -Date: Sun Nov 28 15:27:35 2010 +0100 +Date: Sun Nov 28 15:27:35 2010 +0100 app: add a "text" property to GimpTextLayer and emit notifications for it @@ -46949,7 +47808,7 @@ commit 54d33500d81c2844a341c2812f249b958eb970ec Author: Michael Natterer -Date: Sun Nov 28 13:35:09 2010 +0100 +Date: Sun Nov 28 13:35:09 2010 +0100 app: move updating the shells' appearance to a utility function @@ -46962,7 +47821,7 @@ commit ffcbe2c16515edd0154eb248380bb4ac4561618b Author: Michael Natterer -Date: Sun Nov 28 13:19:06 2010 +0100 +Date: Sun Nov 28 13:19:06 2010 +0100 Bug 622311 - Get rid of status bar grip window in single-window mode @@ -46973,13 +47832,13 @@ right thing to do anyway). app/display/gimpdisplayshell-appearance.c | 17 +++++++++++++-- - app/gui/gimpuiconfigurer.c | 35 + app/gui/gimpuiconfigurer.c | 35 +++++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 6 deletions(-) commit 357e25bfd166d16c71b324ce702ac0adf8f4e351 Author: Michael Natterer -Date: Sun Nov 28 13:16:35 2010 +0100 +Date: Sun Nov 28 13:16:35 2010 +0100 app: move the cage tool after all other transform tools, not before them @@ -46989,7 +47848,7 @@ commit fcaf202b5210433baaccd04500248619a251926c Author: Michael Natterer -Date: Sat Nov 27 23:42:28 2010 +0100 +Date: Sat Nov 27 23:42:28 2010 +0100 app: leftover code was setting the sensitivity of an unrelated label @@ -46998,7 +47857,7 @@ commit c4ec18790c50c8fa04f723cb9de73f722070095f Author: Michael Natterer -Date: Sat Nov 27 22:28:34 2010 +0100 +Date: Sat Nov 27 22:28:34 2010 +0100 Bug 598253 - Bug when copying path from a document to another document @@ -47006,7 +47865,7 @@ a size just as pixel images, and there is no reason not to use that size as-is. - app/actions/edit-commands.c | 2 +- + app/actions/edit-commands.c | 2 +- app/actions/vectors-commands.c | 2 +- app/display/gimpdisplayshell-dnd.c | 2 +- app/widgets/gimpvectorstreeview.c | 2 +- @@ -47014,7 +47873,7 @@ commit 2dd634e4b6a94be833d0dad9f7dfe94b4473a2b3 Author: Khaled Hosny -Date: Sat Nov 27 16:37:12 2010 +0200 +Date: Sat Nov 27 16:37:12 2010 +0200 Updated Arabic translation @@ -47024,7 +47883,7 @@ commit 5bcabf2794ecf5621a3b48090572755732412615 Author: Miloš Popović -Date: Fri Nov 26 19:51:10 2010 +0100 +Date: Fri Nov 26 19:51:10 2010 +0100 Updated Serbian translation @@ -47033,11 +47892,11 @@ commit c492bc24c418d7687f3799ecd74d04d24e20b936 Author: Miloš Popović -Date: Fri Nov 26 19:48:50 2010 +0100 +Date: Fri Nov 26 19:48:50 2010 +0100 Updated Serbian translation - po/sr.po | 2962 + po/sr.po | 2962 +++++++++++++++++++++++++++-------------------------- po/sr@latin.po | 3104 +++++++++++++++++++++++++++++--------------------------- @@ -47045,7 +47904,7 @@ commit b1106845d48fcf8a5940feed0af523c8d26e21c4 Author: Michael Natterer -Date: Fri Nov 26 10:44:46 2010 +0100 +Date: Fri Nov 26 10:44:46 2010 +0100 app: the tool-list and tool-grid views are gone, don't try to open them @@ -47055,7 +47914,7 @@ commit bbe0e757b80b492f12ccd4c4b8c82fc8e3fd95bf Author: Michael Natterer -Date: Fri Nov 26 09:19:36 2010 +0100 +Date: Fri Nov 26 09:19:36 2010 +0100 app: some GimpImageWindow cleanup @@ -47071,7 +47930,7 @@ commit 689d69abe71d3178de3aa35c75b3aaa1bf9e6a34 Author: Michael Natterer -Date: Thu Nov 25 23:49:41 2010 +0100 +Date: Thu Nov 25 23:49:41 2010 +0100 Bug 582083 - GIMP brushes are not recognized by Nautilus @@ -47083,7 +47942,7 @@ commit 3242ad592e96a1e577a2cfacb927516cbc08deea Author: Michael Natterer -Date: Thu Nov 25 23:28:25 2010 +0100 +Date: Thu Nov 25 23:28:25 2010 +0100 plug-ins: don't forget to set the progress to 1.0 when finished @@ -47093,32 +47952,32 @@ commit bbc3943638d55ff097ed88715d51a0d0e78ede3c Author: Michael Natterer -Date: Thu Nov 25 21:30:29 2010 +0100 +Date: Thu Nov 25 21:30:29 2010 +0100 app: some cleanup in the new paint options code - app/paint/gimppaintoptions.c | 27 +++++++-------- - app/paint/gimppaintoptions.h | 17 +++++---- + app/paint/gimppaintoptions.c | 27 +++++++-------- + app/paint/gimppaintoptions.h | 17 +++++---- app/tools/gimppaintoptions-gui.c | 74 +++++++++++++++++----------------------- 3 files changed, 52 insertions(+), 66 deletions(-) commit 904048cdcbdd47b5fb896c2dfc4431b7ee60ff9c Author: Alexia Death -Date: Wed Nov 24 23:34:00 2010 +0200 +Date: Wed Nov 24 23:34:00 2010 +0200 app: Clearly present Fade and Color dynamics options as such - app/core/gimpdynamicsoutput.c | 30 ++--- - app/paint/gimppaintoptions.c | 238 + app/core/gimpdynamicsoutput.c | 30 ++--- + app/paint/gimppaintoptions.c | 238 ++++++++++++++++----------------------- - app/paint/gimppaintoptions.h | 4 +- + app/paint/gimppaintoptions.h | 4 +- app/tools/gimppaintoptions-gui.c | 131 +++++++++++---------- 4 files changed, 174 insertions(+), 229 deletions(-) commit d46b53f63ddfe3fd1189f599842af683c2e8b0b0 Author: Michael Natterer -Date: Thu Nov 25 11:31:40 2010 +0100 +Date: Thu Nov 25 11:31:40 2010 +0100 Bug 635040 - Edit -> Stroke Path performs no action on an incomplete path @@ -47130,13 +47989,13 @@ app/core/gimpdrawable-stroke.c | 76 ++++++++++++++++++++++++++---------------- app/core/gimpdrawable-stroke.h | 46 +++++++++++++------------ - app/tools/gimprectangletool.c | 4 +-- - app/vectors/gimpvectors.c | 17 ++++++---- + app/tools/gimprectangletool.c | 4 +-- + app/vectors/gimpvectors.c | 17 ++++++---- 4 files changed, 84 insertions(+), 59 deletions(-) commit 77a5999f13beb151e98af67926a5a63e3eb7007f Author: Michael Natterer -Date: Thu Nov 25 00:04:41 2010 +0100 +Date: Thu Nov 25 00:04:41 2010 +0100 Bug 634315 - gimptextlayout.c: typo in assignment @@ -47145,7 +48004,7 @@ commit 88f2af98aa5da976b4a62553f89d94752d0f936f Author: Michael Natterer -Date: Wed Nov 24 23:01:50 2010 +0100 +Date: Wed Nov 24 23:01:50 2010 +0100 app: clean up the dynamics editor @@ -47158,7 +48017,7 @@ commit 65c62642598755c3454e3f6206d5846ded3df868 Author: Michael Natterer -Date: Wed Nov 24 22:31:56 2010 +0100 +Date: Wed Nov 24 22:31:56 2010 +0100 app: change icon for brush size reset button and add tooltip @@ -47167,7 +48026,7 @@ commit 711313e8586afd75c229a8d75fe369969d3237fa Author: Michael Natterer -Date: Wed Nov 24 22:03:04 2010 +0100 +Date: Wed Nov 24 22:03:04 2010 +0100 build: remove suppressed warnings (see commit below) @@ -47176,33 +48035,33 @@ commit 09ebacdb824cc63da32fa098a1c1d93ce0d7767a Author: Michael Natterer -Date: Wed Nov 24 22:02:22 2010 +0100 +Date: Wed Nov 24 22:02:22 2010 +0100 pygimp: undeprecate quite some stuff - plug-ins/pygimp/gimpmodule.c | 10 +- + plug-ins/pygimp/gimpmodule.c | 10 +- plug-ins/pygimp/pygimp-drawable.c | 208 ++++++++++++++++++++++++++------------ 2 files changed, 154 insertions(+), 64 deletions(-) commit 7b320c7bf66156b6fc1c8b556a42fdaf14a187db Author: Michael Natterer -Date: Sun Nov 21 16:09:09 2010 +0100 +Date: Sun Nov 21 16:09:09 2010 +0100 Get rid of DOS line endings - app/base/base-utils.c | 280 ++--- - app/base/base-utils.h | 56 +- - build/.gitignore | 2 +- - build/Makefile.am | 2 +- - build/windows/gimprc.rule | 20 +- + app/base/base-utils.c | 280 ++--- + app/base/base-utils.h | 56 +- + build/.gitignore | 2 +- + build/Makefile.am | 2 +- + build/windows/gimprc.rule | 20 +- modules/controller-dx-dinput.c | 2246 ++++++++++++++++++++-------------------- 6 files changed, 1303 insertions(+), 1303 deletions(-) commit 223ae53fcc7667e202b5f0838d5d5053ddedb567 Author: Michael Natterer -Date: Sun Nov 21 14:13:58 2010 +0100 +Date: Sun Nov 21 14:13:58 2010 +0100 app: set the cage tool's dirty mask so it is canceled upon image changes @@ -47212,7 +48071,7 @@ commit ef87b83ff028a8a6511c84ee0252a8181db2f199 Author: Michael Natterer -Date: Sat Nov 20 20:44:16 2010 +0100 +Date: Sat Nov 20 20:44:16 2010 +0100 app: change toolbox geometry hints to something that's closer to the docs @@ -47224,7 +48083,7 @@ commit a598b2d1be4d1dff4c4b25366c0ddb4a4a2cff03 Author: Michael Natterer -Date: Sat Nov 20 20:37:15 2010 +0100 +Date: Sat Nov 20 20:37:15 2010 +0100 app: I don't know what I was thinking when changing these function names... @@ -47234,7 +48093,7 @@ commit 74a09704bab56a97b93a0395ee8631d634bbcc8d Author: Michael Natterer -Date: Sat Nov 20 15:18:09 2010 +0100 +Date: Sat Nov 20 15:18:09 2010 +0100 app: some toolbox cleanup @@ -47251,7 +48110,7 @@ commit 0327f701b15bbe9b219520eff9d388ce7f3246ad Author: Martin Nordholts -Date: Sat Nov 20 14:13:44 2010 +0100 +Date: Sat Nov 20 14:13:44 2010 +0100 po: Update POTFILES.in @@ -47260,7 +48119,7 @@ commit cfde98394cd646197794871f0a6bdbdd8f256b9a Author: Mukund Sivaraman -Date: Sat Nov 20 12:38:58 2010 +0530 +Date: Sat Nov 20 12:38:58 2010 +0530 Fix scheme for (integer? 7.0) which should return #t @@ -47269,7 +48128,7 @@ commit e4a96c738eb46e33ed150f40aff441b1ad5fabe4 Author: Michael Natterer -Date: Sat Nov 20 10:20:52 2010 +0100 +Date: Sat Nov 20 10:20:52 2010 +0100 app: factor out duplicated code to gimp_tool_palette_get_button_size() @@ -47283,7 +48142,7 @@ commit 281969b45dbe10ed2920625560b15d1e5dd35af8 Author: Michael Natterer -Date: Fri Nov 19 23:52:09 2010 +0100 +Date: Fri Nov 19 23:52:09 2010 +0100 app: add GimpToolPalette which derives from GtkToolPalette @@ -47296,13 +48155,13 @@ ++++++++++++++++++++++++++++++++++++++++++ app/widgets/gimptoolpalette.h | 53 +++++ app/widgets/widgets-types.h | 1 + - themes/Default/gtkrc | 4 +- - themes/Small/gtkrc | 4 +- + themes/Default/gtkrc | 4 +- + themes/Small/gtkrc | 4 +- 7 files changed, 709 insertions(+), 418 deletions(-) commit b5ece8b364d60df414b6f7f80d9aaa0d3023e27f Author: Michael Natterer -Date: Fri Nov 19 15:19:24 2010 +0100 +Date: Fri Nov 19 15:19:24 2010 +0100 app: the ink sensitivity spin scales need two decimal digits precision @@ -47311,7 +48170,7 @@ commit 6960dda6f2b19013d77b720447a8b6c4a87f556c Author: Michael Natterer -Date: Fri Nov 19 14:08:37 2010 +0100 +Date: Fri Nov 19 14:08:37 2010 +0100 app: draw GimpSpinScale's label with style->text, not style->fg @@ -47320,7 +48179,7 @@ commit 04c4eedb4c6d544de088c74949579f0a683898c0 Author: Michael Natterer -Date: Fri Nov 19 12:02:57 2010 +0100 +Date: Fri Nov 19 12:02:57 2010 +0100 app: indentation @@ -47329,7 +48188,7 @@ commit 2b8605639d935d997dd95c3f6aebd7be91dade31 Author: Alexia Death -Date: Wed Nov 17 19:55:16 2010 +0200 +Date: Wed Nov 17 19:55:16 2010 +0200 app: Disable somewhat obsolete stroke smooth @@ -47338,30 +48197,30 @@ commit 20afb328a7aeec1d6c9ec349092bb94df7b1e5c0 Author: Alexia Death -Date: Wed Nov 17 00:03:07 2010 +0200 +Date: Wed Nov 17 00:03:07 2010 +0200 app: Unify direction calculation for painting and stroking - app/core/gimpcoords.c | 46 + app/core/gimpcoords.c | 46 +++++++++++++++++++++++++++++++++++ - app/core/gimpcoords.h | 3 +++ + app/core/gimpcoords.h | 3 +++ app/display/gimpdisplayshell-coords.c | 20 +++++++-------- app/paint/gimppaintcore-stroke.c | 26 +++----------------- 4 files changed, 61 insertions(+), 34 deletions(-) commit 7a3dc6ee38e9f8de0e6d5ba59df30bf560234c56 Author: Michael Natterer -Date: Mon Nov 15 00:23:18 2010 +0100 +Date: Mon Nov 15 00:23:18 2010 +0100 app: remove unused #includes app/display/gimpdisplayshell-expose.c | 1 - - app/tools/gimpdrawtool.c | 1 - + app/tools/gimpdrawtool.c | 1 - 2 files changed, 2 deletions(-) commit 41269d35bee120fd226dd5ad0c3eff536d6a2d21 Author: Michael Natterer -Date: Sun Nov 14 22:12:54 2010 +0100 +Date: Sun Nov 14 22:12:54 2010 +0100 app: fix antique copyright header @@ -47371,7 +48230,7 @@ commit dc564954d5c26bc6e0a0862ea381c55ff2c7f34c Author: Michael Natterer -Date: Sun Nov 14 16:43:21 2010 +0100 +Date: Sun Nov 14 16:43:21 2010 +0100 app: namespace the ink blob @@ -47380,8 +48239,8 @@ app/paint/gimpink-blob.c | 178 +++++++++++++++++++++---------------------- app/paint/gimpink-blob.h | 82 ++++++++++---------- - app/paint/gimpink.c | 126 +++++++++++++++--------------- - app/paint/gimpink.h | 6 +- + app/paint/gimpink.c | 126 +++++++++++++++--------------- + app/paint/gimpink.h | 6 +- app/paint/gimpinkundo.c | 6 +- app/paint/gimpinkundo.h | 2 +- app/widgets/gimpblobeditor.c | 16 ++-- @@ -47389,7 +48248,7 @@ commit c4cd420ef84decba42011502a9d3704d178f3020 Author: Michael Natterer -Date: Sun Nov 14 16:29:42 2010 +0100 +Date: Sun Nov 14 16:29:42 2010 +0100 app: rename GIMP_INK_BLOB_TYPE_ELLIPSE to GIMP_INK_BLOB_TYPE_CIRCLE @@ -47400,18 +48259,18 @@ one-liner because the enum names now match their resp. stock items - app/paint/gimpink.c | 2 +- - app/paint/gimpinkoptions.c | 2 +- - app/paint/paint-enums.c | 4 +-- - app/paint/paint-enums.h | 2 +- + app/paint/gimpink.c | 2 +- + app/paint/gimpinkoptions.c | 2 +- + app/paint/paint-enums.c | 4 +-- + app/paint/paint-enums.h | 2 +- app/tools/gimpinkoptions-gui.c | 69 ++++++------------------------------------ - app/widgets/gimpblobeditor.c | 4 +-- + app/widgets/gimpblobeditor.c | 4 +-- 6 files changed, 16 insertions(+), 67 deletions(-) commit ae9f6d1b3f10702322fece9f38658e744d39cbf6 Author: Michael Natterer -Date: Sat Nov 13 23:02:07 2010 +0100 +Date: Sat Nov 13 23:02:07 2010 +0100 app: remove the unused gimp_display_shell_expose_vectors() @@ -47422,7 +48281,7 @@ commit 5cea26b6e5f1eec498ba56f1d7bac993616b042a Author: Michael Natterer -Date: Sat Nov 13 22:58:43 2010 +0100 +Date: Sat Nov 13 22:58:43 2010 +0100 app: gimp_display_shell_expose_region(): return if the canvas is not realized @@ -47434,7 +48293,7 @@ commit a9217d4233e10c0734a296d08e495503e3cff22f Author: Michael Natterer -Date: Sat Nov 13 22:58:10 2010 +0100 +Date: Sat Nov 13 22:58:10 2010 +0100 app: set the grid canvas item invisible by default @@ -47443,7 +48302,7 @@ commit f72d8a4a398284fd10f87a5e6b0505f32764dfcd Author: Nelson A. de Oliveira -Date: Tue Nov 9 16:06:00 2010 -0200 +Date: Tue Nov 9 16:06:00 2010 -0200 Move file opening block to after some tests @@ -47455,41 +48314,41 @@ commit 7666e5cf36b037e8da11f9535c73f4eeb24b49cd Author: Nelson A. de Oliveira -Date: Tue Nov 9 16:03:47 2010 -0200 +Date: Tue Nov 9 16:03:47 2010 -0200 Fix memory and descriptor leaks - modules/gimpinputdevicestore-dx.c | 7 ++++++- - plug-ins/common/crop-zealous.c | 2 ++ - plug-ins/common/curve-bend.c | 1 + - plug-ins/common/file-cel.c | 1 + - plug-ins/common/file-compressor.c | 1 + - plug-ins/common/file-csource.c | 1 + - plug-ins/common/file-dicom.c | 4 ++++ - plug-ins/common/file-gbr.c | 1 + - plug-ins/common/file-gih.c | 1 + - plug-ins/common/file-header.c | 2 ++ - plug-ins/common/file-html-table.c | 1 + - plug-ins/common/file-pcx.c | 8 ++++++++ - plug-ins/common/file-psp.c | 1 + - plug-ins/common/file-sunras.c | 1 + - plug-ins/common/file-xwd.c | 4 ++++ - plug-ins/common/mail.c | 2 ++ - plug-ins/file-bmp/bmp-read.c | 1 + - plug-ins/file-ico/ico-save.c | 1 + - plug-ins/file-psd/psd-image-res-load.c | 7 +++++++ - plug-ins/file-psd/psd-load.c | 3 +++ - plug-ins/file-psd/psd-util.c | 2 ++ + modules/gimpinputdevicestore-dx.c | 7 ++++++- + plug-ins/common/crop-zealous.c | 2 ++ + plug-ins/common/curve-bend.c | 1 + + plug-ins/common/file-cel.c | 1 + + plug-ins/common/file-compressor.c | 1 + + plug-ins/common/file-csource.c | 1 + + plug-ins/common/file-dicom.c | 4 ++++ + plug-ins/common/file-gbr.c | 1 + + plug-ins/common/file-gih.c | 1 + + plug-ins/common/file-header.c | 2 ++ + plug-ins/common/file-html-table.c | 1 + + plug-ins/common/file-pcx.c | 8 ++++++++ + plug-ins/common/file-psp.c | 1 + + plug-ins/common/file-sunras.c | 1 + + plug-ins/common/file-xwd.c | 4 ++++ + plug-ins/common/mail.c | 2 ++ + plug-ins/file-bmp/bmp-read.c | 1 + + plug-ins/file-ico/ico-save.c | 1 + + plug-ins/file-psd/psd-image-res-load.c | 7 +++++++ + plug-ins/file-psd/psd-load.c | 3 +++ + plug-ins/file-psd/psd-util.c | 2 ++ plug-ins/fractal-explorer/fractal-explorer-dialogs.c | 2 ++ - plug-ins/fractal-explorer/fractal-explorer.c | 2 ++ - plug-ins/gfig/gfig.c | 4 ++++ - plug-ins/gimpressionist/ppmtool.c | 1 + - plug-ins/ifs-compose/ifs-compose-utils.c | 1 + + plug-ins/fractal-explorer/fractal-explorer.c | 2 ++ + plug-ins/gfig/gfig.c | 4 ++++ + plug-ins/gimpressionist/ppmtool.c | 1 + + plug-ins/ifs-compose/ifs-compose-utils.c | 1 + 26 files changed, 61 insertions(+), 1 deletion(-) commit e4532fe2a8b6fa9175acb19460d34e7e83062079 Author: Michael Natterer -Date: Fri Nov 12 20:18:03 2010 +0100 +Date: Fri Nov 12 20:18:03 2010 +0100 app: call gimp_canvas_item_begin,end_change() around passe partout changes @@ -47502,24 +48361,24 @@ commit 458230bf8d976d1903246bd7ca82767060394183 Author: Michael Natterer -Date: Fri Nov 12 19:47:51 2010 +0100 +Date: Fri Nov 12 19:47:51 2010 +0100 app: use a GimpCanvasPassePartout for drawing the crop highlight and remove all old drawing logic. app/display/gimpdisplayshell-callbacks.c | 11 -------- - app/display/gimpdisplayshell-draw.c | 27 -------------------- - app/display/gimpdisplayshell-draw.h | 6 ----- - app/display/gimpdisplayshell-items.c | 7 ++++++ - app/display/gimpdisplayshell.c | 43 + app/display/gimpdisplayshell-draw.c | 27 -------------------- + app/display/gimpdisplayshell-draw.h | 6 ----- + app/display/gimpdisplayshell-items.c | 7 ++++++ + app/display/gimpdisplayshell.c | 43 ++++++++------------------------ - app/display/gimpdisplayshell.h | 1 + + app/display/gimpdisplayshell.h | 1 + 6 files changed, 18 insertions(+), 77 deletions(-) commit cca8273f5ed0d86eb25803c6a151a6d7f1107013 Author: Michael Natterer -Date: Fri Nov 12 19:45:01 2010 +0100 +Date: Fri Nov 12 19:45:01 2010 +0100 app: fix the canvas passe partout's extents @@ -47528,7 +48387,7 @@ commit e7f8758f5c217c91d5668708fbb45de748086e9a Author: Michael Natterer -Date: Wed Nov 10 19:37:58 2010 +0100 +Date: Wed Nov 10 19:37:58 2010 +0100 app: remove gimp_image_map_is_busy() again @@ -47538,7 +48397,7 @@ commit dc9018bd147b02f0d4d6ba8f680cb96822e4db04 Author: Michael Natterer -Date: Wed Nov 10 19:08:01 2010 +0100 +Date: Wed Nov 10 19:08:01 2010 +0100 app: implement GimpTool::options_notify() @@ -47548,7 +48407,7 @@ commit 5fa1e9ea40a09613d3e019711cae16964e0f01be Author: Alexia Death -Date: Wed Nov 10 19:11:49 2010 +0200 +Date: Wed Nov 10 19:11:49 2010 +0200 app: Tell the user how to commit the cage transform @@ -47557,7 +48416,7 @@ commit ef44bfedad3c248fba2935ff88c15efcde86d6af Author: Michael Natterer -Date: Wed Nov 10 14:39:30 2010 +0100 +Date: Wed Nov 10 14:39:30 2010 +0100 app: check for GIMP_BUTTON_RELEASE_CANCEL, not GDK_BUTTON3_MASK @@ -47566,7 +48425,7 @@ commit 372bc90f653bc8c5fe003bb2be644a79045d8a60 Author: Mikael Magnusson -Date: Sun Nov 7 19:26:48 2010 +0100 +Date: Sun Nov 7 19:26:48 2010 +0100 app: fix right-click cancelling a transform tool @@ -47578,7 +48437,7 @@ commit d6e76a10d611b4e88abee914ae423cc3c431c355 Author: Mikael Magnusson -Date: Sun Nov 7 19:26:25 2010 +0100 +Date: Sun Nov 7 19:26:25 2010 +0100 app: fix redraw after cancelling a transform tool with right-click cancelling @@ -47588,7 +48447,7 @@ commit 32926c9b6ab1f916623ef84bc225ce5d4b2be34a Author: Michael Natterer -Date: Wed Nov 10 14:20:33 2010 +0100 +Date: Wed Nov 10 14:20:33 2010 +0100 app: implement GimpTool::options_notify() @@ -47601,7 +48460,7 @@ commit 9e5eca8fd1c5317b08c5e9d5b061451854a582d1 Author: Michael Natterer -Date: Wed Nov 10 14:18:33 2010 +0100 +Date: Wed Nov 10 14:18:33 2010 +0100 app: add virtual function GimpTool::options_notify() @@ -47615,7 +48474,7 @@ commit 3b09aaa5f137913861064abeae7f91882d357286 Author: Michael Natterer -Date: Wed Nov 10 11:40:48 2010 +0100 +Date: Wed Nov 10 11:40:48 2010 +0100 app: property ID enums don't need to be public @@ -47625,7 +48484,7 @@ commit 3ac37bbff0098c6d641cb296d8b99ff38522f3ce Author: Michael Natterer -Date: Wed Nov 10 09:30:07 2010 +0100 +Date: Wed Nov 10 09:30:07 2010 +0100 app: formatting; move variables to local scopes @@ -47635,7 +48494,7 @@ commit 6bf13efbc82d9ef0004c9fa16cdf9dd965b8820a Author: Michael Natterer -Date: Wed Nov 10 00:16:34 2010 +0100 +Date: Wed Nov 10 00:16:34 2010 +0100 app: use gimp_widget_flush_expose() for the statusbar's progress @@ -47644,7 +48503,7 @@ commit 41cad26f12c3be75cdfa2f311865afcb24782a0b Author: Michael Natterer -Date: Wed Nov 10 00:14:22 2010 +0100 +Date: Wed Nov 10 00:14:22 2010 +0100 app: don't run the main loop manually after calling gimp_progress_set_value() @@ -47654,7 +48513,7 @@ commit 1741d39d8b03d0a30e01c4136964a8815a7f2931 Author: Michael Natterer -Date: Wed Nov 10 00:13:07 2010 +0100 +Date: Wed Nov 10 00:13:07 2010 +0100 app: gimp_widget_flush_expose() return if the widget is not drawable @@ -47663,7 +48522,7 @@ commit f6a284dc4cc7e15c75bab64f52783883c3d880a2 Author: Michael Natterer -Date: Tue Nov 9 19:35:54 2010 +0100 +Date: Tue Nov 9 19:35:54 2010 +0100 app: use a canvas progress in the cage tool @@ -47676,11 +48535,11 @@ commit cff73863c5671d4940e15a58c08e89f9d3520cb0 Author: Michael Natterer -Date: Tue Nov 9 19:35:04 2010 +0100 +Date: Tue Nov 9 19:35:04 2010 +0100 app: add GimpCanvasProgress, an on-canvas progress item - app/display/Makefile.am | 2 + + app/display/Makefile.am | 2 + app/display/gimpcanvasprogress.c | 429 +++++++++++++++++++++++++++++++++++++++ app/display/gimpcanvasprogress.h | 58 ++++++ @@ -47688,7 +48547,7 @@ commit cacf8b550f4b5213165fc81601f5aa2e5bdb5df9 Author: Michael Natterer -Date: Tue Nov 9 19:33:15 2010 +0100 +Date: Tue Nov 9 19:33:15 2010 +0100 app: add gimp_widget_flush_expose() utility function @@ -47703,7 +48562,7 @@ commit d2ebadcfb906af972edb95807e2887af4ad76856 Author: Nils Philippsen -Date: Tue Nov 9 11:28:30 2010 +0100 +Date: Tue Nov 9 11:28:30 2010 +0100 colorxhtml: check validity of source_type @@ -47712,7 +48571,7 @@ commit 63fcfb15a2f58179e2b5c673efe66a28af25d672 Author: Michael Natterer -Date: Tue Nov 9 11:32:40 2010 +0100 +Date: Tue Nov 9 11:32:40 2010 +0100 app: use the new shifting API instead of reimplementing it @@ -47722,11 +48581,11 @@ commit 1541d8b666843db7be3bee3a00f9d3c71d6739a8 Author: Michael Natterer -Date: Tue Nov 9 11:27:51 2010 +0100 +Date: Tue Nov 9 11:27:51 2010 +0100 app: make the shift-coordinates-by-anchor functions public API - app/display/Makefile.am | 2 + + app/display/Makefile.am | 2 + app/display/gimpcanvashandle.c | 145 +++-------------------------------- app/display/gimpcanvasitem-utils.c | 153 @@ -47736,41 +48595,41 @@ commit 3f6a70f7fe1b2de34c00c1214e58f7b445be964f Author: Michael Natterer -Date: Mon Nov 8 22:48:50 2010 +0100 +Date: Mon Nov 8 22:48:50 2010 +0100 app: define one more standard tool handle size - app/tools/gimpaligntool.c | 34 +++++++++++++++++++++++++--------- - app/tools/gimpdrawtool.h | 1 + + app/tools/gimpaligntool.c | 34 +++++++++++++++++++++++++--------- + app/tools/gimpdrawtool.h | 1 + app/tools/gimpeditselectiontool.c | 5 ++--- - app/tools/gimprectangletool.c | 9 +++------ + app/tools/gimprectangletool.c | 9 +++------ 4 files changed, 31 insertions(+), 18 deletions(-) commit cf0402f0691ed629419b59d18b85db210a91b948 Author: Michael Natterer -Date: Mon Nov 8 22:37:00 2010 +0100 +Date: Mon Nov 8 22:37:00 2010 +0100 app: consistent handle sizes for tool drawing Replace a myriad of defines in different tools by three consistent sizes defined in gimpdrawtool.h. - app/tools/gimpblendtool.c | 11 ++++------- - app/tools/gimpcagetool.c | 8 +++----- - app/tools/gimpdrawtool.h | 5 +++++ + app/tools/gimpblendtool.c | 11 ++++------- + app/tools/gimpcagetool.c | 8 +++----- + app/tools/gimpdrawtool.h | 5 +++++ app/tools/gimpfreeselecttool.c | 8 ++++---- - app/tools/gimpiscissorstool.c | 31 +++++++++++++++++-------------- - app/tools/gimpmeasuretool.c | 19 ++++++++++--------- - app/tools/gimppainttool.c | 11 ++++------- + app/tools/gimpiscissorstool.c | 31 +++++++++++++++++-------------- + app/tools/gimpmeasuretool.c | 19 ++++++++++--------- + app/tools/gimppainttool.c | 11 ++++------- app/tools/gimpperspectiveclonetool.c | 19 ++++++++++--------- - app/tools/gimpsourcetool.c | 6 ++---- - app/tools/gimptransformtool.c | 13 +++++++------ - app/tools/gimpvectortool.c | 26 +++++++++++++++----------- + app/tools/gimpsourcetool.c | 6 ++---- + app/tools/gimptransformtool.c | 13 +++++++------ + app/tools/gimpvectortool.c | 26 +++++++++++++++----------- 11 files changed, 81 insertions(+), 76 deletions(-) commit d101062433a0905ecdbdcb76f1db00888c7d4e2c Author: Martin Nordholts -Date: Mon Nov 8 08:05:18 2010 +0100 +Date: Mon Nov 8 08:05:18 2010 +0100 po: Update POTFILES.in @@ -47781,17 +48640,17 @@ commit 232adf8eb5f2961238b9f165bf477044899afcc6 Author: Martin Nordholts -Date: Sun Nov 7 15:02:20 2010 +0100 +Date: Sun Nov 7 15:02:20 2010 +0100 Update gimprc docs/gimprc.5.in | 12 ------------ - etc/gimprc | 10 ---------- + etc/gimprc | 10 ---------- 2 files changed, 22 deletions(-) commit e1b8f8efdf1f9bb0998415e3e9d5899bef8d9f19 Author: Martin Nordholts -Date: Sun Nov 7 15:02:08 2010 +0100 +Date: Sun Nov 7 15:02:08 2010 +0100 libgimpmath: Update gimpmath.def @@ -47800,7 +48659,7 @@ commit a73348c561017f4d2cd94a542e29bbcf9aacfa13 Author: Michael Natterer -Date: Sat Nov 6 00:05:35 2010 +0100 +Date: Sat Nov 6 00:05:35 2010 +0100 app: fix handle hovering detection, it was using the wrong radius @@ -47809,7 +48668,7 @@ commit 31aa09a11f2a2486c4cf9ab69104019d97c1d68a Author: Michael Natterer -Date: Sat Nov 6 00:03:38 2010 +0100 +Date: Sat Nov 6 00:03:38 2010 +0100 app: add proper cursors that show what will happen @@ -47818,7 +48677,7 @@ commit c791ed0dca94ebd568b7dcedf4e3074217c5f9d0 Author: Alexia Death -Date: Fri Nov 5 23:43:31 2010 +0200 +Date: Fri Nov 5 23:43:31 2010 +0200 app: Fix coordinate adjustment bug in cage tool @@ -47827,7 +48686,7 @@ commit 9d604a545f3646054f19801e0d08cbb19e2ee9c1 Author: Michael Natterer -Date: Fri Nov 5 23:49:48 2010 +0100 +Date: Fri Nov 5 23:49:48 2010 +0100 app: move all the cage modifying logic to button_release() @@ -47842,7 +48701,7 @@ commit f4c98fbad6ffeb26fa7f2f0d7e1d30b610c5c7e2 Author: Michael Natterer -Date: Fri Nov 5 22:30:10 2010 +0100 +Date: Fri Nov 5 22:30:10 2010 +0100 app: don't use a GimpVector2 for the cursor position @@ -47854,7 +48713,7 @@ commit 9867cf62c331cb032424824324177cc739e7b9dd Author: Michael Natterer -Date: Fri Nov 5 22:25:14 2010 +0100 +Date: Fri Nov 5 22:25:14 2010 +0100 app: -1000 is a valid cursor position, use G_MINDOUBLE as "no cursor" @@ -47863,7 +48722,7 @@ commit baf964a7346a598b30486ec79ca08fc7b0808381 Author: Michael Natterer -Date: Fri Nov 5 22:21:56 2010 +0100 +Date: Fri Nov 5 22:21:56 2010 +0100 app: rename member handle_moved to moving_handle @@ -47873,7 +48732,7 @@ commit 038a6dd671d51618d7bb6b2653576dc811da1292 Author: Michael Natterer -Date: Fri Nov 5 21:05:54 2010 +0100 +Date: Fri Nov 5 21:05:54 2010 +0100 app: no need to abort the image map when a handle changes @@ -47882,7 +48741,7 @@ commit 77bb31ba519d556ce2b11d57e075f76ea1946548 Author: Michael Natterer -Date: Fri Nov 5 19:59:48 2010 +0100 +Date: Fri Nov 5 19:59:48 2010 +0100 app: put the drawn lines into a stroke group @@ -47891,7 +48750,7 @@ commit 86a220bbdfcddaf6af42de365f9d444cbe2ea69a Author: Michael Natterer -Date: Fri Nov 5 19:47:57 2010 +0100 +Date: Fri Nov 5 19:47:57 2010 +0100 app: remove the preview node and other unneeded stuff @@ -47904,7 +48763,7 @@ commit 6f31f3d2f62d66e39f1177ba6374a69f79e5ffd5 Author: Michael Natterer -Date: Fri Nov 5 19:42:42 2010 +0100 +Date: Fri Nov 5 19:42:42 2010 +0100 app: pass the drawable to gimp_cage_tool_create_image_map() @@ -47913,7 +48772,7 @@ commit 2028d547a292987a7431843f02fbbf139d2d2957 Author: Michael Natterer -Date: Fri Nov 5 19:10:03 2010 +0100 +Date: Fri Nov 5 19:10:03 2010 +0100 app: use the GimpImageMap as it's meant to be used @@ -47929,7 +48788,7 @@ commit 4a4994f4dbed64784058cb437705d4a5ba22c196 Author: Michael Natterer -Date: Fri Nov 5 16:30:23 2010 +0100 +Date: Fri Nov 5 16:30:23 2010 +0100 libgimpwidgets: bring back unit format strings in GimpSizeEntry @@ -47942,7 +48801,7 @@ commit 73a6ddf7b5e9f8b13e67d074df0d264089a3ce54 Author: Michael Natterer -Date: Fri Nov 5 16:28:54 2010 +0100 +Date: Fri Nov 5 16:28:54 2010 +0100 libgimpwidgets: use the short and long format strings for the unit combo @@ -47955,7 +48814,7 @@ commit e821cd4881bfb38321f6384f97b5795de1a1ab34 Author: Michael Natterer -Date: Fri Nov 5 16:26:58 2010 +0100 +Date: Fri Nov 5 16:26:58 2010 +0100 libgimpwidgets: add "short-format" and "long-format" properties @@ -47969,7 +48828,7 @@ commit 71de3d7bdf774bfcec736a1ea37237c7347dc716 Author: Michael Natterer -Date: Fri Nov 5 16:24:37 2010 +0100 +Date: Fri Nov 5 16:24:37 2010 +0100 app: use "pixels/unit" as label for the resolution menu @@ -47982,34 +48841,34 @@ commit e0dad1bf355f9260d27c773bfa8947e4ca23661d Author: Michael Natterer -Date: Fri Nov 5 12:45:07 2010 +0100 +Date: Fri Nov 5 12:45:07 2010 +0100 app: canonicalize cage op names, and some indentation fixes app/gegl/gimpoperationcagecoefcalc.c | 3 +-- app/gegl/gimpoperationcagetransform.c | 28 ++++++++++++++-------------- - app/tools/gimpcagetool.c | 4 ++-- + app/tools/gimpcagetool.c | 4 ++-- 3 files changed, 17 insertions(+), 18 deletions(-) commit eb3db78b06f65862637efe647f0a8ab23b91993a Author: Michael Natterer -Date: Fri Nov 5 10:04:45 2010 +0100 +Date: Fri Nov 5 10:04:45 2010 +0100 app: rename config->cage_vertice_number to config->n_cage_vertices and some minor cleanup. - app/gegl/gimpcageconfig.c | 86 + app/gegl/gimpcageconfig.c | 86 ++++++++++++++++++----------------- - app/gegl/gimpcageconfig.h | 8 ++-- + app/gegl/gimpcageconfig.h | 8 ++-- app/gegl/gimpoperationcagecoefcalc.c | 18 ++++---- app/gegl/gimpoperationcagetransform.c | 6 +-- - app/tools/gimpcagetool.c | 25 +++++----- + app/tools/gimpcagetool.c | 25 +++++----- 5 files changed, 75 insertions(+), 68 deletions(-) commit 09aae9a91956afe9eea0a35590b52e9c2ce02620 Author: Michael Natterer -Date: Fri Nov 5 09:49:03 2010 +0100 +Date: Fri Nov 5 09:49:03 2010 +0100 app: more minor cage tool cleanup @@ -48018,7 +48877,7 @@ commit c98688873dfef68a6f8ce2de4417de51f985afd7 Author: Michael Natterer -Date: Thu Nov 4 22:47:03 2010 +0100 +Date: Thu Nov 4 22:47:03 2010 +0100 app: more minor cage cleanup @@ -48027,7 +48886,7 @@ commit a6d85e8d57d43a8bcf4db10c0c1d77d646d35ade Author: Michael Natterer -Date: Thu Nov 4 22:38:41 2010 +0100 +Date: Thu Nov 4 22:38:41 2010 +0100 app: more formatting cleanup @@ -48036,7 +48895,7 @@ commit f6a8ad61fa7c8570199517cf42943fd9bf99cb5c Author: Michael Natterer -Date: Thu Nov 4 22:32:01 2010 +0100 +Date: Thu Nov 4 22:32:01 2010 +0100 app: remove useless box from cage options gui @@ -48045,7 +48904,7 @@ commit 428e8541c31fd1be21f8acb5951960766981c426 Author: Michael Natterer -Date: Thu Nov 4 22:30:30 2010 +0100 +Date: Thu Nov 4 22:30:30 2010 +0100 app: remove unused #includes @@ -48054,7 +48913,7 @@ commit b7a674285fb0c75c85fde48b016d5afc6b7acea0 Author: Michael Natterer -Date: Thu Nov 4 22:28:47 2010 +0100 +Date: Thu Nov 4 22:28:47 2010 +0100 app: derive GimpCageOptions directly from GimpToolOptions @@ -48064,7 +48923,7 @@ commit 33a8c154032a1248a864ec3d6c2955acd879b58e Author: Michael Natterer -Date: Thu Nov 4 22:14:58 2010 +0100 +Date: Thu Nov 4 22:14:58 2010 +0100 app: large scale formatting cleanup in the new cage code @@ -48074,28 +48933,28 @@ - indentation - coding style - app/gegl/Makefile.am | 28 +- - app/gegl/gimp-gegl-enums.c | 43 ++ - app/gegl/gimp-gegl-enums.h | 35 ++ - app/gegl/gimp-gegl-types.h | 2 + - app/gegl/gimpcageconfig.c | 358 +++++++------ - app/gegl/gimpcageconfig.h | 109 +--- + app/gegl/Makefile.am | 28 +- + app/gegl/gimp-gegl-enums.c | 43 ++ + app/gegl/gimp-gegl-enums.h | 35 ++ + app/gegl/gimp-gegl-types.h | 2 + + app/gegl/gimpcageconfig.c | 358 +++++++------ + app/gegl/gimpcageconfig.h | 109 +--- app/gegl/gimpoperationcagecoefcalc.c | 165 +++--- app/gegl/gimpoperationcagecoefcalc.h | 6 +- app/gegl/gimpoperationcagetransform.c | 431 +++++++-------- app/gegl/gimpoperationcagetransform.h | 2 + - app/tools/gimpcageoptions.c | 41 +- - app/tools/gimpcageoptions.h | 17 +- - app/tools/gimpcagetool.c | 965 + app/tools/gimpcageoptions.c | 41 +- + app/tools/gimpcageoptions.h | 17 +- + app/tools/gimpcagetool.c | 965 ++++++++++++++++------------------ - app/tools/gimpcagetool.h | 30 +- - app/tools/tools-enums.c | 29 - - app/tools/tools-enums.h | 10 - + app/tools/gimpcagetool.h | 30 +- + app/tools/tools-enums.c | 29 - + app/tools/tools-enums.h | 10 - 16 files changed, 1136 insertions(+), 1135 deletions(-) commit 5ce581f7976c64eff5276b88e2f6303ac65037d8 Author: Martin Nordholts -Date: Thu Nov 4 21:44:31 2010 +0100 +Date: Thu Nov 4 21:44:31 2010 +0100 app: Use Shift+G for Cage Tool @@ -48107,7 +48966,7 @@ commit 26ca306cc95e779534cad9ae3c6d98dcce4cc3b7 Author: Michael Natterer -Date: Thu Nov 4 21:08:51 2010 +0100 +Date: Thu Nov 4 21:08:51 2010 +0100 app: Makefile formatting cleanup @@ -48117,31 +48976,31 @@ commit d2563a69fdff531149ef799d8bf1ea985d928991 Author: Alexia Death -Date: Thu Nov 4 20:25:32 2010 +0200 +Date: Thu Nov 4 20:25:32 2010 +0200 app: Cleanup in preparation of merge - app/gegl/gimpcageconfig.c | 2 +- - app/gegl/gimpcageconfig.h | 1 + + app/gegl/gimpcageconfig.c | 2 +- + app/gegl/gimpcageconfig.h | 1 + app/tools/tools-enums.c | 29 +++++++++++++++++++++++++++++ app/tools/tools-enums.h | 10 ++++++++++ - libgimp/gimpenums.c.tail | 2 -- + libgimp/gimpenums.c.tail | 2 -- libgimpbase/gimpbaseenums.c | 30 ------------------------------ libgimpbase/gimpbaseenums.h | 10 ---------- - libgimpmath/gimpvector.c | 4 ++++ - tools/pdbgen/enums.pl | 7 ------- + libgimpmath/gimpvector.c | 4 ++++ + tools/pdbgen/enums.pl | 7 ------- 9 files changed, 45 insertions(+), 50 deletions(-) commit dfd5470a2e83fc7363961f830a0b4353b6f5767a -Merge: 040c415 91ceae6 +Merge: 040c415905 91ceae61d7 Author: Alexia Death -Date: Thu Nov 4 20:00:36 2010 +0200 +Date: Thu Nov 4 20:00:36 2010 +0200 Merge remote branch 'origin/master' into soc-2010-cage-2 commit 040c415905a4107d071981a6f144ccc86e7e6713 Author: Alexia Death -Date: Thu Nov 4 19:54:07 2010 +0200 +Date: Thu Nov 4 19:54:07 2010 +0200 app: Fix cage operaton cliping offset @@ -48150,7 +49009,7 @@ commit 91ceae61d7843c3e007d4167f1e21c68c088caeb Author: Khaled Hosny -Date: Thu Nov 4 04:21:52 2010 +0200 +Date: Thu Nov 4 04:21:52 2010 +0200 Updated Arabic translation @@ -48159,15 +49018,15 @@ 1 file changed, 1044 insertions(+), 1030 deletions(-) commit 27c77e6a5e95049b17494e6fa7be95aae8250d28 -Merge: 9b96120 8663b22 +Merge: 9b96120c31 8663b22c2a Author: Alexia Death -Date: Thu Nov 4 00:41:45 2010 +0200 +Date: Thu Nov 4 00:41:45 2010 +0200 Merge branch 'master' into soc-2010-cage-2 commit 9b96120c31e89209fd7fb25f98099e26d53d2ea8 Author: Alexia Death -Date: Thu Nov 4 00:10:22 2010 +0200 +Date: Thu Nov 4 00:10:22 2010 +0200 app: Make cage tool behave nice with offset layers @@ -48179,7 +49038,7 @@ commit e529428a68a2b858ffe89e9c636861e0a3f56c05 Author: Alexia Death -Date: Wed Nov 3 21:08:10 2010 +0200 +Date: Wed Nov 3 21:08:10 2010 +0200 app: Make cage tool apply to layer mask as well if one is present @@ -48189,7 +49048,7 @@ commit 9208834880c313abeb210ccb9234f33ac5fc3e33 Author: Michael Natterer -Date: Wed Nov 3 09:53:18 2010 +0100 +Date: Wed Nov 3 09:53:18 2010 +0100 app: make the blob shape widgets more compact @@ -48199,7 +49058,7 @@ commit aa846ec451607873f6430345fccd8ad27854df8d Author: Michael Natterer -Date: Tue Nov 2 23:30:47 2010 +0100 +Date: Tue Nov 2 23:30:47 2010 +0100 app: use spin scales for the ink options @@ -48209,12 +49068,12 @@ commit d5ff5b6748cad60b24044d436285da39c777d0eb Author: Michael Natterer -Date: Tue Nov 2 22:14:34 2010 +0100 +Date: Tue Nov 2 22:14:34 2010 +0100 app: get rid of more tables in the tool options and fix up spacing a bit - app/tools/gimpblendoptions.c | 19 ++++++++++--------- + app/tools/gimpblendoptions.c | 19 ++++++++++--------- app/tools/gimppaintoptions-gui.c | 40 +++++++++------------------------------- app/tools/gimppaintoptions-gui.h | 3 --- @@ -48223,7 +49082,7 @@ commit 6ee6fb9b81b9fc13314113a281e2d44f75d95e17 Author: Michael Natterer -Date: Tue Nov 2 22:01:15 2010 +0100 +Date: Tue Nov 2 22:01:15 2010 +0100 app: use a spin scale for the aspect ratio @@ -48235,7 +49094,7 @@ commit bf14241f26357bb943e96aa74cfc1b2f6d64b928 Author: Michael Natterer -Date: Tue Nov 2 21:57:37 2010 +0100 +Date: Tue Nov 2 21:57:37 2010 +0100 app: make the brush size reset button smaller @@ -48244,7 +49103,7 @@ commit b07d02cdc68fd4da580c4e44e7bcf696b48f2046 Author: Mikael Magnusson -Date: Sun Oct 31 18:06:12 2010 +0100 +Date: Sun Oct 31 18:06:12 2010 +0100 plug-ins: destroy cairo surface in CML Explorer @@ -48253,7 +49112,7 @@ commit 81fee76747391091e26079926e17ac20a50415a6 Author: Mikael Magnusson -Date: Sun Oct 31 19:03:18 2010 +0100 +Date: Sun Oct 31 19:03:18 2010 +0100 plug-ins: port Lighting Effects to cairo @@ -48268,18 +49127,18 @@ commit 1ae2ad856619831b6332ffebf74e01b47fed76d6 Author: Alexia Death -Date: Tue Nov 2 21:28:01 2010 +0200 +Date: Tue Nov 2 21:28:01 2010 +0200 app: Generic cage cleanup - app/gegl/gimpcageconfig.c | 15 ++++++--------- + app/gegl/gimpcageconfig.c | 15 ++++++--------- app/gegl/gimpoperationcagetransform.c | 2 -- - app/tools/gimpcageoptions.c | 2 +- + app/tools/gimpcageoptions.c | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-) commit f09f6dae06598d38ec02dfec94a5715e7c0c2c58 Author: Alexia Death -Date: Tue Nov 2 20:56:11 2010 +0200 +Date: Tue Nov 2 20:56:11 2010 +0200 app: Make cage tool work with gegl master @@ -48288,20 +49147,20 @@ commit 90e525ca09d8cf69c1788568e0bebee389166830 Author: Mikael Magnusson -Date: Tue Nov 2 12:16:19 2010 +0100 +Date: Tue Nov 2 12:16:19 2010 +0100 app: use a spin scale for the brush size (have to limit size to 1000 temporarily) - app/paint/gimppaintoptions.c | 2 +- - app/tools/gimppaintoptions-gui.c | 26 +++++++++++++++----------- + app/paint/gimppaintoptions.c | 2 +- + app/tools/gimppaintoptions-gui.c | 26 +++++++++++++++----------- app/widgets/gimpwidgets-constructors.c | 34 ++++++++++++++++++++++------------ 3 files changed, 38 insertions(+), 24 deletions(-) commit 8f991c5950167aec92c807b022ad6dc54f1c5ef7 Author: Michael Natterer -Date: Tue Nov 2 14:05:47 2010 +0100 +Date: Tue Nov 2 14:05:47 2010 +0100 app: make the brush, pattern etc selecing boxes more compact @@ -48310,35 +49169,35 @@ tool options further (add more spin scales, and some general reordering and spacing cleanup). - app/dialogs/convert-dialog.c | 2 +- - app/tools/gimpblendoptions.c | 32 ++++++----- + app/dialogs/convert-dialog.c | 2 +- + app/tools/gimpblendoptions.c | 32 ++++++----- app/tools/gimpbucketfilloptions.c | 3 +- - app/tools/gimpclonetool.c | 3 +- + app/tools/gimpclonetool.c | 3 +- app/tools/gimppaintoptions-gui.c | 47 ++++++++-------- app/tools/gimpperspectiveclonetool.c | 3 +- app/tools/gimpregionselectoptions.c | 16 +++--- - app/tools/gimptextoptions.c | 14 ++--- + app/tools/gimptextoptions.c | 14 ++--- app/tools/gimptransformoptions.c | 66 +++++++--------------- - app/widgets/gimpfilleditor.c | 3 +- - app/widgets/gimpviewablebox.c | 103 + app/widgets/gimpfilleditor.c | 3 +- + app/widgets/gimpviewablebox.c | 103 +++++++++++++++++++++++------------ - app/widgets/gimpviewablebox.h | 12 ++++ + app/widgets/gimpviewablebox.h | 12 ++++ 12 files changed, 166 insertions(+), 138 deletions(-) commit 0e7db279265f8f3e190f0938563253524795724e Author: Alan Monfort -Date: Tue Nov 2 06:51:31 2010 +0100 +Date: Tue Nov 2 06:51:31 2010 +0100 Updated Breton translation po-script-fu/br.po | 405 +++++--- - po/br.po | 2907 + po/br.po | 2907 +++++++++++++++++++++++----------------------------- 2 files changed, 1531 insertions(+), 1781 deletions(-) commit 9cb69b80beae1c2a013f7e6743ffd5bc1442c7a0 Author: Michael Natterer -Date: Mon Nov 1 23:38:17 2010 +0100 +Date: Mon Nov 1 23:38:17 2010 +0100 app: minor fixes @@ -48348,7 +49207,7 @@ commit 7af8cc0e4d67e7d9a62f247deda6f572d475d7c5 Author: Michael Natterer -Date: Mon Nov 1 22:19:59 2010 +0100 +Date: Mon Nov 1 22:19:59 2010 +0100 app: use a spin scale for fade-length @@ -48357,7 +49216,7 @@ commit 7bfdf76a47c83a75938c4a60c984524f4eb09ac7 Author: Michael Natterer -Date: Mon Nov 1 22:07:55 2010 +0100 +Date: Mon Nov 1 22:07:55 2010 +0100 app: use the new opacity prop scale @@ -48366,7 +49225,7 @@ commit 37038ab77f2ba1ade88841be5afac609930194ed Author: Michael Natterer -Date: Mon Nov 1 22:07:39 2010 +0100 +Date: Mon Nov 1 22:07:39 2010 +0100 app: add an opacity prop scale @@ -48377,26 +49236,26 @@ commit 0a98d16814ea7862e783b85e85eff9d1d3cc2e1a Author: Michael Natterer -Date: Mon Nov 1 21:48:59 2010 +0100 +Date: Mon Nov 1 21:48:59 2010 +0100 app: use spin scales for all trivial cases in tool options - app/tools/gimpairbrushtool.c | 31 + app/tools/gimpairbrushtool.c | 31 +++++++++++++------------------ - app/tools/gimpblendoptions.c | 29 ++++++++++++++--------------- - app/tools/gimpbucketfilloptions.c | 18 ++++++++++-------- - app/tools/gimpcoloroptions.c | 25 ++++++++++--------------- - app/tools/gimpconvolvetool.c | 18 +++++++----------- - app/tools/gimpdodgeburntool.c | 18 +++++++----------- + app/tools/gimpblendoptions.c | 29 ++++++++++++++--------------- + app/tools/gimpbucketfilloptions.c | 18 ++++++++++-------- + app/tools/gimpcoloroptions.c | 25 ++++++++++--------------- + app/tools/gimpconvolvetool.c | 18 +++++++----------- + app/tools/gimpdodgeburntool.c | 18 +++++++----------- app/tools/gimprectangleselectoptions.c | 17 ++++++----------- - app/tools/gimpregionselectoptions.c | 16 ++++++++++------ - app/tools/gimpselectionoptions.c | 17 ++++++----------- - app/tools/gimpsmudgetool.c | 18 +++++++----------- + app/tools/gimpregionselectoptions.c | 16 ++++++++++------ + app/tools/gimpselectionoptions.c | 17 ++++++----------- + app/tools/gimpsmudgetool.c | 18 +++++++----------- 10 files changed, 90 insertions(+), 117 deletions(-) commit 8bf497294e72546e4fff70ae6666f89370657c0c Author: Michael Natterer -Date: Mon Nov 1 21:48:19 2010 +0100 +Date: Mon Nov 1 21:48:19 2010 +0100 app: enable adjustment based prop widgets for all numeric param types @@ -48406,7 +49265,7 @@ commit fc0e19022ea00b0f03b375fa330d81b79fd96027 Author: Michael Natterer -Date: Mon Nov 1 21:03:01 2010 +0100 +Date: Mon Nov 1 21:03:01 2010 +0100 app: use a spin scale for the jitter amount @@ -48416,7 +49275,7 @@ commit e84a0eebf96660214b479e3441d6c21c0345810a Author: Michael Natterer -Date: Mon Nov 1 20:54:43 2010 +0100 +Date: Mon Nov 1 20:54:43 2010 +0100 app: fix gimp_prop_spin_scale_new() by setting the pspec on the right object @@ -48426,7 +49285,7 @@ commit 864e6bdfc05448c0b470d82988488604f75e3ec4 Author: Michael Natterer -Date: Mon Nov 1 20:51:13 2010 +0100 +Date: Mon Nov 1 20:51:13 2010 +0100 app: don't show a text cursor when not over the editable text @@ -48436,7 +49295,7 @@ commit 5e58df8aa830e1891232698c6a602ac2a4856cf5 Author: Michael Natterer -Date: Mon Nov 1 20:04:53 2010 +0100 +Date: Mon Nov 1 20:04:53 2010 +0100 app: use a GimpSpinScale for the brush angle, please test and comment! @@ -48445,7 +49304,7 @@ commit 01f4bad1f60410d08f15faf403c20dfcd83f162d Author: Michael Natterer -Date: Mon Nov 1 20:04:35 2010 +0100 +Date: Mon Nov 1 20:04:35 2010 +0100 app: add gimp_prop_spin_scale_new() @@ -48456,20 +49315,20 @@ commit ae3afca697a92597b31d3d63bcbc0d2a908340f2 Author: Michael Natterer -Date: Mon Nov 1 20:03:39 2010 +0100 +Date: Mon Nov 1 20:03:39 2010 +0100 app: add new widget GimpSpinScale which is a combined spinbutton and scale - app/widgets/Makefile.am | 2 + + app/widgets/Makefile.am | 2 + app/widgets/gimpspinscale.c | 392 ++++++++++++++++++++++++++++++++++++++++++++ - app/widgets/gimpspinscale.h | 54 ++++++ + app/widgets/gimpspinscale.h | 54 ++++++ 3 files changed, 448 insertions(+) commit 7816d6b8ea717471ef8c393555e97906b31c73fa Author: Alexandre Prokoudine -Date: Mon Nov 1 12:24:48 2010 +0300 +Date: Mon Nov 1 12:24:48 2010 +0300 po/ru.po updated Russian translation to match recent changes @@ -48479,7 +49338,7 @@ commit 1b549fa57248282742cef1165d0c5ee58ca4b895 Author: Martin Nordholts -Date: Mon Nov 1 07:15:59 2010 +0100 +Date: Mon Nov 1 07:15:59 2010 +0100 Revert "po-plug-ins: Temporarily disable file-pdf-load.c" @@ -48491,7 +49350,7 @@ commit 77967609089fa299f9cbda02474daaa840362904 Author: Michael Natterer -Date: Sun Oct 31 22:15:52 2010 +0100 +Date: Sun Oct 31 22:15:52 2010 +0100 libgimpwidgets: style cleanup @@ -48500,7 +49359,7 @@ commit b76df39f06768bfc13544dce84ffe132860b2a1f Author: Michael Natterer -Date: Sun Oct 31 22:11:32 2010 +0100 +Date: Sun Oct 31 22:11:32 2010 +0100 libgimpwidgets: use gimp_unit_format_string() in GimpUnitMenu @@ -48510,7 +49369,7 @@ commit cab852fb7369cfd0a934d0126985c91f040a43a3 Author: Michael Natterer -Date: Sun Oct 31 22:10:31 2010 +0100 +Date: Sun Oct 31 22:10:31 2010 +0100 libgimpbase: add gimp_unit_format_string() @@ -48525,20 +49384,20 @@ commit 73d7fbedeb2b0184f7262e5b04f87dc848d56ac1 Author: Michael Natterer -Date: Sun Oct 31 21:38:27 2010 +0100 +Date: Sun Oct 31 21:38:27 2010 +0100 plug-ins: port file-pdf-load to GimpUnitComboBox and build it again - plug-ins/common/.gitignore | 2 ++ - plug-ins/common/Makefile.am | 22 ++++++++++++++++++++++ + plug-ins/common/.gitignore | 2 ++ + plug-ins/common/Makefile.am | 22 ++++++++++++++++++++++ plug-ins/common/file-pdf-load.c | 15 ++++++++++----- - plug-ins/common/gimprc.common | 1 + + plug-ins/common/gimprc.common | 1 + plug-ins/common/plugin-defs.pl | 2 +- 5 files changed, 36 insertions(+), 6 deletions(-) commit 16f5727e593e09f166d8123afac7571b8a031179 Author: Mikael Magnusson -Date: Sun Oct 31 16:32:17 2010 +0100 +Date: Sun Oct 31 16:32:17 2010 +0100 plug-ins: port CML Explorer to cairo @@ -48548,7 +49407,7 @@ commit dbf1d49efece26b82284140bb2133305822b230a Author: Michael Natterer -Date: Sun Oct 31 16:45:49 2010 +0100 +Date: Sun Oct 31 16:45:49 2010 +0100 libgimpwidgets: let the size entry's spinbutton fill the available space @@ -48561,7 +49420,7 @@ commit be3ebbb65c534a8f174ed8462cf565c681456102 Author: Michael Natterer -Date: Sun Oct 31 16:30:03 2010 +0100 +Date: Sun Oct 31 16:30:03 2010 +0100 libgimpwidgets: tooltips no longer require an event box around no-window widgets @@ -48571,7 +49430,7 @@ commit 1f398549e24f8ae21ef8993718a53aac62b72e35 Author: Michael Natterer -Date: Sun Oct 31 16:15:33 2010 +0100 +Date: Sun Oct 31 16:15:33 2010 +0100 modules: add size-request workaround that is not needed any longer @@ -48580,7 +49439,7 @@ commit 39199fb98b11c6dfe2df612fba40124869e10c2b Author: Mikael Magnusson -Date: Sun Oct 31 14:40:48 2010 +0100 +Date: Sun Oct 31 14:40:48 2010 +0100 plug-ins: port sphere-designer to cairo @@ -48590,14 +49449,14 @@ commit df0772fcdee689140cfcd25deea6e6e6f01606b3 Author: Martin Nordholts -Date: Sun Oct 31 15:09:03 2010 +0100 +Date: Sun Oct 31 15:09:03 2010 +0100 app: Add 'crop_set_width_without_pending_rect' regression test Add regression test 'crop_set_width_without_pending_rect' for "Bug 322396 - Crop dimension entering causes crash". - app/tests/test-tools.c | 67 + app/tests/test-tools.c | 67 +++++++++++++++++++++++++++++++++++++--- app/tools/gimprectangleoptions.c | 17 ++++++++++ app/tools/gimprectangleoptions.h | 5 +++ @@ -48605,22 +49464,22 @@ commit 48690d60e185eab584431327d72f24f5b872ed77 Author: Martin Nordholts -Date: Sun Oct 31 13:05:15 2010 +0100 +Date: Sun Oct 31 13:05:15 2010 +0100 app: Add gimp_tools_get/set_tool_options_gui() Add gimp_tools_get_tool_options_gui() and gimp_tools_set_tool_options_gui() widgets utility functions. - app/tools/gimp-tools.c | 16 ++++++---------- - app/widgets/gimptooloptionseditor.c | 6 ++---- + app/tools/gimp-tools.c | 16 ++++++---------- + app/widgets/gimptooloptionseditor.c | 6 ++---- app/widgets/gimpwidgets-utils.c | 20 ++++++++++++++++++++ - app/widgets/gimpwidgets-utils.h | 5 ++++- + app/widgets/gimpwidgets-utils.h | 5 ++++- 4 files changed, 32 insertions(+), 15 deletions(-) commit cba98e1bc06c067f98f6c1830ea2463a1ed06f0d Author: Martin Nordholts -Date: Sun Oct 31 08:03:51 2010 +0100 +Date: Sun Oct 31 08:03:51 2010 +0100 app/tests: Run tests on an Xvfb X server if available @@ -48630,12 +49489,12 @@ to make sure xvfb-run is available. app/tests/Makefile.am | 6 ++++++ - configure.ac | 8 ++++++++ + configure.ac | 8 ++++++++ 2 files changed, 14 insertions(+) commit f216e0b03931302c929d0f3954523cb371bcbec0 Author: Martin Nordholts -Date: Sun Oct 31 08:07:15 2010 +0100 +Date: Sun Oct 31 08:07:15 2010 +0100 po: Update POTFILES.in @@ -48644,53 +49503,53 @@ commit 29d63afbb7741c38eff3e7cf1cac9718e958772d Author: Michael Natterer -Date: Sat Oct 30 22:19:22 2010 +0200 +Date: Sat Oct 30 22:19:22 2010 +0200 pdb: remove gimp-item-to-selection again - app/pdb/internal-procs.c | 2 +- - app/pdb/item-cmds.c | 65 + app/pdb/internal-procs.c | 2 +- + app/pdb/item-cmds.c | 65 ---------------------------------------- - app/pdb/selection-cmds.c | 18 +++++------ - libgimp/gimp.def | 1 - - libgimp/gimpitem_pdb.c | 37 ----------------------- - libgimp/gimpitem_pdb.h | 60 + app/pdb/selection-cmds.c | 18 +++++------ + libgimp/gimp.def | 1 - + libgimp/gimpitem_pdb.c | 37 ----------------------- + libgimp/gimpitem_pdb.h | 60 ++++++++++++++++++------------------- - libgimp/gimpselection_pdb.c | 6 ++-- - plug-ins/common/lcms.c | 2 +- - plug-ins/file-xjt/xjt.c | 3 +- + libgimp/gimpselection_pdb.c | 6 ++-- + plug-ins/common/lcms.c | 2 +- + plug-ins/file-xjt/xjt.c | 3 +- plug-ins/pygimp/pygimp-vectors.c | 2 +- - tools/pdbgen/pdb/item.pdb | 43 +------------------------- + tools/pdbgen/pdb/item.pdb | 43 +------------------------- tools/pdbgen/pdb/selection.pdb | 6 ++-- 12 files changed, 50 insertions(+), 195 deletions(-) commit 457a46a04c338f71db6dcc0f43bc0afdcde30353 Author: Michael Natterer -Date: Sat Oct 30 22:06:20 2010 +0200 +Date: Sat Oct 30 22:06:20 2010 +0200 pdb: add new selection API which has less parameters than the old one and uses the new context properties instead. This is work in progress and subject to change. Don't use it in plug-ins/scripts yet! - app/pdb/Makefile.am | 1 + - app/pdb/image-select-cmds.c | 759 + app/pdb/Makefile.am | 1 + + app/pdb/image-select-cmds.c | 759 ++++++++++++++++++++++++++++++++++++++ - app/pdb/internal-procs.c | 3 +- - app/pdb/internal-procs.h | 1 + - libgimp/Makefile.am | 2 + - libgimp/gimp.def | 7 + - libgimp/gimp_pdb.h | 1 + - libgimp/gimpimageselect_pdb.c | 408 ++++++++++++++++++++ - libgimp/gimpimageselect_pdb.h | 79 ++++ - tools/pdbgen/Makefile.am | 1 + - tools/pdbgen/groups.pl | 1 + + app/pdb/internal-procs.c | 3 +- + app/pdb/internal-procs.h | 1 + + libgimp/Makefile.am | 2 + + libgimp/gimp.def | 7 + + libgimp/gimp_pdb.h | 1 + + libgimp/gimpimageselect_pdb.c | 408 ++++++++++++++++++++ + libgimp/gimpimageselect_pdb.h | 79 ++++ + tools/pdbgen/Makefile.am | 1 + + tools/pdbgen/groups.pl | 1 + tools/pdbgen/pdb/image_select.pdb | 433 ++++++++++++++++++++++ 12 files changed, 1695 insertions(+), 1 deletion(-) commit 108c6f4e41362e554ff44442698ccd396b696deb Author: Michael Natterer -Date: Sat Oct 30 21:58:00 2010 +0200 +Date: Sat Oct 30 21:58:00 2010 +0200 pdb: preemtively update context docs for upcoming selection API changes @@ -48702,7 +49561,7 @@ commit 8663b22c2a3cdad6a8bf9c793830ca3f4c6ad79c Author: Alexia Death -Date: Sat Oct 30 21:38:20 2010 +0300 +Date: Sat Oct 30 21:38:20 2010 +0300 app: Fixes to brush scale->size replacement @@ -48712,18 +49571,18 @@ commit ae742f09200cb04d99e5d7a482dd941fb67233f2 Author: Michael Natterer -Date: Sat Oct 30 19:56:24 2010 +0200 +Date: Sat Oct 30 19:56:24 2010 +0200 app: some cleanup in the new brush size code - app/paint/gimpbrushcore.c | 59 + app/paint/gimpbrushcore.c | 59 +++++++++++++++++++++------------------- app/tools/gimppaintoptions-gui.c | 22 +++++++-------- 2 files changed, 42 insertions(+), 39 deletions(-) commit 5bc3317b5ac72b3dd485ee25fa335e3b7f01fa5b Author: Michael Natterer -Date: Sat Oct 30 19:37:46 2010 +0200 +Date: Sat Oct 30 19:37:46 2010 +0200 libgimpwidgets: fix the new prop_unit_combo_box to work like the oly unit menu @@ -48736,24 +49595,24 @@ commit 5d42803d7fff78cf4ef07dd2ea86f03d46dfa451 Author: Alexia Death -Date: Fri Oct 29 22:57:26 2010 +0300 +Date: Fri Oct 29 22:57:26 2010 +0300 app: Expose brush size in pixels, not as ratio - app/actions/tools-actions.c | 48 + app/actions/tools-actions.c | 48 ++++++++++++++++++------------------- - app/actions/tools-commands.c | 10 ++++---- - app/actions/tools-commands.h | 2 +- - app/paint/gimpbrushcore.c | 14 ++++++++--- - app/paint/gimppaintoptions.c | 18 +++++++------- - app/paint/gimppaintoptions.h | 2 +- + app/actions/tools-commands.c | 10 ++++---- + app/actions/tools-commands.h | 2 +- + app/paint/gimpbrushcore.c | 14 ++++++++--- + app/paint/gimppaintoptions.c | 18 +++++++------- + app/paint/gimppaintoptions.h | 2 +- app/tools/gimppaintoptions-gui.c | 52 +++++++++++++++++++++++++++++++++------- 7 files changed, 94 insertions(+), 52 deletions(-) commit b9a7c121a4d8fa630ae386bfbedbfd6c0fed4522 Author: Michael Natterer -Date: Sat Oct 30 15:44:46 2010 +0200 +Date: Sat Oct 30 15:44:46 2010 +0200 app: don't inherit from GtkHBox or GtkVBox @@ -48761,55 +49620,55 @@ init(). Replace more gtk_container_add() by gtk_box_pack_start() in the reparented classes. - app/widgets/gimpactioneditor.c | 5 ++++- - app/widgets/gimpactioneditor.h | 4 ++-- - app/widgets/gimpcolordisplayeditor.c | 7 +++++-- - app/widgets/gimpcolordisplayeditor.h | 4 ++-- - app/widgets/gimpcontainereditor.c | 12 ++++++++---- - app/widgets/gimpcontainereditor.h | 4 ++-- - app/widgets/gimpcontrollereditor.c | 13 ++++++++----- - app/widgets/gimpcontrollereditor.h | 4 ++-- - app/widgets/gimpcontrollerlist.c | 9 ++++++--- - app/widgets/gimpcontrollerlist.h | 4 ++-- - app/widgets/gimpdeviceeditor.c | 5 ++++- - app/widgets/gimpdeviceeditor.h | 4 ++-- - app/widgets/gimpdeviceinfoeditor.c | 5 ++++- - app/widgets/gimpdeviceinfoeditor.h | 4 ++-- - app/widgets/gimpdock.c | 14 +++++++++----- - app/widgets/gimpdock.h | 4 ++-- - app/widgets/gimpdockcolumns.c | 8 ++++++-- - app/widgets/gimpdockcolumns.h | 4 ++-- + app/widgets/gimpactioneditor.c | 5 ++++- + app/widgets/gimpactioneditor.h | 4 ++-- + app/widgets/gimpcolordisplayeditor.c | 7 +++++-- + app/widgets/gimpcolordisplayeditor.h | 4 ++-- + app/widgets/gimpcontainereditor.c | 12 ++++++++---- + app/widgets/gimpcontainereditor.h | 4 ++-- + app/widgets/gimpcontrollereditor.c | 13 ++++++++----- + app/widgets/gimpcontrollereditor.h | 4 ++-- + app/widgets/gimpcontrollerlist.c | 9 ++++++--- + app/widgets/gimpcontrollerlist.h | 4 ++-- + app/widgets/gimpdeviceeditor.c | 5 ++++- + app/widgets/gimpdeviceeditor.h | 4 ++-- + app/widgets/gimpdeviceinfoeditor.c | 5 ++++- + app/widgets/gimpdeviceinfoeditor.h | 4 ++-- + app/widgets/gimpdock.c | 14 +++++++++----- + app/widgets/gimpdock.h | 4 ++-- + app/widgets/gimpdockcolumns.c | 8 ++++++-- + app/widgets/gimpdockcolumns.h | 4 ++-- app/widgets/gimpdynamicsoutputeditor.c | 7 +++---- app/widgets/gimpdynamicsoutputeditor.h | 4 ++-- - app/widgets/gimpeditor.c | 5 ++++- - app/widgets/gimpeditor.h | 4 ++-- - app/widgets/gimpfilleditor.c | 5 ++++- - app/widgets/gimpfilleditor.h | 4 ++-- - app/widgets/gimpgrideditor.c | 8 +++++--- - app/widgets/gimpgrideditor.h | 12 ++++++------ - app/widgets/gimphistogrambox.c | 5 ++++- - app/widgets/gimphistogrambox.h | 4 ++-- - app/widgets/gimpimageparasiteview.c | 5 ++++- - app/widgets/gimpimageparasiteview.h | 4 ++-- - app/widgets/gimpmessagebox.c | 5 ++++- - app/widgets/gimpmessagebox.h | 12 ++++++------ - app/widgets/gimpprogressbox.c | 5 ++++- - app/widgets/gimpprogressbox.h | 14 +++++++------- - app/widgets/gimpsettingsbox.c | 7 +++++-- - app/widgets/gimpsettingsbox.h | 4 ++-- - app/widgets/gimpsettingseditor.c | 7 +++++-- - app/widgets/gimpsettingseditor.h | 4 ++-- - app/widgets/gimpsizebox.c | 5 ++++- - app/widgets/gimpsizebox.h | 4 ++-- - app/widgets/gimptemplateeditor.c | 9 ++++++--- - app/widgets/gimptemplateeditor.h | 4 ++-- - app/widgets/gimptextstyleeditor.c | 5 ++++- - app/widgets/gimptextstyleeditor.h | 4 ++-- + app/widgets/gimpeditor.c | 5 ++++- + app/widgets/gimpeditor.h | 4 ++-- + app/widgets/gimpfilleditor.c | 5 ++++- + app/widgets/gimpfilleditor.h | 4 ++-- + app/widgets/gimpgrideditor.c | 8 +++++--- + app/widgets/gimpgrideditor.h | 12 ++++++------ + app/widgets/gimphistogrambox.c | 5 ++++- + app/widgets/gimphistogrambox.h | 4 ++-- + app/widgets/gimpimageparasiteview.c | 5 ++++- + app/widgets/gimpimageparasiteview.h | 4 ++-- + app/widgets/gimpmessagebox.c | 5 ++++- + app/widgets/gimpmessagebox.h | 12 ++++++------ + app/widgets/gimpprogressbox.c | 5 ++++- + app/widgets/gimpprogressbox.h | 14 +++++++------- + app/widgets/gimpsettingsbox.c | 7 +++++-- + app/widgets/gimpsettingsbox.h | 4 ++-- + app/widgets/gimpsettingseditor.c | 7 +++++-- + app/widgets/gimpsettingseditor.h | 4 ++-- + app/widgets/gimpsizebox.c | 5 ++++- + app/widgets/gimpsizebox.h | 4 ++-- + app/widgets/gimptemplateeditor.c | 9 ++++++--- + app/widgets/gimptemplateeditor.h | 4 ++-- + app/widgets/gimptextstyleeditor.c | 5 ++++- + app/widgets/gimptextstyleeditor.h | 4 ++-- 44 files changed, 167 insertions(+), 103 deletions(-) commit 060a08da5af8cec9062e42bd8b85d2f86f0f7f9f Author: Michael Natterer -Date: Sat Oct 30 15:43:56 2010 +0200 +Date: Sat Oct 30 15:43:56 2010 +0200 app: +1 @@ -48818,7 +49677,7 @@ commit 56dee7245a0089a6b777aa04bcd778b44940e6c2 Author: Michael Natterer -Date: Sat Oct 30 15:43:17 2010 +0200 +Date: Sat Oct 30 15:43:17 2010 +0200 app: and one more @@ -48827,30 +49686,30 @@ commit ebc92dc5b443dbe17a578ba558c444dd0743c8ab Author: Michael Natterer -Date: Sat Oct 30 15:42:25 2010 +0200 +Date: Sat Oct 30 15:42:25 2010 +0200 app: more gtk_container_add -> gtk_box_pack_start - app/widgets/gimpbrushselect.c | 2 +- - app/widgets/gimpcolordialog.c | 4 ++-- + app/widgets/gimpbrushselect.c | 2 +- + app/widgets/gimpcolordialog.c | 4 ++-- app/widgets/gimpcolorselectorpalette.c | 2 +- - app/widgets/gimpdevicestatus.c | 2 +- - app/widgets/gimperrorconsole.c | 2 +- - app/widgets/gimperrordialog.c | 2 +- - app/widgets/gimpfontselect.c | 2 +- - app/widgets/gimpgradientselect.c | 2 +- - app/widgets/gimpimagecommenteditor.c | 2 +- - app/widgets/gimpimageprofileview.c | 2 +- - app/widgets/gimppaletteselect.c | 2 +- - app/widgets/gimpprogressdialog.c | 2 +- - app/widgets/gimptooloptionseditor.c | 3 ++- - app/widgets/gimpundoeditor.c | 2 +- - app/widgets/gimpviewabledialog.c | 2 +- + app/widgets/gimpdevicestatus.c | 2 +- + app/widgets/gimperrorconsole.c | 2 +- + app/widgets/gimperrordialog.c | 2 +- + app/widgets/gimpfontselect.c | 2 +- + app/widgets/gimpgradientselect.c | 2 +- + app/widgets/gimpimagecommenteditor.c | 2 +- + app/widgets/gimpimageprofileview.c | 2 +- + app/widgets/gimppaletteselect.c | 2 +- + app/widgets/gimpprogressdialog.c | 2 +- + app/widgets/gimptooloptionseditor.c | 3 ++- + app/widgets/gimpundoeditor.c | 2 +- + app/widgets/gimpviewabledialog.c | 2 +- 15 files changed, 17 insertions(+), 16 deletions(-) commit b2a2e3200e39ebf7196668a0383d3e16fbebb162 Author: Michael Natterer -Date: Sat Oct 30 15:12:20 2010 +0200 +Date: Sat Oct 30 15:12:20 2010 +0200 app: derive GimpDisplayShell from GtkBox instead of GtkVBox @@ -48858,13 +49717,13 @@ app/display/gimpdisplayshell-filter-dialog.c | 4 ++-- app/display/gimpdisplayshell-scale-dialog.c | 4 ++-- - app/display/gimpdisplayshell.c | 5 ++++- - app/display/gimpdisplayshell.h | 4 ++-- + app/display/gimpdisplayshell.c | 5 ++++- + app/display/gimpdisplayshell.h | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) commit 79f0f5639b076def381bcbf1c60154f7873921c8 Author: Michael Natterer -Date: Sat Oct 30 14:56:00 2010 +0200 +Date: Sat Oct 30 14:56:00 2010 +0200 Don't use gtk_container_add() for adding to GtkBoxes @@ -48873,40 +49732,40 @@ gtk_box_pack_start() and specify expanding explicitely. app/actions/gradient-editor-commands.c | 8 ++++---- - app/actions/window-commands.c | 3 ++- - app/dialogs/channel-options-dialog.c | 4 ++-- - app/dialogs/convert-dialog.c | 4 ++-- - app/dialogs/fade-dialog.c | 4 ++-- - app/dialogs/grid-dialog.c | 4 ++-- + app/actions/window-commands.c | 3 ++- + app/dialogs/channel-options-dialog.c | 4 ++-- + app/dialogs/convert-dialog.c | 4 ++-- + app/dialogs/fade-dialog.c | 4 ++-- + app/dialogs/grid-dialog.c | 4 ++-- app/dialogs/image-merge-layers-dialog.c | 4 ++-- - app/dialogs/input-devices-dialog.c | 2 +- + app/dialogs/input-devices-dialog.c | 2 +- app/dialogs/keyboard-shortcuts-dialog.c | 4 ++-- - app/dialogs/layer-add-mask-dialog.c | 4 ++-- - app/dialogs/layer-options-dialog.c | 4 ++-- - app/dialogs/module-dialog.c | 20 ++++++++++---------- - app/dialogs/offset-dialog.c | 4 ++-- - app/dialogs/palette-import-dialog.c | 4 ++-- - app/dialogs/preferences-dialog.c | 9 ++++----- - app/dialogs/resize-dialog.c | 4 ++-- + app/dialogs/layer-add-mask-dialog.c | 4 ++-- + app/dialogs/layer-options-dialog.c | 4 ++-- + app/dialogs/module-dialog.c | 20 ++++++++++---------- + app/dialogs/offset-dialog.c | 4 ++-- + app/dialogs/palette-import-dialog.c | 4 ++-- + app/dialogs/preferences-dialog.c | 9 ++++----- + app/dialogs/resize-dialog.c | 4 ++-- app/dialogs/resolution-calibrate-dialog.c | 4 ++-- - app/dialogs/scale-dialog.c | 4 ++-- - app/dialogs/stroke-dialog.c | 4 ++-- - app/dialogs/template-options-dialog.c | 4 ++-- - app/dialogs/vectors-options-dialog.c | 4 ++-- - app/gui/gui.c | 4 ++-- - app/tools/gimpimagemaptool.c | 4 ++-- - app/tools/gimpmeasuretool.c | 4 ++-- - libgimp/gimpexport.c | 8 ++++---- - libgimp/gimpmenu.c | 2 +- - libgimp/gimpprocbrowserdialog.c | 4 ++-- - libgimpwidgets/gimpcolorbutton.c | 4 ++-- - libgimpwidgets/gimpquerybox.c | 5 +++-- - libgimpwidgets/gimpunitmenu.c | 6 +++--- + app/dialogs/scale-dialog.c | 4 ++-- + app/dialogs/stroke-dialog.c | 4 ++-- + app/dialogs/template-options-dialog.c | 4 ++-- + app/dialogs/vectors-options-dialog.c | 4 ++-- + app/gui/gui.c | 4 ++-- + app/tools/gimpimagemaptool.c | 4 ++-- + app/tools/gimpmeasuretool.c | 4 ++-- + libgimp/gimpexport.c | 8 ++++---- + libgimp/gimpmenu.c | 2 +- + libgimp/gimpprocbrowserdialog.c | 4 ++-- + libgimpwidgets/gimpcolorbutton.c | 4 ++-- + libgimpwidgets/gimpquerybox.c | 5 +++-- + libgimpwidgets/gimpunitmenu.c | 6 +++--- 30 files changed, 74 insertions(+), 73 deletions(-) commit bdd1cea93a8e6b544f4be8b255b64fff79203a48 Author: Chao-Hsiung Liao -Date: Sat Oct 30 19:55:58 2010 +0800 +Date: Sat Oct 30 19:55:58 2010 +0800 Updated Traditional Chinese translation (Hong Kong and Taiwan) @@ -48929,13 +49788,13 @@ po-tips/LINGUAS | 1 + po-tips/zh_HK.po | 217 + po-tips/zh_TW.po | 327 +- - po/zh_HK.po | 9194 ++++++----------------- - po/zh_TW.po | 9198 ++++++----------------- + po/zh_HK.po | 9194 ++++++----------------- + po/zh_TW.po | 9198 ++++++----------------- 20 files changed, 36475 insertions(+), 26156 deletions(-) commit 186b037f943e7b563642891349d2745858e5f26b Author: Michael Natterer -Date: Fri Oct 29 10:33:57 2010 +0200 +Date: Fri Oct 29 10:33:57 2010 +0200 app: formatting @@ -48944,7 +49803,7 @@ commit 59a4e70b86e43f8620ca7a3bea7fba935593acfa Author: Michael Natterer -Date: Fri Oct 29 10:31:04 2010 +0200 +Date: Fri Oct 29 10:31:04 2010 +0200 app: don't reserve a height for the statusbar label's icon @@ -48957,7 +49816,7 @@ commit dcdc09872dcdec71c24b8204bfa9ff41238eefb8 Author: Michael Natterer -Date: Fri Oct 29 04:45:12 2010 +0200 +Date: Fri Oct 29 04:45:12 2010 +0200 Bug 631934 - Interaction between Old text parameters and new region specific text attributes @@ -48972,22 +49831,22 @@ commit 0da7773bb5c34cfb1177561b7169ea09e34a3546 Author: Carles Ferrando -Date: Fri Oct 29 00:33:19 2010 +0100 +Date: Fri Oct 29 00:33:19 2010 +0100 Updated Catalan (Valencian) translation - po-libgimp/ca@valencia.po | 1758 ++-- + po-libgimp/ca@valencia.po | 1758 ++-- po-plug-ins/ca@valencia.po | 18203 ++++++++++++++++++++++-------------------- - po-python/ca@valencia.po | 249 +- - po-script-fu/ca@valencia.po | 1115 +-- - po-tips/ca@valencia.po | 146 +- - po/ca@valencia.po | 2621 +++--- + po-python/ca@valencia.po | 249 +- + po-script-fu/ca@valencia.po | 1115 +-- + po-tips/ca@valencia.po | 146 +- + po/ca@valencia.po | 2621 +++--- 6 files changed, 12485 insertions(+), 11607 deletions(-) commit 5111498e1139147398a4efdfb02672a95d4e855d Author: Simon Budig -Date: Thu Oct 28 20:26:50 2010 +0200 +Date: Thu Oct 28 20:26:50 2010 +0200 More input validation in the psd load plugin @@ -49000,7 +49859,7 @@ commit 0829e5b028773a6b80e8ebcb9944b749628ee81a Author: Michael Natterer -Date: Thu Oct 28 03:09:53 2010 +0200 +Date: Thu Oct 28 03:09:53 2010 +0200 app: simplify how the colormap editor sets FG/BG colors @@ -49015,7 +49874,7 @@ commit 112ca01064f7f74452f8105cbd4042d85a418298 Author: Michael Natterer -Date: Thu Oct 28 02:15:42 2010 +0200 +Date: Thu Oct 28 02:15:42 2010 +0200 app: bye bye deprecated GtkPreview @@ -49028,7 +49887,7 @@ commit 32d5d1681bc3a5dbe23e5f34060350180e0fa766 Author: Michael Natterer -Date: Thu Oct 28 02:15:16 2010 +0200 +Date: Thu Oct 28 02:15:16 2010 +0200 app: don't crash if the palette is NULL @@ -49037,7 +49896,7 @@ commit 9dee789cfdda1e138768b369c987c40608e9d720 Author: Michael Natterer -Date: Thu Oct 28 02:14:28 2010 +0200 +Date: Thu Oct 28 02:14:28 2010 +0200 app: emit "update" when the viewable goes away via the weak notify @@ -49046,7 +49905,7 @@ commit d899328a1cd7d21d9357a2899d1bfbc174704119 Author: Michael Natterer -Date: Thu Oct 28 02:12:52 2010 +0200 +Date: Thu Oct 28 02:12:52 2010 +0200 app: some updates in the new colormap palette proxy code @@ -49061,33 +49920,33 @@ commit 6e01b28502aac8a95cbda99548c2779622901f3b Author: Marco Ciampa -Date: Wed Oct 27 23:52:09 2010 +0200 +Date: Wed Oct 27 23:52:09 2010 +0200 Updated italian translation po-plug-ins/it.po | 856 ++++++++++++++++++------------------ po-script-fu/it.po | 391 +++++++++++------ - po/it.po | 1213 + po/it.po | 1213 +++++++++++++++++++++++++--------------------------- 3 files changed, 1248 insertions(+), 1212 deletions(-) commit e8df16436609930480b9aff51eb6cf4689334b7d Author: Alexia Death -Date: Wed Oct 27 21:48:17 2010 +0300 +Date: Wed Oct 27 21:48:17 2010 +0300 app: Add dynamics selector to the tool options - app/paint/gimppaintoptions.c | 30 ++++++++++++++++++++++ - app/paint/gimppaintoptions.h | 2 ++ + app/paint/gimppaintoptions.c | 30 ++++++++++++++++++++++ + app/paint/gimppaintoptions.h | 2 ++ app/tools/gimppaintoptions-gui.c | 8 +++++- - app/widgets/gimpviewablebox.c | 55 + app/widgets/gimpviewablebox.c | 55 ++++++++++++++++++++++++++++++++++++++++ - app/widgets/gimpviewablebox.h | 8 ++++++ + app/widgets/gimpviewablebox.h | 8 ++++++ 5 files changed, 102 insertions(+), 1 deletion(-) commit a27b6f5f47a31c96c4bf74bd50ffb3e69b62f824 Author: Michael Natterer -Date: Wed Oct 27 15:40:43 2010 +0200 +Date: Wed Oct 27 15:40:43 2010 +0200 app: keep a GimpPalette around that proxies the image's indexed colormap @@ -49099,12 +49958,12 @@ ++++++++++++++++++++++++++++++++++++++++-- app/core/gimpimage-colormap.h | 4 ++ app/core/gimpimage-private.h | 1 + - app/core/gimpimage.c | 27 +++------ + app/core/gimpimage.c | 27 +++------ 4 files changed, 146 insertions(+), 23 deletions(-) commit d1307a84a49d03e006153628d573aefce3336dda Author: Michael Natterer -Date: Wed Oct 27 15:39:52 2010 +0200 +Date: Wed Oct 27 15:39:52 2010 +0200 app: return TRUE from button_press() so the event doesn't get to the notebook @@ -49114,37 +49973,37 @@ commit f46122b862f08dd4c07c5b59db6c81b77b1f3571 Author: Michael Natterer -Date: Wed Oct 27 14:36:44 2010 +0200 +Date: Wed Oct 27 14:36:44 2010 +0200 app: add lots of accessors to GimpPalette and use them all over the place instead of directly accessing the struct. - app/actions/palettes-commands.c | 10 ++-- - app/core/gimpimage-convert.c | 16 ++--- - app/core/gimppalette-import.c | 2 +- - app/core/gimppalette-load.c | 4 +- - app/core/gimppalette-save.c | 7 ++- - app/core/gimppalette.c | 104 + app/actions/palettes-commands.c | 10 ++-- + app/core/gimpimage-convert.c | 16 ++--- + app/core/gimppalette-import.c | 2 +- + app/core/gimppalette-load.c | 4 +- + app/core/gimppalette-save.c | 7 ++- + app/core/gimppalette.c | 104 ++++++++++++++++++++++++++++++++- - app/core/gimppalette.h | 56 +++++++++++------- - app/dialogs/convert-dialog.c | 5 +- - app/dialogs/palette-import-dialog.c | 5 +- - app/pdb/palette-cmds.c | 69 +++++++--------------- - app/pdb/palettes-cmds.c | 10 ++-- + app/core/gimppalette.h | 56 +++++++++++------- + app/dialogs/convert-dialog.c | 5 +- + app/dialogs/palette-import-dialog.c | 5 +- + app/pdb/palette-cmds.c | 69 +++++++--------------- + app/pdb/palettes-cmds.c | 10 ++-- app/widgets/gimpcolorselectorpalette.c | 2 +- - app/widgets/gimppaletteeditor.c | 75 ++++++++++++------------ - app/widgets/gimppaletteselect.c | 2 +- - app/widgets/gimppaletteview.c | 21 ++++--- - app/widgets/gimpviewrendererpalette.c | 20 ++++--- - tools/pdbgen/pdb/palette.pdb | 69 +++++++--------------- - tools/pdbgen/pdb/palettes.pdb | 10 ++-- + app/widgets/gimppaletteeditor.c | 75 ++++++++++++------------ + app/widgets/gimppaletteselect.c | 2 +- + app/widgets/gimppaletteview.c | 21 ++++--- + app/widgets/gimpviewrendererpalette.c | 20 ++++--- + tools/pdbgen/pdb/palette.pdb | 69 +++++++--------------- + tools/pdbgen/pdb/palettes.pdb | 10 ++-- 18 files changed, 285 insertions(+), 202 deletions(-) commit 5931fe531260959499870d22139960629e0f115f Author: Martin Nordholts -Date: Tue Oct 26 18:23:00 2010 +0200 +Date: Tue Oct 26 18:23:00 2010 +0200 app/tests: test-tools.c formating @@ -49153,7 +50012,7 @@ commit 8c65edcc55657c71ca3997848ef0769fdeb667ca Author: Michael Natterer -Date: Tue Oct 26 16:40:41 2010 +0200 +Date: Tue Oct 26 16:40:41 2010 +0200 app: make GimpScaleComboBox build with GTK+ >= 2.23.1 @@ -49162,7 +50021,7 @@ commit d3c97238a3d305f1b25e46e4fc18b7507f043058 Author: Martin Nordholts -Date: Tue Oct 26 14:35:06 2010 +0200 +Date: Tue Oct 26 14:35:06 2010 +0200 app/tests: Fix inludes of non-UI tests @@ -49176,7 +50035,7 @@ commit 4fd051cc0d63bb16a7a9d1eaa75e564cda23b8f8 Author: Martin Nordholts -Date: Tue Oct 26 14:34:10 2010 +0200 +Date: Tue Oct 26 14:34:10 2010 +0200 app/tests: Remove invalid redeclaration @@ -49187,22 +50046,22 @@ commit fc8ab634a8fba3f88e38dad06e0152e0d431838e Author: Martin Nordholts -Date: Mon Oct 25 14:32:22 2010 +0200 +Date: Mon Oct 25 14:32:22 2010 +0200 app/tests: Add '/gimp-tools/crop_tool_can_crop' test Begin adding a new set of tests meant to test tools. The first test is a regression test for "Bug 315255 - SIGSEGV, while doing a crop". - app/tests/.gitignore | 1 + - app/tests/Makefile.am | 1 + + app/tests/.gitignore | 1 + + app/tests/Makefile.am | 1 + app/tests/test-tools.c | 432 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 434 insertions(+) commit e7b7bb713631fff68f14405ae020bee19e83a55f Author: Martin Nordholts -Date: Tue Oct 26 14:15:03 2010 +0200 +Date: Tue Oct 26 14:15:03 2010 +0200 app/tests: Make gimp_ui_get_ui_manager() a global test util @@ -49213,23 +50072,23 @@ app/tests/gimp-app-test-utils.c | 48 +++++++++++++++++++++++++++++++++++++---- app/tests/gimp-app-test-utils.h | 17 ++++++++------- - app/tests/test-ui.c | 39 ++++++--------------------------- + app/tests/test-ui.c | 39 ++++++--------------------------- 3 files changed, 60 insertions(+), 44 deletions(-) commit 62ece2ff180bde8914d5ab61730bc04ca0767be6 Author: Martin Nordholts -Date: Tue Oct 26 13:53:24 2010 +0200 +Date: Tue Oct 26 13:53:24 2010 +0200 app/tests: Make gimp_ui_synthesize_key_event() a global test util app/tests/gimp-app-test-utils.c | 23 +++++++++++++++++++++++ app/tests/gimp-app-test-utils.h | 14 ++++++++------ - app/tests/test-ui.c | 20 +------------------- + app/tests/test-ui.c | 20 +------------------- 3 files changed, 32 insertions(+), 25 deletions(-) commit edff4949bc064b963efe88570473fa76fcd2b96e Author: Martin Nordholts -Date: Tue Oct 26 13:48:36 2010 +0200 +Date: Tue Oct 26 13:48:36 2010 +0200 app: Call gimp_log_init() in test init functions @@ -49241,7 +50100,7 @@ commit c33b287dabe825bc7fddcba213448552c22db6bd Author: Martin Nordholts -Date: Tue Oct 26 13:47:18 2010 +0200 +Date: Tue Oct 26 13:47:18 2010 +0200 app: Register GimpToolAction for gimp_enum_get_value_name() @@ -49254,18 +50113,18 @@ commit 73d2f4421032a7cc13a026bd404752a25adf733d Author: Martin Nordholts -Date: Tue Oct 26 13:46:11 2010 +0200 +Date: Tue Oct 26 13:46:11 2010 +0200 app: Add some GimpRectangleTool GIMP_LOG() messages - app/gimp-log.c | 3 ++- - app/gimp-log.h | 4 +++- + app/gimp-log.c | 3 ++- + app/gimp-log.h | 4 +++- app/tools/gimprectangletool.c | 15 +++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) commit ee81f23f0a08fa0f9676b865d8409ca4ffba5d45 Author: Martin Nordholts -Date: Tue Oct 26 13:45:17 2010 +0200 +Date: Tue Oct 26 13:45:17 2010 +0200 app: Add gimp_enum_get_value_name() utility function @@ -49275,7 +50134,7 @@ commit 3d82d40f5b6bec5d688b41000e5da4fc0b4fa129 Author: Martin Nordholts -Date: Mon Oct 25 20:56:09 2010 +0200 +Date: Mon Oct 25 20:56:09 2010 +0200 app/tests: Improve gimp_test_utils_set_env_to_subdir() hint @@ -49287,7 +50146,7 @@ commit 1e747cbb19c8fb5a53807ab4a85447f9186e93d0 Author: Martin Nordholts -Date: Mon Oct 25 14:14:01 2010 +0200 +Date: Mon Oct 25 14:14:01 2010 +0200 app: Update gimp_display_shell_transform_xy_f() gtk-doc @@ -49298,7 +50157,7 @@ commit 2056042e967b135d2aa818351a927f3b68ff3bdf Author: Martin Nordholts -Date: Mon Oct 25 08:47:27 2010 +0200 +Date: Mon Oct 25 08:47:27 2010 +0200 app/tests: Add gimp_test_utils_create_image() @@ -49309,7 +50168,7 @@ commit 9e6f5000a588f31f22e2e5cf6c97a753012bd826 Author: Martin Nordholts -Date: Mon Oct 25 13:58:09 2010 +0200 +Date: Mon Oct 25 13:58:09 2010 +0200 app/tests: Give possible solution to 'keyboard_zoom_focus' failing @@ -49318,7 +50177,7 @@ commit 6fc4c42298cb6c8b36f93ca0af9746a9c00e355f Author: Michael Natterer -Date: Mon Oct 25 22:54:55 2010 +0200 +Date: Mon Oct 25 22:54:55 2010 +0200 Bug 348183 - palette editor doesn't show all palette colors @@ -49333,7 +50192,7 @@ commit 356690da1c72e6464d8fec6c66b78855f713a9b2 Author: Joe Hansen -Date: Sun Oct 24 17:34:17 2010 +0200 +Date: Sun Oct 24 17:34:17 2010 +0200 Updated Danish translation @@ -49343,7 +50202,7 @@ commit b072e7583351171bae8297b8cd191ccd958bc6aa Author: Mukund Sivaraman -Date: Sat Oct 23 17:23:22 2010 +0530 +Date: Sat Oct 23 17:23:22 2010 +0530 file-jpeg: Make cinfo struct static so asynchronous saves don't crash @@ -49358,7 +50217,7 @@ commit 150983ac600ca9f6b9dfe1a73dced42cab45c98e Author: Alexandre Prokoudine -Date: Sat Oct 23 02:19:46 2010 +0400 +Date: Sat Oct 23 02:19:46 2010 +0400 po/ru.po: Fixed typos spotted by Maxim S. Barabash @@ -49367,7 +50226,7 @@ commit 64ed52144a777e9229d3af5403a263c418a750f4 Author: Mukund Sivaraman -Date: Sat Oct 23 00:34:05 2010 +0530 +Date: Sat Oct 23 00:34:05 2010 +0530 Update indentation @@ -49376,27 +50235,27 @@ commit 60d24b4c045e2fe51adabdac8f3ba67e67a5a746 Author: Michael Natterer -Date: Fri Oct 22 19:56:59 2010 +0200 +Date: Fri Oct 22 19:56:59 2010 +0200 app: get rid of #ifdef USE_CAIRO_REGION almost everywhere get replaced by GDK region functions and use the cairo region functions unconditionally all over the place. - app/display/display-types.h | 10 +++++++++- - app/display/gimpcanvasarc.c | 4 ---- + app/display/display-types.h | 10 +++++++++- + app/display/gimpcanvasarc.c | 4 ---- app/display/gimpcanvasboundary.c | 4 ---- app/display/gimpcanvascorner.c | 4 ---- app/display/gimpcanvascursor.c | 4 ---- - app/display/gimpcanvasgrid.c | 4 ---- - app/display/gimpcanvasgroup.c | 13 ------------- - app/display/gimpcanvasguide.c | 4 ---- + app/display/gimpcanvasgrid.c | 4 ---- + app/display/gimpcanvasgroup.c | 13 ------------- + app/display/gimpcanvasguide.c | 4 ---- app/display/gimpcanvashandle.c | 4 ---- - app/display/gimpcanvasitem.c | 17 ----------------- - app/display/gimpcanvasline.c | 4 ---- + app/display/gimpcanvasitem.c | 17 ----------------- + app/display/gimpcanvasline.c | 4 ---- app/display/gimpcanvaspassepartout.c | 8 -------- - app/display/gimpcanvaspath.c | 4 ---- - app/display/gimpcanvaspen.c | 8 -------- + app/display/gimpcanvaspath.c | 4 ---- + app/display/gimpcanvaspen.c | 8 -------- app/display/gimpcanvaspolygon.c | 4 ---- app/display/gimpcanvasrectangle.c | 26 +------------------------- app/display/gimpcanvassamplepoint.c | 4 ---- @@ -49406,7 +50265,7 @@ commit 40797f1fd4cf635d88608cfdaf937ae258e2d13a Author: Mukund Sivaraman -Date: Fri Oct 22 22:45:59 2010 +0530 +Date: Fri Oct 22 22:45:59 2010 +0530 Bump down cairo version for USE_CAIRO_REGION @@ -49415,7 +50274,7 @@ commit 49988638067c3d66262b34b79ffa7a1e6c43919f Author: Mukund Sivaraman -Date: Fri Oct 22 22:23:16 2010 +0530 +Date: Fri Oct 22 22:23:16 2010 +0530 file-jpeg: Fix a crash when toggling settings in preview mode @@ -49428,7 +50287,7 @@ commit 71ab7f4291b552991eabfc67a44341aadc4eac47 Author: Michael Natterer -Date: Fri Oct 22 18:46:57 2010 +0200 +Date: Fri Oct 22 18:46:57 2010 +0200 app: cairo_translate() by allocation.x,y @@ -49437,7 +50296,7 @@ commit 8140df304a80bf888367a51f3b4ea81551ffaefd Author: Martin Nordholts -Date: Thu Oct 21 21:11:27 2010 +0200 +Date: Thu Oct 21 21:11:27 2010 +0200 app/tests: Don't depend on UI in test-xcf.c @@ -49446,7 +50305,7 @@ commit 784a1ce2a9932a0bdae3c72fec93009404d05fe0 Author: Martin Nordholts -Date: Thu Oct 21 21:11:06 2010 +0200 +Date: Thu Oct 21 21:11:06 2010 +0200 app: Initialize and restore GIMP in gimp_init_for_testing() @@ -49459,7 +50318,7 @@ commit 81410e0a5fe6564995e082e71d817ed9fc7cc08c Author: Martin Nordholts -Date: Thu Oct 21 21:09:16 2010 +0200 +Date: Thu Oct 21 21:09:16 2010 +0200 app/tests: Exit properly in test-core.c to avoid broken wire @@ -49472,7 +50331,7 @@ commit 8f8ea74d1fc3be72d17ee3d71fd56049ae6c93c3 Author: Michael Natterer -Date: Thu Oct 21 13:19:51 2010 +0200 +Date: Thu Oct 21 13:19:51 2010 +0200 app: return TRUE from button and motion callbacks because we handled the events @@ -49482,7 +50341,7 @@ commit 199804bce54511bd04be7543d2565317c674c430 Author: Michael Natterer -Date: Thu Oct 21 12:02:49 2010 +0200 +Date: Thu Oct 21 12:02:49 2010 +0200 app: fix alphabetic order @@ -49491,7 +50350,7 @@ commit 8a1517f18b0119717d4d9854f647493da110a2a6 Author: Michael Natterer -Date: Thu Oct 21 11:53:41 2010 +0200 +Date: Thu Oct 21 11:53:41 2010 +0200 app: properly select icon view items @@ -49503,7 +50362,7 @@ commit c60e29254ba5712017ea2fbcc960bf1e5010c41a Author: Michael Natterer -Date: Thu Oct 21 11:38:58 2010 +0200 +Date: Thu Oct 21 11:38:58 2010 +0200 app: don't try to set properties of a NULL icon view @@ -49512,7 +50371,7 @@ commit 7cfda8cc3335237bd720a1fe45d457eb09473561 Author: Michael Natterer -Date: Wed Oct 20 19:25:03 2010 +0200 +Date: Wed Oct 20 19:25:03 2010 +0200 app: use pango_cairo_show_layout() instead of a GdkPangoRenderer @@ -49521,7 +50380,7 @@ commit 83407d230c332a8b9eab7cf5115a566070dc03e2 Author: Michael Natterer -Date: Wed Oct 20 19:09:54 2010 +0200 +Date: Wed Oct 20 19:09:54 2010 +0200 app: build with GSEAL_ENABLE (don't access widget->requisition) @@ -49530,7 +50389,7 @@ commit c8bef14682e0b101ad4859dd397381ea0045a136 Author: Michael Natterer -Date: Wed Oct 20 19:04:32 2010 +0200 +Date: Wed Oct 20 19:04:32 2010 +0200 app: fix Makefile.am formatting @@ -49539,7 +50398,7 @@ commit 090a465362ff8158f915aac97b9bb9eb790e478b Author: Michael Natterer -Date: Wed Oct 20 18:04:18 2010 +0200 +Date: Wed Oct 20 18:04:18 2010 +0200 app: don't pass "GdkRectangle *draw_area" to gimp_view_renderer_draw() @@ -49548,18 +50407,18 @@ height available for drawing. app/widgets/gimpcellrendererviewable.c | 6 ++++- - app/widgets/gimpview.c | 6 ++++- - app/widgets/gimpviewrenderer.c | 43 + app/widgets/gimpview.c | 6 ++++- + app/widgets/gimpviewrenderer.c | 43 +++++++++++++++++++--------------- - app/widgets/gimpviewrenderer.h | 24 ++++++++++--------- - app/widgets/gimpviewrendererbrush.c | 38 + app/widgets/gimpviewrenderer.h | 24 ++++++++++--------- + app/widgets/gimpviewrendererbrush.c | 38 ++++++++++++++++-------------- - app/widgets/gimpviewrenderervectors.c | 22 +++++++++-------- + app/widgets/gimpviewrenderervectors.c | 22 +++++++++-------- 6 files changed, 80 insertions(+), 59 deletions(-) commit 7ab96f6b5c0882eb3f0ed8c35891e98350b94e20 Author: Michael Natterer -Date: Wed Oct 20 17:32:54 2010 +0200 +Date: Wed Oct 20 17:32:54 2010 +0200 app: don't chain up in GtkWidget::size-request() @@ -49571,7 +50430,7 @@ commit 9e28a0406b29fdd792c5cf178ba425f2ee60c766 Author: Michael Natterer -Date: Tue Oct 19 18:37:00 2010 +0200 +Date: Tue Oct 19 18:37:00 2010 +0200 libgimpwidgets: use accessors for GtkAdjustment members @@ -49584,7 +50443,7 @@ commit 349a401cc5adecf63fe2542ae6305db95cdb9826 Author: Mukund Sivaraman -Date: Tue Oct 19 00:24:32 2010 +0530 +Date: Tue Oct 19 00:24:32 2010 +0530 file-jp2-load: Elaborate comment @@ -49593,7 +50452,7 @@ commit 400f5ac5f309bf983d6a91b973e0ee5ad4861e5e Author: Michael Natterer -Date: Tue Oct 19 12:27:33 2010 +0200 +Date: Tue Oct 19 12:27:33 2010 +0200 app: store adjustments as GtkAdjustment pointers instead of GtkObject ones @@ -49610,21 +50469,21 @@ commit 868fdcf99ff618130d835e1d681b498177eb3b2a Author: Sven Neumann -Date: Tue Oct 19 10:13:01 2010 +0200 +Date: Tue Oct 19 10:13:01 2010 +0200 app: remove min-colors and install-colormap properties from gimprc - app/config/gimpcoreconfig.c | 52 + app/config/gimpcoreconfig.c | 52 +++++++++++++++++++----------------- - app/config/gimpcoreconfig.h | 2 -- - app/config/gimprc-blurbs.h | 7 ----- - app/gui/gui.c | 3 --- + app/config/gimpcoreconfig.h | 2 -- + app/config/gimprc-blurbs.h | 7 ----- + app/gui/gui.c | 3 --- app/plug-in/gimppluginmanager-call.c | 4 +-- 5 files changed, 29 insertions(+), 39 deletions(-) commit 6302ea7de832b14ecd809078c4a30b7c2d149c67 Author: Sven Neumann -Date: Tue Oct 19 10:02:27 2010 +0200 +Date: Tue Oct 19 10:02:27 2010 +0200 pygimp: remove wrappers for gimp_min_colors() and gimp_install_cmap() @@ -49633,7 +50492,7 @@ commit 71ead9647238c92c8cbd7c30009794def64a214a Author: Sven Neumann -Date: Tue Oct 19 09:59:59 2010 +0200 +Date: Tue Oct 19 09:59:59 2010 +0200 libgimp: deprecate gimp_min_colors() and gimp_install_cmap() @@ -49648,7 +50507,7 @@ commit 31b64f3c80f3c2dbfa7d006f9e9520f351928be2 Author: Martin Nordholts -Date: Mon Oct 18 22:29:15 2010 +0200 +Date: Mon Oct 18 22:29:15 2010 +0200 po-plug-ins: Temporarily disable file-pdf-load.c @@ -49657,14 +50516,14 @@ commit a798c9456c300be0004bcf0939f05cb14da5bf66 Author: Sven Neumann -Date: Mon Oct 18 22:15:34 2010 +0200 +Date: Mon Oct 18 22:15:34 2010 +0200 app/display: add new canvas item GimpCanvasPassePartout This is supposed to replace the GimpDisplayShell highlight API, but it is not yet used. - app/display/Makefile.am | 2 + + app/display/Makefile.am | 2 + app/display/gimpcanvaspassepartout.c | 140 +++++++++++++++++++++++++++++++++++ app/display/gimpcanvaspassepartout.h | 59 +++++++++++++++ @@ -49675,7 +50534,7 @@ commit 8c42c38c7e0474e0e4b1c9a12bb69bd459b2171c Author: Michael Natterer -Date: Mon Oct 18 21:30:56 2010 +0200 +Date: Mon Oct 18 21:30:56 2010 +0200 app: store the dialog's adjustments as GtkAdjustment pointers @@ -49687,7 +50546,7 @@ commit 0ad43df54e44d63aed7c240d6106adc83ab1ea70 Author: Michael Natterer -Date: Mon Oct 18 20:25:02 2010 +0200 +Date: Mon Oct 18 20:25:02 2010 +0200 app: use the cairo_region_t hack in gimp_display_shell_set_highlight() @@ -49696,31 +50555,31 @@ commit 22db39afd29bf176a42fa86d9446fd20beeeef0e Author: Michael Natterer -Date: Mon Oct 18 20:13:09 2010 +0200 +Date: Mon Oct 18 20:13:09 2010 +0200 app: fix incomplete earlier s/GtkAnchorType/GimpHandleAnchor/ change app/display/gimpcanvashandle.c | 28 +++++++------- - app/tools/gimpaligntool.c | 16 ++++---- - app/tools/gimpblendtool.c | 4 +- - app/tools/gimpbrushtool.c | 2 +- + app/tools/gimpaligntool.c | 16 ++++---- + app/tools/gimpblendtool.c | 4 +- + app/tools/gimpbrushtool.c | 2 +- app/tools/gimpeditselectiontool.c | 2 +- app/tools/gimpfreeselecttool.c | 2 +- - app/tools/gimpiscissorstool.c | 16 ++++---- - app/tools/gimpmeasuretool.c | 10 ++--- - app/tools/gimppainttool.c | 4 +- + app/tools/gimpiscissorstool.c | 16 ++++---- + app/tools/gimpmeasuretool.c | 10 ++--- + app/tools/gimppainttool.c | 4 +- app/tools/gimpperspectiveclonetool.c | 10 ++--- - app/tools/gimprectangletool.c | 72 + app/tools/gimprectangletool.c | 72 ++++++++++++++++++------------------ - app/tools/gimpsourcetool.c | 2 +- + app/tools/gimpsourcetool.c | 2 +- app/tools/gimptexttool-editor.c | 6 +-- - app/tools/gimptransformtool.c | 30 +++++++-------- - app/tools/gimpvectortool.c | 4 +- + app/tools/gimptransformtool.c | 30 +++++++-------- + app/tools/gimpvectortool.c | 4 +- 15 files changed, 104 insertions(+), 104 deletions(-) commit 479082075bb9d7e69909091a34a5386f15622a9e Author: Michael Natterer -Date: Mon Oct 18 19:59:13 2010 +0200 +Date: Mon Oct 18 19:59:13 2010 +0200 app: use cairo_region_t for canvas items if cairo >= 1.10 is available @@ -49728,23 +50587,23 @@ cairo_region_t and has some evil #ifdefs. This is going to die immeditately once we can depend on cairo 1.10. - app/display/display-types.h | 9 ++++ - app/display/gimpcanvasarc.c | 32 +++++++------- + app/display/display-types.h | 9 ++++ + app/display/gimpcanvasarc.c | 32 +++++++------- app/display/gimpcanvasboundary.c | 34 ++++++++------- app/display/gimpcanvascorner.c | 32 +++++++------- app/display/gimpcanvascursor.c | 32 +++++++------- - app/display/gimpcanvasgrid.c | 40 ++++++++++-------- - app/display/gimpcanvasgroup.c | 59 +++++++++++++++----------- - app/display/gimpcanvasguide.c | 38 +++++++++-------- + app/display/gimpcanvasgrid.c | 40 ++++++++++-------- + app/display/gimpcanvasgroup.c | 59 +++++++++++++++----------- + app/display/gimpcanvasguide.c | 38 +++++++++-------- app/display/gimpcanvashandle.c | 32 +++++++------- - app/display/gimpcanvasitem.c | 78 + app/display/gimpcanvasitem.c | 78 +++++++++++++++++++++-------------- - app/display/gimpcanvasitem.h | 78 + app/display/gimpcanvasitem.h | 78 +++++++++++++++++------------------ app/display/gimpcanvaslayerboundary.c | 34 +++++++-------- - app/display/gimpcanvasline.c | 32 +++++++------- - app/display/gimpcanvaspath.c | 40 ++++++++++-------- - app/display/gimpcanvaspen.c | 38 ++++++++++------- + app/display/gimpcanvasline.c | 32 +++++++------- + app/display/gimpcanvaspath.c | 40 ++++++++++-------- + app/display/gimpcanvaspen.c | 38 ++++++++++------- app/display/gimpcanvaspolygon.c | 34 ++++++++------- app/display/gimpcanvasrectangle.c | 56 ++++++++++++++++++------- app/display/gimpcanvassamplepoint.c | 44 +++++++++++--------- @@ -49756,7 +50615,7 @@ commit 1130e8c8908c7d011948bac9ae65c7f57b18e8dd Author: Sven Neumann -Date: Mon Oct 18 18:28:57 2010 +0200 +Date: Mon Oct 18 18:28:57 2010 +0200 Bug 631728 - Crash or Gtk-CRITICAL on File->Open @@ -49768,7 +50627,7 @@ commit d831b9a3533ea41a3572e0c084b6b7380bf40673 Author: Michael Natterer -Date: Mon Oct 18 16:40:47 2010 +0200 +Date: Mon Oct 18 16:40:47 2010 +0200 libgimpwidgets: fix GimpFrame's child allocation for GSEAL_ENABLE @@ -49782,7 +50641,7 @@ commit 9bbcf8c6b3fe0a960f8c4bc64169853611e35eb7 Author: Mukund Sivaraman -Date: Mon Oct 18 19:19:59 2010 +0530 +Date: Mon Oct 18 19:19:59 2010 +0530 plug-ins/common/file-jp2-load: Check for other kinds of alpha components @@ -49794,28 +50653,28 @@ commit 5b64b83569b64e6c31a79ae1f714dbdb7f4ea699 Author: Michael Natterer -Date: Mon Oct 18 12:50:17 2010 +0200 +Date: Mon Oct 18 12:50:17 2010 +0200 app: introduce enum GimpHandleAnchor as replacement for GtkAnchorType because the latter is gone in GTK+ 3.0 - app/display/display-enums.c | 43 ++++++++++ - app/display/display-enums.h | 18 +++++ + app/display/display-enums.c | 43 ++++++++++ + app/display/display-enums.h | 18 +++++ app/display/gimpcanvascorner.c | 40 +++++----- app/display/gimpcanvascorner.h | 2 +- app/display/gimpcanvashandle.c | 58 +++++++------- app/display/gimpcanvashandle.h | 2 +- app/display/gimpdisplayshell.c | 32 ++++---- app/display/gimpdisplayshell.h | 4 +- - app/tools/gimpdrawtool.c | 176 + app/tools/gimpdrawtool.c | 176 ++++++++++++++++++++--------------------- - app/tools/gimpdrawtool.h | 6 +- + app/tools/gimpdrawtool.h | 6 +- 10 files changed, 221 insertions(+), 160 deletions(-) commit 0e9442b7c0c7f28e435a5e448057c49c5aa2a267 Author: Michael Natterer -Date: Mon Oct 18 12:44:58 2010 +0200 +Date: Mon Oct 18 12:44:58 2010 +0200 app: fix typo in comment @@ -49824,7 +50683,7 @@ commit 130885e903f7c880255695b916e683cc511b77b4 Author: Martin Nordholts -Date: Sat Oct 16 19:17:29 2010 +0200 +Date: Sat Oct 16 19:17:29 2010 +0200 app/xcf: Simplify MAX_XCF_STRING_LEN @@ -49835,7 +50694,7 @@ commit 133c62327e4f5f486619285bfc9a9753f9920c4f Author: Mattias Põldaru -Date: Sun Oct 17 20:22:25 2010 +0300 +Date: Sun Oct 17 20:22:25 2010 +0300 [l10n] Updated Estonian translation @@ -49845,7 +50704,7 @@ commit b04348d257682b7636581876b59eea37bb3274bf Author: Mattias Põldaru -Date: Sun Oct 17 20:21:25 2010 +0300 +Date: Sun Oct 17 20:21:25 2010 +0300 [l10n] Updated Estonian translation @@ -49854,7 +50713,7 @@ commit 83eeb724ca8da6b8855c10a2e708f36cf3f592c1 Author: Mukund Sivaraman -Date: Sun Oct 17 16:06:24 2010 +0530 +Date: Sun Oct 17 16:06:24 2010 +0530 plug-ins/common/screenshot: Remove extra article @@ -49863,19 +50722,19 @@ commit 42f67f4d9649d78ab28b941abe27728b2ab75e5c Author: Mukund Sivaraman -Date: Sun Oct 17 00:29:04 2010 +0530 +Date: Sun Oct 17 00:29:04 2010 +0530 Rename WebKit's AM_CONDITIONAL This is so that WebKit can be used elsewhere in GIMP. - configure.ac | 2 +- + configure.ac | 2 +- plug-ins/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit e8416a7143b1b83261ff20ad2768d85023138a97 Author: Bruce Cowan -Date: Sat Oct 16 19:32:31 2010 +0100 +Date: Sat Oct 16 19:32:31 2010 +0100 Updated British English translation @@ -49887,12 +50746,12 @@ po-tags/LINGUAS | 1 + po-tags/en_GB.po | 26 + po-tips/en_GB.po | 21 +- - po/en_GB.po | 2829 ++++++--------------- + po/en_GB.po | 2829 ++++++--------------- 8 files changed, 5779 insertions(+), 6184 deletions(-) commit daf6456663f1ea980e549d19f67c5c73ceea64a9 Author: Mukund Sivaraman -Date: Sat Oct 16 15:08:42 2010 +0530 +Date: Sat Oct 16 15:08:42 2010 +0530 Fix install rule for individual plug-ins @@ -49902,7 +50761,7 @@ commit 0ff751fd2db63605083c008dfdb2727e03e872f0 Author: Mukund Sivaraman -Date: Sat Oct 16 11:53:50 2010 +0530 +Date: Sat Oct 16 11:53:50 2010 +0530 Sort gimpwidgets.def entries @@ -49911,7 +50770,7 @@ commit 8b57945ebb3e7c0543eedc4164f4732eaebaa124 Author: Mukund Sivaraman -Date: Sat Oct 16 11:48:48 2010 +0530 +Date: Sat Oct 16 11:48:48 2010 +0530 Convert spaces to tab in def file @@ -49920,7 +50779,7 @@ commit c7f36d15466cc5aeda2dfdea6c51a1028d652d1d Author: Mukund Sivaraman -Date: Sat Oct 16 11:48:23 2010 +0530 +Date: Sat Oct 16 11:48:23 2010 +0530 Add missing symbols to gimpwidgets.def @@ -49929,7 +50788,7 @@ commit f1a7db80c91c463b69cfb2a05d6a10fc62571eb3 Author: Mukund Sivaraman -Date: Sat Oct 16 04:22:11 2010 +0530 +Date: Sat Oct 16 04:22:11 2010 +0530 Validate number of colors in XCF colormaps @@ -49938,7 +50797,7 @@ commit 4855d433b08eb483b7c94a4c9ecfd80acce9b553 Author: Mukund Sivaraman -Date: Sat Oct 16 04:04:26 2010 +0530 +Date: Sat Oct 16 04:04:26 2010 +0530 Validate XCF string length @@ -49951,17 +50810,17 @@ commit 675a9c3950d0466813cb940c0bc5e2902bfb1cfe Author: Mukund Sivaraman -Date: Fri Oct 15 22:27:01 2010 +0530 +Date: Fri Oct 15 22:27:01 2010 +0530 Decrement sample size just like in the gradients_sample_uniform case - app/pdb/gradients-cmds.c | 2 +- + app/pdb/gradients-cmds.c | 2 +- tools/pdbgen/pdb/gradients.pdb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit bec9e4b4ea6c58ee1de93f63c642daa7fd42b90f Author: Nils Philippsen -Date: Fri Oct 15 17:25:28 2010 +0200 +Date: Fri Oct 15 17:25:28 2010 +0200 pygimp: deprecate gimpui.UnitMenu @@ -49970,7 +50829,7 @@ commit bc265758b0ac4a17696075a81e040156b7fee8b1 Author: Nils Philippsen -Date: Fri Oct 15 17:23:01 2010 +0200 +Date: Fri Oct 15 17:23:01 2010 +0200 pygimp: add wrapper for GimpUnit, GimpUnitComboBox @@ -49980,7 +50839,7 @@ commit b07eed8208d66d60e34cff9253529b59ef755ce4 Author: Nils Philippsen -Date: Fri Oct 15 17:19:00 2010 +0200 +Date: Fri Oct 15 17:19:00 2010 +0200 pygimp: fix building with deprecated GimpUnitMenu @@ -49989,7 +50848,7 @@ commit 628439bc311c560f9b80ab09496b7003138fbbf7 Author: Michael Natterer -Date: Fri Oct 15 16:03:36 2010 +0200 +Date: Fri Oct 15 16:03:36 2010 +0200 app: simplify toolbox wilber drawing a lot @@ -49999,7 +50858,7 @@ commit 37effb99a48d1d847e0459d9e267c0287b99d5c6 Author: Michael Natterer -Date: Fri Oct 15 15:17:12 2010 +0200 +Date: Fri Oct 15 15:17:12 2010 +0200 app: use the window's allocation instead of gdk_drawable_get_size() @@ -50008,7 +50867,7 @@ commit 5af8cc1d4042774c9c1c58789d2a4bba9b86eced Author: Michael Natterer -Date: Fri Oct 15 15:06:43 2010 +0200 +Date: Fri Oct 15 15:06:43 2010 +0200 app: translate the cr by allocation.x,y instead of doing this while drawing @@ -50018,26 +50877,26 @@ commit b69eea8cd6f37a9895553c28d188f30ee6b0fe8f Author: Michael Natterer -Date: Fri Oct 15 14:08:36 2010 +0200 +Date: Fri Oct 15 14:08:36 2010 +0200 app: implement GObject::dispose() instead of GtkObject::destroy() - app/widgets/gimpdock.c | 33 ++++++++------- - app/widgets/gimpdockable.c | 91 + app/widgets/gimpdock.c | 33 ++++++++------- + app/widgets/gimpdockable.c | 91 ++++++++++++++++++++-------------------- - app/widgets/gimpeditor.c | 75 ++++++++++++++++----------------- + app/widgets/gimpeditor.c | 75 ++++++++++++++++----------------- app/widgets/gimperrorconsole.c | 14 +++---- - app/widgets/gimpfgbgeditor.c | 56 ++++++++++++------------- - app/widgets/gimpfgbgview.c | 32 +++++++------- - app/widgets/gimpfiledialog.c | 11 ++--- + app/widgets/gimpfgbgeditor.c | 56 ++++++++++++------------- + app/widgets/gimpfgbgview.c | 32 +++++++------- + app/widgets/gimpfiledialog.c | 11 ++--- app/widgets/gimpgradienteditor.c | 16 ++++--- - app/widgets/gimpimageeditor.c | 12 +++--- + app/widgets/gimpimageeditor.c | 12 +++--- app/widgets/gimpitemtreeview.c | 15 +++---- 10 files changed, 174 insertions(+), 181 deletions(-) commit 3c18ba3497cc79e61c46e23cd3676d9bcae2544f Author: Michael Natterer -Date: Fri Oct 15 13:48:36 2010 +0200 +Date: Fri Oct 15 13:48:36 2010 +0200 app: implement GObject::dispose() instead of GtkWidget::destroy() @@ -50047,7 +50906,7 @@ commit 756b7310e7096c5d481f87c9f9a8baa48d1af109 Author: Michael Natterer -Date: Fri Oct 15 13:02:05 2010 +0200 +Date: Fri Oct 15 13:02:05 2010 +0200 app: cairo_translate() by allocation.x,y instead of doing that when drawing @@ -50057,7 +50916,7 @@ commit 1cc27bcef7c61fb018b59bef924e0403cbf7b271 Author: Michael Natterer -Date: Fri Oct 15 12:53:58 2010 +0200 +Date: Fri Oct 15 12:53:58 2010 +0200 app: port gimp_view_renderer_draw() to take a cairo_t* instead of GdkWindow* @@ -50065,31 +50924,31 @@ and pass in the cr with clipping set up from the callers instead. app/widgets/gimpcellrendererviewable.c | 11 +++++++++-- - app/widgets/gimpview.c | 13 +++++++++---- - app/widgets/gimpviewrenderer.c | 23 +++-------------------- - app/widgets/gimpviewrenderer.h | 5 ++--- + app/widgets/gimpview.c | 13 +++++++++---- + app/widgets/gimpviewrenderer.c | 23 +++-------------------- + app/widgets/gimpviewrenderer.h | 5 ++--- 4 files changed, 23 insertions(+), 29 deletions(-) commit dc398572388f41a5806a0e535a7e681572223f9f Author: Michael Natterer -Date: Fri Oct 15 12:37:36 2010 +0200 +Date: Fri Oct 15 12:37:36 2010 +0200 app: add GimpSegment as replacement for GdkSegment - app/display/gimpcanvasboundary.c | 10 +++++----- - app/display/gimpdisplayshell-draw.c | 2 +- - app/display/gimpdisplayshell-draw.h | 2 +- + app/display/gimpcanvasboundary.c | 10 +++++----- + app/display/gimpdisplayshell-draw.c | 2 +- + app/display/gimpdisplayshell-draw.h | 2 +- app/display/gimpdisplayshell-selection.c | 14 +++++++------- app/display/gimpdisplayshell-transform.c | 2 +- app/display/gimpdisplayshell-transform.h | 2 +- - app/widgets/gimpcairo.c | 6 +++--- - app/widgets/gimpcairo.h | 2 +- - app/widgets/widgets-types.h | 13 +++++++++++++ + app/widgets/gimpcairo.c | 6 +++--- + app/widgets/gimpcairo.h | 2 +- + app/widgets/widgets-types.h | 13 +++++++++++++ 9 files changed, 33 insertions(+), 20 deletions(-) commit 1948feb686c8210f8f9a3162d9c40d0fbdc856b5 Author: Michael Natterer -Date: Fri Oct 15 12:17:10 2010 +0200 +Date: Fri Oct 15 12:17:10 2010 +0200 libgimp: implement GObject::dispose() instead of GtkWidget::destroy() @@ -50101,7 +50960,7 @@ commit 38999b7dd44887d7d3446052761c42064447c660 Author: Michael Natterer -Date: Fri Oct 15 12:04:36 2010 +0200 +Date: Fri Oct 15 12:04:36 2010 +0200 libgimp: implement GObject::dispose() instead of GtkObject::destroy() @@ -50113,7 +50972,7 @@ commit 47c6b25f2397454d3509ab24b034d1d6c5b5686b Author: Michael Natterer -Date: Fri Oct 15 11:09:47 2010 +0200 +Date: Fri Oct 15 11:09:47 2010 +0200 libgimpwidgets: transform the cr to widget coords @@ -50126,7 +50985,7 @@ commit 3584b662a613e15158ed10c8223c7e13763834eb Author: Michael Natterer -Date: Fri Oct 15 10:40:37 2010 +0200 +Date: Fri Oct 15 10:40:37 2010 +0200 libgimpwidgets: transform the cr to widget coords @@ -50137,7 +50996,7 @@ commit 1de338ea9d14e0c264b64248c31d9cea430083a5 Author: Michael Natterer -Date: Fri Oct 15 10:35:28 2010 +0200 +Date: Fri Oct 15 10:35:28 2010 +0200 libgimpwidgets: port the GimpChainButton lines to cairo @@ -50149,7 +51008,7 @@ commit 84274e22307967036e024fe9537aac1ea418a437 Author: Michael Natterer -Date: Fri Oct 15 02:34:29 2010 +0200 +Date: Fri Oct 15 02:34:29 2010 +0200 libgimpwidgets: implement GObject::dispose() instead of GtkObject::destroy() @@ -50159,7 +51018,7 @@ commit b67dbdc6ca9102079250fffe1417faa5994ec83b Author: Michael Natterer -Date: Fri Oct 15 02:25:51 2010 +0200 +Date: Fri Oct 15 02:25:51 2010 +0200 libgimpwidgets: implement GObject::dispose() instead of GtkObject::destroy() @@ -50169,7 +51028,7 @@ commit a9e62971108aa294dae6cc0c9f77e1b08517f997 Author: Michael Natterer -Date: Fri Oct 15 02:12:33 2010 +0200 +Date: Fri Oct 15 02:12:33 2010 +0200 libgimpwidgets: implement GObject::finalize() instead of GtkObject::destroy() @@ -50179,7 +51038,7 @@ commit 6a10ded2217f5098f2741aa92cdbdf5c9ad5f4c9 Author: Michael Natterer -Date: Fri Oct 15 02:07:55 2010 +0200 +Date: Fri Oct 15 02:07:55 2010 +0200 libgimpwidgets: implement GObject::dispose() instead of GtkObject::destroy() @@ -50190,7 +51049,7 @@ commit b25ac7b68d8af9c6aa1fa5643bc8e57b72052a98 Author: Michael Natterer -Date: Fri Oct 15 01:27:02 2010 +0200 +Date: Fri Oct 15 01:27:02 2010 +0200 libgimpwidgets: add "percent" support to GimpUnitStore @@ -50204,7 +51063,7 @@ commit e5faf090ca5f1420502efd3c40321d1d91a74548 Author: Michael Natterer -Date: Fri Oct 15 00:15:48 2010 +0200 +Date: Fri Oct 15 00:15:48 2010 +0200 libgimpwidgets: add gimp_unit_store_set,get_has_pixels() @@ -50221,7 +51080,7 @@ commit f2bd06e2d140f3a243738acb97daa4ebe4c55d9b Author: Michael Natterer -Date: Thu Oct 14 23:22:22 2010 +0200 +Date: Thu Oct 14 23:22:22 2010 +0200 libgimpwidgets: move GimpUnitStore members to a private struct @@ -50232,7 +51091,7 @@ commit c36f762f7d149cbbebac44f8974474f7dfb89421 Author: Michael Natterer -Date: Thu Oct 14 23:03:34 2010 +0200 +Date: Thu Oct 14 23:03:34 2010 +0200 libgimpwidgets: deprecate GimpUnitMenu and gimp_prop_unit_menu_new() @@ -50248,42 +51107,40 @@ +++++++++++++++++++++++++++++++++++++++ libgimpwidgets/gimppropwidgets.h | 4 ++ libgimpwidgets/gimpsizeentry.c | 50 ++++++++------- - libgimpwidgets/gimpunitmenu.c | 4 +- - libgimpwidgets/gimpunitmenu.h | 4 ++ - plug-ins/common/.gitignore | 2 - - plug-ins/common/Makefile.am | 22 ------- - plug-ins/common/gimprc.common | 1 - + libgimpwidgets/gimpunitmenu.c | 4 +- + libgimpwidgets/gimpunitmenu.h | 4 ++ + plug-ins/common/.gitignore | 2 - + plug-ins/common/Makefile.am | 22 ------- + plug-ins/common/gimprc.common | 1 - plug-ins/common/plugin-defs.pl | 2 +- 11 files changed, 173 insertions(+), 51 deletions(-) commit 74458f46ee9cdcd7cf49467837c7b9d0a7552c5f Author: Michael Natterer -Date: Thu Oct 14 22:15:25 2010 +0200 +Date: Thu Oct 14 22:15:25 2010 +0200 app/libgimpwidgets: move GimpUnitStore and GimpUnitComboBox to libgimpwidgets - app/display/gimpstatusbar.c | 2 - - app/widgets/Makefile.am | 4 - - app/widgets/gimpunitcombobox.c | 145 ----------- - app/widgets/gimpunitcombobox.h | 56 ---- - app/widgets/gimpunitstore.c | 525 - -------------------------------------- - app/widgets/gimpunitstore.h | 90 ------- - app/widgets/widgets-types.h | 2 - - libgimpwidgets/Makefile.am | 6 + - libgimpwidgets/gimpunitcombobox.c | 146 +++++++++++ - libgimpwidgets/gimpunitcombobox.h | 63 +++++ - libgimpwidgets/gimpunitstore.c | 525 - ++++++++++++++++++++++++++++++++++++++ - libgimpwidgets/gimpunitstore.h | 97 +++++++ - libgimpwidgets/gimpwidgets.h | 2 + - libgimpwidgets/gimpwidgetstypes.h | 2 + - 14 files changed, 841 insertions(+), 824 deletions(-) + app/display/gimpstatusbar.c | 2 -- + app/widgets/Makefile.am | 4 --- + app/widgets/widgets-types.h | 2 -- + libgimpwidgets/Makefile.am | 6 +++++ + {app/widgets => libgimpwidgets}/gimpunitcombobox.c | 25 + ++++++++++--------- + {app/widgets => libgimpwidgets}/gimpunitcombobox.h | 29 + ++++++++++++++-------- + {app/widgets => libgimpwidgets}/gimpunitstore.c | 26 + +++++++++---------- + {app/widgets => libgimpwidgets}/gimpunitstore.h | 29 + ++++++++++++++-------- + libgimpwidgets/gimpwidgets.h | 2 ++ + libgimpwidgets/gimpwidgetstypes.h | 2 ++ + 10 files changed, 72 insertions(+), 55 deletions(-) commit af518f9e84bd6493f190a975f40d3dc707f58e9d Author: Michael Natterer -Date: Thu Oct 14 17:47:48 2010 +0200 +Date: Thu Oct 14 17:47:48 2010 +0200 libgimpwidgets: use GObject::dispose() instead of GtkObject::destroy() @@ -50292,7 +51149,7 @@ commit b24c25d31764a5868e4f6f6a5ce8f002b57330b7 Author: Michael Natterer -Date: Thu Oct 14 17:33:07 2010 +0200 +Date: Thu Oct 14 17:33:07 2010 +0200 app: don't use GET_PRIVATE() before the precondition check @@ -50301,7 +51158,7 @@ commit 843d9e35add4818d195d6c020f6c75c7f3bbadd8 Author: Michael Natterer -Date: Thu Oct 14 17:22:56 2010 +0200 +Date: Thu Oct 14 17:22:56 2010 +0200 libgimpwidgets: replace GdkGC* with gpointer for an unused struct member @@ -50311,7 +51168,7 @@ commit 8e0dd56feb3aa6deba752aec44f8fde96ae611d7 Author: Michael Natterer -Date: Thu Oct 14 11:01:16 2010 +0200 +Date: Thu Oct 14 11:01:16 2010 +0200 app: fix crashes by not trying to navigate on a NULL layout @@ -50321,13 +51178,13 @@ app/tools/gimptexttool-editor.c | 37 ++++++++++++++++++------------------- - app/tools/gimptexttool.c | 4 +++- - app/tools/gimptexttool.h | 2 +- + app/tools/gimptexttool.c | 4 +++- + app/tools/gimptexttool.h | 2 +- 3 files changed, 22 insertions(+), 21 deletions(-) commit 852196eb3dc29d5568f63f51a451b5c188757a04 Author: Michael Natterer -Date: Thu Oct 14 02:45:32 2010 +0200 +Date: Thu Oct 14 02:45:32 2010 +0200 app: fix insert and overwrite cursors for RTL text @@ -50338,12 +51195,12 @@ app/tools/gimptexttool-editor.c | 29 ++++++++++++++++++++++++----- app/tools/gimptexttool-editor.h | 1 + - app/tools/gimptexttool.c | 6 ++++-- + app/tools/gimptexttool.c | 6 ++++-- 3 files changed, 29 insertions(+), 7 deletions(-) commit f3c2a75e44a1838766c70c34bb7b6955d75bfc52 Author: Michael Natterer -Date: Thu Oct 14 02:43:37 2010 +0200 +Date: Thu Oct 14 02:43:37 2010 +0200 app: overwrite cursors can have negative widths in RTL text @@ -50352,7 +51209,7 @@ commit 0c7ec05035e8a2bedb9f865705eb969f0f4d081a Author: Michael Natterer -Date: Thu Oct 14 01:01:33 2010 +0200 +Date: Thu Oct 14 01:01:33 2010 +0200 app: honor text direction when moving the cursor @@ -50365,7 +51222,7 @@ commit 56c50741d3da6d9f95fe591a248871dd1318a075 Author: Michael Natterer -Date: Thu Oct 14 00:13:35 2010 +0200 +Date: Thu Oct 14 00:13:35 2010 +0200 app: honor the "gtk-show-input-method-menu" setting @@ -50376,7 +51233,7 @@ commit beef765b4f4d0174f6886964b147f315b2f9b499 Author: Sven Neumann -Date: Wed Oct 13 22:01:58 2010 +0200 +Date: Wed Oct 13 22:01:58 2010 +0200 Bug 631885 - GIMP fails to import a path from SVG @@ -50394,7 +51251,7 @@ commit 4236990351a3276997fd84c4087521b708d16496 Author: Sven Neumann -Date: Wed Oct 13 21:52:10 2010 +0200 +Date: Wed Oct 13 21:52:10 2010 +0200 app/vectors: formatting @@ -50404,7 +51261,7 @@ commit 8cf6695a5058ed9aeedf3ab0c40f3c36aeae7df3 Author: Barak Itkin -Date: Tue Oct 12 02:13:28 2010 +0200 +Date: Tue Oct 12 02:13:28 2010 +0200 Fix Bug 631742 - Can't change color of first letter @@ -50421,7 +51278,7 @@ commit c79deb40dd70333112316560ba3ac7680c5a8427 Author: Michael Natterer -Date: Mon Oct 11 23:33:33 2010 +0200 +Date: Mon Oct 11 23:33:33 2010 +0200 app: don't use a timeout for delaying display flushing @@ -50434,7 +51291,7 @@ commit be2037ce038916f25edae67515bbd9523eaaaf4f Author: Michael Natterer -Date: Mon Oct 11 22:49:10 2010 +0200 +Date: Mon Oct 11 22:49:10 2010 +0200 app: limit realtime image updates to about 50 fps @@ -50446,7 +51303,7 @@ commit 11bc11d2f70467e47bf2de4d4bdbb89daffbb3a2 Author: Michael Natterer -Date: Mon Oct 11 22:27:32 2010 +0200 +Date: Mon Oct 11 22:27:32 2010 +0200 app: add back the draw timeout @@ -50457,7 +51314,7 @@ commit 38153d7476f7c9388766a386d5394c27998d3027 Author: Michael Natterer -Date: Mon Oct 11 22:26:52 2010 +0200 +Date: Mon Oct 11 22:26:52 2010 +0200 app: gimp_paint_tool_oper_update(): stop/start the draw tool only when needed @@ -50467,7 +51324,7 @@ commit ff03681bdfa371891ec7cc754bfed811c5c434e6 Author: Christian Krippendorf -Date: Sun Oct 10 22:31:35 2010 +0200 +Date: Sun Oct 10 22:31:35 2010 +0200 Bug 627328 - GIMP 2.6.10 segfaults when CTRL-left click on a layer mask @@ -50482,28 +51339,28 @@ commit fee17f87127c95c06ef07f586c19e7e3585e162f Author: Alexandre Prokoudine -Date: Sun Oct 10 21:04:08 2010 +0400 +Date: Sun Oct 10 21:04:08 2010 +0400 Cleanup of recent changes in porting scripts to new API. Marked layer names in carved-logo.scm for translation while at that - plug-ins/script-fu/scripts/add-bevel.scm | 4 ++-- + plug-ins/script-fu/scripts/add-bevel.scm | 4 ++-- .../script-fu/scripts/beveled-pattern-heading.scm | 6 +++--- - plug-ins/script-fu/scripts/burn-in-anim.scm | 4 ++-- - plug-ins/script-fu/scripts/carve-it.scm | 10 +++++----- - plug-ins/script-fu/scripts/carved-logo.scm | 20 + plug-ins/script-fu/scripts/burn-in-anim.scm | 4 ++-- + plug-ins/script-fu/scripts/carve-it.scm | 10 +++++----- + plug-ins/script-fu/scripts/carved-logo.scm | 20 ++++++++++---------- - plug-ins/script-fu/scripts/chrome-it.scm | 4 ++-- - plug-ins/script-fu/scripts/circuit.scm | 6 +++--- + plug-ins/script-fu/scripts/chrome-it.scm | 4 ++-- + plug-ins/script-fu/scripts/circuit.scm | 6 +++--- plug-ins/script-fu/scripts/distress-selection.scm | 2 +- - plug-ins/script-fu/scripts/drop-shadow.scm | 2 +- + plug-ins/script-fu/scripts/drop-shadow.scm | 2 +- plug-ins/script-fu/scripts/perspective-shadow.scm | 2 +- - plug-ins/script-fu/scripts/xach-effect.scm | 8 ++++---- + plug-ins/script-fu/scripts/xach-effect.scm | 8 ++++---- 11 files changed, 34 insertions(+), 34 deletions(-) commit 0a7e3f929f1c799bd12aebdf08bcc168975fbb04 Author: Sven Neumann -Date: Sun Oct 10 17:47:57 2010 +0200 +Date: Sun Oct 10 17:47:57 2010 +0200 po-script-fu: add contact-sheet.scm to POTFILES.skip instead @@ -50512,7 +51369,7 @@ commit 388c6543190b426230abccdbd68cf1f4fe63c04b Author: Sven Neumann -Date: Sun Oct 10 17:45:49 2010 +0200 +Date: Sun Oct 10 17:45:49 2010 +0200 Revert "Added forgotten contactsheet.scm script to the list of translatables" @@ -50525,7 +51382,7 @@ commit 8f7e1ac8dcf25d17f5db1eb58eeced78d85f704e Author: Alexandre Prokoudine -Date: Sun Oct 10 18:41:30 2010 +0400 +Date: Sun Oct 10 18:41:30 2010 +0400 Added forgotten contactsheet.scm script to the list of translatables @@ -50534,19 +51391,19 @@ commit 3abf6de94447fd34b56d3d07aa534b8b5059fb6a Author: Alexandre Prokoudine -Date: Sun Oct 10 17:59:29 2010 +0400 +Date: Sun Oct 10 17:59:29 2010 +0400 Porting scripts to new API, marking layer names for translation plug-ins/script-fu/scripts/burn-in-anim.scm | 10 +++++----- plug-ins/script-fu/scripts/circuit.scm | 10 +++++----- - plug-ins/script-fu/scripts/clothify.scm | 4 ++-- - plug-ins/script-fu/scripts/coffee.scm | 4 ++-- + plug-ins/script-fu/scripts/clothify.scm | 4 ++-- + plug-ins/script-fu/scripts/coffee.scm | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) commit 4d18135b4692aa38ff3f0a975f062e589d242554 Author: Sven Neumann -Date: Sun Oct 10 01:56:00 2010 +0200 +Date: Sun Oct 10 01:56:00 2010 +0200 script-fu: use "Rule" instead of "Hrule" @@ -50555,7 +51412,7 @@ commit 9100fd1c628b309182cf6987b78ed7218a127d1e Author: Sven Neumann -Date: Sun Oct 10 01:51:45 2010 +0200 +Date: Sun Oct 10 01:51:45 2010 +0200 script-fu: don't include whitespace used as separator in translatable string @@ -50569,22 +51426,22 @@ commit 0a4657ae9fce7ca4757aa533dbde48d1e52c4079 Author: Alexandre Prokoudine -Date: Sun Oct 10 03:52:15 2010 +0400 +Date: Sun Oct 10 03:52:15 2010 +0400 Porting scripts to new API, marking layer names for translation - plug-ins/script-fu/scripts/beveled-button.scm | 8 ++++---- - plug-ins/script-fu/scripts/beveled-pattern-arrow.scm | 8 ++++---- - plug-ins/script-fu/scripts/beveled-pattern-bullet.scm | 8 ++++---- - plug-ins/script-fu/scripts/beveled-pattern-button.scm | 8 ++++---- + plug-ins/script-fu/scripts/beveled-button.scm | 8 ++++---- + plug-ins/script-fu/scripts/beveled-pattern-arrow.scm | 8 ++++---- + plug-ins/script-fu/scripts/beveled-pattern-bullet.scm | 8 ++++---- + plug-ins/script-fu/scripts/beveled-pattern-button.scm | 8 ++++---- plug-ins/script-fu/scripts/beveled-pattern-heading.scm | 14 +++++++------- - plug-ins/script-fu/scripts/beveled-pattern-hrule.scm | 8 ++++---- + plug-ins/script-fu/scripts/beveled-pattern-hrule.scm | 8 ++++---- 6 files changed, 27 insertions(+), 27 deletions(-) commit e1a705c125a1ec314d1982a56f11284910a7cec6 Author: Alexandre Prokoudine -Date: Sun Oct 10 03:41:21 2010 +0400 +Date: Sun Oct 10 03:41:21 2010 +0400 Marking layer names for translation @@ -50594,27 +51451,27 @@ commit e062acbc642cf0cfa601595ddb0524be11354dd9 Author: Alexandre Prokoudine -Date: Sun Oct 10 03:40:59 2010 +0400 +Date: Sun Oct 10 03:40:59 2010 +0400 Porting scripts to new API, marking layer names for translation - plug-ins/script-fu/scripts/add-bevel.scm | 8 ++++---- - plug-ins/script-fu/scripts/addborder.scm | 4 ++-- + plug-ins/script-fu/scripts/add-bevel.scm | 8 ++++---- + plug-ins/script-fu/scripts/addborder.scm | 4 ++-- plug-ins/script-fu/scripts/alien-glow-arrow.scm | 12 ++++++------ - plug-ins/script-fu/scripts/alien-glow-bar.scm | 12 ++++++------ + plug-ins/script-fu/scripts/alien-glow-bar.scm | 12 ++++++------ plug-ins/script-fu/scripts/alien-glow-bullet.scm | 12 ++++++------ plug-ins/script-fu/scripts/alien-glow-button.scm | 12 ++++++------ - plug-ins/script-fu/scripts/blend-anim.scm | 15 ++++++++------- + plug-ins/script-fu/scripts/blend-anim.scm | 15 ++++++++------- 7 files changed, 38 insertions(+), 37 deletions(-) commit 466523f7325fc05f136567ec832100e1bb5507e6 Author: Alexandre Prokoudine -Date: Sun Oct 10 02:37:31 2010 +0400 +Date: Sun Oct 10 02:37:31 2010 +0400 Porting scripts to new API plug-ins/script-fu/scripts/distress-selection.scm | 4 ++-- - plug-ins/script-fu/scripts/mkbrush.scm | 8 ++++---- + plug-ins/script-fu/scripts/mkbrush.scm | 8 ++++---- plug-ins/script-fu/scripts/select-to-brush.scm | 2 +- plug-ins/script-fu/scripts/select-to-image.scm | 2 +- plug-ins/script-fu/scripts/select-to-pattern.scm | 2 +- @@ -50622,7 +51479,7 @@ commit bf6a2e6451dcdb13fff81b1644c2d4c05815db39 Author: Sven Neumann -Date: Sun Oct 10 00:31:40 2010 +0200 +Date: Sun Oct 10 00:31:40 2010 +0200 app/base: formatting @@ -50631,20 +51488,20 @@ commit bb9c1210b3d6506ec7746b29a2a42b7d6469c26c Author: Alexandre Prokoudine -Date: Sun Oct 10 02:14:53 2010 +0400 +Date: Sun Oct 10 02:14:53 2010 +0400 Porting to new API: add-[layer|channel] > insert-[layer|channel] and more, perspective-shadow.scm will need revisiting re. new item transformation API - plug-ins/script-fu/scripts/drop-shadow.scm | 4 ++-- + plug-ins/script-fu/scripts/drop-shadow.scm | 4 ++-- plug-ins/script-fu/scripts/perspective-shadow.scm | 4 ++-- - plug-ins/script-fu/scripts/xach-effect.scm | 18 +++++++++--------- + plug-ins/script-fu/scripts/xach-effect.scm | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) commit 3de4d7263a6a86b53db3169893c9c77a7f8ff59e Author: Michael Natterer -Date: Sat Oct 9 22:00:19 2010 +0200 +Date: Sat Oct 9 22:00:19 2010 +0200 app: Bug 631619 - Drawing artifacts spread by paintbrush outline on canvas @@ -50654,24 +51511,24 @@ impossible to get this right on that level. Also fix te extents of GimpCanvasBoundary os it leaves no artifacts. - app/base/boundary.c | 28 -------- - app/base/boundary.h | 4 -- + app/base/boundary.c | 28 -------- + app/base/boundary.h | 4 -- app/display/gimpcanvasboundary.c | 134 +++++++++++++++++++++++++++----------- app/display/gimpcanvasboundary.h | 1 + - app/paint/gimpbrushcore.c | 57 +++++++--------- - app/paint/gimpbrushcore.h | 9 ++- - app/tools/gimpbrushtool.c | 26 ++------ - app/tools/gimpdrawtool.c | 3 + - app/tools/gimpdrawtool.h | 1 + + app/paint/gimpbrushcore.c | 57 +++++++--------- + app/paint/gimpbrushcore.h | 9 ++- + app/tools/gimpbrushtool.c | 26 ++------ + app/tools/gimpdrawtool.c | 3 + + app/tools/gimpdrawtool.h | 1 + app/tools/gimpeditselectiontool.c | 3 + app/tools/gimpregionselecttool.c | 1 + - app/tools/gimptransformtool.c | 2 + + app/tools/gimptransformtool.c | 2 + 12 files changed, 137 insertions(+), 132 deletions(-) commit f8d682179016ed2c9904eb2f0ebffac21312d7c0 Author: Michael Natterer -Date: Sat Oct 9 20:23:05 2010 +0200 +Date: Sat Oct 9 20:23:05 2010 +0200 app: get rid of selection_control() in core/ and display/ @@ -50682,41 +51539,41 @@ - replace GimpImage::selection_control() by ::selection_invalidate() because none of the other enum values was used any longer - app/core/core-enums.c | 29 + app/core/core-enums.c | 29 ----------------------------- - app/core/core-enums.h | 11 ----------- - app/core/gimpimage.c | 20 +++++++++----------- - app/core/gimpimage.h | 6 ++---- - app/core/gimplayer.c | 2 +- - app/core/gimpselection.c | 2 +- + app/core/core-enums.h | 11 ----------- + app/core/gimpimage.c | 20 +++++++++----------- + app/core/gimpimage.h | 6 ++---- + app/core/gimplayer.c | 2 +- + app/core/gimpselection.c | 2 +- app/display/gimpdisplayshell-callbacks.c | 2 +- app/display/gimpdisplayshell-handlers.c | 17 ++++++++--------- app/display/gimpdisplayshell-selection.c | 29 ++++++++++++++--------------- app/display/gimpdisplayshell-selection.h | 4 ++-- - app/display/gimpdisplayshell.c | 2 +- + app/display/gimpdisplayshell.c | 2 +- 11 files changed, 39 insertions(+), 85 deletions(-) commit c1c42f193dc582b9b923aa630b9dc8268ba49bc9 Author: Martin Nordholts -Date: Sat Oct 9 17:59:44 2010 +0200 +Date: Sat Oct 9 17:59:44 2010 +0200 app: Remove 'use_cpu_accel' from gimp_init_for_{,gui_}testing() Remove silly 'use_cpu_accel' parameter from gimp_init_for_testing() and gimp_init_for_gui_testing(). - app/tests.c | 12 ++++++++---- - app/tests.h | 5 ++--- - app/tests/test-core.c | 2 +- - app/tests/test-session-management.c | 2 +- - app/tests/test-ui.c | 2 +- - app/tests/test-xcf.c | 2 +- + app/tests.c | 12 ++++++++---- + app/tests.h | 5 ++--- + app/tests/test-core.c | 2 +- + app/tests/test-session-management.c | 2 +- + app/tests/test-ui.c | 2 +- + app/tests/test-xcf.c | 2 +- 6 files changed, 14 insertions(+), 11 deletions(-) commit 9805ed7dd8a582b94f85fffdadf3d17dc24a3ff9 Author: Barak Itkin -Date: Sat Oct 9 18:11:57 2010 +0200 +Date: Sat Oct 9 18:11:57 2010 +0200 i18n: Add Hebrew and Ukrainian to po-tags/LINGUAS @@ -50725,7 +51582,7 @@ commit cc8c546ed0ce34a7c86a065aae515552900dcab4 Author: Michael Natterer -Date: Sat Oct 9 15:34:20 2010 +0200 +Date: Sat Oct 9 15:34:20 2010 +0200 app: turn "edit-mask" into a property of GimpCanvasLayerBoundary @@ -50735,7 +51592,7 @@ commit 545e65dda6a25f9042d3820ba5d13accfad52207 Author: Michael Natterer -Date: Sat Oct 9 14:26:33 2010 +0200 +Date: Sat Oct 9 14:26:33 2010 +0200 app: add gimp_display_shell_selection_pause() and _resume() @@ -50743,21 +51600,21 @@ the resp. enum values. Remove the GIMP_SELECTION_PAUSE and _RESUME enums values and thus the presence of this concept in the core. - app/core/core-enums.c | 4 --- - app/core/core-enums.h | 4 +-- + app/core/core-enums.c | 4 --- + app/core/core-enums.h | 4 +-- app/display/gimpdisplayshell-handlers.c | 4 +-- app/display/gimpdisplayshell-selection.c | 57 ++++++++++++++++---------------- app/display/gimpdisplayshell-selection.h | 3 ++ - app/tools/gimpcolortool.c | 9 +++-- - app/tools/gimpeditselectiontool.c | 4 +-- - app/tools/gimpmovetool.c | 10 +++--- - app/tools/gimppainttool.c | 4 +-- + app/tools/gimpcolortool.c | 9 +++-- + app/tools/gimpeditselectiontool.c | 4 +-- + app/tools/gimpmovetool.c | 10 +++--- + app/tools/gimppainttool.c | 4 +-- 9 files changed, 46 insertions(+), 53 deletions(-) commit e11ca44ba0d214e7792b978e745ff34dbe5e5bab Author: Michael Natterer -Date: Sat Oct 9 14:07:04 2010 +0200 +Date: Sat Oct 9 14:07:04 2010 +0200 app: use gimp_display_shell_selection_control() in the paint tool @@ -50769,7 +51626,7 @@ commit 71a50bc58a29b98d16a55d9f0ff1404f1242cfff Author: Michael Natterer -Date: Sat Oct 9 12:55:11 2010 +0200 +Date: Sat Oct 9 12:55:11 2010 +0200 app: rename selection member "hidden" to "show_selection" @@ -50782,7 +51639,7 @@ commit 0cae0f2fca7cf779ca17c670f0d08832eb7a7794 Author: Michael Natterer -Date: Sat Oct 9 12:51:20 2010 +0200 +Date: Sat Oct 9 12:51:20 2010 +0200 app: rename selection member "visible" to "shell_visible" @@ -50792,7 +51649,7 @@ commit 7a9793ba6eaf9c32d0b49025a77aafdfd6aac250 Author: Mukund Sivaraman -Date: Fri Oct 8 22:53:04 2010 +0530 +Date: Fri Oct 8 22:53:04 2010 +0530 plug-ins: Use the correct enum value in file-psp @@ -50801,22 +51658,22 @@ commit 6b8141d548cec2983cb681dabf6cbfd7e83f941c Author: Michael Natterer -Date: Fri Oct 8 18:52:28 2010 +0200 +Date: Fri Oct 8 18:52:28 2010 +0200 app: wrap GimpBezierDesc in a boxed type to make property handling easier - app/display/gimpcanvaspath.c | 24 ++++++++-------------- + app/display/gimpcanvaspath.c | 24 ++++++++-------------- app/display/gimpdisplayshell-handlers.c | 2 +- - app/vectors/gimpbezierdesc.c | 35 + app/vectors/gimpbezierdesc.c | 35 ++++++++++++++++----------------- - app/vectors/gimpbezierdesc.h | 14 ++++++++----- - app/vectors/gimpvectors.c | 6 +++--- + app/vectors/gimpbezierdesc.h | 14 ++++++++----- + app/vectors/gimpvectors.c | 6 +++--- 5 files changed, 38 insertions(+), 43 deletions(-) commit 914ac9aa1183bad3c0259fecc2115494f5388a86 Author: Michael Natterer -Date: Fri Oct 8 16:13:21 2010 +0200 +Date: Fri Oct 8 16:13:21 2010 +0200 app: no need to cairo_save()/restore() around drawing a canvas item @@ -50825,7 +51682,7 @@ commit b59196c2455de4fa5a1ea78bdf2ca2ce1641628a Author: Michael Natterer -Date: Fri Oct 8 15:46:00 2010 +0200 +Date: Fri Oct 8 15:46:00 2010 +0200 app: set shell->vectors to NULL in gimp_display_shell_items_free() @@ -50834,7 +51691,7 @@ commit 9828f6db205a57a86d0178360c680374be8f2f8e Author: Michael Natterer -Date: Fri Oct 8 12:09:33 2010 +0200 +Date: Fri Oct 8 12:09:33 2010 +0200 app: remove unused variables in gimp_brush_core_create_bound_segs() @@ -50843,29 +51700,29 @@ commit cc88bafe8cc36faf22c623428e57d97f9fe59129 Author: Baurzhan Muftakhidinov -Date: Fri Oct 8 09:43:22 2010 +0600 +Date: Fri Oct 8 09:43:22 2010 +0600 Initial translation of libgimp to Kazakh - po-libgimp/LINGUAS | 1 + + po-libgimp/LINGUAS | 1 + po-libgimp/kk.po | 1853 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1854 insertions(+) commit 29e66b738499911c5abd4118ca4b9c536be99f8a Author: Baurzhan Muftakhidinov -Date: Fri Oct 8 09:35:11 2010 +0600 +Date: Fri Oct 8 09:35:11 2010 +0600 Initial translation to Kazakh - po/LINGUAS | 1 + + po/LINGUAS | 1 + po/kk.po | 12602 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 12603 insertions(+) commit 55f01bf6f389474b506ef38f41c542cca8f98159 Author: Michael Natterer -Date: Fri Oct 8 01:03:56 2010 +0200 +Date: Fri Oct 8 01:03:56 2010 +0200 app: remove gimp_display_shell_draw_vectors() @@ -50878,35 +51735,35 @@ Change the callbacks to manage proxy items for all the image's vectors. - app/core/gimpimage-private.h | 4 - - app/core/gimpimage.c | 113 ------------------- - app/core/gimpimage.h | 5 - + app/core/gimpimage-private.h | 4 - + app/core/gimpimage.c | 113 ------------------- + app/core/gimpimage.h | 5 - app/display/gimpdisplayshell-callbacks.c | 5 - - app/display/gimpdisplayshell-draw.c | 49 --------- - app/display/gimpdisplayshell-draw.h | 3 - + app/display/gimpdisplayshell-draw.c | 49 --------- + app/display/gimpdisplayshell-draw.h | 3 - app/display/gimpdisplayshell-handlers.c | 181 +++++++++++++++++++++++++++---- - app/display/gimpdisplayshell-items.c | 4 + - app/display/gimpdisplayshell.h | 5 + + app/display/gimpdisplayshell-items.c | 4 + + app/display/gimpdisplayshell.h | 5 + 9 files changed, 166 insertions(+), 203 deletions(-) commit db72c72c1f057ee3f1f096c5d7a43a9633bd4d9e Author: Sven Neumann -Date: Thu Oct 7 22:21:49 2010 +0200 +Date: Thu Oct 7 22:21:49 2010 +0200 Bug 631609 - [regression] no transparency on antialiased fonts Render the layout into an ARGB32 surface and convert the text layer pixel format from that. - app/text/gimptextlayer.c | 72 + app/text/gimptextlayer.c | 72 ++++++++++++++++------------------------ libgimpwidgets/gimpcairo-utils.h | 38 +++++++++++++++++++++ 2 files changed, 66 insertions(+), 44 deletions(-) commit 20ec80b20e41aed43285aa442b397562a0a91de5 Author: Sven Neumann -Date: Thu Oct 7 22:21:32 2010 +0200 +Date: Thu Oct 7 22:21:32 2010 +0200 app: formatting @@ -50915,7 +51772,7 @@ commit 51b1775ff7a9337cb7438c6607e92e6e78ee35ba Author: Nils Philippsen -Date: Thu Oct 7 18:19:24 2010 +0200 +Date: Thu Oct 7 18:19:24 2010 +0200 configure.ac: fix building screenshot plugin without libXmu @@ -50927,7 +51784,7 @@ commit 9853df88a1c0e9d9f354a9509774ff2ec73a7c94 Author: Mukund Sivaraman -Date: Thu Oct 7 17:55:36 2010 +0530 +Date: Thu Oct 7 17:55:36 2010 +0530 plug-ins: Increase size of values array in file-xmc to allow for values[5] access @@ -50937,7 +51794,7 @@ commit cfe6e3a00ed32cebd930f89ef50a1cb88f449205 Author: Mukund Sivaraman -Date: Thu Oct 7 17:52:13 2010 +0530 +Date: Thu Oct 7 17:52:13 2010 +0530 plug-ins: Increase size of values array in file-gih to allow for values[1] access @@ -50947,7 +51804,7 @@ commit ea29074bf8fb12baaaaca2bb104395666704720d Author: Mukund Sivaraman -Date: Thu Oct 7 17:48:59 2010 +0530 +Date: Thu Oct 7 17:48:59 2010 +0530 plug-ins: Increase size of values array to allow for values[3] access @@ -50956,7 +51813,7 @@ commit 54a65fa9c34a00e52c757f46643490cbdd7256f4 Author: Michael Natterer -Date: Thu Oct 7 14:10:57 2010 +0200 +Date: Thu Oct 7 14:10:57 2010 +0200 app: add gimp_draw_tool_add_path() and use it in the vector tool @@ -50970,7 +51827,7 @@ commit 0b078d3dad2cea9c30e52c917205334749983001 Author: Michael Natterer -Date: Thu Oct 7 14:08:48 2010 +0200 +Date: Thu Oct 7 14:08:48 2010 +0200 app: several GimpCanvasPath fixes @@ -50984,32 +51841,32 @@ commit d7492cb52895bae5d100b4f8997c0cb58a840c3a Author: Alexia Death -Date: Thu Oct 7 00:37:04 2010 +0300 +Date: Thu Oct 7 00:37:04 2010 +0300 app: remove forward transform preview from cage tool, reverse is actually faster - app/gegl/Makefile.am | 2 - - app/gegl/gimp-gegl.c | 2 - + app/gegl/Makefile.am | 2 - + app/gegl/gimp-gegl.c | 2 - app/gegl/gimpoperationcagepreview.c | 282 ------------------------------------ - app/gegl/gimpoperationcagepreview.h | 58 -------- - app/tools/gimpcagetool.c | 145 ++++++++++-------- + app/gegl/gimpoperationcagepreview.h | 58 -------- + app/tools/gimpcagetool.c | 145 ++++++++++-------- 5 files changed, 86 insertions(+), 403 deletions(-) commit 149ba1ec4b05fcc3284018d1784db8e4bb9dac56 Author: Michael Natterer -Date: Wed Oct 6 23:02:16 2010 +0200 +Date: Wed Oct 6 23:02:16 2010 +0200 app: add a path canvas item class based on cairo_path_t (GimpBezierDesc) and use it in gimp_display_shell_draw_vectors(). - app/display/Makefile.am | 2 + - app/display/gimpcanvaspath.c | 310 + app/display/Makefile.am | 2 + + app/display/gimpcanvaspath.c | 310 +++++++++++++++++++++++++++++++++++ - app/display/gimpcanvaspath.h | 58 +++++++ + app/display/gimpcanvaspath.h | 58 +++++++ app/display/gimpdisplayshell-draw.c | 58 ++----- app/display/gimpdisplayshell-style.c | 6 +- app/display/gimpdisplayshell-style.h | 2 - @@ -51017,7 +51874,7 @@ commit 2a965a8a783c0e057630d6653d7ae2fd3bb417e4 Author: Michael Natterer -Date: Wed Oct 6 22:49:53 2010 +0200 +Date: Wed Oct 6 22:49:53 2010 +0200 app: argh, don't include the .c file @@ -51026,24 +51883,24 @@ commit a16fc33c43526ee1bec6f424ae1201820c54b7ae Author: Michael Natterer -Date: Wed Oct 6 22:37:07 2010 +0200 +Date: Wed Oct 6 22:37:07 2010 +0200 app: add new() copy() and free() API around GimpBezierDesc and use it instead of manually (de)allocating. Will also be used in a new canvas path item. - app/vectors/Makefile.am | 2 ++ - app/vectors/gimpbezierdesc.c | 79 + app/vectors/Makefile.am | 2 ++ + app/vectors/gimpbezierdesc.c | 79 ++++++++++++++++++++++++++++++++++++++++++ - app/vectors/gimpbezierdesc.h | 33 ++++++++++++++++++ + app/vectors/gimpbezierdesc.h | 33 ++++++++++++++++++ app/vectors/gimpbezierstroke.c | 8 ++--- - app/vectors/gimpvectors.c | 16 ++++----- + app/vectors/gimpvectors.c | 16 ++++----- 5 files changed, 123 insertions(+), 15 deletions(-) commit e986310e3e3eb882285da30bcf41ef0d2aaf37ea Author: Rupert Weber -Date: Mon Sep 20 17:27:56 2010 +0200 +Date: Mon Sep 20 17:27:56 2010 +0200 Bug 630201 - remove unused layer-modes.c in app/paint-funcs @@ -51053,17 +51910,17 @@ app/composite/gimp-composite.c | 6 +- app/composite/gimp-composite.h | 1 - - app/paint-funcs/Makefile.am | 2 - - app/paint-funcs/layer-modes.c | 1111 + app/paint-funcs/Makefile.am | 2 - + app/paint-funcs/layer-modes.c | 1111 --------------------------------------- - app/paint-funcs/layer-modes.h | 80 --- - app/paint-funcs/paint-funcs.c | 248 +++------ + app/paint-funcs/layer-modes.h | 80 --- + app/paint-funcs/paint-funcs.c | 248 +++------ devel-docs/app/app-sections.txt | 1 - 7 files changed, 84 insertions(+), 1365 deletions(-) commit 08a3a1dca7fd2dcff308747b65b904dba0593d80 Author: Martin Nordholts -Date: Wed Oct 6 20:04:37 2010 +0200 +Date: Wed Oct 6 20:04:37 2010 +0200 build/buildbot: Suppress pygimp gimp_drawable_transform_* warnings @@ -51072,7 +51929,7 @@ commit 4a32f3e5003d1ac75c3acee7deb0f6640c62fcea Author: Martin Nordholts -Date: Wed Oct 6 19:53:14 2010 +0200 +Date: Wed Oct 6 19:53:14 2010 +0200 plug-ins: Port common/file-tiff-load.c to new item transform API @@ -51087,7 +51944,7 @@ commit 719e04f5d9563efc0c4a94bac8c5a09fa3aa192d Author: Martin Nordholts -Date: Wed Oct 6 19:30:09 2010 +0200 +Date: Wed Oct 6 19:30:09 2010 +0200 plug-ins: Port common/curve-bend.c to new item transform API @@ -51096,7 +51953,7 @@ commit 2e9b6625e8dbc65966439b4de8195f32ba775b31 Author: Michael Natterer -Date: Tue Oct 5 21:11:10 2010 +0200 +Date: Tue Oct 5 21:11:10 2010 +0200 pdb: document that the context's inteprolation defaults to the gimprc value @@ -51108,7 +51965,7 @@ commit 49f2204a8a996309cb9c256dc956aa8f54812297 Author: Michael Natterer -Date: Mon Oct 4 23:37:14 2010 +0200 +Date: Mon Oct 4 23:37:14 2010 +0200 app: add a newline @@ -51117,7 +51974,7 @@ commit 9d0e69d43bd51a2627eb625ca8a578f0126041f2 Author: Martin Nordholts -Date: Tue Oct 5 08:04:17 2010 +0200 +Date: Tue Oct 5 08:04:17 2010 +0200 plug-ins/file-sgi: Quickfix for -Wtype-limits warnings @@ -51129,7 +51986,7 @@ commit cc7755f87666023bc523d582d0da39f45e160d73 Author: Martin Nordholts -Date: Tue Oct 5 07:39:00 2010 +0200 +Date: Tue Oct 5 07:39:00 2010 +0200 Port stuff to gimp_item_is_text_layer() @@ -51137,44 +51994,44 @@ gimp_drawable_is_text_layer(). Nevermind the previous commit, it should never have been pushed... - app/actions/layers-actions.c | 2 +- - app/actions/layers-commands.c | 4 ++-- - app/actions/text-tool-actions.c | 2 +- - app/dialogs/layer-options-dialog.c | 4 ++-- - app/display/gimpdisplayshell-dnd.c | 2 +- - app/gimpcore.def | 2 +- - app/pdb/gimppdb-utils.c | 2 +- - app/pdb/item-cmds.c | 3 +-- - app/text/gimptextlayer.c | 10 +++++----- - app/text/gimptextlayer.h | 2 +- - app/widgets/gimplayertreeview.c | 2 +- - app/widgets/gimpviewrendererlayer.c | 2 +- - plug-ins/common/file-pdf-save.c | 2 +- - tools/pdbgen/pdb/item.pdb | 3 +-- + app/actions/layers-actions.c | 2 +- + app/actions/layers-commands.c | 4 ++-- + app/actions/text-tool-actions.c | 2 +- + app/dialogs/layer-options-dialog.c | 4 ++-- + app/display/gimpdisplayshell-dnd.c | 2 +- + app/gimpcore.def | 2 +- + app/pdb/gimppdb-utils.c | 2 +- + app/pdb/item-cmds.c | 3 +-- + app/text/gimptextlayer.c | 10 +++++----- + app/text/gimptextlayer.h | 2 +- + app/widgets/gimplayertreeview.c | 2 +- + app/widgets/gimpviewrendererlayer.c | 2 +- + plug-ins/common/file-pdf-save.c | 2 +- + tools/pdbgen/pdb/item.pdb | 3 +-- 14 files changed, 20 insertions(+), 22 deletions(-) commit 49a0be731e2417f46b7db6291269c4d9effa3765 Author: Martin Nordholts -Date: Tue Oct 5 07:12:30 2010 +0200 +Date: Tue Oct 5 07:12:30 2010 +0200 app: s/gimp_drawable_is_text_layer/gimp_item_is_text_layer/g - app/actions/layers-actions.c | 2 +- - app/actions/layers-commands.c | 4 ++-- + app/actions/layers-actions.c | 2 +- + app/actions/layers-commands.c | 4 ++-- app/actions/text-tool-actions.c | 2 +- app/dialogs/layer-options-dialog.c | 4 ++-- app/display/gimpdisplayshell-dnd.c | 2 +- - app/pdb/gimppdb-utils.c | 2 +- - app/pdb/item-cmds.c | 2 +- - app/text/gimptextlayer.c | 4 ++-- - app/text/gimptextlayer.h | 2 +- + app/pdb/gimppdb-utils.c | 2 +- + app/pdb/item-cmds.c | 2 +- + app/text/gimptextlayer.c | 4 ++-- + app/text/gimptextlayer.h | 2 +- app/widgets/gimplayertreeview.c | 2 +- app/widgets/gimpviewrendererlayer.c | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) commit 1e96a981a577fb9f7b608eabf104dbf35456e71e Author: Martin Nordholts -Date: Tue Oct 5 06:55:38 2010 +0200 +Date: Tue Oct 5 06:55:38 2010 +0200 build/buildbot: Suppress png.h deprecation warnings fixup 2... @@ -51183,7 +52040,7 @@ commit 4151d9f693a1a1f4d3f681300e72711e8656fee7 Author: Michael Natterer -Date: Mon Oct 4 23:31:25 2010 +0200 +Date: Mon Oct 4 23:31:25 2010 +0200 app: some draw tool cleanup @@ -51195,7 +52052,7 @@ commit cacfc0181c88d2c30791260890df052106d0a12f Author: Martin Nordholts -Date: Mon Oct 4 22:57:32 2010 +0200 +Date: Mon Oct 4 22:57:32 2010 +0200 build/buildbot: Suppress png.h deprecation warnings fixup... @@ -51204,7 +52061,7 @@ commit b8ed5fea5411f7767aee84dc3239d59dd9d65b1a Author: Martin Nordholts -Date: Mon Oct 4 22:50:48 2010 +0200 +Date: Mon Oct 4 22:50:48 2010 +0200 build/buildbot: Suppress png.h deprecation warnings @@ -51213,7 +52070,7 @@ commit ee828618713628c17a3fb81a9f65e7e30f74ec77 Author: Martin Nordholts -Date: Mon Oct 4 22:20:34 2010 +0200 +Date: Mon Oct 4 22:20:34 2010 +0200 build/buildbot: Supress jas_config.h warnings @@ -51222,7 +52079,7 @@ commit 8587e1e920655440bf786b13865cd7975a0b4aea Author: Sven Neumann -Date: Mon Oct 4 22:02:12 2010 +0200 +Date: Mon Oct 4 22:02:12 2010 +0200 app/tools: introduce gimp_draw_tool_add_crosshair() @@ -51236,7 +52093,7 @@ commit b74811324ad42bcf68c05f007bf070ff8903592e Author: Michael Natterer -Date: Mon Oct 4 21:44:05 2010 +0200 +Date: Mon Oct 4 21:44:05 2010 +0200 app: don't use PROJ_ROUND() for pixel-adjusting canvas item drawing @@ -51249,17 +52106,17 @@ bounding box and pixel-align that, then recalculate the center), so arcs properly align with rectangles. - app/display/gimpcanvasarc.c | 12 ++++++++---- + app/display/gimpcanvasarc.c | 12 ++++++++---- app/display/gimpcanvascorner.c | 8 ++++---- app/display/gimpcanvashandle.c | 4 ++-- - app/display/gimpcanvasline.c | 8 ++++---- + app/display/gimpcanvasline.c | 8 ++++---- app/display/gimpcanvaspolygon.c | 4 ++-- app/display/gimpcanvasrectangle.c | 8 ++++---- 6 files changed, 24 insertions(+), 20 deletions(-) commit 5a3dc38af023ae79f0cf83833dadecd6cc476262 Author: Sven Neumann -Date: Mon Oct 4 21:40:52 2010 +0200 +Date: Mon Oct 4 21:40:52 2010 +0200 app/tools: draw two guides for the moving sample point @@ -51276,7 +52133,7 @@ commit 5e0fbc66a09c828ecb3586362c6cf99ccec5f2a7 Author: Sven Neumann -Date: Mon Oct 4 21:22:28 2010 +0200 +Date: Mon Oct 4 21:22:28 2010 +0200 app/tools: don't use -1 as invalid guide position @@ -51290,17 +52147,17 @@ commit 333dfc7f134df1e092aa441084035934a24d100c Author: Mukund Sivaraman -Date: Mon Oct 4 20:16:22 2010 +0530 +Date: Mon Oct 4 20:16:22 2010 +0530 Fix warnings from windows build related .rule files build/windows/gimprc-plug-ins.rule | 5 ++++- - build/windows/gimprc.rule | 5 ++++- + build/windows/gimprc.rule | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) commit b693269060d10fac2ee89e66e0f029548c339388 Author: Michael Natterer -Date: Mon Oct 4 14:03:37 2010 +0200 +Date: Mon Oct 4 14:03:37 2010 +0200 app: simplify creating of stroke and fill groups a lot @@ -51319,23 +52176,23 @@ avoid ugly overdrawing (the mis-alignment of arcs becomes very visible now however, will fix that soon) - app/tools/gimpcroptool.c | 9 +- - app/tools/gimpdrawtool.c | 48 ++++- - app/tools/gimpdrawtool.h | 9 +- + app/tools/gimpcroptool.c | 9 +- + app/tools/gimpdrawtool.c | 48 ++++- + app/tools/gimpdrawtool.h | 9 +- app/tools/gimpfreeselecttool.c | 32 ++- - app/tools/gimpmeasuretool.c | 44 ++-- + app/tools/gimpmeasuretool.c | 44 ++-- app/tools/gimpperspectiveclonetool.c | 42 ++-- app/tools/gimprectangleselecttool.c | 60 ++++-- - app/tools/gimprectangletool.c | 393 + app/tools/gimprectangletool.c | 393 +++++++++++++++-------------------- - app/tools/gimprectangletool.h | 3 +- - app/tools/gimptexttool.c | 22 +- - app/tools/gimptransformtool.c | 60 +++--- + app/tools/gimprectangletool.h | 3 +- + app/tools/gimptexttool.c | 22 +- + app/tools/gimptransformtool.c | 60 +++--- 11 files changed, 350 insertions(+), 372 deletions(-) commit 64d9d76722ed2b81c73b76d5ba181bd3de1b7ac7 Author: Michael Natterer -Date: Mon Oct 4 13:58:29 2010 +0200 +Date: Mon Oct 4 13:58:29 2010 +0200 app: gimp_draw_tool_add_arc() pass the "filled" parameter down to the item @@ -51347,7 +52204,7 @@ commit d88a348c1858bc8be9b38370b91723a264357122 Author: Michael Natterer -Date: Sun Oct 3 22:14:40 2010 +0200 +Date: Sun Oct 3 22:14:40 2010 +0200 app: add public API for the "guide-style" and "sample-point-style" properties @@ -51356,20 +52213,20 @@ additionally hide them, and these items are used rarely enough to justify the additional parameter to the new() functions. - app/display/gimpcanvasguide.c | 4 +++- - app/display/gimpcanvasguide.h | 3 ++- - app/display/gimpcanvassamplepoint.c | 12 +++++++----- - app/display/gimpcanvassamplepoint.h | 3 ++- + app/display/gimpcanvasguide.c | 4 +++- + app/display/gimpcanvasguide.h | 3 ++- + app/display/gimpcanvassamplepoint.c | 12 +++++++----- + app/display/gimpcanvassamplepoint.h | 3 ++- app/display/gimpdisplayshell-handlers.c | 7 +++---- - app/tools/gimpcolortool.c | 1 - - app/tools/gimpdrawtool.c | 7 ++++--- - app/tools/gimpdrawtool.h | 3 ++- - app/tools/gimpmovetool.c | 8 ++++---- + app/tools/gimpcolortool.c | 1 - + app/tools/gimpdrawtool.c | 7 ++++--- + app/tools/gimpdrawtool.h | 3 ++- + app/tools/gimpmovetool.c | 8 ++++---- 9 files changed, 27 insertions(+), 21 deletions(-) commit 19bf6ff4975d9c0a402aeebb82ac8d0435d88762 Author: Martin Nordholts -Date: Sun Oct 3 19:05:58 2010 +0200 +Date: Sun Oct 3 19:05:58 2010 +0200 Bug 629926 - some tool sliders are not usable @@ -51381,7 +52238,7 @@ commit 3047bbaa2177c5679e49b9b96f616a0b4cfa97f7 Author: Martin Nordholts -Date: Sun Oct 3 14:15:38 2010 +0200 +Date: Sun Oct 3 14:15:38 2010 +0200 suppressed-warnings.txt: Don't suppress fixed warning @@ -51393,7 +52250,7 @@ commit 6be41a6675007a0c7328453c654bcda5a2b875b0 Author: Sven Neumann -Date: Sun Oct 3 14:05:20 2010 +0200 +Date: Sun Oct 3 14:05:20 2010 +0200 Bug 631199 - Printing and Print preview broken with cairo 1.10 @@ -51405,7 +52262,7 @@ commit 69604ef12df133e20c7ede387555495b3c475ffe Author: Patrick Horgan -Date: Sat Oct 2 19:32:31 2010 -0700 +Date: Sat Oct 2 19:32:31 2010 -0700 libgimpbase: avoid aliasing error @@ -51417,20 +52274,20 @@ commit 185deee3b22d09516afadea9513cd4ec8871607c Author: Martin Nordholts -Date: Sun Oct 3 11:14:35 2010 +0200 +Date: Sun Oct 3 11:14:35 2010 +0200 app: Don't run UI tests when there is no DISPLAY - app/tests.c | 19 +++++++++++++++++++ - app/tests.h | 1 + - app/tests/test-session-management.c | 1 + - app/tests/test-ui.c | 1 + - app/tests/test-xcf.c | 1 + + app/tests.c | 19 +++++++++++++++++++ + app/tests.h | 1 + + app/tests/test-session-management.c | 1 + + app/tests/test-ui.c | 1 + + app/tests/test-xcf.c | 1 + 5 files changed, 23 insertions(+) commit c87af702b1fd15e36b0e6064dbc083cf94a5b768 Author: Martin Nordholts -Date: Sun Oct 3 10:18:24 2010 +0200 +Date: Sun Oct 3 10:18:24 2010 +0200 configure.ac: Require libpoppler 0.6.0 @@ -51441,7 +52298,7 @@ commit 5275270b36eb70a966f8e867b7dc92e15eafc909 Author: Martin Nordholts -Date: Sun Oct 3 08:46:47 2010 +0200 +Date: Sun Oct 3 08:46:47 2010 +0200 build/buildbot: Supress AM_PROG_LIBTOOL warning with autoconf 2.68 @@ -51450,7 +52307,7 @@ commit 01e6f573548ba55f19fce1ad6ae0cef854b45422 Author: Martin Nordholts -Date: Sun Oct 3 08:47:55 2010 +0200 +Date: Sun Oct 3 08:47:55 2010 +0200 Use AC_CONF_PROGRAM in AC_COMPILE_IFELSE to silence autoconf 2.68 @@ -51459,7 +52316,7 @@ commit 96df3c2a083bdd213a65434a31ee8a79ef14326b Author: Michael Natterer -Date: Sun Oct 3 02:39:04 2010 +0200 +Date: Sun Oct 3 02:39:04 2010 +0200 app: formatting @@ -51468,7 +52325,7 @@ commit 0b4bb5175040357b1ebdfa639e0a2bf55758d6a2 Author: Michael Natterer -Date: Sun Oct 3 02:31:54 2010 +0200 +Date: Sun Oct 3 02:31:54 2010 +0200 app: need to actually set the extents of the pen, not only calculate them @@ -51478,29 +52335,29 @@ commit f3450431a33428a3ca76c2dc4f6da031d46022df Author: Michael Natterer -Date: Sun Oct 3 02:26:40 2010 +0200 +Date: Sun Oct 3 02:26:40 2010 +0200 app: add a pen canvas item class and use it in the foreground select tool Remove gimp_display_shell_draw_pen(). - app/display/Makefile.am | 2 + - app/display/gimpcanvaspen.c | 237 + app/display/Makefile.am | 2 + + app/display/gimpcanvaspen.c | 237 +++++++++++++++++++++++++++++++++++ - app/display/gimpcanvaspen.h | 60 +++++++++ + app/display/gimpcanvaspen.h | 60 +++++++++ app/display/gimpdisplayshell-draw.c | 45 ------- app/display/gimpdisplayshell-draw.h | 9 +- app/display/gimpdisplayshell-style.c | 21 +--- app/display/gimpdisplayshell-style.h | 3 +- - app/tools/gimpdrawtool.c | 25 ++++ - app/tools/gimpdrawtool.h | 8 ++ + app/tools/gimpdrawtool.c | 25 ++++ + app/tools/gimpdrawtool.h | 8 ++ app/tools/gimpforegroundselecttool.c | 21 ++-- 10 files changed, 346 insertions(+), 85 deletions(-) commit ff6d0f36b33f92dce0f08a9a98ad2693bbe75c91 Author: Michael Natterer -Date: Sun Oct 3 02:25:53 2010 +0200 +Date: Sun Oct 3 02:25:53 2010 +0200 app: remove obsolete include @@ -51509,7 +52366,7 @@ commit ba6aa8258ed4f1858612aa4f32ac17df6be5800c Author: Michael Natterer -Date: Sun Oct 3 01:38:59 2010 +0200 +Date: Sun Oct 3 01:38:59 2010 +0200 app: implement the "points" property using GimpArray @@ -51523,7 +52380,7 @@ commit dbce9d49d90587f2922ebb18541362f5ac5ba9f0 Author: Michael Natterer -Date: Sun Oct 3 00:52:46 2010 +0200 +Date: Sun Oct 3 00:52:46 2010 +0200 app: fix scrolling in of dashed lines @@ -51532,14 +52389,14 @@ simply set the shell's scroll offsets as cairo translation and everything looks perfect. - app/display/gimpcanvasgrid.c | 1 + - app/display/gimpcanvasguide.c | 1 + + app/display/gimpcanvasgrid.c | 1 + + app/display/gimpcanvasguide.c | 1 + app/display/gimpcanvaslayerboundary.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) commit 3e69ae00390aa97879bffcd5d628ad9710142049 Author: Michael Natterer -Date: Sun Oct 3 00:28:40 2010 +0200 +Date: Sun Oct 3 00:28:40 2010 +0200 app: add a layer boundary canvas item class @@ -51553,31 +52410,31 @@ the removed enum values - remove gimp_layer_boundary() - app/core/core-enums.c | 4 - - app/core/core-enums.h | 2 - - app/core/gimplayer.c | 73 ------- - app/core/gimplayer.h | 2 - - app/core/gimplayermask.c | 11 +- - app/display/Makefile.am | 2 + - app/display/gimpcanvaslayerboundary.c | 303 + app/core/core-enums.c | 4 - + app/core/core-enums.h | 2 - + app/core/gimplayer.c | 73 ------- + app/core/gimplayer.h | 2 - + app/core/gimplayermask.c | 11 +- + app/display/Makefile.am | 2 + + app/display/gimpcanvaslayerboundary.c | 303 ++++++++++++++++++++++++++++++ - app/display/gimpcanvaslayerboundary.h | 58 ++++++ + app/display/gimpcanvaslayerboundary.h | 58 ++++++ app/display/gimpdisplayshell-appearance.c | 2 +- - app/display/gimpdisplayshell-draw.c | 18 -- - app/display/gimpdisplayshell-draw.h | 5 - + app/display/gimpdisplayshell-draw.c | 18 -- + app/display/gimpdisplayshell-draw.h | 5 - app/display/gimpdisplayshell-handlers.c | 7 + - app/display/gimpdisplayshell-items.c | 15 +- + app/display/gimpdisplayshell-items.c | 15 +- app/display/gimpdisplayshell-selection.c | 136 +------------- app/display/gimpdisplayshell-selection.h | 14 +- - app/display/gimpdisplayshell-style.c | 10 +- - app/display/gimpdisplayshell-style.h | 2 +- - app/display/gimpdisplayshell.c | 4 + - app/display/gimpdisplayshell.h | 1 + + app/display/gimpdisplayshell-style.c | 10 +- + app/display/gimpdisplayshell-style.h | 2 +- + app/display/gimpdisplayshell.c | 4 + + app/display/gimpdisplayshell.h | 1 + 19 files changed, 405 insertions(+), 264 deletions(-) commit 8c214f95ca78710d5395584d0913d1cfe3f38b05 Author: Michael Natterer -Date: Sat Oct 2 22:30:30 2010 +0200 +Date: Sat Oct 2 22:30:30 2010 +0200 app: fix showing the layer boundary when there is a floating selection @@ -51588,7 +52445,7 @@ commit dd4f27ed4f32ed6199d4915bb11764fcc7a3e5fc Author: Michael Natterer -Date: Sat Oct 2 22:11:52 2010 +0200 +Date: Sat Oct 2 22:11:52 2010 +0200 app: remove gimp_display_shell_set_cursor_style() @@ -51598,41 +52455,41 @@ commit 7ffa463273e5e326cf37efa71138a452370abae7 Author: Michael Natterer -Date: Sat Oct 2 22:07:31 2010 +0200 +Date: Sat Oct 2 22:07:31 2010 +0200 app: remove obsolete includes - app/display/gimpdisplayshell-cursor.c | 1 - - app/display/gimpdisplayshell-draw.c | 2 -- + app/display/gimpdisplayshell-cursor.c | 1 - + app/display/gimpdisplayshell-draw.c | 2 -- app/display/gimpdisplayshell-handlers.c | 1 - - app/display/gimpdisplayshell.c | 1 - + app/display/gimpdisplayshell.c | 1 - 4 files changed, 5 deletions(-) commit 1d45f6295ef50135366032588d7fd230f56727c1 Author: Michael Natterer -Date: Sat Oct 2 21:56:36 2010 +0200 +Date: Sat Oct 2 21:56:36 2010 +0200 app: add a software cursor canvas item and use it to draw the sw cursor. Almost every aspect of the old code was ugly and hard to read, this is so much nicer... - app/display/Makefile.am | 2 + - app/display/gimpcanvascursor.c | 235 + app/display/Makefile.am | 2 + + app/display/gimpcanvascursor.c | 235 +++++++++++++++++++++++++++++++ - app/display/gimpcanvascursor.h | 59 ++++++++ + app/display/gimpcanvascursor.h | 59 ++++++++ app/display/gimpdisplayshell-callbacks.c | 5 - - app/display/gimpdisplayshell-cursor.c | 49 +++---- - app/display/gimpdisplayshell-cursor.h | 3 - - app/display/gimpdisplayshell-draw.c | 49 ------- - app/display/gimpdisplayshell-draw.h | 2 - - app/display/gimpdisplayshell-items.c | 7 + - app/display/gimpdisplayshell.h | 4 +- + app/display/gimpdisplayshell-cursor.c | 49 +++---- + app/display/gimpdisplayshell-cursor.h | 3 - + app/display/gimpdisplayshell-draw.c | 49 ------- + app/display/gimpdisplayshell-draw.h | 2 - + app/display/gimpdisplayshell-items.c | 7 + + app/display/gimpdisplayshell.h | 4 +- 10 files changed, 323 insertions(+), 92 deletions(-) commit cfa17dc744ecfe3d6fc5be386c76e0762d4a3ee4 Author: Michael Natterer -Date: Sat Oct 2 21:52:42 2010 +0200 +Date: Sat Oct 2 21:52:42 2010 +0200 app: fix last fix for the region leak... @@ -51645,41 +52502,41 @@ commit cad95533dd8b091d830208f255abe1cba8c9f00a Author: Michael Natterer -Date: Sat Oct 2 21:13:31 2010 +0200 +Date: Sat Oct 2 21:13:31 2010 +0200 app: queue a draw on the canvas in gimp_canvas_set_bg_color() Instead of doing it in gimp_display_shell_set_padding() from where it's called. - app/display/gimpcanvas.c | 2 ++ + app/display/gimpcanvas.c | 2 ++ app/display/gimpdisplayshell-appearance.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) commit 502d7c815b3d95b67e1d19cb6373891d09a3959e Author: Michael Natterer -Date: Sat Oct 2 20:57:40 2010 +0200 +Date: Sat Oct 2 20:57:40 2010 +0200 app: add a canvas grid item class and use it to draw the grid Remove gimp_display_shell_draw_grid(). - app/display/Makefile.am | 2 + - app/display/gimpcanvasgrid.c | 399 + app/display/Makefile.am | 2 + + app/display/gimpcanvasgrid.c | 399 ++++++++++++++++++++++++++++++ - app/display/gimpcanvasgrid.h | 56 +++++ + app/display/gimpcanvasgrid.h | 56 +++++ app/display/gimpdisplayshell-appearance.c | 11 +- app/display/gimpdisplayshell-callbacks.c | 5 - - app/display/gimpdisplayshell-draw.c | 177 ------------- - app/display/gimpdisplayshell-draw.h | 3 +- + app/display/gimpdisplayshell-draw.c | 177 ------------- + app/display/gimpdisplayshell-draw.h | 3 +- app/display/gimpdisplayshell-handlers.c | 8 +- - app/display/gimpdisplayshell-items.c | 7 + - app/display/gimpdisplayshell.h | 1 + + app/display/gimpdisplayshell-items.c | 7 + + app/display/gimpdisplayshell.h | 1 + 10 files changed, 471 insertions(+), 198 deletions(-) commit 2731a9c7b9e428fe98bcd96beabfd548dc3a4c7f Author: Michael Natterer -Date: Sat Oct 2 19:58:35 2010 +0200 +Date: Sat Oct 2 19:58:35 2010 +0200 app: manage the stroking/filling state of child items correctly in all cases @@ -51692,7 +52549,7 @@ commit b392ae6515953c37d7ed18d7f830d2c9fd783918 Author: Michael Natterer -Date: Sat Oct 2 19:57:41 2010 +0200 +Date: Sat Oct 2 19:57:41 2010 +0200 app: don't leak the changed region in gimp_canvas_item_end_change() @@ -51701,7 +52558,7 @@ commit 7dbaf348c5931db6be4444124e982f184ff6b807 Author: Michael Natterer -Date: Sat Oct 2 19:53:39 2010 +0200 +Date: Sat Oct 2 19:53:39 2010 +0200 app: fix gimp_text_buffer_get_color_tag() @@ -51715,7 +52572,7 @@ commit 68b380fa4e1bc07a7e23cf73d1cdadf182d1e5b4 Author: Michael Natterer -Date: Sat Oct 2 19:51:49 2010 +0200 +Date: Sat Oct 2 19:51:49 2010 +0200 app: forgot to check for "color_differs" for breaking out of a loop @@ -51726,7 +52583,7 @@ commit d6f343943b327ed1ce1ce4ebbbf160d8d87d1d1a Author: Michael Natterer -Date: Sat Oct 2 19:49:59 2010 +0200 +Date: Sat Oct 2 19:49:59 2010 +0200 app: fix text cursor extents so it doesn't leave artifacts @@ -51735,7 +52592,7 @@ commit 10111126aed16c27ddf0ab24d363327054f70991 Author: Michael Natterer -Date: Fri Oct 1 20:41:27 2010 +0200 +Date: Fri Oct 1 20:41:27 2010 +0200 app: add a "visible" property and API to GimpCanvasItem @@ -51755,17 +52612,17 @@ - add some protected function to emit "update", and to figure if it makes sense at all to emit "update" on an item. - app/display/gimpcanvasgroup.c | 31 +++-- - app/display/gimpcanvasitem.c | 194 + app/display/gimpcanvasgroup.c | 31 +++-- + app/display/gimpcanvasitem.c | 194 +++++++++++++++++++++++------- - app/display/gimpcanvasitem.h | 10 ++ + app/display/gimpcanvasitem.h | 10 ++ app/display/gimpdisplayshell-appearance.c | 17 +-- app/display/gimpdisplayshell-handlers.c | 4 + 5 files changed, 186 insertions(+), 70 deletions(-) commit f0d01f611c57a374888a0153c9f52ceceae4c90c Author: Michael Natterer -Date: Fri Oct 1 17:43:41 2010 +0200 +Date: Fri Oct 1 17:43:41 2010 +0200 app: don't bother to emit an "update" region if no handler is connected @@ -51780,7 +52637,7 @@ commit d9cd9f8a0725cb9514dc44af9de61a9a493e6e69 Author: Michael Natterer -Date: Fri Oct 1 17:13:00 2010 +0200 +Date: Fri Oct 1 17:13:00 2010 +0200 app: add an "update" signal to GimpCanvasItem @@ -51793,114 +52650,114 @@ - Remove gimp_display_shell_expose_item() - Move all the shell's item group code into gimpdisplayshell-items.c - app/display/gimpcanvasgroup.c | 41 +++++++++++++++++ - app/display/gimpcanvasitem.c | 79 + app/display/gimpcanvasgroup.c | 41 +++++++++++++++++ + app/display/gimpcanvasitem.c | 79 +++++++++++++++++++++++++++++---- - app/display/gimpcanvasitem.h | 5 +++ - app/display/gimpdisplayshell-expose.c | 51 +++++++-------------- - app/display/gimpdisplayshell-expose.h | 4 +- + app/display/gimpcanvasitem.h | 5 +++ + app/display/gimpdisplayshell-expose.c | 51 +++++++-------------- + app/display/gimpdisplayshell-expose.h | 4 +- app/display/gimpdisplayshell-handlers.c | 25 +---------- - app/display/gimpdisplayshell-items.c | 65 ++++++++++++++++++++++++--- - app/display/gimpdisplayshell-items.h | 3 ++ - app/display/gimpdisplayshell.c | 22 ++------- + app/display/gimpdisplayshell-items.c | 65 ++++++++++++++++++++++++--- + app/display/gimpdisplayshell-items.h | 3 ++ + app/display/gimpdisplayshell.c | 22 ++------- 9 files changed, 202 insertions(+), 93 deletions(-) commit d3f19baf0d5b1c91271c27917a8500b0aeb64962 Author: Michael Natterer -Date: Fri Oct 1 14:54:53 2010 +0200 +Date: Fri Oct 1 14:54:53 2010 +0200 app: remove "shell" parameter from GimpCanvasItem's public APIs because each item has a shell now. Keep the parameter in the virtual functions though because that saves a lot of code in the subclasses. - app/display/gimpcanvasarc.c | 4 ++-- - app/display/gimpcanvasboundary.c | 2 +- - app/display/gimpcanvascorner.c | 2 +- - app/display/gimpcanvasgroup.c | 9 ++++----- - app/display/gimpcanvasguide.c | 2 +- - app/display/gimpcanvashandle.c | 10 +++++----- - app/display/gimpcanvasitem.c | 32 + app/display/gimpcanvasarc.c | 4 ++-- + app/display/gimpcanvasboundary.c | 2 +- + app/display/gimpcanvascorner.c | 2 +- + app/display/gimpcanvasgroup.c | 9 ++++----- + app/display/gimpcanvasguide.c | 2 +- + app/display/gimpcanvashandle.c | 10 +++++----- + app/display/gimpcanvasitem.c | 32 +++++++++++++++++--------------- - app/display/gimpcanvasitem.h | 6 +----- - app/display/gimpcanvasline.c | 2 +- - app/display/gimpcanvaspolygon.c | 4 ++-- - app/display/gimpcanvasrectangle.c | 4 ++-- - app/display/gimpcanvassamplepoint.c | 4 ++-- - app/display/gimpcanvastextcursor.c | 2 +- + app/display/gimpcanvasitem.h | 6 +----- + app/display/gimpcanvasline.c | 2 +- + app/display/gimpcanvaspolygon.c | 4 ++-- + app/display/gimpcanvasrectangle.c | 4 ++-- + app/display/gimpcanvassamplepoint.c | 4 ++-- + app/display/gimpcanvastextcursor.c | 2 +- app/display/gimpdisplayshell-callbacks.c | 2 +- - app/display/gimpdisplayshell-expose.c | 2 +- + app/display/gimpdisplayshell-expose.c | 2 +- 15 files changed, 42 insertions(+), 45 deletions(-) commit 33ab94517f517e3f2c214c2e7e8f41ba4ca3dc03 Author: Michael Natterer -Date: Fri Oct 1 14:24:46 2010 +0200 +Date: Fri Oct 1 14:24:46 2010 +0200 app: add gimp_draw_tool_add_stroke_group() and add_fill_group() and use it in all tools which have groups. - app/tools/gimpdrawtool.c | 32 + app/tools/gimpdrawtool.c | 32 ++++++++++++++++++++++++++++++++ - app/tools/gimpdrawtool.h | 3 +++ + app/tools/gimpdrawtool.h | 3 +++ app/tools/gimpfreeselecttool.c | 6 +----- - app/tools/gimpmeasuretool.c | 6 +----- + app/tools/gimpmeasuretool.c | 6 +----- app/tools/gimpperspectiveclonetool.c | 6 +----- - app/tools/gimprectangletool.c | 6 +----- - app/tools/gimptexttool.c | 5 +---- - app/tools/gimptransformtool.c | 6 +----- + app/tools/gimprectangletool.c | 6 +----- + app/tools/gimptexttool.c | 5 +---- + app/tools/gimptransformtool.c | 6 +----- 8 files changed, 41 insertions(+), 29 deletions(-) commit 201bfe3e25e939b8a2084d8a73a73756c8e055f8 Author: Michael Natterer -Date: Fri Oct 1 14:13:45 2010 +0200 +Date: Fri Oct 1 14:13:45 2010 +0200 app: add a "shell" property to GimpCanvasItem and pass it to all constructors. The GimpDisplayShell is needed because items are going to become more powerful soon. - app/display/gimpcanvasarc.c | 18 +++++++++------- - app/display/gimpcanvasarc.h | 15 ++++++------- - app/display/gimpcanvasboundary.c | 12 +++++++---- - app/display/gimpcanvasboundary.h | 9 ++++---- - app/display/gimpcanvascorner.c | 20 +++++++++++------- - app/display/gimpcanvascorner.h | 17 ++++++++------- - app/display/gimpcanvasgroup.c | 8 +++++-- - app/display/gimpcanvasgroup.h | 18 ++++++++-------- - app/display/gimpcanvasguide.c | 6 +++++- - app/display/gimpcanvasguide.h | 3 ++- - app/display/gimpcanvashandle.c | 16 ++++++++------ - app/display/gimpcanvashandle.h | 3 ++- - app/display/gimpcanvasitem.c | 37 + app/display/gimpcanvasarc.c | 18 +++++++++------- + app/display/gimpcanvasarc.h | 15 ++++++------- + app/display/gimpcanvasboundary.c | 12 +++++++---- + app/display/gimpcanvasboundary.h | 9 ++++---- + app/display/gimpcanvascorner.c | 20 +++++++++++------- + app/display/gimpcanvascorner.h | 17 ++++++++------- + app/display/gimpcanvasgroup.c | 8 +++++-- + app/display/gimpcanvasgroup.h | 18 ++++++++-------- + app/display/gimpcanvasguide.c | 6 +++++- + app/display/gimpcanvasguide.h | 3 ++- + app/display/gimpcanvashandle.c | 16 ++++++++------ + app/display/gimpcanvashandle.h | 3 ++- + app/display/gimpcanvasitem.c | 37 +++++++++++++++++++++++++++++---- - app/display/gimpcanvasline.c | 20 +++++++++++------- - app/display/gimpcanvasline.h | 9 ++++---- - app/display/gimpcanvaspolygon.c | 14 +++++++++++-- - app/display/gimpcanvaspolygon.h | 6 ++++-- - app/display/gimpcanvasproxygroup.c | 8 +++++-- - app/display/gimpcanvasproxygroup.h | 2 +- - app/display/gimpcanvasrectangle.c | 14 ++++++++----- - app/display/gimpcanvasrectangle.h | 11 +++++----- - app/display/gimpcanvassamplepoint.c | 10 ++++++--- - app/display/gimpcanvassamplepoint.h | 7 ++++--- - app/display/gimpcanvastextcursor.c | 9 ++++++-- - app/display/gimpcanvastextcursor.h | 5 +++-- + app/display/gimpcanvasline.c | 20 +++++++++++------- + app/display/gimpcanvasline.h | 9 ++++---- + app/display/gimpcanvaspolygon.c | 14 +++++++++++-- + app/display/gimpcanvaspolygon.h | 6 ++++-- + app/display/gimpcanvasproxygroup.c | 8 +++++-- + app/display/gimpcanvasproxygroup.h | 2 +- + app/display/gimpcanvasrectangle.c | 14 ++++++++----- + app/display/gimpcanvasrectangle.h | 11 +++++----- + app/display/gimpcanvassamplepoint.c | 10 ++++++--- + app/display/gimpcanvassamplepoint.h | 7 ++++--- + app/display/gimpcanvastextcursor.c | 9 ++++++-- + app/display/gimpcanvastextcursor.h | 5 +++-- app/display/gimpdisplayshell-handlers.c | 6 ++++-- - app/display/gimpdisplayshell.c | 6 +++--- - app/tools/gimpdrawtool.c | 35 + app/display/gimpdisplayshell.c | 6 +++--- + app/tools/gimpdrawtool.c | 35 ++++++++++++++++++++----------- - app/tools/gimpfreeselecttool.c | 2 +- - app/tools/gimpmeasuretool.c | 2 +- - app/tools/gimpperspectiveclonetool.c | 2 +- - app/tools/gimprectangletool.c | 2 +- - app/tools/gimptexttool.c | 2 +- - app/tools/gimptransformtool.c | 2 +- + app/tools/gimpfreeselecttool.c | 2 +- + app/tools/gimpmeasuretool.c | 2 +- + app/tools/gimpperspectiveclonetool.c | 2 +- + app/tools/gimprectangletool.c | 2 +- + app/tools/gimptexttool.c | 2 +- + app/tools/gimptransformtool.c | 2 +- 34 files changed, 232 insertions(+), 124 deletions(-) commit 26d0035be040daf87e085c94483f1ceee463164f Author: Michael Natterer -Date: Fri Oct 1 10:34:15 2010 +0200 +Date: Fri Oct 1 10:34:15 2010 +0200 app: draw guides using GimpCanvasItems @@ -51911,23 +52768,23 @@ items as needed - Remove gimp_display_shell_draw_guides() - app/core/gimpguideundo.c | 8 ++- - app/core/gimpimage-arrange.c | 2 - - app/core/gimpimage-guides.c | 10 ++-- - app/core/gimpimage.c | 87 + app/core/gimpguideundo.c | 8 ++- + app/core/gimpimage-arrange.c | 2 - + app/core/gimpimage-guides.c | 10 ++-- + app/core/gimpimage.c | 87 ++++++++++++++++++++++++------- - app/core/gimpimage.h | 17 ++++-- + app/core/gimpimage.h | 17 ++++-- app/display/gimpdisplayshell-callbacks.c | 5 -- - app/display/gimpdisplayshell-draw.c | 46 ----------------- - app/display/gimpdisplayshell-draw.h | 2 - + app/display/gimpdisplayshell-draw.c | 46 ----------------- + app/display/gimpdisplayshell-draw.h | 2 - app/display/gimpdisplayshell-handlers.c | 89 ++++++++++++++++++++++++++++---- - app/tools/gimpmeasuretool.c | 41 ++++++--------- + app/tools/gimpmeasuretool.c | 41 ++++++--------- 10 files changed, 187 insertions(+), 120 deletions(-) commit 3b4f2ec94c65192313499ef51a8ec860cc5abb0f Author: Michael Natterer -Date: Fri Oct 1 10:33:39 2010 +0200 +Date: Fri Oct 1 10:33:39 2010 +0200 app: add a GimpCanvasProxyGroup that will be used for guides @@ -51937,19 +52794,19 @@ commit 07051535da0f05351680f561043d3a476165e9e4 Author: Michael Natterer -Date: Fri Oct 1 09:27:10 2010 +0200 +Date: Fri Oct 1 09:27:10 2010 +0200 app: remove GimpImage signal "update-sample-point" app/core/gimpimage-sample-points.c | 16 ---------------- - app/core/gimpimage.c | 23 ----------------------- - app/core/gimpimage.h | 4 ---- + app/core/gimpimage.c | 23 ----------------------- + app/core/gimpimage.h | 4 ---- app/core/gimpsamplepointundo.c | 4 ---- 4 files changed, 47 deletions(-) commit 6a2785173d00597feaab5d68fdbb0f7b3bd87f45 Author: Michael Natterer -Date: Fri Oct 1 09:21:14 2010 +0200 +Date: Fri Oct 1 09:21:14 2010 +0200 app: port GimpSamplePointEditor to the "sample-point-moved" signal @@ -51958,7 +52815,7 @@ commit 0c613ba87d7e976101c1118346ffaec374ab758c Author: Michael Natterer -Date: Fri Oct 1 09:15:52 2010 +0200 +Date: Fri Oct 1 09:15:52 2010 +0200 app: port sample point drawing to GimpCanvasItems @@ -51968,20 +52825,20 @@ and update the canvas items accordingly - Remove gimp_display_shell_draw_sample_points() - app/core/gimpimage-sample-points.c | 8 +- - app/core/gimpimage.c | 23 ++++++ - app/core/gimpimage.h | 4 + - app/core/gimpsamplepointundo.c | 3 + + app/core/gimpimage-sample-points.c | 8 +- + app/core/gimpimage.c | 23 ++++++ + app/core/gimpimage.h | 4 + + app/core/gimpsamplepointundo.c | 3 + app/display/gimpdisplayshell-callbacks.c | 7 +- - app/display/gimpdisplayshell-draw.c | 50 ------------ - app/display/gimpdisplayshell-draw.h | 2 - + app/display/gimpdisplayshell-draw.c | 50 ------------ + app/display/gimpdisplayshell-draw.h | 2 - app/display/gimpdisplayshell-handlers.c | 128 ++++++++++++++++++++++++++++--- 8 files changed, 155 insertions(+), 70 deletions(-) commit 0f73269484e5cda35f9ea792b4235f523b0b3515 Author: Michael Natterer -Date: Fri Oct 1 09:15:36 2010 +0200 +Date: Fri Oct 1 09:15:36 2010 +0200 app: remove "item" parameter from gimp_canvas_proxy_group_remove_item() @@ -51992,7 +52849,7 @@ commit 75b4c8096f7769102f2b0eb25d505f38f62d4a27 Author: Michael Natterer -Date: Fri Oct 1 09:01:51 2010 +0200 +Date: Fri Oct 1 09:01:51 2010 +0200 app: add a proxy group which will keep sample point canvas items @@ -52002,14 +52859,14 @@ commit f6314b48969f62912f2a463d13b75f723c5e637c Author: Michael Natterer -Date: Fri Oct 1 08:59:56 2010 +0200 +Date: Fri Oct 1 08:59:56 2010 +0200 app: add GimpCanvasProxyGroup which is a group that keeps a mapping between arbitrary pointers and canvas items. No MVC whatsoever yet, just a simple hash table. - app/display/Makefile.am | 2 + + app/display/Makefile.am | 2 + app/display/gimpcanvasproxygroup.c | 203 +++++++++++++++++++++++++++++++++++++ app/display/gimpcanvasproxygroup.h | 64 ++++++++++++ @@ -52017,7 +52874,7 @@ commit 36ee0a7367106b991a7d2953d49cda8841e9b5a2 Author: Gil Forcada -Date: Thu Sep 30 23:55:11 2010 +0200 +Date: Thu Sep 30 23:55:11 2010 +0200 Updated Catalan translation @@ -52027,7 +52884,7 @@ commit ec5fa2fb26407ceaadd041ef9061312ab39e48cb Author: Sven Neumann -Date: Thu Sep 30 22:46:30 2010 +0200 +Date: Thu Sep 30 22:46:30 2010 +0200 plug-ins: unify handling of return values @@ -52038,12 +52895,12 @@ plug-ins/common/filter-pack.c | 2 +- plug-ins/common/sharpen.c | 4 +--- plug-ins/file-fli/fli-gimp.c | 3 +-- - plug-ins/gfig/gfig.c | 3 ++- + plug-ins/gfig/gfig.c | 3 ++- 5 files changed, 6 insertions(+), 10 deletions(-) commit cad6ba9b944af61438939aed3f54a7eb86d00424 Author: Mukund Sivaraman -Date: Thu Sep 30 23:14:56 2010 +0530 +Date: Thu Sep 30 23:14:56 2010 +0530 Make values static to avoid returning bogus ptr @@ -52054,7 +52911,7 @@ commit 14f9074675c83724d7e7b574e49be85200b9cfb8 Author: Mukund Sivaraman -Date: Thu Sep 30 23:01:03 2010 +0530 +Date: Thu Sep 30 23:01:03 2010 +0530 Remove unused code @@ -52063,7 +52920,7 @@ commit bab2c37f489bfcf6a5ed664390e6e7badc9ef461 Author: Michael Natterer -Date: Thu Sep 30 13:28:04 2010 +0200 +Date: Thu Sep 30 13:28:04 2010 +0200 app: don't include "core/gimpsamplepoint.h" @@ -52072,32 +52929,32 @@ commit 2a67bfcb1013333d597782a080e7f4963638e122 Author: Sven Neumann -Date: Thu Sep 30 10:11:45 2010 +0200 +Date: Thu Sep 30 10:11:45 2010 +0200 app: document the new display title option - app/config/gimpconfig-dump.c | 1 + + app/config/gimpconfig-dump.c | 1 + app/display/gimpdisplayshell-title.c | 5 ++--- - docs/gimprc.5.in | 4 ++++ - etc/gimprc | 2 ++ + docs/gimprc.5.in | 4 ++++ + etc/gimprc | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) commit 26f6f2992aeb1fc01dd53b78e08bcc55daecc822 Author: Michael Natterer -Date: Thu Sep 30 10:12:15 2010 +0200 +Date: Thu Sep 30 10:12:15 2010 +0200 app: remove GIMP_SAMPLE_POINT_DRAW_SIZE from gimpsamplepoint.h and add it to gimpcanvassamplepoint.c, it doesn't need to be public any longer. - app/core/gimpsamplepoint.h | 3 --- + app/core/gimpsamplepoint.h | 3 --- app/display/gimpcanvassamplepoint.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) commit f03cf53e0c515c1393a5ec7e733d6b92174eee16 Author: Mukund Sivaraman -Date: Thu Sep 30 12:54:26 2010 +0530 +Date: Thu Sep 30 12:54:26 2010 +0530 Convert tabs to spaces in last commit @@ -52106,7 +52963,7 @@ commit fee8f4008ec253ff30251737560129fcbd34bfa1 Author: Mukund Sivaraman -Date: Thu Sep 30 12:46:22 2010 +0530 +Date: Thu Sep 30 12:46:22 2010 +0530 Avoid overflow in expression @@ -52115,7 +52972,7 @@ commit ad331d562634450729d324951a5ffddfe247c3a8 Author: Michael Natterer -Date: Thu Sep 30 09:05:55 2010 +0200 +Date: Thu Sep 30 09:05:55 2010 +0200 app: minor cleanup in gimp_display_shell_expose_item() @@ -52124,21 +52981,21 @@ commit 7f1cadddd04bebf65b13ab3e4184269b293f56c8 Author: Michael Natterer -Date: Thu Sep 30 08:59:36 2010 +0200 +Date: Thu Sep 30 08:59:36 2010 +0200 app: use temporary canvas items for exposing guides and sample points and remove gimp_display_shell_expose_guide() and _sample_point(). - app/display/gimpdisplayshell-expose.c | 64 + app/display/gimpdisplayshell-expose.c | 64 --------------------------------- - app/display/gimpdisplayshell-expose.h | 24 ++++++------- + app/display/gimpdisplayshell-expose.h | 24 ++++++------- app/display/gimpdisplayshell-handlers.c | 25 +++++++++++-- 3 files changed, 33 insertions(+), 80 deletions(-) commit aa47dd22f0d8d498c80236303e0ac27210a4e675 Author: Bogdan Szczurek -Date: Thu Sep 30 07:57:44 2010 +0200 +Date: Thu Sep 30 07:57:44 2010 +0200 app: Support 'M' for 'megapixels' in image title format string @@ -52147,7 +53004,7 @@ commit 2ced18cc87c7cdb03395d6b1937f5035c5ae7692 Author: Michael Natterer -Date: Thu Sep 30 02:03:16 2010 +0200 +Date: Thu Sep 30 02:03:16 2010 +0200 app: add gimp_draw_tool_add_sample_point() @@ -52162,7 +53019,7 @@ commit cbd1d8cd51e6274a7f0bcbf4acc11ca2d4733dfd Author: Michael Natterer -Date: Thu Sep 30 01:37:28 2010 +0200 +Date: Thu Sep 30 01:37:28 2010 +0200 app: remove gimp_display_shell_draw_sample_point() @@ -52170,12 +53027,12 @@ app/display/gimpdisplayshell-draw.c | 57 ++++++++++++++++--------------------- - app/display/gimpdisplayshell-draw.h | 4 --- + app/display/gimpdisplayshell-draw.h | 4 --- 2 files changed, 25 insertions(+), 36 deletions(-) commit f5750647c19c3c964ed7496d1530aa38d7d0f182 Author: Michael Natterer -Date: Thu Sep 30 01:32:34 2010 +0200 +Date: Thu Sep 30 01:32:34 2010 +0200 app: use a GimpCanvasSamplePoint to draw the hovered sample point @@ -52185,13 +53042,13 @@ commit 0d11be8fed2d33793ff7f86bd568e37ced98dbfa Author: Michael Natterer -Date: Thu Sep 30 01:13:23 2010 +0200 +Date: Thu Sep 30 01:13:23 2010 +0200 app: add a canvas sample point item class and use it in gimp_display_shell_draw_sample_point(). - app/display/Makefile.am | 2 + + app/display/Makefile.am | 2 + app/display/gimpcanvassamplepoint.c | 334 ++++++++++++++++++++++++++++++++++ app/display/gimpcanvassamplepoint.h | 57 ++++++ @@ -52201,19 +53058,19 @@ commit a5071f1252ee8301ba0397e600b7ea3cbbb4a92f Author: Michael Schumacher -Date: Thu Sep 30 00:24:48 2010 +0200 +Date: Thu Sep 30 00:24:48 2010 +0200 Fix version resources for app/ and add the same code for plug-ins build/windows/gimp-plug-ins.rc.in | 3 ++- - build/windows/gimp.rc.in | 2 +- + build/windows/gimp.rc.in | 2 +- build/windows/gimprc-plug-ins.rule | 1 + - build/windows/gimprc.rule | 2 +- + build/windows/gimprc.rule | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) commit 50efb962221aa0f14352956d9bf7685e68f4963f Author: Michael Natterer -Date: Thu Sep 30 00:40:42 2010 +0200 +Date: Thu Sep 30 00:40:42 2010 +0200 app: remove empty GimpTool::control() implementation @@ -52222,7 +53079,7 @@ commit a8259996e4d2efed44ff3d05cccecff378df998f Author: Michael Natterer -Date: Thu Sep 30 00:39:15 2010 +0200 +Date: Thu Sep 30 00:39:15 2010 +0200 app: simplify the drawing code @@ -52233,7 +53090,7 @@ commit d3e2db88bb306ba43f1455675fe0bd76ff7946e3 Author: Michael Natterer -Date: Thu Sep 30 00:29:11 2010 +0200 +Date: Thu Sep 30 00:29:11 2010 +0200 app: restart the draw tool after moving a guide @@ -52246,7 +53103,7 @@ commit 9d36984d3737b275d5af9715b49a256df9e2ccfa Author: Michael Natterer -Date: Thu Sep 30 00:23:06 2010 +0200 +Date: Thu Sep 30 00:23:06 2010 +0200 app: remove the now obsolete gimp_display_shell_draw_guide() @@ -52254,12 +53111,12 @@ app/display/gimpdisplayshell-draw.c | 49 +++++++++++++++---------------------- - app/display/gimpdisplayshell-draw.h | 4 --- + app/display/gimpdisplayshell-draw.h | 4 --- 2 files changed, 20 insertions(+), 33 deletions(-) commit 89af8f414310f36cdd119a6cf9a09f4bf993e451 Author: Michael Natterer -Date: Thu Sep 30 00:18:00 2010 +0200 +Date: Thu Sep 30 00:18:00 2010 +0200 app: use a GimpCanvasGuide to display the hovered guide @@ -52271,7 +53128,7 @@ commit 5a4bcb8c3dc871ab041769d7bae9d3ef4ffc9fb2 Author: Michael Natterer -Date: Thu Sep 30 00:02:21 2010 +0200 +Date: Thu Sep 30 00:02:21 2010 +0200 app: use a temporary GimpCanvasGuide to draw guides guides @@ -52281,7 +53138,7 @@ commit 50755d81f35f2765241ba7f8b0de6a22c6b105e0 Author: Michael Natterer -Date: Thu Sep 30 00:01:31 2010 +0200 +Date: Thu Sep 30 00:01:31 2010 +0200 app: override GimpCanvasItem::stroke() and optionally stroke in guide style @@ -52292,7 +53149,7 @@ commit 238683e7d69042867db8ce3483b2925a5ef5b664 Author: Michael Natterer -Date: Wed Sep 29 23:46:36 2010 +0200 +Date: Wed Sep 29 23:46:36 2010 +0200 app: add gimp_canvas_item_get_highlight() @@ -52302,7 +53159,7 @@ commit 7b5316825c5b9fe3be4ff64ffa38d35b08d812f0 Author: Michael Natterer -Date: Wed Sep 29 23:40:45 2010 +0200 +Date: Wed Sep 29 23:40:45 2010 +0200 app: turn GimpCanvasItem's stroke() and fill() into virtual functions @@ -52313,7 +53170,7 @@ commit 1f8a835e400aae42298c5d36d78e30ac77aef2cd Author: Michael Natterer -Date: Wed Sep 29 23:23:14 2010 +0200 +Date: Wed Sep 29 23:23:14 2010 +0200 app: fix GimpCanvasBoundary's extents @@ -52322,7 +53179,7 @@ commit c83294f4ce19a3b377a61372b9bcccd272946197 Author: Mukund Sivaraman -Date: Thu Sep 30 01:56:02 2010 +0530 +Date: Thu Sep 30 01:56:02 2010 +0530 Minor coding style fix @@ -52331,7 +53188,7 @@ commit fe5b6eddc051c3ea394d00e7cc527757b9ec8336 Author: Michael Natterer -Date: Wed Sep 29 22:20:02 2010 +0200 +Date: Wed Sep 29 22:20:02 2010 +0200 app: indentation @@ -52340,7 +53197,7 @@ commit 7edfa2ca543739fb86c9e2e277470d8f3df5ee45 Author: Michael Natterer -Date: Wed Sep 29 22:12:01 2010 +0200 +Date: Wed Sep 29 22:12:01 2010 +0200 app: start an infrastructure where the shell keeps around its canvas items @@ -52349,21 +53206,21 @@ - Draw the kept canvas items instead of calling a draw tool function. - The draw tool now sets its item on the shell. - app/display/Makefile.am | 2 ++ + app/display/Makefile.am | 2 ++ app/display/gimpdisplayshell-callbacks.c | 15 +++------ - app/display/gimpdisplayshell-items.c | 55 + app/display/gimpdisplayshell-items.c | 55 ++++++++++++++++++++++++++++++++ - app/display/gimpdisplayshell-items.h | 31 ++++++++++++++++++ - app/display/gimpdisplayshell.c | 9 ++++++ - app/display/gimpdisplayshell.h | 2 ++ - app/tools/gimpdrawtool.c | 49 + app/display/gimpdisplayshell-items.h | 31 ++++++++++++++++++ + app/display/gimpdisplayshell.c | 9 ++++++ + app/display/gimpdisplayshell.h | 2 ++ + app/tools/gimpdrawtool.c | 49 ++++++++++------------------ - app/tools/gimpdrawtool.h | 3 -- + app/tools/gimpdrawtool.h | 3 -- 8 files changed, 119 insertions(+), 47 deletions(-) commit 81cfb4404730e3f0eb38ee2cb4628fa321644303 Author: Michael Natterer -Date: Wed Sep 29 21:14:51 2010 +0200 +Date: Wed Sep 29 21:14:51 2010 +0200 app: use a GimpColorPanel not a GimpColorButton in the text style editor @@ -52375,18 +53232,18 @@ commit 42e137fc74af8ad645702a4ed4a9a215679533f4 Author: Michael Natterer -Date: Wed Sep 29 20:58:13 2010 +0200 +Date: Wed Sep 29 20:58:13 2010 +0200 app: rename gimp_display_shell_draw_area() to draw_image() app/display/gimpdisplayshell-callbacks.c | 10 +++++----- - app/display/gimpdisplayshell-draw.c | 12 ++++++------ - app/display/gimpdisplayshell-draw.h | 2 +- + app/display/gimpdisplayshell-draw.c | 12 ++++++------ + app/display/gimpdisplayshell-draw.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) commit 2ef259cd2006a82d73487fcee37438fae570c955 Author: Sven Neumann -Date: Wed Sep 29 00:10:37 2010 +0200 +Date: Wed Sep 29 00:10:37 2010 +0200 app: use GimpRGB as mask color @@ -52397,17 +53254,17 @@ Adapt GimpForegroundSelectTool, the only user of the display mask feature, to this change. - app/display/gimpdisplayshell-render.c | 23 +++-------------------- - app/display/gimpdisplayshell.c | 12 ++++++------ - app/display/gimpdisplayshell.h | 4 ++-- + app/display/gimpdisplayshell-render.c | 23 +++-------------------- + app/display/gimpdisplayshell.c | 12 ++++++------ + app/display/gimpdisplayshell.h | 4 ++-- app/tools/gimpforegroundselectoptions.c | 28 ++++++++++++++++++++++++++++ app/tools/gimpforegroundselectoptions.h | 7 +++++-- - app/tools/gimpforegroundselecttool.c | 28 +++++++++++++++++++++------- + app/tools/gimpforegroundselecttool.c | 28 +++++++++++++++++++++------- 6 files changed, 65 insertions(+), 37 deletions(-) commit a7413bd784335f474f28cfc962d0d67517089102 Author: Sven Neumann -Date: Tue Sep 28 23:49:22 2010 +0200 +Date: Tue Sep 28 23:49:22 2010 +0200 app/display: implement drawing of selection mask @@ -52423,7 +53280,7 @@ commit 1eb77f6360580f41b5a9a64456d0dafec85d7b16 Author: Sven Neumann -Date: Tue Sep 28 23:02:23 2010 +0200 +Date: Tue Sep 28 23:02:23 2010 +0200 app/display: refactor RenderInfo code @@ -52433,7 +53290,7 @@ commit 375567df6fd4b28f55efab67e8fe866413245af1 Author: Sven Neumann -Date: Tue Sep 28 22:46:21 2010 +0200 +Date: Tue Sep 28 22:46:21 2010 +0200 app/display: sprinkle render code with const qualifiers @@ -52442,7 +53299,7 @@ commit b3182be59cc578e5dd98efb6fc6473e9e334eb73 Author: Sven Neumann -Date: Tue Sep 28 22:39:50 2010 +0200 +Date: Tue Sep 28 22:39:50 2010 +0200 app/display: remove obsolete includes @@ -52451,7 +53308,7 @@ commit 260c8560e40626dd5964219b9c3ddbf774743a7f Author: Sven Neumann -Date: Tue Sep 28 22:26:05 2010 +0200 +Date: Tue Sep 28 22:26:05 2010 +0200 app: remove gimp_display_shell_render_{init,exit} @@ -52461,12 +53318,12 @@ app/display/gimpdisplayshell-render.c | 42 +++++++++-------------------------- app/display/gimpdisplayshell-render.h | 15 +++++-------- - app/gui/gui.c | 3 --- + app/gui/gui.c | 3 --- 3 files changed, 16 insertions(+), 44 deletions(-) commit d5d5f4fb3fb9481e437c401e225612f98920fae6 Author: Sven Neumann -Date: Tue Sep 28 22:13:32 2010 +0200 +Date: Tue Sep 28 22:13:32 2010 +0200 app/display: adjust a comment to reflect the current state of the code @@ -52475,7 +53332,7 @@ commit dd1e858921db451e13658f91349d78c6eda2abdf Author: Sven Neumann -Date: Tue Sep 28 22:10:33 2010 +0200 +Date: Tue Sep 28 22:10:33 2010 +0200 app/display: introduce a style for dimming @@ -52486,7 +53343,7 @@ commit eb5bb6363e4a01383d6b9707fe2856a8112f475e Author: Sven Neumann -Date: Tue Sep 28 22:04:07 2010 +0200 +Date: Tue Sep 28 22:04:07 2010 +0200 app/display: draw the crop highlight using cairo @@ -52494,16 +53351,16 @@ the area outside the highlight rectangle. app/display/gimpdisplayshell-callbacks.c | 14 +++- - app/display/gimpdisplayshell-draw.c | 45 +++++++++---- - app/display/gimpdisplayshell-draw.h | 6 ++ - app/display/gimpdisplayshell-render.c | 111 + app/display/gimpdisplayshell-draw.c | 45 +++++++++---- + app/display/gimpdisplayshell-draw.h | 6 ++ + app/display/gimpdisplayshell-render.c | 111 ++++--------------------------- - app/display/gimpdisplayshell-render.h | 19 +++--- + app/display/gimpdisplayshell-render.h | 19 +++--- 5 files changed, 71 insertions(+), 124 deletions(-) commit ccee0ec41a37727115e73d919e0c2a34ffae8f20 Author: Sven Neumann -Date: Tue Sep 28 21:10:03 2010 +0200 +Date: Tue Sep 28 21:10:03 2010 +0200 app/display: let cairo render the checkerboard @@ -52513,29 +53370,29 @@ and the image on top of it. app/display/gimpdisplayshell-callbacks.c | 8 ++ - app/display/gimpdisplayshell-draw.c | 46 ++++++++++++ - app/display/gimpdisplayshell-draw.h | 6 ++ + app/display/gimpdisplayshell-draw.c | 46 ++++++++++++ + app/display/gimpdisplayshell-draw.h | 6 ++ app/display/gimpdisplayshell-handlers.c | 6 ++ - app/display/gimpdisplayshell-render.c | 123 + app/display/gimpdisplayshell-render.c | 123 +++++-------------------------- - app/display/gimpdisplayshell.c | 8 +- - app/display/gimpdisplayshell.h | 1 + + app/display/gimpdisplayshell.c | 8 +- + app/display/gimpdisplayshell.h | 1 + 7 files changed, 91 insertions(+), 107 deletions(-) commit ebeb9333506c987e10ec512b7fa92b5f79ccf853 Author: Michael Natterer -Date: Wed Sep 29 20:10:21 2010 +0200 +Date: Wed Sep 29 20:10:21 2010 +0200 app: add gimp_display_shell_expose_item() and use it in the draw tool app/display/gimpdisplayshell-expose.c | 22 ++++++++++++++++++++++ app/display/gimpdisplayshell-expose.h | 2 ++ - app/tools/gimpdrawtool.c | 13 +++---------- + app/tools/gimpdrawtool.c | 13 +++---------- 3 files changed, 27 insertions(+), 10 deletions(-) commit 7367ec1b7cb211945597cf428f50d78e225062e5 Author: Michael Natterer -Date: Wed Sep 29 19:58:59 2010 +0200 +Date: Wed Sep 29 19:58:59 2010 +0200 app: fix the extents of filled rectangles and invalidate less pixels @@ -52548,7 +53405,7 @@ commit ea2c1994f4ce634b949630889b978fbe32117acb Author: A S Alam -Date: Wed Sep 29 22:57:38 2010 +0530 +Date: Wed Sep 29 22:57:38 2010 +0530 update for Punjabi @@ -52558,7 +53415,7 @@ commit 5dfb2782dd4fae09c0aa94e73540a922a6254984 Author: Mukund Sivaraman -Date: Wed Sep 29 00:39:23 2010 +0530 +Date: Wed Sep 29 00:39:23 2010 +0530 Use libapp_generated_sources in Makefile.am @@ -52567,7 +53424,7 @@ commit 6b1aabfa71df1257c0269d528221d04ff188a02e Author: Nils Philippsen -Date: Tue Sep 28 18:17:45 2010 +0200 +Date: Tue Sep 28 18:17:45 2010 +0200 add git-version.h to BUILT_SOURCES @@ -52578,7 +53435,7 @@ commit 0c0470f9d6fc6d5ae39f50cf956f5b35246f20a9 Author: Nils Philippsen -Date: Tue Sep 28 17:56:16 2010 +0200 +Date: Tue Sep 28 17:56:16 2010 +0200 use computed copyright year in Windows rc files @@ -52588,169 +53445,169 @@ commit f507a6aad182fd2f7fa593bb67d219878e092a7b Author: Nils Philippsen -Date: Tue Sep 28 17:11:56 2010 +0200 +Date: Tue Sep 28 17:11:56 2010 +0200 update copyright years translations where possible - po/ar.po | 4 ++-- - po/ast.po | 4 ++-- - po/az.po | 4 ++-- - po/be.po | 4 ++-- - po/bg.po | 4 ++-- - po/br.po | 4 ++-- - po/ca.po | 4 ++-- + po/ar.po | 4 ++-- + po/ast.po | 4 ++-- + po/az.po | 4 ++-- + po/be.po | 4 ++-- + po/bg.po | 4 ++-- + po/br.po | 4 ++-- + po/ca.po | 4 ++-- po/ca@valencia.po | 4 ++-- - po/cs.po | 4 ++-- - po/da.po | 4 ++-- - po/de.po | 4 ++-- - po/dz.po | 2 +- - po/el.po | 4 ++-- - po/en_CA.po | 4 ++-- - po/en_GB.po | 4 ++-- - po/eo.po | 4 ++-- - po/es.po | 4 ++-- - po/et.po | 4 ++-- - po/eu.po | 4 ++-- - po/fa.po | 4 ++-- - po/fi.po | 4 ++-- - po/fr.po | 4 ++-- - po/gl.po | 4 ++-- - po/gu.po | 2 +- - po/he.po | 4 ++-- - po/hr.po | 4 ++-- - po/hu.po | 4 ++-- - po/id.po | 2 +- - po/it.po | 4 ++-- - po/ja.po | 4 ++-- - po/kn.po | 2 +- - po/ko.po | 4 ++-- - po/lt.po | 4 ++-- - po/lv.po | 4 ++-- - po/mk.po | 4 ++-- - po/ms.po | 2 +- - po/my.po | 2 +- - po/nb.po | 4 ++-- - po/nl.po | 4 ++-- - po/nn.po | 2 -- - po/pa.po | 4 ++-- - po/pl.po | 4 ++-- - po/pt.po | 4 ++-- - po/pt_BR.po | 4 ++-- - po/ro.po | 4 ++-- - po/ru.po | 4 ++-- - po/rw.po | 4 ++-- - po/sk.po | 2 +- - po/sl.po | 4 ++-- - po/sr.po | 2 +- + po/cs.po | 4 ++-- + po/da.po | 4 ++-- + po/de.po | 4 ++-- + po/dz.po | 2 +- + po/el.po | 4 ++-- + po/en_CA.po | 4 ++-- + po/en_GB.po | 4 ++-- + po/eo.po | 4 ++-- + po/es.po | 4 ++-- + po/et.po | 4 ++-- + po/eu.po | 4 ++-- + po/fa.po | 4 ++-- + po/fi.po | 4 ++-- + po/fr.po | 4 ++-- + po/gl.po | 4 ++-- + po/gu.po | 2 +- + po/he.po | 4 ++-- + po/hr.po | 4 ++-- + po/hu.po | 4 ++-- + po/id.po | 2 +- + po/it.po | 4 ++-- + po/ja.po | 4 ++-- + po/kn.po | 2 +- + po/ko.po | 4 ++-- + po/lt.po | 4 ++-- + po/lv.po | 4 ++-- + po/mk.po | 4 ++-- + po/ms.po | 2 +- + po/my.po | 2 +- + po/nb.po | 4 ++-- + po/nl.po | 4 ++-- + po/nn.po | 2 -- + po/pa.po | 4 ++-- + po/pl.po | 4 ++-- + po/pt.po | 4 ++-- + po/pt_BR.po | 4 ++-- + po/ro.po | 4 ++-- + po/ru.po | 4 ++-- + po/rw.po | 4 ++-- + po/sk.po | 2 +- + po/sl.po | 4 ++-- + po/sr.po | 2 +- po/sr@latin.po | 2 +- - po/sv.po | 4 ++-- - po/ta.po | 4 ++-- - po/th.po | 2 +- - po/tr.po | 2 +- - po/uk.po | 4 ++-- - po/vi.po | 4 ++-- - po/xh.po | 2 +- - po/zh_CN.po | 4 ++-- - po/zh_HK.po | 4 ++-- - po/zh_TW.po | 4 ++-- + po/sv.po | 4 ++-- + po/ta.po | 4 ++-- + po/th.po | 2 +- + po/tr.po | 2 +- + po/uk.po | 4 ++-- + po/vi.po | 4 ++-- + po/xh.po | 2 +- + po/zh_CN.po | 4 ++-- + po/zh_HK.po | 4 ++-- + po/zh_TW.po | 4 ++-- 61 files changed, 108 insertions(+), 110 deletions(-) commit 0e57af80f4c67fce5697eb82d43b8f8c12ccd8f7 Author: Nils Philippsen -Date: Tue Sep 28 16:15:28 2010 +0200 +Date: Tue Sep 28 16:15:28 2010 +0200 make update-po - po/am.po | 18207 ++++++++++++++++++++++-------- - po/ar.po | 1297 +-- - po/ast.po | 2243 ++-- - po/az.po | 22388 ++++++++++++++++++++++++++++--------- - po/be.po | 7335 +++++++----- - po/bg.po | 12414 ++++++++++++++------- - po/br.po | 2854 +++-- - po/ca.po | 6699 ++++++----- + po/am.po | 18207 ++++++++++++++++++++++-------- + po/ar.po | 1297 +-- + po/ast.po | 2243 ++-- + po/az.po | 22388 ++++++++++++++++++++++++++++--------- + po/be.po | 7335 +++++++----- + po/bg.po | 12414 ++++++++++++++------- + po/br.po | 2854 +++-- + po/ca.po | 6699 ++++++----- po/ca@valencia.po | 12128 +++++++++++++------- - po/cs.po | 5494 +++++---- - po/da.po | 5688 ++++++---- - po/de.po | 2906 +++-- - po/dz.po | 14330 ++++++++++++++++-------- - po/el.po | 6506 ++++++----- - po/en_CA.po | 12495 ++++++++++++++------- - po/en_GB.po | 11000 ++++++++++++------ - po/eo.po | 13030 +++++++++++++++------- - po/es.po | 861 +- - po/et.po | 5870 +++++++++- - po/eu.po | 3049 +++-- - po/fa.po | 12519 ++++++++++++++------- - po/fi.po | 10955 ++++++++++++------ - po/fr.po | 4327 +++++--- - po/ga.po | 17604 +++++++++++++++++++---------- - po/gl.po | 10984 ++++++++++++------ - po/gu.po | 15870 ++++++++++++++++++-------- - po/he.po | 1692 +-- - po/hi.po | 13736 +++++++++++++++-------- - po/hr.po | 18634 +++++++++++++++++++++---------- - po/hu.po | 11170 +++++++++++++------ - po/id.po | 18301 +++++++++++++++++++----------- - po/is.po | 10665 ++++++++++++------ - po/it.po | 1513 +-- - po/ja.po | 7900 ++++++++----- - po/ka.po | 17762 +++++++++++++++++++++++++---- - po/km.po | 12634 ++++++++++++++------- - po/kn.po | 11193 ++++++++++++------- - po/ko.po | 12076 +++++++++++++------- - po/lt.po | 11174 +++++++++++++------ - po/lv.po | 11142 +++++++++++++------ - po/mk.po | 11009 ++++++++++++------ - po/ml.po | 17018 +++++++++++++++++++--------- - po/ms.po | 18873 +++++++++++++++++++++---------- - po/my.po | 3453 +++--- - po/nb.po | 546 +- - po/nds.po | 4091 ++++--- - po/ne.po | 12590 ++++++++++++++------- - po/nl.po | 12513 ++++++++++++++------- - po/nn.po | 12286 +++++++++++++------- - po/oc.po | 10734 ++++++++++++------ - po/pa.po | 11047 ++++++++++++------ - po/pl.po | 12478 ++++++++++++++------- - po/pt.po | 31398 + po/cs.po | 5494 +++++---- + po/da.po | 5688 ++++++---- + po/de.po | 2906 +++-- + po/dz.po | 14330 ++++++++++++++++-------- + po/el.po | 6506 ++++++----- + po/en_CA.po | 12495 ++++++++++++++------- + po/en_GB.po | 11000 ++++++++++++------ + po/eo.po | 13030 +++++++++++++++------- + po/es.po | 861 +- + po/et.po | 5870 +++++++++- + po/eu.po | 3049 +++-- + po/fa.po | 12519 ++++++++++++++------- + po/fi.po | 10955 ++++++++++++------ + po/fr.po | 4327 +++++--- + po/ga.po | 17604 +++++++++++++++++++---------- + po/gl.po | 10984 ++++++++++++------ + po/gu.po | 15870 ++++++++++++++++++-------- + po/he.po | 1692 +-- + po/hi.po | 13736 +++++++++++++++-------- + po/hr.po | 18634 +++++++++++++++++++++---------- + po/hu.po | 11170 +++++++++++++------ + po/id.po | 18301 +++++++++++++++++++----------- + po/is.po | 10665 ++++++++++++------ + po/it.po | 1513 +-- + po/ja.po | 7900 ++++++++----- + po/ka.po | 17762 +++++++++++++++++++++++++---- + po/km.po | 12634 ++++++++++++++------- + po/kn.po | 11193 ++++++++++++------- + po/ko.po | 12076 +++++++++++++------- + po/lt.po | 11174 +++++++++++++------ + po/lv.po | 11142 +++++++++++++------ + po/mk.po | 11009 ++++++++++++------ + po/ml.po | 17018 +++++++++++++++++++--------- + po/ms.po | 18873 +++++++++++++++++++++---------- + po/my.po | 3453 +++--- + po/nb.po | 546 +- + po/nds.po | 4091 ++++--- + po/ne.po | 12590 ++++++++++++++------- + po/nl.po | 12513 ++++++++++++++------- + po/nn.po | 12286 +++++++++++++------- + po/oc.po | 10734 ++++++++++++------ + po/pa.po | 11047 ++++++++++++------ + po/pl.po | 12478 ++++++++++++++------- + po/pt.po | 31398 +++++++++++++++++++++++++++++----------------------- - po/pt_BR.po | 6695 ++++++----- - po/ro.po | 1125 +- - po/ru.po | 237 +- - po/rw.po | 17472 ++++++++++++++++++++--------- - po/si.po | 6848 +++++++----- - po/sk.po | 17778 ++++++++++++++++++++--------- - po/sl.po | 2285 ++-- - po/sr.po | 2858 +++-- + po/pt_BR.po | 6695 ++++++----- + po/ro.po | 1125 +- + po/ru.po | 237 +- + po/rw.po | 17472 ++++++++++++++++++++--------- + po/si.po | 6848 +++++++----- + po/sk.po | 17778 ++++++++++++++++++++--------- + po/sl.po | 2285 ++-- + po/sr.po | 2858 +++-- po/sr@latin.po | 3000 +++-- - po/sv.po | 7301 ++++++++---- - po/ta.po | 1222 +- - po/th.po | 2919 +++-- - po/tr.po | 17136 +++++++++++++++++++--------- - po/tt.po | 14210 +++++++++++++++++------- - po/uk.po | 2862 +++-- - po/vi.po | 14790 +++++++++++++++++-------- - po/xh.po | 18277 +++++++++++++++++++++--------- - po/yi.po | 15158 +++++++++++++++++-------- - po/zh_CN.po | 2231 ++-- - po/zh_HK.po | 11127 +++++++++++++------ - po/zh_TW.po | 11127 +++++++++++++------ + po/sv.po | 7301 ++++++++---- + po/ta.po | 1222 +- + po/th.po | 2919 +++-- + po/tr.po | 17136 +++++++++++++++++++--------- + po/tt.po | 14210 +++++++++++++++++------- + po/uk.po | 2862 +++-- + po/vi.po | 14790 +++++++++++++++++-------- + po/xh.po | 18277 +++++++++++++++++++++--------- + po/yi.po | 15158 +++++++++++++++++-------- + po/zh_CN.po | 2231 ++-- + po/zh_HK.po | 11127 +++++++++++++------ + po/zh_TW.po | 11127 +++++++++++++------ 74 files changed, 498387 insertions(+), 234952 deletions(-) commit c9b03ef8ffa90ffe742ecbd28d88b81150db3151 Author: Nils Philippsen -Date: Tue Sep 28 14:23:41 2010 +0200 +Date: Tue Sep 28 14:23:41 2010 +0200 app: use last git commit year for copyright label - app/about.h | 3 ++- + app/about.h | 3 ++- app/dialogs/about-dialog.c | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) commit 37d98767423151430e42e88e33c7e7c7156c8b1d Author: Nils Philippsen -Date: Fri Sep 17 11:52:45 2010 +0200 +Date: Fri Sep 17 11:52:45 2010 +0200 app: define GIMP_GIT_LAST_COMMIT_{TIMESTAMP,YEAR} macros @@ -52759,20 +53616,20 @@ commit eed3b054bce8e95451bdf0ef30feafbc86fb1ead Author: Alexandre Prokoudine -Date: Tue Sep 28 09:10:07 2010 +0400 +Date: Tue Sep 28 09:10:07 2010 +0400 Porting to new API: add-[layer|channel] > insert-[layer|channel] and more plug-ins/script-fu/scripts/3dTruchet.scm | 10 +++++----- - plug-ins/script-fu/scripts/camo.scm | 6 +++--- + plug-ins/script-fu/scripts/camo.scm | 6 +++--- plug-ins/script-fu/scripts/carve-it.scm | 22 +++++++++++----------- plug-ins/script-fu/scripts/chrome-it.scm | 18 +++++++++--------- 4 files changed, 28 insertions(+), 28 deletions(-) commit 9f2f17851c53f9317dce4d92f60c75647ee05439 Author: Alexandre Prokoudine -Date: Tue Sep 28 03:44:30 2010 +0400 +Date: Tue Sep 28 03:44:30 2010 +0400 Porting to new API: add-[layer|channel] > insert-[layer|channel] @@ -52781,7 +53638,7 @@ commit b02ba67199ffc8861db38bf7df67c1971853fcdd Author: Alexandre Prokoudine -Date: Tue Sep 28 03:29:03 2010 +0400 +Date: Tue Sep 28 03:29:03 2010 +0400 Porting to new API: add-[layer|channel] > -insert-[layer|channel] @@ -52790,7 +53647,7 @@ commit ac5e9f93d7a5c068752676b390c8996c0a363dd2 Author: Alexandre Prokoudine -Date: Tue Sep 28 02:47:07 2010 +0400 +Date: Tue Sep 28 02:47:07 2010 +0400 Updated Russian translation @@ -52800,7 +53657,7 @@ commit e869e83f56f84c67fb9c52aa929a6983bb18b48d Author: Michael Natterer -Date: Mon Sep 27 23:04:18 2010 +0200 +Date: Mon Sep 27 23:04:18 2010 +0200 app: add the text tool's selection rectangles to a filling group @@ -52811,7 +53668,7 @@ commit d7cb20b0d5083d86bfe5e95957f2e7ad63839c67 Author: Michael Natterer -Date: Mon Sep 27 22:59:36 2010 +0200 +Date: Mon Sep 27 22:59:36 2010 +0200 app: add group filling support to GimpCanvasItem and GimpCanvasGroup @@ -52826,7 +53683,7 @@ commit b63e26e45d254e6db668c948612b49af9fabc64f Author: Michael Natterer -Date: Mon Sep 27 21:32:18 2010 +0200 +Date: Mon Sep 27 21:32:18 2010 +0200 configure.ac: fix previous commit @@ -52835,7 +53692,7 @@ commit 673064d7c91d86f8f95e23c262db0c5db292c815 Author: Michael Natterer -Date: Mon Sep 27 20:10:59 2010 +0200 +Date: Mon Sep 27 20:10:59 2010 +0200 app: disable deprecated GTK+ API until version 2.22 @@ -52846,7 +53703,7 @@ commit 3f2641c4be609d17222bd6eef8b651663c6e9bad Author: Michael Natterer -Date: Mon Sep 27 19:31:21 2010 +0200 +Date: Mon Sep 27 19:31:21 2010 +0200 app: put the bounding box lines into a stroking group @@ -52856,7 +53713,7 @@ commit 50a34c230a86e2ddbea5e769bb8a80c480b1fe76 Author: Ville Pätsi -Date: Mon Sep 27 20:02:13 2010 +0300 +Date: Mon Sep 27 20:02:13 2010 +0300 app: Changed tool display colors and opacities @@ -52865,7 +53722,7 @@ commit ee7a922cbafe0050e3964a40977ef9170a269fea Author: Tor Lillqvist -Date: Mon Sep 27 13:22:54 2010 +0300 +Date: Mon Sep 27 13:22:54 2010 +0300 No SYMPREFIX should be used for 64-bit Windows @@ -52877,20 +53734,20 @@ commit 8d93dfa92382328b8cc640133d4bf17355674911 Author: Sven Neumann -Date: Sun Sep 26 23:14:25 2010 +0200 +Date: Sun Sep 26 23:14:25 2010 +0200 app: remove xor-color property from gimprc app/config/gimpdisplayconfig.c | 35 ++++++++++++++++++----------------- app/config/gimpdisplayconfig.h | 1 - - app/config/gimprc-blurbs.h | 5 ----- - docs/gimprc.5.in | 9 --------- - etc/gimprc | 8 -------- + app/config/gimprc-blurbs.h | 5 ----- + docs/gimprc.5.in | 9 --------- + etc/gimprc | 8 -------- 5 files changed, 18 insertions(+), 40 deletions(-) commit 7db14ffca9f38adbe0d57b225d679a4befdd1805 Author: Michael Natterer -Date: Sun Sep 26 23:09:23 2010 +0200 +Date: Sun Sep 26 23:09:23 2010 +0200 app: remove gimp_display_shell_transform_coords() @@ -52901,7 +53758,7 @@ commit 3b7999a2183e5a03a0d64e88f589b6d9a48e2b81 Author: Michael Natterer -Date: Sun Sep 26 23:06:07 2010 +0200 +Date: Sun Sep 26 23:06:07 2010 +0200 app: remove gimp_display_shell_transform_points() @@ -52912,7 +53769,7 @@ commit 74885082ee44a6a2d9ccd24c552ef8bba48b0efe Author: Sven Neumann -Date: Sun Sep 26 23:02:38 2010 +0200 +Date: Sun Sep 26 23:02:38 2010 +0200 app/base: formatting @@ -52921,19 +53778,19 @@ commit 7ed79e9fe18248ecf3994d13df1eb0afe24b93e6 Author: Michael Natterer -Date: Sun Sep 26 23:00:23 2010 +0200 +Date: Sun Sep 26 23:00:23 2010 +0200 app: fix off-by-0.5 in boundary drawing which doesn't seem to have any visual effect... app/display/gimpdisplayshell-style.c | 1 + - app/widgets/gimpcairo.c | 4 ++-- + app/widgets/gimpcairo.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) commit 1a5bacf649a032b98ec1172533bfdef4918ed8a4 Author: Alexia Death -Date: Sun Sep 26 23:57:45 2010 +0300 +Date: Sun Sep 26 23:57:45 2010 +0300 Fix cage tool to work with the draw tool in master @@ -52942,7 +53799,7 @@ commit 06da10bc082eb2f76bcce27a2180b66ef20c09af Author: Michael Natterer -Date: Sun Sep 26 22:41:04 2010 +0200 +Date: Sun Sep 26 22:41:04 2010 +0200 app: change boundary drawing by tools to work like the selection @@ -52956,60 +53813,60 @@ so it can transform things that are not in the image's coordinate system. - app/base/boundary.c | 29 ++------- - app/display/gimpcanvasboundary.c | 107 + app/base/boundary.c | 29 ++------- + app/display/gimpcanvasboundary.c | 107 ++++++++++++------------------- app/display/gimpdisplayshell-selection.c | 3 +- app/display/gimpdisplayshell-transform.c | 33 +++++----- app/display/gimpdisplayshell-transform.h | 4 +- - app/paint/gimpbrushcore.c | 21 ++---- - app/tools/gimpeditselectiontool.c | 11 ++-- - app/tools/gimpregionselecttool.c | 10 +-- - app/tools/gimptransformtool.c | 64 +++++++----------- + app/paint/gimpbrushcore.c | 21 ++---- + app/tools/gimpeditselectiontool.c | 11 ++-- + app/tools/gimpregionselecttool.c | 10 +-- + app/tools/gimptransformtool.c | 64 +++++++----------- 9 files changed, 101 insertions(+), 181 deletions(-) commit 8f9ec0650ffcb025e10eb28f74e9242082921565 Author: Michael Natterer -Date: Sun Sep 26 22:38:01 2010 +0200 +Date: Sun Sep 26 22:38:01 2010 +0200 app: move code from GtkObject::destroy() to GObject::dispose() app/widgets/gimpbrushfactoryview.c | 10 ++--- app/widgets/gimpcolordisplayeditor.c | 10 ++--- - app/widgets/gimpcoloreditor.c | 33 +++++++-------- + app/widgets/gimpcoloreditor.c | 33 +++++++-------- app/widgets/gimpcolormapeditor.c | 28 ++++++------- - app/widgets/gimpcolorpanel.c | 13 +++--- - app/widgets/gimpmessagebox.c | 71 + app/widgets/gimpcolorpanel.c | 13 +++--- + app/widgets/gimpmessagebox.c | 71 +++++++++++++++----------------- app/widgets/gimpoverlaydialog.c | 14 +++---- app/widgets/gimppaletteeditor.c | 16 ++++---- - app/widgets/gimppdbdialog.c | 80 + app/widgets/gimppdbdialog.c | 80 +++++++++++++++--------------------- - app/widgets/gimpprogressbox.c | 10 ++--- - app/widgets/gimpsizebox.c | 37 ++++++++--------- - app/widgets/gimpthumbbox.c | 21 ++-------- - app/widgets/gimptooleditor.c | 59 +++++++++++++------------- + app/widgets/gimpprogressbox.c | 10 ++--- + app/widgets/gimpsizebox.c | 37 ++++++++--------- + app/widgets/gimpthumbbox.c | 21 ++-------- + app/widgets/gimptooleditor.c | 59 +++++++++++++------------- app/widgets/gimptooloptionseditor.c | 67 +++++++++++++++--------------- - app/widgets/gimpview.c | 11 ++--- + app/widgets/gimpview.c | 11 ++--- app/widgets/gimpviewabledialog.c | 31 +++++++------- 16 files changed, 236 insertions(+), 275 deletions(-) commit 0e17e44ba4d9c61dd7774bb2d8043100cedfd6f3 Author: Michael Natterer -Date: Sun Sep 26 22:35:49 2010 +0200 +Date: Sun Sep 26 22:35:49 2010 +0200 app: move code from GtkObject::destroy() to GObject::dispose() app/display/gimpdisplayshell.c | 183 ++++++++++++++++++------------------- - app/display/gimpimagewindow.c | 40 +++----- + app/display/gimpimagewindow.c | 40 +++----- app/display/gimpnavigationeditor.c | 10 +- - app/display/gimpstatusbar.c | 39 ++++---- + app/display/gimpstatusbar.c | 39 ++++---- 4 files changed, 127 insertions(+), 145 deletions(-) commit 4492725110d24f9edf6a4ee012ad5eecd715c043 Author: Michael Natterer -Date: Sun Sep 26 22:26:57 2010 +0200 +Date: Sun Sep 26 22:26:57 2010 +0200 app: add some (disabled) code that draws the untransformed brush outline @@ -53019,7 +53876,7 @@ commit 1d17042efb01eea1b4fa758ccd005d06d0f36363 Author: Sven Neumann -Date: Sun Sep 26 22:25:49 2010 +0200 +Date: Sun Sep 26 22:25:49 2010 +0200 app/display: don't evaluate alpha value several times @@ -53032,7 +53889,7 @@ commit 2f3c6af28bb8ce551600ae65d3bc3508549b2bab Author: Sven Neumann -Date: Sun Sep 26 22:15:07 2010 +0200 +Date: Sun Sep 26 22:15:07 2010 +0200 app/display: fix cairo drawing of transform tool image preview @@ -53046,7 +53903,7 @@ commit 8f9ffe597d39898c82061b9edd5d4ac313a9a417 Author: Sven Neumann -Date: Sun Sep 26 22:12:13 2010 +0200 +Date: Sun Sep 26 22:12:13 2010 +0200 libgimpwidgets: add const qualifiers @@ -53056,15 +53913,15 @@ 1 file changed, 6 insertions(+), 6 deletions(-) commit 74e5864fa6e86844116504b5bc0e6170154a2503 -Merge: e133035 c3102bd +Merge: e133035440 c3102bde81 Author: Alexia Death -Date: Sun Sep 26 23:08:15 2010 +0300 +Date: Sun Sep 26 23:08:15 2010 +0300 Merge branch 'master' into soc-2010-cage-2 commit c3102bde81186f2dfa6b6fc36513ae5358a4a6fe Author: Michael Natterer -Date: Sun Sep 26 19:20:14 2010 +0200 +Date: Sun Sep 26 19:20:14 2010 +0200 app: move the GimpCanvasGroup typedef to display-types.h @@ -53074,7 +53931,7 @@ commit ffd57307c8096b11dc22f39b785c436228fb1101 Author: Michael Natterer -Date: Sun Sep 26 18:44:40 2010 +0200 +Date: Sun Sep 26 18:44:40 2010 +0200 app: put the transform tool's grid and boundary into a stroke group @@ -53084,7 +53941,7 @@ commit b0a22bc28573e9aafde33a80c3337c6677fa4271 Author: Michael Natterer -Date: Sun Sep 26 17:40:10 2010 +0200 +Date: Sun Sep 26 17:40:10 2010 +0200 app: change the default item line cap to round @@ -53092,15 +53949,15 @@ are always axis-aligned. app/display/gimpcanvashandle.c | 3 + - app/display/gimpcanvasitem.c | 117 + app/display/gimpcanvasitem.c | 117 ++++++++++++++++++++++++++++++++--- - app/display/gimpcanvasitem.h | 2 + + app/display/gimpcanvasitem.h | 2 + app/display/gimpdisplayshell-style.c | 2 - 4 files changed, 113 insertions(+), 11 deletions(-) commit 6ec1729035c24256f32ff286273800d23c511fcf Author: Michael Natterer -Date: Sun Sep 26 17:13:53 2010 +0200 +Date: Sun Sep 26 17:13:53 2010 +0200 app: add the handle that is being dragged to the stroke group too @@ -53110,7 +53967,7 @@ commit f284e5f748267907d53c8157cf7d37109224f793 Author: Michael Natterer -Date: Sun Sep 26 16:56:26 2010 +0200 +Date: Sun Sep 26 16:56:26 2010 +0200 app: don't draw the draw tool's items to the wrong display @@ -53119,7 +53976,7 @@ commit 9cce1b894b52348d6923388809089c75bbe160e4 Author: Michael Natterer -Date: Sun Sep 26 16:17:05 2010 +0200 +Date: Sun Sep 26 16:17:05 2010 +0200 app: put a lot of rectangle tool lines into a stroke groups @@ -53131,7 +53988,7 @@ commit e0f35d89792d720a59d4eaee522f676a37e058ec Author: Michael Natterer -Date: Sun Sep 26 15:49:10 2010 +0200 +Date: Sun Sep 26 15:49:10 2010 +0200 app: put the lines and the angle arc into a stroke group @@ -53144,7 +54001,7 @@ commit a306a46d450f93b55cc4c2df6f7418e2198584f4 Author: Michael Natterer -Date: Sun Sep 26 15:43:59 2010 +0200 +Date: Sun Sep 26 15:43:59 2010 +0200 app: make the code that puts the lines into a stroke group nicer @@ -53156,7 +54013,7 @@ commit 4b89850a2e1f8edba34e9873d7bfe8854f39e67a Author: Michael Natterer -Date: Sun Sep 26 14:17:04 2010 +0200 +Date: Sun Sep 26 14:17:04 2010 +0200 app: draw the free select tool's line in one stroke() @@ -53169,7 +54026,7 @@ commit b173707c846fe64fade70ce5ed3bde4fcbcc050e Author: Michael Natterer -Date: Sun Sep 26 14:15:47 2010 +0200 +Date: Sun Sep 26 14:15:47 2010 +0200 app: add gimp_draw_tool_remove_item() @@ -53179,7 +54036,7 @@ commit e6ce564de45a8fbc14a384412da10df186a4516f Author: Michael Natterer -Date: Sun Sep 26 14:12:54 2010 +0200 +Date: Sun Sep 26 14:12:54 2010 +0200 app: add an infrastructure that allows to stroke multiple items at once @@ -53203,7 +54060,7 @@ commit ea5190e630adfc1940074b0509a840b0d230f71e Author: Martin Nordholts -Date: Sun Sep 26 12:46:26 2010 +0200 +Date: Sun Sep 26 12:46:26 2010 +0200 app/tests: Fix gimp_display_shell_transform_xy() build @@ -53212,7 +54069,7 @@ commit 27d3070a73ecd67d4127fcb5d18eeacba1caf384 Author: Martin Nordholts -Date: Mon Sep 20 21:36:43 2010 +0200 +Date: Mon Sep 20 21:36:43 2010 +0200 build: Cleanup in buildbot/suppressed-warnings.txt @@ -53221,7 +54078,7 @@ commit 970a062b01921cbc408a29e65b3437419af0bcb5 Author: Michael Natterer -Date: Sun Sep 26 00:30:09 2010 +0200 +Date: Sun Sep 26 00:30:09 2010 +0200 app: argh! never add even only one line of code without testing... @@ -53230,7 +54087,7 @@ commit 3d26ad805cb8f8d2060b79ba26106fa651959a9e Author: Martin Srebotnjak -Date: Sat Sep 25 20:35:37 2010 +0200 +Date: Sat Sep 25 20:35:37 2010 +0200 Updated Slovenian translation @@ -53240,7 +54097,7 @@ commit ce2d110d2897752ad442da49f0b783706299f472 Author: Martin Srebotnjak -Date: Sat Sep 25 20:10:17 2010 +0200 +Date: Sat Sep 25 20:10:17 2010 +0200 Updated Slovenian translation @@ -53250,41 +54107,41 @@ commit b3af235e79bc61c4225649856f1d6011e46d7a10 Author: Michael Natterer -Date: Sat Sep 25 19:02:22 2010 +0200 +Date: Sat Sep 25 19:02:22 2010 +0200 app: rename all gimp_draw_tool_draw_foo() functions to gimp_draw_tool_add_foo() because that's what they do now. - app/tools/gimpaligntool.c | 51 ++++--- - app/tools/gimpblendtool.c | 38 ++--- - app/tools/gimpbrushtool.c | 14 +- - app/tools/gimpcolortool.c | 28 ++-- - app/tools/gimpdrawtool.c | 141 +++++++++--------- - app/tools/gimpdrawtool.h | 22 +-- + app/tools/gimpaligntool.c | 51 ++++--- + app/tools/gimpblendtool.c | 38 ++--- + app/tools/gimpbrushtool.c | 14 +- + app/tools/gimpcolortool.c | 28 ++-- + app/tools/gimpdrawtool.c | 141 +++++++++--------- + app/tools/gimpdrawtool.h | 22 +-- app/tools/gimpeditselectiontool.c | 80 +++++------ app/tools/gimpellipseselecttool.c | 10 +- app/tools/gimpforegroundselecttool.c | 14 +- app/tools/gimpfreeselecttool.c | 26 ++-- - app/tools/gimpiscissorstool.c | 81 +++++------ - app/tools/gimpmagnifytool.c | 10 +- - app/tools/gimpmeasuretool.c | 66 ++++----- - app/tools/gimpmovetool.c | 6 +- - app/tools/gimppainttool.c | 38 ++--- + app/tools/gimpiscissorstool.c | 81 +++++------ + app/tools/gimpmagnifytool.c | 10 +- + app/tools/gimpmeasuretool.c | 66 ++++----- + app/tools/gimpmovetool.c | 6 +- + app/tools/gimppainttool.c | 38 ++--- app/tools/gimpperspectiveclonetool.c | 76 +++++----- app/tools/gimprectangleselecttool.c | 38 ++--- - app/tools/gimprectangletool.c | 268 + app/tools/gimprectangletool.c | 268 +++++++++++++++++------------------ app/tools/gimpregionselecttool.c | 8 +- - app/tools/gimpsourcetool.c | 12 +- - app/tools/gimptexttool.c | 8 +- - app/tools/gimptransformtool.c | 154 ++++++++++---------- - app/tools/gimpvectortool.c | 50 +++---- + app/tools/gimpsourcetool.c | 12 +- + app/tools/gimptexttool.c | 8 +- + app/tools/gimptransformtool.c | 154 ++++++++++---------- + app/tools/gimpvectortool.c | 50 +++---- 23 files changed, 622 insertions(+), 617 deletions(-) commit 5089b9a706c8a54732f0d46791cd8ec354a6df1b Author: Michael Natterer -Date: Sat Sep 25 18:24:38 2010 +0200 +Date: Sat Sep 25 18:24:38 2010 +0200 app: remove gimp_draw_tool_in_radius() @@ -53298,7 +54155,7 @@ commit dfd5a265ebeea10905e4743f30e204789b4c3c8f Author: Michael Natterer -Date: Sat Sep 25 18:04:40 2010 +0200 +Date: Sat Sep 25 18:04:40 2010 +0200 app: remove gimp_draw_tool_draw_dashed_line() @@ -53312,7 +54169,7 @@ commit e91dce5f9f87d805219e6d4feb6e014deb8f0763 Author: Michael Natterer -Date: Sat Sep 25 17:59:56 2010 +0200 +Date: Sat Sep 25 17:59:56 2010 +0200 app: remove gimp_draw_tool_draw_arc_by_anchor() @@ -53326,7 +54183,7 @@ commit 5cda4393d0612df1570cfd47ae3a7a124203919a Author: Michael Natterer -Date: Sat Sep 25 17:52:56 2010 +0200 +Date: Sat Sep 25 17:52:56 2010 +0200 app: return the created item from gimp_draw_tool_draw_foo() @@ -53337,23 +54194,23 @@ commit 02924e1e70d901780d76990b991912d743bbb9e9 Author: Michael Natterer -Date: Sat Sep 25 17:35:40 2010 +0200 +Date: Sat Sep 25 17:35:40 2010 +0200 app: change the unit of angles in the draw tool's draw_arc() functions from the weird X 1/64 of a degree to radian. - app/tools/gimpdrawtool.c | 22 ++++++++-------------- - app/tools/gimpdrawtool.h | 8 ++++---- + app/tools/gimpdrawtool.c | 22 ++++++++-------------- + app/tools/gimpdrawtool.h | 8 ++++---- app/tools/gimpellipseselecttool.c | 2 +- app/tools/gimpforegroundselecttool.c | 3 ++- - app/tools/gimpmeasuretool.c | 16 ++++++++-------- + app/tools/gimpmeasuretool.c | 16 ++++++++-------- app/tools/gimprectangleselecttool.c | 8 ++++---- 6 files changed, 27 insertions(+), 32 deletions(-) commit df44ced093f797e895c32d6e23a5132e77559829 Author: Michael Natterer -Date: Sat Sep 25 17:20:08 2010 +0200 +Date: Sat Sep 25 17:20:08 2010 +0200 app: keep the draw tool's items around in a GimpCanvasGroup @@ -53366,7 +54223,7 @@ commit e074d4d1516e5faf977f890b4e70a91b9e5148f7 Author: Michael Natterer -Date: Sat Sep 25 17:17:02 2010 +0200 +Date: Sat Sep 25 17:17:02 2010 +0200 app: move the GimpCanvasItem typedef to display-types.h @@ -53376,7 +54233,7 @@ commit 349c1500c94067ec52575ae0ab088a0b31ec8cae Author: Michael Natterer -Date: Sat Sep 25 17:14:57 2010 +0200 +Date: Sat Sep 25 17:14:57 2010 +0200 app: add a canvas group item which keeps around sub-items @@ -53391,7 +54248,7 @@ commit 6b30250353ac7db7f71e8b77c493529c6b2faece Author: Michael Natterer -Date: Sat Sep 25 16:02:02 2010 +0200 +Date: Sat Sep 25 16:02:02 2010 +0200 libgimpconfig: don't crash if g_value_get_boxed() returns NULL @@ -53401,7 +54258,7 @@ commit 62f8f559a7d9cfc7468eeaffc697cebef32617be Author: Michael Natterer -Date: Sat Sep 25 11:19:00 2010 +0200 +Date: Sat Sep 25 11:19:00 2010 +0200 app: add gimp_draw_tool_add_item() and use it all over the place @@ -53411,7 +54268,7 @@ commit e89650edd9e5e65fcf1f287ba6086788e02d6ce5 Author: Michael Natterer -Date: Sat Sep 25 00:02:26 2010 +0200 +Date: Sat Sep 25 00:02:26 2010 +0200 app: fix size of outside corner handles @@ -53420,7 +54277,7 @@ commit cbaf997ae22902319958275240db5c386fe3d8f1 Author: Michael Natterer -Date: Fri Sep 24 23:25:19 2010 +0200 +Date: Fri Sep 24 23:25:19 2010 +0200 app: undraw the old canvas items only before drawing new ones @@ -53434,7 +54291,7 @@ commit e8d46f7098d412cc64212b272fb6f4e8e7df4305 Author: Michael Natterer -Date: Fri Sep 24 22:55:54 2010 +0200 +Date: Fri Sep 24 22:55:54 2010 +0200 app: fix GimpCanvasArc's extents so it doesn't leave artifacts @@ -53443,7 +54300,7 @@ commit 5d14e9befcb3f31886706b7210d437e67e94c7cd Author: Michael Natterer -Date: Fri Sep 24 21:25:01 2010 +0200 +Date: Fri Sep 24 21:25:01 2010 +0200 app: move clearing and invalidating canvas items to utility functions @@ -53453,7 +54310,7 @@ commit 7a6a57c42f123f3c6db4827f54352bd2ce4ab802 Author: Michael Natterer -Date: Fri Sep 24 21:18:45 2010 +0200 +Date: Fri Sep 24 21:18:45 2010 +0200 app: remove code in draw() that special cases drawing vs. undrawing @@ -53464,37 +54321,37 @@ commit 313f8bee1edde4f2939d9eb3d74c97ba3d2dafe7 Author: Michael Natterer -Date: Fri Sep 24 21:14:49 2010 +0200 +Date: Fri Sep 24 21:14:49 2010 +0200 app: remove "gboolean use_cairo" from the draw tool again It's always TRUE now. - app/tools/gimpaligntool.c | 2 - - app/tools/gimpblendtool.c | 2 - - app/tools/gimpcolorpickertool.c | 2 - - app/tools/gimpcroptool.c | 2 - - app/tools/gimpdrawtool.c | 84 + app/tools/gimpaligntool.c | 2 - + app/tools/gimpblendtool.c | 2 - + app/tools/gimpcolorpickertool.c | 2 - + app/tools/gimpcroptool.c | 2 - + app/tools/gimpdrawtool.c | 84 ++++++++++++++----------------------- - app/tools/gimpdrawtool.h | 1 - - app/tools/gimpeditselectiontool.c | 2 - - app/tools/gimpellipseselecttool.c | 2 - - app/tools/gimpfreeselecttool.c | 2 - - app/tools/gimpiscissorstool.c | 2 - - app/tools/gimpmagnifytool.c | 2 - - app/tools/gimpmeasuretool.c | 4 +- - app/tools/gimpmovetool.c | 2 - - app/tools/gimppainttool.c | 2 - - app/tools/gimprectangleselecttool.c | 2 - - app/tools/gimpregionselecttool.c | 2 - - app/tools/gimptexttool.c | 2 - - app/tools/gimptransformtool.c | 2 - - app/tools/gimpvectortool.c | 2 - + app/tools/gimpdrawtool.h | 1 - + app/tools/gimpeditselectiontool.c | 2 - + app/tools/gimpellipseselecttool.c | 2 - + app/tools/gimpfreeselecttool.c | 2 - + app/tools/gimpiscissorstool.c | 2 - + app/tools/gimpmagnifytool.c | 2 - + app/tools/gimpmeasuretool.c | 4 +- + app/tools/gimpmovetool.c | 2 - + app/tools/gimppainttool.c | 2 - + app/tools/gimprectangleselecttool.c | 2 - + app/tools/gimpregionselecttool.c | 2 - + app/tools/gimptexttool.c | 2 - + app/tools/gimptransformtool.c | 2 - + app/tools/gimpvectortool.c | 2 - 19 files changed, 33 insertions(+), 88 deletions(-) commit d6f035a9342794acc177086f8e35870cded397c3 Author: Michael Natterer -Date: Fri Sep 24 21:03:51 2010 +0200 +Date: Fri Sep 24 21:03:51 2010 +0200 app: bye bye XOR :D @@ -53505,7 +54362,7 @@ commit 21adcb22e1662356ff915dc33b47b9684ca0db01 Author: Michael Natterer -Date: Fri Sep 24 20:58:22 2010 +0200 +Date: Fri Sep 24 20:58:22 2010 +0200 app: port the region select tool to gimp_draw_tool_draw_boundary() @@ -53520,7 +54377,7 @@ commit a5c961ae6f373dc62e00123956fa28849f0d2df6 Author: Michael Natterer -Date: Fri Sep 24 20:40:02 2010 +0200 +Date: Fri Sep 24 20:40:02 2010 +0200 app: remove the last traces of gimp_canvas_draw_foo() from the draw tool @@ -53531,7 +54388,7 @@ commit 9154814b94de434156209d6de0cce88b3d2132ed Author: Michael Natterer -Date: Fri Sep 24 20:35:59 2010 +0200 +Date: Fri Sep 24 20:35:59 2010 +0200 app: enable cairo drawing for the text tool @@ -53544,7 +54401,7 @@ commit 957acb42e844a7e32891478551744497d4c67fc8 Author: Michael Natterer -Date: Fri Sep 24 20:35:14 2010 +0200 +Date: Fri Sep 24 20:35:14 2010 +0200 app: add support for cairo text cursor drawing @@ -53553,11 +54410,11 @@ commit 225d22473e4f7875d5b1428795ae0ea76a2fb4fc Author: Michael Natterer -Date: Fri Sep 24 20:34:21 2010 +0200 +Date: Fri Sep 24 20:34:21 2010 +0200 app: add a text cursor canvas item class - app/display/Makefile.am | 2 + + app/display/Makefile.am | 2 + app/display/gimpcanvastextcursor.c | 307 +++++++++++++++++++++++++++++++++++++ app/display/gimpcanvastextcursor.h | 56 +++++++ @@ -53565,7 +54422,7 @@ commit e7f1d444c394192ea57e16045508cd08def26129 Author: Michael Natterer -Date: Fri Sep 24 19:08:19 2010 +0200 +Date: Fri Sep 24 19:08:19 2010 +0200 app: remove much more dead code paths from the draw tool and the canvas @@ -53578,7 +54435,7 @@ commit 9cb4a2e87b9bd6ff218e2ee25bfde15e4c472e83 Author: Michael Natterer -Date: Fri Sep 24 18:59:05 2010 +0200 +Date: Fri Sep 24 18:59:05 2010 +0200 app: enable cairo drawing for the align tool @@ -53587,7 +54444,7 @@ commit 9c7cd6d41c6942061d2f6a75e532c5b2b6d1dd0a Author: Michael Natterer -Date: Fri Sep 24 18:54:50 2010 +0200 +Date: Fri Sep 24 18:54:50 2010 +0200 app: fix canvas arc extents @@ -53596,7 +54453,7 @@ commit 926bbc6658d64a9e10d8f797218193aa379e96a3 Author: Michael Natterer -Date: Fri Sep 24 18:43:09 2010 +0200 +Date: Fri Sep 24 18:43:09 2010 +0200 app: enable cairo drawing for the rect and ellipse select tools @@ -53608,7 +54465,7 @@ commit 67708a65a128e93d16eb948c43b7dac1cd181478 Author: Michael Natterer -Date: Fri Sep 24 18:42:36 2010 +0200 +Date: Fri Sep 24 18:42:36 2010 +0200 app: add support for cairo arcs @@ -53617,19 +54474,19 @@ commit 4e5d47dcbfaa24898b05f1cc3d5dec100861c54a Author: Michael Natterer -Date: Fri Sep 24 18:41:57 2010 +0200 +Date: Fri Sep 24 18:41:57 2010 +0200 app: add an arc canvas item class - app/display/Makefile.am | 2 + + app/display/Makefile.am | 2 + app/display/gimpcanvasarc.c | 325 ++++++++++++++++++++++++++++++++++++++++++++ - app/display/gimpcanvasarc.h | 61 +++++++++ + app/display/gimpcanvasarc.h | 61 +++++++++ 3 files changed, 388 insertions(+) commit db1da1ed64f5520d63ebf5ddfd3ac1793bd23ca4 Author: Michael Natterer -Date: Fri Sep 24 13:13:53 2010 +0200 +Date: Fri Sep 24 13:13:53 2010 +0200 app: handle sizes should be odd numbers @@ -53638,7 +54495,7 @@ commit 398742b3ac1e4c644056e0360262bacdd2ef26c9 Author: Michael Natterer -Date: Fri Sep 24 13:13:33 2010 +0200 +Date: Fri Sep 24 13:13:33 2010 +0200 app: draw the grid under the bounding box @@ -53647,7 +54504,7 @@ commit b5194b65c5774749836ea8dc7890fb6feafe4631 Author: Michael Natterer -Date: Fri Sep 24 13:13:02 2010 +0200 +Date: Fri Sep 24 13:13:02 2010 +0200 app: handle sizes should be odd numbers @@ -53656,18 +54513,18 @@ commit 74fe162f934ce1a23184e7f6bdae705e7ccb6701 Author: Michael Natterer -Date: Fri Sep 24 13:12:34 2010 +0200 +Date: Fri Sep 24 13:12:34 2010 +0200 app: move adding an arc path out to a utility function app/display/gimpcanvashandle.c | 32 ++++++++------------------------ - app/widgets/gimpcairo.c | 24 ++++++++++++++++++++++++ - app/widgets/gimpcairo.h | 6 ++++++ + app/widgets/gimpcairo.c | 24 ++++++++++++++++++++++++ + app/widgets/gimpcairo.h | 6 ++++++ 3 files changed, 38 insertions(+), 24 deletions(-) commit e98a20c158fd052ec9fe46a4dd41f6258df42090 Author: Michael Natterer -Date: Fri Sep 24 13:11:54 2010 +0200 +Date: Fri Sep 24 13:11:54 2010 +0200 app: increase max corner size @@ -53676,7 +54533,7 @@ commit 870faec2102e6c58fccf7d34dce3bdaceb1e7338 Author: Michael Natterer -Date: Fri Sep 24 11:21:44 2010 +0200 +Date: Fri Sep 24 11:21:44 2010 +0200 app: fix bounding box calculation for lines that are not axis-aligned @@ -53688,7 +54545,7 @@ commit 75c11e259d1c8df186bac75f0a226ac920fa3124 Author: Michael Natterer -Date: Fri Sep 24 11:21:07 2010 +0200 +Date: Fri Sep 24 11:21:07 2010 +0200 app: fix off-by-one in rectangle tool guides @@ -53699,7 +54556,7 @@ commit 4a5d3301ad5487c63bb1cb587e69d0cdb4eda770 Author: Michael Natterer -Date: Fri Sep 24 10:51:10 2010 +0200 +Date: Fri Sep 24 10:51:10 2010 +0200 app: enable cairo drawing for the crop tool @@ -53708,7 +54565,7 @@ commit 6fb802f77bd1a6cc3998104f3156526658c12529 Author: Michael Natterer -Date: Fri Sep 24 10:50:44 2010 +0200 +Date: Fri Sep 24 10:50:44 2010 +0200 app: add draw tool support for cairo corners @@ -53717,11 +54574,11 @@ commit a29a7ec4a2cd78177b404a51181583edc2ea1155 Author: Michael Natterer -Date: Fri Sep 24 10:50:05 2010 +0200 +Date: Fri Sep 24 10:50:05 2010 +0200 app: add a corner canvas item class - app/display/Makefile.am | 2 + + app/display/Makefile.am | 2 + app/display/gimpcanvascorner.c | 440 +++++++++++++++++++++++++++++++++++++++++ app/display/gimpcanvascorner.h | 62 ++++++ @@ -53729,7 +54586,7 @@ commit 41c338ce93f28979a2e67a3af330681672701827 Author: Michael Natterer -Date: Fri Sep 24 02:11:04 2010 +0200 +Date: Fri Sep 24 02:11:04 2010 +0200 app: remove XOR drawing code paths which are now dead @@ -53741,7 +54598,7 @@ commit 3afd2da6905306956cbbfa9e85b2cce7afb1423c Author: Michael Natterer -Date: Fri Sep 24 01:33:15 2010 +0200 +Date: Fri Sep 24 01:33:15 2010 +0200 app: enable cairo drawing for the measure tool @@ -53750,7 +54607,7 @@ commit 1c550d462339902070890b2395446a91a022f00e Author: Michael Natterer -Date: Fri Sep 24 01:32:57 2010 +0200 +Date: Fri Sep 24 01:32:57 2010 +0200 app: suppose arc slices @@ -53759,7 +54616,7 @@ commit 6ebc29818eff59714bfefb9d7e175a6c4ec3ebd8 Author: Michael Natterer -Date: Fri Sep 24 01:32:09 2010 +0200 +Date: Fri Sep 24 01:32:09 2010 +0200 app: add arc slices to GimpCanvasHandle @@ -53770,7 +54627,7 @@ commit 590e63f65825aa87cdabd6a3d4e9b7018db89f45 Author: Michael Natterer -Date: Thu Sep 23 23:52:32 2010 +0200 +Date: Thu Sep 23 23:52:32 2010 +0200 app: enable cairo drawing for all transform tools @@ -53779,7 +54636,7 @@ commit a75b298946af86554403337034a17792ab3725f0 Author: Michael Natterer -Date: Thu Sep 23 23:47:20 2010 +0200 +Date: Thu Sep 23 23:47:20 2010 +0200 app: enable cairo drawing for the edit selection tool @@ -53788,7 +54645,7 @@ commit 3b4d26e8d234ae11ad25271dfd46bcba84ef3ab5 Author: Michael Natterer -Date: Thu Sep 23 23:39:36 2010 +0200 +Date: Thu Sep 23 23:39:36 2010 +0200 app: enable cairo drawing for all paint tools @@ -53797,7 +54654,7 @@ commit ecd59cd013aef84af52afe2683f7ef4fb5a82636 Author: Michael Natterer -Date: Thu Sep 23 23:39:16 2010 +0200 +Date: Thu Sep 23 23:39:16 2010 +0200 app: add cairo support to boundary drawing @@ -53806,13 +54663,13 @@ commit 483efcbff5b1eef70ddae73bc56de705863bd2b8 Author: Michael Natterer -Date: Thu Sep 23 23:38:27 2010 +0200 +Date: Thu Sep 23 23:38:27 2010 +0200 app: add a boundary canvas item class This can be done much better, but this one kindof works for now. - app/display/Makefile.am | 2 + + app/display/Makefile.am | 2 + app/display/gimpcanvasboundary.c | 339 +++++++++++++++++++++++++++++++++++++++ app/display/gimpcanvasboundary.h | 58 +++++++ @@ -53820,7 +54677,7 @@ commit d921f8520b3ffc0b37d0b5ff9f1da05b1b7ffd79 Author: Michael Natterer -Date: Thu Sep 23 23:35:59 2010 +0200 +Date: Thu Sep 23 23:35:59 2010 +0200 app: fix infinite recursion in gimp_brush_core_create_bound_segs() @@ -53832,7 +54689,7 @@ commit 2c0520281da761b7eb48b57b64e281cb37190a12 Author: Michael Natterer -Date: Thu Sep 23 19:47:14 2010 +0200 +Date: Thu Sep 23 19:47:14 2010 +0200 app: reorder code in draw() so handles are on top of lines @@ -53842,7 +54699,7 @@ commit 39a4dfb923fdbdac2df952caf30a3a4c64b76c7b Author: Michael Natterer -Date: Thu Sep 23 19:26:29 2010 +0200 +Date: Thu Sep 23 19:26:29 2010 +0200 app: enable cairo drawing for the vector tool @@ -53851,7 +54708,7 @@ commit db1a85148e4fd60341ae5d9d5595c96eb4be51d1 Author: Michael Natterer -Date: Thu Sep 23 19:26:02 2010 +0200 +Date: Thu Sep 23 19:26:02 2010 +0200 app: use the highlight color for "dashed" lines, oh well... @@ -53860,21 +54717,21 @@ commit d1d89e0ddecd93994927bcc1ad32ef3e0bec4672 Author: Michael Natterer -Date: Thu Sep 23 19:25:22 2010 +0200 +Date: Thu Sep 23 19:25:22 2010 +0200 app: add a "highlight" mode for the tool FG style such a hack, but looks better than dashed lines - app/display/gimpcanvasitem.c | 21 ++++++++++++++++++--- - app/display/gimpcanvasitem.h | 3 +++ + app/display/gimpcanvasitem.c | 21 ++++++++++++++++++--- + app/display/gimpcanvasitem.h | 3 +++ app/display/gimpdisplayshell-style.c | 9 +++++++-- app/display/gimpdisplayshell-style.h | 3 ++- 4 files changed, 30 insertions(+), 6 deletions(-) commit 74bc42edf35afd5c2b0c4ba2feec90b5423805a2 Author: Michael Natterer -Date: Thu Sep 23 19:03:30 2010 +0200 +Date: Thu Sep 23 19:03:30 2010 +0200 app: implement square handles @@ -53884,7 +54741,7 @@ commit fb68e40214a8fcaa41f2b3793aefadbb2fec1edc Author: Michael Natterer -Date: Thu Sep 23 14:55:38 2010 +0200 +Date: Thu Sep 23 14:55:38 2010 +0200 app: draw the line before the handles so it will look ok with cairo @@ -53893,7 +54750,7 @@ commit 76be01d02648e51003546416352a24112349967c Author: Michael Natterer -Date: Thu Sep 23 14:52:23 2010 +0200 +Date: Thu Sep 23 14:52:23 2010 +0200 app: enable cairo drawing for the move tool @@ -53902,7 +54759,7 @@ commit fe5e989af6e6860b96d67be6ceb7fadcc5ef7347 Author: Michael Natterer -Date: Thu Sep 23 14:52:07 2010 +0200 +Date: Thu Sep 23 14:52:07 2010 +0200 app: add support for drawing guide lines with cairo @@ -53911,7 +54768,7 @@ commit 8dbab53faea5f4de03b6637b2cb4d6d77a142767 Author: Michael Natterer -Date: Thu Sep 23 14:51:45 2010 +0200 +Date: Thu Sep 23 14:51:45 2010 +0200 app: add a guide line canvas item class @@ -53923,7 +54780,7 @@ commit 612aee9f334e19ce5fae9d0b50d479702b53d3ef Author: Michael Natterer -Date: Thu Sep 23 14:26:52 2010 +0200 +Date: Thu Sep 23 14:26:52 2010 +0200 app: change segment drawing to using pixel centers and CAP_SQUARE line ends @@ -53932,91 +54789,91 @@ for segment drawing in tools. app/display/gimpdisplayshell-selection.c | 1 + - app/display/gimpdisplayshell-style.c | 8 ++++++-- - app/widgets/gimpcairo.c | 8 ++++---- + app/display/gimpdisplayshell-style.c | 8 ++++++-- + app/widgets/gimpcairo.c | 8 ++++---- 3 files changed, 11 insertions(+), 6 deletions(-) commit ddc63de6d6fb4ebfa7db58f6b3d4e913ebab597e Author: Michael Natterer -Date: Thu Sep 23 10:50:39 2010 +0200 +Date: Thu Sep 23 10:50:39 2010 +0200 app: remove "gboolean use_offsets" from gimpdisplayshell-transform.[ch] - app/display/gimpcanvashandle.c | 3 +- - app/display/gimpcanvasline.c | 6 +- - app/display/gimpcanvaspolygon.c | 3 +- - app/display/gimpcanvasrectangle.c | 6 +- - app/display/gimpdisplay.c | 4 +- - app/display/gimpdisplayshell-cursor.c | 2 +- - app/display/gimpdisplayshell-draw.c | 34 +++----- - app/display/gimpdisplayshell-expose.c | 10 +-- + app/display/gimpcanvashandle.c | 3 +- + app/display/gimpcanvasline.c | 6 +- + app/display/gimpcanvaspolygon.c | 3 +- + app/display/gimpcanvasrectangle.c | 6 +- + app/display/gimpdisplay.c | 4 +- + app/display/gimpdisplayshell-cursor.c | 2 +- + app/display/gimpdisplayshell-draw.c | 34 +++----- + app/display/gimpdisplayshell-expose.c | 10 +-- app/display/gimpdisplayshell-preview.c | 3 +- - app/display/gimpdisplayshell-scale.c | 3 +- + app/display/gimpdisplayshell-scale.c | 3 +- app/display/gimpdisplayshell-selection.c | 2 +- app/display/gimpdisplayshell-transform.c | 141 +++++-------------------------- app/display/gimpdisplayshell-transform.h | 21 ++--- - app/display/gimpdisplayshell.c | 7 +- - app/display/gimpimagewindow.c | 3 +- - app/tools/gimpcolortool.c | 3 +- - app/tools/gimpdrawtool.c | 70 ++++++--------- - app/tools/gimpmovetool.c | 3 +- - app/tools/gimpregionselecttool.c | 2 +- - app/tools/gimptransformtool.c | 20 ++--- + app/display/gimpdisplayshell.c | 7 +- + app/display/gimpimagewindow.c | 3 +- + app/tools/gimpcolortool.c | 3 +- + app/tools/gimpdrawtool.c | 70 ++++++--------- + app/tools/gimpmovetool.c | 3 +- + app/tools/gimpregionselecttool.c | 2 +- + app/tools/gimptransformtool.c | 20 ++--- 20 files changed, 100 insertions(+), 246 deletions(-) commit a0cb4fe80510669e1edf2a938bf56aa3e9a4efbd Author: Michael Natterer -Date: Thu Sep 23 10:47:59 2010 +0200 +Date: Thu Sep 23 10:47:59 2010 +0200 app: add boundary_offset() which offsets BoundSegs in place and use it in gimp_region_select_tool_calculate(). Also fix boundary_transform() indentation. - app/base/boundary.c | 84 + app/base/boundary.c | 84 ++++++++++++++++++++++++++-------------- - app/base/boundary.h | 6 +++ + app/base/boundary.h | 6 +++ app/tools/gimpregionselecttool.c | 14 ++++++- 3 files changed, 72 insertions(+), 32 deletions(-) commit 4d0c75032746caf2b72a7bc1c09635b2f4b7e4d8 Author: Michael Natterer -Date: Thu Sep 23 09:45:23 2010 +0200 +Date: Thu Sep 23 09:45:23 2010 +0200 app: get rid of "gboolean use_offsets" in the draw tool and always pass image coordinates. Transform the coords manually in the very few places which passed TRUE. - app/tools/gimpaligntool.c | 22 +++---- - app/tools/gimpblendtool.c | 9 +-- - app/tools/gimpbrushtool.c | 6 +- - app/tools/gimpcolortool.c | 9 +-- - app/tools/gimpdrawtool.c | 118 + app/tools/gimpaligntool.c | 22 +++---- + app/tools/gimpblendtool.c | 9 +-- + app/tools/gimpbrushtool.c | 6 +- + app/tools/gimpcolortool.c | 9 +-- + app/tools/gimpdrawtool.c | 118 +++++++++++++---------------------- - app/tools/gimpdrawtool.h | 36 ++++------- + app/tools/gimpdrawtool.h | 36 ++++------- app/tools/gimpeditselectiontool.c | 47 +++++++------- app/tools/gimpellipseselecttool.c | 3 +- app/tools/gimpforegroundselecttool.c | 6 +- app/tools/gimpfreeselecttool.c | 7 +-- - app/tools/gimpiscissorstool.c | 35 ++++------- - app/tools/gimpmagnifytool.c | 6 +- - app/tools/gimpmeasuretool.c | 21 +++---- - app/tools/gimppainttool.c | 31 ++++----- + app/tools/gimpiscissorstool.c | 35 ++++------- + app/tools/gimpmagnifytool.c | 6 +- + app/tools/gimpmeasuretool.c | 21 +++---- + app/tools/gimppainttool.c | 31 ++++----- app/tools/gimpperspectiveclonetool.c | 27 +++----- app/tools/gimprectangleselecttool.c | 12 ++-- - app/tools/gimprectangletool.c | 79 ++++++++++------------- - app/tools/gimpsourcetool.c | 3 +- - app/tools/gimptexttool.c | 17 +++-- - app/tools/gimptransformtool.c | 68 +++++++------------- - app/tools/gimpvectortool.c | 22 +++---- + app/tools/gimprectangletool.c | 79 ++++++++++------------- + app/tools/gimpsourcetool.c | 3 +- + app/tools/gimptexttool.c | 17 +++-- + app/tools/gimptransformtool.c | 68 +++++++------------- + app/tools/gimpvectortool.c | 22 +++---- 21 files changed, 235 insertions(+), 349 deletions(-) commit 517e77b70766fae8797e83817ba851e35ee3a524 Author: Michael Natterer -Date: Thu Sep 23 01:04:22 2010 +0200 +Date: Thu Sep 23 01:04:22 2010 +0200 app: keep GimpColorTool->center_x and _y around in image coords @@ -54025,7 +54882,7 @@ commit 7c82f3dc09809fd184d92ec506d57e50165780bd Author: Michael Natterer -Date: Thu Sep 23 00:40:32 2010 +0200 +Date: Thu Sep 23 00:40:32 2010 +0200 app: add gimp_canvas_polygon_new_from_coords() @@ -54033,12 +54890,12 @@ app/display/gimpcanvaspolygon.c | 27 +++++++++++++++++++++++++++ app/display/gimpcanvaspolygon.h | 13 ++++++++----- - app/tools/gimpdrawtool.c | 13 ++++++++++++- + app/tools/gimpdrawtool.c | 13 ++++++++++++- 3 files changed, 47 insertions(+), 6 deletions(-) commit eeeea7c69bf9edffad87d9ee0feec0a49935e414 Author: Michael Natterer -Date: Thu Sep 23 00:30:09 2010 +0200 +Date: Thu Sep 23 00:30:09 2010 +0200 app: enable cairo drawing for the iscissors tool @@ -54047,7 +54904,7 @@ commit c80cea5937cdb5214aa38fd7da9f4e547ad5ab43 Author: Michael Natterer -Date: Thu Sep 23 00:19:44 2010 +0200 +Date: Thu Sep 23 00:19:44 2010 +0200 app: proper line caps and joins for canvas items @@ -54056,7 +54913,7 @@ commit 5f349c352f3893bef2a260f5263386e3d69a0ed9 Author: Michael Natterer -Date: Thu Sep 23 00:11:49 2010 +0200 +Date: Thu Sep 23 00:11:49 2010 +0200 app: nicer fill style for canvas items @@ -54067,7 +54924,7 @@ commit c058ec93ee2a987b22e63faf5fe8479a7d24fe20 Author: Michael Natterer -Date: Thu Sep 23 00:11:18 2010 +0200 +Date: Thu Sep 23 00:11:18 2010 +0200 app: temporarily enable double buffering unconditionally @@ -54076,7 +54933,7 @@ commit f9a7bea24aae8105e724b335850e2c023f89c573 Author: Michael Natterer -Date: Thu Sep 23 00:00:28 2010 +0200 +Date: Thu Sep 23 00:00:28 2010 +0200 app: enable cairo drawing in the free select tool @@ -54085,7 +54942,7 @@ commit 83bab2f0cdbb8b71cbcf6338373406e223698efb Author: Michael Natterer -Date: Thu Sep 23 00:00:07 2010 +0200 +Date: Thu Sep 23 00:00:07 2010 +0200 app: add support for cairo polygons @@ -54094,11 +54951,11 @@ commit 4bedffd2cff73e3fa481fa01eac20086533b4266 Author: Michael Natterer -Date: Wed Sep 22 23:59:10 2010 +0200 +Date: Wed Sep 22 23:59:10 2010 +0200 app: add a polygon canvas item class (filled polygons unimplemented) - app/display/Makefile.am | 2 + + app/display/Makefile.am | 2 + app/display/gimpcanvaspolygon.c | 284 ++++++++++++++++++++++++++++++++++++++++ app/display/gimpcanvaspolygon.h | 57 ++++++++ @@ -54106,7 +54963,7 @@ commit f719cf1ea2963dcb770116c34b925dee0096b898 Author: Michael Natterer -Date: Wed Sep 22 23:58:42 2010 +0200 +Date: Wed Sep 22 23:58:42 2010 +0200 app: implement circle handles @@ -54115,7 +54972,7 @@ commit ddcd5a69834840b3fd420d85c092f6f3da7f86cc Author: Sven Neumann -Date: Wed Sep 22 23:38:08 2010 +0200 +Date: Wed Sep 22 23:38:08 2010 +0200 app: workaround warning about empty private struct @@ -54125,7 +54982,7 @@ commit 721fae71fb2249648b2cc6225be143c0349b0183 Author: Michael Natterer -Date: Wed Sep 22 22:45:17 2010 +0200 +Date: Wed Sep 22 22:45:17 2010 +0200 app: enable cairo drawing for the color picker tool @@ -54134,7 +54991,7 @@ commit e7de19ed2fb508c67b6d8111f5493d52655e1e41 Author: Michael Natterer -Date: Wed Sep 22 22:26:41 2010 +0200 +Date: Wed Sep 22 22:26:41 2010 +0200 app: remove debug spew in the draw tool @@ -54143,7 +55000,7 @@ commit 919b3d83b832f30a0ebe195fccb96ad0470cea71 Author: Michael Natterer -Date: Wed Sep 22 22:25:37 2010 +0200 +Date: Wed Sep 22 22:25:37 2010 +0200 app: enable cairo drawing in the blend tool @@ -54154,7 +55011,7 @@ commit 55369b5f22c454f457938076d9567bbbff38875f Author: Michael Natterer -Date: Wed Sep 22 22:25:09 2010 +0200 +Date: Wed Sep 22 22:25:09 2010 +0200 app: enable cairo drawing in the zoom tool @@ -54163,7 +55020,7 @@ commit 1ea16c07703001d513f363cbbd7420a31d0e8b03 Author: Michael Natterer -Date: Wed Sep 22 22:24:22 2010 +0200 +Date: Wed Sep 22 22:24:22 2010 +0200 app: draw the active tool's stuff in the display expose handler @@ -54172,7 +55029,7 @@ commit 683e097d899152d84546bf38b6bf8a06dcef55d6 Author: Michael Natterer -Date: Wed Sep 22 22:19:28 2010 +0200 +Date: Wed Sep 22 22:19:28 2010 +0200 app: add cairo drawing support in GimpDrawTool @@ -54190,7 +55047,7 @@ commit 284403d99eddc296a8141d51b957f6d74b8c81a0 Author: Michael Natterer -Date: Wed Sep 22 21:45:33 2010 +0200 +Date: Wed Sep 22 21:45:33 2010 +0200 app: fix width and height properties to allow negative sizes @@ -54199,7 +55056,7 @@ commit 5722345cc7f5393250c76679ede2eb742a464198 Author: Michael Natterer -Date: Wed Sep 22 21:02:38 2010 +0200 +Date: Wed Sep 22 21:02:38 2010 +0200 app: remove prototype for non-existing gimp_draw_tool_set_transform() @@ -54208,7 +55065,7 @@ commit 24654e0df301a0122b410d66fd5cd1ab2b7a4370 Author: Michael Natterer -Date: Wed Sep 22 15:31:17 2010 +0200 +Date: Wed Sep 22 15:31:17 2010 +0200 app: remove the draw timeout from GimpDrawTool @@ -54222,28 +55079,28 @@ commit d0f6846ff547ab2be6c75597ee11368c692a58f3 Author: Michael Natterer -Date: Wed Sep 22 10:33:41 2010 +0200 +Date: Wed Sep 22 10:33:41 2010 +0200 app: remove premature canvas item extents caching optimization again app/display/gimpcanvashandle.c | 35 ++++++++++++++++++++++++++++------- - app/display/gimpcanvasitem.c | 29 +---------------------------- - app/display/gimpcanvasitem.h | 5 ----- - app/display/gimpcanvasline.c | 21 +++++++++++++-------- + app/display/gimpcanvasitem.c | 29 +---------------------------- + app/display/gimpcanvasitem.h | 5 ----- + app/display/gimpcanvasline.c | 21 +++++++++++++-------- app/display/gimpcanvasrectangle.c | 37 +++++++++++++++++++++++++------------ 5 files changed, 67 insertions(+), 60 deletions(-) commit de2ae870473fa76dd8e9c49d8636806a10537418 Author: Michael Natterer -Date: Tue Sep 21 19:22:29 2010 +0200 +Date: Tue Sep 21 19:22:29 2010 +0200 app: add GimpCanvasHandle which draws tool handles Currently only a centered cross is implemented. - app/display/Makefile.am | 2 + + app/display/Makefile.am | 2 + app/display/gimpcanvashandle.c | 382 +++++++++++++++++++++++++++++++++++++++++ app/display/gimpcanvashandle.h | 60 +++++++ @@ -54251,7 +55108,7 @@ commit b0d8ba5ffddd46798a7480d75f5de3c8d808b9ad Author: Kevin Cozens -Date: Mon Sep 20 23:20:45 2010 -0400 +Date: Mon Sep 20 23:20:45 2010 -0400 Additional fixes for handling UTF-8 coded strings (Bugs 572865 & 628893) @@ -54265,14 +55122,14 @@ routine is not the way to allocate space for UTF-8 coded strings. - Added some comments. - plug-ins/script-fu/scheme-wrapper.c | 10 ++++++---- + plug-ins/script-fu/scheme-wrapper.c | 10 ++++++---- plug-ins/script-fu/tinyscheme/scheme.c | 35 +++++++++++++++++++++++++++------- 2 files changed, 34 insertions(+), 11 deletions(-) commit 69da253e51cddd1b940f34029edcee5a34bf75c7 Author: Michael Natterer -Date: Mon Sep 20 19:26:34 2010 +0200 +Date: Mon Sep 20 19:26:34 2010 +0200 app: move enum GimpHandleType to display-enums.h @@ -54283,22 +55140,22 @@ commit 0c1073460cd4a5b747affad8ec8258f919504294 Author: Michael Natterer -Date: Mon Sep 20 00:13:32 2010 +0200 +Date: Mon Sep 20 00:13:32 2010 +0200 app: get rid of some public draw tool API and use gimp_draw_tool_draw_handle() instead which does exactly the same for these cases. - app/tools/gimpdrawtool.c | 16 ++++------------ - app/tools/gimpdrawtool.h | 15 --------------- + app/tools/gimpdrawtool.c | 16 ++++------------ + app/tools/gimpdrawtool.h | 15 --------------- app/tools/gimpeditselectiontool.c | 15 ++++++++------- - app/tools/gimprectangletool.c | 15 ++++++++------- + app/tools/gimprectangletool.c | 15 ++++++++------- 4 files changed, 20 insertions(+), 41 deletions(-) commit 5e5cacfd4cddd038a733d35df3ab5a1a024d6fbe Author: Michael Natterer -Date: Sun Sep 19 23:49:56 2010 +0200 +Date: Sun Sep 19 23:49:56 2010 +0200 app: fix canvas line extents @@ -54307,7 +55164,7 @@ commit ae6670ba8b20f03a7d12d5eba57c5be3b9dcb1db Author: Kevin Cozens -Date: Sun Sep 19 17:46:41 2010 -0400 +Date: Sun Sep 19 17:46:41 2010 -0400 Last part of fixes for handling UTF-8 coded strings (Bugs 572865 & 628893) @@ -54325,7 +55182,7 @@ commit 68552674702653abde0bfc5d4b0cd84d045b5d92 Author: Kevin Cozens -Date: Sun Sep 19 17:45:31 2010 -0400 +Date: Sun Sep 19 17:45:31 2010 -0400 First part of fixes for handling UTF-8 coded strings (Bugs 572865 & 628893) @@ -54339,7 +55196,7 @@ commit 46836d950de7730945e7ede95a4f5fa92c4062a4 Author: Michael Natterer -Date: Sun Sep 19 23:46:52 2010 +0200 +Date: Sun Sep 19 23:46:52 2010 +0200 app: add a canvas line class @@ -54351,38 +55208,38 @@ commit f17cc0093d6ab50e5648ab4b08ee204e58cb84e1 Author: Michael Natterer -Date: Sun Sep 19 23:46:06 2010 +0200 +Date: Sun Sep 19 23:46:06 2010 +0200 app: minor cleanup and fixes - app/display/gimpcanvasitem.c | 3 +++ + app/display/gimpcanvasitem.c | 3 +++ app/display/gimpcanvasrectangle.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) commit 96bdf1fec53fa9bb9ab039b81a00c7364d884b39 Author: Michael Natterer -Date: Sun Sep 19 23:20:36 2010 +0200 +Date: Sun Sep 19 23:20:36 2010 +0200 app: refactor the canvas items to return a GdkRegion as extents instead of invalidating the canvas themselves. - app/display/gimpcanvasitem.c | 78 + app/display/gimpcanvasitem.c | 78 +++++++++++++++++++++++++++++++-------- - app/display/gimpcanvasitem.h | 39 +++++++++++--------- + app/display/gimpcanvasitem.h | 39 +++++++++++--------- app/display/gimpcanvasrectangle.c | 58 ++++++++++++++--------------- 3 files changed, 113 insertions(+), 62 deletions(-) commit 69a898cc9f29e2b0bb6189dcd5d98addf92078a4 Author: Michael Natterer -Date: Sun Sep 19 19:45:51 2010 +0200 +Date: Sun Sep 19 19:45:51 2010 +0200 app: some cairo tool drawing infrastructure for review, please have a look - app/display/Makefile.am | 4 + - app/display/gimpcanvasitem.c | 120 ++++++++++++++++ - app/display/gimpcanvasitem.h | 75 ++++++++++ + app/display/Makefile.am | 4 + + app/display/gimpcanvasitem.c | 120 ++++++++++++++++ + app/display/gimpcanvasitem.h | 75 ++++++++++ app/display/gimpcanvasrectangle.c | 289 ++++++++++++++++++++++++++++++++++++++ app/display/gimpcanvasrectangle.h | 59 ++++++++ @@ -54390,7 +55247,7 @@ commit 11aecbd090178a2362c111f7aa7d28060e15e977 Author: Michael Natterer -Date: Sun Sep 19 19:19:24 2010 +0200 +Date: Sun Sep 19 19:19:24 2010 +0200 app: add styles for tool drawing (still unused) @@ -54400,7 +55257,7 @@ commit f04e16016f4d5111ac684f870fa6d15e2cfed8e0 Author: Michael Natterer -Date: Sun Sep 19 19:14:42 2010 +0200 +Date: Sun Sep 19 19:14:42 2010 +0200 app: draw inactive paths blue on white @@ -54409,7 +55266,7 @@ commit 7e28f52dd746a0c69dde93afe3f2d79375e14de1 Author: Michael Natterer -Date: Sun Sep 19 18:58:23 2010 +0200 +Date: Sun Sep 19 18:58:23 2010 +0200 app: remove unused clipping functions in GimpDrawTool and GimpCanvas @@ -54422,7 +55279,7 @@ commit 916216c50a0d8201d2a82be14a3ea64935b08a7c Author: Mattias Põldaru -Date: Sun Sep 19 11:48:05 2010 +0300 +Date: Sun Sep 19 11:48:05 2010 +0300 [l10n] Updated Estonian translation @@ -54431,7 +55288,7 @@ commit 545422e640e0aec02ade99ce5fec3ccb0d737801 Author: Mattias Põldaru -Date: Sun Sep 19 11:47:12 2010 +0300 +Date: Sun Sep 19 11:47:12 2010 +0300 [l10n] Updated Estonian translation @@ -54440,7 +55297,7 @@ commit 428e9b908b21f10a87130a01239ea86b858a238c Author: Michael Natterer -Date: Fri Sep 17 23:15:16 2010 +0200 +Date: Fri Sep 17 23:15:16 2010 +0200 app: more cleanup, move more variables to local scopes @@ -54450,7 +55307,7 @@ commit 8a029f3e4e5181d8ca92c5e2121da4818c2a2ee4 Author: Michael Natterer -Date: Fri Sep 17 23:12:42 2010 +0200 +Date: Fri Sep 17 23:12:42 2010 +0200 app: enable double buffering when editing vectors @@ -54459,7 +55316,7 @@ commit cca92570184a0b1bd901776fb053601fcdad6cec Author: Michael Natterer -Date: Fri Sep 17 22:50:20 2010 +0200 +Date: Fri Sep 17 22:50:20 2010 +0200 app: add functions to set the vectors' cairo style @@ -54474,7 +55331,7 @@ commit 8e33205b6598d8af28c630d82265338bae3ead94 Author: Michael Natterer -Date: Fri Sep 17 22:29:51 2010 +0200 +Date: Fri Sep 17 22:29:51 2010 +0200 app: draw all vectors strokes with one cairo_stroke() @@ -54483,7 +55340,7 @@ commit 4e3775b7c52bda7dab7a7296ff833ef023a9e094 Author: Simon Budig -Date: Fri Sep 17 22:27:28 2010 +0200 +Date: Fri Sep 17 22:27:28 2010 +0200 app: another rounding fix, style cleanups. @@ -54493,7 +55350,7 @@ commit 610b6a23e2b9f6a46d51ba0cb72469bf4d1f0251 Author: Simon Budig -Date: Fri Sep 17 21:57:08 2010 +0200 +Date: Fri Sep 17 21:57:08 2010 +0200 app: properly round the bounding box in the move tool @@ -54502,7 +55359,7 @@ commit ae0cf760ab0673658783585bc2a5f29a4dd11cc9 Author: Sven Neumann -Date: Fri Sep 17 21:32:38 2010 +0200 +Date: Fri Sep 17 21:32:38 2010 +0200 app: only expose the area covered by the vectors object @@ -54515,7 +55372,7 @@ commit ec2be9b415fab986d67211ff4a0f04b1bb3a6c34 Author: Sven Neumann -Date: Fri Sep 17 21:31:55 2010 +0200 +Date: Fri Sep 17 21:31:55 2010 +0200 app: cache bounding box of GimpVectors object @@ -54529,7 +55386,7 @@ commit 8cfb8c2143d00da5e2377c70d1c1dc85f0ef153d Author: Sven Neumann -Date: Fri Sep 17 21:28:30 2010 +0200 +Date: Fri Sep 17 21:28:30 2010 +0200 app: update vectors from the freeze handler as well @@ -54542,7 +55399,7 @@ commit 97912b481e8313755d3ca2a2d2f7e0820c2170ee Author: Michael Natterer -Date: Fri Sep 17 16:09:30 2010 +0200 +Date: Fri Sep 17 16:09:30 2010 +0200 app: move variables to local scopes in gimp_vectors_bounds() @@ -54551,7 +55408,7 @@ commit 6bce0641d4a92877310705819696afd9d38f82d2 Author: Michael Natterer -Date: Fri Sep 17 11:31:57 2010 +0200 +Date: Fri Sep 17 11:31:57 2010 +0200 app: add signal GimpImage::update_vectors() and have the image manage updates @@ -54561,18 +55418,18 @@ accordingly. Add an update-vectors signal handler to GimpDisplayShell and remove all other vectors handlers. - app/core/gimpimage-private.h | 4 ++ - app/core/gimpimage.c | 112 + app/core/gimpimage-private.h | 4 ++ + app/core/gimpimage.c | 112 ++++++++++++++++++++++++++++++ - app/core/gimpimage.h | 5 ++ + app/core/gimpimage.h | 5 ++ app/display/gimpdisplayshell-handlers.c | 117 ++++++-------------------------- - app/display/gimpdisplayshell.h | 4 -- + app/display/gimpdisplayshell.h | 4 -- 5 files changed, 141 insertions(+), 101 deletions(-) commit 372e7316b7953fbfc0b26a138df9ea91850922ca Author: Sven Neumann -Date: Fri Sep 17 00:12:38 2010 +0200 +Date: Fri Sep 17 00:12:38 2010 +0200 app: adjust line style for cairo-drawn vectors @@ -54581,17 +55438,17 @@ commit 31fb4c955966074b5645b0daeb47cb13dd791d82 Author: Sven Neumann -Date: Thu Sep 16 23:27:25 2010 +0200 +Date: Thu Sep 16 23:27:25 2010 +0200 app: use GSlice for GimpBezierDesc app/vectors/gimpbezierstroke.c | 2 +- - app/vectors/gimpvectors.c | 11 +++++------ + app/vectors/gimpvectors.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) commit 72b25fd35574592d0116e9a28c4f7d195fb547af Author: Sven Neumann -Date: Thu Sep 16 23:09:14 2010 +0200 +Date: Thu Sep 16 23:09:14 2010 +0200 app: let the vectors tool draw vectors the old way again @@ -54603,7 +55460,7 @@ commit a9a20e8c616cb50e42676bba7d2d706033dc39ee Author: Sven Neumann -Date: Thu Sep 16 21:51:23 2010 +0200 +Date: Thu Sep 16 21:51:23 2010 +0200 app: cleanup of vectors rendering @@ -54615,7 +55472,7 @@ commit 5abae32923fa6d76e9aa023110695c08ddaf70a4 Author: Sven Neumann -Date: Thu Sep 16 21:36:51 2010 +0200 +Date: Thu Sep 16 21:36:51 2010 +0200 app: cache bezier representation in GimpVectors object @@ -54628,32 +55485,32 @@ and thawn whenever it is changed... app/display/gimpdisplayshell-draw.c | 10 ++------- - app/vectors/gimpvectors.c | 41 + app/vectors/gimpvectors.c | 41 +++++++++++++++++++++++++++++++---- - app/vectors/gimpvectors.h | 16 ++++++++------ + app/vectors/gimpvectors.h | 16 ++++++++------ app/widgets/gimpviewrenderervectors.c | 15 +++++-------- devel-docs/app/app-sections.txt | 2 +- 5 files changed, 55 insertions(+), 29 deletions(-) commit 5ab83e72ac2e4e0be5ef8b98edf870e60419ff67 Author: Sven Neumann -Date: Sun Sep 12 00:08:17 2010 +0200 +Date: Sun Sep 12 00:08:17 2010 +0200 app: don't let the vectors tool draw the active vectors Let the display shell deal with drawing the vectors. The vectors tool only draws the handles on the active vectors object. - app/display/gimpdisplayshell-draw.c | 54 ++++++++++++++++++++--- + app/display/gimpdisplayshell-draw.c | 54 ++++++++++++++++++++--- app/display/gimpdisplayshell-handlers.c | 18 ++++++++ - app/tools/gimpdrawtool.h | 2 - - app/tools/gimpvectortool.c | 77 + app/tools/gimpdrawtool.h | 2 - + app/tools/gimpvectortool.c | 77 ++++----------------------------- 4 files changed, 75 insertions(+), 76 deletions(-) commit 4c57e3f19e54d2527abc8ee69bbd000ac7ff4441 Author: Sven Neumann -Date: Sat Sep 11 23:37:17 2010 +0200 +Date: Sat Sep 11 23:37:17 2010 +0200 app: port GimpVectors drawing to cairo @@ -54661,18 +55518,18 @@ to follow. app/display/gimpdisplayshell-callbacks.c | 7 +++- - app/display/gimpdisplayshell-draw.c | 66 + app/display/gimpdisplayshell-draw.c | 66 +++++++++++++++++--------------- - app/display/gimpdisplayshell-draw.h | 5 +-- - app/display/gimpdisplayshell-expose.c | 11 ++++++ - app/display/gimpdisplayshell-expose.h | 2 + + app/display/gimpdisplayshell-draw.h | 5 +-- + app/display/gimpdisplayshell-expose.c | 11 ++++++ + app/display/gimpdisplayshell-expose.h | 2 + app/display/gimpdisplayshell-handlers.c | 18 ++++----- - app/display/gimpdisplayshell.c | 4 -- + app/display/gimpdisplayshell.c | 4 -- 7 files changed, 63 insertions(+), 50 deletions(-) commit 81182d93f7d26858949680642ab5bcf759d0b141 Author: Sven Neumann -Date: Thu Sep 16 21:06:56 2010 +0200 +Date: Thu Sep 16 21:06:56 2010 +0200 app: use gimp_label_set_attributes() instead of markup @@ -54685,7 +55542,7 @@ commit 16491ce8a8caa21fed749f6f05adf7f17fa7c1ff Author: Michael Natterer -Date: Thu Sep 16 20:58:21 2010 +0200 +Date: Thu Sep 16 20:58:21 2010 +0200 pygimp: completely undeprecate pygimp-image.c @@ -54697,7 +55554,7 @@ commit 98d8d686e871c2d3ec4f4103fb894e1ccd25ddc8 Author: Michael Natterer -Date: Thu Sep 16 20:53:15 2010 +0200 +Date: Thu Sep 16 20:53:15 2010 +0200 pygimp: don't use gimp_image,layer_scale_full() @@ -54707,17 +55564,17 @@ commit aa55a982497e910862d4feef9818f16ba5f37c27 Author: Michael Natterer -Date: Thu Sep 16 20:36:14 2010 +0200 +Date: Thu Sep 16 20:36:14 2010 +0200 pdb: #include "gimpgrouplayer.h" in layers-cmds.c - app/pdb/layer-cmds.c | 1 + + app/pdb/layer-cmds.c | 1 + tools/pdbgen/pdb/layer.pdb | 1 + 2 files changed, 2 insertions(+) commit 54001221d75cb6b7b928a86635791da02f42b6cf Author: Michael Natterer -Date: Thu Sep 16 20:33:56 2010 +0200 +Date: Thu Sep 16 20:33:56 2010 +0200 pdb: deprecate gimp_layer_scale_full() and gimp_image_scale_full() @@ -54725,8 +55582,8 @@ interpolation property and update the documentation accordingly. app/pdb/context-cmds.c | 2 +- - app/pdb/image-cmds.c | 14 ++++++++------ - app/pdb/layer-cmds.c | 14 ++++++++------ + app/pdb/image-cmds.c | 14 ++++++++------ + app/pdb/layer-cmds.c | 14 ++++++++------ libgimp/gimpcontext_pdb.c | 5 +++-- libgimp/gimpimage_pdb.c | 12 +++--------- libgimp/gimpimage_pdb.h | 2 ++ @@ -54739,7 +55596,7 @@ commit 46e4fa93b2d5408176205587c42f83dd6c770556 Author: Michael Natterer -Date: Thu Sep 16 20:16:12 2010 +0200 +Date: Thu Sep 16 20:16:12 2010 +0200 app: take the default value of GimpPDBContext::interpolation from gimprc @@ -54749,7 +55606,7 @@ commit 2643107912f4ca078c77640dc42875f5edb0ad56 Author: Massimo Valentini -Date: Thu Sep 16 19:47:37 2010 +0200 +Date: Thu Sep 16 19:47:37 2010 +0200 Bug 623850 - (Paco) Recursive Gaussian Filter error @@ -54758,7 +55615,7 @@ commit ec7fc273d89be8652e31b2a2283b861b3710af36 Author: Martin Nordholts -Date: Thu Sep 16 17:46:10 2010 +0200 +Date: Thu Sep 16 17:46:10 2010 +0200 Bug 629436 - the current tool is not shown in the tool options dialog @@ -54767,20 +55624,20 @@ commit d64bf1ee14144a937dd5a64d47e68d9b9fa5a269 Author: Michael Natterer -Date: Thu Sep 16 00:50:28 2010 +0200 +Date: Thu Sep 16 00:50:28 2010 +0200 pdb: deprecate the entire drawable transform API - app/pdb/drawable-transform-cmds.c | 96 ++++++------- - libgimp/gimpdrawabletransform_pdb.c | 162 +++------------------- - libgimp/gimpdrawabletransform_pdb.h | 2 + + app/pdb/drawable-transform-cmds.c | 96 ++++++------- + libgimp/gimpdrawabletransform_pdb.c | 162 +++------------------- + libgimp/gimpdrawabletransform_pdb.h | 2 + tools/pdbgen/pdb/drawable_transform.pdb | 231 +++----------------------------- 4 files changed, 85 insertions(+), 406 deletions(-) commit 4d3b52ec6ced2b0ecfb28c8c90e1f4b415babf1e Author: Michael Natterer -Date: Thu Sep 16 00:36:03 2010 +0200 +Date: Thu Sep 16 00:36:03 2010 +0200 pdb: return the resulting floating selection in the item transform API @@ -54790,80 +55647,80 @@ the old procedures keep their semantics (and will all be deprecated anyway). - app/core/gimpdrawable-transform.c | 87 ++++++++------- - app/core/gimpdrawable-transform.h | 94 ++++++++-------- - app/pdb/drawable-transform-cmds.c | 190 + app/core/gimpdrawable-transform.c | 87 ++++++++------- + app/core/gimpdrawable-transform.h | 94 ++++++++-------- + app/pdb/drawable-transform-cmds.c | 190 +++++++++++++++++++------------- - app/pdb/item-transform-cmds.c | 177 + app/pdb/item-transform-cmds.c | 177 +++++++++++++++++++---------- - app/pdb/transform-tools-cmds.c | 75 +++++++------ + app/pdb/transform-tools-cmds.c | 75 +++++++------ tools/pdbgen/pdb/drawable_transform.pdb | 46 +++++--- - tools/pdbgen/pdb/item_transform.pdb | 51 ++++++--- - tools/pdbgen/pdb/transform_tools.pdb | 75 +++++++------ + tools/pdbgen/pdb/item_transform.pdb | 51 ++++++--- + tools/pdbgen/pdb/transform_tools.pdb | 75 +++++++------ 8 files changed, 476 insertions(+), 319 deletions(-) commit c6e93e4f5ac16195fc0a0906b367b48fd29d048e Author: Michael Natterer -Date: Wed Sep 15 22:07:36 2010 +0200 +Date: Wed Sep 15 22:07:36 2010 +0200 pdb: generate nicer gtk-doc comments (no doc contents changed) - libgimp/gimpbrush_pdb.c | 44 +++++----- - libgimp/gimpbrushes_pdb.c | 12 +-- - libgimp/gimpbrushselect_pdb.c | 6 +- - libgimp/gimpbuffer_pdb.c | 14 +-- - libgimp/gimpchannel_pdb.c | 20 ++--- - libgimp/gimpcolor_pdb.c | 32 +++---- - libgimp/gimpcontext_pdb.c | 78 ++++++++--------- - libgimp/gimpconvert_pdb.c | 8 +- - libgimp/gimpdisplay_pdb.c | 12 +-- - libgimp/gimpdrawable_pdb.c | 46 +++++----- - libgimp/gimpdrawabletransform_pdb.c | 32 +++---- - libgimp/gimpedit_pdb.c | 34 ++++---- - libgimp/gimpfileops_pdb.c | 22 ++--- - libgimp/gimpfloatingsel_pdb.c | 12 +-- - libgimp/gimpfonts_pdb.c | 4 +- - libgimp/gimpfontselect_pdb.c | 6 +- - libgimp/gimpgimprc_pdb.c | 16 ++-- - libgimp/gimpgradient_pdb.c | 62 ++++++------- - libgimp/gimpgradients_pdb.c | 10 +-- - libgimp/gimpgradientselect_pdb.c | 6 +- - libgimp/gimpgrid_pdb.c | 20 ++--- - libgimp/gimpguides_pdb.c | 12 +-- - libgimp/gimphelp_pdb.c | 2 +- - libgimp/gimpimage_pdb.c | 170 + libgimp/gimpbrush_pdb.c | 44 +++++----- + libgimp/gimpbrushes_pdb.c | 12 +-- + libgimp/gimpbrushselect_pdb.c | 6 +- + libgimp/gimpbuffer_pdb.c | 14 +-- + libgimp/gimpchannel_pdb.c | 20 ++--- + libgimp/gimpcolor_pdb.c | 32 +++---- + libgimp/gimpcontext_pdb.c | 78 ++++++++--------- + libgimp/gimpconvert_pdb.c | 8 +- + libgimp/gimpdisplay_pdb.c | 12 +-- + libgimp/gimpdrawable_pdb.c | 46 +++++----- + libgimp/gimpdrawabletransform_pdb.c | 32 +++---- + libgimp/gimpedit_pdb.c | 34 ++++---- + libgimp/gimpfileops_pdb.c | 22 ++--- + libgimp/gimpfloatingsel_pdb.c | 12 +-- + libgimp/gimpfonts_pdb.c | 4 +- + libgimp/gimpfontselect_pdb.c | 6 +- + libgimp/gimpgimprc_pdb.c | 16 ++-- + libgimp/gimpgradient_pdb.c | 62 ++++++------- + libgimp/gimpgradients_pdb.c | 10 +-- + libgimp/gimpgradientselect_pdb.c | 6 +- + libgimp/gimpgrid_pdb.c | 20 ++--- + libgimp/gimpguides_pdb.c | 12 +-- + libgimp/gimphelp_pdb.c | 2 +- + libgimp/gimpimage_pdb.c | 170 ++++++++++++++++++------------------ - libgimp/gimpitem_pdb.c | 48 +++++----- - libgimp/gimpitemtransform_pdb.c | 18 ++-- - libgimp/gimplayer_pdb.c | 62 ++++++------- - libgimp/gimpmessage_pdb.c | 6 +- - libgimp/gimpmisc_pdb.c | 4 +- - libgimp/gimppainttools_pdb.c | 34 ++++---- - libgimp/gimppalette_pdb.c | 30 +++---- - libgimp/gimppalettes_pdb.c | 8 +- - libgimp/gimppaletteselect_pdb.c | 6 +- - libgimp/gimpparasite_pdb.c | 40 ++++----- - libgimp/gimppaths_pdb.c | 30 +++---- - libgimp/gimppattern_pdb.c | 4 +- - libgimp/gimppatterns_pdb.c | 8 +- - libgimp/gimppatternselect_pdb.c | 6 +- - libgimp/gimpplugin_pdb.c | 14 +-- - libgimp/gimpproceduraldb_pdb.c | 20 ++--- - libgimp/gimpprogress_pdb.c | 18 ++-- - libgimp/gimpselection_pdb.c | 34 ++++---- - libgimp/gimpselectiontools_pdb.c | 16 ++-- - libgimp/gimptextlayer_pdb.c | 62 ++++++------- - libgimp/gimptexttool_pdb.c | 8 +- - libgimp/gimptransformtools_pdb.c | 12 +-- - libgimp/gimpundo_pdb.c | 14 +-- - libgimp/gimpunit_pdb.c | 24 ++--- - libgimp/gimpvectors_pdb.c | 52 +++++------ - tools/pdbgen/lib.pl | 2 +- + libgimp/gimpitem_pdb.c | 48 +++++----- + libgimp/gimpitemtransform_pdb.c | 18 ++-- + libgimp/gimplayer_pdb.c | 62 ++++++------- + libgimp/gimpmessage_pdb.c | 6 +- + libgimp/gimpmisc_pdb.c | 4 +- + libgimp/gimppainttools_pdb.c | 34 ++++---- + libgimp/gimppalette_pdb.c | 30 +++---- + libgimp/gimppalettes_pdb.c | 8 +- + libgimp/gimppaletteselect_pdb.c | 6 +- + libgimp/gimpparasite_pdb.c | 40 ++++----- + libgimp/gimppaths_pdb.c | 30 +++---- + libgimp/gimppattern_pdb.c | 4 +- + libgimp/gimppatterns_pdb.c | 8 +- + libgimp/gimppatternselect_pdb.c | 6 +- + libgimp/gimpplugin_pdb.c | 14 +-- + libgimp/gimpproceduraldb_pdb.c | 20 ++--- + libgimp/gimpprogress_pdb.c | 18 ++-- + libgimp/gimpselection_pdb.c | 34 ++++---- + libgimp/gimpselectiontools_pdb.c | 16 ++-- + libgimp/gimptextlayer_pdb.c | 62 ++++++------- + libgimp/gimptexttool_pdb.c | 8 +- + libgimp/gimptransformtools_pdb.c | 12 +-- + libgimp/gimpundo_pdb.c | 14 +-- + libgimp/gimpunit_pdb.c | 24 ++--- + libgimp/gimpvectors_pdb.c | 52 +++++------ + tools/pdbgen/lib.pl | 2 +- 50 files changed, 630 insertions(+), 630 deletions(-) commit bbc44c9a6bbb4ff8d7da6a718130f71d52625822 Author: Michael Natterer -Date: Wed Sep 15 22:02:53 2010 +0200 +Date: Wed Sep 15 22:02:53 2010 +0200 pdb: remove obsolete includes @@ -54873,7 +55730,7 @@ commit 38b9b4117e8bc6980312506ee2dd86afd248c064 Author: Michael Natterer -Date: Wed Sep 15 21:51:53 2010 +0200 +Date: Wed Sep 15 21:51:53 2010 +0200 pdb: deprecate gimp-drawable-is-text-layer and add gimp-item-is-text-layer @@ -54881,9 +55738,9 @@ app/pdb/drawable-cmds.c | 58 ------------------------------------------ app/pdb/gimp-pdb-compat.c | 1 + - app/pdb/item-cmds.c | 59 + app/pdb/item-cmds.c | 59 +++++++++++++++++++++++++++++++++++++++++++ - libgimp/gimp.def | 1 + + libgimp/gimp.def | 1 + libgimp/gimpdrawable.c | 16 ++++++++++++ libgimp/gimpdrawable.h | 1 + libgimp/gimpdrawable_pdb.c | 33 ------------------------ @@ -54896,7 +55753,7 @@ commit c56f0568c5dc51fa6741c772ad28e1480d9189c8 Author: Michael Natterer -Date: Wed Sep 15 21:43:03 2010 +0200 +Date: Wed Sep 15 21:43:03 2010 +0200 pdb: remove deprecated drawable procedures @@ -54915,7 +55772,7 @@ commit ddd3464706a2bc911e0ff77737fd8fb69f936300 Author: Michael Natterer -Date: Wed Sep 15 21:26:31 2010 +0200 +Date: Wed Sep 15 21:26:31 2010 +0200 pdb: forgot a few in the last commit @@ -54924,7 +55781,7 @@ commit ec3615127778a8396297c34bdb05f5212883b68e Author: Michael Natterer -Date: Wed Sep 15 21:22:53 2010 +0200 +Date: Wed Sep 15 21:22:53 2010 +0200 pdb: don't have compat aliases for procedures which are deprecated themselves @@ -54936,25 +55793,25 @@ commit 548d2e041d47df3e3f295b2b16edd30e8b57af4c Author: Michael Natterer -Date: Wed Sep 15 21:18:47 2010 +0200 +Date: Wed Sep 15 21:18:47 2010 +0200 pdb: clean up gimp-layer-group-new There is no need to wrap it with a function with identical signature. Also move it next to the other layer-new functions. - app/pdb/layer-cmds.c | 122 + app/pdb/layer-cmds.c | 122 ++++++++++++++++++++++----------------------- - libgimp/gimplayer.c | 19 ------- - libgimp/gimplayer.h | 1 - + libgimp/gimplayer.c | 19 ------- + libgimp/gimplayer.h | 1 - libgimp/gimplayer_pdb.c | 70 +++++++++++++------------- - libgimp/gimplayer_pdb.h | 2 +- + libgimp/gimplayer_pdb.h | 2 +- tools/pdbgen/pdb/layer.pdb | 70 +++++++++++++------------- 6 files changed, 132 insertions(+), 152 deletions(-) commit 97b35ab3324208725f6d9ed48af90283dd3b5be3 Author: Michael Natterer -Date: Wed Sep 15 21:13:22 2010 +0200 +Date: Wed Sep 15 21:13:22 2010 +0200 pdb: remove deprecated vectors procedures @@ -54966,10 +55823,10 @@ app/pdb/internal-procs.c | 2 +- app/pdb/vectors-cmds.c | 556 ------------------------------------------- - libgimp/Makefile.am | 3 + - libgimp/gimp.h | 1 + - libgimp/gimpvectors.c | 197 +++++++++++++++ - libgimp/gimpvectors.h | 48 ++++ + libgimp/Makefile.am | 3 + + libgimp/gimp.h | 1 + + libgimp/gimpvectors.c | 197 +++++++++++++++ + libgimp/gimpvectors.h | 48 ++++ libgimp/gimpvectors_pdb.c | 308 ------------------------ libgimp/gimpvectors_pdb.h | 18 -- tools/pdbgen/pdb/vectors.pdb | 228 +----------------- @@ -54977,7 +55834,7 @@ commit f1cf31f9da3304d8d8a9f9afbb0da94638b35e38 Author: Michael Natterer -Date: Wed Sep 15 16:36:16 2010 +0200 +Date: Wed Sep 15 16:36:16 2010 +0200 app: don't pass default names to gimp_drawable_configure() @@ -54990,37 +55847,37 @@ commit 2f62347bf61b74260cb44f98bf19d7263a00006d Author: Barak Itkin -Date: Wed Sep 15 00:02:28 2010 +0200 +Date: Wed Sep 15 00:02:28 2010 +0200 pdb: Add a more detailed description to the gimp_image_insert functions - app/pdb/image-cmds.c | 6 +++--- + app/pdb/image-cmds.c | 6 +++--- libgimp/gimpimage_pdb.c | 24 +++++++++++++++++------- tools/pdbgen/pdb/image.pdb | 28 +++++++++++++++++++--------- 3 files changed, 39 insertions(+), 19 deletions(-) commit 3cb663296386573f015c163a8a537dc50a51e535 Author: Barak Itkin -Date: Wed Sep 15 00:00:49 2010 +0200 +Date: Wed Sep 15 00:00:49 2010 +0200 pdb: Some fixes to the commit that added gimp_layer_group_new() libgimp/gimplayer.c | 38 +++++++++++++++++++------------------- - libgimp/gimplayer.h | 2 ++ + libgimp/gimplayer.h | 2 ++ 2 files changed, 21 insertions(+), 19 deletions(-) commit 805a971d998f737b35f1572e8551b912651455d7 Author: Barak Itkin -Date: Tue Sep 14 22:38:34 2010 +0200 +Date: Tue Sep 14 22:38:34 2010 +0200 pdb: add the procedure gimp_layer_group_new app/pdb/internal-procs.c | 2 +- - app/pdb/layer-cmds.c | 61 + app/pdb/layer-cmds.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ - libgimp/gimp.def | 1 + - libgimp/gimplayer.c | 19 +++++++++++++++ + libgimp/gimp.def | 1 + + libgimp/gimplayer.c | 19 +++++++++++++++ libgimp/gimplayer_pdb.c | 35 ++++++++++++++++++++++++++ libgimp/gimplayer_pdb.h | 1 + tools/pdbgen/pdb/layer.pdb | 35 +++++++++++++++++++++++++- @@ -55028,7 +55885,7 @@ commit 558e4331ddc5728d6cf92d3b1457d70852eb355c Author: Kjartan Maraas -Date: Tue Sep 14 21:47:43 2010 +0200 +Date: Tue Sep 14 21:47:43 2010 +0200 Updated Norwegian bokmål translation @@ -55038,19 +55895,19 @@ commit a885824f70f8d1a94d26a63cb358c5e19b50ae51 Author: Michael Natterer -Date: Tue Sep 14 14:38:35 2010 +0200 +Date: Tue Sep 14 14:38:35 2010 +0200 pdb: add barak_pdb_misc() instead of replicating the author information tools/pdbgen/pdb/text_layer.pdb | 10 ++-------- - tools/pdbgen/pdb/vectors.pdb | 5 +---- - tools/pdbgen/stddefs.pdb | 4 ++++ + tools/pdbgen/pdb/vectors.pdb | 5 +---- + tools/pdbgen/stddefs.pdb | 4 ++++ 3 files changed, 7 insertions(+), 12 deletions(-) commit 309985d169a8be902b8a2fc1510d93710d07c73f Author: Michael Natterer -Date: Tue Sep 14 09:26:38 2010 +0200 +Date: Tue Sep 14 09:26:38 2010 +0200 cursors: add the new color picker cursor files to CLEANFILES @@ -55059,7 +55916,7 @@ commit 1135f2db926ebadda6c72f043cb2d7a6fcfa3003 Author: Barak Itkin -Date: Mon Sep 13 02:55:20 2010 +0200 +Date: Mon Sep 13 02:55:20 2010 +0200 Bug 624487 - Fix incorrect "wrap mode" documentation values in Edge plug-in @@ -55069,7 +55926,7 @@ commit 90eda12905273aa1ab0b53bcf3898e2a61037367 Author: Seth Burgess -Date: Mon Sep 13 02:08:05 2010 +0200 +Date: Mon Sep 13 02:08:05 2010 +0200 plug-ins: Fix preview in Difference of Gaussians @@ -55080,22 +55937,22 @@ commit d62c287fced53488214b246ae910ec4ccb43e63d Author: Michael Natterer -Date: Mon Sep 13 02:16:18 2010 +0200 +Date: Mon Sep 13 02:16:18 2010 +0200 libgimpwidgets: remove the pixbuf inline data garbage from GimpPickButton Instead, generate a proper header for inclusion in cursors/. - cursors/.gitignore | 2 + - cursors/Makefile.am | 19 ++- + cursors/.gitignore | 2 + + cursors/Makefile.am | 19 ++- libgimpwidgets/gimppickbutton.c | 313 +--------------------------------------- 3 files changed, 22 insertions(+), 312 deletions(-) commit 0097286a452df53f00cb07d9e5837b0131178add Author: Barak Itkin -Date: Sun Sep 12 18:51:38 2010 +0200 +Date: Sun Sep 12 18:51:38 2010 +0200 plug-ins: remove execute permission from common/file-pdf-save.c @@ -55104,7 +55961,7 @@ commit 3c2f0809e3280066423db6f0d289aa3a7b625ced Author: Martin Nordholts -Date: Sun Sep 12 18:37:00 2010 +0200 +Date: Sun Sep 12 18:37:00 2010 +0200 app/tests: Increase GIMP_UI_WINDOW_POSITION_EPSILON @@ -55112,7 +55969,7 @@ failed with assertion failed ((int)abs (y_before_hide - y_after_show) <= - GIMP_UI_WINDOW_POSITION_EPSILON): (21 <= 10) + GIMP_UI_WINDOW_POSITION_EPSILON): (21 <= 10) so appearently we need to be more liberal. @@ -55121,7 +55978,7 @@ commit fb53ac6c3af26a8a7704b26395666166c91502de Author: Michael Natterer -Date: Sun Sep 12 02:44:00 2010 +0200 +Date: Sun Sep 12 02:44:00 2010 +0200 plug-ins: create the GimpPickButton from pixbuf inline data @@ -55133,7 +55990,7 @@ commit 0f28b38a5513415156f572a94a37e72afcf8a0cd Author: Michael Natterer -Date: Sun Sep 12 00:57:13 2010 +0200 +Date: Sun Sep 12 00:57:13 2010 +0200 libgimpwidgets: set page_size to 0 on adjustments used for spin buttons @@ -55146,7 +56003,7 @@ commit 3c152550302097812a33c1cec7c3aad669fae4ae Author: Michael Natterer -Date: Sun Sep 12 00:53:59 2010 +0200 +Date: Sun Sep 12 00:53:59 2010 +0200 plug-ins: port curve-bend curve drawing to cairo @@ -55156,19 +56013,19 @@ commit 9c8736a56f644f9ac8afa464096bcfec00d8e766 Author: Sven Neumann -Date: Sat Sep 11 23:00:48 2010 +0200 +Date: Sat Sep 11 23:00:48 2010 +0200 app: formatting - app/core/gimpimage-grid.c | 3 ++- - app/core/gimpimage-guides.c | 6 ++++-- + app/core/gimpimage-grid.c | 3 ++- + app/core/gimpimage-guides.c | 6 ++++-- app/vectors/gimpbezierstroke.h | 2 -- - app/vectors/gimpvectors.c | 1 + + app/vectors/gimpvectors.c | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) commit 885147717a9ec472be7b110100fcc7502a515977 Author: Michael Natterer -Date: Sat Sep 11 22:39:05 2010 +0200 +Date: Sat Sep 11 22:39:05 2010 +0200 libgimpwidgets: port GimpOffsetArea drawing to cairo @@ -55180,7 +56037,7 @@ commit 1770615125e489e7477ad50f748892eef8fc8494 Author: Michael Natterer -Date: Sat Sep 11 22:24:08 2010 +0200 +Date: Sat Sep 11 22:24:08 2010 +0200 libgimpwidgets: ports GimpColorSelect marker drawing to cairo @@ -55190,7 +56047,7 @@ commit 251177f18df9c8619b7595b36a2ccd42a7e3b607 Author: Michael Natterer -Date: Sat Sep 11 22:06:00 2010 +0200 +Date: Sat Sep 11 22:06:00 2010 +0200 libgimpwidgets: fix GimpColorScale arrows to be as small as before @@ -55199,7 +56056,7 @@ commit 22d5dc9752d329981b2e07108c90285b8c1d2aa3 Author: Sven Neumann -Date: Sat Sep 11 21:34:58 2010 +0200 +Date: Sat Sep 11 21:34:58 2010 +0200 app: formatting @@ -55208,7 +56065,7 @@ commit 9ffaf94170269b9ee976b772d1319fac8cbf24c6 Author: Simon Budig -Date: Sat Sep 11 01:51:13 2010 +0200 +Date: Sat Sep 11 01:51:13 2010 +0200 fix path import of polylines/polygons @@ -55217,7 +56074,7 @@ commit 354a640e9e8631b2cd8782e68a9bf0a06c276284 Author: Michael Natterer -Date: Fri Sep 10 21:27:42 2010 +0200 +Date: Fri Sep 10 21:27:42 2010 +0200 libgimpwidgets: port the rest of GimpColorScale drawing to cairo @@ -55227,7 +56084,7 @@ commit f6761e79a9a6b35c5ab2de2c753cdff502e94c04 Author: Martin Nordholts -Date: Fri Sep 10 21:21:01 2010 +0200 +Date: Fri Sep 10 21:21:01 2010 +0200 po: Update POTFILES.in @@ -55236,7 +56093,7 @@ commit e617ecedd9039ab48b6b3e6cb714e0b98966c3e5 Author: Michael Natterer -Date: Fri Sep 10 20:57:06 2010 +0200 +Date: Fri Sep 10 20:57:06 2010 +0200 libgimpwidgets: port GimpColorScale slider drawing to cairo @@ -55246,7 +56103,7 @@ commit 8b4bcbb9e13f9e7f373b8ea0f8de07d5f422b3a1 Author: Michael Natterer -Date: Fri Sep 10 19:53:48 2010 +0200 +Date: Fri Sep 10 19:53:48 2010 +0200 libgimpwidgets: port GimpColorArea drawing to cairo @@ -55260,7 +56117,7 @@ commit 7f9a4d51f742df8446dc17adca9859837ed5ed72 Author: Michael Natterer -Date: Fri Sep 10 19:12:52 2010 +0200 +Date: Fri Sep 10 19:12:52 2010 +0200 app: get rid of using gdk_draw to construct bitmap cursors @@ -55269,208 +56126,208 @@ for old X servers), add the bitmaps as proper PNGs and simply use them as RGBA cursors. - app/widgets/gimpcursor.c | 792 + app/widgets/gimpcursor.c | 792 ++++++------------------ - cursors/Makefile.am | 317 ++++------ - cursors/cursor-bad-bw.png | Bin 0 -> 211 bytes - cursors/cursor-color-picker-bw.png | Bin 0 -> 222 bytes - cursors/cursor-corner-bottom-left-bw.png | Bin 0 -> 198 bytes - cursors/cursor-corner-bottom-right-bw.png | Bin 0 -> 158 bytes - cursors/cursor-corner-top-left-bw.png | Bin 0 -> 268 bytes - cursors/cursor-corner-top-right-bw.png | Bin 0 -> 207 bytes - cursors/cursor-crosshair-bw.png | Bin 0 -> 156 bytes - cursors/cursor-crosshair-small-bw.png | Bin 0 -> 146 bytes - cursors/cursor-mouse-bw.png | Bin 0 -> 180 bytes - cursors/cursor-move-bw.png | Bin 0 -> 196 bytes - cursors/cursor-none-bw.png | Bin 0 -> 96 bytes - cursors/cursor-side-bottom-bw.png | Bin 0 -> 166 bytes - cursors/cursor-side-left-bw.png | Bin 0 -> 181 bytes - cursors/cursor-side-right-bw.png | Bin 0 -> 182 bytes - cursors/cursor-side-top-bw.png | Bin 0 -> 171 bytes - cursors/cursor-zoom-bw.png | Bin 0 -> 203 bytes - cursors/tool-airbrush-bw.png | Bin 0 -> 220 bytes - cursors/tool-blend-bw.png | Bin 0 -> 179 bytes - cursors/tool-blur-bw.png | Bin 0 -> 204 bytes - cursors/tool-bucket-fill-bw.png | Bin 0 -> 214 bytes - cursors/tool-burn-bw.png | Bin 0 -> 189 bytes - cursors/tool-clone-bw.png | Bin 0 -> 207 bytes - cursors/tool-color-picker-bw.png | Bin 0 -> 213 bytes - cursors/tool-crop-bw.png | Bin 0 -> 184 bytes - cursors/tool-dodge-bw.png | Bin 0 -> 189 bytes - cursors/tool-ellipse-select-bw.png | Bin 0 -> 188 bytes - cursors/tool-eraser-bw.png | Bin 0 -> 190 bytes - cursors/tool-flip-horizontal-bw.png | Bin 0 -> 155 bytes - cursors/tool-flip-vertical-bw.png | Bin 0 -> 174 bytes - cursors/tool-free-select-bw.png | Bin 0 -> 210 bytes - cursors/tool-fuzzy-select-bw.png | Bin 0 -> 227 bytes - cursors/tool-hand-bw.png | Bin 0 -> 218 bytes - cursors/tool-heal-bw.png | Bin 0 -> 883 bytes - cursors/tool-ink-bw.png | Bin 0 -> 238 bytes - cursors/tool-iscissors-bw.png | Bin 0 -> 245 bytes - cursors/tool-measure-bw.png | Bin 0 -> 206 bytes - cursors/tool-move-bw.png | Bin 0 -> 192 bytes - cursors/tool-paintbrush-bw.png | Bin 0 -> 206 bytes - cursors/tool-paths-anchor-bw.png | Bin 0 -> 245 bytes - cursors/tool-paths-bw.png | Bin 0 -> 241 bytes - cursors/tool-paths-control-bw.png | Bin 0 -> 256 bytes - cursors/tool-paths-segment-bw.png | Bin 0 -> 258 bytes - cursors/tool-pencil-bw.png | Bin 0 -> 165 bytes - cursors/tool-perspective-bw.png | Bin 0 -> 174 bytes - cursors/tool-polygon-select-bw.png | Bin 0 -> 219 bytes - cursors/tool-rect-select-bw.png | Bin 0 -> 172 bytes - cursors/tool-resize-bw.png | Bin 0 -> 193 bytes - cursors/tool-rotate-bw.png | Bin 0 -> 255 bytes - cursors/tool-shear-bw.png | Bin 0 -> 173 bytes - cursors/tool-smudge-bw.png | Bin 0 -> 236 bytes - cursors/tool-text-bw.png | Bin 0 -> 191 bytes - cursors/tool-zoom-bw.png | Bin 0 -> 190 bytes - cursors/xbm/cursor-bad-mask.xbm | 17 - - cursors/xbm/cursor-bad.xbm | 17 - - cursors/xbm/cursor-color-picker-mask.xbm | 16 - - cursors/xbm/cursor-color-picker.xbm | 16 - + cursors/Makefile.am | 317 ++++------ + cursors/cursor-bad-bw.png | Bin 0 -> 211 bytes + cursors/cursor-color-picker-bw.png | Bin 0 -> 222 bytes + cursors/cursor-corner-bottom-left-bw.png | Bin 0 -> 198 bytes + cursors/cursor-corner-bottom-right-bw.png | Bin 0 -> 158 bytes + cursors/cursor-corner-top-left-bw.png | Bin 0 -> 268 bytes + cursors/cursor-corner-top-right-bw.png | Bin 0 -> 207 bytes + cursors/cursor-crosshair-bw.png | Bin 0 -> 156 bytes + cursors/cursor-crosshair-small-bw.png | Bin 0 -> 146 bytes + cursors/cursor-mouse-bw.png | Bin 0 -> 180 bytes + cursors/cursor-move-bw.png | Bin 0 -> 196 bytes + cursors/cursor-none-bw.png | Bin 0 -> 96 bytes + cursors/cursor-side-bottom-bw.png | Bin 0 -> 166 bytes + cursors/cursor-side-left-bw.png | Bin 0 -> 181 bytes + cursors/cursor-side-right-bw.png | Bin 0 -> 182 bytes + cursors/cursor-side-top-bw.png | Bin 0 -> 171 bytes + cursors/cursor-zoom-bw.png | Bin 0 -> 203 bytes + cursors/tool-airbrush-bw.png | Bin 0 -> 220 bytes + cursors/tool-blend-bw.png | Bin 0 -> 179 bytes + cursors/tool-blur-bw.png | Bin 0 -> 204 bytes + cursors/tool-bucket-fill-bw.png | Bin 0 -> 214 bytes + cursors/tool-burn-bw.png | Bin 0 -> 189 bytes + cursors/tool-clone-bw.png | Bin 0 -> 207 bytes + cursors/tool-color-picker-bw.png | Bin 0 -> 213 bytes + cursors/tool-crop-bw.png | Bin 0 -> 184 bytes + cursors/tool-dodge-bw.png | Bin 0 -> 189 bytes + cursors/tool-ellipse-select-bw.png | Bin 0 -> 188 bytes + cursors/tool-eraser-bw.png | Bin 0 -> 190 bytes + cursors/tool-flip-horizontal-bw.png | Bin 0 -> 155 bytes + cursors/tool-flip-vertical-bw.png | Bin 0 -> 174 bytes + cursors/tool-free-select-bw.png | Bin 0 -> 210 bytes + cursors/tool-fuzzy-select-bw.png | Bin 0 -> 227 bytes + cursors/tool-hand-bw.png | Bin 0 -> 218 bytes + cursors/tool-heal-bw.png | Bin 0 -> 883 bytes + cursors/tool-ink-bw.png | Bin 0 -> 238 bytes + cursors/tool-iscissors-bw.png | Bin 0 -> 245 bytes + cursors/tool-measure-bw.png | Bin 0 -> 206 bytes + cursors/tool-move-bw.png | Bin 0 -> 192 bytes + cursors/tool-paintbrush-bw.png | Bin 0 -> 206 bytes + cursors/tool-paths-anchor-bw.png | Bin 0 -> 245 bytes + cursors/tool-paths-bw.png | Bin 0 -> 241 bytes + cursors/tool-paths-control-bw.png | Bin 0 -> 256 bytes + cursors/tool-paths-segment-bw.png | Bin 0 -> 258 bytes + cursors/tool-pencil-bw.png | Bin 0 -> 165 bytes + cursors/tool-perspective-bw.png | Bin 0 -> 174 bytes + cursors/tool-polygon-select-bw.png | Bin 0 -> 219 bytes + cursors/tool-rect-select-bw.png | Bin 0 -> 172 bytes + cursors/tool-resize-bw.png | Bin 0 -> 193 bytes + cursors/tool-rotate-bw.png | Bin 0 -> 255 bytes + cursors/tool-shear-bw.png | Bin 0 -> 173 bytes + cursors/tool-smudge-bw.png | Bin 0 -> 236 bytes + cursors/tool-text-bw.png | Bin 0 -> 191 bytes + cursors/tool-zoom-bw.png | Bin 0 -> 190 bytes + cursors/xbm/cursor-bad-mask.xbm | 17 - + cursors/xbm/cursor-bad.xbm | 17 - + cursors/xbm/cursor-color-picker-mask.xbm | 16 - + cursors/xbm/cursor-color-picker.xbm | 16 - cursors/xbm/cursor-corner-bottom-left-mask.xbm | 16 - - cursors/xbm/cursor-corner-bottom-left.xbm | 16 - + cursors/xbm/cursor-corner-bottom-left.xbm | 16 - cursors/xbm/cursor-corner-bottom-right-mask.xbm | 16 - - cursors/xbm/cursor-corner-bottom-right.xbm | 16 - - cursors/xbm/cursor-corner-top-left-mask.xbm | 16 - - cursors/xbm/cursor-corner-top-left.xbm | 16 - - cursors/xbm/cursor-corner-top-right-mask.xbm | 16 - - cursors/xbm/cursor-corner-top-right.xbm | 16 - - cursors/xbm/cursor-crosshair-mask.xbm | 17 - - cursors/xbm/cursor-crosshair-small-mask.xbm | 17 - - cursors/xbm/cursor-crosshair-small.xbm | 17 - - cursors/xbm/cursor-crosshair.xbm | 17 - - cursors/xbm/cursor-mouse-mask.xbm | 17 - - cursors/xbm/cursor-mouse.xbm | 17 - - cursors/xbm/cursor-move-mask.xbm | 16 - - cursors/xbm/cursor-move.xbm | 16 - - cursors/xbm/cursor-none.xbm | 16 - - cursors/xbm/cursor-side-bottom-mask.xbm | 16 - - cursors/xbm/cursor-side-bottom.xbm | 16 - - cursors/xbm/cursor-side-left-mask.xbm | 16 - - cursors/xbm/cursor-side-left.xbm | 16 - - cursors/xbm/cursor-side-right-mask.xbm | 16 - - cursors/xbm/cursor-side-right.xbm | 16 - - cursors/xbm/cursor-side-top-mask.xbm | 16 - - cursors/xbm/cursor-side-top.xbm | 16 - - cursors/xbm/cursor-zoom-mask.xbm | 17 - - cursors/xbm/cursor-zoom.xbm | 17 - - cursors/xbm/modifier-anchor-mask.xbm | 15 - - cursors/xbm/modifier-anchor.xbm | 15 - - cursors/xbm/modifier-background-mask.xbm | 14 - - cursors/xbm/modifier-background.xbm | 14 - - cursors/xbm/modifier-bad-mask.xbm | 14 - - cursors/xbm/modifier-bad.xbm | 14 - - cursors/xbm/modifier-control-mask.xbm | 15 - - cursors/xbm/modifier-control.xbm | 15 - - cursors/xbm/modifier-foreground-mask.xbm | 14 - - cursors/xbm/modifier-foreground.xbm | 14 - - cursors/xbm/modifier-intersect-mask.xbm | 15 - - cursors/xbm/modifier-intersect.xbm | 15 - - cursors/xbm/modifier-join-mask.xbm | 14 - - cursors/xbm/modifier-join.xbm | 14 - - cursors/xbm/modifier-minus-mask.xbm | 15 - - cursors/xbm/modifier-minus.xbm | 15 - - cursors/xbm/modifier-move-mask.xbm | 15 - - cursors/xbm/modifier-move.xbm | 15 - - cursors/xbm/modifier-pattern-mask.xbm | 14 - - cursors/xbm/modifier-pattern.xbm | 14 - - cursors/xbm/modifier-plus-mask.xbm | 15 - - cursors/xbm/modifier-plus.xbm | 15 - - cursors/xbm/modifier-resize-mask.xbm | 15 - - cursors/xbm/modifier-resize.xbm | 15 - - cursors/xbm/modifier-select-mask.xbm | 14 - - cursors/xbm/modifier-select.xbm | 14 - - cursors/xbm/tool-airbrush-mask.xbm | 14 - - cursors/xbm/tool-airbrush.xbm | 14 - - cursors/xbm/tool-blend-mask.xbm | 14 - - cursors/xbm/tool-blend.xbm | 14 - - cursors/xbm/tool-blur-mask.xbm | 14 - - cursors/xbm/tool-blur.xbm | 14 - - cursors/xbm/tool-bucket-fill-mask.xbm | 14 - - cursors/xbm/tool-bucket-fill.xbm | 14 - - cursors/xbm/tool-burn-mask.xbm | 14 - - cursors/xbm/tool-burn.xbm | 14 - - cursors/xbm/tool-clone-mask.xbm | 14 - - cursors/xbm/tool-clone.xbm | 14 - - cursors/xbm/tool-color-picker-mask.xbm | 14 - - cursors/xbm/tool-color-picker.xbm | 14 - - cursors/xbm/tool-crop-mask.xbm | 14 - - cursors/xbm/tool-crop.xbm | 14 - - cursors/xbm/tool-dodge-mask.xbm | 14 - - cursors/xbm/tool-dodge.xbm | 14 - - cursors/xbm/tool-ellipse-select-mask.xbm | 14 - - cursors/xbm/tool-ellipse-select.xbm | 14 - - cursors/xbm/tool-eraser-mask.xbm | 14 - - cursors/xbm/tool-eraser.xbm | 14 - - cursors/xbm/tool-flip-horizontal-mask.xbm | 14 - - cursors/xbm/tool-flip-horizontal.xbm | 14 - - cursors/xbm/tool-flip-vertical-mask.xbm | 14 - - cursors/xbm/tool-flip-vertical.xbm | 14 - - cursors/xbm/tool-free-select-mask.xbm | 14 - - cursors/xbm/tool-free-select.xbm | 14 - - cursors/xbm/tool-fuzzy-select-mask.xbm | 14 - - cursors/xbm/tool-fuzzy-select.xbm | 14 - - cursors/xbm/tool-hand-mask.xbm | 14 - - cursors/xbm/tool-hand.xbm | 14 - - cursors/xbm/tool-heal-mask.xbm | 14 - - cursors/xbm/tool-heal.xbm | 14 - - cursors/xbm/tool-ink-mask.xbm | 14 - - cursors/xbm/tool-ink.xbm | 14 - - cursors/xbm/tool-iscissors-mask.xbm | 14 - - cursors/xbm/tool-iscissors.xbm | 14 - - cursors/xbm/tool-measure-mask.xbm | 14 - - cursors/xbm/tool-measure.xbm | 14 - - cursors/xbm/tool-move-mask.xbm | 14 - - cursors/xbm/tool-move.xbm | 14 - - cursors/xbm/tool-paintbrush-mask.xbm | 14 - - cursors/xbm/tool-paintbrush.xbm | 14 - - cursors/xbm/tool-paths-anchor-mask.xbm | 14 - - cursors/xbm/tool-paths-anchor.xbm | 14 - - cursors/xbm/tool-paths-control-mask.xbm | 14 - - cursors/xbm/tool-paths-control.xbm | 14 - - cursors/xbm/tool-paths-mask.xbm | 14 - - cursors/xbm/tool-paths-segment-mask.xbm | 14 - - cursors/xbm/tool-paths-segment.xbm | 14 - - cursors/xbm/tool-paths.xbm | 14 - - cursors/xbm/tool-pencil-mask.xbm | 14 - - cursors/xbm/tool-pencil.xbm | 14 - - cursors/xbm/tool-perspective-mask.xbm | 14 - - cursors/xbm/tool-perspective.xbm | 14 - - cursors/xbm/tool-polygon-select-mask.xbm | 14 - - cursors/xbm/tool-polygon-select.xbm | 14 - - cursors/xbm/tool-rect-select-mask.xbm | 14 - - cursors/xbm/tool-rect-select.xbm | 14 - - cursors/xbm/tool-resize-mask.xbm | 14 - - cursors/xbm/tool-resize.xbm | 14 - - cursors/xbm/tool-rotate-mask.xbm | 14 - - cursors/xbm/tool-rotate.xbm | 14 - - cursors/xbm/tool-shear-mask.xbm | 14 - - cursors/xbm/tool-shear.xbm | 14 - - cursors/xbm/tool-smudge-mask.xbm | 14 - - cursors/xbm/tool-smudge.xbm | 14 - - cursors/xbm/tool-text-mask.xbm | 14 - - cursors/xbm/tool-text.xbm | 14 - - cursors/xbm/tool-zoom-mask.xbm | 14 - - cursors/xbm/tool-zoom.xbm | 14 - + cursors/xbm/cursor-corner-bottom-right.xbm | 16 - + cursors/xbm/cursor-corner-top-left-mask.xbm | 16 - + cursors/xbm/cursor-corner-top-left.xbm | 16 - + cursors/xbm/cursor-corner-top-right-mask.xbm | 16 - + cursors/xbm/cursor-corner-top-right.xbm | 16 - + cursors/xbm/cursor-crosshair-mask.xbm | 17 - + cursors/xbm/cursor-crosshair-small-mask.xbm | 17 - + cursors/xbm/cursor-crosshair-small.xbm | 17 - + cursors/xbm/cursor-crosshair.xbm | 17 - + cursors/xbm/cursor-mouse-mask.xbm | 17 - + cursors/xbm/cursor-mouse.xbm | 17 - + cursors/xbm/cursor-move-mask.xbm | 16 - + cursors/xbm/cursor-move.xbm | 16 - + cursors/xbm/cursor-none.xbm | 16 - + cursors/xbm/cursor-side-bottom-mask.xbm | 16 - + cursors/xbm/cursor-side-bottom.xbm | 16 - + cursors/xbm/cursor-side-left-mask.xbm | 16 - + cursors/xbm/cursor-side-left.xbm | 16 - + cursors/xbm/cursor-side-right-mask.xbm | 16 - + cursors/xbm/cursor-side-right.xbm | 16 - + cursors/xbm/cursor-side-top-mask.xbm | 16 - + cursors/xbm/cursor-side-top.xbm | 16 - + cursors/xbm/cursor-zoom-mask.xbm | 17 - + cursors/xbm/cursor-zoom.xbm | 17 - + cursors/xbm/modifier-anchor-mask.xbm | 15 - + cursors/xbm/modifier-anchor.xbm | 15 - + cursors/xbm/modifier-background-mask.xbm | 14 - + cursors/xbm/modifier-background.xbm | 14 - + cursors/xbm/modifier-bad-mask.xbm | 14 - + cursors/xbm/modifier-bad.xbm | 14 - + cursors/xbm/modifier-control-mask.xbm | 15 - + cursors/xbm/modifier-control.xbm | 15 - + cursors/xbm/modifier-foreground-mask.xbm | 14 - + cursors/xbm/modifier-foreground.xbm | 14 - + cursors/xbm/modifier-intersect-mask.xbm | 15 - + cursors/xbm/modifier-intersect.xbm | 15 - + cursors/xbm/modifier-join-mask.xbm | 14 - + cursors/xbm/modifier-join.xbm | 14 - + cursors/xbm/modifier-minus-mask.xbm | 15 - + cursors/xbm/modifier-minus.xbm | 15 - + cursors/xbm/modifier-move-mask.xbm | 15 - + cursors/xbm/modifier-move.xbm | 15 - + cursors/xbm/modifier-pattern-mask.xbm | 14 - + cursors/xbm/modifier-pattern.xbm | 14 - + cursors/xbm/modifier-plus-mask.xbm | 15 - + cursors/xbm/modifier-plus.xbm | 15 - + cursors/xbm/modifier-resize-mask.xbm | 15 - + cursors/xbm/modifier-resize.xbm | 15 - + cursors/xbm/modifier-select-mask.xbm | 14 - + cursors/xbm/modifier-select.xbm | 14 - + cursors/xbm/tool-airbrush-mask.xbm | 14 - + cursors/xbm/tool-airbrush.xbm | 14 - + cursors/xbm/tool-blend-mask.xbm | 14 - + cursors/xbm/tool-blend.xbm | 14 - + cursors/xbm/tool-blur-mask.xbm | 14 - + cursors/xbm/tool-blur.xbm | 14 - + cursors/xbm/tool-bucket-fill-mask.xbm | 14 - + cursors/xbm/tool-bucket-fill.xbm | 14 - + cursors/xbm/tool-burn-mask.xbm | 14 - + cursors/xbm/tool-burn.xbm | 14 - + cursors/xbm/tool-clone-mask.xbm | 14 - + cursors/xbm/tool-clone.xbm | 14 - + cursors/xbm/tool-color-picker-mask.xbm | 14 - + cursors/xbm/tool-color-picker.xbm | 14 - + cursors/xbm/tool-crop-mask.xbm | 14 - + cursors/xbm/tool-crop.xbm | 14 - + cursors/xbm/tool-dodge-mask.xbm | 14 - + cursors/xbm/tool-dodge.xbm | 14 - + cursors/xbm/tool-ellipse-select-mask.xbm | 14 - + cursors/xbm/tool-ellipse-select.xbm | 14 - + cursors/xbm/tool-eraser-mask.xbm | 14 - + cursors/xbm/tool-eraser.xbm | 14 - + cursors/xbm/tool-flip-horizontal-mask.xbm | 14 - + cursors/xbm/tool-flip-horizontal.xbm | 14 - + cursors/xbm/tool-flip-vertical-mask.xbm | 14 - + cursors/xbm/tool-flip-vertical.xbm | 14 - + cursors/xbm/tool-free-select-mask.xbm | 14 - + cursors/xbm/tool-free-select.xbm | 14 - + cursors/xbm/tool-fuzzy-select-mask.xbm | 14 - + cursors/xbm/tool-fuzzy-select.xbm | 14 - + cursors/xbm/tool-hand-mask.xbm | 14 - + cursors/xbm/tool-hand.xbm | 14 - + cursors/xbm/tool-heal-mask.xbm | 14 - + cursors/xbm/tool-heal.xbm | 14 - + cursors/xbm/tool-ink-mask.xbm | 14 - + cursors/xbm/tool-ink.xbm | 14 - + cursors/xbm/tool-iscissors-mask.xbm | 14 - + cursors/xbm/tool-iscissors.xbm | 14 - + cursors/xbm/tool-measure-mask.xbm | 14 - + cursors/xbm/tool-measure.xbm | 14 - + cursors/xbm/tool-move-mask.xbm | 14 - + cursors/xbm/tool-move.xbm | 14 - + cursors/xbm/tool-paintbrush-mask.xbm | 14 - + cursors/xbm/tool-paintbrush.xbm | 14 - + cursors/xbm/tool-paths-anchor-mask.xbm | 14 - + cursors/xbm/tool-paths-anchor.xbm | 14 - + cursors/xbm/tool-paths-control-mask.xbm | 14 - + cursors/xbm/tool-paths-control.xbm | 14 - + cursors/xbm/tool-paths-mask.xbm | 14 - + cursors/xbm/tool-paths-segment-mask.xbm | 14 - + cursors/xbm/tool-paths-segment.xbm | 14 - + cursors/xbm/tool-paths.xbm | 14 - + cursors/xbm/tool-pencil-mask.xbm | 14 - + cursors/xbm/tool-pencil.xbm | 14 - + cursors/xbm/tool-perspective-mask.xbm | 14 - + cursors/xbm/tool-perspective.xbm | 14 - + cursors/xbm/tool-polygon-select-mask.xbm | 14 - + cursors/xbm/tool-polygon-select.xbm | 14 - + cursors/xbm/tool-rect-select-mask.xbm | 14 - + cursors/xbm/tool-rect-select.xbm | 14 - + cursors/xbm/tool-resize-mask.xbm | 14 - + cursors/xbm/tool-resize.xbm | 14 - + cursors/xbm/tool-rotate-mask.xbm | 14 - + cursors/xbm/tool-rotate.xbm | 14 - + cursors/xbm/tool-shear-mask.xbm | 14 - + cursors/xbm/tool-shear.xbm | 14 - + cursors/xbm/tool-smudge-mask.xbm | 14 - + cursors/xbm/tool-smudge.xbm | 14 - + cursors/xbm/tool-text-mask.xbm | 14 - + cursors/xbm/tool-text.xbm | 14 - + cursors/xbm/tool-zoom-mask.xbm | 14 - + cursors/xbm/tool-zoom.xbm | 14 - 183 files changed, 291 insertions(+), 2710 deletions(-) commit 9b440396e1c9212f07382dfdd595285e8d2a64dc Author: Michael Natterer -Date: Fri Sep 10 14:44:41 2010 +0200 +Date: Fri Sep 10 14:44:41 2010 +0200 plug-ins: port ifs-compose drawing to cairo plug-ins/ifs-compose/ifs-compose-utils.c | 58 ++++++++++++++++++++--------- - plug-ins/ifs-compose/ifs-compose.c | 63 + plug-ins/ifs-compose/ifs-compose.c | 63 ++++++++++++++++---------------- - plug-ins/ifs-compose/ifs-compose.h | 9 ++--- + plug-ins/ifs-compose/ifs-compose.h | 9 ++--- 3 files changed, 76 insertions(+), 54 deletions(-) commit 3b0c4e2e5e739cac21ae611e3af988540b6d8df7 Author: Michael Natterer -Date: Fri Sep 10 13:47:04 2010 +0200 +Date: Fri Sep 10 13:47:04 2010 +0200 app: port a gdk_draw_rectangle() in GimpComboTagEntry to cairo @@ -55479,21 +56336,21 @@ commit a0d3d8d7631151712b1cfc1c65815913e386804b Author: Michael Natterer -Date: Thu Sep 9 21:50:55 2010 +0200 +Date: Thu Sep 9 21:50:55 2010 +0200 plug-ins: port color-rotate drawing to cairo and simplify the code plug-ins/color-rotate/color-rotate-callbacks.c | 214 +++---------------------- - plug-ins/color-rotate/color-rotate-dialog.c | 6 +- - plug-ins/color-rotate/color-rotate-draw.c | 178 +++++++++++--------- - plug-ins/color-rotate/color-rotate-draw.h | 15 +- - plug-ins/color-rotate/color-rotate.h | 1 - + plug-ins/color-rotate/color-rotate-dialog.c | 6 +- + plug-ins/color-rotate/color-rotate-draw.c | 178 +++++++++++--------- + plug-ins/color-rotate/color-rotate-draw.h | 15 +- + plug-ins/color-rotate/color-rotate.h | 1 - 5 files changed, 136 insertions(+), 278 deletions(-) commit d9932ff159d67d9aeecbe3430ac3bd3872bf14c2 Author: Alexia Death -Date: Thu Sep 9 21:56:19 2010 +0300 +Date: Thu Sep 9 21:56:19 2010 +0300 app: Fix potential segfault caused by accessing empty history buffer @@ -55502,7 +56359,7 @@ commit 113941a7e50ceb4b5847eb6fa00c64bfa9cc32cb Author: Martin Nordholts -Date: Thu Sep 9 16:37:03 2010 +0200 +Date: Thu Sep 9 16:37:03 2010 +0200 libgimp: Update gimp.def @@ -55511,7 +56368,7 @@ commit 52a6a8deb827be3660ed60109e5496dc66ca7761 Author: Michael Natterer -Date: Thu Sep 9 14:07:27 2010 +0200 +Date: Thu Sep 9 14:07:27 2010 +0200 plug-ins: port sample-colorize drawing to cairo @@ -55521,7 +56378,7 @@ commit 333eeab13f3d7b96833e1c33d6edaa42815f6eec Author: Michael Natterer -Date: Thu Sep 9 13:50:15 2010 +0200 +Date: Thu Sep 9 13:50:15 2010 +0200 plug-ins: pagr-size must be 0 on adjustments used for spin buttons @@ -55530,7 +56387,7 @@ commit 154eb3d307873c54939b9f996f858c007a9a4f91 Author: Michael Natterer -Date: Thu Sep 9 03:32:45 2010 +0200 +Date: Thu Sep 9 03:32:45 2010 +0200 app: port the splash's background pixmap drawing to cairo @@ -55539,7 +56396,7 @@ commit fe536cf845497510f62ab9c9957c3ca4a05d3a55 Author: Michael Natterer -Date: Thu Sep 9 02:07:58 2010 +0200 +Date: Thu Sep 9 02:07:58 2010 +0200 plug-ins: remove more useless logic from nova @@ -55548,7 +56405,7 @@ commit 3c062c3f239284b3f7bf1081af5d604ae6624a3b Author: Michael Natterer -Date: Thu Sep 9 02:07:13 2010 +0200 +Date: Thu Sep 9 02:07:13 2010 +0200 plug-ins: port lens-flare center drawing to cairo @@ -55558,7 +56415,7 @@ commit 0ad9051bc3a9eabb7aaf7e175bec99b29a1e86b6 Author: Michael Natterer -Date: Thu Sep 9 01:54:00 2010 +0200 +Date: Thu Sep 9 01:54:00 2010 +0200 plug-ins: more cleanup in nova and tile-small @@ -55569,7 +56426,7 @@ commit c5658da09c946c485c19c4ca6f8ff40cf05642f9 Author: Lloyd Konneker -Date: Wed Sep 8 08:09:30 2010 -0400 +Date: Wed Sep 8 08:09:30 2010 -0400 Bug 155733 - need to check return values of gimp_drawable_mask_bounds() @@ -55587,7 +56444,7 @@ commit 0aa35c8c8e206ca9987960d362188473bb846a67 Author: Michael Natterer -Date: Wed Sep 8 21:00:29 2010 +0200 +Date: Wed Sep 8 21:00:29 2010 +0200 plug-ins: use the same opacities for drawing lines on top of the preview @@ -55598,7 +56455,7 @@ commit 9970a2b14bf7659cfbc12030376c6171806925c5 Author: Michael Natterer -Date: Wed Sep 8 20:52:02 2010 +0200 +Date: Wed Sep 8 20:52:02 2010 +0200 plug-ins: port nova cursor drawing to cairo and simplify drawing a lot @@ -55608,7 +56465,7 @@ commit 73b5f87873dc6ca44b88789b4759720359ad870f Author: Michael Natterer -Date: Wed Sep 8 20:33:39 2010 +0200 +Date: Wed Sep 8 20:33:39 2010 +0200 plug-ins: port tile-small selection drawing to cairo @@ -55618,7 +56475,7 @@ commit fd14818035b7be663b02aa2eb12cf9bb5abd5065 Author: Michael Natterer -Date: Wed Sep 8 19:32:22 2010 +0200 +Date: Wed Sep 8 19:32:22 2010 +0200 app: port GimpDisplayShell transform preview drawing to cairo @@ -55630,7 +56487,7 @@ commit e0ad0f478e83758056cb3b78500bf4f3eee9c7f6 Author: Michael Natterer -Date: Wed Sep 8 14:36:29 2010 +0200 +Date: Wed Sep 8 14:36:29 2010 +0200 plug-ins: port filter-pack drawing to cairo @@ -55640,7 +56497,7 @@ commit e8f4d4b449635f3842090b8f946b1a030fc51ff1 Author: Michael Natterer -Date: Wed Sep 8 02:48:37 2010 +0200 +Date: Wed Sep 8 02:48:37 2010 +0200 pdb: add transform API for items @@ -55648,23 +56505,23 @@ than the drawable transform API because it uses the new context states. Untested and not finished! - app/pdb/Makefile.am | 1 + - app/pdb/internal-procs.c | 3 +- - app/pdb/internal-procs.h | 1 + - app/pdb/item-transform-cmds.c | 1320 + app/pdb/Makefile.am | 1 + + app/pdb/internal-procs.c | 3 +- + app/pdb/internal-procs.h | 1 + + app/pdb/item-transform-cmds.c | 1320 +++++++++++++++++++++++++++++++++++ - libgimp/Makefile.am | 2 + - libgimp/gimp_pdb.h | 1 + - libgimp/gimpitemtransform_pdb.c | 541 ++++++++++++++ - libgimp/gimpitemtransform_pdb.h | 89 +++ - tools/pdbgen/Makefile.am | 1 + - tools/pdbgen/groups.pl | 1 + - tools/pdbgen/pdb/item_transform.pdb | 626 +++++++++++++++++ + libgimp/Makefile.am | 2 + + libgimp/gimp_pdb.h | 1 + + libgimp/gimpitemtransform_pdb.c | 541 ++++++++++++++ + libgimp/gimpitemtransform_pdb.h | 89 +++ + tools/pdbgen/Makefile.am | 1 + + tools/pdbgen/groups.pl | 1 + + tools/pdbgen/pdb/item_transform.pdb | 626 +++++++++++++++++ 11 files changed, 2585 insertions(+), 1 deletion(-) commit 8b38bde6424fc78d9a51ab458014e566ebd6fd80 Author: Michael Natterer -Date: Tue Sep 7 23:43:18 2010 +0200 +Date: Tue Sep 7 23:43:18 2010 +0200 app: remove the "auto_center" params from gimpdrawable-transform.[ch] @@ -55673,20 +56530,20 @@ pretty much poinless, but a commit will follow that makes it look better... - app/core/gimp-transform-utils.c | 49 + app/core/gimp-transform-utils.c | 49 +++++++++++++++++++++++++++++++++ - app/core/gimp-transform-utils.h | 15 ++++++++++ - app/core/gimpdrawable-transform.c | 41 --------------------------- - app/core/gimpdrawable-transform.h | 2 -- - app/pdb/drawable-transform-cmds.c | 13 +++++++-- - app/pdb/transform-tools-cmds.c | 7 ++++- + app/core/gimp-transform-utils.h | 15 ++++++++++ + app/core/gimpdrawable-transform.c | 41 --------------------------- + app/core/gimpdrawable-transform.h | 2 -- + app/pdb/drawable-transform-cmds.c | 13 +++++++-- + app/pdb/transform-tools-cmds.c | 7 ++++- tools/pdbgen/pdb/drawable_transform.pdb | 13 +++++++-- - tools/pdbgen/pdb/transform_tools.pdb | 7 ++++- + tools/pdbgen/pdb/transform_tools.pdb | 7 ++++- 8 files changed, 98 insertions(+), 49 deletions(-) commit 095ae5cc9b346d8371e237d1aaf0b3c39e6c37fc Author: Michael Natterer -Date: Tue Sep 7 21:28:00 2010 +0200 +Date: Tue Sep 7 21:28:00 2010 +0200 app: move mask_bounds() and mask_intersect() from GimpDrawable to GimpItem @@ -55695,40 +56552,40 @@ GimpItem enables some simplifications, esp. in upcoming PDB wrappers. None of these refactorings is in this commit though. - app/core/gimp-edit.c | 5 +- - app/core/gimpdrawable-blend.c | 4 +- - app/core/gimpdrawable-bucket-fill.c | 2 +- - app/core/gimpdrawable-histogram.c | 2 +- - app/core/gimpdrawable-levels.c | 2 +- - app/core/gimpdrawable-operation.c | 6 +- - app/core/gimpdrawable-process.c | 2 +- - app/core/gimpdrawable-shadow.c | 2 +- - app/core/gimpdrawable-stroke.c | 4 +- - app/core/gimpdrawable-transform.c | 2 +- - app/core/gimpdrawable.c | 114 + app/core/gimp-edit.c | 5 +- + app/core/gimpdrawable-blend.c | 4 +- + app/core/gimpdrawable-bucket-fill.c | 2 +- + app/core/gimpdrawable-histogram.c | 2 +- + app/core/gimpdrawable-levels.c | 2 +- + app/core/gimpdrawable-operation.c | 6 +- + app/core/gimpdrawable-process.c | 2 +- + app/core/gimpdrawable-shadow.c | 2 +- + app/core/gimpdrawable-stroke.c | 4 +- + app/core/gimpdrawable-transform.c | 2 +- + app/core/gimpdrawable.c | 114 -------------------------------- - app/core/gimpdrawable.h | 11 --- - app/core/gimpimagemap.c | 6 +- - app/core/gimpitem.c | 108 + app/core/gimpdrawable.h | 11 --- + app/core/gimpimagemap.c | 6 +- + app/core/gimpitem.c | 108 +++++++++++++++++++++++++++++- - app/core/gimpitem.h | 11 +++ - app/core/gimppalette-import.c | 3 +- - app/core/gimpselection.c | 6 +- + app/core/gimpitem.h | 11 +++ + app/core/gimppalette-import.c | 3 +- + app/core/gimpselection.c | 6 +- app/display/gimpdisplayshell-preview.c | 8 +-- - app/pdb/drawable-cmds.c | 6 +- - app/pdb/drawable-transform-cmds.c | 32 ++++----- - app/pdb/transform-tools-cmds.c | 12 ++-- - app/tools/gimpeditselectiontool.c | 6 +- - app/tools/gimpselectiontool.c | 4 +- - app/tools/gimptransformtool.c | 6 +- - tools/pdbgen/pdb/drawable.pdb | 6 +- + app/pdb/drawable-cmds.c | 6 +- + app/pdb/drawable-transform-cmds.c | 32 ++++----- + app/pdb/transform-tools-cmds.c | 12 ++-- + app/tools/gimpeditselectiontool.c | 6 +- + app/tools/gimpselectiontool.c | 4 +- + app/tools/gimptransformtool.c | 6 +- + tools/pdbgen/pdb/drawable.pdb | 6 +- tools/pdbgen/pdb/drawable_transform.pdb | 8 +-- - tools/pdbgen/pdb/transform_tools.pdb | 12 ++-- + tools/pdbgen/pdb/transform_tools.pdb | 12 ++-- 27 files changed, 192 insertions(+), 198 deletions(-) commit 178aa9c6dcf2774c5687fab46e45295d7a0e2fd8 Author: Sven Neumann -Date: Tue Sep 7 20:39:45 2010 +0200 +Date: Tue Sep 7 20:39:45 2010 +0200 app/tools: fix alternative button order @@ -55737,17 +56594,17 @@ commit 24b6c27e42ccb19d76602cea6f9edaa07bd8537c Author: Michael Natterer -Date: Tue Sep 7 17:43:39 2010 +0200 +Date: Tue Sep 7 17:43:39 2010 +0200 app: use gimp_drawable_mask_intersect() instead of mask_bounds() - app/core/gimpdrawable-blend.c | 10 +++++----- + app/core/gimpdrawable-blend.c | 10 +++++----- app/core/gimpdrawable-histogram.c | 22 +++++++++++----------- 2 files changed, 16 insertions(+), 16 deletions(-) commit df1575234c79f0276d7d25db690ba2e05615c97e Author: Michael Natterer -Date: Tue Sep 7 17:08:54 2010 +0200 +Date: Tue Sep 7 17:08:54 2010 +0200 app: make the code in gimp_drawable_mask_intersect() a bit more readable @@ -55757,7 +56614,7 @@ commit bdc2d4520be090bbbb90af18c75de6df49ed1d61 Author: Michael Natterer -Date: Tue Sep 7 16:21:40 2010 +0200 +Date: Tue Sep 7 16:21:40 2010 +0200 app: make sure to always show error messages returned by plug-ins @@ -55771,7 +56628,7 @@ commit 23aaf69779c438fe27e73189ae3ce90989c8e410 Author: Michael Natterer -Date: Tue Sep 7 02:33:13 2010 +0200 +Date: Tue Sep 7 02:33:13 2010 +0200 pdb: add a lot of state for a new item-based transform API @@ -55783,7 +56640,7 @@ app/pdb/gimppdbcontext.c | 61 ++++++- app/pdb/gimppdbcontext.h | 15 +- app/pdb/internal-procs.c | 2 +- - libgimp/gimp.def | 8 + + libgimp/gimp.def | 8 + libgimp/gimpcontext_pdb.c | 257 ++++++++++++++++++++++++++++++ libgimp/gimpcontext_pdb.h | 76 +++++---- tools/pdbgen/pdb/context.pdb | 219 ++++++++++++++++++++++++- @@ -55791,7 +56648,7 @@ commit d96b491050ee3835173d043efa694cf312da008c Author: Sven Neumann -Date: Tue Sep 7 00:50:13 2010 +0200 +Date: Tue Sep 7 00:50:13 2010 +0200 Update use of Pango API and bump required version to 1.22.0 @@ -55799,17 +56656,17 @@ pango_cairo_font_map_create_context(). Compile with PANGO_DISABLED_DEPRECATED for pango < 1.30. - INSTALL | 2 +- - app/sanity.c | 4 ++-- + INSTALL | 2 +- + app/sanity.c | 4 ++-- app/text/gimpfontlist.c | 17 ++++++++++------- app/text/gimptext-compat.c | 15 +++++++++------ app/text/gimptextlayout.c | 13 +++++++------ - configure.ac | 14 +++++++------- + configure.ac | 14 +++++++------- 6 files changed, 36 insertions(+), 29 deletions(-) commit 4264afbb0ebe721aaf97ac13b26e75da0bf58904 Author: Michael Natterer -Date: Tue Sep 7 00:35:28 2010 +0200 +Date: Tue Sep 7 00:35:28 2010 +0200 pygimp: port to gimp_item_to_selection() @@ -55818,21 +56675,21 @@ commit bab75db54e07c2ea866cc3e659d95786d8fc40b3 Author: Sven Neumann -Date: Mon Sep 6 23:58:10 2010 +0200 +Date: Mon Sep 6 23:58:10 2010 +0200 python: port plug-ins to Image.insert_layer() plug-ins/pygimp/plug-ins/benchmark-foreground-extract.py | 2 +- - plug-ins/pygimp/plug-ins/clothify.py | 4 ++-- - plug-ins/pygimp/plug-ins/foggify.py | 2 +- - plug-ins/pygimp/plug-ins/py-slice.py | 2 +- - plug-ins/pygimp/plug-ins/shadow_bevel.py | 2 +- - plug-ins/pygimp/plug-ins/sphere.py | 2 +- + plug-ins/pygimp/plug-ins/clothify.py | 4 ++-- + plug-ins/pygimp/plug-ins/foggify.py | 2 +- + plug-ins/pygimp/plug-ins/py-slice.py | 2 +- + plug-ins/pygimp/plug-ins/shadow_bevel.py | 2 +- + plug-ins/pygimp/plug-ins/sphere.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) commit 378a465caaa1a206ab22955f38f8961803409585 Author: Sven Neumann -Date: Mon Sep 6 23:43:22 2010 +0200 +Date: Mon Sep 6 23:43:22 2010 +0200 python: add Image.insert_layer() and Image.insert_channel() @@ -55842,7 +56699,7 @@ commit 48f621958584745c2ad99769f40418281fb4f93c Author: Sven Neumann -Date: Mon Sep 6 23:31:04 2010 +0200 +Date: Mon Sep 6 23:31:04 2010 +0200 python: use gimp_image_insert_layer() instead of add_layer() @@ -55851,7 +56708,7 @@ commit 2cbf8a7c96f03eccd1eefd306567ad85073ac096 Author: Sven Neumann -Date: Mon Sep 6 23:19:00 2010 +0200 +Date: Mon Sep 6 23:19:00 2010 +0200 pdb: mention gimp_edit_fill() in the gimp_drawable_fill() docs @@ -55866,20 +56723,20 @@ commit 9486971f07d2d47c0c5a33e5f2bcfcf051020ba6 Author: Sven Neumann -Date: Mon Sep 6 22:54:53 2010 +0200 +Date: Mon Sep 6 22:54:53 2010 +0200 pdb: the new gimp-image-insert procedures should accept no parent Allow to pass -1 as parent parameter to the newly added gimp-image-insert procedures by adding the 'none_ok' flag. - app/pdb/image-cmds.c | 8 ++++---- + app/pdb/image-cmds.c | 8 ++++---- tools/pdbgen/pdb/image.pdb | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) commit 0aec9a2b83a97cb4e6d3ea27d36afbe473e52ee2 Author: Michael Natterer -Date: Mon Sep 6 13:46:35 2010 +0200 +Date: Mon Sep 6 13:46:35 2010 +0200 tools: fix quoting @@ -55888,7 +56745,7 @@ commit bbd7ec6b5ca705182ffbe7899b8ee72ae965b2e2 Author: Michael Natterer -Date: Mon Sep 6 11:40:46 2010 +0200 +Date: Mon Sep 6 11:40:46 2010 +0200 plug-ins: port from gimp_image_add_foo() to gimp_image_insert_foo() @@ -55897,67 +56754,67 @@ just fixing insert positions, I went for passing -1 as parent in almost all cases. And because of laziness... - libgimp/gimpexport.c | 2 +- - plug-ins/common/animation-optimize.c | 4 ++-- - plug-ins/common/compose.c | 2 +- - plug-ins/common/curve-bend.c | 6 +++--- - plug-ins/common/decompose.c | 2 +- - plug-ins/common/edge-dog.c | 8 +++++--- - plug-ins/common/file-cel.c | 2 +- - plug-ins/common/file-dicom.c | 2 +- - plug-ins/common/file-gbr.c | 2 +- - plug-ins/common/file-gif-load.c | 2 +- - plug-ins/common/file-gih.c | 2 +- - plug-ins/common/file-jp2-load.c | 2 +- - plug-ins/common/file-pat.c | 2 +- - plug-ins/common/file-pcx.c | 2 +- - plug-ins/common/file-pdf-load.c | 2 +- - plug-ins/common/file-pix.c | 2 +- - plug-ins/common/file-png.c | 2 +- - plug-ins/common/file-pnm.c | 2 +- - plug-ins/common/file-ps.c | 4 ++-- - plug-ins/common/file-psp.c | 2 +- - plug-ins/common/file-raw.c | 2 +- - plug-ins/common/file-sunras.c | 2 +- - plug-ins/common/file-svg.c | 2 +- - plug-ins/common/file-tga.c | 2 +- - plug-ins/common/file-tiff-load.c | 6 +++--- - plug-ins/common/file-wmf.c | 2 +- - plug-ins/common/file-xbm.c | 2 +- - plug-ins/common/file-xmc.c | 4 ++-- - plug-ins/common/file-xpm.c | 2 +- - plug-ins/common/file-xwd.c | 2 +- - plug-ins/common/film.c | 4 ++-- - plug-ins/common/hot.c | 2 +- - plug-ins/common/iwarp.c | 4 ++-- - plug-ins/common/screenshot.c | 4 ++-- - plug-ins/common/smooth-palette.c | 2 +- - plug-ins/common/tile.c | 2 +- - plug-ins/common/warp.c | 4 ++-- - plug-ins/file-bmp/bmp-read.c | 4 ++-- - plug-ins/file-faxg3/faxg3.c | 2 +- - plug-ins/file-fits/fits.c | 2 +- - plug-ins/file-fli/fli-gimp.c | 2 +- - plug-ins/file-ico/ico-dialog.c | 4 ++-- - plug-ins/file-ico/ico-load.c | 2 +- - plug-ins/file-ico/ico-save.c | 2 +- - plug-ins/file-jpeg/jpeg-load.c | 4 ++-- - plug-ins/file-psd/psd-image-res-load.c | 4 ++-- - plug-ins/file-psd/psd-load.c | 8 ++++---- - plug-ins/file-sgi/sgi.c | 2 +- - plug-ins/file-xjt/xjt.c | 6 +++--- - plug-ins/gfig/gfig-dialog.c | 2 +- - plug-ins/lighting/lighting-apply.c | 2 +- - plug-ins/map-object/map-object-apply.c | 2 +- - plug-ins/pagecurl/pagecurl.c | 4 +++- + libgimp/gimpexport.c | 2 +- + plug-ins/common/animation-optimize.c | 4 ++-- + plug-ins/common/compose.c | 2 +- + plug-ins/common/curve-bend.c | 6 +++--- + plug-ins/common/decompose.c | 2 +- + plug-ins/common/edge-dog.c | 8 +++++--- + plug-ins/common/file-cel.c | 2 +- + plug-ins/common/file-dicom.c | 2 +- + plug-ins/common/file-gbr.c | 2 +- + plug-ins/common/file-gif-load.c | 2 +- + plug-ins/common/file-gih.c | 2 +- + plug-ins/common/file-jp2-load.c | 2 +- + plug-ins/common/file-pat.c | 2 +- + plug-ins/common/file-pcx.c | 2 +- + plug-ins/common/file-pdf-load.c | 2 +- + plug-ins/common/file-pix.c | 2 +- + plug-ins/common/file-png.c | 2 +- + plug-ins/common/file-pnm.c | 2 +- + plug-ins/common/file-ps.c | 4 ++-- + plug-ins/common/file-psp.c | 2 +- + plug-ins/common/file-raw.c | 2 +- + plug-ins/common/file-sunras.c | 2 +- + plug-ins/common/file-svg.c | 2 +- + plug-ins/common/file-tga.c | 2 +- + plug-ins/common/file-tiff-load.c | 6 +++--- + plug-ins/common/file-wmf.c | 2 +- + plug-ins/common/file-xbm.c | 2 +- + plug-ins/common/file-xmc.c | 4 ++-- + plug-ins/common/file-xpm.c | 2 +- + plug-ins/common/file-xwd.c | 2 +- + plug-ins/common/film.c | 4 ++-- + plug-ins/common/hot.c | 2 +- + plug-ins/common/iwarp.c | 4 ++-- + plug-ins/common/screenshot.c | 4 ++-- + plug-ins/common/smooth-palette.c | 2 +- + plug-ins/common/tile.c | 2 +- + plug-ins/common/warp.c | 4 ++-- + plug-ins/file-bmp/bmp-read.c | 4 ++-- + plug-ins/file-faxg3/faxg3.c | 2 +- + plug-ins/file-fits/fits.c | 2 +- + plug-ins/file-fli/fli-gimp.c | 2 +- + plug-ins/file-ico/ico-dialog.c | 4 ++-- + plug-ins/file-ico/ico-load.c | 2 +- + plug-ins/file-ico/ico-save.c | 2 +- + plug-ins/file-jpeg/jpeg-load.c | 4 ++-- + plug-ins/file-psd/psd-image-res-load.c | 4 ++-- + plug-ins/file-psd/psd-load.c | 8 ++++---- + plug-ins/file-sgi/sgi.c | 2 +- + plug-ins/file-xjt/xjt.c | 6 +++--- + plug-ins/gfig/gfig-dialog.c | 2 +- + plug-ins/lighting/lighting-apply.c | 2 +- + plug-ins/map-object/map-object-apply.c | 2 +- + plug-ins/pagecurl/pagecurl.c | 4 +++- plug-ins/selection-to-path/selection-to-path.c | 2 +- - plug-ins/twain/twain.c | 4 ++-- - plug-ins/win-snap/winsnap.c | 2 +- + plug-ins/twain/twain.c | 4 ++-- + plug-ins/win-snap/winsnap.c | 2 +- 56 files changed, 83 insertions(+), 79 deletions(-) commit 8f666511233d0878b57f0baf1da476c3be709320 Author: Martin Nordholts -Date: Mon Sep 6 08:32:16 2010 +0200 +Date: Mon Sep 6 08:32:16 2010 +0200 configure.ac: Disable gzip tarball @@ -55969,7 +56826,7 @@ commit 83435ab87995da8b7a2fe9882d33910925080108 Author: Martin Nordholts -Date: Mon Sep 6 08:14:23 2010 +0200 +Date: Mon Sep 6 08:14:23 2010 +0200 po: Fix make distcheck @@ -55978,11 +56835,11 @@ commit d0e55640eccfefc4ef382875cb6122ad79f49c93 Author: Michael Natterer -Date: Mon Sep 6 00:15:40 2010 +0200 +Date: Mon Sep 6 00:15:40 2010 +0200 pdb: deprecate gimp_image_add_layer,channel,vectors() - app/pdb/image-cmds.c | 39 ++++++++++++++++++--------------------- + app/pdb/image-cmds.c | 39 ++++++++++++++++++--------------------- libgimp/gimpimage_pdb.c | 20 +++----------------- libgimp/gimpimage_pdb.h | 6 ++++++ tools/pdbgen/pdb/image.pdb | 33 +++------------------------------ @@ -55990,33 +56847,33 @@ commit 9e0dccec73e273a702f4bb63cb8c9e0e320fcea6 Author: Michael Natterer -Date: Mon Sep 6 00:03:29 2010 +0200 +Date: Mon Sep 6 00:03:29 2010 +0200 pdb: update docs to mention the new insert procs instead of the add ones - app/pdb/channel-cmds.c | 2 +- - app/pdb/fileops-cmds.c | 4 ++-- - app/pdb/layer-cmds.c | 6 +++--- - app/pdb/text-layer-cmds.c | 2 +- - app/pdb/vectors-cmds.c | 4 ++-- - libgimp/gimpchannel.c | 8 ++++---- - libgimp/gimpchannel_pdb.c | 2 +- - libgimp/gimpfileops_pdb.c | 6 ++++-- - libgimp/gimplayer.c | 2 +- - libgimp/gimplayer_pdb.c | 10 +++++----- - libgimp/gimptextlayer_pdb.c | 2 +- - libgimp/gimpvectors_pdb.c | 4 ++-- - tools/pdbgen/pdb/channel.pdb | 13 +++++++------ - tools/pdbgen/pdb/fileops.pdb | 4 ++-- - tools/pdbgen/pdb/layer.pdb | 30 ++++++++++++++++-------------- + app/pdb/channel-cmds.c | 2 +- + app/pdb/fileops-cmds.c | 4 ++-- + app/pdb/layer-cmds.c | 6 +++--- + app/pdb/text-layer-cmds.c | 2 +- + app/pdb/vectors-cmds.c | 4 ++-- + libgimp/gimpchannel.c | 8 ++++---- + libgimp/gimpchannel_pdb.c | 2 +- + libgimp/gimpfileops_pdb.c | 6 ++++-- + libgimp/gimplayer.c | 2 +- + libgimp/gimplayer_pdb.c | 10 +++++----- + libgimp/gimptextlayer_pdb.c | 2 +- + libgimp/gimpvectors_pdb.c | 4 ++-- + tools/pdbgen/pdb/channel.pdb | 13 +++++++------ + tools/pdbgen/pdb/fileops.pdb | 4 ++-- + tools/pdbgen/pdb/layer.pdb | 30 ++++++++++++++++-------------- tools/pdbgen/pdb/text_layer.pdb | 2 +- - tools/pdbgen/pdb/vectors.pdb | 4 ++-- + tools/pdbgen/pdb/vectors.pdb | 4 ++-- 17 files changed, 55 insertions(+), 50 deletions(-) commit a547c5d20055e6dcd14f55cbb97d48c5b729288f Author: Michael Natterer -Date: Sun Sep 5 23:54:23 2010 +0200 +Date: Sun Sep 5 23:54:23 2010 +0200 pdb: add gimp_image_insert_layer,channel,vectors() @@ -56024,10 +56881,10 @@ tree. We don't have channel or vectors trees (yet) but API symmetry is more important here than a currently useless parameter. - app/pdb/image-cmds.c | 254 + app/pdb/image-cmds.c | 254 ++++++++++++++++++++++++++++++++++++++++++++- - app/pdb/internal-procs.c | 2 +- - libgimp/gimp.def | 3 + + app/pdb/internal-procs.c | 2 +- + libgimp/gimp.def | 3 + libgimp/gimpimage_pdb.c | 125 +++++++++++++++++++++- libgimp/gimpimage_pdb.h | 12 +++ tools/pdbgen/pdb/image.pdb | 145 +++++++++++++++++++++++++- @@ -56035,7 +56892,7 @@ commit 6af4cd6cffacdc9d63f5de7f8d86b876437a89fc Author: Martin Nordholts -Date: Sun Sep 5 23:46:50 2010 +0200 +Date: Sun Sep 5 23:46:50 2010 +0200 build: Update buildbot/suppressed-warnings.txt again @@ -56047,7 +56904,7 @@ commit edf1bb794f6829279dcd9eabbd3d51789914b684 Author: Michael Natterer -Date: Sun Sep 5 23:22:17 2010 +0200 +Date: Sun Sep 5 23:22:17 2010 +0200 plug-ins: use gimp_item_to_selection() instead of deprecated API @@ -56057,7 +56914,7 @@ commit 8ab4fbcf28becea847b4110736f43575e860c683 Author: Michael Natterer -Date: Sun Sep 5 23:13:42 2010 +0200 +Date: Sun Sep 5 23:13:42 2010 +0200 pdb: add context procedures for the new antialias and feather properties @@ -56065,7 +56922,7 @@ app/pdb/context-cmds.c | 294 ++++++++++++++++++++++++++++++++++++++++++- app/pdb/internal-procs.c | 2 +- - libgimp/gimp.def | 6 + + libgimp/gimp.def | 6 + libgimp/gimpcontext_pdb.c | 200 +++++++++++++++++++++++++++++ libgimp/gimpcontext_pdb.h | 8 ++ tools/pdbgen/pdb/context.pdb | 167 +++++++++++++++++++++++- @@ -56073,7 +56930,7 @@ commit e7475c1d52e1275dc7e34f0af7eba8490d49f24b Author: Michael Natterer -Date: Sun Sep 5 22:38:07 2010 +0200 +Date: Sun Sep 5 22:38:07 2010 +0200 pdb: add new procedure gimp-item-to-selection @@ -56081,26 +56938,26 @@ newly added GimpPDBContext properties, so it only has an "operation" parameter. - app/pdb/internal-procs.c | 2 +- - app/pdb/item-cmds.c | 66 + app/pdb/internal-procs.c | 2 +- + app/pdb/item-cmds.c | 66 ++++++++++++++++++++++++++++++++++++++++++ - app/pdb/selection-cmds.c | 36 +++++++++++------------ - app/pdb/vectors-cmds.c | 6 ++-- - libgimp/gimp.def | 1 + - libgimp/gimpitem_pdb.c | 37 +++++++++++++++++++++++ - libgimp/gimpitem_pdb.h | 58 +++++++++++++++++++------------------ - libgimp/gimpselection_pdb.c | 21 ++++---------- - libgimp/gimpselection_pdb.h | 4 +++ - libgimp/gimpvectors_pdb.c | 5 +--- - libgimp/gimpvectors_pdb.h | 2 ++ - tools/pdbgen/pdb/item.pdb | 44 +++++++++++++++++++++++++++- + app/pdb/selection-cmds.c | 36 +++++++++++------------ + app/pdb/vectors-cmds.c | 6 ++-- + libgimp/gimp.def | 1 + + libgimp/gimpitem_pdb.c | 37 +++++++++++++++++++++++ + libgimp/gimpitem_pdb.h | 58 +++++++++++++++++++------------------ + libgimp/gimpselection_pdb.c | 21 ++++---------- + libgimp/gimpselection_pdb.h | 4 +++ + libgimp/gimpvectors_pdb.c | 5 +--- + libgimp/gimpvectors_pdb.h | 2 ++ + tools/pdbgen/pdb/item.pdb | 44 +++++++++++++++++++++++++++- tools/pdbgen/pdb/selection.pdb | 32 ++------------------ - tools/pdbgen/pdb/vectors.pdb | 8 +---- + tools/pdbgen/pdb/vectors.pdb | 8 +---- 14 files changed, 216 insertions(+), 106 deletions(-) commit cbcb7515f040782ca235171f1d67846972d77f67 Author: Michael Natterer -Date: Sun Sep 5 22:34:24 2010 +0200 +Date: Sun Sep 5 22:34:24 2010 +0200 app: increase max value of feather-radius properties to 1000.0 @@ -56109,7 +56966,7 @@ commit ee31bd1c4dbc1ad38cee25ec215203c661e0067d Author: Sven Neumann -Date: Sun Sep 5 19:32:57 2010 +0200 +Date: Sun Sep 5 19:32:57 2010 +0200 plug-ins: whitespace and coding style cleanups @@ -56122,7 +56979,7 @@ commit 6a99cf7ed4ae925e7dcbe8b26e73da892fa6b879 Author: KermiDT -Date: Sun Sep 5 15:38:44 2010 +0200 +Date: Sun Sep 5 15:38:44 2010 +0200 Bug 628817 - Optimized Despeckle plug-in @@ -56134,20 +56991,20 @@ commit e133035440e79c9b209d8623c3bb9d1b37540be5 Author: Alexia Death -Date: Sun Sep 5 13:33:26 2010 +0300 +Date: Sun Sep 5 13:33:26 2010 +0300 Fix point selection detection - app/gegl/gimpcageconfig.c | 36 ------------ - app/gegl/gimpcageconfig.h | 18 +----- + app/gegl/gimpcageconfig.c | 36 ------------ + app/gegl/gimpcageconfig.h | 18 +----- app/gegl/gimpoperationcagetransform.c | 6 +- - app/tools/gimpcagetool.c | 103 + app/tools/gimpcagetool.c | 103 +++++++++++++++++++++++++++------- 4 files changed, 86 insertions(+), 77 deletions(-) commit d2612487921420c32d189649503331b19fa2f69e Author: Alexia Death -Date: Sun Sep 5 12:48:23 2010 +0300 +Date: Sun Sep 5 12:48:23 2010 +0300 Clean up debug code @@ -56157,7 +57014,7 @@ commit 1e4b3a53b38a555b5f131bcc87534d9987e1bd1c Author: Michael Natterer -Date: Sat Sep 4 22:31:58 2010 +0200 +Date: Sat Sep 4 22:31:58 2010 +0200 tools: insert #include "gimppdbcontext.h" at the right place if needed @@ -56166,7 +57023,7 @@ commit 2066545b913acd5cb077987779f41e0a34e2d4e7 Author: Michael Natterer -Date: Sat Sep 4 22:17:01 2010 +0200 +Date: Sat Sep 4 22:17:01 2010 +0200 app: add GimpPDBContext which holds more state available to procedures @@ -56177,21 +57034,21 @@ independently. Make sure that all procedures and all plug-ins get GimpPDBContexts instead of plain GimpContexts passed. - app/pdb/Makefile.am | 2 + - app/pdb/gimppdbcontext.c | 184 + app/pdb/Makefile.am | 2 + + app/pdb/gimppdbcontext.c | 184 ++++++++++++++++++++++++++++++++ - app/pdb/gimppdbcontext.h | 61 +++++++++++ - app/pdb/gimpprocedure.c | 15 ++- - app/plug-in/gimpplugin-context.c | 6 +- - app/plug-in/gimpplugin.c | 7 +- - app/plug-in/gimppluginmanager-call.c | 11 +- + app/pdb/gimppdbcontext.h | 61 +++++++++++ + app/pdb/gimpprocedure.c | 15 ++- + app/plug-in/gimpplugin-context.c | 6 +- + app/plug-in/gimpplugin.c | 7 +- + app/plug-in/gimppluginmanager-call.c | 11 +- app/plug-in/gimppluginmanager-restore.c | 7 +- - app/plug-in/gimppluginprocframe.c | 6 +- + app/plug-in/gimppluginprocframe.c | 6 +- 9 files changed, 283 insertions(+), 16 deletions(-) commit fc121e7ba8d1c41a2e00772b972154b274905bd7 Author: Martin Nordholts -Date: Sat Sep 4 13:24:59 2010 +0200 +Date: Sat Sep 4 13:24:59 2010 +0200 Disable strict aliasing where we break aliasing rules @@ -56199,14 +57056,14 @@ "dereferencing type-punned pointer will break strict-aliasing rules"-warnings. - plug-ins/common/Makefile.am | 2 ++ + plug-ins/common/Makefile.am | 2 ++ plug-ins/common/plugin-defs.pl | 2 +- plug-ins/file-fits/Makefile.am | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) commit 27471e1f7cdfdb0598a0cce537f5a4ebd5ce8eed Author: Martin Nordholts -Date: Sat Sep 4 13:36:36 2010 +0200 +Date: Sat Sep 4 13:36:36 2010 +0200 plug-ins/common: Allow arbitrary CFLAGS in mkgen.pl @@ -56222,7 +57079,7 @@ commit 92b1d80e0ca1173c1397cbc34ec1732540277953 Author: Martin Nordholts -Date: Sat Sep 4 13:24:31 2010 +0200 +Date: Sat Sep 4 13:24:31 2010 +0200 build: Update buildbot/suppressed-warnings.txt @@ -56231,7 +57088,7 @@ commit 529559407eef9afcb54ae70bb270d8ecf6fcda86 Author: Martin Nordholts -Date: Fri Sep 3 09:32:25 2010 +0200 +Date: Fri Sep 3 09:32:25 2010 +0200 plug-ins/pygimp: Fix copy-paste error in gimpthumb.override @@ -56240,7 +57097,7 @@ commit 5f8a13a3600fe30ed73211f0b10e29a571b550e9 Author: Martin Nordholts -Date: Fri Sep 3 08:41:38 2010 +0200 +Date: Fri Sep 3 08:41:38 2010 +0200 build: Update buildbot/suppressed-warnings.txt @@ -56249,7 +57106,7 @@ commit 136499d1ae5e86dbbb18badb4c4cecf711468c9c Author: Martin Nordholts -Date: Fri Sep 3 09:04:00 2010 +0200 +Date: Fri Sep 3 09:04:00 2010 +0200 plug-ins/imagemap: Kill #define COMMAND_PROTO @@ -56257,12 +57114,12 @@ and get rid of warnings about defined functions not being used. plug-ins/imagemap/imap_cmd_move_sash.c | 7 ++++--- - plug-ins/imagemap/imap_command.h | 6 ------ + plug-ins/imagemap/imap_command.h | 6 ------ 2 files changed, 4 insertions(+), 9 deletions(-) commit 3e60cacfd598cf58a188062174ce9eaf21e22611 Author: Martin Nordholts -Date: Fri Sep 3 08:37:42 2010 +0200 +Date: Fri Sep 3 08:37:42 2010 +0200 app/core: Init bestcolor in gimpimage-convert.c @@ -56274,7 +57131,7 @@ commit b3189cdbf62ff620c6a58443074e991ec66e5f3a Author: Martin Nordholts -Date: Fri Sep 3 08:28:28 2010 +0200 +Date: Fri Sep 3 08:28:28 2010 +0200 plug-ins/pygimp: Workaround for missing header @@ -56287,7 +57144,7 @@ commit 1d79b045e881a680037430bdac3328fc0f5b6c69 Author: Martin Nordholts -Date: Fri Sep 3 08:20:00 2010 +0200 +Date: Fri Sep 3 08:20:00 2010 +0200 plug-ins/pygimp: Fix setitem function signatures @@ -56299,7 +57156,7 @@ commit d40984f505e9ed703f87704f642dca002caf506d Author: Martin Nordholts -Date: Fri Sep 3 08:12:05 2010 +0200 +Date: Fri Sep 3 08:12:05 2010 +0200 plug-ins/pygimp: Cast PyMappingMethods.mp_length to lenfunc @@ -56314,7 +57171,7 @@ commit 1801fc70abcd323b5e920807c2c56ba7456b57a1 Author: Martin Nordholts -Date: Thu Sep 2 19:22:35 2010 +0200 +Date: Thu Sep 2 19:22:35 2010 +0200 app: Use `git describe` for verbose version @@ -56323,23 +57180,23 @@ this. Note that the commit ID is prefixed with 'g'. app/Makefile.am | 2 +- - app/version.c | 2 +- + app/version.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 55b0c9f08e14bc26451cf94b6a3a223059bff6da Author: Alexia Death -Date: Thu Sep 2 22:28:06 2010 +0300 +Date: Thu Sep 2 22:28:06 2010 +0300 Some generic method sorting and cleanup in the tool app/gegl/gimpoperationcagecoefcalc.c | 7 +- - app/tools/gimpcagetool.c | 444 + app/tools/gimpcagetool.c | 444 ++++++++++++++++++----------------- 2 files changed, 231 insertions(+), 220 deletions(-) commit fc7831f7a141681610304f3271e945c5f9e7994e Author: Tor Lillqvist -Date: Thu Sep 2 21:28:29 2010 +0300 +Date: Thu Sep 2 21:28:29 2010 +0300 Reduce risks on Windows also for plug-ins @@ -56348,7 +57205,7 @@ commit 6ecb219c4f41067fdd8ed76879da15ddd3496f54 Author: Alexia Death -Date: Thu Sep 2 20:11:34 2010 +0300 +Date: Thu Sep 2 20:11:34 2010 +0300 Fix a preview update related segfault @@ -56357,7 +57214,7 @@ commit 6d62a5e4feb4f2a3d8a6bd7706c87668cedfb223 Author: Tor Lillqvist -Date: Thu Sep 2 19:34:51 2010 +0300 +Date: Thu Sep 2 19:34:51 2010 +0300 Fix Win32 build @@ -56368,7 +57225,7 @@ commit 8a8140986f8c89e7bfa525451b721915e5aa9123 Author: Tor Lillqvist -Date: Thu Sep 2 19:10:10 2010 +0300 +Date: Thu Sep 2 19:10:10 2010 +0300 Include cairo.h from correct path @@ -56376,15 +57233,15 @@ 1 file changed, 1 insertion(+), 1 deletion(-) commit 6a22f17ab34c7f2fa432c2ed0b9494e6ec1be9f7 -Merge: d98bd74 bfce429 +Merge: d98bd748e7 bfce429d24 Author: Alexia Death -Date: Thu Sep 2 18:49:35 2010 +0300 +Date: Thu Sep 2 18:49:35 2010 +0300 Merge branch 'master' into soc-2010-cage-2 commit 24386abb3b6c2e509a43a537e35e9600dd25d2ed Author: Tor Lillqvist -Date: Thu Sep 2 18:38:06 2010 +0300 +Date: Thu Sep 2 18:38:06 2010 +0300 Increase safety on Windows @@ -56396,7 +57253,7 @@ commit bfce429d24f4bf94f298c3e84d3b2e33fc9f2d82 Author: Michael Natterer -Date: Thu Sep 2 00:42:59 2010 +0200 +Date: Thu Sep 2 00:42:59 2010 +0200 app: some minor fixes in GimpTextStyleEditor @@ -56408,25 +57265,25 @@ commit ad819263af66224d6c60e37a0adbbb695a06575b Author: Michael Natterer -Date: Thu Sep 2 00:20:04 2010 +0200 +Date: Thu Sep 2 00:20:04 2010 +0200 Bug 620674 - Adding support for multi-colored text layer Apply slightly modified patch from Barak Itkin that adds colors for text spans plus GUI to edit these colors. - app/widgets/gimptextbuffer.c | 137 + app/widgets/gimptextbuffer.c | 137 ++++++++++++++++++++++++++++++++++++++ - app/widgets/gimptextbuffer.h | 9 +++ + app/widgets/gimptextbuffer.h | 9 +++ app/widgets/gimptextstyleeditor.c | 93 ++++++++++++++++++++++++++ app/widgets/gimptextstyleeditor.h | 2 + - app/widgets/gimptexttag.c | 20 ++++++ - app/widgets/gimptexttag.h | 3 + + app/widgets/gimptexttag.c | 20 ++++++ + app/widgets/gimptexttag.h | 3 + 6 files changed, 264 insertions(+) commit 3759b3f0d1ba128eee9d6c3195b9b891aa75b582 Author: Michael Natterer -Date: Wed Sep 1 23:30:40 2010 +0200 +Date: Wed Sep 1 23:30:40 2010 +0200 app: render the text layout directly into the layer's pixels @@ -56441,7 +57298,7 @@ commit 1e525ff3b9ca32f8b84c3ecfceedc61a8eddc0c4 Author: Michael Natterer -Date: Wed Sep 1 23:13:02 2010 +0200 +Date: Wed Sep 1 23:13:02 2010 +0200 libgimpwidgets: allow gimpcairo-utils.h inclusion from non-gui files @@ -56453,39 +57310,38 @@ commit d791e308f16a494d6cb04bca76a97587ee01cd01 Author: Martin Nordholts -Date: Wed Sep 1 17:14:24 2010 +0200 +Date: Wed Sep 1 17:14:24 2010 +0200 build: Rename to buildbot/suppressed-warnings.txt Rename buildbot/suppressed_warnings.txt to buildbot/suppressed-warnings.txt, dashes are nicer in file names. - build/buildbot/suppressed-warnings.txt | 21 +++++++++++++++++++++ - build/buildbot/suppressed_warnings.txt | 21 --------------------- - 2 files changed, 21 insertions(+), 21 deletions(-) + build/buildbot/{suppressed_warnings.txt => suppressed-warnings.txt} | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) commit 5f77a0c33fe5add3ebd17608d77c855a9ee58dc7 Author: Sven Neumann -Date: Wed Sep 1 14:14:57 2010 +0200 +Date: Wed Sep 1 14:14:57 2010 +0200 build/windows: remove trailing whitespace and fix file coding system - build/windows/.gitignore | 8 ++++---- - build/windows/Makefile.am | 16 ++++++++-------- + build/windows/.gitignore | 8 ++++---- + build/windows/Makefile.am | 16 ++++++++-------- build/windows/gimp-plug-ins.rc.in | 2 +- build/windows/gimprc-plug-ins.rule | 12 ++++++------ 4 files changed, 19 insertions(+), 19 deletions(-) commit d98bd748e7b896e85114cd9087cc53f2a276ade3 -Merge: 6dc2042 e77dd90 +Merge: 6dc2042fe2 e77dd90fc0 Author: Alexia Death -Date: Wed Sep 1 11:21:58 2010 +0300 +Date: Wed Sep 1 11:21:58 2010 +0300 Merge branch 'master' into soc-2010-cage-2 commit e77dd90fc09c656faa74dfafa1f7ef533a4358cf Author: Michael Schumacher -Date: Wed Sep 1 08:24:45 2010 +0200 +Date: Wed Sep 1 08:24:45 2010 +0200 Bug 574018 - Add a manifest to executables @@ -56495,50 +57351,50 @@ If no problems turn up, this will close the bug. - build/windows/.gitignore | 3 +- - build/windows/Makefile.am | 10 +- - build/windows/gimp-plug-ins.rc.in | 66 +++++ - build/windows/gimprc-plug-ins.rule | 6 + - build/windows/plug-ins.ico | Bin 0 -> 2550 bytes - configure.ac | 1 + - plug-ins/color-rotate/Makefile.am | 8 +- - plug-ins/common/Makefile.am | 443 + build/windows/.gitignore | 3 +- + build/windows/Makefile.am | 10 +- + build/windows/gimp-plug-ins.rc.in | 66 +++++ + build/windows/gimprc-plug-ins.rule | 6 + + build/windows/plug-ins.ico | Bin 0 -> 2550 bytes + configure.ac | 1 + + plug-ins/color-rotate/Makefile.am | 8 +- + plug-ins/common/Makefile.am | 443 ++++++++++++++++++++++----------- - plug-ins/common/gimprc.common | 145 +++++++++++ - plug-ins/common/mkgen.pl | 23 +- - plug-ins/file-bmp/Makefile.am | 8 +- - plug-ins/file-faxg3/Makefile.am | 8 +- - plug-ins/file-fits/Makefile.am | 8 +- - plug-ins/file-fli/Makefile.am | 8 +- - plug-ins/file-ico/Makefile.am | 8 +- - plug-ins/file-jpeg/Makefile.am | 8 +- - plug-ins/file-psd/Makefile.am | 14 ++ - plug-ins/file-sgi/Makefile.am | 8 +- - plug-ins/file-uri/Makefile.am | 8 +- - plug-ins/file-xjt/Makefile.am | 8 +- - plug-ins/flame/Makefile.am | 8 +- - plug-ins/fractal-explorer/Makefile.am | 8 +- - plug-ins/gfig/Makefile.am | 8 +- - plug-ins/gimpressionist/Makefile.am | 8 +- - plug-ins/gradient-flare/Makefile.am | 8 +- - plug-ins/help-browser/Makefile.am | 8 +- - plug-ins/help/Makefile.am | 8 +- - plug-ins/ifs-compose/Makefile.am | 8 +- - plug-ins/imagemap/Makefile.am | 8 +- - plug-ins/lighting/Makefile.am | 8 +- - plug-ins/map-object/Makefile.am | 8 +- - plug-ins/maze/Makefile.am | 8 +- - plug-ins/metadata/Makefile.am | 8 +- - plug-ins/pagecurl/Makefile.am | 8 +- - plug-ins/print/Makefile.am | 8 +- - plug-ins/script-fu/Makefile.am | 8 +- + plug-ins/common/gimprc.common | 145 +++++++++++ + plug-ins/common/mkgen.pl | 23 +- + plug-ins/file-bmp/Makefile.am | 8 +- + plug-ins/file-faxg3/Makefile.am | 8 +- + plug-ins/file-fits/Makefile.am | 8 +- + plug-ins/file-fli/Makefile.am | 8 +- + plug-ins/file-ico/Makefile.am | 8 +- + plug-ins/file-jpeg/Makefile.am | 8 +- + plug-ins/file-psd/Makefile.am | 14 ++ + plug-ins/file-sgi/Makefile.am | 8 +- + plug-ins/file-uri/Makefile.am | 8 +- + plug-ins/file-xjt/Makefile.am | 8 +- + plug-ins/flame/Makefile.am | 8 +- + plug-ins/fractal-explorer/Makefile.am | 8 +- + plug-ins/gfig/Makefile.am | 8 +- + plug-ins/gimpressionist/Makefile.am | 8 +- + plug-ins/gradient-flare/Makefile.am | 8 +- + plug-ins/help-browser/Makefile.am | 8 +- + plug-ins/help/Makefile.am | 8 +- + plug-ins/ifs-compose/Makefile.am | 8 +- + plug-ins/imagemap/Makefile.am | 8 +- + plug-ins/lighting/Makefile.am | 8 +- + plug-ins/map-object/Makefile.am | 8 +- + plug-ins/maze/Makefile.am | 8 +- + plug-ins/metadata/Makefile.am | 8 +- + plug-ins/pagecurl/Makefile.am | 8 +- + plug-ins/print/Makefile.am | 8 +- + plug-ins/script-fu/Makefile.am | 8 +- plug-ins/selection-to-path/Makefile.am | 8 +- - plug-ins/twain/Makefile.am | 7 +- + plug-ins/twain/Makefile.am | 7 +- 38 files changed, 753 insertions(+), 181 deletions(-) commit 81024bd50100eb2f5c7080503c2786bdd4139dbb Author: Michael Schumacher -Date: Tue Aug 31 00:02:59 2010 +0200 +Date: Tue Aug 31 00:02:59 2010 +0200 Adjusted copyright date to 2010 @@ -56547,7 +57403,7 @@ commit 813ee3de888fc3d84935a9af5341438a951de73b Author: Sven Neumann -Date: Tue Aug 31 22:58:27 2010 +0200 +Date: Tue Aug 31 22:58:27 2010 +0200 app: port layout drawing to cairo @@ -56557,7 +57413,7 @@ commit b8c8993ff9997904a2389c17daff5d5f009e35ca Author: Martin Nordholts -Date: Tue Aug 31 22:52:22 2010 +0200 +Date: Tue Aug 31 22:52:22 2010 +0200 build: Add initial version of buildbot/suppressed_warnings.txt @@ -56566,18 +57422,18 @@ commit 0dc4b5de7254d74d875d6bdb18054981edc7547d Author: Martin Nordholts -Date: Tue Aug 31 22:29:49 2010 +0200 +Date: Tue Aug 31 22:29:49 2010 +0200 Fix a bunch of warnings - app/core/gimpimage-convert.c | 2 +- - app/display/gimpcanvas.c | 2 ++ + app/core/gimpimage-convert.c | 2 +- + app/display/gimpcanvas.c | 2 ++ libgimpcolor/test-color-parser.c | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) commit 7ea33a7ea6d51f71e2bd1cb3a001d3c195f683c2 Author: Michael Natterer -Date: Tue Aug 31 18:59:41 2010 +0200 +Date: Tue Aug 31 18:59:41 2010 +0200 libgimp: update gimp.def @@ -56586,7 +57442,7 @@ commit bf62cc2e5f4c47f8f846c0ca34bca3b22ddc0f88 Author: Martin Nordholts -Date: Tue Aug 31 17:34:18 2010 +0200 +Date: Tue Aug 31 17:34:18 2010 +0200 Revert "tools: Add distdir-from-configure-ac.sh" @@ -56599,25 +57455,25 @@ commit ab852d74095acd4e2ae7f53f204762b59e28531c Author: Michael Natterer -Date: Tue Aug 31 17:07:27 2010 +0200 +Date: Tue Aug 31 17:07:27 2010 +0200 pdb: add proper error messages for gimp_image_reorder_item() app/pdb/gimppdb-utils.c | 83 +++++++++++++++++++++++++++++++++++++++++++--- app/pdb/gimppdb-utils.h | 9 +++++ - app/pdb/image-cmds.c | 11 ++---- + app/pdb/image-cmds.c | 11 ++---- tools/pdbgen/pdb/image.pdb | 11 ++---- 4 files changed, 94 insertions(+), 20 deletions(-) commit b24de26791b9f27914b3002aa5caf3842d423317 Author: Michael Natterer -Date: Mon Aug 30 20:36:11 2010 +0200 +Date: Mon Aug 30 20:36:11 2010 +0200 libgimp: add gimp_image_reorder_item() for arbitrary reordering in a tree - app/pdb/image-cmds.c | 84 + app/pdb/image-cmds.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++ app/pdb/internal-procs.c | 2 +- libgimp/gimpimage_pdb.c | 40 ++++++++++++++++++++++ @@ -56627,7 +57483,7 @@ commit 762ad9c07448a180efe2d33a571d2af5d2f07c7d Author: Martin Nordholts -Date: Mon Aug 30 23:13:21 2010 +0200 +Date: Mon Aug 30 23:13:21 2010 +0200 tools: Add distdir-from-configure-ac.sh @@ -56638,22 +57494,22 @@ commit 6dc2042fe2f4862e409b505b6bc690e79dc919e5 Author: Alexia Death -Date: Mon Aug 30 23:36:20 2010 +0300 +Date: Mon Aug 30 23:36:20 2010 +0300 app: cage tool adjustments and fixes Just show the complete preview and take the fill color from under first point. - app/gegl/gimpcageconfig.c | 2 +- + app/gegl/gimpcageconfig.c | 2 +- app/gegl/gimpoperationcagetransform.c | 12 +++++------- - app/tools/gimpcageoptions.c | 2 +- - app/tools/gimpcagetool.c | 12 +++--------- + app/tools/gimpcageoptions.c | 2 +- + app/tools/gimpcagetool.c | 12 +++--------- 4 files changed, 10 insertions(+), 18 deletions(-) commit 9f0cdcded6cca70476419807e57cf1f86e41bff6 Author: Martin Nordholts -Date: Mon Aug 30 19:35:29 2010 +0200 +Date: Mon Aug 30 19:35:29 2010 +0200 libgimp: Update gimp.def @@ -56662,7 +57518,7 @@ commit 34b525a3798081e9b29fc547dbe60b34826009e7 Author: Martin Nordholts -Date: Mon Aug 30 18:17:31 2010 +0200 +Date: Mon Aug 30 18:17:31 2010 +0200 po-plug-ins: Update POTFILES.in @@ -56671,7 +57527,7 @@ commit 91b069c843e218b56794c358b379d0e9835e1088 Author: Alan Monfort -Date: Mon Aug 30 14:03:01 2010 +0200 +Date: Mon Aug 30 14:03:01 2010 +0200 Updated Breton translation @@ -56680,22 +57536,22 @@ commit 05c6b7e9f294c49246e24a96dd27a6610ceee468 Author: Alan Monfort -Date: Mon Aug 30 14:02:10 2010 +0200 +Date: Mon Aug 30 14:02:10 2010 +0200 Updated Breton translation po-libgimp/br.po | 446 ++++++------ po-plug-ins/br.po | 615 ++++++++-------- - po-python/LINGUAS | 1 + + po-python/LINGUAS | 1 + po-python/br.po | 337 +++++++++ po-script-fu/br.po | 527 ++++++++------ - po/br.po | 2026 + po/br.po | 2026 ++++++++++++++++++++++++++-------------------------- 6 files changed, 2212 insertions(+), 1740 deletions(-) commit 3b981a2663b7b012fce2f720c077c28dadb6f11a Author: Francisco Vila -Date: Mon Aug 30 06:01:13 2010 +0200 +Date: Mon Aug 30 06:01:13 2010 +0200 Updated Spanish translation @@ -56705,7 +57561,7 @@ commit 4e2289f736f9505e6613fdd9f3d7276750b8cbf1 Author: Michael Natterer -Date: Sat Aug 28 18:49:15 2010 +0200 +Date: Sat Aug 28 18:49:15 2010 +0200 libgimp: add API to access item groups @@ -56713,7 +57569,7 @@ functions still missing. app/pdb/internal-procs.c | 2 +- - app/pdb/item-cmds.c | 207 + app/pdb/item-cmds.c | 207 ++++++++++++++++++++++++++++++++++++++++++++++ libgimp/gimpitem_pdb.c | 110 ++++++++++++++++++++++++ libgimp/gimpitem_pdb.h | 4 + @@ -56722,32 +57578,32 @@ commit 274f210e4ca3523917a4c32a341aebfa1ec0d1cd Author: Michael Natterer -Date: Sat Aug 28 15:33:25 2010 +0200 +Date: Sat Aug 28 15:33:25 2010 +0200 app: remove obsolete includes - app/display/gimpcanvas.c | 3 --- + app/display/gimpcanvas.c | 3 --- app/display/gimpdisplayshell-callbacks.c | 1 - 2 files changed, 4 deletions(-) commit 02abdff8aa558c7b263c76657c39f72ddf3974de Author: Michael Natterer -Date: Sat Aug 28 15:30:02 2010 +0200 +Date: Sat Aug 28 15:30:02 2010 +0200 app: move the wilber drawing functions to gimpcairo.c - app/display/gimpcanvas.c | 47 ----------------- - app/display/gimpcanvas.h | 2 - + app/display/gimpcanvas.c | 47 ----------------- + app/display/gimpcanvas.h | 2 - app/display/gimpdisplayshell-callbacks.c | 3 +- - app/widgets/gimpcairo.c | 89 + app/widgets/gimpcairo.c | 89 ++++++++++++++++++++++++++++++++ - app/widgets/gimpcairo.h | 5 ++ - app/widgets/gimptoolbox.c | 31 ++--------- + app/widgets/gimpcairo.h | 5 ++ + app/widgets/gimptoolbox.c | 31 ++--------- 6 files changed, 99 insertions(+), 78 deletions(-) commit 6130f6b0bb1672f7911b0bf2eb02f076e7881a75 Author: Michael Natterer -Date: Sat Aug 28 12:44:30 2010 +0200 +Date: Sat Aug 28 12:44:30 2010 +0200 plug-ins: clean up includes in file-pdf-save.c @@ -56756,7 +57612,7 @@ commit c0e475e7e2e0b2279b054f7c2aaa5324df469154 Author: Michael Natterer -Date: Sat Aug 28 11:44:11 2010 +0200 +Date: Sat Aug 28 11:44:11 2010 +0200 app: add comment about cairo_t and double buffering @@ -56765,7 +57621,7 @@ commit e582cdd23de7fbbacc3f72419541505562f6bcc3 Author: Mukund Sivaraman -Date: Sat Aug 28 09:38:15 2010 +0530 +Date: Sat Aug 28 09:38:15 2010 +0530 Don't use GNU specific extension @@ -56774,7 +57630,7 @@ commit d1393686abae45ea403798511c36faf2f7f5d1ad Author: Michael Natterer -Date: Sat Aug 28 00:09:31 2010 +0200 +Date: Sat Aug 28 00:09:31 2010 +0200 app: move creating of the cairo_t to gimp_display_shell_canvas_expose() @@ -56787,25 +57643,25 @@ commit f0c40d3717c9778bb40fa2bb9c1eef3ab15c6862 Author: Michael Natterer -Date: Fri Aug 27 19:32:16 2010 +0200 +Date: Fri Aug 27 19:32:16 2010 +0200 app: port GimpDisplayShell image drawing to cairo - app/display/gimpcanvas.c | 42 --------------- - app/display/gimpcanvas.h | 11 ---- + app/display/gimpcanvas.c | 42 --------------- + app/display/gimpcanvas.h | 11 ---- app/display/gimpdisplayshell-callbacks.c | 6 ++- - app/display/gimpdisplayshell-draw.c | 4 +- - app/display/gimpdisplayshell-draw.h | 1 + - app/display/gimpdisplayshell-render.c | 93 + app/display/gimpdisplayshell-draw.c | 4 +- + app/display/gimpdisplayshell-draw.h | 1 + + app/display/gimpdisplayshell-render.c | 93 ++++++++++++++++++-------------- - app/display/gimpdisplayshell-render.h | 1 + - app/display/gimpdisplayshell.c | 12 ++--- - app/display/gimpdisplayshell.h | 2 +- + app/display/gimpdisplayshell-render.h | 1 + + app/display/gimpdisplayshell.c | 12 ++--- + app/display/gimpdisplayshell.h | 2 +- 9 files changed, 69 insertions(+), 103 deletions(-) commit 90655d8744f154ba5fe38d8d1aa0a3126796267c Author: Michael Schumacher -Date: Fri Aug 27 23:09:20 2010 +0200 +Date: Fri Aug 27 23:09:20 2010 +0200 Use $(GIMP_APP_VERSION) in resource object file name @@ -56814,24 +57670,24 @@ commit f1266c2b0ad1355a6d18c05529dc2a0425424870 Author: Barak Itkin -Date: Sat Aug 28 00:08:35 2010 +0300 +Date: Sat Aug 28 00:08:35 2010 +0300 plug-ins: fix some warnings in file-pdf-save, and fix configure.ac to include it - configure.ac | 2 +- + configure.ac | 2 +- plug-ins/common/file-pdf-save.c | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) commit 6f8c412735637403063dfb929c3626d4d506d8d4 Author: Barak Itkin -Date: Fri Aug 27 23:22:10 2010 +0300 +Date: Fri Aug 27 23:22:10 2010 +0300 plug-ins: add the new file-pdf-save plugin (Bug #382688) - configure.ac | 25 + - plug-ins/common/.gitignore | 2 + - plug-ins/common/Makefile.am | 21 + + configure.ac | 25 + + plug-ins/common/.gitignore | 2 + + plug-ins/common/Makefile.am | 21 + plug-ins/common/file-pdf-save.c | 1475 +++++++++++++++++++++++++++++++++++++++ plug-ins/common/plugin-defs.pl | 1 + @@ -56839,7 +57695,7 @@ commit 7f10c24f4a1ddef6336247b3c43d80da166e8a87 Author: Barak Itkin -Date: Fri Aug 27 19:43:00 2010 +0300 +Date: Fri Aug 27 19:43:00 2010 +0300 plug-ins: rename file-pdf to file-pdf-load @@ -56847,19 +57703,16 @@ to introduce the new PDF export plugin - configure.ac | 6 +- - plug-ins/common/.gitignore | 4 +- - plug-ins/common/Makefile.am | 12 +- - plug-ins/common/file-pdf-load.c | 1485 - +++++++++++++++++++++++++++++++++++++++ - plug-ins/common/file-pdf.c | 1485 - --------------------------------------- - plug-ins/common/plugin-defs.pl | 2 +- - 6 files changed, 1497 insertions(+), 1497 deletions(-) + configure.ac | 6 +++--- + plug-ins/common/.gitignore | 4 ++-- + plug-ins/common/Makefile.am | 12 ++++++------ + plug-ins/common/{file-pdf.c => file-pdf-load.c} | 4 ++-- + plug-ins/common/plugin-defs.pl | 2 +- + 5 files changed, 14 insertions(+), 14 deletions(-) commit 9781cf1523006aafb21c0a7f92a3c3b5faf41de7 Author: Michael Schumacher -Date: Fri Aug 27 21:13:03 2010 +0200 +Date: Fri Aug 27 21:13:03 2010 +0200 Bug 574018 - Add a manifest to executables @@ -56867,30 +57720,30 @@ build/windows/ directory. Michael Natterer suggested this approach in order to minimize the changes done to each executable's Makefile.am. - app/Makefile.am | 8 +------- + app/Makefile.am | 8 +------- build/windows/Makefile.am | 1 + build/windows/gimprc.rule | 6 ++++++ 3 files changed, 8 insertions(+), 7 deletions(-) commit 0d35e8de6d79607c0c7fc820884367e39c85fe41 Author: Michael Natterer -Date: Fri Aug 27 16:11:06 2010 +0200 +Date: Fri Aug 27 16:11:06 2010 +0200 libgimp: add item based API for positions (raise, lower etc.) and deprecate the resp. functions for layers, channels and vectors. - app/pdb/image-cmds.c | 1026 + app/pdb/image-cmds.c | 1026 ++++++++++++++++++++++++++++---------------- - app/pdb/internal-procs.c | 2 +- + app/pdb/internal-procs.c | 2 +- libgimp/gimpimage_pdb.c | 455 +++++++++++++------- - libgimp/gimpimage_pdb.h | 32 +- + libgimp/gimpimage_pdb.h | 32 +- tools/pdbgen/pdb/image.pdb | 288 ++++++++----- 5 files changed, 1144 insertions(+), 659 deletions(-) commit ac33ead19d9d321accd2bb787a40c598309f3ada Author: Sven Neumann -Date: Fri Aug 27 15:13:24 2010 +0200 +Date: Fri Aug 27 15:13:24 2010 +0200 app/widgets: plug memory leak @@ -56899,20 +57752,20 @@ commit 9c63f3d4f1f8e561bcbdee47f90ca475afe06530 Author: Michael Natterer -Date: Fri Aug 27 15:03:03 2010 +0200 +Date: Fri Aug 27 15:03:03 2010 +0200 app: remove gimp_display_shell_draw_selection_segments() and move its code into selection_render_mask(). - app/display/gimpdisplayshell-draw.c | 24 ++++-------------------- - app/display/gimpdisplayshell-draw.h | 6 +----- + app/display/gimpdisplayshell-draw.c | 24 ++++-------------------- + app/display/gimpdisplayshell-draw.h | 6 +----- app/display/gimpdisplayshell-selection.c | 17 +++++++++++------ 3 files changed, 16 insertions(+), 31 deletions(-) commit f260cd766eef3b5318a13614ecc9f75f4f88faf8 Author: Michael Natterer -Date: Fri Aug 27 14:58:43 2010 +0200 +Date: Fri Aug 27 14:58:43 2010 +0200 app: add gimp_cairo_add_segments() @@ -56921,13 +57774,13 @@ app/display/gimpdisplayshell-draw.c | 52 +++---------------------------------- - app/widgets/gimpcairo.c | 25 ++++++++++++++++++ - app/widgets/gimpcairo.h | 4 +++ + app/widgets/gimpcairo.c | 25 ++++++++++++++++++ + app/widgets/gimpcairo.h | 4 +++ 3 files changed, 33 insertions(+), 48 deletions(-) commit f4f1c563a2216e0956dc191aa7ddbcedff9e8a54 Author: Michael Natterer -Date: Fri Aug 27 14:52:27 2010 +0200 +Date: Fri Aug 27 14:52:27 2010 +0200 app: don't include "gimpcanvas.h" any longer @@ -56936,7 +57789,7 @@ commit 3e1b14fd1a83593454357a28e08909458bac81d7 Author: Michael Natterer -Date: Fri Aug 27 14:41:30 2010 +0200 +Date: Fri Aug 27 14:41:30 2010 +0200 app: add widgets/gimpcairo.[ch] for cairo utility functions @@ -56944,14 +57797,14 @@ app/display/gimpdisplayshell-style.c | 144 +++++++++++++---------------------- - app/widgets/Makefile.am | 2 + - app/widgets/gimpcairo.c | 86 +++++++++++++++++++++ - app/widgets/gimpcairo.h | 33 ++++++++ + app/widgets/Makefile.am | 2 + + app/widgets/gimpcairo.c | 86 +++++++++++++++++++++ + app/widgets/gimpcairo.h | 33 ++++++++ 4 files changed, 173 insertions(+), 92 deletions(-) commit 63fc773b5178d2e5b35df35d49d1020583109a37 Author: Sven Neumann -Date: Fri Aug 27 13:11:51 2010 +0200 +Date: Fri Aug 27 13:11:51 2010 +0200 po-tags: add skip file @@ -56960,7 +57813,7 @@ commit d4d3e65cbe90d377a6adde30af95446af26869c5 Author: Marco Ciampa -Date: Fri Aug 27 11:28:21 2010 +0200 +Date: Fri Aug 27 11:28:21 2010 +0200 Updated italian translation @@ -56969,7 +57822,7 @@ commit 82dca2ecf4030adba8119b81f477d25e06b986fa Author: Michael Schumacher -Date: Thu Aug 26 22:10:07 2010 +0200 +Date: Thu Aug 26 22:10:07 2010 +0200 Bug 574018 - Add a manifest to executables @@ -56978,28 +57831,22 @@ linked. In this initial step, the current resources are moved from the app/ directory to a global build/windows directory. - Makefile.am | 3 +- - app/Makefile.am | 23 ++++++--------- - app/fileicon.ico | Bin 22486 -> 0 bytes - app/gimp.manifest | 23 --------------- - app/gimp.rc.in | 67 - -------------------------------------------- - app/wilber.ico | Bin 45046 -> 0 bytes - build/.gitignore | 2 ++ - build/Makefile.am | 2 ++ - build/windows/.gitignore | 3 ++ - build/windows/Makefile.am | 5 ++++ - build/windows/fileicon.ico | Bin 0 -> 22486 bytes - build/windows/gimp.manifest | 23 +++++++++++++++ - build/windows/gimp.rc.in | 67 - ++++++++++++++++++++++++++++++++++++++++++++ - build/windows/wilber.ico | Bin 0 -> 45046 bytes - configure.ac | 4 ++- - 15 files changed, 115 insertions(+), 107 deletions(-) + Makefile.am | 3 ++- + app/Makefile.am | 23 ++++++++--------------- + build/.gitignore | 2 ++ + build/Makefile.am | 2 ++ + build/windows/.gitignore | 3 +++ + build/windows/Makefile.am | 5 +++++ + {app => build/windows}/fileicon.ico | Bin + {app => build/windows}/gimp.manifest | 0 + {app => build/windows}/gimp.rc.in | 6 +++--- + {app => build/windows}/wilber.ico | Bin + configure.ac | 4 +++- + 11 files changed, 28 insertions(+), 20 deletions(-) commit b7b93d3d7bf4d07184d1ec101894fe40a77350b2 Author: Sven Neumann -Date: Thu Aug 26 21:01:39 2010 +0200 +Date: Thu Aug 26 21:01:39 2010 +0200 app/display: add some const qualifiers @@ -57008,7 +57855,7 @@ commit a6ce99afe0b49f007b7afe20a26bcc9ae3266f2e Author: Michael Natterer -Date: Thu Aug 26 21:01:21 2010 +0200 +Date: Thu Aug 26 21:01:21 2010 +0200 app: remove point drawing API from GimpCanvas, it's not used any longer @@ -57020,7 +57867,7 @@ commit be2bd189cd6d96c63e4a8a41cff98486e740ebf4 Author: Michael Natterer -Date: Thu Aug 26 20:52:52 2010 +0200 +Date: Thu Aug 26 20:52:52 2010 +0200 app: completely switch to cairo-drawing the selection @@ -57030,24 +57877,24 @@ Also fixes bug #479875 - performance problem drawing a complex selection. - app/display/gimpcanvas.c | 184 -------------------- - app/display/gimpcanvas.h | 7 - - app/display/gimpdisplayshell-draw.c | 26 ++- - app/display/gimpdisplayshell-draw.h | 7 +- + app/display/gimpcanvas.c | 184 -------------------- + app/display/gimpcanvas.h | 7 - + app/display/gimpdisplayshell-draw.c | 26 ++- + app/display/gimpdisplayshell-draw.h | 7 +- app/display/gimpdisplayshell-selection.c | 289 +++---------------------------- 5 files changed, 53 insertions(+), 460 deletions(-) commit aee148a486060e5b52ca2963cae5de264ba343c1 -Merge: 37d38f5 d745ab3 +Merge: 37d38f596e d745ab3871 Author: Alexia Death -Date: Thu Aug 26 21:50:55 2010 +0300 +Date: Thu Aug 26 21:50:55 2010 +0300 Merge branch 'master' into soc-2010-cage-2 commit d745ab387168dc583a87ea49822d4a64f140feac Author: Michael Natterer -Date: Thu Aug 26 19:13:49 2010 +0200 +Date: Thu Aug 26 19:13:49 2010 +0200 app: move the GIMP_CURSOR_SIZE define to a single place in the right header @@ -57059,7 +57906,7 @@ commit fa6eb03fb2f6757e4b3886dc1ca46b78fe3ff49b Author: Martin Nordholts -Date: Thu Aug 26 18:50:16 2010 +0200 +Date: Thu Aug 26 18:50:16 2010 +0200 app/tests: Add 'paintbrush_is_standard_tool' regression test @@ -57071,7 +57918,7 @@ commit 98ee5e14a2cd9f9c83dfc76696427ec3b80290e8 Author: Michael Natterer -Date: Thu Aug 26 18:21:04 2010 +0200 +Date: Thu Aug 26 18:21:04 2010 +0200 app: forgot to remove some disabled code @@ -57080,24 +57927,24 @@ commit 58db8a3ef0f87e83869604ec45c2f966b90f493e Author: Michael Natterer -Date: Thu Aug 26 18:09:33 2010 +0200 +Date: Thu Aug 26 18:09:33 2010 +0200 app: port GimpDisplayShell selection drawing to cairo but keep the old code around because it's much faster. The new code is enabled by defining the CAIRO_SELECTION environment variable. - app/display/gimpdisplayshell-draw.c | 63 +++++++++++++ - app/display/gimpdisplayshell-draw.h | 9 ++ + app/display/gimpdisplayshell-draw.c | 63 +++++++++++++ + app/display/gimpdisplayshell-draw.h | 9 ++ app/display/gimpdisplayshell-selection.c | 150 +++++++++++++++++++++---------- - app/display/gimpdisplayshell-style.c | 78 +++++++++++++--- - app/display/gimpdisplayshell-style.h | 43 +++++---- + app/display/gimpdisplayshell-style.c | 78 +++++++++++++--- + app/display/gimpdisplayshell-style.h | 43 +++++---- 5 files changed, 266 insertions(+), 77 deletions(-) commit f1d89f712dd75a5e759f5923119500296ed9bd25 Author: Sven Neumann -Date: Wed Aug 25 21:41:14 2010 +0200 +Date: Wed Aug 25 21:41:14 2010 +0200 Bug 626446 - segfaults when started with -i argument @@ -57105,7 +57952,7 @@ code that was copied and pasted from other GimpData objects. Fixes the crash on startup in non-interactive mode. - app/core/gimp.c | 2 +- + app/core/gimp.c | 2 +- app/core/gimpcontext.c | 13 +++---------- app/core/gimptoolpreset.c | 24 ++---------------------- app/core/gimptoolpreset.h | 1 - @@ -57113,26 +57960,26 @@ commit cd192adf09a8423aa0d2a2d10db764331cef11f5 Author: Michael Natterer -Date: Wed Aug 25 21:21:16 2010 +0200 +Date: Wed Aug 25 21:21:16 2010 +0200 app: undo some of the previous refactorings and keep using GdkSegment It's not going to be deprecated, so there is no harm in using it; get rid of all the added _old() functions too. - app/display/gimpdisplayshell-draw.c | 2 +- - app/display/gimpdisplayshell-draw.h | 2 +- + app/display/gimpdisplayshell-draw.c | 2 +- + app/display/gimpdisplayshell-draw.h | 2 +- app/display/gimpdisplayshell-selection.c | 65 +++++--------------------------- app/display/gimpdisplayshell-transform.c | 60 +---------------------------- app/display/gimpdisplayshell-transform.h | 7 +--- - app/tools/gimpregionselecttool.c | 4 +- + app/tools/gimpregionselecttool.c | 4 +- 6 files changed, 15 insertions(+), 125 deletions(-) commit d73f08840896fc299614004b721b6252b85a3e46 Author: Michael Natterer -Date: Wed Aug 25 13:01:12 2010 +0200 +Date: Wed Aug 25 13:01:12 2010 +0200 app: move the calls to cairo_translate() out of gimpdisplayshell-style.c @@ -57146,7 +57993,7 @@ commit 3f6bb75129a6ff8c131070301332a47715610b2a Author: Michael Natterer -Date: Wed Aug 25 01:58:00 2010 +0200 +Date: Wed Aug 25 01:58:00 2010 +0200 app: pass transformed segments to gimp_display_shell_draw_layer_boundary() @@ -57156,7 +58003,7 @@ return arrays of BoundSegs, for the lack of a nicer struct). This is all very ugly and will change. - app/display/gimpdisplayshell-draw.c | 42 ++----------- + app/display/gimpdisplayshell-draw.c | 42 ++----------- app/display/gimpdisplayshell-selection.c | 102 +++++++++++++++++++++---------- app/display/gimpdisplayshell-transform.c | 58 ++++++++++++++++++ @@ -57165,7 +58012,7 @@ commit 3127d36216f996897d0cc36e0920cc8fcd47b5fd Author: Michael Natterer -Date: Wed Aug 25 01:37:19 2010 +0200 +Date: Wed Aug 25 01:37:19 2010 +0200 app: rename gimp_display_shell_transform_segments() @@ -57175,23 +58022,23 @@ app/display/gimpdisplayshell-selection.c | 4 ++-- app/display/gimpdisplayshell-transform.c | 12 ++++++------ app/display/gimpdisplayshell-transform.h | 2 +- - app/tools/gimpregionselecttool.c | 4 ++-- + app/tools/gimpregionselecttool.c | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) commit e7f6350c2f93eba76fb9a1cc8a94b4206acb8b3c Author: Alexandre Prokoudine -Date: Wed Aug 25 02:55:35 2010 +0400 +Date: Wed Aug 25 02:55:35 2010 +0400 Updated Russian translations po-plug-ins/ru.po | 380 +++++++++-------- - po/ru.po | 1203 + po/ru.po | 1203 ++++++++++++++++++++++++++++------------------------- 2 files changed, 826 insertions(+), 757 deletions(-) commit 4e0925a67c0af366357fd3196f851b99dec53456 Author: Michael Natterer -Date: Tue Aug 24 18:07:31 2010 +0200 +Date: Tue Aug 24 18:07:31 2010 +0200 app: port GimpDisplayShell layer boundary drawing to cairo @@ -57199,19 +58046,19 @@ GdkSegment arrays now, but this uglyness will go away once porting to cairo is complete. - app/display/gimpcanvas.c | 33 ---------------- - app/display/gimpcanvas.h | 3 -- - app/display/gimpdisplayshell-draw.c | 67 + app/display/gimpcanvas.c | 33 ---------------- + app/display/gimpcanvas.h | 3 -- + app/display/gimpdisplayshell-draw.c | 67 ++++++++++++++++++++++++++++++++ - app/display/gimpdisplayshell-draw.h | 5 +++ + app/display/gimpdisplayshell-draw.h | 5 +++ app/display/gimpdisplayshell-selection.c | 54 ++++++++++++++----------- - app/display/gimpdisplayshell-style.c | 41 +++++++++++++++++++ - app/display/gimpdisplayshell-style.h | 3 ++ + app/display/gimpdisplayshell-style.c | 41 +++++++++++++++++++ + app/display/gimpdisplayshell-style.h | 3 ++ 7 files changed, 148 insertions(+), 58 deletions(-) commit b5e49426dfff595b9e786f9dbe3f27d0ad75cba6 Author: Michael Natterer -Date: Tue Aug 24 18:04:49 2010 +0200 +Date: Tue Aug 24 18:04:49 2010 +0200 app: forgot to remove debug output in xcf_save_choose_format() @@ -57220,7 +58067,7 @@ commit 0d39da7ce8f348581684a2c6ce6110311af4b804 Author: Michael Natterer -Date: Tue Aug 24 17:36:42 2010 +0200 +Date: Tue Aug 24 17:36:42 2010 +0200 app: s/num_segs/n_segs/ @@ -57230,7 +58077,7 @@ commit bb40aef9bfe45cf34098472c2a2325fdc53c6711 Author: Michael Natterer -Date: Tue Aug 24 14:04:31 2010 +0200 +Date: Tue Aug 24 14:04:31 2010 +0200 Bug 626492 - XCF version not increased when new layers are in layer group @@ -57239,12 +58086,12 @@ add a version 3 loader entry. app/xcf/xcf-save.c | 13 ++++++++++--- - app/xcf/xcf.c | 3 ++- + app/xcf/xcf.c | 3 ++- 2 files changed, 12 insertions(+), 4 deletions(-) commit 8fc5fd6c99ac685bd16f3057f5f5c1b3bb73eaa3 Author: Michael Natterer -Date: Tue Aug 24 13:43:31 2010 +0200 +Date: Tue Aug 24 13:43:31 2010 +0200 app: whitespace and formatting cleanup @@ -57254,7 +58101,7 @@ commit ea5acef4a5764cdfe2f8ff15b16f9326b093c948 Author: Michael Natterer -Date: Mon Aug 23 22:18:03 2010 +0200 +Date: Mon Aug 23 22:18:03 2010 +0200 app: remove redundant call to gimp_display_shell_scroll_get_render_start_offset() @@ -57264,26 +58111,26 @@ commit 18d3882c5c4a9e210506cb1b37facee939299587 Author: Michael Natterer -Date: Mon Aug 23 21:59:27 2010 +0200 +Date: Mon Aug 23 21:59:27 2010 +0200 app: port GimpDisplayShell pen drawing to cairo - app/display/gimpcanvas.c | 27 --------- - app/display/gimpcanvas.h | 3 - - app/display/gimpdisplayshell-draw.c | 102 + app/display/gimpcanvas.c | 27 --------- + app/display/gimpcanvas.h | 3 - + app/display/gimpdisplayshell-draw.c | 102 +++++++------------------------- - app/display/gimpdisplayshell-draw.h | 3 +- + app/display/gimpdisplayshell-draw.h | 3 +- app/display/gimpdisplayshell-handlers.c | 6 -- - app/display/gimpdisplayshell-style.c | 34 +++++++++++ - app/display/gimpdisplayshell-style.h | 5 ++ - app/display/gimpdisplayshell.c | 6 -- - app/display/gimpdisplayshell.h | 1 - - app/tools/gimpforegroundselecttool.c | 4 ++ + app/display/gimpdisplayshell-style.c | 34 +++++++++++ + app/display/gimpdisplayshell-style.h | 5 ++ + app/display/gimpdisplayshell.c | 6 -- + app/display/gimpdisplayshell.h | 1 - + app/tools/gimpforegroundselecttool.c | 4 ++ 10 files changed, 68 insertions(+), 123 deletions(-) commit 3a1ba90507a6b16b0ad54c190ad3f3b8d9f7d42b Author: Michael Natterer -Date: Mon Aug 23 20:39:22 2010 +0200 +Date: Mon Aug 23 20:39:22 2010 +0200 app: port GimpDisplayShell cursor drawing to cairo @@ -57291,21 +58138,21 @@ gimp_display_shell_update_cursor(), which is needed with the new manual double buffering code. - app/display/gimpcanvas.c | 35 + app/display/gimpcanvas.c | 35 ------------------------------ - app/display/gimpcanvas.h | 3 --- + app/display/gimpcanvas.h | 3 --- app/display/gimpdisplayshell-callbacks.c | 4 +++- - app/display/gimpdisplayshell-cursor.c | 20 ++++++++++++----- - app/display/gimpdisplayshell-draw.c | 37 + app/display/gimpdisplayshell-cursor.c | 20 ++++++++++++----- + app/display/gimpdisplayshell-draw.c | 37 +++++++++++++++++++++++++++++--- - app/display/gimpdisplayshell-draw.h | 3 ++- - app/display/gimpdisplayshell-style.c | 12 +++++++++++ - app/display/gimpdisplayshell-style.h | 2 ++ + app/display/gimpdisplayshell-draw.h | 3 ++- + app/display/gimpdisplayshell-style.c | 12 +++++++++++ + app/display/gimpdisplayshell-style.h | 2 ++ 8 files changed, 68 insertions(+), 48 deletions(-) commit 6411f5e32782b97a3e35c45cad5057b577a11530 Author: Barak Itkin -Date: Mon Aug 23 16:10:39 2010 +0300 +Date: Mon Aug 23 16:10:39 2010 +0300 app: Add a better tooltip to "Save a Copy" (see Bug 588097) @@ -57314,7 +58161,7 @@ commit 3d6eff1d4986b06e8dcb6b50d7224fc77da7b8b5 Author: Sven Neumann -Date: Sun Aug 22 21:50:18 2010 +0200 +Date: Sun Aug 22 21:50:18 2010 +0200 app: minor formatting changes and some const qualifiers @@ -57324,7 +58171,7 @@ commit 9bde117b055cf7e2989e14ce7c10103232aee399 Author: Massimo Valentini -Date: Sun Aug 22 21:37:24 2010 +0200 +Date: Sun Aug 22 21:37:24 2010 +0200 Bug 623169 - Memory leaks in GIMP @@ -57335,7 +58182,7 @@ commit 8d0be04e51fcb737c3404c26c77dbab09258ac34 Author: Martin Nordholts -Date: Sat Aug 21 12:27:52 2010 +0200 +Date: Sat Aug 21 12:27:52 2010 +0200 app/base: Add gtk-doc to pixel_region_init() @@ -57344,7 +58191,7 @@ commit 3a447213a9878eae967395c2a0acb2e207ef08e4 Author: Martin Nordholts -Date: Sat Aug 21 11:14:20 2010 +0200 +Date: Sat Aug 21 11:14:20 2010 +0200 app/tests: Add layer group regression testing for XCF write and read @@ -57354,7 +58201,7 @@ commit 1d7dd157e23d5d41ba57da1bba00211db82844c5 Author: David Gowers <00ai99@gmail.com> -Date: Tue Jul 6 09:02:22 2010 +0930 +Date: Tue Jul 6 09:02:22 2010 +0930 Bug 367388 - Small/percentage adjustment actions for tool-value and tip-sizes @@ -57362,17 +58209,17 @@ Implement actions for relative adjustment of tool values and brush sizes. - app/actions/actions.c | 5 ++-- - app/actions/actions.h | 1 + + app/actions/actions.c | 5 ++-- + app/actions/actions.h | 1 + app/actions/context-commands.c | 12 ++++----- - app/actions/tools-actions.c | 59 + app/actions/tools-actions.c | 59 ++++++++++++++++++++++++++++++++++++++++++ - app/actions/tools-commands.c | 18 ++++++------- + app/actions/tools-commands.c | 18 ++++++------- 5 files changed, 78 insertions(+), 17 deletions(-) commit ac6722929ae5243965d18d4c101942f2727b424d Author: Martin Nordholts -Date: Fri Aug 20 18:39:33 2010 +0200 +Date: Fri Aug 20 18:39:33 2010 +0200 libgimp: Make GimpPixelRgn members signed @@ -57389,7 +58236,7 @@ commit 4f14da539118f7a4017c271b202c6c6ea304672b Author: Martin Nordholts -Date: Fri Aug 20 08:14:01 2010 +0200 +Date: Fri Aug 20 08:14:01 2010 +0200 Bug 625307 - Make gtk-doc-less git builds work again @@ -57401,7 +58248,7 @@ commit e8cbb1ef2c728b98739ae8b1cc383e1cdd3a1ad6 Author: Martin Nordholts -Date: Wed Aug 18 07:20:44 2010 +0200 +Date: Wed Aug 18 07:20:44 2010 +0200 devel-docs/app: Fix build @@ -57411,7 +58258,7 @@ commit 92d0b22653322594eb6843fbaa8c2622e3a89f65 Author: Martin Nordholts -Date: Tue Aug 17 19:08:33 2010 +0200 +Date: Tue Aug 17 19:08:33 2010 +0200 app: Fix translation, "region_select" => "selection" @@ -57420,7 +58267,7 @@ commit 9bd423994dec49366388a6d448def80b6a82e7cf Author: Martin Nordholts -Date: Tue Aug 17 18:48:05 2010 +0200 +Date: Tue Aug 17 18:48:05 2010 +0200 app: Make Alt-Click on layer thumbnail in Layers dockable discoverable @@ -57435,7 +58282,7 @@ commit a0dc12a0f3c2f2ea1aa55c3a3e4717fe77d345a8 Author: Martin Nordholts -Date: Wed Jul 7 14:43:18 2010 +0200 +Date: Wed Jul 7 14:43:18 2010 +0200 Remove "Text to Selection" actions @@ -57448,12 +58295,12 @@ ----------------------------------------- app/widgets/gimphelp-ids.h | 4 ---- menus/image-menu.xml.in | 6 ------ - menus/layers-menu.xml | 1 - + menus/layers-menu.xml | 1 - 4 files changed, 52 deletions(-) commit fa441e8d5fe3e2356bae6bca2c8185c2a5bffcfb Author: Martin Nordholts -Date: Tue Aug 17 18:24:53 2010 +0200 +Date: Tue Aug 17 18:24:53 2010 +0200 app: Refer to splash screen as splash screen, not startup window @@ -57462,7 +58309,7 @@ commit 74f39616a0caca9a0a2608a666c4c2ef5b2bf267 Author: Michael Schumacher -Date: Mon Aug 16 22:34:59 2010 +0200 +Date: Mon Aug 16 22:34:59 2010 +0200 Bug 627009 - Image type filter doesn't include .rgba SGI files @@ -57474,7 +58321,7 @@ commit 876e99fdd097ab50d3744cb7f85956ac57928322 Author: Martin Nordholts -Date: Mon Aug 16 22:00:06 2010 +0200 +Date: Mon Aug 16 22:00:06 2010 +0200 app: Rectangle tool: Allow 'size' separators in 'aspect' and vice versa @@ -57487,7 +58334,7 @@ commit 30693304bcc4afc6799716a183848b0f1d70768b Author: Martin Nordholts -Date: Mon Aug 16 21:50:49 2010 +0200 +Date: Mon Aug 16 21:50:49 2010 +0200 libgimp: Update gimp.def @@ -57496,19 +58343,19 @@ commit 410d4426e8edaaf0f5f6dc7cdfd8bb51e8f71b74 Author: Martin Nordholts -Date: Mon Aug 16 21:40:57 2010 +0200 +Date: Mon Aug 16 21:40:57 2010 +0200 Update gimprc docs/gimprc.5.in | 2 +- - etc/gimprc | 2 +- + etc/gimprc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 270ba46eba8270c42ad5c722854d4def295740c6 Author: Martin Nordholts -Date: Mon Jul 26 19:41:50 2010 +0200 +Date: Mon Jul 26 19:41:50 2010 +0200 - Bug 623186 - GIF save plugin chokes on layers larger than canvas + Bug 623186 - GIF save plugin chokes on layers larger than canvas GIMP_RUN_WITH_LAST_VALS must have the UI initialized too, for example when doing File -> Export . @@ -57518,31 +58365,31 @@ commit 693a76a3367c0dc08774194abd8b60dc5de45614 Author: Martin Nordholts -Date: Wed Jul 21 14:12:18 2010 +0200 +Date: Wed Jul 21 14:12:18 2010 +0200 Remove old and unused ChangeLogs - devel-docs/ChangeLog | 4413 ------------------ - devel-docs/Makefile.am | 1 - + devel-docs/ChangeLog | 4413 ------------------ + devel-docs/Makefile.am | 1 - plug-ins/gimpressionist/ChangeLog | 265 -- - po-libgimp/ChangeLog | 3380 -------------- - po-libgimp/Makefile.in.in | 2 +- - po-plug-ins/ChangeLog | 5378 ---------------------- - po-plug-ins/Makefile.in.in | 2 +- - po-python/ChangeLog | 601 --- - po-python/Makefile.in.in | 2 +- - po-script-fu/ChangeLog | 3006 ------------ - po-script-fu/Makefile.in.in | 2 +- - po-tips/ChangeLog | 775 ---- - po-tips/Makefile.in.in | 2 +- - po/ChangeLog | 9064 + po-libgimp/ChangeLog | 3380 -------------- + po-libgimp/Makefile.in.in | 2 +- + po-plug-ins/ChangeLog | 5378 ---------------------- + po-plug-ins/Makefile.in.in | 2 +- + po-python/ChangeLog | 601 --- + po-python/Makefile.in.in | 2 +- + po-script-fu/ChangeLog | 3006 ------------ + po-script-fu/Makefile.in.in | 2 +- + po-tips/ChangeLog | 775 ---- + po-tips/Makefile.in.in | 2 +- + po/ChangeLog | 9064 ------------------------------------- - po/Makefile.in.in | 2 +- + po/Makefile.in.in | 2 +- 15 files changed, 6 insertions(+), 26889 deletions(-) commit 37d38f596eda696407f79cd04618cf87f5fecdd4 Author: Michael Muré -Date: Sun Aug 15 14:53:13 2010 +0200 +Date: Sun Aug 15 14:53:13 2010 +0200 gimpcageconfig: solve segfault when adding 25th cage handle @@ -57551,22 +58398,22 @@ commit f44dcf26b3dda6a3b7155fc2766529d26598ae28 Author: Michael Muré -Date: Sun Aug 15 14:20:47 2010 +0200 +Date: Sun Aug 15 14:20:47 2010 +0200 fill the original cage position with a plain color + UI app/gegl/gimpoperationcagetransform.c | 62 ++++++++++++++++++++++++++--------- app/gegl/gimpoperationcagetransform.h | 5 ++- - app/tools/gimpcageoptions.c | 23 ++++++++++++- - app/tools/gimpcageoptions.h | 3 +- - app/tools/gimpcagetool.c | 17 +++++----- - app/tools/gimpcagetool.h | 2 +- + app/tools/gimpcageoptions.c | 23 ++++++++++++- + app/tools/gimpcageoptions.h | 3 +- + app/tools/gimpcagetool.c | 17 +++++----- + app/tools/gimpcagetool.h | 2 +- 6 files changed, 83 insertions(+), 29 deletions(-) commit e2a7ef2e3261c909ce5eac91c7592b2009769c6d Author: Michael Muré -Date: Sun Aug 15 12:59:49 2010 +0200 +Date: Sun Aug 15 12:59:49 2010 +0200 gimpcageconfig: displace the cage by a small delta to avoid having pixel exactly on edges @@ -57576,7 +58423,7 @@ commit 537c72b0cf0ebb79707e476c5b206bc191c609bf Author: Michael Muré -Date: Sun Aug 15 02:09:41 2010 +0200 +Date: Sun Aug 15 02:09:41 2010 +0200 gimpcageconfig: add missing normal computing, which caused wrong first preview @@ -57586,7 +58433,7 @@ commit 28cfa9d3df88bbf54a99b45a4dd38211a07922d3 Author: Alexia Death -Date: Sun Aug 15 02:58:31 2010 +0300 +Date: Sun Aug 15 02:58:31 2010 +0300 tools: Fix some warnings I introduced into cage tool earlyer @@ -57595,7 +58442,7 @@ commit f037300658512c6f2d583f987b10af18ebb54969 Author: Alexia Death -Date: Sun Aug 15 02:29:34 2010 +0300 +Date: Sun Aug 15 02:29:34 2010 +0300 tools: Many cage tool fixes. @@ -57609,7 +58456,7 @@ commit c06ed13a144787469e9945e19355ba736a6c0893 Author: Alexia Death -Date: Sun Aug 15 02:27:09 2010 +0300 +Date: Sun Aug 15 02:27:09 2010 +0300 core: Add function to test if image map is busy @@ -57619,7 +58466,7 @@ commit f92b01d233ecd1ea6f899a0b66781ece3a8aac09 Author: Michael Muré -Date: Sun Aug 15 01:00:21 2010 +0200 +Date: Sun Aug 15 01:00:21 2010 +0200 gimpoperationcagetransform: optimization @@ -57629,7 +58476,7 @@ commit 02a14315f49530558914e385cdacfdbc7b315a29 Author: Michael Muré -Date: Sat Aug 14 23:53:23 2010 +0200 +Date: Sat Aug 14 23:53:23 2010 +0200 gimpoperationcagepreview: transform only pixel inside the cage @@ -57639,20 +58486,20 @@ commit b7c2b26defcefd566a27595eec468a9dfa0de860 Author: Michael Muré -Date: Sat Aug 14 23:52:41 2010 +0200 +Date: Sat Aug 14 23:52:41 2010 +0200 precompute edge normal - app/gegl/gimpcageconfig.c | 148 + app/gegl/gimpcageconfig.c | 148 ++++++++++++++++++---------------- - app/gegl/gimpcageconfig.h | 13 +-- + app/gegl/gimpcageconfig.h | 13 +-- app/gegl/gimpoperationcagepreview.c | 9 ++- app/gegl/gimpoperationcagetransform.c | 4 +- 4 files changed, 87 insertions(+), 87 deletions(-) commit c4a196d87ac2d0c92f911ef1081936e4ff1abce1 Author: Michael Muré -Date: Sat Aug 14 21:37:17 2010 +0200 +Date: Sat Aug 14 21:37:17 2010 +0200 gimpoperationcagepreview: make the preview more visible @@ -57661,7 +58508,7 @@ commit 2dfb79ec74c3be6ece2daf3e93ba1a88d5ae899d Author: Michael Muré -Date: Sat Aug 14 21:26:19 2010 +0200 +Date: Sat Aug 14 21:26:19 2010 +0200 gimpoperationcagecoefcalc: correct coef calculation. Now deform works as expected. @@ -57671,7 +58518,7 @@ commit 7655a45d61d6619243589dd440c692907166d159 Author: Michael Muré -Date: Sat Aug 14 21:24:59 2010 +0200 +Date: Sat Aug 14 21:24:59 2010 +0200 gimpvector: correct normal vector computing, vector wasn't normilized @@ -57680,7 +58527,7 @@ commit 268c5ca968c8549738dcc7136aaeff7474dcda53 Author: David Planella -Date: Sat Aug 14 00:23:41 2010 +0200 +Date: Sat Aug 14 00:23:41 2010 +0200 Minor updated to Catalan translation @@ -57690,11 +58537,11 @@ commit 54a9294ea9ee33cf5b27a9d68ab4d32cc9fd4104 Author: Michael Muré -Date: Fri Aug 13 18:26:38 2010 +0200 +Date: Fri Aug 13 18:26:38 2010 +0200 cleaning - app/gegl/gimpcageconfig.c | 39 + app/gegl/gimpcageconfig.c | 39 ----------------------------------- app/gegl/gimpoperationcagecoefcalc.h | 2 +- app/gegl/gimpoperationcagepreview.h | 2 +- @@ -57704,7 +58551,7 @@ commit 6c36d7ac13f9c51d6c4aef283a5be963d1eb6412 Author: Michael Muré -Date: Fri Aug 13 18:25:48 2010 +0200 +Date: Fri Aug 13 18:25:48 2010 +0200 gimpcagetool: add preview @@ -57715,7 +58562,7 @@ commit 6b65f94c66c946355618ff6e60fbc8a6d488553a Author: Marco Ciampa -Date: Fri Aug 13 14:55:21 2010 +0200 +Date: Fri Aug 13 14:55:21 2010 +0200 Updated italian translation @@ -57724,7 +58571,7 @@ commit 503cd01d2be257204eff9f559336ba345478f08d Author: Marco Ciampa -Date: Fri Aug 13 00:53:13 2010 +0200 +Date: Fri Aug 13 00:53:13 2010 +0200 Updated italian translation @@ -57733,7 +58580,7 @@ commit a31b437bf6f14997cafef587a08ce10bbdcf643f Author: Alexia Death -Date: Fri Aug 13 00:07:25 2010 +0300 +Date: Fri Aug 13 00:07:25 2010 +0300 Fix gfloat to gdouble resolving any nan-ds in coefs. @@ -57742,7 +58589,7 @@ commit fe7b253512a9286aa6ff6b24c873fa5d27342be7 Author: Michael Schumacher -Date: Thu Aug 12 21:40:40 2010 +0200 +Date: Thu Aug 12 21:40:40 2010 +0200 Bug 626020 - Console window opening on file-ps-load @@ -57758,7 +58605,7 @@ commit c29396a0c23d9071b5f35d26b7bf2974d29e840a Author: Michael Muré -Date: Thu Aug 12 14:38:21 2010 +0200 +Date: Thu Aug 12 14:38:21 2010 +0200 GimpCageTool: add code in #if #else #endif to test the forward transform @@ -57769,7 +58616,7 @@ commit 25818716b3aa53eccbb88c5416c865785bed3871 Author: Michael Muré -Date: Thu Aug 12 14:36:07 2010 +0200 +Date: Thu Aug 12 14:36:07 2010 +0200 GimpOperationCageTransform: cleanup @@ -57779,38 +58626,36 @@ commit 9b3dbf9f3ecd9123bb8b0e2078db09dc7065f27a Author: Michael Muré -Date: Thu Aug 12 14:34:19 2010 +0200 +Date: Thu Aug 12 14:34:19 2010 +0200 renaming of GimpOperationCage to GimpOperationCagePreview + cleaning - app/gegl/Makefile.am | 4 +- - app/gegl/gimp-gegl-types.h | 2 +- - app/gegl/gimp-gegl.c | 4 +- - app/gegl/gimpoperationcage.c | 277 - ----------------------------------- - app/gegl/gimpoperationcage.h | 58 -------- - app/gegl/gimpoperationcagepreview.c | 279 - ++++++++++++++++++++++++++++++++++++ - app/gegl/gimpoperationcagepreview.h | 58 ++++++++ - app/gegl/makefile.msc | 2 +- - 8 files changed, 343 insertions(+), 341 deletions(-) + app/gegl/Makefile.am | 4 +- + app/gegl/gimp-gegl-types.h | 2 +- + app/gegl/gimp-gegl.c | 4 +- + app/gegl/gimpoperationcage.h | 58 ------ + ...poperationcage.c => gimpoperationcagepreview.c} | 200 + +++++++++++---------- + app/gegl/gimpoperationcagepreview.h | 58 ++++++ + app/gegl/makefile.msc | 2 +- + 7 files changed, 165 insertions(+), 163 deletions(-) commit 3d791670747db6ee3b9dfb0fbf57f06c0240433f Author: Michael Muré -Date: Thu Aug 12 13:47:31 2010 +0200 +Date: Thu Aug 12 13:47:31 2010 +0200 change name of gimp cage gegl op to gimp internal op. app/gegl/gimpoperationcagecoefcalc.c | 6 +++--- app/gegl/gimpoperationcagetransform.c | 35 ++++++++++------------------------- - app/tools/gimpcageoptions.c | 6 +++--- - app/tools/gimpcagetool.c | 6 +++--- + app/tools/gimpcageoptions.c | 6 +++--- + app/tools/gimpcagetool.c | 6 +++--- 4 files changed, 19 insertions(+), 34 deletions(-) commit 023aa06883f325a76d80dc712c3369f478b77331 Author: Michael Muré -Date: Thu Aug 12 13:43:01 2010 +0200 +Date: Thu Aug 12 13:43:01 2010 +0200 gimpoperationcoefcalc: attempt to fix the wrong coefficient inside and in the boundary of the cage. @@ -57821,46 +58666,46 @@ commit 1d1ff1fedde7e2420f3ae27bcde7f1880eb3767d Author: Michael Natterer -Date: Thu Aug 12 13:13:15 2010 +0200 +Date: Thu Aug 12 13:13:15 2010 +0200 app: port GimpDisplayShell sample point drawing to cairo Same disclaimer about tool uglyness applies here. Will be fixed. - app/display/gimpcanvas.c | 42 +++-------- - app/display/gimpcanvas.h | 9 +-- + app/display/gimpcanvas.c | 42 +++-------- + app/display/gimpcanvas.h | 9 +-- app/display/gimpdisplayshell-callbacks.c | 4 +- - app/display/gimpdisplayshell-draw.c | 118 + app/display/gimpdisplayshell-draw.c | 118 ++++++++++++++----------------- - app/display/gimpdisplayshell-draw.h | 4 +- - app/display/gimpdisplayshell-style.c | 33 +++++++-- - app/display/gimpdisplayshell-style.h | 15 ++-- - app/tools/gimpcolortool.c | 42 ++++++++--- + app/display/gimpdisplayshell-draw.h | 4 +- + app/display/gimpdisplayshell-style.c | 33 +++++++-- + app/display/gimpdisplayshell-style.h | 15 ++-- + app/tools/gimpcolortool.c | 42 ++++++++--- 8 files changed, 141 insertions(+), 126 deletions(-) commit 922c330bec7bac517b94d6d91b0e8ce4feb76e47 Author: Michael Natterer -Date: Thu Aug 12 00:51:58 2010 +0200 +Date: Thu Aug 12 00:51:58 2010 +0200 app: port GimpDisplayShell guide drawing to cairo The cairo_t code in GimpMoveTool is still disgusting. This probably needs some GimpTool API that creates a cairo_t for tools. - app/display/gimpcanvas.c | 22 ----- - app/display/gimpcanvas.h | 2 - + app/display/gimpcanvas.c | 22 ----- + app/display/gimpcanvas.h | 2 - app/display/gimpdisplayshell-callbacks.c | 4 +- - app/display/gimpdisplayshell-draw.c | 65 +++++++-------- - app/display/gimpdisplayshell-draw.h | 4 +- - app/display/gimpdisplayshell-style.c | 139 + app/display/gimpdisplayshell-draw.c | 65 +++++++-------- + app/display/gimpdisplayshell-draw.h | 4 +- + app/display/gimpdisplayshell-style.c | 139 +++++++++++++++++++++---------- - app/display/gimpdisplayshell-style.h | 9 +- - app/tools/gimpmovetool.c | 38 +++++++-- + app/display/gimpdisplayshell-style.h | 9 +- + app/tools/gimpmovetool.c | 38 +++++++-- 8 files changed, 166 insertions(+), 117 deletions(-) commit 0985274e8ce34002e62a7ad56ba1c6e316028257 Author: Michael Natterer -Date: Thu Aug 12 00:32:34 2010 +0200 +Date: Thu Aug 12 00:32:34 2010 +0200 app: don't call scale functions on an empty display shell @@ -57869,7 +58714,7 @@ commit 03ad3f00277ed649456b15b749747fc19e1cb53e Author: Michael Natterer -Date: Thu Aug 12 00:09:05 2010 +0200 +Date: Thu Aug 12 00:09:05 2010 +0200 app: reorder parameters in new style API @@ -57880,13 +58725,13 @@ commit 002003a2ea6c96ab9547a8418bd067698ecc3655 Author: Michael Natterer -Date: Wed Aug 11 23:47:46 2010 +0200 +Date: Wed Aug 11 23:47:46 2010 +0200 app: add new files gimpdisplayshell-style.[ch] which contains functions to set styles on a cairo_t. - app/display/Makefile.am | 2 + + app/display/Makefile.am | 2 + app/display/gimpdisplayshell-draw.c | 78 ++------------------------ app/display/gimpdisplayshell-style.c | 106 +++++++++++++++++++++++++++++++++++ @@ -57895,7 +58740,7 @@ commit 1a609d6381b8322691e183152f691faccf21dcd1 Author: Michael Natterer -Date: Wed Aug 11 23:32:44 2010 +0200 +Date: Wed Aug 11 23:32:44 2010 +0200 libgimpwidgets: cleanup @@ -57905,25 +58750,25 @@ commit 951c1354830d32d322f7b761c55a79e4969221bf Author: Alexia Death -Date: Thu Aug 12 00:08:19 2010 +0300 +Date: Thu Aug 12 00:08:19 2010 +0300 theme: Temporary icons for dynamics and tool presets Staring at a row of paintbrush icons got really annoying. - libgimpwidgets/gimpstock.c | 8 ++++++++ - libgimpwidgets/gimpstock.h | 6 ++++-- - themes/Default/images/Makefile.am | 6 +++++- - themes/Default/images/makefile.msc | 4 ++++ - themes/Default/images/stock-dynamics-16.png | Bin 0 -> 521 bytes - themes/Default/images/stock-dynamics-22.png | Bin 0 -> 641 bytes + libgimpwidgets/gimpstock.c | 8 ++++++++ + libgimpwidgets/gimpstock.h | 6 ++++-- + themes/Default/images/Makefile.am | 6 +++++- + themes/Default/images/makefile.msc | 4 ++++ + themes/Default/images/stock-dynamics-16.png | Bin 0 -> 521 bytes + themes/Default/images/stock-dynamics-22.png | Bin 0 -> 641 bytes themes/Default/images/stock-tool-preset-16.png | Bin 0 -> 836 bytes themes/Default/images/stock-tool-preset-22.png | Bin 0 -> 1225 bytes 8 files changed, 21 insertions(+), 3 deletions(-) commit 50fdbf09fdf44a34b9acd7d3e01282f9c6096322 Author: Michael Muré -Date: Wed Aug 11 20:36:25 2010 +0200 +Date: Wed Aug 11 20:36:25 2010 +0200 GimpOperationCoefCalc: compute the coefficient only inside the cage. There is still a problem when pixel is exactly on a edge. @@ -57935,7 +58780,7 @@ commit fe9f1f4a0152a7719486515c3966aec18234501e Author: Michael Muré -Date: Wed Aug 11 20:27:32 2010 +0200 +Date: Wed Aug 11 20:27:32 2010 +0200 GimpCageTool: better memory gestion in different handle + code to render/debug coefficient, in #if #else #endif @@ -57947,7 +58792,7 @@ commit eabbabb571bb14bb4c4922b675a467e5b6291cee Author: Michael Muré -Date: Wed Aug 11 20:11:49 2010 +0200 +Date: Wed Aug 11 20:11:49 2010 +0200 GimpCageConfig: add 2 method to check if a point is inside the cage. Second one is commented, for test. @@ -57959,7 +58804,7 @@ commit 716a3ac4467d76fb1aa2c7e794a843bb43016ff7 Author: Barak Itkin -Date: Wed Aug 11 19:24:59 2010 +0300 +Date: Wed Aug 11 19:24:59 2010 +0300 pdbgen: Add README_NEW_PDB_PROC to Makefile.am @@ -57968,7 +58813,7 @@ commit 88ddd0b9c624c21c84ea6e74b0f1b0c04496221b Author: Barak Itkin -Date: Wed Aug 11 19:06:55 2010 +0300 +Date: Wed Aug 11 19:06:55 2010 +0300 pdbgen: Add documentation on adding new PDB procedures @@ -57978,7 +58823,7 @@ commit a6d7542c56205678530f6c32aa9698d50980ed35 Author: Michael Natterer -Date: Wed Aug 11 15:00:27 2010 +0200 +Date: Wed Aug 11 15:00:27 2010 +0200 app: simplify some GimpDisplayShell drawing code @@ -57988,7 +58833,7 @@ commit 72e29d882e9598336d4facda10bf10fa9dbe8a2f Author: drtv -Date: Wed Aug 11 18:05:20 2010 +0530 +Date: Wed Aug 11 18:05:20 2010 +0530 Updated Tamil translation @@ -57997,7 +58842,7 @@ commit f7854124cee7e8c6559acccbb0369ab315166183 Author: drtv -Date: Wed Aug 11 18:03:08 2010 +0530 +Date: Wed Aug 11 18:03:08 2010 +0530 Updated Tamil translation @@ -58007,22 +58852,22 @@ commit 529ce40a5d92d9c9957c7e8350ce48ffbcad033a Author: Michael Natterer -Date: Wed Aug 11 13:16:55 2010 +0200 +Date: Wed Aug 11 13:16:55 2010 +0200 app: port GimpDisplayShell grid drawing to cairo app/display/gimpdisplayshell-callbacks.c | 12 +- - app/display/gimpdisplayshell-draw.c | 185 + app/display/gimpdisplayshell-draw.c | 185 ++++++++++++++++++------------- - app/display/gimpdisplayshell-draw.h | 2 +- + app/display/gimpdisplayshell-draw.h | 2 +- app/display/gimpdisplayshell-handlers.c | 12 -- - app/display/gimpdisplayshell.c | 6 - - app/display/gimpdisplayshell.h | 1 - + app/display/gimpdisplayshell.c | 6 - + app/display/gimpdisplayshell.h | 1 - 6 files changed, 121 insertions(+), 97 deletions(-) commit 37051c6ce8072a93c3e780fc858ed0b2cc754600 Author: Marco Ciampa -Date: Wed Aug 11 09:31:04 2010 +0200 +Date: Wed Aug 11 09:31:04 2010 +0200 Updated italian translation. @@ -58031,7 +58876,7 @@ commit f5935620553ce2979c90f5e5d35bac30bdf207ac Author: Alexia Death -Date: Tue Aug 10 22:01:18 2010 +0300 +Date: Tue Aug 10 22:01:18 2010 +0300 Fix a memory allocation issue mid recursion and put a depth limit in place @@ -58044,7 +58889,7 @@ commit 67c1981a40c1dc301e4660ec48654c5693bba432 Author: Michael Muré -Date: Tue Aug 10 00:58:24 2010 +0200 +Date: Tue Aug 10 00:58:24 2010 +0200 GimpCageTool: don't allow to add handle after closing the cage @@ -58053,7 +58898,7 @@ commit 81c948f196a981e186937eeb7e79f434aa152f7b Author: Michael Muré -Date: Tue Aug 10 00:12:10 2010 +0200 +Date: Tue Aug 10 00:12:10 2010 +0200 GimpOperationCageTransform: pre-full the coordinate buffer with no-displacement coordinate, to keep the background while rendering @@ -58064,21 +58909,21 @@ commit 34b40a6c7efbdd6e4ed5212f4315c03366a109a0 Author: Michael Muré -Date: Mon Aug 9 23:33:11 2010 +0200 +Date: Mon Aug 9 23:33:11 2010 +0200 solve the problem result cropped to the bounding box of the cage - app/gegl/gimpcageconfig.c | 3 +- + app/gegl/gimpcageconfig.c | 3 +- app/gegl/gimpoperationcagetransform.c | 54 ++++++++++-------- app/gegl/gimpoperationcagetransform.h | 10 ++-- - app/tools/gimpcagetool.c | 100 + app/tools/gimpcagetool.c | 100 +++++++++++++++++++++++++--------- - app/tools/gimpcagetool.h | 4 +- + app/tools/gimpcagetool.h | 4 +- 5 files changed, 115 insertions(+), 56 deletions(-) commit 62c4387a26769b26f2e4557128d6c5b029004c3f Author: Michael Natterer -Date: Mon Aug 9 00:14:35 2010 +0200 +Date: Mon Aug 9 00:14:35 2010 +0200 modules: port ColorselWater drawing to cairo @@ -58088,7 +58933,7 @@ commit 19b81bb097732981341191ad9d4829e632029a6c Author: Michael Muré -Date: Sun Aug 8 18:21:26 2010 +0200 +Date: Sun Aug 8 18:21:26 2010 +0200 gimpcagetool: fix buffer leak @@ -58097,7 +58942,7 @@ commit fe72f5985bb853468383a0abd5d4d4f8b3cbf574 Author: Michael Natterer -Date: Sun Aug 8 18:00:08 2010 +0200 +Date: Sun Aug 8 18:00:08 2010 +0200 app: reduce code duplication in gimpimage-duplicate.c @@ -58107,7 +58952,7 @@ commit 1ba9de4567758a575ffdcd755ad9ded7d4430865 Author: Michael Natterer -Date: Sun Aug 8 17:50:08 2010 +0200 +Date: Sun Aug 8 17:50:08 2010 +0200 Bug 620646 - Little defect about duplication of images @@ -58122,7 +58967,7 @@ commit b2642272a41fa006f0584af75104909f5944aa50 Author: Michael Natterer -Date: Sun Aug 8 17:31:39 2010 +0200 +Date: Sun Aug 8 17:31:39 2010 +0200 app: add gimp_item_stack_get_item_by_path() @@ -58134,7 +58979,7 @@ commit 3762e03bf6c386a54d4ba4ce0c2a37211b466507 Author: Michael Natterer -Date: Sun Aug 8 16:49:50 2010 +0200 +Date: Sun Aug 8 16:49:50 2010 +0200 Require cairo >= 1.8.0 and add a cairo sanity check to app/sanity.c @@ -58144,7 +58989,7 @@ commit 10574e8f220f5583ea49aedaf56640b81790298e Author: Michael Natterer -Date: Sun Aug 8 16:10:14 2010 +0200 +Date: Sun Aug 8 16:10:14 2010 +0200 libgimpwidgets: port GimpPickButton color picking to cairo @@ -58154,7 +58999,7 @@ commit 789cc05baf1430eb97f79184cbd252bc65c15893 Author: Michael Natterer -Date: Sun Aug 8 16:09:21 2010 +0200 +Date: Sun Aug 8 16:09:21 2010 +0200 libgimpwidgets: add new macro GIMP_CAIRO_RGB24_GET_PIXEL() @@ -58165,7 +59010,7 @@ commit 1e48f161131eb1b6f36868ebc9c748a69b514dff Author: Michael Natterer -Date: Sun Aug 8 15:39:16 2010 +0200 +Date: Sun Aug 8 15:39:16 2010 +0200 libgimpwidgets: port GimpCellRendererToggle drawing to cairo @@ -58174,7 +59019,7 @@ commit e94d90f4a7e40c1f946f32f25a556599f60825dd Author: Michael Muré -Date: Sun Aug 8 01:34:53 2010 +0200 +Date: Sun Aug 8 01:34:53 2010 +0200 GimpOperationCageTransform: add code to compute the exact source point to handle aliasing. @@ -58186,7 +59031,7 @@ commit a68eb9d72d8e15c645eb450965c2f6a61ab935dd Author: Michael Muré -Date: Sat Aug 7 15:44:38 2010 +0200 +Date: Sat Aug 7 15:44:38 2010 +0200 remove the unneeded anymore GimpCage data structure @@ -58200,7 +59045,7 @@ commit 90d3900fbcd39124f14ccbad55d95c7f28734e32 Author: Michael Muré -Date: Sat Aug 7 15:23:08 2010 +0200 +Date: Sat Aug 7 15:23:08 2010 +0200 gimpoperationcagetransform: clean unnecessery code @@ -58210,23 +59055,23 @@ commit 69cf476387327acb6fbd2776d46350d29efd403a Author: Michael Muré -Date: Sat Aug 7 15:21:06 2010 +0200 +Date: Sat Aug 7 15:21:06 2010 +0200 add a gegl op that compute the reverse transformation of a cage deform. still wip. - app/gegl/Makefile.am | 2 + - app/gegl/gimp-gegl-types.h | 1 + - app/gegl/gimp-gegl.c | 2 + + app/gegl/Makefile.am | 2 + + app/gegl/gimp-gegl-types.h | 1 + + app/gegl/gimp-gegl.c | 2 + app/gegl/gimpoperationcagetransform.c | 424 ++++++++++++++++++++++++++++++++++ app/gegl/gimpoperationcagetransform.h | 61 +++++ - app/gegl/makefile.msc | 1 + + app/gegl/makefile.msc | 1 + 6 files changed, 491 insertions(+) commit 459414c9dc2a7cfdd95967662fc3d6cd58021aed Author: Michael Muré -Date: Sat Aug 7 15:10:23 2010 +0200 +Date: Sat Aug 7 15:10:23 2010 +0200 gimpcagetool: use cage_transform and gegl_render_mapping to do the transform @@ -58242,7 +59087,7 @@ commit 9677eeeffc263913a76481e2d714036c65964291 Author: Michael Muré -Date: Tue Jul 27 16:59:33 2010 +0200 +Date: Tue Jul 27 16:59:33 2010 +0200 gimpcagetool: add a warning if the coef buffer isn't initialised @@ -58251,7 +59096,7 @@ commit 8c33eb83f7d47bc417417ec19428c6dbf78e4650 Author: Michael Muré -Date: Tue Jul 27 10:44:21 2010 +0200 +Date: Tue Jul 27 10:44:21 2010 +0200 gimpcagetool, gimpoperationcage: now the forward transform work as expected @@ -58262,7 +59107,7 @@ commit 3c5c65ea3c3c9c163eb9fb8fef4e8b1561d7571a Author: Michael Muré -Date: Mon Jul 26 19:24:05 2010 +0200 +Date: Mon Jul 26 19:24:05 2010 +0200 gimpcagetool: use GimpCageConfig, and apply gegl op. Doesn't work yet. @@ -58273,7 +59118,7 @@ commit 09ce431e7d80237804dac2cee3149968daceaf6f Author: Michael Muré -Date: Mon Jul 26 19:17:49 2010 +0200 +Date: Mon Jul 26 19:17:49 2010 +0200 gimpoperationcage: now inherit from GeglOperationComposer, to have an aux buffer for the coef @@ -58285,7 +59130,7 @@ commit 670a20de05cad6077edc422bb9ddc9fdb1dd471b Author: Michael Muré -Date: Mon Jul 26 19:15:45 2010 +0200 +Date: Mon Jul 26 19:15:45 2010 +0200 gimpcageconfig: correct scaling factor memory allocation @@ -58294,7 +59139,7 @@ commit 54ef87a7d3d489b6c815db2dfad7f51932fcb2b5 Author: Michael Muré -Date: Sat Jul 24 11:27:47 2010 +0200 +Date: Sat Jul 24 11:27:47 2010 +0200 gimpcageconfig: add the scaling factor computation @@ -58305,7 +59150,7 @@ commit 973aeee9d4ec349acf17b977677a1a4fe07e0079 Author: Michael Muré -Date: Fri Jul 23 23:06:33 2010 +0200 +Date: Fri Jul 23 23:06:33 2010 +0200 register gimpoperationcagecoefcalc @@ -58314,7 +59159,7 @@ commit 4f26fc8d44dc0a3919a92afd6477055480423f1a Author: Michael Muré -Date: Fri Jul 23 23:06:00 2010 +0200 +Date: Fri Jul 23 23:06:00 2010 +0200 gimpcageconfig: fix compilation @@ -58323,7 +59168,7 @@ commit 7436539878ac1243d83a36882457e7dc34141ba8 Author: Michael Muré -Date: Fri Jul 23 21:59:36 2010 +0200 +Date: Fri Jul 23 21:59:36 2010 +0200 gimpcageconfig: correct indentation @@ -58333,7 +59178,7 @@ commit d7474cd33acb1a332ee26c2a8bea9d169374feec Author: Michael Muré -Date: Fri Jul 23 21:54:53 2010 +0200 +Date: Fri Jul 23 21:54:53 2010 +0200 gimpcageconfig: correct indentation @@ -58342,7 +59187,7 @@ commit 74a37c6266ea163d2c23c26a85f8fbc789acb249 Author: Michael Muré -Date: Fri Jul 23 21:39:49 2010 +0200 +Date: Fri Jul 23 21:39:49 2010 +0200 gimpoperationcoefcalc: get_bounding_box now return the bounding box of the cage @@ -58353,58 +59198,58 @@ commit b05460f2926825097c8003f9b1f4c884d5ed7afe Author: Michael Muré -Date: Fri Jul 23 21:31:28 2010 +0200 +Date: Fri Jul 23 21:31:28 2010 +0200 add a gegl operator that compute the coeffcient for a cage transform - app/gegl/Makefile.am | 2 + - app/gegl/gimp-gegl-types.h | 1 + + app/gegl/Makefile.am | 2 + + app/gegl/gimp-gegl-types.h | 1 + app/gegl/gimpoperationcagecoefcalc.c | 227 +++++++++++++++++++++++++++++++++++ app/gegl/gimpoperationcagecoefcalc.h | 59 +++++++++ - app/gegl/makefile.msc | 1 + + app/gegl/makefile.msc | 1 + 5 files changed, 290 insertions(+) commit c686093b38c9c8b2517e5e73f57ed1ff93b987c2 Author: Michael Muré -Date: Fri Jul 23 15:41:21 2010 +0200 +Date: Fri Jul 23 15:41:21 2010 +0200 make GimpCageOptions to use the new enum for Cage mode - app/tools/gimpcageoptions.h | 2 +- + app/tools/gimpcageoptions.h | 2 +- app/tools/tools-enums.c | 29 ----------------------------- app/tools/tools-enums.h | 10 ---------- 3 files changed, 1 insertion(+), 40 deletions(-) commit 2abbfc91140041a85eedbf5bfb6dab83301687a9 Author: Michael Muré -Date: Fri Jul 23 15:39:15 2010 +0200 +Date: Fri Jul 23 15:39:15 2010 +0200 rewrite of the GimpCage data structure as a Gegl config object - app/gegl/Makefile.am | 5 +- - app/gegl/gimp-gegl-types.h | 1 + + app/gegl/Makefile.am | 5 +- + app/gegl/gimp-gegl-types.h | 1 + app/gegl/gimpcageconfig.c | 356 +++++++++++++++++++++++++++++++++++++++++++++ app/gegl/gimpcageconfig.h | 149 +++++++++++++++++++ - app/gegl/makefile.msc | 1 + + app/gegl/makefile.msc | 1 + 5 files changed, 510 insertions(+), 2 deletions(-) commit 5d483a95176e75178edba417f0911414e980e5f9 Author: Michael Muré -Date: Fri Jul 23 15:13:19 2010 +0200 +Date: Fri Jul 23 15:13:19 2010 +0200 add an enum for cage mode - libgimp/gimpenums.c.tail | 2 ++ + libgimp/gimpenums.c.tail | 2 ++ libgimpbase/gimpbaseenums.c | 30 ++++++++++++++++++++++++++++++ libgimpbase/gimpbaseenums.h | 10 ++++++++++ - tools/pdbgen/enums.pl | 7 +++++++ + tools/pdbgen/enums.pl | 7 +++++++ 4 files changed, 49 insertions(+) commit 066bbb80f4bc22a17db3884a2c3524ad5aa058d7 Author: Michael Muré -Date: Thu Jul 22 10:56:01 2010 +0200 +Date: Thu Jul 22 10:56:01 2010 +0200 gimpcagetool: flush the image correctly after applying a cage deform @@ -58413,7 +59258,7 @@ commit e141953d35397bc7cd96c5309bcfc8cc4249001e Author: Michael Muré -Date: Thu Jul 22 10:38:12 2010 +0200 +Date: Thu Jul 22 10:38:12 2010 +0200 gimpcagetool: the cage can be closed only if the number of point is 3 or more @@ -58423,7 +59268,7 @@ commit 98ff627955f07c6bfaadb971afd41bb9a15e7ffb Author: Michael Muré -Date: Thu Jul 22 00:16:18 2010 +0200 +Date: Thu Jul 22 00:16:18 2010 +0200 gimpcagetool: fix a missing include and a function declaration @@ -58432,7 +59277,7 @@ commit fcd156014a60c713687b88a0bbee20fc76c0cdaf Author: Michael Muré -Date: Thu Jul 22 00:07:27 2010 +0200 +Date: Thu Jul 22 00:07:27 2010 +0200 gimpcagetool: beginning of the link tool/gegl op @@ -58442,7 +59287,7 @@ commit c24029c230cbeb107b58f0d6bf685dd921158666 Author: Michael Muré -Date: Wed Jul 21 22:44:15 2010 +0200 +Date: Wed Jul 21 22:44:15 2010 +0200 gimpcage: fix of a bug in the bounding box computation @@ -58451,7 +59296,7 @@ commit df842ba87c0f9c50e6fb258fa4f02d1c917cadea Author: Michael Muré -Date: Wed Jul 21 22:15:02 2010 +0200 +Date: Wed Jul 21 22:15:02 2010 +0200 gimpcage: add a missing update of the scaling factor @@ -58460,7 +59305,7 @@ commit a20c519bafdb6509c44ef96763428e4652d29495 Author: Michael Muré -Date: Wed Jul 21 19:20:12 2010 +0200 +Date: Wed Jul 21 19:20:12 2010 +0200 gimpoperationcage: use of no_cache = false @@ -58470,7 +59315,7 @@ commit c1485b214e64c0fcaf117e6a70dbd10c8f15a959 Author: Michael Muré -Date: Sat Jul 17 21:33:41 2010 +0200 +Date: Sat Jul 17 21:33:41 2010 +0200 gimpoperationcage: update of the static cage @@ -58479,7 +59324,7 @@ commit 2ef73c356e88d02af3da118bc5f591a445b84260 Author: Michael Muré -Date: Sat Jul 17 21:25:46 2010 +0200 +Date: Sat Jul 17 21:25:46 2010 +0200 GimpCage: now reverse the cage before computation if needed @@ -58489,7 +59334,7 @@ commit db5981a69cc9ee9938c92059f92d25996adcd6eb Author: Michael Muré -Date: Sat Jul 17 16:32:46 2010 +0200 +Date: Sat Jul 17 16:32:46 2010 +0200 gimpcagetool: draw/edit cage, accordingly to cage mode @@ -58499,7 +59344,7 @@ commit d836615ae741a11ded35b9cea992dbd168ee155b Author: Michael Muré -Date: Sat Jul 17 13:33:48 2010 +0200 +Date: Sat Jul 17 13:33:48 2010 +0200 gimpcagetool: now inherit from GimpDrawTool. Moving cage point also works. @@ -58510,7 +59355,7 @@ commit ad0a81c528abf4f5eca5fe57fd147d5b8b3270b5 Author: Michael Muré -Date: Fri Jul 16 23:04:00 2010 +0200 +Date: Fri Jul 16 23:04:00 2010 +0200 gimpoperationcage: iterate accordingly to cage's bounding box. pre-copy the input buffer to the output. @@ -58521,22 +59366,22 @@ commit 1b67742e4f7f61e887fc57bb4b18a47758d316cc Author: Michael Muré -Date: Fri Jul 16 22:37:25 2010 +0200 +Date: Fri Jul 16 22:37:25 2010 +0200 gimpcage: add a function to compute the bounding box of the deformed cage. Computing of the coefficient is done accordingly. Update of the gegl op. Also add a wip function to compute if the cage is clockwise or not. - app/core/gimpcage.c | 118 + app/core/gimpcage.c | 118 +++++++++++++++++++++++++++++++++++++++---- - app/core/gimpcage.h | 3 +- + app/core/gimpcage.h | 3 +- app/gegl/gimpoperationcage.c | 12 ++--- 3 files changed, 112 insertions(+), 21 deletions(-) commit a93752554de8f38a4c5878eb05487c9829f14dfd Author: Michael Muré -Date: Fri Jul 16 20:59:54 2010 +0200 +Date: Fri Jul 16 20:59:54 2010 +0200 gimpoperationcage: update of the gegl operator to use the deformed cage indide GimpCage and the scale factor. @@ -58548,7 +59393,7 @@ commit 81f9e6019bd771150dd720b385b4a4a702bfa2ab Author: Michael Muré -Date: Fri Jul 16 20:53:57 2010 +0200 +Date: Fri Jul 16 20:53:57 2010 +0200 gimpcage: add a second series of point for the deformed cage, with access function. Also add the computing of the scaling factor and @@ -58556,12 +59401,12 @@ app/core/gimpcage.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++--- - app/core/gimpcage.h | 26 ++++++++---- + app/core/gimpcage.h | 26 ++++++++---- 2 files changed, 131 insertions(+), 12 deletions(-) commit 6533622ace37c0f43428ce5c9c78d1a90fee9ce4 Author: Michael Muré -Date: Wed Jul 14 23:59:01 2010 +0200 +Date: Wed Jul 14 23:59:01 2010 +0200 update of the cage tool icon, a bit less blurry. thanks again to Barak Itkin @@ -58576,12 +59421,12 @@ commit 98b198785a0c49c7523cc00afc85e4bc31cec7ac Author: Michael Muré -Date: Wed Jul 14 23:56:28 2010 +0200 +Date: Wed Jul 14 23:56:28 2010 +0200 gimpoperationcage: the gegl op now do a transformation, with cage vertices hardcoded - app/Makefile.am | 9 ++- + app/Makefile.am | 9 ++- app/gegl/gimpoperationcage.c | 162 ++++++++++++++++++++++++++++++++++--------- app/gegl/gimpoperationcage.h | 5 ++ @@ -58589,7 +59434,7 @@ commit 3715837edf062db1bf1dad38c83c5c3441ff0666 Author: Michael Muré -Date: Wed Jul 14 23:53:52 2010 +0200 +Date: Wed Jul 14 23:53:52 2010 +0200 gimpcage: add a function that return the normal to an edge of the cage @@ -58600,7 +59445,7 @@ commit 884bc9b0f56ee2ce4e6dd7b592b908791d09edfc Author: Michael Muré -Date: Wed Jul 14 23:51:04 2010 +0200 +Date: Wed Jul 14 23:51:04 2010 +0200 libgimpmath: add a function that compute the normal vector to an other @@ -58610,7 +59455,7 @@ commit fb737d2197d3fe70c496721d183983eb0eabc952 Author: Michael Muré -Date: Tue Jul 13 16:09:51 2010 +0200 +Date: Tue Jul 13 16:09:51 2010 +0200 Update of the cage tool icon. Big thanks to Barak Itkin @@ -58626,7 +59471,7 @@ commit f994d57732a96b1ef40cad683cba68429f69a42d Author: Michael Muré -Date: Tue Jul 13 01:01:29 2010 +0200 +Date: Tue Jul 13 01:01:29 2010 +0200 gimpcage data structure: - fix of the iteration of the buffers @@ -58634,23 +59479,23 @@ - expose the compute coefficient function app/core/gimpcage.c | 12 ++++++------ - app/core/gimpcage.h | 2 ++ + app/core/gimpcage.h | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) commit 509d329f159507d0af5cfd316c982617eb914aad Author: Michael Muré -Date: Mon Jul 12 23:17:03 2010 +0200 +Date: Mon Jul 12 23:17:03 2010 +0200 Cage transform gegl op: now correctly iterate and fill with a color - app/gegl/gimp-gegl.c | 2 ++ + app/gegl/gimp-gegl.c | 2 ++ app/gegl/gimpoperationcage.c | 39 +++++++++++++++++++++++++++------------ app/gegl/gimpoperationcage.h | 2 +- 3 files changed, 30 insertions(+), 13 deletions(-) commit b010b1911806fe779732f003e4d5b0a9db5144c1 Author: Michael Muré -Date: Mon Jul 12 17:50:36 2010 +0200 +Date: Mon Jul 12 17:50:36 2010 +0200 app/gegl/gimpoperationcage: add code to iterate the out buffer and set a color. @@ -58661,7 +59506,7 @@ commit 2157a67cea62829115277494a0fa782ef890db6c Author: Michael Muré -Date: Mon Jul 12 17:43:12 2010 +0200 +Date: Mon Jul 12 17:43:12 2010 +0200 app/core/gimpcage: add access functions to the cage data structure (add a vertice, remove the last, move a vertice, check if a point @@ -58670,8 +59515,8 @@ app/tools/gimpcagetool: The tool can now draw a cage, add vertices, remove the last, close the cage - app/core/gimpcage.c | 127 ++++++++++++-- - app/core/gimpcage.h | 24 +++ + app/core/gimpcage.c | 127 ++++++++++++-- + app/core/gimpcage.h | 24 +++ app/tools/gimpcagetool.c | 421 ++++++++++++++++++++++++++++++++++++++++++----- app/tools/gimpcagetool.h | 9 +- @@ -58679,7 +59524,7 @@ commit a50c5dc46451fed3db4788c8797d27432e25af2b Author: Michael Muré -Date: Mon Jul 12 17:41:03 2010 +0200 +Date: Mon Jul 12 17:41:03 2010 +0200 add an entry for the cage transform tool in the menu @@ -58688,34 +59533,34 @@ commit 18565165476a69c5768f3a03183c90c216e09185 Author: Michael Muré -Date: Tue Jul 6 20:12:01 2010 +0200 +Date: Tue Jul 6 20:12:01 2010 +0200 Beginning of GimpCage data structure, with the computation of the coefficient (test needed) app/core/gimpcage.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - app/core/gimpcage.h | 23 +++++----- + app/core/gimpcage.h | 23 +++++----- 2 files changed, 131 insertions(+), 10 deletions(-) commit 6a387f7db0ac0bdaf3c9652fe8f58fca7d8c4129 Author: Michael Muré -Date: Fri Jul 2 10:52:10 2010 +0200 +Date: Fri Jul 2 10:52:10 2010 +0200 Enhancement of the CageOptions object to allow the selection of the mode (creation or transform of the cage) + basic gui app/tools/gimpcageoptions.c | 88 ++++++++++++++++++++++++++++++++++++++++++++- - app/tools/gimpcageoptions.h | 6 ++++ - app/tools/gimpcagetool.c | 6 ++-- + app/tools/gimpcageoptions.h | 6 ++++ + app/tools/gimpcagetool.c | 6 ++-- app/tools/tools-enums.c | 29 +++++++++++++++ app/tools/tools-enums.h | 10 ++++++ 5 files changed, 135 insertions(+), 4 deletions(-) commit b389ec701c0a3a4ad238a806d98518dcafc335d1 Author: Michael Muré -Date: Fri Jul 2 09:08:12 2010 +0200 +Date: Fri Jul 2 09:08:12 2010 +0200 Change of the cage tool icon for those from LightningIsMyName @@ -58726,26 +59571,26 @@ commit f6316285be6f78628006588c36698e9d1caf7b51 Author: Michael Muré -Date: Wed Jun 30 20:27:52 2010 +0200 +Date: Wed Jun 30 20:27:52 2010 +0200 structure of the cage tool, with an options object - app/core/gimpcage.c | 5 +- - app/core/gimpcage.h | 4 +- - app/gegl/gimpoperationcage.c | 30 +++++-- - app/gegl/gimpoperationcage.h | 1 - - app/tools/Makefile.am | 2 + - app/tools/gimpcageoptions.c | 58 ++++++++++++ - app/tools/gimpcageoptions.h | 51 +++++++++++ - app/tools/gimpcagetool.c | 99 + app/core/gimpcage.c | 5 +- + app/core/gimpcage.h | 4 +- + app/gegl/gimpoperationcage.c | 30 +++++-- + app/gegl/gimpoperationcage.h | 1 - + app/tools/Makefile.am | 2 + + app/tools/gimpcageoptions.c | 58 ++++++++++++ + app/tools/gimpcageoptions.h | 51 +++++++++++ + app/tools/gimpcagetool.c | 99 ++++++++++++++++++--- - app/tools/gimpcagetool.h | 5 +- - app/tools/makefile.msc | 1 + - app/widgets/gimphelp-ids.h | 1 + - libgimpwidgets/gimpstock.c | 3 + - libgimpwidgets/gimpstock.h | 1 + - themes/Default/images/Makefile.am | 2 + - themes/Default/images/makefile.msc | 2 + + app/tools/gimpcagetool.h | 5 +- + app/tools/makefile.msc | 1 + + app/widgets/gimphelp-ids.h | 1 + + libgimpwidgets/gimpstock.c | 3 + + libgimpwidgets/gimpstock.h | 1 + + themes/Default/images/Makefile.am | 2 + + themes/Default/images/makefile.msc | 2 + themes/Default/images/tools/stock-tool-cage-16.png | Bin 0 -> 687 bytes themes/Default/images/tools/stock-tool-cage-22.png | Bin 0 -> 941 bytes themes/Default/images/tools/stock-tool-cage-22.xcf | Bin 0 -> 1791 bytes @@ -58753,22 +59598,22 @@ commit 24652b4fbde2b3bfe4e075e88aff0ad562d4a948 Author: Michael Muré -Date: Mon Jun 14 23:25:08 2010 +0200 +Date: Mon Jun 14 23:25:08 2010 +0200 empty gobject for GimpCage (data structure), GimpOperationCage (Gegl op) and GimpCageTool (frontend) - app/core/Makefile.am | 2 ++ - app/core/core-types.h | 1 + - app/core/gimpcage.c | 34 +++++++++++++++++++ - app/core/gimpcage.h | 58 ++++++++++++++++++++++++++++++++ - app/core/makefile.msc | 1 + - app/gegl/Makefile.am | 3 ++ + app/core/Makefile.am | 2 ++ + app/core/core-types.h | 1 + + app/core/gimpcage.c | 34 +++++++++++++++++++ + app/core/gimpcage.h | 58 ++++++++++++++++++++++++++++++++ + app/core/makefile.msc | 1 + + app/gegl/Makefile.am | 3 ++ app/gegl/gimp-gegl-types.h | 1 + app/gegl/gimpoperationcage.c | 66 ++++++++++++++++++++++++++++++++++++ app/gegl/gimpoperationcage.h | 51 ++++++++++++++++++++++++++++ - app/gegl/makefile.msc | 1 + - app/tools/Makefile.am | 2 ++ + app/gegl/makefile.msc | 1 + + app/tools/Makefile.am | 2 ++ app/tools/gimp-tools.c | 2 ++ app/tools/gimpcagetool.c | 79 ++++++++++++++++++++++++++++++++++++++++++++ @@ -58778,7 +59623,7 @@ commit 48b10d57f89757ba25468d2fc2f9c65cb66ae31c Author: Lucian Adrian Grijincu -Date: Sat Aug 7 20:42:28 2010 +0300 +Date: Sat Aug 7 20:42:28 2010 +0300 po: Updated Romanian translation @@ -58788,7 +59633,7 @@ commit 1ca4f9ef97793794bbfe9a2e709e2390a3f4f596 Author: Łukasz Jernaś -Date: Sat Aug 7 18:40:53 2010 +0200 +Date: Sat Aug 7 18:40:53 2010 +0200 Fix typo in Polish translation @@ -58797,7 +59642,7 @@ commit 3c63e2018102215e629d971d60e1cd334f0572af Author: Lucian Adrian Grijincu -Date: Sat Aug 7 17:29:08 2010 +0300 +Date: Sat Aug 7 17:29:08 2010 +0300 po: Updated Romanian translation @@ -58807,7 +59652,7 @@ commit 5c252e323fb2f1ad29c70748a742183f4e2de7b3 Author: Sven Neumann -Date: Sat Aug 7 00:26:58 2010 +0200 +Date: Sat Aug 7 00:26:58 2010 +0200 app: move duplicated code into a helper function @@ -58817,7 +59662,7 @@ commit dbba892079e8c49a2ec21203e529ac727e2d69df Author: Lucian Adrian Grijincu -Date: Fri Aug 6 00:44:58 2010 +0300 +Date: Fri Aug 6 00:44:58 2010 +0300 po-python: Updated Romanian translation @@ -58826,7 +59671,7 @@ commit cba08b771a518856031cd17a3935870f513c680d Author: Martin Srebotnjak -Date: Thu Aug 5 21:24:43 2010 +0200 +Date: Thu Aug 5 21:24:43 2010 +0200 Updated Slovenian translation @@ -58836,7 +59681,7 @@ commit bdcd7500a88d46892d17a08ad5db5027ab0338d0 Author: Martin Srebotnjak -Date: Thu Aug 5 21:24:19 2010 +0200 +Date: Thu Aug 5 21:24:19 2010 +0200 Updated Slovenian translation @@ -58845,7 +59690,7 @@ commit e33a260941ef979d1d9f6671af8848190cfcd6b3 Author: Martin Srebotnjak -Date: Thu Aug 5 21:23:43 2010 +0200 +Date: Thu Aug 5 21:23:43 2010 +0200 Updated Slovenian translation @@ -58855,7 +59700,7 @@ commit a389e2ff438fe9b6bce348fe8a6bb5c5e615eeca Author: Martin Srebotnjak -Date: Thu Aug 5 21:23:16 2010 +0200 +Date: Thu Aug 5 21:23:16 2010 +0200 Updated Slovenian translation @@ -58865,7 +59710,7 @@ commit df0627c0eb5b8c71bb5923265a5c49d06f096826 Author: Barak Itkin -Date: Thu Aug 5 21:39:34 2010 +0300 +Date: Thu Aug 5 21:39:34 2010 +0300 app: Unmark the git version string for translation @@ -58874,7 +59719,7 @@ commit e12162bbb1f20bf86f496e92b9439f69f843cc4e Author: Lucian Adrian Grijincu -Date: Thu Aug 5 02:32:11 2010 +0300 +Date: Thu Aug 5 02:32:11 2010 +0300 po-plug-ins: Updated Romanian translation @@ -58884,7 +59729,7 @@ commit 101cfa0f1933be899b2e6996bd67fbca31c502d7 Author: Lucian Adrian Grijincu -Date: Thu Aug 5 02:25:30 2010 +0300 +Date: Thu Aug 5 02:25:30 2010 +0300 po-script-fu: Updated Romanian translation @@ -58894,7 +59739,7 @@ commit 782b16c4c52acdccc59aa6a2816d6c719df74f68 Author: Lucian Adrian Grijincu -Date: Thu Aug 5 02:23:51 2010 +0300 +Date: Thu Aug 5 02:23:51 2010 +0300 po-libgimp: Updated Romanian translation @@ -58903,7 +59748,7 @@ commit 441606449b77b05ef51495394964d4458e8a58bd Author: Lucian Adrian Grijincu -Date: Thu Aug 5 02:20:12 2010 +0300 +Date: Thu Aug 5 02:20:12 2010 +0300 po: Updated Romanian translation @@ -58913,7 +59758,7 @@ commit 4d56d260b6e3fd92aa46ab17b21c81e76118e37c Author: Kiyotaka NISHIBORI -Date: Thu Aug 5 00:04:50 2010 +0900 +Date: Thu Aug 5 00:04:50 2010 +0900 Updated Japanese translation. @@ -58923,7 +59768,7 @@ commit 3fa6b209578443ae70250ada3fbcba4986e89ed0 Author: Barak Itkin -Date: Wed Aug 4 02:54:14 2010 +0300 +Date: Wed Aug 4 02:54:14 2010 +0300 Update Hebrew translation @@ -58931,14 +59776,14 @@ +++++++++++++++++++++++++++-------------------------- po-plug-ins/he.po | 228 ++++++++++++++++-------------- po-script-fu/he.po | 139 +++++++++---------- - po-tags/he.po | 26 ++++ - po-tips/he.po | 27 ++-- - po/he.po | 318 +++++++++++++++++++----------------------- + po-tags/he.po | 26 ++++ + po-tips/he.po | 27 ++-- + po/he.po | 318 +++++++++++++++++++----------------------- 6 files changed, 580 insertions(+), 558 deletions(-) commit 690ffe4925ceaeccefaf51a639022847483900c0 Author: Marco Ciampa -Date: Tue Aug 3 22:43:05 2010 +0200 +Date: Tue Aug 3 22:43:05 2010 +0200 Updated italian translation @@ -58947,7 +59792,7 @@ commit f05b92fe1d918fd1f1b20b59bdfae6a698189d61 Author: Marco Ciampa -Date: Tue Aug 3 17:48:29 2010 +0200 +Date: Tue Aug 3 17:48:29 2010 +0200 Updated italian translation. @@ -58956,45 +59801,45 @@ commit 03f1034a9773232f54a98ef684b49342c31b8c82 Author: Barak Itkin -Date: Tue Aug 3 00:13:51 2010 +0300 +Date: Tue Aug 3 00:13:51 2010 +0300 script-fu: Use the new gimp-item api where possible - plug-ins/script-fu/scripts/3d-outline.scm | 12 +++++------ - plug-ins/script-fu/scripts/add-bevel.scm | 2 +- - plug-ins/script-fu/scripts/addborder.scm | 2 +- + plug-ins/script-fu/scripts/3d-outline.scm | 12 +++++------ + plug-ins/script-fu/scripts/add-bevel.scm | 2 +- + plug-ins/script-fu/scripts/addborder.scm | 2 +- plug-ins/script-fu/scripts/alien-neon-logo.scm | 2 +- - plug-ins/script-fu/scripts/basic2-logo.scm | 2 +- - plug-ins/script-fu/scripts/blend-anim.scm | 26 + plug-ins/script-fu/scripts/basic2-logo.scm | 2 +- + plug-ins/script-fu/scripts/blend-anim.scm | 26 +++++++++++------------ - plug-ins/script-fu/scripts/burn-in-anim.scm | 16 +++++++------- - plug-ins/script-fu/scripts/carve-it.scm | 14 ++++++------ - plug-ins/script-fu/scripts/carved-logo.scm | 10 ++++----- - plug-ins/script-fu/scripts/chip-away.scm | 2 +- - plug-ins/script-fu/scripts/chrome-it.scm | 12 +++++------ - plug-ins/script-fu/scripts/chrome-logo.scm | 12 +++++------ - plug-ins/script-fu/scripts/comic-logo.scm | 4 ++-- - plug-ins/script-fu/scripts/crystal-logo.scm | 12 +++++------ + plug-ins/script-fu/scripts/burn-in-anim.scm | 16 +++++++------- + plug-ins/script-fu/scripts/carve-it.scm | 14 ++++++------ + plug-ins/script-fu/scripts/carved-logo.scm | 10 ++++----- + plug-ins/script-fu/scripts/chip-away.scm | 2 +- + plug-ins/script-fu/scripts/chrome-it.scm | 12 +++++------ + plug-ins/script-fu/scripts/chrome-logo.scm | 12 +++++------ + plug-ins/script-fu/scripts/comic-logo.scm | 4 ++-- + plug-ins/script-fu/scripts/crystal-logo.scm | 12 +++++------ plug-ins/script-fu/scripts/difference-clouds.scm | 2 +- plug-ins/script-fu/scripts/distress-selection.scm | 4 ++-- - plug-ins/script-fu/scripts/glossy.scm | 2 +- - plug-ins/script-fu/scripts/glowing-logo.scm | 2 +- - plug-ins/script-fu/scripts/grid-system.scm | 2 +- - plug-ins/script-fu/scripts/neon-logo.scm | 2 +- + plug-ins/script-fu/scripts/glossy.scm | 2 +- + plug-ins/script-fu/scripts/glowing-logo.scm | 2 +- + plug-ins/script-fu/scripts/grid-system.scm | 2 +- + plug-ins/script-fu/scripts/neon-logo.scm | 2 +- plug-ins/script-fu/scripts/sota-chrome-logo.scm | 22 +++++++++---------- - plug-ins/script-fu/scripts/spinning-globe.scm | 2 +- - plug-ins/script-fu/scripts/t-o-p-logo.scm | 2 +- - plug-ins/script-fu/scripts/text-circle.scm | 6 +++--- - plug-ins/script-fu/scripts/title-header.scm | 2 +- - plug-ins/script-fu/scripts/unsharp-mask.scm | 14 ++++++------ - plug-ins/script-fu/scripts/waves-anim.scm | 4 ++-- - plug-ins/script-fu/scripts/weave.scm | 2 +- + plug-ins/script-fu/scripts/spinning-globe.scm | 2 +- + plug-ins/script-fu/scripts/t-o-p-logo.scm | 2 +- + plug-ins/script-fu/scripts/text-circle.scm | 6 +++--- + plug-ins/script-fu/scripts/title-header.scm | 2 +- + plug-ins/script-fu/scripts/unsharp-mask.scm | 14 ++++++------ + plug-ins/script-fu/scripts/waves-anim.scm | 4 ++-- + plug-ins/script-fu/scripts/weave.scm | 2 +- 28 files changed, 98 insertions(+), 98 deletions(-) commit 25be82a04b22e932229e90f08a4859768546262f Author: Mukund Sivaraman -Date: Mon Aug 2 02:40:08 2010 +0530 +Date: Mon Aug 2 02:40:08 2010 +0530 Substitute target header filename like the rest of the code @@ -59003,7 +59848,7 @@ commit 10d11abcd5176e5433f3435f76d261ce6eec2d7f Author: Mukund Sivaraman -Date: Mon Aug 2 02:29:13 2010 +0530 +Date: Mon Aug 2 02:29:13 2010 +0530 Fix typo @@ -59012,7 +59857,7 @@ commit 1dfa7b5e767f88eeb78c95fdf46fb63e982d8b65 Author: SimaMoto,RyōTa -Date: Thu Jul 29 19:53:34 2010 +0900 +Date: Thu Jul 29 19:53:34 2010 +0900 Bug 625571 - Request context tags for reasonable translation on some plug-ins @@ -59021,12 +59866,12 @@ of the Color Rotate and the Color to Alpha plug-ins. plug-ins/color-rotate/color-rotate-dialog.c | 4 ++-- - plug-ins/common/color-to-alpha.c | 2 +- + plug-ins/common/color-to-alpha.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit 7df1a4f3df72fdefb51578b242b2a5c2dfcb1f48 Author: Michael Natterer -Date: Fri Jul 30 16:25:08 2010 +0200 +Date: Fri Jul 30 16:25:08 2010 +0200 app: clean up GimpColorBar rendering and add cairo_surface_mark_dirty() @@ -59036,7 +59881,7 @@ commit 1a893ce0b46a887a501ef6356debacc0a11c597c Author: Michael Natterer -Date: Fri Jul 30 16:20:45 2010 +0200 +Date: Fri Jul 30 16:20:45 2010 +0200 libgimp: port GimpGradientSelectButton drawing to cairo @@ -59046,7 +59891,7 @@ commit 208096bc7cc498195839eeb53d23a32f560af05e Author: Michael Natterer -Date: Fri Jul 30 14:58:55 2010 +0200 +Date: Fri Jul 30 14:58:55 2010 +0200 app: port GimpColorBar drawing to cairo @@ -59056,7 +59901,7 @@ commit ac801637712492c996f4bd7ffea7ac0474f59b45 Author: Michael Natterer -Date: Fri Jul 30 13:14:10 2010 +0200 +Date: Fri Jul 30 13:14:10 2010 +0200 app: draw the statusbar's icon with cairo @@ -59065,7 +59910,7 @@ commit 4466b3a35bbec72a24ca0bb373d505945a24b7ed Author: Michael Natterer -Date: Fri Jul 30 12:51:03 2010 +0200 +Date: Fri Jul 30 12:51:03 2010 +0200 app: remove code duplication in the histogram and curve views @@ -59073,14 +59918,14 @@ borders. Also fix a lot of off-by-one problems in the curve view which occur due to the 0.5,0.5 offset of cairo line drawing. - app/widgets/gimpcurveview.c | 59 + app/widgets/gimpcurveview.c | 59 +++++++++++++++-------------------------- app/widgets/gimphistogramview.c | 23 +++++++++------- 2 files changed, 34 insertions(+), 48 deletions(-) commit c548a593e57f60ca1dbfa3a00c39c8911772d69f Author: Michael Natterer -Date: Fri Jul 30 12:18:08 2010 +0200 +Date: Fri Jul 30 12:18:08 2010 +0200 app: port GimpHistogramView drawing to cairo @@ -59090,7 +59935,7 @@ commit 900fd00c0080041dff626358578e53333ff5bd03 Author: Michael Natterer -Date: Thu Jul 29 14:41:50 2010 +0200 +Date: Thu Jul 29 14:41:50 2010 +0200 app: port GimpTagPopup drawing to cairo @@ -59100,7 +59945,7 @@ commit d28a04ac045fe182da25700ec8caf45a340d2923 Author: Michael Natterer -Date: Thu Jul 29 14:20:37 2010 +0200 +Date: Thu Jul 29 14:20:37 2010 +0200 app: port GimpFgBgEditor drawing to cairo @@ -59111,7 +59956,7 @@ commit c5951857e13a4eebfe70b0423413ac8ca3e2fa0b Author: Michael Natterer -Date: Thu Jul 29 14:10:01 2010 +0200 +Date: Thu Jul 29 14:10:01 2010 +0200 app: forgot cairo_destroy() @@ -59120,7 +59965,7 @@ commit 8d67b5b69b01e5868456cf0f1858359f8936375c Author: Michael Natterer -Date: Thu Jul 29 14:05:51 2010 +0200 +Date: Thu Jul 29 14:05:51 2010 +0200 app: port GimpFgBgView rendering to cairo @@ -59131,7 +59976,7 @@ commit 06488d03feabed8edc3d796fc0425e8d1fe93958 Author: Michael Natterer -Date: Wed Jul 28 16:15:54 2010 +0200 +Date: Wed Jul 28 16:15:54 2010 +0200 app: draw the curve view's background with cairo @@ -59142,7 +59987,7 @@ commit e1d9a32a835c31b0002572f025bb3316a36e5f84 Author: Michael Natterer -Date: Wed Jul 28 16:00:50 2010 +0200 +Date: Wed Jul 28 16:00:50 2010 +0200 app: draw the splash's strings with cairo, not gdk_draw_layout() @@ -59151,7 +59996,7 @@ commit 9942d5f692ca6c99a96ae6a8454cda2a6a8a8a1a Author: Michael Natterer -Date: Tue Jul 27 18:01:34 2010 +0200 +Date: Tue Jul 27 18:01:34 2010 +0200 app: draw the about dialog's animated string with cairo, not gdk_draw_layout() @@ -59161,7 +60006,7 @@ commit c3a4825a8a365a93347478feb34b0937e00dc1af Author: Michael Natterer -Date: Tue Jul 27 17:26:40 2010 +0200 +Date: Tue Jul 27 17:26:40 2010 +0200 app: simplify GimpOverlayFrame drawing a lot @@ -59172,7 +60017,7 @@ commit 086cfc3f03c1d871e5b9041d84033795b27169fd Author: Ulf-D. Ehlert -Date: Mon Jul 26 21:19:18 2010 +0200 +Date: Mon Jul 26 21:19:18 2010 +0200 po: Fix German translation @@ -59181,21 +60026,21 @@ commit 8cf801c8e010409eac9296a7b7b8e0c8f6814eb1 Author: Sven Neumann -Date: Mon Jul 26 01:08:44 2010 +0200 +Date: Mon Jul 26 01:08:44 2010 +0200 app: allow to delete curve points Pressing Delete in the Curve view now deletes the selected point on the curve. - app/core/gimpcurve.c | 28 ++++++++++++++++++++++++++++ - app/core/gimpcurve.h | 2 ++ - app/widgets/gimpcurveview.c | 4 ++++ + app/core/gimpcurve.c | 28 ++++++++++++++++++++++++++++ + app/core/gimpcurve.h | 2 ++ + app/widgets/gimpcurveview.c | 4 ++++ 3 files changed, 34 insertions(+) commit f60d456e61ba3e243a9b094719a7951558dc8705 Author: Michael Natterer -Date: Fri Jul 23 22:08:28 2010 +0200 +Date: Fri Jul 23 22:08:28 2010 +0200 app: add new parameter check function gimp_pdb_item_is_in_tree() @@ -59208,7 +60053,7 @@ commit 5a9f2f1eaca2329af507ff887c062e91ee0bd9dc Author: Barak Itkin -Date: Fri Jul 23 19:13:49 2010 +0300 +Date: Fri Jul 23 19:13:49 2010 +0300 app: Add '/' as a seperator for the rectangle tools options (in the Fixed field) @@ -59218,7 +60063,7 @@ commit 2a901da55957fe36d89e35b6170c16de5692dea2 Author: Sven Neumann -Date: Wed Jul 21 21:42:27 2010 +0200 +Date: Wed Jul 21 21:42:27 2010 +0200 Bug 624944 - "Colour Exchange" dialog is too high in size @@ -59230,7 +60075,7 @@ commit f76981143d614a99742764f6ac01d4caf36bc101 Author: Ulf-D. Ehlert -Date: Wed Jul 21 12:55:48 2010 +0200 +Date: Wed Jul 21 12:55:48 2010 +0200 Bug 624761 - Stencil Chrome filter: missing parameter check @@ -59244,7 +60089,7 @@ commit e8890f7f4ce2b5e48e96470d9936f949a37d787d Author: Jakub Steiner -Date: Wed Jul 21 02:49:46 2010 +0300 +Date: Wed Jul 21 02:49:46 2010 +0300 data: Add an SVG file for the path in app/widgets/gimpcairo-wilber.c @@ -59253,7 +60098,7 @@ commit fe00c2976991239267736209141f613cf6952619 Author: Barak Itkin -Date: Wed Jul 21 00:58:45 2010 +0300 +Date: Wed Jul 21 00:58:45 2010 +0300 libgimp: Fix the commit of libgimp/gimp.def - add missing line breaks @@ -59262,7 +60107,7 @@ commit 31d12d81099d0c1df1ccc041263fde4fcc6c9748 Author: Barak Itkin -Date: Wed Jul 21 00:49:30 2010 +0300 +Date: Wed Jul 21 00:49:30 2010 +0300 libgimp: Add the new item api to libgimp/gimp.def @@ -59271,7 +60116,7 @@ commit 4165dfb217557fe5d857125f40ec5fddf41e152f Author: Michael Natterer -Date: Tue Jul 20 23:36:16 2010 +0200 +Date: Tue Jul 20 23:36:16 2010 +0200 app: move the alt-click selection feature to GimpItemTreeView @@ -59288,7 +60133,7 @@ commit 3184c440b31e9e01a9c0d137e5b8686c1a7e7580 Author: Michael Natterer -Date: Tue Jul 20 23:09:19 2010 +0200 +Date: Tue Jul 20 23:09:19 2010 +0200 app: introduce GimpItem::to_selection() @@ -59298,29 +60143,29 @@ gimpchannel-select.c manually. app/actions/channels-commands.c | 6 ++--- - app/actions/layers-commands.c | 35 +++++++++-------------------- - app/actions/select-commands.c | 1 - + app/actions/layers-commands.c | 35 +++++++++-------------------- + app/actions/select-commands.c | 1 - app/actions/vectors-commands.c | 15 +++++-------- - app/core/gimpchannel.c | 30 +++++++++++++++++++++++++ - app/core/gimpitem.c | 21 +++++++++++++++++ - app/core/gimpitem.h | 14 ++++++++++++ - app/core/gimplayer.c | 28 ++++++++++++++++++++++- - app/core/gimplayermask.c | 1 + - app/pdb/paths-cmds.c | 16 +++++-------- - app/pdb/selection-cmds.c | 48 + app/core/gimpchannel.c | 30 +++++++++++++++++++++++++ + app/core/gimpitem.c | 21 +++++++++++++++++ + app/core/gimpitem.h | 14 ++++++++++++ + app/core/gimplayer.c | 28 ++++++++++++++++++++++- + app/core/gimplayermask.c | 1 + + app/pdb/paths-cmds.c | 16 +++++-------- + app/pdb/selection-cmds.c | 48 +++++++++++++++------------------------ - app/pdb/vectors-cmds.c | 20 ++++++----------- - app/tools/gimpvectortool.c | 9 +++----- - app/vectors/gimpvectors.c | 28 +++++++++++++++++++++++ - tools/pdbgen/pdb/paths.pdb | 16 +++++-------- + app/pdb/vectors-cmds.c | 20 ++++++----------- + app/tools/gimpvectortool.c | 9 +++----- + app/vectors/gimpvectors.c | 28 +++++++++++++++++++++++ + tools/pdbgen/pdb/paths.pdb | 16 +++++-------- tools/pdbgen/pdb/selection.pdb | 50 ++++++++++++++++------------------------- - tools/pdbgen/pdb/vectors.pdb | 20 ++++++----------- + tools/pdbgen/pdb/vectors.pdb | 20 ++++++----------- 17 files changed, 205 insertions(+), 153 deletions(-) commit e701384f3ac89dadd6de5e69f822d904f7f72a27 Author: Cameron Gregory -Date: Mon Jul 19 13:53:00 2010 +0200 +Date: Mon Jul 19 13:53:00 2010 +0200 Bug 624698 - Wood 1 and Wood 2 have bad alpha value @@ -59332,40 +60177,40 @@ commit cebbde5da936600aeb4740f3d7d8b53bb2c12b24 Author: David Gowers <00ai99@gmail.com> -Date: Wed Jul 14 16:59:21 2010 +0930 +Date: Wed Jul 14 16:59:21 2010 +0930 plugins/pygimp: use (PF|PDB)_ITEM instead of _REGION so pygimp works again. Also update vectors and drawable code to use the new GimpItem API. - plug-ins/pygimp/gimpfu.py | 8 +++--- + plug-ins/pygimp/gimpfu.py | 8 +++--- plug-ins/pygimp/pygimp-drawable.c | 57 ++++++++++++++++++++++----------------- - plug-ins/pygimp/pygimp-tile.c | 6 ++--- + plug-ins/pygimp/pygimp-tile.c | 6 ++--- plug-ins/pygimp/pygimp-vectors.c | 34 +++++++++++------------ 4 files changed, 56 insertions(+), 49 deletions(-) commit 8b31211639d4507182270591d68436f30d3e6550 Author: Michael Natterer -Date: Fri Jul 16 15:24:25 2010 +0200 +Date: Fri Jul 16 15:24:25 2010 +0200 Fix the bulid after GtkNotebookPage got deprecated in gtk-2-22 In all GtkNotebook::switch_page() callbacks, simply replace GtkNotebookPage* by gpointer. - app/dialogs/preferences-dialog.c | 4 ++-- - app/display/gimpimagewindow.c | 4 ++-- - app/widgets/gimpdeviceeditor.c | 4 ++-- - libgimpwidgets/gimpcolornotebook.c | 4 ++-- - libgimpwidgets/gimpcolorselection.c | 4 ++-- + app/dialogs/preferences-dialog.c | 4 ++-- + app/display/gimpimagewindow.c | 4 ++-- + app/widgets/gimpdeviceeditor.c | 4 ++-- + libgimpwidgets/gimpcolornotebook.c | 4 ++-- + libgimpwidgets/gimpcolorselection.c | 4 ++-- plug-ins/imagemap/imap_edit_area_info.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) commit e14c50aaefb41d077455b4cec1fa708cc14a3e7c Author: Sven Neumann -Date: Thu Jul 15 21:40:56 2010 +0200 +Date: Thu Jul 15 21:40:56 2010 +0200 Bug 623169 - Memory leaks in GIMP @@ -59376,27 +60221,27 @@ commit 4fea27ec1d1743a588bb2f06ec6240f17d95b748 Author: Nelson A. de Oliveira -Date: Tue Jun 22 16:10:28 2010 -0300 +Date: Tue Jun 22 16:10:28 2010 -0300 Bug 623169 - Memory leaks in GIMP Add some missing g_free() and free() calls, found by cppcheck. - plug-ins/common/file-gbr.c | 2 ++ - plug-ins/common/file-pat.c | 2 ++ - plug-ins/common/mosaic.c | 6 +++++- + plug-ins/common/file-gbr.c | 2 ++ + plug-ins/common/file-pat.c | 2 ++ + plug-ins/common/mosaic.c | 6 +++++- plug-ins/common/plugin-browser.c | 5 +++++ - plug-ins/file-ico/ico-save.c | 1 + + plug-ins/file-ico/ico-save.c | 1 + plug-ins/file-jpeg/jpeg-save.c | 2 ++ - plug-ins/file-xjt/xjt.c | 1 + - plug-ins/flame/rect.c | 1 + - plug-ins/gfig/gfig-star.c | 4 ++++ + plug-ins/file-xjt/xjt.c | 1 + + plug-ins/flame/rect.c | 1 + + plug-ins/gfig/gfig-star.c | 4 ++++ plug-ins/gimpressionist/ppmtool.c | 2 ++ 10 files changed, 25 insertions(+), 1 deletion(-) commit 17a4baff01720eedf8a857d90305074826e6d3f5 Author: Sven Neumann -Date: Thu Jul 15 21:36:12 2010 +0200 +Date: Thu Jul 15 21:36:12 2010 +0200 Bug 624452 - plug-in-displace pdb call incorrectly documented edge behaviour @@ -59409,34 +60254,34 @@ commit b3f4038f68b1ddf469304425c1cba7ff2e7ef3bb Author: Michael Natterer -Date: Wed Jul 14 20:20:58 2010 +0200 +Date: Wed Jul 14 20:20:58 2010 +0200 libgimp: add gimpenums.c.tail again, pdbgen-generated files are in git - libgimp/.gitignore | 1 - + libgimp/.gitignore | 1 - libgimp/gimpenums.c.tail | 167 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 167 insertions(+), 1 deletion(-) commit 3512d0b03fb1bafb5e494427377c557f4ab83d73 Author: Michael Natterer -Date: Wed Jul 14 19:03:49 2010 +0200 +Date: Wed Jul 14 19:03:49 2010 +0200 libgimp/devel-docs: add back the gtk-doc template for gimpenums It's a generated file and keeping around the template is much easier than adding pdbgen support for generating the docs. - devel-docs/libgimp/.gitignore | 1 - - devel-docs/libgimp/tmpl/.gitignore | 75 +++++++++++ + devel-docs/libgimp/.gitignore | 1 - + devel-docs/libgimp/tmpl/.gitignore | 75 +++++++++++ devel-docs/libgimp/tmpl/gimpenums.sgml | 235 +++++++++++++++++++++++++++++++++ - libgimp/gimpenums.h | 31 ----- + libgimp/gimpenums.h | 31 ----- 4 files changed, 310 insertions(+), 32 deletions(-) commit 19c01bc12a33da39b756df79391d3641a1ca94a4 Author: Michael Natterer -Date: Wed Jul 14 19:02:58 2010 +0200 +Date: Wed Jul 14 19:02:58 2010 +0200 tools: fix generated docs of gimp_enums_init() @@ -59445,7 +60290,7 @@ commit 91a125df40bda9871c1dd7e2370e5fa02d36bcef Author: Michael Natterer -Date: Wed Jul 14 19:01:31 2010 +0200 +Date: Wed Jul 14 19:01:31 2010 +0200 libgimp: remove generated file (it's also in .gitignore) @@ -59455,19 +60300,19 @@ commit cac3fb88f91fa03b1f4a256147aa90079e7ae8ff Author: Lucian Adrian Grijincu -Date: Wed Jul 14 19:53:38 2010 +0300 +Date: Wed Jul 14 19:53:38 2010 +0300 po-tags: Added Romanian translation Signed-off-by: Lucian Adrian Grijincu po-tags/LINGUAS | 1 + - po-tags/ro.po | 25 +++++++++++++++++++++++++ + po-tags/ro.po | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) commit 5c7cf96004f0fe78f9f4be0e7b2f6ee3530b05b3 Author: Cristian Secară -Date: Wed Jul 14 19:05:01 2010 +0300 +Date: Wed Jul 14 19:05:01 2010 +0300 po-tips: Updated Romanian translation @@ -59476,7 +60321,7 @@ commit 2b9f5173abc766ba93f0af6df8c02ff5199c1d39 Author: Cristian Secară -Date: Wed Jul 14 18:59:10 2010 +0300 +Date: Wed Jul 14 18:59:10 2010 +0300 po-script-fu: Updated Romanian translation @@ -59486,7 +60331,7 @@ commit a480afeab77557479d2ff9b209a5c211f8c62c14 Author: Cristian Secară -Date: Wed Jul 14 18:40:48 2010 +0300 +Date: Wed Jul 14 18:40:48 2010 +0300 po-python: Updated Romanian translation @@ -59496,7 +60341,7 @@ commit 2f2b8e4169afbf774c936e0d8f239f9b26dc26c3 Author: Lucian Adrian Grijincu -Date: Wed Jul 14 18:38:04 2010 +0300 +Date: Wed Jul 14 18:38:04 2010 +0300 po-plug-ins: Updated Romanian translation @@ -59505,7 +60350,7 @@ commit c636cfe1b0355adae36c00b18e6bbd7f7cf81fd0 Author: Cristian Secară -Date: Wed Jul 14 17:41:46 2010 +0300 +Date: Wed Jul 14 17:41:46 2010 +0300 po-plug-ins: Updated Romanian translation @@ -59515,7 +60360,7 @@ commit a1b555afafb04d18bc5fcc784de295c5bf6195b1 Author: Cristian Secară -Date: Wed Jul 14 17:13:09 2010 +0300 +Date: Wed Jul 14 17:13:09 2010 +0300 po-libgimp: Updated Romanian translation @@ -59525,7 +60370,7 @@ commit adaeaca035fcb7ed4cacd4136483be86686f4d56 Author: Cristian Secară -Date: Wed Jul 14 16:13:52 2010 +0300 +Date: Wed Jul 14 16:13:52 2010 +0300 po: Updated Romanian translation @@ -59535,7 +60380,7 @@ commit ff221e679c2dd17be9cd55d3d980859d656bfccd Author: Sven Neumann -Date: Tue Jul 13 22:20:15 2010 +0200 +Date: Tue Jul 13 22:20:15 2010 +0200 Bug 624275 - Image saved from google docs generates a 'gimp-image-set-resolution' error message @@ -59548,7 +60393,7 @@ commit 2b7ebd97fbee5c570974aea023eb46afeebe519f Author: Michael Natterer -Date: Mon Jul 12 23:27:14 2010 +0200 +Date: Mon Jul 12 23:27:14 2010 +0200 libgimp: documented some enum values until i got bored @@ -59557,50 +60402,50 @@ commit e3f0a6a0d4fdae0defc556ea0fdfe95e48fd7e3b Author: Michael Natterer -Date: Mon Jul 12 23:11:56 2010 +0200 +Date: Mon Jul 12 23:11:56 2010 +0200 tools: generate "Deprecated:" sections according to gtk-doc standards So the comment about replacement functions appears in the red warning box in the generated HTML. - app/pdb/brushes-cmds.c | 16 +++++------ - app/pdb/color-cmds.c | 4 +-- - app/pdb/drawable-cmds.c | 60 + app/pdb/brushes-cmds.c | 16 +++++------ + app/pdb/color-cmds.c | 4 +-- + app/pdb/drawable-cmds.c | 60 ++++++++++++++++++++-------------------- - app/pdb/floating-sel-cmds.c | 8 +++--- - app/pdb/gradients-cmds.c | 12 ++++---- - app/pdb/image-cmds.c | 12 ++++---- - app/pdb/palettes-cmds.c | 8 +++--- - app/pdb/parasite-cmds.c | 32 ++++++++++----------- - app/pdb/paths-cmds.c | 60 + app/pdb/floating-sel-cmds.c | 8 +++--- + app/pdb/gradients-cmds.c | 12 ++++---- + app/pdb/image-cmds.c | 12 ++++---- + app/pdb/palettes-cmds.c | 8 +++--- + app/pdb/parasite-cmds.c | 32 ++++++++++----------- + app/pdb/paths-cmds.c | 60 ++++++++++++++++++++-------------------- - app/pdb/patterns-cmds.c | 8 +++--- - app/pdb/text-layer-cmds.c | 4 +-- - app/pdb/text-tool-cmds.c | 8 +++--- + app/pdb/patterns-cmds.c | 8 +++--- + app/pdb/text-layer-cmds.c | 4 +-- + app/pdb/text-tool-cmds.c | 8 +++--- app/pdb/transform-tools-cmds.c | 24 ++++++++-------- - app/pdb/vectors-cmds.c | 40 +++++++++++++-------------- - libgimp/gimpbrushes_pdb.c | 8 +++--- - libgimp/gimpcolor_pdb.c | 2 +- - libgimp/gimpdrawable_pdb.c | 30 ++++++++++---------- - libgimp/gimpfloatingsel_pdb.c | 4 +-- - libgimp/gimpgradients_pdb.c | 9 ++---- - libgimp/gimpimage_pdb.c | 3 +- - libgimp/gimppalettes_pdb.c | 6 ++-- - libgimp/gimpparasite_pdb.c | 20 ++++++-------- - libgimp/gimppaths_pdb.c | 40 ++++++++++----------------- - libgimp/gimppatterns_pdb.c | 5 ++-- - libgimp/gimptextlayer_pdb.c | 6 ++-- - libgimp/gimptexttool_pdb.c | 5 ++-- + app/pdb/vectors-cmds.c | 40 +++++++++++++-------------- + libgimp/gimpbrushes_pdb.c | 8 +++--- + libgimp/gimpcolor_pdb.c | 2 +- + libgimp/gimpdrawable_pdb.c | 30 ++++++++++---------- + libgimp/gimpfloatingsel_pdb.c | 4 +-- + libgimp/gimpgradients_pdb.c | 9 ++---- + libgimp/gimpimage_pdb.c | 3 +- + libgimp/gimppalettes_pdb.c | 6 ++-- + libgimp/gimpparasite_pdb.c | 20 ++++++-------- + libgimp/gimppaths_pdb.c | 40 ++++++++++----------------- + libgimp/gimppatterns_pdb.c | 5 ++-- + libgimp/gimptextlayer_pdb.c | 6 ++-- + libgimp/gimptexttool_pdb.c | 5 ++-- libgimp/gimptransformtools_pdb.c | 19 +++++-------- - libgimp/gimpvectors_pdb.c | 20 +++++++------- - tools/pdbgen/lib.pl | 5 ++-- - tools/pdbgen/stddefs.pdb | 4 +-- + libgimp/gimpvectors_pdb.c | 20 +++++++------- + tools/pdbgen/lib.pl | 5 ++-- + tools/pdbgen/stddefs.pdb | 4 +-- 30 files changed, 227 insertions(+), 255 deletions(-) commit e55b7f30a3e8249ef8f99576dcdb3e40e6996283 Author: Martin Nordholts -Date: Mon Jul 12 15:11:04 2010 +0200 +Date: Mon Jul 12 15:11:04 2010 +0200 app: Disable dynamics by default @@ -59609,7 +60454,7 @@ commit 79da8b1191f130a2eca9d4d3a59142a12e225c73 Author: Khaled Hosny -Date: Mon Jul 12 01:58:45 2010 +0300 +Date: Mon Jul 12 01:58:45 2010 +0300 Updated Arabic translation @@ -59619,7 +60464,7 @@ commit 833e43944b828a018bcc9f305d5712a52cbf4dea Author: Sven Neumann -Date: Sat Jul 10 21:30:00 2010 +0200 +Date: Sat Jul 10 21:30:00 2010 +0200 data: Remove color name "Untitled" from palette files @@ -59627,65 +60472,65 @@ palette file. The palette loader will use the name "Untitled", in the current locale, for colors that don't have a name specified. - data/palettes/Bears.gpl | 506 + data/palettes/Bears.gpl | 506 ++++++++++++++++++++-------------------- - data/palettes/Bgold.gpl | 512 + data/palettes/Bgold.gpl | 512 ++++++++++++++++++++--------------------- - data/palettes/Blues.gpl | 498 + data/palettes/Blues.gpl | 498 +++++++++++++++++++-------------------- - data/palettes/Borders.gpl | 512 + data/palettes/Borders.gpl | 512 ++++++++++++++++++++--------------------- - data/palettes/Caramel.gpl | 510 + data/palettes/Caramel.gpl | 510 ++++++++++++++++++++-------------------- - data/palettes/Cascade.gpl | 512 + data/palettes/Cascade.gpl | 512 ++++++++++++++++++++--------------------- - data/palettes/China.gpl | 512 + data/palettes/China.gpl | 512 ++++++++++++++++++++--------------------- - data/palettes/Coldfire.gpl | 510 + data/palettes/Coldfire.gpl | 510 ++++++++++++++++++++-------------------- - data/palettes/Cool_Colors.gpl | 16 +- - data/palettes/Cranes.gpl | 502 + data/palettes/Cool_Colors.gpl | 16 +- + data/palettes/Cranes.gpl | 502 ++++++++++++++++++++-------------------- data/palettes/Dark_pastels.gpl | 512 ++++++++++++++++++++--------------------- - data/palettes/Ega.gpl | 390 +++++++++++++++---------------- - data/palettes/Firecode.gpl | 508 + data/palettes/Ega.gpl | 390 +++++++++++++++---------------- + data/palettes/Firecode.gpl | 508 ++++++++++++++++++++-------------------- - data/palettes/Gold.gpl | 504 + data/palettes/Gold.gpl | 504 ++++++++++++++++++++-------------------- - data/palettes/GrayViolet.gpl | 496 + data/palettes/GrayViolet.gpl | 496 +++++++++++++++++++-------------------- - data/palettes/Grayblue.gpl | 512 + data/palettes/Grayblue.gpl | 512 ++++++++++++++++++++--------------------- - data/palettes/Greens.gpl | 496 + data/palettes/Greens.gpl | 496 +++++++++++++++++++-------------------- - data/palettes/Hilite.gpl | 512 + data/palettes/Hilite.gpl | 512 ++++++++++++++++++++--------------------- - data/palettes/Khaki.gpl | 512 + data/palettes/Khaki.gpl | 512 ++++++++++++++++++++--------------------- - data/palettes/News3.gpl | 512 + data/palettes/News3.gpl | 512 ++++++++++++++++++++--------------------- - data/palettes/Op2.gpl | 510 + data/palettes/Op2.gpl | 510 ++++++++++++++++++++-------------------- - data/palettes/Paintjet.gpl | 32 +-- - data/palettes/Pastels.gpl | 36 +-- - data/palettes/Plasma.gpl | 510 + data/palettes/Paintjet.gpl | 32 +-- + data/palettes/Pastels.gpl | 36 +-- + data/palettes/Plasma.gpl | 510 ++++++++++++++++++++-------------------- - data/palettes/Reds.gpl | 500 + data/palettes/Reds.gpl | 500 ++++++++++++++++++++-------------------- - data/palettes/Royal.gpl | 506 + data/palettes/Royal.gpl | 506 ++++++++++++++++++++-------------------- - data/palettes/Topographic.gpl | 480 + data/palettes/Topographic.gpl | 480 +++++++++++++++++++------------------- - data/palettes/Volcano.gpl | 494 + data/palettes/Volcano.gpl | 494 +++++++++++++++++++-------------------- - data/palettes/Warm_Colors.gpl | 14 +- - data/palettes/Web.gpl | 432 +++++++++++++++++----------------- + data/palettes/Warm_Colors.gpl | 14 +- + data/palettes/Web.gpl | 432 +++++++++++++++++----------------- 30 files changed, 6529 insertions(+), 6529 deletions(-) commit 222ffd2360b80652ebffc44b5a00d1bfddf859d8 Author: Nils Philippsen -Date: Fri Jul 9 16:37:30 2010 +0200 +Date: Fri Jul 9 16:37:30 2010 +0200 app: generate git-version.h regardless of branch @@ -59703,7 +60548,7 @@ commit 6909fd5dc3d25c342a0f80ea9c6bd75a7f66a509 Author: Michael Natterer -Date: Fri Jul 9 14:24:57 2010 +0200 +Date: Fri Jul 9 14:24:57 2010 +0200 devel-docs: update the item section with the parasite functions @@ -59712,26 +60557,26 @@ commit 2e81453c755fc0a0fad1d7a1883356c8cbe663d9 Author: Michael Natterer -Date: Fri Jul 9 14:24:31 2010 +0200 +Date: Fri Jul 9 14:24:31 2010 +0200 pdb: some doc fixes - app/pdb/paths-cmds.c | 12 ++++++------ + app/pdb/paths-cmds.c | 12 ++++++------ libgimp/gimppaths_pdb.c | 6 +++--- tools/pdbgen/pdb/paths.pdb | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) commit 611877783c8a068cf354e9e40351be0caea8bf72 Author: Michael Natterer -Date: Fri Jul 9 14:15:55 2010 +0200 +Date: Fri Jul 9 14:15:55 2010 +0200 libgimp: deprecate gimp_image_attach_new_parasite() and port all its users to gimp_image_parasite_attach(). - libgimp/gimpimage.c | 70 + libgimp/gimpimage.c | 70 +++++++++++++++++++++++--------------------- - libgimp/gimpimage.h | 15 +++++----- + libgimp/gimpimage.h | 15 +++++----- plug-ins/common/decompose.c | 9 ++++-- plug-ins/common/file-gbr.c | 21 ++++++++----- plug-ins/common/file-pat.c | 21 ++++++++----- @@ -59740,7 +60585,7 @@ commit c87025ead62b7b68b593b9cb8ae08324e8b3557e Author: Michael Natterer -Date: Fri Jul 9 14:01:53 2010 +0200 +Date: Fri Jul 9 14:01:53 2010 +0200 plug-ins: gimp_drawable_get_image() -> gimp_item_get_image() @@ -59749,22 +60594,22 @@ commit 94737aae8cf13dd635f0c700728b0a66935acb22 Author: Michael Natterer -Date: Fri Jul 9 13:30:31 2010 +0200 +Date: Fri Jul 9 13:30:31 2010 +0200 libgimp: deprecate gimp_[drawable]_attach_new_parasite() They were unused, and it's silly to have a "convenience" function to replace three trivial lines of code. - libgimp/gimp.c | 3 +++ - libgimp/gimp.h | 2 ++ + libgimp/gimp.c | 3 +++ + libgimp/gimp.h | 2 ++ libgimp/gimpdrawable.c | 3 +++ libgimp/gimpdrawable.h | 2 ++ 4 files changed, 10 insertions(+) commit ef9c292e37079eb6e52ab4deaab257054d864bac Author: Michael Natterer -Date: Fri Jul 9 13:28:57 2010 +0200 +Date: Fri Jul 9 13:28:57 2010 +0200 libgimp: use item API instead of deprecated drawable API @@ -59773,7 +60618,7 @@ commit 521cf890064009f3b97336e97dd189746ff9f1e2 Author: Nils Philippsen -Date: Fri Jul 9 12:49:58 2010 +0200 +Date: Fri Jul 9 12:49:58 2010 +0200 script-fu: make server strict-aliasing friendly @@ -59784,7 +60629,7 @@ commit 6cdc64756e4a26fcfb82bba57fc4489925d0052f Author: Nils Philippsen -Date: Fri Jul 9 12:18:51 2010 +0200 +Date: Fri Jul 9 12:18:51 2010 +0200 configure.ac: add check for getaddrinfo() @@ -59793,68 +60638,68 @@ commit c6a2eaa5c4f704118e525e478a2faca8c2ff0295 Author: Michael Natterer -Date: Fri Jul 9 12:27:36 2010 +0200 +Date: Fri Jul 9 12:27:36 2010 +0200 plug-ins: use new item API instead of deprecated drawable API plug-ins/color-rotate/color-rotate-utils.c | 2 +- - plug-ins/common/align-layers.c | 8 ++++---- - plug-ins/common/animation-optimize.c | 10 +++++----- - plug-ins/common/animation-play.c | 4 ++-- - plug-ins/common/color-cube-analyze.c | 4 ++-- - plug-ins/common/color-to-alpha.c | 2 +- - plug-ins/common/compose.c | 10 +++++----- - plug-ins/common/curve-bend.c | 18 +++++++++--------- - plug-ins/common/edge-dog.c | 12 ++++++------ - plug-ins/common/file-gif-save.c | 4 ++-- - plug-ins/common/file-gih.c | 2 +- - plug-ins/common/file-mng.c | 6 +++--- - plug-ins/common/file-ps.c | 6 +++--- - plug-ins/common/file-psp.c | 2 +- - plug-ins/common/file-xmc.c | 4 ++-- - plug-ins/common/film.c | 2 +- - plug-ins/common/grid.c | 2 +- - plug-ins/common/iwarp.c | 6 +++--- - plug-ins/common/lens-flare.c | 2 +- - plug-ins/common/newsprint.c | 2 +- - plug-ins/common/nova.c | 2 +- - plug-ins/common/pixelize.c | 2 +- - plug-ins/common/red-eye-removal.c | 2 +- - plug-ins/common/rotate.c | 4 ++-- - plug-ins/common/smooth-palette.c | 2 +- - plug-ins/common/tile.c | 2 +- - plug-ins/common/warp.c | 6 +++--- - plug-ins/file-ico/ico-dialog.c | 10 +++++----- - plug-ins/file-ico/ico-save.c | 2 +- - plug-ins/file-jpeg/jpeg-save.c | 2 +- - plug-ins/file-psd/psd-load.c | 14 +++++++------- - plug-ins/file-psd/psd-save.c | 10 +++++----- + plug-ins/common/align-layers.c | 8 ++++---- + plug-ins/common/animation-optimize.c | 10 +++++----- + plug-ins/common/animation-play.c | 4 ++-- + plug-ins/common/color-cube-analyze.c | 4 ++-- + plug-ins/common/color-to-alpha.c | 2 +- + plug-ins/common/compose.c | 10 +++++----- + plug-ins/common/curve-bend.c | 18 +++++++++--------- + plug-ins/common/edge-dog.c | 12 ++++++------ + plug-ins/common/file-gif-save.c | 4 ++-- + plug-ins/common/file-gih.c | 2 +- + plug-ins/common/file-mng.c | 6 +++--- + plug-ins/common/file-ps.c | 6 +++--- + plug-ins/common/file-psp.c | 2 +- + plug-ins/common/file-xmc.c | 4 ++-- + plug-ins/common/film.c | 2 +- + plug-ins/common/grid.c | 2 +- + plug-ins/common/iwarp.c | 6 +++--- + plug-ins/common/lens-flare.c | 2 +- + plug-ins/common/newsprint.c | 2 +- + plug-ins/common/nova.c | 2 +- + plug-ins/common/pixelize.c | 2 +- + plug-ins/common/red-eye-removal.c | 2 +- + plug-ins/common/rotate.c | 4 ++-- + plug-ins/common/smooth-palette.c | 2 +- + plug-ins/common/tile.c | 2 +- + plug-ins/common/warp.c | 6 +++--- + plug-ins/file-ico/ico-dialog.c | 10 +++++----- + plug-ins/file-ico/ico-save.c | 2 +- + plug-ins/file-jpeg/jpeg-save.c | 2 +- + plug-ins/file-psd/psd-load.c | 14 +++++++------- + plug-ins/file-psd/psd-save.c | 10 +++++----- plug-ins/imagemap/imap_cmd_gimp_guides.c | 2 +- - plug-ins/imagemap/imap_preview.c | 2 +- - plug-ins/lighting/lighting-main.c | 4 ++-- - plug-ins/map-object/map-object-main.c | 4 ++-- - plug-ins/maze/maze.c | 2 +- - plug-ins/print/print-draw-page.c | 2 +- - plug-ins/print/print-preview.c | 2 +- - plug-ins/print/print.c | 8 ++++---- + plug-ins/imagemap/imap_preview.c | 2 +- + plug-ins/lighting/lighting-main.c | 4 ++-- + plug-ins/map-object/map-object-main.c | 4 ++-- + plug-ins/maze/maze.c | 2 +- + plug-ins/print/print-draw-page.c | 2 +- + plug-ins/print/print-preview.c | 2 +- + plug-ins/print/print.c | 8 ++++---- 40 files changed, 96 insertions(+), 96 deletions(-) commit ce9ea1e8d71e175ae31a2dbf285e6d28014eed99 Author: Michael Natterer -Date: Fri Jul 9 11:29:35 2010 +0200 +Date: Fri Jul 9 11:29:35 2010 +0200 libgimp: use item API instead of deprecated drawable API libgimp/gimpaspectpreview.c | 2 +- libgimp/gimpdrawable.c | 2 +- libgimp/gimpdrawablepreview.c | 4 ++-- - libgimp/gimpexport.c | 14 +++++++------- + libgimp/gimpexport.c | 14 +++++++------- libgimp/gimpzoompreview.c | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) commit 3c2dcf2df56d48b904dd814800af218fd5744b30 Author: Michael Natterer -Date: Fri Jul 9 11:25:35 2010 +0200 +Date: Fri Jul 9 11:25:35 2010 +0200 pdb: deprecate drawable API that got replaced by item API @@ -59867,7 +60712,7 @@ commit 056a3bf256b495fc7a21ec3b7bbe85a23f5aa4b1 Author: Michael Natterer -Date: Fri Jul 9 11:22:18 2010 +0200 +Date: Fri Jul 9 11:22:18 2010 +0200 libgimp: use gimp_item_get_name() instead of deprecated API @@ -59876,19 +60721,19 @@ commit 45a7484b6a433eb7ced21355716798235fd3e90d Author: Michael Natterer -Date: Fri Jul 9 10:36:52 2010 +0200 +Date: Fri Jul 9 10:36:52 2010 +0200 plug-ins: undeprecate after API deprecations plug-ins/common/file-tiff-save.c | 2 +- - plug-ins/gfig/gfig-dialog.c | 2 +- - plug-ins/gfig/gfig.c | 4 ++-- + plug-ins/gfig/gfig-dialog.c | 2 +- + plug-ins/gfig/gfig.c | 4 ++-- plug-ins/ifs-compose/ifs-compose.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) commit 7314d3fe4f760fab25dec4fb10580754367aa99a Author: Michael Natterer -Date: Fri Jul 9 10:36:17 2010 +0200 +Date: Fri Jul 9 10:36:17 2010 +0200 pdb: deprecate the drawable and vectors parasite APIs @@ -59902,7 +60747,7 @@ commit d0c80bae1232169c6aaa1166d2c267f9e426d044 Author: Michael Natterer -Date: Fri Jul 9 10:19:30 2010 +0200 +Date: Fri Jul 9 10:19:30 2010 +0200 pdb: add parasite API for items @@ -59916,17 +60761,17 @@ commit 79808c3d466647496cc645940dbe0fc227d1efd4 Author: Michael Natterer -Date: Fri Jul 9 10:11:32 2010 +0200 +Date: Fri Jul 9 10:11:32 2010 +0200 devel-docs: update for the addition of item - devel-docs/libgimp/libgimp-docs.sgml | 1 + + devel-docs/libgimp/libgimp-docs.sgml | 1 + devel-docs/libgimp/libgimp-sections.txt | 28 ++++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) commit 0fdf7c6e282cff93b58132636af4632271345c34 Author: Michael Natterer -Date: Fri Jul 9 10:10:55 2010 +0200 +Date: Fri Jul 9 10:10:55 2010 +0200 pdb: deprecate vectors API that is now in item @@ -59939,7 +60784,7 @@ commit 20c3dc0df9774c3566f915fe34c43c62f9f653e5 Author: Michael Natterer -Date: Fri Jul 9 09:46:31 2010 +0200 +Date: Fri Jul 9 09:46:31 2010 +0200 pdb: remove drawable's and vector's "lock-content" API @@ -59960,18 +60805,18 @@ commit 1bca2d8eb0672f911f4c69eb813f0f06a693b568 Author: Michael Natterer -Date: Fri Jul 9 09:45:30 2010 +0200 +Date: Fri Jul 9 09:45:30 2010 +0200 pdb: don't talk about "pixels" in items docs - app/pdb/item-cmds.c | 2 +- + app/pdb/item-cmds.c | 2 +- libgimp/gimpitem_pdb.c | 2 +- tools/pdbgen/pdb/item.pdb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit 2d6f808ff8f55b1d5517f0647bf3921e8ef84660 Author: Michael Natterer -Date: Fri Jul 9 09:34:44 2010 +0200 +Date: Fri Jul 9 09:34:44 2010 +0200 pdb: add a new PDB group "item" and move lots of functions to it @@ -59982,36 +60827,36 @@ change all protocol aware files accordingly and bump the protocol version number. Change script-fu to handle the new type. - app/pdb/Makefile.am | 1 + - app/pdb/gimp-pdb-compat.c | 9 +- - app/pdb/internal-procs.c | 3 +- - app/pdb/internal-procs.h | 1 + - app/pdb/item-cmds.c | 1115 + app/pdb/Makefile.am | 1 + + app/pdb/gimp-pdb-compat.c | 9 +- + app/pdb/internal-procs.c | 3 +- + app/pdb/internal-procs.h | 1 + + app/pdb/item-cmds.c | 1115 +++++++++++++++++++++++++++++++++++ - app/plug-in/plug-in-params.c | 8 +- - libgimp/Makefile.am | 2 + - libgimp/gimp.c | 6 +- - libgimp/gimp.h | 3 +- - libgimp/gimp_pdb.h | 1 + - libgimp/gimpenums.h | 9 - - libgimp/gimpitem_pdb.c | 661 +++++++++++++++++++++ - libgimp/gimpitem_pdb.h | 59 ++ - libgimpbase/gimpbaseenums.c | 4 +- - libgimpbase/gimpbaseenums.h | 5 +- - libgimpbase/gimpprotocol.c | 14 +- - libgimpbase/gimpprotocol.h | 5 +- - plug-ins/script-fu/scheme-wrapper.c | 60 +- - tools/pdbgen/Makefile.am | 1 + - tools/pdbgen/app.pl | 10 + - tools/pdbgen/enums.pl | 9 +- - tools/pdbgen/groups.pl | 1 + - tools/pdbgen/pdb.pl | 9 + - tools/pdbgen/pdb/item.pdb | 575 ++++++++++++++++++ + app/plug-in/plug-in-params.c | 8 +- + libgimp/Makefile.am | 2 + + libgimp/gimp.c | 6 +- + libgimp/gimp.h | 3 +- + libgimp/gimp_pdb.h | 1 + + libgimp/gimpenums.h | 9 - + libgimp/gimpitem_pdb.c | 661 +++++++++++++++++++++ + libgimp/gimpitem_pdb.h | 59 ++ + libgimpbase/gimpbaseenums.c | 4 +- + libgimpbase/gimpbaseenums.h | 5 +- + libgimpbase/gimpprotocol.c | 14 +- + libgimpbase/gimpprotocol.h | 5 +- + plug-ins/script-fu/scheme-wrapper.c | 60 +- + tools/pdbgen/Makefile.am | 1 + + tools/pdbgen/app.pl | 10 + + tools/pdbgen/enums.pl | 9 +- + tools/pdbgen/groups.pl | 1 + + tools/pdbgen/pdb.pl | 9 + + tools/pdbgen/pdb/item.pdb | 575 ++++++++++++++++++ 24 files changed, 2480 insertions(+), 91 deletions(-) commit d303d8c7c1168f8d988b83e0377e5a1b9ebe0adc Author: Michael Natterer -Date: Fri Jul 9 02:30:10 2010 +0200 +Date: Fri Jul 9 02:30:10 2010 +0200 Revert "pdb: Added a procedure to check how many processors GIMP is configured to use." @@ -60019,17 +60864,17 @@ This reverts commit b22880c32f599eb082c52d06a43d40a6615976ee. Adding this procedure was a misunderstanding on IRC. - app/pdb/gimprc-cmds.c | 51 + app/pdb/gimprc-cmds.c | 51 --------------------------------------------- - app/pdb/internal-procs.c | 2 +- + app/pdb/internal-procs.c | 2 +- libgimp/gimpgimprc_pdb.c | 34 ------------------------------ - libgimp/gimpgimprc_pdb.h | 1 - + libgimp/gimpgimprc_pdb.h | 1 - tools/pdbgen/pdb/gimprc.pdb | 40 +---------------------------------- 5 files changed, 2 insertions(+), 126 deletions(-) commit b22880c32f599eb082c52d06a43d40a6615976ee Author: Barak Itkin -Date: Fri Jul 9 02:31:07 2010 +0300 +Date: Fri Jul 9 02:31:07 2010 +0300 pdb: Added a procedure to check how many processors GIMP is configured to use. @@ -60038,17 +60883,17 @@ regenerated the other files using pdbgen. - app/pdb/gimprc-cmds.c | 51 + app/pdb/gimprc-cmds.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ - app/pdb/internal-procs.c | 2 +- + app/pdb/internal-procs.c | 2 +- libgimp/gimpgimprc_pdb.c | 34 ++++++++++++++++++++++++++++++ - libgimp/gimpgimprc_pdb.h | 1 + + libgimp/gimpgimprc_pdb.h | 1 + tools/pdbgen/pdb/gimprc.pdb | 40 ++++++++++++++++++++++++++++++++++- 5 files changed, 126 insertions(+), 2 deletions(-) commit fb6e561f3f4dffe3cc696692b1b91484f70eaabd Author: Sven Neumann -Date: Fri Jul 9 00:16:39 2010 +0200 +Date: Fri Jul 9 00:16:39 2010 +0200 app: update copyright, it's 2010 for a while now ... @@ -60057,7 +60902,7 @@ commit 31d7061e204412a774e5cc2c7006301e953bf46a Author: Michael Natterer -Date: Thu Jul 8 22:40:48 2010 +0200 +Date: Thu Jul 8 22:40:48 2010 +0200 app: remove "item_type" parameter from gimp_param_spec_item_id() @@ -60070,11 +60915,11 @@ commit 14b19ecce88ba5e654c5076d2002adb89f0dae6e Author: Michael Natterer -Date: Thu Jul 8 21:08:18 2010 +0200 +Date: Thu Jul 8 21:08:18 2010 +0200 app: add attached-to checks to all raise and lower functions - app/pdb/image-cmds.c | 50 + app/pdb/image-cmds.c | 50 ++++++++++++++++++++++++++++++++++++---------- tools/pdbgen/pdb/image.pdb | 50 ++++++++++++++++++++++++++++++++++++---------- @@ -60082,7 +60927,7 @@ commit 4097d3c300d4027f78a9d66f3090b13fcd7f8e0d Author: Michael Natterer -Date: Thu Jul 8 21:00:53 2010 +0200 +Date: Thu Jul 8 21:00:53 2010 +0200 app: add check that items passed through the PDB belong to the right image @@ -60091,40 +60936,40 @@ make sure the item is attached to that image, and not only attached to any image. Change wrappers to pass an image where it makes sense. - app/pdb/color-cmds.c | 32 + app/pdb/color-cmds.c | 32 ++++++++++++++--------------- - app/pdb/drawable-cmds.c | 10 ++++----- - app/pdb/drawable-transform-cmds.c | 32 + app/pdb/drawable-cmds.c | 10 ++++----- + app/pdb/drawable-transform-cmds.c | 32 ++++++++++++++--------------- - app/pdb/edit-cmds.c | 29 +++++++++++++------------- - app/pdb/floating-sel-cmds.c | 2 +- - app/pdb/gimppdb-utils.c | 14 ++++++++++++- - app/pdb/gimppdb-utils.h | 1 + - app/pdb/image-cmds.c | 10 ++++----- - app/pdb/layer-cmds.c | 10 ++++----- - app/pdb/paint-tools-cmds.c | 34 + app/pdb/edit-cmds.c | 29 +++++++++++++------------- + app/pdb/floating-sel-cmds.c | 2 +- + app/pdb/gimppdb-utils.c | 14 ++++++++++++- + app/pdb/gimppdb-utils.h | 1 + + app/pdb/image-cmds.c | 10 ++++----- + app/pdb/layer-cmds.c | 10 ++++----- + app/pdb/paint-tools-cmds.c | 34 +++++++++++++++---------------- - app/pdb/selection-cmds.c | 2 +- - app/pdb/text-tool-cmds.c | 4 ++-- - app/pdb/transform-tools-cmds.c | 12 +++++------ - tools/pdbgen/pdb/color.pdb | 32 + app/pdb/selection-cmds.c | 2 +- + app/pdb/text-tool-cmds.c | 4 ++-- + app/pdb/transform-tools-cmds.c | 12 +++++------ + tools/pdbgen/pdb/color.pdb | 32 ++++++++++++++--------------- - tools/pdbgen/pdb/drawable.pdb | 10 ++++----- + tools/pdbgen/pdb/drawable.pdb | 10 ++++----- tools/pdbgen/pdb/drawable_transform.pdb | 12 +++++------ - tools/pdbgen/pdb/edit.pdb | 29 +++++++++++++------------- - tools/pdbgen/pdb/floating_sel.pdb | 2 +- - tools/pdbgen/pdb/image.pdb | 10 ++++----- - tools/pdbgen/pdb/layer.pdb | 10 ++++----- - tools/pdbgen/pdb/paint_tools.pdb | 36 + tools/pdbgen/pdb/edit.pdb | 29 +++++++++++++------------- + tools/pdbgen/pdb/floating_sel.pdb | 2 +- + tools/pdbgen/pdb/image.pdb | 10 ++++----- + tools/pdbgen/pdb/layer.pdb | 10 ++++----- + tools/pdbgen/pdb/paint_tools.pdb | 36 ++++++++++++++++----------------- - tools/pdbgen/pdb/selection.pdb | 2 +- - tools/pdbgen/pdb/text_tool.pdb | 4 ++-- - tools/pdbgen/pdb/transform_tools.pdb | 12 +++++------ + tools/pdbgen/pdb/selection.pdb | 2 +- + tools/pdbgen/pdb/text_tool.pdb | 4 ++-- + tools/pdbgen/pdb/transform_tools.pdb | 12 +++++------ 24 files changed, 183 insertions(+), 168 deletions(-) commit 7609e3d8879f52916d2767c4b867be37187ee534 Author: Alexia Death -Date: Thu Jul 8 20:31:03 2010 +0300 +Date: Thu Jul 8 20:31:03 2010 +0300 app: Fix direction in path stroking @@ -60133,7 +60978,7 @@ commit e23e99e2ab5229f9629713f5d6f12e40b3eeab8f Author: Michael Natterer -Date: Thu Jul 8 18:10:33 2010 +0200 +Date: Thu Jul 8 18:10:33 2010 +0200 app: add missing translation context for undo descriptions @@ -60142,34 +60987,34 @@ commit 314a6ab92674595f5aea8736154a7a6dce639681 Author: Michael Natterer -Date: Thu Jul 8 18:08:13 2010 +0200 +Date: Thu Jul 8 18:08:13 2010 +0200 app: merge the layer, channel and vectors repositioning APIs into an API based on GimpItem. app/actions/channels-commands.c | 8 +- - app/actions/layers-commands.c | 8 +- + app/actions/layers-commands.c | 8 +- app/actions/vectors-commands.c | 8 +- - app/core/gimpchannel.c | 7 + - app/core/gimpimage.c | 431 + app/core/gimpchannel.c | 7 + + app/core/gimpimage.c | 431 +++++++++++--------------------------- - app/core/gimpimage.h | 68 ++---- - app/core/gimpitem.h | 9 + - app/core/gimplayer.c | 7 + - app/pdb/image-cmds.c | 20 +- - app/vectors/gimpvectors.c | 7 + + app/core/gimpimage.h | 68 ++---- + app/core/gimpitem.h | 9 + + app/core/gimplayer.c | 7 + + app/pdb/image-cmds.c | 20 +- + app/vectors/gimpvectors.c | 7 + app/widgets/gimpchanneltreeview.c | 2 - app/widgets/gimpitemtreeview.c | 14 +- app/widgets/gimpitemtreeview.h | 10 - app/widgets/gimplayertreeview.c | 2 - app/widgets/gimpvectorstreeview.c | 2 - - tools/pdbgen/pdb/image.pdb | 20 +- + tools/pdbgen/pdb/image.pdb | 20 +- 16 files changed, 205 insertions(+), 418 deletions(-) commit 70a3addcb993319b8b7b1f07d0c174657b781ed3 Author: Michael Natterer -Date: Thu Jul 8 15:06:19 2010 +0200 +Date: Thu Jul 8 15:06:19 2010 +0200 app: harden precondition checks in GimpItemTree @@ -60182,7 +61027,7 @@ commit 4a1078796ba2d7b03567760f806ded060bd87e61 Author: Andrew Wyatt -Date: Wed Jul 7 20:38:53 2010 +0200 +Date: Wed Jul 7 20:38:53 2010 +0200 Bug 613328 - TGA files saved with incorrect header yOrigin data @@ -60193,7 +61038,7 @@ commit ca43054f084fa81f5b40f29739cdb9611d012ccb Author: Massimo Valentini -Date: Wed Jul 7 20:29:06 2010 +0200 +Date: Wed Jul 7 20:29:06 2010 +0200 Bug 623290 - Save As... does not save Windows Bitmap as default in dialog @@ -60205,7 +61050,7 @@ commit 731fa3081d74440e0eea24ab56dd3b1d4002212c Author: Rupert Weber -Date: Sat Jul 3 12:57:41 2010 +0200 +Date: Sat Jul 3 12:57:41 2010 +0200 Bug 621363 - CMYK decompose broken @@ -60213,14 +61058,14 @@ for RGB<->CMYK conversions. This fix changes the plugin to use the conversion routines provided by libgimpcolorspace. - plug-ins/common/compose.c | 48 +++++++++------------ + plug-ins/common/compose.c | 48 +++++++++------------ plug-ins/common/decompose.c | 101 +++++++++++++++++++++++--------------------- 2 files changed, 75 insertions(+), 74 deletions(-) commit 999f00bd27b16a48ec94a9744d98fc6f1c68713a Author: Sven Neumann -Date: Wed Jul 7 19:25:14 2010 +0200 +Date: Wed Jul 7 19:25:14 2010 +0200 Bug 623186 - GIF save plugin chokes on layers larger than canvas @@ -60232,126 +61077,126 @@ commit c78e4c8d631fbe05f0ecbb4e01792fc48b9fa417 Author: Michael Natterer -Date: Wed Jul 7 11:48:10 2010 +0200 +Date: Wed Jul 7 11:48:10 2010 +0200 libgimp: move docs from template files to inline comments Also split up the "tools" docs into separate files so it matches the new autogenerated PDB section headers. - devel-docs/libgimp/.gitignore | 1 + - devel-docs/libgimp/libgimp-docs.sgml | 4 +- - devel-docs/libgimp/libgimp-sections.txt | 30 +- - devel-docs/libgimp/tmpl/.gitignore | 2 - - devel-docs/libgimp/tmpl/gimp.sgml | 466 ----------- + devel-docs/libgimp/.gitignore | 1 + + devel-docs/libgimp/libgimp-docs.sgml | 4 +- + devel-docs/libgimp/libgimp-sections.txt | 30 +- + devel-docs/libgimp/tmpl/.gitignore | 2 - + devel-docs/libgimp/tmpl/gimp.sgml | 466 ----------- devel-docs/libgimp/tmpl/gimpaspectpreview.sgml | 40 - - devel-docs/libgimp/tmpl/gimpbrush.sgml | 238 ------ - devel-docs/libgimp/tmpl/gimpbrushes.sgml | 124 --- - devel-docs/libgimp/tmpl/gimpbrushmenu.sgml | 54 -- - devel-docs/libgimp/tmpl/gimpbrushselect.sgml | 94 --- + devel-docs/libgimp/tmpl/gimpbrush.sgml | 238 ------ + devel-docs/libgimp/tmpl/gimpbrushes.sgml | 124 --- + devel-docs/libgimp/tmpl/gimpbrushmenu.sgml | 54 -- + devel-docs/libgimp/tmpl/gimpbrushselect.sgml | 94 --- devel-docs/libgimp/tmpl/gimpbrushselectbutton.sgml | 102 --- - devel-docs/libgimp/tmpl/gimpbuffer.sgml | 84 -- - devel-docs/libgimp/tmpl/gimpchannel.sgml | 124 --- - devel-docs/libgimp/tmpl/gimpcolor.sgml | 204 ----- - devel-docs/libgimp/tmpl/gimpcontext.sgml | 233 ------ - devel-docs/libgimp/tmpl/gimpconvert.sgml | 65 -- - devel-docs/libgimp/tmpl/gimpdisplay.sgml | 74 -- - devel-docs/libgimp/tmpl/gimpdrawable.sgml | 552 ------------- + devel-docs/libgimp/tmpl/gimpbuffer.sgml | 84 -- + devel-docs/libgimp/tmpl/gimpchannel.sgml | 124 --- + devel-docs/libgimp/tmpl/gimpcolor.sgml | 204 ----- + devel-docs/libgimp/tmpl/gimpcontext.sgml | 233 ------ + devel-docs/libgimp/tmpl/gimpconvert.sgml | 65 -- + devel-docs/libgimp/tmpl/gimpdisplay.sgml | 74 -- + devel-docs/libgimp/tmpl/gimpdrawable.sgml | 552 ------------- devel-docs/libgimp/tmpl/gimpdrawablepreview.sgml | 58 -- devel-docs/libgimp/tmpl/gimpdrawabletransform.sgml | 297 ------- - devel-docs/libgimp/tmpl/gimpedit.sgml | 193 ----- - devel-docs/libgimp/tmpl/gimpenums.sgml | 232 ------ - devel-docs/libgimp/tmpl/gimpexport.sgml | 86 --- - devel-docs/libgimp/tmpl/gimpfileops.sgml | 140 ---- - devel-docs/libgimp/tmpl/gimpfloatingsel.sgml | 77 -- - devel-docs/libgimp/tmpl/gimpfontmenu.sgml | 48 -- - devel-docs/libgimp/tmpl/gimpfonts.sgml | 37 - - devel-docs/libgimp/tmpl/gimpfontselect.sgml | 79 -- + devel-docs/libgimp/tmpl/gimpedit.sgml | 193 ----- + devel-docs/libgimp/tmpl/gimpenums.sgml | 232 ------ + devel-docs/libgimp/tmpl/gimpexport.sgml | 86 --- + devel-docs/libgimp/tmpl/gimpfileops.sgml | 140 ---- + devel-docs/libgimp/tmpl/gimpfloatingsel.sgml | 77 -- + devel-docs/libgimp/tmpl/gimpfontmenu.sgml | 48 -- + devel-docs/libgimp/tmpl/gimpfonts.sgml | 37 - + devel-docs/libgimp/tmpl/gimpfontselect.sgml | 79 -- devel-docs/libgimp/tmpl/gimpfontselectbutton.sgml | 72 -- - devel-docs/libgimp/tmpl/gimpgimprc.sgml | 89 --- - devel-docs/libgimp/tmpl/gimpgradient.sgml | 367 --------- - devel-docs/libgimp/tmpl/gimpgradientmenu.sgml | 48 -- - devel-docs/libgimp/tmpl/gimpgradients.sgml | 89 --- + devel-docs/libgimp/tmpl/gimpgimprc.sgml | 89 --- + devel-docs/libgimp/tmpl/gimpgradient.sgml | 367 --------- + devel-docs/libgimp/tmpl/gimpgradientmenu.sgml | 48 -- + devel-docs/libgimp/tmpl/gimpgradients.sgml | 89 --- devel-docs/libgimp/tmpl/gimpgradientselect.sgml | 83 -- .../libgimp/tmpl/gimpgradientselectbutton.sgml | 74 -- - devel-docs/libgimp/tmpl/gimpgrid.sgml | 122 --- - devel-docs/libgimp/tmpl/gimpguides.sgml | 80 -- - devel-docs/libgimp/tmpl/gimphelp.sgml | 30 - - devel-docs/libgimp/tmpl/gimpimage.sgml | 859 + devel-docs/libgimp/tmpl/gimpgrid.sgml | 122 --- + devel-docs/libgimp/tmpl/gimpguides.sgml | 80 -- + devel-docs/libgimp/tmpl/gimphelp.sgml | 30 - + devel-docs/libgimp/tmpl/gimpimage.sgml | 859 --------------------- devel-docs/libgimp/tmpl/gimpimagecombobox.sgml | 45 -- - devel-docs/libgimp/tmpl/gimpitemcombobox.sgml | 106 --- - devel-docs/libgimp/tmpl/gimplayer.sgml | 342 -------- - devel-docs/libgimp/tmpl/gimpmenu.sgml | 87 --- - devel-docs/libgimp/tmpl/gimpmessage.sgml | 46 -- - devel-docs/libgimp/tmpl/gimppalette.sgml | 222 ------ - devel-docs/libgimp/tmpl/gimppalettemenu.sgml | 48 -- - devel-docs/libgimp/tmpl/gimppalettes.sgml | 67 -- + devel-docs/libgimp/tmpl/gimpitemcombobox.sgml | 106 --- + devel-docs/libgimp/tmpl/gimplayer.sgml | 342 -------- + devel-docs/libgimp/tmpl/gimpmenu.sgml | 87 --- + devel-docs/libgimp/tmpl/gimpmessage.sgml | 46 -- + devel-docs/libgimp/tmpl/gimppalette.sgml | 222 ------ + devel-docs/libgimp/tmpl/gimppalettemenu.sgml | 48 -- + devel-docs/libgimp/tmpl/gimppalettes.sgml | 67 -- devel-docs/libgimp/tmpl/gimppaletteselect.sgml | 79 -- - .../libgimp/tmpl/gimppaletteselectbutton.sgml | 72 -- - devel-docs/libgimp/tmpl/gimppaths.sgml | 184 ----- - devel-docs/libgimp/tmpl/gimppattern.sgml | 45 -- - devel-docs/libgimp/tmpl/gimppatternmenu.sgml | 48 -- - devel-docs/libgimp/tmpl/gimppatterns.sgml | 71 -- + .../libgimp/tmpl/gimppaletteselectbutton.sgml | 72 -- + devel-docs/libgimp/tmpl/gimppaths.sgml | 184 ----- + devel-docs/libgimp/tmpl/gimppattern.sgml | 45 -- + devel-docs/libgimp/tmpl/gimppatternmenu.sgml | 48 -- + devel-docs/libgimp/tmpl/gimppatterns.sgml | 71 -- devel-docs/libgimp/tmpl/gimppatternselect.sgml | 83 -- - .../libgimp/tmpl/gimppatternselectbutton.sgml | 76 -- - devel-docs/libgimp/tmpl/gimppixbuf.sgml | 83 -- - devel-docs/libgimp/tmpl/gimppixelfetcher.sgml | 98 --- - devel-docs/libgimp/tmpl/gimppixelrgn.sgml | 190 ----- - devel-docs/libgimp/tmpl/gimpplugin.sgml | 88 --- + .../libgimp/tmpl/gimppatternselectbutton.sgml | 76 -- + devel-docs/libgimp/tmpl/gimppixbuf.sgml | 83 -- + devel-docs/libgimp/tmpl/gimppixelfetcher.sgml | 98 --- + devel-docs/libgimp/tmpl/gimppixelrgn.sgml | 190 ----- + devel-docs/libgimp/tmpl/gimpplugin.sgml | 88 --- devel-docs/libgimp/tmpl/gimpprocbrowserdialog.sgml | 61 -- - devel-docs/libgimp/tmpl/gimpproceduraldb.sgml | 138 ---- - devel-docs/libgimp/tmpl/gimpprocview.sgml | 39 - - devel-docs/libgimp/tmpl/gimpprogress.sgml | 187 ----- - devel-docs/libgimp/tmpl/gimpprogressbar.sgml | 34 - + devel-docs/libgimp/tmpl/gimpproceduraldb.sgml | 138 ---- + devel-docs/libgimp/tmpl/gimpprocview.sgml | 39 - + devel-docs/libgimp/tmpl/gimpprogress.sgml | 187 ----- + devel-docs/libgimp/tmpl/gimpprogressbar.sgml | 34 - devel-docs/libgimp/tmpl/gimpregioniterator.sgml | 155 ---- - devel-docs/libgimp/tmpl/gimpselectbutton.sgml | 33 - - devel-docs/libgimp/tmpl/gimpselection.sgml | 199 ----- - devel-docs/libgimp/tmpl/gimptextlayer.sgml | 314 -------- - devel-docs/libgimp/tmpl/gimptexttool.sgml | 102 --- - devel-docs/libgimp/tmpl/gimptile.sgml | 84 -- - devel-docs/libgimp/tmpl/gimptools.sgml | 466 ----------- - devel-docs/libgimp/tmpl/gimpui.sgml | 68 -- - devel-docs/libgimp/tmpl/gimpundo.sgml | 83 -- - devel-docs/libgimp/tmpl/gimpunit.sgml | 134 ---- - devel-docs/libgimp/tmpl/gimpvectors.sgml | 492 ------------ - devel-docs/libgimp/tmpl/gimpzoompreview.sgml | 93 --- - libgimp/gimp.c | 14 +- - libgimp/gimp.h | 27 +- - libgimp/gimpaspectpreview.c | 11 + - libgimp/gimpbrushmenu.c | 11 +- - libgimp/gimpbrushselectbutton.c | 9 + - libgimp/gimpdrawablepreview.c | 9 + - libgimp/gimpenums.h | 9 + - libgimp/gimpexport.c | 20 + - libgimp/gimpfontmenu.c | 11 +- - libgimp/gimpfontselectbutton.c | 9 + - libgimp/gimpgradientmenu.c | 11 +- - libgimp/gimpgradientselectbutton.c | 9 + - libgimp/gimpimagecombobox.c | 17 +- - libgimp/gimpitemcombobox.c | 10 + - libgimp/gimpmenu.c | 58 +- - libgimp/gimppalettemenu.c | 11 +- - libgimp/gimppaletteselectbutton.c | 9 + - libgimp/gimppatternmenu.c | 9 + - libgimp/gimppatternselectbutton.c | 9 + - libgimp/gimppixbuf.c | 9 + - libgimp/gimppixelfetcher.c | 15 +- - libgimp/gimppixelrgn.c | 10 + - libgimp/gimpprocbrowserdialog.c | 9 + - libgimp/gimpprocview.c | 10 + - libgimp/gimpprogress.c | 8 +- - libgimp/gimpprogressbar.c | 10 + - libgimp/gimpregioniterator.c | 11 + - libgimp/gimpselectbutton.c | 10 + - libgimp/gimptile.c | 9 + - libgimp/gimpui.c | 16 + - libgimp/gimpzoompreview.c | 14 + + devel-docs/libgimp/tmpl/gimpselectbutton.sgml | 33 - + devel-docs/libgimp/tmpl/gimpselection.sgml | 199 ----- + devel-docs/libgimp/tmpl/gimptextlayer.sgml | 314 -------- + devel-docs/libgimp/tmpl/gimptexttool.sgml | 102 --- + devel-docs/libgimp/tmpl/gimptile.sgml | 84 -- + devel-docs/libgimp/tmpl/gimptools.sgml | 466 ----------- + devel-docs/libgimp/tmpl/gimpui.sgml | 68 -- + devel-docs/libgimp/tmpl/gimpundo.sgml | 83 -- + devel-docs/libgimp/tmpl/gimpunit.sgml | 134 ---- + devel-docs/libgimp/tmpl/gimpvectors.sgml | 492 ------------ + devel-docs/libgimp/tmpl/gimpzoompreview.sgml | 93 --- + libgimp/gimp.c | 14 +- + libgimp/gimp.h | 27 +- + libgimp/gimpaspectpreview.c | 11 + + libgimp/gimpbrushmenu.c | 11 +- + libgimp/gimpbrushselectbutton.c | 9 + + libgimp/gimpdrawablepreview.c | 9 + + libgimp/gimpenums.h | 9 + + libgimp/gimpexport.c | 20 + + libgimp/gimpfontmenu.c | 11 +- + libgimp/gimpfontselectbutton.c | 9 + + libgimp/gimpgradientmenu.c | 11 +- + libgimp/gimpgradientselectbutton.c | 9 + + libgimp/gimpimagecombobox.c | 17 +- + libgimp/gimpitemcombobox.c | 10 + + libgimp/gimpmenu.c | 58 +- + libgimp/gimppalettemenu.c | 11 +- + libgimp/gimppaletteselectbutton.c | 9 + + libgimp/gimppatternmenu.c | 9 + + libgimp/gimppatternselectbutton.c | 9 + + libgimp/gimppixbuf.c | 9 + + libgimp/gimppixelfetcher.c | 15 +- + libgimp/gimppixelrgn.c | 10 + + libgimp/gimpprocbrowserdialog.c | 9 + + libgimp/gimpprocview.c | 10 + + libgimp/gimpprogress.c | 8 +- + libgimp/gimpprogressbar.c | 10 + + libgimp/gimpregioniterator.c | 11 + + libgimp/gimpselectbutton.c | 10 + + libgimp/gimptile.c | 9 + + libgimp/gimpui.c | 16 + + libgimp/gimpzoompreview.c | 14 + 107 files changed, 375 insertions(+), 10442 deletions(-) commit edbdd4a945a07716c3b00c353cecb234e49b351a Author: Michael Natterer -Date: Wed Jul 7 11:46:58 2010 +0200 +Date: Wed Jul 7 11:46:58 2010 +0200 app: one file in pdb/ got regenerated because of a doc fix @@ -60360,114 +61205,114 @@ commit 3a2cd14382d9f8c94aaf44a95bb443ad49785280 Author: Michael Natterer -Date: Wed Jul 7 11:43:10 2010 +0200 +Date: Wed Jul 7 11:43:10 2010 +0200 tools: add pdbgen support for generating gtk-doc SECTION comments Add the new $doc_title, $doc_short_desc and $doc_long_desc strings to all .pdb files. - libgimp/gimpbrush_pdb.c | 10 ++++++++++ - libgimp/gimpbrushes_pdb.c | 10 ++++++++++ - libgimp/gimpbrushselect_pdb.c | 10 ++++++++++ - libgimp/gimpbuffer_pdb.c | 10 ++++++++++ - libgimp/gimpchannel_pdb.c | 10 ++++++++++ - libgimp/gimpcolor_pdb.c | 10 ++++++++++ - libgimp/gimpcontext_pdb.c | 10 ++++++++++ - libgimp/gimpconvert_pdb.c | 10 ++++++++++ - libgimp/gimpdisplay_pdb.c | 10 ++++++++++ - libgimp/gimpdrawable_pdb.c | 10 ++++++++++ - libgimp/gimpdrawabletransform_pdb.c | 10 ++++++++++ - libgimp/gimpedit_pdb.c | 10 ++++++++++ - libgimp/gimpfileops_pdb.c | 10 ++++++++++ - libgimp/gimpfloatingsel_pdb.c | 10 ++++++++++ - libgimp/gimpfonts_pdb.c | 10 ++++++++++ - libgimp/gimpfontselect_pdb.c | 10 ++++++++++ - libgimp/gimpgimprc_pdb.c | 10 ++++++++++ - libgimp/gimpgradient_pdb.c | 10 ++++++++++ - libgimp/gimpgradients_pdb.c | 10 ++++++++++ - libgimp/gimpgradientselect_pdb.c | 10 ++++++++++ - libgimp/gimpgrid_pdb.c | 10 ++++++++++ - libgimp/gimpguides_pdb.c | 10 ++++++++++ - libgimp/gimphelp_pdb.c | 10 ++++++++++ - libgimp/gimpimage_pdb.c | 11 +++++++++++ - libgimp/gimplayer_pdb.c | 10 ++++++++++ - libgimp/gimpmessage_pdb.c | 10 ++++++++++ - libgimp/gimpmisc_pdb.c | 10 ++++++++++ - libgimp/gimppainttools_pdb.c | 10 ++++++++++ - libgimp/gimppalette_pdb.c | 10 ++++++++++ - libgimp/gimppalettes_pdb.c | 10 ++++++++++ - libgimp/gimppaletteselect_pdb.c | 10 ++++++++++ - libgimp/gimpparasite_pdb.c | 10 ++++++++++ - libgimp/gimppaths_pdb.c | 10 ++++++++++ - libgimp/gimppattern_pdb.c | 10 ++++++++++ - libgimp/gimppatterns_pdb.c | 10 ++++++++++ - libgimp/gimppatternselect_pdb.c | 10 ++++++++++ - libgimp/gimpplugin_pdb.c | 11 +++++++++++ - libgimp/gimpproceduraldb_pdb.c | 11 +++++++++++ - libgimp/gimpprogress_pdb.c | 10 ++++++++++ - libgimp/gimpselection_pdb.c | 10 ++++++++++ - libgimp/gimpselectiontools_pdb.c | 10 ++++++++++ - libgimp/gimptextlayer_pdb.c | 10 ++++++++++ - libgimp/gimptexttool_pdb.c | 10 ++++++++++ - libgimp/gimptransformtools_pdb.c | 10 ++++++++++ - libgimp/gimpundo_pdb.c | 10 ++++++++++ - libgimp/gimpunit_pdb.c | 11 +++++++++++ - libgimp/gimpvectors_pdb.c | 12 +++++++++++- - tools/pdbgen/lib.pl | 13 +++++++++++++ - tools/pdbgen/pdb/brush.pdb | 3 +++ - tools/pdbgen/pdb/brush_select.pdb | 3 +++ - tools/pdbgen/pdb/brushes.pdb | 3 +++ - tools/pdbgen/pdb/buffer.pdb | 3 +++ - tools/pdbgen/pdb/channel.pdb | 3 +++ - tools/pdbgen/pdb/color.pdb | 3 +++ - tools/pdbgen/pdb/context.pdb | 3 +++ - tools/pdbgen/pdb/convert.pdb | 3 +++ - tools/pdbgen/pdb/display.pdb | 3 +++ - tools/pdbgen/pdb/drawable.pdb | 3 +++ + libgimp/gimpbrush_pdb.c | 10 ++++++++++ + libgimp/gimpbrushes_pdb.c | 10 ++++++++++ + libgimp/gimpbrushselect_pdb.c | 10 ++++++++++ + libgimp/gimpbuffer_pdb.c | 10 ++++++++++ + libgimp/gimpchannel_pdb.c | 10 ++++++++++ + libgimp/gimpcolor_pdb.c | 10 ++++++++++ + libgimp/gimpcontext_pdb.c | 10 ++++++++++ + libgimp/gimpconvert_pdb.c | 10 ++++++++++ + libgimp/gimpdisplay_pdb.c | 10 ++++++++++ + libgimp/gimpdrawable_pdb.c | 10 ++++++++++ + libgimp/gimpdrawabletransform_pdb.c | 10 ++++++++++ + libgimp/gimpedit_pdb.c | 10 ++++++++++ + libgimp/gimpfileops_pdb.c | 10 ++++++++++ + libgimp/gimpfloatingsel_pdb.c | 10 ++++++++++ + libgimp/gimpfonts_pdb.c | 10 ++++++++++ + libgimp/gimpfontselect_pdb.c | 10 ++++++++++ + libgimp/gimpgimprc_pdb.c | 10 ++++++++++ + libgimp/gimpgradient_pdb.c | 10 ++++++++++ + libgimp/gimpgradients_pdb.c | 10 ++++++++++ + libgimp/gimpgradientselect_pdb.c | 10 ++++++++++ + libgimp/gimpgrid_pdb.c | 10 ++++++++++ + libgimp/gimpguides_pdb.c | 10 ++++++++++ + libgimp/gimphelp_pdb.c | 10 ++++++++++ + libgimp/gimpimage_pdb.c | 11 +++++++++++ + libgimp/gimplayer_pdb.c | 10 ++++++++++ + libgimp/gimpmessage_pdb.c | 10 ++++++++++ + libgimp/gimpmisc_pdb.c | 10 ++++++++++ + libgimp/gimppainttools_pdb.c | 10 ++++++++++ + libgimp/gimppalette_pdb.c | 10 ++++++++++ + libgimp/gimppalettes_pdb.c | 10 ++++++++++ + libgimp/gimppaletteselect_pdb.c | 10 ++++++++++ + libgimp/gimpparasite_pdb.c | 10 ++++++++++ + libgimp/gimppaths_pdb.c | 10 ++++++++++ + libgimp/gimppattern_pdb.c | 10 ++++++++++ + libgimp/gimppatterns_pdb.c | 10 ++++++++++ + libgimp/gimppatternselect_pdb.c | 10 ++++++++++ + libgimp/gimpplugin_pdb.c | 11 +++++++++++ + libgimp/gimpproceduraldb_pdb.c | 11 +++++++++++ + libgimp/gimpprogress_pdb.c | 10 ++++++++++ + libgimp/gimpselection_pdb.c | 10 ++++++++++ + libgimp/gimpselectiontools_pdb.c | 10 ++++++++++ + libgimp/gimptextlayer_pdb.c | 10 ++++++++++ + libgimp/gimptexttool_pdb.c | 10 ++++++++++ + libgimp/gimptransformtools_pdb.c | 10 ++++++++++ + libgimp/gimpundo_pdb.c | 10 ++++++++++ + libgimp/gimpunit_pdb.c | 11 +++++++++++ + libgimp/gimpvectors_pdb.c | 12 +++++++++++- + tools/pdbgen/lib.pl | 13 +++++++++++++ + tools/pdbgen/pdb/brush.pdb | 3 +++ + tools/pdbgen/pdb/brush_select.pdb | 3 +++ + tools/pdbgen/pdb/brushes.pdb | 3 +++ + tools/pdbgen/pdb/buffer.pdb | 3 +++ + tools/pdbgen/pdb/channel.pdb | 3 +++ + tools/pdbgen/pdb/color.pdb | 3 +++ + tools/pdbgen/pdb/context.pdb | 3 +++ + tools/pdbgen/pdb/convert.pdb | 3 +++ + tools/pdbgen/pdb/display.pdb | 3 +++ + tools/pdbgen/pdb/drawable.pdb | 3 +++ tools/pdbgen/pdb/drawable_transform.pdb | 3 +++ - tools/pdbgen/pdb/edit.pdb | 3 +++ - tools/pdbgen/pdb/fileops.pdb | 3 +++ - tools/pdbgen/pdb/floating_sel.pdb | 3 +++ - tools/pdbgen/pdb/font_select.pdb | 3 +++ - tools/pdbgen/pdb/fonts.pdb | 3 +++ - tools/pdbgen/pdb/gimprc.pdb | 3 +++ - tools/pdbgen/pdb/gradient.pdb | 3 +++ - tools/pdbgen/pdb/gradient_select.pdb | 3 +++ - tools/pdbgen/pdb/gradients.pdb | 3 +++ - tools/pdbgen/pdb/grid.pdb | 3 +++ - tools/pdbgen/pdb/guides.pdb | 3 +++ - tools/pdbgen/pdb/help.pdb | 3 +++ - tools/pdbgen/pdb/image.pdb | 3 +++ - tools/pdbgen/pdb/layer.pdb | 3 +++ - tools/pdbgen/pdb/message.pdb | 3 +++ - tools/pdbgen/pdb/misc.pdb | 3 +++ - tools/pdbgen/pdb/paint_tools.pdb | 3 +++ - tools/pdbgen/pdb/palette.pdb | 3 +++ - tools/pdbgen/pdb/palette_select.pdb | 3 +++ - tools/pdbgen/pdb/palettes.pdb | 3 +++ - tools/pdbgen/pdb/parasite.pdb | 3 +++ - tools/pdbgen/pdb/paths.pdb | 3 +++ - tools/pdbgen/pdb/pattern.pdb | 3 +++ - tools/pdbgen/pdb/pattern_select.pdb | 3 +++ - tools/pdbgen/pdb/patterns.pdb | 3 +++ - tools/pdbgen/pdb/plug_in.pdb | 3 +++ - tools/pdbgen/pdb/procedural_db.pdb | 3 +++ - tools/pdbgen/pdb/progress.pdb | 3 +++ - tools/pdbgen/pdb/selection.pdb | 3 +++ - tools/pdbgen/pdb/selection_tools.pdb | 3 +++ - tools/pdbgen/pdb/text_layer.pdb | 3 +++ - tools/pdbgen/pdb/text_tool.pdb | 3 +++ - tools/pdbgen/pdb/transform_tools.pdb | 3 +++ - tools/pdbgen/pdb/undo.pdb | 3 +++ - tools/pdbgen/pdb/unit.pdb | 4 ++++ - tools/pdbgen/pdb/vectors.pdb | 5 ++++- - tools/pdbgen/pdbgen.pl | 3 ++- + tools/pdbgen/pdb/edit.pdb | 3 +++ + tools/pdbgen/pdb/fileops.pdb | 3 +++ + tools/pdbgen/pdb/floating_sel.pdb | 3 +++ + tools/pdbgen/pdb/font_select.pdb | 3 +++ + tools/pdbgen/pdb/fonts.pdb | 3 +++ + tools/pdbgen/pdb/gimprc.pdb | 3 +++ + tools/pdbgen/pdb/gradient.pdb | 3 +++ + tools/pdbgen/pdb/gradient_select.pdb | 3 +++ + tools/pdbgen/pdb/gradients.pdb | 3 +++ + tools/pdbgen/pdb/grid.pdb | 3 +++ + tools/pdbgen/pdb/guides.pdb | 3 +++ + tools/pdbgen/pdb/help.pdb | 3 +++ + tools/pdbgen/pdb/image.pdb | 3 +++ + tools/pdbgen/pdb/layer.pdb | 3 +++ + tools/pdbgen/pdb/message.pdb | 3 +++ + tools/pdbgen/pdb/misc.pdb | 3 +++ + tools/pdbgen/pdb/paint_tools.pdb | 3 +++ + tools/pdbgen/pdb/palette.pdb | 3 +++ + tools/pdbgen/pdb/palette_select.pdb | 3 +++ + tools/pdbgen/pdb/palettes.pdb | 3 +++ + tools/pdbgen/pdb/parasite.pdb | 3 +++ + tools/pdbgen/pdb/paths.pdb | 3 +++ + tools/pdbgen/pdb/pattern.pdb | 3 +++ + tools/pdbgen/pdb/pattern_select.pdb | 3 +++ + tools/pdbgen/pdb/patterns.pdb | 3 +++ + tools/pdbgen/pdb/plug_in.pdb | 3 +++ + tools/pdbgen/pdb/procedural_db.pdb | 3 +++ + tools/pdbgen/pdb/progress.pdb | 3 +++ + tools/pdbgen/pdb/selection.pdb | 3 +++ + tools/pdbgen/pdb/selection_tools.pdb | 3 +++ + tools/pdbgen/pdb/text_layer.pdb | 3 +++ + tools/pdbgen/pdb/text_tool.pdb | 3 +++ + tools/pdbgen/pdb/transform_tools.pdb | 3 +++ + tools/pdbgen/pdb/undo.pdb | 3 +++ + tools/pdbgen/pdb/unit.pdb | 4 ++++ + tools/pdbgen/pdb/vectors.pdb | 5 ++++- + tools/pdbgen/pdbgen.pl | 3 ++- 96 files changed, 633 insertions(+), 3 deletions(-) commit 6739f6266c53799a3ef8f00677c8f64c4bd3a812 Author: Martin Nordholts -Date: Tue Jul 6 18:12:09 2010 +0200 +Date: Tue Jul 6 18:12:09 2010 +0200 Revert "app: Add alpha-to-selection shortcuts in tooltips" @@ -60479,7 +61324,7 @@ commit 9378b4292220cf0533e4a734296d8cbb7f9ce1c8 Author: Martin Nordholts -Date: Tue Jul 6 17:01:31 2010 +0200 +Date: Tue Jul 6 17:01:31 2010 +0200 app: Add alpha-to-selection shortcuts in tooltips @@ -60491,7 +61336,7 @@ commit 01113ffeee4cce5e81717b2fe935a52d15f62335 Author: Martin Nordholts -Date: Tue Jul 6 16:02:53 2010 +0200 +Date: Tue Jul 6 16:02:53 2010 +0200 app: Handle merge commits for git-version.h @@ -60510,7 +61355,7 @@ commit 9ddbc55a086a546b2967f16a2b51056e7cf57584 Author: Martin Nordholts -Date: Thu Jul 1 21:15:33 2010 +0200 +Date: Thu Jul 1 21:15:33 2010 +0200 libgimpbase: Disable gimp_wire_read() warning @@ -60525,168 +61370,168 @@ commit b3ee51794dd25c4817add305708d3d99ca27f6d2 Author: Michael Natterer -Date: Mon Jul 5 19:04:15 2010 +0200 +Date: Mon Jul 5 19:04:15 2010 +0200 libgimpwidgets: fix most gtk-doc warnings .../libgimpwidgets/libgimpwidgets-sections.txt | 1 + - libgimpwidgets/gimpcairo-utils.c | 4 +- - libgimpwidgets/gimpcellrenderertoggle.c | 6 +- - libgimpwidgets/gimpcolorbutton.c | 12 ++-- - libgimpwidgets/gimpcolorprofilestore.c | 4 +- - libgimpwidgets/gimpcolorselection.c | 4 +- - libgimpwidgets/gimpcolorselector.c | 4 +- - libgimpwidgets/gimpcontroller.h | 8 +++ - libgimpwidgets/gimpenumcombobox.c | 3 +- - libgimpwidgets/gimpenumwidgets.c | 82 + libgimpwidgets/gimpcairo-utils.c | 4 +- + libgimpwidgets/gimpcellrenderertoggle.c | 6 +- + libgimpwidgets/gimpcolorbutton.c | 12 ++-- + libgimpwidgets/gimpcolorprofilestore.c | 4 +- + libgimpwidgets/gimpcolorselection.c | 4 +- + libgimpwidgets/gimpcolorselector.c | 4 +- + libgimpwidgets/gimpcontroller.h | 8 +++ + libgimpwidgets/gimpenumcombobox.c | 3 +- + libgimpwidgets/gimpenumwidgets.c | 82 +++++++++++----------- - libgimpwidgets/gimpfileentry.c | 8 +-- - libgimpwidgets/gimpintstore.h | 12 ++++ - libgimpwidgets/gimpnumberpairentry.c | 4 ++ - libgimpwidgets/gimpnumberpairentry.h | 8 +-- - libgimpwidgets/gimppageselector.c | 11 +-- - libgimpwidgets/gimppreview.c | 8 +-- - libgimpwidgets/gimppropwidgets.c | 16 ++--- - libgimpwidgets/gimpquerybox.h | 4 +- - libgimpwidgets/gimpscaleentry.c | 2 +- - libgimpwidgets/gimpscaleentry.h | 10 +-- - libgimpwidgets/gimpsizeentry.c | 21 +++--- - libgimpwidgets/gimpstringcombobox.c | 2 +- - libgimpwidgets/gimpunitmenu.c | 2 +- - libgimpwidgets/gimpwidgets.c | 14 ++-- - libgimpwidgets/gimpwidgets.h | 10 +-- - libgimpwidgets/gimpwidgetsenums.h | 64 +++++++++++++++-- - libgimpwidgets/gimpzoommodel.c | 2 +- + libgimpwidgets/gimpfileentry.c | 8 +-- + libgimpwidgets/gimpintstore.h | 12 ++++ + libgimpwidgets/gimpnumberpairentry.c | 4 ++ + libgimpwidgets/gimpnumberpairentry.h | 8 +-- + libgimpwidgets/gimppageselector.c | 11 +-- + libgimpwidgets/gimppreview.c | 8 +-- + libgimpwidgets/gimppropwidgets.c | 16 ++--- + libgimpwidgets/gimpquerybox.h | 4 +- + libgimpwidgets/gimpscaleentry.c | 2 +- + libgimpwidgets/gimpscaleentry.h | 10 +-- + libgimpwidgets/gimpsizeentry.c | 21 +++--- + libgimpwidgets/gimpstringcombobox.c | 2 +- + libgimpwidgets/gimpunitmenu.c | 2 +- + libgimpwidgets/gimpwidgets.c | 14 ++-- + libgimpwidgets/gimpwidgets.h | 10 +-- + libgimpwidgets/gimpwidgetsenums.h | 64 +++++++++++++++-- + libgimpwidgets/gimpzoommodel.c | 2 +- 27 files changed, 202 insertions(+), 124 deletions(-) commit 1f7ff98c4529d80a73568afc181bc4e0ee170a5c Author: Michael Natterer -Date: Mon Jul 5 18:01:28 2010 +0200 +Date: Mon Jul 5 18:01:28 2010 +0200 libgimpwidgets: move docs from template files to inline comments but leave the template file for gimpstock there because its contents would be too much for gimpstock.h. - devel-docs/libgimpwidgets/tmpl/.gitignore | 50 +++ + devel-docs/libgimpwidgets/tmpl/.gitignore | 50 +++ devel-docs/libgimpwidgets/tmpl/gimpbrowser.sgml | 71 ---- devel-docs/libgimpwidgets/tmpl/gimpbutton.sgml | 52 --- - .../libgimpwidgets/tmpl/gimpcairo-utils.sgml | 91 ----- + .../libgimpwidgets/tmpl/gimpcairo-utils.sgml | 91 ----- .../libgimpwidgets/tmpl/gimpcellrenderercolor.sgml | 48 --- - .../tmpl/gimpcellrenderertoggle.sgml | 63 ---- - .../libgimpwidgets/tmpl/gimpchainbutton.sgml | 86 ----- + .../tmpl/gimpcellrenderertoggle.sgml | 63 ---- + .../libgimpwidgets/tmpl/gimpchainbutton.sgml | 86 ----- devel-docs/libgimpwidgets/tmpl/gimpcolorarea.sgml | 117 ------ - .../libgimpwidgets/tmpl/gimpcolorbutton.sgml | 126 ------- - .../libgimpwidgets/tmpl/gimpcolordisplay.sgml | 164 --------- + .../libgimpwidgets/tmpl/gimpcolorbutton.sgml | 126 ------- + .../libgimpwidgets/tmpl/gimpcolordisplay.sgml | 164 --------- .../libgimpwidgets/tmpl/gimpcolordisplaystack.sgml | 132 ------- .../libgimpwidgets/tmpl/gimpcolorhexentry.sgml | 58 --- .../libgimpwidgets/tmpl/gimpcolornotebook.sgml | 47 --- - .../tmpl/gimpcolorprofilecombobox.sgml | 84 ----- + .../tmpl/gimpcolorprofilecombobox.sgml | 84 ----- .../libgimpwidgets/tmpl/gimpcolorprofilestore.sgml | 49 --- devel-docs/libgimpwidgets/tmpl/gimpcolorscale.sgml | 54 --- - .../libgimpwidgets/tmpl/gimpcolorscales.sgml | 27 -- - .../libgimpwidgets/tmpl/gimpcolorselect.sgml | 29 -- + .../libgimpwidgets/tmpl/gimpcolorscales.sgml | 27 -- + .../libgimpwidgets/tmpl/gimpcolorselect.sgml | 29 -- .../libgimpwidgets/tmpl/gimpcolorselection.sgml | 124 ------- .../libgimpwidgets/tmpl/gimpcolorselector.sgml | 159 --------- devel-docs/libgimpwidgets/tmpl/gimpcontroller.sgml | 134 ------- devel-docs/libgimpwidgets/tmpl/gimpdialog.sgml | 112 ------ - .../libgimpwidgets/tmpl/gimpenumcombobox.sgml | 57 --- + .../libgimpwidgets/tmpl/gimpenumcombobox.sgml | 57 --- devel-docs/libgimpwidgets/tmpl/gimpenumlabel.sgml | 44 --- devel-docs/libgimpwidgets/tmpl/gimpenumstore.sgml | 81 ----- - .../libgimpwidgets/tmpl/gimpenumwidgets.sgml | 113 ------ + .../libgimpwidgets/tmpl/gimpenumwidgets.sgml | 113 ------ devel-docs/libgimpwidgets/tmpl/gimpfileentry.sgml | 79 ----- - devel-docs/libgimpwidgets/tmpl/gimpframe.sgml | 44 --- + devel-docs/libgimpwidgets/tmpl/gimpframe.sgml | 44 --- devel-docs/libgimpwidgets/tmpl/gimphelpui.sgml | 117 ------ devel-docs/libgimpwidgets/tmpl/gimphintbox.sgml | 28 -- - .../libgimpwidgets/tmpl/gimpintcombobox.sgml | 133 ------- + .../libgimpwidgets/tmpl/gimpintcombobox.sgml | 133 ------- devel-docs/libgimpwidgets/tmpl/gimpintstore.sgml | 61 ---- - .../libgimpwidgets/tmpl/gimpmemsizeentry.sgml | 63 ---- + .../libgimpwidgets/tmpl/gimpmemsizeentry.sgml | 63 ---- .../libgimpwidgets/tmpl/gimpnumberpairentry.sgml | 232 ------------ devel-docs/libgimpwidgets/tmpl/gimpoffsetarea.sgml | 73 ---- devel-docs/libgimpwidgets/tmpl/gimpoldwidgets.sgml | 122 ------- - .../libgimpwidgets/tmpl/gimppageselector.sgml | 213 ----------- + .../libgimpwidgets/tmpl/gimppageselector.sgml | 213 ----------- devel-docs/libgimpwidgets/tmpl/gimppatheditor.sgml | 121 ------- devel-docs/libgimpwidgets/tmpl/gimppickbutton.sgml | 43 --- devel-docs/libgimpwidgets/tmpl/gimppixmap.sgml | 55 --- devel-docs/libgimpwidgets/tmpl/gimppreview.sgml | 169 --------- - .../libgimpwidgets/tmpl/gimppreviewarea.sgml | 149 -------- - .../libgimpwidgets/tmpl/gimppropwidgets.sgml | 383 + .../libgimpwidgets/tmpl/gimppreviewarea.sgml | 149 -------- + .../libgimpwidgets/tmpl/gimppropwidgets.sgml | 383 -------------------- devel-docs/libgimpwidgets/tmpl/gimpquerybox.sgml | 196 ---------- - devel-docs/libgimpwidgets/tmpl/gimpruler.sgml | 127 ------- + devel-docs/libgimpwidgets/tmpl/gimpruler.sgml | 127 ------- .../libgimpwidgets/tmpl/gimpscrolledpreview.sgml | 61 ---- devel-docs/libgimpwidgets/tmpl/gimpsizeentry.sgml | 285 --------------- - devel-docs/libgimpwidgets/tmpl/gimpstock.sgml | 15 +- + devel-docs/libgimpwidgets/tmpl/gimpstock.sgml | 15 +- .../libgimpwidgets/tmpl/gimpstringcombobox.sgml | 70 ---- devel-docs/libgimpwidgets/tmpl/gimpunitmenu.sgml | 100 ------ devel-docs/libgimpwidgets/tmpl/gimpwidgets.sgml | 394 --------------------- devel-docs/libgimpwidgets/tmpl/gimpzoommodel.sgml | 140 -------- - libgimpwidgets/gimpbrowser.c | 9 + - libgimpwidgets/gimpbutton.c | 19 + - libgimpwidgets/gimpbutton.h | 2 +- - libgimpwidgets/gimpcairo-utils.c | 10 + - libgimpwidgets/gimpcellrenderercolor.c | 9 + - libgimpwidgets/gimpcellrenderertoggle.c | 10 + - libgimpwidgets/gimpchainbutton.c | 22 ++ - libgimpwidgets/gimpcolorarea.c | 10 + - libgimpwidgets/gimpcolorbutton.c | 16 + - libgimpwidgets/gimpcolordisplay.c | 11 + - libgimpwidgets/gimpcolordisplaystack.c | 10 + - libgimpwidgets/gimpcolorhexentry.c | 9 + - libgimpwidgets/gimpcolornotebook.c | 11 + - libgimpwidgets/gimpcolorprofilecombobox.c | 9 + - libgimpwidgets/gimpcolorprofilestore.c | 9 + - libgimpwidgets/gimpcolorscale.c | 9 + - libgimpwidgets/gimpcolorscales.c | 11 + - libgimpwidgets/gimpcolorselect.c | 14 + - libgimpwidgets/gimpcolorselection.c | 9 + - libgimpwidgets/gimpcolorselector.c | 11 + - libgimpwidgets/gimpcolorselector.h | 17 +- - libgimpwidgets/gimpcontroller.c | 10 + - libgimpwidgets/gimpdialog.c | 11 + - libgimpwidgets/gimpenumcombobox.c | 9 + - libgimpwidgets/gimpenumlabel.c | 9 + - libgimpwidgets/gimpenumstore.c | 9 + - libgimpwidgets/gimpenumwidgets.c | 10 + - libgimpwidgets/gimpfileentry.c | 24 ++ - libgimpwidgets/gimpframe.c | 10 + - libgimpwidgets/gimphelpui.c | 11 + - libgimpwidgets/gimphelpui.h | 7 + - libgimpwidgets/gimphintbox.c | 9 + - libgimpwidgets/gimpintcombobox.c | 10 + - libgimpwidgets/gimpintstore.c | 10 + - libgimpwidgets/gimpmemsizeentry.c | 12 + - libgimpwidgets/gimpmemsizeentry.h | 1 + - libgimpwidgets/gimpnumberpairentry.c | 9 + - libgimpwidgets/gimpoffsetarea.c | 9 + - libgimpwidgets/gimpoldwidgets.c | 11 + - libgimpwidgets/gimppageselector.c | 10 + - libgimpwidgets/gimppatheditor.c | 21 ++ - libgimpwidgets/gimppickbutton.c | 18 + - libgimpwidgets/gimppixmap.c | 18 + - libgimpwidgets/gimppreview.c | 11 + - libgimpwidgets/gimppreviewarea.c | 10 + - libgimpwidgets/gimppropwidgets.c | 9 + - libgimpwidgets/gimpquerybox.c | 21 ++ - libgimpwidgets/gimpquerybox.h | 49 ++- - libgimpwidgets/gimpruler.c | 9 + - libgimpwidgets/gimpscaleentry.h | 34 +- - libgimpwidgets/gimpscrolledpreview.c | 10 + - libgimpwidgets/gimpsizeentry.c | 29 ++ - libgimpwidgets/gimpstock.c | 16 + - libgimpwidgets/gimpstringcombobox.c | 9 + - libgimpwidgets/gimpunitmenu.c | 21 ++ - libgimpwidgets/gimpwidgets.c | 11 + - libgimpwidgets/gimpwidgets.h | 29 +- - libgimpwidgets/gimpwidgetsenums.h | 13 + - libgimpwidgets/gimpwidgetstypes.h | 20 ++ - libgimpwidgets/gimpzoommodel.c | 9 + + libgimpwidgets/gimpbrowser.c | 9 + + libgimpwidgets/gimpbutton.c | 19 + + libgimpwidgets/gimpbutton.h | 2 +- + libgimpwidgets/gimpcairo-utils.c | 10 + + libgimpwidgets/gimpcellrenderercolor.c | 9 + + libgimpwidgets/gimpcellrenderertoggle.c | 10 + + libgimpwidgets/gimpchainbutton.c | 22 ++ + libgimpwidgets/gimpcolorarea.c | 10 + + libgimpwidgets/gimpcolorbutton.c | 16 + + libgimpwidgets/gimpcolordisplay.c | 11 + + libgimpwidgets/gimpcolordisplaystack.c | 10 + + libgimpwidgets/gimpcolorhexentry.c | 9 + + libgimpwidgets/gimpcolornotebook.c | 11 + + libgimpwidgets/gimpcolorprofilecombobox.c | 9 + + libgimpwidgets/gimpcolorprofilestore.c | 9 + + libgimpwidgets/gimpcolorscale.c | 9 + + libgimpwidgets/gimpcolorscales.c | 11 + + libgimpwidgets/gimpcolorselect.c | 14 + + libgimpwidgets/gimpcolorselection.c | 9 + + libgimpwidgets/gimpcolorselector.c | 11 + + libgimpwidgets/gimpcolorselector.h | 17 +- + libgimpwidgets/gimpcontroller.c | 10 + + libgimpwidgets/gimpdialog.c | 11 + + libgimpwidgets/gimpenumcombobox.c | 9 + + libgimpwidgets/gimpenumlabel.c | 9 + + libgimpwidgets/gimpenumstore.c | 9 + + libgimpwidgets/gimpenumwidgets.c | 10 + + libgimpwidgets/gimpfileentry.c | 24 ++ + libgimpwidgets/gimpframe.c | 10 + + libgimpwidgets/gimphelpui.c | 11 + + libgimpwidgets/gimphelpui.h | 7 + + libgimpwidgets/gimphintbox.c | 9 + + libgimpwidgets/gimpintcombobox.c | 10 + + libgimpwidgets/gimpintstore.c | 10 + + libgimpwidgets/gimpmemsizeentry.c | 12 + + libgimpwidgets/gimpmemsizeentry.h | 1 + + libgimpwidgets/gimpnumberpairentry.c | 9 + + libgimpwidgets/gimpoffsetarea.c | 9 + + libgimpwidgets/gimpoldwidgets.c | 11 + + libgimpwidgets/gimppageselector.c | 10 + + libgimpwidgets/gimppatheditor.c | 21 ++ + libgimpwidgets/gimppickbutton.c | 18 + + libgimpwidgets/gimppixmap.c | 18 + + libgimpwidgets/gimppreview.c | 11 + + libgimpwidgets/gimppreviewarea.c | 10 + + libgimpwidgets/gimppropwidgets.c | 9 + + libgimpwidgets/gimpquerybox.c | 21 ++ + libgimpwidgets/gimpquerybox.h | 49 ++- + libgimpwidgets/gimpruler.c | 9 + + libgimpwidgets/gimpscaleentry.h | 34 +- + libgimpwidgets/gimpscrolledpreview.c | 10 + + libgimpwidgets/gimpsizeentry.c | 29 ++ + libgimpwidgets/gimpstock.c | 16 + + libgimpwidgets/gimpstringcombobox.c | 9 + + libgimpwidgets/gimpunitmenu.c | 21 ++ + libgimpwidgets/gimpwidgets.c | 11 + + libgimpwidgets/gimpwidgets.h | 29 +- + libgimpwidgets/gimpwidgetsenums.h | 13 + + libgimpwidgets/gimpwidgetstypes.h | 20 ++ + libgimpwidgets/gimpzoommodel.c | 9 + 112 files changed, 845 insertions(+), 5595 deletions(-) commit 597b255262230e7e52a4961bb5443e7bb9968c11 Author: Mukund Sivaraman -Date: Sun Jul 4 22:13:33 2010 +0530 +Date: Sun Jul 4 22:13:33 2010 +0530 Update Desaturate tool's status text @@ -60697,7 +61542,7 @@ commit 6bfe88ae17f02190145a2d65679db66632143052 Author: Tor Lillqvist -Date: Mon Jul 5 09:59:34 2010 +0300 +Date: Mon Jul 5 09:59:34 2010 +0300 script-fu build fix for Windows @@ -60706,41 +61551,41 @@ commit 8efe98649e0dceaf2bb3bf66cd6f5ba818df73af Author: Michael Natterer -Date: Fri Jul 2 16:01:40 2010 +0200 +Date: Fri Jul 2 16:01:40 2010 +0200 libgimpthumb: fix all gtk-doc warnings, and reach 100% doc coverage, yay! libgimpthumb/gimpthumb-enums.h | 4 ++-- libgimpthumb/gimpthumb-utils.c | 10 +++++----- - libgimpthumb/gimpthumbnail.c | 2 ++ - libgimpthumb/gimpthumbnail.h | 6 ++++++ + libgimpthumb/gimpthumbnail.c | 2 ++ + libgimpthumb/gimpthumbnail.h | 6 ++++++ 4 files changed, 15 insertions(+), 7 deletions(-) commit 58dbc8d8390e1c1773fdfad3e3e794e837140643 Author: Michael Natterer -Date: Fri Jul 2 15:53:20 2010 +0200 +Date: Fri Jul 2 15:53:20 2010 +0200 libgimpthumb: move docs from template files to inline comments - devel-docs/libgimpthumb/.gitignore | 1 + - devel-docs/libgimpthumb/tmpl/.gitignore | 2 - + devel-docs/libgimpthumb/.gitignore | 1 + + devel-docs/libgimpthumb/tmpl/.gitignore | 2 - devel-docs/libgimpthumb/tmpl/gimpthumb-enums.sgml | 54 ------ devel-docs/libgimpthumb/tmpl/gimpthumb-error.sgml | 44 ----- devel-docs/libgimpthumb/tmpl/gimpthumb-utils.sgml | 127 ------------- devel-docs/libgimpthumb/tmpl/gimpthumbnail.sgml | 216 ---------------------- - libgimpthumb/gimpthumb-enums.h | 42 +++++ - libgimpthumb/gimpthumb-error.c | 9 + - libgimpthumb/gimpthumb-error.h | 20 +- - libgimpthumb/gimpthumb-utils.c | 9 + - libgimpthumb/gimpthumbnail.c | 9 + - libgimpthumb/gimpthumbnail.h | 1 + + libgimpthumb/gimpthumb-enums.h | 42 +++++ + libgimpthumb/gimpthumb-error.c | 9 + + libgimpthumb/gimpthumb-error.h | 20 +- + libgimpthumb/gimpthumb-utils.c | 9 + + libgimpthumb/gimpthumbnail.c | 9 + + libgimpthumb/gimpthumbnail.h | 1 + 12 files changed, 88 insertions(+), 446 deletions(-) commit 9d80d8a7cde17474a75b8a5307408f85c08995c8 Author: Michael Natterer -Date: Fri Jul 2 14:48:24 2010 +0200 +Date: Fri Jul 2 14:48:24 2010 +0200 libgimpmath: fix all gtk-doc warnings @@ -60750,54 +61595,54 @@ commit 2ce4075eebe146aff4ea9f77faf80d408a2d64aa Author: Michael Natterer -Date: Fri Jul 2 14:41:35 2010 +0200 +Date: Fri Jul 2 14:41:35 2010 +0200 libgimpmath: move docs from template files to inline comments - devel-docs/libgimpmath/.gitignore | 1 + - devel-docs/libgimpmath/tmpl/.gitignore | 2 - - devel-docs/libgimpmath/tmpl/gimpmath.sgml | 78 ----- + devel-docs/libgimpmath/.gitignore | 1 + + devel-docs/libgimpmath/tmpl/.gitignore | 2 - + devel-docs/libgimpmath/tmpl/gimpmath.sgml | 78 ----- devel-docs/libgimpmath/tmpl/gimpmatrix.sgml | 268 ---------------- - devel-docs/libgimpmath/tmpl/gimpmd5.sgml | 29 -- + devel-docs/libgimpmath/tmpl/gimpmd5.sgml | 29 -- devel-docs/libgimpmath/tmpl/gimpvector.sgml | 482 ---------------------------- - libgimpmath/gimpmath.h | 63 +++- - libgimpmath/gimpmatrix.c | 18 ++ - libgimpmath/gimpmatrix.h | 18 ++ - libgimpmath/gimpmd5.c | 9 + - libgimpmath/gimpvector.c | 10 + - libgimpmath/gimpvector.h | 24 ++ + libgimpmath/gimpmath.h | 63 +++- + libgimpmath/gimpmatrix.c | 18 ++ + libgimpmath/gimpmatrix.h | 18 ++ + libgimpmath/gimpmd5.c | 9 + + libgimpmath/gimpvector.c | 10 + + libgimpmath/gimpvector.h | 24 ++ 12 files changed, 135 insertions(+), 867 deletions(-) commit a5e28dec575890bf802d92bb2fff08c6fd0d9a73 Author: Michael Natterer -Date: Tue Jun 29 22:40:11 2010 +0200 +Date: Tue Jun 29 22:40:11 2010 +0200 libgimpmodule: fix some gtk-doc warnings devel-docs/libgimpmodule/libgimpmodule-sections.txt | 2 ++ - libgimpmodule/gimpmodule.c | 6 +++--- + libgimpmodule/gimpmodule.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) commit fcc0a5a42471ab8cd8682e034edb7fc94410d9f0 Author: Michael Natterer -Date: Tue Jun 29 22:35:34 2010 +0200 +Date: Tue Jun 29 22:35:34 2010 +0200 libgimpmodule: move docs from templates to inline comments - devel-docs/libgimpmodule/.gitignore | 1 + - devel-docs/libgimpmodule/tmpl/.gitignore | 2 - - devel-docs/libgimpmodule/tmpl/gimpmodule.sgml | 217 + devel-docs/libgimpmodule/.gitignore | 1 + + devel-docs/libgimpmodule/tmpl/.gitignore | 2 - + devel-docs/libgimpmodule/tmpl/gimpmodule.sgml | 217 ------------------------ devel-docs/libgimpmodule/tmpl/gimpmoduledb.sgml | 94 ---------- - libgimpmodule/gimpmodule.c | 11 ++ - libgimpmodule/gimpmodule.h | 100 +++++++++-- - libgimpmodule/gimpmoduledb.c | 10 ++ + libgimpmodule/gimpmodule.c | 11 ++ + libgimpmodule/gimpmodule.h | 100 +++++++++-- + libgimpmodule/gimpmoduledb.c | 10 ++ 7 files changed, 107 insertions(+), 328 deletions(-) commit 1330ca2ea8daefcc73b7e5c7b61f36ffe7850c62 Author: Alexandre Prokoudine -Date: Thu Jul 1 18:22:38 2010 +0400 +Date: Thu Jul 1 18:22:38 2010 +0400 Translation fix by suggestion from Terion @@ -60806,7 +61651,7 @@ commit 1ab08ade9f037907dbaa32b53656e228ec163734 Author: Alexandre Prokoudine -Date: Wed Jun 30 19:46:06 2010 +0400 +Date: Wed Jun 30 19:46:06 2010 +0400 A fix to Russian translation at shimon's suggestion @@ -60815,57 +61660,57 @@ commit 945641232edb3dcefdc82747158c97fdabb6c15a Author: Michael Natterer -Date: Tue Jun 29 22:19:11 2010 +0200 +Date: Tue Jun 29 22:19:11 2010 +0200 libgimpconfig: fix a lot of gtk-doc warnings - devel-docs/libgimpconfig/libgimpconfig-sections.txt | 3 +++ - devel-docs/libgimpconfig/libgimpconfig.types | 1 + - libgimpconfig/gimpconfig-deserialize.c | 4 ++-- - libgimpconfig/gimpconfig-error.h | 20 + devel-docs/libgimpconfig/libgimpconfig-sections.txt | 3 +++ + devel-docs/libgimpconfig/libgimpconfig.types | 1 + + libgimpconfig/gimpconfig-deserialize.c | 4 ++-- + libgimpconfig/gimpconfig-error.h | 20 +++++++++++++++----- - libgimpconfig/gimpconfig-iface.c | 20 + libgimpconfig/gimpconfig-iface.c | 20 ++++++++++---------- - libgimpconfig/gimpconfig-path.c | 6 +++--- - libgimpconfig/gimpconfig-serialize.c | 2 +- - libgimpconfig/gimpconfigtypes.h | 1 + + libgimpconfig/gimpconfig-path.c | 6 +++--- + libgimpconfig/gimpconfig-serialize.c | 2 +- + libgimpconfig/gimpconfigtypes.h | 1 + 8 files changed, 36 insertions(+), 21 deletions(-) commit 1af54c7874db63810b57204fad8813bf2d8ee3b5 Author: Michael Natterer -Date: Tue Jun 29 20:57:52 2010 +0200 +Date: Tue Jun 29 20:57:52 2010 +0200 libgimpconfig: move docs from template files to inline comments - devel-docs/libgimpconfig/.gitignore | 1 + - devel-docs/libgimpconfig/tmpl/.gitignore | 2 - + devel-docs/libgimpconfig/.gitignore | 1 + + devel-docs/libgimpconfig/tmpl/.gitignore | 2 - devel-docs/libgimpconfig/tmpl/gimpcolorconfig.sgml | 110 --------- .../libgimpconfig/tmpl/gimpconfig-deserialize.sgml | 42 ---- - .../libgimpconfig/tmpl/gimpconfig-error.sgml | 45 ---- - .../libgimpconfig/tmpl/gimpconfig-iface.sgml | 142 ----------- - .../libgimpconfig/tmpl/gimpconfig-params.sgml | 275 + .../libgimpconfig/tmpl/gimpconfig-error.sgml | 45 ---- + .../libgimpconfig/tmpl/gimpconfig-iface.sgml | 142 ----------- + .../libgimpconfig/tmpl/gimpconfig-params.sgml | 275 --------------------- devel-docs/libgimpconfig/tmpl/gimpconfig-path.sgml | 98 -------- .../libgimpconfig/tmpl/gimpconfig-serialize.sgml | 73 ------ - .../libgimpconfig/tmpl/gimpconfig-utils.sgml | 68 ----- + .../libgimpconfig/tmpl/gimpconfig-utils.sgml | 68 ----- devel-docs/libgimpconfig/tmpl/gimpconfigtypes.sgml | 28 --- - .../libgimpconfig/tmpl/gimpconfigwriter.sgml | 166 ------------- + .../libgimpconfig/tmpl/gimpconfigwriter.sgml | 166 ------------- devel-docs/libgimpconfig/tmpl/gimpscanner.sgml | 139 ----------- - libgimpconfig/gimpcolorconfig.c | 9 + - libgimpconfig/gimpconfig-deserialize.c | 9 + - libgimpconfig/gimpconfig-error.c | 9 + - libgimpconfig/gimpconfig-iface.c | 9 + - libgimpconfig/gimpconfig-params.h | 9 + - libgimpconfig/gimpconfig-path.c | 9 + - libgimpconfig/gimpconfig-serialize.c | 9 + - libgimpconfig/gimpconfig-utils.c | 9 + - libgimpconfig/gimpconfigwriter.c | 10 + - libgimpconfig/gimpscanner.c | 9 + + libgimpconfig/gimpcolorconfig.c | 9 + + libgimpconfig/gimpconfig-deserialize.c | 9 + + libgimpconfig/gimpconfig-error.c | 9 + + libgimpconfig/gimpconfig-iface.c | 9 + + libgimpconfig/gimpconfig-params.h | 9 + + libgimpconfig/gimpconfig-path.c | 9 + + libgimpconfig/gimpconfig-serialize.c | 9 + + libgimpconfig/gimpconfig-utils.c | 9 + + libgimpconfig/gimpconfigwriter.c | 10 + + libgimpconfig/gimpscanner.c | 9 + 23 files changed, 92 insertions(+), 1188 deletions(-) commit e74989282be765e7b0f75e5b37a183872bd66601 Author: Sven Neumann -Date: Tue Jun 29 20:11:53 2010 +0200 +Date: Tue Jun 29 20:11:53 2010 +0200 data: add 2.6 splash screen to the splash screen gallery @@ -60874,131 +61719,131 @@ commit 7b335188b64432c7bf81e7d84d887ca2a9a289c4 Author: Michael Natterer -Date: Tue Jun 29 20:08:39 2010 +0200 +Date: Tue Jun 29 20:08:39 2010 +0200 libgimpcolor: fix most gtk-doc warnings libgimpcolor/gimpadaptivesupersample.c | 2 +- - libgimpcolor/gimpbilinear.c | 2 +- - libgimpcolor/gimpcmyk.c | 2 +- - libgimpcolor/gimpcolormanaged.c | 2 +- - libgimpcolor/gimpcolorspace.c | 2 +- - libgimpcolor/gimpcolortypes.h | 43 +++++++++++++++++++++++++++++ - libgimpcolor/gimphsv.c | 2 +- - libgimpcolor/gimprgb.c | 50 + libgimpcolor/gimpbilinear.c | 2 +- + libgimpcolor/gimpcmyk.c | 2 +- + libgimpcolor/gimpcolormanaged.c | 2 +- + libgimpcolor/gimpcolorspace.c | 2 +- + libgimpcolor/gimpcolortypes.h | 43 +++++++++++++++++++++++++++++ + libgimpcolor/gimphsv.c | 2 +- + libgimpcolor/gimprgb.c | 50 +++++++++++++++++----------------- 8 files changed, 74 insertions(+), 31 deletions(-) commit 1649241483a951c5df9410cf92653ff18b0137d3 Author: Michael Natterer -Date: Tue Jun 29 19:46:37 2010 +0200 +Date: Tue Jun 29 19:46:37 2010 +0200 libgimpcolor: move docs from template files to inline comments Only added section headers for now, there was nothing else in the template files. - devel-docs/libgimpcolor/.gitignore | 1 + - devel-docs/libgimpcolor/tmpl/.gitignore | 2 - + devel-docs/libgimpcolor/.gitignore | 1 + + devel-docs/libgimpcolor/tmpl/.gitignore | 2 - .../libgimpcolor/tmpl/gimpadaptivesupersample.sgml | 72 ---- devel-docs/libgimpcolor/tmpl/gimpbilinear.sgml | 98 ----- - devel-docs/libgimpcolor/tmpl/gimpcmyk.sgml | 112 ----- + devel-docs/libgimpcolor/tmpl/gimpcmyk.sgml | 112 ----- devel-docs/libgimpcolor/tmpl/gimpcolormanaged.sgml | 52 --- devel-docs/libgimpcolor/tmpl/gimpcolorspace.sgml | 194 --------- - devel-docs/libgimpcolor/tmpl/gimphsv.sgml | 95 ----- - devel-docs/libgimpcolor/tmpl/gimprgb.sgml | 451 + devel-docs/libgimpcolor/tmpl/gimphsv.sgml | 95 ----- + devel-docs/libgimpcolor/tmpl/gimprgb.sgml | 451 --------------------- - libgimpcolor/gimpadaptivesupersample.c | 10 + - libgimpcolor/gimpbilinear.c | 9 + - libgimpcolor/gimpcmyk.c | 9 + - libgimpcolor/gimpcolormanaged.c | 9 + - libgimpcolor/gimpcolorspace.c | 13 + - libgimpcolor/gimphsv.c | 9 + - libgimpcolor/gimprgb.c | 9 + + libgimpcolor/gimpadaptivesupersample.c | 10 + + libgimpcolor/gimpbilinear.c | 9 + + libgimpcolor/gimpcmyk.c | 9 + + libgimpcolor/gimpcolormanaged.c | 9 + + libgimpcolor/gimpcolorspace.c | 13 + + libgimpcolor/gimphsv.c | 9 + + libgimpcolor/gimprgb.c | 9 + 16 files changed, 69 insertions(+), 1076 deletions(-) commit 48f54d50f19a988683bdf2e03e17e096708acac2 Author: Michael Natterer -Date: Tue Jun 29 19:18:52 2010 +0200 +Date: Tue Jun 29 19:18:52 2010 +0200 devel-docs: really remove the template files devel-docs/libgimpbase/tmpl/gimpbaseenums.sgml | 397 ------------------------ devel-docs/libgimpbase/tmpl/gimpbasetypes.sgml | 112 ------- - devel-docs/libgimpbase/tmpl/gimpchecks.sgml | 60 ---- - devel-docs/libgimpbase/tmpl/gimpcpuaccel.sgml | 53 ---- + devel-docs/libgimpbase/tmpl/gimpchecks.sgml | 60 ---- + devel-docs/libgimpbase/tmpl/gimpcpuaccel.sgml | 53 ---- devel-docs/libgimpbase/tmpl/gimpdatafiles.sgml | 64 ---- - devel-docs/libgimpbase/tmpl/gimpenv.sgml | 140 --------- - devel-docs/libgimpbase/tmpl/gimplimits.sgml | 57 ---- - devel-docs/libgimpbase/tmpl/gimpmemsize.sgml | 95 ------ - devel-docs/libgimpbase/tmpl/gimpparam.sgml | 50 --- - devel-docs/libgimpbase/tmpl/gimpparasite.sgml | 243 --------------- + devel-docs/libgimpbase/tmpl/gimpenv.sgml | 140 --------- + devel-docs/libgimpbase/tmpl/gimplimits.sgml | 57 ---- + devel-docs/libgimpbase/tmpl/gimpmemsize.sgml | 95 ------ + devel-docs/libgimpbase/tmpl/gimpparam.sgml | 50 --- + devel-docs/libgimpbase/tmpl/gimpparasite.sgml | 243 --------------- devel-docs/libgimpbase/tmpl/gimpparasiteio.sgml | 73 ----- devel-docs/libgimpbase/tmpl/gimprectangle.sgml | 61 ---- - devel-docs/libgimpbase/tmpl/gimpsignal.sgml | 41 --- - devel-docs/libgimpbase/tmpl/gimpunit.sgml | 216 ------------- - devel-docs/libgimpbase/tmpl/gimputils.sgml | 168 ---------- - devel-docs/libgimpbase/tmpl/gimpversion.sgml | 92 ------ + devel-docs/libgimpbase/tmpl/gimpsignal.sgml | 41 --- + devel-docs/libgimpbase/tmpl/gimpunit.sgml | 216 ------------- + devel-docs/libgimpbase/tmpl/gimputils.sgml | 168 ---------- + devel-docs/libgimpbase/tmpl/gimpversion.sgml | 92 ------ 16 files changed, 1922 deletions(-) commit 3411c7b63a7d3e25118e19dc74568c69f630e3c5 Author: Michael Natterer -Date: Tue Jun 29 19:13:40 2010 +0200 +Date: Tue Jun 29 19:13:40 2010 +0200 libgimpbase: move docs from template files to inline comments and remove all template files. Also fixed all gtk-doc warnings and fixed/added some docs. - configure.ac | 40 +++++++++++++++++ - devel-docs/libgimpbase/.gitignore | 1 + + configure.ac | 40 +++++++++++++++++ + devel-docs/libgimpbase/.gitignore | 1 + devel-docs/libgimpbase/libgimpbase-sections.txt | 3 ++ - devel-docs/libgimpbase/tmpl/.gitignore | 2 - + devel-docs/libgimpbase/tmpl/.gitignore | 2 - devel-docs/libgimpbase/tmpl/gimpbaseenums.sgml | 7 ++- devel-docs/libgimpbase/tmpl/gimpbasetypes.sgml | 7 ++- - devel-docs/libgimpbase/tmpl/gimpchecks.sgml | 17 ++++---- - devel-docs/libgimpbase/tmpl/gimpcpuaccel.sgml | 4 ++ + devel-docs/libgimpbase/tmpl/gimpchecks.sgml | 17 ++++---- + devel-docs/libgimpbase/tmpl/gimpcpuaccel.sgml | 4 ++ devel-docs/libgimpbase/tmpl/gimpdatafiles.sgml | 7 ++- - devel-docs/libgimpbase/tmpl/gimpenv.sgml | 14 ++++-- - devel-docs/libgimpbase/tmpl/gimplimits.sgml | 26 ++++------- - devel-docs/libgimpbase/tmpl/gimpmemsize.sgml | 9 ++-- - devel-docs/libgimpbase/tmpl/gimpparam.sgml | 13 +++--- - devel-docs/libgimpbase/tmpl/gimpparasite.sgml | 9 ++-- + devel-docs/libgimpbase/tmpl/gimpenv.sgml | 14 ++++-- + devel-docs/libgimpbase/tmpl/gimplimits.sgml | 26 ++++------- + devel-docs/libgimpbase/tmpl/gimpmemsize.sgml | 9 ++-- + devel-docs/libgimpbase/tmpl/gimpparam.sgml | 13 +++--- + devel-docs/libgimpbase/tmpl/gimpparasite.sgml | 9 ++-- devel-docs/libgimpbase/tmpl/gimpparasiteio.sgml | 26 +++++++++-- devel-docs/libgimpbase/tmpl/gimprectangle.sgml | 3 ++ - devel-docs/libgimpbase/tmpl/gimpsignal.sgml | 16 +++---- - devel-docs/libgimpbase/tmpl/gimpunit.sgml | 39 +++++++++++++---- - devel-docs/libgimpbase/tmpl/gimputils.sgml | 5 ++- - devel-docs/libgimpbase/tmpl/gimpversion.sgml | 10 ++--- - libgimpbase/gimpbaseenums.h | 9 ++++ - libgimpbase/gimpbasetypes.c | 23 +++++++--- - libgimpbase/gimpbasetypes.h | 18 ++++++++ - libgimpbase/gimpchecks.c | 10 +++++ - libgimpbase/gimpchecks.h | 37 ++++++++++++---- - libgimpbase/gimpcpuaccel.c | 9 ++++ - libgimpbase/gimpdatafiles.c | 9 ++++ - libgimpbase/gimpdatafiles.h | 13 ++++++ - libgimpbase/gimpenv.c | 10 +++++ - libgimpbase/gimplimits.h | 57 + devel-docs/libgimpbase/tmpl/gimpsignal.sgml | 16 +++---- + devel-docs/libgimpbase/tmpl/gimpunit.sgml | 39 +++++++++++++---- + devel-docs/libgimpbase/tmpl/gimputils.sgml | 5 ++- + devel-docs/libgimpbase/tmpl/gimpversion.sgml | 10 ++--- + libgimpbase/gimpbaseenums.h | 9 ++++ + libgimpbase/gimpbasetypes.c | 23 +++++++--- + libgimpbase/gimpbasetypes.h | 18 ++++++++ + libgimpbase/gimpchecks.c | 10 +++++ + libgimpbase/gimpchecks.h | 37 ++++++++++++---- + libgimpbase/gimpcpuaccel.c | 9 ++++ + libgimpbase/gimpdatafiles.c | 9 ++++ + libgimpbase/gimpdatafiles.h | 13 ++++++ + libgimpbase/gimpenv.c | 10 +++++ + libgimpbase/gimplimits.h | 57 ++++++++++++++++++++++--- - libgimpbase/gimpmemsize.c | 9 ++++ - libgimpbase/gimpmemsize.h | 8 ++-- - libgimpbase/gimpparam.h | 32 +++++++++++++- - libgimpbase/gimpparasite.c | 13 ++++++ - libgimpbase/gimpparasiteio.c | 12 ++++++ - libgimpbase/gimpparasiteio.h | 6 ++- - libgimpbase/gimprectangle.c | 9 ++++ - libgimpbase/gimpsignal.c | 10 +++++ - libgimpbase/gimpsignal.h | 14 ++++-- - libgimpbase/gimpunit.c | 22 ++++++++-- - libgimpbase/gimpunit.h | 10 +++-- - libgimpbase/gimputils.c | 11 ++++- + libgimpbase/gimpmemsize.c | 9 ++++ + libgimpbase/gimpmemsize.h | 8 ++-- + libgimpbase/gimpparam.h | 32 +++++++++++++- + libgimpbase/gimpparasite.c | 13 ++++++ + libgimpbase/gimpparasiteio.c | 12 ++++++ + libgimpbase/gimpparasiteio.h | 6 ++- + libgimpbase/gimprectangle.c | 9 ++++ + libgimpbase/gimpsignal.c | 10 +++++ + libgimpbase/gimpsignal.h | 14 ++++-- + libgimpbase/gimpunit.c | 22 ++++++++-- + libgimpbase/gimpunit.h | 10 +++-- + libgimpbase/gimputils.c | 11 ++++- 42 files changed, 496 insertions(+), 113 deletions(-) commit 81925e424bf8efb998ea74105ce682e89525b96b Author: Martin Nordholts -Date: Tue Jun 29 18:45:52 2010 +0200 +Date: Tue Jun 29 18:45:52 2010 +0200 app/tests: Prepare test-core.c for other tests @@ -61007,7 +61852,7 @@ commit a09d428c7eff6a5f73fb2dde1487c552db190f19 Author: Ulf-D. Ehlert -Date: Tue Jun 29 18:11:27 2010 +0200 +Date: Tue Jun 29 18:11:27 2010 +0200 po: Minor fixes to German translations @@ -61016,7 +61861,7 @@ commit 6ba7aff8e98621341b9f52bbe14eee730fa3de87 Author: Marco Ciampa -Date: Tue Jun 29 18:08:10 2010 +0200 +Date: Tue Jun 29 18:08:10 2010 +0200 Little fix in italian translation. @@ -61025,31 +61870,28 @@ commit dd059635d4a20fed1fc402cc2950e472a280fc2b Author: Martin Nordholts -Date: Tue Jun 29 18:08:34 2010 +0200 +Date: Tue Jun 29 18:08:34 2010 +0200 app/tests: Rename test-layers to test-core Rename test-layers to test-core so we can put more tests there, like color processing algorithm tests for example. - app/tests/.gitignore | 2 +- - app/tests/Makefile.am | 2 +- - app/tests/test-core.c | 189 - ++++++++++++++++++++++++++++++++++++++++++++++++ - app/tests/test-layers.c | 189 - ------------------------------------------------ - 4 files changed, 191 insertions(+), 191 deletions(-) + app/tests/.gitignore | 2 +- + app/tests/Makefile.am | 2 +- + app/tests/{test-layers.c => test-core.c} | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) commit 04538534fc581de0507ef2ec1148853ff1e96dbe Author: Nils Philippsen -Date: Tue Jun 29 15:43:31 2010 +0200 +Date: Tue Jun 29 15:43:31 2010 +0200 Bug 623045 - script-fu: make server IPv6 aware use getnameinfo() instead of inet_ntoa() use two sockets for IPv4, IPv6 - configure.ac | 8 +- + configure.ac | 8 +- plug-ins/script-fu/script-fu-server.c | 141 ++++++++++++++++++++++++++-------- plug-ins/script-fu/servertest.py | 76 ++++++++++++------ @@ -61057,7 +61899,7 @@ commit ded69c41a7109eb46136fa21a33d2e4a57f1e7e5 Author: Marco Ciampa -Date: Tue Jun 29 12:04:16 2010 +0200 +Date: Tue Jun 29 12:04:16 2010 +0200 Small fix in italian translation. @@ -61066,7 +61908,7 @@ commit 36594d676be92a2fba5e09711745fe672b2746cf Author: Michael Natterer -Date: Tue Jun 29 10:01:53 2010 +0200 +Date: Tue Jun 29 10:01:53 2010 +0200 Bump version to 2.7.2 @@ -61075,7 +61917,7 @@ commit f42870648d4a720638fa397096259a152ddba1db Author: Michael Natterer -Date: Tue Jun 29 00:25:32 2010 +0200 +Date: Tue Jun 29 00:25:32 2010 +0200 app: link ../gimp-debug.o into test-config @@ -61084,7 +61926,7 @@ commit 5476b8bdb0247cb7d0ef62cbf444acd3fad42836 Author: Simon Budig -Date: Mon Jun 28 23:47:51 2010 +0200 +Date: Mon Jun 28 23:47:51 2010 +0200 new splash, now scaled to the correct size @@ -61093,7 +61935,7 @@ commit 9084fd4316e8b10e47fbad046dc8b08d443936fc Author: Simon Budig -Date: Mon Jun 28 23:07:41 2010 +0200 +Date: Mon Jun 28 23:07:41 2010 +0200 new splash for the devel version, using the LGM switchboard photo from tml. @@ -61103,7 +61945,7 @@ commit f432563be3535121c5f4a3ed3de43ecbcf7dd2c9 Author: Martin Nordholts -Date: Mon Jun 28 21:55:03 2010 +0200 +Date: Mon Jun 28 21:55:03 2010 +0200 And AUTHORS... @@ -61112,7 +61954,7 @@ commit 47afc71ae2bd166b861469936dc76c10e7757b22 Author: Martin Nordholts -Date: Mon Jun 28 21:38:14 2010 +0200 +Date: Mon Jun 28 21:38:14 2010 +0200 Update authors.xml for 2.7.1 @@ -61121,7 +61963,7 @@ commit c59d956d1b20d0fda82a1b873e00596a57348b8f Author: Martin Nordholts -Date: Mon Jun 28 18:34:47 2010 +0200 +Date: Mon Jun 28 18:34:47 2010 +0200 Update NEWS for 2.7.1 @@ -61132,7 +61974,7 @@ commit fad6053643482e222e246c2db828182b4f2a8c7f Author: Michael Natterer -Date: Mon Jun 28 12:23:31 2010 +0200 +Date: Mon Jun 28 12:23:31 2010 +0200 Make cairo code work with newer cairo backends that actually use caching @@ -61142,16 +61984,16 @@ pixels directly, so we don't read old pixels, and our written pixels get actually used. - app/text/gimptextlayer.c | 2 ++ - app/widgets/gimpviewrenderer.c | 4 ++++ + app/text/gimptextlayer.c | 2 ++ + app/widgets/gimpviewrenderer.c | 4 ++++ app/widgets/gimpviewrenderergradient.c | 4 ++++ - app/widgets/gimpviewrendererpalette.c | 4 ++++ - libgimpwidgets/gimpcairo-utils.c | 4 ++++ + app/widgets/gimpviewrendererpalette.c | 4 ++++ + libgimpwidgets/gimpcairo-utils.c | 4 ++++ 5 files changed, 18 insertions(+) commit d2fd8a8dc8d0e7197825fbe02bbe291ee8406146 Author: Michael Natterer -Date: Mon Jun 28 00:13:19 2010 +0200 +Date: Mon Jun 28 00:13:19 2010 +0200 app: don't call gimp_cell_renderer_viewable_pre_clicked() on a NULL cell @@ -61161,7 +62003,7 @@ commit 706900c4f6e9d669b7c8be2065decf49a9898620 Author: Martin Nordholts -Date: Sun Jun 27 21:44:29 2010 +0200 +Date: Sun Jun 27 21:44:29 2010 +0200 Bug 589010 - Don't make Alt-Clicked layers active @@ -61170,18 +62012,18 @@ GimpLayerTreeView to this signal and if a layer is Alt-Clicked, don't go ahead and make the layer active. Also add a test for this use case. - app/core/gimpmarshal.list | 1 + - app/tests/test-ui.c | 61 +++++++++++---- + app/core/gimpmarshal.list | 1 + + app/tests/test-ui.c | 61 +++++++++++---- app/widgets/gimpcellrendererviewable.c | 53 +++++++++++++ app/widgets/gimpcellrendererviewable.h | 22 ++++-- - app/widgets/gimpcontainertreeview.c | 13 +++- - app/widgets/gimplayertreeview.c | 138 + app/widgets/gimpcontainertreeview.c | 13 +++- + app/widgets/gimplayertreeview.c | 138 ++++++++++++++++++++------------- 6 files changed, 206 insertions(+), 82 deletions(-) commit 2b78572604ce5c7d16df837dff984c7615aa3fa2 Author: Michael Natterer -Date: Sun Jun 27 21:39:30 2010 +0200 +Date: Sun Jun 27 21:39:30 2010 +0200 po-tags: fix charset to fix the build @@ -61190,18 +62032,18 @@ commit 0092d6cc16c9c9c9aa053d068f3496b434e94f0a Author: Marco Ciampa -Date: Sun Jun 27 18:20:45 2010 +0200 +Date: Sun Jun 27 18:20:45 2010 +0200 Updated italian translation po-plug-ins/it.po | 18 +++++++++--------- po-tags/LINGUAS | 1 + - po-tags/it.po | 24 ++++++++++++++++++++++++ + po-tags/it.po | 24 ++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 9 deletions(-) commit d7baa20c34e04162fd6829d9b0caa5012380a8ea Author: Fernando Correia -Date: Sun Jun 27 15:15:15 2010 +0100 +Date: Sun Jun 27 15:15:15 2010 +0100 Updated Portuguese translation @@ -61211,7 +62053,7 @@ commit b85a1efceecf16731defa044e00ab2f1bb0f0609 Author: Fernando Correia -Date: Sun Jun 27 14:53:26 2010 +0100 +Date: Sun Jun 27 14:53:26 2010 +0100 Updated Portuguese translation @@ -61221,7 +62063,7 @@ commit 4471f0ea4b2f17d07421de989152308d0972a1c4 Author: Martin Nordholts -Date: Sun Jun 27 14:10:59 2010 +0200 +Date: Sun Jun 27 14:10:59 2010 +0200 Bug 622683 - file export defaults to the wrong directory / folder @@ -61233,7 +62075,7 @@ commit 66e2866a78671ec220cf43075d3e6fbe4600445b Author: Martin Nordholts -Date: Sun Jun 27 13:16:36 2010 +0200 +Date: Sun Jun 27 13:16:36 2010 +0200 app/tests: Make "create_new_image_via_dialog" result more useful @@ -61245,7 +62087,7 @@ commit d8f8acdff3c1fe28d1f05f36cf3c33eb7fa5b102 Author: Martin Nordholts -Date: Sun Jun 27 12:41:20 2010 +0200 +Date: Sun Jun 27 12:41:20 2010 +0200 app/tests: Add convenience macro GIMP_PAUSE() @@ -61254,7 +62096,7 @@ commit 0258461c9f1d1a40a582272dbc8d4254997ab1f2 Author: Martin Nordholts -Date: Sun Jun 27 11:51:44 2010 +0200 +Date: Sun Jun 27 11:51:44 2010 +0200 app: Format widgets/gimpcellrendererviewable.h @@ -61266,18 +62108,18 @@ commit 1a9eb3e9235f9ed8bcab9502769b25580fd33576 Author: Martin Nordholts -Date: Sun Jun 27 11:08:42 2010 +0200 +Date: Sun Jun 27 11:08:42 2010 +0200 app/tests: Use gtk_test_init() app/tests/test-session-management.c | 4 +--- - app/tests/test-ui.c | 4 +--- - app/tests/test-xcf.c | 4 +--- + app/tests/test-ui.c | 4 +--- + app/tests/test-xcf.c | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) commit 8d0fe6fc4a969cb4a42e7a4cc9aa57cd282b79cf Author: Martin Nordholts -Date: Sun Jun 27 10:47:30 2010 +0200 +Date: Sun Jun 27 10:47:30 2010 +0200 app/tests: Output session management test result @@ -61289,20 +62131,20 @@ commit bbfb4b13dfe7a587a3cc5631824f000ffcb6b9ad Author: Martin Nordholts -Date: Sun Jun 27 10:43:58 2010 +0200 +Date: Sun Jun 27 10:43:58 2010 +0200 app/tests: Add "gimp-single-image-window" entry to sessionrc Add "gimp-single-image-window" entry to sessionrc. Makes the UI test behave a bit more nicely. - app/tests/gimpdir/sessionrc | 4 ++++ + app/tests/gimpdir/sessionrc | 4 ++++ app/tests/gimpdir/sessionrc-expected | 4 ++++ 2 files changed, 8 insertions(+) commit 3f0b473680a909c1dc3bbdb543ec6af7dc720a00 Author: Martin Nordholts -Date: Sun Jun 27 10:29:49 2010 +0200 +Date: Sun Jun 27 10:29:49 2010 +0200 app: Don't use actions for Alt-Click on layer @@ -61317,7 +62159,7 @@ commit aeed966943827bb11b7b149defea27cf2dc72506 Author: Martin Nordholts -Date: Sat Jun 26 21:59:17 2010 +0200 +Date: Sat Jun 26 21:59:17 2010 +0200 app: Format widgets/gimplayertreeview.c function prototypes @@ -61330,7 +62172,7 @@ commit a5c0d74599281841d96cfd45de0ec9f5757312b4 Author: Martin Nordholts -Date: Sat Jun 26 21:22:04 2010 +0200 +Date: Sat Jun 26 21:22:04 2010 +0200 app/tests: Merge some tests @@ -61339,16 +62181,16 @@ "gimp-layer-groups/add_layer" which we already have in "gimp-layers". And we can have layer group tests there too. - app/tests/Makefile.am | 2 - + app/tests/Makefile.am | 2 - app/tests/test-layer-grouping.c | 138 ------------------------------------- - app/tests/test-ui.c | 41 +++++++++++ + app/tests/test-ui.c | 41 +++++++++++ app/tests/test-window-management.c | 120 -------------------------------- 4 files changed, 41 insertions(+), 260 deletions(-) commit 7670ae7e87b8bd40c674d2815eef5bc38ba76958 Author: Martin Nordholts -Date: Sat Jun 26 19:02:03 2010 +0200 +Date: Sat Jun 26 19:02:03 2010 +0200 app/tests: Add alt_click_is_layer_to_selection @@ -61358,15 +62200,15 @@ Change sessionrc to have only one page in the GimpDockbook to avoid problems with gtk_test_find_widget(). - app/tests/gimpdir/sessionrc | 6 +-- + app/tests/gimpdir/sessionrc | 6 +-- app/tests/gimpdir/sessionrc-expected | 6 +-- - app/tests/test-ui.c | 98 + app/tests/test-ui.c | 98 ++++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+), 8 deletions(-) commit 1c72e5e406fbb663a322e147a74ad50585ea408c Author: Martin Nordholts -Date: Fri Jun 25 13:40:03 2010 +0200 +Date: Fri Jun 25 13:40:03 2010 +0200 app/tests: Make gimp_ui_find_dock_window() more generic @@ -61375,7 +62217,7 @@ commit 15fd08747de7bfac29dd13550109c58f484bdb7a Author: Michael Natterer -Date: Sun Jun 27 01:55:21 2010 +0200 +Date: Sun Jun 27 01:55:21 2010 +0200 Bug 595170 - brush - color from gradient works wrong in greyscale @@ -61386,7 +62228,7 @@ commit 2813fce0b8fffee97fff038760aa7a66b1d9d9ec Author: Michael Natterer -Date: Sun Jun 27 01:15:46 2010 +0200 +Date: Sun Jun 27 01:15:46 2010 +0200 Bug 613838 - Error in gimp-hue-saturation PDB call @@ -61400,7 +62242,7 @@ commit aa5833fb9f4f014666d8c03c48a6e5acd0b1402d Author: Michael Natterer -Date: Sun Jun 27 00:38:29 2010 +0200 +Date: Sun Jun 27 00:38:29 2010 +0200 pygimp: remove bogus $(srcdir) from a Makefile rule @@ -61413,7 +62255,7 @@ commit 40423b26a8ca7c6bbe8c6162e182d8eefa9363e3 Author: Michael Natterer -Date: Sat Jun 26 23:28:17 2010 +0200 +Date: Sat Jun 26 23:28:17 2010 +0200 app: free ui_manager_name in finalize() @@ -61422,7 +62264,7 @@ commit 79dbfb2b51c1ea08b797be442a86dcd6e1755037 Author: Michael Natterer -Date: Sat Jun 26 23:27:17 2010 +0200 +Date: Sat Jun 26 23:27:17 2010 +0200 app: remove the docks manually in dispose() for the reason below @@ -61431,7 +62273,7 @@ commit de3a5896f3c00f85ef2c900bab7f7ec05de8d050 Author: Michael Natterer -Date: Sat Jun 26 23:26:00 2010 +0200 +Date: Sat Jun 26 23:26:00 2010 +0200 app: remove the children manually in dispose() for the reason below @@ -61440,7 +62282,7 @@ commit 0abe67389d934ae30399d7602cd7f8b62d280d22 Author: Michael Natterer -Date: Sat Jun 26 23:23:50 2010 +0200 +Date: Sat Jun 26 23:23:50 2010 +0200 app: remove the dockables manually in dispose() @@ -61453,7 +62295,7 @@ commit d596695afcd6213d205fb4c4042d02a27f1910d1 Author: Michael Natterer -Date: Sat Jun 26 23:22:53 2010 +0200 +Date: Sat Jun 26 23:22:53 2010 +0200 app: run dispose explicitely on the paint_options before unrefing them @@ -61462,7 +62304,7 @@ commit 324fa432b62f2664674aa67d2ef23713f5fc3fff Author: Michael Natterer -Date: Sat Jun 26 18:25:44 2010 +0200 +Date: Sat Jun 26 18:25:44 2010 +0200 app: free the tag_ref_counts hash table in dispose() @@ -61471,7 +62313,7 @@ commit e24c2d224929eb49ad04e84df4fa76ef5903b3eb Author: Michael Natterer -Date: Sat Jun 26 15:49:10 2010 +0200 +Date: Sat Jun 26 15:49:10 2010 +0200 app: add a local "container" variable to make the code more readable @@ -61480,7 +62322,7 @@ commit ceda85f3180ac5a0b792ac7f33d21bf16cbd9284 Author: Marco Ciampa -Date: Fri Jun 25 00:14:50 2010 +0200 +Date: Fri Jun 25 00:14:50 2010 +0200 Updated italian translation. @@ -61490,7 +62332,7 @@ commit b55c545359258f4f597212b29ea89fee408ecb2f Author: Martin Nordholts -Date: Thu Jun 24 22:57:25 2010 +0200 +Date: Thu Jun 24 22:57:25 2010 +0200 app: Kill UI configurer gracefully @@ -61501,7 +62343,7 @@ commit 990c49b359c12cbd1741995f420b74825062ba73 Author: Michael Natterer -Date: Thu Jun 24 22:47:42 2010 +0200 +Date: Thu Jun 24 22:47:42 2010 +0200 app: include the config objects in the instance debugging @@ -61513,7 +62355,7 @@ commit ed630a18524ba9037a4d69a8758fb3951345b1ac Author: Martin Nordholts -Date: Thu Jun 24 19:00:23 2010 +0200 +Date: Thu Jun 24 19:00:23 2010 +0200 app: Remove unused variables and dead code @@ -61522,7 +62364,7 @@ commit e0d5bab077ee2e8c9ffc8ec9e5c674e1fe44b1ff Author: Michael Natterer -Date: Thu Jun 24 22:33:33 2010 +0200 +Date: Thu Jun 24 22:33:33 2010 +0200 app: remove the static variables for the "standard_foo" fallback members @@ -61537,7 +62379,7 @@ commit 991210c0f94ed8e88eab7ebf19438bad85931930 Author: Michael Natterer -Date: Thu Jun 24 21:56:41 2010 +0200 +Date: Thu Jun 24 21:56:41 2010 +0200 Bug 622608 - GIMP crashes when clicking any scroll bar from combo boxes @@ -61550,7 +62392,7 @@ commit 4d205e03ff86934af21b2c74a911a4d11ab537ee Author: Michael Natterer -Date: Thu Jun 24 21:33:50 2010 +0200 +Date: Thu Jun 24 21:33:50 2010 +0200 app: actually add the new files, sorry @@ -61561,14 +62403,14 @@ commit b2b1cb135b27d1bd77a3c224d209a8dc851a17f0 Author: Michael Natterer -Date: Thu Jun 24 19:11:56 2010 +0200 +Date: Thu Jun 24 19:11:56 2010 +0200 app: move the instance debug facility to the new file app/gimp-debug.c Build it unconditionally but enable it via GIMP_DEBUG=instances app/Makefile.am | 2 ++ - app/app.c | 5 ++-- + app/app.c | 5 ++-- app/core/gimpobject.c | 81 +++------------------------------------------------ app/core/gimpobject.h | 6 ---- @@ -61578,7 +62420,7 @@ commit c448cc7d251d8ef575f52eb653a11738fe147329 Author: Michael Natterer -Date: Thu Jun 24 18:36:25 2010 +0200 +Date: Thu Jun 24 18:36:25 2010 +0200 app: really really destroy the tool options widgets this time @@ -61587,7 +62429,7 @@ commit 44e6acbef871b6c92e91e299de0897438b6ca1db Author: Michael Natterer -Date: Thu Jun 24 18:35:15 2010 +0200 +Date: Thu Jun 24 18:35:15 2010 +0200 app: the name of the standard paint is "gimp-paintbrush" not "GimpPaintbrush" @@ -61597,7 +62439,7 @@ commit 39c74059545d492e3c5ef953ae3ad2d26b342316 Author: Michael Natterer -Date: Thu Jun 24 13:00:16 2010 +0200 +Date: Thu Jun 24 13:00:16 2010 +0200 app: disconnect from the dialog factory in dispose() instead of finalize() @@ -61607,7 +62449,7 @@ commit a83b3250e4781bfb1f5f5add8cc21a96b27679e2 Author: Michael Natterer -Date: Thu Jun 24 12:59:36 2010 +0200 +Date: Thu Jun 24 12:59:36 2010 +0200 app: set non-NULL names on the default image and the default grid @@ -61616,7 +62458,7 @@ commit 67590c04d19c791fbfd9bd9d75ec313ae52f7e65 Author: Michael Natterer -Date: Thu Jun 24 12:58:59 2010 +0200 +Date: Thu Jun 24 12:58:59 2010 +0200 app: unref tool options and presets in dispose() instead of finalize() @@ -61625,7 +62467,7 @@ commit bfbdf1cfb88869959984a16cb7e6e8cd686596ce Author: Michael Natterer -Date: Thu Jun 24 12:58:22 2010 +0200 +Date: Thu Jun 24 12:58:22 2010 +0200 app: unref the paint options in dispose() instead of finalize() @@ -61634,7 +62476,7 @@ commit 5db9d314986a7e5b1c88d4a03b0f5ffa2beb1127 Author: Michael Natterer -Date: Thu Jun 24 12:57:46 2010 +0200 +Date: Thu Jun 24 12:57:46 2010 +0200 app: drop all object references in dispose() insatead of finalize() @@ -61644,7 +62486,7 @@ commit 06bf098fa9ba712d3780577705f77f4f44d57957 Author: Michael Natterer -Date: Thu Jun 24 12:57:00 2010 +0200 +Date: Thu Jun 24 12:57:00 2010 +0200 app: run dispose on the tool infos before unrefing their container @@ -61655,7 +62497,7 @@ commit cf98aed702fbce2558128919572530c5f3359e52 Author: Michael Natterer -Date: Thu Jun 24 12:56:07 2010 +0200 +Date: Thu Jun 24 12:56:07 2010 +0200 app: run dispose on the paint infos before unrefing their container @@ -61666,7 +62508,7 @@ commit a5b6544b6e655590e0072103125f2759d3d764e5 Author: Michael Natterer -Date: Thu Jun 24 12:54:56 2010 +0200 +Date: Thu Jun 24 12:54:56 2010 +0200 app: unref options->tool_info in dispose() instead of finalize() @@ -61675,7 +62517,7 @@ commit 69e7e411f8bf15bed76b5c3fcd720f1222e959d6 Author: Michael Natterer -Date: Thu Jun 24 12:54:19 2010 +0200 +Date: Thu Jun 24 12:54:19 2010 +0200 app: unref options->paint_info in dispose() instead of finalize() @@ -61684,7 +62526,7 @@ commit c47edb50161b4290050edc3293e123c099b7f8ee Author: Michael Natterer -Date: Thu Jun 24 12:53:28 2010 +0200 +Date: Thu Jun 24 12:53:28 2010 +0200 app: improve the g_warning() about undestroyed dialogs @@ -61693,7 +62535,7 @@ commit e7b16c86343dfacbe5c846275a2000708ffdf2a6 Author: Michael Natterer -Date: Thu Jun 24 12:51:46 2010 +0200 +Date: Thu Jun 24 12:51:46 2010 +0200 app: run dispose manually on the dialog factory before unrefing it @@ -61705,7 +62547,7 @@ commit 403908829a4af34584d04c8c972f861819e0baa5 Author: Michael Natterer -Date: Thu Jun 24 12:50:56 2010 +0200 +Date: Thu Jun 24 12:50:56 2010 +0200 app: add comment about why we can't use GimpContainerView API in init() @@ -61715,7 +62557,7 @@ commit 3c565a17366450c7e92c1765574ee5e576981559 Author: Michael Natterer -Date: Thu Jun 24 12:49:54 2010 +0200 +Date: Thu Jun 24 12:49:54 2010 +0200 app: unref context, dialog_factory and ui_manager in GObject::dispose() @@ -61727,7 +62569,7 @@ commit ad83462570595434d1a82892f63d0fa3e8cdc6a1 Author: Michael Natterer -Date: Thu Jun 24 12:48:57 2010 +0200 +Date: Thu Jun 24 12:48:57 2010 +0200 app: unref the filtered container in GObject::dispose() @@ -61738,7 +62580,7 @@ commit c9bde335f0e9ca2db51fa436f75d6992193df365 Author: Michael Natterer -Date: Thu Jun 24 12:46:45 2010 +0200 +Date: Thu Jun 24 12:46:45 2010 +0200 app: don't additionally ref the standard data objects @@ -61746,7 +62588,7 @@ it's nullified automatically if they are ever finalized. Doesn't actually get rid of them upon exit yet, this is just a preparation. - app/core/gimpbrush.c | 3 ++- + app/core/gimpbrush.c | 3 ++- app/core/gimpdynamics.c | 3 ++- app/core/gimpgradient.c | 3 ++- app/core/gimppalette.c | 3 ++- @@ -61756,7 +62598,7 @@ commit 5da440f1a58b14672d6d11e7734d794a9df966c9 Author: Barak Itkin -Date: Thu Jun 24 14:40:50 2010 +0300 +Date: Thu Jun 24 14:40:50 2010 +0300 Update Hebrew translation. @@ -61764,13 +62606,13 @@ po-plug-ins/he.po | 15285 ++++++++++++++++++++++++++++----------------------- po-script-fu/he.po | 2572 +++++---- - po-tips/he.po | 175 +- - po/he.po | 13499 +++++++++++++++++++++++++++++---------------- + po-tips/he.po | 175 +- + po/he.po | 13499 +++++++++++++++++++++++++++++---------------- 5 files changed, 20250 insertions(+), 13278 deletions(-) commit c4588f1209b840dd7f9138fedf9a6f130beccc2e Author: Nelson A. de Oliveira -Date: Wed Jun 23 22:21:57 2010 -0300 +Date: Wed Jun 23 22:21:57 2010 -0300 Bug 575911 - Add 'Rule of fifths' crop guide overlay @@ -61785,7 +62627,7 @@ commit b43be361ffa12228fc7b2178f6244ae7f9415e77 Author: Michael Natterer -Date: Wed Jun 23 22:50:45 2010 +0200 +Date: Wed Jun 23 22:50:45 2010 +0200 app: add a forgotten g_object_unref() @@ -61796,7 +62638,7 @@ commit bbd4038e98b3b8b4e1e310479673b1e3be83080d Author: Michael Natterer -Date: Wed Jun 23 22:48:53 2010 +0200 +Date: Wed Jun 23 22:48:53 2010 +0200 app: make sure all tool options widgets are properly destroyed @@ -61810,11 +62652,11 @@ commit e44d81bd4b34be2e67ce281926f14b0460b80373 Author: Michael Natterer -Date: Wed Jun 23 22:30:39 2010 +0200 +Date: Wed Jun 23 22:30:39 2010 +0200 app: add a debug facility that keeps track of allocated GimpObjects - app/app.c | 4 ++ + app/app.c | 4 ++ app/core/gimpobject.c | 145 ++++++++++++++++++++++++++++++++++++++++++++------ app/core/gimpobject.h | 6 +++ @@ -61822,7 +62664,7 @@ commit f6781d15c4c253f1b14093e8758504c84f504886 Author: Martin Nordholts -Date: Wed Jun 23 20:17:37 2010 +0200 +Date: Wed Jun 23 20:17:37 2010 +0200 Bug 565459 - newly opened images are put into the background @@ -61843,7 +62685,7 @@ commit 24317404927a95f027d88c7dd7743e22802b3ad8 Author: Martin Nordholts -Date: Wed Jun 23 19:57:34 2010 +0200 +Date: Wed Jun 23 19:57:34 2010 +0200 app: Explain gdk_window_raise() in file-open-dialog.c @@ -61852,7 +62694,7 @@ commit 66bd26b208c4041ae07a6959d00428628ce854a3 Author: SimaMoto,RyōTa -Date: Sun May 9 09:45:40 2010 +0900 +Date: Sun May 9 09:45:40 2010 +0900 Bug 618143 - Clarify labels in 'Size' tab in GIMPressionist @@ -61865,7 +62707,7 @@ commit e54a93f64932cc770da575b8c6cb643694c7779b Author: Martin Nordholts -Date: Wed Jun 23 18:22:55 2010 +0200 +Date: Wed Jun 23 18:22:55 2010 +0200 devel-docs: Update development schedule @@ -61879,7 +62721,7 @@ commit ea050b267e8e5647d6edfbfdee9f8e1e9749ea79 Author: Michael Natterer -Date: Wed Jun 23 00:20:21 2010 +0200 +Date: Wed Jun 23 00:20:21 2010 +0200 app: don't leak all cached GtkTreeIters in container views @@ -61899,7 +62741,7 @@ commit a60463cd8e11f7737181a2ec0848d7bcb1b63bb2 Author: Michael Natterer -Date: Wed Jun 23 00:19:44 2010 +0200 +Date: Wed Jun 23 00:19:44 2010 +0200 app: free one more list returned by gtk_container_get_children() @@ -61908,7 +62750,7 @@ commit 46e141021340bddf1a2856b56eb5aa9a366c5838 Author: Michael Natterer -Date: Tue Jun 22 23:05:28 2010 +0200 +Date: Tue Jun 22 23:05:28 2010 +0200 app: free the list returned by gtk_container_get_children() @@ -61917,7 +62759,7 @@ commit 865a1f4896522e2d8c9bd4405e63402857f43ef6 Author: Michael Natterer -Date: Tue Jun 22 23:05:06 2010 +0200 +Date: Tue Jun 22 23:05:06 2010 +0200 app: free the string returned by gimp_dock_window_get_description() @@ -61926,7 +62768,7 @@ commit 94e757df51ac3ed14683fdd6ed10d65ba231dac8 Author: Michael Natterer -Date: Tue Jun 22 23:04:23 2010 +0200 +Date: Tue Jun 22 23:04:23 2010 +0200 app: don't leak options->language; add finalize() to free it @@ -61935,7 +62777,7 @@ commit cf1cc6dc6f7cc48037c048d8ea8683e83f83457e Author: Michael Natterer -Date: Tue Jun 22 23:03:30 2010 +0200 +Date: Tue Jun 22 23:03:30 2010 +0200 app: private->shells might be a list with one element upon destroy; free it @@ -61945,7 +62787,7 @@ commit 5df1d477b7bffaf064716de4aaaa0f62ae84f442 Author: Michael Natterer -Date: Tue Jun 22 23:03:13 2010 +0200 +Date: Tue Jun 22 23:03:13 2010 +0200 app: free shell->zoom_focus_pointer_queue in destroy() @@ -61954,7 +62796,7 @@ commit 09ebdcb06b7d612048fa38fd26114b777f0a1916 Author: Michael Natterer -Date: Tue Jun 22 23:02:23 2010 +0200 +Date: Tue Jun 22 23:02:23 2010 +0200 app: don't leak each transformed brush mask @@ -61963,7 +62805,7 @@ commit 2b050c78cd5b32c1e2665fa9fb1059b5250e55ca Author: Martin Nordholts -Date: Tue Jun 22 21:34:54 2010 +0200 +Date: Tue Jun 22 21:34:54 2010 +0200 devel-docs: Remove release commit from release-howto.txt @@ -61972,7 +62814,7 @@ commit 2a984ef51f1679acd7c73163c633fdc8470058f2 Author: Michael Natterer -Date: Tue Jun 22 20:07:50 2010 +0200 +Date: Tue Jun 22 20:07:50 2010 +0200 Bug 612618 - Font selection remains visible @@ -61984,7 +62826,7 @@ commit ff1da59f3322ec286d50b4a65473413d0b63f212 Author: Martin Nordholts -Date: Tue Jun 22 19:35:16 2010 +0200 +Date: Tue Jun 22 19:35:16 2010 +0200 Bug 574018 - Add a manifest to executables @@ -61997,7 +62839,7 @@ commit 75941beacae1e742c2edf0c0713e6be82e0b4875 Author: Kevin Cozens -Date: Mon Jun 21 22:54:46 2010 -0400 +Date: Mon Jun 21 22:54:46 2010 -0400 Added SIOD compatability routines string-downcase and string-upcase. @@ -62006,7 +62848,7 @@ commit f0e90007f77c6d49284cf5f71f0ce3044963309e Author: Martin Nordholts -Date: Mon Jun 21 20:59:38 2010 +0200 +Date: Mon Jun 21 20:59:38 2010 +0200 app/tests: Remove gimp_ui_synthesize_plus_key_event() crack @@ -62020,7 +62862,7 @@ commit 8b344fa6adb32a79f1298020c81b2e6d046ac7a7 Author: Martin Nordholts -Date: Mon Jun 21 20:38:05 2010 +0200 +Date: Mon Jun 21 20:38:05 2010 +0200 app: Test for existance of git-version.h.tmp before comparing @@ -62032,7 +62874,7 @@ commit ae0ae9fcb8570a2ce4d2ed0e85a8e64fb54549f8 Author: Michael Natterer -Date: Mon Jun 21 21:08:13 2010 +0200 +Date: Mon Jun 21 21:08:13 2010 +0200 app: pass all construct params to g_object_new() @@ -62041,7 +62883,7 @@ commit d04051bcad1d57319f9c278be30f43ee41a73e78 Author: Michael Natterer -Date: Sun Jun 20 23:53:43 2010 +0200 +Date: Sun Jun 20 23:53:43 2010 +0200 Bug 622234 - gimp.desktop: image/x-psd in MimeTypes twice @@ -62052,7 +62894,7 @@ commit ac6ee071849a3e1572007aa45c33d8d2f198653c Author: Michael Natterer -Date: Sun Jun 20 23:26:45 2010 +0200 +Date: Sun Jun 20 23:26:45 2010 +0200 app: the tests should succeed, so should a normal gimp session @@ -62067,7 +62909,7 @@ commit df731fecda446557e15908f8ebd3e649c2c19ac4 Author: Martin Nordholts -Date: Sun Jun 20 20:01:19 2010 +0200 +Date: Sun Jun 20 20:01:19 2010 +0200 Make 'make distcheck' pass @@ -62079,23 +62921,23 @@ commit ce33255588f4f33e7a0a75a53c7f6c2997d65004 Author: Martin Nordholts -Date: Sun Jun 20 18:59:39 2010 +0200 +Date: Sun Jun 20 18:59:39 2010 +0200 app/tests: Also add error margin to 'gimpsessioninfo-book.c' Also add error margin to 'gimpsessioninfo-book.c' and update reference files. This makes 'make distcheck' pass, and it passes more reliably. - app/tests/gimpdir/dockrc | 10 +++++----- + app/tests/gimpdir/dockrc | 10 +++++----- app/tests/gimpdir/dockrc-expected | 4 ++-- - app/tests/gimpdir/sessionrc | 24 ++++++++++++------------ + app/tests/gimpdir/sessionrc | 24 ++++++++++++------------ app/tests/gimpdir/sessionrc-expected | 6 +++--- app/widgets/gimpsessioninfo-book.c | 14 +++++++++++++- 5 files changed, 35 insertions(+), 23 deletions(-) commit 9275404452e233e38c6cc438beaccab92278631f Author: Sven Neumann -Date: Sun Jun 20 18:37:53 2010 +0200 +Date: Sun Jun 20 18:37:53 2010 +0200 Bug 622196 - Unportable test(1) construct in configure script @@ -62106,7 +62948,7 @@ commit ba3d530c9b4d6e81594e6bdda0c0a1fc92aaddee Author: Michael Natterer -Date: Sun Jun 20 12:25:32 2010 +0200 +Date: Sun Jun 20 12:25:32 2010 +0200 tests: fix the directory variables in TESTS_ENVIRONMENT @@ -62119,7 +62961,7 @@ commit 49d951d49ed167736e412ca5a145792118c37afa Author: Martin Nordholts -Date: Sat Jun 19 23:24:23 2010 +0200 +Date: Sat Jun 19 23:24:23 2010 +0200 app: Introduce error margin in sessionrc in test cases @@ -62130,18 +62972,18 @@ Still needs more work, should probably do the same on book positions too... - app/tests.c | 11 ++++++- + app/tests.c | 11 ++++++- app/tests/gimpdir/dockrc-expected | 6 ++-- app/tests/gimpdir/sessionrc-expected | 20 ++++++------ - app/widgets/gimpsessioninfo.c | 63 + app/widgets/gimpsessioninfo.c | 63 +++++++++++++++++++++++++++++++++--- - app/widgets/gimpsessioninfo.h | 56 + app/widgets/gimpsessioninfo.h | 56 ++++++++++++++++++-------------- 5 files changed, 113 insertions(+), 43 deletions(-) commit 4e78fc72794d74bc7c463831ff2d6209efe2c9bd Author: Martin Nordholts -Date: Sat Jun 19 17:26:00 2010 +0200 +Date: Sat Jun 19 17:26:00 2010 +0200 Also distribute dockrc-expected @@ -62150,11 +62992,11 @@ commit 53596f708d49d68639711669000be0f27e6adfec Author: Martin Nordholts -Date: Sat Jun 19 17:55:06 2010 +0200 +Date: Sat Jun 19 17:55:06 2010 +0200 m4macros: Delete gtk-doc.m4, gtkdocize gives us a symlink - acinclude.m4 | 7 +++---- + acinclude.m4 | 7 +++---- m4macros/Makefile.am | 1 - m4macros/gtk-doc.m4 | 53 ---------------------------------------------------- @@ -62162,7 +63004,7 @@ commit d1202096e66a30029213ca71230b70eb038b658f Author: Martin Nordholts -Date: Sat Jan 30 08:10:41 2010 +0100 +Date: Sat Jan 30 08:10:41 2010 +0100 app: Include git commit hash in verbose version output @@ -62173,12 +63015,12 @@ app/.gitignore | 9 +++++---- app/Makefile.am | 26 +++++++++++++++++++++++++- - app/version.c | 4 ++++ + app/version.c | 4 ++++ 3 files changed, 34 insertions(+), 5 deletions(-) commit 22864d1b8818b0edb7a78a2585ab74868c460e1f Author: Michael Natterer -Date: Sat Jun 19 15:18:52 2010 +0200 +Date: Sat Jun 19 15:18:52 2010 +0200 NEWS: even more @@ -62187,7 +63029,7 @@ commit e0221f8e655de698a9fbb2567a13ef11457db0e6 Author: Michael Natterer -Date: Sat Jun 19 15:09:50 2010 +0200 +Date: Sat Jun 19 15:09:50 2010 +0200 NEWS: more updates @@ -62196,7 +63038,7 @@ commit 5290bb038337944d815588227c27b292d83c6914 Author: Michael Natterer -Date: Sat Jun 19 14:51:45 2010 +0200 +Date: Sat Jun 19 14:51:45 2010 +0200 NEWS: updates @@ -62205,7 +63047,7 @@ commit 8ea880d91cc284f21deff73f86078b07250d3e65 Author: Alexandre Prokoudine -Date: Sat Jun 19 15:44:09 2010 +0400 +Date: Sat Jun 19 15:44:09 2010 +0400 Updated Russian translation, take one @@ -62215,7 +63057,7 @@ commit c739588541e80ef3c3f476feeecc7b8bab46e2f3 Author: Alexandre Prokoudine -Date: Sat Jun 19 15:42:15 2010 +0400 +Date: Sat Jun 19 15:42:15 2010 +0400 Updated Russian translation, take one @@ -62225,17 +63067,17 @@ commit 9bc0303ededf7a0b6f3f2ce0a74b1b24d1508be7 Author: Martin Nordholts -Date: Sat Jun 19 10:51:55 2010 +0200 +Date: Sat Jun 19 10:51:55 2010 +0200 Regenerate gimprc docs/gimprc.5.in | 25 ++++++++++++++++++++++++- - etc/gimprc | 21 ++++++++++++++++++++- + etc/gimprc | 21 ++++++++++++++++++++- 2 files changed, 44 insertions(+), 2 deletions(-) commit 9060ab1d15bef222a360294643d21a1a1fb725f6 Author: Martin Nordholts -Date: Sat Jun 19 10:51:39 2010 +0200 +Date: Sat Jun 19 10:51:39 2010 +0200 po: Update POTFILES.in @@ -62244,7 +63086,7 @@ commit ab6d5553d987b9ddf5a2140d01f267590c96f84a Author: Martin Nordholts -Date: Sat Jun 19 09:43:27 2010 +0200 +Date: Sat Jun 19 09:43:27 2010 +0200 app: Don't unmaximize image window when switching tabs in swm @@ -62257,7 +63099,7 @@ commit 1e6055060c9d94ce0504a1899753fdb12fd09e2a Author: Martin Nordholts -Date: Sat Jun 19 08:26:30 2010 +0200 +Date: Sat Jun 19 08:26:30 2010 +0200 app/tests: Also simply test-xcf.c @@ -62269,7 +63111,7 @@ commit 6ad46f651a8cb0ffda61e9c99ca4758221b10917 Author: Martin Nordholts -Date: Sat Jun 19 08:09:34 2010 +0200 +Date: Sat Jun 19 08:09:34 2010 +0200 Bug 610587 - Zooming with zoom tool pans away from the cursor @@ -62281,7 +63123,7 @@ commit 4ca603e97d20ca58088ad62076ef0683014f2c2f Author: Martin Nordholts -Date: Fri Jun 18 23:00:11 2010 +0200 +Date: Fri Jun 18 23:00:11 2010 +0200 Revert "Bug 610587 - Zooming with zoom tool pans away from the cursor" @@ -62293,13 +63135,13 @@ commit 87ab39a9432fb96f9ed2e922fdba0de04c42240d Author: Martin Nordholts -Date: Fri Jun 18 22:35:24 2010 +0200 +Date: Fri Jun 18 22:35:24 2010 +0200 Bug 608622 - Desaturate icon causes confusion with Gradients tool - libgimpwidgets/gimpstock.c | 3 +++ - libgimpwidgets/gimpstock.h | 2 +- - themes/Default/images/Makefile.am | 2 ++ + libgimpwidgets/gimpstock.c | 3 +++ + libgimpwidgets/gimpstock.h | 2 +- + themes/Default/images/Makefile.am | 2 ++ themes/Default/images/tools/stock-tool-desaturate-16.png | Bin 0 -> 561 bytes themes/Default/images/tools/stock-tool-desaturate-22.png | Bin 0 -> @@ -62308,7 +63150,7 @@ commit 7e3898da0934bcab753747ace4ae2477e801b34b Author: Martin Nordholts -Date: Fri Jun 18 20:57:59 2010 +0200 +Date: Fri Jun 18 20:57:59 2010 +0200 app/tests: Add keyboard zoom focus regression test @@ -62320,13 +63162,13 @@ app/display/gimpdisplayshell-scale.h | 3 + app/display/gimpdisplayshell.c | 2 + app/display/gimpdisplayshell.h | 2 + - app/tests/test-ui.c | 106 + app/tests/test-ui.c | 106 +++++++++++++++++++++++++++++++++++ 5 files changed, 150 insertions(+), 3 deletions(-) commit 1f1f20261ee834e83d01e2cc82a0225439d32077 Author: Martin Nordholts -Date: Fri Jun 18 20:37:21 2010 +0200 +Date: Fri Jun 18 20:37:21 2010 +0200 Bug 610587 - Zooming with zoom tool pans away from the cursor @@ -62338,18 +63180,18 @@ commit 3f6a3e749c8070b712aeb12b6b7ff69271b652c3 Author: Martin Nordholts -Date: Mon Jun 14 21:58:52 2010 +0200 +Date: Mon Jun 14 21:58:52 2010 +0200 app/tests: cleanup - app/tests/test-ui.c | 2 -- + app/tests/test-ui.c | 2 -- app/tests/test-window-management.c | 64 ++++++++++++++++++-------------------- 2 files changed, 30 insertions(+), 36 deletions(-) commit 0af34013a2fd811d2043c37fcdd1ee97275d89be Author: Martin Nordholts -Date: Mon Jun 14 21:14:19 2010 +0200 +Date: Mon Jun 14 21:14:19 2010 +0200 app: Add minimum gimp_display_shell_transform_xy() gkt-doc @@ -62358,7 +63200,7 @@ commit b799a8bd03bf6da4794371d61600d77ba5b947fc Author: Martin Nordholts -Date: Tue Jun 15 08:13:19 2010 +0200 +Date: Tue Jun 15 08:13:19 2010 +0200 app: Remove unnecessary gimp_dockbook_refresh_tab_layout_lut() calls @@ -62371,7 +63213,7 @@ commit 5588e15eed5a53d7b73dec84ed445c17f2d4d8db Author: Martin Nordholts -Date: Fri Jun 18 20:06:04 2010 +0200 +Date: Fri Jun 18 20:06:04 2010 +0200 app: Disable snap-to-canvas by default @@ -62383,7 +63225,7 @@ commit 8ab8a25c999df682dbb9640f939b18955944903b Author: Michael Natterer -Date: Fri Jun 18 13:51:49 2010 +0200 +Date: Fri Jun 18 13:51:49 2010 +0200 app: some disabled cairo bling code @@ -62396,7 +63238,7 @@ commit c1c715c2d1e6ea234acfa4f1444453cc1889fd7c Author: Michael Natterer -Date: Fri Jun 18 13:46:39 2010 +0200 +Date: Fri Jun 18 13:46:39 2010 +0200 app: don't draw any background if the overlay child is app-paintable @@ -62409,7 +63251,7 @@ commit 27ec3aa81283431c1ec458c8b41993975acf2d09 Author: Michael Natterer -Date: Fri Jun 18 13:45:03 2010 +0200 +Date: Fri Jun 18 13:45:03 2010 +0200 app: switch off double buffering on the entire offscreen widget tree @@ -62420,7 +63262,7 @@ commit 6eda16d5501fa21bc18eea412e28dad248c38f5e Author: Michael Natterer -Date: Fri Jun 18 09:11:14 2010 +0200 +Date: Fri Jun 18 09:11:14 2010 +0200 app: call dialogs_exit() after controllers_exit() and devices_exit() @@ -62435,7 +63277,7 @@ commit e61b2df08a9d245e4ab9ccc55bf8743df0b7d559 Author: Marco Ciampa -Date: Tue Jun 15 00:39:12 2010 +0200 +Date: Tue Jun 15 00:39:12 2010 +0200 Updated italian translation. @@ -62445,7 +63287,7 @@ commit 782ba9bcb9810d24c90586c345ccd160263b9ad3 Author: Martin Nordholts -Date: Mon Jun 14 18:53:13 2010 +0200 +Date: Mon Jun 14 18:53:13 2010 +0200 app/tests: Make it easier to add tests @@ -62453,15 +63295,15 @@ and adding macros to register tests. app/tests/test-layer-grouping.c | 63 ++++++------ - app/tests/test-layers.c | 79 +++++++-------- - app/tests/test-ui.c | 194 + app/tests/test-layers.c | 79 +++++++-------- + app/tests/test-ui.c | 194 +++++++++++++------------------------ app/tests/test-window-management.c | 26 ++--- 4 files changed, 152 insertions(+), 210 deletions(-) commit ffd10df39f67e080f11e236ae115726683f2545b Author: Michael Natterer -Date: Mon Jun 14 13:48:11 2010 +0200 +Date: Mon Jun 14 13:48:11 2010 +0200 themes: use the color scheme from "Darklooks" for canvas overlays @@ -62473,17 +63315,17 @@ commit b9c09c559d94cc87212e1d5dc6089a527d71b7f3 Author: Ulf-D. Ehlert -Date: Sun Jun 13 18:47:11 2010 +0200 +Date: Sun Jun 13 18:47:11 2010 +0200 po: Minor fixes to German translations po-plug-ins/de.po | 7 ++++--- - po/de.po | 8 ++++---- + po/de.po | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) commit bc72b15539eb11b0e8f7b3b9bf8b5f1464d2026f Author: Marco Ciampa -Date: Sun Jun 13 13:33:47 2010 +0200 +Date: Sun Jun 13 13:33:47 2010 +0200 Updated italian translation. @@ -62493,7 +63335,7 @@ commit 170f0bed00aa67a4f2c6d2a17979e8f87704159e Author: Michael Natterer -Date: Sat Jun 12 23:49:55 2010 +0200 +Date: Sat Jun 12 23:49:55 2010 +0200 app: use a GimpOverlayFrame for the text style editor @@ -62504,7 +63346,7 @@ commit 30de295cf40ce0b01e706d9823f161edb949e211 Author: Michael Natterer -Date: Sat Jun 12 23:38:13 2010 +0200 +Date: Sat Jun 12 23:38:13 2010 +0200 app: make the alpha channel work on canvas overlay widgets @@ -62527,7 +63369,7 @@ commit c37c0024af9b07ec658249df974eb0ba58eb749d Author: Barak Itkin -Date: Sat Jun 12 20:49:44 2010 +0300 +Date: Sat Jun 12 20:49:44 2010 +0300 app: Fix the description of layers-merge-down @@ -62544,7 +63386,7 @@ commit d3e7864b5c45191aa001ec2f28b9db49be2d5065 Author: Michael Natterer -Date: Sat Jun 12 19:37:03 2010 +0200 +Date: Sat Jun 12 19:37:03 2010 +0200 app: code cleanup @@ -62553,7 +63395,7 @@ commit fc3a89ab0e1dfc23b820aadacf0526a79fcf8fa2 Author: Michael Natterer -Date: Sat Jun 12 19:23:22 2010 +0200 +Date: Sat Jun 12 19:23:22 2010 +0200 app: make GimpOverlayFrame work as standalone container @@ -62566,13 +63408,13 @@ commit cabc3aa67a61fac6d7415713a2269359e2051434 Author: Michael Natterer -Date: Sat Jun 12 19:02:51 2010 +0200 +Date: Sat Jun 12 19:02:51 2010 +0200 app: split out the round corners code from GimpOverlayDialog into a new GtkBin subclass called GimpOverlayFrame. - app/widgets/Makefile.am | 2 + + app/widgets/Makefile.am | 2 + app/widgets/gimpoverlaydialog.c | 96 +-------------------------- app/widgets/gimpoverlaydialog.h | 9 ++- app/widgets/gimpoverlayframe.c | 143 @@ -62582,7 +63424,7 @@ commit 94dc079d44a56c0c65e61c609d39b9e63fd02aee Author: Michael Natterer -Date: Sat Jun 12 18:46:30 2010 +0200 +Date: Sat Jun 12 18:46:30 2010 +0200 app: forgot to save the last comment edit @@ -62591,7 +63433,7 @@ commit 4da97f95c90324d324a33f5abeec883729f8d57c Author: Michael Natterer -Date: Sat Jun 12 18:45:02 2010 +0200 +Date: Sat Jun 12 18:45:02 2010 +0200 app: don't leak a string returned by g_object_get(), and some cleanup @@ -62600,7 +63442,7 @@ commit 88250391b033463efb622d3cc88702bbf9688368 Author: Michael Natterer -Date: Sat Jun 12 18:39:21 2010 +0200 +Date: Sat Jun 12 18:39:21 2010 +0200 app: fix keyboard focus navigation in overlay children @@ -62615,7 +63457,7 @@ commit 5da660a14d766c7adf0d24e04645c952477178c0 Author: Martin Nordholts -Date: Sat Jun 12 15:36:14 2010 +0200 +Date: Sat Jun 12 15:36:14 2010 +0200 app: Make zoom focus with keyboard work again @@ -62628,7 +63470,7 @@ commit c1f63290bc1ef10c089148620e02a8b8ce0492a3 Author: Michael Natterer -Date: Sat Jun 12 11:38:15 2010 +0200 +Date: Sat Jun 12 11:38:15 2010 +0200 app: add back the code that aligns the menu with the menu button @@ -62637,7 +63479,7 @@ commit 6812d5bdceb05263ca6068f3084b25b37e40323c Author: Martin Nordholts -Date: Wed May 26 18:10:31 2010 +0200 +Date: Wed May 26 18:10:31 2010 +0200 Bug 346881 - Remove redundant title of tab and move menu button up @@ -62649,15 +63491,15 @@ app/actions/dockable-actions.c | 43 +-- app/tests/gimpdir/sessionrc-expected | 4 +- - app/widgets/gimpdockable.c | 679 + app/widgets/gimpdockable.c | 679 ++--------------------------------- - app/widgets/gimpdockable.h | 81 +++-- - app/widgets/gimpdockbook.c | 255 +++++++++++-- + app/widgets/gimpdockable.h | 81 +++-- + app/widgets/gimpdockbook.c | 255 +++++++++++-- 5 files changed, 320 insertions(+), 742 deletions(-) commit 9b86acd16bc50cd22ac7b7defaab4e3eee78039d Author: Martin Nordholts -Date: Fri Jun 11 23:18:49 2010 +0200 +Date: Fri Jun 11 23:18:49 2010 +0200 Add 'Automatic' Tab Style support @@ -62679,41 +63521,41 @@ Also add a basic regression test. app/actions/dockable-actions.c | 8 +- - app/gimp-log.c | 3 +- - app/gimp-log.h | 4 +- - app/tests/gimpdir/sessionrc | 2 +- + app/gimp-log.c | 3 +- + app/gimp-log.h | 4 +- + app/tests/gimpdir/sessionrc | 2 +- app/tests/gimpdir/sessionrc-expected | 2 +- - app/tests/test-ui.c | 88 +++++++++ - app/widgets/gimpdockable.c | 62 +++++- - app/widgets/gimpdockable.h | 3 + - app/widgets/gimpdockbook.c | 365 + app/tests/test-ui.c | 88 +++++++++ + app/widgets/gimpdockable.c | 62 +++++- + app/widgets/gimpdockable.h | 3 + + app/widgets/gimpdockbook.c | 365 +++++++++++++++++++++++++++++++++-- - app/widgets/gimpdockbook.h | 1 + - app/widgets/gimpdocked.c | 15 ++ - app/widgets/gimpdocked.h | 2 + + app/widgets/gimpdockbook.h | 1 + + app/widgets/gimpdocked.c | 15 ++ + app/widgets/gimpdocked.h | 2 + app/widgets/gimptooloptionseditor.c | 15 +- - app/widgets/widgets-enums.c | 4 + - app/widgets/widgets-enums.h | 4 +- - etc/sessionrc | 16 +- - menus/dockable-menu.xml.in | 2 + + app/widgets/widgets-enums.c | 4 + + app/widgets/widgets-enums.h | 4 +- + etc/sessionrc | 16 +- + menus/dockable-menu.xml.in | 2 + 17 files changed, 557 insertions(+), 39 deletions(-) commit 501f97b54be11575629b7783f5c874ba22caa249 Author: Martin Nordholts -Date: Fri Jun 11 22:38:34 2010 +0200 +Date: Fri Jun 11 22:38:34 2010 +0200 Add gimp_preview_tab_style_to_icon() utility function Also fix wrong conversion from PREVIEW_NAME to ICON_BLURB - app/widgets/gimpdockable.c | 20 +------------------- + app/widgets/gimpdockable.c | 20 +------------------- app/widgets/gimpwidgets-utils.c | 24 ++++++++++++++++++++++++ app/widgets/gimpwidgets-utils.h | 1 + 3 files changed, 26 insertions(+), 19 deletions(-) commit e8e469c53c52371276e59271d43e79085f350cd8 Author: Martin Nordholts -Date: Sun May 30 15:39:36 2010 +0200 +Date: Sun May 30 15:39:36 2010 +0200 app: Add gimp_dock_temp_add/remove() @@ -62730,7 +63572,7 @@ commit 5334cc13b8d1ede2baa79fdddb7fdb56ff17de7e Author: Michael Natterer -Date: Fri Jun 11 10:04:15 2010 +0200 +Date: Fri Jun 11 10:04:15 2010 +0200 po-libgimp: add libgimpwidgets/gimpwidgets-private.c to POTFILES.in @@ -62739,7 +63581,7 @@ commit 56994869cd04dd49d2c569ff5611425343f69fad Author: Michael Natterer -Date: Fri Jun 11 09:53:08 2010 +0200 +Date: Fri Jun 11 09:53:08 2010 +0200 libgimpwidgets: register descriptions for the GdkInputMode enum @@ -62751,7 +63593,7 @@ commit e827e7f1bfdd88f8fbfe1f8d0b110a9bcaa877cd Author: Martin Nordholts -Date: Fri Jun 11 07:35:07 2010 +0200 +Date: Fri Jun 11 07:35:07 2010 +0200 app: Add gimp_dockable_create_event_box_tab_widget() @@ -62761,7 +63603,7 @@ commit 5a9217e959c0363efc8f3a9ee92df7e7d28ef715 Author: Marco Ciampa -Date: Fri Jun 11 02:05:58 2010 +0200 +Date: Fri Jun 11 02:05:58 2010 +0200 Updated italian translation. @@ -62771,7 +63613,7 @@ commit 85a24f04209a60eb900f9642acfd4b669c3251c2 Author: Sven Neumann -Date: Wed Jun 9 22:57:53 2010 +0200 +Date: Wed Jun 9 22:57:53 2010 +0200 app: fix compiler warning and minor formatting issues @@ -62781,20 +63623,20 @@ commit 3e2714508f3a4b3fbf3995ce58c28a656103ae36 Author: Michael Natterer -Date: Wed Jun 9 18:55:48 2010 +0200 +Date: Wed Jun 9 18:55:48 2010 +0200 app: add log output of key event handling in GimpWindow using the "key-events" debug key. - app/gimp-log.c | 3 ++- - app/gimp-log.h | 4 +++- + app/gimp-log.c | 3 ++- + app/gimp-log.h | 4 +++- app/widgets/gimpwindow.c | 38 ++++++++++++++++++++++++++++++++++---- 3 files changed, 39 insertions(+), 6 deletions(-) commit 5930b13084497d8720ac3b0c51daa0d0ffe4bdda Author: Barak Itkin -Date: Tue Jun 8 14:24:11 2010 +0300 +Date: Tue Jun 8 14:24:11 2010 +0300 app: add context to all undo descriptions @@ -62803,45 +63645,45 @@ language (like Hebrew) that require a different grammatical tense for describing actions - app/core/gimp-edit.c | 16 ++++----- - app/core/gimpchannel-select.c | 14 ++++---- - app/core/gimpchannel.c | 36 ++++++++++----------- - app/core/gimpdrawable-blend.c | 2 +- - app/core/gimpdrawable-brightness-contrast.c | 4 +-- - app/core/gimpdrawable-bucket-fill.c | 2 +- - app/core/gimpdrawable-color-balance.c | 4 +-- - app/core/gimpdrawable-colorize.c | 4 +-- - app/core/gimpdrawable-curves.c | 4 +-- - app/core/gimpdrawable-equalize.c | 2 +- - app/core/gimpdrawable-offset.c | 2 +- - app/core/gimpdrawable-stroke.c | 2 +- - app/core/gimpdrawable-transform.c | 10 +++--- - app/core/gimpdrawable.c | 2 +- - app/core/gimpgrouplayer.c | 14 ++++---- - app/core/gimpimage-arrange.c | 2 +- - app/core/gimpimage-colormap.c | 6 ++-- - app/core/gimpimage-convert.c | 6 ++-- - app/core/gimpimage-crop.c | 4 +-- - app/core/gimpimage-grid.c | 2 +- - app/core/gimpimage-guides.c | 8 ++--- - app/core/gimpimage-item-list.c | 8 ++--- - app/core/gimpimage-merge.c | 12 +++---- - app/core/gimpimage-quick-mask.c | 4 +-- - app/core/gimpimage-resize.c | 2 +- - app/core/gimpimage-sample-points.c | 6 ++-- - app/core/gimpimage-scale.c | 2 +- - app/core/gimpimage.c | 50 + app/core/gimp-edit.c | 16 ++++----- + app/core/gimpchannel-select.c | 14 ++++---- + app/core/gimpchannel.c | 36 ++++++++++----------- + app/core/gimpdrawable-blend.c | 2 +- + app/core/gimpdrawable-brightness-contrast.c | 4 +-- + app/core/gimpdrawable-bucket-fill.c | 2 +- + app/core/gimpdrawable-color-balance.c | 4 +-- + app/core/gimpdrawable-colorize.c | 4 +-- + app/core/gimpdrawable-curves.c | 4 +-- + app/core/gimpdrawable-equalize.c | 2 +- + app/core/gimpdrawable-offset.c | 2 +- + app/core/gimpdrawable-stroke.c | 2 +- + app/core/gimpdrawable-transform.c | 10 +++--- + app/core/gimpdrawable.c | 2 +- + app/core/gimpgrouplayer.c | 14 ++++---- + app/core/gimpimage-arrange.c | 2 +- + app/core/gimpimage-colormap.c | 6 ++-- + app/core/gimpimage-convert.c | 6 ++-- + app/core/gimpimage-crop.c | 4 +-- + app/core/gimpimage-grid.c | 2 +- + app/core/gimpimage-guides.c | 8 ++--- + app/core/gimpimage-item-list.c | 8 ++--- + app/core/gimpimage-merge.c | 12 +++---- + app/core/gimpimage-quick-mask.c | 4 +-- + app/core/gimpimage-resize.c | 2 +- + app/core/gimpimage-sample-points.c | 6 ++-- + app/core/gimpimage-scale.c | 2 +- + app/core/gimpimage.c | 50 ++++++++++++++--------------- - app/core/gimpitem.c | 9 +++--- - app/core/gimplayer-floating-sel.c | 4 +-- - app/core/gimplayer.c | 28 ++++++++-------- - app/core/gimplayermask.c | 6 ++-- - app/core/gimpselection.c | 24 +++++++------- + app/core/gimpitem.c | 9 +++--- + app/core/gimplayer-floating-sel.c | 4 +-- + app/core/gimplayer.c | 28 ++++++++-------- + app/core/gimplayermask.c | 6 ++-- + app/core/gimpselection.c | 24 +++++++------- 33 files changed, 151 insertions(+), 150 deletions(-) commit 5dd9e4bbc308fa76b9c923240fb1b9b90cf1c9aa Author: Michael Natterer -Date: Tue Jun 8 10:10:04 2010 +0200 +Date: Tue Jun 8 10:10:04 2010 +0200 app: remove member GimpDrawable::has_alpha @@ -62856,7 +63698,7 @@ commit 8a27702ac3d9dcb15062582c83e9be1ebca5d096 Author: Michael Natterer -Date: Sun Jun 6 20:24:27 2010 +0200 +Date: Sun Jun 6 20:24:27 2010 +0200 app: add simple macros GIMP_TIMER_START() and GIMP_TIMER_END() @@ -62864,13 +63706,13 @@ Use it for projection benchmarking and add timing to scaling. app/actions/debug-commands.c | 9 +++------ - app/core/gimp-utils.h | 9 +++++++++ + app/core/gimp-utils.h | 9 +++++++++ app/core/gimpdrawable.c | 5 +++++ 3 files changed, 17 insertions(+), 6 deletions(-) commit 17961941fc78dcc13b8cc381bf8405bb568cee3e Author: Michael Natterer -Date: Sun Jun 6 19:54:44 2010 +0200 +Date: Sun Jun 6 19:54:44 2010 +0200 app: use gegl:scale for scaling if use-gegl is TRUE @@ -62880,7 +63722,7 @@ commit 301b990a4682fd8881f896805cbabca96da5b0ac Author: Michael Natterer -Date: Sun Jun 6 19:52:39 2010 +0200 +Date: Sun Jun 6 19:52:39 2010 +0200 app: add gimp_drawable_apply_operation_to_tiles() @@ -62894,7 +63736,7 @@ commit 6e9796850b83ab7207463ef92bfeccbc3c26a6b2 Author: Michael Natterer -Date: Sun Jun 6 19:50:59 2010 +0200 +Date: Sun Jun 6 19:50:59 2010 +0200 app: more g_strcmp0() @@ -62903,20 +63745,20 @@ commit 8cefb2913eccd479e221b1f8c7c1e6aa19a7d6aa Author: Michael Natterer -Date: Sun Jun 6 19:15:49 2010 +0200 +Date: Sun Jun 6 19:15:49 2010 +0200 app: use g_strcmp0() where strings can be NULL instead of checking manually app/actions/documents-commands.c | 2 +- - app/core/gimpobject.c | 6 ++---- - app/core/gimppdbprogress.c | 3 +-- - app/core/gimptagcache.c | 2 +- + app/core/gimpobject.c | 6 ++---- + app/core/gimppdbprogress.c | 3 +-- + app/core/gimptagcache.c | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) commit 6d67ffd6f0905f19603bd3cffcb991bc34a79bd8 Author: Michael Natterer -Date: Sun Jun 6 18:55:07 2010 +0200 +Date: Sun Jun 6 18:55:07 2010 +0200 app: some cleanup in GimpFilteredContainer @@ -62925,7 +63767,7 @@ commit 6cdf63cc71017068bbd2a1fd92b6cd28130bb42b Author: Michael Natterer -Date: Sun Jun 6 17:41:31 2010 +0200 +Date: Sun Jun 6 17:41:31 2010 +0200 app: add gimp_interpolation_to_gegl_filter() @@ -62935,7 +63777,7 @@ commit 9ebc3b11b95482a564027d7df1bb1d956a757d70 Author: Xandru Armesto -Date: Sun Jun 6 17:06:49 2010 +0200 +Date: Sun Jun 6 17:06:49 2010 +0200 updated asturian translation @@ -62944,7 +63786,7 @@ commit e5562ab83cea4fb4ea73a41f2c2c4407f70e6fe4 Author: Xandru Armesto -Date: Sun Jun 6 16:59:22 2010 +0200 +Date: Sun Jun 6 16:59:22 2010 +0200 Updated asturian translation @@ -62954,7 +63796,7 @@ commit 96a5c558b57c1e8c077258e1b278dfbe52ff0541 Author: Xandru Armesto -Date: Sun Jun 6 16:59:03 2010 +0200 +Date: Sun Jun 6 16:59:03 2010 +0200 Added asturian language @@ -62963,7 +63805,7 @@ commit 3c8baf6c28d9e8409bda4c0638564d5609786fbd Author: Michael Natterer -Date: Sun Jun 6 16:44:36 2010 +0200 +Date: Sun Jun 6 16:44:36 2010 +0200 app: make sure scale and resize progress is shown in the statusbar again @@ -62976,7 +63818,7 @@ commit 72bcb72c44a8c14b5ee6a7bdd4043ac0a3613523 Author: Michael Natterer -Date: Sat Jun 5 22:42:00 2010 +0200 +Date: Sat Jun 5 22:42:00 2010 +0200 app: rename gimp_template_create_image() to gimp_image_new_from_template() @@ -62984,18 +63826,18 @@ and move it from gimptemplate.c to gimpimage-new.c app/actions/templates-commands.c | 2 +- - app/core/gimpimage-new.c | 72 + app/core/gimpimage-new.c | 72 +++++++++++++++++++++++++++++++++++++ - app/core/gimpimage-new.h | 3 ++ - app/core/gimptemplate.c | 77 + app/core/gimpimage-new.h | 3 ++ + app/core/gimptemplate.c | 77 ---------------------------------------- - app/core/gimptemplate.h | 12 +++---- + app/core/gimptemplate.h | 12 +++---- app/dialogs/image-new-dialog.c | 2 +- 6 files changed, 81 insertions(+), 87 deletions(-) commit 9dd373d86e71ac69301e4cbfaaeb4bee0eb5be6a Author: Michael Natterer -Date: Sat Jun 5 19:26:06 2010 +0200 +Date: Sat Jun 5 19:26:06 2010 +0200 Bug 620604 - Description of "histogram" procedure is slightly inaccurate @@ -63023,27 +63865,27 @@ * app/pdb/color-cmds.c: regenerated, fixing the two broken ranges mentioned in the bug report. - app/pdb/color-cmds.c | 4 ++-- - tools/pdbgen/app.pl | 42 ++++++++++++++++++++++++++++++++++++------ - tools/pdbgen/pdb.pl | 16 +--------------- + app/pdb/color-cmds.c | 4 ++-- + tools/pdbgen/app.pl | 42 ++++++++++++++++++++++++++++++++++++------ + tools/pdbgen/pdb.pl | 16 +--------------- tools/pdbgen/pdbgen.pl | 4 ++-- 4 files changed, 41 insertions(+), 25 deletions(-) commit 2e0832169106469054b66de79b7774e218e335ee Author: Michael Natterer -Date: Sat Jun 5 18:26:53 2010 +0200 +Date: Sat Jun 5 18:26:53 2010 +0200 tools: remove redundant type "int32" from some array length params because they are int32 be default in the absence of an explicit type. - tools/pdbgen/pdb/drawable.pdb | 4 ++-- + tools/pdbgen/pdb/drawable.pdb | 4 ++-- tools/pdbgen/pdb/gradients.pdb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit 2e9b58d985dc50248eb54f6c344094038c269988 Author: Sira Nokyoongtong -Date: Fri Jun 4 20:24:23 2010 +0700 +Date: Fri Jun 4 20:24:23 2010 +0700 Updated Thai translation. @@ -63053,26 +63895,24 @@ commit 434bfbd6fad2960c9d723efcd3ba588102aa00e7 Author: Michael Natterer -Date: Thu Jun 3 22:32:30 2010 +0200 +Date: Thu Jun 3 22:32:30 2010 +0200 app: rename GimpToolOverlay to GimpOverlayDialog because it's only used by tools currently, but not related to them in any way. - app/tools/gimpimagemaptool.c | 18 +- - app/widgets/Makefile.am | 4 +- - app/widgets/gimpoverlaydialog.c | 473 - ++++++++++++++++++++++++++++++++++++++++ - app/widgets/gimpoverlaydialog.h | 69 ++++++ - app/widgets/gimptooloverlay.c | 473 - ---------------------------------------- - app/widgets/gimptooloverlay.h | 69 ------ - 6 files changed, 553 insertions(+), 553 deletions(-) + app/tools/gimpimagemaptool.c | 18 +- + app/widgets/Makefile.am | 4 +- + .../{gimptooloverlay.c => gimpoverlaydialog.c} | 194 + ++++++++++----------- + app/widgets/gimpoverlaydialog.h | 69 ++++++++ + app/widgets/gimptooloverlay.h | 69 -------- + 5 files changed, 177 insertions(+), 177 deletions(-) commit e6983567f258fc57fc9d435beb8659b8b3a560d3 Author: Michael Natterer -Date: Thu Jun 3 22:19:09 2010 +0200 +Date: Thu Jun 3 22:19:09 2010 +0200 app: add GimpContainerIconView, a new GimpContainerView based on GtkIconView @@ -63082,17 +63922,17 @@ without a modified GTK+, so it's disabled. Keeping it in GIT makes developing easier though. - app/widgets/Makefile.am | 2 + - app/widgets/gimpcontainereditor.c | 9 + + app/widgets/Makefile.am | 2 + + app/widgets/gimpcontainereditor.c | 9 + app/widgets/gimpcontainericonview.c | 774 ++++++++++++++++++++++++++++++++++++ - app/widgets/gimpcontainericonview.h | 70 ++++ - app/widgets/widgets-types.h | 1 + + app/widgets/gimpcontainericonview.h | 70 ++++ + app/widgets/widgets-types.h | 1 + 5 files changed, 856 insertions(+) commit a3b93151aa293b503920d00aeb74c17638acd23a Author: Michael Natterer -Date: Thu Jun 3 22:16:08 2010 +0200 +Date: Thu Jun 3 22:16:08 2010 +0200 app: some #if 0'ed testing code I occasionally need for debugging @@ -63104,7 +63944,7 @@ commit 15906be4d9457953665013c3fa90b1327d1b3b53 Author: Michael Natterer -Date: Thu Jun 3 22:09:02 2010 +0200 +Date: Thu Jun 3 22:09:02 2010 +0200 app: pull more code into GimpContainerTreeStore @@ -63130,7 +63970,7 @@ commit 6571759c43a6ac98aca9456a884427582493d38f Author: Michael Natterer -Date: Thu Jun 3 22:04:54 2010 +0200 +Date: Thu Jun 3 22:04:54 2010 +0200 app: make sure tool overlay dialogs close on Escape when they are focussed @@ -63141,18 +63981,18 @@ commit 2f6800c9d4d9b1c5f6bb595d7d587faab51869d7 Author: Ulf-D. Ehlert -Date: Wed Jun 2 13:35:32 2010 +0200 +Date: Wed Jun 2 13:35:32 2010 +0200 po: Minor fixes to German translations po-plug-ins/de.po | 44 ++++++++++++++++++++++++++++---------------- po-script-fu/de.po | 11 +++++++---- - po/de.po | 15 +++++++-------- + po/de.po | 15 +++++++-------- 3 files changed, 42 insertions(+), 28 deletions(-) commit 7b4c731192947e096ac10ddc57f9c2cdb6a8b423 Author: Martin Nordholts -Date: Sun May 23 12:36:24 2010 +0200 +Date: Sun May 23 12:36:24 2010 +0200 app: Add gimp_dockbook_get_tab_icon_size() @@ -63161,7 +64001,7 @@ commit 264c04198a310892cac113e1920bb8c7aceeeae4 Author: Thorsten Vollmer -Date: Sat May 29 22:28:26 2010 +0200 +Date: Sat May 29 22:28:26 2010 +0200 correct some inconsistencies and typos in INSTALL @@ -63172,7 +64012,7 @@ commit 5d8a9b156b7db2e486d9a9370ce3c303fdd9e23a Author: Thorsten Vollmer -Date: Sat May 29 22:16:08 2010 +0200 +Date: Sat May 29 22:16:08 2010 +0200 allow to disable libXpm @@ -63184,24 +64024,24 @@ commit 3f66808584d2252d278718f2e422bae558c8a034 Author: Barak Itkin -Date: Tue May 18 00:29:27 2010 +0300 +Date: Tue May 18 00:29:27 2010 +0300 Added a function to export the Pango markup of a text layer This is required for the PDF export plugin. - app/pdb/internal-procs.c | 2 +- - app/pdb/text-layer-cmds.c | 68 + app/pdb/internal-procs.c | 2 +- + app/pdb/text-layer-cmds.c | 68 +++++++++++++++++++++++++++++++++++++++++ - libgimp/gimp.def | 1 + - libgimp/gimptextlayer_pdb.c | 36 ++++++++++++++++++++++ - libgimp/gimptextlayer_pdb.h | 1 + + libgimp/gimp.def | 1 + + libgimp/gimptextlayer_pdb.c | 36 ++++++++++++++++++++++ + libgimp/gimptextlayer_pdb.h | 1 + tools/pdbgen/pdb/text_layer.pdb | 47 +++++++++++++++++++++++++++- 6 files changed, 153 insertions(+), 2 deletions(-) commit bc54cbfd573d6d6ea0507e93f2e79bce8d5a8af9 Author: Martin Nordholts -Date: Tue Jun 1 20:45:46 2010 +0200 +Date: Tue Jun 1 20:45:46 2010 +0200 Add --without-mac-twain to configure @@ -63211,7 +64051,7 @@ commit 5ab64953509136072e12454b8fda803487c15d10 Author: Michael Natterer -Date: Mon May 31 23:06:52 2010 +0200 +Date: Mon May 31 23:06:52 2010 +0200 app: say "Reset All Tool Options" in the confirm dialog @@ -63222,7 +64062,7 @@ commit 7ed39988701e436b71fd1888bc674dbedd751fbc Author: Sven Neumann -Date: Mon May 31 21:36:36 2010 +0200 +Date: Mon May 31 21:36:36 2010 +0200 script-fu: clean up coding style and translatable messages @@ -63232,7 +64072,7 @@ commit e745ad94e4fc4b5c5410d7767cc4a6a6133d5c8c Author: Sven Neumann -Date: Mon May 31 21:10:46 2010 +0200 +Date: Mon May 31 21:10:46 2010 +0200 script-fu: menu path should not be marked for translation @@ -63241,7 +64081,7 @@ commit 356d2fb88c8053e0946773e58cd80eeb517e522b Author: Michael Natterer -Date: Sun May 30 18:10:35 2010 +0200 +Date: Sun May 30 18:10:35 2010 +0200 app: remove #include "gimpcontainergridview.h" @@ -63250,7 +64090,7 @@ commit c75bab37d305fce004edc2c8b3c76695a3e967e0 Author: Michael Natterer -Date: Sun May 30 18:08:55 2010 +0200 +Date: Sun May 30 18:08:55 2010 +0200 app: remove useless #includes @@ -63259,7 +64099,7 @@ commit 7cdf66a9a1ab5cddb38291a81659afff2edaf85d Author: Michael Natterer -Date: Sun May 30 17:22:30 2010 +0200 +Date: Sun May 30 17:22:30 2010 +0200 app: remove GtkVWrapBox because it's unused @@ -63271,37 +64111,37 @@ commit 6429c3de1bf19625f73ba6705939fc83332a5f7b Author: Michael Natterer -Date: Sun May 30 17:19:47 2010 +0200 +Date: Sun May 30 17:19:47 2010 +0200 app: #undef GSEAL_ENABLE to build against the gtk-2-22 branch GDK structs and objects have been sealed in gtk-2-22, but we can't use the newly introduced accessors yet. - app/widgets/gimpdeviceinfo.c | 2 ++ - app/widgets/gimpdevices.c | 2 ++ + app/widgets/gimpdeviceinfo.c | 2 ++ + app/widgets/gimpdevices.c | 2 ++ app/widgets/gimpdevicestatus.c | 2 ++ - app/widgets/gimpdnd-xds.c | 2 ++ - app/widgets/gimptoolbox.c | 2 ++ - app/widgets/gtkvwrapbox.c | 1 + + app/widgets/gimpdnd-xds.c | 2 ++ + app/widgets/gimptoolbox.c | 2 ++ + app/widgets/gtkvwrapbox.c | 1 + 6 files changed, 11 insertions(+) commit c67a8c75460b9d1faa25a1373afcfd313f27fdea Author: Martin Nordholts -Date: Sat May 29 15:46:15 2010 +0200 +Date: Sat May 29 15:46:15 2010 +0200 app/tests: Don't have toolbox in sessionrc in session-management test Enable it again when we have a way to handle that the toolbox size is likely to change due to the use of GDK_HINT_RESIZE_INC. - app/tests/gimpdir/sessionrc | 10 ++++++---- + app/tests/gimpdir/sessionrc | 10 ++++++---- app/tests/gimpdir/sessionrc-expected | 6 ------ 2 files changed, 6 insertions(+), 10 deletions(-) commit 0d66ff0a310643776e2183027985e7fff347d76a Author: Sven Neumann -Date: Fri May 28 22:31:15 2010 +0200 +Date: Fri May 28 22:31:15 2010 +0200 plug-ins: move variables to local scope @@ -63310,7 +64150,7 @@ commit 754b556ea6939da36541ff81c9ee06f03f6f0610 Author: Sven Neumann -Date: Fri May 28 22:20:35 2010 +0200 +Date: Fri May 28 22:20:35 2010 +0200 Bug 619189 - Add support for RGB565 in csource export filter @@ -63324,7 +64164,7 @@ commit e942d1e91399cc92f1e8944de91a85c39a30fe1b Author: Martin Nordholts -Date: Thu May 27 18:53:14 2010 +0200 +Date: Thu May 27 18:53:14 2010 +0200 plug-ins: Remove bogus ) in file-xmc.c @@ -63333,7 +64173,7 @@ commit a68963ab1675184aa20035b5a90d10b9fd8361bf Author: Martin Nordholts -Date: Wed May 26 17:20:55 2010 +0200 +Date: Wed May 26 17:20:55 2010 +0200 etc: Explicitly set 'tab-style icon' on "gimp-tool-options" @@ -63346,7 +64186,7 @@ commit 3a1c319c916c09f95be0dd0da2b3ca8308849b1e Author: Michael Natterer -Date: Wed May 26 11:47:52 2010 +0200 +Date: Wed May 26 11:47:52 2010 +0200 app: disable double buffering on all offscreen widgets @@ -63358,7 +64198,7 @@ commit a4ccfcee72e13228ced79185d1116c846df63892 Author: Roman Joost -Date: Sat May 15 18:56:36 2010 +1000 +Date: Sat May 15 18:56:36 2010 +1000 Default XMP_TYPE_LANG_ALT to "x-default" according to spec. @@ -63371,7 +64211,7 @@ commit 064c3f661aa58c008f355db4a147b4fc3d20f112 Author: Martin Nordholts -Date: Sat May 22 20:11:43 2010 +0200 +Date: Sat May 22 20:11:43 2010 +0200 app: Add gimp_dockable_convert_tab_style() @@ -63381,7 +64221,7 @@ commit 6efcab2e517f7dd588cc4b8f4c819cab9d301244 Author: Martin Nordholts -Date: Sat May 22 19:31:27 2010 +0200 +Date: Sat May 22 19:31:27 2010 +0200 app: Add gimp_dockbook_recreate_tab_widgets() @@ -63391,7 +64231,7 @@ commit 9cd68579e4a10daf86c201901e1d3e6a263efcb5 Author: Barak Itkin -Date: Tue May 18 09:56:17 2010 +0300 +Date: Tue May 18 09:56:17 2010 +0300 Bug 618961 - Bad escape character in script-fu palette-export prevents parsing @@ -63404,7 +64244,7 @@ commit ed6fa8d3f391e1414e4cecac52cc6f5e90a833eb Author: Sven Neumann -Date: Fri May 21 22:19:24 2010 +0200 +Date: Fri May 21 22:19:24 2010 +0200 plug-ins: adjust user-visible strings for consistency @@ -63413,7 +64253,7 @@ commit c3f1d0c33b8844d8f0a9969a899864f2322de889 Author: Sven Neumann -Date: Thu May 20 21:08:57 2010 +0200 +Date: Thu May 20 21:08:57 2010 +0200 plug-ins: improve error messages @@ -63422,7 +64262,7 @@ commit 649bd8f678de44154979c8cdbdd76c318e8b528a Author: Michael Natterer -Date: Thu May 20 10:11:18 2010 +0200 +Date: Thu May 20 10:11:18 2010 +0200 Bug 619131 - Attempting to flip FG/BG hard-edge gradient locks up GIMP @@ -63434,7 +64274,7 @@ commit 788ba611af9435b8c5f6f8bda64416490ac5597a Author: Michael Natterer -Date: Wed May 19 20:07:31 2010 +0200 +Date: Wed May 19 20:07:31 2010 +0200 app: base multiple selection API on the GtkSelectionMode enum @@ -63443,18 +64283,18 @@ with GTK+. app/widgets/gimpcontainereditor.c | 14 +++--- - app/widgets/gimpcontainereditor.h | 8 ++-- + app/widgets/gimpcontainereditor.h | 8 ++-- app/widgets/gimpcontainertreeview.c | 38 ++++++++--------- app/widgets/gimpcontainerview.c | 85 +++++++++++++++++++------------------ app/widgets/gimpcontainerview.h | 84 ++++++++++++++++++------------------ - app/widgets/gimpdatafactoryview.c | 2 +- + app/widgets/gimpdatafactoryview.c | 2 +- 6 files changed, 116 insertions(+), 115 deletions(-) commit 899fbb94b770d7e1b50bd3a0f002883cbd5cfcf0 Author: Martin Nordholts -Date: Wed May 19 07:02:13 2010 +0200 +Date: Wed May 19 07:02:13 2010 +0200 Update POTFILES.in @@ -63463,7 +64303,7 @@ commit ae7449a81ba48f120d969be9a5b4ebe562213280 Author: Michael Natterer -Date: Mon May 17 22:35:12 2010 +0200 +Date: Mon May 17 22:35:12 2010 +0200 app: use a GimpContainerTreeStore for GimpContainerEntry @@ -63476,7 +64316,7 @@ commit 0d659b0496ce4e515b7fa24d40d54b9ef49f9dad Author: Michael Natterer -Date: Mon May 17 22:34:09 2010 +0200 +Date: Mon May 17 22:34:09 2010 +0200 app: add "use-name" property and API to GimpContainerTreeStore @@ -63489,7 +64329,7 @@ commit 998b906dcd28c3adca76f89bfd26db6a1c5af1f3 Author: Michael Natterer -Date: Mon May 17 22:05:08 2010 +0200 +Date: Mon May 17 22:05:08 2010 +0200 app: use a GimpContainerTreeStore for GimpContainerComboBox @@ -63497,13 +64337,13 @@ app/widgets/gimpcontainercombobox.c | 218 ++++++++---------------------------- - app/widgets/gimpcontainercombobox.h | 14 +-- - app/widgets/gimpsettingsbox.c | 3 +- + app/widgets/gimpcontainercombobox.h | 14 +-- + app/widgets/gimpsettingsbox.c | 3 +- 3 files changed, 50 insertions(+), 185 deletions(-) commit 89f7500b79dad91a18bf29eaed66a64d557f6ce1 Author: Michael Natterer -Date: Mon May 17 21:34:11 2010 +0200 +Date: Mon May 17 21:34:11 2010 +0200 app: add gimp_container_tree_store_columns_init() @@ -63516,7 +64356,7 @@ commit e1a88379d03c78f9472374be92031dff7c2a0753 Author: Michael Natterer -Date: Mon May 17 21:28:17 2010 +0200 +Date: Mon May 17 21:28:17 2010 +0200 app: remove the model column enum from gimpcontainertreeview.h @@ -63524,21 +64364,21 @@ place instead. app/widgets/gimpcontainertreeview-dnd.c | 3 ++- - app/widgets/gimpcontainertreeview.c | 34 + app/widgets/gimpcontainertreeview.c | 34 ++++++++++++++++----------------- - app/widgets/gimpcontainertreeview.h | 11 ----------- - app/widgets/gimpdatafactoryview.c | 5 +++-- - app/widgets/gimpdeviceeditor.c | 9 +++++---- - app/widgets/gimpitemtreeview.c | 8 ++++---- - app/widgets/gimplayertreeview.c | 8 ++++---- - app/widgets/gimpsettingseditor.c | 7 ++++--- - app/widgets/gimptemplateview.c | 5 +++-- - app/widgets/gimptooleditor.c | 5 +++-- + app/widgets/gimpcontainertreeview.h | 11 ----------- + app/widgets/gimpdatafactoryview.c | 5 +++-- + app/widgets/gimpdeviceeditor.c | 9 +++++---- + app/widgets/gimpitemtreeview.c | 8 ++++---- + app/widgets/gimplayertreeview.c | 8 ++++---- + app/widgets/gimpsettingseditor.c | 7 ++++--- + app/widgets/gimptemplateview.c | 5 +++-- + app/widgets/gimptooleditor.c | 5 +++-- 10 files changed, 45 insertions(+), 50 deletions(-) commit 104d0ffb3efd813a34efbb11566ea1e9c6444875 Author: Michael Natterer -Date: Mon May 17 21:22:36 2010 +0200 +Date: Mon May 17 21:22:36 2010 +0200 app: add gimp_container_tree_store_columns_add() @@ -63554,24 +64394,24 @@ commit 82a5c62e54d3f764c172e13fab0e132be2bc0e74 Author: Michael Natterer -Date: Mon May 17 21:06:28 2010 +0200 +Date: Mon May 17 21:06:28 2010 +0200 app: add GimpContainerTreeStore which is a GtkTreeStore subclass and pulls the store handling logic out of GimpContainerTreeView so it can be reused. - app/widgets/Makefile.am | 2 + + app/widgets/Makefile.am | 2 + app/widgets/gimpcontainertreestore.c | 466 +++++++++++++++++++++++++++++++++++ app/widgets/gimpcontainertreestore.h | 83 +++++++ app/widgets/gimpcontainertreeview.c | 243 +++--------------- - app/widgets/widgets-types.h | 1 + + app/widgets/widgets-types.h | 1 + 5 files changed, 586 insertions(+), 209 deletions(-) commit 00f0350413355e108f288d492165683a1072b0b4 Author: Sven Neumann -Date: Sun May 16 22:26:11 2010 +0200 +Date: Sun May 16 22:26:11 2010 +0200 Bug 618580 - Thread pool creation fails if number of CPUs is > GIMP_MAX_NUM_THREADS @@ -63584,7 +64424,7 @@ commit 7de8fa5293fabdfc44ce0a1c1e2e8d9ee5e7cf3c Author: Martin Nordholts -Date: Sun May 16 20:28:00 2010 +0200 +Date: Sun May 16 20:28:00 2010 +0200 plug-ins: Refer to 'Windows' as 'Microsoft Windows' @@ -63593,19 +64433,19 @@ commit 250f473ea77d67c782202f1ced3933fe917b3212 Author: Martin Nordholts -Date: Sun May 16 19:54:06 2010 +0200 +Date: Sun May 16 19:54:06 2010 +0200 Update NEWS, AUTHORS and INSTALL with changes up to now - AUTHORS | 3 +++ - INSTALL | 8 ++++---- - NEWS | 20 ++++++++++++++++++-- - authors.xml | 3 +++ + AUTHORS | 3 +++ + INSTALL | 8 ++++---- + NEWS | 20 ++++++++++++++++++-- + authors.xml | 3 +++ 4 files changed, 28 insertions(+), 6 deletions(-) commit d7dc2dc1ab509c078d5584ddb9dddb790d0d0441 Author: Martin Nordholts -Date: Sun May 16 12:19:18 2010 +0200 +Date: Sun May 16 12:19:18 2010 +0200 app: Make tooltips in the toolbox work again @@ -63616,22 +64456,22 @@ toolboxes created from scratch. app/actions/dialogs-commands.c | 1 + - app/actions/file-commands.c | 4 ++++ - app/actions/image-commands.c | 1 + + app/actions/file-commands.c | 4 ++++ + app/actions/image-commands.c | 1 + app/actions/palettes-commands.c | 1 + - app/gui/gimpuiconfigurer.c | 1 + - app/gui/gui-message.c | 1 + - app/tests/test-ui.c | 1 + + app/gui/gimpuiconfigurer.c | 1 + + app/gui/gui-message.c | 1 + + app/tests/test-ui.c | 1 + app/widgets/gimpdialogfactory.c | 10 +++++++++- app/widgets/gimpdialogfactory.h | 1 + app/widgets/gimpsessioninfo-dock.c | 1 + - app/widgets/gimpsessioninfo.c | 1 + + app/widgets/gimpsessioninfo.c | 1 + app/widgets/gimpwidgets-utils.c | 2 ++ 12 files changed, 24 insertions(+), 1 deletion(-) commit afa9bd3b9ab14b52474aa2bcfe9e01709720964d Author: Cameron Gregory -Date: Sun May 16 11:42:45 2010 +0200 +Date: Sun May 16 11:42:45 2010 +0200 plug-ins: script-fu-selection-rounded-rectangle takes four arguments @@ -63643,7 +64483,7 @@ commit 19d4ad70f939ca173e32f0e65fc34e69f11a9ac3 Author: Nelson A. de Oliveira -Date: Wed Nov 18 17:48:24 2009 -0200 +Date: Wed Nov 18 17:48:24 2009 -0200 Bug 595605 - memory leaks in plug-ins/common/curve-bend.c @@ -63654,7 +64494,7 @@ commit df24468fde963d158d57d8926c4459f718403335 Author: Tor Lillqvist -Date: Sun May 16 11:00:53 2010 +0200 +Date: Sun May 16 11:00:53 2010 +0200 Bug 544560 - Loading PDF file fails if its path contains non-ascii characters @@ -63668,7 +64508,7 @@ commit 1ca7c6df50907260dd620037f317bed335682872 Author: Gilles Rochefort -Date: Sat May 15 20:55:29 2010 +0200 +Date: Sat May 15 20:55:29 2010 +0200 Bug 613841 - Reducing toolbox width in single window mode @@ -63679,7 +64519,7 @@ commit e3b0bda9629f45b818d97af6309144013d2f2976 Author: Martin Nordholts -Date: Mon Apr 19 04:32:18 2010 +0200 +Date: Mon Apr 19 04:32:18 2010 +0200 app: Use 'create' not 'new' in dockable instance creation methods @@ -63694,7 +64534,7 @@ commit 256eee985019705da2edab832678d11caf1e1845 Author: Alexia Death -Date: Fri May 14 21:25:09 2010 +0300 +Date: Fri May 14 21:25:09 2010 +0300 app: Fix Outline transforming for generated brushes @@ -63703,7 +64543,7 @@ commit b0d02666a3521d8ed78f92ef23708a4b1a563d0f Author: Alexia Death -Date: Fri May 14 20:57:48 2010 +0300 +Date: Fri May 14 20:57:48 2010 +0300 app: A few more generic aspect ratio fixes @@ -63714,38 +64554,38 @@ commit 45a8d2c63ce83a1757840edff383a7280820e8a7 Author: Roman Joost -Date: Sun May 9 21:53:22 2010 +1000 +Date: Sun May 9 21:53:22 2010 +1000 Make use of the XMPModel widget interface. The GtkEntry is re-factored to use the XMPModel based interface. - plug-ins/metadata/gimpxmpmodelentry.c | 230 + plug-ins/metadata/gimpxmpmodelentry.c | 230 ++++----------------------------- - plug-ins/metadata/gimpxmpmodelentry.h | 17 ++- - plug-ins/metadata/gimpxmpmodeltext.c | 4 +- + plug-ins/metadata/gimpxmpmodelentry.h | 17 ++- + plug-ins/metadata/gimpxmpmodeltext.c | 4 +- plug-ins/metadata/gimpxmpmodelwidget.c | 45 ++++++- 4 files changed, 77 insertions(+), 219 deletions(-) commit b124fe6de67b29c5f73c81710448bda887bede07 Author: Roman Joost -Date: Sun May 9 21:49:56 2010 +1000 +Date: Sun May 9 21:49:56 2010 +1000 New GtkTextView widget based on the XMPModel widget. The new widget provides editing capabilities for the description and keywords. It uses the new interface for XMPModel widgets. - plug-ins/metadata/Makefile.am | 4 ++ + plug-ins/metadata/Makefile.am | 4 ++ plug-ins/metadata/gimpxmpmodeltext.c | 115 +++++++++++++++++++++++++++++++++++ plug-ins/metadata/gimpxmpmodeltext.h | 67 ++++++++++++++++++++ - plug-ins/metadata/interface.c | 59 ++++-------------- + plug-ins/metadata/interface.c | 59 ++++-------------- 4 files changed, 197 insertions(+), 48 deletions(-) commit c628c1e949766d4e3cd6cfad9fab7e648ec5e33a Author: Roman Joost -Date: Sun May 9 21:47:01 2010 +1000 +Date: Sun May 9 21:47:01 2010 +1000 New interface for XMPModel-based gtkwidgets. @@ -63761,7 +64601,7 @@ commit 79eb42689374f326535a10b86b78d4b65de282dc Author: Sven Neumann -Date: Mon May 10 21:25:00 2010 +0200 +Date: Mon May 10 21:25:00 2010 +0200 plug-ins: coding style cleanup and a few simplifications @@ -63771,7 +64611,7 @@ commit 55bc1fa84fd1dabfc286d7aee7c53e8fb0105bf6 Author: Sven Neumann -Date: Mon May 10 20:43:12 2010 +0200 +Date: Mon May 10 20:43:12 2010 +0200 Bug 144454 - Loading and storing DICOM again looses important information @@ -63785,7 +64625,7 @@ commit 67ba62154e22d23d0a9f5c8fba61ccc547e9a2ab Author: Michael Natterer -Date: Wed May 12 19:00:18 2010 +0200 +Date: Wed May 12 19:00:18 2010 +0200 app: fix and improve text style overlay keyboard interaction @@ -63800,12 +64640,12 @@ widgets in the style editor doesn't work. app/display/gimpdisplayshell-callbacks.c | 11 +++++++---- - app/widgets/gimptextstyleeditor.c | 8 -------- + app/widgets/gimptextstyleeditor.c | 8 -------- 2 files changed, 7 insertions(+), 12 deletions(-) commit 4ceb72848a5cfb1f06dcd80da2d8f4f376409732 Author: Michael Natterer -Date: Mon May 10 20:57:45 2010 +0200 +Date: Mon May 10 20:57:45 2010 +0200 app: enable canvas double buffering if there is a transform preview @@ -63816,7 +64656,7 @@ commit b925e256d305e660619bee7f475e124b45b83013 Author: Michael Natterer -Date: Mon May 10 20:00:23 2010 +0200 +Date: Mon May 10 20:00:23 2010 +0200 app: don't set the GTK_HAS_FOCUS flag on the canvas manually @@ -63829,7 +64669,7 @@ commit 46ea1971719aa2bdd02fc5a9f60aee22b21d07be Author: Michael Natterer -Date: Mon May 10 17:54:49 2010 +0200 +Date: Mon May 10 17:54:49 2010 +0200 app: avoid the deprecated and sealed GTK_OBJECT_FLAGS() @@ -63838,7 +64678,7 @@ commit 7c042df739dc30f2175ebbb4cb94001ab96b6e0f Author: Michael Natterer -Date: Mon May 10 17:30:17 2010 +0200 +Date: Mon May 10 17:30:17 2010 +0200 app: use a GtkToolPalette for the grid of tools in the toolbox @@ -63848,7 +64688,7 @@ commit 0938001858cad8552b2c33b6b0e00929bf559b44 Author: Marco Ciampa -Date: Mon May 10 08:47:35 2010 +0200 +Date: Mon May 10 08:47:35 2010 +0200 Little fix in italian translation. @@ -63857,7 +64697,7 @@ commit 74f907ca33677a55adee7473c15b1b1015dcff7f Author: Alexia Death -Date: Mon May 10 00:14:24 2010 +0300 +Date: Mon May 10 00:14:24 2010 +0300 app: Fix curve application to tilt aspect ratio maping @@ -63866,7 +64706,7 @@ commit 4816a61dcb7dcec59853315471a6131c1f71d833 Author: Alexia Death -Date: Mon May 10 00:11:55 2010 +0300 +Date: Mon May 10 00:11:55 2010 +0300 app: Aspect ratio fixes @@ -63876,7 +64716,7 @@ commit 0cb1ada8183583c5742f0616c77cfad9becf1880 Author: Alexia Death -Date: Mon May 10 00:11:07 2010 +0300 +Date: Mon May 10 00:11:07 2010 +0300 app: convert aspect ratio to scale_x&scale_y just before matrix transform @@ -63884,12 +64724,12 @@ app/core/gimpbrush-transform.c | 48 ++++++++++++++++++++++-------------------- app/core/gimpbrush-transform.h | 4 ++-- - app/paint/gimpbrushcore.c | 3 ++- + app/paint/gimpbrushcore.c | 3 ++- 3 files changed, 29 insertions(+), 26 deletions(-) commit 39339957ef76a347e7f50f44ab973d9611fbabcc Author: Aron Xu -Date: Fri May 7 16:42:51 2010 +0800 +Date: Fri May 7 16:42:51 2010 +0800 Update Simplified Chinese translation. @@ -63899,7 +64739,7 @@ commit bfc9009ce028af77fe63b668650f42efbb5fc221 Author: Aron Xu -Date: Fri May 7 16:41:33 2010 +0800 +Date: Fri May 7 16:41:33 2010 +0800 Update Simplified Chinese translation. @@ -63908,7 +64748,7 @@ commit 89acd1fe91e8b836c021596119b67077b504e26e Author: Aron Xu -Date: Fri May 7 16:37:56 2010 +0800 +Date: Fri May 7 16:37:56 2010 +0800 Update Simplified Chinese translation. @@ -63918,7 +64758,7 @@ commit b983e1fc8220fa66a83ca5dae173a041ab8638e5 Author: Aron Xu -Date: Fri May 7 16:26:05 2010 +0800 +Date: Fri May 7 16:26:05 2010 +0800 Update Simplified Chinese translation. @@ -63928,7 +64768,7 @@ commit aa806486e4031c300a3edd8e9db38ee27cd893af Author: Sven Neumann -Date: Thu May 6 20:52:33 2010 +0200 +Date: Thu May 6 20:52:33 2010 +0200 Bug 616564 - Dicom Plugin Storing Odd Length Dicom Tags @@ -63941,7 +64781,7 @@ commit da6ab495b99e4eb9492a94b8045e9c2b2acdcaf9 Author: Jon Nordby -Date: Tue May 4 12:42:53 2010 +0200 +Date: Tue May 4 12:42:53 2010 +0200 plug-ins: OpenRaster visibility layer attribute @@ -63950,7 +64790,7 @@ commit c16af0160677292e8fc8ba96bcd2361ee049c499 Author: Jon Nordby -Date: Thu May 6 03:44:01 2010 +0200 +Date: Thu May 6 03:44:01 2010 +0200 plug-ins: OpenRaster, fix wrong layer positions @@ -63965,7 +64805,7 @@ commit 262bfd9c3303cb2938b1f68b54ce065b13a538b0 Author: Olle Niit -Date: Tue May 4 07:10:00 2010 +0300 +Date: Tue May 4 07:10:00 2010 +0300 Estonian translation updated @@ -63975,7 +64815,7 @@ commit 4c8519ebd034605cb686bbee26bfa0ae66b0dc3e Author: Mihkel Tõnnov -Date: Tue May 4 07:07:59 2010 +0300 +Date: Tue May 4 07:07:59 2010 +0300 Estonian translation updated @@ -63985,7 +64825,7 @@ commit a26a6027cc4872ce312c699b1cd07755d8528b20 Author: Olle Niit -Date: Tue May 4 07:05:35 2010 +0300 +Date: Tue May 4 07:05:35 2010 +0300 Estonian translation updated @@ -63995,7 +64835,7 @@ commit 6207eb067db461f8a044751f1ab1753eca0de73f Author: Priit Laes -Date: Tue May 4 07:04:11 2010 +0300 +Date: Tue May 4 07:04:11 2010 +0300 Estonian translation updated @@ -64005,7 +64845,7 @@ commit 7549f0feade3b6091377c31f746237490e1aeab6 Author: Michael Natterer -Date: Sun May 2 16:08:47 2010 +0200 +Date: Sun May 2 16:08:47 2010 +0200 app: really clip guide and sample point drawing to the exposed region @@ -64014,7 +64854,7 @@ commit 1f8d2e66e1aec6ca256c03d655d651ed9149e805 Author: Michael Natterer -Date: Sun May 2 16:06:15 2010 +0200 +Date: Sun May 2 16:06:15 2010 +0200 app: make clip rect and clip region parameters const @@ -64025,7 +64865,7 @@ commit 2a289a75f4175a5af4ad173052f616e541132fe5 Author: Michael Natterer -Date: Sun May 2 16:01:40 2010 +0200 +Date: Sun May 2 16:01:40 2010 +0200 app: don't draw guides which are out of canvas @@ -64034,21 +64874,21 @@ commit 02b8eea08625a9b844a947e23c283d015a964bfe Author: Michael Natterer -Date: Sun May 2 15:58:51 2010 +0200 +Date: Sun May 2 15:58:51 2010 +0200 app: restrict sample point drawing to the exposed region With the same limitation as for guides in the last commit. app/display/gimpdisplayshell-callbacks.c | 2 +- - app/display/gimpdisplayshell-draw.c | 27 +++++++++++++++++++++------ - app/display/gimpdisplayshell-draw.h | 4 +++- - app/tools/gimpcolortool.c | 15 ++++++++------- + app/display/gimpdisplayshell-draw.c | 27 +++++++++++++++++++++------ + app/display/gimpdisplayshell-draw.h | 4 +++- + app/tools/gimpcolortool.c | 15 ++++++++------- 4 files changed, 33 insertions(+), 15 deletions(-) commit 6e4be79befc3f0a690a1396240c1b24c6ea09044 Author: Michael Natterer -Date: Sun May 2 15:40:11 2010 +0200 +Date: Sun May 2 15:40:11 2010 +0200 app: restrict grid and guide drawing to the exposed region @@ -64056,15 +64896,15 @@ to draw them when they are outside the expose region's bounding box. app/display/gimpdisplayshell-callbacks.c | 4 +- - app/display/gimpdisplayshell-draw.c | 66 + app/display/gimpdisplayshell-draw.c | 66 ++++++++++++++++++++------------ - app/display/gimpdisplayshell-draw.h | 6 ++- - app/tools/gimpmovetool.c | 12 +++--- + app/display/gimpdisplayshell-draw.h | 6 ++- + app/tools/gimpmovetool.c | 12 +++--- 4 files changed, 54 insertions(+), 34 deletions(-) commit fc5775f16fd962134d287a64a27178d7c4c8db1a Author: Michael Natterer -Date: Sun May 2 13:08:11 2010 +0200 +Date: Sun May 2 13:08:11 2010 +0200 app: remove lots of bounds checks from gimp_display_shell_draw_area() @@ -64076,7 +64916,7 @@ commit 84cf53d90837227899a5e590781677fdbf4b4fe6 Author: Michael Natterer -Date: Sun May 2 12:12:48 2010 +0200 +Date: Sun May 2 12:12:48 2010 +0200 app: fix artifacts caused by delayed tool drawing @@ -64093,16 +64933,16 @@ pausing/resuming the active tool *outside* the double buffered drawing. - app/display/gimpcanvas.c | 1 + + app/display/gimpcanvas.c | 1 + app/display/gimpdisplayshell-callbacks.c | 135 ++++++++++++++++++++++--------- app/display/gimpdisplayshell-callbacks.h | 4 + - app/display/gimpdisplayshell.c | 3 + + app/display/gimpdisplayshell.c | 3 + 4 files changed, 107 insertions(+), 36 deletions(-) commit be1e775d0889b744d8aa2ebb8661f5c46350eb3f Author: Marco Ciampa -Date: Sun May 2 00:23:31 2010 +0200 +Date: Sun May 2 00:23:31 2010 +0200 Updated italian translation. @@ -64111,7 +64951,7 @@ commit 656e99faf5240ae2a25742d8579cf9243d5819b3 Author: Michael Natterer -Date: Sat May 1 18:02:42 2010 +0200 +Date: Sat May 1 18:02:42 2010 +0200 app: clean up and simplify gimp_display_shell_canvas_expose() @@ -64121,7 +64961,7 @@ commit 1833a6eaa1ec085d6e0b1af3ce4d84666351c94d Author: Michael Natterer -Date: Sat May 1 17:45:31 2010 +0200 +Date: Sat May 1 17:45:31 2010 +0200 app: honor the exact region when drawing and invalidate overlay children @@ -64136,7 +64976,7 @@ commit d445361f172190fea8a4af51373decc322e41da0 Author: Michael Natterer -Date: Sat May 1 14:36:20 2010 +0200 +Date: Sat May 1 14:36:20 2010 +0200 Revert "Adds layer_group_get_layers call: minimal layer group support to the PDB" @@ -64149,7 +64989,7 @@ commit d3ab91b7d2ce4b78938d34531118b2f79cf8d8aa Author: Michael Natterer -Date: Sat May 1 14:36:04 2010 +0200 +Date: Sat May 1 14:36:04 2010 +0200 Revert "Adds a layer-group aware layers property to Layer objects" @@ -64160,7 +65000,7 @@ commit 2525e30429fd8634126ea9e0dd553fc0e1b4a0ed Author: João S. O. Bueno -Date: Fri Apr 23 00:55:36 2010 -0300 +Date: Fri Apr 23 00:55:36 2010 -0300 Adds a layer-group aware layers property to Layer objects @@ -64169,7 +65009,7 @@ commit cc60d331f7ed1e1fc189c9c27af781f79c16f214 Author: João S. O. Bueno -Date: Fri Apr 23 00:04:39 2010 -0300 +Date: Fri Apr 23 00:04:39 2010 -0300 Adds layer_group_get_layers call: minimal layer group support to the PDB @@ -64180,7 +65020,7 @@ commit 9eac51989a49c0b03993bee8d46ef7763152902f Author: Ulf-D. Ehlert -Date: Tue Apr 27 14:33:51 2010 +0200 +Date: Tue Apr 27 14:33:51 2010 +0200 po: Fix German translation @@ -64190,29 +65030,29 @@ commit 506469f9f923183d1946297b57babbd1a03ce0b9 Author: Michael Natterer -Date: Mon Apr 26 18:52:49 2010 +0200 +Date: Mon Apr 26 18:52:49 2010 +0200 app: minor formatting cleanup - app/core/gimptoolpreset.c | 5 +++-- - app/core/gimptoolpreset.h | 10 +++++----- + app/core/gimptoolpreset.c | 5 +++-- + app/core/gimptoolpreset.h | 10 +++++----- app/widgets/gimptoolpreseteditor.c | 21 ++++++++++++++------- 3 files changed, 22 insertions(+), 14 deletions(-) commit 5e1c9d228c233c3013d0c300dece9cee7d8ccd23 Author: Alexia Death -Date: Sat Apr 24 18:51:42 2010 +0300 +Date: Sat Apr 24 18:51:42 2010 +0300 app: Fix tool preset editor init - app/core/gimptoolpreset.c | 2 ++ + app/core/gimptoolpreset.c | 2 ++ app/widgets/gimptoolpreseteditor.c | 41 ++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 22 deletions(-) commit 06c1b290d0c22c5576efe1144c36d30e6069840f Author: Alexia Death -Date: Sat Apr 24 17:55:54 2010 +0300 +Date: Sat Apr 24 17:55:54 2010 +0300 app: Add tool preset editor to controll what elements get applied @@ -64222,15 +65062,15 @@ At init time the gimp object passed to the constructor is not yet available. - app/core/gimptoolpreset.c | 4 +-- - app/tools/tool_manager.c | 4 +++ + app/core/gimptoolpreset.c | 4 +-- + app/tools/tool_manager.c | 4 +++ app/widgets/gimptoolpreseteditor.c | 51 +++++++++++++++++++++++++++++++++++--- 3 files changed, 52 insertions(+), 7 deletions(-) commit 93ab387fb474254b7182e9e2e2b98ea6e45454d4 Author: Alexia Death -Date: Sat Apr 24 15:54:35 2010 +0300 +Date: Sat Apr 24 15:54:35 2010 +0300 app: add use flags to tool preset @@ -64241,7 +65081,7 @@ commit 72096f5d18ef280698bc921c97a20f04bf384472 Author: Marco Ciampa -Date: Fri Apr 23 12:59:44 2010 +0200 +Date: Fri Apr 23 12:59:44 2010 +0200 Updated italian translation. @@ -64251,7 +65091,7 @@ commit 8d3a5099f875568fd2cc7409a669f4ca450e895d Author: Michael Natterer -Date: Thu Apr 22 17:17:02 2010 +0200 +Date: Thu Apr 22 17:17:02 2010 +0200 app: turn a g_warning() into a g_return_if_fail() @@ -64260,7 +65100,7 @@ commit 5b28d046740da8375f0a2b9841c5706da8946006 Author: Michael Natterer -Date: Thu Apr 22 17:15:08 2010 +0200 +Date: Thu Apr 22 17:15:08 2010 +0200 app: queue the draw timeout only if paused_count reaches zero @@ -64269,7 +65109,7 @@ commit 2f5d2bc85f7316b58d8c8227d6360e77acba4c02 Author: Michael Natterer -Date: Thu Apr 22 16:45:44 2010 +0200 +Date: Thu Apr 22 16:45:44 2010 +0200 Bug 616342 - gimp crashes on startup if you have a contextrc file from 2.6 @@ -64281,7 +65121,7 @@ commit 56e4585f700b59c8349093dcbeb1abd0ab787a23 Author: Michael Natterer -Date: Wed Apr 21 20:56:49 2010 +0200 +Date: Wed Apr 21 20:56:49 2010 +0200 app: finally apply tool presets when one is seleced @@ -64296,7 +65136,7 @@ commit 8f813ec52b503a8cdf7c6ae3c7c35df5e7c7f037 Author: Michael Natterer -Date: Wed Apr 21 20:53:16 2010 +0200 +Date: Wed Apr 21 20:53:16 2010 +0200 app: print a warning if a wrong tool is set on a GimpToolOptions object @@ -64310,7 +65150,7 @@ commit 94181ce53809e4a502708726e06f466e3b0734cc Author: Michael Natterer -Date: Wed Apr 21 20:41:04 2010 +0200 +Date: Wed Apr 21 20:41:04 2010 +0200 app: don't overwrite all tool options' "tool" and "paint-info" @@ -64322,18 +65162,18 @@ commit 67377bb930700f8c3856076f7bd01ae93c1f962e Author: Alan Monfort -Date: Wed Apr 21 04:46:30 2010 +0200 +Date: Wed Apr 21 04:46:30 2010 +0200 updated breton translation po-plug-ins/br.po | 521 ++++---- - po/br.po | 3519 + po/br.po | 3519 ++++++++++++++++++++++++++++++----------------------- 2 files changed, 2218 insertions(+), 1822 deletions(-) commit 15e462c8a239d89d43b71aff1c3ed5487873d03c Author: Alexandre Prokoudine -Date: Wed Apr 21 06:26:02 2010 +0400 +Date: Wed Apr 21 06:26:02 2010 +0400 Improved menu translation once again (ru) @@ -64342,17 +65182,17 @@ commit 0258961c462ce59a71eb82d903fbe59d0792425b Author: Alexandre Prokoudine -Date: Wed Apr 21 05:15:28 2010 +0400 +Date: Wed Apr 21 05:15:28 2010 +0400 Improved menu translation again (ru) po-script-fu/ru.po | 8 ++++---- - po/ru.po | 6 +++--- + po/ru.po | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) commit 8035d4b942743385b064914c968d7b82e2ea9f4a Author: Alexandre Prokoudine -Date: Wed Apr 21 01:38:32 2010 +0400 +Date: Wed Apr 21 01:38:32 2010 +0400 Improved menu translation (ru) @@ -64361,7 +65201,7 @@ commit d47aa2ba52cca3947e9b488cfd66c3c4ab5dc7b0 Author: Michael Natterer -Date: Tue Apr 20 20:11:37 2010 +0200 +Date: Tue Apr 20 20:11:37 2010 +0200 app: change to the preset's tool when a tool preset is selected @@ -64373,7 +65213,7 @@ commit bb00c53bf545bdf7c9bef7e7af6d089f8ad89117 Author: Michael Natterer -Date: Tue Apr 20 20:04:24 2010 +0200 +Date: Tue Apr 20 20:04:24 2010 +0200 app: make sure tool options are created with the right tool set @@ -64383,7 +65223,7 @@ commit c835fad2c973005b7abeb45ec3531dc0cf0e6e46 Author: Michael Natterer -Date: Tue Apr 20 20:00:34 2010 +0200 +Date: Tue Apr 20 20:00:34 2010 +0200 app: make sure GimpToolOptions always have the right GimpToolInfo set @@ -64398,7 +65238,7 @@ commit 372eabdd48e4a8f5da1810530190ebb7510eff03 Author: Michael Natterer -Date: Tue Apr 20 09:56:59 2010 +0200 +Date: Tue Apr 20 09:56:59 2010 +0200 app: avoid using sealed GtkStatusbar members @@ -64408,23 +65248,23 @@ app/display/gimpstatusbar.c | 61 ++++++++++++++++----------------------------- - app/display/gimpstatusbar.h | 1 + + app/display/gimpstatusbar.h | 1 + 2 files changed, 23 insertions(+), 39 deletions(-) commit f464fefe8b78322771be87cfd94bd40f0795dbf2 Author: Alexandre Prokoudine -Date: Tue Apr 20 00:10:12 2010 +0400 +Date: Tue Apr 20 00:10:12 2010 +0400 Updated Russian translations po-script-fu/ru.po | 277 ++++++++++++++++++++++++++++++++++++----------- - po/ru.po | 307 + po/ru.po | 307 +++++++++++++++++++++++++++-------------------------- 2 files changed, 374 insertions(+), 210 deletions(-) commit 78f3a9e78ab9e63e9abc3efafc360d69d3b21bbd Author: Alexandre Prokoudine -Date: Tue Apr 20 00:04:35 2010 +0400 +Date: Tue Apr 20 00:04:35 2010 +0400 Added palette-export.scm to the list of translatable scripts @@ -64433,7 +65273,7 @@ commit bdd112c185cb691b49c52821648b618d768a2241 Author: Alexandre Prokoudine -Date: Tue Apr 20 00:03:55 2010 +0400 +Date: Tue Apr 20 00:03:55 2010 +0400 Better grammar, messages are translatable now @@ -64442,39 +65282,39 @@ commit a2c70822d4cee7af3c6cf6f3983523e24afa6743 Author: Michael Natterer -Date: Mon Apr 19 19:21:07 2010 +0200 +Date: Mon Apr 19 19:21:07 2010 +0200 Use accessors from GTK+ 2.20 instead of using sealed members directly app/dialogs/resolution-calibrate-dialog.c | 5 +-- - app/display/gimpcanvas.c | 7 +--- + app/display/gimpcanvas.c | 7 +--- app/display/gimpdisplayshell-callbacks.c | 2 +- - app/display/gimpimagewindow.c | 5 +-- - app/widgets/gimpcolormapeditor.c | 4 +- - app/widgets/gimpcursor.c | 5 +-- - app/widgets/gimpdockable.c | 5 +-- - app/widgets/gimpoverlaybox.c | 10 ++--- - app/widgets/gimpoverlaychild.c | 9 ++--- - app/widgets/gimptagentry.c | 4 +- - app/widgets/gimptagpopup.c | 50 ++++++++++++++---------- - app/widgets/gimpview.c | 23 +++++------ - app/widgets/gimpwidgets-utils.c | 13 +++---- - libgimp/gimpprogressbar.c | 7 +--- - libgimp/gimpui.c | 7 +--- - libgimp/gimpzoompreview.c | 5 +-- - libgimpwidgets/gimpcolorscale.c | 65 + app/display/gimpimagewindow.c | 5 +-- + app/widgets/gimpcolormapeditor.c | 4 +- + app/widgets/gimpcursor.c | 5 +-- + app/widgets/gimpdockable.c | 5 +-- + app/widgets/gimpoverlaybox.c | 10 ++--- + app/widgets/gimpoverlaychild.c | 9 ++--- + app/widgets/gimptagentry.c | 4 +- + app/widgets/gimptagpopup.c | 50 ++++++++++++++---------- + app/widgets/gimpview.c | 23 +++++------ + app/widgets/gimpwidgets-utils.c | 13 +++---- + libgimp/gimpprogressbar.c | 7 +--- + libgimp/gimpui.c | 7 +--- + libgimp/gimpzoompreview.c | 5 +-- + libgimpwidgets/gimpcolorscale.c | 65 ++++++++++++++----------------- - libgimpwidgets/gimppixmap.c | 2 +- - libgimpwidgets/gimppreview.c | 7 +--- - libgimpwidgets/gimpruler.c | 10 ++--- - libgimpwidgets/gimpscrolledpreview.c | 5 +-- - plug-ins/common/animation-play.c | 5 +-- - plug-ins/ifs-compose/ifs-compose.c | 5 +-- + libgimpwidgets/gimppixmap.c | 2 +- + libgimpwidgets/gimppreview.c | 7 +--- + libgimpwidgets/gimpruler.c | 10 ++--- + libgimpwidgets/gimpscrolledpreview.c | 5 +-- + plug-ins/common/animation-play.c | 5 +-- + plug-ins/ifs-compose/ifs-compose.c | 5 +-- 23 files changed, 104 insertions(+), 156 deletions(-) commit a0358f7c6455e5ded04bd7cd0018ba147becd77e Author: Michael Natterer -Date: Mon Apr 19 19:03:08 2010 +0200 +Date: Mon Apr 19 19:03:08 2010 +0200 Depend on GLib >= 2.24.0 and GTK+ 2.20.0 @@ -64485,7 +65325,7 @@ commit 6d75f53be8aa335b6e21e5aeba70645d41654c62 Author: Martin Srebotnjak -Date: Mon Apr 19 14:42:39 2010 +0200 +Date: Mon Apr 19 14:42:39 2010 +0200 Updated Slovenian translation @@ -64495,7 +65335,7 @@ commit f53f73da193649532af0ce3c4813c79c1eba91ea Author: Alexia Death -Date: Sun Apr 18 21:20:29 2010 +0300 +Date: Sun Apr 18 21:20:29 2010 +0300 app: Fix a typo in outline transform @@ -64504,7 +65344,7 @@ commit 39349e06587ececbf4b9138769e85a2baaab84eb Author: Martin Nordholts -Date: Sun Apr 18 18:01:14 2010 +0200 +Date: Sun Apr 18 18:01:14 2010 +0200 app: Remove _for_style in gimp_dockable_new_tab_widget_for_style() @@ -64517,7 +65357,7 @@ commit d35f4d5db49334601f9ce2c9166d95929ef1a532 Author: Martin Nordholts -Date: Sun Apr 18 17:42:26 2010 +0200 +Date: Sun Apr 18 17:42:26 2010 +0200 app: Clarify GimpDockable tab widget interface @@ -64535,7 +65375,7 @@ commit 5c3cf190958b250d32e940a0eca02a167661d0d9 Author: Michael Natterer -Date: Sun Apr 18 15:03:16 2010 +0200 +Date: Sun Apr 18 15:03:16 2010 +0200 Revert "app: Make drawable updates happen at fixed framerate" @@ -64549,7 +65389,7 @@ commit 32aca3c8b68c77d69ef3b8f5facb42d235491638 Author: Alexia Death -Date: Sun Apr 18 15:52:17 2010 +0300 +Date: Sun Apr 18 15:52:17 2010 +0300 app: Make drawable updates happen at fixed framerate @@ -64560,7 +65400,7 @@ commit 547c92d0f646710887890621615f4b2777657955 Author: Michael Natterer -Date: Sun Apr 18 12:47:18 2010 +0200 +Date: Sun Apr 18 12:47:18 2010 +0200 Bug 541586 - Tool options not saved/loaded correctly? @@ -64574,7 +65414,7 @@ commit aea305be82dd860028c2875acb020360e37515e3 Author: Michael Natterer -Date: Sat Apr 17 14:52:22 2010 +0200 +Date: Sat Apr 17 14:52:22 2010 +0200 app: fix tool preset editor action labels @@ -64583,7 +65423,7 @@ commit 8885cd3b4f961e721da6c6e3473be47cbd78f129 Author: Nils Philippsen -Date: Thu Apr 15 16:38:21 2010 +0200 +Date: Thu Apr 15 16:38:21 2010 +0200 remove obsolete tooltips object creation @@ -64592,27 +65432,27 @@ Author: Jerry Baker Date: Mon Apr 12 14:40:47 2010 -0400 - Use gtk.Tooltip() instead of gtk.Tooltips() + Use gtk.Tooltip() instead of gtk.Tooltips() plug-ins/pygimp/gimpfu.py | 2 -- 1 file changed, 2 deletions(-) commit 945330af7121a55dad32546053f2017895e22508 Author: Marco Ciampa -Date: Wed Apr 14 18:39:38 2010 +0200 +Date: Wed Apr 14 18:39:38 2010 +0200 Updated italian translation - po-libgimp/it.po | 26 +- + po-libgimp/it.po | 26 +- po-plug-ins/it.po | 171 +++--- po-script-fu/it.po | 220 +++----- - po/it.po | 1602 + po/it.po | 1602 ++++++++++++++++++++++++++++++---------------------- 4 files changed, 1129 insertions(+), 890 deletions(-) commit c014c7fe22e70f1c0d7e49831c9aa85e647852b2 Author: Andika Triwidada -Date: Wed Apr 14 12:38:08 2010 +0300 +Date: Wed Apr 14 12:38:08 2010 +0300 Added Indonesian translation to po-tips and po-python, contributed by Imam Musthaqim @@ -64622,13 +65462,13 @@ po-python/id.po | 314 +++++++++++++++++++++++++++++++++++++++++++++++++++++ po-tips/LINGUAS | 1 + - po-tips/id.po | 319 + po-tips/id.po | 319 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 635 insertions(+) commit a78bffbfb9d40d304c57b896863465282228424f Author: Jerry Baker -Date: Mon Apr 12 14:40:47 2010 -0400 +Date: Mon Apr 12 14:40:47 2010 -0400 Use gtk.Tooltip() instead of gtk.Tooltips() @@ -64637,19 +65477,19 @@ commit 4c4c861aa1a08520a6941db8dd68d42d3341bca8 Author: Michael Natterer -Date: Sun Apr 11 16:18:21 2010 +0200 +Date: Sun Apr 11 16:18:21 2010 +0200 app: make sure GimpToolPreset got the "gimp" construct property passed and pass a Gimp when creating the preset editor's local model. - app/core/gimptoolpreset.c | 21 +++++++++++++++++++++ + app/core/gimptoolpreset.c | 21 +++++++++++++++++++++ app/widgets/gimptoolpreseteditor.c | 12 ++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) commit 0f47beff78b268d0a0a3b2f0a7ee10b46cc72a86 Author: Michael Natterer -Date: Sun Apr 11 16:17:27 2010 +0200 +Date: Sun Apr 11 16:17:27 2010 +0200 app: turn "context" into a CONSTRUCT_ONLY property and assert it being set @@ -64659,7 +65499,7 @@ commit 1c786ae5d4d7e628f57cfe01c316e8b873362e02 Author: Michael Natterer -Date: Sun Apr 11 15:54:09 2010 +0200 +Date: Sun Apr 11 15:54:09 2010 +0200 app: don't forget to free the models of the dynamics and preset editors @@ -64671,7 +65511,7 @@ commit b676a1add071ec357a32de058cdff4854b3ed497 Author: Michael Natterer -Date: Sun Apr 11 15:43:29 2010 +0200 +Date: Sun Apr 11 15:43:29 2010 +0200 app: make tool preset loading work @@ -64683,71 +65523,71 @@ property. app/core/gimptoolpreset-load.c | 4 +- - app/core/gimptoolpreset.c | 137 + app/core/gimptoolpreset.c | 137 ++++++++++++++++++++++++++++++++++++----- - app/core/gimptoolpreset.h | 1 + + app/core/gimptoolpreset.h | 1 + 3 files changed, 125 insertions(+), 17 deletions(-) commit ccf8d1930d89810c812b69d9423062f4648399e4 Author: Michael Natterer -Date: Sun Apr 11 13:40:28 2010 +0200 +Date: Sun Apr 11 13:40:28 2010 +0200 app: add missing bits so GimpToolPresetEditor doesn't warn and crash - app/actions/actions.c | 4 ++++ - app/menus/menus.c | 7 +++++++ + app/actions/actions.c | 4 ++++ + app/menus/menus.c | 7 +++++++ app/widgets/gimptoolpreseteditor.c | 3 ++- - menus/Makefile.am | 1 + + menus/Makefile.am | 1 + menus/tool-preset-editor-menu.xml | 8 ++++++++ 5 files changed, 22 insertions(+), 1 deletion(-) commit caad58d203d3923981eed4b0541efaa2a6685ab6 Author: Michael Natterer -Date: Sun Apr 11 13:12:41 2010 +0200 +Date: Sun Apr 11 13:12:41 2010 +0200 app: add a GimpContext parameter to GimpDataLoadFunc - app/actions/data-commands.c | 3 ++- - app/core/gimp.c | 18 ++++++++++++------ - app/core/gimpbrush-load.c | 11 +++++++---- - app/core/gimpbrush-load.h | 9 ++++++--- + app/actions/data-commands.c | 3 ++- + app/core/gimp.c | 18 ++++++++++++------ + app/core/gimpbrush-load.c | 11 +++++++---- + app/core/gimpbrush-load.h | 9 ++++++--- app/core/gimpbrushgenerated-load.c | 3 ++- app/core/gimpbrushgenerated-load.h | 3 ++- - app/core/gimpbrushpipe-load.c | 6 ++++-- - app/core/gimpbrushpipe-load.h | 3 ++- - app/core/gimpdatafactory.c | 28 +++++++++++++++++++--------- - app/core/gimpdatafactory.h | 7 +++++-- - app/core/gimpdynamics-load.c | 3 ++- - app/core/gimpdynamics-load.h | 3 ++- - app/core/gimpgradient-load.c | 6 ++++-- - app/core/gimpgradient-load.h | 6 ++++-- - app/core/gimppalette-import.c | 2 +- - app/core/gimppalette-load.c | 3 ++- - app/core/gimppalette-load.h | 3 ++- - app/core/gimppattern-load.c | 6 ++++-- - app/core/gimppattern-load.h | 6 ++++-- + app/core/gimpbrushpipe-load.c | 6 ++++-- + app/core/gimpbrushpipe-load.h | 3 ++- + app/core/gimpdatafactory.c | 28 +++++++++++++++++++--------- + app/core/gimpdatafactory.h | 7 +++++-- + app/core/gimpdynamics-load.c | 3 ++- + app/core/gimpdynamics-load.h | 3 ++- + app/core/gimpgradient-load.c | 6 ++++-- + app/core/gimpgradient-load.h | 6 ++++-- + app/core/gimppalette-import.c | 2 +- + app/core/gimppalette-load.c | 3 ++- + app/core/gimppalette-load.h | 3 ++- + app/core/gimppattern-load.c | 6 ++++-- + app/core/gimppattern-load.h | 6 ++++-- app/core/gimptoolpreset-load.c | 5 ++++- app/core/gimptoolpreset-load.h | 3 ++- - app/pdb/brushes-cmds.c | 2 +- - app/pdb/gradients-cmds.c | 2 +- - app/pdb/palettes-cmds.c | 2 +- - app/pdb/patterns-cmds.c | 2 +- - tools/pdbgen/pdb/brushes.pdb | 2 +- + app/pdb/brushes-cmds.c | 2 +- + app/pdb/gradients-cmds.c | 2 +- + app/pdb/palettes-cmds.c | 2 +- + app/pdb/patterns-cmds.c | 2 +- + tools/pdbgen/pdb/brushes.pdb | 2 +- tools/pdbgen/pdb/gradients.pdb | 2 +- - tools/pdbgen/pdb/palettes.pdb | 2 +- - tools/pdbgen/pdb/patterns.pdb | 2 +- + tools/pdbgen/pdb/palettes.pdb | 2 +- + tools/pdbgen/pdb/patterns.pdb | 2 +- 29 files changed, 100 insertions(+), 53 deletions(-) commit 4fcf34699fda2e383bde756f2a8989d7a99806f3 Author: Michael Natterer -Date: Sat Apr 10 19:55:42 2010 +0200 +Date: Sat Apr 10 19:55:42 2010 +0200 app: flip context and name parameters in GimpDataNewFunc app/actions/data-commands.c | 2 +- app/core/gimp-gradients.c | 4 ++-- - app/core/gimpbrush.c | 6 +++--- - app/core/gimpbrush.h | 4 ++-- + app/core/gimpbrush.c | 6 +++--- + app/core/gimpbrush.h | 4 ++-- app/core/gimpdatafactory.c | 8 ++++---- app/core/gimpdatafactory.h | 8 ++++---- app/core/gimpdynamics.c | 9 ++++++--- @@ -64762,7 +65602,7 @@ app/core/gimppattern.h | 4 ++-- app/core/gimptoolpreset.c | 11 ++++++----- app/core/gimptoolpreset.h | 4 ++-- - app/pdb/brush-cmds.c | 2 +- + app/pdb/brush-cmds.c | 2 +- app/pdb/gradient-cmds.c | 2 +- app/pdb/palette-cmds.c | 2 +- tools/pdbgen/pdb/brush.pdb | 2 +- @@ -64772,19 +65612,19 @@ commit 78a4cae2d51918306f18a1ecbb9b4bbb7c744f60 Author: Alexia Death -Date: Fri Apr 9 00:44:52 2010 +0300 +Date: Fri Apr 9 00:44:52 2010 +0300 app: Rewire the the feature formely known as harndess back to gui as force - app/core/core-enums.c | 2 ++ - app/core/core-enums.h | 1 + + app/core/core-enums.c | 2 ++ + app/core/core-enums.h | 1 + app/core/gimpdynamics.c | 26 +++++++++++++++++++++++++ app/core/gimpdynamics.h | 1 + app/paint/gimpbrushcore.c | 45 ++++++++++++++++++++++---------------------- app/paint/gimpbrushcore.h | 1 + - app/paint/gimpclone.c | 6 +++--- + app/paint/gimpclone.c | 6 +++--- app/paint/gimperaser.c | 6 +++--- app/paint/gimppaintbrush.c | 6 +++--- app/paint/gimppaintoptions.c | 8 +++----- @@ -64792,7 +65632,7 @@ commit 9ed712ddc460c6b1b6b6169933a3d513bef8bf76 Author: Alexia Death -Date: Thu Apr 8 00:29:09 2010 +0300 +Date: Thu Apr 8 00:29:09 2010 +0300 app: Fix ceil/floor amplifying errors in transform size calculation @@ -64801,7 +65641,7 @@ commit 9de1d97fb3d22a30173cdc560723311557aa9334 Author: Sven Neumann -Date: Wed Apr 7 21:27:51 2010 +0200 +Date: Wed Apr 7 21:27:51 2010 +0200 Bug 615071 - invalid menu path crashes GIMP @@ -64813,7 +65653,7 @@ commit 304db468d2fc0b96a5591d74d32c3275f4b74f83 Author: Sven Neumann -Date: Wed Apr 7 21:05:38 2010 +0200 +Date: Wed Apr 7 21:05:38 2010 +0200 Bug 615071 - invalid menu path crashes GIMP @@ -64825,7 +65665,7 @@ commit 6437acde64b4a737e5bed8bab997f889dd7c265e Author: Alexandre Prokoudine -Date: Wed Apr 7 00:33:44 2010 +0400 +Date: Wed Apr 7 00:33:44 2010 +0400 Updated Russian translation @@ -64835,7 +65675,7 @@ commit be3642cd67dc4dd7eee338f4ddab6b40e5fef577 Author: Alexandre Prokoudine -Date: Wed Apr 7 00:03:09 2010 +0400 +Date: Wed Apr 7 00:03:09 2010 +0400 Proofreading: spacing, grammar @@ -64844,7 +65684,7 @@ commit 5e40b0fc8e645ec2e2e4913775bf093d9394b72e Author: Alexandre Prokoudine -Date: Wed Apr 7 00:02:28 2010 +0400 +Date: Wed Apr 7 00:02:28 2010 +0400 Added the tool presets dialog to the list of translatable files @@ -64853,7 +65693,7 @@ commit 430b0e551718622650ce1bec3748741cc9b5d400 Author: Michael Natterer -Date: Mon Apr 5 13:24:54 2010 +0200 +Date: Mon Apr 5 13:24:54 2010 +0200 app: add a GimpContext parameter to all functions which create GimpData @@ -64861,41 +65701,41 @@ and pass a context whereever needed. Fix up gimp_tool_preset_new() to actually make a copy of the context's active tool's options. - app/actions/data-commands.c | 9 ++++++--- - app/core/gimp-gradients.c | 5 ++++- - app/core/gimpbrush.c | 7 ++++--- - app/core/gimpbrush.h | 5 +++-- - app/core/gimpcontext.c | 30 +++++++++++++----------------- - app/core/gimpdatafactory.c | 12 ++++++++---- - app/core/gimpdatafactory.h | 11 +++++++---- - app/core/gimpdynamics.c | 7 ++++--- - app/core/gimpdynamics.h | 5 +++-- - app/core/gimpgradient.c | 7 ++++--- - app/core/gimpgradient.h | 5 +++-- - app/core/gimppalette-import.c | 37 + app/actions/data-commands.c | 9 ++++++--- + app/core/gimp-gradients.c | 5 ++++- + app/core/gimpbrush.c | 7 ++++--- + app/core/gimpbrush.h | 5 +++-- + app/core/gimpcontext.c | 30 +++++++++++++----------------- + app/core/gimpdatafactory.c | 12 ++++++++---- + app/core/gimpdatafactory.h | 11 +++++++---- + app/core/gimpdynamics.c | 7 ++++--- + app/core/gimpdynamics.h | 5 +++-- + app/core/gimpgradient.c | 7 ++++--- + app/core/gimpgradient.h | 5 +++-- + app/core/gimppalette-import.c | 37 +++++++++++++++++++++++++------------ - app/core/gimppalette-import.h | 6 +++++- - app/core/gimppalette-load.c | 25 +++++++++++++++---------- - app/core/gimppalette-load.h | 15 ++++++++++----- - app/core/gimppalette.c | 7 ++++--- - app/core/gimppalette.h | 5 +++-- - app/core/gimppattern.c | 7 ++++--- - app/core/gimppattern.h | 5 +++-- - app/core/gimptoolpreset.c | 30 +++++++++++++++++++++++------- - app/core/gimptoolpreset.h | 6 +++--- - app/dialogs/palette-import-dialog.c | 6 +++++- - app/pdb/brush-cmds.c | 3 ++- - app/pdb/gradient-cmds.c | 3 ++- - app/pdb/palette-cmds.c | 3 ++- - app/widgets/gimpselectiondata.c | 8 ++++---- - tools/pdbgen/pdb/brush.pdb | 3 ++- - tools/pdbgen/pdb/gradient.pdb | 3 ++- - tools/pdbgen/pdb/palette.pdb | 3 ++- + app/core/gimppalette-import.h | 6 +++++- + app/core/gimppalette-load.c | 25 +++++++++++++++---------- + app/core/gimppalette-load.h | 15 ++++++++++----- + app/core/gimppalette.c | 7 ++++--- + app/core/gimppalette.h | 5 +++-- + app/core/gimppattern.c | 7 ++++--- + app/core/gimppattern.h | 5 +++-- + app/core/gimptoolpreset.c | 30 +++++++++++++++++++++++------- + app/core/gimptoolpreset.h | 6 +++--- + app/dialogs/palette-import-dialog.c | 6 +++++- + app/pdb/brush-cmds.c | 3 ++- + app/pdb/gradient-cmds.c | 3 ++- + app/pdb/palette-cmds.c | 3 ++- + app/widgets/gimpselectiondata.c | 8 ++++---- + tools/pdbgen/pdb/brush.pdb | 3 ++- + tools/pdbgen/pdb/gradient.pdb | 3 ++- + tools/pdbgen/pdb/palette.pdb | 3 ++- 29 files changed, 175 insertions(+), 103 deletions(-) commit 9a1617ba65658637a38b14fc07bf6c9b2ff2868b Author: Alexandre Prokoudine -Date: Sun Apr 4 21:37:19 2010 +0400 +Date: Sun Apr 4 21:37:19 2010 +0400 Updated Russian translation @@ -64905,7 +65745,7 @@ commit 8a8a2e1fac9a341032c7e322d29fb829a8f6e832 Author: Michael Natterer -Date: Sun Apr 4 19:23:29 2010 +0200 +Date: Sun Apr 4 19:23:29 2010 +0200 app: get the tool preset from the context @@ -64914,7 +65754,7 @@ commit 98a5e77200c4b1cac622dd0f7fc75460a4fef2f4 Author: Michael Natterer -Date: Sun Apr 4 18:56:40 2010 +0200 +Date: Sun Apr 4 18:56:40 2010 +0200 app: formatting @@ -64923,7 +65763,7 @@ commit c31ad026701a38ecdcd884789d8c9c51f38b4df5 Author: Michael Natterer -Date: Sun Apr 4 15:01:32 2010 +0200 +Date: Sun Apr 4 15:01:32 2010 +0200 app: some cleanup in the tool preset editor @@ -64933,7 +65773,7 @@ commit 6d3d94dcb0eb10797c6d12d9d64efceb6ece7d2f Author: Michael Natterer -Date: Sun Apr 4 15:00:55 2010 +0200 +Date: Sun Apr 4 15:00:55 2010 +0200 menus: add the tool preset dialog to the dialogs menu @@ -64942,7 +65782,7 @@ commit 7ea16558b6cb2738866b7681c6e1e38dc80af847 Author: Michael Natterer -Date: Sun Apr 4 15:00:26 2010 +0200 +Date: Sun Apr 4 15:00:26 2010 +0200 app: some cosmetic cleanup in the multiple selection code @@ -64952,7 +65792,7 @@ commit 21f1e882b28fcf8ffcc67ef74cde9885858c691b Author: Michael Natterer -Date: Sun Apr 4 14:59:03 2010 +0200 +Date: Sun Apr 4 14:59:03 2010 +0200 app: fix warning when the data factory's container is empty @@ -64964,29 +65804,29 @@ commit efed2bf6235d283779661844f3f383a06f0e502f Author: Michael Natterer -Date: Sun Apr 4 13:58:55 2010 +0200 +Date: Sun Apr 4 13:58:55 2010 +0200 app: some cleanup and fixes in the tool preset infrastructure app/actions/Makefile.am | 4 +- - app/actions/actions.c | 2 +- + app/actions/actions.c | 2 +- app/actions/dialogs-actions.c | 12 ++-- app/config/gimpcoreconfig.c | 80 ++++++++++++--------- app/config/gimpcoreconfig.h | 4 +- - app/core/core-enums.h | 79 ++++++++++---------- - app/core/gimp.c | 4 +- + app/core/core-enums.h | 79 ++++++++++---------- + app/core/gimp.c | 4 +- app/core/gimpcontext.c | 36 +++++----- app/core/gimpcontext.h | 164 +++++++++++++++++++++--------------------- app/core/gimptoolpreset.c | 38 +++++----- app/core/gimptoolpreset.h | 12 ++-- - app/dialogs/dialogs.c | 24 +++---- + app/dialogs/dialogs.c | 24 +++---- app/widgets/gimphelp-ids.h | 14 ++-- 13 files changed, 242 insertions(+), 231 deletions(-) commit bcf64e05f8e771c93669d30e21cd19b88de9171b Author: Martin Srebotnjak -Date: Sun Apr 4 08:22:11 2010 +0200 +Date: Sun Apr 4 08:22:11 2010 +0200 Updated Slovenian translation @@ -64995,7 +65835,7 @@ commit 0c5589d5f27d3eb6f58eb86435af2f050ab3b858 Author: Martin Srebotnjak -Date: Sun Apr 4 08:21:27 2010 +0200 +Date: Sun Apr 4 08:21:27 2010 +0200 Updated Slovenian translation @@ -65005,7 +65845,7 @@ commit 7ca50d995a44458ce07b59db43a6531076e1a045 Author: Martin Srebotnjak -Date: Sun Apr 4 08:21:03 2010 +0200 +Date: Sun Apr 4 08:21:03 2010 +0200 Updated Slovenian translation @@ -65014,7 +65854,7 @@ commit 8db0fb8f89ea60d190aa0cb382c7bbd88f0d11eb Author: Martin Srebotnjak -Date: Sun Apr 4 08:20:15 2010 +0200 +Date: Sun Apr 4 08:20:15 2010 +0200 Updated Slovenian translation @@ -65024,7 +65864,7 @@ commit a28fabff09f7fcb66166dba98e8d7719f123da2a Author: Alexia Death -Date: Sun Apr 4 01:16:31 2010 +0300 +Date: Sun Apr 4 01:16:31 2010 +0300 app: add missing files @@ -65035,53 +65875,53 @@ commit 29f7fe87b02a49049ad7740aa9285a46391bcaee Author: Alexia Death -Date: Sat Apr 3 18:25:31 2010 +0300 +Date: Sat Apr 3 18:25:31 2010 +0300 Base infra for tool presets. - app/actions/Makefile.am | 4 + - app/actions/actions.c | 4 + - app/actions/dialogs-actions.c | 6 + - app/actions/tool-preset-actions.c | 132 +++++++++++++++++ - app/actions/tool-preset-actions.h | 27 ++++ - app/config/gimpcoreconfig.c | 49 +++++++ - app/config/gimpcoreconfig.h | 3 + - app/config/gimprc-blurbs.h | 11 +- - app/core/Makefile.am | 6 + - app/core/core-enums.h | 9 +- - app/core/core-types.h | 1 + - app/core/gimp.c | 39 +++++ - app/core/gimp.h | 1 + - app/core/gimpcontext.c | 242 + app/actions/Makefile.am | 4 + + app/actions/actions.c | 4 + + app/actions/dialogs-actions.c | 6 + + app/actions/tool-preset-actions.c | 132 +++++++++++++++++ + app/actions/tool-preset-actions.h | 27 ++++ + app/config/gimpcoreconfig.c | 49 +++++++ + app/config/gimpcoreconfig.h | 3 + + app/config/gimprc-blurbs.h | 11 +- + app/core/Makefile.am | 6 + + app/core/core-enums.h | 9 +- + app/core/core-types.h | 1 + + app/core/gimp.c | 39 +++++ + app/core/gimp.h | 1 + + app/core/gimpcontext.c | 242 +++++++++++++++++++++++++++++--- - app/core/gimpcontext.h | 12 ++ - app/core/gimptoolpreset-load.c | 52 +++++++ - app/core/gimptoolpreset-load.h | 29 ++++ - app/core/gimptoolpreset-save.c | 42 ++++++ - app/core/gimptoolpreset-save.h | 27 ++++ - app/core/gimptoolpreset.c | 223 + app/core/gimpcontext.h | 12 ++ + app/core/gimptoolpreset-load.c | 52 +++++++ + app/core/gimptoolpreset-load.h | 29 ++++ + app/core/gimptoolpreset-save.c | 42 ++++++ + app/core/gimptoolpreset-save.h | 27 ++++ + app/core/gimptoolpreset.c | 223 +++++++++++++++++++++++++++++ - app/core/gimptoolpreset.h | 53 +++++++ - app/dialogs/dialogs-constructors.c | 25 ++++ - app/dialogs/dialogs-constructors.h | 10 +- - app/dialogs/dialogs.c | 12 +- - app/menus/menus.c | 9 ++ - app/menus/plug-in-menus.c | 5 + - app/widgets/Makefile.am | 4 + - app/widgets/gimphelp-ids.h | 10 ++ - app/widgets/gimptoolpreseteditor.c | 195 +++++++++++++++++++++++++ - app/widgets/gimptoolpreseteditor.h | 55 ++++++++ + app/core/gimptoolpreset.h | 53 +++++++ + app/dialogs/dialogs-constructors.c | 25 ++++ + app/dialogs/dialogs-constructors.h | 10 +- + app/dialogs/dialogs.c | 12 +- + app/menus/menus.c | 9 ++ + app/menus/plug-in-menus.c | 5 + + app/widgets/Makefile.am | 4 + + app/widgets/gimphelp-ids.h | 10 ++ + app/widgets/gimptoolpreseteditor.c | 195 +++++++++++++++++++++++++ + app/widgets/gimptoolpreseteditor.h | 55 ++++++++ app/widgets/gimptoolpresetfactoryview.c | 91 ++++++++++++ app/widgets/gimptoolpresetfactoryview.h | 58 ++++++++ - app/widgets/widgets-types.h | 3 +- - libgimpwidgets/gimpstock.h | 1 + - menus/Makefile.am | 1 + - menus/tool-preset-menu.xml | 16 +++ + app/widgets/widgets-types.h | 3 +- + libgimpwidgets/gimpstock.h | 1 + + menus/Makefile.am | 1 + + menus/tool-preset-menu.xml | 16 +++ 36 files changed, 1437 insertions(+), 30 deletions(-) commit a6b2d102f315f11e2dcc9c092ca0640b6920f884 Author: Michael Natterer -Date: Sat Apr 3 18:02:14 2010 +0200 +Date: Sat Apr 3 18:02:14 2010 +0200 app: add utility functions for getting GtkTextTag properties @@ -65089,17 +65929,17 @@ have to use magic strings all over the place, and we don't have to use g_object_get() either. - app/widgets/Makefile.am | 2 + - app/widgets/gimptextbuffer.c | 110 + app/widgets/Makefile.am | 2 + + app/widgets/gimptextbuffer.c | 110 +++++++++++--------------------------- app/widgets/gimptextstyleeditor.c | 17 ++---- - app/widgets/gimptexttag.c | 76 ++++++++++++++++++++++++++ - app/widgets/gimptexttag.h | 39 ++++++++++++++ + app/widgets/gimptexttag.c | 76 ++++++++++++++++++++++++++ + app/widgets/gimptexttag.h | 39 ++++++++++++++ 5 files changed, 153 insertions(+), 91 deletions(-) commit 0313ce3d44df592ab798c63448fb295b4497b493 Author: Maxim V. Dziumanenko -Date: Sat Apr 3 17:57:47 2010 +0300 +Date: Sat Apr 3 17:57:47 2010 +0300 Updated Ukrainian translation @@ -65109,7 +65949,7 @@ commit abf74e4a20128abfb79773d6dadff22eae83ae04 Author: Maxim V. Dziumanenko -Date: Sat Apr 3 16:03:11 2010 +0300 +Date: Sat Apr 3 16:03:11 2010 +0300 Updated Ukrainian translation @@ -65119,7 +65959,7 @@ commit ee586a49565969c0c25418b81e4ab4097e1a0f00 Author: Maxim V. Dziumanenko -Date: Sat Apr 3 15:44:09 2010 +0300 +Date: Sat Apr 3 15:44:09 2010 +0300 Updated Ukrainian translation @@ -65129,7 +65969,7 @@ commit 3794cc2c0829f1ba8e017af83451965223466437 Author: Maxim V. Dziumanenko -Date: Sat Apr 3 15:40:27 2010 +0300 +Date: Sat Apr 3 15:40:27 2010 +0300 Added Ukrainian translation @@ -65138,7 +65978,7 @@ commit d31de76431803f4e43f3b4d021c175c5e59d9e9f Author: Maxim V. Dziumanenko -Date: Sat Apr 3 15:36:51 2010 +0300 +Date: Sat Apr 3 15:36:51 2010 +0300 Updated Ukrainian translation @@ -65148,7 +65988,7 @@ commit 5269b46611e2acd3fd41e962543da8aacbab9c66 Author: Maxim V. Dziumanenko -Date: Sat Apr 3 08:43:40 2010 +0300 +Date: Sat Apr 3 08:43:40 2010 +0300 Updated Ukrainian translation @@ -65158,7 +65998,7 @@ commit b69d174d83c40d43066285acd2026c957dacd656 Author: Matej Urbančič -Date: Sat Apr 3 08:01:11 2010 +0200 +Date: Sat Apr 3 08:01:11 2010 +0200 Added sl for Slovenian translation @@ -65167,7 +66007,7 @@ commit fbb718e1cd8307c8eed30f52e5e3470d8e5522e6 Author: Martin Srebotnjak -Date: Sat Apr 3 08:00:49 2010 +0200 +Date: Sat Apr 3 08:00:49 2010 +0200 Updated Slovenian translation @@ -65176,7 +66016,7 @@ commit 6612f52354158ee855ea710842b3410b2c3ccb16 Author: Martin Srebotnjak -Date: Sat Apr 3 07:54:28 2010 +0200 +Date: Sat Apr 3 07:54:28 2010 +0200 Updated Slovenian translation @@ -65186,7 +66026,7 @@ commit 09e3ea5db8b3de978f64632f9dfffb6da8652d6e Author: Martin Srebotnjak -Date: Sat Apr 3 07:53:42 2010 +0200 +Date: Sat Apr 3 07:53:42 2010 +0200 Updated Slovenian translation @@ -65196,7 +66036,7 @@ commit 63a9ed0ffc6b2c0649fc529f05af27a976fbfefc Author: Martin Srebotnjak -Date: Sat Apr 3 07:53:14 2010 +0200 +Date: Sat Apr 3 07:53:14 2010 +0200 Updated Slovenian translation @@ -65206,7 +66046,7 @@ commit af7c16dd0ce6862d13c3d7e49392455480bdc149 Author: Martin Srebotnjak -Date: Sat Apr 3 07:52:10 2010 +0200 +Date: Sat Apr 3 07:52:10 2010 +0200 Updated Slovenian translation @@ -65216,7 +66056,7 @@ commit d9692ed3d770f2466e6c83b4c9f6ad70e2c11d7b Author: Martin Srebotnjak -Date: Sat Apr 3 07:51:20 2010 +0200 +Date: Sat Apr 3 07:51:20 2010 +0200 Updated Slovenian translation @@ -65226,7 +66066,7 @@ commit d5303ffcd50cedd249165ad333ae6aa0067d14a1 Author: Martin Srebotnjak -Date: Sat Apr 3 07:50:47 2010 +0200 +Date: Sat Apr 3 07:50:47 2010 +0200 Updated Slovenian translation @@ -65236,7 +66076,7 @@ commit 35968682c3ff646cc4cf6fd970b2244d43cdc893 Author: Maxim V. Dziumanenko -Date: Sat Apr 3 02:50:29 2010 +0300 +Date: Sat Apr 3 02:50:29 2010 +0300 Updated Ukrainian translation @@ -65246,7 +66086,7 @@ commit fa4440d7224f28f26bd935776a012bef9bcef786 Author: Maxim V. Dziumanenko -Date: Fri Apr 2 17:58:00 2010 +0300 +Date: Fri Apr 2 17:58:00 2010 +0300 Updated Ukrainian translation @@ -65256,7 +66096,7 @@ commit e856ca95522af1b28f7979fcef28f03f85a56c3f Author: Michael Natterer -Date: Fri Apr 2 15:19:27 2010 +0200 +Date: Fri Apr 2 15:19:27 2010 +0200 app: handle kerning tags in the same way as baseline, size and font @@ -65266,7 +66106,7 @@ commit 381088b4b8e521e39991c717f0a98cc9e5ec7b72 Author: Aurimas Juška -Date: Fri Apr 2 00:25:53 2010 +0300 +Date: Fri Apr 2 00:25:53 2010 +0300 app: Bug 614604 - Crash when selecting a gradient from tool dialog @@ -65278,7 +66118,7 @@ commit 93645e908310876bca4e88a81eb89fa2154c935e Author: Michael Natterer -Date: Thu Apr 1 22:29:08 2010 +0200 +Date: Thu Apr 1 22:29:08 2010 +0200 app: cosmetic cleanup @@ -65287,7 +66127,7 @@ commit 04b01c3a256a5162db68095a1e65f6c5e17b3fd3 Author: Michael Natterer -Date: Thu Apr 1 21:15:19 2010 +0200 +Date: Thu Apr 1 21:15:19 2010 +0200 plug-ins: actually return FALSE if mount_enclosing_volume() fails @@ -65296,7 +66136,7 @@ commit 74d44ee2df07ce0be62e1edce9a8cf5bcb672f42 Author: Michael Natterer -Date: Thu Apr 1 21:06:09 2010 +0200 +Date: Thu Apr 1 21:06:09 2010 +0200 plug-ins: need to initialize "mapped" booleans to FALSE @@ -65305,7 +66145,7 @@ commit 4da60dd1b3c68fdf7b7d21d13b2f52cac3ac8cbf Author: Michael Natterer -Date: Thu Apr 1 20:46:31 2010 +0200 +Date: Thu Apr 1 20:46:31 2010 +0200 app: add context->dynamics_name to the context's memsize @@ -65314,11 +66154,11 @@ commit a21b832bab92637650827bed1955a26ada56259c Author: Miloš Popović -Date: Thu Apr 1 16:41:09 2010 +0200 +Date: Thu Apr 1 16:41:09 2010 +0200 Updated Serbian translations - po/sr.po | 450 + po/sr.po | 450 +++++++++++++++++++++++++++++++-------------------------- po/sr@latin.po | 450 +++++++++++++++++++++++++++++++-------------------------- @@ -65326,7 +66166,7 @@ commit 2e1e5393fe464501954513da2ca2c7773553ca74 Author: Michael Natterer -Date: Wed Mar 31 19:13:46 2010 +0200 +Date: Wed Mar 31 19:13:46 2010 +0200 app: make sure the baseline spinbutton always shows the right value @@ -65336,7 +66176,7 @@ commit ba9b0c12c7f3f16e43cb83a6740cdb3c7c9345c0 Author: Inaki Larranaga Murgoitio -Date: Mon Mar 29 17:56:35 2010 +0200 +Date: Mon Mar 29 17:56:35 2010 +0200 Updated Basque language @@ -65346,7 +66186,7 @@ commit 587f3ab3620a03082552f226816bbb05db73a170 Author: Alexandre Prokoudine -Date: Sun Mar 28 22:23:25 2010 +0400 +Date: Sun Mar 28 22:23:25 2010 +0400 Fixed translation error @@ -65356,7 +66196,7 @@ commit b4e86aa6ecefcc1d9130a7ca0751e81a7e98727b Author: Michael Natterer -Date: Sun Mar 28 21:52:10 2010 +0200 +Date: Sun Mar 28 21:52:10 2010 +0200 app: make sure the "size" spinbutton shows the size used for inserting text @@ -65367,21 +66207,21 @@ commit 91cce1c81bdc0e11a4f7be02f40d7e0af4b4e550 Author: Michael Natterer -Date: Sun Mar 28 21:38:31 2010 +0200 +Date: Sun Mar 28 21:38:31 2010 +0200 app: add size control for text spans, does not work as expected yet app/tools/gimptexttool-editor.c | 23 +++++ - app/widgets/gimptextbuffer.c | 198 + app/widgets/gimptextbuffer.c | 198 +++++++++++++++++++++++++++++++++++++- - app/widgets/gimptextbuffer.h | 13 +++ + app/widgets/gimptextbuffer.h | 13 +++ app/widgets/gimptextstyleeditor.c | 95 ++++++++++++++++-- app/widgets/gimptextstyleeditor.h | 4 +- 5 files changed, 321 insertions(+), 12 deletions(-) commit e22e881a9c1be204f6e76b4d0947a05f0c29543d Author: Michael Natterer -Date: Sun Mar 28 20:46:23 2010 +0200 +Date: Sun Mar 28 20:46:23 2010 +0200 app: more optional debug output (in #ifdef VERBOSE) @@ -65390,7 +66230,7 @@ commit b55591ca04cf5ae3376fb204cb7b397f7deb7fd9 Author: Sven Neumann -Date: Sun Mar 28 12:34:38 2010 +0200 +Date: Sun Mar 28 12:34:38 2010 +0200 Bug 614153 - Importing PDF files with long titles @@ -65401,7 +66241,7 @@ commit a9eeea8d0e42915c57f87910a5856a3e705436e1 Author: vasudeven -Date: Sun Mar 21 17:46:07 2010 +0530 +Date: Sun Mar 21 17:46:07 2010 +0530 Added Tamil translation @@ -65410,7 +66250,7 @@ commit d2150511e5bf5a8bab80e18a8fde680a8275edc8 Author: vasudeven -Date: Sun Mar 21 17:42:45 2010 +0530 +Date: Sun Mar 21 17:42:45 2010 +0530 Added Tamil translation @@ -65421,28 +66261,28 @@ commit 82ceb7439050fbf7c9b316c6958e8c82dcff1976 Author: vasudeven -Date: Sun Mar 21 17:22:00 2010 +0530 +Date: Sun Mar 21 17:22:00 2010 +0530 Added Tamil translation - po-libgimp/LINGUAS | 1 + + po-libgimp/LINGUAS | 1 + po-libgimp/ta.po | 1971 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1972 insertions(+) commit 900a99ecb345b1b39e043dd2448ef794c2a80847 Author: Michael Natterer -Date: Sat Mar 20 23:18:14 2010 +0100 +Date: Sat Mar 20 23:18:14 2010 +0100 app: add binding signals for changing the text size (still unused) app/widgets/gimptextproxy.c | 18 ++++++++++++++++++ - app/widgets/gimptextproxy.h | 2 ++ + app/widgets/gimptextproxy.h | 2 ++ 2 files changed, 20 insertions(+) commit 28891670e85ff931951acc4d1655f2a741c1467a Author: Michael Natterer -Date: Sat Mar 20 22:56:56 2010 +0100 +Date: Sat Mar 20 22:56:56 2010 +0100 app: implement deleting of devices (unplugged devices' settings only) @@ -65452,7 +66292,7 @@ commit d66b6134a015ba5a4af54dddf7b671022f059060 Author: Michael Natterer -Date: Sat Mar 20 22:25:16 2010 +0100 +Date: Sat Mar 20 22:25:16 2010 +0100 app: micro cleanups @@ -65461,7 +66301,7 @@ commit 6a79d9c3e77940c29dbc753493274c63982d58a6 Author: Alexandre Prokoudine -Date: Sun Mar 21 00:14:37 2010 +0300 +Date: Sun Mar 21 00:14:37 2010 +0300 Updated Russian translation against Martin's changes @@ -65470,7 +66310,7 @@ commit 122feb0dd5a52440b11c300694ca34822da7f276 Author: Martin Nordholts -Date: Sat Mar 20 18:05:12 2010 +0100 +Date: Sat Mar 20 18:05:12 2010 +0100 app: Capitalize Windows-menu items @@ -65482,7 +66322,7 @@ commit 8fb92ae67a44860a39e16a8b071b7958dffc4a7e Author: Alexia Death -Date: Sat Mar 20 12:26:51 2010 +0200 +Date: Sat Mar 20 12:26:51 2010 +0200 app: Make direction behave a bit more sanely and predictably @@ -65491,7 +66331,7 @@ commit 69e28668a1648a46fd24f1689cd55a30db64800c Author: Alexia Death -Date: Fri Mar 19 23:24:42 2010 +0200 +Date: Fri Mar 19 23:24:42 2010 +0200 app: Tune redraw limit to sane bounds @@ -65500,7 +66340,7 @@ commit 08193e8b56ac85837200af5c3ff7a57f9eb5a209 Author: Michael Natterer -Date: Fri Mar 19 21:08:41 2010 +0100 +Date: Fri Mar 19 21:08:41 2010 +0100 Limit the draw tool's redraw framerate to about 29 FPS using a timeout @@ -65510,7 +66350,7 @@ commit 054bd341bde9b646dc4680ea0a1e1927367e6f2b Author: Alexia Death -Date: Fri Mar 19 20:34:07 2010 +0200 +Date: Fri Mar 19 20:34:07 2010 +0200 app: fix incomplete revert @@ -65519,7 +66359,7 @@ commit 1e8ec625dfc1303cc38692fb06ae14f5535c75f5 Author: Alexia Death -Date: Fri Mar 19 20:22:56 2010 +0200 +Date: Fri Mar 19 20:22:56 2010 +0200 Revert "app: Fix the code that disables outline to be a bit neater" @@ -65530,7 +66370,7 @@ commit 656eb53aada30cce711b8e1d13b999fb66c42427 Author: Alexia Death -Date: Fri Mar 19 20:21:42 2010 +0200 +Date: Fri Mar 19 20:21:42 2010 +0200 Revert "app: Do not show brush outline when painting" @@ -65542,23 +66382,23 @@ commit 021a49ce7346707984bbfb4808b02b55f1dac567 Author: Michael Natterer -Date: Fri Mar 19 19:16:31 2010 +0100 +Date: Fri Mar 19 19:16:31 2010 +0100 Add tile_manager_duplicate() which does quick tile-by-tile COW copy and use it instead of duplicating the same code twice less efficiently. - app/base/tile-manager.c | 27 +++++++++++++ - app/base/tile-manager.h | 4 ++ - app/core/gimpbuffer.c | 17 +------- + app/base/tile-manager.c | 27 +++++++++++++ + app/base/tile-manager.h | 4 ++ + app/core/gimpbuffer.c | 17 +------- app/core/gimpdrawablemodundo.c | 91 ++++++++++++++++++------------------------ 4 files changed, 72 insertions(+), 67 deletions(-) commit de583d4c28b00f7c31def31b174a02213500bd6d Author: Michael Natterer -Date: Fri Mar 19 09:52:29 2010 +0100 +Date: Fri Mar 19 09:52:29 2010 +0100 Make gimp_buffer_new() ref the passed tiles @@ -65570,7 +66410,7 @@ commit d00a2c2e58c613a9aaf7eeae95cdeb86ccf3a7a5 Author: NISHIBORI Kiyotaka -Date: Sat Mar 20 00:12:19 2010 +0900 +Date: Sat Mar 20 00:12:19 2010 +0900 Updated Japanese translation (libgimp) @@ -65580,7 +66420,7 @@ commit f9e68fe0ee83630028d1fc8ca35a1e40becdd0d5 Author: Michael Natterer -Date: Thu Mar 18 10:32:52 2010 +0100 +Date: Thu Mar 18 10:32:52 2010 +0100 Fix undo when going back from a modified text layer to an editable one @@ -65595,7 +66435,7 @@ commit 8688037a58c86f928b91689056953d7452bb4efa Author: Michael Natterer -Date: Thu Mar 18 10:25:18 2010 +0100 +Date: Thu Mar 18 10:25:18 2010 +0100 Optionally make a copy of the drawable's tiles in GimpDrawableModUndo @@ -65607,7 +66447,7 @@ (which currently is the undo's only user) - app/core/gimpdrawable.c | 2 +- + app/core/gimpdrawable.c | 2 +- app/core/gimpdrawablemodundo.c | 117 ++++++++++++++++++++++++++++++++++++----- app/core/gimpdrawablemodundo.h | 1 + @@ -65617,7 +66457,7 @@ commit 2f22dc8c2459a3b0c9eaf6aa052d67f44283cfd7 Author: Alexandre Prokoudine -Date: Thu Mar 18 06:09:45 2010 +0300 +Date: Thu Mar 18 06:09:45 2010 +0300 More updates to Russian transaltion @@ -65627,7 +66467,7 @@ commit 63824d715386fe126c03d38edb42702b3bd42b08 Author: Øyvind Kolås -Date: Wed Mar 17 23:39:46 2010 +0000 +Date: Wed Mar 17 23:39:46 2010 +0000 app: use a blacklist instead of whitelist for gegl op categories @@ -65642,7 +66482,7 @@ commit 2fe6b205f2a06587d1a6214c1e1a072a288bc26f Author: Russell Kyaw -Date: Thu Mar 18 01:17:30 2010 +0200 +Date: Thu Mar 18 01:17:30 2010 +0200 Updated Burmese translation for GIMP @@ -65652,7 +66492,7 @@ commit e30cdddeb010b0f2798f8239b433bdfceda20924 Author: Øyvind Kolås -Date: Wed Mar 17 22:21:33 2010 +0000 +Date: Wed Mar 17 22:21:33 2010 +0000 app: include gegl-plugin.h in gimpdrawable.c @@ -65664,7 +66504,7 @@ commit 477b2e1a0ff64a9f99de8b831c8af8638b5c7f59 Author: Alexia Death -Date: Wed Mar 17 20:12:12 2010 +0200 +Date: Wed Mar 17 20:12:12 2010 +0200 app: fix outline offseting at rotation @@ -65673,31 +66513,31 @@ commit 3607a737447aec84c8ecd90a44dc55bc7133632e Author: Alexia Death -Date: Wed Mar 17 19:48:12 2010 +0200 +Date: Wed Mar 17 19:48:12 2010 +0200 app: Make sure outline and brush transform use the same kind of matrix app/core/gimpbrush-transform.c | 49 ++++++++++++++++++++---------------------- app/core/gimpbrush-transform.h | 7 ++++++ - app/paint/gimpbrushcore.c | 12 ++++------- + app/paint/gimpbrushcore.c | 12 ++++------- 3 files changed, 34 insertions(+), 34 deletions(-) commit 54d0f5ef9a377dfb345152e112db2f54d9865aa0 Author: Ulf-D. Ehlert -Date: Wed Mar 17 13:08:38 2010 +0100 +Date: Wed Mar 17 13:08:38 2010 +0100 po: Minor fixes to German translations po-plug-ins/de.po | 21 ++++++++++++--------- po-python/de.po | 2 +- - po-tips/de.po | 7 +++++-- - po/de.po | 25 ++++++++++++++----------- + po-tips/de.po | 7 +++++-- + po/de.po | 25 ++++++++++++++----------- 4 files changed, 32 insertions(+), 23 deletions(-) commit fd4f86934d8f7b6644758cf729310c3114eacfd2 Author: Alexandre Prokoudine -Date: Wed Mar 17 20:05:45 2010 +0300 +Date: Wed Mar 17 20:05:45 2010 +0300 Slightly updated Russian translation @@ -65707,7 +66547,7 @@ commit d282bc3b42488ffdef641a446254aab5953a1b9c Author: Christian.Kirbach -Date: Wed Mar 17 10:27:41 2010 +0100 +Date: Wed Mar 17 10:27:41 2010 +0100 Updated German translation @@ -65717,7 +66557,7 @@ commit 58d82dcadcdcac2308c54c26f4dcddfdc5063248 Author: Alexia Death -Date: Wed Mar 17 00:36:19 2010 +0200 +Date: Wed Mar 17 00:36:19 2010 +0200 app: Fix the code that disables outline to be a bit neater @@ -65726,7 +66566,7 @@ commit 031dc8e68ac9dd52322112c1e356ad9e66b9fcf9 Author: Alexia Death -Date: Tue Mar 16 23:48:56 2010 +0200 +Date: Tue Mar 16 23:48:56 2010 +0200 app: Do not show brush outline when painting @@ -65738,7 +66578,7 @@ commit bd2f852ac102b17fc0427502532eeaaf436bbcf6 Author: Alexia Death -Date: Tue Mar 16 21:51:59 2010 +0200 +Date: Tue Mar 16 21:51:59 2010 +0200 app: make off-canvas changes have effect on brush outline @@ -65748,7 +66588,7 @@ commit 178af8a8f10e893c3321f3074e9c456c34392084 Author: Alexia Death -Date: Mon Mar 15 20:57:39 2010 +0200 +Date: Mon Mar 15 20:57:39 2010 +0200 app: Add dummy pressure prop for airbrush presets backwards compadibility @@ -65758,7 +66598,7 @@ commit 0b9f9e86b1bfe28f13e68cb04848d3325fa8d81b Author: Inaki Larranaga Murgoitio -Date: Tue Mar 16 17:54:59 2010 +0100 +Date: Tue Mar 16 17:54:59 2010 +0100 Updated Basque language @@ -65768,7 +66608,7 @@ commit 89fb69224dc21c8b4b776cc2a74b346e25dcc627 Author: Inaki Larranaga Murgoitio -Date: Tue Mar 16 17:54:22 2010 +0100 +Date: Tue Mar 16 17:54:22 2010 +0100 Updated Basque language @@ -65778,7 +66618,7 @@ commit 86ae897d34c5107f04992256f62e3a19ce0d4c66 Author: Inaki Larranaga Murgoitio -Date: Tue Mar 16 17:40:28 2010 +0100 +Date: Tue Mar 16 17:40:28 2010 +0100 Updated Basque language @@ -65788,7 +66628,7 @@ commit f157023ac462fab06b98413ead532c0b8386b142 Author: Michael Natterer -Date: Mon Mar 15 12:18:30 2010 +0100 +Date: Mon Mar 15 12:18:30 2010 +0100 app: gah, need to make the new strings translatable... @@ -65797,7 +66637,7 @@ commit 317e095052cbea043bf7a739b529134f9859f784 Author: Michael Natterer -Date: Mon Mar 15 12:13:05 2010 +0100 +Date: Mon Mar 15 12:13:05 2010 +0100 Bug 435540 - layer tab: context menu on floating selection @@ -65809,12 +66649,12 @@ commit 44a5a34d7e083453fb0aa9093f3a99f19d476569 Author: Alexia Death -Date: Mon Mar 15 02:20:13 2010 +0200 +Date: Mon Mar 15 02:20:13 2010 +0200 app: Make brush boundaries dynamic aswell - app/base/boundary.c | 43 ++++++++++ - app/base/boundary.h | 3 + + app/base/boundary.c | 43 ++++++++++ + app/base/boundary.h | 3 + app/paint/gimpbrushcore.c | 200 +++++++++++++++++++++++++++++++--------------- app/paint/gimpbrushcore.h | 10 +++ @@ -65823,7 +66663,7 @@ commit 96bce3802f07af7be0db5da04f511a8cd34309ad Author: Michael Natterer -Date: Sun Mar 14 22:57:48 2010 +0100 +Date: Sun Mar 14 22:57:48 2010 +0100 Bug 612896 - Ctrl TAB doesn't browse all the layers @@ -65836,7 +66676,7 @@ commit 9565ef44a91642234dea7577ea02088a998082ba Author: Michael Natterer -Date: Sun Mar 14 22:57:03 2010 +0100 +Date: Sun Mar 14 22:57:03 2010 +0100 app: make sure the selected item's parent paths are all expanded @@ -65845,12 +66685,12 @@ commit 336de7935f3733bd1adcb2433008efb62a021aa7 Author: Alexia Death -Date: Sun Mar 14 19:09:55 2010 +0200 +Date: Sun Mar 14 19:09:55 2010 +0200 app: Add dynamics to airbrush Flow - app/core/core-enums.c | 2 ++ - app/core/core-enums.h | 1 + + app/core/core-enums.c | 2 ++ + app/core/core-enums.h | 1 + app/core/gimpdynamics.c | 23 +++++++++++++++++++++++ app/core/gimpdynamics.h | 1 + app/paint/gimpairbrush.c | 2 +- @@ -65858,18 +66698,18 @@ commit f1a1114ed766732ce8efd83a2610cbdb11298661 Author: Alexia Death -Date: Sun Mar 14 18:12:24 2010 +0200 +Date: Sun Mar 14 18:12:24 2010 +0200 app: Order dynamics in editor a bit more sensibly - app/core/core-enums.c | 20 ++++++++++---------- - app/core/core-enums.h | 10 +++++----- + app/core/core-enums.c | 20 ++++++++++---------- + app/core/core-enums.h | 10 +++++----- app/core/gimpdynamics.c | 12 ++++++------ 3 files changed, 21 insertions(+), 21 deletions(-) commit e85220f8f93836f354033b7b89a4d98dff3f1094 Author: Alexia Death -Date: Sun Mar 14 17:27:27 2010 +0200 +Date: Sun Mar 14 17:27:27 2010 +0200 app: Add an option to explicity turn off airbrush rate @@ -65878,15 +66718,15 @@ rate slider needs to be disabled when motion only is enabled, because it has no effect. - app/paint/gimpairbrush.c | 2 +- + app/paint/gimpairbrush.c | 2 +- app/paint/gimpairbrushoptions.c | 15 ++++++++++++++- app/paint/gimpairbrushoptions.h | 1 + - app/tools/gimpairbrushtool.c | 6 ++++++ + app/tools/gimpairbrushtool.c | 6 ++++++ 4 files changed, 22 insertions(+), 2 deletions(-) commit 861179b452ebf0a6788a793e0ff1b464eed33a5e Author: Alexia Death -Date: Sun Mar 14 17:23:49 2010 +0200 +Date: Sun Mar 14 17:23:49 2010 +0200 app: Rename so-called airbrush pressure to Flow @@ -65894,15 +66734,15 @@ used as input for dynamcs and the fact that flow of paint makes much more sense. - app/paint/gimpairbrush.c | 2 +- + app/paint/gimpairbrush.c | 2 +- app/paint/gimpairbrushoptions.c | 20 ++++++++++---------- app/paint/gimpairbrushoptions.h | 2 +- - app/tools/gimpairbrushtool.c | 4 ++-- + app/tools/gimpairbrushtool.c | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) commit 520da707c11e05d156a9a090eb8821b09e9fcca0 Author: Martin Nordholts -Date: Sat Mar 13 20:02:55 2010 +0100 +Date: Sat Mar 13 20:02:55 2010 +0100 app: Only show active dockables in dock window titles @@ -65922,7 +66762,7 @@ commit a915132ee6f3d3d8a5cdd7f265d4ca86e1e88364 Author: Martin Nordholts -Date: Sat Mar 13 17:18:47 2010 +0100 +Date: Sat Mar 13 17:18:47 2010 +0100 app: Don't call the dock title a title, but "description" @@ -65938,7 +66778,7 @@ commit 0c4409c8971ffdc0dd01e39f363a95095d51d39d Author: Martin Nordholts -Date: Sat Mar 13 16:35:57 2010 +0100 +Date: Sat Mar 13 16:35:57 2010 +0100 app: Session manage empty- and single-image window separately @@ -65949,15 +66789,15 @@ from that point be session managed separately: switching mode switches size of the image window. - app/dialogs/dialogs.c | 4 ++- + app/dialogs/dialogs.c | 4 ++- app/display/gimpimagewindow.c | 84 +++++++++++++++++++++++++++++++++++++------ - etc/sessionrc | 8 +++++ + etc/sessionrc | 8 +++++ 3 files changed, 84 insertions(+), 12 deletions(-) commit 77dab5257e0821123b2ef253bc95035f4535661a Author: Martin Nordholts -Date: Sat Mar 13 12:56:27 2010 +0100 +Date: Sat Mar 13 12:56:27 2010 +0100 app: Introduce image window session utility functions @@ -65971,7 +66811,7 @@ commit e6fa0c65c22e9c3ca7e13c8484331082839efceb Author: Martin Nordholts -Date: Sat Mar 13 12:41:06 2010 +0100 +Date: Sat Mar 13 12:41:06 2010 +0100 app: Simplify GimpImageWindow session management @@ -65986,7 +66826,7 @@ commit 614714d980b906ec8ee049d1f6ea90681640c07a Author: Jon Nordby -Date: Fri Mar 12 23:01:24 2010 +0100 +Date: Fri Mar 12 23:01:24 2010 +0100 plug-ins: Optimize OpenRaster PNG saving @@ -66000,7 +66840,7 @@ commit 3352b0485c42c48824731feac75ed3d222ed8888 Author: Martin Nordholts -Date: Sat Mar 13 12:16:20 2010 +0100 +Date: Sat Mar 13 12:16:20 2010 +0100 app: Fix dockable separator translations @@ -66011,12 +66851,12 @@ app/widgets/gimpdock.h | 14 ++++++++++++++ app/widgets/gimpdockwindow.c | 2 +- app/widgets/gimptoolbox.c | 2 +- - po/POTFILES.in | 1 + + po/POTFILES.in | 1 + 5 files changed, 19 insertions(+), 4 deletions(-) commit cbb815c20303c94fcfea221a55d528ba93ac7d90 Author: Massimo Valentini -Date: Fri Mar 12 20:58:45 2010 +0100 +Date: Fri Mar 12 20:58:45 2010 +0100 Bug 600112 - blur-gauss-selective.exe crashes @@ -66028,7 +66868,7 @@ commit 13cbdabcc30e35f26b267b3d46cb72c39155e67c Author: Michael Natterer -Date: Thu Mar 11 20:50:16 2010 +0100 +Date: Thu Mar 11 20:50:16 2010 +0100 app: fix publically reported layout offset for a couple of cases @@ -66041,12 +66881,12 @@ can draw cursor and selection at the right place. app/text/gimptextlayout-render.c | 31 ++----------------------------- - app/text/gimptextlayout.c | 25 +++++++++++++++++++++++++ + app/text/gimptextlayout.c | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 29 deletions(-) commit 4ba8de76256a0c3c79cd3afd3b4cb0d4fb1c836c Author: Alexandre Prokoudine -Date: Thu Mar 11 22:26:34 2010 +0300 +Date: Thu Mar 11 22:26:34 2010 +0300 Fixes to Russian translation @@ -66055,7 +66895,7 @@ commit b46a89a3022d2c93ffe0d86a5398027aa6aae7bd Author: Aurimas Juška -Date: Thu Mar 11 17:40:00 2010 +0200 +Date: Thu Mar 11 17:40:00 2010 +0200 app: Add methods to enable multiple selection in GimpContainerView @@ -66063,45 +66903,45 @@ disabled everywhere else. app/widgets/gimpcontainereditor.c | 13 +++++++++++ - app/widgets/gimpcontainereditor.h | 4 ++++ + app/widgets/gimpcontainereditor.h | 4 ++++ app/widgets/gimpcontainertreeview.c | 20 +++++++++++++++++ app/widgets/gimpcontainerview.c | 45 +++++++++++++++++++++++++++++++++++++ - app/widgets/gimpcontainerview.h | 8 +++++++ - app/widgets/gimpdatafactoryview.c | 2 ++ + app/widgets/gimpcontainerview.h | 8 +++++++ + app/widgets/gimpdatafactoryview.c | 2 ++ 6 files changed, 92 insertions(+) commit 9e2723d39020dad4efcfea7c0a3b994e4dc1401e Author: Aurimas Juška -Date: Tue Mar 9 21:29:25 2010 +0200 +Date: Tue Mar 9 21:29:25 2010 +0200 app: Revert add flags for multiple selection support Don't add additional constructor argument. - app/dialogs/quit-dialog.c | 2 +- - app/widgets/gimpbufferview.c | 2 +- - app/widgets/gimpcontainereditor.c | 4 +--- - app/widgets/gimpcontainereditor.h | 1 - - app/widgets/gimpcontainerpopup.c | 1 - + app/dialogs/quit-dialog.c | 2 +- + app/widgets/gimpbufferview.c | 2 +- + app/widgets/gimpcontainereditor.c | 4 +--- + app/widgets/gimpcontainereditor.h | 1 - + app/widgets/gimpcontainerpopup.c | 1 - app/widgets/gimpcontainertreeview.c | 18 ++++-------------- - app/widgets/gimpcontainertreeview.h | 3 +-- + app/widgets/gimpcontainertreeview.h | 3 +-- app/widgets/gimpcontainerview.c | 21 --------------------- - app/widgets/gimpcontainerview.h | 1 - - app/widgets/gimpcontrollerlist.c | 2 +- - app/widgets/gimpdatafactoryview.c | 2 +- - app/widgets/gimpdeviceeditor.c | 2 +- - app/widgets/gimpdocumentview.c | 2 +- - app/widgets/gimpfontview.c | 2 +- - app/widgets/gimpimageview.c | 2 +- - app/widgets/gimpsettingseditor.c | 2 +- - app/widgets/gimptemplateview.c | 2 +- - app/widgets/gimpundoeditor.c | 2 +- + app/widgets/gimpcontainerview.h | 1 - + app/widgets/gimpcontrollerlist.c | 2 +- + app/widgets/gimpdatafactoryview.c | 2 +- + app/widgets/gimpdeviceeditor.c | 2 +- + app/widgets/gimpdocumentview.c | 2 +- + app/widgets/gimpfontview.c | 2 +- + app/widgets/gimpimageview.c | 2 +- + app/widgets/gimpsettingseditor.c | 2 +- + app/widgets/gimptemplateview.c | 2 +- + app/widgets/gimpundoeditor.c | 2 +- 18 files changed, 17 insertions(+), 54 deletions(-) commit bc02c2f51ee31588ceb8b9d9aebaf1557fe4119c Author: Massimo Valentini -Date: Thu Mar 11 08:42:19 2010 +0100 +Date: Thu Mar 11 08:42:19 2010 +0100 Bug 599233 - Dialog of "Save as BMP" ignores changes which are not made with a mouse @@ -66113,7 +66953,7 @@ commit bae745bba2c1bf3e0d348e266643c38495af05f0 Author: Alexia Death -Date: Wed Mar 10 23:32:31 2010 +0200 +Date: Wed Mar 10 23:32:31 2010 +0200 app: Fix 0.0-scale brushes in interpolation @@ -66122,7 +66962,7 @@ commit 7f8c5d5a357d269356e7b66c17ddf1cc2c93f378 Author: Michael Natterer -Date: Wed Mar 10 20:17:13 2010 +0100 +Date: Wed Mar 10 20:17:13 2010 +0100 app: make private functions static, I have no clue why they weren't @@ -66131,7 +66971,7 @@ commit 2bad33bc8f3b094c6a8c178134df15d26a6494fe Author: Christian.Kirbach -Date: Wed Mar 10 11:26:15 2010 +0100 +Date: Wed Mar 10 11:26:15 2010 +0100 Updated German translation @@ -66141,24 +66981,24 @@ commit 5fda650281eec30f577cbfffecb394a2b0d8e082 Author: Alexia Death -Date: Tue Mar 9 22:22:38 2010 +0200 +Date: Tue Mar 9 22:22:38 2010 +0200 app: Support for wheel input found in highend wacom tablets&tools - app/core/gimpdynamicsoutput.c | 77 + app/core/gimpdynamicsoutput.c | 77 ++++++++++++++++++++++++++++++---- - app/core/gimpdynamicsoutput.h | 2 + - app/widgets/gimpdynamicseditor.c | 12 ++++-- + app/core/gimpdynamicsoutput.h | 2 + + app/widgets/gimpdynamicseditor.c | 12 ++++-- app/widgets/gimpdynamicsoutputeditor.c | 29 +++++++++++++ 4 files changed, 110 insertions(+), 10 deletions(-) commit 96b371b775f994e5839cffcfa5b0f489a66fa4e9 Author: Miloš Popović -Date: Tue Mar 9 19:11:00 2010 +0100 +Date: Tue Mar 9 19:11:00 2010 +0100 Updated Serbian translations - po/sr.po | 770 + po/sr.po | 770 ++++++++++++++++++++++++++++++++------------------------- po/sr@latin.po | 770 ++++++++++++++++++++++++++++++++------------------------- @@ -66166,7 +67006,7 @@ commit fe6699cc1cd31a445c0590a6b904df218e6222b8 Author: Martin Nordholts -Date: Tue Mar 9 08:01:34 2010 +0100 +Date: Tue Mar 9 08:01:34 2010 +0100 app: Apply Windows→Hide docks on startup @@ -66176,12 +67016,12 @@ app/actions/windows-commands.c | 11 ----------- app/widgets/gimpdialogfactory.c | 38 ++++++++++++++++++++++++++++++++++++-- - app/widgets/gimpsessioninfo.c | 14 +++++++++++++- + app/widgets/gimpsessioninfo.c | 14 +++++++++++++- 3 files changed, 49 insertions(+), 14 deletions(-) commit c5c92e484ce84ea156e7c27ff6f2b14d4f9081f7 Author: Martin Nordholts -Date: Mon Mar 1 08:23:05 2010 +0100 +Date: Mon Mar 1 08:23:05 2010 +0100 app: We don't need to show restored dialogs twice @@ -66190,7 +67030,7 @@ commit 909acba11debca4226e499fcd1b87349e647eeb4 Author: Martin Nordholts -Date: Tue Mar 9 07:48:25 2010 +0100 +Date: Tue Mar 9 07:48:25 2010 +0100 app: Introduce GIMP_DIALOG_VISIBILITY_HIDDEN @@ -66201,12 +67041,12 @@ app/widgets/gimpdialogfactory.c | 8 +++++--- app/widgets/gimpdialogfactory.h | 3 ++- - app/widgets/gimpsessioninfo.c | 5 +++++ + app/widgets/gimpsessioninfo.c | 5 +++++ 3 files changed, 12 insertions(+), 4 deletions(-) commit e6268b735365e824214a1341f184071574b8cb7a Author: Martin Nordholts -Date: Sun Mar 7 14:53:31 2010 +0100 +Date: Sun Mar 7 14:53:31 2010 +0100 devel-docs: Update GIMP schedule @@ -66217,7 +67057,7 @@ commit 8fb846160af35a9fca2ea85a0a2754d879875326 Author: Aurimas Juška -Date: Tue Mar 9 01:13:29 2010 +0200 +Date: Tue Mar 9 01:13:29 2010 +0200 app: Fix crash when GimpContainerTreeView is used to activate items @@ -66229,7 +67069,7 @@ commit 3e3613bef79cf8c46d9a5507d6637f46965ddc8a Author: Michael Natterer -Date: Mon Mar 8 21:57:29 2010 +0100 +Date: Mon Mar 8 21:57:29 2010 +0100 app: allow for more fine-grained baseline and kerning adjustments @@ -66238,13 +67078,13 @@ from gint to gdouble. app/tools/gimptexttool-editor.c | 12 ++++++------ - app/widgets/gimptextproxy.c | 18 +++++++++--------- - app/widgets/gimptextproxy.h | 6 +++--- + app/widgets/gimptextproxy.c | 18 +++++++++--------- + app/widgets/gimptextproxy.h | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) commit 4d0acad8c074aaa702da7678e8cc1200b41a5db6 Author: Alexandre Prokoudine -Date: Mon Mar 8 10:08:12 2010 +0300 +Date: Mon Mar 8 10:08:12 2010 +0300 Updated Russian translation @@ -66254,36 +67094,36 @@ commit 13b172b675f55a4d2193471b2238053fd4c0a956 Author: Aurimas Juška -Date: Mon Aug 17 23:29:43 2009 +0300 +Date: Mon Aug 17 23:29:43 2009 +0300 app: Add flags for multiple selection support Multiple item selection is disabled by default and currently enabled only for data views. - app/dialogs/quit-dialog.c | 2 +- - app/widgets/gimpbufferview.c | 2 +- - app/widgets/gimpcontainereditor.c | 4 +++- - app/widgets/gimpcontainereditor.h | 1 + - app/widgets/gimpcontainerpopup.c | 1 + + app/dialogs/quit-dialog.c | 2 +- + app/widgets/gimpbufferview.c | 2 +- + app/widgets/gimpcontainereditor.c | 4 +++- + app/widgets/gimpcontainereditor.h | 1 + + app/widgets/gimpcontainerpopup.c | 1 + app/widgets/gimpcontainertreeview.c | 18 ++++++++++++++---- - app/widgets/gimpcontainertreeview.h | 3 ++- + app/widgets/gimpcontainertreeview.h | 3 ++- app/widgets/gimpcontainerview.c | 21 +++++++++++++++++++++ - app/widgets/gimpcontainerview.h | 1 + - app/widgets/gimpcontrollerlist.c | 2 +- - app/widgets/gimpdatafactoryview.c | 2 +- - app/widgets/gimpdeviceeditor.c | 2 +- - app/widgets/gimpdocumentview.c | 2 +- - app/widgets/gimpfontview.c | 2 +- - app/widgets/gimpimageview.c | 2 +- - app/widgets/gimpsettingseditor.c | 2 +- - app/widgets/gimptemplateview.c | 2 +- - app/widgets/gimpundoeditor.c | 2 +- + app/widgets/gimpcontainerview.h | 1 + + app/widgets/gimpcontrollerlist.c | 2 +- + app/widgets/gimpdatafactoryview.c | 2 +- + app/widgets/gimpdeviceeditor.c | 2 +- + app/widgets/gimpdocumentview.c | 2 +- + app/widgets/gimpfontview.c | 2 +- + app/widgets/gimpimageview.c | 2 +- + app/widgets/gimpsettingseditor.c | 2 +- + app/widgets/gimptemplateview.c | 2 +- + app/widgets/gimpundoeditor.c | 2 +- 18 files changed, 54 insertions(+), 17 deletions(-) commit 8e87f06e204575e03822b1b195b74743f41d85eb Author: Aurimas Juška -Date: Fri Aug 14 22:25:22 2009 +0300 +Date: Fri Aug 14 22:25:22 2009 +0300 app: Add support for tag assignment on multiple selected items @@ -66295,14 +67135,14 @@ replacing their previous tags). app/widgets/gimpdatafactoryview.c | 9 +-- - app/widgets/gimptagentry.c | 143 + app/widgets/gimptagentry.c | 143 +++++++++++++++++++++++++++----------- - app/widgets/gimptagentry.h | 1 + + app/widgets/gimptagentry.h | 1 + 3 files changed, 107 insertions(+), 46 deletions(-) commit ebe9e51b62a61d903d2ecc908c469d45b7fd3e83 Author: Aurimas Juška -Date: Sun Mar 7 18:54:20 2010 +0200 +Date: Sun Mar 7 18:54:20 2010 +0200 app: Add support for multiple items selection @@ -66310,21 +67150,21 @@ GimpContainerTreeView actually provides such functionality. All other GimpContainerViews should work as before. - app/actions/actions.c | 16 +++++ - app/actions/actions.h | 1 + - app/actions/brushes-actions.c | 5 ++ - app/actions/gradients-actions.c | 5 ++ - app/actions/palettes-actions.c | 5 ++ - app/actions/patterns-actions.c | 5 ++ + app/actions/actions.c | 16 +++++ + app/actions/actions.h | 1 + + app/actions/brushes-actions.c | 5 ++ + app/actions/gradients-actions.c | 5 ++ + app/actions/palettes-actions.c | 5 ++ + app/actions/patterns-actions.c | 5 ++ app/widgets/gimpcontainertreeview.c | 136 +++++++++++++++++++++++++++++------- - app/widgets/gimpcontainerview.c | 76 ++++++++++++++++++++ - app/widgets/gimpcontainerview.h | 9 ++- + app/widgets/gimpcontainerview.c | 76 ++++++++++++++++++++ + app/widgets/gimpcontainerview.h | 9 ++- 9 files changed, 229 insertions(+), 29 deletions(-) commit 98a2b0210f9fdf4acb5c5632e0607ee978e5a869 Author: Michael Natterer -Date: Sun Mar 7 17:34:49 2010 +0100 +Date: Sun Mar 7 17:34:49 2010 +0100 app: fix crash introduced by layout offset refactoring @@ -66337,7 +67177,7 @@ commit 20d77451fd2176f5e592f7eda5720876f2c951fb Author: Alexia Death -Date: Sun Mar 7 15:56:38 2010 +0200 +Date: Sun Mar 7 15:56:38 2010 +0200 app: Fix brush tools behavior at very small scale values @@ -66349,7 +67189,7 @@ commit 318dd80189d45e30124b086e743c1c5980b3abb7 Author: Alexia Death -Date: Sun Mar 7 15:01:22 2010 +0200 +Date: Sun Mar 7 15:01:22 2010 +0200 app: Remove the fade exponent. It does not let fade hit zero. @@ -66358,7 +67198,7 @@ commit ee1f0a8b007236dd3f6a1f72fc32285a444778a2 Author: Martin Nordholts -Date: Sun Mar 7 12:59:21 2010 +0100 +Date: Sun Mar 7 12:59:21 2010 +0100 app: Fix dock remove condition @@ -66371,7 +67211,7 @@ commit 35096957a9812c1e878e79613079f14b88b90086 Author: Martin Nordholts -Date: Sun Mar 7 12:48:26 2010 +0100 +Date: Sun Mar 7 12:48:26 2010 +0100 Bug 554927 - The dock window titles uses a non localizable comma @@ -66384,7 +67224,7 @@ commit a5409e2872e816fb4e266e13bf64e213fee1a7a2 Author: Michael Natterer -Date: Sun Mar 7 12:39:50 2010 +0100 +Date: Sun Mar 7 12:39:50 2010 +0100 app: allow to pick text layers with the text tool @@ -66397,7 +67237,7 @@ commit 1eb50fec2e3abaedf5c8f02e6e4d711fc9489ea1 Author: Jerry Baker -Date: Fri Mar 5 12:50:01 2010 -0500 +Date: Fri Mar 5 12:50:01 2010 -0500 Bug 611928 - Add 'active_vectors' to pygimp @@ -66409,7 +67249,7 @@ commit d44ee9e2c4ba716616cb25530f7d5290408902ec Author: Martin Nordholts -Date: Sun Mar 7 12:24:26 2010 +0100 +Date: Sun Mar 7 12:24:26 2010 +0100 app: Update Windows->Toolbox menu entry depending on if toolbox exists @@ -66428,7 +67268,7 @@ commit 15344ffd6dd41febd6e542f1e5e74186c149bec4 Author: Martin Nordholts -Date: Sun Mar 7 11:15:16 2010 +0100 +Date: Sun Mar 7 11:15:16 2010 +0100 app: Add gimp_action_group_set_action_tooltip() @@ -66438,7 +67278,7 @@ commit 33dbcf210e1cf71ef932f5fd68e9a5a20773a588 Author: Martin Nordholts -Date: Sun Mar 7 10:25:24 2010 +0100 +Date: Sun Mar 7 10:25:24 2010 +0100 app: Move title invalidation from GimpMenuDock to GimpDock base class @@ -66453,7 +67293,7 @@ commit ea666d178bbf67dc64b29bc74e937b374124eaec Author: Martin Nordholts -Date: Sun Mar 7 09:33:33 2010 +0100 +Date: Sun Mar 7 09:33:33 2010 +0100 app: Don't remove dock in destruction from dock column @@ -66467,7 +67307,7 @@ commit 7b8352bfa04f24e2501b365ac7509cc52df55720 Author: Martin Nordholts -Date: Sun Mar 7 09:00:08 2010 +0100 +Date: Sun Mar 7 09:00:08 2010 +0100 app/tests: Make test that closes dock window use multi-column variant @@ -66480,7 +67320,7 @@ commit bdfbddd5e8578f40ea489e75e790d486464da207 Author: Martin Nordholts -Date: Sun Mar 7 08:55:18 2010 +0100 +Date: Sun Mar 7 08:55:18 2010 +0100 app/tests: Generalize gimp_ui_find_non_toolbox_dock_window() @@ -66493,7 +67333,7 @@ commit a90a64707cbb597e998b45533374f79658b64d64 Author: Martin Nordholts -Date: Sun Mar 7 07:51:53 2010 +0100 +Date: Sun Mar 7 07:51:53 2010 +0100 app: Prevent multiple toolboxes through recently closed-list @@ -66507,7 +67347,7 @@ commit beb8e450f088eb72b7d3a3be738f9cc1f58f80c6 Author: Martin Nordholts -Date: Sat Mar 6 08:17:21 2010 +0100 +Date: Sat Mar 6 08:17:21 2010 +0100 app: Fix condition of what dock windows are added to recent-list @@ -66521,27 +67361,27 @@ commit 6650693d295b211c92a67d80b9fe2bedeb669965 Author: Michael Natterer -Date: Sun Mar 7 01:55:31 2010 +0100 +Date: Sun Mar 7 01:55:31 2010 +0100 app: move gimp_image_pick_layer() to its own file and add a (still unused) text layer picking function. - app/core/Makefile.am | 2 + + app/core/Makefile.am | 2 + app/core/gimpimage-pick-layer.c | 109 ++++++++++++++++++++++++++++++++++++++++ app/core/gimpimage-pick-layer.h | 30 +++++++++++ - app/core/gimpimage.c | 33 ------------ - app/core/gimpimage.h | 3 -- - app/pdb/image-cmds.c | 1 + - app/tools/gimpmovetool.c | 1 + - app/tools/gimpselectiontool.c | 1 + - tools/pdbgen/pdb/image.pdb | 1 + + app/core/gimpimage.c | 33 ------------ + app/core/gimpimage.h | 3 -- + app/pdb/image-cmds.c | 1 + + app/tools/gimpmovetool.c | 1 + + app/tools/gimpselectiontool.c | 1 + + tools/pdbgen/pdb/image.pdb | 1 + 9 files changed, 145 insertions(+), 36 deletions(-) commit cda52f946cddf7cbffe1e85713c535d6b0dfa7c6 Author: Michael Natterer -Date: Sun Mar 7 01:19:09 2010 +0100 +Date: Sun Mar 7 01:19:09 2010 +0100 app: minor code cleanup (add local variable to improve readability) @@ -66550,7 +67390,7 @@ commit 2e5de8f6abcfab32b07cebc344110c44b5e44b89 Author: Michael Natterer -Date: Sun Mar 7 01:15:04 2010 +0100 +Date: Sun Mar 7 01:15:04 2010 +0100 app: pass the cursor's PangoRectangle to gimp_draw_tool_draw_text_cursor() @@ -66566,7 +67406,7 @@ commit b9405d046a51ae4692bd30a5c9d66efe6c5414d3 Author: Michael Natterer -Date: Sun Mar 7 00:53:32 2010 +0100 +Date: Sun Mar 7 00:53:32 2010 +0100 app: fix some corner cases in gimp_text_tool_button_release() @@ -66582,7 +67422,7 @@ commit a077d618eadd137cd37af22206c856ae5efe0396 Author: Michael Natterer -Date: Sun Mar 7 00:21:51 2010 +0100 +Date: Sun Mar 7 00:21:51 2010 +0100 app: no need any more to block drawing before non-text changes to the proxy @@ -66592,7 +67432,7 @@ commit 44f6d074a3deddcbccd4bbe084a510b493f46c85 Author: Michael Natterer -Date: Sun Mar 7 00:15:32 2010 +0100 +Date: Sun Mar 7 00:15:32 2010 +0100 app: call gimp_text_tool_block_drawing() in proxy_notify() @@ -66607,7 +67447,7 @@ commit 2934095816dae2f8a151d6eece3aa36c3accfef7 Author: Michael Natterer -Date: Sun Mar 7 00:11:05 2010 +0100 +Date: Sun Mar 7 00:11:05 2010 +0100 app: use gimp_text_layout_get_offsets() @@ -66618,12 +67458,12 @@ app/tools/gimptexttool-editor.c | 68 +++++++++++++++-------------------------- app/tools/gimptexttool-editor.h | 4 +-- - app/tools/gimptexttool.c | 37 +++++++++++----------- + app/tools/gimptexttool.c | 37 +++++++++++----------- 3 files changed, 43 insertions(+), 66 deletions(-) commit 1aeb315ecf10d4cc5f9df8e284cee7b1cd48dc11 Author: Michael Natterer -Date: Sat Mar 6 23:14:29 2010 +0100 +Date: Sat Mar 6 23:14:29 2010 +0100 undef GTK_DISABLE_DEPRECATED in many places which undef GSEAL_ENABLE @@ -66631,31 +67471,31 @@ now deprecated in GTK+ master. app/dialogs/resolution-calibrate-dialog.c | 1 + - app/display/gimpcanvas.c | 1 + + app/display/gimpcanvas.c | 1 + app/display/gimpdisplayshell-callbacks.c | 1 + - app/display/gimpimagewindow.c | 1 + - app/widgets/gimpcursor.c | 1 + - app/widgets/gimpdockable.c | 1 + - app/widgets/gimpoverlaybox.c | 1 + - app/widgets/gimpoverlaychild.c | 1 + - app/widgets/gimpview.c | 1 + - app/widgets/gimpwidgets-utils.c | 1 + - app/widgets/gtkhwrapbox.c | 1 + - app/widgets/gtkwrapbox.c | 1 + - libgimp/gimpprogressbar.c | 1 + - libgimp/gimpui.c | 1 + - libgimp/gimpzoompreview.c | 1 + - libgimpwidgets/gimppixmap.c | 1 + - libgimpwidgets/gimppreview.c | 1 + - libgimpwidgets/gimpruler.c | 1 + - libgimpwidgets/gimpscrolledpreview.c | 1 + - plug-ins/common/animation-play.c | 1 + - plug-ins/ifs-compose/ifs-compose.c | 1 + + app/display/gimpimagewindow.c | 1 + + app/widgets/gimpcursor.c | 1 + + app/widgets/gimpdockable.c | 1 + + app/widgets/gimpoverlaybox.c | 1 + + app/widgets/gimpoverlaychild.c | 1 + + app/widgets/gimpview.c | 1 + + app/widgets/gimpwidgets-utils.c | 1 + + app/widgets/gtkhwrapbox.c | 1 + + app/widgets/gtkwrapbox.c | 1 + + libgimp/gimpprogressbar.c | 1 + + libgimp/gimpui.c | 1 + + libgimp/gimpzoompreview.c | 1 + + libgimpwidgets/gimppixmap.c | 1 + + libgimpwidgets/gimppreview.c | 1 + + libgimpwidgets/gimpruler.c | 1 + + libgimpwidgets/gimpscrolledpreview.c | 1 + + plug-ins/common/animation-play.c | 1 + + plug-ins/ifs-compose/ifs-compose.c | 1 + 21 files changed, 21 insertions(+) commit e003213784b58d632b34071ae58d7f84aea78a55 Author: Michael Natterer -Date: Sat Mar 6 22:54:12 2010 +0100 +Date: Sat Mar 6 22:54:12 2010 +0100 app: move code for font entry and "size" label together @@ -66664,7 +67504,7 @@ commit 1010b497c2ff427e64261209e461f7ec4e4c27ef Author: Martin Nordholts -Date: Fri Mar 5 21:24:47 2010 +0100 +Date: Fri Mar 5 21:24:47 2010 +0100 app: Update dock window title when docks re added/removed @@ -66677,7 +67517,7 @@ commit 0279daed2844e93f944df2289e964c79d8610cb3 Author: Martin Nordholts -Date: Fri Mar 5 08:26:24 2010 +0100 +Date: Fri Mar 5 08:26:24 2010 +0100 app: Make Toolbox dock title complete @@ -66691,7 +67531,7 @@ commit bfb8a94e19c16c076ff53bb73d2456d34c869721 Author: Martin Nordholts -Date: Fri Mar 5 07:27:47 2010 +0100 +Date: Fri Mar 5 07:27:47 2010 +0100 menus: Move Windows→Toolbox entry out from list of open dock windows @@ -66703,7 +67543,7 @@ commit 4cda04da5c67cdb7b57b761f9837926b3bf3343f Author: Martin Nordholts -Date: Thu Mar 4 23:25:36 2010 +0100 +Date: Thu Mar 4 23:25:36 2010 +0100 app: Remove gimp_dock_window_get_dock() @@ -66713,7 +67553,7 @@ it. (The function itself was introduced when there could only be one dock per dock window.) - app/actions/actions.c | 20 ++++---------------- + app/actions/actions.c | 20 ++++---------------- app/actions/dock-actions.c | 9 ++++----- app/widgets/gimpdockwindow.c | 21 +++------------------ app/widgets/gimpdockwindow.h | 1 - @@ -66721,7 +67561,7 @@ commit cecae710340fff602803d4cd94738c38535c77c4 Author: Martin Nordholts -Date: Thu Mar 4 22:59:25 2010 +0100 +Date: Thu Mar 4 22:59:25 2010 +0100 app: Include all docks in dock window title @@ -66730,7 +67570,7 @@ commit fc35ec4fe5a6157f1633e9d616ad36197e484084 Author: Martin Nordholts -Date: Wed Mar 3 17:35:50 2010 +0100 +Date: Wed Mar 3 17:35:50 2010 +0100 app: Fix magic number in gimp_canvas_draw_segments() @@ -66739,21 +67579,21 @@ commit 3ef96003957f06e93a4992c494e406ed6f3ae4e9 Author: Miloš Popović -Date: Fri Mar 5 20:37:00 2010 +0100 +Date: Fri Mar 5 20:37:00 2010 +0100 Updated Serbian translations - po-plug-ins/sr.po | 342 +++++---- + po-plug-ins/sr.po | 342 +++++---- po-plug-ins/sr@latin.po | 342 +++++---- - po/sr.po | 1929 + po/sr.po | 1929 ++++++++++++++++++++++++----------------------- - po/sr@latin.po | 1929 + po/sr@latin.po | 1929 ++++++++++++++++++++++++----------------------- 4 files changed, 2328 insertions(+), 2214 deletions(-) commit 15c5c0a03628b55b60e841736046094d04067e6f Author: Michael Natterer -Date: Fri Mar 5 16:38:18 2010 +0100 +Date: Fri Mar 5 16:38:18 2010 +0100 po: update POTFILES.in @@ -66762,7 +67602,7 @@ commit e9f85b3afcb92e3e4dc25391b4c52d03c7771eaf Author: Michael Natterer -Date: Fri Mar 5 10:53:09 2010 +0100 +Date: Fri Mar 5 10:53:09 2010 +0100 app: block text buffer signals around copying to the clipboard @@ -66774,7 +67614,7 @@ commit 076948b4b741a32cc8f330513c68b3b785315e47 Author: Michael Natterer -Date: Fri Mar 5 10:50:50 2010 +0100 +Date: Fri Mar 5 10:50:50 2010 +0100 app: don't leave drawing blocked in the error case @@ -66783,7 +67623,7 @@ commit 5284c9c836198f74197e2f365d5b5955d6a16b10 Author: Michael Natterer -Date: Thu Mar 4 23:47:23 2010 +0100 +Date: Thu Mar 4 23:47:23 2010 +0100 app: fix text tool drawing for good this time (hopefully) @@ -66822,14 +67662,14 @@ - add calls to begin/end_user_action() where they were missing. app/tools/gimptexttool-editor.c | 36 +------------ - app/tools/gimptexttool.c | 112 + app/tools/gimptexttool.c | 112 +++++++++++++++++++++++++++------------- - app/tools/gimptexttool.h | 1 + + app/tools/gimptexttool.h | 1 + 3 files changed, 80 insertions(+), 69 deletions(-) commit e54a05f78f12ef491fb071b5557ac991a6fce944 Author: Michael Natterer -Date: Thu Mar 4 23:10:23 2010 +0100 +Date: Thu Mar 4 23:10:23 2010 +0100 app: get rid of gimp_text_tool_idle_apply() @@ -66841,7 +67681,7 @@ commit 6fcb5c137d3fa52ec0d9ec0a64c7d008426a3e2f Author: Michael Natterer -Date: Thu Mar 4 18:53:53 2010 +0100 +Date: Thu Mar 4 18:53:53 2010 +0100 app: block all unhandled key events in the text style editor @@ -66852,7 +67692,7 @@ commit 8434bf927621c4d89dd4a1df5e53ba9ce787475a Author: Michael Natterer -Date: Thu Mar 4 14:32:36 2010 +0100 +Date: Thu Mar 4 14:32:36 2010 +0100 app: reorganize widgets in two lines @@ -66865,15 +67705,15 @@ commit f76621554869cdb741f027b9c2f223db5712a34a Author: Michael Natterer -Date: Thu Mar 4 14:19:37 2010 +0100 +Date: Thu Mar 4 14:19:37 2010 +0100 app: add baseline and kerning controls to the style editor overlay Involves adding GimpTextBuffer API to *set* baseline and kerning (as opposed to changing it relatively from what it was). - app/widgets/gimptextbuffer.c | 72 +++++++++++ - app/widgets/gimptextbuffer.h | 8 ++ + app/widgets/gimptextbuffer.c | 72 +++++++++++ + app/widgets/gimptextbuffer.h | 8 ++ app/widgets/gimptextstyleeditor.c | 253 +++++++++++++++++++++++++++++++------- app/widgets/gimptextstyleeditor.h | 6 + @@ -66881,7 +67721,7 @@ commit 35aebd76d606a1fb6711bcdfe0df298f721b149e Author: Nils-Christoph Fiedler -Date: Thu Mar 4 01:09:44 2010 +0100 +Date: Thu Mar 4 01:09:44 2010 +0100 Updated LowGerman translation @@ -66891,7 +67731,7 @@ commit 73b86bd9c9295a2ba150a27d3793407fc23d89c0 Author: Aurimas Juška -Date: Wed Mar 3 23:25:17 2010 +0200 +Date: Wed Mar 3 23:25:17 2010 +0200 app: Fix GimpTag reference handling @@ -66901,7 +67741,7 @@ commit 9431376f55ec8dc22f16969434c49cc579902e6e Author: Michael Natterer -Date: Wed Mar 3 10:53:01 2010 +0100 +Date: Wed Mar 3 10:53:01 2010 +0100 app: cosmetic cleanup for readability @@ -66910,22 +67750,22 @@ commit bbd2d521f12f771d7a1064b59e00e0720ba3a36b Author: Michael Natterer -Date: Wed Mar 3 10:48:42 2010 +0100 +Date: Wed Mar 3 10:48:42 2010 +0100 app: rename "spacing" to "kerning" because that's what it does - app/tools/gimptexttool-editor.c | 10 ++-- + app/tools/gimptexttool-editor.c | 10 ++-- app/widgets/gimptextbuffer-serialize.c | 4 +- - app/widgets/gimptextbuffer.c | 91 + app/widgets/gimptextbuffer.c | 91 +++++++++++++++------------------- - app/widgets/gimptextbuffer.h | 8 +-- - app/widgets/gimptextproxy.c | 12 ++--- - app/widgets/gimptextproxy.h | 2 +- + app/widgets/gimptextbuffer.h | 8 +-- + app/widgets/gimptextproxy.c | 12 ++--- + app/widgets/gimptextproxy.h | 2 +- 6 files changed, 58 insertions(+), 69 deletions(-) commit 1d74c1f9cf03db1de91cc8506cfa9cf6f3fa6268 Author: Michael Natterer -Date: Wed Mar 3 10:18:31 2010 +0100 +Date: Wed Mar 3 10:18:31 2010 +0100 app: don't overwrite all markup-set attributes with letter_spacing @@ -66937,7 +67777,7 @@ commit 60e0496b1ebe9e337c9e4081ec21a9c09379ceb8 Author: Martin Nordholts -Date: Wed Mar 3 07:38:50 2010 +0100 +Date: Wed Mar 3 07:38:50 2010 +0100 Bug 610588 - Show Image Selection menu items visible in SWM @@ -66946,7 +67786,7 @@ commit 080f1a6ce4c0e6f7ec136f925e0dd117dd9b94d6 Author: Michael Natterer -Date: Wed Mar 3 01:15:27 2010 +0100 +Date: Wed Mar 3 01:15:27 2010 +0100 app: fix editing text layers which don't contain markup @@ -66959,7 +67799,7 @@ commit 798e2e67e9089d55e5dd999f3c47a1b2de5078c0 Author: Martin Nordholts -Date: Tue Mar 2 22:31:01 2010 +0100 +Date: Tue Mar 2 22:31:01 2010 +0100 app: Move toolbox special casing into dialog factory @@ -66967,19 +67807,19 @@ gimp_dialog_factory_dialog_new_internal() and on the fly fix problems with double toolboxes appearing and sometimes not appearing. - app/actions/dialogs-actions.c | 6 ++++ - app/actions/windows-actions.c | 6 ---- + app/actions/dialogs-actions.c | 6 ++++ + app/actions/windows-actions.c | 6 ---- app/actions/windows-commands.c | 29 ---------------- app/actions/windows-commands.h | 3 -- - app/gui/gui.c | 2 -- + app/gui/gui.c | 2 -- app/widgets/gimpdialogfactory.c | 76 ++++++++++++++++++++++++++++++++--------- - menus/image-menu.xml.in | 4 +-- + menus/image-menu.xml.in | 4 +-- 7 files changed, 68 insertions(+), 58 deletions(-) commit e4dee4c559d2ece9629c561158c4afc5e8291fe0 Author: Martin Nordholts -Date: Tue Mar 2 22:15:42 2010 +0100 +Date: Tue Mar 2 22:15:42 2010 +0100 app: Cleanup gimp_dialog_factory_dialog_new_internal() a bit @@ -66991,7 +67831,7 @@ commit 9a9d7489d1896ceb0d0ae57794f1c7919e7520d2 Author: Michael Natterer -Date: Tue Mar 2 21:54:24 2010 +0100 +Date: Tue Mar 2 21:54:24 2010 +0100 app: make undo compression in the text tool work again @@ -67005,7 +67845,7 @@ This way we don't push "text" *and* "markup" undos on each keystroke, and undo compression works the way it did before. - app/text/gimptext.c | 12 +++++++++ + app/text/gimptext.c | 12 +++++++++ app/tools/gimptexttool.c | 59 +++++++++++++++++++++++++++++--------------- app/widgets/gimptextbuffer.c | 24 ++++++++++++++++++ @@ -67014,7 +67854,7 @@ commit e9abde75eecef2b5545f53bdda0719a0c7fae4f4 Author: Michael Natterer -Date: Tue Mar 2 21:19:57 2010 +0100 +Date: Tue Mar 2 21:19:57 2010 +0100 app: if there is no "text", generate the layer name from "markup" @@ -67022,15 +67862,15 @@ code stolen from gmarkup.c), and use it if the layer's text object doesn't have any text set. - app/core/gimp-utils.c | 157 + app/core/gimp-utils.c | 157 +++++++++++++++++++++++++++++++++++++++++++++++ - app/core/gimp-utils.h | 3 + + app/core/gimp-utils.h | 3 + app/text/gimptextlayer.c | 32 +++++++--- 3 files changed, 184 insertions(+), 8 deletions(-) commit 842f1df2f222753ae589eabf7529712167bfd580 Author: Michael Natterer -Date: Tue Mar 2 17:54:29 2010 +0100 +Date: Tue Mar 2 17:54:29 2010 +0100 Bug 611514 - Layers inside layer groups can't be dragged to layer dock buttons @@ -67047,7 +67887,7 @@ commit 9c4864e789b05b294e5d56e59eb1e9f610150658 Author: Michael Natterer -Date: Tue Mar 2 17:44:31 2010 +0100 +Date: Tue Mar 2 17:44:31 2010 +0100 app: optimize away redundant and expensive text layer re-rendering @@ -67062,16 +67902,16 @@ common code to the "changed" callback (e.g. we don't need to re-frame the item for each set property). - app/text/gimptext.c | 63 + app/text/gimptext.c | 63 ++++++++++++++++++++++++++++++++++++------------ - app/text/gimptext.h | 2 ++ + app/text/gimptext.h | 2 ++ app/text/gimptextlayer.c | 14 +++++++---- app/tools/gimptexttool.c | 36 ++++++++++++++++++++++----- 4 files changed, 89 insertions(+), 26 deletions(-) commit 6d4f2c3431e8d3c229ecd3ac5952b287d10983fb Author: Michael Natterer -Date: Tue Mar 2 15:24:17 2010 +0100 +Date: Tue Mar 2 15:24:17 2010 +0100 Bug 565001 - Text-Tool crashes when edit a 2.4.2 version xcf @@ -67082,7 +67922,7 @@ commit 1fb61b8515f2b81e9168233e8e7118d1dcf9203e Author: Michael Natterer -Date: Tue Mar 2 13:04:37 2010 +0100 +Date: Tue Mar 2 13:04:37 2010 +0100 app: make sure mouse-selecting doesn't push an undo step @@ -67094,7 +67934,7 @@ commit 78ea82df1fee8fce16ce39ddffb1a78f9c860835 Author: Michael Natterer -Date: Tue Mar 2 12:23:29 2010 +0100 +Date: Tue Mar 2 12:23:29 2010 +0100 app: simplify mouse selection by using iters instead of indices @@ -67103,12 +67943,12 @@ app/tools/gimptexttool-editor.c | 93 ++++++++++++----------------------------- - app/tools/gimptexttool.h | 2 +- + app/tools/gimptexttool.h | 2 +- 2 files changed, 28 insertions(+), 67 deletions(-) commit f230019f7151cc5b317fc3b120c870c0b6246341 Author: Michael Natterer -Date: Tue Mar 2 11:46:58 2010 +0100 +Date: Tue Mar 2 11:46:58 2010 +0100 app: move updating the style editor to an idle function @@ -67120,33 +67960,33 @@ commit 1ddef5d37504f85cc48f0a8c0b31ac837edc0b62 Author: Michael Natterer -Date: Tue Mar 2 11:37:57 2010 +0100 +Date: Tue Mar 2 11:37:57 2010 +0100 app: redo the buffer's tag-at-iter APIs and fix editor state update - app/widgets/gimptextbuffer.c | 104 + app/widgets/gimptextbuffer.c | 104 +++++++++++++++++++------------------- - app/widgets/gimptextbuffer.h | 12 ++--- + app/widgets/gimptextbuffer.h | 12 ++--- app/widgets/gimptextstyleeditor.c | 31 +++--------- 3 files changed, 63 insertions(+), 84 deletions(-) commit bea0c7f3d440619697e537e0cd34015a1c02af8d Author: Michael Natterer -Date: Tue Mar 2 11:11:06 2010 +0100 +Date: Tue Mar 2 11:11:06 2010 +0100 app: allow to select fonts on text spans A bit hackish, will cleanup... - app/widgets/gimptextbuffer.c | 169 + app/widgets/gimptextbuffer.c | 169 +++++++++++++++++++++++++++++++++----- - app/widgets/gimptextbuffer.h | 16 ++++ + app/widgets/gimptextbuffer.h | 16 ++++ app/widgets/gimptextstyleeditor.c | 135 +++++++++++++++++++++++++++--- 3 files changed, 289 insertions(+), 31 deletions(-) commit aeac58089b3bccaf8a332f9c7e9f6e63e86d98e7 Author: Michael Natterer -Date: Tue Mar 2 00:12:27 2010 +0100 +Date: Tue Mar 2 00:12:27 2010 +0100 app: add a font selector to the text style editor @@ -67160,7 +68000,7 @@ commit 62af8de7ea7f07e95ce5124fb31cf0c90bc5ee1c Author: Michael Natterer -Date: Tue Mar 2 00:11:47 2010 +0100 +Date: Tue Mar 2 00:11:47 2010 +0100 app: no need to say shell->canvas when we are in a canvas callback @@ -67169,7 +68009,7 @@ commit dfc1671cb031ce5d5af611c8bcb52f4148518cee Author: Michael Natterer -Date: Mon Mar 1 23:45:16 2010 +0100 +Date: Mon Mar 1 23:45:16 2010 +0100 app: set a normal mouse cursor on all overlay children windows @@ -67181,7 +68021,7 @@ commit f214b4f9b774f3314c7894bdea5205d924a4ddc0 Author: Michael Natterer -Date: Mon Mar 1 23:34:52 2010 +0100 +Date: Mon Mar 1 23:34:52 2010 +0100 app: oper_update(): if we are not in proximity, set the function to DEAD @@ -67196,7 +68036,7 @@ commit ffd6248a5e307033967fbd03c153114cb6e3a959 Author: Michael Natterer -Date: Mon Mar 1 23:18:06 2010 +0100 +Date: Mon Mar 1 23:18:06 2010 +0100 app: set has-window to TRUE in gimp_overlay_box_init() @@ -67207,7 +68047,7 @@ commit b19db0dea951433777f9093c90a16453a8d369b6 Author: Michael Natterer -Date: Mon Mar 1 22:39:42 2010 +0100 +Date: Mon Mar 1 22:39:42 2010 +0100 app: don't remove all tags when toggling style buttons and then inserting @@ -67216,16 +68056,16 @@ unchecked toggles), and remove only these tags, so the tags that have no widget in the UI are not affected by the insert_tags logic. - app/widgets/gimptextbuffer.c | 63 + app/widgets/gimptextbuffer.c | 63 +++++++++++++++++++++++++++------------ - app/widgets/gimptextbuffer.h | 6 ++-- + app/widgets/gimptextbuffer.h | 6 ++-- app/widgets/gimptextstyleeditor.c | 24 +++++++++++---- app/widgets/gimptextstyleeditor.h | 9 +++--- 4 files changed, 71 insertions(+), 31 deletions(-) commit b61dfff04c1e6246a559f25f78f8078bd53f7341 Author: Michael Natterer -Date: Mon Mar 1 22:12:57 2010 +0100 +Date: Mon Mar 1 22:12:57 2010 +0100 app: use U+2060 WORD JOINER for manual kerning @@ -67233,12 +68073,12 @@ app/widgets/gimptextbuffer-serialize.c | 2 +- app/widgets/gimptextbuffer-serialize.h | 4 ++++ - app/widgets/gimptextbuffer.c | 4 ++-- + app/widgets/gimptextbuffer.c | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) commit 8a1a19fc3248f89218c434c37afa9b1fb533a3de Author: Michael Natterer -Date: Mon Mar 1 21:39:26 2010 +0100 +Date: Mon Mar 1 21:39:26 2010 +0100 app: argh forgot one more place @@ -67250,7 +68090,7 @@ commit 3d1f677b4f02fc6c2d9f896f3bec070b2c62797f Author: Michael Natterer -Date: Mon Mar 1 21:19:08 2010 +0100 +Date: Mon Mar 1 21:19:08 2010 +0100 app: fix cursor placement and selecting by mouse when there is manual kerning @@ -67261,12 +68101,12 @@ app/tools/gimptexttool-editor.c | 93 ++++++++++++++++++++++++----------------- - app/tools/gimptexttool.h | 2 +- + app/tools/gimptexttool.h | 2 +- 2 files changed, 55 insertions(+), 40 deletions(-) commit f7382bc33f764dd9f345131cbbda317c1c30df6c Author: Michael Natterer -Date: Mon Mar 1 19:57:28 2010 +0100 +Date: Mon Mar 1 19:57:28 2010 +0100 app: argh, #define ENABLE_SPACING to actually enable spacing... @@ -67275,7 +68115,7 @@ commit f8ac0c61ab568949c56380c1ec30ce518216b538 Author: Michael Natterer -Date: Mon Mar 1 16:27:34 2010 +0100 +Date: Mon Mar 1 16:27:34 2010 +0100 app: make manual kerning / character spacing work @@ -67289,15 +68129,15 @@ (and thus the layout) for each character that is tagged with spacing. app/tools/gimptexttool-editor.c | 16 ++---- - app/tools/gimptexttool.c | 4 +- - app/widgets/gimptextbuffer.c | 108 + app/tools/gimptexttool.c | 4 +- + app/widgets/gimptextbuffer.c | 108 ++++++++++++++++++++++++++++++++++++++-- - app/widgets/gimptextbuffer.h | 7 ++- + app/widgets/gimptextbuffer.h | 7 ++- 4 files changed, 118 insertions(+), 17 deletions(-) commit f519b90a2b5f6a40c1483175268dbe4afad1a880 Author: Michael Natterer -Date: Mon Mar 1 16:09:50 2010 +0100 +Date: Mon Mar 1 16:09:50 2010 +0100 app: call begin_user_action() and end_user_action() around removing tags @@ -67307,7 +68147,7 @@ commit ff50b52c7286b89f1de45014426117b690bf0d2c Author: Michael Natterer -Date: Mon Mar 1 16:03:48 2010 +0100 +Date: Mon Mar 1 16:03:48 2010 +0100 app: use gtk_text_buffer_delete_interactive() @@ -67319,7 +68159,7 @@ commit 11b1300b6f6752124f765305f3d78c54c1fa795a Author: Martin Nordholts -Date: Sun Feb 28 23:20:57 2010 +0100 +Date: Sun Feb 28 23:20:57 2010 +0100 app: Introduce gimp_dialog_factory_get_singleton() @@ -67331,57 +68171,57 @@ factory instance around. There were so many problems before when we had four of them, so let's just keep one of them around. - app/actions/colormap-commands.c | 4 +--- - app/actions/context-commands.c | 10 ++++----- - app/actions/data-commands.c | 4 +--- - app/actions/dialogs-commands.c | 6 ++---- - app/actions/dockable-commands.c | 2 -- - app/actions/edit-commands.c | 3 +-- - app/actions/file-commands.c | 11 +++++----- + app/actions/colormap-commands.c | 4 +--- + app/actions/context-commands.c | 10 ++++----- + app/actions/data-commands.c | 4 +--- + app/actions/dialogs-commands.c | 6 ++---- + app/actions/dockable-commands.c | 2 -- + app/actions/edit-commands.c | 3 +-- + app/actions/file-commands.c | 11 +++++----- app/actions/gradient-editor-commands.c | 7 +++---- - app/actions/image-commands.c | 3 +-- - app/actions/palette-editor-commands.c | 4 +--- - app/actions/palettes-commands.c | 4 +--- - app/actions/select-commands.c | 3 +-- - app/actions/templates-commands.c | 1 - - app/actions/view-commands.c | 4 +--- - app/actions/windows-actions.c | 8 ++++---- - app/actions/windows-commands.c | 10 ++++----- - app/dialogs/dialogs.c | 27 +++++++++++++------------ - app/dialogs/preferences-dialog.c | 6 ++---- - app/display/gimpdisplayshell-cursor.c | 6 ++---- - app/gui/gimpuiconfigurer.c | 10 ++++----- - app/gui/gui-message.c | 8 +++----- - app/gui/gui-vtable.c | 8 +++----- - app/gui/gui.c | 4 ++-- - app/gui/session.c | 8 ++++---- - app/menus/windows-menu.c | 8 ++++---- - app/tests.c | 2 -- - app/tests/test-session-management.c | 2 -- - app/tests/test-ui.c | 16 +++++++-------- - app/tests/test-window-management.c | 6 ++---- - app/tools/gimpcolortool.c | 8 +++----- - app/tools/gimptexttool-editor.c | 4 +--- - app/tools/gimptexttool.c | 4 +--- - app/widgets/gimpcontrollereditor.c | 4 +--- - app/widgets/gimpcontrollerlist.c | 4 +--- - app/widgets/gimpdevicestatus.c | 4 +--- - app/widgets/gimpdialogfactory.c | 37 + app/actions/image-commands.c | 3 +-- + app/actions/palette-editor-commands.c | 4 +--- + app/actions/palettes-commands.c | 4 +--- + app/actions/select-commands.c | 3 +-- + app/actions/templates-commands.c | 1 - + app/actions/view-commands.c | 4 +--- + app/actions/windows-actions.c | 8 ++++---- + app/actions/windows-commands.c | 10 ++++----- + app/dialogs/dialogs.c | 27 +++++++++++++------------ + app/dialogs/preferences-dialog.c | 6 ++---- + app/display/gimpdisplayshell-cursor.c | 6 ++---- + app/gui/gimpuiconfigurer.c | 10 ++++----- + app/gui/gui-message.c | 8 +++----- + app/gui/gui-vtable.c | 8 +++----- + app/gui/gui.c | 4 ++-- + app/gui/session.c | 8 ++++---- + app/menus/windows-menu.c | 8 ++++---- + app/tests.c | 2 -- + app/tests/test-session-management.c | 2 -- + app/tests/test-ui.c | 16 +++++++-------- + app/tests/test-window-management.c | 6 ++---- + app/tools/gimpcolortool.c | 8 +++----- + app/tools/gimptexttool-editor.c | 4 +--- + app/tools/gimptexttool.c | 4 +--- + app/widgets/gimpcontrollereditor.c | 4 +--- + app/widgets/gimpcontrollerlist.c | 4 +--- + app/widgets/gimpdevicestatus.c | 4 +--- + app/widgets/gimpdialogfactory.c | 37 ++++++++++++++++++++++++++++++++++ - app/widgets/gimpdialogfactory.h | 3 +++ - app/widgets/gimpdockable.c | 4 +--- - app/widgets/gimpdockcolumns.c | 2 -- - app/widgets/gimpdockwindow.c | 2 +- - app/widgets/gimppanedbox.c | 2 -- - app/widgets/gimpsessioninfo.c | 4 +--- - app/widgets/gimptoolbox-color-area.c | 4 +--- - app/widgets/gimptooldialog.c | 4 +--- - app/widgets/gimpviewablebox.c | 6 ++---- + app/widgets/gimpdialogfactory.h | 3 +++ + app/widgets/gimpdockable.c | 4 +--- + app/widgets/gimpdockcolumns.c | 2 -- + app/widgets/gimpdockwindow.c | 2 +- + app/widgets/gimppanedbox.c | 2 -- + app/widgets/gimpsessioninfo.c | 4 +--- + app/widgets/gimptoolbox-color-area.c | 4 +--- + app/widgets/gimptooldialog.c | 4 +--- + app/widgets/gimpviewablebox.c | 6 ++---- 45 files changed, 133 insertions(+), 158 deletions(-) commit 82c52974e23ecdbf9b69469b887035c4753311bd Author: Martin Nordholts -Date: Sun Feb 28 23:22:26 2010 +0100 +Date: Sun Feb 28 23:22:26 2010 +0100 app/tests: Don't exit before test-xcf.c tests are run @@ -67390,7 +68230,7 @@ commit 67ccf8c21af66b6a26acfa8cb3b381ffe07eef97 Author: Michael Natterer -Date: Sun Feb 28 19:40:15 2010 +0100 +Date: Sun Feb 28 19:40:15 2010 +0100 app: implement proper manual kerning, but disable it for now @@ -67401,12 +68241,12 @@ app/widgets/gimptextbuffer-serialize.c | 81 ++++++++++++++++++++++++++++++++++ app/widgets/gimptextbuffer-serialize.h | 33 ++++++++------ - app/widgets/gimptextbuffer.c | 8 ++++ + app/widgets/gimptextbuffer.c | 8 ++++ 3 files changed, 108 insertions(+), 14 deletions(-) commit 6d176f5a11ef5ae8636e095cf8b8f9c740f853b0 Author: Martin Nordholts -Date: Sun Feb 28 20:00:21 2010 +0100 +Date: Sun Feb 28 20:00:21 2010 +0100 app: Remove GimpDialogFactoryClass::factories @@ -67416,7 +68256,7 @@ commit 947e28596f9a9a674c832bd792697cc7cc55cf09 Author: Martin Nordholts -Date: Sun Feb 28 19:58:37 2010 +0100 +Date: Sun Feb 28 19:58:37 2010 +0100 app: Remove gimp_dialog_factory_from_name() @@ -67429,29 +68269,29 @@ app/actions/palette-editor-commands.c | 4 +++- app/dialogs/preferences-dialog.c | 6 ++++-- app/display/gimpdisplayshell-cursor.c | 10 ++++------ - app/gui/session.c | 14 +++----------- - app/tests/test-ui.c | 6 ++---- - app/tools/gimpcolortool.c | 12 ++++++------ + app/gui/session.c | 14 +++----------- + app/tests/test-ui.c | 6 ++---- + app/tools/gimpcolortool.c | 12 ++++++------ app/tools/gimptexttool-editor.c | 4 +++- - app/tools/gimptexttool.c | 4 +++- + app/tools/gimptexttool.c | 4 +++- app/widgets/gimpcontrollereditor.c | 4 +++- app/widgets/gimpcontrollerlist.c | 4 +++- app/widgets/gimpdevicestatus.c | 4 +++- app/widgets/gimpdialogfactory.c | 25 ------------------------- app/widgets/gimpdialogfactory.h | 1 - - app/widgets/gimpsessioninfo.c | 2 +- + app/widgets/gimpsessioninfo.c | 2 +- app/widgets/gimptoolbox-color-area.c | 8 +++----- - app/widgets/gimptooldialog.c | 4 +++- - app/widgets/gimpviewablebox.c | 6 ++++-- + app/widgets/gimptooldialog.c | 4 +++- + app/widgets/gimpviewablebox.c | 6 ++++-- 19 files changed, 59 insertions(+), 83 deletions(-) commit 2a51c69e9bf7e280cd6b323d302906daeb96bf40 Author: Martin Nordholts -Date: Sun Feb 28 19:13:14 2010 +0100 +Date: Sun Feb 28 19:13:14 2010 +0100 app: Set_busy() on individual dialog factories - app/gui/gui-vtable.c | 4 ++-- + app/gui/gui-vtable.c | 4 ++-- app/widgets/gimpdialogfactory.c | 51 ++++++++--------------------------------- app/widgets/gimpdialogfactory.h | 5 ++-- @@ -67459,7 +68299,7 @@ commit f135ebb97fd32a50bf021412da0da98a2c6d3d16 Author: Michael Natterer -Date: Sun Feb 28 19:01:45 2010 +0100 +Date: Sun Feb 28 19:01:45 2010 +0100 app: use a temporary GtkTextBuffer for (de)seriaizing markup @@ -67473,7 +68313,7 @@ commit 86ad0cc025882c297bfc254ed670670ef93d2759 Author: Michael Natterer -Date: Sun Feb 28 18:59:45 2010 +0100 +Date: Sun Feb 28 18:59:45 2010 +0100 app: make sure (de)serialization handles register_buffer != content_buffer @@ -67488,7 +68328,7 @@ commit 6647c495f3c0e17e9420e77b0cd7d2967ad9026b Author: Martin Nordholts -Date: Sun Feb 28 18:48:16 2010 +0100 +Date: Sun Feb 28 18:48:16 2010 +0100 app: Store GimpDialogsState per dialog factory @@ -67496,7 +68336,7 @@ gimpdialogfactory.c and move it into the GimpDialogFactory struct. app/actions/windows-commands.c | 4 +-- - app/display/gimpimagewindow.c | 4 +-- + app/display/gimpimagewindow.c | 4 +-- app/widgets/gimpdialogfactory.c | 66 +++++++++++++++++++---------------------- app/widgets/gimpdialogfactory.h | 9 +++--- @@ -67504,7 +68344,7 @@ commit 9447b125e6a508bacb0b10270420fc859e601249 Author: Alexia Death -Date: Sun Feb 28 19:42:32 2010 +0200 +Date: Sun Feb 28 19:42:32 2010 +0200 app: Remove obslete draw queueing @@ -67513,7 +68353,7 @@ commit 3f816cbc29e8c94b5b07d2b8d87bbbca35e42eb2 Author: Michael Natterer -Date: Sun Feb 28 18:28:00 2010 +0100 +Date: Sun Feb 28 18:28:00 2010 +0100 app: fix gimp_curve_view_remove_all_backgrounds() @@ -67522,7 +68362,7 @@ commit 9e9ea6f33a902aa8bbbc83284cf2b6e0c871a13a Author: Alexia Death -Date: Sun Feb 28 19:00:37 2010 +0200 +Date: Sun Feb 28 19:00:37 2010 +0200 app: improve dynamics editor behavior on switching @@ -67532,17 +68372,17 @@ commit 783e04013a44495b62c26b52cad2fa7ffa379a95 Author: Michael Natterer -Date: Sun Feb 28 17:56:20 2010 +0100 +Date: Sun Feb 28 17:56:20 2010 +0100 app: make letter spacing work when there is no selection app/tools/gimptexttool-editor.c | 1 + - app/widgets/gimptextbuffer.c | 26 +++----------------------- + app/widgets/gimptextbuffer.c | 26 +++----------------------- 2 files changed, 4 insertions(+), 23 deletions(-) commit 9af58d8c4379cba138be3c3c0046d601eab334be Author: Michael Natterer -Date: Sun Feb 28 17:19:36 2010 +0100 +Date: Sun Feb 28 17:19:36 2010 +0100 app: remove redundant call to gimp_text_buffer_set_text() @@ -67551,7 +68391,7 @@ commit 65216b939da80f934e6079c83705ded9b6fa709b Author: Michael Natterer -Date: Sun Feb 28 17:15:06 2010 +0100 +Date: Sun Feb 28 17:15:06 2010 +0100 app: group text buffer changes by user actions @@ -67561,22 +68401,22 @@ "changed", "apply-tag" and "remove-tag" separately, so we only update the text proxy once per user editing. - app/tools/gimptexttool.c | 53 + app/tools/gimptexttool.c | 53 ++++++++------------------------------- - app/widgets/gimptextbuffer.c | 18 +++++++++++++ + app/widgets/gimptextbuffer.c | 18 +++++++++++++ app/widgets/gimptextstyleeditor.c | 4 +++ 3 files changed, 33 insertions(+), 42 deletions(-) commit 87d89ce990485fad482fb2301659b4312add410f Author: Martin Nordholts -Date: Sun Feb 28 16:23:19 2010 +0100 +Date: Sun Feb 28 16:23:19 2010 +0100 app: Save and restore dialog factories explicitly With only one dialog factory around the for-each functions are not needed any more. Remove them, starting with save and restore. - app/gui/session.c | 4 ++-- + app/gui/session.c | 4 ++-- app/widgets/gimpdialogfactory.c | 45 +++++------------------------------------ app/widgets/gimpdialogfactory.h | 6 ++++-- @@ -67584,19 +68424,19 @@ commit 867186094511fb7b9e2e5ff21bf45645df2ecbbf Author: Michael Natterer -Date: Sun Feb 28 16:14:54 2010 +0100 +Date: Sun Feb 28 16:14:54 2010 +0100 app: move "image" member of GimpDisplay to the private struct - app/display/gimpdisplay.c | 47 + app/display/gimpdisplay.c | 47 ++++++++++++++++++++++++------------ - app/display/gimpdisplay.h | 5 ++-- + app/display/gimpdisplay.h | 5 ++-- app/display/gimpdisplayshell-scale.c | 3 ++- 3 files changed, 35 insertions(+), 20 deletions(-) commit 144210031d04116e9d9115e3bec17cbeb1566743 Author: Martin Nordholts -Date: Sun Feb 28 16:00:56 2010 +0100 +Date: Sun Feb 28 16:00:56 2010 +0100 app: Remove unused gimp_dialog_factories_session_clear() @@ -67608,7 +68448,7 @@ commit efcfec9eb8dc8646c5f5f3fd486b4c195734e243 Author: Michael Natterer -Date: Sun Feb 28 15:42:55 2010 +0100 +Date: Sun Feb 28 15:42:55 2010 +0100 app: remove ancient utility function img2real() @@ -67620,7 +68460,7 @@ commit e7a3938932944b48babde062cc7417f18a179f03 Author: Michael Natterer -Date: Sun Feb 28 15:29:52 2010 +0100 +Date: Sun Feb 28 15:29:52 2010 +0100 app: make toggle button updating a lot less complicated @@ -67634,7 +68474,7 @@ commit 55961ab149376264423ab97338986bdca6ea676f Author: Michael Natterer -Date: Sun Feb 28 15:28:43 2010 +0100 +Date: Sun Feb 28 15:28:43 2010 +0100 app: fix glitch in my recent unit conversion cleanup @@ -67643,7 +68483,7 @@ commit 78ddb19347ea1d4314a1be722ddbf3427319dc58 Author: Martin Nordholts -Date: Sun Feb 28 15:22:17 2010 +0100 +Date: Sun Feb 28 15:22:17 2010 +0100 app: Keep canvas position on all display shell widgets @@ -67655,14 +68495,14 @@ around some day... app/display/gimpdisplayshell-appearance.c | 4 ++ - app/display/gimpimagewindow.c | 99 + app/display/gimpimagewindow.c | 99 +++++++++++++++---------------- - app/display/gimpimagewindow.h | 1 + + app/display/gimpimagewindow.h | 1 + 3 files changed, 54 insertions(+), 50 deletions(-) commit 2c0573d6cd7143f2481eeaae6961f07f03ac66bf Author: Martin Nordholts -Date: Sun Feb 28 15:13:53 2010 +0100 +Date: Sun Feb 28 15:13:53 2010 +0100 app: gimp_image_window_keep_canvas_pos() should work in canvas coords @@ -67674,7 +68514,7 @@ commit 99bf62e30367d9fd70f5da41f146af594fbd5bf8 Author: Martin Nordholts -Date: Sun Feb 28 09:54:39 2010 +0100 +Date: Sun Feb 28 09:54:39 2010 +0100 app: For view actions, only set if not already set @@ -67689,19 +68529,19 @@ commit 4a4d6abe56e77b211fcbc3684fbd43a88995de51 Author: Martin Nordholts -Date: Sun Feb 28 09:39:37 2010 +0100 +Date: Sun Feb 28 09:39:37 2010 +0100 app: Add and use return_if_no_shell() - app/actions/actions.c | 14 ++++++ - app/actions/actions.h | 74 ++++++++++++++++------------- + app/actions/actions.c | 14 ++++++ + app/actions/actions.h | 74 ++++++++++++++++------------- app/actions/view-commands.c | 113 +++++++++----------------------------------- 3 files changed, 77 insertions(+), 124 deletions(-) commit 84d33e4316d0b38cb5e9fe90871538dfd4d5fb43 Author: Michael Natterer -Date: Sun Feb 28 14:48:47 2010 +0100 +Date: Sun Feb 28 14:48:47 2010 +0100 app: make image-coords overlay widgets work fine at any zoom factor @@ -67717,7 +68557,7 @@ commit 1c8b01f01234395d78a9b57f0b7adbefe1aff639 Author: Michael Natterer -Date: Sun Feb 28 14:20:56 2010 +0100 +Date: Sun Feb 28 14:20:56 2010 +0100 app: make the text style editor aware of the image's resolution @@ -67731,7 +68571,7 @@ commit d074653c36cd55d491e487946890f8f2bab7aac7 Author: Michael Natterer -Date: Sun Feb 28 14:16:40 2010 +0100 +Date: Sun Feb 28 14:16:40 2010 +0100 app: add letter spacing control using Alt+Left/Right @@ -67744,7 +68584,7 @@ commit d88949547dc837e663d5b4f834e8bea4f3209826 Author: Michael Natterer -Date: Sun Feb 28 13:58:08 2010 +0100 +Date: Sun Feb 28 13:58:08 2010 +0100 app: make the change_spacing() call only act on the cursor position @@ -67755,7 +68595,7 @@ commit 8399eefc95ae6982c2ed68ee2404e4195e50f8b3 Author: Michael Natterer -Date: Sat Feb 27 18:19:47 2010 +0100 +Date: Sat Feb 27 18:19:47 2010 +0100 app: make sure the text style box is repositioned on *each* rectangle change @@ -67765,7 +68605,7 @@ commit 4ac06c04cdf520ccb74ca7c096ff40bfbce6e1f9 Author: Alexia Death -Date: Sun Feb 28 02:04:16 2010 +0200 +Date: Sun Feb 28 02:04:16 2010 +0200 app: Make reset curve button work @@ -67774,7 +68614,7 @@ commit 47ace57ce22be535242ab0655cfdda3b4e14e412 Author: Alexia Death -Date: Sun Feb 28 01:01:27 2010 +0200 +Date: Sun Feb 28 01:01:27 2010 +0200 app: Working input selectors in the curve editors @@ -67784,7 +68624,7 @@ commit 47ce3bef8f1cd4532acab7d4c2bc22dedcb5242e Author: Alexia Death -Date: Sat Feb 27 19:58:46 2010 +0200 +Date: Sat Feb 27 19:58:46 2010 +0200 app: Small fixes dynamics output editor @@ -67794,7 +68634,7 @@ commit 82837da1df6d397e4008578ab984e9045bbe829f Author: Alexia Death -Date: Sat Feb 27 19:20:51 2010 +0200 +Date: Sat Feb 27 19:20:51 2010 +0200 app: Add background curves for dynamics @@ -67804,20 +68644,20 @@ commit 45c835aaa251b3c1ce1b9944d555616022129b05 Author: Alexia Death -Date: Sat Feb 27 19:03:40 2010 +0200 +Date: Sat Feb 27 19:03:40 2010 +0200 app: Add API to remove all background curves from the curve view Also, use this change in cuves tool. - app/tools/gimpcurvestool.c | 7 +------ + app/tools/gimpcurvestool.c | 7 +------ app/widgets/gimpcurveview.c | 21 +++++++++++++++++++++ - app/widgets/gimpcurveview.h | 2 ++ + app/widgets/gimpcurveview.h | 2 ++ 3 files changed, 24 insertions(+), 6 deletions(-) commit 1e26bb13483b5b76f40ccae445e6e0289898f88f Author: Michael Natterer -Date: Sat Feb 27 17:54:36 2010 +0100 +Date: Sat Feb 27 17:54:36 2010 +0100 app: support baseline changing via Alt+Up and Alt+Down @@ -67829,16 +68669,16 @@ baseline by 1024 pango units, which might be whatever depending on the output grid. - app/tools/gimptexttool-editor.c | 37 ++++++- + app/tools/gimptexttool-editor.c | 37 ++++++- app/widgets/gimptextbuffer-serialize.c | 38 +++++-- - app/widgets/gimptextbuffer.c | 191 + app/widgets/gimptextbuffer.c | 191 ++++++++++++++++++++++++++++++++- - app/widgets/gimptextbuffer.h | 74 ++++++++----- + app/widgets/gimptextbuffer.h | 74 ++++++++----- 4 files changed, 299 insertions(+), 41 deletions(-) commit 8b3592dc8f5ffddb666721437b60e477666d38f5 Author: Alexia Death -Date: Sat Feb 27 18:32:58 2010 +0200 +Date: Sat Feb 27 18:32:58 2010 +0200 app: Beginnings of curve changing @@ -67848,7 +68688,7 @@ commit fea1690d4089fff0bad361f449ae6e2debdf3bff Author: Alexia Death -Date: Sat Feb 27 16:33:10 2010 +0200 +Date: Sat Feb 27 16:33:10 2010 +0200 app: Minor corrections to dynmics output editor @@ -67859,7 +68699,7 @@ commit 4171d9c77448f668a759a8146e117a59539f80bf Author: Michael Natterer -Date: Sat Feb 27 13:14:28 2010 +0100 +Date: Sat Feb 27 13:14:28 2010 +0100 app: add signals bindings to change baseline and spacing @@ -67867,14 +68707,14 @@ the text tool editor. The callbacks do nothing yet. app/tools/gimptexttool-editor.c | 25 +++++++++++++++++++++ - app/widgets/gimptextproxy.c | 50 + app/widgets/gimptextproxy.c | 50 +++++++++++++++++++++++++++++++++++++++++ - app/widgets/gimptextproxy.h | 5 +++++ + app/widgets/gimptextproxy.h | 5 +++++ 3 files changed, 80 insertions(+) commit 14194a3be55d079b648ad93f01e4e7a529c51165 Author: Rudolfs Mazurs -Date: Sat Feb 27 00:35:43 2010 +0200 +Date: Sat Feb 27 00:35:43 2010 +0200 Updated Latvian translation. @@ -67884,7 +68724,7 @@ commit 5e9e5752e9ee17b9f6d706602cc4a4eb27f3a4f7 Author: Rudolfs Mazurs -Date: Sat Feb 27 00:30:38 2010 +0200 +Date: Sat Feb 27 00:30:38 2010 +0200 Updated Latvian translation. @@ -67894,7 +68734,7 @@ commit 9766f651320a94943a604cf267cd9a8ddf123839 Author: Michael Natterer -Date: Fri Feb 26 21:22:10 2010 +0100 +Date: Fri Feb 26 21:22:10 2010 +0100 app: almost fix changing layers @@ -67905,7 +68745,7 @@ commit 9a53cc11ca2a7c7397982dfe338488f2095134dc Author: Michael Natterer -Date: Fri Feb 26 19:53:52 2010 +0100 +Date: Fri Feb 26 19:53:52 2010 +0100 app: allow to toggle tags and then write text with that style @@ -67917,16 +68757,16 @@ or cursor/selection change, so we always display wthe style at the cursor unless the buttons were clicked explicitely. - app/widgets/gimptextbuffer.c | 87 + app/widgets/gimptextbuffer.c | 87 +++++++++++++++++++++++++++++++++++---- - app/widgets/gimptextbuffer.h | 52 ++++++++++++----------- + app/widgets/gimptextbuffer.h | 52 ++++++++++++----------- app/widgets/gimptextstyleeditor.c | 60 +++++++++++++++++++++------ app/widgets/gimptextstyleeditor.h | 7 +++- 4 files changed, 159 insertions(+), 47 deletions(-) commit a4826176d879dca7ea106de43d05c2ee5cdf17da Author: Michael Natterer -Date: Fri Feb 26 19:45:20 2010 +0100 +Date: Fri Feb 26 19:45:20 2010 +0100 app: make sure all markup tags are closed at the right point @@ -67940,7 +68780,7 @@ commit 8af94be7a0fb62c6899a5acdcf91b1ce444aea19 Author: Michael Natterer -Date: Fri Feb 26 13:10:52 2010 +0100 +Date: Fri Feb 26 13:10:52 2010 +0100 app: move the style overlay a few pixels @@ -67951,7 +68791,7 @@ commit 9c52fc9f68f78a254303335c5eeba7c5480b1cb1 Author: Alexandre Prokoudine -Date: Fri Feb 26 09:20:44 2010 +0300 +Date: Fri Feb 26 09:20:44 2010 +0300 Tiny quick fix for Russian translation @@ -67960,7 +68800,7 @@ commit 28967aefe8b84ad8f75ddd7d4bf746c65f81569b Author: Alexandre Prokoudine -Date: Fri Feb 26 05:37:52 2010 +0300 +Date: Fri Feb 26 05:37:52 2010 +0300 Updated Russian translation @@ -67970,7 +68810,7 @@ commit 11479d3abdde1180cfa0fe7c45a073ab5c11a89e Author: Michael Natterer -Date: Fri Feb 26 03:04:11 2010 +0100 +Date: Fri Feb 26 03:04:11 2010 +0100 app: use the tags left of the cursor when inserting @@ -67978,13 +68818,13 @@ and end of spans (take the tags toggled on/off at these positions into account). - app/widgets/gimptextbuffer.c | 25 ++++++++++++++++++++++++- + app/widgets/gimptextbuffer.c | 25 ++++++++++++++++++++++++- app/widgets/gimptextstyleeditor.c | 14 +++++++++++--- 2 files changed, 35 insertions(+), 4 deletions(-) commit b040220ebc52aa64e64b48d3e7419617865a8cc4 Author: Alexandre Prokoudine -Date: Fri Feb 26 04:34:55 2010 +0300 +Date: Fri Feb 26 04:34:55 2010 +0300 Marked forgotten user visible message for translation @@ -67993,7 +68833,7 @@ commit 6c556698e5d9e0a36b0f6c39d7d6233f91738211 Author: Michael Natterer -Date: Fri Feb 26 02:34:01 2010 +0100 +Date: Fri Feb 26 02:34:01 2010 +0100 app: add gimp_text_buffer_insert() and use it @@ -68001,25 +68841,25 @@ tags to the inserted text. app/tools/gimptexttool-editor.c | 5 ++--- - app/widgets/gimptextbuffer.c | 9 +++++++++ - app/widgets/gimptextbuffer.h | 3 +++ + app/widgets/gimptextbuffer.c | 9 +++++++++ + app/widgets/gimptextbuffer.h | 3 +++ 3 files changed, 14 insertions(+), 3 deletions(-) commit ebfbc5a0306dbfa687b94fbabf9ac700a38985f7 Author: Michael Natterer -Date: Fri Feb 26 02:10:03 2010 +0100 +Date: Fri Feb 26 02:10:03 2010 +0100 app: make sure the style editor moves with the text layer app/tools/gimptexttool-editor.c | 39 +++++++++++++++++++++++++-------------- app/tools/gimptexttool-editor.h | 1 + - app/tools/gimptexttool.c | 2 ++ + app/tools/gimptexttool.c | 2 ++ 3 files changed, 28 insertions(+), 14 deletions(-) commit c0358d81221033f63b77be31d07732bba33071ff Author: Michael Natterer -Date: Fri Feb 26 01:57:51 2010 +0100 +Date: Fri Feb 26 01:57:51 2010 +0100 app: restore text box moving functionality, it got lost a few commits back @@ -68029,7 +68869,7 @@ commit 9cff2365b10da6f68d8f5cc93bc2127a53223161 Author: Michael Natterer -Date: Fri Feb 26 01:36:31 2010 +0100 +Date: Fri Feb 26 01:36:31 2010 +0100 app: enable editing text styles @@ -68038,14 +68878,14 @@ - connect to chages to text marks on the buffer. app/tools/gimptexttool-editor.c | 41 ++++++++++++++++++++++++ - app/tools/gimptexttool.c | 70 + app/tools/gimptexttool.c | 70 ++++++++++++++++++++++++++++++++++------- - app/tools/gimptexttool.h | 3 ++ + app/tools/gimptexttool.h | 3 ++ 3 files changed, 103 insertions(+), 11 deletions(-) commit 360f5739da8345d037dfd6d2697ecd50450a0059 Author: Michael Natterer -Date: Fri Feb 26 01:22:27 2010 +0100 +Date: Fri Feb 26 01:22:27 2010 +0100 app: add infrastructure for editing pango markup based text styles @@ -68057,36 +68897,36 @@ GtkTextBuffer's rich text (de)serialization infrastructure. Doesn't produce or handle yet. - app/widgets/Makefile.am | 4 + + app/widgets/Makefile.am | 4 + app/widgets/gimptextbuffer-serialize.c | 609 +++++++++++++++++++++++++++++++++ app/widgets/gimptextbuffer-serialize.h | 46 +++ - app/widgets/gimptextbuffer.c | 130 +++++++ - app/widgets/gimptextbuffer.h | 16 + - app/widgets/gimptextstyleeditor.c | 423 +++++++++++++++++++++++ - app/widgets/gimptextstyleeditor.h | 61 ++++ - app/widgets/widgets-types.h | 1 + + app/widgets/gimptextbuffer.c | 130 +++++++ + app/widgets/gimptextbuffer.h | 16 + + app/widgets/gimptextstyleeditor.c | 423 +++++++++++++++++++++++ + app/widgets/gimptextstyleeditor.h | 61 ++++ + app/widgets/widgets-types.h | 1 + 8 files changed, 1290 insertions(+) commit db6a669c4bdf7cf4609f7c6aed70e71756caa926 Author: Michael Natterer -Date: Fri Feb 26 00:11:25 2010 +0100 +Date: Fri Feb 26 00:11:25 2010 +0100 app: add "markup" property to GimpText And prefer it over "text" when rendering. Everything is exactly as before if "markup" is never set. - app/text/gimptext-vectors.c | 5 +++-- - app/text/gimptext.c | 18 ++++++++++++++++++ - app/text/gimptext.h | 1 + - app/text/gimptextlayer.c | 2 +- - app/text/gimptextlayout.c | 4 +++- + app/text/gimptext-vectors.c | 5 +++-- + app/text/gimptext.c | 18 ++++++++++++++++++ + app/text/gimptext.h | 1 + + app/text/gimptextlayer.c | 2 +- + app/text/gimptextlayout.c | 4 +++- 5 files changed, 26 insertions(+), 4 deletions(-) commit ff01c2d77ecc73e0c75d30a0d22784663333d256 Author: Michael Natterer -Date: Fri Feb 26 00:09:54 2010 +0100 +Date: Fri Feb 26 00:09:54 2010 +0100 app: add API to move an existing image-coords overlay around @@ -68096,7 +68936,7 @@ commit ed5830fb7b7657232315f7c54385cc3aee32d911 Author: Martin Nordholts -Date: Thu Feb 25 21:37:02 2010 +0100 +Date: Thu Feb 25 21:37:02 2010 +0100 app: Pause tool drawing while hiding docks in single-window mode @@ -68108,7 +68948,7 @@ commit 3f4dafb07df5e6e0eda79a2984d20c41fab31a3e Author: Alexia Death -Date: Thu Feb 25 22:32:09 2010 +0200 +Date: Thu Feb 25 22:32:09 2010 +0200 app: Beginnings of input selector, does not do anything yet @@ -68118,7 +68958,7 @@ commit 98463cf081f3d59dbbff1f2803df2f213e7940d1 Author: Martin Nordholts -Date: Thu Feb 25 18:02:04 2010 +0100 +Date: Thu Feb 25 18:02:04 2010 +0100 app: Add get_backtrace() function to base-utils.[ch] @@ -68128,20 +68968,20 @@ commit dbe54e3f05f5aab99134387e6767d00442e758ab Author: Michael Natterer -Date: Thu Feb 25 17:49:33 2010 +0100 +Date: Thu Feb 25 17:49:33 2010 +0100 app: rename GimpTextTool::text_buffer to just ::buffer app/actions/text-tool-commands.c | 5 +++-- app/tools/gimptexttool-editor.c | 31 ++++++++++++++-------------- - app/tools/gimptexttool.c | 44 + app/tools/gimptexttool.c | 44 ++++++++++++++++++++-------------------- - app/tools/gimptexttool.h | 2 +- + app/tools/gimptexttool.h | 2 +- 4 files changed, 41 insertions(+), 41 deletions(-) commit 0b4bdc5613f9496db40b2669a598dce779972d97 Author: Michael Natterer -Date: Thu Feb 25 17:41:10 2010 +0100 +Date: Thu Feb 25 17:41:10 2010 +0100 app: add GimpTextBuffer, a GtkTextBuffer subclass @@ -68152,27 +68992,27 @@ app/actions/error-console-commands.c | 5 +- app/actions/text-editor-commands.c | 6 +- app/actions/text-tool-commands.c | 9 +- - app/tools/gimptextoptions.c | 4 +- - app/tools/gimptextoptions.h | 2 +- + app/tools/gimptextoptions.c | 4 +- + app/tools/gimptextoptions.h | 2 +- app/tools/gimptexttool-editor.c | 66 +++----- app/tools/gimptexttool-editor.h | 5 - - app/tools/gimptexttool.c | 43 +++--- - app/tools/gimptexttool.h | 2 +- - app/widgets/Makefile.am | 2 + + app/tools/gimptexttool.c | 43 +++--- + app/tools/gimptexttool.h | 2 +- + app/widgets/Makefile.am | 2 + app/widgets/gimperrorconsole.c | 3 +- - app/widgets/gimptextbuffer.c | 288 + app/widgets/gimptextbuffer.c | 288 +++++++++++++++++++++++++++++++++++ - app/widgets/gimptextbuffer.h | 65 ++++++++ - app/widgets/gimptexteditor.c | 12 +- - app/widgets/gimptexteditor.h | 2 +- + app/widgets/gimptextbuffer.h | 65 ++++++++ + app/widgets/gimptexteditor.c | 12 +- + app/widgets/gimptexteditor.h | 2 +- app/widgets/gimpwidgets-utils.c | 134 ---------------- app/widgets/gimpwidgets-utils.h | 7 - - app/widgets/widgets-types.h | 3 +- + app/widgets/widgets-types.h | 3 +- 18 files changed, 427 insertions(+), 231 deletions(-) commit 18f3be6bd3438c828648a93174595ebd3f4a632c Author: Martin Nordholts -Date: Tue Feb 23 20:21:08 2010 +0100 +Date: Tue Feb 23 20:21:08 2010 +0100 Bug 602223 - Can't hide docks with Tab in single-window mode @@ -68188,20 +69028,20 @@ Also add regression testing for this fix to test-ui.c - app/actions/windows-actions.c | 3 +- + app/actions/windows-actions.c | 3 +- app/actions/windows-commands.c | 9 ++++ - app/config/gimpguiconfig.c | 12 ++++++ - app/config/gimpguiconfig.h | 1 + - app/config/gimprc-blurbs.h | 3 ++ - app/display/gimpimagewindow.c | 95 + app/config/gimpguiconfig.c | 12 ++++++ + app/config/gimpguiconfig.h | 1 + + app/config/gimprc-blurbs.h | 3 ++ + app/display/gimpimagewindow.c | 95 ++++++++++++++++++++++++++++++++++++++++-- - app/tests/test-ui.c | 94 + app/tests/test-ui.c | 94 ++++++++++++++++++++++++++++++++++++++--- 7 files changed, 207 insertions(+), 10 deletions(-) commit 82a0b95147e3d79c4d25944000a81465fc13fa51 Author: Martin Nordholts -Date: Mon Feb 22 19:24:23 2010 +0100 +Date: Mon Feb 22 19:24:23 2010 +0100 app: Update image window side docks visiblity from the image window @@ -68217,7 +69057,7 @@ commit 82b2e2cff56bbf40350478a806b0fcb15e7f9153 Author: Martin Nordholts -Date: Mon Feb 22 19:20:12 2010 +0100 +Date: Mon Feb 22 19:20:12 2010 +0100 app/tests: Update test-ui.c, gimp_dialog_factories_toggle() is removed @@ -68226,18 +69066,18 @@ commit bbd487915cb4d8d46897b8f5b3bb04df0cd700f7 Author: Marco Ciampa -Date: Wed Feb 24 16:22:30 2010 +0100 +Date: Wed Feb 24 16:22:30 2010 +0100 Updated italian translation. po-plug-ins/it.po | 102 ++-- - po/it.po | 1463 + po/it.po | 1463 +++++++++++++++++++++++++++-------------------------- 2 files changed, 786 insertions(+), 779 deletions(-) commit 0ee393c69226ba2be972c0846caf594b8409f954 Author: Michael Natterer -Date: Wed Feb 24 10:53:10 2010 +0100 +Date: Wed Feb 24 10:53:10 2010 +0100 libgimpbase: fix typos in docs of recently added unit functions @@ -68246,7 +69086,7 @@ commit 261bb2c598e4565dd2cf543ef27bf55dfd624ea2 Author: Michael Natterer -Date: Wed Feb 24 01:36:10 2010 +0100 +Date: Wed Feb 24 01:36:10 2010 +0100 app: configure the IM overlay's opacity explicitely @@ -68255,7 +69095,7 @@ commit 650d635dfbd4cda0ac031c703784f1ace00725f1 Author: Michael Natterer -Date: Wed Feb 24 01:35:40 2010 +0100 +Date: Wed Feb 24 01:35:40 2010 +0100 app: move stuff to the local scope it belongs to @@ -68264,17 +69104,17 @@ commit ede02a68b992483c11e59b28659f37bfe83c7827 Author: Alexia Death -Date: Wed Feb 24 02:09:43 2010 +0200 +Date: Wed Feb 24 02:09:43 2010 +0200 app: Make pressure at stroke ends nicer app/display/gimpdisplayshell-callbacks.c | 2 +- - app/display/gimpdisplayshell-coords.c | 19 ++++++++++++++++--- + app/display/gimpdisplayshell-coords.c | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) commit 15081a3a738e94cb70d045c360c94a8ad007ec18 Author: Alexia Death -Date: Wed Feb 24 02:06:15 2010 +0200 +Date: Wed Feb 24 02:06:15 2010 +0200 app: Make catmul-rom coords intepolation clamp pressure @@ -68283,7 +69123,7 @@ commit 97db8b9b420ecb53498d91922a517fa607b68ef3 Author: Michael Natterer -Date: Wed Feb 24 00:18:50 2010 +0100 +Date: Wed Feb 24 00:18:50 2010 +0100 app: add function gimp_text_tool_editor_get_iter_index() @@ -68292,12 +69132,12 @@ app/tools/gimptexttool-editor.c | 31 +++++++++++++++++++++---------- app/tools/gimptexttool-editor.h | 3 +++ - app/tools/gimptexttool.c | 12 ++---------- + app/tools/gimptexttool.c | 12 ++---------- 3 files changed, 26 insertions(+), 20 deletions(-) commit 14158b982a4930d557eb6a3a9c128a62d69af3f1 Author: Michael Natterer -Date: Wed Feb 24 00:03:15 2010 +0100 +Date: Wed Feb 24 00:03:15 2010 +0100 app: clean up comments @@ -68306,7 +69146,7 @@ commit a17ede4ce00819450aff7a79d0a0f36a139932d3 Author: Michael Natterer -Date: Tue Feb 23 23:46:09 2010 +0100 +Date: Tue Feb 23 23:46:09 2010 +0100 app: fix crash caused by bogus value of text_tool->selecting @@ -68319,7 +69159,7 @@ commit f9bee0d42fa1d760bc3738d8b15aaf0b1699000e Author: Michael Natterer -Date: Tue Feb 23 23:14:09 2010 +0100 +Date: Tue Feb 23 23:14:09 2010 +0100 app: fix XOR cursor drawing artifacts @@ -68342,14 +69182,14 @@ see the edited text because it's out-of-layer. app/tools/gimptexttool-editor.c | 12 ++++--- - app/tools/gimptexttool.c | 70 + app/tools/gimptexttool.c | 70 +++++++++++++++++------------------------ - app/tools/gimptexttool.h | 3 +- + app/tools/gimptexttool.h | 3 +- 3 files changed, 37 insertions(+), 48 deletions(-) commit 7ea07c884bd7957c230fa682e8205d573505e1ef Author: Michael Natterer -Date: Tue Feb 23 20:59:10 2010 +0100 +Date: Tue Feb 23 20:59:10 2010 +0100 app: some code cleanup @@ -68362,7 +69202,7 @@ commit ced0c1af79c9d7bdd0c91c622f4ece1fce7628f4 Author: Alexia Death -Date: Tue Feb 23 21:15:18 2010 +0200 +Date: Tue Feb 23 21:15:18 2010 +0200 app: Fix some code ugliness intoduced by my last commit @@ -68372,7 +69212,7 @@ commit 639a17ad110f4363ff9610e81fca38e14498a774 Author: Alexandre Prokoudine -Date: Tue Feb 23 21:49:27 2010 +0300 +Date: Tue Feb 23 21:49:27 2010 +0300 Updates and fixes to Russian translation @@ -68382,7 +69222,7 @@ commit 0e1715fae26dcd615a0560b98bf33143a7af4238 Author: Alexia Death -Date: Tue Feb 23 20:16:28 2010 +0200 +Date: Tue Feb 23 20:16:28 2010 +0200 app: Make the curve changes have immedate effect and have a working curve @@ -68393,7 +69233,7 @@ commit 3a8c23426146ed63d5d700041de6ebb1374d21cf Author: Alexia Death -Date: Tue Feb 23 17:39:06 2010 +0200 +Date: Tue Feb 23 17:39:06 2010 +0200 app: Make all inputs for an output respect curves @@ -68403,7 +69243,7 @@ commit 902e49fcc83581b3b9a2e22ad6d2cd5e5e4d9a61 Author: Alexia Death -Date: Tue Feb 23 16:58:58 2010 +0200 +Date: Tue Feb 23 16:58:58 2010 +0200 app: Make dynamics output curve getting work right. @@ -68412,7 +69252,7 @@ commit 62c0472ca5eb9c44a0d2f502146cdc1ff13c9bf9 Author: rubikcube -Date: Sun Nov 1 17:05:56 2009 +0100 +Date: Sun Nov 1 17:05:56 2009 +0100 Bug 600316 - Animated brushes, angle calculation @@ -68423,7 +69263,7 @@ commit 568823bbf2933c549462918762ae9fc3b5178cdd Author: Barak Itkin -Date: Fri Feb 12 17:19:17 2010 +0200 +Date: Fri Feb 12 17:19:17 2010 +0200 Bug 609679 - Inconsistency in the colorize icons @@ -68440,14 +69280,14 @@ commit 088368079c4cf754c8c32cf67d01194be7cd6dcb Author: Michael Natterer -Date: Tue Feb 23 11:39:35 2010 +0100 +Date: Tue Feb 23 11:39:35 2010 +0100 app: make the coordinates display in the curve view configurable Add API for X and Y ranges, default to 0.0..1.0 and configure the view for 0..255 in the curves tool. - app/tools/gimpcurvestool.c | 2 ++ + app/tools/gimpcurvestool.c | 2 ++ app/widgets/gimpcurveview.c | 67 +++++++++++++++++++++++++++++++++++++++++---- app/widgets/gimpcurveview.h | 11 ++++++++ @@ -68455,7 +69295,7 @@ commit 6224e3d5f74799ffac43234c12aa799ed181ba66 Author: Michael Natterer -Date: Mon Feb 22 18:48:13 2010 +0100 +Date: Mon Feb 22 18:48:13 2010 +0100 app: pause/resume the draw tool at some more reasonable places @@ -68464,7 +69304,7 @@ commit bdf4269e3040d7d4c4094fab2b4eb55c6d92d5e8 Author: Alexia Death -Date: Mon Feb 22 20:34:11 2010 +0200 +Date: Mon Feb 22 20:34:11 2010 +0200 app: Add props for curves @@ -68474,7 +69314,7 @@ commit 86d417c6f701f331e0ff7f831d7b406574fdfa21 Author: Michael Natterer -Date: Mon Feb 22 10:50:04 2010 +0100 +Date: Mon Feb 22 10:50:04 2010 +0100 app: fix curve focus drawing @@ -68483,24 +69323,24 @@ commit ba6a7d33ff04a63ba2706c8c475c69df376bc59c Author: Michael Natterer -Date: Mon Feb 22 10:35:43 2010 +0100 +Date: Mon Feb 22 10:35:43 2010 +0100 app: fix code formatting and UI packing - app/widgets/gimpdynamicseditor.c | 85 + app/widgets/gimpdynamicseditor.c | 85 +++++++++++++++++----------------- - app/widgets/gimpdynamicseditor.h | 1 - + app/widgets/gimpdynamicseditor.h | 1 - app/widgets/gimpdynamicsoutputeditor.c | 49 +++++++------------- app/widgets/gimpdynamicsoutputeditor.h | 4 +- 4 files changed, 63 insertions(+), 76 deletions(-) commit 652c6756c4b64bc34627e321cef00c2c9603cda5 Author: Michael Natterer -Date: Mon Feb 22 08:52:32 2010 +0100 +Date: Mon Feb 22 08:52:32 2010 +0100 app: cosmetic cleanups in the new dynamics stuff in core/ - app/core/core-enums.h | 1 + + app/core/core-enums.h | 1 + app/core/gimpdynamics.c | 8 +++----- app/core/gimpdynamics.h | 10 +++++----- app/core/gimpdynamicsoutput.c | 21 ++++++++++++--------- @@ -68509,7 +69349,7 @@ commit dd8c65aed31cb8cb37db42ca68f38288dac39aeb Author: Alexandre Prokoudine -Date: Mon Feb 22 10:52:06 2010 +0300 +Date: Mon Feb 22 10:52:06 2010 +0300 Typo fixed @@ -68518,7 +69358,7 @@ commit 35794e707e7658ce0be4bf9ceb66d06e99e697ad Author: Alexandre Prokoudine -Date: Mon Feb 22 10:46:38 2010 +0300 +Date: Mon Feb 22 10:46:38 2010 +0300 Updated Russian translation @@ -68528,21 +69368,21 @@ commit 6c383b87a7f15f0d2db1094ccee9eed5de20788c Author: Alexia Death -Date: Mon Feb 22 00:08:10 2010 +0200 +Date: Mon Feb 22 00:08:10 2010 +0200 app: Add he beginnings of output editor - app/widgets/Makefile.am | 2 + - app/widgets/gimpdynamicseditor.c | 16 ++- + app/widgets/Makefile.am | 2 + + app/widgets/gimpdynamicseditor.c | 16 ++- app/widgets/gimpdynamicsoutputeditor.c | 256 +++++++++++++++++++++++++++++++++ app/widgets/gimpdynamicsoutputeditor.h | 51 +++++++ - app/widgets/widgets-types.h | 1 + + app/widgets/widgets-types.h | 1 + 5 files changed, 319 insertions(+), 7 deletions(-) commit 53dce99bfb94e1994107b9091eb49ef45ee76032 Author: Alexia Death -Date: Mon Feb 22 00:43:52 2010 +0200 +Date: Mon Feb 22 00:43:52 2010 +0200 app: Prepare dynamics editor for output curves @@ -68553,12 +69393,12 @@ commit 468b30b58557e7671cd917c3cebb8aeddc4e6dd8 Author: Alexia Death -Date: Mon Feb 22 00:41:55 2010 +0200 +Date: Mon Feb 22 00:41:55 2010 +0200 app: Add type for dynamics output - app/core/core-enums.c | 43 +++++++++++++++++++++ - app/core/core-enums.h | 17 +++++++++ + app/core/core-enums.c | 43 +++++++++++++++++++++ + app/core/core-enums.h | 17 +++++++++ app/core/gimpdynamics.c | 88 ++++++++++++++++++++++++++++++++++++------- app/core/gimpdynamics.h | 3 ++ @@ -68568,7 +69408,7 @@ commit a66cc1639b22e99ef23f81499fa4e3f857ff479e Author: Michael Natterer -Date: Sun Feb 21 23:36:25 2010 +0100 +Date: Sun Feb 21 23:36:25 2010 +0100 app: i hate unsigned integers @@ -68577,7 +69417,7 @@ commit 7c63af506e01f27e4da3cdb19cfddb97bd1bd25a Author: Michael Natterer -Date: Sun Feb 21 20:41:48 2010 +0100 +Date: Sun Feb 21 20:41:48 2010 +0100 app: don't "fix" the extents of filled rectangles and circles @@ -68590,7 +69430,7 @@ commit b6db793e6f69ddbb06c15fe1ad6888d53ce87a4b Author: Michael Natterer -Date: Sun Feb 21 20:41:17 2010 +0100 +Date: Sun Feb 21 20:41:17 2010 +0100 app: remove the old selection code, the new one works now and is correct @@ -68601,7 +69441,7 @@ commit 51dc42bdd988a4af9728d409323e142ce3bd3f6a Author: Michael Natterer -Date: Sun Feb 21 20:25:17 2010 +0100 +Date: Sun Feb 21 20:25:17 2010 +0100 app: use the line's y coords for selection rendering, not the char's @@ -68612,7 +69452,7 @@ commit 4ec38099e5418674d3a09b29f765c57edfa2621a Author: Michael Natterer -Date: Sun Feb 21 20:11:13 2010 +0100 +Date: Sun Feb 21 20:11:13 2010 +0100 app: render the selection char-by-char @@ -68625,7 +69465,7 @@ commit 4295b1712c55ea2fba986fbb4a6d4eed34669a2f Author: Michael Natterer -Date: Sun Feb 21 18:59:51 2010 +0100 +Date: Sun Feb 21 18:59:51 2010 +0100 app: keep the "use-editor" setting consistent @@ -68636,7 +69476,7 @@ commit ea7495a95ca51eb1df0f236c390af73b5a038313 Author: Michael Natterer -Date: Sun Feb 21 17:47:21 2010 +0100 +Date: Sun Feb 21 17:47:21 2010 +0100 app: take the rendering direction into account when adjusting the x-offset @@ -68644,15 +69484,15 @@ Move the layout to the right edge of the bounding box if LTR and RIGHT *or* RTL and LEFT. - app/text/gimptext-vectors.c | 2 +- - app/text/gimptextlayer.c | 2 +- + app/text/gimptext-vectors.c | 2 +- + app/text/gimptextlayer.c | 2 +- app/text/gimptextlayout-render.c | 33 ++++++++++++++++----------------- app/text/gimptextlayout-render.h | 7 ++++--- 4 files changed, 22 insertions(+), 22 deletions(-) commit 3befe0df59fcce1e21e3b40c638cbbbfcc1320f1 Author: Michael Natterer -Date: Sun Feb 21 17:35:04 2010 +0100 +Date: Sun Feb 21 17:35:04 2010 +0100 app: #include "libgimpbase/gimpbase.h" @@ -68661,7 +69501,7 @@ commit 0908e53148173099efb804dcd5bd0f2a3d754492 Author: Michael Natterer -Date: Sun Feb 21 16:46:39 2010 +0100 +Date: Sun Feb 21 16:46:39 2010 +0100 app: use the new unit conversion functions @@ -68673,27 +69513,27 @@ they will simply have to share one unit database. app/core/gimpdrawable-stroke.c | 6 ++--- - app/display/gimpcursorview.c | 48 + app/display/gimpcursorview.c | 48 +++++++++++++++------------------- app/display/gimpdisplayshell-scale.c | 14 +++------- app/display/gimpdisplayshell-title.c | 20 +++++++-------- - app/display/gimpstatusbar.c | 18 +++++-------- - app/text/gimptextlayout.c | 48 + app/display/gimpstatusbar.c | 18 +++++-------- + app/text/gimptextlayout.c | 48 ++++++++++++++-------------------- - app/tools/gimpmeasuretool.c | 31 +++++++++++----------- - app/tools/gimppainttool.c | 8 +++--- - app/tools/gimpscaletool.c | 1 - - app/tools/gimptexttool.c | 50 + app/tools/gimpmeasuretool.c | 31 +++++++++++----------- + app/tools/gimppainttool.c | 8 +++--- + app/tools/gimpscaletool.c | 1 - + app/tools/gimptexttool.c | 50 +++++++++--------------------------- app/vectors/gimpvectors-export.c | 7 ++--- app/widgets/gimpimagepropview.c | 16 +++++------- - app/xcf/xcf-load.c | 28 +++++++++----------- - app/xcf/xcf-save.c | 19 +++++++------- + app/xcf/xcf-load.c | 28 +++++++++----------- + app/xcf/xcf-save.c | 19 +++++++------- 14 files changed, 123 insertions(+), 191 deletions(-) commit 52041715a965b23fd64cb52770c71e9729da3435 Author: Michael Natterer -Date: Sun Feb 21 16:45:01 2010 +0100 +Date: Sun Feb 21 16:45:01 2010 +0100 libgimpbase: add utility functions to convert between pixels and units @@ -68704,7 +69544,7 @@ commit 41a277f040f1b6b00b500bdd9d8fdff86a98267a Author: Michael Natterer -Date: Sun Feb 21 14:33:33 2010 +0100 +Date: Sun Feb 21 14:33:33 2010 +0100 Bug 565001 - Text-Tool crashes when edit a 2.4.2 version xcf @@ -68717,7 +69557,7 @@ commit e5e6638c32a4e03403f21bd25c675bb06943eda2 Author: Michael Natterer -Date: Sun Feb 21 12:23:51 2010 +0100 +Date: Sun Feb 21 12:23:51 2010 +0100 app: push the right drawable undo here too @@ -68726,7 +69566,7 @@ commit f13204e0a4df052ceb57b6c7a730124fbf8f5fe0 Author: Michael Natterer -Date: Sun Feb 21 12:04:19 2010 +0100 +Date: Sun Feb 21 12:04:19 2010 +0100 app: fix the transition to modified text layer and back @@ -68755,19 +69595,19 @@ commit 5150f3c8f616585373ba3a0171caede8e763ed91 Author: Michael Natterer -Date: Sun Feb 21 02:00:57 2010 +0100 +Date: Sun Feb 21 02:00:57 2010 +0100 app: when connecting the text object, also set its text on the buffer and don't do it in editor_start(), which caused an undo to be pushed. app/tools/gimptexttool-editor.c | 6 ------ - app/tools/gimptexttool.c | 18 +++++++++--------- + app/tools/gimptexttool.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 15 deletions(-) commit a6ca7e184c140235360105ba4e587b1737005aef Author: Michael Natterer -Date: Sun Feb 21 01:39:38 2010 +0100 +Date: Sun Feb 21 01:39:38 2010 +0100 app: more text tool @@ -68781,7 +69621,7 @@ commit 9a3dbbb6ef8086df219c67ac37c074c68812a7bf Author: Michael Natterer -Date: Sat Feb 20 23:33:58 2010 +0100 +Date: Sat Feb 20 23:33:58 2010 +0100 app: consistent IM callback names @@ -68790,7 +69630,7 @@ commit b5b6d377420025019796bcbc99e76e17a7f56507 Author: Michael Natterer -Date: Sat Feb 20 23:19:10 2010 +0100 +Date: Sat Feb 20 23:19:10 2010 +0100 app: move the entire mouse-selection apparatus to gimptexttool-editor.[ch] @@ -68798,14 +69638,14 @@ app/tools/gimptexttool-editor.c | 203 +++++++++++++++++++++++++++++++++++++++- app/tools/gimptexttool-editor.h | 48 +++++----- - app/tools/gimptexttool.c | 192 + app/tools/gimptexttool.c | 192 ++----------------------------------- - app/tools/gimptexttool.h | 8 +- + app/tools/gimptexttool.h | 8 +- 4 files changed, 239 insertions(+), 212 deletions(-) commit f9a2c5cfe108dc8a54890b5d349e9b931734e766 Author: Martin Nordholts -Date: Sat Feb 20 22:52:21 2010 +0100 +Date: Sat Feb 20 22:52:21 2010 +0100 app: Add Windows→Hide docks menu item @@ -68816,30 +69656,30 @@ shortcut will work. We remove gimp_dialog_factories_toggle() and make clients activate the action instead to toggle dock visibility. - app/actions/windows-actions.c | 16 ++++++++++++++++ - app/actions/windows-commands.c | 18 ++++++++++++++++++ - app/actions/windows-commands.h | 2 ++ + app/actions/windows-actions.c | 16 ++++++++++++++++ + app/actions/windows-commands.c | 18 ++++++++++++++++++ + app/actions/windows-commands.h | 2 ++ app/display/gimpdisplayshell-callbacks.c | 16 ++++++++++++++-- - app/widgets/gimpdialogfactory.c | 13 ------------- - app/widgets/gimpdialogfactory.h | 1 - - app/widgets/gimphelp-ids.h | 1 + - menus/image-menu.xml.in | 1 + + app/widgets/gimpdialogfactory.c | 13 ------------- + app/widgets/gimpdialogfactory.h | 1 - + app/widgets/gimphelp-ids.h | 1 + + menus/image-menu.xml.in | 1 + 8 files changed, 52 insertions(+), 16 deletions(-) commit 6d6a52b521aa0411cc30d83d97df72da63da0598 Author: Martin Nordholts -Date: Sat Feb 20 22:06:12 2010 +0100 +Date: Sat Feb 20 22:06:12 2010 +0100 app: Make GimpDialogsState public in core app/widgets/gimpdialogfactory.c | 15 +++++++-------- app/widgets/gimpdialogfactory.h | 2 ++ - app/widgets/widgets-enums.h | 7 +++++++ + app/widgets/widgets-enums.h | 7 +++++++ 3 files changed, 16 insertions(+), 8 deletions(-) commit 75f7e25e3a78db3933225ebcbc9c1b2c4c9c47a2 Author: Michael Natterer -Date: Sat Feb 20 22:48:51 2010 +0100 +Date: Sat Feb 20 22:48:51 2010 +0100 app: don't call update_layout() from buffer_changed() @@ -68851,7 +69691,7 @@ commit 6c3e385cac848719bfa666ef992fe57c1f185312 Author: Michael Natterer -Date: Sat Feb 20 22:18:38 2010 +0100 +Date: Sat Feb 20 22:18:38 2010 +0100 app: fix line navigation for lines that are not left-aligned @@ -68864,7 +69704,7 @@ commit e91f27a0fdd9ce42318a1559b72b264163bbc109 Author: Michael Natterer -Date: Sat Feb 20 22:11:06 2010 +0100 +Date: Sat Feb 20 22:11:06 2010 +0100 app: simplify selection drawing a lot @@ -68874,7 +69714,7 @@ commit bd151ac84e7ea4caa4d3676030cb440b007ab7df Author: Michael Natterer -Date: Sat Feb 20 20:32:19 2010 +0100 +Date: Sat Feb 20 20:32:19 2010 +0100 app: add background curves when editing the R, B or G curve @@ -68886,7 +69726,7 @@ commit 2352037dbdf059450f9be0095bc7badd964e47c0 Author: Michael Natterer -Date: Sat Feb 20 20:31:22 2010 +0100 +Date: Sat Feb 20 20:31:22 2010 +0100 app: allow to show an arbitrary number of "background curves" @@ -68894,12 +69734,12 @@ app/widgets/gimpcurveview.c | 129 ++++++++++++++++++++++++++++++++++++++------ - app/widgets/gimpcurveview.h | 26 +++++---- + app/widgets/gimpcurveview.h | 26 +++++---- 2 files changed, 129 insertions(+), 26 deletions(-) commit 42de0453da5191d5ccc07111f7c755fd0592a691 Author: Michael Natterer -Date: Sat Feb 20 19:43:17 2010 +0100 +Date: Sat Feb 20 19:43:17 2010 +0100 app: when disconnecting from the text layer, also empty our text buffer @@ -68912,7 +69752,7 @@ commit 487336fc091b69cfdffb3c75e0e1b912ba2b540c Author: Michael Natterer -Date: Sat Feb 20 19:31:27 2010 +0100 +Date: Sat Feb 20 19:31:27 2010 +0100 app: remove gimp_text_tool_update_proxy() @@ -68925,7 +69765,7 @@ commit c91b0263844a1623b7624494a1bfb2a05db645e1 Author: Michael Natterer -Date: Sat Feb 20 19:25:07 2010 +0100 +Date: Sat Feb 20 19:25:07 2010 +0100 app: re-add gimp_text_tool_editor_get_text() @@ -68934,12 +69774,12 @@ app/tools/gimptexttool-editor.c | 17 ++++++++++++++--- app/tools/gimptexttool-editor.h | 2 ++ - app/tools/gimptexttool.c | 29 +++++------------------------ + app/tools/gimptexttool.c | 29 +++++------------------------ 3 files changed, 21 insertions(+), 27 deletions(-) commit 1e9048ded9ee9434fcbc8cee987e1ca6c8331eb5 Author: Martin Nordholts -Date: Sat Feb 20 16:55:35 2010 +0100 +Date: Sat Feb 20 16:55:35 2010 +0100 app: Turn gimp_dialog_factory_dock_with_window_new() into util func @@ -68952,7 +69792,7 @@ app/widgets/gimpdialogfactory.c | 65 +++----------------------------------- app/widgets/gimpdialogfactory.h | 3 -- - app/widgets/gimpdockable.c | 6 ++-- + app/widgets/gimpdockable.c | 6 ++-- app/widgets/gimpwidgets-utils.c | 58 ++++++++++++++++++++++++++++++++++ app/widgets/gimpwidgets-utils.h | 4 ++- @@ -68960,7 +69800,7 @@ commit ec0f3bdcb83d9e42f11c0f9a4dbf9a0161e55a69 Author: Michael Natterer -Date: Sat Feb 20 16:18:41 2010 +0100 +Date: Sat Feb 20 16:18:41 2010 +0100 app: buncha more text tool fixes @@ -68970,12 +69810,12 @@ (fixes most drawing artifacts) app/tools/gimptexttool-editor.c | 16 ++++++++++++++++ - app/tools/gimptexttool.c | 22 ++++++++++++++++++++++ + app/tools/gimptexttool.c | 22 ++++++++++++++++++++++ 2 files changed, 38 insertions(+) commit a0da3ffc15599e2a2f00681c85fc341e1f7082ff Author: Michael Natterer -Date: Sat Feb 20 16:03:51 2010 +0100 +Date: Sat Feb 20 16:03:51 2010 +0100 app: set "hide-empty" to FALSE on the input method submenu @@ -68984,7 +69824,7 @@ commit 2e0f4e89380f96a3285f6366ef25be2edf8ffef0 Author: Michael Natterer -Date: Sat Feb 20 15:37:54 2010 +0100 +Date: Sat Feb 20 15:37:54 2010 +0100 app: make the preedit overlay better readable (text/base instead of fg/bg) @@ -68994,7 +69834,7 @@ commit 4704c187392e6597afa0d00069d3f2f8071d08dd Author: Michael Natterer -Date: Sat Feb 20 15:13:14 2010 +0100 +Date: Sat Feb 20 15:13:14 2010 +0100 app: implement IM preedit using an overlay widget @@ -69009,14 +69849,14 @@ app/tools/gimptexttool-editor.c | 144 ++++++++++++++++++++++------- app/tools/gimptexttool-editor.h | 27 +++--- - app/tools/gimptexttool.c | 200 + app/tools/gimptexttool.c | 200 +++++++--------------------------------- - app/tools/gimptexttool.h | 3 + + app/tools/gimptexttool.h | 3 + 4 files changed, 163 insertions(+), 211 deletions(-) commit 9b75184442a12d6d339c199cf365fb833ee65897 Author: Michael Natterer -Date: Sat Feb 20 14:52:37 2010 +0100 +Date: Sat Feb 20 14:52:37 2010 +0100 app: add API to add overlays in image coordinates @@ -69029,20 +69869,20 @@ commit d488cc650a75ef26a586f5bf812e9659fedaf406 Author: Michael Natterer -Date: Sat Feb 20 14:46:29 2010 +0100 +Date: Sat Feb 20 14:46:29 2010 +0100 app: allow to position overlay widgets absolutely - app/widgets/gimpoverlaybox.c | 53 + app/widgets/gimpoverlaybox.c | 53 +++++++++++++++++++++++++++++++++++------- - app/widgets/gimpoverlaybox.h | 42 ++++++++++++++++++--------------- + app/widgets/gimpoverlaybox.h | 42 ++++++++++++++++++--------------- app/widgets/gimpoverlaychild.c | 33 +++++++++++++++++--------- app/widgets/gimpoverlaychild.h | 5 ++++ 4 files changed, 94 insertions(+), 39 deletions(-) commit 9bc0ea54660d3cc3448cd947d9ec33093c7f650b Author: Michael Natterer -Date: Sat Feb 20 11:05:37 2010 +0100 +Date: Sat Feb 20 11:05:37 2010 +0100 app: don't leave artifacts on the box when a child changes its size @@ -69054,7 +69894,7 @@ commit f0ba888c061e97b27d9ee73d911da644e52f5ef1 Author: Martin Nordholts -Date: Sat Feb 20 14:28:08 2010 +0100 +Date: Sat Feb 20 14:28:08 2010 +0100 app: Don't show toolbox when last image is closed @@ -69066,7 +69906,7 @@ commit ea6efc3885c2b57812cfcd2a47dc569d49ef11bf Author: Martin Nordholts -Date: Sat Feb 20 13:05:00 2010 +0100 +Date: Sat Feb 20 13:05:00 2010 +0100 app: Make Recently Used Docks work with GIMP 2.6 dockrc files @@ -69075,15 +69915,15 @@ add a copyright notice to dialogs.c since tha file is almost rewritten by now... - app/dialogs/dialogs.c | 27 +++++++++++++++++++++++ + app/dialogs/dialogs.c | 27 +++++++++++++++++++++++ app/tests/gimpdir/dockrc-expected | 44 +++++++++++++++++++++++++++++++++++++ - app/tests/test-session-management.c | 2 +- + app/tests/test-session-management.c | 2 +- 3 files changed, 72 insertions(+), 1 deletion(-) commit dec798e0df179f4ff252055cb75d02c3062b7bbe Author: Martin Nordholts -Date: Sat Feb 20 12:13:55 2010 +0100 +Date: Sat Feb 20 12:13:55 2010 +0100 app: Serialize factory entry name along with GimpSessionInfo @@ -69091,17 +69931,17 @@ the Recently Closed Docks feature work across sessions in a natural way. - app/gui/session.c | 59 + app/gui/session.c | 59 +++++++++++++++++++---------------- app/tests/gimpdir/sessionrc-expected | 24 +++++++++----- app/widgets/gimpdialogfactory.c | 2 -- app/widgets/gimpsessioninfo-private.h | 10 +++--- - app/widgets/gimpsessioninfo.c | 31 ++++++++++++++++++ + app/widgets/gimpsessioninfo.c | 31 ++++++++++++++++++ 5 files changed, 84 insertions(+), 42 deletions(-) commit 1d120d9b02b0374b7ad60d10afa6e257ec5ef116 Author: Martin Nordholts -Date: Sat Feb 20 12:58:29 2010 +0100 +Date: Sat Feb 20 12:58:29 2010 +0100 app/tests: Improve test-session-management.c output @@ -69114,7 +69954,7 @@ commit b771bf9879da9986cd545af288462bd98eacf4ed Author: Alexia Death -Date: Sat Feb 20 12:35:07 2010 +0200 +Date: Sat Feb 20 12:35:07 2010 +0200 app: Fix direction in strokig with dynamics. @@ -69123,7 +69963,7 @@ commit bf830398a5a6f18e5efb6756def9cfb86a1d32e1 Author: Martin Nordholts -Date: Sat Feb 20 11:09:51 2010 +0100 +Date: Sat Feb 20 11:09:51 2010 +0100 app: Cleanup GimpImageWindow and dependencies, only one dialog factory @@ -69136,41 +69976,41 @@ ++++++++++++------------------------------- app/display/gimpimagewindow.h | 4 +-- app/gui/gimpuiconfigurer.c | 1 - - app/gui/gui-vtable.c | 1 - + app/gui/gui-vtable.c | 1 - 6 files changed, 22 insertions(+), 58 deletions(-) commit c3619fb85c42a838e4e47f5ea5194e4bca15d0d5 Author: Martin Nordholts -Date: Sat Feb 20 10:58:29 2010 +0100 +Date: Sat Feb 20 10:58:29 2010 +0100 app: Merge "toplevel" and "display" factories Merge "toplevel" and "display" factories so that we only have one dialog factory. This allows us to get rid of a lot of special casing. - app/dialogs/dialogs.c | 49 + app/dialogs/dialogs.c | 49 +++++++++++++++--------------------- - app/dialogs/dialogs.h | 2 -- - app/gui/gimpuiconfigurer.c | 2 +- - app/gui/gui-vtable.c | 2 +- - app/gui/session.c | 12 +++++---- + app/dialogs/dialogs.h | 2 -- + app/gui/gimpuiconfigurer.c | 2 +- + app/gui/gui-vtable.c | 2 +- + app/gui/session.c | 12 +++++---- app/tests/gimpdir/sessionrc-expected | 2 +- 6 files changed, 30 insertions(+), 39 deletions(-) commit 993d2df33800ec8160aa655301b88fa1dde612b4 Author: Martin Nordholts -Date: Sat Feb 20 10:32:50 2010 +0100 +Date: Sat Feb 20 10:32:50 2010 +0100 app: Make hideability a per entry rather than per dialog factory thing - app/dialogs/dialogs.c | 16 ++++++++++++---- + app/dialogs/dialogs.c | 16 ++++++++++++---- app/widgets/gimpdialogfactory.c | 16 ++++++++-------- app/widgets/gimpdialogfactory.h | 7 +++++-- 3 files changed, 25 insertions(+), 14 deletions(-) commit 8b458fb59150b94e55f209396868e2db7ac4dafa Author: Martin Nordholts -Date: Sat Feb 20 09:26:57 2010 +0100 +Date: Sat Feb 20 09:26:57 2010 +0100 app: Merge "toplevel" and "dock" dialog factories @@ -69178,36 +70018,36 @@ only one dialog factory. app/actions/context-commands.c | 4 +-- - app/actions/data-commands.c | 2 +- + app/actions/data-commands.c | 2 +- app/actions/dialogs-commands.c | 2 +- - app/actions/edit-commands.c | 2 +- - app/actions/select-commands.c | 2 +- - app/actions/view-commands.c | 2 +- - app/actions/windows-actions.c | 8 ++--- + app/actions/edit-commands.c | 2 +- + app/actions/select-commands.c | 2 +- + app/actions/view-commands.c | 2 +- + app/actions/windows-actions.c | 8 ++--- app/actions/windows-commands.c | 6 ++-- - app/dialogs/dialogs.c | 65 + app/dialogs/dialogs.c | 65 +++++++++-------------------------- - app/dialogs/dialogs.h | 1 - + app/dialogs/dialogs.h | 1 - app/display/gimpdisplayshell-cursor.c | 4 +-- - app/gui/gimpuiconfigurer.c | 8 ++--- - app/gui/gui-message.c | 4 +-- - app/gui/gui-vtable.c | 2 +- - app/gui/gui.c | 2 +- - app/gui/session.c | 15 ++++---- - app/menus/windows-menu.c | 8 ++--- + app/gui/gimpuiconfigurer.c | 8 ++--- + app/gui/gui-message.c | 4 +-- + app/gui/gui-vtable.c | 2 +- + app/gui/gui.c | 2 +- + app/gui/session.c | 15 ++++---- + app/menus/windows-menu.c | 8 ++--- app/tests/gimpdir/sessionrc-expected | 10 +++--- - app/tests/test-ui.c | 12 +++---- + app/tests/test-ui.c | 12 +++---- app/tests/test-window-management.c | 4 +-- - app/tools/gimpcolortool.c | 2 +- + app/tools/gimpcolortool.c | 2 +- app/widgets/gimpdevicestatus.c | 2 +- - app/widgets/gimpdockable.c | 2 +- - app/widgets/gimpdockwindow.c | 2 +- - app/widgets/gimpviewablebox.c | 4 +-- + app/widgets/gimpdockable.c | 2 +- + app/widgets/gimpdockwindow.c | 2 +- + app/widgets/gimpviewablebox.c | 4 +-- 25 files changed, 72 insertions(+), 103 deletions(-) commit 10ff2733ffd9c60a707ba338d745f7a187d918df Author: Michael Natterer -Date: Fri Feb 19 23:42:45 2010 +0100 +Date: Fri Feb 19 23:42:45 2010 +0100 app: add missing include @@ -69216,7 +70056,7 @@ commit 8a626724296ee11767648444542b07ea2650eebd Author: Michael Natterer -Date: Fri Feb 19 23:17:36 2010 +0100 +Date: Fri Feb 19 23:17:36 2010 +0100 app: use gimp_item_tree_rename_item() to auto-rename text layers @@ -69227,7 +70067,7 @@ commit 2cb8f0a8649d63ad4c303cec8ac2535afd18e041 Author: Alexia Death -Date: Fri Feb 19 22:41:20 2010 +0200 +Date: Fri Feb 19 22:41:20 2010 +0200 app: Make sure button releases get handled by paint tools too @@ -69236,24 +70076,24 @@ commit 5f0255e269f30a70ab791c4b166227b480820468 Author: Michael Natterer -Date: Fri Feb 19 21:23:02 2010 +0100 +Date: Fri Feb 19 21:23:02 2010 +0100 Add GIMP_STOCK_INPUT_DEVICE icons and use them for the devices dialog From icon masta Jimmac. - app/actions/dialogs-actions.c | 2 +- - app/widgets/gimpdeviceinfo.c | 2 +- - libgimpwidgets/gimpstock.c | 3 +++ - libgimpwidgets/gimpstock.h | 1 + - themes/Default/images/Makefile.am | 2 ++ + app/actions/dialogs-actions.c | 2 +- + app/widgets/gimpdeviceinfo.c | 2 +- + libgimpwidgets/gimpstock.c | 3 +++ + libgimpwidgets/gimpstock.h | 1 + + themes/Default/images/Makefile.am | 2 ++ themes/Default/images/stock-input-device-16.png | Bin 0 -> 843 bytes themes/Default/images/stock-input-device-22.png | Bin 0 -> 1080 bytes 7 files changed, 8 insertions(+), 2 deletions(-) commit eb244f208aa158232cad0e2d9d4af7080fe2b99a Author: Alexia Death -Date: Fri Feb 19 22:05:29 2010 +0200 +Date: Fri Feb 19 22:05:29 2010 +0200 app: Best guess attempt to catch that very rare segfault from event_eval @@ -69266,7 +70106,7 @@ commit c55753f2ad387ead2edbbfce8cd8f7f3751455b4 Author: Michael Natterer -Date: Fri Feb 19 20:59:25 2010 +0100 +Date: Fri Feb 19 20:59:25 2010 +0100 Bug 610478 - Layer preview suddenly stops getting updated @@ -69281,29 +70121,29 @@ commit d967852cd79a8aea8021f072e58e908d71adf7fa Author: Michael Natterer -Date: Fri Feb 19 17:41:26 2010 +0100 +Date: Fri Feb 19 17:41:26 2010 +0100 app: turn the input devices dialog into a session managed toplevel It works exactly as the keyboard shortcuts dialog now and has its own menu entry: Edit -> Input Devices. - app/actions/dialogs-actions.c | 6 +++ - app/dialogs/Makefile.am | 2 + + app/actions/dialogs-actions.c | 6 +++ + app/dialogs/Makefile.am | 2 + app/dialogs/dialogs-constructors.c | 10 ++++ - app/dialogs/dialogs-constructors.h | 4 ++ - app/dialogs/dialogs.c | 2 + + app/dialogs/dialogs-constructors.h | 4 ++ + app/dialogs/dialogs.c | 2 + app/dialogs/input-devices-dialog.c | 102 +++++++++++++++++++++++++++++++++++++ app/dialogs/input-devices-dialog.h | 25 +++++++++ app/dialogs/preferences-dialog.c | 68 ++----------------------- - app/widgets/gimphelp-ids.h | 1 + - menus/image-menu.xml.in | 1 + + app/widgets/gimphelp-ids.h | 1 + + menus/image-menu.xml.in | 1 + 10 files changed, 157 insertions(+), 64 deletions(-) commit a8a732f7533ee16b5184add854e0a5c3589869c4 Author: Michael Natterer -Date: Fri Feb 19 16:05:48 2010 +0100 +Date: Fri Feb 19 16:05:48 2010 +0100 app: fix IM context reset @@ -69321,25 +70161,25 @@ app/tools/gimptexttool-editor.c | 37 ++++++++++++++++++++++++------------- app/tools/gimptexttool-editor.h | 2 ++ - app/tools/gimptexttool.c | 12 +++++++++--- + app/tools/gimptexttool.c | 12 +++++++++--- 3 files changed, 35 insertions(+), 16 deletions(-) commit a8548fa7fd85ebe90d2d2cb933200b1851cc2f63 Author: Michael Natterer -Date: Fri Feb 19 13:02:06 2010 +0100 +Date: Fri Feb 19 13:02:06 2010 +0100 app: remove member text_tool->preedit_len because it is always strlen(text_tool->preedit_string) app/tools/gimptexttool-editor.c | 3 --- - app/tools/gimptexttool.c | 8 ++++---- - app/tools/gimptexttool.h | 1 - + app/tools/gimptexttool.c | 8 ++++---- + app/tools/gimptexttool.h | 1 - 3 files changed, 4 insertions(+), 8 deletions(-) commit 99b3af1cd29e3c53e0d3daed814fe4089056eb97 Author: Michael Natterer -Date: Fri Feb 19 12:40:46 2010 +0100 +Date: Fri Feb 19 12:40:46 2010 +0100 app: re-frame the layer on each text change @@ -69351,7 +70191,7 @@ commit 5feec1dd9f7d6454dd7557789f17aa06fcd6a4e0 Author: Michael Natterer -Date: Fri Feb 19 12:21:03 2010 +0100 +Date: Fri Feb 19 12:21:03 2010 +0100 app: some signal handling/updating fixes that also make undo mostly work @@ -69368,12 +70208,12 @@ everything. app/tools/gimptexttool-editor.c | 8 ++++---- - app/tools/gimptexttool.c | 23 +++++++++++------------ + app/tools/gimptexttool.c | 23 +++++++++++------------ 2 files changed, 15 insertions(+), 16 deletions(-) commit 92ba7b262a929a6122a2b0c5f27188fd98e7f001 Author: Michael Natterer -Date: Fri Feb 19 11:09:32 2010 +0100 +Date: Fri Feb 19 11:09:32 2010 +0100 app: remove "return" at the end of a void function @@ -69382,7 +70222,7 @@ commit 21e2462b2ca91e6c7ec7fb9e911f255772bda96d Author: Michael Natterer -Date: Fri Feb 19 11:05:58 2010 +0100 +Date: Fri Feb 19 11:05:58 2010 +0100 app: only resize the text layer if the rectangle size has actually changed @@ -69395,7 +70235,7 @@ commit 9f03c457e17b6ba8e78714300dac39d7ded525a0 Author: Michael Natterer -Date: Fri Feb 19 10:57:00 2010 +0100 +Date: Fri Feb 19 10:57:00 2010 +0100 app: no reason to translate the newly created text layer @@ -69407,7 +70247,7 @@ commit e4d63ce11a3ac1de90275dc953d9bf763d0f4561 Author: Michael Natterer -Date: Fri Feb 19 10:53:46 2010 +0100 +Date: Fri Feb 19 10:53:46 2010 +0100 app: don't create new text layers on double and triple clicks @@ -69416,7 +70256,7 @@ commit c69459f13e54f002e347201095a26fa1e1044cb3 Author: Michael Natterer -Date: Fri Feb 19 10:50:07 2010 +0100 +Date: Fri Feb 19 10:50:07 2010 +0100 app: adapt button_release() to the new realities @@ -69431,7 +70271,7 @@ commit 3c63462e432708d91dd9f8aa54672e9a941d279e Author: Sven Neumann -Date: Fri Feb 19 19:30:55 2010 +0100 +Date: Fri Feb 19 19:30:55 2010 +0100 app: always use snprintf(), even in tests @@ -69440,7 +70280,7 @@ commit 3545bafc4164fb9abec32f92e30c9d3fb662a3e9 Author: Martin Nordholts -Date: Thu Feb 18 21:49:06 2010 +0100 +Date: Thu Feb 18 21:49:06 2010 +0100 app/tests: When session management test fails, use system() to say why @@ -69449,7 +70289,7 @@ commit 53ac78a4a086d8b710344a15d547078e1d2b8ca3 Author: Michael Natterer -Date: Thu Feb 18 21:35:45 2010 +0100 +Date: Thu Feb 18 21:35:45 2010 +0100 app: register the pressure curve are sreialibable property @@ -69460,7 +70300,7 @@ commit 7e3b090c320acb4661c341d218104bb6053f1321 Author: Michael Natterer -Date: Thu Feb 18 20:50:37 2010 +0100 +Date: Thu Feb 18 20:50:37 2010 +0100 app: request and process key_release events @@ -69470,12 +70310,12 @@ app/tools/gimptexttool-editor.c | 25 +++++++++++++++++++++++++ app/tools/gimptexttool-editor.h | 19 +++++++++++-------- - app/tools/gimptexttool.c | 17 +++++++++++++++++ + app/tools/gimptexttool.c | 17 +++++++++++++++++ 3 files changed, 53 insertions(+), 8 deletions(-) commit c0aa4498d23e7737ce5e383c84615dd5ffcbb108 Author: Michael Natterer -Date: Thu Feb 18 20:50:11 2010 +0100 +Date: Thu Feb 18 20:50:11 2010 +0100 app: add intrastructure to send key_release events to tools @@ -69484,15 +70324,15 @@ GimpToolControl. app/display/gimpdisplayshell-callbacks.c | 12 ++++++++++++ - app/tools/gimptool.c | 24 ++++++++++++++++++++++++ - app/tools/gimptool.h | 6 ++++++ - app/tools/tool_manager.c | 21 +++++++++++++++++++++ - app/tools/tool_manager.h | 3 +++ + app/tools/gimptool.c | 24 ++++++++++++++++++++++++ + app/tools/gimptool.h | 6 ++++++ + app/tools/tool_manager.c | 21 +++++++++++++++++++++ + app/tools/tool_manager.h | 3 +++ 5 files changed, 66 insertions(+) commit e616ebad4d9d091d1434c12ce073247d4abc21c9 Author: Michael Natterer -Date: Thu Feb 18 20:16:11 2010 +0100 +Date: Thu Feb 18 20:16:11 2010 +0100 app: move tons of code out of the line iter loop @@ -69505,7 +70345,7 @@ commit becc85683c277386977049dd0b9d207696e9a537 Author: Michael Natterer -Date: Thu Feb 18 19:53:44 2010 +0100 +Date: Thu Feb 18 19:53:44 2010 +0100 app: remove "mark_set" callback @@ -69518,7 +70358,7 @@ commit fa6e9e6653c0d8f08fe5c55015e40ae31bd79442 Author: Michael Natterer -Date: Thu Feb 18 19:44:52 2010 +0100 +Date: Thu Feb 18 19:44:52 2010 +0100 app: avoid to do things twice when double or triple clicks arrive @@ -69531,7 +70371,7 @@ commit 051deba82d3dc24e5c9b7e8e34cb9c125ee31197 Author: Michael Natterer -Date: Thu Feb 18 11:47:16 2010 +0100 +Date: Thu Feb 18 11:47:16 2010 +0100 app: more minor cleanups @@ -69540,7 +70380,7 @@ commit 2ca9aab14c0618b45d1780bca9d4bcd447656f75 Author: Michael Natterer -Date: Thu Feb 18 11:34:08 2010 +0100 +Date: Thu Feb 18 11:34:08 2010 +0100 app: get rid of one indentation level in gimp_text_tool_motion() @@ -69550,29 +70390,29 @@ commit 3d0f2d8d1b3aa5de51b454fc0c6eea0514410ac8 Author: Michael Natterer -Date: Thu Feb 18 09:51:45 2010 +0100 +Date: Thu Feb 18 09:51:45 2010 +0100 app: clean up text editing members of struct GimpTextTool app/tools/gimptexttool-editor.c | 37 ++++++++++++++++++++----------------- - app/tools/gimptexttool.h | 25 +++++++++++++------------ + app/tools/gimptexttool.h | 25 +++++++++++++------------ 2 files changed, 33 insertions(+), 29 deletions(-) commit 5c9b660c243f7a64978898a33f64807b984fd685 Author: Michael Natterer -Date: Thu Feb 18 09:39:25 2010 +0100 +Date: Thu Feb 18 09:39:25 2010 +0100 app: turn text editing debug spew into proper GIMP_LOG() output - app/gimp-log.c | 1 + - app/gimp-log.h | 4 +++- + app/gimp-log.c | 1 + + app/gimp-log.h | 4 +++- app/tools/gimptexttool-editor.c | 24 ++++++++++++------------ 3 files changed, 16 insertions(+), 13 deletions(-) commit 5794041cebb98ba43d72cba9a51cf9c88a5fc105 Author: Michael Natterer -Date: Thu Feb 18 09:27:08 2010 +0100 +Date: Thu Feb 18 09:27:08 2010 +0100 app: turn off clipping for the text cursor and the preedit strings @@ -69584,7 +70424,7 @@ commit 468ea629a65bc274c868ece9c22b48e97e7a26f4 Author: Michael Natterer -Date: Thu Feb 18 09:12:26 2010 +0100 +Date: Thu Feb 18 09:12:26 2010 +0100 app: use image and rect_tool utility functions instead of duplicating them @@ -69597,7 +70437,7 @@ commit b081d9137096924f5a1662f5d58d5476ab53d22c Author: Martin Nordholts -Date: Thu Feb 18 07:22:40 2010 +0100 +Date: Thu Feb 18 07:22:40 2010 +0100 app/tests: Add regression test for hide/show of dock windows @@ -69611,7 +70451,7 @@ commit 45efd8407938e1f7487b9b372c195aab32a4f90a Author: Martin Nordholts -Date: Thu Feb 18 07:21:20 2010 +0100 +Date: Thu Feb 18 07:21:20 2010 +0100 Bug 608834 - Toolbox and docks move on desktop change @@ -69625,35 +70465,35 @@ commit 838f2d567d24fb3fcdec67247300da0863679894 Author: Michael Natterer -Date: Wed Feb 17 21:39:33 2010 +0100 +Date: Wed Feb 17 21:39:33 2010 +0100 app: cleanup app/tools/gimptexttool-editor.c | 75 ++++++++++++++++++++++------------------- app/tools/gimptexttool-editor.h | 4 ++- - app/tools/gimptexttool.c | 47 +++++++++++++------------- - app/tools/gimptexttool.h | 5 +++ + app/tools/gimptexttool.c | 47 +++++++++++++------------- + app/tools/gimptexttool.h | 5 +++ 4 files changed, 71 insertions(+), 60 deletions(-) commit 8f27ec48c6a0e1e7f6a25b1893561a6b64776348 Author: Michael Natterer -Date: Wed Feb 17 21:23:15 2010 +0100 +Date: Wed Feb 17 21:23:15 2010 +0100 app: split the text editor code out to a separate file - app/tools/Makefile.am | 2 + + app/tools/Makefile.am | 2 + app/tools/gimptexttool-editor.c | 833 ++++++++++++++++++++++++++++++++++++++++ app/tools/gimptexttool-editor.h | 38 ++ - app/tools/gimptexttool.c | 781 + app/tools/gimptexttool.c | 781 +------------------------------------ - app/tools/gimptexttool.h | 5 + + app/tools/gimptexttool.h | 5 + 5 files changed, 889 insertions(+), 770 deletions(-) commit 50ef39a01f6eb85b9d6966eb9d3dfba09cd2db2a Author: Martin Nordholts -Date: Wed Feb 17 20:45:20 2010 +0100 +Date: Wed Feb 17 20:45:20 2010 +0100 app: Make gimpgegltool.c compile @@ -69662,7 +70502,7 @@ commit 31659758d1b8b78b7b8b28df581444732a2b4571 Author: Michael Natterer -Date: Wed Feb 17 20:23:58 2010 +0100 +Date: Wed Feb 17 20:23:58 2010 +0100 app: do the setting of the text box mode properly @@ -69672,15 +70512,15 @@ - make sure we update the rectangle in some more situations. - add utility function gimp_text_tool_frame_item(). - app/tools/gimptextoptions.c | 24 +++++++-- - app/tools/gimptextoptions.h | 2 +- + app/tools/gimptextoptions.c | 24 +++++++-- + app/tools/gimptextoptions.h | 2 +- app/tools/gimptexttool.c | 119 ++++++++++++-------------------------------- 3 files changed, 52 insertions(+), 93 deletions(-) commit 919471c2852575ad4b45d09696f5551a055b6bc2 Author: Michael Natterer -Date: Wed Feb 17 20:20:57 2010 +0100 +Date: Wed Feb 17 20:20:57 2010 +0100 app: register descriptions for the GimpTextBoxMode enum @@ -69690,7 +70530,7 @@ commit d28ed195a3d4207ca9877320acab846a3121167a Author: Michael Natterer -Date: Wed Feb 17 19:18:13 2010 +0100 +Date: Wed Feb 17 19:18:13 2010 +0100 app: make the "Dynamic Text Box" button insensitive by default @@ -69699,7 +70539,7 @@ commit 91bc46f8153cafdcb770af41ec5d84c2e5524b1e Author: Sven Neumann -Date: Wed Feb 17 18:56:08 2010 +0100 +Date: Wed Feb 17 18:56:08 2010 +0100 devel-docs: milestones are also used to track resolved bugs @@ -69708,7 +70548,7 @@ commit dbae9c58a05fff256d847e3a300d76fb7d7a6d35 Author: Sven Neumann -Date: Wed Feb 17 18:41:04 2010 +0100 +Date: Wed Feb 17 18:41:04 2010 +0100 Bug 610282 - GEGL Operation tool's help-id @@ -69720,7 +70560,7 @@ commit 0f275bfdc9702aaea5a649f795220f550861b1b0 Author: Martin Nordholts -Date: Wed Feb 17 19:09:58 2010 +0100 +Date: Wed Feb 17 19:09:58 2010 +0100 plug-ins: Don't initialize va_list to NULL, it's not portable @@ -69729,7 +70569,7 @@ commit 2dc577d606fc11f1f98d8eee6b95d1821a041997 Author: Michael Natterer -Date: Wed Feb 17 16:05:45 2010 +0100 +Date: Wed Feb 17 16:05:45 2010 +0100 app: clean up the text options notify callback @@ -69738,23 +70578,23 @@ commit 8574f4c4e83e576d0221b64f638d3001ed5b968f Author: Michael Natterer -Date: Wed Feb 17 15:50:03 2010 +0100 +Date: Wed Feb 17 15:50:03 2010 +0100 app: allow to set the text layer back to dynamic resizing Add a "Dynamic Text Box" button to the tool options which sets the - text box' mode back to dynamically resizing with the text. This badly + text box' mode back to dynamically resizing with the text. This badly needs UI review but is at least possible now. - app/tools/gimptextoptions.c | 5 +++++ - app/tools/gimptextoptions.h | 1 + + app/tools/gimptextoptions.c | 5 +++++ + app/tools/gimptextoptions.h | 1 + app/tools/gimptexttool.c | 50 ++++++++++++++++++++++++++++++++++++++------- 3 files changed, 49 insertions(+), 7 deletions(-) commit 9974fe36d1bb74d907798ab6a29b0d3cf1ab18ae Author: Michael Natterer -Date: Wed Feb 17 13:17:46 2010 +0100 +Date: Wed Feb 17 13:17:46 2010 +0100 app: improve cursor movement by positions when there is a selection @@ -69767,7 +70607,7 @@ commit 3efd20de77e55f4c3584afe406bfcc47dbda831d Author: Michael Natterer -Date: Wed Feb 17 13:08:53 2010 +0100 +Date: Wed Feb 17 13:08:53 2010 +0100 app: move gimp_text_tool_set_layer() to the public functions @@ -69777,7 +70617,7 @@ commit dd1ec8ff9d5b384fcd660d0010df4b05b39c3e9a Author: Michael Natterer -Date: Wed Feb 17 12:03:18 2010 +0100 +Date: Wed Feb 17 12:03:18 2010 +0100 app: rename editor related functions @@ -69790,7 +70630,7 @@ commit 94d9dca2a3565845462f8355c0909c6729771eef Author: Michael Natterer -Date: Wed Feb 17 11:57:32 2010 +0100 +Date: Wed Feb 17 11:57:32 2010 +0100 app: more text tool fixes @@ -69808,7 +70648,7 @@ commit 1fa6497922b0d20cd06f8b261b211395534d8c65 Author: Michael Natterer -Date: Wed Feb 17 09:52:15 2010 +0100 +Date: Wed Feb 17 09:52:15 2010 +0100 app: don't try to hide a NULL transform dialog @@ -69817,20 +70657,20 @@ commit 5a11453465ebf2b3f6130fb67bf5b5cd189ed3f1 Author: Martin Nordholts -Date: Wed Feb 17 08:33:41 2010 +0100 +Date: Wed Feb 17 08:33:41 2010 +0100 devel-docs: Add bugzilla-milestones.txt Add bugzilla-milestones.txt that explains how we use the milestone feature in our bugtracker. - devel-docs/Makefile.am | 1 + + devel-docs/Makefile.am | 1 + devel-docs/bugzilla-milestones.txt | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) commit 592ac26250a449e915ca3a048340cd5d43009c53 Author: Martin Nordholts -Date: Wed Feb 17 08:08:39 2010 +0100 +Date: Wed Feb 17 08:08:39 2010 +0100 devel-docs: Update 2.8 schedule @@ -69842,7 +70682,7 @@ commit c2a8f51768c6f0e2141c77d99c5c30ad25b49868 Author: Michael Natterer -Date: Tue Feb 16 22:44:38 2010 +0100 +Date: Tue Feb 16 22:44:38 2010 +0100 app: lots of text tool fixes @@ -69863,7 +70703,7 @@ commit 66a13cd0d190c47c3b8eb9ef3e465b959d66e9db Author: Martin Nordholts -Date: Tue Feb 16 22:28:38 2010 +0100 +Date: Tue Feb 16 22:28:38 2010 +0100 Bug 608178 - view->show rules shortcut broken, duplicate keybinding @@ -69876,7 +70716,7 @@ commit 88e2b1aab32dc61fa91c75a15119d6d41065dcdc Author: Michael Natterer -Date: Tue Feb 16 20:05:44 2010 +0100 +Date: Tue Feb 16 20:05:44 2010 +0100 app: add a focus rectangle to GimpCurveView @@ -69885,7 +70725,7 @@ commit ac1baa5374b92423d618dbba46dd97addf9a7fd7 Author: Martin Nordholts -Date: Tue Feb 16 08:45:57 2010 +0100 +Date: Tue Feb 16 08:45:57 2010 +0100 plug-ins: Change MNG capability from LAYERS_AS_ANIMATION to LAYERS @@ -69905,7 +70745,7 @@ commit 7cdd99feacbcc2189eabc13d9e5fdc82a51d418d Author: Martin Nordholts -Date: Mon Feb 15 22:47:19 2010 +0100 +Date: Mon Feb 15 22:47:19 2010 +0100 Bug 596427 - Can't export to animated GIF @@ -69924,7 +70764,7 @@ commit d9862b21c1c3230cbdade3d437ebc0cfd7f9baa6 Author: Martin Nordholts -Date: Sat Feb 13 13:26:46 2010 +0100 +Date: Sat Feb 13 13:26:46 2010 +0100 plug-ins: Move save_image() code out of options fetching code for GIF @@ -69936,35 +70776,35 @@ commit c3b2e0e5646a6fe89e34734f1ed5831a8729e1d4 Author: Martin Nordholts -Date: Sat Feb 13 12:25:29 2010 +0100 +Date: Sat Feb 13 12:25:29 2010 +0100 devel-docs: Add gtkbuilder-porting-guide.txt Add guide giving a suggested workflow when porting C UI code to GtkBuilder UI declaration files. - devel-docs/Makefile.am | 41 ++++----- + devel-docs/Makefile.am | 41 ++++----- devel-docs/gtkbuilder-porting-guide.txt | 150 ++++++++++++++++++++++++++++++++ 2 files changed, 171 insertions(+), 20 deletions(-) commit 5c154c17dc6b1d69dd1a4a4e868ec71b17fa1ad9 Author: Martin Nordholts -Date: Sat Feb 13 12:23:39 2010 +0100 +Date: Sat Feb 13 12:23:39 2010 +0100 plug-ins: Port file-gif-save.c to Glade + GtkBuilder plug-ins/common/file-gif-save.c | 299 ++++++++++++++++++++-------------------- - plug-ins/ui/Makefile.am | 1 + + plug-ins/ui/Makefile.am | 1 + plug-ins/ui/plug-in-file-gif.ui | 289 ++++++++++++++++++++++++++++++++++++++ - po-plug-ins/POTFILES.in | 1 + + po-plug-ins/POTFILES.in | 1 + 4 files changed, 437 insertions(+), 153 deletions(-) commit 84b8ec1f5c0f4d0751e9c0d5c876cb808bcee456 Author: Martin Nordholts -Date: Wed Jan 6 18:51:22 2010 +0100 +Date: Wed Jan 6 18:51:22 2010 +0100 plug-ins: Minor readability improvement in GIF's save_dialog() @@ -69975,26 +70815,26 @@ commit fdde593fc51121e18a12ee65c703b90ca2b12f7e Author: Michael Natterer -Date: Tue Feb 16 19:58:51 2010 +0100 +Date: Tue Feb 16 19:58:51 2010 +0100 app: enable copy and paste for curves Add GimpCurve support to the clipboard and handle ctrl-x, ctrl-c and ctrl-v in GimpCurveView. - app/widgets/gimpclipboard.c | 210 ++++++++++++++++++++++++++ - app/widgets/gimpclipboard.h | 4 + - app/widgets/gimpcurveview.c | 298 + app/widgets/gimpclipboard.c | 210 ++++++++++++++++++++++++++ + app/widgets/gimpclipboard.h | 4 + + app/widgets/gimpcurveview.c | 298 +++++++++++++++++++++++++++---------- - app/widgets/gimpcurveview.h | 6 + - app/widgets/gimpdeviceinfoeditor.c | 1 + + app/widgets/gimpcurveview.h | 6 + + app/widgets/gimpdeviceinfoeditor.c | 1 + app/widgets/gimpselectiondata.c | 55 +++++++ - app/widgets/gimpselectiondata.h | 7 + + app/widgets/gimpselectiondata.h | 7 + 7 files changed, 501 insertions(+), 80 deletions(-) commit 592fce0f7bb27828157dd4887e221e6600d440f9 Author: Michael Natterer -Date: Tue Feb 16 19:58:06 2010 +0100 +Date: Tue Feb 16 19:58:06 2010 +0100 app: properly implement GimpData::duplicate() @@ -70003,7 +70843,7 @@ commit 7a1b77fb074ac6b9a3ffbee85d74c2953c358243 Author: Michael Natterer -Date: Tue Feb 16 19:29:37 2010 +0100 +Date: Tue Feb 16 19:29:37 2010 +0100 app: gimp_device_info_map_axis(): "value" is a double, not a boolean @@ -70013,20 +70853,20 @@ commit 2a92f5757774a270297ffcc341532296b89eb516 Author: Michael Natterer -Date: Tue Feb 16 13:27:46 2010 +0100 +Date: Tue Feb 16 13:27:46 2010 +0100 app: actually use the device's pressure curve to map the pressure axis unfortunately i have no way of testing this, so please test... app/widgets/gimpdeviceinfo-coords.c | 15 +++++++++------ - app/widgets/gimpdeviceinfo.c | 18 ++++++++++++++++++ - app/widgets/gimpdeviceinfo.h | 3 +++ + app/widgets/gimpdeviceinfo.c | 18 ++++++++++++++++++ + app/widgets/gimpdeviceinfo.h | 3 +++ 3 files changed, 30 insertions(+), 6 deletions(-) commit 828e4d8452cda0e7ec71d0d8c8b42a74f085c238 Author: Michael Natterer -Date: Tue Feb 16 13:05:17 2010 +0100 +Date: Tue Feb 16 13:05:17 2010 +0100 app: some formatting before real changes happen @@ -70035,7 +70875,7 @@ commit 5af05cce0b2b48b8db5274850bad400a37614ff8 Author: Michael Natterer -Date: Tue Feb 16 13:00:46 2010 +0100 +Date: Tue Feb 16 13:00:46 2010 +0100 app: move the entire get-coords API from GimpDisplayShell to GimpDeviceInfo @@ -70045,21 +70885,21 @@ app/display/gimpdisplayshell-autoscroll.c | 12 +- app/display/gimpdisplayshell-callbacks.c | 56 +++++---- - app/display/gimpdisplayshell-coords.c | 135 ---------------------- - app/display/gimpdisplayshell-coords.h | 18 --- - app/widgets/Makefile.am | 2 + - app/widgets/gimpdeviceinfo-coords.c | 186 + app/display/gimpdisplayshell-coords.c | 135 ---------------------- + app/display/gimpdisplayshell-coords.h | 18 --- + app/widgets/Makefile.am | 2 + + app/widgets/gimpdeviceinfo-coords.c | 186 ++++++++++++++++++++++++++++++ - app/widgets/gimpdeviceinfo-coords.h | 43 +++++++ - app/widgets/gimpdevices.c | 58 +++++----- - app/widgets/gimpdevices.h | 28 ++--- - app/widgets/gimpdevicestatus.c | 5 +- - app/widgets/gimpdevicestatus.h | 14 +-- + app/widgets/gimpdeviceinfo-coords.h | 43 +++++++ + app/widgets/gimpdevices.c | 58 +++++----- + app/widgets/gimpdevices.h | 28 ++--- + app/widgets/gimpdevicestatus.c | 5 +- + app/widgets/gimpdevicestatus.h | 14 +-- 11 files changed, 324 insertions(+), 233 deletions(-) commit 6932a6d0114f357ad0740e804b16b2a82d552803 Author: Michael Natterer -Date: Tue Feb 16 12:11:22 2010 +0100 +Date: Tue Feb 16 12:11:22 2010 +0100 app: add gimp_device_info_has_cursor() as replacement for GdkDevice.has_cursor @@ -70070,7 +70910,7 @@ commit fb65cc197d93df6d11a68f2dff44312d850aa5d2 Author: Jakub Steiner -Date: Tue Feb 16 11:14:03 2010 +0100 +Date: Tue Feb 16 11:14:03 2010 +0100 Get rid of a backslash I forgot. @@ -70079,18 +70919,18 @@ commit 0579cb949be212e540a345e79f4c4b503206d5fa Author: Jakub Steiner -Date: Tue Feb 16 11:00:03 2010 +0100 +Date: Tue Feb 16 11:00:03 2010 +0100 infinite ability to forget to add stuff. desktop/256x256/gimp.png | Bin 0 -> 33688 bytes - desktop/src/gimp.svg | 3297 + desktop/src/gimp.svg | 3297 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 3297 insertions(+) commit a10b8421d92ec4c369f4aabe1af50a4a4ebdcedf Author: Michael Natterer -Date: Tue Feb 16 10:53:52 2010 +0100 +Date: Tue Feb 16 10:53:52 2010 +0100 app: select the first axis so the shown curve makes sense @@ -70099,7 +70939,7 @@ commit 7f2a0b2bd7d891c663368934cb8590a4630d9656 Author: Jakub Steiner -Date: Tue Feb 16 10:53:40 2010 +0100 +Date: Tue Feb 16 10:53:40 2010 +0100 update launcher icon. Replace the scalable with a high resolution bitmap (256x256px). Source SVG includes all sizes. @@ -70109,25 +70949,25 @@ desktop/24x24/gimp.png | Bin 1017 -> 1419 bytes desktop/32x32/gimp.png | Bin 1717 -> 1941 bytes desktop/48x48/gimp.png | Bin 2885 -> 3376 bytes - desktop/Makefile.am | 11 +- + desktop/Makefile.am | 11 +- desktop/scalable/gimp.svg | 384 ---------------------------------------------- 7 files changed, 4 insertions(+), 391 deletions(-) commit 1e26dbc22d1bd691bbdfed6da6f8e696d62cf5d7 Author: Michael Natterer -Date: Mon Feb 15 23:08:30 2010 +0100 +Date: Mon Feb 15 23:08:30 2010 +0100 app: add views for the axes' curves app/widgets/gimpdeviceinfoeditor.c | 193 +++++++++++++++++++++++++++++++++---- - app/widgets/gimpdeviceinfoeditor.h | 4 +- + app/widgets/gimpdeviceinfoeditor.h | 4 +- 2 files changed, 175 insertions(+), 22 deletions(-) commit 2da0529ef4727fd7bf9dfa0683fc28f649a27505 Author: Michael Natterer -Date: Mon Feb 15 23:06:19 2010 +0100 +Date: Mon Feb 15 23:06:19 2010 +0100 app: add a pressure curve @@ -70139,7 +70979,7 @@ commit 3ff4a910a9d78f49664e8a0f5628ceb2736ddbeb Author: Michael Natterer -Date: Mon Feb 15 20:00:26 2010 +0100 +Date: Mon Feb 15 20:00:26 2010 +0100 app: implement device removal in gimp_devices_device_removed() @@ -70148,7 +70988,7 @@ commit 0ce37c500e90c025474599f84ee40df20189a435 Author: Michael Natterer -Date: Mon Feb 15 19:58:02 2010 +0100 +Date: Mon Feb 15 19:58:02 2010 +0100 app: allow unplugging devices in GimpDeviceInfo @@ -70161,7 +71001,7 @@ commit a023665a5d73a02cfeb842fdb9b660777eb71e6e Author: Michael Natterer -Date: Mon Feb 15 19:27:19 2010 +0100 +Date: Mon Feb 15 19:27:19 2010 +0100 app: if there is no histogram set in the parent class, draw BG and borders here @@ -70171,7 +71011,7 @@ commit 00b1835f9e09171d45103fdaa768eda05bf1dde0 Author: Michael Natterer -Date: Mon Feb 15 18:24:19 2010 +0100 +Date: Mon Feb 15 18:24:19 2010 +0100 app: remove unused private member @@ -70180,7 +71020,7 @@ commit 240dae660d1f0f137c9d64b709e02f67365a3b8c Author: Michael Natterer -Date: Mon Feb 15 16:48:21 2010 +0100 +Date: Mon Feb 15 16:48:21 2010 +0100 app : keep the axis mapping in a treeview @@ -70193,7 +71033,7 @@ commit f115a0bdfe2b9180b3437bcfb6e586333074250f Author: Michael Natterer -Date: Mon Feb 15 13:12:26 2010 +0100 +Date: Mon Feb 15 13:12:26 2010 +0100 app: add GimpFrames for axes and keys and remove useless treeview headers @@ -70203,7 +71043,7 @@ commit 55c8c86e49f284f7636bcbb0abc33da70ef0cb5e Author: Michael Natterer -Date: Mon Feb 15 13:11:58 2010 +0100 +Date: Mon Feb 15 13:11:58 2010 +0100 app: oops, need to disconnect from the device list signals in dispose() @@ -70213,7 +71053,7 @@ commit 179ddd8a4938709b1b8b2c8d386d70c72cd1314e Author: Michael Natterer -Date: Mon Feb 15 12:59:29 2010 +0100 +Date: Mon Feb 15 12:59:29 2010 +0100 app: add a button to remove unplugged devices from the list @@ -70224,7 +71064,7 @@ commit f0d4cf68c0e82941ab840b70e2a969cd4fbc3563 Author: Michael Natterer -Date: Mon Feb 15 00:47:15 2010 +0100 +Date: Mon Feb 15 00:47:15 2010 +0100 app: grey out the names of unplugged devices @@ -70234,7 +71074,7 @@ commit 3a0557afe8b725fcc643f1531c4610a417afb979 Author: Michael Natterer -Date: Sun Feb 14 22:39:40 2010 +0100 +Date: Sun Feb 14 22:39:40 2010 +0100 app: add a boolean model column which sets the sensitivity of the text renderer @@ -70248,7 +71088,7 @@ commit 3facba67d4b995aefe4241b242f39f35ec0085d0 Author: Michael Natterer -Date: Sun Feb 14 22:08:32 2010 +0100 +Date: Sun Feb 14 22:08:32 2010 +0100 app: sort plugged devices to the start of the list @@ -70261,7 +71101,7 @@ commit 12aa801441226c7f8f1fa87416f22552b3eec292 Author: Michael Natterer -Date: Sun Feb 14 20:26:16 2010 +0100 +Date: Sun Feb 14 20:26:16 2010 +0100 app: protect against calling a subclass' GimpItem::get_node() impl directly @@ -70274,12 +71114,12 @@ app/core/gimpchannel.c | 6 ++++++ app/core/gimpdrawable.c | 4 +++- - app/core/gimplayer.c | 2 ++ + app/core/gimplayer.c | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) commit 5f46061830258d929901acfe257709cbc37986de Author: Michael Natterer -Date: Sun Feb 14 13:55:45 2010 +0100 +Date: Sun Feb 14 13:55:45 2010 +0100 app: add gimp_item_peek_node() and use it @@ -70288,24 +71128,24 @@ exist. app/core/gimpdrawable.c | 9 ++++++--- - app/core/gimpitem.c | 8 ++++++++ - app/core/gimpitem.h | 1 + + app/core/gimpitem.c | 8 ++++++++ + app/core/gimpitem.h | 1 + 3 files changed, 15 insertions(+), 3 deletions(-) commit 44d969c1463bd7473807347847ba4e3ab88a0376 Author: Martin Nordholts -Date: Sat Feb 13 21:54:48 2010 +0100 +Date: Sat Feb 13 21:54:48 2010 +0100 Update NEWS and AUTHORS for 2.7.1 with changes up until now - AUTHORS | 2 ++ - NEWS | 16 ++++++++++++++-- - authors.xml | 2 ++ + AUTHORS | 2 ++ + NEWS | 16 ++++++++++++++-- + authors.xml | 2 ++ 3 files changed, 18 insertions(+), 2 deletions(-) commit 32b7b79c33fc9deb11af10da77d0d2a7c412f345 Author: Kevin Cozens -Date: Sat Feb 13 15:05:02 2010 -0500 +Date: Sat Feb 13 15:05:02 2010 -0500 Fixed scheme struct strbuff[] size to handle long strings in register blocks @@ -70315,7 +71155,7 @@ commit 33d66f5c7e97b5ae6622aa53930a1cffbedc79d5 Author: Martin Nordholts -Date: Sat Feb 13 20:05:41 2010 +0100 +Date: Sat Feb 13 20:05:41 2010 +0100 app/tests: Add regression test for Recently Closed Docks @@ -70327,7 +71167,7 @@ commit 509310912203d4529de8b4e93b5aba1f56c1113e Author: Martin Nordholts -Date: Sat Feb 13 18:51:29 2010 +0100 +Date: Sat Feb 13 18:51:29 2010 +0100 app: Fix gimp_ui_get_ui_manager() to allow arbitrary test exec order @@ -70342,7 +71182,7 @@ commit 9bf0d80c9cdaae71c9b385387369039ebc284144 Author: Martin Nordholts -Date: Sat Feb 13 18:37:51 2010 +0100 +Date: Sat Feb 13 18:37:51 2010 +0100 app: Make Windows → Recently Closed Docks work again @@ -70354,7 +71194,7 @@ commit 1046e30724985c620631effff35d5b12d3d75e17 Author: Michael Natterer -Date: Sat Feb 13 18:20:32 2010 +0100 +Date: Sat Feb 13 18:20:32 2010 +0100 app: add a little bling (a header that looks like the selected item) @@ -70364,7 +71204,7 @@ commit 1083313f488f82c0c0c623a00d86829cbd2cbfde Author: Michael Natterer -Date: Sat Feb 13 17:39:41 2010 +0100 +Date: Sat Feb 13 17:39:41 2010 +0100 app: don't warn when selecting a NULL device (when closing the dialog) @@ -70373,18 +71213,18 @@ commit 9617f42d13ccb11f326116398cf2d1891a6882c8 Author: Michael Natterer -Date: Sat Feb 13 17:31:33 2010 +0100 +Date: Sat Feb 13 17:31:33 2010 +0100 app: add and use gimp_device_info_get_device() - app/widgets/gimpdeviceinfo.c | 12 ++++++++++++ - app/widgets/gimpdeviceinfo.h | 2 ++ + app/widgets/gimpdeviceinfo.c | 12 ++++++++++++ + app/widgets/gimpdeviceinfo.h | 2 ++ app/widgets/gimpdevicestatus.c | 12 ++++++++---- 3 files changed, 22 insertions(+), 4 deletions(-) commit 7e94bb3ef20b85ec67183953521ab997643c7ec7 Author: Martin Nordholts -Date: Sat Feb 13 17:16:53 2010 +0100 +Date: Sat Feb 13 17:16:53 2010 +0100 app: Avoid crash when using Windows -> Recently Closed Docks @@ -70396,7 +71236,7 @@ commit fe58e525b873a52b600c886d59d48cb20d740f60 Author: Michael Natterer -Date: Sat Feb 13 16:24:01 2010 +0100 +Date: Sat Feb 13 16:24:01 2010 +0100 app: s/device_info/info/ in local variable names @@ -70406,7 +71246,7 @@ commit 1cc77abdf9dfe8e9ecd6b3d7f292915935268d50 Author: Michael Natterer -Date: Sat Feb 13 16:21:26 2010 +0100 +Date: Sat Feb 13 16:21:26 2010 +0100 app: try to guess a reasonable icon for devices @@ -70416,7 +71256,7 @@ commit 472597bba090c4c7f04ac7139dd39dee4e9ab0c3 Author: Michael Natterer -Date: Sat Feb 13 15:54:55 2010 +0100 +Date: Sat Feb 13 15:54:55 2010 +0100 app: use a treeview for selecting which device to edit @@ -70431,7 +71271,7 @@ commit f1a9908191125152732aecb47d063b80ce190fe5 Author: Michael Natterer -Date: Sat Feb 13 15:46:34 2010 +0100 +Date: Sat Feb 13 15:46:34 2010 +0100 app: add a USER_DATA column to GimpContainerTreeView's model @@ -70443,7 +71283,7 @@ commit f9cb5fbc10e17f0e34fb05db62848c09d916c251 Author: Michael Natterer -Date: Sat Feb 13 15:04:32 2010 +0100 +Date: Sat Feb 13 15:04:32 2010 +0100 app: derive GimpContext from GimpViewable instead of GimpObject @@ -70457,7 +71297,7 @@ commit 56fabf760e02a76c8a46bbf50fdba6d8c53d544d Author: Michael Natterer -Date: Fri Feb 12 23:36:38 2010 +0100 +Date: Fri Feb 12 23:36:38 2010 +0100 app: add "gimp" property needed for next step @@ -70469,7 +71309,7 @@ commit fdd0b6d64d627df8346cb987b7a85eed2201c170 Author: Michael Natterer -Date: Fri Feb 12 21:57:58 2010 +0100 +Date: Fri Feb 12 21:57:58 2010 +0100 app: make the accel renderer editable @@ -70478,7 +71318,7 @@ commit cc21fd8a54b272003c8daeae277b8e7408b8ad9f Author: Alexia Death -Date: Fri Feb 12 22:55:20 2010 +0200 +Date: Fri Feb 12 22:55:20 2010 +0200 app: add missing parameter @@ -70487,7 +71327,7 @@ commit 327b2426509cf610fd241a237a47ad8772a131e6 Author: Michael Natterer -Date: Fri Feb 12 21:39:38 2010 +0100 +Date: Fri Feb 12 21:39:38 2010 +0100 widgets: fix copy & paste error so it actually changes the device's keys now @@ -70497,7 +71337,7 @@ commit 8c1b5de6378970f4fda7470598f5cc5a149adfff Author: Michael Natterer -Date: Fri Feb 12 21:35:39 2010 +0100 +Date: Fri Feb 12 21:35:39 2010 +0100 widgets: use a treeview for the device's keys @@ -70507,7 +71347,7 @@ commit 20e4936d3e96d44ca7e8350b2c525d16f73cc5e5 Author: Michael Natterer -Date: Fri Feb 12 17:10:54 2010 +0100 +Date: Fri Feb 12 17:10:54 2010 +0100 app: make device management more dynamic in preparation of XI2 @@ -70526,7 +71366,7 @@ commit c6bbeda4440b72e2914496b03c74e45674c11024 Author: Michael Natterer -Date: Fri Feb 12 15:46:07 2010 +0100 +Date: Fri Feb 12 15:46:07 2010 +0100 app: get rid of GtkInputDialog, also brings us closer to XI2 @@ -70542,20 +71382,20 @@ to use the new stuff. app/dialogs/preferences-dialog.c | 69 +++--- - app/widgets/Makefile.am | 4 + + app/widgets/Makefile.am | 4 + app/widgets/gimpdeviceeditor.c | 129 ++++++++++ app/widgets/gimpdeviceeditor.h | 48 ++++ - app/widgets/gimpdeviceinfo.c | 228 +++++++++++++----- - app/widgets/gimpdeviceinfo.h | 36 ++- + app/widgets/gimpdeviceinfo.c | 228 +++++++++++++----- + app/widgets/gimpdeviceinfo.h | 36 ++- app/widgets/gimpdeviceinfoeditor.c | 469 +++++++++++++++++++++++++++++++++++++ app/widgets/gimpdeviceinfoeditor.h | 51 ++++ - app/widgets/widgets-types.h | 2 + + app/widgets/widgets-types.h | 2 + 9 files changed, 944 insertions(+), 92 deletions(-) commit 77498d15875ba242cc720586e5a99e71521da328 Author: Kevin Cozens -Date: Thu Feb 11 12:02:57 2010 -0500 +Date: Thu Feb 11 12:02:57 2010 -0500 Bug 605540 - texts displayed with gimp-message are not translated @@ -70566,7 +71406,7 @@ commit 56ec0c87740279d53a5f3467ffba290d7aab6ea7 Author: Michael Natterer -Date: Thu Feb 11 19:55:20 2010 +0100 +Date: Thu Feb 11 19:55:20 2010 +0100 display: reserve more space for the cursor label so negative coords fit @@ -70576,7 +71416,7 @@ commit 3cd4f0de4592c89f1c8ebc5ed63bd4450dbc530c Author: Michael Natterer -Date: Thu Feb 11 19:49:33 2010 +0100 +Date: Thu Feb 11 19:49:33 2010 +0100 display: don't use statusbar->hbox for size calculations, use the hbox instead @@ -70586,7 +71426,7 @@ commit 0953e7fbf2743a6b07c2daaa6f4cb2536c97d5a1 Author: Alexandre Prokoudine -Date: Thu Feb 11 21:28:00 2010 +0300 +Date: Thu Feb 11 21:28:00 2010 +0300 Fixes to Russian translation @@ -70595,7 +71435,7 @@ commit f2f83109ec26dc85c9b68f9d1c205c60383954f5 Author: Michael Natterer -Date: Thu Feb 11 19:24:08 2010 +0100 +Date: Thu Feb 11 19:24:08 2010 +0100 display: redo the code that does evil things to the statusbar's widgets @@ -70609,7 +71449,7 @@ commit ba5e6d4ca2f31b613580772ab7ba39ed1f9d5cc6 Author: Michael Natterer -Date: Thu Feb 11 13:02:30 2010 +0100 +Date: Thu Feb 11 13:02:30 2010 +0100 widgets: use accessors instead of sealed GTK+ members @@ -70619,7 +71459,7 @@ commit 7d54c72cfe99b9ee1c9887f9ec277b5c2b66808c Author: Michael Natterer -Date: Thu Feb 11 10:34:48 2010 +0100 +Date: Thu Feb 11 10:34:48 2010 +0100 widgets: use gtk_widget_get_parent(menu) instead of menu->toplevel @@ -70631,7 +71471,7 @@ commit 8a3d32a061d9887722e72ddf1dac1026c54884ba Author: Alexandre Prokoudine -Date: Thu Feb 11 03:27:33 2010 +0300 +Date: Thu Feb 11 03:27:33 2010 +0300 Updated Russian translation @@ -70641,7 +71481,7 @@ commit 9a4bf10d30d3ace506caa2196e8f56b369bfab86 Author: Michael Natterer -Date: Wed Feb 10 19:37:46 2010 +0100 +Date: Wed Feb 10 19:37:46 2010 +0100 Bug 609026 - leaks shared memory @@ -70656,21 +71496,21 @@ commit 74c01d7a10f323a650d2bbd36b3e39b2d17fa278 Author: Michael Natterer -Date: Wed Feb 10 19:24:40 2010 +0100 +Date: Wed Feb 10 19:24:40 2010 +0100 app: add log output when attaching/detaching shared memory Also put the call to shmdt() out of the IPC_RMID_DEFERRED_RELEASE ifdef. - app/gimp-log.c | 3 ++- - app/gimp-log.h | 4 +++- + app/gimp-log.c | 3 ++- + app/gimp-log.h | 4 +++- app/plug-in/gimppluginshm.c | 14 ++++++++++---- 3 files changed, 15 insertions(+), 6 deletions(-) commit 034bd0427f17a8a8f594f6901e837a13fc231331 Author: Michael Natterer -Date: Wed Feb 10 12:51:46 2010 +0100 +Date: Wed Feb 10 12:51:46 2010 +0100 Bug 609056 - Exporting to Alias PIX format fails @@ -70682,7 +71522,7 @@ commit c4562c5a93376f591945e1aa355d36581d593526 Author: Michael Natterer -Date: Wed Feb 10 12:42:30 2010 +0100 +Date: Wed Feb 10 12:42:30 2010 +0100 core: use g_param_spec_boxed() for tile managers, not g_param_spec_pointer() @@ -70692,7 +71532,7 @@ commit 68ee4a5d6c594afe676b0a8a46159046157f85aa Author: Michael Natterer -Date: Wed Feb 10 12:33:30 2010 +0100 +Date: Wed Feb 10 12:33:30 2010 +0100 base: add a proper version of the code that tracked down the tile manager leak @@ -70703,14 +71543,14 @@ swap complaining about not being empty, because there is absolutely nothing wrong with swap and cache when we simply leaked tile managers. - app/base/base.c | 5 +++++ + app/base/base.c | 5 +++++ app/base/tile-manager.c | 34 +++++++++++++++++++++++++++++++++- app/base/tile-manager.h | 3 +++ 3 files changed, 41 insertions(+), 1 deletion(-) commit 7bfa3272abaa2316c3567859f3f6e299c7e153e3 Author: Simon Budig -Date: Tue Feb 9 23:21:42 2010 +0100 +Date: Tue Feb 9 23:21:42 2010 +0100 Give a hint what pressing shift over a vector handle does. @@ -70719,7 +71559,7 @@ commit fe97de2a68c0d2ac3b6f86d0f6650ca5d9232ba3 Author: Michael Natterer -Date: Tue Feb 9 22:42:20 2010 +0100 +Date: Tue Feb 9 22:42:20 2010 +0100 modules: forgot to port this one to GSEAL_ENABLE @@ -70728,7 +71568,7 @@ commit 8afdbd805303045d82e4965eb8a758a223dc140a Author: Michael Natterer -Date: Tue Feb 9 17:47:08 2010 +0100 +Date: Tue Feb 9 17:47:08 2010 +0100 Let gimp_item_tree_get_insert_pos() return a boolean indicating success @@ -70736,7 +71576,7 @@ and move more precondition checks there. Remove lots and lots of checks from all its callers and simply bail out if it returns FALSE. - app/core/gimpimage.c | 106 + app/core/gimpimage.c | 106 +++++++++++++----------------------------------- app/core/gimpitemtree.c | 61 ++++++++++++++++------------ app/core/gimpitemtree.h | 71 ++++++++++++++++---------------- @@ -70744,7 +71584,7 @@ commit e83954c49a95721eac9dd9b6ada7b98024986e4d Author: Michael Natterer -Date: Tue Feb 9 00:33:41 2010 +0100 +Date: Tue Feb 9 00:33:41 2010 +0100 Add more precondition checks to gimp_item_tree_get_insert_pos() @@ -70753,7 +71593,7 @@ commit 37d10415df95901495b3c3bc354056a5fd690629 Author: Michael Natterer -Date: Tue Feb 9 00:25:10 2010 +0100 +Date: Tue Feb 9 00:25:10 2010 +0100 Make sure all items of a subtree get added to / removed from the name hash @@ -70766,7 +71606,7 @@ commit 6e49a0fa5dedcf6522b88a21cae1c3e219760e5e Author: Michael Natterer -Date: Mon Feb 8 15:19:03 2010 +0100 +Date: Mon Feb 8 15:19:03 2010 +0100 Move gimp_edit_paste_as_new() to gimp_image_new_from_buffer() @@ -70774,21 +71614,21 @@ from the implementation point of view. app/actions/buffers-commands.c | 13 ++++------ - app/actions/edit-commands.c | 12 ++++----- - app/core/gimp-edit.c | 59 + app/actions/edit-commands.c | 12 ++++----- + app/core/gimp-edit.c | 59 ------------------------------------------ - app/core/gimp-edit.h | 3 --- - app/core/gimpimage-new.c | 56 + app/core/gimp-edit.h | 3 --- + app/core/gimpimage-new.c | 56 +++++++++++++++++++++++++++++++++++++++ - app/core/gimpimage-new.h | 3 +++ - app/pdb/edit-cmds.c | 5 ++-- - app/widgets/gimptoolbox-dnd.c | 12 +++------ - tools/pdbgen/pdb/edit.pdb | 5 ++-- + app/core/gimpimage-new.h | 3 +++ + app/pdb/edit-cmds.c | 5 ++-- + app/widgets/gimptoolbox-dnd.c | 12 +++------ + tools/pdbgen/pdb/edit.pdb | 5 ++-- 9 files changed, 79 insertions(+), 89 deletions(-) commit 903604113f9fd7ccdde54849264879df7ea6ca3b Author: Michael Natterer -Date: Mon Feb 8 14:47:45 2010 +0100 +Date: Mon Feb 8 14:47:45 2010 +0100 Add utility function to create images to gimpimage-new.[ch] @@ -70796,33 +71636,33 @@ and remove that duplicated code from gimptoolbox-dnd.c and gimpdisplayshell-dnd.c - app/core/gimpimage-new.c | 157 + app/core/gimpimage-new.c | 157 +++++++++++++++++++++++++++++++++++++ - app/core/gimpimage-new.h | 17 +++- + app/core/gimpimage-new.h | 17 +++- app/display/gimpdisplayshell-dnd.c | 72 ++++------------- - app/widgets/gimptoolbox-dnd.c | 131 +++---------------------------- + app/widgets/gimptoolbox-dnd.c | 131 +++---------------------------- 4 files changed, 197 insertions(+), 180 deletions(-) commit 9a561646c2af795df1ce55b738879d834d0492ce Author: Michael Natterer -Date: Mon Feb 8 11:11:33 2010 +0100 +Date: Mon Feb 8 11:11:33 2010 +0100 Move the undo disable/freeze APIs to gimpimage-undo.[ch] app/core/gimpimage-duplicate.c | 1 + - app/core/gimpimage-undo.c | 63 +++++++++++++++++++++++++++++++++++++ - app/core/gimpimage-undo.h | 6 ++++ - app/core/gimpimage.c | 70 + app/core/gimpimage-undo.c | 63 +++++++++++++++++++++++++++++++++++++ + app/core/gimpimage-undo.h | 6 ++++ + app/core/gimpimage.c | 70 ++---------------------------------------- - app/core/gimpimage.h | 13 +++----- - app/core/gimptemplate.c | 1 + - app/widgets/gimptoolbox-dnd.c | 1 + - app/xcf/xcf-load.c | 1 + + app/core/gimpimage.h | 13 +++----- + app/core/gimptemplate.c | 1 + + app/widgets/gimptoolbox-dnd.c | 1 + + app/xcf/xcf-load.c | 1 + 8 files changed, 80 insertions(+), 76 deletions(-) commit 052dcd016400563d3a281df832899f27fc9e9051 Author: Michael Natterer -Date: Mon Feb 8 10:39:44 2010 +0100 +Date: Mon Feb 8 10:39:44 2010 +0100 Update the layer stack in gimp_image_active_layer_notify() @@ -70833,7 +71673,7 @@ commit 7413ec9f3122d52a48329fe296fa637d7af09821 Author: Michael Natterer -Date: Mon Feb 8 01:14:22 2010 +0100 +Date: Mon Feb 8 01:14:22 2010 +0100 Argh, when removing items, also remove them from the name hash @@ -70842,7 +71682,7 @@ commit 11ca58ccf24a132dd38d5070e9320c107275984c Author: Michael Natterer -Date: Mon Feb 8 01:11:30 2010 +0100 +Date: Mon Feb 8 01:11:30 2010 +0100 Use G_TYPE_CHECK_INSTANCE_TYPE() instead of GIMP_IS_ITEM() @@ -70853,7 +71693,7 @@ commit 7bb64cd86489a1035b36d98b2dd88b6f97a7f435 Author: Michael Natterer -Date: Mon Feb 8 01:10:21 2010 +0100 +Date: Mon Feb 8 01:10:21 2010 +0100 Nuke two more local variables that make no sense any longer @@ -70862,7 +71702,7 @@ commit 430588ac38b060c24cfb2858154c5a2af411ec90 Author: Michael Natterer -Date: Mon Feb 8 00:47:57 2010 +0100 +Date: Mon Feb 8 00:47:57 2010 +0100 Make sure we don't try to reorder items into their children @@ -70871,7 +71711,7 @@ commit 52eaf96a6c4b7ca36da50df07604535fc282a9a9 Author: Michael Natterer -Date: Mon Feb 8 00:28:47 2010 +0100 +Date: Mon Feb 8 00:28:47 2010 +0100 Some of the stupidity from the previous commit was copied from here @@ -70881,7 +71721,7 @@ commit 2cb6669d0122e023f048d747a08c3a9593b495c2 Author: Michael Natterer -Date: Sun Feb 7 23:56:40 2010 +0100 +Date: Sun Feb 7 23:56:40 2010 +0100 Fix a lot of stupidity in gimp_item_tree_uniquefy_name() @@ -70896,7 +71736,7 @@ commit 6b1872359dab912d1bb7007ff8cc9ccdfff1a3df Author: Michael Natterer -Date: Sun Feb 7 23:36:57 2010 +0100 +Date: Sun Feb 7 23:36:57 2010 +0100 Get rid of one more local variable in gimp_image_add_layer() @@ -70905,7 +71745,7 @@ commit b83e82514b526cb57c72d57355d5056d1f99e408 Author: Michael Natterer -Date: Sun Feb 7 23:35:22 2010 +0100 +Date: Sun Feb 7 23:35:22 2010 +0100 Use G_TYPE_CHECK_INSTANCE_TYPE() instead of GIMP_IS_ITEM() @@ -70917,7 +71757,7 @@ commit 1e84abc3966354a0c81e35fcd4fb78bc450fa71b Author: Michael Natterer -Date: Sun Feb 7 19:57:46 2010 +0100 +Date: Sun Feb 7 19:57:46 2010 +0100 Connect to "notify::active-item" of the item trees @@ -70930,7 +71770,7 @@ commit b7d1be96e09b3d1c0d7daffb0d2104718d264c2d Author: Michael Natterer -Date: Sun Feb 7 19:39:48 2010 +0100 +Date: Sun Feb 7 19:39:48 2010 +0100 Get rid of the "New" in "New Layer", "New Channel" etc. @@ -70940,7 +71780,7 @@ will be used. app/actions/channels-commands.c | 6 +++--- - app/actions/layers-commands.c | 5 +++-- + app/actions/layers-commands.c | 5 +++-- app/actions/vectors-commands.c | 5 ++--- app/widgets/gimpchanneltreeview.c | 2 +- app/widgets/gimplayertreeview.c | 2 +- @@ -70949,7 +71789,7 @@ commit 3514271fdea33b06406299c251104b18392177a2 Author: Michael Natterer -Date: Sun Feb 7 19:22:02 2010 +0100 +Date: Sun Feb 7 19:22:02 2010 +0100 Give unnamed items proper names @@ -70961,7 +71801,7 @@ commit 5de2482526a77e32782799b216aae6030f340c11 Author: Michael Natterer -Date: Sun Feb 7 19:21:42 2010 +0100 +Date: Sun Feb 7 19:21:42 2010 +0100 Add some comment to group the functions @@ -70970,7 +71810,7 @@ commit 94271a00e6119d47432fb7c19b36d5e03c009db1 Author: Cristian Secară -Date: Mon Feb 8 23:17:52 2010 +0200 +Date: Mon Feb 8 23:17:52 2010 +0200 Updated Romanian translation @@ -70980,20 +71820,20 @@ commit 06d6286d3a5a5d89193d9ae592d3a839ef8ca295 Author: Cristian Secară -Date: Mon Feb 8 22:50:22 2010 +0200 +Date: Mon Feb 8 22:50:22 2010 +0200 Updated Romanian translations - po-libgimp/ro.po | 12 +- + po-libgimp/ro.po | 12 +- po-plug-ins/ro.po | 1656 +++++++++++++++++++++++----------------------------- po-script-fu/ro.po | 373 ++++++------ - po/ro.po | 169 +++--- + po/ro.po | 169 +++--- 4 files changed, 1030 insertions(+), 1180 deletions(-) commit 834b49ee42bcf97cb99de16682805b215ca912b5 Author: Sven Neumann -Date: Mon Feb 8 21:35:44 2010 +0100 +Date: Mon Feb 8 21:35:44 2010 +0100 Bump required babl and gegl versions in the run-time sanity checks. @@ -71002,7 +71842,7 @@ commit 7763b9aa352403cef62b631f1b01c2473d6cddda Author: Michael Natterer -Date: Sun Feb 7 17:16:24 2010 +0100 +Date: Sun Feb 7 17:16:24 2010 +0100 Depend on babl and gegl >= 0.1.2 @@ -71011,13 +71851,13 @@ commit 217d80bb7889c00f98d7d18ab024ba01266f343b Author: Michael Natterer -Date: Sun Feb 7 16:34:44 2010 +0100 +Date: Sun Feb 7 16:34:44 2010 +0100 Move get_item_by_name() from GimpItemStack to GimpItemTree and turn its code into a simple hash table lookup. - app/core/gimpimage.c | 18 ++++++------- + app/core/gimpimage.c | 18 ++++++------- app/core/gimpitemstack.c | 31 ---------------------- app/core/gimpitemstack.h | 2 -- app/core/gimpitemtree.c | 11 ++++++++ @@ -71027,7 +71867,7 @@ commit 8a7f2e8f51c59fc3e5887b62ba7809ca39ffad86 Author: Michael Natterer -Date: Sun Feb 7 16:23:02 2010 +0100 +Date: Sun Feb 7 16:23:02 2010 +0100 Bug 604175 - gimp_vectors_import() is O(n**2) in gimp_list_uniquefy_name(), for some data @@ -71045,14 +71885,14 @@ commit 2034a3676cee2181cfc6599f7319598b98fa6bf9 Author: Michael Natterer -Date: Sun Feb 7 15:56:53 2010 +0100 +Date: Sun Feb 7 15:56:53 2010 +0100 Use gimp_item_tree_rename_item() also when undoing an item rename so all item renaming goes through GimpItemTree API. Add "push_undo" parameter to gimp_item_tree_rename_item(). - app/core/gimpitem.c | 2 +- + app/core/gimpitem.c | 2 +- app/core/gimpitempropundo.c | 7 ++++++- app/core/gimpitemtree.c | 4 +++- app/core/gimpitemtree.h | 1 + @@ -71060,21 +71900,21 @@ commit bcf7603e04deb5271a6a17ba7ebdeba74e520ea7 Author: Michael Natterer -Date: Sun Feb 7 15:39:42 2010 +0100 +Date: Sun Feb 7 15:39:42 2010 +0100 Add gimp_item_tree_rename_item() and call it from gimp_item_real_rename() if the item is attached to an image; simply use gimp_object_set_name() otherwise. - app/core/gimpitem.c | 7 ++++--- + app/core/gimpitem.c | 7 ++++--- app/core/gimpitemtree.c | 25 +++++++++++++++++++++++++ app/core/gimpitemtree.h | 5 +++++ 3 files changed, 34 insertions(+), 3 deletions(-) commit 5455ce895dbc0e569d53a8ab6756818761e13f74 Author: Michael Natterer -Date: Sun Feb 7 15:27:21 2010 +0100 +Date: Sun Feb 7 15:27:21 2010 +0100 Cause less eye cancer @@ -71084,7 +71924,7 @@ commit d9d13bc08d45121e556755d973268b97cd7671b7 Author: Michael Natterer -Date: Sun Feb 7 15:07:30 2010 +0100 +Date: Sun Feb 7 15:07:30 2010 +0100 Add some more precondition checks to GimpItemTree functions @@ -71093,25 +71933,25 @@ commit e00c59461acc0e9ad941b2efa21b960da14c72da Author: Michael Natterer -Date: Sun Feb 7 15:01:31 2010 +0100 +Date: Sun Feb 7 15:01:31 2010 +0100 No need to pass the active item to GimpItemTree functions any longer - app/core/gimpimage.c | 36 ++++++++++-------------------------- + app/core/gimpimage.c | 36 ++++++++++-------------------------- app/core/gimpitemtree.c | 25 +++++++++++++------------ app/core/gimpitemtree.h | 20 +++++++++----------- 3 files changed, 32 insertions(+), 49 deletions(-) commit c9645cc0d39538cdc270b0d21f5e8deb5d4bfb01 Author: Michael Natterer -Date: Sun Feb 7 14:52:34 2010 +0100 +Date: Sun Feb 7 14:52:34 2010 +0100 Add "active-item" property and API to GimpItemTree and use it to store the image's active layer, channel and vectors. app/core/gimpimage-private.h | 4 --- - app/core/gimpimage.c | 59 + app/core/gimpimage.c | 59 ++++++++++++++++++++++++++------------------ app/core/gimpitemtree.c | 49 +++++++++++++++++++++++++++++++++++- app/core/gimpitemtree.h | 55 @@ -71120,11 +71960,11 @@ commit 78375e0ec57529f2ff4dd3f4d5ad9e16343d6f8d Author: Michael Natterer -Date: Sun Feb 7 14:08:52 2010 +0100 +Date: Sun Feb 7 14:08:52 2010 +0100 Move gimp_image_get_insert_pos() to gimp_item_tree_get_insert_pos() - app/core/gimpimage.c | 104 + app/core/gimpimage.c | 104 ++++++++---------------------------------------- app/core/gimpitemtree.c | 61 ++++++++++++++++++++++++++++ app/core/gimpitemtree.h | 45 +++++++++++---------- @@ -71132,7 +71972,7 @@ commit 82f8cee292d9593b13c59a8d1f53c380e2611325 Author: Michael Natterer -Date: Sun Feb 7 13:46:46 2010 +0100 +Date: Sun Feb 7 13:46:46 2010 +0100 Use the newly added get_parent() APIs @@ -71141,23 +71981,23 @@ readable at all. app/actions/channels-commands.c | 2 +- - app/actions/layers-commands.c | 7 ++-- + app/actions/layers-commands.c | 7 ++-- app/actions/vectors-commands.c | 7 ++-- - app/core/gimpchannelundo.c | 4 +- - app/core/gimpimage-merge.c | 4 +- - app/core/gimpimage.c | 86 + app/core/gimpchannelundo.c | 4 +- + app/core/gimpimage-merge.c | 4 +- + app/core/gimpimage.c | 86 +++++++++-------------------------------- - app/core/gimpitem.c | 18 ++++----- - app/core/gimpitem.h | 2 +- - app/core/gimpitempropundo.c | 4 +- - app/core/gimpitemtree.c | 2 +- - app/core/gimplayerundo.c | 4 +- - app/vectors/gimpvectorsundo.c | 4 +- + app/core/gimpitem.c | 18 ++++----- + app/core/gimpitem.h | 2 +- + app/core/gimpitempropundo.c | 4 +- + app/core/gimpitemtree.c | 2 +- + app/core/gimplayerundo.c | 4 +- + app/vectors/gimpvectorsundo.c | 4 +- 12 files changed, 44 insertions(+), 100 deletions(-) commit e0224cdbfbacec49c72c4ae22c6e661790c6b68b Author: Michael Natterer -Date: Sun Feb 7 12:03:07 2010 +0100 +Date: Sun Feb 7 12:03:07 2010 +0100 Add get_parent() API for items, layers, channels and vectors @@ -71168,17 +72008,17 @@ app/core/gimpchannel.c | 8 ++++++++ app/core/gimpchannel.h | 2 ++ - app/core/gimpitem.c | 8 ++++++++ - app/core/gimpitem.h | 2 ++ - app/core/gimplayer.c | 8 ++++++++ - app/core/gimplayer.h | 2 ++ + app/core/gimpitem.c | 8 ++++++++ + app/core/gimpitem.h | 2 ++ + app/core/gimplayer.c | 8 ++++++++ + app/core/gimplayer.h | 2 ++ app/vectors/gimpvectors.c | 8 ++++++++ app/vectors/gimpvectors.h | 3 ++- 8 files changed, 40 insertions(+), 1 deletion(-) commit f2c56cb363d2372fc43ad7167863d99f80c6245b Author: Michael Natterer -Date: Sun Feb 7 12:02:37 2010 +0100 +Date: Sun Feb 7 12:02:37 2010 +0100 app: #if 0 some stuff to aviod warnings @@ -71187,7 +72027,7 @@ commit 1b7d60cc87b92bdbdf4e3112d48a0129c69025a0 Author: Michael Natterer -Date: Sun Feb 7 11:47:33 2010 +0100 +Date: Sun Feb 7 11:47:33 2010 +0100 Add gimp_item_tree_add_item() and gimp_item_tree_remove_item() @@ -71197,7 +72037,7 @@ madness. We need the calls to the item tree anyway because it's going to ensure unique names of its items. - app/core/gimpimage.c | 200 + app/core/gimpimage.c | 200 ++++++++++++------------------------------------ app/core/gimpitemtree.c | 71 +++++++++++++++++ app/core/gimpitemtree.h | 9 +++ @@ -71205,7 +72045,7 @@ commit 7bfd5dcf75499f71d6c3336bff24c70efbda4615 Author: Michael Natterer -Date: Sat Feb 6 16:41:54 2010 +0100 +Date: Sat Feb 6 16:41:54 2010 +0100 Merge the layer, channel and vectors reorder undo into one item undo @@ -71219,27 +72059,27 @@ GimpVectorsPropUndo is now a completely empty skeleton. Keep it around anyway, maybe we'll get vectors properties to undo soon. - app/core/core-enums.c | 8 ++--- - app/core/core-enums.h | 4 +-- + app/core/core-enums.c | 8 ++--- + app/core/core-enums.h | 4 +-- app/core/gimpchannelpropundo.c | 23 -------------- app/core/gimpchannelpropundo.h | 2 -- app/core/gimpimage-undo-push.c | 64 ++++++++++----------------------------- app/core/gimpimage-undo-push.h | 13 ++------ - app/core/gimpimage.c | 18 ++--------- - app/core/gimpitempropundo.c | 24 +++++++++++++++ - app/core/gimpitempropundo.h | 2 ++ - app/core/gimpitemtree.c | 17 ++++++----- - app/core/gimpitemtree.h | 28 ++++++----------- - app/core/gimplayerpropundo.c | 23 -------------- - app/core/gimplayerpropundo.h | 2 -- + app/core/gimpimage.c | 18 ++--------- + app/core/gimpitempropundo.c | 24 +++++++++++++++ + app/core/gimpitempropundo.h | 2 ++ + app/core/gimpitemtree.c | 17 ++++++----- + app/core/gimpitemtree.h | 28 ++++++----------- + app/core/gimplayerpropundo.c | 23 -------------- + app/core/gimplayerpropundo.h | 2 -- app/vectors/gimpvectorspropundo.c | 23 -------------- app/vectors/gimpvectorspropundo.h | 3 -- 15 files changed, 70 insertions(+), 184 deletions(-) commit 804e692c86913130defc569135b4d99a83157eb3 Author: Michael Natterer -Date: Sat Feb 6 16:17:23 2010 +0100 +Date: Sat Feb 6 16:17:23 2010 +0100 Add some item tree infrastructure that will be needed later @@ -71248,11 +72088,11 @@ - implement gimp_item_get_container() using gimp_item_get_tree() app/core/gimpchannel.c | 11 +++++------ - app/core/gimpimage.c | 24 ++++++++++++++++++++++++ - app/core/gimpimage.h | 4 ++++ - app/core/gimpitem.c | 21 ++++++++++++++++++--- - app/core/gimpitem.h | 3 ++- - app/core/gimplayer.c | 11 +++++------ + app/core/gimpimage.c | 24 ++++++++++++++++++++++++ + app/core/gimpimage.h | 4 ++++ + app/core/gimpitem.c | 21 ++++++++++++++++++--- + app/core/gimpitem.h | 3 ++- + app/core/gimplayer.c | 11 +++++------ app/core/gimplayermask.c | 8 ++++---- app/core/gimpselection.c | 9 ++++----- app/vectors/gimpvectors.c | 11 +++++------ @@ -71260,7 +72100,7 @@ commit 25d39f2daa279598c5a7a7102d0f7e04216611f7 Author: Michael Natterer -Date: Sat Feb 6 16:00:06 2010 +0100 +Date: Sat Feb 6 16:00:06 2010 +0100 Add gimp_item_tree_reorder_item() @@ -71268,7 +72108,7 @@ _channel() and _vectors(), which now consist of a single call to gimp_item_tree_reorder_item(). - app/core/gimpimage.c | 217 + app/core/gimpimage.c | 217 ++++++++---------------------------------------- app/core/gimpitemtree.c | 76 +++++++++++++++++ app/core/gimpitemtree.h | 22 ++++- @@ -71276,18 +72116,18 @@ commit f551333cbe6de83dfe3b0833a627f03f97076a26 Author: Michael Natterer -Date: Sat Feb 6 13:49:09 2010 +0100 +Date: Sat Feb 6 13:49:09 2010 +0100 Add an "image" property to GimpItemTree - app/core/gimpimage.c | 9 ++++++--- + app/core/gimpimage.c | 9 ++++++--- app/core/gimpitemtree.c | 28 ++++++++++++++++++++++++---- app/core/gimpitemtree.h | 5 +++-- 3 files changed, 33 insertions(+), 9 deletions(-) commit c9d0b370fe0c69609185df3b45860aa91afce023 Author: Michael Natterer -Date: Sat Feb 6 13:41:16 2010 +0100 +Date: Sat Feb 6 13:41:16 2010 +0100 Use GimpItemTrees to keep the image's layers, channels and vectors @@ -71296,13 +72136,13 @@ private->layers->container. Useful code will follow :) app/core/gimpimage-private.h | 6 +-- - app/core/gimpimage.c | 119 + app/core/gimpimage.c | 119 +++++++++++++++++++++++-------------------- 2 files changed, 66 insertions(+), 59 deletions(-) commit d57f39df00c68f7235e5c8ba954aca61108e13b7 Author: Michael Natterer -Date: Sat Feb 6 12:58:10 2010 +0100 +Date: Sat Feb 6 12:58:10 2010 +0100 Add unused new class GimpItemTree which will keep the image's items @@ -71310,8 +72150,8 @@ will keep the active item, handle inserting, removing and reordering and whatnot... - app/core/Makefile.am | 2 + - app/core/core-types.h | 5 ++ + app/core/Makefile.am | 2 + + app/core/core-types.h | 5 ++ app/core/gimpitemtree.c | 230 ++++++++++++++++++++++++++++++++++++++++++++++++ app/core/gimpitemtree.h | 55 ++++++++++++ @@ -71319,7 +72159,7 @@ commit 004b96ac6cdc22bfdde73ed85338595135066fd3 Author: Michael Natterer -Date: Fri Feb 5 16:14:04 2010 +0100 +Date: Fri Feb 5 16:14:04 2010 +0100 Don't use gimpimage-private.h undoing guide/sample point removals @@ -71329,9 +72169,9 @@ clear that these functions are internal API, also add comments to the proper public APIs so it's clear which one to use in which situation. - app/core/gimpguideundo.c | 16 ++-------------- - app/core/gimpimage-guides.c | 6 ------ - app/core/gimpimage-guides.h | 6 ++++++ + app/core/gimpguideundo.c | 16 ++-------------- + app/core/gimpimage-guides.c | 6 ------ + app/core/gimpimage-guides.h | 6 ++++++ app/core/gimpimage-sample-points.c | 4 ---- app/core/gimpimage-sample-points.h | 8 ++++++++ app/core/gimpsamplepointundo.c | 24 ++++-------------------- @@ -71339,18 +72179,18 @@ commit 8d652ba8cddce802e2e99f33942571670767770b Author: Marco Ciampa -Date: Sat Feb 6 12:55:05 2010 +0100 +Date: Sat Feb 6 12:55:05 2010 +0100 Updated italian translation po-plug-ins/it.po | 158 +++---- - po/it.po | 1278 + po/it.po | 1278 +++++++++++++++++++++++++++-------------------------- 2 files changed, 704 insertions(+), 732 deletions(-) commit adb860af93d1268646dde713084f1c817df107ae Author: Gabor Kelemen -Date: Sat Feb 6 00:15:28 2010 +0100 +Date: Sat Feb 6 00:15:28 2010 +0100 Hungarian translation updated @@ -71360,7 +72200,7 @@ commit 4211524ee2c6077d96ca0d584efbc46e51651657 Author: Michael Natterer -Date: Fri Feb 5 09:19:43 2010 +0100 +Date: Fri Feb 5 09:19:43 2010 +0100 Use gimp_image_undo_is_enabled() instead of private->undo_freeze_count @@ -71369,19 +72209,19 @@ commit 2b2464d6c8742fc4ce970c269d2b776640ecd5b3 Author: Michael Natterer -Date: Fri Feb 5 09:13:25 2010 +0100 +Date: Fri Feb 5 09:13:25 2010 +0100 Move the "flush_accum" to GimpImagePrivate app/core/gimpimage-private.h | 14 ++++++++++++++ - app/core/gimpimage.c | 41 + app/core/gimpimage.c | 41 +++++++++++++++++++++-------------------- - app/core/gimpimage.h | 18 ++---------------- + app/core/gimpimage.h | 18 ++---------------- 3 files changed, 37 insertions(+), 36 deletions(-) commit 43c0cfedbd50ffa425982e6601b3a0ebdf33b150 Author: Martin Nordholts -Date: Thu Feb 4 21:24:53 2010 +0100 +Date: Thu Feb 4 21:24:53 2010 +0100 app: "Pixel dimensions" -> "Size in pixels" in Image Properties dialog @@ -71394,170 +72234,170 @@ commit 0f0853ca86cfbcc316e88390f5c57d280485e849 Author: Michael Natterer -Date: Thu Feb 4 21:09:19 2010 +0100 +Date: Thu Feb 4 21:09:19 2010 +0100 Move "preview" to GimpImagePrivate app/core/gimpimage-preview.c | 23 ++++++++++++----------- app/core/gimpimage-private.h | 3 +++ - app/core/gimpimage.c | 18 +++++++++--------- - app/core/gimpimage.h | 3 --- + app/core/gimpimage.c | 18 +++++++++--------- + app/core/gimpimage.h | 3 --- 4 files changed, 24 insertions(+), 23 deletions(-) commit 09c897262eb05fc625b3035b679e5849c13f4798 Author: Michael Natterer -Date: Thu Feb 4 20:06:49 2010 +0100 +Date: Thu Feb 4 20:06:49 2010 +0100 Move all undo-related members to GimpImagePrivate Also add some new API to access them. - app/actions/edit-actions.c | 6 +- - app/actions/edit-commands.c | 23 +++--- - app/core/gimpimage-private.h | 6 ++ - app/core/gimpimage-scale.c | 4 +- - app/core/gimpimage-undo.c | 158 + app/actions/edit-actions.c | 6 +- + app/actions/edit-commands.c | 23 +++--- + app/core/gimpimage-private.h | 6 ++ + app/core/gimpimage-scale.c | 4 +- + app/core/gimpimage-undo.c | 158 ++++++++++++++++++++++++------------ - app/core/gimpimage-undo.h | 42 +++++----- - app/core/gimpimage.c | 24 +++--- - app/core/gimpimage.h | 6 -- - app/core/gimpundo.c | 6 +- - app/plug-in/gimpplugin-cleanup.c | 11 ++- - app/tools/gimprectangleselecttool.c | 29 +++---- - app/tools/gimpvectortool.c | 3 +- - app/widgets/gimpimagepropview.c | 7 +- - app/widgets/gimpundoeditor.c | 41 +++++----- + app/core/gimpimage-undo.h | 42 +++++----- + app/core/gimpimage.c | 24 +++--- + app/core/gimpimage.h | 6 -- + app/core/gimpundo.c | 6 +- + app/plug-in/gimpplugin-cleanup.c | 11 ++- + app/tools/gimprectangleselecttool.c | 29 +++---- + app/tools/gimpvectortool.c | 3 +- + app/widgets/gimpimagepropview.c | 7 +- + app/widgets/gimpundoeditor.c | 41 +++++----- 14 files changed, 216 insertions(+), 150 deletions(-) commit 4c1ec79281c6ba83eea5e071c51619491a624de8 Author: Michael Natterer -Date: Thu Feb 4 09:49:45 2010 +0100 +Date: Thu Feb 4 09:49:45 2010 +0100 Move the quick mask members to GimpImagePrivate and add API to access the "inverted" state. - app/actions/quick-mask-actions.c | 20 +++++++++--- - app/actions/quick-mask-commands.c | 2 +- - app/core/gimpimage-duplicate.c | 9 ++++-- - app/core/gimpimage-private.h | 4 +++ - app/core/gimpimage-quick-mask.c | 54 + app/actions/quick-mask-actions.c | 20 +++++++++--- + app/actions/quick-mask-commands.c | 2 +- + app/core/gimpimage-duplicate.c | 9 ++++-- + app/core/gimpimage-private.h | 4 +++ + app/core/gimpimage-quick-mask.c | 54 +++++++++++++++++++++------------ - app/core/gimpimage-quick-mask.h | 19 ++++++------ - app/core/gimpimage.c | 11 ++++--- - app/core/gimpimage.h | 7 ++--- + app/core/gimpimage-quick-mask.h | 19 ++++++------ + app/core/gimpimage.c | 11 ++++--- + app/core/gimpimage.h | 7 ++--- app/display/gimpdisplayshell-handlers.c | 8 +++-- 9 files changed, 88 insertions(+), 46 deletions(-) commit 02f5931c968ecfb92aef960a623bfe3867ab2f01 Author: Michael Natterer -Date: Thu Feb 4 09:08:50 2010 +0100 +Date: Thu Feb 4 09:08:50 2010 +0100 Move "visible" and "active" to GimpImagePrivate and add accessors for the entire arrays (not just their members). app/core/gimpimage-duplicate.c | 8 +++--- - app/core/gimpimage-private.h | 3 +++ - app/core/gimpimage.c | 61 + app/core/gimpimage-private.h | 3 +++ + app/core/gimpimage.c | 61 +++++++++++++++++++++++++++++++++++------- - app/core/gimpimage.h | 10 ++++--- - app/core/gimplayer-project.c | 7 +++-- - app/core/gimplayer.c | 4 +-- + app/core/gimpimage.h | 10 ++++--- + app/core/gimplayer-project.c | 7 +++-- + app/core/gimplayer.c | 4 +-- 6 files changed, 72 insertions(+), 21 deletions(-) commit a8df1ec985e6299749727ddcd5adadaeccd67b78 Author: Alexandre Prokoudine -Date: Thu Feb 4 07:20:25 2010 +0300 +Date: Thu Feb 4 07:20:25 2010 +0300 Updated Russian translation po-plug-ins/ru.po | 331 ++++++++++++++-------------- po-script-fu/ru.po | 384 ++++++++++----------------------- - po/ru.po | 617 + po/ru.po | 617 ++++++++++++++++++++++++++--------------------------- 3 files changed, 585 insertions(+), 747 deletions(-) commit 4143f5cd626cbcbc5f1573cdb3510c143f322cb7 Author: Michael Natterer -Date: Wed Feb 3 23:42:32 2010 +0100 +Date: Wed Feb 3 23:42:32 2010 +0100 Move "parasites" to GimpImagePrivate app/core/gimpimage-duplicate.c | 10 +++++++--- - app/core/gimpimage-private.h | 2 ++ - app/core/gimpimage.c | 33 ++++++++++++++++++++------------- - app/core/gimpimage.h | 2 -- - app/core/gimpimageundo.c | 4 ++-- - app/xcf/xcf-load.c | 4 +++- - app/xcf/xcf-save.c | 18 ++++++++++-------- + app/core/gimpimage-private.h | 2 ++ + app/core/gimpimage.c | 33 ++++++++++++++++++++------------- + app/core/gimpimage.h | 2 -- + app/core/gimpimageundo.c | 4 ++-- + app/xcf/xcf-load.c | 4 +++- + app/xcf/xcf-save.c | 18 ++++++++++-------- 7 files changed, 44 insertions(+), 29 deletions(-) commit 4a247e9182b07d33ddbff7184c9440cb2ec56bfb Author: Michael Natterer -Date: Wed Feb 3 23:24:18 2010 +0100 +Date: Wed Feb 3 23:24:18 2010 +0100 Move "floating_sel" and "selection_mask" to GimpImagePrivate app/core/gimpimage-duplicate.c | 15 +++++++++------ - app/core/gimpimage-private.h | 3 +++ - app/core/gimpimage.c | 34 +++++++++++++++++++--------------- - app/core/gimpimage.h | 3 --- - app/xcf/xcf-load.c | 5 +++-- + app/core/gimpimage-private.h | 3 +++ + app/core/gimpimage.c | 34 +++++++++++++++++++--------------- + app/core/gimpimage.h | 3 --- + app/xcf/xcf-load.c | 5 +++-- 5 files changed, 34 insertions(+), 26 deletions(-) commit 3720938517e8ef4b348002e50b23b181a755e4f5 Author: Michael Natterer -Date: Wed Feb 3 23:12:22 2010 +0100 +Date: Wed Feb 3 23:12:22 2010 +0100 Move the active layer, channel and vectors to GimpImagePrivate app/core/gimpimage-private.h | 4 +++ - app/core/gimpimage.c | 58 + app/core/gimpimage.c | 58 ++++++++++++++++++++++++++------------------ - app/core/gimpimage.h | 4 --- + app/core/gimpimage.h | 4 --- 3 files changed, 39 insertions(+), 27 deletions(-) commit 67014260dd3ed7ee0b2f5be6f2be4f5895f7b821 Author: Michael Natterer -Date: Wed Feb 3 23:05:49 2010 +0100 +Date: Wed Feb 3 23:05:49 2010 +0100 Move some container handlers to GimpImagePrivate app/core/gimpimage-private.h | 4 ++++ - app/core/gimpimage.c | 14 +++++++------- - app/core/gimpimage.h | 4 ---- + app/core/gimpimage.c | 14 +++++++------- + app/core/gimpimage.h | 4 ---- 3 files changed, 11 insertions(+), 11 deletions(-) commit 88de69464eb65c09d2a2c0b9b2f7b6f5c9eca4c9 Author: Michael Natterer -Date: Wed Feb 3 23:00:31 2010 +0100 +Date: Wed Feb 3 23:00:31 2010 +0100 Move "layers", "channels" and "vectors" to GimpImagePrivate - app/actions/vectors-actions.c | 2 +- - app/core/gimpchannel.c | 6 +- - app/core/gimpimage-flip.c | 6 +- - app/core/gimpimage-private.h | 6 + - app/core/gimpimage-resize.c | 6 +- - app/core/gimpimage-rotate.c | 6 +- - app/core/gimpimage.c | 309 + app/actions/vectors-actions.c | 2 +- + app/core/gimpchannel.c | 6 +- + app/core/gimpimage-flip.c | 6 +- + app/core/gimpimage-private.h | 6 + + app/core/gimpimage-resize.c | 6 +- + app/core/gimpimage-rotate.c | 6 +- + app/core/gimpimage.c | 309 ++++++++++++++++++++------------ - app/core/gimpimage.h | 6 - - app/core/gimplayer.c | 6 +- + app/core/gimpimage.h | 6 - + app/core/gimplayer.c | 6 +- app/display/gimpdisplayshell-handlers.c | 25 +-- - app/pdb/image-cmds.c | 12 +- - app/pdb/paths-cmds.c | 3 +- - app/vectors/gimpvectors.c | 6 +- - app/xcf/xcf-load.c | 10 +- - app/xcf/xcf-save.c | 10 +- - tools/pdbgen/pdb/image.pdb | 12 +- - tools/pdbgen/pdb/paths.pdb | 3 +- + app/pdb/image-cmds.c | 12 +- + app/pdb/paths-cmds.c | 3 +- + app/vectors/gimpvectors.c | 6 +- + app/xcf/xcf-load.c | 10 +- + app/xcf/xcf-save.c | 10 +- + tools/pdbgen/pdb/image.pdb | 12 +- + tools/pdbgen/pdb/paths.pdb | 3 +- 17 files changed, 268 insertions(+), 166 deletions(-) commit c9b9b8e18ef99203aad1e96943bfb51785884298 Author: Michael Natterer -Date: Wed Feb 3 22:59:50 2010 +0100 +Date: Wed Feb 3 22:59:50 2010 +0100 Increating and decreasing the display count were swapped @@ -71566,96 +72406,96 @@ commit c9f8399614e9eaff1a9e0691485eda67d6b38bef Author: Michael Natterer -Date: Wed Feb 3 22:16:02 2010 +0100 +Date: Wed Feb 3 22:16:02 2010 +0100 Move "grid", "guides" and "sample_points" to GimpImagePrivate - app/core/gimpguideundo.c | 7 ++++-- - app/core/gimpimage-duplicate.c | 4 ++-- - app/core/gimpimage-grid.c | 13 +++++++---- - app/core/gimpimage-guides.c | 38 + app/core/gimpguideundo.c | 7 ++++-- + app/core/gimpimage-duplicate.c | 4 ++-- + app/core/gimpimage-grid.c | 13 +++++++---- + app/core/gimpimage-guides.c | 38 ++++++++++++++++++++++----------- - app/core/gimpimage-private.h | 4 ++++ - app/core/gimpimage-sample-points.c | 22 +++++++++++++------ - app/core/gimpimage.c | 32 +++++++++++++-------------- - app/core/gimpimage.h | 4 ---- - app/core/gimpimageundo.c | 2 +- - app/core/gimpsamplepointundo.c | 8 ++++--- - app/display/gimpdisplayshell-draw.c | 3 ++- + app/core/gimpimage-private.h | 4 ++++ + app/core/gimpimage-sample-points.c | 22 +++++++++++++------ + app/core/gimpimage.c | 32 +++++++++++++-------------- + app/core/gimpimage.h | 4 ---- + app/core/gimpimageundo.c | 2 +- + app/core/gimpsamplepointundo.c | 8 ++++--- + app/display/gimpdisplayshell-draw.c | 3 ++- app/display/gimpdisplayshell-handlers.c | 5 +++-- - app/xcf/xcf-load.c | 12 ++++++----- - app/xcf/xcf-save.c | 2 +- + app/xcf/xcf-load.c | 12 ++++++----- + app/xcf/xcf-save.c | 2 +- 14 files changed, 96 insertions(+), 60 deletions(-) commit 2005fd1a682c29367d5f42c571c378a34a0c99be Author: Michael Natterer -Date: Wed Feb 3 21:46:09 2010 +0100 +Date: Wed Feb 3 21:46:09 2010 +0100 Move "projection" and "graph" to GimpImagePrivate - app/actions/view-actions.c | 6 +++- - app/actions/view-commands.c | 2 +- - app/core/gimp-edit.c | 14 +++++++--- - app/core/gimpchannel.c | 27 ++++++++++-------- + app/actions/view-actions.c | 6 +++- + app/actions/view-commands.c | 2 +- + app/core/gimp-edit.c | 14 +++++++--- + app/core/gimpchannel.c | 27 ++++++++++-------- app/core/gimpimage-contiguous-region.c | 4 +-- - app/core/gimpimage-crop.c | 2 +- - app/core/gimpimage-pick-color.c | 2 +- - app/core/gimpimage-preview.c | 21 +++++++------- - app/core/gimpimage-private.h | 3 ++ - app/core/gimpimage.c | 50 + app/core/gimpimage-crop.c | 2 +- + app/core/gimpimage-pick-color.c | 2 +- + app/core/gimpimage-preview.c | 21 +++++++------- + app/core/gimpimage-private.h | 3 ++ + app/core/gimpimage.c | 50 ++++++++++++++++++---------------- - app/core/gimpimage.h | 3 -- - app/core/gimpimagefile.c | 2 +- - app/core/gimppalette-import.c | 13 +++++---- + app/core/gimpimage.h | 3 -- + app/core/gimpimagefile.c | 2 +- + app/core/gimppalette-import.c | 13 +++++---- 13 files changed, 83 insertions(+), 66 deletions(-) commit bb624cb8c40fff4465735c4d6bc0edfa5990ad2a Author: Michael Natterer -Date: Wed Feb 3 21:31:27 2010 +0100 +Date: Wed Feb 3 21:31:27 2010 +0100 Move "tattoo_state" to GimpImagePrivate app/core/gimpimage-private.h | 2 ++ - app/core/gimpimage.c | 16 ++++++++++------ - app/core/gimpimage.h | 2 -- + app/core/gimpimage.c | 16 ++++++++++------ + app/core/gimpimage.h | 2 -- 3 files changed, 12 insertions(+), 8 deletions(-) commit 0b2c804e9d9ea702d428a8e3ace8cb7a487ddf62 Author: Michael Natterer -Date: Wed Feb 3 21:20:29 2010 +0100 +Date: Wed Feb 3 21:20:29 2010 +0100 Move "disp_count" and "instance_count" to GimpImagePrivate and add the neccessary API to access and modify them. - app/actions/images-actions.c | 14 ++++++++--- - app/actions/images-commands.c | 2 +- - app/core/gimpimage-private.h | 3 +++ - app/core/gimpimage.c | 47 + app/actions/images-actions.c | 14 ++++++++--- + app/actions/images-commands.c | 2 +- + app/core/gimpimage-private.h | 3 +++ + app/core/gimpimage.c | 47 ++++++++++++++++++++++++++++++++++-- - app/core/gimpimage.h | 13 +++++++--- + app/core/gimpimage.h | 13 +++++++--- app/display/gimpdisplay-foreach.c | 6 ++--- - app/display/gimpdisplay.c | 7 +++--- + app/display/gimpdisplay.c | 7 +++--- app/display/gimpdisplayshell-close.c | 10 ++++---- - app/pdb/display-cmds.c | 8 +++--- - app/pdb/image-cmds.c | 2 +- - tools/pdbgen/pdb/display.pdb | 8 +++--- - tools/pdbgen/pdb/image.pdb | 2 +- + app/pdb/display-cmds.c | 8 +++--- + app/pdb/image-cmds.c | 2 +- + tools/pdbgen/pdb/display.pdb | 8 +++--- + tools/pdbgen/pdb/image.pdb | 2 +- 12 files changed, 91 insertions(+), 31 deletions(-) commit 8e31261caaf792b83c6280e0ab06bb7a52563550 Author: Sven Neumann -Date: Wed Feb 3 20:57:11 2010 +0100 +Date: Wed Feb 3 20:57:11 2010 +0100 plug-ins: fix build rules for web-browser plug-in in plugin-defs.pl - plug-ins/common/Makefile.am | 5 ++++- + plug-ins/common/Makefile.am | 5 ++++- plug-ins/common/plugin-defs.pl | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) commit 799a7fc5a8de83ec2bfc4a93fb9fe3ac46dd65b3 Author: Sven Neumann -Date: Wed Feb 3 20:54:04 2010 +0100 +Date: Wed Feb 3 20:54:04 2010 +0100 script-fu: drop gimp.org header and label scripts @@ -71663,17 +72503,17 @@ web-page that has long been redone several times. There is no point in distributing these scripts any longer. - plug-ins/script-fu/scripts/Makefile.am | 2 - + plug-ins/script-fu/scripts/Makefile.am | 2 - plug-ins/script-fu/scripts/gimp-headers.scm | 192 ---------------------------- plug-ins/script-fu/scripts/gimp-labels.scm | 190 --------------------------- - po-script-fu/POTFILES.in | 2 - + po-script-fu/POTFILES.in | 2 - 4 files changed, 386 deletions(-) commit a179537e29ec91dbad355da7776140479a8a88e5 Author: Sven Neumann -Date: Wed Feb 3 20:49:38 2010 +0100 +Date: Wed Feb 3 20:49:38 2010 +0100 app: fix compiler warning and improve formatting a little @@ -71683,7 +72523,7 @@ commit edb41221c6673b57b4456ca280a3af69e9e1f67a Author: Sven Neumann -Date: Wed Feb 3 20:39:02 2010 +0100 +Date: Wed Feb 3 20:39:02 2010 +0100 plug-ins: drop gee and gee-zoom plug-ins @@ -71691,36 +72531,36 @@ available thru the PDB. Since they are not useful except for the fun of staring at the weird code, we can as well remove them entirely. - plug-ins/common/.gitignore | 4 - - plug-ins/common/Makefile.am | 38 -- - plug-ins/common/gee-zoom.c | 802 + plug-ins/common/.gitignore | 4 - + plug-ins/common/Makefile.am | 38 -- + plug-ins/common/gee-zoom.c | 802 ----------------------------------------- - plug-ins/common/gee.c | 656 --------------------------------- + plug-ins/common/gee.c | 656 --------------------------------- plug-ins/common/plugin-defs.pl | 2 - - po-plug-ins/POTFILES.in | 2 - + po-plug-ins/POTFILES.in | 2 - 6 files changed, 1504 deletions(-) commit f769284acac28e6c4020debace25c680990f3bed Author: Michael Natterer -Date: Wed Feb 3 20:31:25 2010 +0100 +Date: Wed Feb 3 20:31:25 2010 +0100 Start private struct for GimpImage and move the first members there - app/core/Makefile.am | 1 + - app/core/gimpimage-colormap.c | 74 ++++++---- - app/core/gimpimage-private.h | 55 +++++++ - app/core/gimpimage-undo.c | 44 ++++-- - app/core/gimpimage.c | 268 + app/core/Makefile.am | 1 + + app/core/gimpimage-colormap.c | 74 ++++++---- + app/core/gimpimage-private.h | 55 +++++++ + app/core/gimpimage-undo.c | 44 ++++-- + app/core/gimpimage.c | 268 ++++++++++++++++++++++------------- - app/core/gimpimage.h | 24 +--- - app/core/gimpimageundo.c | 12 +- + app/core/gimpimage.h | 24 +--- + app/core/gimpimageundo.c | 12 +- app/display/gimpdisplayshell-close.c | 7 +- - app/file/file-open.c | 3 +- + app/file/file-open.c | 3 +- 9 files changed, 315 insertions(+), 173 deletions(-) commit 32358615d448952000a157a9ba845c818071fa58 Author: Michael Natterer -Date: Wed Feb 3 20:09:20 2010 +0100 +Date: Wed Feb 3 20:09:20 2010 +0100 Don't access image->colormap directly @@ -71730,17 +72570,17 @@ commit f18943f4ceea491faeee35fb50ff8bc4029c4eb7 Author: Michael Natterer -Date: Wed Feb 3 19:53:45 2010 +0100 +Date: Wed Feb 3 19:53:45 2010 +0100 Don't access the image's unit and resolution members directly app/core/gimpdrawable-stroke.c | 2 +- - app/xcf/xcf-load.c | 4 ++-- + app/xcf/xcf-load.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit b6ce5d075d5b8103068a9e20712ecb35e037154a Author: Michael Natterer -Date: Wed Feb 3 19:50:46 2010 +0100 +Date: Wed Feb 3 19:50:46 2010 +0100 Remove macros SCREEN_XRES() and SCREEN_YRES() @@ -71751,12 +72591,12 @@ app/display/gimpdisplayshell-scale.h | 82 +++++++++++++++++++----------------- app/display/gimpdisplayshell.h | 6 --- - app/tools/gimpmagnifytool.c | 16 ++++--- + app/tools/gimpmagnifytool.c | 16 ++++--- 4 files changed, 85 insertions(+), 57 deletions(-) commit 36551daa19d770bc3dd2bc87455c5f01343dd2a5 Author: Akkana Peck -Date: Tue Feb 2 13:04:24 2010 -0800 +Date: Tue Feb 2 13:04:24 2010 -0800 Fix bug 590418: make chalk script-fu work. @@ -71769,7 +72609,7 @@ commit 1d6c2307f903c7b222b0d9df61b66859f3c2854d Author: Martin Nordholts -Date: Tue Feb 2 08:35:26 2010 +0100 +Date: Tue Feb 2 08:35:26 2010 +0100 etc: Make sessionrc up to date with recent code changes @@ -71778,7 +72618,7 @@ commit ed2d178da359fc68f33dbefff1a42c8060747f0b Author: Martin Nordholts -Date: Mon Feb 1 21:55:18 2010 +0100 +Date: Mon Feb 1 21:55:18 2010 +0100 app: Get rid of config -> display module dependency @@ -71796,38 +72636,36 @@ application is made up of core modules and UI modules and that no core module depends on any UI module - app/Makefile.am | 3 - - app/actions/view-actions.c | 2 +- - app/actions/view-commands.c | 2 +- - app/config/Makefile.am | 38 +- - app/config/config-enums.c | 226 +++++++++++ - app/config/config-enums.h | 105 +++++ - app/config/config-types.h | 7 +- - app/config/gimpdisplayconfig.c | 9 +- - app/config/gimpdisplayconfig.h | 2 - - app/config/gimpdisplayoptions.c | 350 +++++++++++++++++ - app/config/gimpdisplayoptions.h | 72 ++++ - app/config/gimpguiconfig.h | 2 - - app/config/gimppluginconfig.h | 2 - - app/core/core-types.h | 3 - - app/display/Makefile.am | 2 - - app/display/display-enums.c | 124 ------ - app/display/display-enums.h | 49 --- - app/display/gimpdisplayoptions.c | 351 ----------------- - app/display/gimpdisplayoptions.h | 72 ---- - app/display/gimpdisplayshell-appearance.c | 3 +- - app/display/gimpdisplayshell-handlers.c | 2 +- - app/display/gimpdisplayshell.c | 2 +- - app/widgets/widgets-enums.c | 89 ----- - app/widgets/widgets-enums.h | 34 -- - devel-docs/gimp-module-dependencies.svg | 618 - +++++++++++++++--------------- - po/POTFILES.in | 4 +- - 26 files changed, 1115 insertions(+), 1058 deletions(-) + app/Makefile.am | 3 - + app/actions/view-actions.c | 2 +- + app/actions/view-commands.c | 2 +- + app/config/Makefile.am | 38 +- + app/config/config-enums.c | 226 ++++++++++ + app/config/config-enums.h | 105 +++++ + app/config/config-types.h | 7 +- + app/config/gimpdisplayconfig.c | 9 +- + app/config/gimpdisplayconfig.h | 2 - + app/{display => config}/gimpdisplayoptions.c | 5 +- + app/{display => config}/gimpdisplayoptions.h | 0 + app/config/gimpguiconfig.h | 2 - + app/config/gimppluginconfig.h | 2 - + app/core/core-types.h | 3 - + app/display/Makefile.am | 2 - + app/display/display-enums.c | 124 ------ + app/display/display-enums.h | 49 --- + app/display/gimpdisplayshell-appearance.c | 3 +- + app/display/gimpdisplayshell-handlers.c | 2 +- + app/display/gimpdisplayshell.c | 2 +- + app/widgets/widgets-enums.c | 89 ---- + app/widgets/widgets-enums.h | 34 -- + devel-docs/gimp-module-dependencies.svg | 618 + ++++++++++++++------------- + po/POTFILES.in | 4 +- + 24 files changed, 695 insertions(+), 638 deletions(-) commit fda5e405b65ac8297d3ef70c9a1464c6267bf46f Author: Mattias Põldaru -Date: Mon Feb 1 21:50:01 2010 +0200 +Date: Mon Feb 1 21:50:01 2010 +0200 Updating Estonian translation @@ -71837,7 +72675,7 @@ commit 92604a4842911ec68cb368d65a020b7a20d67060 Author: Mattias Põldaru -Date: Mon Feb 1 21:43:46 2010 +0200 +Date: Mon Feb 1 21:43:46 2010 +0200 Updating Estonian translation @@ -71847,7 +72685,7 @@ commit cc6427e5d5ee11340820e4151bd3936c7b5e9a38 Author: Kevin Cozens -Date: Sun Jan 31 17:54:21 2010 -0500 +Date: Sun Jan 31 17:54:21 2010 -0500 Applied patch from Saul Goode which mostly fixes bug #604587 @@ -71860,7 +72698,7 @@ commit 6601625af7682a1ccd71718190dcb10206b903c5 Author: Sven Neumann -Date: Mon Feb 1 00:02:28 2010 +0100 +Date: Mon Feb 1 00:02:28 2010 +0100 Add AC_CONFIG_MACRO_DIR() to configure.ac as suggested by libtoolize @@ -71868,14 +72706,14 @@ the .gitignore file in the m4macros directory. This fixes the build from a fresh checkout for me. Please revert if it causes problems. - Makefile.am | 2 ++ - configure.ac | 1 + + Makefile.am | 2 ++ + configure.ac | 1 + m4macros/.gitignore | 11 +++++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) commit e82e09307cc0c2e68180a18c07f40c71aaa968ae Author: Michael Natterer -Date: Sun Jan 31 21:35:21 2010 +0100 +Date: Sun Jan 31 21:35:21 2010 +0100 app: increase vector loading float array size @@ -71887,7 +72725,7 @@ commit b499d01a71adaf78905433e52b2087dcb55c7c21 Author: Sven Neumann -Date: Sun Jan 31 21:11:11 2010 +0100 +Date: Sun Jan 31 21:11:11 2010 +0100 Bug 608188 - a few strings in Save as... > Raw image data dialog are always in English @@ -71899,7 +72737,7 @@ commit 48a393f44f7ed67433a0d5ae77aef901c4f7a98b Author: Sven Neumann -Date: Sun Jan 31 21:02:49 2010 +0100 +Date: Sun Jan 31 21:02:49 2010 +0100 Bug 607888 - "Fractal Explorer" string in the filter's title bar is always in English @@ -71911,7 +72749,7 @@ commit 523c599baaaffe6ff679f558b8134547582aa83e Author: Martin Nordholts -Date: Sun Jan 31 20:22:24 2010 +0100 +Date: Sun Jan 31 20:22:24 2010 +0100 app: Simplify gimp_dockbook_init() a bit @@ -71920,7 +72758,7 @@ commit 02d3874eb7d1ee3091a06a9f93bf5135cdf6de4d Author: Martin Nordholts -Date: Sun Jan 31 20:21:17 2010 +0100 +Date: Sun Jan 31 20:21:17 2010 +0100 app: Only add "gimp-toolbox" dock to "gimp-toolbox-window" @@ -71929,7 +72767,7 @@ commit bf92270051accdddb19f743b917924915eea91cc Author: Martin Nordholts -Date: Sun Jan 31 18:54:19 2010 +0100 +Date: Sun Jan 31 18:54:19 2010 +0100 app: Don't crash when the toolbox dock window don't have docks @@ -71942,7 +72780,7 @@ commit 1438b9b31ce81a0a42f34bd0eea2f6f3d84e8088 Author: Martin Nordholts -Date: Sun Jan 31 18:55:16 2010 +0100 +Date: Sun Jan 31 18:55:16 2010 +0100 app/tests: Make sessionrc more realistic @@ -71954,7 +72792,7 @@ commit 499b0f1a495e24865529d282a31edc897c8bb09c Author: Michael Natterer -Date: Sun Jan 31 17:54:14 2010 +0100 +Date: Sun Jan 31 17:54:14 2010 +0100 Lower libpng requirement to 1.2.37 to make them stop whining @@ -71963,7 +72801,7 @@ commit 08b7709535aa989741fa34554a41c0de019ce20e Author: Michael Natterer -Date: Sun Jan 31 17:36:56 2010 +0100 +Date: Sun Jan 31 17:36:56 2010 +0100 Bug 604820 - GEGL Operation "path" crashes GIMP @@ -71974,7 +72812,7 @@ commit 74bf91cb63ec9ee64d7f2ab2c1b58f118b0f61e1 Author: Michael Natterer -Date: Sun Jan 31 17:19:51 2010 +0100 +Date: Sun Jan 31 17:19:51 2010 +0100 Bug 603711 - Crashes when using path tool @@ -71987,7 +72825,7 @@ commit 98818f91cfb4e934214fb9e3c6f3b023c883212e Author: Michael Natterer -Date: Sun Jan 31 14:30:08 2010 +0100 +Date: Sun Jan 31 14:30:08 2010 +0100 Fix GimpCoords' default initializer @@ -72000,7 +72838,7 @@ commit 2db98792dcb466ef432ffe15a249466609beba45 Author: Michael Natterer -Date: Sun Jan 31 11:56:36 2010 +0100 +Date: Sun Jan 31 11:56:36 2010 +0100 Bug 607242 - GIMP 2.7.0 fails to build against libpng 1.4.0 @@ -72008,13 +72846,13 @@ use png_set_expand_gray_1_2_4_to_8() instead of the deprecated png_set_gray_1_2_4_to_8(). - configure.ac | 3 ++- + configure.ac | 3 ++- plug-ins/file-ico/ico-load.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) commit a6d052f77464b00d832f0600e74c7960ee13e0c4 Author: Michael Natterer -Date: Sun Jan 31 11:31:19 2010 +0100 +Date: Sun Jan 31 11:31:19 2010 +0100 Bug 607140 - Tags not saved for Paint Dynamics resources on GIMP restart @@ -72026,7 +72864,7 @@ commit 8ba9700ddb8664512124fdfaeb72eae13c8430cb Author: Martin Nordholts -Date: Sat Jan 30 08:59:28 2010 +0100 +Date: Sat Jan 30 08:59:28 2010 +0100 Bug 597368 - Widget spacing around canvas steals working space @@ -72034,12 +72872,12 @@ that space can be used for the actual canvas itself instead. app/display/gimpdisplayshell-appearance.c | 18 ------------------ - app/display/gimpdisplayshell.c | 8 +++----- + app/display/gimpdisplayshell.c | 8 +++----- 2 files changed, 3 insertions(+), 23 deletions(-) commit a3be9db88cee167d810109b903e712a878b90a29 Author: Martin Nordholts -Date: Sat Jan 30 07:35:38 2010 +0100 +Date: Sat Jan 30 07:35:38 2010 +0100 devel-docs: For completeness, distribute all *.txt files @@ -72048,7 +72886,7 @@ commit f77c4009573f8ac8a4578b82477d8f00c66fd561 Author: Martin Nordholts -Date: Sat Jan 30 07:38:25 2010 +0100 +Date: Sat Jan 30 07:38:25 2010 +0100 app/tests: Generalize gimp_test_utils_set_gimp2_directory() @@ -72057,18 +72895,18 @@ the build dir. app/tests/gimp-app-test-utils.c | 16 ++++++++-------- - app/tests/gimp-app-test-utils.h | 3 ++- - app/tests/test-layer-grouping.c | 3 ++- - app/tests/test-layers.c | 3 ++- - app/tests/test-session-management.c | 6 ++++-- - app/tests/test-ui.c | 6 ++++-- - app/tests/test-window-management.c | 6 ++++-- - app/tests/test-xcf.c | 6 ++++-- + app/tests/gimp-app-test-utils.h | 3 ++- + app/tests/test-layer-grouping.c | 3 ++- + app/tests/test-layers.c | 3 ++- + app/tests/test-session-management.c | 6 ++++-- + app/tests/test-ui.c | 6 ++++-- + app/tests/test-window-management.c | 6 ++++-- + app/tests/test-xcf.c | 6 ++++-- 8 files changed, 30 insertions(+), 19 deletions(-) commit 97bbde6e5b1094f62411bc04211721ab97643385 Author: Martin Nordholts -Date: Sat Jan 30 07:31:03 2010 +0100 +Date: Sat Jan 30 07:31:03 2010 +0100 app/tests: Distribute sessionrc-expected @@ -72077,7 +72915,7 @@ commit 0e6ac8b806e2720f4d0c7edadf8fe659138247e3 Author: Alexandre Prokoudine -Date: Sat Jan 30 07:24:31 2010 +0100 +Date: Sat Jan 30 07:24:31 2010 +0100 Bug 560572 - Updated ps-menurc for PS CS4 @@ -72087,7 +72925,7 @@ commit 985f2ae093d9b0645ac9b5011b0934e3025f6967 Author: Martin Nordholts -Date: Sat Jan 30 07:17:35 2010 +0100 +Date: Sat Jan 30 07:17:35 2010 +0100 app/tests: Create gimpdir-output properly @@ -72099,7 +72937,7 @@ commit 71368e9c3b8564d514f8bb7decce6d6e38991640 Author: Martin Nordholts -Date: Sat Jan 30 06:44:58 2010 +0100 +Date: Sat Jan 30 06:44:58 2010 +0100 po-*: Skip plug-ins/ui @@ -72111,17 +72949,17 @@ commit 21c775c25790cf0654953dbb39c1b47c422f46a6 Author: Miloš Popović -Date: Fri Jan 29 21:20:26 2010 +0100 +Date: Fri Jan 29 21:20:26 2010 +0100 Fixed some strings in Serbian translations - po/sr.po | 6 +++--- + po/sr.po | 6 +++--- po/sr@latin.po | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) commit 3612ef2d7656f45b91e5cd15b4b1bf90c5413fc1 Author: Martin Nordholts -Date: Fri Jan 29 18:31:55 2010 +0100 +Date: Fri Jan 29 18:31:55 2010 +0100 app: Have separate output gimpdir for test cases @@ -72140,24 +72978,24 @@ GIMP/GTK+/X/whatever has a tendency to adjust that during runs. The new size is stable for the moment. - app/tests/.gitignore | 1 + - app/tests/Makefile.am | 15 +++++- + app/tests/.gitignore | 1 + + app/tests/Makefile.am | 15 +++++- app/tests/gimp-app-test-utils.c | 70 ++++++++++++-------------- app/tests/gimp-app-test-utils.h | 7 ++- - app/tests/gimpdir/sessionrc | 2 +- + app/tests/gimpdir/sessionrc | 2 +- app/tests/gimpdir/sessionrc-expected | 97 ++++++++++++++++++++++++++++++++++++ app/tests/test-layer-grouping.c | 2 +- - app/tests/test-layers.c | 2 +- + app/tests/test-layers.c | 2 +- app/tests/test-session-management.c | 24 +++++++-- - app/tests/test-ui.c | 5 +- + app/tests/test-ui.c | 5 +- app/tests/test-window-management.c | 5 +- - app/tests/test-xcf.c | 5 +- + app/tests/test-xcf.c | 5 +- 12 files changed, 181 insertions(+), 54 deletions(-) commit 5d9dde1d479bf153f63ee9c03571069fcb8266b2 Author: Martin Nordholts -Date: Fri Jan 29 17:47:30 2010 +0100 +Date: Fri Jan 29 17:47:30 2010 +0100 libgimpbase: Support changing GIMP2_DIRECTORY at run-time @@ -72179,7 +73017,7 @@ commit 35906c38b3d4d1846d2a1af92c9a3ade4f09282c Author: Russell Kyaw -Date: Fri Jan 29 18:25:41 2010 +0200 +Date: Fri Jan 29 18:25:41 2010 +0200 Added Burmese (Myanmar) translation @@ -72192,25 +73030,25 @@ po-script-fu/LINGUAS | 1 + po-script-fu/my.po | 2786 ++++++++++ po-tips/LINGUAS | 1 + - po-tips/my.po | 312 ++ - po/LINGUAS | 1 + - po/my.po | 14428 + po-tips/my.po | 312 ++ + po/LINGUAS | 1 + + po/my.po | 14428 +++++++++++++++++++++++++++++++++++++++++++++++++ 12 files changed, 32492 insertions(+) commit aa2059c5d9bf3e89b43ac1fa3b424ebab7076250 Author: Miloš Popović -Date: Fri Jan 29 00:59:53 2010 +0100 +Date: Fri Jan 29 00:59:53 2010 +0100 Fixed some strings in Serbian translations - po/sr.po | 10 +++++----- + po/sr.po | 10 +++++----- po/sr@latin.po | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) commit dc05c2687e2a92eef75bc3c7e7581d98a2f77262 Author: Michael Natterer -Date: Sun Jan 24 23:55:36 2010 +0100 +Date: Sun Jan 24 23:55:36 2010 +0100 libgimp: add a frame around the color areas again, but only one frame around both @@ -72221,40 +73059,40 @@ commit 2784984059109b88c564d485a7f4d0a9d3602174 Author: Miloš Popović -Date: Sun Jan 24 15:45:27 2010 +0000 +Date: Sun Jan 24 15:45:27 2010 +0000 Updates and Fixed some Serbian translations - po-libgimp/sr.po | 2 +- + po-libgimp/sr.po | 2 +- po-libgimp/sr@latin.po | 2 +- - po-plug-ins/sr.po | 639 ++++++++++++++------------ + po-plug-ins/sr.po | 639 ++++++++++++++------------ po-plug-ins/sr@latin.po | 639 ++++++++++++++------------ - po-tags/LINGUAS | 2 + - po-tags/sr.po | 27 ++ - po-tags/sr@latin.po | 27 ++ - po/sr.po | 1151 + po-tags/LINGUAS | 2 + + po-tags/sr.po | 27 ++ + po-tags/sr@latin.po | 27 ++ + po/sr.po | 1151 +++++++++++++++++++++-------------------------- - po/sr@latin.po | 1151 + po/sr@latin.po | 1151 +++++++++++++++++++++-------------------------- 9 files changed, 1774 insertions(+), 1866 deletions(-) commit bd8af017f5f50ad30201875f9ecc0a2cac8a4f16 Author: Jon Nordby -Date: Sun Jan 24 08:59:55 2010 +0100 +Date: Sun Jan 24 08:59:55 2010 +0100 Bug 605366 - OpenRaster support Add basic OpenRaster support. At the very least, this allows multi-layered .ora files to be shared between MyPaint and GIMP. - plug-ins/pygimp/plug-ins/Makefile.am | 1 + + plug-ins/pygimp/plug-ins/Makefile.am | 1 + plug-ins/pygimp/plug-ins/file-openraster.py | 252 ++++++++++++++++++++++++++++ 2 files changed, 253 insertions(+) commit 835d1b9661eb85e8c6269cbc7bf858a28fe53add Author: Martin Nordholts -Date: Sat Jan 23 11:37:19 2010 +0100 +Date: Sat Jan 23 11:37:19 2010 +0100 devel-docs: Update gimp-schedule.ods @@ -72268,7 +73106,7 @@ commit d008b6db6961a74c5827941cbdadc6487c01ff57 Author: Martin Nordholts -Date: Sat Jan 23 10:47:23 2010 +0100 +Date: Sat Jan 23 10:47:23 2010 +0100 devel-docs: In the schedule, have snapshots instead of updating @@ -72280,7 +73118,7 @@ commit 66a47f6b7ab4ca52fc9ac0773be7a3eca908276e Author: Claude Paroz -Date: Sat Jan 23 11:07:31 2010 +0100 +Date: Sat Jan 23 11:07:31 2010 +0100 Updated French translation @@ -72292,7 +73130,7 @@ commit 436bdd8d895353ed4fb8b91569000b6702bc0765 Author: Claude Paroz -Date: Sat Jan 23 10:05:36 2010 +0100 +Date: Sat Jan 23 10:05:36 2010 +0100 Updated French translation @@ -72304,7 +73142,7 @@ commit 6522fdc9b7f7616f4cd07ddb2aa7bb5a807c8d2f Author: Kretynofil -Date: Sat Jan 23 09:28:49 2010 +0100 +Date: Sat Jan 23 09:28:49 2010 +0100 Bug 598344 - Make 'Current' and 'Old' colors in color selector adjacent @@ -72317,7 +73155,7 @@ commit d31b7c4f5e9d1695554d310361b1ba95bd437ca5 Author: Adi Roiban -Date: Sat Jan 23 01:56:38 2010 +0200 +Date: Sat Jan 23 01:56:38 2010 +0200 Update Romanian translation @@ -72325,13 +73163,13 @@ po-plug-ins/ro.po | 1839 ++++++++++++++++++++++++++++------------------------ po-script-fu/ro.po | 350 ++++++---- - po-tips/ro.po | 311 +++++++-- - po/ro.po | 667 ++++++++++--------- + po-tips/ro.po | 311 +++++++-- + po/ro.po | 667 ++++++++++--------- 5 files changed, 1981 insertions(+), 1455 deletions(-) commit c094736f83e8847df9408de88116a41ffe189c61 Author: Martin Nordholts -Date: Fri Jan 22 21:00:17 2010 +0100 +Date: Fri Jan 22 21:00:17 2010 +0100 app: Remove accidentally commited g_printerr() @@ -72340,7 +73178,7 @@ commit ba37aaa5328630ec423c1d56766469b7e2c96dc2 Author: Martin Nordholts -Date: Fri Jan 22 20:48:34 2010 +0100 +Date: Fri Jan 22 20:48:34 2010 +0100 app: Support multi-column DnD in toolbox window @@ -72356,7 +73194,7 @@ commit 613b330bc0c3b05f30a2e587951f905631fc29e6 Author: Martin Nordholts -Date: Thu Jan 21 21:00:31 2010 +0100 +Date: Thu Jan 21 21:00:31 2010 +0100 app: Clarify why we need URI drop target on toolbox @@ -72365,7 +73203,7 @@ commit 1093462ae9777a7f8446eda13735a9348b43ecb1 Author: Martin Nordholts -Date: Wed Jan 20 18:29:54 2010 +0100 +Date: Wed Jan 20 18:29:54 2010 +0100 app: Merge 'global_toolbox_factory' into 'global_dock_factory' @@ -72385,30 +73223,30 @@ differentiate between the "gimp-dock" and "gimp-toolbox" dock types. - app/actions/windows-commands.c | 7 +++-- - app/dialogs/dialogs-constructors.c | 6 +--- - app/dialogs/dialogs.c | 54 + app/actions/windows-commands.c | 7 +++-- + app/dialogs/dialogs-constructors.c | 6 +--- + app/dialogs/dialogs.c | 54 ++++----------------------------- - app/dialogs/dialogs.h | 1 - - app/gui/gimpuiconfigurer.c | 38 ++++++++++++++--------- - app/gui/session.c | 10 ++++++- - app/tests/gimpdir/dockrc | 4 +-- - app/tests/test-window-management.c | 8 +++-- - app/widgets/gimpdialogfactory.c | 55 + app/dialogs/dialogs.h | 1 - + app/gui/gimpuiconfigurer.c | 38 ++++++++++++++--------- + app/gui/session.c | 10 ++++++- + app/tests/gimpdir/dockrc | 4 +-- + app/tests/test-window-management.c | 8 +++-- + app/widgets/gimpdialogfactory.c | 55 +++++++++++----------------------- - app/widgets/gimpdialogfactory.h | 3 +- - app/widgets/gimpdockable.c | 3 +- - app/widgets/gimpdockwindow.c | 26 ++++++++++++++++ - app/widgets/gimpdockwindow.h | 2 ++ - app/widgets/gimpsessioninfo-dock.c | 37 +++++++++++++---------- - app/widgets/gimpsessioninfo-dock.h | 8 +++-- + app/widgets/gimpdialogfactory.h | 3 +- + app/widgets/gimpdockable.c | 3 +- + app/widgets/gimpdockwindow.c | 26 ++++++++++++++++ + app/widgets/gimpdockwindow.h | 2 ++ + app/widgets/gimpsessioninfo-dock.c | 37 +++++++++++++---------- + app/widgets/gimpsessioninfo-dock.h | 8 +++-- app/widgets/gimpsessioninfo-dockable.c | 14 ++++----- - app/widgets/gimpsessioninfo.c | 36 ++++++++++++++++++++-- + app/widgets/gimpsessioninfo.c | 36 ++++++++++++++++++++-- 17 files changed, 167 insertions(+), 145 deletions(-) commit dd8b867852efccc00eda94244ef1f27dc1a145b7 Author: Martin Nordholts -Date: Tue Jan 19 23:18:30 2010 +0100 +Date: Tue Jan 19 23:18:30 2010 +0100 app: Kill #if-zeroed GimpContext code that doesn't seem to be needed @@ -72417,7 +73255,7 @@ commit 2604db71a872eae33205de339d670ab8a5a49b89 Author: Martin Nordholts -Date: Tue Jan 19 23:15:37 2010 +0100 +Date: Tue Jan 19 23:15:37 2010 +0100 app: Don't yell in FIXME, explain instead @@ -72426,7 +73264,7 @@ commit 84dd0d5241e30f7bfa046b866e5b01a5d2aebb5d Author: Martin Nordholts -Date: Tue Jan 19 23:05:45 2010 +0100 +Date: Tue Jan 19 23:05:45 2010 +0100 app: Remove windows_commands_get_toolbox(), use dialog variant @@ -72438,7 +73276,7 @@ commit 66197c5d11a670c459e7fe8d8bcdc46f0784b226 Author: Martin Nordholts -Date: Tue Jan 19 22:40:06 2010 +0100 +Date: Tue Jan 19 22:40:06 2010 +0100 app: global_dock_window_factory -> global_dock_factory @@ -72448,32 +73286,32 @@ create non-toplevel dockables, but I don't expect this to happen in the forseeable future. - app/actions/data-commands.c | 2 +- - app/actions/dialogs-commands.c | 2 +- - app/actions/edit-commands.c | 2 +- - app/actions/select-commands.c | 2 +- - app/actions/view-commands.c | 2 +- - app/actions/windows-actions.c | 8 +++---- - app/actions/windows-commands.c | 4 ++-- - app/dialogs/dialogs-constructors.c | 8 +++---- - app/dialogs/dialogs.c | 39 + app/actions/data-commands.c | 2 +- + app/actions/dialogs-commands.c | 2 +- + app/actions/edit-commands.c | 2 +- + app/actions/select-commands.c | 2 +- + app/actions/view-commands.c | 2 +- + app/actions/windows-actions.c | 8 +++---- + app/actions/windows-commands.c | 4 ++-- + app/dialogs/dialogs-constructors.c | 8 +++---- + app/dialogs/dialogs.c | 39 +++++++++++++++++----------------- - app/dialogs/dialogs.h | 2 +- - app/gui/gimpuiconfigurer.c | 8 +++---- - app/gui/gui-message.c | 4 ++-- - app/gui/gui-vtable.c | 2 +- - app/gui/gui.c | 2 +- - app/menus/windows-menu.c | 8 +++---- - app/tests/test-window-management.c | 2 +- - app/widgets/gimpdialogfactory.c | 5 ----- - app/widgets/gimpdockable.c | 2 +- - app/widgets/gimpsessioninfo-dock.c | 5 ----- + app/dialogs/dialogs.h | 2 +- + app/gui/gimpuiconfigurer.c | 8 +++---- + app/gui/gui-message.c | 4 ++-- + app/gui/gui-vtable.c | 2 +- + app/gui/gui.c | 2 +- + app/menus/windows-menu.c | 8 +++---- + app/tests/test-window-management.c | 2 +- + app/widgets/gimpdialogfactory.c | 5 ----- + app/widgets/gimpdockable.c | 2 +- + app/widgets/gimpsessioninfo-dock.c | 5 ----- app/widgets/gimpsessioninfo-dockable.c | 2 +- 20 files changed, 50 insertions(+), 61 deletions(-) commit 56a8cb68a891e7f769195e7794deb91f6d7c2293 Author: Martin Nordholts -Date: Tue Jan 19 22:23:23 2010 +0100 +Date: Tue Jan 19 22:23:23 2010 +0100 app: Have dialog factory entries for the dock windows @@ -72488,20 +73326,20 @@ * We make sure that we still can handle sessionrc files from GIMP 2.6 and older - app/dialogs/dialogs.c | 50 ++++++++++++- - app/gui/gimpuiconfigurer.c | 28 ++++--- - app/gui/session.c | 56 ++++++++------ + app/dialogs/dialogs.c | 50 ++++++++++++- + app/gui/gimpuiconfigurer.c | 28 ++++--- + app/gui/session.c | 56 ++++++++------ app/widgets/gimpdialogfactory.c | 146 ++++++++++--------------------------- - app/widgets/gimpdialogfactory.h | 4 - - app/widgets/gimpsessioninfo-dock.c | 2 +- - app/widgets/gimpsessioninfo.c | 69 +++++++----------- - app/widgets/gimptoolbox.c | 10 ++- + app/widgets/gimpdialogfactory.h | 4 - + app/widgets/gimpsessioninfo-dock.c | 2 +- + app/widgets/gimpsessioninfo.c | 69 +++++++----------- + app/widgets/gimptoolbox.c | 10 ++- 8 files changed, 168 insertions(+), 197 deletions(-) commit 862ae52d4ee236a78e95cccef70e878ad84bd718 Author: Martin Nordholts -Date: Sun Jan 17 20:08:32 2010 +0100 +Date: Sun Jan 17 20:08:32 2010 +0100 devel-docs: Add a paragraph about sessionrc @@ -72510,7 +73348,7 @@ commit 11e8ff8db65132bebdbdfae2f61d8c9b105805a3 Author: Petr Kovar -Date: Sun Jan 17 22:04:01 2010 +0100 +Date: Sun Jan 17 22:04:01 2010 +0100 Updated Czech translation by Marek Cernocky @@ -72522,7 +73360,7 @@ commit eac902d065c3b9d5798465aa5be0841f4671d7a8 Author: Michael Natterer -Date: Sun Jan 17 16:50:49 2010 +0100 +Date: Sun Jan 17 16:50:49 2010 +0100 libgimp: use gtk_widget_get_visible() instead of GTK_WIDGET_VISIBLE() @@ -72531,7 +73369,7 @@ commit 5876d1d5e64738f3110d87d986bb802e8b40d0e4 Author: Khaled Hosny -Date: Sun Jan 17 13:23:34 2010 +0200 +Date: Sun Jan 17 13:23:34 2010 +0200 Updated Arabic translation @@ -72540,14 +73378,14 @@ ++++++++++++++++++++++++++++------------------------ po-python/ar.po | 190 +- po-script-fu/ar.po | 232 +- - po-tags/LINGUAS | 1 + - po-tags/ar.po | 27 + - po-tips/ar.po | 48 +- + po-tags/LINGUAS | 1 + + po-tags/ar.po | 27 + + po-tips/ar.po | 48 +- 7 files changed, 4531 insertions(+), 3784 deletions(-) commit cc94e5f608eee3c2098dc1aa6b5cf6dacf268c2a Author: Khaled Hosny -Date: Sun Jan 17 13:07:37 2010 +0200 +Date: Sun Jan 17 13:07:37 2010 +0200 Fix renamed file @@ -72556,7 +73394,7 @@ commit 8c10d1c4519c5dd968ea241c3b2c54d48c95f68a Author: Martin Nordholts -Date: Sun Jan 17 10:35:28 2010 +0100 +Date: Sun Jan 17 10:35:28 2010 +0100 app/tests: Add simple tests to switch to and from single-window mode @@ -72566,7 +73404,7 @@ commit 4c9fd7cffba813971d288f609798e01e12150ece Author: Khaled Hosny -Date: Sun Jan 17 11:24:05 2010 +0200 +Date: Sun Jan 17 11:24:05 2010 +0200 Updated Arabic translation @@ -72576,7 +73414,7 @@ commit b0fb45647d9ff1e672c42e5e906bcdca416fd892 Author: Martin Nordholts -Date: Sun Jan 17 00:01:35 2010 +0100 +Date: Sun Jan 17 00:01:35 2010 +0100 devel-docs: Add paragraph about GimpDialogFactory to ui-framework.txt @@ -72585,7 +73423,7 @@ commit 408c22b79e9571f2fa19ba002e8ee66c91409bac Author: Martin Nordholts -Date: Sun Jan 17 00:00:19 2010 +0100 +Date: Sun Jan 17 00:00:19 2010 +0100 app: Use the dialog factory for creating docks @@ -72605,7 +73443,7 @@ +++++++++++++++++++++++++++++++++++--- app/dialogs/dialogs-constructors.h | 60 ++++++++++++++++++++++++++++++++++-- - app/dialogs/dialogs.c | 24 ++++++++++++--- + app/dialogs/dialogs.c | 24 ++++++++++++--- app/widgets/gimpdialogfactory.c | 47 ++++++++++++++++------------ app/widgets/gimpdialogfactory.h | 13 ++++---- app/widgets/gimpsessioninfo-dock.c | 19 +++++++++++- @@ -72613,7 +73451,7 @@ commit 0e9f4342778551f52314c7d0c550da61487ec018 Author: Martin Nordholts -Date: Sat Jan 16 23:51:23 2010 +0100 +Date: Sat Jan 16 23:51:23 2010 +0100 app/tests: Explain why gimp_test_utils_get_source_subdir() might fail @@ -72622,7 +73460,7 @@ commit f8060aed2712504701a00a1a472198c925b84273 Author: Martin Nordholts -Date: Sat Jan 16 23:05:18 2010 +0100 +Date: Sat Jan 16 23:05:18 2010 +0100 app/tests: Add "/gimp-ui/create-new-image-via-dialog" test @@ -72636,7 +73474,7 @@ commit a259d467166413b2e4fe77d909539e341c11c9ff Author: Martin Nordholts -Date: Sat Jan 16 21:47:15 2010 +0100 +Date: Sat Jan 16 21:47:15 2010 +0100 app/tests: Add "gimp-image-new-dialog" to sessionrc @@ -72648,7 +73486,7 @@ commit db2221c97d0532b2a558ba44fb80f2b4e39c2c0a Author: Martin Nordholts -Date: Sat Jan 16 21:22:56 2010 +0100 +Date: Sat Jan 16 21:22:56 2010 +0100 app: Fix gimp_dialog_factory_constructor() @@ -72660,7 +73498,7 @@ commit 08078ca79c0e666e5015b422433187a66e060164 Author: Martin Nordholts -Date: Sat Jan 16 19:43:33 2010 +0100 +Date: Sat Jan 16 19:43:33 2010 +0100 app: Remove gimp_dialog_factory_set_put_in_dockables() @@ -72670,7 +73508,7 @@ is being moved in: try to keep information per-entry rather than per-factory. - app/dialogs/dialogs.c | 2 - + app/dialogs/dialogs.c | 2 - app/widgets/gimpdialogfactory.c | 91 +++++++++++------------------------------ app/widgets/gimpdialogfactory.h | 6 +-- @@ -72678,21 +73516,21 @@ commit 2527955c21e80a5213579979a1e77751827e0e1c Author: Martin Nordholts -Date: Sat Jan 16 19:35:26 2010 +0100 +Date: Sat Jan 16 19:35:26 2010 +0100 app: Copy 'dockable' member in gimp_dialog_factory_register_entry() Copying 'dockable' for a dialog factory entry was forgotten in gimp_dialog_factory_register_entry(). - app/dialogs/dialogs.c | 7 +++++-- + app/dialogs/dialogs.c | 7 +++++-- app/widgets/gimpdialogfactory.c | 4 +++- app/widgets/gimpdialogfactory.h | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) commit deb07e812dd8eddf84a1cd7e636e8588a7368bef Author: Martin Nordholts -Date: Sat Jan 16 17:54:56 2010 +0100 +Date: Sat Jan 16 17:54:56 2010 +0100 app: Introduce gimp_dialog_factory_set_put_in_dockables() @@ -72713,7 +73551,7 @@ app/dialogs/dialogs-constructors.c | 29 ------------- app/dialogs/dialogs-constructors.h | 5 --- - app/dialogs/dialogs.c | 6 +-- + app/dialogs/dialogs.c | 6 +-- app/widgets/gimpdialogfactory.c | 83 +++++++++++++++++++++++++++++++------- app/widgets/gimpdialogfactory.h | 8 +--- @@ -72721,7 +73559,7 @@ commit 73445668a65d908532afdf2b6f5d0e83ac468f15 Author: Michael Natterer -Date: Sat Jan 16 15:12:50 2010 +0100 +Date: Sat Jan 16 15:12:50 2010 +0100 app: remove #undef GSEAL_ENABLE, this file is completely ported @@ -72730,7 +73568,7 @@ commit fa6fc65fbf9016161e3e6b6ccbfd9561258ead20 Author: Michael Natterer -Date: Sat Jan 16 11:23:53 2010 +0100 +Date: Sat Jan 16 11:23:53 2010 +0100 app: port one more file to GSEAL_ENABLE @@ -72741,7 +73579,7 @@ commit 038ea9474d9f0fe6877376d1cc3640b1bde8d3b8 Author: Martin Nordholts -Date: Fri Jan 15 22:39:10 2010 +0100 +Date: Fri Jan 15 22:39:10 2010 +0100 devel-docs: Add a schedule for development @@ -72762,7 +73600,7 @@ commit 7175f3e883d8cdf43d12276f5bd5f592f6e82c14 Author: Michael Natterer -Date: Fri Jan 15 15:33:08 2010 +0100 +Date: Fri Jan 15 15:33:08 2010 +0100 Some more changes to build with GSEAL_ENABLE @@ -72770,34 +73608,34 @@ - remove quite some #undef GSEAL_ENABLE from completely ported files app/display/gimpdisplayshell-callbacks.c | 2 +- - app/display/gimpdisplayshell.c | 2 -- - app/widgets/gimpcurveview.c | 24 ++++++++++++++-------- - app/widgets/gimpdasheditor.c | 20 ++++++++++-------- - app/widgets/gimpdockable.c | 24 ++++++++++++++-------- - app/widgets/gimpdockbook.c | 9 ++++---- - app/widgets/gimpfgbgeditor.c | 23 +++++++++++++-------- - app/widgets/gimpfgbgview.c | 13 ++++++------ - app/widgets/gimpgradienteditor.c | 16 +++++++++++---- - app/widgets/gimphandlebar.c | 35 + app/display/gimpdisplayshell.c | 2 -- + app/widgets/gimpcurveview.c | 24 ++++++++++++++-------- + app/widgets/gimpdasheditor.c | 20 ++++++++++-------- + app/widgets/gimpdockable.c | 24 ++++++++++++++-------- + app/widgets/gimpdockbook.c | 9 ++++---- + app/widgets/gimpfgbgeditor.c | 23 +++++++++++++-------- + app/widgets/gimpfgbgview.c | 13 ++++++------ + app/widgets/gimpgradienteditor.c | 16 +++++++++++---- + app/widgets/gimphandlebar.c | 35 ++++++++++++++++++++++---------- - app/widgets/gimphistogrameditor.c | 2 -- - app/widgets/gimphistogramview.c | 25 +++++++++++++++-------- - app/widgets/gimpmessagebox.c | 4 +--- - app/widgets/gimpnavigationview.c | 11 +++++----- - app/widgets/gimppaletteview.c | 16 +++++++++------ - app/widgets/gimpprogressbox.c | 7 ++++--- - app/widgets/gimpscalebutton.c | 15 +++++++------- - app/widgets/gimpstrokeeditor.c | 14 +++++++------ - app/widgets/gimptoolbox.c | 9 +++++--- - app/widgets/gimpview-popup.c | 8 ++++++-- - app/widgets/gimpview.c | 19 +++++++++++------ - app/widgets/gimpwidgets-utils.c | 15 ++++++++------ + app/widgets/gimphistogrameditor.c | 2 -- + app/widgets/gimphistogramview.c | 25 +++++++++++++++-------- + app/widgets/gimpmessagebox.c | 4 +--- + app/widgets/gimpnavigationview.c | 11 +++++----- + app/widgets/gimppaletteview.c | 16 +++++++++------ + app/widgets/gimpprogressbox.c | 7 ++++--- + app/widgets/gimpscalebutton.c | 15 +++++++------- + app/widgets/gimpstrokeeditor.c | 14 +++++++------ + app/widgets/gimptoolbox.c | 9 +++++--- + app/widgets/gimpview-popup.c | 8 ++++++-- + app/widgets/gimpview.c | 19 +++++++++++------ + app/widgets/gimpwidgets-utils.c | 15 ++++++++------ plug-ins/script-fu/script-fu-console.c | 17 ++++++++++------ 23 files changed, 204 insertions(+), 126 deletions(-) commit 67365732d4494ecddc7f54c8f1476e098da394ef Author: Alexandre Prokoudine -Date: Fri Jan 15 00:44:17 2010 +0300 +Date: Fri Jan 15 00:44:17 2010 +0300 Updated Russian translation @@ -72807,7 +73645,7 @@ commit 3feb38151bb9ba659b77b3460ba5672ddd6f01c7 Author: Daniel Nylander -Date: Wed Jan 13 20:40:26 2010 +0100 +Date: Wed Jan 13 20:40:26 2010 +0100 Updated Swedish translation @@ -72816,7 +73654,7 @@ commit 1e20cac35759b391a78367d7fcfaffbacf0b4126 Author: Daniel Nylander -Date: Wed Jan 13 20:39:40 2010 +0100 +Date: Wed Jan 13 20:39:40 2010 +0100 Updated Swedish translation @@ -72826,22 +73664,19 @@ commit d2406fd4c350a13b77b87f0996bb8d91e8a22a4a Author: Michael Natterer -Date: Tue Jan 12 22:02:51 2010 +0100 +Date: Tue Jan 12 22:02:51 2010 +0100 plug-ins: move the UI file to datadir/ui/plug-ins/plug-in-file-png.ui - plug-ins/Makefile.am | 2 +- - plug-ins/common/file-png.c | 5 +- - plug-ins/ui/Makefile.am | 4 +- - plug-ins/ui/file-png.ui | 226 - ---------------------------------------- - plug-ins/ui/plug-in-file-png.ui | 226 - ++++++++++++++++++++++++++++++++++++++++ - 5 files changed, 233 insertions(+), 230 deletions(-) + plug-ins/Makefile.am | 2 +- + plug-ins/common/file-png.c | 5 ++++- + plug-ins/ui/Makefile.am | 4 ++-- + plug-ins/ui/{file-png.ui => plug-in-file-png.ui} | 0 + 4 files changed, 7 insertions(+), 4 deletions(-) commit 9317bb454813aa8cd24dfa8f01d834a3174767cc Author: Sven Neumann -Date: Tue Jan 12 21:12:40 2010 +0100 +Date: Tue Jan 12 21:12:40 2010 +0100 plug-ins: fix error reporting and a compiler warning @@ -72850,7 +73685,7 @@ commit d3dde03b78d402d5f826103ebf20e88d49564f17 Author: Alexia Death -Date: Sat Jan 2 15:23:09 2010 +0200 +Date: Sat Jan 2 15:23:09 2010 +0200 app: Fix a tug of war with scrollbars when middle click panning. @@ -72862,7 +73697,7 @@ commit 7c32f5442adf392d1035e28b235608356038591c Author: Martin Nordholts -Date: Sat Jan 9 20:02:53 2010 +0100 +Date: Sat Jan 9 20:02:53 2010 +0100 plug-ins: Check for errors when loading file-png.ui @@ -72874,7 +73709,7 @@ commit b883d59411dfde28fb0704fa2790e602999f7f6f Author: Sven Neumann -Date: Sat Jan 9 12:12:12 2010 +0100 +Date: Sat Jan 9 12:12:12 2010 +0100 Bug 606372 - Saving to .ppm fails on indexed colorspace @@ -72885,7 +73720,7 @@ commit 0abf5cc4f077384c13131fe840e42a7833401390 Author: Martin Nordholts -Date: Fri Jan 8 00:05:20 2010 +0100 +Date: Fri Jan 8 00:05:20 2010 +0100 Use Glade + GtkBuilder for file-png.c save_dialog() @@ -72893,19 +73728,19 @@ dialog in the PNG plug-in. The layout is as good as identical. Mnemonics still works and strings are still translated. - configure.ac | 1 + - plug-ins/Makefile.am | 1 + + configure.ac | 1 + + plug-ins/Makefile.am | 1 + plug-ins/common/file-png.c | 202 +++++++++++++++------------------------- - plug-ins/ui/.gitignore | 2 + - plug-ins/ui/Makefile.am | 6 ++ + plug-ins/ui/.gitignore | 2 + + plug-ins/ui/Makefile.am | 6 ++ plug-ins/ui/file-png.ui | 226 +++++++++++++++++++++++++++++++++++++++++++++ - po-plug-ins/POTFILES.in | 1 + + po-plug-ins/POTFILES.in | 1 + 7 files changed, 313 insertions(+), 126 deletions(-) commit e87c77bcfc96adfc0bb1eebfe4f0b3acbce9cd67 Author: Martin Nordholts -Date: Fri Jan 8 15:04:35 2010 +0100 +Date: Fri Jan 8 15:04:35 2010 +0100 app: Allow tests to override the menus directory @@ -72915,44 +73750,44 @@ app/tests/gimp-app-test-utils.c | 34 ++++++++++++++++++++++++++++++++++ - app/tests/gimp-app-test-utils.h | 4 +++- - app/tests/test-session-management.c | 1 + - app/tests/test-ui.c | 1 + - app/widgets/gimpuimanager.c | 14 +++++++++++--- + app/tests/gimp-app-test-utils.h | 4 +++- + app/tests/test-session-management.c | 1 + + app/tests/test-ui.c | 1 + + app/widgets/gimpuimanager.c | 14 +++++++++++--- 5 files changed, 50 insertions(+), 4 deletions(-) commit 33e8b08f12de5ada1cd541d6c49acde137a8048c Author: Martin Nordholts -Date: Fri Jan 8 13:37:25 2010 +0100 +Date: Fri Jan 8 13:37:25 2010 +0100 app/tests: Distribute test files and test directories - app/tests/Makefile.am | 5 +++++ - app/tests/files/Makefile.am | 2 ++ - app/tests/gimpdir-empty/Makefile.am | 7 +++++++ + app/tests/Makefile.am | 5 +++++ + app/tests/files/Makefile.am | 2 ++ + app/tests/gimpdir-empty/Makefile.am | 7 +++++++ app/tests/gimpdir-empty/brushes/Makefile.am | 1 + app/tests/gimpdir-empty/gradients/Makefile.am | 1 + app/tests/gimpdir-empty/patterns/Makefile.am | 1 + - app/tests/gimpdir/Makefile.am | 9 +++++++++ - app/tests/gimpdir/brushes/Makefile.am | 1 + + app/tests/gimpdir/Makefile.am | 9 +++++++++ + app/tests/gimpdir/brushes/Makefile.am | 1 + app/tests/gimpdir/gradients/Makefile.am | 1 + app/tests/gimpdir/patterns/Makefile.am | 1 + - configure.ac | 9 +++++++++ + configure.ac | 9 +++++++++ 11 files changed, 38 insertions(+) commit 4b8b8f4dde97c73819e495cb1d153729e1615042 Author: Martin Nordholts -Date: Fri Jan 8 12:05:13 2010 +0100 +Date: Fri Jan 8 12:05:13 2010 +0100 Update gimprc docs/gimprc.5.in | 42 ++++++++++++++++++++++++++++++++++++++++-- - etc/gimprc | 37 +++++++++++++++++++++++++++++++++++-- + etc/gimprc | 37 +++++++++++++++++++++++++++++++++++-- 2 files changed, 75 insertions(+), 4 deletions(-) commit d03ebe7fed1006cc2f909cde4abc1ebb68b07e17 Author: Martin Nordholts -Date: Fri Jan 8 11:41:45 2010 +0100 +Date: Fri Jan 8 11:41:45 2010 +0100 po: Add app/widgets/gimpdockwindow.c to POTFILES.in @@ -72961,7 +73796,7 @@ commit bcedff3234d1eedd57664fe00e03c9610c39ac76 Author: Martin Nordholts -Date: Fri Jan 8 11:21:26 2010 +0100 +Date: Fri Jan 8 11:21:26 2010 +0100 data: Add obsoletegradientdata_DATA to EXTRA_DIST @@ -72970,7 +73805,7 @@ commit cf31690eaf4e2b64b2cf7edca14ccb254dd3287e Author: Martin Nordholts -Date: Fri Jan 8 11:06:56 2010 +0100 +Date: Fri Jan 8 11:06:56 2010 +0100 libgimp: Update gimp.def with new symbols @@ -72979,7 +73814,7 @@ commit 857dc9d85e8f576c947755b4072d8c8239733742 Author: Martin Nordholts -Date: Fri Jan 8 11:06:46 2010 +0100 +Date: Fri Jan 8 11:06:46 2010 +0100 libgimp: Cleanup gimp.def @@ -72989,7 +73824,7 @@ commit 5d79f664d3d08451e456a779b03b65b72578f0ee Author: Martin Nordholts -Date: Thu Jan 7 19:18:03 2010 +0100 +Date: Thu Jan 7 19:18:03 2010 +0100 app: Add "dialog-factory", "ui-manager" properties to GimpDockColumns @@ -73007,7 +73842,7 @@ commit bc5da21ba275e9c87975c25bd00524c7b04f80dc Author: Martin Nordholts -Date: Thu Jan 7 19:13:13 2010 +0100 +Date: Thu Jan 7 19:13:13 2010 +0100 app: Add gimp_dock_columns_new() and GimpContext property @@ -73025,7 +73860,7 @@ commit 33573b466b4aeda9c2461e3d111085a5194d0ee6 Author: Martin Nordholts -Date: Wed Jan 6 18:19:20 2010 +0100 +Date: Wed Jan 6 18:19:20 2010 +0100 app: Check for dirty images before forcing single-window mode @@ -73039,7 +73874,7 @@ commit 5c4154d4383f1b63fa08068b04f683d940b919d1 Author: Martin Nordholts -Date: Wed Jan 6 15:10:32 2010 +0100 +Date: Wed Jan 6 15:10:32 2010 +0100 app: Don't remove the toolbox dock from dock columns @@ -73051,7 +73886,7 @@ commit f1bbb2c70a7afe635c2a1fea7e7b86f3ad8f8c88 Author: Martin Nordholts -Date: Wed Jan 6 14:49:13 2010 +0100 +Date: Wed Jan 6 14:49:13 2010 +0100 app: Fix menubar suddently stopping to work when toggling window modes @@ -73080,7 +73915,7 @@ commit fecc04914e051a502c62cbdeeedbddb0330534da Author: Martin Nordholts -Date: Wed Jan 6 14:44:24 2010 +0100 +Date: Wed Jan 6 14:44:24 2010 +0100 app: gimp_image_window_page_removed() gets the widget, not page @@ -73093,7 +73928,7 @@ commit 17b36d3bec957bd2e3ff74f828bb44bbed56be95 Author: Michael Schumacher -Date: Sat Dec 19 09:29:07 2009 +0100 +Date: Sat Dec 19 09:29:07 2009 +0100 Fix some compile warnings on Microsoft Windows @@ -73104,7 +73939,7 @@ commit 0902cd4136f00b11b4a29f7c8c3e92db726678f7 Author: Martin Nordholts -Date: Wed Jan 6 13:34:25 2010 +0100 +Date: Wed Jan 6 13:34:25 2010 +0100 devel-docs: Update contexts.txt with single-window mode @@ -73113,7 +73948,7 @@ commit 3015b0d0d020831af2a91cfcadc9b11a616eec2c Author: Martin Nordholts -Date: Wed Jan 6 13:33:47 2010 +0100 +Date: Wed Jan 6 13:33:47 2010 +0100 app: Update docks with new context when switching to window modes @@ -73130,7 +73965,7 @@ commit eae77112e105dfc682e6184a747542fd77557d6e Author: Martin Nordholts -Date: Wed Jan 6 11:35:37 2010 +0100 +Date: Wed Jan 6 11:35:37 2010 +0100 app: Bail out, not fail, in gimp_view_render_to_surface() buffer test @@ -73144,19 +73979,19 @@ commit 7e5224f82883c0c58c26a02090d9ce3c828f288e Author: Martin Nordholts -Date: Wed Jan 6 11:35:25 2010 +0100 +Date: Wed Jan 6 11:35:25 2010 +0100 app: Add and use gimp_dock_window_new() app/dialogs/dialogs-constructors.c | 24 ++++++++---------- - app/widgets/gimpdockwindow.c | 19 ++++++++++++++ - app/widgets/gimpdockwindow.h | 51 + app/widgets/gimpdockwindow.c | 19 ++++++++++++++ + app/widgets/gimpdockwindow.h | 51 +++++++++++++++++++++----------------- 3 files changed, 57 insertions(+), 37 deletions(-) commit cf84a36620f6340d36ab35a29afe2ed3a43e6e46 Author: Sven Neumann -Date: Tue Jan 5 22:29:35 2010 +0100 +Date: Tue Jan 5 22:29:35 2010 +0100 po: add app/widgets/gimptranslationstore.c @@ -73165,7 +74000,7 @@ commit 8f6fea7636118eb427b1497a353aaa446b0a1e16 Author: Sven Neumann -Date: Thu Dec 31 14:13:11 2009 +0100 +Date: Thu Dec 31 14:13:11 2009 +0100 app: prepare another refactoring @@ -73175,12 +74010,12 @@ app/widgets/gimplanguageentry.h | 8 ++++---- app/widgets/gimplanguagestore.c | 32 +++++++++++++++----------------- app/widgets/gimplanguagestore.h | 8 ++++---- - app/widgets/gimppropwidgets.c | 12 ++++++------ + app/widgets/gimppropwidgets.c | 12 ++++++------ 7 files changed, 49 insertions(+), 51 deletions(-) commit 50c2ba45ec5ca23322442d5cc6491ab6a627ce20 Author: Sven Neumann -Date: Wed Dec 30 23:55:26 2009 +0100 +Date: Wed Dec 30 23:55:26 2009 +0100 app: add GimpTranslationStore class @@ -73188,54 +74023,54 @@ installed GIMP translations. Also sort the list alphabetically instead of relying on the XML file being sorted. - app/app.c | 2 - - app/widgets/Makefile.am | 2 + - app/widgets/gimplanguagecombobox.c | 6 +- - app/widgets/gimplanguageentry.c | 3 +- + app/app.c | 2 - + app/widgets/Makefile.am | 2 + + app/widgets/gimplanguagecombobox.c | 6 +- + app/widgets/gimplanguageentry.c | 3 +- app/widgets/gimplanguagestore-parser.c | 54 +++++---- app/widgets/gimplanguagestore-parser.h | 6 +- - app/widgets/gimplanguagestore.c | 113 +++++++++++++++++-- - app/widgets/gimplanguagestore.h | 17 ++- - app/widgets/gimptranslationstore.c | 196 + app/widgets/gimplanguagestore.c | 113 +++++++++++++++++-- + app/widgets/gimplanguagestore.h | 17 ++- + app/widgets/gimptranslationstore.c | 196 +++++++++++++++++++++++++++++++++ - app/widgets/gimptranslationstore.h | 44 ++++++++ - app/widgets/widgets-types.h | 1 + + app/widgets/gimptranslationstore.h | 44 ++++++++ + app/widgets/widgets-types.h | 1 + 11 files changed, 396 insertions(+), 48 deletions(-) commit d2804b48fbb009ee22134cb982de5e46684ca412 Author: Sven Neumann -Date: Wed Dec 30 22:21:54 2009 +0100 +Date: Wed Dec 30 22:21:54 2009 +0100 app: add GimpLanguageComboBox and use it from the Preferences dialog - app/config/gimprc-blurbs.h | 2 +- + app/config/gimprc-blurbs.h | 2 +- app/dialogs/preferences-dialog.c | 25 ++++++++ - app/widgets/Makefile.am | 2 + + app/widgets/Makefile.am | 2 + app/widgets/gimplanguagecombobox.c | 126 +++++++++++++++++++++++++++++++++++++ app/widgets/gimplanguagecombobox.h | 50 +++++++++++++++ - app/widgets/gimplanguageentry.c | 7 ++- - app/widgets/gimppropwidgets.c | 99 +++++++++++++++++++++++++++++ - app/widgets/gimppropwidgets.h | 6 +- - app/widgets/widgets-types.h | 5 +- + app/widgets/gimplanguageentry.c | 7 ++- + app/widgets/gimppropwidgets.c | 99 +++++++++++++++++++++++++++++ + app/widgets/gimppropwidgets.h | 6 +- + app/widgets/widgets-types.h | 5 +- 9 files changed, 316 insertions(+), 6 deletions(-) commit a56de78b0115960dcc09e12a4b5a7eb9cf6630d8 Author: Sven Neumann -Date: Wed Dec 30 00:38:31 2009 +0100 +Date: Wed Dec 30 00:38:31 2009 +0100 app: add "language" gimprc option and set the language accordingly - app/app.c | 28 +++++++++++++++++++++++++--- + app/app.c | 28 +++++++++++++++++++++++++--- app/config/gimpcoreconfig.c | 14 ++++++++++++++ - app/config/gimpcoreconfig.h | 1 + - app/config/gimprc-blurbs.h | 3 +++ - app/main.c | 6 ++++++ + app/config/gimpcoreconfig.h | 1 + + app/config/gimprc-blurbs.h | 3 +++ + app/main.c | 6 ++++++ 5 files changed, 49 insertions(+), 3 deletions(-) commit efbf581d616e57eb18863fdca7d21ff73326bbdb Author: Martin Nordholts -Date: Tue Jan 5 21:19:12 2010 +0100 +Date: Tue Jan 5 21:19:12 2010 +0100 app: Add newline at end of gimpbrush-transform.c @@ -73244,7 +74079,7 @@ commit 6fb317598ea27c420913790b4507a9ad4894cca1 Author: Martin Nordholts -Date: Tue Jan 5 18:28:09 2010 +0100 +Date: Tue Jan 5 18:28:09 2010 +0100 app: Add TODO with importance of killing config -> display dependency @@ -73257,7 +74092,7 @@ commit 70d30207f04ac6a7d4e8c8eb957c6cfe43e6dcf0 Author: Martin Nordholts -Date: Tue Jan 5 18:15:41 2010 +0100 +Date: Tue Jan 5 18:15:41 2010 +0100 devel-docs: Add initial version of context.txt, explaining GimpContext @@ -73267,7 +74102,7 @@ commit 8a66f9357f58bc60e3797538796845a12bc1420a Author: Martin Nordholts -Date: Tue Jan 5 13:20:54 2010 +0100 +Date: Tue Jan 5 13:20:54 2010 +0100 app: Prevent losing dockables, force multi-window mode on exit @@ -73283,7 +74118,7 @@ commit b42a5a99673f16a307bd9fa82cf197ec3dc07eb3 Author: Martin Nordholts -Date: Tue Jan 5 13:14:32 2010 +0100 +Date: Tue Jan 5 13:14:32 2010 +0100 app: Handle calls to gimp_view_render_to_surface() while GIMP exists @@ -73292,7 +74127,7 @@ commit 87c25236b81fc1280ffeeb5d4809ac42a5feb075 Author: Martin Nordholts -Date: Tue Jan 5 11:29:54 2010 +0100 +Date: Tue Jan 5 11:29:54 2010 +0100 app: Don't try to create widgets that requires a context while detached @@ -73307,7 +74142,7 @@ commit 4fcd3024f1d13ddaeca18060d1bb5d93468fdb58 Author: Martin Nordholts -Date: Tue Jan 5 11:08:10 2010 +0100 +Date: Tue Jan 5 11:08:10 2010 +0100 app: Set a GimpContext on GimpDockColumns @@ -73327,7 +74162,7 @@ commit 64896eed7fd7b04157c01900c2465efcc52b3845 Author: Martin Nordholts -Date: Tue Jan 5 10:37:03 2010 +0100 +Date: Tue Jan 5 10:37:03 2010 +0100 app: Add run-time check to gimp_dock_columns_get_docks() @@ -73336,7 +74171,7 @@ commit 1e62e58f61f56962c99c2f770ac56e638f1e437a Author: Martin Nordholts -Date: Tue Jan 5 10:28:16 2010 +0100 +Date: Tue Jan 5 10:28:16 2010 +0100 app: gimp_dockable_set_dockbook() must be able to take NULL @@ -73345,7 +74180,7 @@ commit f8410035f1cf66db4960ea16b93601e8d3427312 Author: Martin Nordholts -Date: Tue Jan 5 10:26:07 2010 +0100 +Date: Tue Jan 5 10:26:07 2010 +0100 app: Ref dockables in DnD signal code @@ -73360,26 +74195,26 @@ commit be653a7110e033f57c50e3c2d878042318cb2d50 Author: Martin Nordholts -Date: Tue Jan 5 00:30:10 2010 +0100 +Date: Tue Jan 5 00:30:10 2010 +0100 app: Seal GimpDockable and add necessary getters and setters - app/actions/dockable-actions.c | 4 +- - app/actions/dockable-commands.c | 6 +- - app/widgets/gimpdialogfactory.c | 9 +- - app/widgets/gimpdock.c | 14 +- - app/widgets/gimpdockable.c | 369 + app/actions/dockable-actions.c | 4 +- + app/actions/dockable-commands.c | 6 +- + app/widgets/gimpdialogfactory.c | 9 +- + app/widgets/gimpdock.c | 14 +- + app/widgets/gimpdockable.c | 369 +++++++++++++++++++++------------ - app/widgets/gimpdockable.h | 44 ++-- - app/widgets/gimpdockbook.c | 55 ++--- - app/widgets/gimpdockcolumns.c | 2 +- - app/widgets/gimpmenudock.c | 2 +- + app/widgets/gimpdockable.h | 44 ++-- + app/widgets/gimpdockbook.c | 55 ++--- + app/widgets/gimpdockcolumns.c | 2 +- + app/widgets/gimpmenudock.c | 2 +- app/widgets/gimpsessioninfo-dockable.c | 4 +- 10 files changed, 312 insertions(+), 197 deletions(-) commit 96d1e6f53bfaff883894726ab5d0f7703a221ee5 Author: Martin Nordholts -Date: Tue Jan 5 00:17:22 2010 +0100 +Date: Tue Jan 5 00:17:22 2010 +0100 NEWS: Add "Improve Free Select Tool handle highlightning" @@ -73388,7 +74223,7 @@ commit 2205a0f9ace20dff0683bc0072b4c2ebb9f5c20d Author: Petr Kovar -Date: Mon Jan 4 20:50:25 2010 +0100 +Date: Mon Jan 4 20:50:25 2010 +0100 Updated Czech translation by Marek Cernocky @@ -73398,7 +74233,7 @@ commit 64a9531afe9e35af40c4310c4416d981e88bfce5 Author: Martin Nordholts -Date: Mon Jan 4 17:00:50 2010 +0100 +Date: Mon Jan 4 17:00:50 2010 +0100 devel-docs: Add gimp-module-dependencies.svg @@ -73414,7 +74249,7 @@ commit c116363731e6b9eb1ba42adec6c4fe4e4b4d608f Author: Martin Nordholts -Date: Mon Jan 4 16:58:52 2010 +0100 +Date: Mon Jan 4 16:58:52 2010 +0100 tools: Add tool to construct a dependency graph between modules @@ -73427,7 +74262,7 @@ commit 622e69ba467ac952c3697d33e6ade45abcc5ae19 Author: Martin Nordholts -Date: Sun Jan 3 11:16:53 2010 +0100 +Date: Sun Jan 3 11:16:53 2010 +0100 Update NEWS and AUTHORS for 2.7.1 with changes up until now @@ -73440,14 +74275,14 @@ xargs git --no-pager log --pretty=format:%an GIMP_2_7_0..HEAD -- | \ sort | uniq > authors-temp.txt - AUTHORS | 7 +++++++ - NEWS | 17 ++++++++++++++++- + AUTHORS | 7 +++++++ + NEWS | 17 ++++++++++++++++- authors.xml | 11 +++++++++-- 3 files changed, 32 insertions(+), 3 deletions(-) commit effd5eeed2267336d72d552ece8e1d3cf6901929 Author: Marco Ciampa -Date: Sun Jan 3 02:05:53 2010 +0100 +Date: Sun Jan 3 02:05:53 2010 +0100 Updated italian translation @@ -73457,28 +74292,28 @@ commit 9155ea3838221deb394d2a8060758e2cdeda7310 Author: Marco Ciampa -Date: Sun Jan 3 01:59:05 2010 +0100 +Date: Sun Jan 3 01:59:05 2010 +0100 Updated italian translation po-plug-ins/it.po | 17 ++++++++++++----- - po/it.po | 8 ++++++-- + po/it.po | 8 ++++++-- 2 files changed, 18 insertions(+), 7 deletions(-) commit f6f6ef765ff07dcfeffe997e9565bc1e2f515f5f Author: Marco Ciampa -Date: Sun Jan 3 01:57:12 2010 +0100 +Date: Sun Jan 3 01:57:12 2010 +0100 Updated italian translation. po-plug-ins/it.po | 196 +++++++++++++++++++++-------------- - po/it.po | 301 + po/it.po | 301 ++++++++++++++++++++++++++---------------------------- 2 files changed, 265 insertions(+), 232 deletions(-) commit b6f322d8fce8f4e985b1af8806d7700df621372a Author: Sven Neumann -Date: Sun Jan 3 00:51:47 2010 +0100 +Date: Sun Jan 3 00:51:47 2010 +0100 docs: remove use of undefined macro in man pages @@ -73489,7 +74324,7 @@ commit b5defd4e4a8a5b5364d91a406b96e24ccff8e69e Author: Martin Nordholts -Date: Sat Jan 2 23:41:52 2010 +0100 +Date: Sat Jan 2 23:41:52 2010 +0100 app: Add GIMP_LOG_FLOATING_SELECTION domain @@ -73499,14 +74334,14 @@ GIMP_LOG for it. app/core/gimpdrawable.c | 6 ++++-- - app/gimp-log.c | 23 ++++++++++++----------- - app/gimp-log.h | 46 + app/gimp-log.c | 23 ++++++++++++----------- + app/gimp-log.h | 46 ++++++++++++++++++++++++---------------------- 3 files changed, 40 insertions(+), 35 deletions(-) commit 86e14c2c2fb896a71fb711854720f80f6c66dc03 Author: Martin Nordholts -Date: Sat Jan 2 23:30:14 2010 +0100 +Date: Sat Jan 2 23:30:14 2010 +0100 app/tests: Add a GIMP 2.8 XCF feature test template @@ -73520,7 +74355,7 @@ commit 19183f81b24263f44a7cab799a9019f4b6c48e4f Author: Martin Nordholts -Date: Sat Jan 2 23:16:55 2010 +0100 +Date: Sat Jan 2 23:16:55 2010 +0100 app/tests: Test loading of an XCF file created with GIMP 2.6 @@ -73531,13 +74366,13 @@ Also add a file-local helper function gimp_test_load_image(). app/tests/files/gimp-2-6-file.xcf | Bin 0 -> 1872 bytes - app/tests/test-xcf.c | 86 + app/tests/test-xcf.c | 86 +++++++++++++++++++++++++++++++------- 2 files changed, 70 insertions(+), 16 deletions(-) commit f86f9e2adf7da643857cd65cb678d8bdc7a12969 Author: Martin Nordholts -Date: Sat Jan 2 23:10:54 2010 +0100 +Date: Sat Jan 2 23:10:54 2010 +0100 app/tests: Sort TESTS in Makefile.am @@ -73546,7 +74381,7 @@ commit 745d2dbf76e27293e5804bc9f652583bc658b5a0 Author: Martin Nordholts -Date: Sat Jan 2 23:09:21 2010 +0100 +Date: Sat Jan 2 23:09:21 2010 +0100 app/tests: Add a "gimp-comment" with an explanation of the file @@ -73558,7 +74393,7 @@ commit 0724959b61d2528bf09540d5017924683d02f891 Author: Martin Nordholts -Date: Sat Jan 2 23:06:57 2010 +0100 +Date: Sat Jan 2 23:06:57 2010 +0100 app/tests: Make channel same size as image in XCF test @@ -73570,7 +74405,7 @@ commit 69f28be91c17d1741ac48fafcb4db461345fd7cb Author: Martin Nordholts -Date: Sat Jan 2 20:19:39 2010 +0100 +Date: Sat Jan 2 20:19:39 2010 +0100 app: Remove unused variable 'hardness' in paint/gimpbrushcore.c @@ -73579,7 +74414,7 @@ commit c380512ce119c2b92428cd09aa3e94706a7580d5 Author: Martin Nordholts -Date: Sat Jan 2 20:18:45 2010 +0100 +Date: Sat Jan 2 20:18:45 2010 +0100 Revert "app: Add gimp_vectors_get_stroke()" @@ -73588,14 +74423,14 @@ NULL) instead of gimp_vectors_get_stroke (vectors, 0). Thanks to nomis for pointing this out. - app/tests/test-xcf.c | 2 +- + app/tests/test-xcf.c | 2 +- app/vectors/gimpvectors.c | 8 -------- app/vectors/gimpvectors.h | 2 -- 3 files changed, 1 insertion(+), 11 deletions(-) commit 3e81e87bca8c253e2771ef61dca1e3d95b7b68b9 Author: Martin Nordholts -Date: Sat Jan 2 18:54:32 2010 +0100 +Date: Sat Jan 2 18:54:32 2010 +0100 app/tests: Improve code coverage and test names in XCF test @@ -73617,7 +74452,7 @@ commit 2d2b6f03c580127e1aca7fcdbc391893301560cd Author: Martin Nordholts -Date: Wed Dec 30 11:06:56 2009 +0100 +Date: Wed Dec 30 11:06:56 2009 +0100 app: Add gimp_vectors_get_stroke() @@ -73627,7 +74462,7 @@ commit 3014d8d81da34644b33a846ab7dc302027793deb Author: Michael Natterer -Date: Fri Jan 1 18:46:08 2010 +0100 +Date: Fri Jan 1 18:46:08 2010 +0100 tools: fix typo in help text: libgumpui -> libgimpui @@ -73636,7 +74471,7 @@ commit bdec911bfccae166edce2539e6f9ef5b06169e98 Author: Alexia Death -Date: Fri Jan 1 19:03:59 2010 +0200 +Date: Fri Jan 1 19:03:59 2010 +0200 app: Fix a mixing quirk in linear dynamics mixing @@ -73648,19 +74483,19 @@ commit 2c4c9ad3331fd138730bb5650caf4eed3bad86e2 Author: Alexia Death -Date: Fri Jan 1 18:16:29 2010 +0200 +Date: Fri Jan 1 18:16:29 2010 +0200 app: Clean up the hardness feature. Lets convolve PixelRegions. app/core/gimpbrush-transform.c | 29 +++++---- - app/paint-funcs/paint-funcs.c | 133 + app/paint-funcs/paint-funcs.c | 133 ----------------------------------------- - app/paint-funcs/paint-funcs.h | 8 --- + app/paint-funcs/paint-funcs.h | 8 --- 3 files changed, 19 insertions(+), 151 deletions(-) commit 9774988f30746d64383cf893c4384bf2eedb1478 Author: Alexia Death -Date: Fri Jan 1 15:41:07 2010 +0200 +Date: Fri Jan 1 15:41:07 2010 +0200 Real dynamic hardness support for both generated and pixmap brushes. @@ -73676,19 +74511,19 @@ app/core/gimpbrush-transform.c | 170 +++++++++++++++++++++++++++++++---------- app/core/gimpbrush-transform.h | 6 +- - app/core/gimpbrush.c | 18 +++-- - app/core/gimpbrush.h | 12 ++- - app/core/gimpbrushgenerated.c | 8 +- - app/paint-funcs/paint-funcs.c | 134 ++++++++++++++++++++++++++++++++ - app/paint-funcs/paint-funcs.h | 8 ++ - app/paint/gimpbrushcore.c | 34 +++++++-- - app/paint/gimpbrushcore.h | 2 + - app/paint/gimppaintoptions.c | 7 +- + app/core/gimpbrush.c | 18 +++-- + app/core/gimpbrush.h | 12 ++- + app/core/gimpbrushgenerated.c | 8 +- + app/paint-funcs/paint-funcs.c | 134 ++++++++++++++++++++++++++++++++ + app/paint-funcs/paint-funcs.h | 8 ++ + app/paint/gimpbrushcore.c | 34 +++++++-- + app/paint/gimpbrushcore.h | 2 + + app/paint/gimppaintoptions.c | 7 +- 10 files changed, 333 insertions(+), 66 deletions(-) commit 37b6a205d3c5d3a3b5425ff776a1364417c936d6 Author: Michael Natterer -Date: Wed Dec 30 18:01:09 2009 +0100 +Date: Wed Dec 30 18:01:09 2009 +0100 app: change the way the operation for layer compositing is determined @@ -73701,7 +74536,7 @@ commit b9b1cbe00ed27e698920c2d85faee8a65bad5657 Author: Sven Neumann -Date: Wed Dec 30 00:36:24 2009 +0100 +Date: Wed Dec 30 00:36:24 2009 +0100 comment out debug output from tag-cache @@ -73710,7 +74545,7 @@ commit 9f6827be7c626f94148f605d85be29ad490672cc Author: Michael Natterer -Date: Wed Dec 30 15:18:44 2009 +0100 +Date: Wed Dec 30 15:18:44 2009 +0100 app: add back individual operation classes for the layer modes @@ -73718,91 +74553,91 @@ empty and unused, but can be filled with code and enabled one-by-one now. - app/gegl/Makefile.am | 52 ++++++++++++++++++- - app/gegl/gimp-gegl-types.h | 25 +++++++++ - app/gegl/gimp-gegl-utils.c | 38 ++++++++++++++ - app/gegl/gimp-gegl-utils.h | 2 + - app/gegl/gimp-gegl.c | 50 ++++++++++++++++++ - app/gegl/gimpoperationadditionmode.c | 88 + app/gegl/Makefile.am | 52 ++++++++++++++++++- + app/gegl/gimp-gegl-types.h | 25 +++++++++ + app/gegl/gimp-gegl-utils.c | 38 ++++++++++++++ + app/gegl/gimp-gegl-utils.h | 2 + + app/gegl/gimp-gegl.c | 50 ++++++++++++++++++ + app/gegl/gimpoperationadditionmode.c | 88 ++++++++++++++++++++++++++++++++ - app/gegl/gimpoperationadditionmode.h | 53 +++++++++++++++++++ - app/gegl/gimpoperationantierasemode.c | 88 + app/gegl/gimpoperationadditionmode.h | 53 +++++++++++++++++++ + app/gegl/gimpoperationantierasemode.c | 88 ++++++++++++++++++++++++++++++++ - app/gegl/gimpoperationantierasemode.h | 53 +++++++++++++++++++ - app/gegl/gimpoperationbehindmode.c | 88 + app/gegl/gimpoperationantierasemode.h | 53 +++++++++++++++++++ + app/gegl/gimpoperationbehindmode.c | 88 ++++++++++++++++++++++++++++++++ - app/gegl/gimpoperationbehindmode.h | 53 +++++++++++++++++++ - app/gegl/gimpoperationburnmode.c | 88 + app/gegl/gimpoperationbehindmode.h | 53 +++++++++++++++++++ + app/gegl/gimpoperationburnmode.c | 88 ++++++++++++++++++++++++++++++++ - app/gegl/gimpoperationburnmode.h | 53 +++++++++++++++++++ + app/gegl/gimpoperationburnmode.h | 53 +++++++++++++++++++ app/gegl/gimpoperationcolorerasemode.c | 88 ++++++++++++++++++++++++++++++++ app/gegl/gimpoperationcolorerasemode.h | 53 +++++++++++++++++++ - app/gegl/gimpoperationcolormode.c | 88 + app/gegl/gimpoperationcolormode.c | 88 ++++++++++++++++++++++++++++++++ - app/gegl/gimpoperationcolormode.h | 53 +++++++++++++++++++ + app/gegl/gimpoperationcolormode.h | 53 +++++++++++++++++++ app/gegl/gimpoperationdarkenonlymode.c | 88 ++++++++++++++++++++++++++++++++ app/gegl/gimpoperationdarkenonlymode.h | 53 +++++++++++++++++++ app/gegl/gimpoperationdifferencemode.c | 88 ++++++++++++++++++++++++++++++++ app/gegl/gimpoperationdifferencemode.h | 53 +++++++++++++++++++ - app/gegl/gimpoperationdissolvemode.c | 88 + app/gegl/gimpoperationdissolvemode.c | 88 ++++++++++++++++++++++++++++++++ - app/gegl/gimpoperationdissolvemode.h | 53 +++++++++++++++++++ - app/gegl/gimpoperationdividemode.c | 88 + app/gegl/gimpoperationdissolvemode.h | 53 +++++++++++++++++++ + app/gegl/gimpoperationdividemode.c | 88 ++++++++++++++++++++++++++++++++ - app/gegl/gimpoperationdividemode.h | 53 +++++++++++++++++++ - app/gegl/gimpoperationdodgemode.c | 88 + app/gegl/gimpoperationdividemode.h | 53 +++++++++++++++++++ + app/gegl/gimpoperationdodgemode.c | 88 ++++++++++++++++++++++++++++++++ - app/gegl/gimpoperationdodgemode.h | 53 +++++++++++++++++++ - app/gegl/gimpoperationerasemode.c | 88 + app/gegl/gimpoperationdodgemode.h | 53 +++++++++++++++++++ + app/gegl/gimpoperationerasemode.c | 88 ++++++++++++++++++++++++++++++++ - app/gegl/gimpoperationerasemode.h | 53 +++++++++++++++++++ + app/gegl/gimpoperationerasemode.h | 53 +++++++++++++++++++ app/gegl/gimpoperationgrainextractmode.c | 88 ++++++++++++++++++++++++++++++++ app/gegl/gimpoperationgrainextractmode.h | 53 +++++++++++++++++++ app/gegl/gimpoperationgrainmergemode.c | 88 ++++++++++++++++++++++++++++++++ app/gegl/gimpoperationgrainmergemode.h | 53 +++++++++++++++++++ - app/gegl/gimpoperationhardlightmode.c | 88 + app/gegl/gimpoperationhardlightmode.c | 88 ++++++++++++++++++++++++++++++++ - app/gegl/gimpoperationhardlightmode.h | 53 +++++++++++++++++++ - app/gegl/gimpoperationhuemode.c | 88 + app/gegl/gimpoperationhardlightmode.h | 53 +++++++++++++++++++ + app/gegl/gimpoperationhuemode.c | 88 ++++++++++++++++++++++++++++++++ - app/gegl/gimpoperationhuemode.h | 53 +++++++++++++++++++ + app/gegl/gimpoperationhuemode.h | 53 +++++++++++++++++++ app/gegl/gimpoperationlightenonlymode.c | 88 ++++++++++++++++++++++++++++++++ app/gegl/gimpoperationlightenonlymode.h | 53 +++++++++++++++++++ - app/gegl/gimpoperationmultiplymode.c | 88 + app/gegl/gimpoperationmultiplymode.c | 88 ++++++++++++++++++++++++++++++++ - app/gegl/gimpoperationmultiplymode.h | 53 +++++++++++++++++++ - app/gegl/gimpoperationoverlaymode.c | 88 + app/gegl/gimpoperationmultiplymode.h | 53 +++++++++++++++++++ + app/gegl/gimpoperationoverlaymode.c | 88 ++++++++++++++++++++++++++++++++ - app/gegl/gimpoperationoverlaymode.h | 53 +++++++++++++++++++ - app/gegl/gimpoperationreplacemode.c | 88 + app/gegl/gimpoperationoverlaymode.h | 53 +++++++++++++++++++ + app/gegl/gimpoperationreplacemode.c | 88 ++++++++++++++++++++++++++++++++ - app/gegl/gimpoperationreplacemode.h | 53 +++++++++++++++++++ + app/gegl/gimpoperationreplacemode.h | 53 +++++++++++++++++++ app/gegl/gimpoperationsaturationmode.c | 88 ++++++++++++++++++++++++++++++++ app/gegl/gimpoperationsaturationmode.h | 53 +++++++++++++++++++ - app/gegl/gimpoperationscreenmode.c | 88 + app/gegl/gimpoperationscreenmode.c | 88 ++++++++++++++++++++++++++++++++ - app/gegl/gimpoperationscreenmode.h | 53 +++++++++++++++++++ - app/gegl/gimpoperationsoftlightmode.c | 88 + app/gegl/gimpoperationscreenmode.h | 53 +++++++++++++++++++ + app/gegl/gimpoperationsoftlightmode.c | 88 ++++++++++++++++++++++++++++++++ - app/gegl/gimpoperationsoftlightmode.h | 53 +++++++++++++++++++ - app/gegl/gimpoperationsubtractmode.c | 88 + app/gegl/gimpoperationsoftlightmode.h | 53 +++++++++++++++++++ + app/gegl/gimpoperationsubtractmode.c | 88 ++++++++++++++++++++++++++++++++ - app/gegl/gimpoperationsubtractmode.h | 53 +++++++++++++++++++ - app/gegl/gimpoperationvaluemode.c | 88 + app/gegl/gimpoperationsubtractmode.h | 53 +++++++++++++++++++ + app/gegl/gimpoperationvaluemode.c | 88 ++++++++++++++++++++++++++++++++ - app/gegl/gimpoperationvaluemode.h | 53 +++++++++++++++++++ + app/gegl/gimpoperationvaluemode.h | 53 +++++++++++++++++++ 55 files changed, 3691 insertions(+), 1 deletion(-) commit a58e7ee91843ff4f45cd316ab1a74dd23b00cd74 Author: Michael Natterer -Date: Wed Dec 30 15:05:29 2009 +0100 +Date: Wed Dec 30 15:05:29 2009 +0100 app: add .libs to .gitignore @@ -73811,7 +74646,7 @@ commit 9b4ff636edcfbaee6adb8be3e70ae5e96110e629 Author: Alexia Death -Date: Wed Dec 30 16:03:11 2009 +0200 +Date: Wed Dec 30 16:03:11 2009 +0200 app: Fix typo in event history option blurb noticed by Mikael Magnusson @@ -73821,7 +74656,7 @@ commit e79834b75ea9f47853fc0017195b2d8c7bce7fa6 Author: Alexia Death -Date: Wed Dec 30 15:10:34 2009 +0200 +Date: Wed Dec 30 15:10:34 2009 +0200 app: Fix garbage appearing in generated brushes with dynamic angles @@ -73833,7 +74668,7 @@ commit c5b4643d6932bcc31b374b43f9695b7195d10e07 Author: Alexia Death -Date: Wed Dec 30 13:21:26 2009 +0200 +Date: Wed Dec 30 13:21:26 2009 +0200 Revert "app: Fix garbage appearing in 1:1 apect ratio 2 spike generated brushes" @@ -73846,7 +74681,7 @@ commit 11f094f565c8843d3b52447f6bf7564fe383f605 Author: Omari Stephens -Date: Sun Dec 27 16:58:53 2009 +0000 +Date: Sun Dec 27 16:58:53 2009 +0000 plug-ins/pygimp: Minor style cleanup for readability @@ -73861,7 +74696,7 @@ commit bb852184e1d33f2aebeae6089535178c334b1d93 Author: Michael Natterer -Date: Mon Dec 28 21:10:04 2009 +0100 +Date: Mon Dec 28 21:10:04 2009 +0100 app: pass the drop_path to GimpContainerTreeView::drop_possible() @@ -73870,15 +74705,15 @@ app/widgets/gimpcontainertreeview-dnd.c | 26 ++++++++++++++------------ app/widgets/gimpcontainertreeview-dnd.h | 3 ++- - app/widgets/gimpcontainertreeview.h | 1 + - app/widgets/gimpdrawabletreeview.c | 5 ++++- - app/widgets/gimpitemtreeview.c | 3 +++ - app/widgets/gimplayertreeview.c | 3 +++ + app/widgets/gimpcontainertreeview.h | 1 + + app/widgets/gimpdrawabletreeview.c | 5 ++++- + app/widgets/gimpitemtreeview.c | 3 +++ + app/widgets/gimplayertreeview.c | 3 +++ 6 files changed, 27 insertions(+), 14 deletions(-) commit 3d9f9124f3c3c1025c7cfee9059bed5d0a3f30ea Author: Michael Natterer -Date: Mon Dec 28 21:07:38 2009 +0100 +Date: Mon Dec 28 21:07:38 2009 +0100 app: formatting @@ -73887,7 +74722,7 @@ commit 79c40235529abba485809ceaeb1d708a1ae869fc Author: Michael Natterer -Date: Mon Dec 28 20:50:26 2009 +0100 +Date: Mon Dec 28 20:50:26 2009 +0100 app: inline the inner curve mapping function for internal use @@ -73901,7 +74736,7 @@ commit 14ca90ac2f0278f7db763bd38ed69cdd93674d54 Author: Martin Nordholts -Date: Mon Dec 28 11:00:40 2009 +0100 +Date: Mon Dec 28 11:00:40 2009 +0100 app/tests: Clean up test-ui.c a bit @@ -73910,7 +74745,7 @@ commit a3a8cf16c0142013dbc45ae383b0a657d4f7880b Author: Sven Neumann -Date: Sun Dec 27 19:47:14 2009 +0100 +Date: Sun Dec 27 19:47:14 2009 +0100 add libgimpapptestutils.a to .gitignore @@ -73919,20 +74754,20 @@ commit f0348aff40b27c9fc6da53250e57ea507dd155bb Author: Sven Neumann -Date: Sun Dec 27 11:02:40 2009 +0100 +Date: Sun Dec 27 11:02:40 2009 +0100 some minor code cleanups - plug-ins/metadata/Makefile.am | 7 +- + plug-ins/metadata/Makefile.am | 7 +- plug-ins/metadata/gimpxmpmodelentry.c | 151 +++++++++++++++++++--------------- plug-ins/metadata/gimpxmpmodelentry.h | 29 +++---- - plug-ins/metadata/metadata.c | 20 ++--- + plug-ins/metadata/metadata.c | 20 ++--- 4 files changed, 106 insertions(+), 101 deletions(-) commit 3749f2c62c3963194d32291b4aa0aa94fa686910 Author: Roman Joost -Date: Sat Oct 3 12:57:17 2009 +1000 +Date: Sat Oct 3 12:57:17 2009 +1000 Revamped the GimpXmpModelEntry object initialisation. @@ -73943,12 +74778,12 @@ plug-ins/metadata/gimpxmpmodelentry.c | 153 ++++++++++++++++++++++++++-------- - plug-ins/metadata/interface.c | 18 +++- + plug-ins/metadata/interface.c | 18 +++- 2 files changed, 132 insertions(+), 39 deletions(-) commit 1c8255de59c9ac79dcd90609b19ec34d5225fb30 Author: Roman Joost -Date: Sun Sep 27 14:37:05 2009 +1000 +Date: Sun Sep 27 14:37:05 2009 +1000 Code cleanup. @@ -73958,29 +74793,29 @@ widget and the XMPModel. The new entry widget is not build as a library anymore. - plug-ins/metadata/Makefile.am | 44 ++++++++++-------------- + plug-ins/metadata/Makefile.am | 44 ++++++++++-------------- plug-ins/metadata/gimpxmpmodelentry.c | 65 ++++++++++++++++++----------------- plug-ins/metadata/gimpxmpmodelentry.h | 32 +++++++++++------ - plug-ins/metadata/interface.c | 30 ---------------- - plug-ins/metadata/xmp-model.h | 4 +-- + plug-ins/metadata/interface.c | 30 ---------------- + plug-ins/metadata/xmp-model.h | 4 +-- 5 files changed, 76 insertions(+), 99 deletions(-) commit 9578088ce8f6f481b28c62cb514babf5846eb7fc Author: Roman Joost -Date: Sat Sep 26 19:12:25 2009 +1000 +Date: Sat Sep 26 19:12:25 2009 +1000 Set the correct icons if the entry changed a property in the XMPModel and use the new EntryWidget for the caption writer as well. plug-ins/metadata/gimpxmpmodelentry.c | 43 +++++++++++++++++++++++++++++++++-- - plug-ins/metadata/interface.c | 4 +--- + plug-ins/metadata/interface.c | 4 +--- 2 files changed, 42 insertions(+), 5 deletions(-) commit 3705c85e1e448c979ef1f5b6e93344a01f980bf9 Author: Roman Joost -Date: Sat Sep 26 20:49:04 2009 +1000 +Date: Sat Sep 26 20:49:04 2009 +1000 Implemented better signal handling for property-changed events. @@ -73998,23 +74833,23 @@ commit a13e4692fb313f02025b25cc8b13f5be2736a45a Author: Roman Joost -Date: Thu Jul 23 20:53:35 2009 +1000 +Date: Thu Jul 23 20:53:35 2009 +1000 Registered new GimpXMPModelEntry, connected it with the XMPModel. The new entry widget now makes use of the detailed signal from the XMPModel. - plug-ins/metadata/Makefile.am | 11 +++ + plug-ins/metadata/Makefile.am | 11 +++ plug-ins/metadata/gimpxmpmodelentry.c | 146 ++++++++++++++++++++++++++++++++++ plug-ins/metadata/gimpxmpmodelentry.h | 55 +++++++++++++ - plug-ins/metadata/interface.c | 56 +++++++------ + plug-ins/metadata/interface.c | 56 +++++++------ 4 files changed, 244 insertions(+), 24 deletions(-) commit 54844e8ab83a1e577e2b462ea56fd27e94ff1a62 Author: Alexia Death -Date: Sun Dec 27 00:27:29 2009 +0200 +Date: Sun Dec 27 00:27:29 2009 +0200 app: Fix garbage appearing in 1:1 apect ratio 2 spike generated brushes @@ -74024,7 +74859,7 @@ commit 345bbfe475ce9e28b984f0a4d09cbb593b5ecf82 Author: Sven Neumann -Date: Sat Dec 26 20:46:19 2009 +0100 +Date: Sat Dec 26 20:46:19 2009 +0100 app: adjust wording and spelling in error messages @@ -74033,7 +74868,7 @@ commit 105b7c5afaa851461276d3c92c6fe50fffc17515 Author: Michael Natterer -Date: Sat Dec 26 14:10:31 2009 +0100 +Date: Sat Dec 26 14:10:31 2009 +0100 app: fix mapping for CURVE_BLUE (use the blue, not the green curve) @@ -74042,7 +74877,7 @@ commit 780ebd7c242020bacf632b93dd58c932b3296ec1 Author: Martin Nordholts -Date: Thu Dec 24 23:01:48 2009 +0100 +Date: Thu Dec 24 23:01:48 2009 +0100 app/tests: Fix warnings about files not existing @@ -74053,26 +74888,26 @@ dir. This way we get rid of a bunch of annoying warnings when running the tests and have more control. - app/tests/Makefile.am | 12 ++++++-- - app/tests/gimp-app-test-utils.c | 45 + app/tests/Makefile.am | 12 ++++++-- + app/tests/gimp-app-test-utils.c | 45 ++++++++++++++++++++++++++++ - app/tests/gimp-app-test-utils.h | 25 ++++++++++++++++ - app/tests/gimpdir-empty/.gitignore | 11 +++++++ + app/tests/gimp-app-test-utils.h | 25 ++++++++++++++++ + app/tests/gimpdir-empty/.gitignore | 11 +++++++ app/tests/gimpdir-empty/brushes/.gitignore | 0 app/tests/gimpdir-empty/gradients/.gitignore | 0 app/tests/gimpdir-empty/patterns/.gitignore | 0 - app/tests/gimpdir-empty/tags.xml | 24 +++++++++++++++ - app/tests/test-layer-grouping.c | 5 +++- - app/tests/test-layers.c | 5 +++- - app/tests/test-session-management.c | 12 ++++++-- - app/tests/test-ui.c | 4 +++ - app/tests/test-window-management.c | 7 +++-- - app/tests/test-xcf.c | 4 +++ + app/tests/gimpdir-empty/tags.xml | 24 +++++++++++++++ + app/tests/test-layer-grouping.c | 5 +++- + app/tests/test-layers.c | 5 +++- + app/tests/test-session-management.c | 12 ++++++-- + app/tests/test-ui.c | 4 +++ + app/tests/test-window-management.c | 7 +++-- + app/tests/test-xcf.c | 4 +++ 14 files changed, 145 insertions(+), 9 deletions(-) commit 47709fab18df76a5e804204461160ecabe8df852 Author: Martin Nordholts -Date: Thu Dec 24 18:54:11 2009 +0100 +Date: Thu Dec 24 18:54:11 2009 +0100 app/tests: Use implicit _SOURCES @@ -74081,21 +74916,21 @@ commit 999fb381640df87d93b31a37cd422bcef9d6067d Author: Martin Nordholts -Date: Thu Dec 24 18:15:43 2009 +0100 +Date: Thu Dec 24 18:15:43 2009 +0100 app/tests: Create brushes, gradients and patterns dirs in gimpdir Create brushes, gradients and patterns dirs in gimpdir to get rid of warnings for those dirs not existing. - app/tests/gimpdir/brushes/.gitignore | 0 + app/tests/gimpdir/brushes/.gitignore | 0 app/tests/gimpdir/gradients/.gitignore | 0 - app/tests/gimpdir/patterns/.gitignore | 0 + app/tests/gimpdir/patterns/.gitignore | 0 3 files changed, 0 insertions(+), 0 deletions(-) commit 1e89d0141790615e17df385f5864ead7a0dd53c0 Author: Martin Nordholts -Date: Thu Dec 24 17:45:24 2009 +0100 +Date: Thu Dec 24 17:45:24 2009 +0100 app/tests: Run main loop until idle instead of for a given time @@ -74108,7 +74943,7 @@ commit ad56949d5be6381e050566cd8fc3bc20e9cf1133 Author: Martin Nordholts -Date: Thu Dec 24 17:40:45 2009 +0100 +Date: Thu Dec 24 17:40:45 2009 +0100 app: Make gimp_tool_options_editor_new() use only g_object_new() @@ -74126,7 +74961,7 @@ commit 5e9aa1281c49494a23de3f341e30e2661e08830c Author: Martin Nordholts -Date: Thu Dec 24 17:26:21 2009 +0100 +Date: Thu Dec 24 17:26:21 2009 +0100 app/tests: Add regression test "/gimp-ui/tool-options-editor-updates" @@ -74143,7 +74978,7 @@ commit 049de90d812a7b5a33f52a5635ce0fa381e70f10 Author: Martin Nordholts -Date: Wed Dec 23 23:44:33 2009 +0100 +Date: Wed Dec 23 23:44:33 2009 +0100 app: Add gimp_test_run_mainloop_until_idle() @@ -74151,12 +74986,12 @@ cases. app/tests.c | 16 ++++++++++++++++ - app/tests.h | 9 +++++---- + app/tests.h | 9 +++++---- 2 files changed, 21 insertions(+), 4 deletions(-) commit 0f7c373f3bcdbf83f678960f3becdc2c55ed0491 Author: Martin Nordholts -Date: Thu Dec 24 17:31:45 2009 +0100 +Date: Thu Dec 24 17:31:45 2009 +0100 app: Add gimp_tool_options_editor_get_tool_options() @@ -74169,7 +75004,7 @@ commit e8ff034ab5d1556d93125ab59eec037691c28b3a Author: Sven Neumann -Date: Wed Dec 23 23:56:45 2009 +0100 +Date: Wed Dec 23 23:56:45 2009 +0100 Bug 605237 - the "Antialiasing..." message in the progress bar does not show translated @@ -74181,7 +75016,7 @@ commit cf5d4953fd4d0123033979d8827fd7574a1ce4ff Author: Martin Nordholts -Date: Wed Dec 23 22:39:47 2009 +0100 +Date: Wed Dec 23 22:39:47 2009 +0100 app: Add GimpToolOptionsEditorPrivate @@ -74190,12 +75025,12 @@ app/widgets/gimptooloptionseditor.c | 177 ++++++++++++++++++++---------------- - app/widgets/gimptooloptionseditor.h | 20 +--- + app/widgets/gimptooloptionseditor.h | 20 +--- 2 files changed, 102 insertions(+), 95 deletions(-) commit c331d5f9eb4f1c967607e1fe3aa28c13185f81cb Author: Martin Nordholts -Date: Mon Dec 21 22:24:26 2009 +0100 +Date: Mon Dec 21 22:24:26 2009 +0100 Bug 598454 - Improve visual feedback for Free Select Tool handles @@ -74210,7 +75045,7 @@ commit 50525e45432b2223ef6148cb033053d1c7f39271 Author: Martin Nordholts -Date: Mon Dec 21 21:27:54 2009 +0100 +Date: Mon Dec 21 21:27:54 2009 +0100 app: Fill Free Select Tool handles when mouse is over them @@ -74223,7 +75058,7 @@ commit caccbe8b67ec5f5fbf1c69a966babd263c78f3ef Author: Martin Nordholts -Date: Mon Dec 21 19:04:48 2009 +0100 +Date: Mon Dec 21 19:04:48 2009 +0100 app/tests: Add XCF write-and-load sanity test @@ -74242,7 +75077,7 @@ commit 8efb46bd0bb6534379d4e284ff742dfe9dba312a Author: Martin Nordholts -Date: Mon Dec 21 17:25:01 2009 +0100 +Date: Mon Dec 21 17:25:01 2009 +0100 app: Remove unused include #include in base/base.c @@ -74251,7 +75086,7 @@ commit facac1a49c652c37f981feac4e8fe5c8d5c2166b Author: Martin Nordholts -Date: Sun Dec 20 20:43:57 2009 +0100 +Date: Sun Dec 20 20:43:57 2009 +0100 devel-docs: Update ui-framework.txt with GimpMenuDock and GimpToolbox @@ -74260,7 +75095,7 @@ commit a7cb4742c519997f06c626fba6a25255450675ea Author: Martin Nordholts -Date: Sun Dec 20 20:30:16 2009 +0100 +Date: Sun Dec 20 20:30:16 2009 +0100 app: Correct a comment regarding dock window factory @@ -74269,31 +75104,31 @@ commit 90d7ffde1afe1ddcc7dc3cc4f55345d94cf02ec9 Author: Martin Nordholts -Date: Sun Dec 20 20:19:31 2009 +0100 +Date: Sun Dec 20 20:19:31 2009 +0100 app: Make all GimpDialogFactory members private Add necessary trivial API that allows us to make remaining GimpDialogFactory instance members private, and make them private. - app/actions/windows-actions.c | 2 +- - app/actions/windows-commands.c | 9 +-- + app/actions/windows-actions.c | 2 +- + app/actions/windows-commands.c | 9 +-- app/dialogs/dialogs-constructors.c | 68 ++++++++++---------- - app/dialogs/dialogs.c | 2 +- - app/display/gimpimagewindow.c | 2 +- - app/gui/gimpuiconfigurer.c | 2 +- - app/gui/session.c | 3 +- - app/menus/windows-menu.c | 2 +- - app/tools/gimptexttool.c | 4 +- + app/dialogs/dialogs.c | 2 +- + app/display/gimpimagewindow.c | 2 +- + app/gui/gimpuiconfigurer.c | 2 +- + app/gui/session.c | 3 +- + app/menus/windows-menu.c | 2 +- + app/tools/gimptexttool.c | 4 +- app/widgets/gimpdialogfactory.c | 127 +++++++++++++++++++++++++------------ app/widgets/gimpdialogfactory.h | 12 ++-- - app/widgets/gimpdockwindow.c | 17 +++-- + app/widgets/gimpdockwindow.c | 17 +++-- 12 files changed, 148 insertions(+), 102 deletions(-) commit dbf844c012894166e312470f0d98560d5e426613 Author: Alexia Death -Date: Sun Dec 20 18:36:40 2009 +0200 +Date: Sun Dec 20 18:36:40 2009 +0200 app: Disable history buffer via use of gimprc option @@ -74305,15 +75140,15 @@ Put (use-event-history yes) in gimprc if you want more events and possibly bugs. - app/config/gimpdisplayconfig.c | 18 +++++++++++++++++- - app/config/gimpdisplayconfig.h | 1 + - app/config/gimprc-blurbs.h | 3 +++ + app/config/gimpdisplayconfig.c | 18 +++++++++++++++++- + app/config/gimpdisplayconfig.h | 1 + + app/config/gimprc-blurbs.h | 3 +++ app/display/gimpdisplayshell-callbacks.c | 1 + 4 files changed, 22 insertions(+), 1 deletion(-) commit b503cfc560da4b489a3bf8fa7a3e28f1bbf4dc3d Author: Alexandre Prokoudine -Date: Sun Dec 20 19:18:43 2009 +0300 +Date: Sun Dec 20 19:18:43 2009 +0300 Updated Russian translation, again @@ -74323,7 +75158,7 @@ commit 1f4098200a8a8e6c398998a465c53b965f0db932 Author: Alexia Death -Date: Sun Dec 20 17:29:22 2009 +0200 +Date: Sun Dec 20 17:29:22 2009 +0200 Revert "app: Removing code for making use of the X event history buffer" @@ -74337,7 +75172,7 @@ commit af4717e78f5bdf2773cb681c8ee1c5e0683cc85b Author: Alexia Death -Date: Sun Dec 20 16:04:57 2009 +0200 +Date: Sun Dec 20 16:04:57 2009 +0200 app: Removing code for making use of the X event history buffer @@ -74354,37 +75189,37 @@ commit 8699511bbdc73a7efe5f08225711b5cbd791684b Author: Martin Nordholts -Date: Sun Dec 20 14:41:02 2009 +0100 +Date: Sun Dec 20 14:41:02 2009 +0100 app: global_dock_window_factory -> global_dock_factory With GimpDock not being a toplevel any longer, it makes more sense to name global_dock_factory global_dock_window_factory. Do that. - app/actions/data-commands.c | 2 +- - app/actions/dialogs-commands.c | 2 +- - app/actions/edit-commands.c | 2 +- - app/actions/select-commands.c | 2 +- - app/actions/view-commands.c | 2 +- - app/actions/windows-actions.c | 10 +++++---- - app/actions/windows-commands.c | 6 ++--- - app/dialogs/dialogs-constructors.c | 8 +++---- - app/dialogs/dialogs.c | 41 + app/actions/data-commands.c | 2 +- + app/actions/dialogs-commands.c | 2 +- + app/actions/edit-commands.c | 2 +- + app/actions/select-commands.c | 2 +- + app/actions/view-commands.c | 2 +- + app/actions/windows-actions.c | 10 +++++---- + app/actions/windows-commands.c | 6 ++--- + app/dialogs/dialogs-constructors.c | 8 +++---- + app/dialogs/dialogs.c | 41 +++++++++++++++++----------------- - app/dialogs/dialogs.h | 2 +- - app/gui/gimpuiconfigurer.c | 6 ++--- - app/gui/gui-message.c | 4 ++-- - app/gui/gui-vtable.c | 2 +- - app/gui/gui.c | 2 +- - app/menus/windows-menu.c | 10 +++++---- - app/tests/test-window-management.c | 2 +- - app/widgets/gimpdockable.c | 2 +- + app/dialogs/dialogs.h | 2 +- + app/gui/gimpuiconfigurer.c | 6 ++--- + app/gui/gui-message.c | 4 ++-- + app/gui/gui-vtable.c | 2 +- + app/gui/gui.c | 2 +- + app/menus/windows-menu.c | 10 +++++---- + app/tests/test-window-management.c | 2 +- + app/widgets/gimpdockable.c | 2 +- app/widgets/gimpsessioninfo-dockable.c | 2 +- 18 files changed, 56 insertions(+), 51 deletions(-) commit b8fe7278c81c6d15cc905214f59ff991e44e285b Author: Martin Nordholts -Date: Sun Dec 20 12:30:59 2009 +0100 +Date: Sun Dec 20 12:30:59 2009 +0100 app: Add GimpDialogFactoryPrivate @@ -74399,7 +75234,7 @@ commit 1ed1f5e31d93bab7cc421eab19b7507c5abba83c Author: Martin Nordholts -Date: Sun Dec 20 12:27:50 2009 +0100 +Date: Sun Dec 20 12:27:50 2009 +0100 app: Format static function prototypes in widgets/gimpdialogfactory.c @@ -74409,7 +75244,7 @@ commit 7fde4a75db6876f2376ef15bd772220a342fa196 Author: Lucian Grijincu -Date: Sat Dec 19 19:02:46 2009 +0200 +Date: Sat Dec 19 19:02:46 2009 +0200 Updated Romanian translation @@ -74419,7 +75254,7 @@ commit 355f1bfd569436bcafb5b1dbe9a49446793d4c45 Author: Alexia Death -Date: Sat Dec 19 17:29:42 2009 +0200 +Date: Sat Dec 19 17:29:42 2009 +0200 app: Fix tabs to spaces for dynamics @@ -74427,11 +75262,11 @@ app/core/gimpdynamicsoutput.h | 7 ++++--- app/paint/gimpairbrush.c | 4 ++-- app/paint/gimpbrushcore.c | 16 ++++++++-------- - app/paint/gimpclone.c | 2 +- + app/paint/gimpclone.c | 2 +- app/paint/gimpconvolve.c | 4 ++-- app/paint/gimpdodgeburn.c | 4 ++-- app/paint/gimperaser.c | 4 ++-- - app/paint/gimpheal.c | 2 +- + app/paint/gimpheal.c | 2 +- app/paint/gimppaintbrush.c | 6 +++--- app/paint/gimpsmudge.c | 6 +++--- app/paint/gimpsourcecore.c | 2 +- @@ -74439,7 +75274,7 @@ commit 119c0b30597e2800dbefce18f70234906aa7812a Author: Marco Ciampa -Date: Sat Dec 19 13:40:11 2009 +0100 +Date: Sat Dec 19 13:40:11 2009 +0100 Updated italian translation. @@ -74448,18 +75283,18 @@ commit b237e9343e058b0d14e1f454dc8c03b84e119d73 Author: Martin Nordholts -Date: Sat Dec 19 12:33:27 2009 +0100 +Date: Sat Dec 19 12:33:27 2009 +0100 app: dialogs_toolbox_get() -> dialogs_toolbox_new() app/dialogs/dialogs-constructors.c | 2 +- app/dialogs/dialogs-constructors.h | 2 +- - app/dialogs/dialogs.c | 2 +- + app/dialogs/dialogs.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit a0ffbd17b1b56a048493042169e849f7086a65e2 Author: Martin Nordholts -Date: Sat Dec 19 11:25:34 2009 +0100 +Date: Sat Dec 19 11:25:34 2009 +0100 app: Continue cleanup of macro definitions in dialogs/dialogs.c @@ -74473,7 +75308,7 @@ commit 5f03cf20d7fd0b701a36692f42f2371ba58b8576 Author: Martin Nordholts -Date: Sat Dec 19 10:36:05 2009 +0100 +Date: Sat Dec 19 10:36:05 2009 +0100 app: Improve readability of macros in dialogs/dialogs.c @@ -74485,7 +75320,7 @@ commit 6eb3e65445d1c8e8438141fec41d56a2ddbe756b Author: Martin Nordholts -Date: Sat Dec 19 09:29:49 2009 +0100 +Date: Sat Dec 19 09:29:49 2009 +0100 app: Remove unused variables in gradient_options_gui() @@ -74494,7 +75329,7 @@ commit a5ef19fb5949e267b5736ffda5510f7af2731f59 Author: Martin Nordholts -Date: Sat Dec 19 09:29:35 2009 +0100 +Date: Sat Dec 19 09:29:35 2009 +0100 app: Cleanup actions/windows-commands.c from last commit @@ -74505,7 +75340,7 @@ commit 2b7f8f7a7e4fd8a1945292ae26dc535c778b47a4 Author: Martin Nordholts -Date: Sat Dec 19 09:22:59 2009 +0100 +Date: Sat Dec 19 09:22:59 2009 +0100 app: Inline gimp_dialog_factory_show_toolbox() @@ -74520,7 +75355,7 @@ commit 6d3ee267be823367aca1d3df6f18852b06c80f90 Author: Alexia Death -Date: Fri Dec 18 23:07:00 2009 +0200 +Date: Fri Dec 18 23:07:00 2009 +0200 data: Add the dynamics files that missed commit after rename @@ -74532,7 +75367,7 @@ commit b95dda6eeac7fc31f4dc70d7c4c27572d4df229f Author: Alexia Death -Date: Fri Dec 18 20:20:45 2009 +0200 +Date: Fri Dec 18 20:20:45 2009 +0200 app: Fix dynamics mixing for inputs&outputs that have paint options toggles @@ -74542,11 +75377,11 @@ app/core/gimpdynamicsoutput.h | 3 +++ app/paint/gimpairbrush.c | 2 ++ app/paint/gimpbrushcore.c | 8 ++++++++ - app/paint/gimpclone.c | 1 + + app/paint/gimpclone.c | 1 + app/paint/gimpconvolve.c | 2 ++ app/paint/gimpdodgeburn.c | 2 ++ app/paint/gimperaser.c | 2 ++ - app/paint/gimpheal.c | 1 + + app/paint/gimpheal.c | 1 + app/paint/gimppaintbrush.c | 3 +++ app/paint/gimpsmudge.c | 3 +++ app/paint/gimpsourcecore.c | 1 + @@ -74554,35 +75389,35 @@ commit d2ad292848fd242e533c93526c1d17d75e804b07 Author: Alexia Death -Date: Thu Dec 17 21:49:23 2009 +0200 +Date: Thu Dec 17 21:49:23 2009 +0200 app: Remove repeat options from gradient for paint tools Repeat for gradient/color or any other dynamic driving is provided by fade. - app/paint/gimppaintoptions.c | 94 + app/paint/gimppaintoptions.c | 94 +--------------------------------------- - app/paint/gimppaintoptions.h | 2 - + app/paint/gimppaintoptions.h | 2 - app/tools/gimppaintoptions-gui.c | 24 ---------- 3 files changed, 1 insertion(+), 119 deletions(-) commit 2337581a2dc0a03090feaaf70eff40a801318859 Author: Alexia Death -Date: Fri Dec 18 20:19:22 2009 +0200 +Date: Fri Dec 18 20:19:22 2009 +0200 data: Fix a typo(extra p in taper) for two dynamics presets data/dynamics/Fade-Tappering.gdyn | 61 ----------------------------------- - data/dynamics/Makefile.am | 4 +-- + data/dynamics/Makefile.am | 4 +-- data/dynamics/Velocity-Tappering.gdyn | 61 ----------------------------------- 3 files changed, 2 insertions(+), 124 deletions(-) commit 523708d8492e6fa4f22b58385fcbcdfe9635d837 Author: Alexandre Prokoudine -Date: Fri Dec 18 20:34:35 2009 +0300 +Date: Fri Dec 18 20:34:35 2009 +0300 Updated Russian translation @@ -74592,7 +75427,7 @@ commit 30bb7b58910d98fae8a77903bb7dd3a63f568b5e Author: Martin Nordholts -Date: Fri Dec 18 18:33:51 2009 +0100 +Date: Fri Dec 18 18:33:51 2009 +0100 Bug 604796 - Restore keyboard method to acquire screenshot @@ -74604,7 +75439,7 @@ commit ef6bd20c3b97112881b2b777e289635e58cb73b4 Author: Martin Nordholts -Date: Sat Dec 12 16:36:50 2009 +0100 +Date: Sat Dec 12 16:36:50 2009 +0100 app: When paned widget is removed, clear drag handler @@ -74616,7 +75451,7 @@ commit a0b0d72dd733dabebdb5e1cbe2cf16125adba522 Author: Khaled Hosny -Date: Thu Dec 17 11:01:30 2009 +0200 +Date: Thu Dec 17 11:01:30 2009 +0200 Updated Arabic translation @@ -74626,7 +75461,7 @@ commit cfc3c4c69345e2ef98f3d727152c05f5c9cfa4c2 Author: Sven Neumann -Date: Mon Dec 14 20:28:47 2009 +0100 +Date: Mon Dec 14 20:28:47 2009 +0100 initialize all fields of GimpCoords (based on a patch by Massimo) @@ -74635,7 +75470,7 @@ commit 335597ce7d92c22e9ecb90c21176b6b43dae5459 Author: Michael Natterer -Date: Mon Dec 14 14:00:01 2009 +0100 +Date: Mon Dec 14 14:00:01 2009 +0100 Bug 604508 - gimp-layer-new-from-visible should work from updated projection @@ -74644,13 +75479,13 @@ from it. app/actions/layers-commands.c | 2 ++ - app/pdb/layer-cmds.c | 2 ++ + app/pdb/layer-cmds.c | 2 ++ tools/pdbgen/pdb/layer.pdb | 2 ++ 3 files changed, 6 insertions(+) commit 15f81f1cb3c1fa3f97bad386d4c751576f350480 Author: Alan Monfort -Date: Mon Dec 14 12:43:28 2009 +0100 +Date: Mon Dec 14 12:43:28 2009 +0100 Updated breton translation @@ -74660,7 +75495,7 @@ commit d5a7e61c79f3d1d8ebaa7fabb8a31c4a0aae0b19 Author: Denis ARNAUD -Date: Mon Dec 14 12:42:40 2009 +0100 +Date: Mon Dec 14 12:42:40 2009 +0100 Updated breton translation @@ -74670,7 +75505,7 @@ commit e77fc1e82b28605ca4bb9c2323ac62e44935ba83 Author: Alan Monfort -Date: Mon Dec 14 06:06:21 2009 +0100 +Date: Mon Dec 14 06:06:21 2009 +0100 Updated breton translation @@ -74680,7 +75515,7 @@ commit 39bb1d0977a36b868c1e8a1d3ce67f465f1737ea Author: Denis ARNAUD -Date: Mon Dec 14 06:01:20 2009 +0100 +Date: Mon Dec 14 06:01:20 2009 +0100 Updated breton translation @@ -74690,18 +75525,18 @@ commit 155ecdb8a7cb028193007e5848e24dd3111eeba6 Author: 神州散人 -Date: Mon Dec 14 11:34:45 2009 +0800 +Date: Mon Dec 14 11:34:45 2009 +0800 Updated Simplified Chinese translation. po-plug-ins/zh_CN.po | 249 +++++++++++++++++++++++++++++++++------------------ - po/zh_CN.po | 136 ++++++++++++++-------------- + po/zh_CN.po | 136 ++++++++++++++-------------- 2 files changed, 230 insertions(+), 155 deletions(-) commit 60705f79e93e5d74f0fc52b1f4e030a07446ab3f Author: Alexia Death -Date: Sat Dec 12 23:14:14 2009 +0200 +Date: Sat Dec 12 23:14:14 2009 +0200 app: Making spacing available as dynamic parameter @@ -74710,16 +75545,16 @@ between current and maximum spacing. - app/core/gimpdynamics.c | 20 ++++++++++++- - app/core/gimpdynamics.h | 1 + - app/paint/gimpbrushcore.c | 62 + app/core/gimpdynamics.c | 20 ++++++++++++- + app/core/gimpdynamics.h | 1 + + app/paint/gimpbrushcore.c | 62 ++++++++++++++++++++++++---------------- app/widgets/gimpdynamicseditor.c | 6 +++- 4 files changed, 63 insertions(+), 26 deletions(-) commit e2e781c78eebddf4b077dd0501a55dd9b3b66725 Author: David Planella -Date: Thu Dec 10 22:12:24 2009 +0100 +Date: Thu Dec 10 22:12:24 2009 +0100 Fixed a few typos in the Catalan translation @@ -74729,7 +75564,7 @@ commit 65c5541fafcb44b71c97c6c4df025eac466f7c5f Author: Martin Nordholts -Date: Thu Dec 10 19:26:23 2009 +0100 +Date: Thu Dec 10 19:26:23 2009 +0100 app: Don't crash when detaching dockables from image window @@ -74740,16 +75575,16 @@ The use of global variables is meant to be temporary. - app/widgets/gimpdock.c | 4 +++- - app/widgets/gimpdockable.c | 11 ++++++++--- - app/widgets/gimpdockcolumns.c | 4 +++- - app/widgets/gimpdockwindow.c | 4 +++- + app/widgets/gimpdock.c | 4 +++- + app/widgets/gimpdockable.c | 11 ++++++++--- + app/widgets/gimpdockcolumns.c | 4 +++- + app/widgets/gimpdockwindow.c | 4 +++- app/widgets/gimpsessioninfo-book.c | 4 +++- 5 files changed, 20 insertions(+), 7 deletions(-) commit c02d28643fc132b7e8e2a8791c6fbfa94cf06b35 Author: Michael Natterer -Date: Thu Dec 10 12:20:03 2009 +0100 +Date: Thu Dec 10 12:20:03 2009 +0100 app: fix gimp_button_menu_position() to not add the y position twice @@ -74761,7 +75596,7 @@ commit c7a5195bdf42aa194fed640943ada8d2114c4218 Author: Martin Nordholts -Date: Tue Dec 8 22:27:32 2009 +0100 +Date: Tue Dec 8 22:27:32 2009 +0100 Bug 604078 - Crash when pressing Backspace with Free Select Tool @@ -74778,7 +75613,7 @@ commit b7ae59e9a470fa6e7cfdade1613729c94c3e3a5e Author: Nils Philippsen -Date: Wed Dec 9 17:11:21 2009 +0100 +Date: Wed Dec 9 17:11:21 2009 +0100 SGI: allocate memory more consistently @@ -74790,7 +75625,7 @@ commit 4d9724f2f67bca4005ca50c22afccd7bf30cc2e8 Author: Simon Budig -Date: Wed Dec 9 16:05:05 2009 +0100 +Date: Wed Dec 9 16:05:05 2009 +0100 SGI: fix out of bounds writes @@ -74804,7 +75639,7 @@ commit 838be627be38d3ff25fddf7af16f0c98ddf4cc04 Author: Nils Philippsen -Date: Mon Dec 7 16:21:44 2009 +0100 +Date: Mon Dec 7 16:21:44 2009 +0100 SGI: cast allocation calculations @@ -74818,7 +75653,7 @@ commit daaf1d2b97c74271d9f8cc517f16b53d0089e094 Author: Nils Philippsen -Date: Wed Dec 9 15:43:28 2009 +0100 +Date: Wed Dec 9 15:43:28 2009 +0100 SGI: sanitize input data @@ -74829,7 +75664,7 @@ commit 5aa82f3b6d55280012efc6973c799a46b2ad5d75 Author: Nils Philippsen -Date: Tue Dec 8 17:44:54 2009 +0100 +Date: Tue Dec 8 17:44:54 2009 +0100 PAT: sanitize input data @@ -74842,7 +75677,7 @@ commit b053021a2938d5967edfc966470bfac9257fc03a Author: Nils Philippsen -Date: Tue Dec 8 16:36:10 2009 +0100 +Date: Tue Dec 8 16:36:10 2009 +0100 GBR: more input data sanitation @@ -74854,7 +75689,7 @@ commit 869dcd7be1c1ec991256ba079f670574f1e57b90 Author: Nils Philippsen -Date: Fri Dec 4 11:17:21 2009 +0100 +Date: Fri Dec 4 11:17:21 2009 +0100 GBR: sanitize input data @@ -74866,7 +75701,7 @@ commit a9671395f6573e90316a9d748588c5435216f6ce Author: Nils Philippsen -Date: Wed Dec 2 15:12:17 2009 +0100 +Date: Wed Dec 2 15:12:17 2009 +0100 PCX: Avoid allocation overflows. @@ -74877,7 +75712,7 @@ commit ed7f48be05d233607460ce331a5c07ebfa5830fa Author: Nils Philippsen -Date: Tue Dec 1 15:31:52 2009 +0100 +Date: Tue Dec 1 15:31:52 2009 +0100 PCX: sanitize input data @@ -74888,7 +75723,7 @@ commit f3235e6f456814aecab4c0c56014208cb7c86019 Author: Martin Nordholts -Date: Tue Dec 8 19:49:13 2009 +0100 +Date: Tue Dec 8 19:49:13 2009 +0100 app: Add "dock-factory" property to GimpImageWindow @@ -74901,27 +75736,27 @@ app/display/gimpimagewindow.c | 33 +++++++++++++++++++++++++++++++-- app/display/gimpimagewindow.h | 4 +++- app/gui/gimpuiconfigurer.c | 3 ++- - app/gui/gui-vtable.c | 3 ++- + app/gui/gui-vtable.c | 3 ++- 6 files changed, 44 insertions(+), 8 deletions(-) commit a736b8f972a821903b71d08bed394abbb8d47beb Author: Alexia Death -Date: Sun Dec 6 20:03:39 2009 +0200 +Date: Sun Dec 6 20:03:39 2009 +0200 Adding repeat option to fade. Now fade can be applied either as sawtooth or triangular wave. Also fade can be reversed. - app/paint/gimppaintoptions.c | 65 + app/paint/gimppaintoptions.c | 65 +++++++++++++++++++++++++++++++++------- - app/paint/gimppaintoptions.h | 8 +++-- + app/paint/gimppaintoptions.h | 8 +++-- app/tools/gimppaintoptions-gui.c | 17 ++++++++++- 3 files changed, 76 insertions(+), 14 deletions(-) commit 362f7c3718a295f83afb535495b146ba9f0b619c Author: Alexandre Prokoudine -Date: Sun Dec 6 18:43:31 2009 +0300 +Date: Sun Dec 6 18:43:31 2009 +0300 Updated Russian translations @@ -74930,7 +75765,7 @@ commit 34ad9dad1a06b67ab2b2383606318ea8f457a653 Author: Martin Nordholts -Date: Sun Dec 6 14:49:13 2009 +0100 +Date: Sun Dec 6 14:49:13 2009 +0100 app: Session manage multi-column dock windows @@ -74943,19 +75778,19 @@ app/tests/test-session-management.c and adjust positions and image selection menus a bit. - app/tests/gimpdir/sessionrc | 34 +++++++++------ + app/tests/gimpdir/sessionrc | 34 +++++++++------ app/widgets/gimpsessioninfo-dock.c | 72 +++++++++++++++++++++++-------- app/widgets/gimpsessioninfo-dock.h | 33 +++++++++----- app/widgets/gimpsessioninfo-private.h | 4 +- - app/widgets/gimpsessioninfo.c | 81 + app/widgets/gimpsessioninfo.c | 81 ++++++++++++++++++++++++----------- - app/widgets/widgets-types.h | 1 + + app/widgets/widgets-types.h | 1 + 6 files changed, 153 insertions(+), 72 deletions(-) commit bfd91ebdb7fbacf3ed19ac663ed7692eb47b476d Author: Martin Nordholts -Date: Sun Dec 6 14:31:27 2009 +0100 +Date: Sun Dec 6 14:31:27 2009 +0100 app: Append in gimp_dock_columns_add_dock() @@ -74968,7 +75803,7 @@ commit 482f31cd3fa35e0a704bd70b48c0207cdb3d1d68 Author: Martin Nordholts -Date: Sun Dec 6 10:23:05 2009 +0100 +Date: Sun Dec 6 10:23:05 2009 +0100 app: Add GimpMenuFactoryPrivate @@ -74977,7 +75812,7 @@ much control as possible in who can get the Gimp instance. app/actions/debug-commands.c | 4 ++-- - app/menus/menus.c | 1 - + app/menus/menus.c | 1 - app/widgets/gimpmenufactory.c | 41 ++++++++++++++++++++++++++++++----------- app/widgets/gimpmenufactory.h | 34 ++++++++++++++++------------------ @@ -74985,7 +75820,7 @@ commit b1b560b0c4f7cf8a47db184f0d7174e1897376db Author: Martin Nordholts -Date: Sun Dec 6 09:50:02 2009 +0100 +Date: Sun Dec 6 09:50:02 2009 +0100 app: Only kill living dock windows when switching to s-w-m @@ -74998,7 +75833,7 @@ commit 968fbd7996b4faf35b58b9ce48c42692b84914cd Author: Martin Nordholts -Date: Sun Dec 6 09:38:51 2009 +0100 +Date: Sun Dec 6 09:38:51 2009 +0100 po: Remove gimpdockseparator.c from POTFILES.in @@ -75010,7 +75845,7 @@ commit 5819c3c83a25de4b56360b9d9aa486433c7eaac4 Author: Martin Nordholts -Date: Sun Dec 6 08:58:27 2009 +0100 +Date: Sun Dec 6 08:58:27 2009 +0100 app: Have an "Export" button, not "Save", in export dialogs @@ -75019,7 +75854,7 @@ commit 3bb15eac782f1633e86955c1dae7e143ff296194 Author: Martin Nordholts -Date: Sat Dec 5 22:43:32 2009 +0100 +Date: Sat Dec 5 22:43:32 2009 +0100 app: Move out dock window logic from gimp_session_info_dock_restore() @@ -75030,12 +75865,12 @@ app/widgets/gimpsessioninfo-dock.c | 39 +++++++++++++++++++++----------------- app/widgets/gimpsessioninfo-dock.h | 5 +++-- - app/widgets/gimpsessioninfo.c | 16 ++++++++++++++-- + app/widgets/gimpsessioninfo.c | 16 ++++++++++++++-- 3 files changed, 39 insertions(+), 21 deletions(-) commit 1bf84999e4a4968f5e1c79e167d1888c4a125fe0 Author: Martin Nordholts -Date: Sat Dec 5 21:20:18 2009 +0100 +Date: Sat Dec 5 21:20:18 2009 +0100 Move the Image Selection Menu to GimpDockWindow @@ -75058,33 +75893,33 @@ GimpDockWindow, but we leave the code around. If this is a problem, it will show. - app/actions/dock-actions.c | 6 +- - app/actions/dock-commands.c | 39 +- - app/dialogs/dialogs-constructors.c | 4 +- - app/widgets/gimpdock.c | 187 ++-------- - app/widgets/gimpdock.h | 10 - - app/widgets/gimpdockable.c | 12 +- - app/widgets/gimpdockcolumns.c | 4 +- - app/widgets/gimpdockwindow.c | 612 + app/actions/dock-actions.c | 6 +- + app/actions/dock-commands.c | 39 +- + app/dialogs/dialogs-constructors.c | 4 +- + app/widgets/gimpdock.c | 187 ++-------- + app/widgets/gimpdock.h | 10 - + app/widgets/gimpdockable.c | 12 +- + app/widgets/gimpdockcolumns.c | 4 +- + app/widgets/gimpdockwindow.c | 612 +++++++++++++++++++++++++++---- - app/widgets/gimpdockwindow.h | 35 +- - app/widgets/gimpmenudock.c | 478 +----------------------- - app/widgets/gimpmenudock.h | 10 +- - app/widgets/gimpsessioninfo-aux.c | 4 +- + app/widgets/gimpdockwindow.h | 35 +- + app/widgets/gimpmenudock.c | 478 +----------------------- + app/widgets/gimpmenudock.h | 10 +- + app/widgets/gimpsessioninfo-aux.c | 4 +- app/widgets/gimpsessioninfo-dockable.c | 12 +- - app/widgets/gimptoolbox-color-area.c | 2 +- - app/widgets/gimptoolbox-dnd.c | 22 +- - app/widgets/gimptoolbox-image-area.c | 2 +- + app/widgets/gimptoolbox-color-area.c | 2 +- + app/widgets/gimptoolbox-dnd.c | 22 +- + app/widgets/gimptoolbox-image-area.c | 2 +- app/widgets/gimptoolbox-indicator-area.c | 8 +- - app/widgets/gimptoolbox.c | 205 ++++++++--- - app/widgets/gimptoolbox.h | 13 +- - themes/Default/gtkrc | 2 +- - themes/Small/gtkrc | 2 +- + app/widgets/gimptoolbox.c | 205 ++++++++--- + app/widgets/gimptoolbox.h | 13 +- + themes/Default/gtkrc | 2 +- + themes/Small/gtkrc | 2 +- 21 files changed, 835 insertions(+), 834 deletions(-) commit cb854e6ad7be72ea8d7244e17926bbe1a8b436ab Author: Martin Nordholts -Date: Sat Dec 5 12:38:55 2009 +0100 +Date: Sat Dec 5 12:38:55 2009 +0100 app: Only do necessary init in gimp_dock_window_init() @@ -75097,7 +75932,7 @@ commit b7b28eb61d9eb607958f68ef1852d791b1c736e8 Author: Martin Nordholts -Date: Sat Dec 5 10:22:13 2009 +0100 +Date: Sat Dec 5 10:22:13 2009 +0100 etc: Do not show the dock Image Menu in default UI @@ -75110,13 +75945,13 @@ commit df447512926e65d1f0bf37898e8fb76abdd29239 Author: Martin Nordholts -Date: Sat Dec 5 09:54:17 2009 +0100 +Date: Sat Dec 5 09:54:17 2009 +0100 app: Add GimpMenuDockPrivate Add GimpMenuDockPrivate which requires two new trivial getters. - app/actions/dock-actions.c | 4 +- + app/actions/dock-actions.c | 4 +- app/widgets/gimpmenudock.c | 123 ++++++++++++++++++++++++++++----------------- app/widgets/gimpmenudock.h | 17 +++---- @@ -75124,7 +75959,7 @@ commit c0e8018e8d6194c40ada86cb6113ce40a710f546 Author: Martin Nordholts -Date: Fri Dec 4 08:30:39 2009 +0100 +Date: Fri Dec 4 08:30:39 2009 +0100 app/tests: Use Palette Editor in sessionrc test for dockable aux info @@ -75136,7 +75971,7 @@ commit d33f643f6bdb1ded43650de8593cee276ff0c600 Author: Martin Nordholts -Date: Thu Dec 3 23:08:30 2009 +0100 +Date: Thu Dec 3 23:08:30 2009 +0100 app: Move GimpDockWindow::"font-scale" style property to GimpDock @@ -75149,13 +75984,13 @@ app/widgets/gimpdock.c | 75 ++++++++++++++++++++++++++++++++++++++++++++ app/widgets/gimpdockwindow.c | 51 ++---------------------------- - themes/Default/gtkrc | 2 +- - themes/Small/gtkrc | 2 +- + themes/Default/gtkrc | 2 +- + themes/Small/gtkrc | 2 +- 4 files changed, 79 insertions(+), 51 deletions(-) commit 5ae5ef0f9f92d0d670e3beb152d71624e3c34932 Author: Martin Nordholts -Date: Thu Dec 3 21:51:21 2009 +0100 +Date: Thu Dec 3 21:51:21 2009 +0100 app: dock_ID -> dock_window_ID in gimp_dock_window_init() @@ -75164,7 +75999,7 @@ commit 208de0e64efb9c9b574e3cb42eb65a4dd7638490 Author: Nils-Christoph Fiedler -Date: Wed Dec 2 22:34:01 2009 +0100 +Date: Wed Dec 2 22:34:01 2009 +0100 Added LowGerman translation @@ -75173,7 +76008,7 @@ commit b09c534090ee69c225f439430d91599ed093dc63 Author: Nils-Christoph Fiedler -Date: Wed Dec 2 22:33:54 2009 +0100 +Date: Wed Dec 2 22:33:54 2009 +0100 Added LowGerman translation @@ -75183,29 +76018,29 @@ commit 4ccb6504353a8c875080c130d21d71d40fb89c3a Author: Martin Nordholts -Date: Wed Dec 2 20:40:39 2009 +0100 +Date: Wed Dec 2 20:40:39 2009 +0100 Exterminate GimpDockSeparator Remove all GimpDockSeparator-related code. Seems pointless to keep even the stuff in gtkrc. - app/widgets/Makefile.am | 2 - - app/widgets/gimpdock.c | 1 - - app/widgets/gimpdockcolumns.c | 1 - + app/widgets/Makefile.am | 2 - + app/widgets/gimpdock.c | 1 - + app/widgets/gimpdockcolumns.c | 1 - app/widgets/gimpdockseparator.c | 294 ---------------------------------------- app/widgets/gimpdockseparator.h | 65 --------- - app/widgets/gimptoolbox.c | 17 --- - app/widgets/widgets-types.h | 1 - - etc/gtkrc | 11 -- - themes/Default/gtkrc | 1 - - themes/Small/gtkrc | 1 - + app/widgets/gimptoolbox.c | 17 --- + app/widgets/widgets-types.h | 1 - + etc/gtkrc | 11 -- + themes/Default/gtkrc | 1 - + themes/Small/gtkrc | 1 - 10 files changed, 394 deletions(-) commit c08c6e21e0de5a8ac9d77b8b46b066f6b7f231aa Author: Martin Nordholts -Date: Tue Dec 1 22:18:04 2009 +0100 +Date: Tue Dec 1 22:18:04 2009 +0100 app: Add gimp_dialog_factory_dock_new() @@ -75215,7 +76050,7 @@ commit 95bab5da5ff6a341a8f2950d94bbc576ac8a05bb Author: Martin Nordholts -Date: Tue Dec 1 21:42:24 2009 +0100 +Date: Tue Dec 1 21:42:24 2009 +0100 app: gimp_dialog_factory_dock_new() -> _dock_with_window_new() @@ -75223,13 +76058,13 @@ app/tests/test-window-management.c | 8 ++++---- app/widgets/gimpdialogfactory.c | 19 ++++++++++--------- app/widgets/gimpdialogfactory.h | 2 +- - app/widgets/gimpdockable.c | 4 ++-- + app/widgets/gimpdockable.c | 4 ++-- app/widgets/gimpsessioninfo-dock.c | 2 +- 6 files changed, 20 insertions(+), 19 deletions(-) commit ae3c3291b0c6cf5de56efd0726b68ec2d96e9d2c Author: Martin Nordholts -Date: Mon Nov 30 23:14:54 2009 +0100 +Date: Mon Nov 30 23:14:54 2009 +0100 app: Check for API availability in gimp_statusbar_init() @@ -75238,7 +76073,7 @@ commit a81dc5ead39ddc71de7a77ee5f6c01ac85022523 Author: Martin Nordholts -Date: Mon Nov 30 22:55:31 2009 +0100 +Date: Mon Nov 30 22:55:31 2009 +0100 app: Use more proper API in gimp_statusbar_init() @@ -75254,20 +76089,20 @@ commit 3639ee4055aa90aa7ebc52738638cfd0833edad7 Author: Marco Ciampa -Date: Mon Nov 30 12:01:49 2009 +0100 +Date: Mon Nov 30 12:01:49 2009 +0100 Updated italian translation - po-libgimp/it.po | 30 +- + po-libgimp/it.po | 30 +- po-plug-ins/it.po | 638 +++++---- - po-script-fu/it.po | 20 +- - po/it.po | 3724 + po-script-fu/it.po | 20 +- + po/it.po | 3724 ++++++++++++++++++++++++++++------------------------ 4 files changed, 2389 insertions(+), 2023 deletions(-) commit 96332f4252c188cfaf95d0bbdb1d8f546ae5f77a Author: Alexandre Prokoudine -Date: Mon Nov 30 03:35:17 2009 +0300 +Date: Mon Nov 30 03:35:17 2009 +0300 Updated Russian translation @@ -75277,7 +76112,7 @@ commit 198088c21537c3a0c17f6516cdc152074e325a9a Author: Alexandre Prokoudine -Date: Mon Nov 30 03:32:01 2009 +0300 +Date: Mon Nov 30 03:32:01 2009 +0300 Updated Russian translation @@ -75287,7 +76122,7 @@ commit fd3ab6ac2bd06b4313ff7a970f30062daf1a7262 Author: Alexandre Prokoudine -Date: Mon Nov 30 03:31:35 2009 +0300 +Date: Mon Nov 30 03:31:35 2009 +0300 Normalized naming of the file type, added missing , in sentences, fixed a typo @@ -75297,7 +76132,7 @@ commit 7b85cf4de8938bfe833de223026bd6e99d585bac Author: Martin Nordholts -Date: Sun Nov 29 18:22:12 2009 +0100 +Date: Sun Nov 29 18:22:12 2009 +0100 app: Use a GdkWindow instead of GimpDockSeparators for dockable DND @@ -75334,24 +76169,24 @@ * Add some GIMP_LOG() debug output for DND * Disable the GimpDockSeparator code in GimpToolbox - app/widgets/gimpdock.c | 13 +- - app/widgets/gimpdockable.c | 86 +++++++- - app/widgets/gimpdockable.h | 68 +++--- - app/widgets/gimpdockbook.c | 147 +++++++++++-- - app/widgets/gimpdockbook.h | 2 + - app/widgets/gimpdockcolumns.c | 16 +- + app/widgets/gimpdock.c | 13 +- + app/widgets/gimpdockable.c | 86 +++++++- + app/widgets/gimpdockable.h | 68 +++--- + app/widgets/gimpdockbook.c | 147 +++++++++++-- + app/widgets/gimpdockbook.h | 2 + + app/widgets/gimpdockcolumns.c | 16 +- app/widgets/gimpdockseparator.c | 20 +- app/widgets/gimpdockseparator.h | 14 +- - app/widgets/gimppanedbox.c | 460 + app/widgets/gimppanedbox.c | 460 +++++++++++++++++++++++++++++++++------- - app/widgets/gimppanedbox.h | 34 +-- - app/widgets/gimptoolbox.c | 22 -- - app/widgets/widgets-types.h | 4 +- + app/widgets/gimppanedbox.h | 34 +-- + app/widgets/gimptoolbox.c | 22 -- + app/widgets/widgets-types.h | 4 +- 12 files changed, 695 insertions(+), 191 deletions(-) commit 9ea1d490a4183dc0c3d938797e6f57d4c7b14989 Author: Martin Nordholts -Date: Sun Nov 29 15:07:10 2009 +0100 +Date: Sun Nov 29 15:07:10 2009 +0100 app: Make gimp_paned_box_remove_widget() more destruction friendly @@ -75363,7 +76198,7 @@ commit 7739670a9338b2cd921896a285c24e87f1917603 Author: Michael Natterer -Date: Sun Nov 29 13:51:22 2009 +0100 +Date: Sun Nov 29 13:51:22 2009 +0100 gimp_layer_sync_mode_node(): use gegl:over for normal mode @@ -75372,7 +76207,7 @@ commit 12ac8ce899775ae9ec1a9bbc373ab6bc57d37467 Author: Michael Natterer -Date: Sun Nov 29 13:35:27 2009 +0100 +Date: Sun Nov 29 13:35:27 2009 +0100 Factor out configuring the layer's mode node to a utility function @@ -75381,31 +76216,31 @@ commit e4e7bf8471294892aca5b10824c1a6d1426699f8 Author: Martin Nordholts -Date: Sat Nov 28 19:12:39 2009 +0100 +Date: Sat Nov 28 19:12:39 2009 +0100 app: Add and use gimp_highlight_widget() Add gimp_highlight_widget() so we can simplify gimp_dockbook_tab_drag_motion() a bit. - app/widgets/gimpdockbook.c | 16 +++++----------- + app/widgets/gimpdockbook.c | 16 +++++----------- app/widgets/gimpwidgets-utils.c | 20 ++++++++++++++++++++ app/widgets/gimpwidgets-utils.h | 3 +++ 3 files changed, 28 insertions(+), 11 deletions(-) commit 2c05af036cfe5454bbf6c145b432265596cacb23 Author: Michael Natterer -Date: Fri Nov 27 21:11:26 2009 +0100 +Date: Fri Nov 27 21:11:26 2009 +0100 Use gegl:over instead of gegl:normal app/core/gimpdrawable.c | 2 +- - app/core/gimpimage.c | 2 +- + app/core/gimpimage.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 825fab3dd0f830abdc0785a465b2dd7f57ba4e1f Author: Michael Natterer -Date: Tue Nov 24 14:58:28 2009 +0100 +Date: Tue Nov 24 14:58:28 2009 +0100 Bug 602761 - plug-in-grid: Parameters Horizontal/Vertical Spacing and Horizontal/Vertical Offset are reversed @@ -75418,7 +76253,7 @@ commit 028b66beba66dd6b1fe0a9a6b825034d3b971b5a Author: Michael Natterer -Date: Tue Nov 24 14:49:17 2009 +0100 +Date: Tue Nov 24 14:49:17 2009 +0100 Bug 602761 - plug-in-grid: Parameters Horizontal/Vertical Spacing and Horizontal/Vertical Offset are reversed @@ -75439,7 +76274,7 @@ commit 85b8d9668e8abccad2fe9015f6fd75d383ea6276 Author: Mircea Purdea -Date: Fri Nov 20 11:23:13 2009 +0200 +Date: Fri Nov 20 11:23:13 2009 +0200 Modified UI to include default timing @@ -75457,7 +76292,7 @@ commit 938de3ac01637304ea8ec8de1bcbfe1c4ba2ab8b Author: Michael Natterer -Date: Thu Nov 19 14:44:56 2009 +0100 +Date: Thu Nov 19 14:44:56 2009 +0100 Simplify if()s a bit in dockable_toggle_view_cmd_callback() @@ -75466,7 +76301,7 @@ commit e466da861638571ac22ba3e37f8b99d7d72bf846 Author: Michael Natterer -Date: Thu Nov 19 14:40:25 2009 +0100 +Date: Thu Nov 19 14:40:25 2009 +0100 Plug memleak found by Nelson A. de Oliveira @@ -75475,7 +76310,7 @@ commit 9cc8d78ff33b7a36852b74e64b427489cad44d0e Author: Simon Budig -Date: Tue Nov 17 00:41:39 2009 +0100 +Date: Tue Nov 17 00:41:39 2009 +0100 Harden the PSD plugin against integer overflows. @@ -75489,19 +76324,19 @@ commit bc7519d1c58ee2818f1247e1eac5c2089370e475 Author: 神州散人 -Date: Tue Nov 17 15:32:42 2009 +0800 +Date: Tue Nov 17 15:32:42 2009 +0800 Updated Simplified Chinese translations. po-plug-ins/zh_CN.po | 3037 +++++++++++++++++++++++++++---------------------- - po/zh_CN.po | 3039 + po/zh_CN.po | 3039 +++++++++++++++++++++++++------------------------- 2 files changed, 3259 insertions(+), 2817 deletions(-) commit 0e440cb6d4d6ee029667363d244aff61b154c33c Author: Simon Budig -Date: Tue Nov 17 01:12:19 2009 +0100 +Date: Tue Nov 17 01:12:19 2009 +0100 Fix the PSD structs to use signed ints for bounding box coordinates. @@ -75511,7 +76346,7 @@ commit be0576997424d66e87b9f820897673543a2e50c8 Author: Kjartan Maraas -Date: Mon Nov 16 18:37:57 2009 +0100 +Date: Mon Nov 16 18:37:57 2009 +0100 Updated Norwegian bokmål translation. @@ -75521,7 +76356,7 @@ commit c13193a8e171d1432fed23add19fc38940d4ac41 Author: Kjartan Maraas -Date: Mon Nov 16 18:28:06 2009 +0100 +Date: Mon Nov 16 18:28:06 2009 +0100 Updated Norwegian bokmål translation. @@ -75530,7 +76365,7 @@ commit 0d12733f5821eab400401fd544943fbaa86d242c Author: Kjartan Maraas -Date: Mon Nov 16 18:19:25 2009 +0100 +Date: Mon Nov 16 18:19:25 2009 +0100 Updated Norwegian bokmål translation. @@ -75540,7 +76375,7 @@ commit 16e6a37687bb4b9748c5a5d166d90f5d5bd2e9f3 Author: Nils Philippsen -Date: Mon Nov 16 18:16:38 2009 +0100 +Date: Mon Nov 16 18:16:38 2009 +0100 Ensure valid bit depths when reading BMP files. @@ -75549,7 +76384,7 @@ commit f63ba36dd9cc01ca6da83fa05ddd12419ad8953e Author: Nils Philippsen -Date: Mon Nov 16 17:16:09 2009 +0100 +Date: Mon Nov 16 17:16:09 2009 +0100 Use more defensive coding in plausibility check. @@ -75562,7 +76397,7 @@ commit 43d57c666346320436a0b668de5525387952784e Author: Nils Philippsen -Date: Mon Nov 16 17:15:32 2009 +0100 +Date: Mon Nov 16 17:15:32 2009 +0100 Make plausibility check easier to understand. @@ -75574,7 +76409,7 @@ commit 7810dede3927703bcbc05b7aa6f346a6bc7c8819 Author: Kjartan Maraas -Date: Mon Nov 16 14:28:52 2009 +0100 +Date: Mon Nov 16 14:28:52 2009 +0100 Updated Norwegian bokmål translation. @@ -75583,7 +76418,7 @@ commit 411a6c0a43d79578a0756c887008339c5b4b0dc8 Author: Kjartan Maraas -Date: Mon Nov 16 14:28:11 2009 +0100 +Date: Mon Nov 16 14:28:11 2009 +0100 Updated Norwegian bokmål translation. @@ -75593,7 +76428,7 @@ commit 3e6d5d58748c2389c40ede46af9199aee91d8153 Author: Kjartan Maraas -Date: Mon Nov 16 14:25:14 2009 +0100 +Date: Mon Nov 16 14:25:14 2009 +0100 Updated Norwegian bokmål translation. @@ -75603,7 +76438,7 @@ commit b45454bc6cde091b49fc8110fb1984006ca04b46 Author: Michael Natterer -Date: Sun Nov 15 21:34:16 2009 +0100 +Date: Sun Nov 15 21:34:16 2009 +0100 Make the popup arrow look sane again @@ -75617,7 +76452,7 @@ commit a6855087135127aa1b1c638a57b292c1c40c50b3 Author: Martin Nordholts -Date: Sun Nov 15 21:25:28 2009 +0100 +Date: Sun Nov 15 21:25:28 2009 +0100 app: Make GimpDockColumns listen to "dock-removed" @@ -75634,7 +76469,7 @@ commit 79563b99c26d489ec59cf3f711f99f1c682a4657 Author: Michael Natterer -Date: Sun Nov 15 20:28:39 2009 +0100 +Date: Sun Nov 15 20:28:39 2009 +0100 Use GtkEntry's icon feature instead of reimplementing our own popup arrow @@ -75650,7 +76485,7 @@ commit b5eae26c4b4dd9bce1b6b9ff3e716d5ef2bf04b1 Author: Martin Nordholts -Date: Sun Nov 15 19:51:15 2009 +0100 +Date: Sun Nov 15 19:51:15 2009 +0100 app: gimp_dock_columns_dock_book_remove() -> _removed() @@ -75659,7 +76494,7 @@ commit 13bac610202276ad0595f7be54d3391034f15a74 Author: Martin Nordholts -Date: Sun Nov 15 19:21:57 2009 +0100 +Date: Sun Nov 15 19:21:57 2009 +0100 app: Move g_list_copy() out from gimp_dock_columns_get_docks() @@ -75673,7 +76508,7 @@ commit 8a473663d56093ea2ee5e354b981962456992b1b Author: Martin Nordholts -Date: Sun Nov 15 16:10:59 2009 +0100 +Date: Sun Nov 15 16:10:59 2009 +0100 app: Fix gimp_dock_separator_get_insert_pos(), we must return an index @@ -75687,7 +76522,7 @@ commit ae2f595f12cb393ec69ffe30e9ac5acdf2250320 Author: Martin Nordholts -Date: Sun Nov 15 15:54:20 2009 +0100 +Date: Sun Nov 15 15:54:20 2009 +0100 app: Remove empty GimpDocks from GimpDockColumns @@ -75696,7 +76531,7 @@ commit 12530bfcf1a534b480eb64a89762abe42c29d991 Author: Martin Nordholts -Date: Fri Nov 13 18:24:20 2009 +0100 +Date: Fri Nov 13 18:24:20 2009 +0100 app: Add GimpDockColumns "dock-added" and "dock-removed" signals @@ -75707,7 +76542,7 @@ commit 474b5fdff3b0bb39f252e67f7ead6357e6f69007 Author: Sven Neumann -Date: Sat Nov 14 16:50:42 2009 +0100 +Date: Sat Nov 14 16:50:42 2009 +0100 Bug 601891 - gimp_image_get_selection returns None @@ -75720,7 +76555,7 @@ commit 0715c58c139bb4cdd4c3635ed43a0099d93ad302 Author: Michael Natterer -Date: Wed Nov 11 21:00:14 2009 +0100 +Date: Wed Nov 11 21:00:14 2009 +0100 Fix the find_widget_under_pointer() code to build with GSEAL_ENABLE @@ -75729,7 +76564,7 @@ commit 5707f0406600cf54bf221042a30a3c84c83c10b7 Author: Sven Neumann -Date: Wed Nov 11 00:10:02 2009 +0100 +Date: Wed Nov 11 00:10:02 2009 +0100 plug-ins: remove dead code @@ -75741,7 +76576,7 @@ commit e3afc99b2fa7aeddf0dba4778663160a5bc682d3 Author: Simon Budig -Date: Tue Nov 10 00:08:59 2009 +0100 +Date: Tue Nov 10 00:08:59 2009 +0100 Harden the BMP plugin against integer overflows. @@ -75754,7 +76589,7 @@ commit b6e57b11d3f1215aee131d0c2d619dd968971b0a Author: Michael Natterer -Date: Mon Nov 9 19:20:08 2009 +0100 +Date: Mon Nov 9 19:20:08 2009 +0100 Fix glitch in last commit to make it build @@ -75763,7 +76598,7 @@ commit 5fe5148368aa8358ef879f92ec2bf0c860d162c3 Author: Sven Neumann -Date: Mon Nov 9 19:08:48 2009 +0100 +Date: Mon Nov 9 19:08:48 2009 +0100 plug-ins: clean up comment @@ -75775,7 +76610,7 @@ commit 42e31b1cc8cfd78d52e94491af19e62f81dbf486 Author: Sven Neumann -Date: Mon Nov 9 19:07:54 2009 +0100 +Date: Mon Nov 9 19:07:54 2009 +0100 libgimpwidgets: clean up comment @@ -75787,7 +76622,7 @@ commit 1339b5cd8737075b961c3c805089d833faf2114a Author: Sven Neumann -Date: Mon Nov 9 19:03:03 2009 +0100 +Date: Mon Nov 9 19:03:03 2009 +0100 script-fu: remove dead code @@ -75799,7 +76634,7 @@ commit 8c49ecb2e5981a2c93298e72c00183629484b4a0 Author: Sven Neumann -Date: Mon Nov 9 18:59:06 2009 +0100 +Date: Mon Nov 9 18:59:06 2009 +0100 plug-ins: remove dead code from the image-map plug-in @@ -75812,7 +76647,7 @@ commit 724302020b3c1e771a4980c2b03cd036dfda22d0 Author: Sven Neumann -Date: Mon Nov 9 09:40:57 2009 +0100 +Date: Mon Nov 9 09:40:57 2009 +0100 plug-ins: remove redundant comment @@ -75825,20 +76660,20 @@ commit 525347d9f644d9d88750c384cd4ad414f887a4c4 Author: Javier Jardón -Date: Mon Nov 9 08:31:45 2009 +0100 +Date: Mon Nov 9 08:31:45 2009 +0100 Remove deprecated glib symbol: g_mapped_free - libgimpconfig/gimpscanner.c | 4 ---- - plug-ins/common/file-wmf.c | 12 ------------ - plug-ins/common/lcms.c | 8 -------- - plug-ins/common/mail.c | 4 ---- + libgimpconfig/gimpscanner.c | 4 ---- + plug-ins/common/file-wmf.c | 12 ------------ + plug-ins/common/lcms.c | 8 -------- + plug-ins/common/mail.c | 4 ---- plug-ins/file-jpeg/jpeg-exif.c | 4 ---- 5 files changed, 32 deletions(-) commit 659cf3743e3c48e18a08ba41c83c7ef77c841410 Author: Michael Natterer -Date: Sun Nov 8 14:22:26 2009 +0100 +Date: Sun Nov 8 14:22:26 2009 +0100 Bug 593848 - FG color changed to black when FG-BG Editor tab created @@ -75854,7 +76689,7 @@ commit 3a8b59ada578e400e2801723b8c84b9c6b3c791f Author: Michael Natterer -Date: Sat Nov 7 21:14:56 2009 +0100 +Date: Sat Nov 7 21:14:56 2009 +0100 Use ${gimp_dir} and ${gimp_data_dir} in tags.xml @@ -75869,13 +76704,13 @@ less identifier remapping. The identifiers even stay the same when upgrading GIMP. - app/core/gimpdata.c | 26 +++++++++++++++++++++++++- + app/core/gimpdata.c | 26 +++++++++++++++++++++++++- data/tags/gimp-tags-default.xml.in | 4 ++-- 2 files changed, 27 insertions(+), 3 deletions(-) commit e4d8a360803211a3c4b904a0f054ac8d2cbcd5f9 Author: Michael Natterer -Date: Sat Nov 7 17:39:02 2009 +0100 +Date: Sat Nov 7 17:39:02 2009 +0100 Store the active dynamics with the input device @@ -75886,7 +76721,7 @@ commit 2651c2517bd48885803810dc9ec224e53afafca5 Author: Michael Natterer -Date: Fri Nov 6 12:04:58 2009 +0100 +Date: Fri Nov 6 12:04:58 2009 +0100 Bail our from expose() when the event doesn't come from entry->text_area @@ -75896,7 +76731,7 @@ commit dd3c1d5eb5ff7c1680fedde809ad906af95b6fe7 Author: Michael Natterer -Date: Thu Nov 5 22:48:11 2009 +0100 +Date: Thu Nov 5 22:48:11 2009 +0100 Use the standard system mouse cursor over the popup arrow @@ -75905,7 +76740,7 @@ commit 68e16056664fcd3b658eab4f6e02a24c78c1f532 Author: Simon Budig -Date: Thu Nov 5 10:55:00 2009 +0100 +Date: Thu Nov 5 10:55:00 2009 +0100 Added workaround for the solaris-printf behaviour. @@ -75914,7 +76749,7 @@ commit c073804733dff41748822c49590ae7e768625cbc Author: Petr Kovar -Date: Wed Nov 4 21:30:58 2009 +0100 +Date: Wed Nov 4 21:30:58 2009 +0100 Updated Czech translation by Marek Cernocky @@ -75924,7 +76759,7 @@ commit 6a00a4ef223ddfde7082e7862621fb07ceacf8e5 Author: Michael Natterer -Date: Wed Nov 4 19:32:13 2009 +0100 +Date: Wed Nov 4 19:32:13 2009 +0100 Add comment why we implement focus_in_event() and focus_out_event() @@ -75933,7 +76768,7 @@ commit a4694d8a0ae2f6b48a38040b3ca6b08a7cde47ba Author: Michael Natterer -Date: Tue Nov 3 15:49:18 2009 +0100 +Date: Tue Nov 3 15:49:18 2009 +0100 Optimize gimp_statusbar_replace_valist() @@ -75945,7 +76780,7 @@ commit ae70da3e7240f1d0d27366f09e2c761397f84d24 Author: Michael Natterer -Date: Tue Nov 3 15:43:32 2009 +0100 +Date: Tue Nov 3 15:43:32 2009 +0100 Remove unused #define STATUSBAR_SIZE 200 @@ -75954,7 +76789,7 @@ commit 8c07e5275975e56e7548c7f1ec484f4ece474fa6 Author: Michael Natterer -Date: Tue Nov 3 13:58:36 2009 +0100 +Date: Tue Nov 3 13:58:36 2009 +0100 Don't let focus-in and focus-out on the canvas invalidate everything @@ -75968,14 +76803,14 @@ failed for empty displays and was constantly invalidating the entire drop zone when the toplevel window gained or lost focus. - app/display/gimpcanvas.c | 62 + app/display/gimpcanvas.c | 62 +++++++++++++++++++++----------- app/display/gimpdisplayshell-callbacks.c | 5 --- 2 files changed, 41 insertions(+), 26 deletions(-) commit 278e9c277127270536c0b6131c744c3115890713 Author: Michael Natterer -Date: Tue Nov 3 09:07:20 2009 +0100 +Date: Tue Nov 3 09:07:20 2009 +0100 Bug 600303 - gimp-remote not ready for GSEAL_ENABLE @@ -75986,25 +76821,25 @@ commit bd6e87818a94c6255b7cbb295b01396a3d56fc1d Author: Miloš Popović -Date: Tue Nov 3 00:40:35 2009 +0000 +Date: Tue Nov 3 00:40:35 2009 +0000 Updated Serbian translation - po-libgimp/sr.po | 663 ++--- + po-libgimp/sr.po | 663 ++--- po-libgimp/sr@latin.po | 663 ++--- - po-plug-ins/sr.po | 6045 +++++++++++++++++++++------------------- + po-plug-ins/sr.po | 6045 +++++++++++++++++++++------------------- po-plug-ins/sr@latin.po | 6045 +++++++++++++++++++++------------------- - po-python/sr.po | 179 +- - po-python/sr@latin.po | 179 +- - po/sr.po | 6954 + po-python/sr.po | 179 +- + po-python/sr@latin.po | 179 +- + po/sr.po | 6954 ++++++++++++++++++++++++++--------------------- - po/sr@latin.po | 6954 + po/sr@latin.po | 6954 ++++++++++++++++++++++++++--------------------- 8 files changed, 15090 insertions(+), 12592 deletions(-) commit 10bb9b090f37281394f8b9f1804338993c212492 Author: Michael Natterer -Date: Sun Nov 1 20:47:18 2009 +0100 +Date: Sun Nov 1 20:47:18 2009 +0100 Get rid of useless const in "const GimpDisplayShell*" @@ -76015,7 +76850,7 @@ commit deed1636f92a02d9fd6b8e1d5616f29bc02ffb63 Author: Michael Natterer -Date: Sun Nov 1 18:18:17 2009 +0100 +Date: Sun Nov 1 18:18:17 2009 +0100 Remove all code from gimp_display_shell_new() @@ -76027,7 +76862,7 @@ commit 439994d99406a8b13c885fc0fd5fc58842de4f22 Author: Michael Natterer -Date: Sun Nov 1 14:49:19 2009 +0100 +Date: Sun Nov 1 14:49:19 2009 +0100 Clean up gimp_display_shell_init() @@ -76040,7 +76875,7 @@ commit 397650bc46bb44cc5d3e7e39d7dd7f1df27a06e4 Author: Martin Nordholts -Date: Sat Oct 31 13:22:09 2009 +0100 +Date: Sat Oct 31 13:22:09 2009 +0100 app: Remove #include "gimpdockseparator.h" in gimpwidgets-utils.c @@ -76049,7 +76884,7 @@ commit 074b77c0d6c71161e90d35fdd4c4ef1d607d50c5 Author: Khaled Hosny -Date: Sat Oct 31 20:38:53 2009 +0200 +Date: Sat Oct 31 20:38:53 2009 +0200 Updated Arabic translation @@ -76059,68 +76894,68 @@ commit 22767ca7b8e47aaec023400197c94605f0e5c515 Author: Michael Natterer -Date: Sat Oct 31 18:48:38 2009 +0100 +Date: Sat Oct 31 18:48:38 2009 +0100 Seal GimpData completely and add the missing accessors - app/actions/brushes-actions.c | 2 +- - app/actions/context-commands.c | 20 ++- - app/actions/data-commands.c | 4 +- - app/actions/dynamics-actions.c | 2 +- + app/actions/brushes-actions.c | 2 +- + app/actions/context-commands.c | 20 ++- + app/actions/data-commands.c | 4 +- + app/actions/dynamics-actions.c | 2 +- app/actions/gradient-editor-commands.c | 10 +- - app/actions/gradients-actions.c | 2 +- - app/actions/palettes-actions.c | 2 +- - app/actions/patterns-actions.c | 2 +- - app/core/gimpbrush.c | 6 +- - app/core/gimpcurve.c | 4 +- - app/core/gimpdata.c | 302 + app/actions/gradients-actions.c | 2 +- + app/actions/palettes-actions.c | 2 +- + app/actions/patterns-actions.c | 2 +- + app/core/gimpbrush.c | 6 +- + app/core/gimpcurve.c | 4 +- + app/core/gimpdata.c | 302 +++++++++++++++++++++++---------- - app/core/gimpdata.h | 27 ++- - app/core/gimpdatafactory.c | 17 +- - app/core/gimpdynamics.c | 5 +- - app/core/gimpgradient.c | 5 +- - app/core/gimppalette.c | 5 +- - app/core/gimppattern.c | 6 +- - app/pdb/brush-cmds.c | 4 +- - app/pdb/gimppdb-utils.c | 6 +- - app/pdb/gradient-cmds.c | 6 +- - app/pdb/palette-cmds.c | 4 +- - app/widgets/gimpdataeditor.c | 9 +- - app/widgets/gimpdatafactoryview.c | 2 +- - tools/pdbgen/pdb/brush.pdb | 4 +- - tools/pdbgen/pdb/gradient.pdb | 6 +- - tools/pdbgen/pdb/palette.pdb | 4 +- + app/core/gimpdata.h | 27 ++- + app/core/gimpdatafactory.c | 17 +- + app/core/gimpdynamics.c | 5 +- + app/core/gimpgradient.c | 5 +- + app/core/gimppalette.c | 5 +- + app/core/gimppattern.c | 6 +- + app/pdb/brush-cmds.c | 4 +- + app/pdb/gimppdb-utils.c | 6 +- + app/pdb/gradient-cmds.c | 6 +- + app/pdb/palette-cmds.c | 4 +- + app/widgets/gimpdataeditor.c | 9 +- + app/widgets/gimpdatafactoryview.c | 2 +- + tools/pdbgen/pdb/brush.pdb | 4 +- + tools/pdbgen/pdb/gradient.pdb | 6 +- + tools/pdbgen/pdb/palette.pdb | 4 +- 26 files changed, 300 insertions(+), 166 deletions(-) commit 7abcfbf2374c8ac7f318ea29b1808368fcb4bf88 Author: Michael Natterer -Date: Sat Oct 31 15:24:57 2009 +0100 +Date: Sat Oct 31 15:24:57 2009 +0100 Add private struct to GimpData And start sealing by moving "filename" there. Add gimp_data_get_filename() and use it everywhere. - app/actions/brushes-actions.c | 17 +++--- - app/actions/data-commands.c | 19 ++++--- + app/actions/brushes-actions.c | 17 +++--- + app/actions/data-commands.c | 19 ++++--- app/actions/dynamics-actions.c | 13 +++-- - app/actions/gradients-actions.c | 9 +++- + app/actions/gradients-actions.c | 9 +++- app/actions/palettes-actions.c | 15 ++++-- app/actions/patterns-actions.c | 17 +++--- - app/core/gimpbrushgenerated-save.c | 4 +- - app/core/gimpcurve-save.c | 4 +- - app/core/gimpdata.c | 107 + app/core/gimpbrushgenerated-save.c | 4 +- + app/core/gimpcurve-save.c | 4 +- + app/core/gimpdata.c | 107 ++++++++++++++++++++++++++----------- - app/core/gimpdata.h | 2 +- - app/core/gimpdatafactory.c | 14 ++--- - app/core/gimpdynamics-save.c | 2 +- - app/core/gimpgradient-save.c | 4 +- - app/core/gimppalette-save.c | 4 +- + app/core/gimpdata.h | 2 +- + app/core/gimpdatafactory.c | 14 ++--- + app/core/gimpdynamics-save.c | 2 +- + app/core/gimpgradient-save.c | 4 +- + app/core/gimppalette-save.c | 4 +- 14 files changed, 154 insertions(+), 77 deletions(-) commit cfa76869d69f3c4e8ad5de87d264978063152337 Author: Michael Natterer -Date: Fri Oct 30 22:58:19 2009 +0100 +Date: Fri Oct 30 22:58:19 2009 +0100 Bug 599797 - Crash on "Refresh dynamics" if ~/.gimp-2.7/dynamics folder is missing @@ -76135,7 +76970,7 @@ commit 223cbeb6fb2646001b438351f9d4c736622511f8 Author: Michael Natterer -Date: Fri Oct 30 22:50:02 2009 +0100 +Date: Fri Oct 30 22:50:02 2009 +0100 Fix gimp_data_factory_data_foreach() @@ -76148,7 +76983,7 @@ commit a0e70231fbe8e7f38650498991ed55c86142ecce Author: Michael Natterer -Date: Fri Oct 30 22:40:50 2009 +0100 +Date: Fri Oct 30 22:40:50 2009 +0100 Rename cache utility function and reorder stuff to make more sense @@ -76158,7 +76993,7 @@ commit 118440affc55803801033060bc10ff22db8d7769 Author: Michael Natterer -Date: Fri Oct 30 22:00:51 2009 +0100 +Date: Fri Oct 30 22:00:51 2009 +0100 Add typedef GimpDataForeachFunc @@ -76170,7 +77005,7 @@ commit 2700b35dae07edbb5a7a2908ae94958f255b67d2 Author: Michael Natterer -Date: Fri Oct 30 21:45:03 2009 +0100 +Date: Fri Oct 30 21:45:03 2009 +0100 gimp_data_factory_load_data(): add local "loader" variable for readability @@ -76180,7 +77015,7 @@ commit 1e49fd6b50bdbd2e1632d52a560d21ca90c101e7 Author: Michael Natterer -Date: Fri Oct 30 21:31:13 2009 +0100 +Date: Fri Oct 30 21:31:13 2009 +0100 Give a proper error message if there is no writable data directory @@ -76196,7 +77031,7 @@ commit b2e98c44ec3f7b7b87a6c277336e43a0e3f4b3ff Author: Michael Natterer -Date: Fri Oct 30 10:47:47 2009 +0100 +Date: Fri Oct 30 10:47:47 2009 +0100 Don't filter out non-existing folders in the path editor @@ -76207,7 +77042,7 @@ commit cc25adfb63683870a74926950b23cc0de65b8bfa Author: Khaled Hosny -Date: Fri Oct 30 18:30:28 2009 +0200 +Date: Fri Oct 30 18:30:28 2009 +0200 Updated Arabic translation @@ -76217,7 +77052,7 @@ commit 0c908fc12bd08bcbe64b0aee920106ffbbcae9aa Author: Michael Natterer -Date: Wed Oct 28 20:25:55 2009 +0100 +Date: Wed Oct 28 20:25:55 2009 +0100 Inline a function that was only used once @@ -76231,7 +77066,7 @@ commit 6ab3d27e7b62a61c164f3fc3ce5f05b81cebdb52 Author: Alexandre Prokoudine -Date: Wed Oct 28 18:01:47 2009 +0000 +Date: Wed Oct 28 18:01:47 2009 +0000 Updated Russian translation @@ -76240,7 +77075,7 @@ commit 032faebac6f3031035f42ae8d84e5ea4bf9ad4e9 Author: drtvasudevan -Date: Wed Oct 28 13:02:36 2009 +0530 +Date: Wed Oct 28 13:02:36 2009 +0530 Updated Tamil translation @@ -76250,7 +77085,7 @@ commit 2eeb57eb52e2e46c9b8ee34bde5a190b6ee19cbf Author: drtvasudevan -Date: Wed Oct 28 13:02:22 2009 +0530 +Date: Wed Oct 28 13:02:22 2009 +0530 Updated Tamil translation @@ -76260,7 +77095,7 @@ commit 6e2e5c50df57da80c64470d8c55b6d7ff816c622 Author: drtvasudevan -Date: Wed Oct 28 05:47:51 2009 +0530 +Date: Wed Oct 28 05:47:51 2009 +0530 updated tamil translation @@ -76270,7 +77105,7 @@ commit 05f6d89ab06f552822a593dcdabe0a702a2b08d2 Author: Alexia Death -Date: Tue Oct 27 23:14:44 2009 +0200 +Date: Tue Oct 27 23:14:44 2009 +0200 Stop smudge from crashing by disabling dynamic transfrorming in the brush core. @@ -76283,7 +77118,7 @@ commit f71694e12606be77f02c6fed1f4f71b1149c196a Author: Khaled Hosny -Date: Tue Oct 27 20:49:22 2009 +0200 +Date: Tue Oct 27 20:49:22 2009 +0200 Updated Arabic translation @@ -76292,7 +77127,7 @@ commit 3329c89ad5a65991d8eafea7b99bd770565d05f3 Author: Michael Natterer -Date: Tue Oct 27 19:47:55 2009 +0100 +Date: Tue Oct 27 19:47:55 2009 +0100 Formatting cleanup @@ -76301,7 +77136,7 @@ commit 962bf514c8d5ab0295a2b1df84bc8bc42ef7141f Author: Michael Natterer -Date: Tue Oct 27 19:44:05 2009 +0100 +Date: Tue Oct 27 19:44:05 2009 +0100 Don't try to make quarks from NULL strings @@ -76314,7 +77149,7 @@ commit 574ff6e7c1d47a5d6c18a789f8e3f59e2218dd39 Author: Khaled Hosny -Date: Tue Oct 27 20:34:39 2009 +0200 +Date: Tue Oct 27 20:34:39 2009 +0200 Updated Arabic translation @@ -76324,7 +77159,7 @@ commit 398607ee94c11acad4676a7003d8914804d24156 Author: Michael Natterer -Date: Tue Oct 27 18:52:47 2009 +0100 +Date: Tue Oct 27 18:52:47 2009 +0100 Bug 599765 - F1 key on gimp-tool-align in menu have wrong link and it open gimp-tool-move @@ -76337,20 +77172,20 @@ commit d97e1fa68b86f927148beb6dcfd1dbab296def66 Author: Alexandre Prokoudine -Date: Tue Oct 27 19:37:52 2009 +0000 +Date: Tue Oct 27 19:37:52 2009 +0000 Updated Russian translation po-libgimp/ru.po | 255 ++--- po-plug-ins/ru.po | 2132 +++++++++++++++++------------------ - po-tips/ru.po | 359 ++---- - po/ru.po | 3202 + po-tips/ru.po | 359 ++---- + po/ru.po | 3202 +++++++++++++++++++++++++---------------------------- 4 files changed, 2810 insertions(+), 3138 deletions(-) commit 0c81d491fbab49e1e085a85f63c15cb14a3fc2b4 Author: Michael Natterer -Date: Tue Oct 27 14:30:20 2009 +0100 +Date: Tue Oct 27 14:30:20 2009 +0100 Change coords in GimpDynamicsOutput from call-by-value to "const GimpCoords*" @@ -76359,11 +77194,11 @@ app/core/gimpdynamicsoutput.h | 6 +++--- app/paint/gimpairbrush.c | 4 ++-- app/paint/gimpbrushcore.c | 14 +++++++------- - app/paint/gimpclone.c | 2 +- + app/paint/gimpclone.c | 2 +- app/paint/gimpconvolve.c | 4 ++-- app/paint/gimpdodgeburn.c | 4 ++-- app/paint/gimperaser.c | 4 ++-- - app/paint/gimpheal.c | 2 +- + app/paint/gimpheal.c | 2 +- app/paint/gimppaintbrush.c | 6 +++--- app/paint/gimpsmudge.c | 6 +++--- app/paint/gimpsourcecore.c | 4 ++-- @@ -76371,7 +77206,7 @@ commit 624bb78c4c8da3a48aad560cc2d490bec9ba9eeb Author: Martin Nordholts -Date: Mon Oct 26 07:52:07 2009 +0100 +Date: Mon Oct 26 07:52:07 2009 +0100 app: Move down gimp_dock_window_from_dock() in the file @@ -76385,7 +77220,7 @@ commit dd967055491c542183cf2934ceb44eb39eb58511 Author: Martin Nordholts -Date: Sun Oct 25 23:34:43 2009 +0100 +Date: Sun Oct 25 23:34:43 2009 +0100 app: Allow multi-column dock windows by drag-and-drop @@ -76399,7 +77234,7 @@ commit d3bb3e7f9943e02d114e87cc250d665d139415c9 Author: Martin Nordholts -Date: Sun Oct 25 23:02:05 2009 +0100 +Date: Sun Oct 25 23:02:05 2009 +0100 app: Add and use gimp_dockbook_drag_source_to_dockable() @@ -76411,18 +77246,18 @@ commit 2b622f99cd186bd4d6d34c804f6eee1e32dd0125 Author: Martin Nordholts -Date: Sun Oct 25 22:25:06 2009 +0100 +Date: Sun Oct 25 22:25:06 2009 +0100 app: gimp_dock_separator_get_anchor() -> _get_insert_pos() - app/widgets/gimpdock.c | 7 +------ + app/widgets/gimpdock.c | 7 +------ app/widgets/gimpdockseparator.c | 10 ++++++++-- app/widgets/gimpdockseparator.h | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) commit 521543106c1815a506d50a847eb5109ee98e57a9 Author: Martin Nordholts -Date: Sun Oct 25 22:05:57 2009 +0100 +Date: Sun Oct 25 22:05:57 2009 +0100 app: Enable repeated toggling between Multi- and Single-window mode @@ -76437,7 +77272,7 @@ commit fdf24546664b34d5073cd9a99a8f0f914bc9d999 Author: Martin Nordholts -Date: Sun Oct 25 22:02:38 2009 +0100 +Date: Sun Oct 25 22:02:38 2009 +0100 app: Add gimp_image_window_new/destroy() @@ -76452,7 +77287,7 @@ commit 19baff1a50d76a99e805464860cefced1208613a Author: Martin Nordholts -Date: Sun Oct 25 21:57:14 2009 +0100 +Date: Sun Oct 25 21:57:14 2009 +0100 app: Add gimp_image_window_get_shell() @@ -76462,7 +77297,7 @@ commit be8e0045acb404d70c18341fdec2e675b7011f61 Author: Martin Nordholts -Date: Sun Oct 25 21:50:08 2009 +0100 +Date: Sun Oct 25 21:50:08 2009 +0100 app: Add gimp_dock_window_get_docks() @@ -76474,7 +77309,7 @@ commit b9214fd3cfaad34d16115f1896ce784a6faf6bda Author: Martin Nordholts -Date: Sun Oct 25 21:44:23 2009 +0100 +Date: Sun Oct 25 21:44:23 2009 +0100 app: Add "gimp" property to GimpImageWindow @@ -76484,7 +77319,7 @@ commit d7c61bade91d23e0c2928089727dbf5485298979 Author: Martin Nordholts -Date: Sun Oct 25 20:35:49 2009 +0100 +Date: Sun Oct 25 20:35:49 2009 +0100 app: Copy dialogs list so we can remove while we iterate @@ -76493,7 +77328,7 @@ commit ca5fbf45d45080e7a993210a42cfd1c38e546607 Author: Martin Nordholts -Date: Sun Oct 25 20:31:55 2009 +0100 +Date: Sun Oct 25 20:31:55 2009 +0100 app: gimp_get_image_window_iter() -> gimp_get_image_windows() @@ -76502,14 +77337,14 @@ or create new windows when we use this function which is why we do a copy. - app/core/gimp.c | 4 ++-- - app/core/gimp.h | 2 +- + app/core/gimp.c | 4 ++-- + app/core/gimp.h | 2 +- app/gui/gimpuiconfigurer.c | 18 ++++++++++-------- 3 files changed, 13 insertions(+), 11 deletions(-) commit 39ee4ffa43381608b3daf19cdb5cb50094d0ef02 Author: Martin Nordholts -Date: Sun Oct 25 20:27:28 2009 +0100 +Date: Sun Oct 25 20:27:28 2009 +0100 app: Use gimp_dock_window_remove_dock() not gtk_container_remove() @@ -76522,7 +77357,7 @@ commit 870d7f9376b2e0861e0458f95fa637ae41eab52e Author: Martin Nordholts -Date: Sun Oct 25 16:27:24 2009 +0100 +Date: Sun Oct 25 16:27:24 2009 +0100 app: Connect to GtkNotebook::page-removed in GimpImageWindow @@ -76536,21 +77371,21 @@ commit 75ee76ecb68f15ee63cbf8955250dc79139b32d3 Author: Martin Nordholts -Date: Sun Oct 25 15:24:44 2009 +0100 +Date: Sun Oct 25 15:24:44 2009 +0100 app: Handle gimp_image_window_get_active_shell() returning NULL When rearranging the UI it is pretty common that gimp_image_window_get_active_shell() returns NULL so check for that. - app/actions/actions.c | 20 ++++++++++++++---- + app/actions/actions.c | 20 ++++++++++++++---- app/display/gimpimagewindow.c | 47 +++++++++++++++++++++++++++++++++---------- 2 files changed, 52 insertions(+), 15 deletions(-) commit fc3c368f9688331f7e8a640d54576d5370312b64 Author: Alexia Death -Date: Sun Oct 25 17:15:48 2009 +0200 +Date: Sun Oct 25 17:15:48 2009 +0200 Fix 180 degrees rotated brushes with dynamics off and direction following. @@ -76560,7 +77395,7 @@ commit e81c4f44dec9b7671db8136e37e76baf45ca78d9 Author: Martin Nordholts -Date: Sun Oct 25 13:10:08 2009 +0100 +Date: Sun Oct 25 13:10:08 2009 +0100 app: Allow more than one dock inside a dock window @@ -76570,14 +77405,14 @@ return all docks and refactor the other code as needed. app/widgets/gimpdialogfactory.c | 5 +++-- - app/widgets/gimpdockwindow.c | 40 + app/widgets/gimpdockwindow.c | 40 +++++++++++++++++++++++++++++++++++----- - app/widgets/gimpdockwindow.h | 5 ++++- + app/widgets/gimpdockwindow.h | 5 ++++- 3 files changed, 42 insertions(+), 8 deletions(-) commit ff6a7877578ec6dfff2a4c2a0bc300f89adeb387 Author: Martin Nordholts -Date: Sun Oct 25 12:21:57 2009 +0100 +Date: Sun Oct 25 12:21:57 2009 +0100 app: Add gimp_dialog_factory_dock_window_new() @@ -76592,7 +77427,7 @@ commit 31b0f01748a59017067dbd63261698c9e88e47ee Author: Martin Nordholts -Date: Sun Oct 25 12:12:43 2009 +0100 +Date: Sun Oct 25 12:12:43 2009 +0100 devel-docs: Start working on ui-framework.txt @@ -76606,7 +77441,7 @@ commit 3934813dd16fedd01e9c6925741357a391f76811 Author: Martin Nordholts -Date: Sun Oct 25 11:49:54 2009 +0100 +Date: Sun Oct 25 11:49:54 2009 +0100 app: Insert, not prepend, into GimpDock dockbooks list @@ -76618,7 +77453,7 @@ commit 43c000498b55c93694d470d356a9180435d16772 Author: Martin Nordholts -Date: Sun Oct 25 10:53:00 2009 +0100 +Date: Sun Oct 25 10:53:00 2009 +0100 app: Format gimpdialogfactory.h @@ -76628,7 +77463,7 @@ commit 9cbe0cafa87aa7cf8d44a967aea6a44d5b848ffd Author: Martin Nordholts -Date: Sun Oct 25 10:38:42 2009 +0100 +Date: Sun Oct 25 10:38:42 2009 +0100 app: Document GimpDialogFactory @@ -76637,7 +77472,7 @@ commit 65c0ce5dbeda50be4f5fbe1c4c816c8c8622699f Author: Martin Nordholts -Date: Sat Oct 24 21:02:19 2009 +0200 +Date: Sat Oct 24 21:02:19 2009 +0200 app: Get rid of const disqualifier warning @@ -76648,14 +77483,14 @@ app/display/gimpdisplayshell-appearance.c | 34 ++++++++-------- app/display/gimpdisplayshell-appearance.h | 30 +++++++-------- - app/display/gimpdisplayshell-draw.c | 48 +++++++++++------------ - app/display/gimpdisplayshell-draw.h | 64 + app/display/gimpdisplayshell-draw.c | 48 +++++++++++------------ + app/display/gimpdisplayshell-draw.h | 64 +++++++++++++++---------------- 4 files changed, 88 insertions(+), 88 deletions(-) commit 4bd2230a55378fd939a5ca5788bda27cc48eb648 Author: Martin Nordholts -Date: Sat Oct 24 20:33:09 2009 +0200 +Date: Sat Oct 24 20:33:09 2009 +0200 app: Chain up GimpPanedBox::finalize() @@ -76664,7 +77499,7 @@ commit 2acc6e3de11d41212c43d7189d17d2cdf03511e4 Author: Martin Nordholts -Date: Sat Oct 24 20:24:21 2009 +0200 +Date: Sat Oct 24 20:24:21 2009 +0200 Ignore Qt Creator project files @@ -76676,7 +77511,7 @@ commit 6f95bc68885ba7832f38d4d61a0d5cf94ecb46d4 Author: Martin Nordholts -Date: Sat Oct 24 20:08:58 2009 +0200 +Date: Sat Oct 24 20:08:58 2009 +0200 app: Keep GimpDocks in GtkPaneds in GimpDockColumns @@ -76691,7 +77526,7 @@ commit b700f219de861b56b15dc298ec6ab44a78a61be5 Author: Martin Nordholts -Date: Sat Oct 24 20:08:08 2009 +0200 +Date: Sat Oct 24 20:08:08 2009 +0200 app: Make created GtkPaned subclass depend on GimpPanedBox orientation @@ -76700,7 +77535,7 @@ commit eb9b365864e0d40e396614e55b490f402e64f7bb Author: Martin Nordholts -Date: Sat Oct 24 18:52:48 2009 +0200 +Date: Sat Oct 24 18:52:48 2009 +0200 app: Add GimpPanedBox @@ -76713,21 +77548,21 @@ Change GimpDock to use this widget and make some other minor adaptations. - app/widgets/Makefile.am | 2 + - app/widgets/gimpdock.c | 109 ++------------ - app/widgets/gimpdock.h | 4 - - app/widgets/gimpdockbook.c | 28 ++-- - app/widgets/gimppanedbox.c | 324 + app/widgets/Makefile.am | 2 + + app/widgets/gimpdock.c | 109 ++------------ + app/widgets/gimpdock.h | 4 - + app/widgets/gimpdockbook.c | 28 ++-- + app/widgets/gimppanedbox.c | 324 ++++++++++++++++++++++++++++++++++++++++ - app/widgets/gimppanedbox.h | 74 +++++++++ + app/widgets/gimppanedbox.h | 74 +++++++++ app/widgets/gimpwidgets-utils.c | 171 --------------------- app/widgets/gimpwidgets-utils.h | 8 - - app/widgets/widgets-types.h | 1 + + app/widgets/widgets-types.h | 1 + 9 files changed, 436 insertions(+), 285 deletions(-) commit 69f17fdbf201a485365f68be8c9097dd2ecf6a52 Author: Martin Nordholts -Date: Sat Oct 24 18:34:25 2009 +0200 +Date: Sat Oct 24 18:34:25 2009 +0200 app: Add gimp_dock_separator_set_dropped_cb() @@ -76735,14 +77570,14 @@ We need this in order to move the dock separators into a common widget for which the callback to use is not known at construction time. - app/widgets/gimpdock.c | 14 ++++++++------ + app/widgets/gimpdock.c | 14 ++++++++------ app/widgets/gimpdockseparator.c | 19 +++++++++++++------ app/widgets/gimpdockseparator.h | 3 ++- 3 files changed, 23 insertions(+), 13 deletions(-) commit fafee5230fac3ad39bcf412101c6cbc0204ef7ab Author: Martin Nordholts -Date: Sat Oct 24 15:03:59 2009 +0200 +Date: Sat Oct 24 15:03:59 2009 +0200 configure.ac: Don't disable deprecated APIs for unreleased libs @@ -76754,7 +77589,7 @@ commit 73ba838093398ae54e64196a079831575c10229b Author: Martin Nordholts -Date: Sat Oct 24 13:47:34 2009 +0200 +Date: Sat Oct 24 13:47:34 2009 +0200 configure.ac: Fix GTK+ and GLib version report @@ -76763,7 +77598,7 @@ commit 6693ed9a915bffaef72f67128979d06c87f396a2 Author: Khaled Hosny -Date: Fri Oct 23 23:17:52 2009 +0200 +Date: Fri Oct 23 23:17:52 2009 +0200 Updated Arabic translation @@ -76773,7 +77608,7 @@ commit d848cdc939060ce36556ffd8fbc85c3b515fcba2 Author: Khaled Hosny -Date: Fri Oct 23 18:50:42 2009 +0200 +Date: Fri Oct 23 18:50:42 2009 +0200 Add missing files @@ -76782,7 +77617,7 @@ commit 25b0bab7d6bc5fdf951966796a3eb9589fe3ba83 Author: Khaled Hosny -Date: Fri Oct 23 18:39:43 2009 +0200 +Date: Fri Oct 23 18:39:43 2009 +0200 Updated Arabic translation @@ -76792,7 +77627,7 @@ commit bc33e4735dbb71bb477af451fe52fce57aca1446 Author: Michael Natterer -Date: Thu Oct 22 20:37:01 2009 +0200 +Date: Thu Oct 22 20:37:01 2009 +0200 Sync required pango version with configure @@ -76801,7 +77636,7 @@ commit ea7c37293c6b104d5774c9543f3699bf509915bb Author: Michael Natterer -Date: Wed Oct 21 19:35:20 2009 +0200 +Date: Wed Oct 21 19:35:20 2009 +0200 Don't block all key events on the canvas (fixes tool interaction) @@ -76814,7 +77649,7 @@ commit a93cb543ff051761c92baf4de3850d7f221c573d Author: Tournaris Pavlos -Date: Tue Oct 20 14:41:36 2009 +0300 +Date: Tue Oct 20 14:41:36 2009 +0300 Updated Greek po-python translation @@ -76824,7 +77659,7 @@ commit 2e6dd9a128b12046166d132bd3b506c720b9a2fa Author: Vasilis Kontogiannis -Date: Tue Oct 20 14:37:52 2009 +0300 +Date: Tue Oct 20 14:37:52 2009 +0300 Updated Greek libgimp translation @@ -76834,7 +77669,7 @@ commit 1f9a0cf1706277e26dc8464ca3c198df7f4cda5f Author: Vasilis Kontogiannis -Date: Tue Oct 20 14:32:49 2009 +0300 +Date: Tue Oct 20 14:32:49 2009 +0300 Updated Greek translation @@ -76844,7 +77679,7 @@ commit db896708f3503c6985aeee51ed38ef0f071b1eca Author: Michael Natterer -Date: Mon Oct 19 11:03:23 2009 +0200 +Date: Mon Oct 19 11:03:23 2009 +0200 Disable RGBA colormaps in offscreen widgets for now because they crash @@ -76853,7 +77688,7 @@ commit 0b712fb4e54cf45864886c26f809f9eeeb2398a9 Author: Michael Natterer -Date: Mon Oct 19 10:11:45 2009 +0200 +Date: Mon Oct 19 10:11:45 2009 +0200 GtkInputDialog is deprecated now, so #undef GTK_DISABLE_DEPRECATED @@ -76865,7 +77700,7 @@ commit 8a377be2770ec1ac90c0c19ed99913d235e44f74 Author: Michael Natterer -Date: Mon Oct 19 00:13:56 2009 +0200 +Date: Mon Oct 19 00:13:56 2009 +0200 Turn legacy tranlation context "tool|_Zoom" into a proper one @@ -76874,7 +77709,7 @@ commit 8780342dcb73bf5e0347de551e903b1d6159f526 Author: Michael Natterer -Date: Sun Oct 18 23:03:04 2009 +0200 +Date: Sun Oct 18 23:03:04 2009 +0200 Set a 10px border on the canvas so overlays have some spacing @@ -76883,7 +77718,7 @@ commit 0c58ffe680fafb69a67072ac94270321de5d77ae Author: Michael Natterer -Date: Sun Oct 18 22:53:26 2009 +0200 +Date: Sun Oct 18 22:53:26 2009 +0200 Use an RGBA colormap so rounded corners work @@ -76892,7 +77727,7 @@ commit 84ab7454b57cbc1c22db910de8306e17d1cd36bb Author: Michael Natterer -Date: Sun Oct 18 22:42:21 2009 +0200 +Date: Sun Oct 18 22:42:21 2009 +0200 Put the image map tool dialogs into overlay boxes when in fullscreen mode @@ -76904,7 +77739,7 @@ commit 81786482ec1e7ba301f6c29f0189c63f8e1ce157 Author: Michael Natterer -Date: Sun Oct 18 22:33:23 2009 +0200 +Date: Sun Oct 18 22:33:23 2009 +0200 Add GimpToolOverlay which displays tool dialogs directly on the canvas @@ -76919,7 +77754,7 @@ commit 8124792130ba616ed1fe74a0988eef01c1c63362 Author: Michael Natterer -Date: Sun Oct 18 22:19:29 2009 +0200 +Date: Sun Oct 18 22:19:29 2009 +0200 Derive GimpCanvas from GimpOverlayBox @@ -76927,16 +77762,16 @@ - use GimpOverlayBox' scroll API which makes sure overlay children don't scroll along - app/display/gimpcanvas.c | 111 + app/display/gimpcanvas.c | 111 ++++++------------------------- - app/display/gimpcanvas.h | 11 ++- + app/display/gimpcanvas.h | 11 ++- app/display/gimpdisplayshell-callbacks.c | 10 ++- - app/display/gimpdisplayshell-scroll.c | 3 +- + app/display/gimpdisplayshell-scroll.c | 3 +- 4 files changed, 36 insertions(+), 99 deletions(-) commit 3d354c9434dbbc0bd0c7c671823e968f046fc6ba Author: Michael Natterer -Date: Sun Oct 18 21:57:34 2009 +0200 +Date: Sun Oct 18 21:57:34 2009 +0200 Add new widget GimpOverlayBox which is a GtkContainer subclass @@ -76944,19 +77779,19 @@ using a (potantially) arbitrary cairo_matrix_t (the actual API allows for arbitrary alignment wihin the container and rotating). - app/widgets/Makefile.am | 4 + - app/widgets/gimpoverlaybox.c | 466 + app/widgets/Makefile.am | 4 + + app/widgets/gimpoverlaybox.c | 466 ++++++++++++++++++++++++++++++++++++++++ - app/widgets/gimpoverlaybox.h | 72 +++++++ + app/widgets/gimpoverlaybox.h | 72 +++++++ app/widgets/gimpoverlaychild.c | 474 +++++++++++++++++++++++++++++++++++++++++ app/widgets/gimpoverlaychild.h | 77 +++++++ - app/widgets/widgets-types.h | 1 + + app/widgets/widgets-types.h | 1 + 6 files changed, 1094 insertions(+) commit 4822ca0d6d9a38593995b0d2efc0b198acaf3f06 Author: Michael Natterer -Date: Sun Oct 18 16:03:33 2009 +0200 +Date: Sun Oct 18 16:03:33 2009 +0200 Make menu positioning also works for transformed offscreen widgets @@ -76969,7 +77804,7 @@ commit 0ce426cc79ca4ea6b0883efbc537ac6ecba89ded Author: Michael Natterer -Date: Sun Oct 18 13:24:59 2009 +0200 +Date: Sun Oct 18 13:24:59 2009 +0200 Make the toggle grid insensitive when the dynamics are read-only @@ -76979,7 +77814,7 @@ commit 387ec40214516a68d5cece146ec8584920ff6722 Author: Michael Natterer -Date: Sun Oct 18 13:10:58 2009 +0200 +Date: Sun Oct 18 13:10:58 2009 +0200 Remove useless frame and vbox that were copied over from the paint options @@ -76989,7 +77824,7 @@ commit 52dd01fdef236c6577277cf4fd9ca2371d791a4a Author: Michael Natterer -Date: Sun Oct 18 13:03:40 2009 +0200 +Date: Sun Oct 18 13:03:40 2009 +0200 Change user-visible strings from "Dynamics" to "Paint Dynamics" @@ -76997,18 +77832,18 @@ "Paint" where the context is clear, like in the dynamics dialog context menu. - app/actions/actions.c | 4 ++-- - app/actions/dialogs-actions.c | 8 ++++---- + app/actions/actions.c | 4 ++-- + app/actions/dialogs-actions.c | 8 ++++---- app/actions/dynamics-actions.c | 2 +- app/actions/dynamics-editor-actions.c | 5 ++--- - app/dialogs/dialogs.c | 4 ++-- + app/dialogs/dialogs.c | 4 ++-- app/widgets/gimpdynamicseditor.c | 3 ++- app/widgets/gimpdynamicsfactoryview.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) commit e979da8b22e14e2108461f49f85f46e4a602a6c6 Author: Michael Natterer -Date: Sun Oct 18 13:03:01 2009 +0200 +Date: Sun Oct 18 13:03:01 2009 +0200 Minor formatting fixes @@ -77017,7 +77852,7 @@ commit 2fb9054aab302b9257ba251b3f9bf43a1f41fac1 Author: Sven Neumann -Date: Sun Oct 18 00:55:03 2009 +0200 +Date: Sun Oct 18 00:55:03 2009 +0200 fix build of devel-docs tools with GSEAL_ENABLE @@ -77027,7 +77862,7 @@ commit 24b9077e26847f834e02092b1fd28b2e44203dc9 Author: Bruce Cowan -Date: Sat Oct 17 23:09:00 2009 +0100 +Date: Sat Oct 17 23:09:00 2009 +0100 Updated British English translation @@ -77037,12 +77872,12 @@ po-python/en_GB.po | 140 +- po-script-fu/en_GB.po | 379 +- po-tips/en_GB.po | 117 +- - po/en_GB.po | 4171 +++++++------ + po/en_GB.po | 4171 +++++++------ 6 files changed, 10638 insertions(+), 9860 deletions(-) commit 57915302f60e3261bcd7b1379456fc98cd10d7bc Author: Michael Natterer -Date: Sat Oct 17 21:24:12 2009 +0200 +Date: Sat Oct 17 21:24:12 2009 +0200 Build with GSEAL_ENABLE @@ -77050,22 +77885,22 @@ 1 file changed, 10 insertions(+), 5 deletions(-) commit 071d26caa96ee22f7fb52a23d3850d8c173acf54 -Merge: 210a4b5 b77592f +Merge: 210a4b5044 b77592ffb2 Author: Alexia Death -Date: Sat Oct 17 21:47:01 2009 +0300 +Date: Sat Oct 17 21:47:01 2009 +0300 Merge commit 'origin/master' into soc-2009-dynamics commit 210a4b5044243ccdf6c9d6622a491e9bf1d80a2f -Merge: 4e018ea 7ce6757 +Merge: 4e018eaa18 7ce6757ad0 Author: Alexia Death -Date: Sat Oct 17 21:42:02 2009 +0300 +Date: Sat Oct 17 21:42:02 2009 +0300 Merge resolution commit b77592ffb21aab9bf9eee4ab37dfd8b568fead9b Author: Michael Natterer -Date: Sat Oct 17 20:37:13 2009 +0200 +Date: Sat Oct 17 20:37:13 2009 +0200 Coding style cleanup @@ -77075,7 +77910,7 @@ commit 7ce6757ad09a3632e5e55c87e5fcc08c36dd503b Author: Michael Natterer -Date: Sat Oct 17 20:32:57 2009 +0200 +Date: Sat Oct 17 20:32:57 2009 +0200 Define GSEAL_ENABLE globally @@ -77084,171 +77919,171 @@ commit 018e8b0d29d9733c3bff1a9d6a7b79e7cde6ccb9 Author: Michael Natterer -Date: Sat Oct 17 20:31:57 2009 +0200 +Date: Sat Oct 17 20:31:57 2009 +0200 Build with GSEAL_ENABLE and #undef it where accessors are missing - plug-ins/common/animation-play.c | 2 + - plug-ins/common/curve-bend.c | 2 +- - plug-ins/common/file-png.c | 2 +- - plug-ins/common/filter-pack.c | 10 +- - plug-ins/common/gee-zoom.c | 2 +- - plug-ins/common/gee.c | 2 +- - plug-ins/common/iwarp.c | 17 +- - plug-ins/flame/flame.c | 4 +- - plug-ins/help-browser/dialog.c | 4 +- - plug-ins/ifs-compose/ifs-compose.c | 276 + plug-ins/common/animation-play.c | 2 + + plug-ins/common/curve-bend.c | 2 +- + plug-ins/common/file-png.c | 2 +- + plug-ins/common/filter-pack.c | 10 +- + plug-ins/common/gee-zoom.c | 2 +- + plug-ins/common/gee.c | 2 +- + plug-ins/common/iwarp.c | 17 +- + plug-ins/flame/flame.c | 4 +- + plug-ins/help-browser/dialog.c | 4 +- + plug-ins/ifs-compose/ifs-compose.c | 276 +++++++++++++++++-------------- plug-ins/imagemap/imap_edit_area_info.c | 62 ++++--- - plug-ins/imagemap/imap_grid.c | 9 +- - plug-ins/imagemap/imap_preview.c | 2 +- - plug-ins/imagemap/imap_settings.c | 4 +- - plug-ins/imagemap/imap_statusbar.c | 4 +- - plug-ins/print/print-preview.c | 77 +++++---- - plug-ins/pygimp/gimpui.override | 4 +- + plug-ins/imagemap/imap_grid.c | 9 +- + plug-ins/imagemap/imap_preview.c | 2 +- + plug-ins/imagemap/imap_settings.c | 4 +- + plug-ins/imagemap/imap_statusbar.c | 4 +- + plug-ins/print/print-preview.c | 77 +++++---- + plug-ins/pygimp/gimpui.override | 4 +- plug-ins/script-fu/script-fu-console.c | 2 + plug-ins/script-fu/script-fu-interface.c | 9 +- 19 files changed, 278 insertions(+), 216 deletions(-) commit 1a23b9ecf21f7e5412c77c46a24c97d698e7775f Author: Michael Natterer -Date: Sat Oct 17 20:20:39 2009 +0200 +Date: Sat Oct 17 20:20:39 2009 +0200 Build with GSEAL_ENABLE and #undef it where accessors are missing - app/widgets/gimpblobeditor.c | 46 + app/widgets/gimpblobeditor.c | 46 ++++++++++++++++++++------------- - app/widgets/gimpcellrendererdashes.c | 37 ++++++++++++++++---------- + app/widgets/gimpcellrendererdashes.c | 37 ++++++++++++++++---------- app/widgets/gimpcellrendererviewable.c | 20 ++++++++------ - app/widgets/gimpcolorbar.c | 23 ++++++++++------- - app/widgets/gimpcolorframe.c | 35 +++++++++++++++---------- - app/widgets/gimpcolormapeditor.c | 2 ++ - app/widgets/gimpcombotagentry.c | 17 +++++++----- - app/widgets/gimpcontainerbox.c | 2 +- - app/widgets/gimpcontainergridview.c | 21 ++++++++------- - app/widgets/gimpcontainerpopup.c | 39 ++++++++++++++++------------ + app/widgets/gimpcolorbar.c | 23 ++++++++++------- + app/widgets/gimpcolorframe.c | 35 +++++++++++++++---------- + app/widgets/gimpcolormapeditor.c | 2 ++ + app/widgets/gimpcombotagentry.c | 17 +++++++----- + app/widgets/gimpcontainerbox.c | 2 +- + app/widgets/gimpcontainergridview.c | 21 ++++++++------- + app/widgets/gimpcontainerpopup.c | 39 ++++++++++++++++------------ app/widgets/gimpcontainertreeview-dnd.c | 7 +++-- - app/widgets/gimpcontainertreeview.c | 24 ++++++++++------- - app/widgets/gimpcontrollereditor.c | 2 +- - app/widgets/gimpcontrollerlist.c | 4 +-- - app/widgets/gimpcursor.c | 2 ++ - app/widgets/gimpcurveview.c | 7 ++--- - app/widgets/gimpdasheditor.c | 2 ++ - app/widgets/gimpdatafactoryview.c | 3 ++- - app/widgets/gimpdialogfactory.c | 28 ++++++++++---------- - app/widgets/gimpdockable.c | 23 ++++++++++------- - app/widgets/gimpdockbook.c | 2 ++ - app/widgets/gimpdockseparator.c | 2 ++ - app/widgets/gimpfgbgeditor.c | 4 ++- - app/widgets/gimpfgbgview.c | 6 +++-- - app/widgets/gimpgradienteditor.c | 2 ++ - app/widgets/gimphandlebar.c | 4 ++- - app/widgets/gimphistogrameditor.c | 5 +++- - app/widgets/gimphistogramview.c | 2 ++ - app/widgets/gimpmessagebox.c | 6 +++-- - app/widgets/gimpnavigationview.c | 11 +++++--- - app/widgets/gimppaletteeditor.c | 4 ++- - app/widgets/gimppaletteview.c | 10 ++++--- - app/widgets/gimpprogressbox.c | 10 ++++--- - app/widgets/gimpscalebutton.c | 4 ++- - app/widgets/gimpsessioninfo.c | 2 +- - app/widgets/gimpsettingsbox.c | 4 +-- - app/widgets/gimpstrokeeditor.c | 8 ++++-- - app/widgets/gimptagentry.c | 2 +- - app/widgets/gimptagpopup.c | 2 ++ - app/widgets/gimptoolbox.c | 25 ++++++++++-------- - app/widgets/gimptooloptionseditor.c | 2 +- - app/widgets/gimpuimanager.c | 2 ++ - app/widgets/gimpview-popup.c | 4 ++- - app/widgets/gimpview.c | 16 +++++++----- - app/widgets/gimpviewrenderer.c | 2 +- - app/widgets/gimpwidgets-utils.c | 13 ++++++---- - app/widgets/gtkhwrapbox.c | 2 ++ - app/widgets/gtkvwrapbox.c | 2 ++ - app/widgets/gtkwrapbox.c | 2 ++ + app/widgets/gimpcontainertreeview.c | 24 ++++++++++------- + app/widgets/gimpcontrollereditor.c | 2 +- + app/widgets/gimpcontrollerlist.c | 4 +-- + app/widgets/gimpcursor.c | 2 ++ + app/widgets/gimpcurveview.c | 7 ++--- + app/widgets/gimpdasheditor.c | 2 ++ + app/widgets/gimpdatafactoryview.c | 3 ++- + app/widgets/gimpdialogfactory.c | 28 ++++++++++---------- + app/widgets/gimpdockable.c | 23 ++++++++++------- + app/widgets/gimpdockbook.c | 2 ++ + app/widgets/gimpdockseparator.c | 2 ++ + app/widgets/gimpfgbgeditor.c | 4 ++- + app/widgets/gimpfgbgview.c | 6 +++-- + app/widgets/gimpgradienteditor.c | 2 ++ + app/widgets/gimphandlebar.c | 4 ++- + app/widgets/gimphistogrameditor.c | 5 +++- + app/widgets/gimphistogramview.c | 2 ++ + app/widgets/gimpmessagebox.c | 6 +++-- + app/widgets/gimpnavigationview.c | 11 +++++--- + app/widgets/gimppaletteeditor.c | 4 ++- + app/widgets/gimppaletteview.c | 10 ++++--- + app/widgets/gimpprogressbox.c | 10 ++++--- + app/widgets/gimpscalebutton.c | 4 ++- + app/widgets/gimpsessioninfo.c | 2 +- + app/widgets/gimpsettingsbox.c | 4 +-- + app/widgets/gimpstrokeeditor.c | 8 ++++-- + app/widgets/gimptagentry.c | 2 +- + app/widgets/gimptagpopup.c | 2 ++ + app/widgets/gimptoolbox.c | 25 ++++++++++-------- + app/widgets/gimptooloptionseditor.c | 2 +- + app/widgets/gimpuimanager.c | 2 ++ + app/widgets/gimpview-popup.c | 4 ++- + app/widgets/gimpview.c | 16 +++++++----- + app/widgets/gimpviewrenderer.c | 2 +- + app/widgets/gimpwidgets-utils.c | 13 ++++++---- + app/widgets/gtkhwrapbox.c | 2 ++ + app/widgets/gtkvwrapbox.c | 2 ++ + app/widgets/gtkwrapbox.c | 2 ++ 49 files changed, 313 insertions(+), 191 deletions(-) commit 6608d66cdeff3d373f69d819853d0056d4033f16 Author: Michael Natterer -Date: Sat Oct 17 19:51:33 2009 +0200 +Date: Sat Oct 17 19:51:33 2009 +0200 Build with GSEAL_ENABLE and #undef it where accessors are missing - app/display/gimpcanvas.c | 63 + app/display/gimpcanvas.c | 63 +++++++++++++++++------------ - app/display/gimpdisplay-foreach.c | 2 +- + app/display/gimpdisplay-foreach.c | 2 +- app/display/gimpdisplayshell-callbacks.c | 17 +++++--- - app/display/gimpdisplayshell-cursor.c | 2 +- - app/display/gimpdisplayshell.c | 12 +++--- - app/display/gimpimagewindow.c | 68 + app/display/gimpdisplayshell-cursor.c | 2 +- + app/display/gimpdisplayshell.c | 12 +++--- + app/display/gimpimagewindow.c | 68 +++++++++++++++++++++++--------- - app/display/gimpstatusbar.c | 40 +++++++++++-------- + app/display/gimpstatusbar.c | 40 +++++++++++-------- 7 files changed, 129 insertions(+), 75 deletions(-) commit fb1fdf49b49b7261bac6e38e793061a8df37769e Author: Michael Natterer -Date: Sat Oct 17 19:33:46 2009 +0200 +Date: Sat Oct 17 19:33:46 2009 +0200 Build with GSEAL_ENABLE app/tools/gimpcolorpickertool.c | 4 ++-- - app/tools/gimplevelstool.c | 45 + app/tools/gimplevelstool.c | 45 +++++++++++++++++++++++----------------- - app/tools/gimpmeasuretool.c | 4 ++-- + app/tools/gimpmeasuretool.c | 4 ++-- app/tools/gimppaintoptions-gui.c | 15 +++++++++----- 4 files changed, 40 insertions(+), 28 deletions(-) commit fa21f2da5b0fba2e62359681de84f1c3d768e9e3 Author: Michael Natterer -Date: Sat Oct 17 19:03:24 2009 +0200 +Date: Sat Oct 17 19:03:24 2009 +0200 Build with GSEAL_ENABLE and #undef it where accessors are missing - app/dialogs/about-dialog.c | 15 +++++++++------ - app/dialogs/dialogs.c | 2 +- + app/dialogs/about-dialog.c | 15 +++++++++------ + app/dialogs/dialogs.c | 2 +- app/dialogs/file-open-location-dialog.c | 3 ++- - app/dialogs/palette-import-dialog.c | 2 +- - app/dialogs/preferences-dialog.c | 2 ++ + app/dialogs/palette-import-dialog.c | 2 +- + app/dialogs/preferences-dialog.c | 2 ++ app/dialogs/resolution-calibrate-dialog.c | 2 ++ 6 files changed, 17 insertions(+), 9 deletions(-) commit 171b449132eb271869fe286a64d158f6fc4be1eb Author: Michael Natterer -Date: Sat Oct 17 18:59:40 2009 +0200 +Date: Sat Oct 17 18:59:40 2009 +0200 Build with GSEAL_ENABLE app/actions/gradient-editor-actions.c | 2 +- - app/actions/window-commands.c | 4 ++-- + app/actions/window-commands.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit 11039a0436b014b70c97b948604d7795dc368d9d Author: Michael Natterer -Date: Sat Oct 17 18:58:28 2009 +0200 +Date: Sat Oct 17 18:58:28 2009 +0200 Build with GSEAL_ENABLE modules/color-selector-water.c | 50 ++++++++++++++++++++++++++---------------- - modules/display-filter-lcms.c | 2 +- + modules/display-filter-lcms.c | 2 +- 2 files changed, 32 insertions(+), 20 deletions(-) commit 8cee9c66a758abba8fecd2a9215d6cce202dd032 Author: Michael Natterer -Date: Sat Oct 17 18:55:14 2009 +0200 +Date: Sat Oct 17 18:55:14 2009 +0200 Build with GSEAL_ENABLE and #undef it where accessors are missing libgimp/gimpbrushselectbutton.c | 15 +++++++++------ libgimp/gimpgradientselectbutton.c | 2 +- - libgimp/gimpprogressbar.c | 16 +++++++++------- - libgimp/gimpui.c | 4 +++- - libgimp/gimpzoompreview.c | 2 ++ + libgimp/gimpprogressbar.c | 16 +++++++++------- + libgimp/gimpui.c | 4 +++- + libgimp/gimpzoompreview.c | 2 ++ 5 files changed, 24 insertions(+), 15 deletions(-) commit fcd346a227bacdf998f6ba8879aa0c9696a244a7 Author: Michael Natterer -Date: Sat Oct 17 18:51:48 2009 +0200 +Date: Sat Oct 17 18:51:48 2009 +0200 Build with GSEAL_ENABLE with a few exceptions @@ -77258,27 +78093,27 @@ libgimpwidgets/gimpcellrenderercolor.c | 35 +++++++----- libgimpwidgets/gimpcellrenderertoggle.c | 33 ++++++++---- - libgimpwidgets/gimpchainbutton.c | 25 +++++---- - libgimpwidgets/gimpcolorarea.c | 16 +++--- - libgimpwidgets/gimpcolorbutton.c | 2 +- - libgimpwidgets/gimpcolorscale.c | 74 ++++++++++++++----------- - libgimpwidgets/gimpcolorselect.c | 62 +++++++++++---------- - libgimpwidgets/gimpframe.c | 30 ++++++----- - libgimpwidgets/gimpoffsetarea.c | 7 ++- - libgimpwidgets/gimpoldwidgets.c | 27 ++++++---- - libgimpwidgets/gimppixmap.c | 12 +++-- - libgimpwidgets/gimppreview.c | 2 + - libgimpwidgets/gimppreviewarea.c | 18 ++++--- - libgimpwidgets/gimpruler.c | 96 + libgimpwidgets/gimpchainbutton.c | 25 +++++---- + libgimpwidgets/gimpcolorarea.c | 16 +++--- + libgimpwidgets/gimpcolorbutton.c | 2 +- + libgimpwidgets/gimpcolorscale.c | 74 ++++++++++++++----------- + libgimpwidgets/gimpcolorselect.c | 62 +++++++++++---------- + libgimpwidgets/gimpframe.c | 30 ++++++----- + libgimpwidgets/gimpoffsetarea.c | 7 ++- + libgimpwidgets/gimpoldwidgets.c | 27 ++++++---- + libgimpwidgets/gimppixmap.c | 12 +++-- + libgimpwidgets/gimppreview.c | 2 + + libgimpwidgets/gimppreviewarea.c | 18 ++++--- + libgimpwidgets/gimpruler.c | 96 ++++++++++++++++++++------------- - libgimpwidgets/gimpscrolledpreview.c | 24 ++++++--- - libgimpwidgets/gimpsizeentry.c | 2 + - libgimpwidgets/gimpunitmenu.c | 2 + + libgimpwidgets/gimpscrolledpreview.c | 24 ++++++--- + libgimpwidgets/gimpsizeentry.c | 2 + + libgimpwidgets/gimpunitmenu.c | 2 + 17 files changed, 288 insertions(+), 179 deletions(-) commit ee48b7b06ece384d974ae423893ef527d84ac750 Author: Michael Natterer -Date: Sat Oct 17 18:49:12 2009 +0200 +Date: Sat Oct 17 18:49:12 2009 +0200 Use accessors instead of table->children and adjustment->value @@ -77287,7 +78122,7 @@ commit 45c05f5f5fc2aebd3b6015b6324e40f219126e21 Author: Michael Natterer -Date: Sat Oct 17 17:59:53 2009 +0200 +Date: Sat Oct 17 17:59:53 2009 +0200 Require GLib >= 2.22.0 @@ -77298,7 +78133,7 @@ commit c58eee02299cb8ee6c639e18728cfbc477f98d3f Author: Michael Natterer -Date: Sat Oct 17 17:49:28 2009 +0200 +Date: Sat Oct 17 17:49:28 2009 +0200 gui_sanity_check(): bump GTK+ dependency here too @@ -77307,16 +78142,16 @@ commit eb6bef33e41affe059db9f77d627366f997fb8e1 Author: Martin Nordholts -Date: Sat Oct 17 14:56:28 2009 +0200 +Date: Sat Oct 17 14:56:28 2009 +0200 Use gtk_widget_set_visible() In places where the pattern if (show) - gtk_widget_show (widget); + gtk_widget_show (widget); else - gtk_widget_hide (widget); + gtk_widget_hide (widget); is used, change to @@ -77324,30 +78159,30 @@ Also do some other minor cleanups. - app/dialogs/module-dialog.c | 18 +++++------ - app/dialogs/palette-import-dialog.c | 6 ++-- + app/dialogs/module-dialog.c | 18 +++++------ + app/dialogs/palette-import-dialog.c | 6 ++-- app/display/gimpdisplayshell-appearance.c | 52 ++++++++----------------------- - app/display/gimpimagewindow.c | 17 ++-------- - app/display/gimpstatusbar.c | 5 +-- - app/widgets/gimpdevicestatus.c | 8 ++--- - app/widgets/gimpeditor.c | 7 +---- - app/widgets/gimpmenudock.c | 5 +-- - app/widgets/gimptoolbox.c | 5 +-- - app/widgets/gimpwidgets-utils.c | 6 ++-- - libgimpwidgets/gimpcolorscales.c | 22 +++---------- - libgimpwidgets/gimpcolorselect.c | 5 +-- - libgimpwidgets/gimpscrolledpreview.c | 26 +++++----------- - libgimpwidgets/gimpsizeentry.c | 5 +-- - plug-ins/common/file-gih.c | 6 ++-- - plug-ins/file-ico/ico-dialog.c | 5 +-- - plug-ins/help-browser/dialog.c | 10 ++---- - plug-ins/imagemap/imap_selection.c | 13 ++++---- + app/display/gimpimagewindow.c | 17 ++-------- + app/display/gimpstatusbar.c | 5 +-- + app/widgets/gimpdevicestatus.c | 8 ++--- + app/widgets/gimpeditor.c | 7 +---- + app/widgets/gimpmenudock.c | 5 +-- + app/widgets/gimptoolbox.c | 5 +-- + app/widgets/gimpwidgets-utils.c | 6 ++-- + libgimpwidgets/gimpcolorscales.c | 22 +++---------- + libgimpwidgets/gimpcolorselect.c | 5 +-- + libgimpwidgets/gimpscrolledpreview.c | 26 +++++----------- + libgimpwidgets/gimpsizeentry.c | 5 +-- + plug-ins/common/file-gih.c | 6 ++-- + plug-ins/file-ico/ico-dialog.c | 5 +-- + plug-ins/help-browser/dialog.c | 10 ++---- + plug-ins/imagemap/imap_selection.c | 13 ++++---- 18 files changed, 59 insertions(+), 162 deletions(-) commit 15f86a80ac758542e5899a9e25944e5a1b85691e Author: Martin Nordholts -Date: Sat Oct 17 14:32:37 2009 +0200 +Date: Sat Oct 17 14:32:37 2009 +0200 Bump required GTK+ version to 2.18.1 @@ -77361,7 +78196,7 @@ commit 567cd4371a3ef08bf2264c7db24366c280527d65 Author: Michael Schumacher -Date: Fri Oct 16 23:41:04 2009 +0200 +Date: Fri Oct 16 23:41:04 2009 +0200 Remove file gimp.rc @@ -77372,7 +78207,7 @@ commit f7ff0903ff9e87caadd70df6dece0bf2b9d88fdb Author: Sven Neumann -Date: Fri Oct 16 22:06:34 2009 +0200 +Date: Fri Oct 16 22:06:34 2009 +0200 Fix a width/height confusion in the healing tool algorithm @@ -77384,7 +78219,7 @@ commit 18fa57b7f23b94c142d58320eeeba3f587f8236e Author: Sveinn í Felli -Date: Fri Oct 16 01:44:06 2009 +0000 +Date: Fri Oct 16 01:44:06 2009 +0000 Updated Icelandic translation @@ -77394,7 +78229,7 @@ commit 99fd09118dfbc6537207551ee866979fb3e78887 Author: Sveinn í Felli -Date: Fri Oct 16 01:19:00 2009 +0000 +Date: Fri Oct 16 01:19:00 2009 +0000 Updated Icelandic translation @@ -77404,7 +78239,7 @@ commit 844dd74af2cb85667cbd9394373ab68ab38bb2f3 Author: Anna Jonna Ármannsdóttir -Date: Fri Oct 16 00:58:07 2009 +0000 +Date: Fri Oct 16 00:58:07 2009 +0000 Updated Icelandic translation @@ -77413,7 +78248,7 @@ commit 51a5b689de6f1f91e5dedd8900b702f679ad6003 Author: Anna Jonna Ármannsdóttir -Date: Fri Oct 16 00:53:06 2009 +0000 +Date: Fri Oct 16 00:53:06 2009 +0000 Updated Icelandic translation @@ -77422,7 +78257,7 @@ commit 9c4b60e560dde59bc201ad554fb377174adf67ee Author: Sveinn í Felli -Date: Fri Oct 16 00:45:35 2009 +0000 +Date: Fri Oct 16 00:45:35 2009 +0000 Updated Icelandic translation @@ -77431,15 +78266,15 @@ 1 file changed, 4909 insertions(+), 1291 deletions(-) commit 4e018eaa186b7ccbd4867dba41f9c2865dd38558 -Merge: a92943d 473b512 +Merge: a92943dd87 473b5122ae Author: Alexia Death -Date: Thu Oct 15 22:58:25 2009 +0300 +Date: Thu Oct 15 22:58:25 2009 +0300 Merge commit 'origin/master' into soc-2009-dynamics commit a92943dd879763e28e9687e414d0af2eea6a850e Author: Alexia Death -Date: Thu Oct 15 22:56:28 2009 +0300 +Date: Thu Oct 15 22:56:28 2009 +0300 rm erroneous makefile @@ -77449,20 +78284,20 @@ commit 04566959fd1230e0e2072ca870a58d72308a0f14 Author: Alexia Death -Date: Thu Oct 15 22:54:06 2009 +0300 +Date: Thu Oct 15 22:54:06 2009 +0300 Added some more dynamics presets and set the default dynamics value - app/config/gimpcoreconfig.c | 2 +- + app/config/gimpcoreconfig.c | 2 +- data/dynamics/Dynamics-Off.gdyn | 61 +++++++++++++++++++++++++++++++++++ data/dynamics/Fade-Tappering.gdyn | 61 +++++++++++++++++++++++++++++++++++ - data/dynamics/Makefile | 37 +++++++++++---------- - data/dynamics/Makefile.am | 9 +++++- + data/dynamics/Makefile | 37 +++++++++++---------- + data/dynamics/Makefile.am | 9 +++++- data/dynamics/Random-Color.gdyn | 61 +++++++++++++++++++++++++++++++++++ - data/dynamics/Tilt-Angle.gdyn | 61 + data/dynamics/Tilt-Angle.gdyn | 61 +++++++++++++++++++++++++++++++++++ data/dynamics/Track-Direction.gdyn | 61 +++++++++++++++++++++++++++++++++++ @@ -77472,7 +78307,7 @@ commit 885d4e968afb6d51bfc6de5dbadd3e09b89a8089 Author: Michael Natterer -Date: Thu Oct 15 21:23:01 2009 +0200 +Date: Thu Oct 15 21:23:01 2009 +0200 Make sure user-install always creates all needed directories @@ -77486,7 +78321,7 @@ commit be3ec7e5b5b5e9579f450719bc381d7ff310380f Author: Alexia Death -Date: Thu Oct 15 21:49:20 2009 +0300 +Date: Thu Oct 15 21:49:20 2009 +0300 Fixing the dynamics install some more @@ -77497,31 +78332,31 @@ commit 211e693e8a389db79d949273f78107836aeed414 Author: Alexia Death -Date: Thu Oct 15 21:12:01 2009 +0300 +Date: Thu Oct 15 21:12:01 2009 +0300 Fixing the dynamics install - data/Makefile.am | 1 + + data/Makefile.am | 1 + data/dynamics/.gitignore | 2 ++ 2 files changed, 3 insertions(+) commit 2b1debe4a9deb2e50878204784263e4057ba60d4 Author: Alexia Death -Date: Thu Oct 15 21:06:42 2009 +0300 +Date: Thu Oct 15 21:06:42 2009 +0300 Adding a default dynamics object to install - configure.ac | 1 + + configure.ac | 1 + data/dynamics/Basic-Dynamics.gdyn | 61 ++++ - data/dynamics/Makefile | 632 + data/dynamics/Makefile | 632 ++++++++++++++++++++++++++++++++++++++ - data/dynamics/Makefile.in | 632 + data/dynamics/Makefile.in | 632 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 1326 insertions(+) commit d030939852269e022f6f2f9640994ac9c6951e66 Author: Alexia Death -Date: Thu Oct 15 19:08:34 2009 +0300 +Date: Thu Oct 15 19:08:34 2009 +0300 Fix airbrush behavior ignoring the buggy hardness for now. @@ -77530,7 +78365,7 @@ commit a7234d68ce468bc92baaaa032f882a7dc1eb4b66 Author: Alexia Death -Date: Thu Oct 15 18:39:42 2009 +0300 +Date: Thu Oct 15 18:39:42 2009 +0300 Revert "Only didive if the number of inputs is > 1 (/ 1 makes little sense)" @@ -77549,7 +78384,7 @@ commit 473b5122ae15a24efec46692fc4fac8b7d110484 Author: Michael Natterer -Date: Thu Oct 15 11:59:58 2009 +0200 +Date: Thu Oct 15 11:59:58 2009 +0200 Move the cursor to the logical end of the selection when cancelling it @@ -77563,7 +78398,7 @@ commit e0ab94d8aa43fd3ec6ca0af376506b2331e83078 Author: Michael Schumacher -Date: Wed Oct 14 21:42:14 2009 +0200 +Date: Wed Oct 14 21:42:14 2009 +0200 Fixed typo "depenendencies" @@ -77572,7 +78407,7 @@ commit ac7eee36591778cf6a02419c11441caa10d522f2 Author: Michael Schumacher -Date: Wed Oct 14 21:30:59 2009 +0200 +Date: Wed Oct 14 21:30:59 2009 +0200 Bug 554748 - Version information for gimp.exe @@ -77593,7 +78428,7 @@ commit 793be22da944b02e67ad4c6ad7b40afd70184889 Author: Michael Natterer -Date: Wed Oct 14 18:52:04 2009 +0200 +Date: Wed Oct 14 18:52:04 2009 +0200 Only didive if the number of inputs is > 1 (/ 1 makes little sense) @@ -77602,7 +78437,7 @@ commit 15b912c66d06ba25f2076c182aa74b434d853e6d Author: Michael Natterer -Date: Wed Oct 14 10:33:11 2009 +0200 +Date: Wed Oct 14 10:33:11 2009 +0200 Change "factors" variables to integer because it's a counter; formatting @@ -77614,7 +78449,7 @@ commit b5022d310ba5347455d92ea072e537dcc7359fea Author: Michael Natterer -Date: Tue Oct 13 23:48:19 2009 +0200 +Date: Tue Oct 13 23:48:19 2009 +0200 Remove overiding GimpPaintOptions of properties that don't exist any longer @@ -77626,7 +78461,7 @@ commit bbf3c1760147ac36e6224808b9f03b1c0da8628f Author: Michael Natterer -Date: Tue Oct 13 23:33:27 2009 +0200 +Date: Tue Oct 13 23:33:27 2009 +0200 Use the right stock_id for "dialogs-dynamics" @@ -77635,7 +78470,7 @@ commit 3b1f78d2860b26f4ec162563c6a1072536556ed5 Author: Michael Natterer -Date: Tue Oct 13 21:19:40 2009 +0200 +Date: Tue Oct 13 21:19:40 2009 +0200 Reorder dynamics stuff @@ -77644,7 +78479,7 @@ commit f264cb4908bc26b6f5a36dc38ff7474706c53c2b Author: Michael Natterer -Date: Tue Oct 13 21:17:39 2009 +0200 +Date: Tue Oct 13 21:17:39 2009 +0200 Remove useless diff to master @@ -77653,7 +78488,7 @@ commit c4fdd7f8b9b42030257b75bd0f3947add4f87361 Author: Michael Natterer -Date: Tue Oct 13 21:15:01 2009 +0200 +Date: Tue Oct 13 21:15:01 2009 +0200 Get rid of useless diff to master @@ -77662,18 +78497,18 @@ commit 8394a3db681456aef9bec63618bf361e2ed8283f Author: Michael Natterer -Date: Tue Oct 13 21:02:10 2009 +0200 +Date: Tue Oct 13 21:02:10 2009 +0200 Handle dynamic opacity in GimpSourceCore for all its subclasses - app/paint/gimpclone.c | 16 ++++++++-------- - app/paint/gimpheal.c | 13 ++++++++----- + app/paint/gimpclone.c | 16 ++++++++-------- + app/paint/gimpheal.c | 13 ++++++++----- app/paint/gimpsourcecore.c | 12 ++++++++++-- 3 files changed, 26 insertions(+), 15 deletions(-) commit de3bfcd25c26dcf73486dfdf4344dedf58e44cb5 Author: Michael Natterer -Date: Tue Oct 13 20:48:44 2009 +0200 +Date: Tue Oct 13 20:48:44 2009 +0200 Bail out early if dynamic opacity is 0.0 @@ -77682,7 +78517,7 @@ commit cdbbd556bb85158a95c0df4d7cb93b69b0514bdc Author: Michael Natterer -Date: Tue Oct 13 20:43:56 2009 +0200 +Date: Tue Oct 13 20:43:56 2009 +0200 Code formatting @@ -77692,7 +78527,7 @@ commit d0c720b236ab6e889d95114bdfaa37d1e228398c Author: Michael Natterer -Date: Tue Oct 13 20:40:21 2009 +0200 +Date: Tue Oct 13 20:40:21 2009 +0200 Fix formatting; use the dynamics from the brush core, not from the context @@ -77702,7 +78537,7 @@ commit d4313db29bddb220df791c54522cbee744959566 Author: Michael Natterer -Date: Tue Oct 13 20:34:01 2009 +0200 +Date: Tue Oct 13 20:34:01 2009 +0200 Bail out early if dynamic opacity is 0.0 @@ -77711,7 +78546,7 @@ commit 005ddab84e953884718ee6327bd9cc28e66b9b3d Author: Michael Natterer -Date: Tue Oct 13 20:30:54 2009 +0200 +Date: Tue Oct 13 20:30:54 2009 +0200 Bail out early if dynamic opacity is 0.0 @@ -77720,7 +78555,7 @@ commit ea48a90e5c0a67c585f004d2e17e3e6f1062c207 Author: Michael Natterer -Date: Tue Oct 13 20:27:55 2009 +0200 +Date: Tue Oct 13 20:27:55 2009 +0200 Bail out early if dynamic opacity is 0.0 @@ -77729,7 +78564,7 @@ commit e094dc56276555c05a45ad3f6fc1859835a3cadf Author: Michael Natterer -Date: Tue Oct 13 20:21:58 2009 +0200 +Date: Tue Oct 13 20:21:58 2009 +0200 Whitespace fix @@ -77738,7 +78573,7 @@ commit aae7c2ef3872d624ff6207897a697ff2faf354ad Author: Michael Natterer -Date: Tue Oct 13 20:18:55 2009 +0200 +Date: Tue Oct 13 20:18:55 2009 +0200 Bail out early if dynamic opacity results in 0.0 @@ -77749,7 +78584,7 @@ commit 135090c57ff9d42505a2d4d5484e19d850af48c2 Author: Michael Natterer -Date: Tue Oct 13 19:32:37 2009 +0200 +Date: Tue Oct 13 19:32:37 2009 +0200 Actually use the paint option's "use-fade" property again @@ -77763,7 +78598,7 @@ commit e284472cbde1c28083cc7b54c7ff03b53058497c Author: Alexandre Prokoudine -Date: Tue Oct 13 21:25:54 2009 +0400 +Date: Tue Oct 13 21:25:54 2009 +0400 Updated Russian translation @@ -77772,15 +78607,15 @@ 1 file changed, 1006 insertions(+), 968 deletions(-) commit 7bae9c0827553fbeb699a110d18236eb7062bd57 -Merge: 3652313 53984a8 +Merge: 36523134f5 53984a8486 Author: Alexia Death -Date: Tue Oct 13 20:23:34 2009 +0300 +Date: Tue Oct 13 20:23:34 2009 +0300 Merge commit 'origin/master' into soc-2009-dynamics commit 36523134f569813c4b549991995dd93c0ddb5626 Author: Michael Natterer -Date: Tue Oct 13 19:19:12 2009 +0200 +Date: Tue Oct 13 19:19:12 2009 +0200 Resurrect the paint option's "use-fade" property and UI @@ -77788,13 +78623,13 @@ independently from its dynamic mapping. The reborn property is not used again yet. - app/paint/gimppaintoptions.c | 19 ++++++++++++++++--- + app/paint/gimppaintoptions.c | 19 ++++++++++++++++--- app/tools/gimppaintoptions-gui.c | 8 +++----- 2 files changed, 19 insertions(+), 8 deletions(-) commit de1db5c0ed6b4bdf33196aa1e43588ef7c5fded0 Author: Michael Natterer -Date: Tue Oct 13 19:01:14 2009 +0200 +Date: Tue Oct 13 19:01:14 2009 +0200 More GimpBrushCore dynamics cleanup/fixes @@ -77811,7 +78646,7 @@ commit e12bc4f93a093e8c78fd280f079faa5f263ab0eb Author: Michael Natterer -Date: Tue Oct 13 18:55:16 2009 +0200 +Date: Tue Oct 13 18:55:16 2009 +0200 gimp_brush_core_start(): move "fade_point" to local scope @@ -77820,7 +78655,7 @@ commit 8331094b8ff662b7eb170d11b9835040d798e752 Author: Michael Natterer -Date: Tue Oct 13 18:50:58 2009 +0200 +Date: Tue Oct 13 18:50:58 2009 +0200 gimp_brush_core_real_set_dynamics(): don't forget to ref the dynamics @@ -77829,7 +78664,7 @@ commit 53984a848694855fb0ce5788243ea33d559cda9a Author: Michael Schumacher -Date: Tue Oct 13 00:01:04 2009 +0200 +Date: Tue Oct 13 00:01:04 2009 +0200 Bug 554748 - Version information for gimp.exe : generate gimp.rc @@ -77839,26 +78674,26 @@ app/Makefile.am | 4 ++-- app/gimp.rc.in | 2 ++ - configure.ac | 1 + + configure.ac | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) commit 8b657e4b9b90d452c8141472736ef71ddd94a888 Author: Kolbjørn Stuestøl -Date: Mon Oct 12 21:50:43 2009 +0200 +Date: Mon Oct 12 21:50:43 2009 +0200 Updated Norwegian Nynorsk translation - po-libgimp/nn.po | 673 ++- + po-libgimp/nn.po | 673 ++- po-plug-ins/nn.po | 16572 ++++++++++++++++++++++++++------------------------- - po-python/nn.po | 90 +- - po-script-fu/nn.po | 592 +- - po/nn.po | 5808 +++++++++--------- + po-python/nn.po | 90 +- + po-script-fu/nn.po | 592 +- + po/nn.po | 5808 +++++++++--------- 5 files changed, 11953 insertions(+), 11782 deletions(-) commit 05304f6d8308bec8ba68b1df5a2914df2a62fee0 Author: Massimo Valentini -Date: Mon Oct 12 20:26:42 2009 +0200 +Date: Mon Oct 12 20:26:42 2009 +0200 Bug 470698 - MapObject cannot modify highlight @@ -77867,21 +78702,21 @@ commit 8fed74777d4e1aad90fd0cced2beb7e2f0d23358 Author: Michael Natterer -Date: Mon Oct 12 19:06:11 2009 +0200 +Date: Mon Oct 12 19:06:11 2009 +0200 Rename boolean properties of GimpDynamicsOutput from "foo" to "use-foo" - app/core/gimpdynamics.c | 16 ++--- - app/core/gimpdynamicsoutput.c | 152 + app/core/gimpdynamics.c | 16 ++--- + app/core/gimpdynamicsoutput.c | 152 ++++++++++++++++++++------------------- - app/core/gimpdynamicsoutput.h | 12 ++-- + app/core/gimpdynamicsoutput.h | 12 ++-- app/widgets/gimpdynamicseditor.c | 12 ++-- 4 files changed, 98 insertions(+), 94 deletions(-) commit 824be894a120f7791ac980d35fedb1582717757b Author: Michael Natterer -Date: Mon Oct 12 14:46:27 2009 +0200 +Date: Mon Oct 12 14:46:27 2009 +0200 Get rid of local unused variable "config" @@ -77890,44 +78725,44 @@ commit 77faffe4b7fbcbb18bd96a9ddb20d30ac3843423 Author: Michael Natterer -Date: Mon Oct 12 14:45:12 2009 +0200 +Date: Mon Oct 12 14:45:12 2009 +0200 Rename the output members of GimpDynamics from foo_dynamics to foo_output - app/core/gimpdynamics.c | 96 + app/core/gimpdynamics.c | 96 ++++++++++++++++++++-------------------- - app/core/gimpdynamics.h | 16 +++---- - app/paint/gimpairbrush.c | 2 +- - app/paint/gimpbrushcore.c | 14 +++--- - app/paint/gimpclone.c | 4 +- - app/paint/gimpconvolve.c | 2 +- - app/paint/gimpdodgeburn.c | 4 +- - app/paint/gimperaser.c | 4 +- - app/paint/gimpheal.c | 4 +- - app/paint/gimppaintbrush.c | 6 +-- - app/paint/gimppaintoptions.c | 4 +- - app/paint/gimpsmudge.c | 6 +-- + app/core/gimpdynamics.h | 16 +++---- + app/paint/gimpairbrush.c | 2 +- + app/paint/gimpbrushcore.c | 14 +++--- + app/paint/gimpclone.c | 4 +- + app/paint/gimpconvolve.c | 2 +- + app/paint/gimpdodgeburn.c | 4 +- + app/paint/gimperaser.c | 4 +- + app/paint/gimpheal.c | 4 +- + app/paint/gimppaintbrush.c | 6 +-- + app/paint/gimppaintoptions.c | 4 +- + app/paint/gimpsmudge.c | 6 +-- app/widgets/gimpdynamicseditor.c | 16 +++---- 13 files changed, 89 insertions(+), 89 deletions(-) commit 5a145ae4c3297bffc5702c8964dc56d793fca920 Author: Michael Natterer -Date: Mon Oct 12 13:00:16 2009 +0200 +Date: Mon Oct 12 13:00:16 2009 +0200 Whitespace cleanup that reduces the diff against master app/core/gimpbrush-transform.c | 3 +-- - app/core/gimpbrush.c | 1 - - app/core/gimpbrushgenerated.c | 2 -- - app/menus/plug-in-menus.c | 4 +--- - app/paint/gimpbrushcore.c | 1 - - app/paint/gimpbrushcore.h | 6 ++---- + app/core/gimpbrush.c | 1 - + app/core/gimpbrushgenerated.c | 2 -- + app/menus/plug-in-menus.c | 4 +--- + app/paint/gimpbrushcore.c | 1 - + app/paint/gimpbrushcore.h | 6 ++---- 6 files changed, 4 insertions(+), 13 deletions(-) commit b6dd77ab842e45656676ac64ff850cd6ef321974 Author: Michael Natterer -Date: Mon Oct 12 12:23:36 2009 +0200 +Date: Mon Oct 12 12:23:36 2009 +0200 Whitespace fix @@ -77936,7 +78771,7 @@ commit 488c52c16a605f7e878723e3bd325965f106ab86 Author: Michael Natterer -Date: Mon Oct 12 12:23:07 2009 +0200 +Date: Mon Oct 12 12:23:07 2009 +0200 Remove dynamics cruft that is now done elsewhere @@ -77946,7 +78781,7 @@ commit db98f468cbe64193b94a5592572d95e9ae8ccbeb Author: Michael Natterer -Date: Sun Oct 11 22:43:46 2009 +0200 +Date: Sun Oct 11 22:43:46 2009 +0200 Rename utility function @@ -77956,7 +78791,7 @@ commit e23073a382ba8e6de29af91030091bbdbb5cfaed Author: Michael Natterer -Date: Sun Oct 11 22:32:14 2009 +0200 +Date: Sun Oct 11 22:32:14 2009 +0200 Clean up widget creation in gimp_dynamics_editor_init() @@ -77966,7 +78801,7 @@ commit 6a47c2a4b867f73ff9227fd91bc605e9ec48b8ff Author: Michael Natterer -Date: Sun Oct 11 22:06:54 2009 +0200 +Date: Sun Oct 11 22:06:54 2009 +0200 Get rid of unused cruft and reorder functions and includes @@ -77976,7 +78811,7 @@ commit c8db73493240b14213c826c2056ab61f86b4d44e Author: Michael Natterer -Date: Sun Oct 11 21:39:46 2009 +0200 +Date: Sun Oct 11 21:39:46 2009 +0200 Make sure changes dynamics are properly saved to disk @@ -77988,7 +78823,7 @@ commit 8df73b9323524966c65dc28414a5e9d811e163b7 Author: Michael Natterer -Date: Sun Oct 11 21:25:28 2009 +0200 +Date: Sun Oct 11 21:25:28 2009 +0200 Switch to using GimpDynamicsOutput's properties @@ -78001,14 +78836,14 @@ also copy around the properties correctly when copying between dynamics objects (fixes NULL filenames on GimpData). - app/core/gimpdynamics.c | 855 + app/core/gimpdynamics.c | 855 +++++++-------------------------------- app/widgets/gimpdynamicseditor.c | 242 ++++++----- 2 files changed, 271 insertions(+), 826 deletions(-) commit 21c037fdd66b5faf699caf1b7f0b30a3ae08ca26 Author: Martin Nordholts -Date: Sun Oct 11 16:58:59 2009 +0200 +Date: Sun Oct 11 16:58:59 2009 +0200 app: Generalize gimp_dock_add/remove_book() @@ -78016,7 +78851,7 @@ and gimp_widgets_remove_paned_widget() in gimpwidgets-utils.[ch] so we can share this code for GimpDockColumns later. - app/widgets/gimpdock.c | 125 ++++------------------------- + app/widgets/gimpdock.c | 125 ++++------------------------- app/widgets/gimpwidgets-utils.c | 172 ++++++++++++++++++++++++++++++++++++++++ app/widgets/gimpwidgets-utils.h | 149 +++++++++++++++++----------------- @@ -78024,7 +78859,7 @@ commit c794fe0af25c84bdc9e6249c3cff34e26dc5b380 Author: Michael Natterer -Date: Sun Oct 11 16:25:30 2009 +0200 +Date: Sun Oct 11 16:25:30 2009 +0200 Implement the GimpConfigInterface @@ -78033,17 +78868,17 @@ commit 37967edd804595306c14d9e52ffe58c3071d31db Author: Michael Natterer -Date: Sun Oct 11 16:00:35 2009 +0200 +Date: Sun Oct 11 16:00:35 2009 +0200 Fill the dynamis popup menu with items and install it - menus/Makefile.am | 1 + + menus/Makefile.am | 1 + menus/dynamics-menu.xml | 9 +++++++++ 2 files changed, 10 insertions(+) commit bc271a3906a390949a4a7b93b3a8d71925515708 Author: Michael Natterer -Date: Sun Oct 11 16:00:14 2009 +0200 +Date: Sun Oct 11 16:00:14 2009 +0200 Fix typo in menu label @@ -78052,7 +78887,7 @@ commit dab5f9e691b5c5f3e14a3c38cb4a0eb782a5659c Author: Michael Natterer -Date: Sun Oct 11 15:54:59 2009 +0200 +Date: Sun Oct 11 15:54:59 2009 +0200 Rename all GimpDynamicsOutput functions to gimp_dynamics_output_foo() @@ -78061,29 +78896,29 @@ app/core/gimpdynamicsoutput.h | 28 +++++++++---------- app/paint/gimpairbrush.c | 2 +- app/paint/gimpbrushcore.c | 23 ++++++--------- - app/paint/gimpclone.c | 4 +-- + app/paint/gimpclone.c | 4 +-- app/paint/gimpconvolve.c | 2 +- app/paint/gimpdodgeburn.c | 4 +-- app/paint/gimperaser.c | 4 +-- - app/paint/gimpheal.c | 4 +-- + app/paint/gimpheal.c | 4 +-- app/paint/gimppaintbrush.c | 6 ++-- app/paint/gimpsmudge.c | 6 ++-- 11 files changed, 72 insertions(+), 76 deletions(-) commit 330d406acc043a591a5453270f2421e8c02bad4b Author: Michael Natterer -Date: Sun Oct 11 15:41:54 2009 +0200 +Date: Sun Oct 11 15:41:54 2009 +0200 Move dynamics includes to the .c files where they belong app/paint/gimpairbrush.c | 2 ++ app/paint/gimpbrushcore.c | 3 ++- app/paint/gimpbrushcore.h | 3 --- - app/paint/gimpclone.c | 2 ++ + app/paint/gimpclone.c | 2 ++ app/paint/gimpconvolve.c | 2 ++ app/paint/gimpdodgeburn.c | 2 ++ app/paint/gimperaser.c | 2 ++ - app/paint/gimpheal.c | 2 ++ + app/paint/gimpheal.c | 2 ++ app/paint/gimppaintbrush.c | 2 ++ app/paint/gimppaintoptions.c | 1 + app/paint/gimpsmudge.c | 2 ++ @@ -78091,7 +78926,7 @@ commit 09964b5f7a8d8b5ecf0127ea9d5213ae36394aa3 Author: Michael Natterer -Date: Sun Oct 11 15:37:14 2009 +0200 +Date: Sun Oct 11 15:37:14 2009 +0200 Remove duplicate commented-out code @@ -78100,7 +78935,7 @@ commit c856c16d17ea5858eb492ec82ac853076b83dcbf Author: Michael Natterer -Date: Sun Oct 11 15:35:52 2009 +0200 +Date: Sun Oct 11 15:35:52 2009 +0200 There is this concept called alphabetic order... @@ -78109,7 +78944,7 @@ commit d543de866348dfc1dc0ad1909aef5398116cd804 Author: Michael Natterer -Date: Sun Oct 11 15:32:47 2009 +0200 +Date: Sun Oct 11 15:32:47 2009 +0200 Don't make the "dynamics-edit" action permanently insensitive @@ -78118,7 +78953,7 @@ commit 66215fcb5662a7111b344c02c8db06a76243cd16 Author: Michael Natterer -Date: Sun Oct 11 15:27:46 2009 +0200 +Date: Sun Oct 11 15:27:46 2009 +0200 Remove the dynamics editor from the menu of dockables @@ -78127,7 +78962,7 @@ commit 423c9d821201970a3c8f702240edebb7ff76426d Author: Martin Nordholts -Date: Sun Oct 11 15:20:55 2009 +0200 +Date: Sun Oct 11 15:20:55 2009 +0200 app: Always keep dock separators alive @@ -78140,30 +78975,30 @@ commit 3236b57a470a3f081bfde3af64e6ad2a5078cb3b Author: Martin Nordholts -Date: Sun Oct 11 13:59:02 2009 +0200 +Date: Sun Oct 11 13:59:02 2009 +0200 app: Generalize GimpDockSeparator Add a callback to GimpDockSeparator to get rid of the GimpDock dependency so that we can reuse it also for GimpDockColumns later. - app/widgets/gimpdock.c | 81 ++++++++++++++++++++++++++++++++++-- + app/widgets/gimpdock.c | 81 ++++++++++++++++++++++++++++++++++-- app/widgets/gimpdockseparator.c | 92 +++++++++++------------------------------ app/widgets/gimpdockseparator.h | 14 +++---- - app/widgets/widgets-types.h | 25 ++++++----- + app/widgets/widgets-types.h | 25 ++++++----- 4 files changed, 121 insertions(+), 91 deletions(-) commit cad2218b6a34baad5a1e49883dd30ca4bee16ecf Author: Michael Natterer -Date: Sun Oct 11 13:53:59 2009 +0200 +Date: Sun Oct 11 13:53:59 2009 +0200 Move GimpDynamicsOutput to its own class ...but use it only as struct to keep GimpDynamics' properties for now. More refactoring later. - app/core/Makefile.am | 2 + + app/core/Makefile.am | 2 + app/core/gimpdynamics.c | 328 +++---------------------------- app/core/gimpdynamics.h | 41 +--- app/core/gimpdynamicsoutput.c | 438 @@ -78174,7 +79009,7 @@ commit 4e124c983b2f2f54e0b583d497750067ea2a5771 Author: Sven Neumann -Date: Sun Oct 11 13:49:14 2009 +0200 +Date: Sun Oct 11 13:49:14 2009 +0200 Only call gimp_channel_combine_span() if the value actually changed @@ -78183,7 +79018,7 @@ commit 3438287f0344b96094aff06efd8a76599e3805ff Author: Michael Natterer -Date: Sun Oct 11 13:18:23 2009 +0200 +Date: Sun Oct 11 13:18:23 2009 +0200 Remove member "name" from the GimpDynamics struct @@ -78196,11 +79031,11 @@ commit 892f43fe9842001dd6f8c6a3d8c81d12638fe7b6 Author: Michael Natterer -Date: Sun Oct 11 13:16:31 2009 +0200 +Date: Sun Oct 11 13:16:31 2009 +0200 Move GimpDynamicsOutput typedef to core-types.h, some cleanup - app/core/core-types.h | 1 + + app/core/core-types.h | 1 + app/core/gimpdynamics.c | 1 + app/core/gimpdynamics.h | 83 +++++++++++++++++++++++++------------------------ @@ -78208,7 +79043,7 @@ commit d69b4f49e3ce221b3d81d4f1ec8611b7fe90725d Author: Alexia Death -Date: Sun Oct 11 13:54:40 2009 +0300 +Date: Sun Oct 11 13:54:40 2009 +0300 Fixing style I think @@ -78217,7 +79052,7 @@ commit e5ad18cba5a03b5a432092750db8fd552666b895 Author: Alexia Death -Date: Sun Oct 11 13:43:28 2009 +0300 +Date: Sun Oct 11 13:43:28 2009 +0300 Fixing the scale thing right and in the right place @@ -78226,7 +79061,7 @@ commit bdfb87ad19e43c059360c91f9c39d1e0aa84b8f4 Author: Martin Nordholts -Date: Sun Oct 11 11:30:52 2009 +0200 +Date: Sun Oct 11 11:30:52 2009 +0200 app: Add GimpDockSeparatorPrivate @@ -78237,18 +79072,18 @@ commit 04bad5609a00ad8b46bf64cc589b39eb8d8e7b23 Author: Alexia Death -Date: Sun Oct 11 12:17:29 2009 +0300 +Date: Sun Oct 11 12:17:29 2009 +0300 Move scale limit so it does not bother generated brushes. app/core/gimpbrush-transform.c | 5 +++++ - app/core/gimpbrush.c | 3 --- - app/core/gimpbrushgenerated.c | 2 ++ + app/core/gimpbrush.c | 3 --- + app/core/gimpbrushgenerated.c | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) commit 424294b7386d87063573f75809e4e183246c6c70 Author: Alexia Death -Date: Sun Oct 11 11:26:44 2009 +0300 +Date: Sun Oct 11 11:26:44 2009 +0300 Remove the special method for mixing scale thats absolete now with limist gone. @@ -78261,18 +79096,18 @@ commit 265687595378f93e39b603e3d0e0daf91fb20cd5 Author: Alexia Death -Date: Sun Oct 11 10:57:13 2009 +0300 +Date: Sun Oct 11 10:57:13 2009 +0300 Remove the silly ratio limit from scale and just make sure that transformation result is at least 1px - app/core/gimpbrush.c | 4 ++++ + app/core/gimpbrush.c | 4 ++++ app/core/gimpdynamics.c | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) commit 42b66678f5ead29abb23183c7cbea96ee7585e69 Author: Michael Natterer -Date: Sun Oct 11 01:44:38 2009 +0200 +Date: Sun Oct 11 01:44:38 2009 +0200 Honor the "global-dynamics" setting @@ -78282,17 +79117,17 @@ commit 8e285ba0145c5e4a0e55262d601585fffbd7dfc9 Author: Michael Natterer -Date: Sun Oct 11 01:42:23 2009 +0200 +Date: Sun Oct 11 01:42:23 2009 +0200 Add prefs UI for "dynamics-path" and "global-dynamics" app/dialogs/preferences-dialog.c | 7 +++++++ - app/widgets/gimphelp-ids.h | 1 + + app/widgets/gimphelp-ids.h | 1 + 2 files changed, 8 insertions(+) commit 3aa8db4cea58a806a41fe00dbc619e6012d2a8d5 Author: Michael Natterer -Date: Sun Oct 11 01:36:24 2009 +0200 +Date: Sun Oct 11 01:36:24 2009 +0200 Use the configured default_dynamics from the config object @@ -78301,7 +79136,7 @@ commit 8be598e029ee46e86e8901cd1bf88d81d91225ed Author: Michael Natterer -Date: Sun Oct 11 01:34:48 2009 +0200 +Date: Sun Oct 11 01:34:48 2009 +0200 Create the dynamics directory @@ -78310,7 +79145,7 @@ commit b550fc9f651aec1aa9c7aef2f78351c3782f6aad Author: Michael Natterer -Date: Sun Oct 11 01:33:14 2009 +0200 +Date: Sun Oct 11 01:33:14 2009 +0200 Use the newly added dynamics paths @@ -78319,19 +79154,19 @@ commit 1cf86f6ac0579e47f6d2dc2d418f9f3976359623 Author: Michael Natterer -Date: Sun Oct 11 01:30:54 2009 +0200 +Date: Sun Oct 11 01:30:54 2009 +0200 Use all config properties needed for dynamics to work like a resource app/config/gimpcoreconfig.c | 58 +++++++++++++++++++++++++++++++++++++++++++++ - app/config/gimpcoreconfig.h | 4 ++++ + app/config/gimpcoreconfig.h | 4 ++++ app/config/gimprc-blurbs.h | 12 ++++++++++ 3 files changed, 74 insertions(+) commit ba355321cff48265830376a7453c74d2e2f0e851 Author: Michael Natterer -Date: Sun Oct 11 01:19:40 2009 +0200 +Date: Sun Oct 11 01:19:40 2009 +0200 Various cleanups in the GimpDynamics object @@ -78341,7 +79176,7 @@ commit 1fcfa9fe585e49aa93d17affc2ae0271db3f9023 Author: Michael Natterer -Date: Sun Oct 11 00:21:21 2009 +0200 +Date: Sun Oct 11 00:21:21 2009 +0200 Reorder includes @@ -78350,7 +79185,7 @@ commit 26bda5a2e229539799a4982583afe5dfb19cb8b3 Author: Michael Natterer -Date: Sun Oct 11 00:19:14 2009 +0200 +Date: Sun Oct 11 00:19:14 2009 +0200 Some more cleanup @@ -78358,7 +79193,7 @@ - related changes - clean up gimpcontext.c - app/core/core-types.h | 1 + + app/core/core-types.h | 1 + app/core/gimpcontext.c | 15 +++++++-------- app/core/gimpcontext.h | 4 ++-- app/core/gimpdynamics.h | 6 ++---- @@ -78367,7 +79202,7 @@ commit 5c1a9497f0b42772e4939c8003d6ce8c335626c8 Author: Michael Natterer -Date: Sun Oct 11 00:08:24 2009 +0200 +Date: Sun Oct 11 00:08:24 2009 +0200 Some formatting cleanup @@ -78376,7 +79211,7 @@ commit 276a603de70712962fa46a0ac62f15944e922e71 Author: Alexia Death -Date: Sun Oct 11 01:16:51 2009 +0300 +Date: Sun Oct 11 01:16:51 2009 +0300 Tiny fix for a missing include @@ -78384,15 +79219,15 @@ 1 file changed, 1 insertion(+) commit 0ca81896e9f2742f5b38c93e139896ebd6c65f37 -Merge: 943e8c9 0012c86 +Merge: 943e8c9009 0012c86cf1 Author: Alexia Death -Date: Sun Oct 11 01:05:40 2009 +0300 +Date: Sun Oct 11 01:05:40 2009 +0300 Merge commit 'origin/master' into soc-2009-dynamics commit 943e8c9009dc742de69a0f3975c3f16dbb447f20 Author: Alexia Death -Date: Sun Oct 11 01:03:52 2009 +0300 +Date: Sun Oct 11 01:03:52 2009 +0300 Last bit for dynamics switching. @@ -78401,19 +79236,19 @@ commit af8b47efe98b2cefbc535deb58621485a174f5d6 Author: Michael Natterer -Date: Sun Oct 11 00:00:45 2009 +0200 +Date: Sun Oct 11 00:00:45 2009 +0200 Some reordering and cleanup - app/actions/actions.c | 6 +++--- - app/actions/dialogs-actions.c | 11 +++++------ + app/actions/actions.c | 6 +++--- + app/actions/dialogs-actions.c | 11 +++++------ app/actions/dynamics-actions.c | 1 - app/actions/dynamics-editor-actions.c | 10 +++++----- 4 files changed, 13 insertions(+), 15 deletions(-) commit 6d36496d6ee9e5164eb5f867e8634e027616784b Author: Michael Natterer -Date: Sat Oct 10 23:55:59 2009 +0200 +Date: Sat Oct 10 23:55:59 2009 +0200 Revert .gitignore to the state in master @@ -78422,7 +79257,7 @@ commit 0012c86cf109fda1e4102a333004022113f7c22b Author: Sven Neumann -Date: Sat Oct 10 23:17:17 2009 +0200 +Date: Sat Oct 10 23:17:17 2009 +0200 update documentation @@ -78431,7 +79266,7 @@ commit aa9538a81aa8562c15b8b70bb9c26ac1e4cf84fe Author: Sven Neumann -Date: Sat Oct 10 23:01:59 2009 +0200 +Date: Sat Oct 10 23:01:59 2009 +0200 Optimize gimp_channel_combine_ellipse_rect() @@ -78452,7 +79287,7 @@ commit bcfce95a5ed789dee1fc40a06ae665274cfd2c1e Author: Sven Neumann -Date: Sat Oct 10 16:31:41 2009 +0200 +Date: Sat Oct 10 16:31:41 2009 +0200 minor cleanups @@ -78462,7 +79297,7 @@ commit 4c0f1a2d5414c844af03e035e5051e9ff4c21e16 Author: Sven Neumann -Date: Sat Oct 10 15:46:31 2009 +0200 +Date: Sat Oct 10 15:46:31 2009 +0200 app: minor optimization and cleanups @@ -78475,7 +79310,7 @@ commit 6409ecb3899d8c968f3414efa6b77f70d260751a Author: Michael Natterer -Date: Sat Oct 10 23:02:18 2009 +0200 +Date: Sat Oct 10 23:02:18 2009 +0200 Fix gimp_dynamics_editor_set_data() to really work this time @@ -78484,7 +79319,7 @@ commit 90abaf1a7310946985b9e6c848476767ab491d54 Author: Martin Nordholts -Date: Sat Oct 10 22:06:55 2009 +0200 +Date: Sat Oct 10 22:06:55 2009 +0200 app: Document GimpContext @@ -78493,26 +79328,26 @@ commit 677b977776da9d8311973cf2a2d06ed65364c9aa Author: Martin Nordholts -Date: Sat Oct 10 22:00:20 2009 +0200 +Date: Sat Oct 10 22:00:20 2009 +0200 app: Make class documentation be picked up by gtk-doc - app/widgets/gimpdock.h | 2 ++ - app/widgets/gimpdockable.h | 2 ++ - app/widgets/gimpdockbook.h | 2 ++ - app/widgets/gimpdockcolumns.h | 2 ++ - app/widgets/gimpdocked.h | 2 ++ - app/widgets/gimpdockseparator.h | 2 ++ - app/widgets/gimpdockwindow.h | 2 ++ - app/widgets/gimpsessioninfo-aux.h | 2 ++ - app/widgets/gimpsessioninfo-book.h | 2 ++ + app/widgets/gimpdock.h | 2 ++ + app/widgets/gimpdockable.h | 2 ++ + app/widgets/gimpdockbook.h | 2 ++ + app/widgets/gimpdockcolumns.h | 2 ++ + app/widgets/gimpdocked.h | 2 ++ + app/widgets/gimpdockseparator.h | 2 ++ + app/widgets/gimpdockwindow.h | 2 ++ + app/widgets/gimpsessioninfo-aux.h | 2 ++ + app/widgets/gimpsessioninfo-book.h | 2 ++ app/widgets/gimpsessioninfo-dockable.h | 2 ++ - app/widgets/gimpsessioninfo.h | 2 ++ + app/widgets/gimpsessioninfo.h | 2 ++ 11 files changed, 22 insertions(+) commit 5bd751c2d2abdc1050d7bde5336fa4a3b22f82a8 Author: Michael Natterer -Date: Sat Oct 10 21:47:25 2009 +0200 +Date: Sat Oct 10 21:47:25 2009 +0200 Make model <-> data property copying work, and some cleanup @@ -78522,7 +79357,7 @@ commit 9b0f6ae5e20c991d83faa271a1dc9ba99c04a42a Author: Alexia Death -Date: Sat Oct 10 22:29:04 2009 +0300 +Date: Sat Oct 10 22:29:04 2009 +0300 Make saves work a bit more. @@ -78531,47 +79366,47 @@ 1 file changed, 58 insertions(+), 42 deletions(-) commit f096de2002260672d511bf29cb568691282f818e -Merge: 4a5f070 da6134e +Merge: 4a5f070217 da6134ece4 Author: Alexia Death -Date: Sat Oct 10 22:08:25 2009 +0300 +Date: Sat Oct 10 22:08:25 2009 +0300 Merge commit 'origin/master' into soc-2009-dynamics commit 4a5f07021727a0581ca702dde095104c713aed9a Author: Alexia Death -Date: Sat Oct 10 22:05:50 2009 +0300 +Date: Sat Oct 10 22:05:50 2009 +0300 Fixing dynamics extension on save - app/core/gimp.c | 2 +- + app/core/gimp.c | 2 +- app/core/gimpdynamics.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) commit 0ffcad46881111965dcc503d41c1730c955a1789 Author: Alexia Death -Date: Sat Oct 10 21:43:20 2009 +0300 +Date: Sat Oct 10 21:43:20 2009 +0300 Several small fixes. - app/core/gimpdynamics.c | 2 +- + app/core/gimpdynamics.c | 2 +- app/widgets/gimpdynamicseditor.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) commit 7f8b34767766d7ce57abfe397805a38afb336838 Author: Alexia Death -Date: Sat Oct 10 21:28:54 2009 +0300 +Date: Sat Oct 10 21:28:54 2009 +0300 Several small fixes. - app/core/gimpdynamics.c | 18 +++++++++--------- - app/core/gimpdynamics.h | 2 +- - app/paint/gimppaintoptions.c | 4 ++-- + app/core/gimpdynamics.c | 18 +++++++++--------- + app/core/gimpdynamics.h | 2 +- + app/paint/gimppaintoptions.c | 4 ++-- app/widgets/gimpdynamicseditor.c | 1 - 4 files changed, 12 insertions(+), 13 deletions(-) commit cbcf46506ca7fb027029044f073660718102e327 Author: Michael Natterer -Date: Sat Oct 10 20:39:11 2009 +0200 +Date: Sat Oct 10 20:39:11 2009 +0200 Fix up dynamics loading/saving @@ -78581,7 +79416,7 @@ commit 72e976cca697cf5a06980e031b91a5889eba98b5 Author: Alexia Death -Date: Sat Oct 10 20:46:06 2009 +0300 +Date: Sat Oct 10 20:46:06 2009 +0300 Make saving work. sortof. @@ -78591,7 +79426,7 @@ commit 5adeb6ee25a91cea9192571a38a797bd75ab7eb2 Author: Alexia Death -Date: Sat Oct 10 20:23:08 2009 +0300 +Date: Sat Oct 10 20:23:08 2009 +0300 Obsolete comment removed @@ -78600,18 +79435,18 @@ commit 430a796904fb68ee7a67a60bc4bbf9a4df2ba713 Author: Alexia Death -Date: Sat Oct 10 20:22:31 2009 +0300 +Date: Sat Oct 10 20:22:31 2009 +0300 Fixes - app/core/gimpdynamics-load.c | 22 +++++++++------------- - app/core/gimpdynamics-save.c | 19 +++++++------------ + app/core/gimpdynamics-load.c | 22 +++++++++------------- + app/core/gimpdynamics-save.c | 19 +++++++------------ app/widgets/gimpdynamicsfactoryview.h | 2 +- 3 files changed, 17 insertions(+), 26 deletions(-) commit da6134ece451a5c885af594de629d998a737dd5d Author: Khaled Hosny -Date: Sat Oct 10 16:54:39 2009 +0200 +Date: Sat Oct 10 16:54:39 2009 +0200 Updated Arabic translation @@ -78621,7 +79456,7 @@ commit 3666648c520279d23a6b75de0ce780a7400ec8b9 Author: Khaled Hosny -Date: Sat Oct 10 15:59:58 2009 +0200 +Date: Sat Oct 10 15:59:58 2009 +0200 gimpimagedock.c has been killed @@ -78630,25 +79465,25 @@ commit 06673f27e26c95a5c4318e54f73a33f6591a3b16 Author: Michael Natterer -Date: Sat Oct 10 15:10:14 2009 +0200 +Date: Sat Oct 10 15:10:14 2009 +0200 Use various GTK+ accessors instead of object->member - plug-ins/common/lens-flare.c | 8 ++++---- - plug-ins/common/noise-rgb.c | 2 +- - plug-ins/common/nova.c | 8 ++++---- + plug-ins/common/lens-flare.c | 8 ++++---- + plug-ins/common/noise-rgb.c | 2 +- + plug-ins/common/nova.c | 8 ++++---- plug-ins/common/plugin-browser.c | 7 +++++-- plug-ins/common/sample-colorize.c | 30 +++++++++++++++--------------- - plug-ins/common/sinus.c | 2 +- + plug-ins/common/sinus.c | 2 +- plug-ins/common/sphere-designer.c | 28 ++++++++++++++-------------- - plug-ins/common/tile-paper.c | 16 ++++++++-------- - plug-ins/common/tile-small.c | 10 +++++----- - plug-ins/common/unit-editor.c | 26 +++++++++++++++++++++----- + plug-ins/common/tile-paper.c | 16 ++++++++-------- + plug-ins/common/tile-small.c | 10 +++++----- + plug-ins/common/unit-editor.c | 26 +++++++++++++++++++++----- 10 files changed, 78 insertions(+), 59 deletions(-) commit 85274ea1f31e9652602968c752332e2dd736a25c Author: Michael Natterer -Date: Sat Oct 10 14:52:52 2009 +0200 +Date: Sat Oct 10 14:52:52 2009 +0200 Use gtk_widget_get_window() instead of widget->window @@ -78657,7 +79492,7 @@ commit e267783c22dd0e60b2a989be47f64d3a43024841 Author: Michael Natterer -Date: Sat Oct 10 14:51:49 2009 +0200 +Date: Sat Oct 10 14:51:49 2009 +0200 Use gtk_widget_get_window() instead of widget->window @@ -78666,7 +79501,7 @@ commit 641c2f4e2248007d36a4ea61b69eca3d9d90e314 Author: Michael Natterer -Date: Sat Oct 10 14:50:07 2009 +0200 +Date: Sat Oct 10 14:50:07 2009 +0200 Use gtk_widget_get_window() instead of widget->window @@ -78675,7 +79510,7 @@ commit 02b1566249c9d16db5cc082f05483d64e172e057 Author: Michael Natterer -Date: Sat Oct 10 14:46:05 2009 +0200 +Date: Sat Oct 10 14:46:05 2009 +0200 Use accessors instead of widget->window and adjustment->value @@ -78685,7 +79520,7 @@ commit b41bca97fbf4f0e01c11ab98dacd2108ed8f705c Author: Michael Natterer -Date: Sat Oct 10 14:40:23 2009 +0200 +Date: Sat Oct 10 14:40:23 2009 +0200 Use gtk_container_child_get() instead of table->children @@ -78694,7 +79529,7 @@ commit 055d10f36620c1ed1f59cf4f54aa63d30f3b45f4 Author: Michael Natterer -Date: Sat Oct 10 14:36:20 2009 +0200 +Date: Sat Oct 10 14:36:20 2009 +0200 Use gtk_adjustment_get_value() instead of adjustment->value @@ -78704,28 +79539,28 @@ commit 0458da1832c1a9fb50f81f5a9dc0fa5c74a4ef80 Author: Michael Natterer -Date: Sat Oct 10 11:32:29 2009 +0200 +Date: Sat Oct 10 11:32:29 2009 +0200 Use accessors instead of widget->window and adjustment->value plug-ins/common/cml-explorer.c | 6 +++--- plug-ins/common/color-exchange.c | 6 +++++- - plug-ins/common/curve-bend.c | 27 +++++++++++++++------------ + plug-ins/common/curve-bend.c | 27 +++++++++++++++------------ 3 files changed, 23 insertions(+), 16 deletions(-) commit 9f77899bf1bde79405055abb0f20e12b28b79d32 Author: Michael Natterer -Date: Sat Oct 10 10:55:09 2009 +0200 +Date: Sat Oct 10 10:55:09 2009 +0200 Use gtk_adjustmenr_get_value() instead of adjustment->value - plug-ins/common/bump-map.c | 6 ++---- + plug-ins/common/bump-map.c | 6 ++---- plug-ins/common/channel-mixer.c | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 16 deletions(-) commit 1e47f5c67c0e5ba09b483aae11d6bbde00dd9b09 Author: Michael Natterer -Date: Sat Oct 10 10:51:59 2009 +0200 +Date: Sat Oct 10 10:51:59 2009 +0200 Use gtk_widget_get_window() instead of widget->window @@ -78735,7 +79570,7 @@ commit cf3c9b230a4554e32368ef0cacd9bf62fb02e8bc Author: Alexia Death -Date: Sat Oct 10 11:23:40 2009 +0300 +Date: Sat Oct 10 11:23:40 2009 +0300 some missing files @@ -78747,7 +79582,7 @@ commit 23c07b9a8d2911e6335de6293743869c51ca40bc Author: Alexia Death -Date: Sat Oct 10 11:20:57 2009 +0300 +Date: Sat Oct 10 11:20:57 2009 +0300 fixes to actions setup @@ -78756,15 +79591,15 @@ 1 file changed, 91 insertions(+) commit 11d6219776a0433603399a9d9593abdff68e6c71 -Merge: 2eab9f2 2914af8 +Merge: 2eab9f2ca4 2914af893b Author: Alexia Death -Date: Sat Oct 10 10:23:25 2009 +0300 +Date: Sat Oct 10 10:23:25 2009 +0300 Merge commit 'origin/master' into soc-2009-dynamics commit 2914af893b966d6cb1fc2d13fa108368ecceacac Author: Martin Nordholts -Date: Fri Oct 9 23:21:50 2009 +0200 +Date: Fri Oct 9 23:21:50 2009 +0200 app: Allow 1-tool wide toolbox in single-window mode @@ -78773,7 +79608,7 @@ commit 04836301aa1b157c84dbc6880c3f41741b2a9143 Author: Michael Natterer -Date: Fri Oct 9 23:00:29 2009 +0200 +Date: Fri Oct 9 23:00:29 2009 +0200 Use accessors instead of widget->window and container->border_width @@ -78782,7 +79617,7 @@ commit a52a4a0fa3ed15e92165513249dc693a37295a20 Author: Michael Natterer -Date: Fri Oct 9 22:57:58 2009 +0200 +Date: Fri Oct 9 22:57:58 2009 +0200 Use GtkAdjustment's accessors @@ -78791,7 +79626,7 @@ commit 9186909ed335a87da8f71a62717f0ecc6e1cd6c3 Author: Michael Natterer -Date: Fri Oct 9 22:56:23 2009 +0200 +Date: Fri Oct 9 22:56:23 2009 +0200 Use gtk_adjustment_get_value() instead of adjustment->value @@ -78800,7 +79635,7 @@ commit 53ceee88cd99c7d90755739a42eaf0905078bc7a Author: Michael Natterer -Date: Fri Oct 9 22:55:16 2009 +0200 +Date: Fri Oct 9 22:55:16 2009 +0200 Use GtkAdjustment's accessors @@ -78809,18 +79644,18 @@ commit e610e5420bbdd8e1ae3d9b933456e378390848c7 Author: Michael Natterer -Date: Fri Oct 9 22:52:44 2009 +0200 +Date: Fri Oct 9 22:52:44 2009 +0200 Use various GTK+ accessors plug-ins/map-object/map-object-preview.c | 26 +++++++++++++------------- - plug-ins/map-object/map-object-ui.c | 28 + plug-ins/map-object/map-object-ui.c | 28 ++++++++++++++-------------- 2 files changed, 27 insertions(+), 27 deletions(-) commit e27f1929d78f10b58ad7816eb9863f0b3ffb51d4 Author: Michael Natterer -Date: Fri Oct 9 22:47:02 2009 +0200 +Date: Fri Oct 9 22:47:02 2009 +0200 Use gtk_widget_get_window() instead of widget->window @@ -78830,7 +79665,7 @@ commit 8eccf3e2eb20ab662916b852e522d023e91b89fc Author: Michael Natterer -Date: Fri Oct 9 22:42:45 2009 +0200 +Date: Fri Oct 9 22:42:45 2009 +0200 Use GtkSelectionData's accessors @@ -78840,7 +79675,7 @@ commit 561c29522cce5e407a6e3fb56dc546c4e2eedf80 Author: Michael Natterer -Date: Fri Oct 9 22:40:39 2009 +0200 +Date: Fri Oct 9 22:40:39 2009 +0200 Use various GTK+ accessors instead of struct->member @@ -78849,7 +79684,7 @@ commit 83d2541613d49994d7b8eba566e544bf32f3e524 Author: Michael Natterer -Date: Fri Oct 9 22:37:25 2009 +0200 +Date: Fri Oct 9 22:37:25 2009 +0200 Use gtk_widget_get_window() instead of widget->window @@ -78858,7 +79693,7 @@ commit 01e8de8ab769c59104554c9e750a90219921ed40 Author: Michael Natterer -Date: Fri Oct 9 22:30:26 2009 +0200 +Date: Fri Oct 9 22:30:26 2009 +0200 Use gtk_widget_get_window() instead of widget->window @@ -78867,19 +79702,19 @@ commit b2dd7d0ca3fa7c36a529103fbe5d05b54b7d518a Author: Michael Natterer -Date: Fri Oct 9 22:05:42 2009 +0200 +Date: Fri Oct 9 22:05:42 2009 +0200 Use gtk_widget_get_window() instead of widget->window - plug-ins/imagemap/imap_cmd_move.c | 4 ++-- + plug-ins/imagemap/imap_cmd_move.c | 4 ++-- plug-ins/imagemap/imap_cmd_move_sash.c | 4 ++-- plug-ins/imagemap/imap_cmd_select_region.c | 6 +++--- - plug-ins/imagemap/imap_grid.c | 6 +++--- + plug-ins/imagemap/imap_grid.c | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) commit 9c9306f653623a78b38873dc78862dbf012a9ccc Author: Michael Natterer -Date: Fri Oct 9 22:00:14 2009 +0200 +Date: Fri Oct 9 22:00:14 2009 +0200 Use GtkSelectionData's accessors @@ -78888,7 +79723,7 @@ commit c83788377ab77470ec735dc5b08ead7c2875bf0c Author: Martin Nordholts -Date: Fri Oct 9 23:03:31 2009 +0200 +Date: Fri Oct 9 23:03:31 2009 +0200 app: Remove unused includes from gimpdisplayshell.c @@ -78897,7 +79732,7 @@ commit 48eb8f5b63d492b40d52e242fc0ebb168640756a Author: Daniel Nylander -Date: Fri Oct 9 22:32:12 2009 +0200 +Date: Fri Oct 9 22:32:12 2009 +0200 Updated Swedish translation @@ -78907,7 +79742,7 @@ commit 13d967524544656838317026bfae051c80d83f49 Author: Daniel Nylander -Date: Fri Oct 9 22:25:56 2009 +0200 +Date: Fri Oct 9 22:25:56 2009 +0200 Updated Swedish translation @@ -78917,7 +79752,7 @@ commit 104fc1cd45dca92a693e12c37ea59e837d6a3b08 Author: Michael Natterer -Date: Fri Oct 9 21:17:42 2009 +0200 +Date: Fri Oct 9 21:17:42 2009 +0200 Use gtk_adjustment_get_value() instead of adjustment->value @@ -78926,7 +79761,7 @@ commit 88bb07571319a0247ace704f1fbe6e98d9efc08c Author: Michael Natterer -Date: Fri Oct 9 21:15:35 2009 +0200 +Date: Fri Oct 9 21:15:35 2009 +0200 Use gtk_widget_get_window() instead of widget->window @@ -78935,7 +79770,7 @@ commit c0bf72eb3cdef1878a140211ebc1de32f8c7e907 Author: Michael Natterer -Date: Fri Oct 9 18:19:35 2009 +0200 +Date: Fri Oct 9 18:19:35 2009 +0200 Use gtk_widget_get_parent() instead of widget->parent @@ -78944,7 +79779,7 @@ commit 2e1caf6be8568893020f7ebe50823602312dea31 Author: Michael Natterer -Date: Fri Oct 9 18:16:54 2009 +0200 +Date: Fri Oct 9 18:16:54 2009 +0200 Use gtk_widget_get_window() instead of widget->window @@ -78953,35 +79788,35 @@ commit abbb4d53a05224174b62155859032fe0685e44e8 Author: Michael Natterer -Date: Fri Oct 9 18:15:48 2009 +0200 +Date: Fri Oct 9 18:15:48 2009 +0200 Use gtk_adjustment_get_value() instead of adjustment->value - plug-ins/gimpressionist/brush.c | 6 +++--- + plug-ins/gimpressionist/brush.c | 6 +++--- plug-ins/gimpressionist/general.c | 10 +++++----- plug-ins/gimpressionist/orientmap.c | 14 +++++++------- - plug-ins/gimpressionist/sizemap.c | 8 ++++---- + plug-ins/gimpressionist/sizemap.c | 8 ++++---- 4 files changed, 19 insertions(+), 19 deletions(-) commit b71da00ef209d67e282a5e6e60bfc19ea1cb9a78 Author: Michael Natterer -Date: Fri Oct 9 17:18:09 2009 +0200 +Date: Fri Oct 9 17:18:09 2009 +0200 Use gtk_widget_get_window() intead of widget->window - plug-ins/gfig/gfig-arc.c | 4 ++-- - plug-ins/gfig/gfig-circle.c | 4 ++-- - plug-ins/gfig/gfig-dialog.c | 13 +++++++------ - plug-ins/gfig/gfig-ellipse.c | 4 ++-- - plug-ins/gfig/gfig-grid.c | 33 +++++++++++++++++---------------- - plug-ins/gfig/gfig-line.c | 4 ++-- - plug-ins/gfig/gfig-preview.c | 8 ++++---- + plug-ins/gfig/gfig-arc.c | 4 ++-- + plug-ins/gfig/gfig-circle.c | 4 ++-- + plug-ins/gfig/gfig-dialog.c | 13 +++++++------ + plug-ins/gfig/gfig-ellipse.c | 4 ++-- + plug-ins/gfig/gfig-grid.c | 33 +++++++++++++++++---------------- + plug-ins/gfig/gfig-line.c | 4 ++-- + plug-ins/gfig/gfig-preview.c | 8 ++++---- plug-ins/gfig/gfig-rectangle.c | 7 ++++--- 8 files changed, 40 insertions(+), 37 deletions(-) commit 17e81e96ca6f41457a107ea617d75bff1f8e5f5f Author: Michael Natterer -Date: Fri Oct 9 17:11:19 2009 +0200 +Date: Fri Oct 9 17:11:19 2009 +0200 Use accessors instead of widget->window and bin->child @@ -78990,7 +79825,7 @@ commit d0fae3d338b0b75eda3cd2b2d6458c8083f398f2 Author: Michael Natterer -Date: Fri Oct 9 17:08:10 2009 +0200 +Date: Fri Oct 9 17:08:10 2009 +0200 Use gtk_adjustment_get_value() instead of adjustment->value @@ -78999,7 +79834,7 @@ commit a651f4b056414d45f76818d6acb3e2131b31afd6 Author: Michael Natterer -Date: Fri Oct 9 17:06:55 2009 +0200 +Date: Fri Oct 9 17:06:55 2009 +0200 Use GtkAdjustment's accessors @@ -79009,7 +79844,7 @@ commit 7917cb0ef9420552a6f920f42561d166df7036ce Author: Michael Natterer -Date: Fri Oct 9 12:23:32 2009 +0200 +Date: Fri Oct 9 12:23:32 2009 +0200 Use gtk_widget_get_window() instead of widget->window @@ -79019,7 +79854,7 @@ commit 2a7cb3915fb4ea55068e12fcef6d8938bfc1390c Author: Michael Natterer -Date: Fri Oct 9 12:16:59 2009 +0200 +Date: Fri Oct 9 12:16:59 2009 +0200 Use gtk_widget_get_window() instead of widget->window @@ -79028,7 +79863,7 @@ commit f5115e06ec00a098df280f3cdf50adc2b42a9897 Author: Michael Natterer -Date: Fri Oct 9 12:02:55 2009 +0200 +Date: Fri Oct 9 12:02:55 2009 +0200 Use GtkAdjustment's accessors @@ -79037,7 +79872,7 @@ commit 43ab261c455ad6200de2ce44a2b1b140c7539f2e Author: Michael Natterer -Date: Fri Oct 9 12:01:09 2009 +0200 +Date: Fri Oct 9 12:01:09 2009 +0200 Use gtk_widget_get_window() instead of widget->window @@ -79046,7 +79881,7 @@ commit 834373eba764deaee0e8dc84216a0a33f04e4c15 Author: Michael Natterer -Date: Fri Oct 9 11:57:17 2009 +0200 +Date: Fri Oct 9 11:57:17 2009 +0200 Use GtkAdjustment's accessors @@ -79055,7 +79890,7 @@ commit 06f55eb856103be637983cb5d98b7d318f69c2a1 Author: Michael Natterer -Date: Fri Oct 9 11:56:21 2009 +0200 +Date: Fri Oct 9 11:56:21 2009 +0200 Use gtk_widget_get_window() instead of widget->window @@ -79064,7 +79899,7 @@ commit e61a74b938fbb4aa5666c27f1c45ac6d0d009fa0 Author: Michael Natterer -Date: Fri Oct 9 11:55:11 2009 +0200 +Date: Fri Oct 9 11:55:11 2009 +0200 Use gtk_adjustment_get_value() instead of adjustment->value @@ -79073,7 +79908,7 @@ commit 454f1391d67381f39205e64ea8f926c149809104 Author: Michael Natterer -Date: Fri Oct 9 11:24:21 2009 +0200 +Date: Fri Oct 9 11:24:21 2009 +0200 Use gtk_widget_get_window() instead of widget->window @@ -79083,7 +79918,7 @@ commit 83c092bfe2ca8561253400f782874bbd1e5b27c0 Author: Michael Natterer -Date: Fri Oct 9 11:20:10 2009 +0200 +Date: Fri Oct 9 11:20:10 2009 +0200 Use gtk_widget_get_window() instead of widget->window @@ -79092,7 +79927,7 @@ commit efcc28a018b0a50ee7489fe346296af0c7fbc1e5 Author: Michael Natterer -Date: Fri Oct 9 11:19:14 2009 +0200 +Date: Fri Oct 9 11:19:14 2009 +0200 Use GtkAdjustment's accessors @@ -79101,7 +79936,7 @@ commit 3e500a4f7f7c56e8f4f76211d916a3df132316b6 Author: Michael Natterer -Date: Fri Oct 9 11:13:51 2009 +0200 +Date: Fri Oct 9 11:13:51 2009 +0200 Use gtk_container_get_children() instead of menushell->children @@ -79110,7 +79945,7 @@ commit 87440be423df7cef9fe3c8c1e830ad6490b2ebf3 Author: Michael Natterer -Date: Fri Oct 9 11:12:41 2009 +0200 +Date: Fri Oct 9 11:12:41 2009 +0200 Use gtk_menu_item_get_submenu() instead of menuitem->submenu @@ -79119,7 +79954,7 @@ commit 639194aac52e9cf2d6640b69b892d81906d8d2c1 Author: Michael Natterer -Date: Fri Oct 9 11:09:41 2009 +0200 +Date: Fri Oct 9 11:09:41 2009 +0200 Use gtk_widget_get_window() instead of widget->window @@ -79128,7 +79963,7 @@ commit 00ce0572260f1dd78473c79821a5e0a6b0d03506 Author: Michael Natterer -Date: Fri Oct 9 11:06:50 2009 +0200 +Date: Fri Oct 9 11:06:50 2009 +0200 Use gtk_widget_get_window() instead of widget->window @@ -79137,7 +79972,7 @@ commit f34cdad2bc3a290a2781024160ec2df33bde469e Author: Michael Natterer -Date: Fri Oct 9 11:05:10 2009 +0200 +Date: Fri Oct 9 11:05:10 2009 +0200 Use gtk_widget_get_window() instead of widget->window @@ -79146,7 +79981,7 @@ commit 2da2c510d235a34b789aa143972385658755a8f9 Author: Michael Natterer -Date: Fri Oct 9 11:02:51 2009 +0200 +Date: Fri Oct 9 11:02:51 2009 +0200 Use gtk_widget_get_window() instead of widget->window @@ -79155,7 +79990,7 @@ commit 33150b4a1bfc30f8b7f123675fd0d5eaef936bd6 Author: Michael Natterer -Date: Fri Oct 9 11:02:12 2009 +0200 +Date: Fri Oct 9 11:02:12 2009 +0200 Use gtk_widget_get_window() instead of widget->window @@ -79164,7 +79999,7 @@ commit 676e7f8c3187db9e941e819a5dd24b0b0bd7e711 Author: Martin Nordholts -Date: Fri Oct 9 20:04:38 2009 +0200 +Date: Fri Oct 9 20:04:38 2009 +0200 app: Formating @@ -79172,37 +80007,37 @@ 1 file changed, 1 insertion(+), 1 deletion(-) commit 2eab9f2ca498e662e8f1d3ae69f904d3fffb0ec7 -Merge: ac111be 2395543 +Merge: ac111be15d 23955439d6 Author: Alexia Death -Date: Fri Oct 9 20:38:43 2009 +0300 +Date: Fri Oct 9 20:38:43 2009 +0300 Merge fixes commit ac111be15d01e142c7bba8ea80f774b3f4369828 Author: Alexia Death -Date: Fri Oct 9 20:25:07 2009 +0300 +Date: Fri Oct 9 20:25:07 2009 +0300 Added dynamics list and some infrastructure. still ont 100% tho - app/actions/Makefile.am | 2 ++ - app/actions/actions.c | 4 ++++ - app/actions/dialogs-actions.c | 7 +++++++ + app/actions/Makefile.am | 2 ++ + app/actions/actions.c | 4 ++++ + app/actions/dialogs-actions.c | 7 +++++++ app/actions/dynamics-editor-actions.c | 2 +- - app/core/gimpdynamics-save.c | 4 ++-- + app/core/gimpdynamics-save.c | 4 ++-- app/dialogs/dialogs-constructors.c | 13 +++++++++++++ app/dialogs/dialogs-constructors.h | 3 +++ - app/dialogs/dialogs.c | 9 +++++++++ - app/menus/menus.c | 12 ++++++++++-- - app/widgets/Makefile.am | 6 ++++-- - app/widgets/gimphelp-ids.h | 8 ++++++++ - app/widgets/widgets-types.h | 1 + - menus/dialogs-menuitems.xml | 1 + - menus/dynamics-menu.xml | 7 +++++++ + app/dialogs/dialogs.c | 9 +++++++++ + app/menus/menus.c | 12 ++++++++++-- + app/widgets/Makefile.am | 6 ++++-- + app/widgets/gimphelp-ids.h | 8 ++++++++ + app/widgets/widgets-types.h | 1 + + menus/dialogs-menuitems.xml | 1 + + menus/dynamics-menu.xml | 7 +++++++ 14 files changed, 72 insertions(+), 7 deletions(-) commit 23955439d6540ca77a0274be331adce712f5b267 Author: Michael Natterer -Date: Fri Oct 9 09:54:27 2009 +0200 +Date: Fri Oct 9 09:54:27 2009 +0200 Don't access GtkAdjustment's members directly @@ -79213,14 +80048,14 @@ "changed" is emitted if anything has changed since freezing. app/display/gimpdisplayshell-callbacks.c | 8 +++-- - app/display/gimpdisplayshell-scale.c | 24 ++++++++++----- - app/display/gimpdisplayshell-scroll.c | 52 + app/display/gimpdisplayshell-scale.c | 24 ++++++++++----- + app/display/gimpdisplayshell-scroll.c | 52 +++++++++++++++++--------------- 3 files changed, 50 insertions(+), 34 deletions(-) commit 8c221ebfe51aa3dd30a7b61540be03e74b653b75 Author: Sven Neumann -Date: Fri Oct 9 00:33:27 2009 +0200 +Date: Fri Oct 9 00:33:27 2009 +0200 check that the action has a gimp pointer attached before using it @@ -79229,7 +80064,7 @@ commit 7c39a22dc205d244783a3c8636036528d83a9954 Author: Michael Natterer -Date: Thu Oct 8 10:33:28 2009 +0200 +Date: Thu Oct 8 10:33:28 2009 +0200 Simplify GimpDisplayShell's icon update API @@ -79238,14 +80073,14 @@ update a NULL image's icon. app/display/gimpdisplayshell-handlers.c | 4 +- - app/display/gimpdisplayshell-icon.c | 79 + app/display/gimpdisplayshell-icon.c | 79 +++++++++++++++------------------ - app/display/gimpdisplayshell-icon.h | 3 +- + app/display/gimpdisplayshell-icon.h | 3 +- 3 files changed, 40 insertions(+), 46 deletions(-) commit 9b595f3b10b2bba42a31b32697dd7d501de89eca Author: SHIRAKAWA Akira -Date: Thu Oct 8 23:22:21 2009 +0200 +Date: Thu Oct 8 23:22:21 2009 +0200 Fixed error from last commit @@ -79258,7 +80093,7 @@ commit a2f9408196b30356662ecd0ebc0ab99fffce406d Author: SHIRAKAWA Akira -Date: Thu Oct 8 22:53:18 2009 +0200 +Date: Thu Oct 8 22:53:18 2009 +0200 Complete removal of pressure and velocity scale defines @@ -79266,15 +80101,15 @@ their meaning, their defines have been completely eliminated from the GIMP source. - app/paint/gimpairbrush.c | 4 ++-- - app/paint/gimppaintoptions.c | 20 ++++++++++---------- - app/paint/gimppaintoptions.h | 3 --- + app/paint/gimpairbrush.c | 4 ++-- + app/paint/gimppaintoptions.c | 20 ++++++++++---------- + app/paint/gimppaintoptions.h | 3 --- devel-docs/app/app-sections.txt | 2 -- 4 files changed, 12 insertions(+), 17 deletions(-) commit 99c2bb21219c6740bbe6c8e27112974aa7ab9cec Author: SHIRAKAWA Akira -Date: Thu Oct 8 00:00:43 2009 +0200 +Date: Thu Oct 8 00:00:43 2009 +0200 Bug 597413 - Opacity, hardness and color brush dynamics only use 2/3 of the total pen pressure range @@ -79286,7 +80121,7 @@ commit e2cc191c92eedc29d6f435ad4e62a5964850f0c8 Author: Michael Natterer -Date: Thu Oct 8 20:05:12 2009 +0200 +Date: Thu Oct 8 20:05:12 2009 +0200 Use GtkAdjustment's accessors @@ -79295,7 +80130,7 @@ commit 57541f809362168d2d4fadbe14b8762b2ef1b8a5 Author: Michael Natterer -Date: Thu Oct 8 09:10:33 2009 +0200 +Date: Thu Oct 8 09:10:33 2009 +0200 Rename gimp_display_shell_selection_layer_set_hidden() to set_layer_hidden() @@ -79307,12 +80142,12 @@ commit 860c952416f38be32da9d9fa1902b0b90d3db298 Author: Alexia Death -Date: Wed Oct 7 23:32:17 2009 +0300 +Date: Wed Oct 7 23:32:17 2009 +0300 Inverted maping matrix and fixes to jitter - app/core/gimpdynamics.h | 5 - - app/paint/gimpbrushcore.c | 7 +- + app/core/gimpdynamics.h | 5 - + app/paint/gimpbrushcore.c | 7 +- app/widgets/gimpdynamicseditor.c | 525 +++++++++++---------------------------- app/widgets/gimpdynamicseditor.h | 6 +- @@ -79320,7 +80155,7 @@ commit cb4c374edd01f8f5a5613b21ecedb5a81253243a Author: Tor Lillqvist -Date: Wed Oct 7 22:31:55 2009 +0300 +Date: Wed Oct 7 22:31:55 2009 +0300 Add missing NULL to g_strconcat() call @@ -79329,7 +80164,7 @@ commit dd0575edb47602021b7dd0e723b6a58a2f645205 Author: Michael Natterer -Date: Wed Oct 7 21:13:39 2009 +0200 +Date: Wed Oct 7 21:13:39 2009 +0200 Move refing/unrefing the image to gimp_display_set_image() @@ -79339,12 +80174,12 @@ app/display/gimpdisplay-handlers.c | 56 ++++++++++++-------------------------- app/display/gimpdisplay-handlers.h | 3 +- - app/display/gimpdisplay.c | 28 +++++++++++++++++-- + app/display/gimpdisplay.c | 28 +++++++++++++++++-- 3 files changed, 44 insertions(+), 43 deletions(-) commit 067cfe9ff011a9d5ae0fe1f10a6d631d0b6e8406 Author: Michael Natterer -Date: Wed Oct 7 20:11:48 2009 +0200 +Date: Wed Oct 7 20:11:48 2009 +0200 Move a call to gimp_display_shell_connect() around @@ -79352,13 +80187,13 @@ because it makes unsetting and setting an image in gimp_display_set_image() more symmetric. - app/display/gimpdisplay.c | 3 +++ + app/display/gimpdisplay.c | 3 +++ app/display/gimpdisplayshell.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) commit 1ae5d6ad8d050e6a3022c7104326f009817c2a4e Author: Michael Natterer -Date: Wed Oct 7 19:59:54 2009 +0200 +Date: Wed Oct 7 19:59:54 2009 +0200 Use the local shell variable and don't call get_shell() again @@ -79367,7 +80202,7 @@ commit e57b0eee633e7c8ae6cb677391e05d14dbb1ad58 Author: Michael Natterer -Date: Wed Oct 7 19:46:01 2009 +0200 +Date: Wed Oct 7 19:46:01 2009 +0200 Don't call gimp_display_get_image() on a NULL display @@ -79376,7 +80211,7 @@ commit 6ad76d226e0a94f5132cf9212b5e7551c858ce09 Author: Michael Natterer -Date: Wed Oct 7 19:42:08 2009 +0200 +Date: Wed Oct 7 19:42:08 2009 +0200 Use gimp_display_set_image() in gimp_display_new() @@ -79389,37 +80224,37 @@ commit 08f35de4acc147861b105a5c29ea13c4b5cbfa5e Author: Michael Natterer -Date: Wed Oct 7 19:00:42 2009 +0200 +Date: Wed Oct 7 19:00:42 2009 +0200 Use gimp_display_get_image() instead of display->image - app/tools/gimpaligntool.c | 23 ++++++------ - app/tools/gimpblendtool.c | 10 +++--- + app/tools/gimpaligntool.c | 23 ++++++------ + app/tools/gimpblendtool.c | 10 +++--- app/tools/gimpbucketfilltool.c | 15 ++++---- - app/tools/gimpcolortool.c | 28 ++++++++------- + app/tools/gimpcolortool.c | 28 ++++++++------- app/tools/gimpforegroundselecttool.c | 7 ++-- app/tools/gimpfreeselecttool.c | 12 ++++--- - app/tools/gimpiscissorstool.c | 62 + app/tools/gimpiscissorstool.c | 62 +++++++++++++++----------------- - app/tools/gimpmeasuretool.c | 23 ++++++------ - app/tools/gimpmovetool.c | 69 + app/tools/gimpmeasuretool.c | 23 ++++++------ + app/tools/gimpmovetool.c | 69 ++++++++++++++++++------------------ - app/tools/gimppainttool.c | 49 ++++++++++++------------- - app/tools/gimprectangletool.c | 58 ++++++++++++++++++------------ + app/tools/gimppainttool.c | 49 ++++++++++++------------- + app/tools/gimprectangletool.c | 58 ++++++++++++++++++------------ app/tools/gimpregionselecttool.c | 24 ++++++------- - app/tools/gimptransformtool.c | 48 +++++++++++++------------ + app/tools/gimptransformtool.c | 48 +++++++++++++------------ 13 files changed, 221 insertions(+), 207 deletions(-) commit 88e7d5396d6ab4051922c3bd0ea0eae9226e9279 -Merge: f89197f c17dfd2 +Merge: f89197f165 c17dfd22a8 Author: Alexia Death -Date: Wed Oct 7 19:42:04 2009 +0300 +Date: Wed Oct 7 19:42:04 2009 +0300 Merge commit 'origin/master' into soc-2009-dynamics commit f89197f165e0f2c7abf3dedad99bedc8bf42bf8e Author: Alexia Death -Date: Wed Oct 7 19:32:37 2009 +0300 +Date: Wed Oct 7 19:32:37 2009 +0300 A small dynamics UI change @@ -79428,7 +80263,7 @@ commit c17dfd22a828a7227e9e357af1015f379bef374e Author: Michael Natterer -Date: Tue Oct 6 19:25:33 2009 +0200 +Date: Tue Oct 6 19:25:33 2009 +0200 Rename layer_select->shell to layer_select->window @@ -79441,89 +80276,89 @@ commit c5b856f16f492606b30df901359e15d52a74bc8a Author: Michael Natterer -Date: Tue Oct 6 19:20:44 2009 +0200 +Date: Tue Oct 6 19:20:44 2009 +0200 Use gimp_display_get_image() instead of display->image - app/actions/actions.c | 7 ++- - app/actions/buffers-commands.c | 2 +- - app/actions/documents-commands.c | 2 +- - app/actions/edit-commands.c | 17 +++--- - app/actions/file-actions.c | 2 +- - app/actions/file-commands.c | 26 +++++---- - app/actions/image-commands.c | 56 ++++++++++++------ - app/actions/images-commands.c | 2 +- - app/actions/plug-in-commands.c | 2 +- - app/actions/select-commands.c | 36 ++++++++---- - app/actions/text-tool-actions.c | 5 +- - app/actions/tools-commands.c | 2 +- - app/actions/view-actions.c | 4 +- - app/actions/view-commands.c | 5 +- - app/actions/windows-actions.c | 12 ++-- - app/dialogs/file-save-dialog.c | 2 +- - app/dialogs/quit-dialog.c | 2 +- - app/display/gimpdisplay-foreach.c | 5 +- + app/actions/actions.c | 7 ++- + app/actions/buffers-commands.c | 2 +- + app/actions/documents-commands.c | 2 +- + app/actions/edit-commands.c | 17 +++--- + app/actions/file-actions.c | 2 +- + app/actions/file-commands.c | 26 +++++---- + app/actions/image-commands.c | 56 ++++++++++++------ + app/actions/images-commands.c | 2 +- + app/actions/plug-in-commands.c | 2 +- + app/actions/select-commands.c | 36 ++++++++---- + app/actions/text-tool-actions.c | 5 +- + app/actions/tools-commands.c | 2 +- + app/actions/view-actions.c | 4 +- + app/actions/view-commands.c | 5 +- + app/actions/windows-actions.c | 12 ++-- + app/dialogs/file-save-dialog.c | 2 +- + app/dialogs/quit-dialog.c | 2 +- + app/display/gimpdisplay-foreach.c | 5 +- app/display/gimpdisplayshell-appearance.c | 20 ++++--- app/display/gimpdisplayshell-callbacks.c | 42 +++++++------- - app/display/gimpdisplayshell-close.c | 2 +- - app/display/gimpdisplayshell-cursor.c | 4 +- - app/display/gimpdisplayshell-dnd.c | 20 +++---- - app/display/gimpdisplayshell-draw.c | 65 +++++++++++++-------- + app/display/gimpdisplayshell-close.c | 2 +- + app/display/gimpdisplayshell-cursor.c | 4 +- + app/display/gimpdisplayshell-dnd.c | 20 +++---- + app/display/gimpdisplayshell-draw.c | 65 +++++++++++++-------- app/display/gimpdisplayshell-filter-dialog.c | 5 +- app/display/gimpdisplayshell-handlers.c | 16 +++--- - app/display/gimpdisplayshell-icon.c | 4 +- + app/display/gimpdisplayshell-icon.c | 4 +- app/display/gimpdisplayshell-layer-select.c | 2 +- app/display/gimpdisplayshell-preview.c | 2 +- - app/display/gimpdisplayshell-render.c | 2 +- + app/display/gimpdisplayshell-render.c | 2 +- app/display/gimpdisplayshell-scale-dialog.c | 2 +- - app/display/gimpdisplayshell-scale.c | 30 ++++++---- - app/display/gimpdisplayshell-scroll.c | 18 +++--- + app/display/gimpdisplayshell-scale.c | 30 ++++++---- + app/display/gimpdisplayshell-scroll.c | 18 +++--- app/display/gimpdisplayshell-selection.c | 12 ++-- - app/display/gimpdisplayshell-title.c | 6 +- + app/display/gimpdisplayshell-title.c | 6 +- app/display/gimpdisplayshell-transform.c | 50 +++++++++------- - app/display/gimpdisplayshell.c | 71 +++++++++++++---------- - app/display/gimpimagewindow.c | 25 ++++---- - app/display/gimpnavigationeditor.c | 8 ++- - app/display/gimpstatusbar.c | 20 ++++--- - app/gui/gui-vtable.c | 2 +- - app/gui/gui.c | 2 +- - app/menus/windows-menu.c | 4 +- + app/display/gimpdisplayshell.c | 71 +++++++++++++---------- + app/display/gimpimagewindow.c | 25 ++++---- + app/display/gimpnavigationeditor.c | 8 ++- + app/display/gimpstatusbar.c | 20 ++++--- + app/gui/gui-vtable.c | 2 +- + app/gui/gui.c | 2 +- + app/menus/windows-menu.c | 4 +- app/tools/gimpbrightnesscontrasttool.c | 7 +-- - app/tools/gimpbrushtool.c | 5 +- - app/tools/gimpbycolorselecttool.c | 9 ++- - app/tools/gimpcolorbalancetool.c | 7 +-- - app/tools/gimpcolorizetool.c | 3 +- - app/tools/gimpcroptool.c | 4 +- - app/tools/gimpcurvestool.c | 3 +- - app/tools/gimpdesaturatetool.c | 5 +- - app/tools/gimpdrawtool.c | 4 +- - app/tools/gimpeditselectiontool.c | 85 + app/tools/gimpbrushtool.c | 5 +- + app/tools/gimpbycolorselecttool.c | 9 ++- + app/tools/gimpcolorbalancetool.c | 7 +-- + app/tools/gimpcolorizetool.c | 3 +- + app/tools/gimpcroptool.c | 4 +- + app/tools/gimpcurvestool.c | 3 +- + app/tools/gimpdesaturatetool.c | 5 +- + app/tools/gimpdrawtool.c | 4 +- + app/tools/gimpeditselectiontool.c | 85 ++++++++++++++-------------- - app/tools/gimpellipseselecttool.c | 3 +- - app/tools/gimpfliptool.c | 3 +- - app/tools/gimpfuzzyselecttool.c | 7 +-- - app/tools/gimpgegltool.c | 3 +- - app/tools/gimphuesaturationtool.c | 7 +-- - app/tools/gimpimagemaptool.c | 17 +++--- - app/tools/gimplevelstool.c | 3 +- - app/tools/gimpmagnifytool.c | 3 +- - app/tools/gimpperspectiveclonetool.c | 20 +++++-- - app/tools/gimpposterizetool.c | 3 +- - app/tools/gimprectangleselecttool.c | 27 ++++----- - app/tools/gimprotatetool.c | 7 ++- - app/tools/gimpscaletool.c | 3 +- - app/tools/gimpselectiontool.c | 11 ++-- - app/tools/gimpsourcetool.c | 2 +- - app/tools/gimptexttool.c | 9 +-- - app/tools/gimpthresholdtool.c | 3 +- - app/tools/gimptool.c | 10 ++-- - app/tools/gimpvectortool.c | 29 ++++++---- - app/tools/tool_manager.c | 4 +- + app/tools/gimpellipseselecttool.c | 3 +- + app/tools/gimpfliptool.c | 3 +- + app/tools/gimpfuzzyselecttool.c | 7 +-- + app/tools/gimpgegltool.c | 3 +- + app/tools/gimphuesaturationtool.c | 7 +-- + app/tools/gimpimagemaptool.c | 17 +++--- + app/tools/gimplevelstool.c | 3 +- + app/tools/gimpmagnifytool.c | 3 +- + app/tools/gimpperspectiveclonetool.c | 20 +++++-- + app/tools/gimpposterizetool.c | 3 +- + app/tools/gimprectangleselecttool.c | 27 ++++----- + app/tools/gimprotatetool.c | 7 ++- + app/tools/gimpscaletool.c | 3 +- + app/tools/gimpselectiontool.c | 11 ++-- + app/tools/gimpsourcetool.c | 2 +- + app/tools/gimptexttool.c | 9 +-- + app/tools/gimpthresholdtool.c | 3 +- + app/tools/gimptool.c | 10 ++-- + app/tools/gimpvectortool.c | 29 ++++++---- + app/tools/tool_manager.c | 4 +- 73 files changed, 536 insertions(+), 393 deletions(-) commit bf41a773cb2f959381c7d055b44186058d392a71 Author: Michael Natterer -Date: Tue Oct 6 10:56:46 2009 +0200 +Date: Tue Oct 6 10:56:46 2009 +0200 Update the window title and icon when switching between shells @@ -79532,7 +80367,7 @@ commit d0a614093e2dba5b559fae31af1e6d5a651321a3 Author: Michael Natterer -Date: Tue Oct 6 10:56:10 2009 +0200 +Date: Tue Oct 6 10:56:10 2009 +0200 Default to GIMP_NAME for the "title" property @@ -79541,21 +80376,21 @@ commit 23cd244c659764ef4a2d9963ae91f701e60abfde Author: Michael Natterer -Date: Tue Oct 6 09:16:46 2009 +0200 +Date: Tue Oct 6 09:16:46 2009 +0200 Make display->instance private, add an accessor and use it everywhere - app/actions/windows-actions.c | 2 +- + app/actions/windows-actions.c | 2 +- app/display/gimpdisplay-handlers.c | 10 ++---- - app/display/gimpdisplay.c | 35 +++++++++++++++---- - app/display/gimpdisplay.h | 66 + app/display/gimpdisplay.c | 35 +++++++++++++++---- + app/display/gimpdisplay.h | 66 ++++++++++++++++++------------------ app/display/gimpdisplayshell-title.c | 3 +- 5 files changed, 67 insertions(+), 49 deletions(-) commit 5d70d609279a5c5dfa9188edd17357cfc250a20d Author: Michael Natterer -Date: Mon Oct 5 20:10:00 2009 +0200 +Date: Mon Oct 5 20:10:00 2009 +0200 Move the display ID to the private struct @@ -79565,7 +80400,7 @@ commit c339125d7d3571d402eea29498e5454e8f09011a Author: Michael Natterer -Date: Mon Oct 5 20:06:13 2009 +0200 +Date: Mon Oct 5 20:06:13 2009 +0200 Add private struct and move "shell" and "update_areas" there @@ -79576,34 +80411,34 @@ commit d1ded0617fc6eb98ed0ffb91db3978661ba19334 Author: Michael Natterer -Date: Mon Oct 5 19:58:03 2009 +0200 +Date: Mon Oct 5 19:58:03 2009 +0200 More gimp_display_get_shell() instead of display->shell - app/actions/actions.c | 2 +- - app/actions/file-commands.c | 5 +-- - app/actions/image-commands.c | 8 ++--- - app/actions/select-commands.c | 8 ++--- - app/actions/text-tool-actions.c | 23 +++++++------- - app/actions/text-tool-commands.c | 8 ++++- - app/actions/view-commands.c | 8 +++-- - app/display/gimpdisplay-foreach.c | 7 +++-- + app/actions/actions.c | 2 +- + app/actions/file-commands.c | 5 +-- + app/actions/image-commands.c | 8 ++--- + app/actions/select-commands.c | 8 ++--- + app/actions/text-tool-actions.c | 23 +++++++------- + app/actions/text-tool-commands.c | 8 ++++- + app/actions/view-commands.c | 8 +++-- + app/display/gimpdisplay-foreach.c | 7 +++-- app/display/gimpdisplayshell-callbacks.c | 12 +++----- - app/display/gimpdisplayshell.c | 2 +- - app/display/gimpimagewindow.c | 2 +- - app/gui/gui-vtable.c | 13 +++++--- - app/gui/gui.c | 6 +++- - app/tools/gimpcolortool.c | 7 +++-- - app/tools/gimpimagemaptool.c | 2 +- - app/tools/gimprectangletool.c | 6 ++-- - app/tools/gimptexttool.c | 52 + app/display/gimpdisplayshell.c | 2 +- + app/display/gimpimagewindow.c | 2 +- + app/gui/gui-vtable.c | 13 +++++--- + app/gui/gui.c | 6 +++- + app/tools/gimpcolortool.c | 7 +++-- + app/tools/gimpimagemaptool.c | 2 +- + app/tools/gimprectangletool.c | 6 ++-- + app/tools/gimptexttool.c | 52 +++++++++++++++++++++----------- - app/tools/gimptool.c | 9 ++++-- + app/tools/gimptool.c | 9 ++++-- 18 files changed, 108 insertions(+), 72 deletions(-) commit 297d205269c64b6365a6e298e292fb86f2a8e926 Author: Michael Natterer -Date: Mon Oct 5 19:27:04 2009 +0200 +Date: Mon Oct 5 19:27:04 2009 +0200 Use gimp_display_get_shell() also in gimpdisplay.c @@ -79612,7 +80447,7 @@ commit 356d11cbfcab070bdb48b8302eb1b9b4686280fd Author: Denis ARNAUD -Date: Mon Oct 5 06:20:27 2009 +0200 +Date: Mon Oct 5 06:20:27 2009 +0200 Updated breton translation @@ -79621,7 +80456,7 @@ commit 161f1346db29cda9545ad2934d838ff1fe0657a4 Author: Michael Natterer -Date: Sun Oct 4 21:58:12 2009 +0200 +Date: Sun Oct 4 21:58:12 2009 +0200 Create the new display ID in set_property() not in gimp_display_new() @@ -79634,7 +80469,7 @@ commit 7e120a99f4f167d9b28346ac23a2853aa2fba500 Author: Sven Neumann -Date: Sun Oct 4 20:29:44 2009 +0200 +Date: Sun Oct 4 20:29:44 2009 +0200 update the gtk+ dependency in INSTALL @@ -79643,87 +80478,87 @@ commit 7d878f6f4b148475a55d003b34a53bd604d235f5 Author: Michael Natterer -Date: Sun Oct 4 20:22:06 2009 +0200 +Date: Sun Oct 4 20:22:06 2009 +0200 Use the GimpDisplayConfig from GimpDisplay where possible ...instead of going via display->gimp and casting. app/display/gimpnavigationeditor.c | 2 +- - app/tools/gimpaligntool.c | 12 ++++-------- - app/tools/gimpmovetool.c | 13 +++---------- + app/tools/gimpaligntool.c | 12 ++++-------- + app/tools/gimpmovetool.c | 13 +++---------- 3 files changed, 8 insertions(+), 19 deletions(-) commit 8ba18309eb3656a2d1976613b270f90e568f8edb Author: Michael Natterer -Date: Sun Oct 4 20:05:28 2009 +0200 +Date: Sun Oct 4 20:05:28 2009 +0200 Use display->gimp intead of display->image->gimp - app/actions/edit-commands.c | 6 +++--- - app/actions/image-commands.c | 2 +- - app/actions/view-commands.c | 4 ++-- - app/tools/gimpaligntool.c | 6 ++---- + app/actions/edit-commands.c | 6 +++--- + app/actions/image-commands.c | 2 +- + app/actions/view-commands.c | 4 ++-- + app/tools/gimpaligntool.c | 6 ++---- app/tools/gimpbucketfilltool.c | 2 +- - app/tools/gimpcolortool.c | 3 +-- + app/tools/gimpcolortool.c | 3 +-- app/tools/gimpeditselectiontool.c | 14 +++++++------- - app/tools/gimpmovetool.c | 10 ++++------ - app/tools/gimppainttool.c | 2 +- - app/tools/gimptool.c | 4 ++-- - app/tools/gimptransformtool.c | 4 ++-- + app/tools/gimpmovetool.c | 10 ++++------ + app/tools/gimppainttool.c | 2 +- + app/tools/gimptool.c | 4 ++-- + app/tools/gimptransformtool.c | 4 ++-- 11 files changed, 26 insertions(+), 31 deletions(-) commit ac98c2c2340c36f97a4aa6c6c9387e0b38e77703 Author: Michael Natterer -Date: Sun Oct 4 19:56:39 2009 +0200 +Date: Sun Oct 4 19:56:39 2009 +0200 Use gimp_display_get_shell() instead of directly accessing it - app/actions/actions.c | 2 +- + app/actions/actions.c | 2 +- app/actions/buffers-commands.c | 2 +- - app/actions/debug-commands.c | 2 +- + app/actions/debug-commands.c | 2 +- app/actions/documents-commands.c | 2 +- - app/actions/edit-commands.c | 2 +- - app/actions/image-commands.c | 10 +++---- - app/actions/images-commands.c | 2 +- - app/actions/layers-commands.c | 4 +-- - app/actions/select-commands.c | 8 ++--- - app/actions/view-actions.c | 2 +- - app/actions/view-commands.c | 58 + app/actions/edit-commands.c | 2 +- + app/actions/image-commands.c | 10 +++---- + app/actions/images-commands.c | 2 +- + app/actions/layers-commands.c | 4 +-- + app/actions/select-commands.c | 8 ++--- + app/actions/view-actions.c | 2 +- + app/actions/view-commands.c | 58 ++++++++++++++++++------------------ app/actions/windows-commands.c | 2 +- - app/dialogs/quit-dialog.c | 2 +- - app/display/gimpcursorview.c | 2 +- + app/dialogs/quit-dialog.c | 2 +- + app/display/gimpcursorview.c | 2 +- app/display/gimpdisplay-foreach.c | 4 +-- app/display/gimpnavigationeditor.c | 2 +- - app/gui/gimpdbusservice.c | 2 +- - app/gui/gui-unique.c | 2 +- - app/gui/gui.c | 4 +-- - app/tools/gimpaligntool.c | 4 +-- - app/tools/gimpbrushtool.c | 2 +- - app/tools/gimpcolortool.c | 14 ++++----- - app/tools/gimpdrawtool.c | 36 ++++++++++------------ + app/gui/gimpdbusservice.c | 2 +- + app/gui/gui-unique.c | 2 +- + app/gui/gui.c | 4 +-- + app/tools/gimpaligntool.c | 4 +-- + app/tools/gimpbrushtool.c | 2 +- + app/tools/gimpcolortool.c | 14 ++++----- + app/tools/gimpdrawtool.c | 36 ++++++++++------------ app/tools/gimpeditselectiontool.c | 6 ++-- app/tools/gimpforegroundselecttool.c | 10 +++---- - app/tools/gimpimagemaptool.c | 2 +- - app/tools/gimpmagnifytool.c | 2 +- - app/tools/gimpmeasuretool.c | 6 ++-- - app/tools/gimpmovetool.c | 16 +++++----- - app/tools/gimppainttool.c | 2 +- + app/tools/gimpimagemaptool.c | 2 +- + app/tools/gimpmagnifytool.c | 2 +- + app/tools/gimpmeasuretool.c | 6 ++-- + app/tools/gimpmovetool.c | 16 +++++----- + app/tools/gimppainttool.c | 2 +- app/tools/gimprectangleselecttool.c | 4 +-- - app/tools/gimprectangletool.c | 12 ++++---- + app/tools/gimprectangletool.c | 12 ++++---- app/tools/gimpregionselecttool.c | 4 +-- - app/tools/gimprotatetool.c | 2 +- - app/tools/gimpscaletool.c | 2 +- - app/tools/gimptexttool.c | 2 +- - app/tools/gimptool.c | 14 ++++----- - app/tools/gimptransformtool.c | 18 +++++------ - app/tools/gimpvectortool.c | 2 +- + app/tools/gimprotatetool.c | 2 +- + app/tools/gimpscaletool.c | 2 +- + app/tools/gimptexttool.c | 2 +- + app/tools/gimptool.c | 14 ++++----- + app/tools/gimptransformtool.c | 18 +++++------ + app/tools/gimpvectortool.c | 2 +- 39 files changed, 135 insertions(+), 139 deletions(-) commit 18cbe3422ea20e535ba56ba302ef49978c5e6ab5 Author: Michael Natterer -Date: Sun Oct 4 19:39:22 2009 +0200 +Date: Sun Oct 4 19:39:22 2009 +0200 Add getters for "gimp", "image" and "shell" @@ -79734,7 +80569,7 @@ commit 4a0b8264933d1bf0038a13d8685bffbaf6c10f05 Author: Michael Natterer -Date: Sun Oct 4 19:30:32 2009 +0200 +Date: Sun Oct 4 19:30:32 2009 +0200 (gimp_display_new): add a local "shell" variable for more readable code @@ -79744,23 +80579,23 @@ commit 31a41c2b3db31eb56258154ea649446b778716e5 Author: Michael Natterer -Date: Sun Oct 4 19:27:58 2009 +0200 +Date: Sun Oct 4 19:27:58 2009 +0200 Use gimp_display_shell_present() instead of gtk_window_present() app/actions/documents-commands.c | 3 ++- - app/actions/images-commands.c | 8 ++------ + app/actions/images-commands.c | 8 ++------ app/actions/windows-commands.c | 4 +--- - app/dialogs/quit-dialog.c | 3 ++- - app/display/gimpdisplay.c | 5 +---- + app/dialogs/quit-dialog.c | 3 ++- + app/display/gimpdisplay.c | 5 +---- app/display/gimpdisplayshell-dnd.c | 5 +---- - app/gui/gimpdbusservice.c | 10 ++-------- - app/gui/gui-unique.c | 2 +- + app/gui/gimpdbusservice.c | 10 ++-------- + app/gui/gui-unique.c | 2 +- 8 files changed, 12 insertions(+), 28 deletions(-) commit 94dcbe0e2e60f866544c16f91ee63786834cf6e8 Author: Michael Natterer -Date: Sun Oct 4 19:24:55 2009 +0200 +Date: Sun Oct 4 19:24:55 2009 +0200 Add new function gimp_display_shell_present() @@ -79773,7 +80608,7 @@ commit aa85917b1aa598fb8642af44de32828d494988bb Author: Michael Natterer -Date: Sun Oct 4 18:54:20 2009 +0200 +Date: Sun Oct 4 18:54:20 2009 +0200 Raise the toplevel not the shell @@ -79782,7 +80617,7 @@ commit 94e8c90a5fab4d0ac1a60a4c5ba5eed96e9c01a3 Author: Martin Nordholts -Date: Sun Oct 4 17:26:48 2009 +0200 +Date: Sun Oct 4 17:26:48 2009 +0200 app: Change toolbox aspect ratio to 2.0 / 15.0 @@ -79794,7 +80629,7 @@ commit 27994481c99226a35f5dd40b8e2cc9d07a6bfdeb Author: Michael Natterer -Date: Sun Oct 4 15:50:28 2009 +0200 +Date: Sun Oct 4 15:50:28 2009 +0200 (gimp_dbus_service_activate): present the toplevel not the shell @@ -79803,7 +80638,7 @@ commit 35b228144a026dd08873bb3baa34e910370db7b6 Author: Martin Nordholts -Date: Sun Oct 4 15:43:03 2009 +0200 +Date: Sun Oct 4 15:43:03 2009 +0200 app: Make GimpToolbox members private @@ -79815,7 +80650,7 @@ commit dee0afed7934818299bc644201539917cf60d05e Author: Michael Natterer -Date: Sun Oct 4 15:31:38 2009 +0200 +Date: Sun Oct 4 15:31:38 2009 +0200 Move the statusbar back to GimpDisplayShell @@ -79824,28 +80659,28 @@ - it produced evil code because - it conceptually didn't belong there - app/actions/actions.c | 38 ++++------ - app/display/gimpdisplay.c | 3 +- + app/actions/actions.c | 38 ++++------ + app/display/gimpdisplay.c | 3 +- app/display/gimpdisplayshell-appearance.c | 17 +++-- - app/display/gimpdisplayshell-cursor.c | 23 ++---- + app/display/gimpdisplayshell-cursor.c | 23 ++---- app/display/gimpdisplayshell-handlers.c | 34 +++------ app/display/gimpdisplayshell-progress.c | 118 +++++++++++------------------- - app/display/gimpdisplayshell.c | 32 +++++++- - app/display/gimpdisplayshell.h | 4 + - app/display/gimpimagewindow.c | 110 + app/display/gimpdisplayshell.c | 32 +++++++- + app/display/gimpdisplayshell.h | 4 + + app/display/gimpimagewindow.c | 110 +++++----------------------- - app/display/gimpimagewindow.h | 1 - - app/display/gimpstatusbar.c | 20 +++++ - app/gui/gui.c | 25 ++----- - app/tools/gimpmeasuretool.c | 6 +- - app/tools/gimptool.c | 104 + app/display/gimpimagewindow.h | 1 - + app/display/gimpstatusbar.c | 20 +++++ + app/gui/gui.c | 25 ++----- + app/tools/gimpmeasuretool.c | 6 +- + app/tools/gimptool.c | 104 +++++++++----------------- 14 files changed, 202 insertions(+), 333 deletions(-) commit 2d3aae3982c50f8437feb30abab80182331c3ec5 Author: Martin Nordholts -Date: Sun Oct 4 14:59:31 2009 +0200 +Date: Sun Oct 4 14:59:31 2009 +0200 app: Expand docks in GimpDockColumns @@ -79854,7 +80689,7 @@ commit d8392b8c529add0385c2b23c1e985e6a48dcaf01 Author: Martin Nordholts -Date: Sun Oct 4 13:51:47 2009 +0200 +Date: Sun Oct 4 13:51:47 2009 +0200 app: Don't resize the left dock area when the image window is resized @@ -79863,7 +80698,7 @@ commit 3b721864d714149582f63d08ce6b98701433608c Author: Martin Nordholts -Date: Sun Oct 4 12:58:30 2009 +0200 +Date: Sun Oct 4 12:58:30 2009 +0200 app: Only show dock separators when rearranging the UI @@ -79879,7 +80714,7 @@ commit 8fd011e75e7adbe1e7beafa3d2b7c2158e0c3b58 Author: Martin Nordholts -Date: Sun Oct 4 11:27:46 2009 +0200 +Date: Sun Oct 4 11:27:46 2009 +0200 app: Make right dock column not resize when adjusting left pane @@ -79888,7 +80723,7 @@ commit d3435b14e6dee47c649c813b521c1941766978ff Author: Martin Nordholts -Date: Sun Oct 4 11:13:05 2009 +0200 +Date: Sun Oct 4 11:13:05 2009 +0200 app: Put docks in the image window in single-window mode in panes @@ -79896,15 +80731,15 @@ 1 file changed, 20 insertions(+), 6 deletions(-) commit 7a2acf88116aef4459d1e63089d75b9061f756d1 -Merge: 212ea4c fcf5895 +Merge: 212ea4cc66 fcf5895575 Author: Alexia Death -Date: Sun Oct 4 11:41:30 2009 +0300 +Date: Sun Oct 4 11:41:30 2009 +0300 Merge commit 'origin/master' into soc-2009-dynamics commit 212ea4cc66a52c86d11a8e93c2d5f939e67386a9 Author: Alexia Death -Date: Sun Oct 4 11:40:26 2009 +0300 +Date: Sun Oct 4 11:40:26 2009 +0300 Start of dynamic jitter @@ -79917,7 +80752,7 @@ commit fcf5895575f5b23a9c82aeabc4ffccb994dc1fa9 Author: Martin Nordholts -Date: Sun Oct 4 02:09:53 2009 +0200 +Date: Sun Oct 4 02:09:53 2009 +0200 app: Move docks to image window in 'Single-window mode' @@ -79930,17 +80765,17 @@ component. It subscribes to changes in the single-window-mode config property and adjusts the UI accordingly. - app/gui/Makefile.am | 2 + + app/gui/Makefile.am | 2 + app/gui/gimpuiconfigurer.c | 249 ++++++++++++++++++++++++++++++++++++++++++++ - app/gui/gimpuiconfigurer.h | 57 ++++++++++ - app/gui/gui.c | 24 ++++- - app/widgets/widgets-types.h | 1 + + app/gui/gimpuiconfigurer.h | 57 ++++++++++ + app/gui/gui.c | 24 ++++- + app/widgets/widgets-types.h | 1 + 5 files changed, 331 insertions(+), 2 deletions(-) commit 10f6ba77745b3d1816776fdb2729dee6e387d3ad Author: Martin Nordholts -Date: Sun Oct 4 02:05:22 2009 +0200 +Date: Sun Oct 4 02:05:22 2009 +0200 app: Add simple utility function gimp_dock_columns_add_dock() @@ -79953,7 +80788,7 @@ commit 4acbda8b358aabeede6e546532918648749268c9 Author: Martin Nordholts -Date: Sun Oct 4 02:03:44 2009 +0200 +Date: Sun Oct 4 02:03:44 2009 +0200 app: Add more verbose "dialog-factory" debug output @@ -79962,7 +80797,7 @@ commit d1958a51030171985a6acdf8b064beb07c8a83e9 Author: Martin Nordholts -Date: Sun Oct 4 02:02:39 2009 +0200 +Date: Sun Oct 4 02:02:39 2009 +0200 app: Add GimpDockColumns to the left and right of a GimpImageWindow @@ -79973,18 +80808,18 @@ commit 301e5c2c3427c3c49e5494dc226c10e80d49441c Author: Martin Nordholts -Date: Sun Oct 4 02:01:53 2009 +0200 +Date: Sun Oct 4 02:01:53 2009 +0200 app: Maintain a list of GimpImageWindow:s on an app instance level - app/core/gimp.c | 10 ++++++++++ - app/core/gimp.h | 3 +++ + app/core/gimp.c | 10 ++++++++++ + app/core/gimp.h | 3 +++ app/display/gimpdisplay.c | 25 +++++++++++++++---------- 3 files changed, 28 insertions(+), 10 deletions(-) commit 2d1d2aae17678b4af6cceafad1ca825190ab3885 Author: Martin Nordholts -Date: Sat Oct 3 16:23:12 2009 +0200 +Date: Sat Oct 3 16:23:12 2009 +0200 app: Handle dock windows without docks in action_data_get_foo() @@ -79993,22 +80828,22 @@ commit 3a041ad2523198dce1f5792a8ec3bcfe6563175c Author: Alexia Death -Date: Sat Oct 3 18:53:25 2009 +0300 +Date: Sat Oct 3 18:53:25 2009 +0300 Lots of improvements on dynamics - app/core/gimpdynamics.c | 41 +-- - app/core/gimpdynamics.h | 10 +- - app/paint/gimpairbrush.c | 7 +- - app/paint/gimpbrushcore.c | 18 +- - app/paint/gimpclone.c | 9 +- - app/paint/gimpconvolve.c | 6 +- - app/paint/gimpdodgeburn.c | 9 +- - app/paint/gimperaser.c | 9 +- - app/paint/gimpheal.c | 9 +- - app/paint/gimppaintbrush.c | 11 +- - app/paint/gimppaintoptions.c | 27 +- - app/paint/gimpsmudge.c | 13 +- + app/core/gimpdynamics.c | 41 +-- + app/core/gimpdynamics.h | 10 +- + app/paint/gimpairbrush.c | 7 +- + app/paint/gimpbrushcore.c | 18 +- + app/paint/gimpclone.c | 9 +- + app/paint/gimpconvolve.c | 6 +- + app/paint/gimpdodgeburn.c | 9 +- + app/paint/gimperaser.c | 9 +- + app/paint/gimpheal.c | 9 +- + app/paint/gimppaintbrush.c | 11 +- + app/paint/gimppaintoptions.c | 27 +- + app/paint/gimpsmudge.c | 13 +- app/tools/gimppaintoptions-gui.c | 560 +-------------------------------------- app/widgets/gimpdynamicseditor.c | 4 - @@ -80016,7 +80851,7 @@ commit 65818936161e4e17ae915b72c1a74c399816c79b Author: Alexia Death -Date: Sat Oct 3 16:54:10 2009 +0300 +Date: Sat Oct 3 16:54:10 2009 +0300 Fix color dynamic @@ -80028,17 +80863,17 @@ commit 26e7b5f0e2fb45d8b85631473bf853e9fb550ace Author: Alexia Death -Date: Sat Oct 3 16:08:15 2009 +0300 +Date: Sat Oct 3 16:08:15 2009 +0300 Fix ennum ordering - app/core/core-enums.h | 36 ++++++++++++++++++------------------ + app/core/core-enums.h | 36 ++++++++++++++++++------------------ app/core/gimpcontext.c | 6 +++--- 2 files changed, 21 insertions(+), 21 deletions(-) commit 0a2d99ab162bc7661a7c28dacff78fe07710e529 Author: Alexia Death -Date: Sat Oct 3 15:11:45 2009 +0300 +Date: Sat Oct 3 15:11:45 2009 +0300 Adding all other drivers to calculation and ading several other calculation methods for differently distributed values like angle @@ -80051,7 +80886,7 @@ commit 0675a2e263047d8fccf600f728e876b2a31f6562 Author: Michael Natterer -Date: Sat Oct 3 14:00:34 2009 +0200 +Date: Sat Oct 3 14:00:34 2009 +0200 Get rid of whitespace diff in NEWS @@ -80060,7 +80895,7 @@ commit c3fc30c81a2bf95ff8497ae539b05bd306524aba Author: Michael Natterer -Date: Sat Oct 3 13:55:29 2009 +0200 +Date: Sat Oct 3 13:55:29 2009 +0200 Alphabet @@ -80069,11 +80904,11 @@ commit f5f571bce580fc0a0ecff0c58b15ecd7214d916b Author: Michael Natterer -Date: Sat Oct 3 13:53:40 2009 +0200 +Date: Sat Oct 3 13:53:40 2009 +0200 Formatting cleanup - app/actions/actions.c | 8 ++++---- + app/actions/actions.c | 8 ++++---- app/actions/dialogs-actions.c | 2 -- app/core/gimpcontext.c | 39 +++++++++++++++++---------------------- @@ -80081,7 +80916,7 @@ commit ac20b2db671843de7e24fa3590dcdadb1c57a0c1 Author: Michael Natterer -Date: Sat Oct 3 13:44:41 2009 +0200 +Date: Sat Oct 3 13:44:41 2009 +0200 Alphabetic ordering, remove stuff from EXTRA_DIST @@ -80089,15 +80924,15 @@ 1 file changed, 3 insertions(+), 5 deletions(-) commit 155393491b6f0d1c0fcaf98691c8d0d84966c1db -Merge: da2920b 750c11f +Merge: da2920b0eb 750c11f001 Author: Alexia Death -Date: Sat Oct 3 14:12:53 2009 +0300 +Date: Sat Oct 3 14:12:53 2009 +0300 Merge commit 'origin/master' into soc-2009-dynamics commit da2920b0ebbcdcc6ea429eb4a7057a2c49c2c3a7 Author: Alexia Death -Date: Sat Oct 3 14:08:05 2009 +0300 +Date: Sat Oct 3 14:08:05 2009 +0300 Adding random as part of the calculations, renaming calc method to linear for type @@ -80111,7 +80946,7 @@ commit 5eedaeb97afd92dca08301999cb0905376ab2e5b Author: Alexia Death -Date: Sat Oct 3 13:03:51 2009 +0300 +Date: Sat Oct 3 13:03:51 2009 +0300 A bit better but probablt wrong state @@ -80120,22 +80955,22 @@ commit cd36753f17f96e88e95a18f114e5ae70370a0fee Author: Alexia Death -Date: Sat Oct 3 12:59:45 2009 +0300 +Date: Sat Oct 3 12:59:45 2009 +0300 Fixed loading for dynamics and made them actually accessible - app/core/gimp.c | 21 +++--- - app/core/gimpcontext.c | 30 ++++++--- - app/core/gimpdynamics.c | 25 +------ - app/paint/gimpbrushcore.c | 7 +- - app/paint/gimppaintoptions.c | 8 --- + app/core/gimp.c | 21 +++--- + app/core/gimpcontext.c | 30 ++++++--- + app/core/gimpdynamics.c | 25 +------ + app/paint/gimpbrushcore.c | 7 +- + app/paint/gimppaintoptions.c | 8 --- app/widgets/gimpdynamicseditor.c | 137 ++++++++++----------------------------- 6 files changed, 70 insertions(+), 158 deletions(-) commit 750c11f00182c448e05a59ca11ec4e91ac1a96b6 Author: Michael Natterer -Date: Sat Oct 3 00:15:04 2009 +0200 +Date: Sat Oct 3 00:15:04 2009 +0200 Move the display render buf size #defines to gimpdisplayshell-render.h @@ -80146,7 +80981,7 @@ commit 7a6fe273b78cb7e8a09a183d99968f1fef2ca584 Author: Simon Budig -Date: Sat Oct 3 00:11:53 2009 +0200 +Date: Sat Oct 3 00:11:53 2009 +0200 Formatting fix. Argh. @@ -80155,7 +80990,7 @@ commit 1a7c67bc05ba0f0ba13c3efccb41fa09dbae1116 Author: Michael Natterer -Date: Sat Oct 3 00:11:34 2009 +0200 +Date: Sat Oct 3 00:11:34 2009 +0200 Remove duplicate #define GIMP_DISPLAY_RENDER_BUF_WIDTH 256 @@ -80164,7 +80999,7 @@ commit cbc401341298ccedbfa92f38592afc6ebc538c9e Author: Michael Natterer -Date: Sat Oct 3 00:06:44 2009 +0200 +Date: Sat Oct 3 00:06:44 2009 +0200 Reindent prototypes @@ -80173,30 +81008,30 @@ commit f6fd3aed51284d8eccc1143214731c6a862751f0 Author: Michael Natterer -Date: Fri Oct 2 23:55:26 2009 +0200 +Date: Fri Oct 2 23:55:26 2009 +0200 Move GimpDisplayShell's expose functions to separate files - app/display/Makefile.am | 2 + - app/display/gimpdisplay.c | 1 + + app/display/Makefile.am | 2 + + app/display/gimpdisplay.c | 1 + app/display/gimpdisplayshell-appearance.c | 1 + - app/display/gimpdisplayshell-cursor.c | 1 + - app/display/gimpdisplayshell-expose.c | 116 + app/display/gimpdisplayshell-cursor.c | 1 + + app/display/gimpdisplayshell-expose.c | 116 ++++++++++++++++++++++++++++++ - app/display/gimpdisplayshell-expose.h | 34 +++++++++ - app/display/gimpdisplayshell-filter.c | 1 + + app/display/gimpdisplayshell-expose.h | 34 +++++++++ + app/display/gimpdisplayshell-filter.c | 1 + app/display/gimpdisplayshell-handlers.c | 1 + - app/display/gimpdisplayshell-scale.c | 1 + - app/display/gimpdisplayshell-scroll.c | 1 + + app/display/gimpdisplayshell-scale.c | 1 + + app/display/gimpdisplayshell-scroll.c | 1 + app/display/gimpdisplayshell-selection.c | 1 + - app/display/gimpdisplayshell.c | 87 +--------------------- - app/display/gimpdisplayshell.h | 11 --- - app/tools/gimptransformtool.c | 1 + + app/display/gimpdisplayshell.c | 87 +--------------------- + app/display/gimpdisplayshell.h | 11 --- + app/tools/gimptransformtool.c | 1 + 14 files changed, 162 insertions(+), 97 deletions(-) commit 6c46d1ec739bc1fb20f1882afcbcd84d66c479ff Author: Michael Natterer -Date: Fri Oct 2 23:43:58 2009 +0200 +Date: Fri Oct 2 23:43:58 2009 +0200 Fix some comment typos and formatting @@ -80205,7 +81040,7 @@ commit 73071e46181b85916b529f8e1690412821b9842f Author: Simon Budig -Date: Fri Oct 2 22:03:33 2009 +0200 +Date: Fri Oct 2 22:03:33 2009 +0200 Fix crasher and behaviour in the GBR plugin for the GRAYA case. @@ -80214,7 +81049,7 @@ commit 3d13f8d4d50e308e9550339791a9e4f833c5907f Author: Michael Natterer -Date: Fri Oct 2 21:50:02 2009 +0200 +Date: Fri Oct 2 21:50:02 2009 +0200 Tweak display finding logic of previous commit a bit @@ -80226,7 +81061,7 @@ commit 3106b66186b71aa25e991f5071dab03981f073ae Author: Michael Natterer -Date: Fri Oct 2 21:15:07 2009 +0200 +Date: Fri Oct 2 21:15:07 2009 +0200 Finally enable multiple images in one window @@ -80239,7 +81074,7 @@ commit ff20a1367d969714b7b7793d3a3dfd859a5b6fcf Author: Michael Natterer -Date: Thu Oct 1 19:41:37 2009 +0200 +Date: Thu Oct 1 19:41:37 2009 +0200 Make GimpImageWindow handle the empty display correctly @@ -80252,7 +81087,7 @@ commit 625885eb9da9c469983a9866256dab2f5054d50b Author: Michael Natterer -Date: Thu Oct 1 19:38:52 2009 +0200 +Date: Thu Oct 1 19:38:52 2009 +0200 Make sure the shell is really destroyed when removing it from the window @@ -80265,7 +81100,7 @@ commit 0e68a7d59ac0c993c3e7f8f3a075b49351710b49 Author: Kevin Cozens -Date: Thu Oct 1 11:51:21 2009 -0400 +Date: Thu Oct 1 11:51:21 2009 -0400 Updated TinyScheme to support UTF-8 coded filenames. See bug #592413. @@ -80275,7 +81110,7 @@ commit a6bb7fb8ee987a7737239a55db68f44d618a8feb Author: Michael Natterer -Date: Wed Sep 30 19:31:13 2009 +0200 +Date: Wed Sep 30 19:31:13 2009 +0200 Remove accidentially added #include @@ -80284,7 +81119,7 @@ commit b9b7cadbb029e918e75d6383e76a7851d345d87a Author: Michael Natterer -Date: Wed Sep 30 19:25:38 2009 +0200 +Date: Wed Sep 30 19:25:38 2009 +0200 Use large image previews as tab widgets @@ -80293,7 +81128,7 @@ commit 98a465318640ca27aa1d41dc191c9d6b29424ea3 Author: Michael Natterer -Date: Wed Sep 30 17:01:55 2009 +0200 +Date: Wed Sep 30 17:01:55 2009 +0200 (gui_display_get_window): return the ID of the toplevel, not of the shell @@ -80303,7 +81138,7 @@ commit 97f556160fd0a95d065bdb2a85b85746209917dc Author: Michael Natterer -Date: Wed Sep 30 15:00:09 2009 +0200 +Date: Wed Sep 30 15:00:09 2009 +0200 Remove #include "display/gimpimagewindow.h" @@ -80312,7 +81147,7 @@ commit e36c3ee9bd19cf1b4f78d5881d86dacb9336409a Author: Martin Nordholts -Date: Wed Sep 30 07:34:55 2009 +0200 +Date: Wed Sep 30 07:34:55 2009 +0200 app: Fix keyboard shortcuts not working when non-image-windows focused @@ -80325,7 +81160,7 @@ commit ccdab9e4cdff670cbab8133eef5bda673e8566ab Author: Michael Natterer -Date: Wed Sep 30 00:00:36 2009 +0200 +Date: Wed Sep 30 00:00:36 2009 +0200 Make updagin the image window's ui manager more sane @@ -80337,12 +81172,12 @@ here anyway and the image window does the right thing now. app/display/gimpimagewindow.c | 3 ++- - app/gui/gui-vtable.c | 9 --------- + app/gui/gui-vtable.c | 9 --------- 2 files changed, 2 insertions(+), 10 deletions(-) commit bc9602c4103f632e6d25aded41b5d8397526c398 Author: Sven Neumann -Date: Tue Sep 29 23:24:16 2009 +0200 +Date: Tue Sep 29 23:24:16 2009 +0200 remove pointless delete-event handler @@ -80352,7 +81187,7 @@ commit 9fe00a78773892712a3c4388463509573e4f51c9 Author: Tal Trachtman -Date: Fri Sep 25 20:41:21 2009 +0100 +Date: Fri Sep 25 20:41:21 2009 +0100 Bug 596472 - Rotate brushes artifacts at certain rotation angles @@ -80367,7 +81202,7 @@ commit ee2fdbcf8fb217438c9ebd97bd531cab49653121 Author: Michael Natterer -Date: Tue Sep 29 23:01:33 2009 +0200 +Date: Tue Sep 29 23:01:33 2009 +0200 Enable some #if 0'ed code and use the just added API @@ -80379,7 +81214,7 @@ commit d1dc70fbdf5b41fec1168ca2c92885e896e8c41a Author: Michael Natterer -Date: Tue Sep 29 22:59:48 2009 +0200 +Date: Tue Sep 29 22:59:48 2009 +0200 Add some more shell management API to GimpImageWindow @@ -80392,7 +81227,7 @@ commit 3189b8f45f2b8fb02342099dc8c6b688da7129fe Author: Michael Natterer -Date: Tue Sep 29 22:38:34 2009 +0200 +Date: Tue Sep 29 22:38:34 2009 +0200 Move GimpImage::saved and GimpImage::exported handlers to the right place @@ -80401,7 +81236,7 @@ image/display connection belongs into GimpDisplayShell, so move these handlers from gimpdisplay-handlers.c to gimpdisplayshell-handlers.c. - app/display/gimpdisplay-handlers.c | 68 + app/display/gimpdisplay-handlers.c | 68 --------------------------------- app/display/gimpdisplayshell-handlers.c | 62 ++++++++++++++++++++++++++++++ @@ -80409,7 +81244,7 @@ commit 35588efaa1466ab38cb46e2ae11a421e92f5b74c Author: Michael Natterer -Date: Tue Sep 29 22:20:12 2009 +0200 +Date: Tue Sep 29 22:20:12 2009 +0200 Remove "gimp-" prefix from the shell's "icon" and "title" properties @@ -80419,13 +81254,13 @@ app/display/gimpdisplayshell-icon.c | 20 ++++++++------------ app/display/gimpdisplayshell-title.c | 6 ++---- app/display/gimpdisplayshell.c | 6 ++---- - app/display/gimpimagewindow.c | 6 ++---- - app/display/gimpstatusbar.c | 3 +-- + app/display/gimpimagewindow.c | 6 ++---- + app/display/gimpstatusbar.c | 3 +-- 5 files changed, 15 insertions(+), 26 deletions(-) commit d046da90e25c33815f1740fea8bbab576bd2d7a3 Author: Michael Natterer -Date: Tue Sep 29 22:14:10 2009 +0200 +Date: Tue Sep 29 22:14:10 2009 +0200 Merge the image window's active shell logic with the notebook's active page @@ -80440,7 +81275,7 @@ commit e8061e5a7e7bb4eb3c675407785544cd8aef703a Author: Michael Natterer -Date: Tue Sep 29 21:57:57 2009 +0200 +Date: Tue Sep 29 21:57:57 2009 +0200 Add a notebook for the display shells @@ -80449,7 +81284,7 @@ commit b0f7a7daf4b5a7529d6dcb3ccb4897496d6aeff6 Author: Michael Natterer -Date: Tue Sep 29 21:47:58 2009 +0200 +Date: Tue Sep 29 21:47:58 2009 +0200 Add a central hbox for docks and display shells @@ -80458,50 +81293,50 @@ commit 1c430a2b1930974ed2d231f0364adefc5da9a7cf Author: Michael Natterer -Date: Tue Sep 29 21:44:43 2009 +0200 +Date: Tue Sep 29 21:44:43 2009 +0200 Move all GimpImageWindow members to a private struct Add accessor functions for publically available members and visibility functions for menubar and statusbar. - app/actions/actions.c | 10 +- - app/actions/debug-commands.c | 5 +- - app/actions/view-commands.c | 2 +- - app/display/gimpdisplay-handlers.c | 12 +- - app/display/gimpdisplay.c | 3 +- + app/actions/actions.c | 10 +- + app/actions/debug-commands.c | 5 +- + app/actions/view-commands.c | 2 +- + app/display/gimpdisplay-handlers.c | 12 +- + app/display/gimpdisplay.c | 3 +- app/display/gimpdisplayshell-appearance.c | 18 +- app/display/gimpdisplayshell-callbacks.c | 12 +- - app/display/gimpdisplayshell-close.c | 9 +- - app/display/gimpdisplayshell-cursor.c | 9 +- + app/display/gimpdisplayshell-close.c | 9 +- + app/display/gimpdisplayshell-cursor.c | 9 +- app/display/gimpdisplayshell-progress.c | 10 +- - app/display/gimpdisplayshell.c | 4 +- - app/display/gimpimagewindow.c | 347 + app/display/gimpdisplayshell.c | 4 +- + app/display/gimpimagewindow.c | 347 +++++++++++++++++++++--------- - app/display/gimpimagewindow.h | 49 +++-- - app/gui/gui-vtable.c | 8 +- - app/gui/gui.c | 14 +- - app/tools/gimpmeasuretool.c | 2 +- - app/tools/gimptool.c | 28 ++- + app/display/gimpimagewindow.h | 49 +++-- + app/gui/gui-vtable.c | 8 +- + app/gui/gui.c | 14 +- + app/tools/gimpmeasuretool.c | 2 +- + app/tools/gimptool.c | 28 ++- 17 files changed, 355 insertions(+), 187 deletions(-) commit 59274856ad470a09507060ac6f43a3173ebab48f Author: Michael Natterer -Date: Tue Sep 29 20:56:14 2009 +0200 +Date: Tue Sep 29 20:56:14 2009 +0200 Derive GimpDisplayShell from GtkVBox instead of GimpImageWindow ...and pack the widget into a separately created GimpImageWindow. - app/display/gimpdisplay.c | 24 ++++++++++++++++++------ + app/display/gimpdisplay.c | 24 ++++++++++++++++++------ app/display/gimpdisplayshell.c | 34 ++++++++++------------------------ app/display/gimpdisplayshell.h | 13 +++---------- - app/display/gimpimagewindow.c | 5 ++--- + app/display/gimpimagewindow.c | 5 ++--- 4 files changed, 33 insertions(+), 43 deletions(-) commit 253b8e2cbe4aadff55dfacc1772f22afa42569df Author: Michael Natterer -Date: Tue Sep 29 20:32:26 2009 +0200 +Date: Tue Sep 29 20:32:26 2009 +0200 Use gimp_display_shell_get_window() instead of gtk_widget_get_toplevel() @@ -80510,33 +81345,33 @@ returns the shell itself if it is not in a window. Check the return value of get_window() for being non-NULL. - app/actions/actions.c | 40 +++++----- - app/actions/debug-commands.c | 16 ++-- - app/actions/view-actions.c | 13 ++-- - app/actions/view-commands.c | 46 +++++++----- - app/actions/windows-commands.c | 6 +- - app/display/gimpdisplay-foreach.c | 16 ++-- - app/display/gimpdisplay-handlers.c | 12 +-- - app/display/gimpdisplay.c | 13 ++-- + app/actions/actions.c | 40 +++++----- + app/actions/debug-commands.c | 16 ++-- + app/actions/view-actions.c | 13 ++-- + app/actions/view-commands.c | 46 +++++++----- + app/actions/windows-commands.c | 6 +- + app/display/gimpdisplay-foreach.c | 16 ++-- + app/display/gimpdisplay-handlers.c | 12 +-- + app/display/gimpdisplay.c | 13 ++-- app/display/gimpdisplayshell-appearance.c | 42 +++++------ app/display/gimpdisplayshell-callbacks.c | 11 +-- - app/display/gimpdisplayshell-close.c | 28 ++++--- - app/display/gimpdisplayshell-cursor.c | 24 +++--- - app/display/gimpdisplayshell-dnd.c | 3 +- + app/display/gimpdisplayshell-close.c | 28 ++++--- + app/display/gimpdisplayshell-cursor.c | 24 +++--- + app/display/gimpdisplayshell-dnd.c | 3 +- app/display/gimpdisplayshell-handlers.c | 14 ++-- app/display/gimpdisplayshell-progress.c | 12 +-- - app/display/gimpdisplayshell-scale.c | 13 +--- - app/display/gimpdisplayshell.c | 12 +-- - app/gui/gui-vtable.c | 7 +- - app/gui/gui.c | 17 +++-- - app/tools/gimpmeasuretool.c | 4 +- - app/tools/gimptool.c | 117 + app/display/gimpdisplayshell-scale.c | 13 +--- + app/display/gimpdisplayshell.c | 12 +-- + app/gui/gui-vtable.c | 7 +- + app/gui/gui.c | 17 +++-- + app/tools/gimpmeasuretool.c | 4 +- + app/tools/gimptool.c | 117 +++++++++++++++++------------- 21 files changed, 255 insertions(+), 211 deletions(-) commit 97987aff6e8914f708838e2ebf5b7322fab78f85 Author: Michael Natterer -Date: Mon Sep 28 23:53:05 2009 +0200 +Date: Mon Sep 28 23:53:05 2009 +0200 Add gimp_display_shell_get_window() which returns an image window or NULL @@ -80547,29 +81382,29 @@ commit 35739c743c70c53ce9cf539e6e054056b70516fe Author: Michael Natterer -Date: Mon Sep 28 22:53:31 2009 +0200 +Date: Mon Sep 28 22:53:31 2009 +0200 Change GimpImageWindow API to speak in shells, not displays A widget container should keep around child widgets, not whatever objects that just have widgets. - app/actions/actions.c | 8 +-- - app/display/gimpdisplay-handlers.c | 4 +- - app/display/gimpdisplay.c | 8 +-- + app/actions/actions.c | 8 +-- + app/display/gimpdisplay-handlers.c | 4 +- + app/display/gimpdisplay.c | 8 +-- app/display/gimpdisplayshell-appearance.c | 8 +-- app/display/gimpdisplayshell-handlers.c | 2 +- app/display/gimpdisplayshell-progress.c | 2 +- - app/display/gimpdisplayshell-scale.c | 4 +- - app/display/gimpdisplayshell.c | 2 +- - app/display/gimpimagewindow.c | 116 + app/display/gimpdisplayshell-scale.c | 4 +- + app/display/gimpdisplayshell.c | 2 +- + app/display/gimpimagewindow.c | 116 ++++++++++++++---------------- - app/display/gimpimagewindow.h | 28 ++++---- + app/display/gimpimagewindow.h | 28 ++++---- 10 files changed, 87 insertions(+), 95 deletions(-) commit bb8daa49a38d5692d6742d6c139630bfc954469b Author: Michael Natterer -Date: Sat Sep 26 10:39:08 2009 +0200 +Date: Sat Sep 26 10:39:08 2009 +0200 Present the toplevel not the shell @@ -80578,7 +81413,7 @@ commit 87001c1b3a2e9a7d5335d3db6efcf3dc7f2ee7ee Author: Michael Natterer -Date: Sat Sep 26 01:23:47 2009 +0200 +Date: Sat Sep 26 01:23:47 2009 +0200 gtk_window_present() the toplevel, not the shell @@ -80587,25 +81422,25 @@ commit 54edc2011339957486e32e880c16486d89e372e2 Author: Michael Natterer -Date: Sat Sep 26 01:19:27 2009 +0200 +Date: Sat Sep 26 01:19:27 2009 +0200 Add missing #include "gimpimagewindow.h" - app/display/gimpdisplay-handlers.c | 1 + + app/display/gimpdisplay-handlers.c | 1 + app/display/gimpdisplayshell-callbacks.c | 1 + - app/display/gimpdisplayshell-close.c | 1 + - app/display/gimpdisplayshell-cursor.c | 1 + + app/display/gimpdisplayshell-close.c | 1 + + app/display/gimpdisplayshell-cursor.c | 1 + app/display/gimpdisplayshell-progress.c | 1 + - app/display/gimpdisplayshell-scale.c | 1 + - app/display/gimpstatusbar.c | 1 + - app/gui/gui-vtable.c | 1 + - app/gui/gui.c | 1 + - app/tools/gimptool.c | 1 + + app/display/gimpdisplayshell-scale.c | 1 + + app/display/gimpstatusbar.c | 1 + + app/gui/gui-vtable.c | 1 + + app/gui/gui.c | 1 + + app/tools/gimptool.c | 1 + 10 files changed, 10 insertions(+) commit 45f4a9933904404123e70aabed6bf141ba397bc7 Author: Michael Natterer -Date: Sat Sep 26 00:55:07 2009 +0200 +Date: Sat Sep 26 00:55:07 2009 +0200 Don't set any options in gimp_display_shell_new() @@ -80618,7 +81453,7 @@ commit 1273a63eab42c8480e6f170f0d9026153f09ba65 Author: Michael Natterer -Date: Sat Sep 26 00:50:21 2009 +0200 +Date: Sat Sep 26 00:50:21 2009 +0200 Update the shell's appearance when it is set active in the image window @@ -80628,7 +81463,7 @@ commit 16038023a568136ed8853a2b8855e7d0f1ffbc47 Author: Michael Natterer -Date: Fri Sep 25 22:54:22 2009 +0200 +Date: Fri Sep 25 22:54:22 2009 +0200 Remove some dead code and fix some comments @@ -80637,18 +81472,18 @@ commit a8876834e80b6e94f18f03b7ce75e53b6be7e135 Author: Michael Natterer -Date: Fri Sep 25 22:41:50 2009 +0200 +Date: Fri Sep 25 22:41:50 2009 +0200 Move the remaining menubar signal connections from the shell to the window app/display/gimpdisplayshell.c | 11 ----------- - app/display/gimpimagewindow.c | 27 +++++++++++++++++++++++++++ + app/display/gimpimagewindow.c | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 11 deletions(-) commit 375a25dd24ce9530d2f8b500974d59cae3ddada6 Author: Michael Natterer -Date: Fri Sep 25 22:06:19 2009 +0200 +Date: Fri Sep 25 22:06:19 2009 +0200 Destroy the toplevel, not the shell in gimp_display_delete() @@ -80660,7 +81495,7 @@ commit f7f58d57be3cf3a8705a3d6304765951080fce33 Author: Michael Natterer -Date: Fri Sep 25 22:01:56 2009 +0200 +Date: Fri Sep 25 22:01:56 2009 +0200 gtk_window_present() the toplevel, not the shell @@ -80669,7 +81504,7 @@ commit accdd3d8a18392648785316529c08b75e6923bdd Author: Michael Natterer -Date: Fri Sep 25 22:01:21 2009 +0200 +Date: Fri Sep 25 22:01:21 2009 +0200 Go via the toplevel to get to the menubar manager @@ -80678,7 +81513,7 @@ commit 6c76120561ffc110a2e597c893efd28df976bd88 Author: Michael Natterer -Date: Fri Sep 25 20:18:26 2009 +0200 +Date: Fri Sep 25 20:18:26 2009 +0200 Move "show-statusbar" next to "show-menubar" @@ -80688,7 +81523,7 @@ commit fbc3b2f0c1824ba41412c061c69463831ef423f4 Author: Michael Natterer -Date: Fri Sep 25 19:56:04 2009 +0200 +Date: Fri Sep 25 19:56:04 2009 +0200 Get rid of image window FIXMEs @@ -80703,7 +81538,7 @@ commit fa43c8797e84b949ae56447999fc10906e9f4d5d Author: Michael Natterer -Date: Fri Sep 25 19:35:03 2009 +0200 +Date: Fri Sep 25 19:35:03 2009 +0200 Add gimp_statusbar_override/restore_window_title() @@ -80715,15 +81550,15 @@ app/display/gimpdisplayshell-progress.c | 57 ------------- app/display/gimpdisplayshell-progress.h | 5 +- - app/display/gimpimagewindow.c | 14 +++- - app/display/gimpstatusbar.c | 40 +++++++++ - app/display/gimpstatusbar.h | 143 + app/display/gimpimagewindow.c | 14 +++- + app/display/gimpstatusbar.c | 40 +++++++++ + app/display/gimpstatusbar.h | 143 ++++++++++++++++---------------- 5 files changed, 126 insertions(+), 133 deletions(-) commit 892f9f8876fbba0d60054212260938dc261b8e77 Author: Michael Natterer -Date: Fri Sep 25 19:04:10 2009 +0200 +Date: Fri Sep 25 19:04:10 2009 +0200 Add gimp_image_window_is_iconified() and use it in GimpImageWindow @@ -80733,7 +81568,7 @@ commit 5b5e4e039afbed713a7cdd867bd964c35042bba2 Author: Michael Natterer -Date: Fri Sep 25 18:35:58 2009 +0200 +Date: Fri Sep 25 18:35:58 2009 +0200 Add gimp_image_window_add_display() and use it @@ -80741,16 +81576,16 @@ shell widgets to the image window's vbox *after* the shell constructor returns. Seems to work nicely :-) - app/display/gimpdisplay.c | 4 ++++ + app/display/gimpdisplay.c | 4 ++++ app/display/gimpdisplayshell.c | 10 ++++++---- app/display/gimpdisplayshell.h | 2 ++ - app/display/gimpimagewindow.c | 20 ++++++++++++++++++++ - app/display/gimpimagewindow.h | 4 ++++ + app/display/gimpimagewindow.c | 20 ++++++++++++++++++++ + app/display/gimpimagewindow.h | 4 ++++ 5 files changed, 36 insertions(+), 4 deletions(-) commit bcef4f275dee81e44bc19f204ca81a6666561f9f Author: Michael Natterer -Date: Fri Sep 25 17:49:50 2009 +0200 +Date: Fri Sep 25 17:49:50 2009 +0200 gimp_display_shell_fill_idle() present the toplevel not the shell @@ -80761,25 +81596,25 @@ commit 32783d7228f25dc67ee98981b46a37d1a0e42361 Author: Michael Natterer -Date: Fri Sep 25 17:46:09 2009 +0200 +Date: Fri Sep 25 17:46:09 2009 +0200 Move shrink_wrap() from the display to the window Also fix all callers. This clearly needs more cleanup. app/display/gimpdisplayshell-handlers.c | 14 ++-- - app/display/gimpdisplayshell-scale.c | 21 +++++- - app/display/gimpdisplayshell.c | 107 + app/display/gimpdisplayshell-scale.c | 21 +++++- + app/display/gimpdisplayshell.c | 107 ---------------------------- - app/display/gimpdisplayshell.h | 3 - - app/display/gimpimagewindow.c | 122 + app/display/gimpdisplayshell.h | 3 - + app/display/gimpimagewindow.c | 122 ++++++++++++++++++++++++++++++++ - app/display/gimpimagewindow.h | 3 + + app/display/gimpimagewindow.h | 3 + 6 files changed, 154 insertions(+), 116 deletions(-) commit 8c2934f62620097f1e64cee3e4cf2f87e6457ae6 Author: Michael Natterer -Date: Fri Sep 25 17:24:41 2009 +0200 +Date: Fri Sep 25 17:24:41 2009 +0200 Remove dead and forgotten declaration of gimp_display_shell_update_icon() @@ -80789,7 +81624,7 @@ commit d5b15428081cff1953ea8918c441771524490c02 Author: Michael Natterer -Date: Fri Sep 25 17:23:52 2009 +0200 +Date: Fri Sep 25 17:23:52 2009 +0200 Add some forgotten casts, fixes (harmless) compile warnings @@ -80798,7 +81633,7 @@ commit abc5e270b37e00e9af8185285775098f914345d8 Author: Michael Natterer -Date: Fri Sep 25 14:21:33 2009 +0200 +Date: Fri Sep 25 14:21:33 2009 +0200 Go via the toplevel to update the image window's ui manager @@ -80807,7 +81642,7 @@ commit 7f064f694e104d627c62fcc526ba932ec9bb90ad Author: Michael Natterer -Date: Fri Sep 25 14:09:24 2009 +0200 +Date: Fri Sep 25 14:09:24 2009 +0200 Get rid of the shell's window-state-event handler @@ -80816,12 +81651,12 @@ Added FIXME as reminder. app/display/gimpdisplayshell.c | 20 -------------------- - app/display/gimpimagewindow.c | 3 +++ + app/display/gimpimagewindow.c | 3 +++ 2 files changed, 3 insertions(+), 20 deletions(-) commit 4f60240a04a0cff6ebb0d6aaebc0f2f60b8e1f29 Author: Michael Natterer -Date: Fri Sep 25 14:06:14 2009 +0200 +Date: Fri Sep 25 14:06:14 2009 +0200 Move updating the "view-fullscreen" actions to the proper place @@ -80830,13 +81665,13 @@ all action code from the window-state-event handlers. app/display/gimpdisplayshell-appearance.c | 9 ++++++++- - app/display/gimpdisplayshell.c | 21 --------------------- - app/display/gimpimagewindow.c | 9 +-------- + app/display/gimpdisplayshell.c | 21 --------------------- + app/display/gimpimagewindow.c | 9 +-------- 3 files changed, 9 insertions(+), 30 deletions(-) commit 8b5b36751ddf9000109979ca8022c35eb066937b Author: Michael Natterer -Date: Fri Sep 25 13:58:25 2009 +0200 +Date: Fri Sep 25 13:58:25 2009 +0200 Move updating the shell's appearance to the right window state event handler @@ -80845,12 +81680,12 @@ the image window. app/display/gimpdisplayshell.c | 2 -- - app/display/gimpimagewindow.c | 3 +++ + app/display/gimpimagewindow.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) commit 5c048e01087d5c168488ac875775bc00648f73b9 Author: Michael Natterer -Date: Fri Sep 25 13:43:54 2009 +0200 +Date: Fri Sep 25 13:43:54 2009 +0200 Reindent static prototypes @@ -80860,20 +81695,20 @@ commit d015a704b328d8e1a0084ec7efd14724d313eea5 Author: Michael Natterer -Date: Fri Sep 25 13:41:23 2009 +0200 +Date: Fri Sep 25 13:41:23 2009 +0200 Move GtkWidget::configure_event() impl from the shell to the window Still has a FIXME for later, but is in the right place now. app/display/gimpdisplayshell.c | 34 +-------------- - app/display/gimpimagewindow.c | 93 + app/display/gimpimagewindow.c | 93 ++++++++++++++++++++++++++++++------------ 2 files changed, 67 insertions(+), 60 deletions(-) commit c475b1b3be4a0eb52e8bf028dcd9ac5d4346c408 Author: Michael Natterer -Date: Fri Sep 25 12:59:40 2009 +0200 +Date: Fri Sep 25 12:59:40 2009 +0200 Update widget packing ASCII art to not include image window widgets @@ -80882,19 +81717,19 @@ commit a5945740e0ee6a817bcc76a06789b1e57449bedb Author: Michael Natterer -Date: Fri Sep 25 12:48:30 2009 +0200 +Date: Fri Sep 25 12:48:30 2009 +0200 Move GtkWidget::delete_event() impl from the shell to the window Still has a FIXME but is in the right place now at least app/display/gimpdisplayshell.c | 15 --------------- - app/display/gimpimagewindow.c | 17 +++++++++++++++++ + app/display/gimpimagewindow.c | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 15 deletions(-) commit b11c3355cbf61eeb18de40e88eb875c738ba636a Author: Michael Natterer -Date: Fri Sep 25 12:31:59 2009 +0200 +Date: Fri Sep 25 12:31:59 2009 +0200 Implement GObject::constructor() @@ -80905,7 +81740,7 @@ commit 1ae56327539b4e68b81ed94ac78a8311a8ce6f8e Author: Michael Natterer -Date: Fri Sep 25 12:28:49 2009 +0200 +Date: Fri Sep 25 12:28:49 2009 +0200 Turn "popup-manager" into a construct-only property and pass it accordingly @@ -80915,7 +81750,7 @@ commit 7b62cb3b008725d99b8b54be6ee30a649a67634b Author: Michael Natterer -Date: Fri Sep 25 12:19:35 2009 +0200 +Date: Fri Sep 25 12:19:35 2009 +0200 Turn "display" into a construct-only property and pass it accordingly @@ -80924,7 +81759,7 @@ commit d2f43f1604bb96f2421732da177b7ed7b59a9166 Author: Michael Natterer -Date: Fri Sep 25 12:13:05 2009 +0200 +Date: Fri Sep 25 12:13:05 2009 +0200 Finally fully enable the image window's active_display mechanism @@ -80936,23 +81771,23 @@ gimp_image_window_set_active_display(). app/display/gimpdisplayshell.c | 3 --- - app/display/gimpimagewindow.c | 3 --- + app/display/gimpimagewindow.c | 3 --- 2 files changed, 6 deletions(-) commit fdd55d37cbec3598b0614b730b39d9eb1b245ea7 Author: Michael Natterer -Date: Fri Sep 25 12:09:15 2009 +0200 +Date: Fri Sep 25 12:09:15 2009 +0200 Move the last window-related NIW code from the shell to the image window app/display/gimpdisplayshell.c | 5 ----- - app/display/gimpimagewindow.c | 9 +++++++++ + app/display/gimpimagewindow.c | 9 +++++++++ 2 files changed, 9 insertions(+), 5 deletions(-) commit 2762100885579437016c10b6e9894ca5f3b01768 Author: Michael Natterer -Date: Fri Sep 25 12:08:03 2009 +0200 +Date: Fri Sep 25 12:08:03 2009 +0200 Show the shell after it has been associated with its image window, not before @@ -80965,7 +81800,7 @@ commit cf14f1ce626aa4bbbafc4b661ad5f2277b4e71a5 Author: Michael Natterer -Date: Fri Sep 25 11:53:30 2009 +0200 +Date: Fri Sep 25 11:53:30 2009 +0200 Go via the tolevel to get to the image window's statusbar @@ -80975,7 +81810,7 @@ commit 8b5a6920994c3c567190999baeed1e53a706af6a Author: Michael Natterer -Date: Fri Sep 25 02:05:26 2009 +0200 +Date: Fri Sep 25 02:05:26 2009 +0200 Remove display_factory member from GimpDisplayShell @@ -80985,28 +81820,28 @@ commit 9c5e44c566791a445dfb3eae300b560a38b8610f Author: Michael Natterer -Date: Fri Sep 25 02:03:30 2009 +0200 +Date: Fri Sep 25 02:03:30 2009 +0200 Move the window part of gimp_display_shell_fill() to GimpImageWindow app/display/gimpdisplayshell.c | 6 ------ - app/display/gimpimagewindow.c | 6 ++++++ + app/display/gimpimagewindow.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) commit 4cc8f8e6f8c6935dbfb0c3abe98c7adf171a623b Author: Michael Natterer -Date: Fri Sep 25 01:56:30 2009 +0200 +Date: Fri Sep 25 01:56:30 2009 +0200 Move the window part of gimp_display_shell_empty() to GimpImageWindow app/display/gimpdisplayshell.c | 43 +----------------------------------------- - app/display/gimpimagewindow.c | 36 +++++++++++++++++++++++++++++++++++ + app/display/gimpimagewindow.c | 36 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 42 deletions(-) commit c7fdac48940f2f1cc24df4341fffe3393367a394 Author: Michael Natterer -Date: Fri Sep 25 01:55:39 2009 +0200 +Date: Fri Sep 25 01:55:39 2009 +0200 gimp_display_set_image(): emit notify::image only if the image changed @@ -81015,7 +81850,7 @@ commit e5d8067a87b3b4a12a8c6e01de9939b90ac93843 Author: Michael Natterer -Date: Fri Sep 25 01:35:03 2009 +0200 +Date: Fri Sep 25 01:35:03 2009 +0200 Unref the menubar_manager in finalize() @@ -81024,7 +81859,7 @@ commit 8086bc8e682aa2d05b07b7c636c019667954be94 Author: Michael Natterer -Date: Fri Sep 25 01:33:25 2009 +0200 +Date: Fri Sep 25 01:33:25 2009 +0200 Pass the display_factory to the image window @@ -81033,7 +81868,7 @@ commit e9c7b47284fbf6a0a6fc2dc796affc2e85aa1068 Author: Michael Natterer -Date: Fri Sep 25 01:31:08 2009 +0200 +Date: Fri Sep 25 01:31:08 2009 +0200 Add "display-factory" construct-only property of type GimpDialogFactory @@ -81044,7 +81879,7 @@ commit e7e87597107c57f9a77704f3353b73d044141b4c Author: Michael Natterer -Date: Fri Sep 25 01:18:22 2009 +0200 +Date: Fri Sep 25 01:18:22 2009 +0200 Move image window related functions together (menubar and statusbar) @@ -81055,7 +81890,7 @@ commit 5804e80ad0a0b8a9c6505af5c4ecf55f0655e5ca Author: Michael Natterer -Date: Fri Sep 25 01:12:55 2009 +0200 +Date: Fri Sep 25 01:12:55 2009 +0200 Get rid of all image window FIXMEs @@ -81068,7 +81903,7 @@ commit 0b12978761f376f58791b5a124c81f568b05c5e1 Author: Michael Natterer -Date: Thu Sep 24 10:30:47 2009 +0200 +Date: Thu Sep 24 10:30:47 2009 +0200 Go via gtk_widget_get_toplevel() to get to the statusbar @@ -81077,7 +81912,7 @@ commit ac254f293d7646c72309ea603f48164c692e525f Author: Michael Natterer -Date: Thu Sep 24 10:19:23 2009 +0200 +Date: Thu Sep 24 10:19:23 2009 +0200 Don't use the menubar_manager to set the quickmask toggle's tooltip @@ -81086,7 +81921,7 @@ commit 88ee13db561369469b8916f19a911430b77ee295 Author: Michael Natterer -Date: Thu Sep 24 10:05:43 2009 +0200 +Date: Thu Sep 24 10:05:43 2009 +0200 Go via the toplevel to get to the statusbar for setting coords @@ -81098,7 +81933,7 @@ commit 7e8a767e884ded1aee310cb94baae87d33d54829 Author: Michael Natterer -Date: Thu Sep 24 09:58:36 2009 +0200 +Date: Thu Sep 24 09:58:36 2009 +0200 Add notify callback for GimpDisplay's "image" property @@ -81109,7 +81944,7 @@ commit fc75f38c0300dd447d85f95ad5a592aff6f72003 Author: Michael Natterer -Date: Thu Sep 24 09:40:32 2009 +0200 +Date: Thu Sep 24 09:40:32 2009 +0200 Make gimp_statusbar_new() a void function and set a shell dynamically @@ -81120,7 +81955,7 @@ commit 82aa4084abd2b8d87bce345185aab9087fb27c8a Author: Michael Natterer -Date: Thu Sep 24 09:35:34 2009 +0200 +Date: Thu Sep 24 09:35:34 2009 +0200 Add gimp_statusbar_set_shell() @@ -81129,23 +81964,23 @@ app/display/gimpstatusbar.c | 43 ++++++++++++++++++++++++++++++++++++------- - app/display/gimpstatusbar.h | 2 ++ + app/display/gimpstatusbar.h | 2 ++ 2 files changed, 38 insertions(+), 7 deletions(-) commit 571cdd47edeeb14aaf9aa85cb5efad4fe3aa54fd Author: Michael Natterer -Date: Thu Sep 24 09:18:19 2009 +0200 +Date: Thu Sep 24 09:18:19 2009 +0200 Set the window role and "resizable" on GimpImageWindow, not on the shell app/display/gimpdisplayshell.c | 4 ---- - app/display/gimpimagewindow.c | 2 ++ + app/display/gimpimagewindow.c | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) commit a9b617235f19dc741dda4c60d41837b4fab2da93 Author: Michael Natterer -Date: Thu Sep 24 09:16:17 2009 +0200 +Date: Thu Sep 24 09:16:17 2009 +0200 Make the scale dialog transient to the shell's toplevel @@ -81154,22 +81989,22 @@ commit 1bbcd8f7b5a7eb9372d921f638701fe4033f6e13 Author: Michael Natterer -Date: Thu Sep 24 09:09:35 2009 +0200 +Date: Thu Sep 24 09:09:35 2009 +0200 Add "icon" property to GimpDisplayShell Set it instead of setting the window icon and connect GimpImageWindow to the notification. - app/display/gimpdisplayshell-icon.c | 4 ++-- + app/display/gimpdisplayshell-icon.c | 4 ++-- app/display/gimpdisplayshell.c | 20 +++++++++++++++++++- - app/display/gimpdisplayshell.h | 2 +- - app/display/gimpimagewindow.c | 18 ++++++++++++++++++ + app/display/gimpdisplayshell.h | 2 +- + app/display/gimpimagewindow.c | 18 ++++++++++++++++++ 4 files changed, 40 insertions(+), 4 deletions(-) commit 660c333b55d11266d191c8f4d2b8fc5c3db15c4b Author: Michael Natterer -Date: Wed Sep 23 19:33:36 2009 +0200 +Date: Wed Sep 23 19:33:36 2009 +0200 Add "title" and "status" properties to GimpSisplayShell @@ -81180,13 +82015,13 @@ app/display/gimpdisplayshell-title.c | 23 +++++++++++---------- app/display/gimpdisplayshell.c | 35 ++++++++++++++++++++++++++++++- app/display/gimpdisplayshell.h | 3 +++ - app/display/gimpimagewindow.c | 40 + app/display/gimpimagewindow.c | 40 ++++++++++++++++++++++++++++++++++-- 4 files changed, 87 insertions(+), 14 deletions(-) commit 5112bc497dee66807b38be815427410016b3392f Author: Michael Natterer -Date: Wed Sep 23 18:56:55 2009 +0200 +Date: Wed Sep 23 18:56:55 2009 +0200 Remove gimp_display_shell_title() because it was completely empty @@ -81197,7 +82032,7 @@ commit 3547a25390456a0c258c78309437fa5dc668000d Author: Michael Natterer -Date: Wed Sep 23 18:52:42 2009 +0200 +Date: Wed Sep 23 18:52:42 2009 +0200 Add a GimpDisplayShell::scaled() handler to GimpImageWindow @@ -81206,14 +82041,14 @@ impl. Had to hack around a bit with the new API to set the window's active display because they are still the same widget. - app/display/gimpdisplay.c | 4 ++++ + app/display/gimpdisplay.c | 4 ++++ app/display/gimpdisplayshell.c | 12 +++--------- - app/display/gimpimagewindow.c | 30 ++++++++++++++++++++++++++++++ + app/display/gimpimagewindow.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 9 deletions(-) commit a82169ee13ae60105fa673406e4f986ec2b42538 Author: Michael Natterer -Date: Wed Sep 23 18:22:50 2009 +0200 +Date: Wed Sep 23 18:22:50 2009 +0200 Keep around an "active_display" member in GimpImageWindow @@ -81222,13 +82057,13 @@ later, but is a step to get rid of FIXME hacks. app/display/gimpdisplayshell.c | 4 ++++ - app/display/gimpimagewindow.c | 19 ++++++++++++++++++- - app/display/gimpimagewindow.h | 4 ++++ + app/display/gimpimagewindow.c | 19 ++++++++++++++++++- + app/display/gimpimagewindow.h | 4 ++++ 3 files changed, 26 insertions(+), 1 deletion(-) commit 03fcc99bbfc8568e71cfc0f917d8cac977523fab Author: Michael Natterer -Date: Wed Sep 23 18:13:08 2009 +0200 +Date: Wed Sep 23 18:13:08 2009 +0200 Move the GtkWidget::style_set() handler to GimpImageWindow @@ -81236,39 +82071,39 @@ app/display/gimpdisplayshell.c | 45 ------------------------------------------ - app/display/gimpimagewindow.c | 43 + app/display/gimpimagewindow.c | 43 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 45 deletions(-) commit 10b98034d435d5384fd5869013d43606918a4afa Author: Michael Natterer -Date: Wed Sep 23 17:55:41 2009 +0200 +Date: Wed Sep 23 17:55:41 2009 +0200 Move the statusbar to GimpImageWindow As with the menubar, port some code properly, and add some horrible /* FIXME image window */ hacks to make it work. - app/actions/actions.c | 12 ++++-- - app/display/gimpdisplay-handlers.c | 6 ++- - app/display/gimpdisplay.c | 3 +- + app/actions/actions.c | 12 ++++-- + app/display/gimpdisplay-handlers.c | 6 ++- + app/display/gimpdisplay.c | 3 +- app/display/gimpdisplayshell-appearance.c | 10 +---- - app/display/gimpdisplayshell-cursor.c | 6 ++- + app/display/gimpdisplayshell-cursor.c | 6 ++- app/display/gimpdisplayshell-progress.c | 36 +++++++++++------ - app/display/gimpdisplayshell-title.c | 6 ++- - app/display/gimpdisplayshell.c | 64 + app/display/gimpdisplayshell-title.c | 6 ++- + app/display/gimpdisplayshell.c | 64 +++++++------------------------ - app/display/gimpdisplayshell.h | 2 - - app/display/gimpimagewindow.c | 45 ++++++++++++++++++++++ - app/display/gimpimagewindow.h | 1 + - app/gui/gui.c | 10 +++-- - app/tools/gimpmeasuretool.c | 3 +- - app/tools/gimptool.c | 52 +++++++++++++++---------- + app/display/gimpdisplayshell.h | 2 - + app/display/gimpimagewindow.c | 45 ++++++++++++++++++++++ + app/display/gimpimagewindow.h | 1 + + app/gui/gui.c | 10 +++-- + app/tools/gimpmeasuretool.c | 3 +- + app/tools/gimptool.c | 52 +++++++++++++++---------- 14 files changed, 147 insertions(+), 109 deletions(-) commit 6793d687692f9872d86ccdc820a7b13821e93985 Author: Michael Natterer -Date: Wed Sep 23 16:58:03 2009 +0200 +Date: Wed Sep 23 16:58:03 2009 +0200 Move the menubar and the menubar_manager to GimpImageWindow @@ -81276,57 +82111,57 @@ go via gtk_widget_get_toplevel(), but also add some horrid temp /* FIXME image window */ hacks. - app/actions/debug-commands.c | 13 ++++-- - app/actions/view-actions.c | 11 +++-- - app/actions/view-commands.c | 6 ++- + app/actions/debug-commands.c | 13 ++++-- + app/actions/view-actions.c | 11 +++-- + app/actions/view-commands.c | 6 ++- app/display/gimpdisplayshell-appearance.c | 53 +++++++++++++--------- app/display/gimpdisplayshell-callbacks.c | 5 ++- - app/display/gimpdisplayshell-close.c | 14 ++++-- - app/display/gimpdisplayshell.c | 74 + app/display/gimpdisplayshell-close.c | 14 ++++-- + app/display/gimpdisplayshell.c | 74 +++++++++++-------------------- - app/display/gimpdisplayshell.h | 2 - - app/display/gimpimagewindow.c | 26 +++++++++++ - app/display/gimpimagewindow.h | 1 + - app/gui/gui-vtable.c | 3 +- + app/display/gimpdisplayshell.h | 2 - + app/display/gimpimagewindow.c | 26 +++++++++++ + app/display/gimpimagewindow.h | 1 + + app/gui/gui-vtable.c | 3 +- 11 files changed, 122 insertions(+), 86 deletions(-) commit 44f9fcbf6fee414fbf9491007b2d6b45298e9b5b Author: Michael Natterer -Date: Wed Sep 23 15:53:16 2009 +0200 +Date: Wed Sep 23 15:53:16 2009 +0200 Move the rc style string for the fullscreen menubar to GimpImageWindow app/display/gimpdisplayshell.c | 7 ------- - app/display/gimpimagewindow.c | 10 ++++++++++ + app/display/gimpimagewindow.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 7 deletions(-) commit 18234941223c4afa13f15201d7c53fe63327e01f Author: Michael Natterer -Date: Wed Sep 23 15:46:44 2009 +0200 +Date: Wed Sep 23 15:46:44 2009 +0200 Keep the main_vbox around in the GimpImageWindow struct (temp hack) app/display/gimpdisplayshell.c | 14 +++++--------- - app/display/gimpimagewindow.c | 4 ++++ - app/display/gimpimagewindow.h | 2 ++ + app/display/gimpimagewindow.c | 4 ++++ + app/display/gimpimagewindow.h | 2 ++ 3 files changed, 11 insertions(+), 9 deletions(-) commit 639c42742989d7ab570d34863ac52b67593ab346 Author: Michael Natterer -Date: Wed Sep 23 15:14:53 2009 +0200 +Date: Wed Sep 23 15:14:53 2009 +0200 Use gtk_widget_get_toplevel() to get to a display's "iconified" state Don't assume that shell->window is the toplevel GdkWindow, go thorugh gtk_widget_get_toplevel() instead. - app/display/gimpdisplay-foreach.c | 5 +++-- + app/display/gimpdisplay-foreach.c | 5 +++-- app/display/gimpdisplayshell-progress.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) commit 90ef404d988f841190067d3ceb5eed868f7d43d0 Author: Michael Natterer -Date: Wed Sep 23 15:05:00 2009 +0200 +Date: Wed Sep 23 15:05:00 2009 +0200 Move more window managing code to GimpImageWindow @@ -81334,12 +82169,12 @@ image window from GimpDisplayShell to GimpImageWindow. app/display/gimpdisplayshell.c | 18 ------------------ - app/display/gimpimagewindow.c | 21 ++++++++++++++++++++- + app/display/gimpimagewindow.c | 21 ++++++++++++++++++++- 2 files changed, 20 insertions(+), 19 deletions(-) commit be93e6564a20b510113007cb533f3995e8263d7d Author: Michael Natterer -Date: Wed Sep 23 14:52:33 2009 +0200 +Date: Wed Sep 23 14:52:33 2009 +0200 Move the fullscreen API from GimpDisplayShell to GimpImageWindow @@ -81347,21 +82182,21 @@ gtk_widget_get_toplvel() to get to the GimpImageWindow when we need a display shell's fullscreen state. - app/actions/view-actions.c | 5 ++- - app/actions/view-commands.c | 21 ++++++++----- + app/actions/view-actions.c | 5 ++- + app/actions/view-commands.c | 21 ++++++++----- app/display/gimpdisplayshell-appearance.c | 29 +++-------------- app/display/gimpdisplayshell-appearance.h | 4 --- app/display/gimpdisplayshell-handlers.c | 6 +++- - app/display/gimpdisplayshell.c | 18 +++-------- - app/display/gimpdisplayshell.h | 1 - - app/display/gimpimagewindow.c | 52 + app/display/gimpdisplayshell.c | 18 +++-------- + app/display/gimpdisplayshell.h | 1 - + app/display/gimpimagewindow.c | 52 +++++++++++++++++++++++++++++++ - app/display/gimpimagewindow.h | 3 ++ + app/display/gimpimagewindow.h | 3 ++ 9 files changed, 86 insertions(+), 53 deletions(-) commit fb046b097da957b3389b12a3be5da7c8706ddb8b Author: Michael Natterer -Date: Wed Sep 23 13:40:52 2009 +0200 +Date: Wed Sep 23 13:40:52 2009 +0200 Add GtkWidget::window_state_event() implementation to GimpImageWindow @@ -81369,14 +82204,14 @@ Chain up in GimpDisplayShell's window_state_event() impl. app/display/gimpdisplayshell.c | 2 ++ - app/display/gimpimagewindow.c | 52 + app/display/gimpimagewindow.c | 52 ++++++++++++++++++++++++++++-------------- - app/display/gimpimagewindow.h | 2 ++ + app/display/gimpimagewindow.h | 2 ++ 3 files changed, 39 insertions(+), 17 deletions(-) commit 7c66b4c43dca1cd871d53142b96fda534e075d17 Author: Michael Natterer -Date: Wed Sep 23 13:07:40 2009 +0200 +Date: Wed Sep 23 13:07:40 2009 +0200 Support GimpImageWindow as action callback user_data @@ -81385,7 +82220,7 @@ commit fcf09eea62d6a5927dd2f61499d5fac4f6f2429b Author: Michael Natterer -Date: Wed Sep 23 13:06:11 2009 +0200 +Date: Wed Sep 23 13:06:11 2009 +0200 Add gimp_image_window_get_active_display() @@ -81398,7 +82233,7 @@ commit dc436b6f86a18a1df80e24e925d4b622464b80ac Author: Michael Natterer -Date: Wed Sep 23 12:47:25 2009 +0200 +Date: Wed Sep 23 12:47:25 2009 +0200 Add menubar_manager member and "menu-factory" construct-only property @@ -81407,14 +82242,14 @@ property to g_object_new() in gimp_display_shell_new(). app/display/gimpdisplayshell.c | 1 + - app/display/gimpimagewindow.c | 75 + app/display/gimpimagewindow.c | 75 ++++++++++++++++++++++++++++++++++++------ - app/display/gimpimagewindow.h | 2 ++ + app/display/gimpimagewindow.h | 2 ++ 3 files changed, 68 insertions(+), 10 deletions(-) commit aad8fbad3e7ae9f506df09b275b7af5f67f6236c Author: Michael Natterer -Date: Wed Sep 23 12:32:36 2009 +0200 +Date: Wed Sep 23 12:32:36 2009 +0200 Derive GimpDisplayShell from GimpImageWindow @@ -81427,7 +82262,7 @@ commit b83a58b64ee3d2f81b957f38bb39352494fb6d78 Author: Michael Natterer -Date: Wed Sep 23 12:24:22 2009 +0200 +Date: Wed Sep 23 12:24:22 2009 +0200 Add new toplevel window class GimpImageWindow @@ -81443,7 +82278,7 @@ commit e7b6d85fea67442ce5a79e7c74597029e9e6f955 Author: Cristian Secară -Date: Mon Sep 28 23:05:57 2009 +0300 +Date: Mon Sep 28 23:05:57 2009 +0300 Updated Romanian translation @@ -81451,21 +82286,21 @@ po-plug-ins/ro.po | 8813 +++++++++++++++++++++++----------------------- po-python/ro.po | 177 +- po-script-fu/ro.po | 818 ++--- - po-tips/ro.po | 8 +- - po/ro.po | 9892 + po-tips/ro.po | 8 +- + po/ro.po | 9892 ++++++++++++++++++---------------------------------- 6 files changed, 8824 insertions(+), 12666 deletions(-) commit e75d44c77cd2bc7df5b977885139374f53b74035 -Merge: bb18654 c39b875 +Merge: bb18654483 c39b8758d5 Author: Alexia Death -Date: Mon Sep 28 20:30:17 2009 +0300 +Date: Mon Sep 28 20:30:17 2009 +0300 Merge commit 'origin/master' into soc-2009-dynamics commit bb18654483959a1736b59c4ea1ddfd3292b3f491 Author: Alexia Death -Date: Mon Sep 28 20:30:03 2009 +0300 +Date: Mon Sep 28 20:30:03 2009 +0300 Fix some compile errors @@ -81475,14 +82310,14 @@ commit 749ed2212dc754359682883d8e7f7f24d02e97fc Author: Alexia Death -Date: Mon Sep 28 20:25:54 2009 +0300 +Date: Mon Sep 28 20:25:54 2009 +0300 index on soc-2009-dynamics: be78fe3... Merge commit 'origin/master' into soc-2009-dynamics commit c39b8758d57356f74b85e5da88a55a85c3a06f01 Author: Martin Nordholts -Date: Sun Sep 27 17:12:18 2009 +0200 +Date: Sun Sep 27 17:12:18 2009 +0200 app: Make dock actions like "Show Image Selection" work @@ -81495,7 +82330,7 @@ commit c7b8a67cfdd29e4147e1b68a51ebc12adc8739ab Author: Martin Nordholts -Date: Sun Sep 27 14:15:03 2009 +0200 +Date: Sun Sep 27 14:15:03 2009 +0200 app: Don't kill the toolbox window when removing the last dockbook @@ -81504,12 +82339,12 @@ kiled when the last dockbook is removed. app/dialogs/dialogs-constructors.c | 18 ++++++++++-------- - app/widgets/gimpdockwindow.c | 21 ++++++++++++++++++++- + app/widgets/gimpdockwindow.c | 21 ++++++++++++++++++++- 2 files changed, 30 insertions(+), 9 deletions(-) commit f3f19ac35fb7bfde82316296d907e0555601f884 Author: Martin Nordholts -Date: Sun Sep 27 13:51:42 2009 +0200 +Date: Sun Sep 27 13:51:42 2009 +0200 app: Make tool selection work again @@ -81522,27 +82357,27 @@ commit 9fa51f70f4437ca9feb30fc44beaf6761c9c5938 Author: Martin Nordholts -Date: Sat Sep 26 18:17:27 2009 +0200 +Date: Sat Sep 26 18:17:27 2009 +0200 Add a Single-window mode Add a single-window mode that can be toggled from 'Windows -> Single-window mode'. No code is yet hooked to the mode though. - app/actions/windows-actions.c | 90 + app/actions/windows-actions.c | 90 +++++++++++++++++++++++++++++++----------- app/actions/windows-commands.c | 22 +++++++++++ app/actions/windows-commands.h | 21 +++++----- - app/config/gimpguiconfig.c | 12 ++++++ - app/config/gimpguiconfig.h | 1 + - app/config/gimprc-blurbs.h | 3 ++ - app/widgets/gimphelp-ids.h | 1 + - menus/image-menu.xml.in | 3 ++ + app/config/gimpguiconfig.c | 12 ++++++ + app/config/gimpguiconfig.h | 1 + + app/config/gimprc-blurbs.h | 3 ++ + app/widgets/gimphelp-ids.h | 1 + + menus/image-menu.xml.in | 3 ++ 8 files changed, 119 insertions(+), 34 deletions(-) commit 1f098e5777149c76d6826cc5cac679b4f88aa1c1 Author: Martin Nordholts -Date: Sat Sep 26 16:48:39 2009 +0200 +Date: Sat Sep 26 16:48:39 2009 +0200 app: Add GimpDockColumns @@ -81560,7 +82395,7 @@ commit 9106c75b14f85ed19dd53d0a5bfabbca1fcb7c14 Author: Martin Nordholts -Date: Sat Sep 26 16:25:30 2009 +0200 +Date: Sat Sep 26 16:25:30 2009 +0200 app: Remove temporary GimpDockWindow property prefixes @@ -81568,12 +82403,12 @@ property names. app/dialogs/dialogs-constructors.c | 16 ++++++++-------- - app/widgets/gimpdockwindow.c | 4 ++-- + app/widgets/gimpdockwindow.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) commit 4f7693acf061e678bcbb4cc07adc59aade72640c Author: Martin Nordholts -Date: Sat Sep 26 16:21:10 2009 +0200 +Date: Sat Sep 26 16:21:10 2009 +0200 app: Make GimpDock a GtkVBox @@ -81599,23 +82434,23 @@ app/dialogs/dialogs-constructors.c | 35 +++++++++++++++++++++++++--- app/dialogs/dialogs-constructors.h | 7 ++++++ - app/dialogs/dialogs.c | 9 ++++++++ + app/dialogs/dialogs.c | 9 ++++++++ app/widgets/gimpdialogfactory.c | 47 +++++++++++++++++++++++++++++--------- app/widgets/gimpdialogfactory.h | 11 +++++++-- - app/widgets/gimpdock.c | 2 +- - app/widgets/gimpdock.h | 9 +++----- - app/widgets/gimpdockable.c | 12 ++++++---- - app/widgets/gimpdockwindow.c | 23 +++++++++++-------- - app/widgets/gimpmenudock.c | 4 ---- + app/widgets/gimpdock.c | 2 +- + app/widgets/gimpdock.h | 9 +++----- + app/widgets/gimpdockable.c | 12 ++++++---- + app/widgets/gimpdockwindow.c | 23 +++++++++++-------- + app/widgets/gimpmenudock.c | 4 ---- app/widgets/gimpsessioninfo-dock.c | 12 ++++++---- - app/widgets/gimptoolbox.c | 14 ++++-------- - app/widgets/gimptoolbox.h | 3 ++- + app/widgets/gimptoolbox.c | 14 ++++-------- + app/widgets/gimptoolbox.h | 3 ++- 13 files changed, 134 insertions(+), 54 deletions(-) commit 5447938d5c7b6cf7f4ecb7a7d1ecf8d48932ee47 Author: Martin Nordholts -Date: Sat Sep 26 16:13:42 2009 +0200 +Date: Sat Sep 26 16:13:42 2009 +0200 app: Fix bogus cast in dock-actions.c @@ -81624,7 +82459,7 @@ commit b00c9b87f554bb8460730b72e183d59ebebb93ec Author: Martin Nordholts -Date: Sat Sep 26 15:39:10 2009 +0200 +Date: Sat Sep 26 15:39:10 2009 +0200 app: Minor code formating @@ -81633,7 +82468,7 @@ commit c47c397332fc95d62c2507e4206bde2dc906f66a Author: Martin Nordholts -Date: Sat Sep 26 15:38:08 2009 +0200 +Date: Sat Sep 26 15:38:08 2009 +0200 app: Add and use gimp_dock_window_set_dock() @@ -81647,7 +82482,7 @@ commit 12a0ea10635cb1f267470a36e523a698cd4c2dc2 Author: Martin Nordholts -Date: Sat Sep 26 15:24:05 2009 +0200 +Date: Sat Sep 26 15:24:05 2009 +0200 app: Destory the dock window from the dock window, not the dock @@ -81657,7 +82492,7 @@ commit 0be33be0dc0b74569c9e3b11ffbc3a68634e6235 Author: Martin Nordholts -Date: Sat Sep 26 15:18:33 2009 +0200 +Date: Sat Sep 26 15:18:33 2009 +0200 app: Add missing #include "widgets/gimpdockwindow.h" @@ -81666,7 +82501,7 @@ commit acc8765e0a2f517f3c90efd09d16487a8876a484 Author: Martin Nordholts -Date: Sat Sep 26 14:38:33 2009 +0200 +Date: Sat Sep 26 14:38:33 2009 +0200 app: Update a few GimpDock related comments @@ -81675,7 +82510,7 @@ commit c9d8aafb68420ed57ea17ff052226ba936bc9525 Author: Martin Nordholts -Date: Sat Sep 26 14:26:49 2009 +0200 +Date: Sat Sep 26 14:26:49 2009 +0200 app: Change a few GIMP_IS_DOCK to GIMP_IS_DOCK_WINDOW @@ -81683,16 +82518,16 @@ window, not a dock. This is in preparation for making GimpDock a non-GimpDockWindow. - app/actions/dock-actions.c | 34 +++++++++++++------------- + app/actions/dock-actions.c | 34 +++++++++++++------------- app/widgets/gimpdialogfactory.c | 4 ++-- app/widgets/gimpsessioninfo-aux.c | 9 +++---- - app/widgets/gimpsessioninfo.c | 50 + app/widgets/gimpsessioninfo.c | 50 +++++++++++++++++++++------------------ 4 files changed, 52 insertions(+), 45 deletions(-) commit 62dde84e43a780ae51745cac227685256198173c Author: Martin Nordholts -Date: Sat Sep 26 13:11:42 2009 +0200 +Date: Sat Sep 26 13:11:42 2009 +0200 app: Change GimpDialogFactory signals to "dock-window-added/removed" @@ -81706,18 +82541,18 @@ This change is a preparation for when GimpDock will stop being a GimpDockWindow. - app/actions/windows-actions.c | 106 + app/actions/windows-actions.c | 106 +++++++++++++++++++--------------------- - app/actions/windows-actions.h | 8 +-- + app/actions/windows-actions.h | 8 +-- app/actions/windows-commands.c | 4 +- - app/menus/windows-menu.c | 92 +++++++++++++++++----------------- + app/menus/windows-menu.c | 92 +++++++++++++++++----------------- app/widgets/gimpdialogfactory.c | 25 +++++----- app/widgets/gimpdialogfactory.h | 8 +-- 6 files changed, 119 insertions(+), 124 deletions(-) commit 3cd7c5a6cdcfa82c01e258575834c066823416fe Author: Martin Nordholts -Date: Sat Sep 26 12:48:44 2009 +0200 +Date: Sat Sep 26 12:48:44 2009 +0200 app/tests: Do role tests on the dock windows, not the docks @@ -81726,7 +82561,7 @@ commit d6820442b55582e04db526c5581d22cdcee08a72 Author: Martin Nordholts -Date: Sat Sep 26 11:39:43 2009 +0200 +Date: Sat Sep 26 11:39:43 2009 +0200 libgimpconfig: Also add gimp_config_serialize() to gimpconfig.def @@ -81735,7 +82570,7 @@ commit 9f699e54415b381729739d264e941f0546541785 Author: Michael Schumacher -Date: Fri Sep 25 23:59:10 2009 +0200 +Date: Fri Sep 25 23:59:10 2009 +0200 Added missing export gimp_config_deserialize @@ -81744,7 +82579,7 @@ commit 60c1b169f3561619e207235ff57dc0c9478ab82d Author: Michael Natterer -Date: Tue Sep 22 23:30:58 2009 +0200 +Date: Tue Sep 22 23:30:58 2009 +0200 Add some missing s @@ -81753,7 +82588,7 @@ commit 01bafc6ea8f1354fef32a1a0f1656de3a6b67a56 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Sep 22 21:41:24 2009 +0200 +Date: Tue Sep 22 21:41:24 2009 +0200 Move variables to local scopes and some minor cleanup @@ -81763,7 +82598,7 @@ commit e306df220a650abcf0c44d733e6229514073fd25 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Sep 22 21:39:32 2009 +0200 +Date: Tue Sep 22 21:39:32 2009 +0200 Fix typo in comment @@ -81772,7 +82607,7 @@ commit 295f345b2eca4b224f51192632e0bc2060c6e07d Author: Michael Natterer <mitch@gimp.org> -Date: Tue Sep 22 20:25:11 2009 +0200 +Date: Tue Sep 22 20:25:11 2009 +0200 Guard against g_file_info_get_icon() returning NULL @@ -81784,7 +82619,7 @@ commit cd7abf24b5393a5e43a1eb2ecce192d2a030ba06 Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> -Date: Tue Sep 22 10:00:36 2009 +0700 +Date: Tue Sep 22 10:00:36 2009 +0700 po-plug-ins/vi.po: fix type "thoạt" @@ -81793,7 +82628,7 @@ commit a40f2b90377bd5618f79eae71cc3533773ce7e17 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 21 22:36:26 2009 +0200 +Date: Mon Sep 21 22:36:26 2009 +0200 Fix and optimize gimp_group_layer_duplicate() @@ -81807,7 +82642,7 @@ commit 43cf8e9259219f7ddcf3b2cd40e660c7d298a054 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 21 20:30:10 2009 +0200 +Date: Mon Sep 21 20:30:10 2009 +0200 Make "merge visible layers" work on the right container @@ -81822,7 +82657,7 @@ commit e79c3c9bd76cb4b44a8b230c46f48837e4160648 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 21 19:21:03 2009 +0200 +Date: Mon Sep 21 19:21:03 2009 +0200 Allow merging down a group layer @@ -81836,7 +82671,7 @@ commit 90893cea8441389d582d2e680ec80047be0a2710 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 21 19:17:02 2009 +0200 +Date: Mon Sep 21 19:17:02 2009 +0200 Add "layers-merge-group" action, callback and menu items @@ -81845,12 +82680,12 @@ app/actions/layers-commands.h | 2 ++ app/widgets/gimphelp-ids.h | 1 + menus/image-menu.xml.in | 1 + - menus/layers-menu.xml | 1 + + menus/layers-menu.xml | 1 + 6 files changed, 26 insertions(+) commit 170054a36e04e4ecba8e39b3cd7f0ab273f72c80 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 21 19:08:04 2009 +0200 +Date: Mon Sep 21 19:08:04 2009 +0200 Add gimp_image_merge_group_layer() @@ -81863,7 +82698,7 @@ commit 13e39d7e2cc6bfdb288998785b31dc8183e56129 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 21 18:41:54 2009 +0200 +Date: Mon Sep 21 18:41:54 2009 +0200 Fix precondition check when duplicating group layers @@ -81876,7 +82711,7 @@ commit 098a0e4491795a57a5c5a151ab32e132e9455b1d Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 21 10:43:26 2009 +0200 +Date: Mon Sep 21 10:43:26 2009 +0200 Make sure the layer preview's border is correct after removing a mask @@ -81889,7 +82724,7 @@ commit fa628b580a634373d8d04e4f2b086b34940a15eb Author: Sven Neumann <sven@gimp.org> -Date: Sun Sep 20 20:34:32 2009 +0200 +Date: Sun Sep 20 20:34:32 2009 +0200 Revert part of commit c8853243ea630e829ce659bcacc90b9a6eb9c7db @@ -81901,7 +82736,7 @@ commit 3af6b2ea3cc41147b117a83315201afea9e19a73 Author: Alexander Jones <alex@weej.com> -Date: Sun Sep 20 19:03:20 2009 +0100 +Date: Sun Sep 20 19:03:20 2009 +0100 Bug 593501 - Canvas Size dialog defaults to fixed aspect ratio @@ -81913,7 +82748,7 @@ commit 02c8835e2cca408d92bd59439f864b2893c9ed9f Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Sep 20 20:09:59 2009 +0200 +Date: Sun Sep 20 20:09:59 2009 +0200 app: Make gimp_dock_window_get_dock() public @@ -81923,7 +82758,7 @@ commit 3ebad746ee7227f3e18259bb0355fa67cf2d6c5a Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Sep 20 19:24:04 2009 +0200 +Date: Sun Sep 20 19:24:04 2009 +0200 app: Add GimpUIManager property to GimpDock @@ -81936,62 +82771,62 @@ commit ae39604a649b85050b53334779d4453134938c3f Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Sep 20 19:08:48 2009 +0200 +Date: Sun Sep 20 19:08:48 2009 +0200 app: Add more dialog-factory debug output - app/gui/session.c | 9 +++++++++ + app/gui/session.c | 9 +++++++++ app/widgets/gimpdialogfactory.c | 6 ++++++ - app/widgets/gimpsessioninfo.c | 9 +++++++++ + app/widgets/gimpsessioninfo.c | 9 +++++++++ 3 files changed, 24 insertions(+) commit 94d95e4db2396c1695fe3b670b7d15f4cd4c66ce Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Sep 20 17:06:36 2009 +0200 +Date: Sun Sep 20 17:06:36 2009 +0200 app: Make GimpSessionInfo members private Make GimpSessionInfo members private but put them in a shared header file so gimpsessioninfo-dock.c can access them too. - app/widgets/Makefile.am | 1 + + app/widgets/Makefile.am | 1 + app/widgets/gimpsessioninfo-dock.c | 9 +- app/widgets/gimpsessioninfo-private.h | 53 +++++++++ - app/widgets/gimpsessioninfo.c | 216 + app/widgets/gimpsessioninfo.c | 216 +++++++++++++++++----------------- - app/widgets/gimpsessioninfo.h | 29 +---- + app/widgets/gimpsessioninfo.h | 29 +---- 5 files changed, 174 insertions(+), 134 deletions(-) commit 8bfcd14f9a2282d59b26494aeba02d0db9283060 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Sep 20 14:51:03 2009 +0200 +Date: Sun Sep 20 14:51:03 2009 +0200 app: Add GimpSessionInfo getters and setters app/actions/context-commands.c | 8 ++-- app/display/gimpdisplayshell-cursor.c | 8 ++-- app/display/gimpdisplayshell.c | 4 +- - app/gui/gui-message.c | 4 +- - app/gui/gui.c | 4 +- - app/gui/session.c | 21 ++++++---- - app/tools/gimpcolortool.c | 8 ++-- + app/gui/gui-message.c | 4 +- + app/gui/gui.c | 4 +- + app/gui/session.c | 21 ++++++---- + app/tools/gimpcolortool.c | 8 ++-- app/widgets/gimpdialogfactory.c | 64 ++++++++++++++++-------------- - app/widgets/gimpdockwindow.c | 4 +- - app/widgets/gimpsessioninfo.c | 74 + app/widgets/gimpdockwindow.c | 4 +- + app/widgets/gimpsessioninfo.c | 74 +++++++++++++++++++++++++++++++++++ - app/widgets/gimpsessioninfo.h | 37 ++++++++++++------ + app/widgets/gimpsessioninfo.h | 37 ++++++++++++------ 11 files changed, 167 insertions(+), 69 deletions(-) commit be78fe3b1d03f91ef8beed383d63a0ab8539639c -Merge: 4cb185a c885324 +Merge: 4cb185a8ba c8853243ea Author: Alexia Death <alexiadeath@gmail.com> -Date: Sun Sep 20 14:32:32 2009 +0300 +Date: Sun Sep 20 14:32:32 2009 +0300 Merge commit 'origin/master' into soc-2009-dynamics commit 7cac9dff67d9ad3492e2b34734d79c6f28003fe4 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Sep 20 13:13:50 2009 +0200 +Date: Sun Sep 20 13:13:50 2009 +0200 app: gimp_session_info_set/get_geometry -> apply/read_geometry() @@ -82001,13 +82836,13 @@ getters and setters and thus the names were misleading. app/widgets/gimpdialogfactory.c | 10 +++++----- - app/widgets/gimpsessioninfo.c | 19 ++++++++++++++++--- - app/widgets/gimpsessioninfo.h | 4 ++-- + app/widgets/gimpsessioninfo.c | 19 ++++++++++++++++--- + app/widgets/gimpsessioninfo.h | 4 ++-- 3 files changed, 23 insertions(+), 10 deletions(-) commit 4ab58d2e7722f52818422b61ddf2da46554e8f58 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Sep 20 12:17:22 2009 +0200 +Date: Sun Sep 20 12:17:22 2009 +0200 app: Have only one GimpDialogFactoryEntry member in GimpSessionInfo @@ -82016,18 +82851,18 @@ 'factory_entry'. We compensate for this by adding a 'dockable' gboolean to GimpDialogFactoryEntry. - app/dialogs/dialogs.c | 10 +++++----- - app/gui/session.c | 6 +++--- + app/dialogs/dialogs.c | 10 +++++----- + app/gui/session.c | 6 +++--- app/widgets/gimpdialogfactory.c | 43 +++++++++++++++-------------------------- app/widgets/gimpdialogfactory.h | 5 +++++ - app/widgets/gimpsessioninfo.c | 31 +++++++++++++++-------------- - app/widgets/gimpsessioninfo.h | 7 ++++--- + app/widgets/gimpsessioninfo.c | 31 +++++++++++++++-------------- + app/widgets/gimpsessioninfo.h | 7 ++++--- 6 files changed, 49 insertions(+), 53 deletions(-) commit 44d5728d7ba03ac68f491c858777496ad0ac1e02 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Sep 20 11:43:41 2009 +0200 +Date: Sun Sep 20 11:43:41 2009 +0200 app: Add and use factory entry related getters for GimpSessionInfo @@ -82036,14 +82871,14 @@ place and also reduces direct access to session info fields. app/widgets/gimpdialogfactory.c | 14 ++++---- - app/widgets/gimpsessioninfo.c | 72 + app/widgets/gimpsessioninfo.c | 72 ++++++++++++++++++++++++++++++++++++++--- - app/widgets/gimpsessioninfo.h | 24 +++++++------- + app/widgets/gimpsessioninfo.h | 24 +++++++------- 3 files changed, 87 insertions(+), 23 deletions(-) commit 8d86735f2054a1177158e4f299ae5d5b1e57bc8c Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Sep 20 11:33:22 2009 +0200 +Date: Sun Sep 20 11:33:22 2009 +0200 app: Increase scope of 'info' in gimp_dialog_factory_add_dialog() @@ -82056,19 +82891,19 @@ commit 6460385553acb4e2d0d1269cdf62581628fa219e Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Sep 17 08:09:47 2009 +0200 +Date: Thu Sep 17 08:09:47 2009 +0200 app: Add docs to GimpSessionInfo related classes - app/widgets/gimpsessioninfo-aux.h | 4 ++++ - app/widgets/gimpsessioninfo-book.h | 4 ++++ + app/widgets/gimpsessioninfo-aux.h | 4 ++++ + app/widgets/gimpsessioninfo-book.h | 4 ++++ app/widgets/gimpsessioninfo-dockable.h | 3 +++ - app/widgets/gimpsessioninfo.h | 4 ++++ + app/widgets/gimpsessioninfo.h | 4 ++++ 4 files changed, 15 insertions(+) commit 09b04c62c9552da35a3a75aabaa6c1c957fc04f7 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Sep 20 10:25:13 2009 +0200 +Date: Sun Sep 20 10:25:13 2009 +0200 app: Introduce and use gimp_dialog_factory_dialog_sane() @@ -82081,7 +82916,7 @@ commit c8853243ea630e829ce659bcacc90b9a6eb9c7db Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Sep 19 18:00:15 2009 +0200 +Date: Sat Sep 19 18:00:15 2009 +0200 app: Clarify session_init() a bit @@ -82093,19 +82928,19 @@ commit a0923b62ee54dc0e58265a4d31611c18ce6b86b8 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Sep 19 17:46:49 2009 +0200 +Date: Sat Sep 19 17:46:49 2009 +0200 libgimpconfig: Add gimp_config_serialize() and _deserialize() devel-docs/libgimpconfig/libgimpconfig-docs.sgml | 3 ++ - libgimpconfig/gimpconfig-iface.c | 51 ++++++++++++++++++ - libgimpconfig/gimpconfig-iface.h | 69 + libgimpconfig/gimpconfig-iface.c | 51 ++++++++++++++++++ + libgimpconfig/gimpconfig-iface.h | 69 +++++++++++++----------- 3 files changed, 92 insertions(+), 31 deletions(-) commit 93d8b91d4916f5ebd961200756a10a69c5a431d8 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Sep 19 15:55:22 2009 +0200 +Date: Sat Sep 19 15:55:22 2009 +0200 app: Also allow GIMP_DEBUG as debug environment variable @@ -82118,7 +82953,7 @@ commit 82c48eeb9ee8ce9f264c8dfeab1401b850e7ad56 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Sep 17 14:50:23 2009 +0200 +Date: Thu Sep 17 14:50:23 2009 +0200 Indentation fix @@ -82127,33 +82962,33 @@ commit b77cbdf3a1195e96c7a0d1a41790a380c7db7651 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Sep 17 09:10:39 2009 +0200 +Date: Thu Sep 17 09:10:39 2009 +0200 More tool event log output and some minor whitespace cleanup app/display/gimpdisplayshell-callbacks.c | 48 ++++++++++++++++---------------- - app/display/gimpdisplayshell-coords.c | 15 +++++----- + app/display/gimpdisplayshell-coords.c | 15 +++++----- 2 files changed, 31 insertions(+), 32 deletions(-) commit fca590925be74f68b0f813d1df21d2f599bc91e0 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Sep 19 12:52:09 2009 +0200 +Date: Sat Sep 19 12:52:09 2009 +0200 app/tests: Add dockrc to session regression testing Add dockrc to session regression testing and do some general cleanups and generalizations in the test. - app/tests/gimpdir/.gitignore | 1 - - app/tests/gimpdir/dockrc | 42 ++++++++++++ + app/tests/gimpdir/.gitignore | 1 - + app/tests/gimpdir/dockrc | 42 ++++++++++++ app/tests/test-session-management.c | 123 +++++++++++++++++++++++------------- 3 files changed, 121 insertions(+), 45 deletions(-) commit d9f89832c76de2fa04829e013d5b56a79a2c787b Author: Khaled Hosny <khaledhosny@eglug.org> -Date: Sat Sep 19 03:24:07 2009 +0200 +Date: Sat Sep 19 03:24:07 2009 +0200 Updated Arabic translation @@ -82163,7 +82998,7 @@ commit 6e0befa6ba87823df645ad3e153f4f68111a6894 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Sep 17 01:12:21 2009 +0200 +Date: Thu Sep 17 01:12:21 2009 +0200 app: Add regression testing for sessionrc/docks @@ -82175,17 +83010,17 @@ created, and then that the content of the new file is identical to the old one. - app/tests/.gitignore | 1 + - app/tests/Makefile.am | 12 +-- - app/tests/gimpdir/.gitignore | 1 - - app/tests/gimpdir/sessionrc | 86 +++++++++++++++++++ + app/tests/.gitignore | 1 + + app/tests/Makefile.am | 12 +-- + app/tests/gimpdir/.gitignore | 1 - + app/tests/gimpdir/sessionrc | 86 +++++++++++++++++++ app/tests/test-session-management.c | 160 ++++++++++++++++++++++++++++++++++++ 5 files changed, 254 insertions(+), 6 deletions(-) commit dc51d8167140e3356da9cfcbf1c3780e3f57fbfc Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Sep 17 00:16:42 2009 +0200 +Date: Thu Sep 17 00:16:42 2009 +0200 app: Don't use the gimpdir for WM tests @@ -82198,7 +83033,7 @@ commit 05eb29b7668b1c2e00950c2a27ee26b10ba45815 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Sep 17 00:20:39 2009 +0200 +Date: Thu Sep 17 00:20:39 2009 +0200 app: Don't blindly increment last-tip-shown @@ -82212,7 +83047,7 @@ commit 1923280e5719af3c50cfda3a076e4174fbbe715f Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Sep 17 00:12:23 2009 +0200 +Date: Thu Sep 17 00:12:23 2009 +0200 app: Add gimp_test_run_temp_mainloop() @@ -82221,40 +83056,40 @@ state to settle before doing tests. app/tests.c | 33 +++++++++++++++++++++++++++++++++ - app/tests.h | 7 ++++--- + app/tests.h | 7 ++++--- 2 files changed, 37 insertions(+), 3 deletions(-) commit 0601229f9feac47f72851dc3e10c3c1d8aa1ea4f Author: Martin Nordholts <martinn@src.gnome.org> -Date: Wed Sep 16 22:58:41 2009 +0200 +Date: Wed Sep 16 22:58:41 2009 +0200 app: Add show_gui parameter to gimp_init_for_gui_testing() Add show_gui parameter to gimp_init_for_gui_testing() so that we can have tests that shows the the actual GIMP interface. - app/tests.c | 6 +++--- - app/tests.h | 3 ++- + app/tests.c | 6 +++--- + app/tests.h | 3 ++- app/tests/test-window-management.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) commit c847b56d0ee5f6cf6bb8e1f078fac7530083926d Author: Martin Nordholts <martinn@src.gnome.org> -Date: Wed Sep 16 18:41:36 2009 +0200 +Date: Wed Sep 16 18:41:36 2009 +0200 app: Add GIMPDIR for tests Add GIMPDIR for tests, both to get rid of warning about missing tags.xml and for future usage. - app/tests/Makefile.am | 2 +- + app/tests/Makefile.am | 2 +- app/tests/gimpdir/.gitignore | 11 +++++++++++ app/tests/gimpdir/tags.xml | 24 ++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) commit fb549cdabff67a70055147952e89cdc157bd262c Author: Martin Nordholts <martinn@src.gnome.org> -Date: Wed Sep 16 17:58:53 2009 +0200 +Date: Wed Sep 16 17:58:53 2009 +0200 app: Call gimp_exit() in tests to avoid warnings about broken pipes @@ -82263,7 +83098,7 @@ commit 9bf17abd75ffe2adace964475053a0de69312d79 Author: Julien Hardelin <jm.hard@wanadoo.fr> -Date: Wed Sep 16 23:25:43 2009 +0200 +Date: Wed Sep 16 23:25:43 2009 +0200 Updated French translation @@ -82273,7 +83108,7 @@ commit ab6406faa88781475b41436c19d3d41d30afc25e Author: Michael Natterer <mitch@gimp.org> -Date: Wed Sep 16 22:08:36 2009 +0200 +Date: Wed Sep 16 22:08:36 2009 +0200 gui_sanity_check(): bump GTK+ version here too @@ -82282,7 +83117,7 @@ commit 699b112940cd3cbf3600c37e1abdb4f06243768e Author: Michael Natterer <mitch@gimp.org> -Date: Wed Sep 16 22:04:17 2009 +0200 +Date: Wed Sep 16 22:04:17 2009 +0200 Require GTK+ >= 2.16.6 @@ -82293,7 +83128,7 @@ commit ff3ca8eee3242a0112725c0ae99410cb0bd0c4ce Author: Michael Natterer <mitch@gimp.org> -Date: Wed Sep 16 20:00:48 2009 +0200 +Date: Wed Sep 16 20:00:48 2009 +0200 Don't lose the active item when reordering between containers of a tree @@ -82306,7 +83141,7 @@ commit ebe72148dd8761a3862e45d58dc82d4e77337c6b Author: Michael Natterer <mitch@gimp.org> -Date: Wed Sep 16 19:53:13 2009 +0200 +Date: Wed Sep 16 19:53:13 2009 +0200 Add new vfunc GimpContainerView::insert_item_after() @@ -82321,7 +83156,7 @@ commit 6700caafb25201a50c34715117f356246334b6ac Author: Sven Neumann <sven@gimp.org> -Date: Tue Sep 15 22:54:49 2009 +0200 +Date: Tue Sep 15 22:54:49 2009 +0200 Fix error handling in gimp-file-save PDB invoker @@ -82331,7 +83166,7 @@ commit 8734c711506526b4dfdb1a3624d7c4bf00da865d Author: Michael Natterer <mitch@gimp.org> -Date: Tue Sep 15 21:03:37 2009 +0200 +Date: Tue Sep 15 21:03:37 2009 +0200 Build "tests" after "." @@ -82340,7 +83175,7 @@ commit 276d8aa599bab5d0774a97e1b0d85924a9f52c5f Author: Claude Paroz <claude@2xlibre.net> -Date: Tue Sep 15 14:00:52 2009 +0200 +Date: Tue Sep 15 14:00:52 2009 +0200 Updated French translation @@ -82352,7 +83187,7 @@ commit e87ed66ba7365efb385a4a4f51ba0a22aca1ec7a Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Sep 15 07:58:14 2009 +0200 +Date: Tue Sep 15 07:58:14 2009 +0200 app: Don't cast GimpDock to GimpDockWindow @@ -82370,7 +83205,7 @@ commit 17f0b1aa1eda7b553870d17fa3e3947359390897 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Sep 15 07:17:00 2009 +0200 +Date: Tue Sep 15 07:17:00 2009 +0200 app: Add and use windows_menu_dock_to_merge_id() @@ -82380,7 +83215,7 @@ commit 8ffda9d20f4d9c669835b2801e693c28658556d3 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon Sep 14 23:36:03 2009 +0200 +Date: Mon Sep 14 23:36:03 2009 +0200 app: Add and use windows_actions_dock_to_action_name() @@ -82391,7 +83226,7 @@ commit 531c3d6253a4147ded270f6564ed1128f5506315 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon Sep 14 23:23:10 2009 +0200 +Date: Mon Sep 14 23:23:10 2009 +0200 app: Update default export filename precedences @@ -82404,21 +83239,21 @@ commit 5df0aa7b417f880f00c27065ea72f48726004665 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 14 21:41:09 2009 +0200 +Date: Mon Sep 14 21:41:09 2009 +0200 Bug 594983 - Build fails with "--enable-gtk-doc-app" Tons of doc updates, it's almost up-to-date now. Also fixes the build. - devel-docs/app/app-docs.sgml | 39 +- + devel-docs/app/app-docs.sgml | 39 +- devel-docs/app/app-sections.txt | 822 ++++++++++++++++++++++++++++++++-------- - devel-docs/app/app.types | 18 +- + devel-docs/app/app.types | 18 +- 3 files changed, 709 insertions(+), 170 deletions(-) commit 61e76b4bff19991b2a51409fb2772fe5660f7dba Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 14 21:40:09 2009 +0200 +Date: Mon Sep 14 21:40:09 2009 +0200 Random doc fixes @@ -82427,7 +83262,7 @@ commit 2c43da09e08ccbd90bc233c8597ee97764e5e5c2 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 14 21:39:46 2009 +0200 +Date: Mon Sep 14 21:39:46 2009 +0200 Random doc fixes @@ -82436,7 +83271,7 @@ commit be23b17a173add4d68bad7e57bbe3f6d7f902f79 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 14 21:39:19 2009 +0200 +Date: Mon Sep 14 21:39:19 2009 +0200 Add missing boilerplate macro @@ -82445,7 +83280,7 @@ commit b5b8aff42d581ffb11c5a790d0de0e907ac36741 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 14 21:38:30 2009 +0200 +Date: Mon Sep 14 21:38:30 2009 +0200 Make class and instance structs public @@ -82458,7 +83293,7 @@ commit 17f345fa1a91cbe1ee56d44304d51707e14a8568 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 14 21:37:53 2009 +0200 +Date: Mon Sep 14 21:37:53 2009 +0200 Add missing boilterplate macro @@ -82467,7 +83302,7 @@ commit 892363605cd749a8dbcc8839f14346e155c10650 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 14 21:36:50 2009 +0200 +Date: Mon Sep 14 21:36:50 2009 +0200 Random doc fix @@ -82476,7 +83311,7 @@ commit 1cf5bfd9c070b81d43873b8cbe9c8213979040cf Author: Claude Paroz <claude@2xlibre.net> -Date: Sun Sep 13 23:04:27 2009 +0200 +Date: Sun Sep 13 23:04:27 2009 +0200 Updated French translation @@ -82488,7 +83323,7 @@ commit fd224caa103bc5c4b433b64444e23e42cd4ee86b Author: Michael Natterer <mitch@gimp.org> -Date: Sun Sep 13 22:39:01 2009 +0200 +Date: Sun Sep 13 22:39:01 2009 +0200 Make sure don't lose the selected item when the tree get collapsed @@ -82507,7 +83342,7 @@ commit 717b4e6a07b5a30e4e303695e34ac1a1929e6e4d Author: Michael Natterer <mitch@gimp.org> -Date: Sun Sep 13 19:24:19 2009 +0200 +Date: Sun Sep 13 19:24:19 2009 +0200 Fix undoing a group layer type conversion @@ -82533,26 +83368,26 @@ * app/core/gimpgrouplayer.c: push a group layer convert undo so this can be properly undone/redone. - app/core/core-enums.c | 2 ++ - app/core/core-enums.h | 1 + - app/core/gimpchannel.c | 2 +- + app/core/core-enums.c | 2 ++ + app/core/core-enums.h | 1 + + app/core/gimpchannel.c | 2 +- app/core/gimpdrawable-convert.c | 12 +++---- app/core/gimpdrawable-convert.h | 6 ++-- - app/core/gimpdrawable.c | 18 ++++++---- - app/core/gimpdrawable.h | 6 ++-- - app/core/gimpgrouplayer.c | 13 +++++-- - app/core/gimpgrouplayerundo.c | 77 + app/core/gimpdrawable.c | 18 ++++++---- + app/core/gimpdrawable.h | 6 ++-- + app/core/gimpgrouplayer.c | 13 +++++-- + app/core/gimpgrouplayerundo.c | 77 ++++++++++++++++++++++++++++++++--------- - app/core/gimpgrouplayerundo.h | 4 ++- - app/core/gimpimage-convert.c | 3 +- + app/core/gimpgrouplayerundo.h | 4 ++- + app/core/gimpimage-convert.c | 3 +- app/core/gimpimage-undo-push.c | 16 +++++++++ app/core/gimpimage-undo-push.h | 3 ++ - app/core/gimplayer.c | 15 ++++---- + app/core/gimplayer.c | 15 ++++---- 14 files changed, 133 insertions(+), 45 deletions(-) commit 2ac7cedbfcfb65326020b5b4bacc87395cbb94c9 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Sep 13 16:30:09 2009 +0200 +Date: Sun Sep 13 16:30:09 2009 +0200 app: Make GimpDockbook instance data private @@ -82562,17 +83397,17 @@ app/actions/dockable-actions.c | 9 ++-- app/actions/dockable-commands.c | 21 +++++----- app/widgets/gimpdialogfactory.c | 2 +- - app/widgets/gimpdock.c | 10 ++--- - app/widgets/gimpdockable.c | 4 +- - app/widgets/gimpdockbook.c | 92 + app/widgets/gimpdock.c | 10 ++--- + app/widgets/gimpdockable.c | 4 +- + app/widgets/gimpdockbook.c | 92 +++++++++++++++++++++++++++++------------ - app/widgets/gimpdockbook.h | 17 ++++---- + app/widgets/gimpdockbook.h | 17 ++++---- app/widgets/gimpdockseparator.c | 2 +- 8 files changed, 102 insertions(+), 55 deletions(-) commit 67128d6034ee6d311201cab5f5227ec5fef1c764 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Sep 13 14:14:08 2009 +0200 +Date: Sun Sep 13 14:14:08 2009 +0200 app: Add GimpDock::set_host_geometry_hints() @@ -82595,7 +83430,7 @@ commit a23a220d60c34cc62fc98178fb04c27dd05ff61e Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Sep 13 13:14:18 2009 +0200 +Date: Sun Sep 13 13:14:18 2009 +0200 app: Add and use GimpDockWindow window title infrastructure @@ -82616,7 +83451,7 @@ commit 0d4e8d05263a4589ec843bcc0d785b8b9a56f223 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Sep 13 12:04:50 2009 +0200 +Date: Sun Sep 13 12:04:50 2009 +0200 app: Move 'Recently Closed Docks' logic to GimpDockWindow @@ -82631,7 +83466,7 @@ commit dc3521e074b409748e0067b338ad3b853b983622 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Sep 13 11:51:39 2009 +0200 +Date: Sun Sep 13 11:51:39 2009 +0200 app: Add and use gimp_dock_get_n_dockables() @@ -82641,7 +83476,7 @@ commit fb99f997880cc5d98c35150946873bc33e95850d Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Sep 13 11:23:02 2009 +0200 +Date: Sun Sep 13 11:23:02 2009 +0200 Move dock window themeing to GimpDockWindow @@ -82659,13 +83494,13 @@ app/widgets/gimpdockwindow.c | 100 +++++++++++++++++++++++++++++++++++++++++- app/widgets/gimpdockwindow.h | 1 + - themes/Default/gtkrc | 4 +- - themes/Small/gtkrc | 4 +- + themes/Default/gtkrc | 4 +- + themes/Small/gtkrc | 4 +- 7 files changed, 119 insertions(+), 103 deletions(-) commit fc3ab53645500743f9b8be95a2fd3da1d88b68b0 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Sep 13 11:08:38 2009 +0200 +Date: Sun Sep 13 11:08:38 2009 +0200 app: Get rid of GimpImageDock typedef @@ -82674,7 +83509,7 @@ commit 12494097b00fa3fc70cc8c59adebd37ccc88e204 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Sep 13 10:14:26 2009 +0200 +Date: Sun Sep 13 10:14:26 2009 +0200 app: Explicitly init dialog_factory member in GimpDockWindow::_init() @@ -82683,7 +83518,7 @@ commit 88e6fe1e6281c497a0db67aabc00cda48c5f12a1 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Sep 13 09:49:56 2009 +0200 +Date: Sun Sep 13 09:49:56 2009 +0200 app: Add GimpDialogFactory property to GimpDockWindow @@ -82699,27 +83534,27 @@ commit 0fc1a32ad048c67df6d6f070062168dba22fe358 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Sep 13 09:31:21 2009 +0200 +Date: Sun Sep 13 09:31:21 2009 +0200 app: Kill GimpImageDock Get rid of GimpImageDock and make its subclasses inherit directly from GimpDock instead. - app/widgets/Makefile.am | 2 -- - app/widgets/gimpdockbook.c | 4 ++-- + app/widgets/Makefile.am | 2 -- + app/widgets/gimpdockbook.c | 4 ++-- app/widgets/gimpimagedock.c | 43 ----------------------------------- app/widgets/gimpimagedock.h | 55 --------------------------------------------- - app/widgets/gimpmenudock.c | 2 +- - app/widgets/gimpmenudock.h | 6 ++--- - app/widgets/gimptoolbox.c | 2 +- - app/widgets/gimptoolbox.h | 6 ++--- + app/widgets/gimpmenudock.c | 2 +- + app/widgets/gimpmenudock.h | 6 ++--- + app/widgets/gimptoolbox.c | 2 +- + app/widgets/gimptoolbox.h | 6 ++--- 8 files changed, 10 insertions(+), 110 deletions(-) commit 3532acbec66d6cd275d9d062197ee414178d91ea Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Sep 13 09:22:59 2009 +0200 +Date: Sun Sep 13 09:22:59 2009 +0200 app: Move UI manager from GimpImageDock to GimpDockWindow @@ -82741,19 +83576,19 @@ commit f5d1c1ba4d7236a9fcde18df062857d78e18e1e8 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Sep 12 22:19:39 2009 +0200 +Date: Sat Sep 12 22:19:39 2009 +0200 app: Add and use gimp_image_dock_get_ui_manager() - app/widgets/gimpdockbook.c | 4 ++-- - app/widgets/gimpimagedock.c | 8 ++++++++ - app/widgets/gimpimagedock.h | 3 ++- + app/widgets/gimpdockbook.c | 4 ++-- + app/widgets/gimpimagedock.c | 8 ++++++++ + app/widgets/gimpimagedock.h | 3 ++- app/widgets/gimptoolbox.c | 15 ++++++++------- 4 files changed, 20 insertions(+), 10 deletions(-) commit e2c02dbc1220b6dac121821fc77c633450d3b372 Author: Julien Hardelin <jhardlin@wanadoo.fr> -Date: Sat Sep 12 22:17:12 2009 +0200 +Date: Sat Sep 12 22:17:12 2009 +0200 Updated French translation @@ -82763,7 +83598,7 @@ commit 65e09758ef6ab1b2f0391da8bc4870a20597afa0 Author: Sven Neumann <sven@gimp.org> -Date: Sat Sep 12 20:33:25 2009 +0200 +Date: Sat Sep 12 20:33:25 2009 +0200 Bug 595003 - Error in string "Lower this tool Lower this tool..." @@ -82774,7 +83609,7 @@ commit 2af860e6a638099d46f71d62445c575f96b6513a Author: Michael Natterer <mitch@gimp.org> -Date: Sat Sep 12 19:24:01 2009 +0200 +Date: Sat Sep 12 19:24:01 2009 +0200 Add GimpProjectable::get_image_type() @@ -82793,7 +83628,7 @@ GimpProjectable::get_image_type(). app/core/gimpgrouplayer.c | 1 + - app/core/gimpimage.c | 13 +++++++++++++ + app/core/gimpimage.c | 13 +++++++++++++ app/core/gimpprojectable.c | 15 +++++++++++++++ app/core/gimpprojectable.h | 40 +++++++++++++++++++++------------------- app/core/gimpprojection.c | 7 ++++++- @@ -82801,7 +83636,7 @@ commit 8794d2481a9632f4d5fca9df1198c9e32c06f480 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Sep 12 14:57:46 2009 +0200 +Date: Sat Sep 12 14:57:46 2009 +0200 Bug 594998 - Keyboard shortcuts does not work for first image when dock is focused @@ -82815,7 +83650,7 @@ commit e2388ed1234033adaebbcff1394520e9b8b111b7 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Sep 12 13:29:18 2009 +0200 +Date: Sat Sep 12 13:29:18 2009 +0200 app: Clarify why each dock has its own context @@ -82824,7 +83659,7 @@ commit 22f2586cc9c8c4b12e59fd2e24b3a5c7c3f5dd67 Author: Hleb Valoshka <375gnu@gmail.com> -Date: Sat Sep 12 13:51:42 2009 +0300 +Date: Sat Sep 12 13:51:42 2009 +0300 Updated Belarusian translation @@ -82832,14 +83667,14 @@ po-plug-ins/be.po | 7274 +++++++++++++++++++------------------- po-python/be.po | 212 +- po-script-fu/be.po | 632 ++-- - po-tips/be.po | 300 +- - po/be.po | 9779 + po-tips/be.po | 300 +- + po/be.po | 9779 +++++++++++++++++++++++++++++++--------------------- 6 files changed, 11038 insertions(+), 8853 deletions(-) commit 0f918e75a44a4e917c26a19370aff4007a42e6c8 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Sep 11 22:01:31 2009 +0200 +Date: Fri Sep 11 22:01:31 2009 +0200 Implement GimpDrawable::convert_type() @@ -82851,7 +83686,7 @@ commit 53c9eeee828ff004c431c65dbde66649d7b0a466 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Sep 11 21:32:37 2009 +0200 +Date: Fri Sep 11 21:32:37 2009 +0200 Use gimp_drawable_convert_type() to convert to gray and rgb @@ -82860,7 +83695,7 @@ commit cd60b9ef5c24dc5d32f83ebfa9b08efde2e8e1cd Author: Michael Natterer <mitch@gimp.org> -Date: Fri Sep 11 21:31:55 2009 +0200 +Date: Fri Sep 11 21:31:55 2009 +0200 gimp_channel_convert(): use gimp_drawable_convert_type() @@ -82869,7 +83704,7 @@ commit c6fb6d0cebea13502d0be97580cf153eafb07c15 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Sep 11 21:28:52 2009 +0200 +Date: Fri Sep 11 21:28:52 2009 +0200 Implement GimpDrawable::convert_type() @@ -82885,7 +83720,7 @@ commit 86a264e9f2c4e7291d9c7f29d939b0303bb4a11a Author: Michael Natterer <mitch@gimp.org> -Date: Fri Sep 11 21:23:35 2009 +0200 +Date: Fri Sep 11 21:23:35 2009 +0200 Add new virtual function GimpDrawable::convert_type() @@ -82908,7 +83743,7 @@ commit f857e70e264699e9ff121c3f2e11b7fcfe4f23b6 Author: Manish Singh <yosh@gimp.org> -Date: Fri Sep 11 12:58:13 2009 -0700 +Date: Fri Sep 11 12:58:13 2009 -0700 Ignore libapp.a @@ -82917,7 +83752,7 @@ commit 2182dec09bee12db007b28f0797dc111ea6a1ec2 Author: Manish Singh <yosh@gimp.org> -Date: Fri Sep 11 12:55:25 2009 -0700 +Date: Fri Sep 11 12:55:25 2009 -0700 Bug 594651 - layer.scale() raises RuntimeError @@ -82928,7 +83763,7 @@ commit 45a8d1f4878b17acbd2ac7e306d7a53e2156d619 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Sep 10 22:25:00 2009 +0200 +Date: Thu Sep 10 22:25:00 2009 +0200 app: Pass dock roles as construction parameters @@ -82943,7 +83778,7 @@ commit 5b74dd27ef713b6853d9a314dfffa3e32842e6ed Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Sep 10 22:13:21 2009 +0200 +Date: Thu Sep 10 22:13:21 2009 +0200 app: Move window init code from GimpDock to GimpDockWindow @@ -82956,7 +83791,7 @@ commit 26fbeebf02f4eb377eea4b5f4fd1fbf3203068fd Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Sep 10 22:03:04 2009 +0200 +Date: Thu Sep 10 22:03:04 2009 +0200 app: Set the dock-window-hint centrally in GimpDockWindow @@ -82970,7 +83805,7 @@ commit 81d961423a27e2ce1ffb1a7919cca30dbe80374e Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Sep 10 21:34:49 2009 +0200 +Date: Thu Sep 10 21:34:49 2009 +0200 app: Add GimpContext property to GimpDockWindow @@ -82986,7 +83821,7 @@ commit 15497c1d6808b1ea479574b0b3e132484f7f172f Author: Manish Singh <yosh@gimp.org> -Date: Wed Sep 9 17:41:20 2009 -0700 +Date: Wed Sep 9 17:41:20 2009 -0700 Explicit shared lib deps to support gold @@ -82995,7 +83830,7 @@ commit 3682f7680fe7b88c85ae2983954aa2cf9c0df0a1 Author: Manish Singh <yosh@gimp.org> -Date: Wed Sep 9 17:38:42 2009 -0700 +Date: Wed Sep 9 17:38:42 2009 -0700 Fix syntax error @@ -83004,7 +83839,7 @@ commit 76a2522a43b78821784f58ff2d7c283818ecbab8 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Wed Sep 9 23:40:44 2009 +0200 +Date: Wed Sep 9 23:40:44 2009 +0200 app: Cleanup PROP_WEB_BROWSER code @@ -83013,7 +83848,7 @@ commit e1faf82e7d9a9dd31c5e7e88abc45c92b3cc603b Author: Martin Nordholts <martinn@src.gnome.org> -Date: Wed Sep 9 23:34:18 2009 +0200 +Date: Wed Sep 9 23:34:18 2009 +0200 Get rid of toolbox-window-hint, use dock-window-hint instead @@ -83021,18 +83856,18 @@ same hint for the toolbox (which actually is a dock) as for the other docks. - app/config/gimpguiconfig.c | 23 +++++++++-------------- - app/config/gimpguiconfig.h | 1 - - app/config/gimprc-blurbs.h | 9 +++------ + app/config/gimpguiconfig.c | 23 +++++++++-------------- + app/config/gimpguiconfig.h | 1 - + app/config/gimprc-blurbs.h | 9 +++------ app/dialogs/preferences-dialog.c | 8 ++------ - app/widgets/gimptoolbox.c | 2 +- - docs/gimprc.5.in | 13 +++---------- - etc/gimprc | 12 +++--------- + app/widgets/gimptoolbox.c | 2 +- + docs/gimprc.5.in | 13 +++---------- + etc/gimprc | 12 +++--------- 7 files changed, 21 insertions(+), 47 deletions(-) commit 0110eb0cdf0a20d517c39d5d78739457fa42f7d4 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Wed Sep 9 18:15:34 2009 +0200 +Date: Wed Sep 9 18:15:34 2009 +0200 app: Introduce GimpDockWindow @@ -83054,7 +83889,7 @@ commit 45f05b272c812a940cd844671d5b50d9116a0552 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Sep 8 22:09:53 2009 +0200 +Date: Tue Sep 8 22:09:53 2009 +0200 gimp_item_real_duplicate(): don't set lock-content if it can't be set @@ -83066,7 +83901,7 @@ commit a8b0e3c943184e56c849bc5fdad9cad0de56b260 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Sep 8 22:09:03 2009 +0200 +Date: Tue Sep 8 22:09:03 2009 +0200 gimp_layer_duplicate(): don't set lock-alpha if it can't be set @@ -83075,7 +83910,7 @@ commit 0c57e8c68e256b81cda1de7b8aca66cdfd4afe04 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Sep 8 20:54:51 2009 +0200 +Date: Tue Sep 8 20:54:51 2009 +0200 gimp_layer_transform_color(): don't assume the dest region has alpha @@ -83088,7 +83923,7 @@ commit f2f741a26e5a796ec8f17fcf47d4a0e15e285c4d Author: Michael Natterer <mitch@gimp.org> -Date: Tue Sep 8 20:36:51 2009 +0200 +Date: Tue Sep 8 20:36:51 2009 +0200 Add gimp_drawable_convert_rgb() and gimp_drawable_convert_grayscale() @@ -83097,18 +83932,18 @@ fiddling from all callers and leave it there only for converting to indexed. - app/core/gimpchannel.c | 16 +------------ + app/core/gimpchannel.c | 16 +------------ app/core/gimpdrawable-convert.c | 52 +++++++++++++++++++++++++++++++++++++++++ app/core/gimpdrawable-convert.h | 3 +++ - app/core/gimpimage-convert.c | 48 + app/core/gimpimage-convert.c | 48 ++++++++++++++++++++----------------- - app/core/gimplayer.c | 39 +++++++++++++++---------------- + app/core/gimplayer.c | 39 +++++++++++++++---------------- 5 files changed, 101 insertions(+), 57 deletions(-) commit 83c79bad5d2018adb9c13ab57ef63b846dcb3383 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Sep 8 19:57:50 2009 +0200 +Date: Tue Sep 8 19:57:50 2009 +0200 Use gboolean instead of gint for boolean value @@ -83117,7 +83952,7 @@ commit f3bae9ac57a16533bd3bf69c723741da30e4d132 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Sep 8 17:49:48 2009 +0200 +Date: Tue Sep 8 17:49:48 2009 +0200 Remove "old_base_type" parameters from gimp_drawable_convert_tiles_foo() @@ -83125,16 +83960,16 @@ I have no idea how ancient these parameters were, but the drawable knows about its type itself, so no need to pass it in. - app/core/gimpchannel.c | 11 ++++------- + app/core/gimpchannel.c | 11 ++++------- app/core/gimpdrawable-convert.c | 20 +++++++++++--------- app/core/gimpdrawable-convert.h | 10 ++++------ - app/core/gimpimage-convert.c | 4 ++-- - app/core/gimplayer.c | 19 ++++++------------- + app/core/gimpimage-convert.c | 4 ++-- + app/core/gimplayer.c | 19 ++++++------------- 5 files changed, 27 insertions(+), 37 deletions(-) commit 1ecf6b5bc87caa6822956bdcca96b9076f595268 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Sep 8 17:13:46 2009 +0200 +Date: Tue Sep 8 17:13:46 2009 +0200 Rename the functions in gimpdrawable-convert.[ch] @@ -83142,26 +83977,26 @@ gimp_drawable_convert_tiles_foo() because they don't convert the drawable itself, they convert its tiles into passed-in tiles. - app/core/gimpchannel.c | 2 +- + app/core/gimpchannel.c | 2 +- app/core/gimpdrawable-convert.c | 12 ++++++------ app/core/gimpdrawable-convert.h | 12 ++++++------ - app/core/gimpimage-convert.c | 8 ++++---- - app/core/gimplayer.c | 18 +++++++++--------- + app/core/gimpimage-convert.c | 8 ++++---- + app/core/gimplayer.c | 18 +++++++++--------- 5 files changed, 26 insertions(+), 26 deletions(-) commit e77f6b10f4309cd4300fe900dd0210bc0518bddc Author: Michael Natterer <mitch@gimp.org> -Date: Tue Sep 8 17:07:33 2009 +0200 +Date: Tue Sep 8 17:07:33 2009 +0200 Use gimp_drawable_type() instead of drawable->type app/core/gimpdrawablemodundo.c | 2 +- - app/core/gimplayer.c | 4 +--- + app/core/gimplayer.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) commit 13ac22d8005b7fb1cb1eb801c87e47d2849a9968 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Sep 8 15:23:57 2009 +0200 +Date: Tue Sep 8 15:23:57 2009 +0200 Add %T which expends to the active drawable's type @@ -83173,7 +84008,7 @@ commit 42fe565f5d4543cc376e52e779bfd6336fab166e Author: Michael Natterer <mitch@gimp.org> -Date: Tue Sep 8 15:05:09 2009 +0200 +Date: Tue Sep 8 15:05:09 2009 +0200 Add the new drawable and vectors lock-content APIs to the docs @@ -83185,7 +84020,7 @@ commit 332ebeb5d3ca156e2df757b393f073b0bb998270 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Sep 8 15:04:05 2009 +0200 +Date: Tue Sep 8 15:04:05 2009 +0200 Add enum GimpTextHintStyle and gimp_rectangle_union() to the docs @@ -83196,7 +84031,7 @@ commit d1f767d9b6a8e05470314d6821ffd41225045c0f Author: Michael Natterer <mitch@gimp.org> -Date: Tue Sep 8 10:23:47 2009 +0200 +Date: Tue Sep 8 10:23:47 2009 +0200 Make gimp_image_get_layer,channel,vectors_by_name,tattoo() more readable @@ -83209,19 +84044,19 @@ commit 810f325a162b500901445b4d82a48b472ff1cd9e Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Sep 8 19:32:39 2009 +0200 +Date: Tue Sep 8 19:32:39 2009 +0200 app: Add regression test for window roles - app/tests/.gitignore | 1 + - app/tests/Makefile.am | 35 +++++++++++--- + app/tests/.gitignore | 1 + + app/tests/Makefile.am | 35 +++++++++++--- app/tests/test-window-management.c | 94 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 6 deletions(-) commit 86f8e996d7f077880724b293092a24a1f6466fe5 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Sep 8 19:28:43 2009 +0200 +Date: Tue Sep 8 19:28:43 2009 +0200 app: Add gimp_init_for_gui_testing() @@ -83231,12 +84066,12 @@ app/tests.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- - app/tests.h | 3 ++- + app/tests.h | 3 ++- 2 files changed, 57 insertions(+), 3 deletions(-) commit b61c971f22019a0adbc003eafff5160b2b0a1430 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Sep 8 19:26:57 2009 +0200 +Date: Tue Sep 8 19:26:57 2009 +0200 app: Add gimp_set/get_show_gui() @@ -83245,12 +84080,12 @@ app/core/gimp.c | 32 ++++++++++++++++++++++++++++++++ app/core/gimp.h | 4 ++++ - app/gui/gui.c | 22 ++++++++++++++-------- + app/gui/gui.c | 22 ++++++++++++++-------- 3 files changed, 50 insertions(+), 8 deletions(-) commit a8e5dea3092bb487bf1268e486ad30b7416a274d Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Sep 8 08:38:51 2009 +0200 +Date: Tue Sep 8 08:38:51 2009 +0200 app: Print error message when tag cache parsing fails @@ -83259,7 +84094,7 @@ commit 67847b4aca34dbd3ecb6a4d23123807a08f98fad Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 7 23:05:25 2009 +0200 +Date: Mon Sep 7 23:05:25 2009 +0200 Add section for 2.7.1 and the changes that happened so far @@ -83268,7 +84103,7 @@ commit 3e6f6088ee145b5874ea0402af6043f3dea7d236 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon Sep 7 22:51:41 2009 +0200 +Date: Mon Sep 7 22:51:41 2009 +0200 app: Create libapp.a for convenient test case linking @@ -83281,7 +84116,7 @@ commit 84b02fb97837692d040382717730646a45be1349 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 7 21:09:24 2009 +0200 +Date: Mon Sep 7 21:09:24 2009 +0200 Refuse to convert layer trees to indexed @@ -83292,7 +84127,7 @@ commit 60ac874cd01f2b797409b30ddde95dbf218552fa Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 7 21:08:25 2009 +0200 +Date: Mon Sep 7 21:08:25 2009 +0200 Refuse to add group layers to indexed images @@ -83301,7 +84136,7 @@ commit 1961036f5e0fd6de32551583c5615b7f4adfaead Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 7 21:07:44 2009 +0200 +Date: Mon Sep 7 21:07:44 2009 +0200 Add gimp_item_stack_is_flat() which returns TRUE if it's not a tree @@ -83311,7 +84146,7 @@ commit 5bb149fa9d7c028d2210e23cda7531080258fd3e Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 7 20:52:10 2009 +0200 +Date: Mon Sep 7 20:52:10 2009 +0200 Add some more checks that come for free to the existing tests @@ -83321,7 +84156,7 @@ commit a0914f8df1d580ae4382161747f5e96c209bcb7d Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 7 19:11:21 2009 +0200 +Date: Mon Sep 7 19:11:21 2009 +0200 Add test-layers to .gitignore @@ -83330,21 +84165,21 @@ commit a17f7e0d4f9b925cc6df52065ea41989ed807d47 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 7 19:09:48 2009 +0200 +Date: Mon Sep 7 19:09:48 2009 +0200 Add a layers test Contains the add-layers test from the "template" test and also a remove-layers one. - app/tests/Makefile.am | 10 ++- + app/tests/Makefile.am | 10 ++- app/tests/test-layers.c | 180 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 187 insertions(+), 3 deletions(-) commit 654261775136919abd9a3cafe4bc0fe0d5785a6a Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 7 19:06:57 2009 +0200 +Date: Mon Sep 7 19:06:57 2009 +0200 Initialize some more stuff so real tests are possible @@ -83356,14 +84191,14 @@ g_thread_init() so the tile cache works (and to be on the safe side in general). - app/tests.c | 12 +++++++++--- - app/tests.h | 4 +++- + app/tests.c | 12 +++++++++--- + app/tests.h | 4 +++- app/tests/test-layer-grouping.c | 4 +++- 3 files changed, 15 insertions(+), 5 deletions(-) commit 2e2c7aaf346c43c7da95ffe26186f8228b60b9bc Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 7 18:55:18 2009 +0200 +Date: Mon Sep 7 18:55:18 2009 +0200 Minor formatting cleanup @@ -83372,7 +84207,7 @@ commit 4df9b25217c2c654bfde66dc82dca71dca908465 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 7 13:04:55 2009 +0200 +Date: Mon Sep 7 13:04:55 2009 +0200 Add facility to compress multiple group layer resizings into one @@ -83391,23 +84226,23 @@ GimpGroupLayerUndo which implements undos for suspend/resume of group layers and calls them in reverse order when undoing. - app/core/Makefile.am | 2 + - app/core/core-enums.c | 4 ++ - app/core/core-enums.h | 2 + - app/core/core-types.h | 1 + - app/core/gimpgrouplayer.c | 101 + app/core/Makefile.am | 2 + + app/core/core-enums.c | 4 ++ + app/core/core-enums.h | 2 + + app/core/core-types.h | 1 + + app/core/gimpgrouplayer.c | 101 +++++++++++++++++++++++++++++++++++++---- - app/core/gimpgrouplayer.h | 10 +++- - app/core/gimpgrouplayerundo.c | 97 + app/core/gimpgrouplayer.h | 10 +++- + app/core/gimpgrouplayerundo.c | 97 +++++++++++++++++++++++++++++++++++++++ - app/core/gimpgrouplayerundo.h | 49 ++++++++++++++++++++ + app/core/gimpgrouplayerundo.h | 49 ++++++++++++++++++++ app/core/gimpimage-undo-push.c | 40 +++++++++++++++- app/core/gimpimage-undo-push.h | 10 ++++ 10 files changed, 305 insertions(+), 11 deletions(-) commit 6a10485f6b201e7a0b699c403f93b687f429fb68 Author: Inaki Larranaga <dooteo@zundan.com> -Date: Mon Sep 7 12:36:54 2009 +0200 +Date: Mon Sep 7 12:36:54 2009 +0200 Updated Basque translation @@ -83417,7 +84252,7 @@ commit c552d2f065293a1ee7317996231e0b25ca8a63cb Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 7 11:06:12 2009 +0200 +Date: Mon Sep 7 11:06:12 2009 +0200 (SUBDIRS): gegl and text live on top of core, xcf on top of plug-ins @@ -83426,7 +84261,7 @@ commit 56a17ed11845a3fcfcbaeec180b69dca4c8d2fcd Author: Michael Natterer <mitch@gimp.org> -Date: Mon Sep 7 10:13:15 2009 +0200 +Date: Mon Sep 7 10:13:15 2009 +0200 Forgot one "Group Layer" -> "Layer Group" string change @@ -83435,21 +84270,21 @@ commit ef9d82054eada5cbcb3d1015eda7fec6168b1b1d Author: Aron Xu <aronxu@gnome.org> -Date: Mon Sep 7 16:00:16 2009 +0800 +Date: Mon Sep 7 16:00:16 2009 +0800 Updated Simplified Chinese translations. - po-libgimp/zh_CN.po | 26 +- - po-python/zh_CN.po | 177 ++-- - po-tags/LINGUAS | 1 + - po-tags/zh_CN.po | 25 + - po/zh_CN.po | 2873 + po-libgimp/zh_CN.po | 26 +- + po-python/zh_CN.po | 177 ++-- + po-tags/LINGUAS | 1 + + po-tags/zh_CN.po | 25 + + po/zh_CN.po | 2873 ++++++++++++++++++++++++++++----------------------- 5 files changed, 1721 insertions(+), 1381 deletions(-) commit e7e4351ccf3b72045a49fa3175c6ed24e45b65c5 Author: Alexandre Prokoudine <alexandre.prokoudine@gmail.com> -Date: Mon Sep 7 11:53:08 2009 +0400 +Date: Mon Sep 7 11:53:08 2009 +0400 Slightly updated Russian translation @@ -83459,7 +84294,7 @@ commit 2959ccceae1fdb3f3becf34d56d1abf94ddd3bb8 Author: Petr Kovar <pknbe@volny.cz> -Date: Sun Sep 6 01:06:15 2009 +0200 +Date: Sun Sep 6 01:06:15 2009 +0200 Updated Czech translation by Jaroslav Krejci @@ -83469,12 +84304,12 @@ po-plug-ins/cs.po | 6359 +++++++++++++++++++++++++++------------------------- po-script-fu/cs.po | 355 +-- - po/cs.po | 3269 +++++++++++++-------------- + po/cs.po | 3269 +++++++++++++-------------- 4 files changed, 5963 insertions(+), 5673 deletions(-) commit 60b90b817a3952241173c530a603bb27ccd92235 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Sep 6 00:15:25 2009 +0200 +Date: Sun Sep 6 00:15:25 2009 +0200 app: GimpDockPriv -> GimpDockPrivate, priv -> p @@ -83485,21 +84320,21 @@ commit 04ef83c7958fd06c8fa1043b85069cb96f67e782 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Sep 5 23:50:01 2009 +0200 +Date: Sat Sep 5 23:50:01 2009 +0200 app: Add some comments on classes used for the dock system - app/widgets/gimpdock.h | 3 +++ - app/widgets/gimpdockable.h | 5 +++++ - app/widgets/gimpdockbook.h | 4 ++++ - app/widgets/gimpdocked.h | 3 +++ + app/widgets/gimpdock.h | 3 +++ + app/widgets/gimpdockable.h | 5 +++++ + app/widgets/gimpdockbook.h | 4 ++++ + app/widgets/gimpdocked.h | 3 +++ app/widgets/gimpdockseparator.h | 4 ++++ - app/widgets/gimpimagedock.h | 3 +++ + app/widgets/gimpimagedock.h | 3 +++ 6 files changed, 22 insertions(+) commit af3e8948444a0db354d1973e4b80ef09c8165510 Author: Julien Hardelin <jm.hard@wanadoo.fr> -Date: Sat Sep 5 23:26:20 2009 +0200 +Date: Sat Sep 5 23:26:20 2009 +0200 Fix po-script-fu French translation @@ -83508,7 +84343,7 @@ commit 2f678cb7f313b4856660d357b02f35595074c3af Author: Claude Paroz <claude@2xlibre.net> -Date: Sat Sep 5 23:21:26 2009 +0200 +Date: Sat Sep 5 23:21:26 2009 +0200 Completed French translation @@ -83518,7 +84353,7 @@ commit 9534b5b1e11589172744d9e31916bc3e4e434611 Author: Claude Paroz <claude@2xlibre.net> -Date: Sat Sep 5 22:40:55 2009 +0200 +Date: Sat Sep 5 22:40:55 2009 +0200 Merge po-plug-ins French fixes from stable branch and complete file @@ -83528,7 +84363,7 @@ commit 6fd1e5d50b0fcd7321266c6ff12283261de9e019 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Sep 5 19:11:39 2009 +0200 +Date: Sat Sep 5 19:11:39 2009 +0200 app: Compile vectors and paint after core @@ -83540,7 +84375,7 @@ commit 8f999e0842150c286cbf845c9ee18aabd9de0aa9 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Sep 5 16:19:52 2009 +0200 +Date: Sat Sep 5 16:19:52 2009 +0200 app: Don't initialize Gimp verbosely in gimp_init_for_testing() @@ -83552,7 +84387,7 @@ commit d6c8fa9783ff7e08d48760ebbfac7bee3919085b Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Sep 5 16:09:57 2009 +0200 +Date: Sat Sep 5 16:09:57 2009 +0200 app: Update .gitignore @@ -83561,7 +84396,7 @@ commit 071153124aa12a9a886ad271c0a58aaa1d653abb Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Sep 5 16:08:23 2009 +0200 +Date: Sat Sep 5 16:08:23 2009 +0200 app: Reverse order of SUBDIRS @@ -83572,7 +84407,7 @@ commit 14aa5314af3a096e63cef5eb42934106d0a74451 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Sep 5 15:52:01 2009 +0200 +Date: Sat Sep 5 15:52:01 2009 +0200 app: Add GIMP core unit testing framework and a simple first test @@ -83584,19 +84419,19 @@ with a new function gimp_init_for_testing() so that test cases can easily setup the core object system. - app/Makefile.am | 3 + - app/tests.c | 47 +++++++++++++++ - app/tests.h | 23 +++++++ - app/tests/.gitignore | 3 + - app/tests/Makefile.am | 74 +++++++++++++++++++++++ + app/Makefile.am | 3 + + app/tests.c | 47 +++++++++++++++ + app/tests.h | 23 +++++++ + app/tests/.gitignore | 3 + + app/tests/Makefile.am | 74 +++++++++++++++++++++++ app/tests/test-layer-grouping.c | 129 ++++++++++++++++++++++++++++++++++++++++ - configure.ac | 1 + + configure.ac | 1 + 7 files changed, 280 insertions(+) commit df9e9e260990f827b40f9be05114897c571749a2 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Sep 5 15:37:48 2009 +0200 +Date: Sat Sep 5 15:37:48 2009 +0200 Disable layer masks on group layers for the time being @@ -83605,15 +84440,15 @@ it causes crashes. app/actions/layers-actions.c | 2 +- - app/pdb/image-cmds.c | 3 ++- - app/pdb/layer-cmds.c | 3 ++- + app/pdb/image-cmds.c | 3 ++- + app/pdb/layer-cmds.c | 3 ++- tools/pdbgen/pdb/image.pdb | 3 ++- tools/pdbgen/pdb/layer.pdb | 3 ++- 5 files changed, 9 insertions(+), 5 deletions(-) commit 871e41c06230a5dd3cd2db86faac8e677eac35b0 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Sep 5 14:32:32 2009 +0200 +Date: Sat Sep 5 14:32:32 2009 +0200 app: Clean up subsystem linking dependencies @@ -83624,14 +84459,14 @@ * Introducing a helper variable so we can share LDADD between gimp-console and gimp - app/Makefile.am | 172 + app/Makefile.am | 172 +++++++++++++++++++++++++------------------------ app/config/Makefile.am | 24 ++++--- 2 files changed, 102 insertions(+), 94 deletions(-) commit b43659fa6215a9d4bd33f317d8f3a1f6a47e89f8 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Sep 5 14:26:00 2009 +0200 +Date: Sat Sep 5 14:26:00 2009 +0200 app: Fix non-string-literal warning for g_print() test-config.c @@ -83640,11 +84475,11 @@ commit e3175cb155a39c3ef90cbeb95299f982aba957ad Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Sep 5 14:15:43 2009 +0200 +Date: Sat Sep 5 14:15:43 2009 +0200 devel-docs: Add missing "new symbols in GIMP 2.8" - devel-docs/libgimpbase/libgimpbase-docs.sgml | 3 +++ + devel-docs/libgimpbase/libgimpbase-docs.sgml | 3 +++ devel-docs/libgimpcolor/libgimpcolor-docs.sgml | 3 +++ devel-docs/libgimpmodule/libgimpmodule-docs.sgml | 3 +++ devel-docs/libgimpwidgets/libgimpwidgets-docs.sgml | 3 +++ @@ -83652,7 +84487,7 @@ commit 5b85642e94334d20b172422e4bf701b8fb0c962a Author: Michael Natterer <mitch@gimp.org> -Date: Fri Sep 4 11:31:19 2009 +0200 +Date: Fri Sep 4 11:31:19 2009 +0200 Reorder some functions so item and drawable methods are together @@ -83662,7 +84497,7 @@ commit e431f84dae189d336b6d0466842aa7c247eed0f7 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Sep 3 21:52:43 2009 +0200 +Date: Thu Sep 3 21:52:43 2009 +0200 data: Add texture/grunge brushes made by Johannes Engelhardt @@ -83681,7 +84516,7 @@ commit 8405d69e86bfac9c573071920f303d55d4b7a152 Author: Sven Neumann <sven@gimp.org> -Date: Thu Sep 3 20:54:06 2009 +0200 +Date: Thu Sep 3 20:54:06 2009 +0200 formatting @@ -83690,7 +84525,7 @@ commit 9359c5d44fa8e0af467501963b047c0fdbe1e2ef Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Sep 3 20:13:21 2009 +0200 +Date: Thu Sep 3 20:13:21 2009 +0200 app: Escape the file names in export menu items @@ -83702,7 +84537,7 @@ commit c1f3872141b04b7f1dd9c00303ccf269b434cbea Author: Michael Natterer <mitch@gimp.org> -Date: Thu Sep 3 19:11:02 2009 +0200 +Date: Thu Sep 3 19:11:02 2009 +0200 Fix loading of layer masks of group layers @@ -83716,7 +84551,7 @@ commit c8b0cb68fa714ae1fc08ce55dddca3b590b3af09 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Sep 3 19:08:22 2009 +0200 +Date: Thu Sep 3 19:08:22 2009 +0200 xcf_save_layer(): add comment about where we store the layer mask offset @@ -83726,23 +84561,23 @@ commit 9e18f771c4489d8e8c6d8c88d4f9c16de975ec5f Author: Michael Natterer <mitch@gimp.org> -Date: Thu Sep 3 14:57:18 2009 +0200 +Date: Thu Sep 3 14:57:18 2009 +0200 Replace "Group Layer" by "Layer Group" in all user visible strings - app/actions/layers-actions.c | 4 ++-- - app/core/gimpgrouplayer.c | 16 ++++++++-------- - app/core/gimpimage-merge.c | 4 ++-- + app/actions/layers-actions.c | 4 ++-- + app/core/gimpgrouplayer.c | 16 ++++++++-------- + app/core/gimpimage-merge.c | 4 ++-- app/display/gimpdisplayshell-dnd.c | 4 ++-- - app/tools/gimpblendtool.c | 2 +- + app/tools/gimpblendtool.c | 2 +- app/tools/gimpbucketfilltool.c | 2 +- - app/tools/gimpimagemaptool.c | 2 +- - app/tools/gimppainttool.c | 2 +- + app/tools/gimpimagemaptool.c | 2 +- + app/tools/gimppainttool.c | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) commit efd5018420008bd358e062e92105097ba05e3d0f Author: Michael Natterer <mitch@gimp.org> -Date: Thu Sep 3 13:24:30 2009 +0200 +Date: Thu Sep 3 13:24:30 2009 +0200 gimp_editor_set_box_style(): small optimization @@ -83753,7 +84588,7 @@ commit 402408db1aa9da54e2cfdaec504c1f11c9b683d5 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Sep 3 13:22:17 2009 +0200 +Date: Thu Sep 3 13:22:17 2009 +0200 gimp_item_tree_view_style_set(): set the style of the lock buttons @@ -83766,7 +84601,7 @@ commit 2d5b6d83d51da904a21a5d8ea1b3d58f93f3bb30 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Sep 3 13:07:06 2009 +0200 +Date: Thu Sep 3 13:07:06 2009 +0200 Use plain togglebuttons, not checkbuttons for the "lock" toggles @@ -83779,17 +84614,17 @@ commit 007fc34af866a51a09e29c9e0ec94f791e75e199 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Sep 3 09:11:16 2009 +0200 +Date: Thu Sep 3 09:11:16 2009 +0200 Add "layers-new-group" to the menus menus/image-menu.xml.in | 1 + - menus/layers-menu.xml | 1 + + menus/layers-menu.xml | 1 + 2 files changed, 2 insertions(+) commit f1f186c71882c4f0b725703332acd43141e6e36f Author: Michael Natterer <mitch@gimp.org> -Date: Thu Sep 3 09:10:42 2009 +0200 +Date: Thu Sep 3 09:10:42 2009 +0200 Change mnemonic of "New Group Layer..." to "G" @@ -83798,7 +84633,7 @@ commit 4347c67964e27abfffbf6163c80d3e1508bb9f4b Author: Michael Natterer <mitch@gimp.org> -Date: Thu Sep 3 08:16:26 2009 +0200 +Date: Thu Sep 3 08:16:26 2009 +0200 Use gimp_drawable_get_tiles() in a few places instead of direct access @@ -83807,7 +84642,7 @@ commit c39dfab87ce035c24ea4334038ddfc9470cd4038 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Sep 3 01:03:29 2009 +0200 +Date: Thu Sep 3 01:03:29 2009 +0200 Don't access image->width and ->height directly @@ -83816,7 +84651,7 @@ commit 0b09278c17f0a4a28998550613e2e6c8b766e2aa Author: Michael Natterer <mitch@gimp.org> -Date: Thu Sep 3 01:00:14 2009 +0200 +Date: Thu Sep 3 01:00:14 2009 +0200 Don't access item->width and ->height directly @@ -83825,7 +84660,7 @@ commit f3e640f2d28d221cb84d1b413bb58d4c75624993 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Sep 2 21:55:14 2009 +0200 +Date: Wed Sep 2 21:55:14 2009 +0200 gimp_projection_projectable_changed(): some fixes and optimizations @@ -83839,7 +84674,7 @@ commit 228da1d32ef093ab7d55e2901f84acc845a60572 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Sep 2 21:37:07 2009 +0200 +Date: Wed Sep 2 21:37:07 2009 +0200 gimp_group_layer_update_size(): remove bogus optimization @@ -83864,7 +84699,7 @@ commit 1735f86d258f7fcd8726becd75ab3d4ec6cfa547 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Sep 2 19:48:46 2009 +0200 +Date: Wed Sep 2 19:48:46 2009 +0200 Kill plug-ins that write to tiles of locked drawables or group layers @@ -83877,7 +84712,7 @@ commit 272073a196ec9792081cad9ab091b06faad7790a Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Tue Sep 1 22:43:50 2009 -0400 +Date: Tue Sep 1 22:43:50 2009 -0400 Applied changes from CVS version 1.34 of official version of TinyScheme. @@ -83890,7 +84725,7 @@ commit 4acd4317a7c91b6bb4d4eab804d46a2534094e1a Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Tue Sep 1 21:52:11 2009 -0400 +Date: Tue Sep 1 21:52:11 2009 -0400 Eliminated compiler warnings (scheme.c). Fixed whitespace (dynload.c). @@ -83900,18 +84735,18 @@ commit b2fa005445d2caaa24a2bbc3c1a01f090d068e74 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Sep 1 23:35:26 2009 +0200 +Date: Tue Sep 1 23:35:26 2009 +0200 Chain up unconditionally in GimpViewable::invalidate_preview() app/core/gimpdrawable.c | 3 +-- - app/core/gimpimage.c | 3 +-- - app/core/gimplayer.c | 3 +-- + app/core/gimpimage.c | 3 +-- + app/core/gimplayer.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) commit 70fdac012e82e0e7028567f30ea30381328eae68 Author: Sven Neumann <sven@gimp.org> -Date: Tue Sep 1 22:26:01 2009 +0200 +Date: Tue Sep 1 22:26:01 2009 +0200 Minor UI tweak in the Keyboard Shortcuts Editor dialog @@ -83924,14 +84759,14 @@ commit 096ff4b093f8d5baea8bff93ba06d66e71939a23 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Sep 1 19:23:44 2009 +0200 +Date: Tue Sep 1 19:23:44 2009 +0200 Remove all wrong and useless comments Remove all outdated comments that we just plain wrong and all useless ones that are like: - /* do foo bar */ + /* do foo bar */ foo_bar(); app/core/gimplayer-floating-sel.c | 13 +------------ @@ -83939,7 +84774,7 @@ commit c6c0817602bf7e6ae4da8e7b2fe099442cab1261 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Sep 1 12:44:30 2009 +0200 +Date: Tue Sep 1 12:44:30 2009 +0200 Don't make the action that invokes the tool insensitive for locked vectors @@ -83949,7 +84784,7 @@ commit a12a9fa70e49272b7a83ba0ad2329cadca60ed8f Author: Michael Natterer <mitch@gimp.org> -Date: Tue Sep 1 12:43:43 2009 +0200 +Date: Tue Sep 1 12:43:43 2009 +0200 gimp_vector_tool_button_press(): don't edit locked vectors @@ -83959,7 +84794,7 @@ commit a22d72971abeddf65b96831df495559d79012a60 Author: Sven Neumann <sven@gimp.org> -Date: Tue Sep 1 09:38:43 2009 +0200 +Date: Tue Sep 1 09:38:43 2009 +0200 Bug 593485 - the metadata plugin crashes @@ -83975,111 +84810,111 @@ commit a3558e3cb8d0cf14a746d26ab6138087350202d4 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 31 22:47:18 2009 +0200 +Date: Mon Aug 31 22:47:18 2009 +0200 Remove GIMP_OBJECT() casts when calling gimp_object_get_name() - app/actions/channels-commands.c | 4 ++-- - app/actions/documents-commands.c | 14 ++++++------ - app/actions/edit-actions.c | 6 ++--- - app/actions/file-actions.c | 2 +- - app/actions/file-commands.c | 8 +++---- - app/actions/layers-commands.c | 4 ++-- - app/actions/plug-in-actions.c | 6 ++--- - app/actions/tool-options-actions.c | 2 +- - app/actions/tool-options-commands.c | 2 +- - app/actions/tools-actions.c | 2 +- - app/actions/vectors-commands.c | 4 ++-- - app/actions/windows-actions.c | 4 ++-- - app/core/gimp-edit.c | 8 +++---- - app/core/gimpbrushgenerated-save.c | 2 +- - app/core/gimpchannel.c | 2 +- - app/core/gimpcontainer.c | 2 +- - app/core/gimpcontext.c | 3 +-- - app/core/gimpdata.c | 4 ++-- - app/core/gimpdatafactory.c | 6 ++--- - app/core/gimpgrouplayer.c | 8 +++---- - app/core/gimpimage-duplicate.c | 10 ++++----- - app/core/gimpimage-merge.c | 6 ++--- - app/core/gimpimage.c | 12 +++++----- - app/core/gimpimagefile.c | 10 ++++----- - app/core/gimpimagemapconfig.c | 4 ++-- - app/core/gimpitem.c | 4 ++-- - app/core/gimpitempropundo.c | 4 ++-- - app/core/gimpitemstack.c | 2 +- - app/core/gimplayer.c | 4 ++-- - app/core/gimplayermask.c | 3 +-- - app/core/gimptoolinfo.c | 2 +- - app/core/gimptoolpresets.c | 3 +-- - app/core/gimpviewable.c | 2 +- - app/dialogs/fade-dialog.c | 3 +-- + app/actions/channels-commands.c | 4 ++-- + app/actions/documents-commands.c | 14 ++++++------ + app/actions/edit-actions.c | 6 ++--- + app/actions/file-actions.c | 2 +- + app/actions/file-commands.c | 8 +++---- + app/actions/layers-commands.c | 4 ++-- + app/actions/plug-in-actions.c | 6 ++--- + app/actions/tool-options-actions.c | 2 +- + app/actions/tool-options-commands.c | 2 +- + app/actions/tools-actions.c | 2 +- + app/actions/vectors-commands.c | 4 ++-- + app/actions/windows-actions.c | 4 ++-- + app/core/gimp-edit.c | 8 +++---- + app/core/gimpbrushgenerated-save.c | 2 +- + app/core/gimpchannel.c | 2 +- + app/core/gimpcontainer.c | 2 +- + app/core/gimpcontext.c | 3 +-- + app/core/gimpdata.c | 4 ++-- + app/core/gimpdatafactory.c | 6 ++--- + app/core/gimpgrouplayer.c | 8 +++---- + app/core/gimpimage-duplicate.c | 10 ++++----- + app/core/gimpimage-merge.c | 6 ++--- + app/core/gimpimage.c | 12 +++++----- + app/core/gimpimagefile.c | 10 ++++----- + app/core/gimpimagemapconfig.c | 4 ++-- + app/core/gimpitem.c | 4 ++-- + app/core/gimpitempropundo.c | 4 ++-- + app/core/gimpitemstack.c | 2 +- + app/core/gimplayer.c | 4 ++-- + app/core/gimplayermask.c | 3 +-- + app/core/gimptoolinfo.c | 2 +- + app/core/gimptoolpresets.c | 3 +-- + app/core/gimpviewable.c | 2 +- + app/dialogs/fade-dialog.c | 3 +-- app/display/gimpdisplayshell-callbacks.c | 2 +- - app/display/gimpdisplayshell-close.c | 2 +- - app/file/file-open.c | 2 +- - app/file/file-procedure.c | 2 +- - app/file/file-utils.c | 2 +- - app/menus/plug-in-menus.c | 10 ++++----- - app/pdb/brush-cmds.c | 6 ++--- - app/pdb/brushes-cmds.c | 4 ++-- - app/pdb/buffer-cmds.c | 2 +- - app/pdb/context-cmds.c | 12 +++++----- - app/pdb/drawable-cmds.c | 2 +- - app/pdb/gimppdb-utils.c | 12 +++++----- - app/pdb/gimppdb.c | 8 +++---- - app/pdb/gimpprocedure.c | 20 ++++++++--------- - app/pdb/gradient-cmds.c | 6 ++--- - app/pdb/gradients-cmds.c | 2 +- - app/pdb/image-cmds.c | 2 +- - app/pdb/palette-cmds.c | 6 ++--- - app/pdb/palettes-cmds.c | 4 ++-- - app/pdb/paths-cmds.c | 4 ++-- - app/pdb/patterns-cmds.c | 4 ++-- - app/pdb/vectors-cmds.c | 2 +- - app/plug-in/gimpplugin-cleanup.c | 2 +- - app/plug-in/gimpplugin-message.c | 38 + app/display/gimpdisplayshell-close.c | 2 +- + app/file/file-open.c | 2 +- + app/file/file-procedure.c | 2 +- + app/file/file-utils.c | 2 +- + app/menus/plug-in-menus.c | 10 ++++----- + app/pdb/brush-cmds.c | 6 ++--- + app/pdb/brushes-cmds.c | 4 ++-- + app/pdb/buffer-cmds.c | 2 +- + app/pdb/context-cmds.c | 12 +++++----- + app/pdb/drawable-cmds.c | 2 +- + app/pdb/gimppdb-utils.c | 12 +++++----- + app/pdb/gimppdb.c | 8 +++---- + app/pdb/gimpprocedure.c | 20 ++++++++--------- + app/pdb/gradient-cmds.c | 6 ++--- + app/pdb/gradients-cmds.c | 2 +- + app/pdb/image-cmds.c | 2 +- + app/pdb/palette-cmds.c | 6 ++--- + app/pdb/palettes-cmds.c | 4 ++-- + app/pdb/paths-cmds.c | 4 ++-- + app/pdb/patterns-cmds.c | 4 ++-- + app/pdb/vectors-cmds.c | 2 +- + app/plug-in/gimpplugin-cleanup.c | 2 +- + app/plug-in/gimpplugin-message.c | 38 ++++++++++++++++---------------- - app/plug-in/gimpplugin.c | 18 +++++++-------- - app/plug-in/gimppluginmanager-call.c | 6 ++--- - app/plug-in/gimppluginprocedure.c | 2 +- - app/plug-in/gimppluginprocframe.c | 2 +- - app/text/gimpfont.c | 4 ++-- - app/text/gimptextlayer-xcf.c | 4 ++-- - app/vectors/gimpvectors-export.c | 2 +- - app/widgets/gimpcontainerentry.c | 8 +++---- - app/widgets/gimpcontainertreeview.c | 3 +-- - app/widgets/gimpcontrollerlist.c | 2 +- - app/widgets/gimpdataeditor.c | 8 +++---- - app/widgets/gimpdevicestatus.c | 4 ++-- - app/widgets/gimpdialogfactory.c | 2 +- - app/widgets/gimpdocumentview.c | 2 +- - app/widgets/gimpfiledialog.c | 10 ++++----- - app/widgets/gimphistogrameditor.c | 2 +- - app/widgets/gimpimagepropview.c | 2 +- - app/widgets/gimpitemtreeview.c | 2 +- - app/widgets/gimpthumbbox.c | 2 +- - app/widgets/gimptoolbox-dnd.c | 2 +- - app/widgets/gimptoolbox.c | 2 +- + app/plug-in/gimpplugin.c | 18 +++++++-------- + app/plug-in/gimppluginmanager-call.c | 6 ++--- + app/plug-in/gimppluginprocedure.c | 2 +- + app/plug-in/gimppluginprocframe.c | 2 +- + app/text/gimpfont.c | 4 ++-- + app/text/gimptextlayer-xcf.c | 4 ++-- + app/vectors/gimpvectors-export.c | 2 +- + app/widgets/gimpcontainerentry.c | 8 +++---- + app/widgets/gimpcontainertreeview.c | 3 +-- + app/widgets/gimpcontrollerlist.c | 2 +- + app/widgets/gimpdataeditor.c | 8 +++---- + app/widgets/gimpdevicestatus.c | 4 ++-- + app/widgets/gimpdialogfactory.c | 2 +- + app/widgets/gimpdocumentview.c | 2 +- + app/widgets/gimpfiledialog.c | 10 ++++----- + app/widgets/gimphistogrameditor.c | 2 +- + app/widgets/gimpimagepropview.c | 2 +- + app/widgets/gimpitemtreeview.c | 2 +- + app/widgets/gimpthumbbox.c | 2 +- + app/widgets/gimptoolbox-dnd.c | 2 +- + app/widgets/gimptoolbox.c | 2 +- app/widgets/gimpviewrenderergradient.c | 2 +- app/widgets/gimpviewrendererimagefile.c | 4 ++-- - app/xcf/xcf-save.c | 8 +++---- - tools/pdbgen/pdb/brush.pdb | 6 ++--- - tools/pdbgen/pdb/brushes.pdb | 4 ++-- - tools/pdbgen/pdb/buffer.pdb | 2 +- - tools/pdbgen/pdb/context.pdb | 12 +++++----- - tools/pdbgen/pdb/drawable.pdb | 2 +- - tools/pdbgen/pdb/gradient.pdb | 6 ++--- - tools/pdbgen/pdb/gradients.pdb | 2 +- - tools/pdbgen/pdb/image.pdb | 2 +- - tools/pdbgen/pdb/palette.pdb | 6 ++--- - tools/pdbgen/pdb/palettes.pdb | 4 ++-- - tools/pdbgen/pdb/paths.pdb | 4 ++-- - tools/pdbgen/pdb/patterns.pdb | 4 ++-- - tools/pdbgen/pdb/vectors.pdb | 2 +- + app/xcf/xcf-save.c | 8 +++---- + tools/pdbgen/pdb/brush.pdb | 6 ++--- + tools/pdbgen/pdb/brushes.pdb | 4 ++-- + tools/pdbgen/pdb/buffer.pdb | 2 +- + tools/pdbgen/pdb/context.pdb | 12 +++++----- + tools/pdbgen/pdb/drawable.pdb | 2 +- + tools/pdbgen/pdb/gradient.pdb | 6 ++--- + tools/pdbgen/pdb/gradients.pdb | 2 +- + tools/pdbgen/pdb/image.pdb | 2 +- + tools/pdbgen/pdb/palette.pdb | 6 ++--- + tools/pdbgen/pdb/palettes.pdb | 4 ++-- + tools/pdbgen/pdb/paths.pdb | 4 ++-- + tools/pdbgen/pdb/patterns.pdb | 4 ++-- + tools/pdbgen/pdb/vectors.pdb | 2 +- 95 files changed, 233 insertions(+), 244 deletions(-) commit a0e1fe6a212f9882f7f19c4c612100f8e59c7001 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 31 21:20:52 2009 +0200 +Date: Mon Aug 31 21:20:52 2009 +0200 gimp_layer_boundary(): come cleanup @@ -84091,7 +84926,7 @@ commit 5fbe68c26b681f35882eabf5e5a6c85b80d4480f Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon Aug 31 21:23:07 2009 +0200 +Date: Mon Aug 31 21:23:07 2009 +0200 app: Enforce privacy of GimpObject members @@ -84105,7 +84940,7 @@ commit 391560154479b7499ddcc51e9126a2d3f29832f2 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 31 20:57:52 2009 +0200 +Date: Mon Aug 31 20:57:52 2009 +0200 Remove gimp_image_layer_boundary() @@ -84113,15 +84948,15 @@ layer or not is pretty useless. This also doesn't make the code in selection_generate_segs() more complex but rather more obvious. - app/core/gimpimage.c | 29 -------------------------- - app/core/gimpimage.h | 3 --- + app/core/gimpimage.c | 29 -------------------------- + app/core/gimpimage.h | 3 --- app/display/gimpdisplayshell-selection.c | 35 +++++++++++++++++--------------- 3 files changed, 19 insertions(+), 48 deletions(-) commit bbc83d33b5ac6a8d4d9d05a30c0ecf9d161212d7 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 31 20:55:03 2009 +0200 +Date: Mon Aug 31 20:55:03 2009 +0200 gimp_drawable_fs_update() takes a GimpLayer, not a GimpDrawable @@ -84130,7 +84965,7 @@ commit 44be1b5d7b438a89a6537e1c5ae30a4f0efbf53d Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 31 20:42:02 2009 +0200 +Date: Mon Aug 31 20:42:02 2009 +0200 Various small cleanups (no code changes) @@ -84140,7 +84975,7 @@ commit 064448cb50185c581646d918e70eff477ababd4c Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 31 19:25:25 2009 +0200 +Date: Mon Aug 31 19:25:25 2009 +0200 Bug 563770 - Layer border visibility don't work with masks @@ -84152,7 +84987,7 @@ commit d50d5b5878fd2626e653e10961db70b24c4e0b97 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 31 17:37:22 2009 +0200 +Date: Mon Aug 31 17:37:22 2009 +0200 Let the drawable connect to its floating selection's "update" signal @@ -84169,7 +85004,7 @@ commit cdbb8e169706c5cf08ea6454d69bb510f583a5d9 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 31 15:15:30 2009 +0200 +Date: Mon Aug 31 15:15:30 2009 +0200 Fix loading of layer trees when there is a floating selection @@ -84183,7 +85018,7 @@ commit c6fa4f7206daa28a374ba12820bb82755c87919e Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 30 21:28:59 2009 +0200 +Date: Sun Aug 30 21:28:59 2009 +0200 Implement saving and loading of layer trees in the XCF @@ -84191,7 +85026,7 @@ PROP_ITEM_PATH * app/xcf/xcf-save.c: when saving a group layer, save a - PROP_GROUP_ITEM. When saving a child item, save a PROP_ITEM_PATH + PROP_GROUP_ITEM. When saving a child item, save a PROP_ITEM_PATH which contains the path indices returned by gimp_item_get_path(). * app/xcf/xcf-load.c: when loading a PROP_GROUP_ITEM, replace the @@ -84209,7 +85044,7 @@ commit 7f8244d50ca6ad0e9d8d5c088c09d0e19efceb18 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 30 21:19:42 2009 +0200 +Date: Sun Aug 30 21:19:42 2009 +0200 Save all an image's layers and channels, but still as flat list @@ -84226,7 +85061,7 @@ commit 7eaba5f8fc04f11acae44897413f122f1fde54b0 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 30 21:07:22 2009 +0200 +Date: Sun Aug 30 21:07:22 2009 +0200 Move variables to local scopes @@ -84236,7 +85071,7 @@ commit 23749cda2c4ec4d3b3097463efda6110512013de Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 30 21:02:43 2009 +0200 +Date: Sun Aug 30 21:02:43 2009 +0200 Don't set "lock-alpha" and "lock-content" on items where it can't be changed @@ -84246,7 +85081,7 @@ commit f9c8bea36833b61e60b0db135c5a904d8279243e Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 30 20:58:24 2009 +0200 +Date: Sun Aug 30 20:58:24 2009 +0200 Add gimp_item_stack_get_parent_by_path(), for use un XCF loading @@ -84260,7 +85095,7 @@ commit 3d547c0a7032e633fd0fa9b86f5f55a5f47f79e6 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 30 20:56:39 2009 +0200 +Date: Sun Aug 30 20:56:39 2009 +0200 Add gimp_item_get_path(), to be used in XCF saving @@ -84268,12 +85103,12 @@ an item tree, pretty much like GtkTreePath does for GtkTreeModels. app/core/gimpitem.c | 29 +++++++++++++++++++++++++++++ - app/core/gimpitem.h | 1 + + app/core/gimpitem.h | 1 + 2 files changed, 30 insertions(+) commit 37768e25e8494ffbf939845bb4f3e40f5b4185f1 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Aug 30 15:47:52 2009 +0200 +Date: Sun Aug 30 15:47:52 2009 +0200 Use gimp_object_get_name() also in fileops.pdb @@ -84282,7 +85117,7 @@ commit 977ee88b4b5a575f871cd6003b5df4cf6f2781bb Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Aug 30 12:52:01 2009 +0200 +Date: Sun Aug 30 12:52:01 2009 +0200 NEWS: Add missing item for 2.7.0 about closing toolbox @@ -84291,7 +85126,7 @@ commit 46b9ffc11fb43a062f0243c5ad9471512ce8163d Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 30 13:14:28 2009 +0200 +Date: Sun Aug 30 13:14:28 2009 +0200 Prepare for changing the layer type in xcf_load_layer_props() @@ -84305,7 +85140,7 @@ commit 03d00c5e0f5dabb659d6c04d8d03c3de3aed33dd Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 30 12:44:35 2009 +0200 +Date: Sun Aug 30 12:44:35 2009 +0200 Save the "lock-content" property on layers and channels in the XCF @@ -84320,7 +85155,7 @@ commit 8f9fc5e2d78a99e769bb514a407729c007188c1f Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 30 11:52:06 2009 +0200 +Date: Sun Aug 30 11:52:06 2009 +0200 Fix comment: s/layer/channel/ @@ -84329,7 +85164,7 @@ commit fcdc3beedb2ba87685dc651f68849c150e780b04 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 30 10:57:39 2009 +0200 +Date: Sun Aug 30 10:57:39 2009 +0200 Bug 591609 - xcf file format developer document inconsistencies @@ -84340,7 +85175,7 @@ commit 2b3c03593f4b1fc982b503df0cebe7c0e743ef6c Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 30 10:49:32 2009 +0200 +Date: Sun Aug 30 10:49:32 2009 +0200 gimp_text_layer_from_layer(): also copy the "lock-content" property @@ -84349,7 +85184,7 @@ commit e1b743e407bdbac0f73ad95a0b5fc1292df2284b Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 30 10:43:09 2009 +0200 +Date: Sun Aug 30 10:43:09 2009 +0200 Fix typo in comment @@ -84358,20 +85193,20 @@ commit 27d036b75f1c5936c7cdaf1da58973542d65f1d5 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 29 21:26:46 2009 +0200 +Date: Sat Aug 29 21:26:46 2009 +0200 Render a layer group's boundary in a different color This is probably not sufficient, but better than nothing. - app/display/gimpcanvas.c | 11 +++++++++++ - app/display/gimpcanvas.h | 1 + + app/display/gimpcanvas.c | 11 +++++++++++ + app/display/gimpcanvas.h | 1 + app/display/gimpdisplayshell-selection.c | 19 ++++++++++++++----- 3 files changed, 26 insertions(+), 5 deletions(-) commit e6235cd98219bfd17c6ea7c2ddc87ce737b933f2 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 29 20:20:25 2009 +0200 +Date: Sat Aug 29 20:20:25 2009 +0200 Don't allow stroking to locked items and group items @@ -84382,7 +85217,7 @@ commit c68f82f4aed3a35b6cbd963a5ca2d56bce245dfb Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 29 20:19:38 2009 +0200 +Date: Sat Aug 29 20:19:38 2009 +0200 Connect to "lock-content-changed" of all items, not "lock-alpha-changed" @@ -84392,14 +85227,14 @@ commit d84e48a82f6b3b67ec8ec4d34d5294cf2eea1b4a Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 29 19:47:52 2009 +0200 +Date: Sat Aug 29 19:47:52 2009 +0200 Make "item" parameter of GimpItem::is_attached() const app/core/gimpchannel.c | 7 ++++--- - app/core/gimpitem.c | 2 +- - app/core/gimpitem.h | 4 ++-- - app/core/gimplayer.c | 7 ++++--- + app/core/gimpitem.c | 2 +- + app/core/gimpitem.h | 4 ++-- + app/core/gimplayer.c | 7 ++++--- app/core/gimplayermask.c | 4 ++-- app/core/gimpselection.c | 7 ++++--- app/vectors/gimpvectors.c | 7 ++++--- @@ -84407,7 +85242,7 @@ commit 02903d6970d5148b185daa53d387d912e96ef260 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 29 15:27:04 2009 +0200 +Date: Sat Aug 29 15:27:04 2009 +0200 Use gimp_item_is_content_locked() instead of gimp_item_get_lock_content() @@ -84419,26 +85254,26 @@ modify the flag on the item itself. app/actions/drawable-actions.c | 2 +- - app/actions/edit-actions.c | 2 +- - app/actions/layers-actions.c | 8 ++++---- - app/actions/select-actions.c | 2 +- - app/actions/vectors-actions.c | 2 +- + app/actions/edit-actions.c | 2 +- + app/actions/layers-actions.c | 8 ++++---- + app/actions/select-actions.c | 2 +- + app/actions/vectors-actions.c | 2 +- app/core/gimpimage-item-list.c | 2 +- - app/core/gimpimage-merge.c | 2 +- + app/core/gimpimage-merge.c | 2 +- app/display/gimpdisplayshell-dnd.c | 4 ++-- - app/pdb/gimppdb-utils.c | 2 +- - app/tools/gimpblendtool.c | 4 ++-- + app/pdb/gimppdb-utils.c | 2 +- + app/tools/gimpblendtool.c | 4 ++-- app/tools/gimpbucketfilltool.c | 4 ++-- - app/tools/gimpcroptool.c | 2 +- - app/tools/gimpimagemaptool.c | 2 +- - app/tools/gimppainttool.c | 4 ++-- - app/tools/gimptransformtool.c | 6 +++--- + app/tools/gimpcroptool.c | 2 +- + app/tools/gimpimagemaptool.c | 2 +- + app/tools/gimppainttool.c | 4 ++-- + app/tools/gimptransformtool.c | 6 +++--- app/widgets/gimpdrawabletreeview.c | 2 +- 16 files changed, 25 insertions(+), 25 deletions(-) commit 521e790b77bdea7d08704d373ab3ef75e1956e8b Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 29 15:10:38 2009 +0200 +Date: Sat Aug 29 15:10:38 2009 +0200 An item is_content_locked() if its parent item is locked @@ -84447,7 +85282,7 @@ commit c730839c1f1cb47e8f5e68c07ec7b1b5bcfdbb4e Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 29 15:08:06 2009 +0200 +Date: Sat Aug 29 15:08:06 2009 +0200 Implement GimpItem::is_content_locked() @@ -84459,7 +85294,7 @@ commit 03fafc01a468a97b6f8099c148a17d1ae2a978c7 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 29 14:59:07 2009 +0200 +Date: Sat Aug 29 14:59:07 2009 +0200 Add virtual function GimpItem::is_content_locked() and public API @@ -84468,12 +85303,12 @@ app/core/gimpitem.c | 101 ++++++++++++++++++++++++++++++---------------------- - app/core/gimpitem.h | 2 ++ + app/core/gimpitem.h | 2 ++ 2 files changed, 60 insertions(+), 43 deletions(-) commit dc738d229eadc6c04bc83e628b715dbb2c01725c Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 29 12:54:25 2009 +0200 +Date: Sat Aug 29 12:54:25 2009 +0200 Don't consider group items as non-lockable any longer @@ -84482,7 +85317,7 @@ commit fecfa95b639d9b5b4c13db449525eaf026b64a77 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 29 12:53:35 2009 +0200 +Date: Sat Aug 29 12:53:35 2009 +0200 Don't override the "lock-content" property any longer @@ -84493,20 +85328,20 @@ commit 85c6af5d421e77624efc0fea4bc3d5bfbd9e9da4 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 29 12:51:58 2009 +0200 +Date: Sat Aug 29 12:51:58 2009 +0200 Separate checks for "writable" from "is group" when setting sensitivity app/actions/drawable-actions.c | 18 +++++++++--------- - app/actions/edit-actions.c | 25 ++++++++++++++++--------- - app/actions/layers-actions.c | 19 +++++++++++-------- - app/actions/select-actions.c | 8 ++++++-- + app/actions/edit-actions.c | 25 ++++++++++++++++--------- + app/actions/layers-actions.c | 19 +++++++++++-------- + app/actions/select-actions.c | 8 ++++++-- 4 files changed, 42 insertions(+), 28 deletions(-) commit 957cf2cfa9846901670121f549e740fbaef7f745 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 29 12:40:40 2009 +0200 +Date: Sat Aug 29 12:40:40 2009 +0200 app: Always use gimp_object_get_name() @@ -84515,60 +85350,60 @@ untyped pointer so we don't have to do so awfully many casts. There is a runtime check for the type inside the function anyway. - app/actions/data-commands.c | 4 +-- - app/actions/file-actions.c | 2 +- - app/actions/file-commands.c | 4 +-- - app/actions/gradients-commands.c | 2 +- - app/actions/plug-in-actions.c | 12 ++++----- - app/actions/templates-commands.c | 2 +- - app/actions/tool-options-commands.c | 2 +- - app/core/gimp-templates.c | 2 +- - app/core/gimpbrush.c | 2 +- - app/core/gimpbrushgenerated.c | 2 +- - app/core/gimpbuffer.c | 2 +- - app/core/gimpcontext.c | 40 + app/actions/data-commands.c | 4 +-- + app/actions/file-actions.c | 2 +- + app/actions/file-commands.c | 4 +-- + app/actions/gradients-commands.c | 2 +- + app/actions/plug-in-actions.c | 12 ++++----- + app/actions/templates-commands.c | 2 +- + app/actions/tool-options-commands.c | 2 +- + app/core/gimp-templates.c | 2 +- + app/core/gimpbrush.c | 2 +- + app/core/gimpbrushgenerated.c | 2 +- + app/core/gimpbuffer.c | 2 +- + app/core/gimpcontext.c | 40 ++++++++++++++--------------- - app/core/gimpcurve.c | 2 +- - app/core/gimpdrawable.c | 2 +- - app/core/gimpgradient-save.c | 2 +- - app/core/gimpimage-undo-push.c | 2 +- - app/core/gimplist.c | 2 +- - app/core/gimpobject.c | 7 ++--- - app/core/gimpobject.h | 5 ++-- - app/core/gimppalette-save.c | 2 +- - app/core/gimppalette.c | 2 +- - app/core/gimppattern.c | 2 +- - app/core/gimptooloptions.c | 4 +-- - app/core/gimptoolpresets.c | 4 +-- - app/dialogs/convert-dialog.c | 2 +- - app/dialogs/palette-import-dialog.c | 6 ++--- - app/display/gimpdisplayshell-layer-select.c | 4 +-- - app/file/file-open.c | 4 +-- - app/file/file-save.c | 2 +- - app/menus/plug-in-menus.c | 10 ++++---- - app/paint/gimppaintoptions.c | 2 +- - app/pdb/fileops-cmds.c | 4 +-- - app/pdb/gimppdb-query.c | 2 +- - app/plug-in/gimpplugin.c | 2 +- - app/plug-in/gimpplugindef.c | 2 +- - app/plug-in/gimppluginmanager-query.c | 2 +- - app/plug-in/gimppluginmanager-restore.c | 8 +++--- - app/plug-in/gimppluginmanager.c | 6 ++--- - app/plug-in/gimppluginprocedure.c | 12 ++++----- - app/vectors/gimpstroke.c | 2 +- - app/widgets/gimpbrushselect.c | 2 +- - app/widgets/gimpdialogfactory.c | 6 ++--- - app/widgets/gimpfontselect.c | 2 +- - app/widgets/gimpgradientselect.c | 2 +- - app/widgets/gimppaletteselect.c | 2 +- - app/widgets/gimppatternselect.c | 2 +- - app/widgets/gimptemplateeditor.c | 2 +- - app/widgets/gimptooldialog.c | 4 +-- + app/core/gimpcurve.c | 2 +- + app/core/gimpdrawable.c | 2 +- + app/core/gimpgradient-save.c | 2 +- + app/core/gimpimage-undo-push.c | 2 +- + app/core/gimplist.c | 2 +- + app/core/gimpobject.c | 7 ++--- + app/core/gimpobject.h | 5 ++-- + app/core/gimppalette-save.c | 2 +- + app/core/gimppalette.c | 2 +- + app/core/gimppattern.c | 2 +- + app/core/gimptooloptions.c | 4 +-- + app/core/gimptoolpresets.c | 4 +-- + app/dialogs/convert-dialog.c | 2 +- + app/dialogs/palette-import-dialog.c | 6 ++--- + app/display/gimpdisplayshell-layer-select.c | 4 +-- + app/file/file-open.c | 4 +-- + app/file/file-save.c | 2 +- + app/menus/plug-in-menus.c | 10 ++++---- + app/paint/gimppaintoptions.c | 2 +- + app/pdb/fileops-cmds.c | 4 +-- + app/pdb/gimppdb-query.c | 2 +- + app/plug-in/gimpplugin.c | 2 +- + app/plug-in/gimpplugindef.c | 2 +- + app/plug-in/gimppluginmanager-query.c | 2 +- + app/plug-in/gimppluginmanager-restore.c | 8 +++--- + app/plug-in/gimppluginmanager.c | 6 ++--- + app/plug-in/gimppluginprocedure.c | 12 ++++----- + app/vectors/gimpstroke.c | 2 +- + app/widgets/gimpbrushselect.c | 2 +- + app/widgets/gimpdialogfactory.c | 6 ++--- + app/widgets/gimpfontselect.c | 2 +- + app/widgets/gimpgradientselect.c | 2 +- + app/widgets/gimppaletteselect.c | 2 +- + app/widgets/gimppatternselect.c | 2 +- + app/widgets/gimptemplateeditor.c | 2 +- + app/widgets/gimptooldialog.c | 4 +-- 48 files changed, 102 insertions(+), 102 deletions(-) commit 0e82aca27c76906f7016888164cdaaa903ce8a2b Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 29 12:26:17 2009 +0200 +Date: Sat Aug 29 12:26:17 2009 +0200 app: Use gimp_object_name_free() instead of manipulating private data @@ -84577,7 +85412,7 @@ commit 35e67dae4370c7f7647076b83b806efed69ef53a Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 29 12:27:57 2009 +0200 +Date: Sat Aug 29 12:27:57 2009 +0200 Don't allow dropping colors and patterns and don't allow pasting to groups @@ -84587,7 +85422,7 @@ commit 13b384e3323a19eda54bf793df2d272ab2d4e2bd Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 29 12:27:23 2009 +0200 +Date: Sat Aug 29 12:27:23 2009 +0200 Don't allow dropping colors and patterns to group layers @@ -84596,7 +85431,7 @@ commit eb03413b49d81436082a7ae97fa94849b205cc1d Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 29 12:26:15 2009 +0200 +Date: Sat Aug 29 12:26:15 2009 +0200 Add separate check that prevents merging down to a group layer @@ -84605,7 +85440,7 @@ commit 5383bf0dc71d2582760ee16e51cfb165542035d3 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 29 12:13:28 2009 +0200 +Date: Sat Aug 29 12:13:28 2009 +0200 app: Fix annoying typos in previous commit @@ -84615,18 +85450,18 @@ commit cb94993f40980128158cb8ca517659201521085b Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 29 12:11:28 2009 +0200 +Date: Sat Aug 29 12:11:28 2009 +0200 app: Clarify corner case uses of gimp_object_name_changed() - app/core/gimpdata.c | 1 + + app/core/gimpdata.c | 1 + app/core/gimpfloatingselundo.c | 4 ++++ app/core/gimplayer-floating-sel.c | 4 ++++ 3 files changed, 9 insertions(+) commit 585a3fa6e443a90ab432e210a01143715165cc9f Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 29 09:16:35 2009 +0200 +Date: Sat Aug 29 09:16:35 2009 +0200 Change PDB wrappers to check for "is group" separately @@ -84634,35 +85469,35 @@ checks for groups. Also remove some checks that were added to make wrappers invokable even though the group appeared locked. - app/pdb/color-cmds.c | 15 +++++++ - app/pdb/drawable-cmds.c | 10 +++-- - app/pdb/drawable-transform-cmds.c | 10 +---- - app/pdb/edit-cmds.c | 32 ++++++++++----- - app/pdb/floating-sel-cmds.c | 3 +- - app/pdb/layer-cmds.c | 16 +++----- - app/pdb/paint-tools-cmds.c | 68 + app/pdb/color-cmds.c | 15 +++++++ + app/pdb/drawable-cmds.c | 10 +++-- + app/pdb/drawable-transform-cmds.c | 10 +---- + app/pdb/edit-cmds.c | 32 ++++++++++----- + app/pdb/floating-sel-cmds.c | 3 +- + app/pdb/layer-cmds.c | 16 +++----- + app/pdb/paint-tools-cmds.c | 68 +++++++++++++++++++++++-------- - app/pdb/paths-cmds.c | 3 +- - app/pdb/selection-cmds.c | 3 +- - app/pdb/text-tool-cmds.c | 8 +++- - app/pdb/vectors-cmds.c | 6 ++- - tools/pdbgen/pdb/color.pdb | 15 +++++++ - tools/pdbgen/pdb/drawable.pdb | 10 +++-- + app/pdb/paths-cmds.c | 3 +- + app/pdb/selection-cmds.c | 3 +- + app/pdb/text-tool-cmds.c | 8 +++- + app/pdb/vectors-cmds.c | 6 ++- + tools/pdbgen/pdb/color.pdb | 15 +++++++ + tools/pdbgen/pdb/drawable.pdb | 10 +++-- tools/pdbgen/pdb/drawable_transform.pdb | 10 +---- - tools/pdbgen/pdb/edit.pdb | 32 ++++++++++----- - tools/pdbgen/pdb/floating_sel.pdb | 3 +- - tools/pdbgen/pdb/layer.pdb | 16 +++----- - tools/pdbgen/pdb/paint_tools.pdb | 72 + tools/pdbgen/pdb/edit.pdb | 32 ++++++++++----- + tools/pdbgen/pdb/floating_sel.pdb | 3 +- + tools/pdbgen/pdb/layer.pdb | 16 +++----- + tools/pdbgen/pdb/paint_tools.pdb | 72 ++++++++++++++++++++++++--------- - tools/pdbgen/pdb/paths.pdb | 3 +- - tools/pdbgen/pdb/selection.pdb | 3 +- - tools/pdbgen/pdb/text_tool.pdb | 8 +++- - tools/pdbgen/pdb/vectors.pdb | 6 ++- + tools/pdbgen/pdb/paths.pdb | 3 +- + tools/pdbgen/pdb/selection.pdb | 3 +- + tools/pdbgen/pdb/text_tool.pdb | 8 +++- + tools/pdbgen/pdb/vectors.pdb | 6 ++- 22 files changed, 241 insertions(+), 111 deletions(-) commit 074257bd37bc776c18b5a0b6ba90539324e785c1 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 28 20:15:13 2009 +0200 +Date: Fri Aug 28 20:15:13 2009 +0200 Add gimp_pdb_item_is_not_group() @@ -84676,7 +85511,7 @@ commit e979c081335030c1f77c1d7908b1e5ccd05d844f Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 28 20:07:14 2009 +0200 +Date: Fri Aug 28 20:07:14 2009 +0200 Start separating the logic for "locked" and "is group" again @@ -84684,15 +85519,15 @@ separate checks for group layers, and refuse to modify them with distinct error messages. - app/tools/gimpblendtool.c | 10 +++++++++- + app/tools/gimpblendtool.c | 10 +++++++++- app/tools/gimpbucketfilltool.c | 10 +++++++++- - app/tools/gimpimagemaptool.c | 7 +++++++ - app/tools/gimppainttool.c | 10 +++++++++- + app/tools/gimpimagemaptool.c | 7 +++++++ + app/tools/gimppainttool.c | 10 +++++++++- 4 files changed, 34 insertions(+), 3 deletions(-) commit c0785cfc67783dd688b7b51ea515b13f6b1d287e Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 28 11:11:19 2009 +0200 +Date: Fri Aug 28 11:11:19 2009 +0200 Remove all padding from the "visible" and "linked" toggles @@ -84703,7 +85538,7 @@ commit 85885224c300d992cf36ff20abcce4d3c3aa7910 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 28 11:06:29 2009 +0200 +Date: Fri Aug 28 11:06:29 2009 +0200 Also send double-clicks on the expander to GtkTreeView @@ -84715,7 +85550,7 @@ commit a302e084ab7ade6f14b989d0dc4b1d10d8453092 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 28 10:59:27 2009 +0200 +Date: Fri Aug 28 10:59:27 2009 +0200 Rename some functions @@ -84731,14 +85566,14 @@ app/widgets/gimpcontainertreeview.c | 16 ++++++++-------- app/widgets/gimpcontainertreeview.h | 12 ++++++------ - app/widgets/gimpitemtreeview.c | 8 ++++---- - app/widgets/gimplayertreeview.c | 4 ++-- - app/widgets/gimptooleditor.c | 3 +-- + app/widgets/gimpitemtreeview.c | 8 ++++---- + app/widgets/gimplayertreeview.c | 4 ++-- + app/widgets/gimptooleditor.c | 3 +-- 5 files changed, 21 insertions(+), 22 deletions(-) commit b2a1583c2b5fd1ad450b761d17cc0c47802aa5ff Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 28 10:15:38 2009 +0200 +Date: Fri Aug 28 10:15:38 2009 +0200 Fix GimpContainerView::set_context() to really set all rows of a tree @@ -84749,7 +85584,7 @@ commit 1685388fd0cd9ec916907fa7c15f22af82323eee Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 28 10:07:15 2009 +0200 +Date: Fri Aug 28 10:07:15 2009 +0200 Fix set_view_size() here too so the layer mask previews are updated too @@ -84760,7 +85595,7 @@ commit 5317ff7490e725ea222b14efc6d13e6fae509099 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Aug 28 08:19:44 2009 +0200 +Date: Fri Aug 28 08:19:44 2009 +0200 app: Make "All images" mean all images in the file dialog @@ -84775,7 +85610,7 @@ commit 2238b68d168e0d9d8ce84fb09f0efbf81e8af67e Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Aug 28 07:49:17 2009 +0200 +Date: Fri Aug 28 07:49:17 2009 +0200 app: Add helper function gimp_file_dialog_process_procedure() @@ -84788,7 +85623,7 @@ commit cf0db5c6bfd2e98eb616a15a0750702ff9ff27cf Author: Martin Nordholts <martinn@src.gnome.org> -Date: Wed Aug 26 21:55:23 2009 +0200 +Date: Wed Aug 26 21:55:23 2009 +0200 app: Don't define stuff in the middle of a file @@ -84797,7 +85632,7 @@ commit 5f3721235e00ef886bbc8ae7595afbc61d40a4a8 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 27 23:20:29 2009 +0200 +Date: Thu Aug 27 23:20:29 2009 +0200 Fix GimpContainerView::set_view_size() implementation for actual trees @@ -84807,7 +85642,7 @@ commit 53aa8773460586160c4264d53e8b2eee4eb6e146 Author: Sven Neumann <sven@gimp.org> -Date: Thu Aug 27 23:11:13 2009 +0200 +Date: Thu Aug 27 23:11:13 2009 +0200 use G_FILE_TEST_IS_REGULAR instead of G_FILE_TEST_EXISTS @@ -84818,7 +85653,7 @@ commit 6031800b9048ca92bd3416283faf27f922f1378e Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 27 23:07:38 2009 +0200 +Date: Thu Aug 27 23:07:38 2009 +0200 Fix automatic size updates of nested groups (again!) @@ -84832,7 +85667,7 @@ commit e0d062aa3837d56d08045dd1773d43ec7ec07d90 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 27 22:24:53 2009 +0200 +Date: Thu Aug 27 22:24:53 2009 +0200 Show a "folder" icon instead of a preview for empty group layers @@ -84841,7 +85676,7 @@ commit 3a0168ee83d012bc90ac4caf3e975ebf62e65427 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 27 22:10:36 2009 +0200 +Date: Thu Aug 27 22:10:36 2009 +0200 When removing a group layer, remove all its children from image->layer_stack @@ -84851,7 +85686,7 @@ commit 1accd760a3a72da5867ca2c4167d41104094380b Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 27 19:43:45 2009 +0200 +Date: Thu Aug 27 19:43:45 2009 +0200 Implement GimpDrawable::estimate_memsize() @@ -84864,7 +85699,7 @@ commit ecacf6f0c3527fd0151f4ac9dba349bff6b4e522 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 27 19:41:14 2009 +0200 +Date: Thu Aug 27 19:41:14 2009 +0200 Filter out child items from the list used to estimate the saled memsize @@ -84874,7 +85709,7 @@ commit f05c5ecfdc458c6fe952ce76d906c06fc24cae2a Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 27 19:36:22 2009 +0200 +Date: Thu Aug 27 19:36:22 2009 +0200 gimp_image_item_list_filter(): actually honor the passed parameters @@ -84886,7 +85721,7 @@ commit 19a168cb9dcdb85419c61788bfbfb355a9c6ebd1 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 27 19:31:55 2009 +0200 +Date: Thu Aug 27 19:31:55 2009 +0200 Mostly revert to the state before group layers @@ -84901,12 +85736,12 @@ app/core/gimpimage-resize.c | 92 ++++++++++++++++++++++++--------------------- app/core/gimpimage-rotate.c | 41 +++++++++----------- - app/core/gimpimage-scale.c | 4 +- + app/core/gimpimage-scale.c | 4 +- 5 files changed, 107 insertions(+), 114 deletions(-) commit cfaf6501e0bcbf724236bece4d6385e8b6507050 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 27 15:15:57 2009 +0200 +Date: Thu Aug 27 15:15:57 2009 +0200 Remove outdated comment @@ -84915,7 +85750,7 @@ commit 4db124defab2e585c5fb51bcc5e6b5c2b180d2b8 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 27 14:26:57 2009 +0200 +Date: Thu Aug 27 14:26:57 2009 +0200 Don't forget to add the projection in GimpObject::get_memsize() @@ -84924,7 +85759,7 @@ commit 193a0b3bcfc9f1d5edf97cd4cf200a2f0e7cd7e9 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 27 12:26:14 2009 +0200 +Date: Thu Aug 27 12:26:14 2009 +0200 Use gimp_item_stack_get_item_iter(stack) instead of GIMP_LIST(stack)->list @@ -84934,7 +85769,7 @@ commit 8f7527616aa1e920c2c658c907e5d58df28f75c8 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 27 12:06:09 2009 +0200 +Date: Thu Aug 27 12:06:09 2009 +0200 Make the include guards match the filename @@ -84943,7 +85778,7 @@ commit cd70850990d02de220bbc840d31a89ada1b0614d Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 27 11:53:47 2009 +0200 +Date: Thu Aug 27 11:53:47 2009 +0200 When scaling a group layer, remove children that are scaled away @@ -84955,7 +85790,7 @@ commit 2a8f29f00ae4d72e746040f8993589678bd7ffdc Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 27 11:01:51 2009 +0200 +Date: Thu Aug 27 11:01:51 2009 +0200 Minor whitespace cleanup @@ -84964,7 +85799,7 @@ commit 347d8db5d11c01b7d779157749aec268e0184916 Author: Tor Lillqvist <tml@iki.fi> -Date: Thu Aug 27 00:02:23 2009 +0300 +Date: Thu Aug 27 00:02:23 2009 +0300 Explicitly ask for a FT font map for the text tool @@ -84987,7 +85822,7 @@ commit c4b977916112ca6aef8aa1c45046e0c5b8abfc48 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Aug 26 20:25:30 2009 +0200 +Date: Wed Aug 26 20:25:30 2009 +0200 Enable clicking on tree expanders @@ -85000,7 +85835,7 @@ commit 98123f3475d71dda1ea66401559b8ecdac8e5e92 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Aug 26 13:20:18 2009 +0200 +Date: Wed Aug 26 13:20:18 2009 +0200 Add freeze_notify/thaw_notify around GimpDrawable::set_tiles() @@ -85009,7 +85844,7 @@ commit d442379d5e6db6ce2fe23b72717b1357f3d1e5b4 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Aug 26 13:06:55 2009 +0200 +Date: Wed Aug 26 13:06:55 2009 +0200 Change GimpProjectable::update to GimpProjectable:invalidate @@ -85022,17 +85857,17 @@ app/actions/view-commands.c | 2 +- app/core/gimpgrouplayer.c | 16 ++++++++++++++-- app/core/gimpimage-crop.c | 8 ++++---- - app/core/gimpimage.c | 38 +++++++++++++++++++------------------- - app/core/gimpimage.h | 2 +- + app/core/gimpimage.c | 38 +++++++++++++++++++------------------- + app/core/gimpimage.h | 2 +- app/core/gimpprojectable.c | 20 ++++++++++---------- app/core/gimpprojectable.h | 4 ++-- app/core/gimpprojection.c | 30 ++++++++++-------------------- - app/file/file-open.c | 8 ++++---- + app/file/file-open.c | 8 ++++---- 10 files changed, 69 insertions(+), 67 deletions(-) commit ea3358145164beb58f1befc66e0909a8b4a293b3 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Aug 26 13:03:40 2009 +0200 +Date: Wed Aug 26 13:03:40 2009 +0200 Use gimp_image_set_size() instead of setting width and height manually @@ -85041,16 +85876,16 @@ gimp_drawable_set_tiles() on the inner group layer failed to emit notify::width and notify::height. - app/core/gimpdrawable.c | 12 +++--------- - app/core/gimpimage-rotate.c | 7 +------ - app/text/gimptextlayer-xcf.c | 7 ++++--- - app/vectors/gimpvectors.c | 5 +++-- + app/core/gimpdrawable.c | 12 +++--------- + app/core/gimpimage-rotate.c | 7 +------ + app/text/gimptextlayer-xcf.c | 7 ++++--- + app/vectors/gimpvectors.c | 5 +++-- app/vectors/gimpvectorsmodundo.c | 7 ++++--- 5 files changed, 15 insertions(+), 23 deletions(-) commit ce5d591336cbea031042d2c384c70aef8d0eefb4 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Aug 26 13:00:13 2009 +0200 +Date: Wed Aug 26 13:00:13 2009 +0200 Add lowlevel accessor gimp_item_set_size() @@ -85060,28 +85895,28 @@ anything. app/core/gimpitem.c | 30 ++++++++++++++++++++++++++++++ - app/core/gimpitem.h | 3 +++ + app/core/gimpitem.h | 3 +++ 2 files changed, 33 insertions(+) commit 9683af0d3136b754f711da93459b5e19102e35df Author: Michael Natterer <mitch@gimp.org> -Date: Wed Aug 26 12:01:50 2009 +0200 +Date: Wed Aug 26 12:01:50 2009 +0200 Include "gimppdb-utils.h" - app/pdb/paths-cmds.c | 1 + + app/pdb/paths-cmds.c | 1 + tools/pdbgen/pdb/paths.pdb | 1 + 2 files changed, 2 insertions(+) commit 6aadd0bbc9fc1b08ad616b529aad49d9828787af Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 25 23:18:34 2009 +0200 +Date: Tue Aug 25 23:18:34 2009 +0200 Rename gimp_image_pick_correlate_layer() to gimp_image_pick_layer() - app/core/gimpimage.c | 6 +++--- - app/core/gimpimage.h | 2 +- - app/pdb/image-cmds.c | 2 +- + app/core/gimpimage.c | 6 +++--- + app/core/gimpimage.h | 2 +- + app/pdb/image-cmds.c | 2 +- app/tools/gimpmovetool.c | 10 +++++----- app/tools/gimpselectiontool.c | 4 ++-- tools/pdbgen/pdb/image.pdb | 2 +- @@ -85089,7 +85924,7 @@ commit fe84af9fd98feef46cb5448b898610e1ab7d24ec Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 25 23:10:31 2009 +0200 +Date: Tue Aug 25 23:10:31 2009 +0200 Don't forget to add added drawables' GeglNodes to the stack's GeglNode @@ -85101,7 +85936,7 @@ commit d37dc64b1628ea5ad4794b80c2a69240442c70c6 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 25 22:02:02 2009 +0200 +Date: Tue Aug 25 22:02:02 2009 +0200 Add GError reporting to gimp_image_merge_down() @@ -85112,13 +85947,13 @@ app/actions/layers-commands.c | 2 +- app/core/gimpimage-merge.c | 34 ++++++++++++++++++++++++++-------- app/core/gimpimage-merge.h | 3 ++- - app/pdb/image-cmds.c | 10 ++++++++-- + app/pdb/image-cmds.c | 10 ++++++++-- tools/pdbgen/pdb/image.pdb | 10 ++++++++-- 5 files changed, 45 insertions(+), 14 deletions(-) commit d91a89e1571e07f29de05dcd28b56edf1fffa702 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 25 21:26:14 2009 +0200 +Date: Tue Aug 25 21:26:14 2009 +0200 Make "Merge down" work on trees and start fixing the rest of the merge code @@ -85138,12 +85973,12 @@ commit 4cb185a8bab7cd8ae59f81d49838adda664f60fb Author: Alexia Death <alexiadeath@gmail.com> -Date: Tue Aug 25 21:28:24 2009 +0300 +Date: Tue Aug 25 21:28:24 2009 +0300 Fixing up the dynamics UI. Currently does not sync with the object in the context tho. - app/core/gimpdynamics.c | 2 +- + app/core/gimpdynamics.c | 2 +- app/widgets/gimpdynamicseditor.c | 409 +++++++++++++++++++++++++++------------ app/widgets/gimpdynamicseditor.h | 7 +- @@ -85151,7 +85986,7 @@ commit 7a373152f94e03cdc778f3ec7aeda74303984905 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 25 20:00:30 2009 +0200 +Date: Tue Aug 25 20:00:30 2009 +0200 Remove boolean variable that was only set and never used after @@ -85160,7 +85995,7 @@ commit 8a4d6c315f5e084be3d3d2fe30970df7efc1401f Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 25 17:32:55 2009 +0200 +Date: Tue Aug 25 17:32:55 2009 +0200 Enable "layers-resize" for group layers @@ -85169,7 +86004,7 @@ commit f812d09d1bcab231abff20ad609e10d2ed261f66 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 25 17:30:50 2009 +0200 +Date: Tue Aug 25 17:30:50 2009 +0200 Enable "layers-crop" for group layers @@ -85178,7 +86013,7 @@ commit 7a4ac0802c386bc718e7ffb7eb23f68d77e56933 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 25 17:29:29 2009 +0200 +Date: Tue Aug 25 17:29:29 2009 +0200 Implement GimpItem::resize() @@ -85191,7 +86026,7 @@ commit 764af4879e0e73c2bbe3ba42cc89a67d8c71aa72 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 25 16:25:26 2009 +0200 +Date: Tue Aug 25 16:25:26 2009 +0200 Revert almost all item tree related changed in this file @@ -85205,7 +86040,7 @@ commit d87337226285a8914e7c3d9491c7e0d3d417f4de Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 25 16:05:39 2009 +0200 +Date: Tue Aug 25 16:05:39 2009 +0200 Don't spoil the names of duplicated groups' children with "copy"s @@ -85214,7 +86049,7 @@ commit f61f435699de4bea4740519e142014ca7ab89993 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 25 15:57:04 2009 +0200 +Date: Tue Aug 25 15:57:04 2009 +0200 Filter out linked children of linked items to translate @@ -85223,7 +86058,7 @@ commit 6fa6aa268629f254d275be41ddf31d555664bbb3 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 25 15:55:30 2009 +0200 +Date: Tue Aug 25 15:55:30 2009 +0200 Filter out linked children of linked items to transform @@ -85232,7 +86067,7 @@ commit 86a76d6237fa7fe4b39a0b3f4f48b704be81f788 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 25 15:46:53 2009 +0200 +Date: Tue Aug 25 15:46:53 2009 +0200 Skip group layers when transforming the entire image @@ -85249,7 +86084,7 @@ commit cb1e3afba45075dbc0ac1aaa1cf74278e96a0941 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 25 15:36:03 2009 +0200 +Date: Tue Aug 25 15:36:03 2009 +0200 Add gimp_image_item_list_filter() @@ -85268,18 +86103,18 @@ commit 40cf6fa62ad0097e14119b428a243f01f9a6d722 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 25 14:31:33 2009 +0200 +Date: Tue Aug 25 14:31:33 2009 +0200 Allow scaling of group layers even though they appear locked app/actions/layers-actions.c | 6 +++++- - app/pdb/layer-cmds.c | 10 ++++++++-- + app/pdb/layer-cmds.c | 10 ++++++++-- tools/pdbgen/pdb/layer.pdb | 10 ++++++++-- 3 files changed, 21 insertions(+), 5 deletions(-) commit bdf01c6495d46f1b7b1a7e64b2eb1564c89565df Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 25 14:26:26 2009 +0200 +Date: Tue Aug 25 14:26:26 2009 +0200 Fix gimp_group_layer_scale() to do the right thing @@ -85291,7 +86126,7 @@ commit 62c5b23aaf9e58c1d1ce3c74a8c0b62f068625ee Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 25 14:23:42 2009 +0200 +Date: Tue Aug 25 14:23:42 2009 +0200 Add naive and wrong version of GimpItem::convert() @@ -85303,7 +86138,7 @@ commit 71134c7f7d161e398fa8c3c55effcd993eb7a5ca Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 25 12:11:44 2009 +0200 +Date: Tue Aug 25 12:11:44 2009 +0200 gimp_group_layer_duplicate(): insert children in the right order @@ -85312,7 +86147,7 @@ commit be40405fdeaa58cd987c13ae2a077ab355e69684 Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Mon Aug 24 22:51:46 2009 -0300 +Date: Mon Aug 24 22:51:46 2009 -0300 Fix errors and warnings. @@ -85322,18 +86157,18 @@ commit 6934a0d2eb8a7bc17bb3ec1b46fbbc82b3312357 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 24 22:38:16 2009 +0200 +Date: Mon Aug 24 22:38:16 2009 +0200 Make sure all group layers' projections switch to GEGL with the main projection app/actions/view-commands.c | 16 ++++++++++++++++ - app/core/gimpgrouplayer.c | 3 +++ + app/core/gimpgrouplayer.c | 3 +++ 2 files changed, 19 insertions(+) commit 1403db11efe490f4b95efd7dad77d3c3b04cf217 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 24 22:01:16 2009 +0200 +Date: Mon Aug 24 22:01:16 2009 +0200 Fix the layer-offset of the group layer's projection graph @@ -85348,7 +86183,7 @@ commit aac92da559f7ae7771e7adf26affc099d731c818 Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Mon Aug 24 15:55:44 2009 -0300 +Date: Mon Aug 24 15:55:44 2009 -0300 Have wires and function calls between dynamics and its editor @@ -85359,7 +86194,7 @@ commit f65261c8ad252bf69c2f41b3d94b7fe7ce18f00d Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 24 20:29:37 2009 +0200 +Date: Mon Aug 24 20:29:37 2009 +0200 Enable simple flip and rotate for group layers @@ -85368,14 +86203,14 @@ appear locked. It seems that group == locked idea is not as allmighty as i thought :( - app/actions/drawable-actions.c | 14 +++++++++----- - app/pdb/drawable-transform-cmds.c | 10 ++++++++-- + app/actions/drawable-actions.c | 14 +++++++++----- + app/pdb/drawable-transform-cmds.c | 10 ++++++++-- tools/pdbgen/pdb/drawable_transform.pdb | 10 ++++++++-- 3 files changed, 25 insertions(+), 9 deletions(-) commit 9fd204977dbf4a923da46c12029c830aa362944f Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 24 19:33:29 2009 +0200 +Date: Mon Aug 24 19:33:29 2009 +0200 Implement GimpItem's transform methods @@ -85390,7 +86225,7 @@ commit c8c6d77c3584c306de4d00a526df488d87e4c027 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 24 17:30:41 2009 +0200 +Date: Mon Aug 24 17:30:41 2009 +0200 Fix finalize() so it doesn't crash @@ -85399,7 +86234,7 @@ commit 2ba3b36969fcb2b07e8533d1b508fe4cbcd40b11 Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Mon Aug 24 11:15:14 2009 -0300 +Date: Mon Aug 24 11:15:14 2009 -0300 Have config value for prop button. @@ -85409,7 +86244,7 @@ commit 4fa06d040516570baa038430df0a01503ce04325 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 24 16:03:21 2009 +0200 +Date: Mon Aug 24 16:03:21 2009 +0200 Add a projection to GimpGroupLayer so we finally have a *visible* layer tree @@ -85426,7 +86261,7 @@ commit dd8a7740abf97ece183e424ee295e94f4061b50b Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 24 15:59:14 2009 +0200 +Date: Mon Aug 24 15:59:14 2009 +0200 Honor the projectable's offset in the projection @@ -85443,13 +86278,13 @@ that will happen on group layers). app/core/gimpprojection-construct.c | 27 +++++++++++++++++++++++- - app/core/gimpprojection.c | 41 + app/core/gimpprojection.c | 41 +++++++++++++++++++++++++++++++------ 2 files changed, 61 insertions(+), 7 deletions(-) commit 0f668e411e02b7144a3b3d57465737b104b99461 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 24 15:54:59 2009 +0200 +Date: Mon Aug 24 15:54:59 2009 +0200 Add an offset API to the GimpProjectable interface @@ -85464,7 +86299,7 @@ commit a451eb950c69a8a78442ec89eb0e905665d9ab38 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 24 12:14:25 2009 +0200 +Date: Mon Aug 24 12:14:25 2009 +0200 Use gimp_item_stack_get_item_iter() @@ -85473,7 +86308,7 @@ commit ffe1359d84b487d0538622505a3be3163938f887 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 24 12:13:29 2009 +0200 +Date: Mon Aug 24 12:13:29 2009 +0200 Add gimp_item_stach_get_item_iter() @@ -85485,7 +86320,7 @@ commit 2ec53512c5c42384f4ea5cd5cea20b1a2c744aca Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 24 00:34:12 2009 +0200 +Date: Mon Aug 24 00:34:12 2009 +0200 Change local variable names from "layer" to "group" @@ -85495,7 +86330,7 @@ commit 6f5488a0462393da49a59d35dd8188491e4f622e Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Mon Aug 24 09:44:06 2009 -0300 +Date: Mon Aug 24 09:44:06 2009 -0300 Implement check button grid. @@ -85505,7 +86340,7 @@ commit 781e7ead0feafcb03af49b821bfcaa2e0ddbe84d Author: Denis Arnaud <darnaud@src.gnome.org> -Date: Mon Aug 24 13:30:30 2009 +0200 +Date: Mon Aug 24 13:30:30 2009 +0200 Updated breton translation @@ -85515,19 +86350,19 @@ commit 9570a4c711bbfa9ffc10b7cdf72dd01e0b36baba Author: Alexandre Prokoudine <alexandre.prokoudine@gmail.com> -Date: Mon Aug 24 14:55:06 2009 +0400 +Date: Mon Aug 24 14:55:06 2009 +0400 Deweirdification of Russian translation, Part I, original/master po-libgimp/ru.po | 326 +++++---- po-plug-ins/ru.po | 216 ++++-- - po/ru.po | 1966 + po/ru.po | 1966 +++++++++++++++++++++++++++++------------------------ 3 files changed, 1427 insertions(+), 1081 deletions(-) commit a136d86c5498f5495e422435a362a43f23f99ffa Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 23 23:00:32 2009 +0200 +Date: Sun Aug 23 23:00:32 2009 +0200 Automatically adjust the size of group layers @@ -85540,11 +86375,11 @@ commit c6bd3e0570ae8bf5233198392def3f67c9ef55c8 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 23 22:58:36 2009 +0200 +Date: Sun Aug 23 22:58:36 2009 +0200 Add gimp_rectangle_union() - libgimpbase/gimpbase.def | 1 + + libgimpbase/gimpbase.def | 1 + libgimpbase/gimprectangle.c | 49 ++++++++++++++++++++++++++++++++++++++++++++- libgimpbase/gimprectangle.h | 13 ++++++++++++ @@ -85552,7 +86387,7 @@ commit e2ed81e310f9536c703fd9e7264522b4cf7b6b8b Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 23 20:27:47 2009 +0200 +Date: Sun Aug 23 20:27:47 2009 +0200 Revert "Revert "Add a button to create a group layer to the layers dialog"" @@ -85564,7 +86399,7 @@ commit 819abf2fa0e74ea6e51ebd8249cd890ccff5fcbd Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 23 20:02:36 2009 +0200 +Date: Sun Aug 23 20:02:36 2009 +0200 Override the "lock-content" property to default to TRUE @@ -85574,7 +86409,7 @@ commit 922375cecad12f1f0fe5d9bb1ea20be3cabffe6c Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 23 19:54:19 2009 +0200 +Date: Sun Aug 23 19:54:19 2009 +0200 g_return_if_fail() on attempts to set locks that can't be changed @@ -85584,12 +86419,12 @@ commit aa70c13fd6c4fbca8840bdcb3372b7a3e4ee7970 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 23 19:51:59 2009 +0200 +Date: Sun Aug 23 19:51:59 2009 +0200 Keep the PDB from changing locks that can't be changed app/pdb/drawable-cmds.c | 5 ++++- - app/pdb/layer-cmds.c | 5 ++++- + app/pdb/layer-cmds.c | 5 ++++- app/pdb/vectors-cmds.c | 5 ++++- tools/pdbgen/pdb/drawable.pdb | 5 ++++- tools/pdbgen/pdb/layer.pdb | 5 ++++- @@ -85598,20 +86433,20 @@ commit af794539d8a17cf4e5494c504008e5e57788c80f Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 23 19:44:15 2009 +0200 +Date: Sun Aug 23 19:44:15 2009 +0200 Make the lock actions insensitive according to the new can_lock functions app/actions/drawable-actions.c | 4 +++- - app/actions/layers-actions.c | 40 + app/actions/layers-actions.c | 40 +++++++++++++++++++++------------------- - app/actions/vectors-actions.c | 4 +++- + app/actions/vectors-actions.c | 4 +++- 3 files changed, 27 insertions(+), 21 deletions(-) commit d6dd3ea39b0759bed78774647ef58880403d59b6 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 23 19:39:28 2009 +0200 +Date: Sun Aug 23 19:39:28 2009 +0200 Set the lock toggles insensitive if the resp. lock properties can't be changed @@ -85622,7 +86457,7 @@ commit b58c988c76ea1394ca4da5fe38fd84f9486d259a Author: Marco Ciampa <ciampix@libero.it> -Date: Sun Aug 23 19:10:42 2009 +0200 +Date: Sun Aug 23 19:10:42 2009 +0200 Updated italian translation. @@ -85631,7 +86466,7 @@ commit d52d7e77b3c58385cd2914fe518bf0b5050743c3 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 23 18:44:05 2009 +0200 +Date: Sun Aug 23 18:44:05 2009 +0200 Add API to determine whether "lock" properties can ba changed @@ -85648,7 +86483,7 @@ commit 34bccb087617cebb22a0ac6ac31cffde5016de11 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Aug 23 18:14:52 2009 +0200 +Date: Sun Aug 23 18:14:52 2009 +0200 authors: Tal's real name is Tal Trachtman @@ -85658,12 +86493,12 @@ commit 287f9ab887937f67f62600f9f2b36fe0c97af3e8 Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Sun Aug 23 11:56:03 2009 -0300 +Date: Sun Aug 23 11:56:03 2009 -0300 Adjust UI code to make check button. - app/core/gimpdynamics.c | 8 +- - app/core/gimpdynamics.h | 4 +- + app/core/gimpdynamics.c | 8 +- + app/core/gimpdynamics.h | 4 +- app/widgets/gimpdynamicseditor.c | 238 ++++++++++++++++++++------------------- app/widgets/gimpdynamicseditor.h | 8 +- @@ -85671,7 +86506,7 @@ commit e61316cea1344ff6f0ffeded9c349dd319d5c302 Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Sat Aug 22 17:54:36 2009 -0300 +Date: Sat Aug 22 17:54:36 2009 -0300 Clean up and have a new branch. @@ -85680,7 +86515,7 @@ commit b141bcdb600deb41683ccb64be444523e53614bf Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 22 01:22:41 2009 +0200 +Date: Sat Aug 22 01:22:41 2009 +0200 Minor plug-in sensitivity refactoring @@ -85691,14 +86526,14 @@ * app/actions/plug-in-actions.c (plug_in_actions_update): pass the active drawable instead of its type. - app/actions/plug-in-actions.c | 19 +++++++------------ + app/actions/plug-in-actions.c | 19 +++++++------------ app/plug-in/gimppluginprocedure.c | 13 +++++++++---- app/plug-in/gimppluginprocedure.h | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) commit f6eed71a5c4bcd42253db17fdcd3e990684a8f7b Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 22 10:41:03 2009 +0200 +Date: Sat Aug 22 10:41:03 2009 +0200 plug-ins: Register .data as extension for raw data loader @@ -85711,7 +86546,7 @@ commit ee8b53934b67420bc96433f78e7836a615ce143c Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 22 10:34:15 2009 +0200 +Date: Sat Aug 22 10:34:15 2009 +0200 app: Use original layer names when importing multi-layered images @@ -85724,7 +86559,7 @@ commit b574ae9275249a79b874c45e9433e383a5dad8a9 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 22 10:11:35 2009 +0200 +Date: Sat Aug 22 10:11:35 2009 +0200 app: Name layers of imported files to filename @@ -85736,7 +86571,7 @@ commit 92df6ae6cdff6b5c139f04c5d0016a6e28a90ffe Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 22 09:00:18 2009 +0200 +Date: Sat Aug 22 09:00:18 2009 +0200 app: Introduce helper function file_open_get_layers() @@ -85746,7 +86581,7 @@ commit 27d5164f3c862ef7529734b0c82dbf446452c94e Author: Tim Harder <radhermit@gmail.com> -Date: Fri Aug 21 13:49:38 2009 -0700 +Date: Fri Aug 21 13:49:38 2009 -0700 libgimpbase: Remove trailing comma from GimpTextHintStyle @@ -85755,18 +86590,18 @@ commit 51cd8c2981c480a0e2ff2ecf0c45f4763f5d4196 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Aug 21 21:39:54 2009 +0200 +Date: Fri Aug 21 21:39:54 2009 +0200 app: Only show 'File->Overwrite' if the source URI has an exporter - app/actions/file-actions.c | 25 +++++++++++++++++-------- + app/actions/file-actions.c | 25 +++++++++++++++++-------- app/plug-in/gimppluginmanager-file.c | 7 +++++++ app/plug-in/gimppluginmanager-file.h | 2 ++ 3 files changed, 26 insertions(+), 8 deletions(-) commit 0a90a7570538959e46fed9f1a4d8cab6e0edc9d9 Author: Alexia Death <alexiadeath@gmail.com> -Date: Fri Aug 21 21:14:23 2009 +0300 +Date: Fri Aug 21 21:14:23 2009 +0300 Make the dynamics editor build and move the commented out mess to the end of the file. @@ -85777,20 +86612,20 @@ commit 9040afc0fc49b8cbeb296b66c8efc4e497a944ef Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 21 19:34:59 2009 +0200 +Date: Fri Aug 21 19:34:59 2009 +0200 Set BAD cursors if the active drawable is locked - app/tools/gimpblendtool.c | 20 ++++++++--------- + app/tools/gimpblendtool.c | 20 ++++++++--------- app/tools/gimpbucketfilltool.c | 29 ++++++++++++++---------- - app/tools/gimppainttool.c | 50 + app/tools/gimppainttool.c | 50 ++++++++++++++++++++++++++++++++++++++++++ - app/tools/gimptransformtool.c | 7 ++++++ + app/tools/gimptransformtool.c | 7 ++++++ 4 files changed, 84 insertions(+), 22 deletions(-) commit ed2c002fd8ce87917d4a9acb6052fa0287971a65 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 21 19:04:45 2009 +0200 +Date: Fri Aug 21 19:04:45 2009 +0200 Make the checks in GimpTool::initialize() work reliably @@ -85801,15 +86636,15 @@ 1 file changed, 3 insertions(+) commit 6655f1b04fe9fc7e40ed6b2af2ce8eeb56b71f92 -Merge: 6c496f7 d2143b8 +Merge: 6c496f7d69 d2143b8886 Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Fri Aug 21 13:33:19 2009 -0300 +Date: Fri Aug 21 13:33:19 2009 -0300 Merge commit 'origin/soc-2009-dynamics' into soc-2009-dynamics commit c9c28be9dfa7101c95b828b32a5a9d8f23c17eb1 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 21 18:27:50 2009 +0200 +Date: Fri Aug 21 18:27:50 2009 +0200 Make the checks in GimpTool::initialize() work reliably @@ -85820,15 +86655,15 @@ 1 file changed, 3 insertions(+) commit d2143b8886681491e74d8a8565fc0bf815b55918 -Merge: db8aa6c b929a7a +Merge: db8aa6cb21 b929a7a67c Author: Alexia Death <alexiadeath@gmail.com> -Date: Fri Aug 21 19:26:05 2009 +0300 +Date: Fri Aug 21 19:26:05 2009 +0300 Merging master to current state commit cb8a611e9388cf2060808a2f3eea3339429e9947 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 21 18:06:58 2009 +0200 +Date: Fri Aug 21 18:06:58 2009 +0200 Don't PDB-modify locked vectors @@ -85842,7 +86677,7 @@ commit 45aa584b3e518b45f63d3678d310f7ffb482a016 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 21 17:57:56 2009 +0200 +Date: Fri Aug 21 17:57:56 2009 +0200 Make all vectors PDB manipulation undoable @@ -85854,7 +86689,7 @@ commit 345f88ab04557c3e882c57178feca52a609372e7 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 21 14:33:12 2009 +0200 +Date: Fri Aug 21 14:33:12 2009 +0200 Make sure we don't PDB-modify locked text layers @@ -85869,19 +86704,19 @@ * app/pdb/text-layer-cmds.c * app/pdb/vectors-cmds.c: regenerated. - app/pdb/gimppdb-utils.c | 3 ++- - app/pdb/gimppdb-utils.h | 1 + - app/pdb/text-layer-cmds.c | 58 + app/pdb/gimppdb-utils.c | 3 ++- + app/pdb/gimppdb-utils.h | 1 + + app/pdb/text-layer-cmds.c | 58 ++++++++++++++++++++--------------------- - app/pdb/vectors-cmds.c | 2 +- + app/pdb/vectors-cmds.c | 2 +- tools/pdbgen/pdb/text_layer.pdb | 58 ++++++++++++++++++++--------------------- - tools/pdbgen/pdb/vectors.pdb | 2 +- + tools/pdbgen/pdb/vectors.pdb | 2 +- 6 files changed, 63 insertions(+), 61 deletions(-) commit 256ac5e62e71610e8ab9f1ddc87f6439719892e0 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 21 14:30:41 2009 +0200 +Date: Fri Aug 21 14:30:41 2009 +0200 Add "lock_content" PDB getters and setters for drawables and vectors @@ -85900,7 +86735,7 @@ commit b929a7a67c5e9b39dcc154c6301b7c79e931ddd0 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 21 14:10:22 2009 +0200 +Date: Fri Aug 21 14:10:22 2009 +0200 Don't allow to drop stuff to locked drawables @@ -85909,7 +86744,7 @@ commit a7efe42870bfb967e066a48c13854b05d2eff182 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 21 13:53:34 2009 +0200 +Date: Fri Aug 21 13:53:34 2009 +0200 Use a GtkToggleButton instead of GtkCheckButton for "Grab event" @@ -85921,7 +86756,7 @@ commit b793146bdea64d963ac14fe39eed5ea0e4cad78b Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 21 13:52:29 2009 +0200 +Date: Fri Aug 21 13:52:29 2009 +0200 Remove redundant call to gtk_toggle_button_set_mode() @@ -85933,7 +86768,7 @@ commit b277454760b1943467bd89bf8666e16b8c0e57f2 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 21 13:50:07 2009 +0200 +Date: Fri Aug 21 13:50:07 2009 +0200 Don't allow to drop stuff to locked drawables @@ -85942,7 +86777,7 @@ commit cca194ed04bce6e297c3e2b9143c71194d26ec7e Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 21 12:07:55 2009 +0200 +Date: Fri Aug 21 12:07:55 2009 +0200 Don't transform the item if it was locked while using the tool @@ -85955,7 +86790,7 @@ commit 7b5e176eeecd394b83b69ca1b8cbce8ad56a7002 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 21 11:55:18 2009 +0200 +Date: Fri Aug 21 11:55:18 2009 +0200 Really don't paint on locked drawables @@ -85969,7 +86804,7 @@ commit 2d930914633e9692d17100209ae9ba2939c5c37d Author: Mads Lundby <lundbymads@gmail.com> -Date: Fri Aug 21 01:25:06 2009 +0200 +Date: Fri Aug 21 01:25:06 2009 +0200 Updated Danish translation @@ -85979,19 +86814,19 @@ commit d196e12da4f2a1f48a4d963b71724aa5d8b72c63 Author: Marco Ciampa <ciampix@libero.it> -Date: Thu Aug 20 23:26:15 2009 +0200 +Date: Thu Aug 20 23:26:15 2009 +0200 Updated italian translation po-libgimp/it.po | 340 ++++--- po-plug-ins/it.po | 2667 ++++++++++++++++++++++++++++++----------------------- - po/it.po | 1935 ++++++++++++++++++++------------------ + po/it.po | 1935 ++++++++++++++++++++------------------ 3 files changed, 2727 insertions(+), 2215 deletions(-) commit e95b5d9f723eebedcfeb01f7329dd5fa0a4e0375 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 20 22:43:01 2009 +0200 +Date: Thu Aug 20 22:43:01 2009 +0200 When cropping the active layer, error out if there is none or it is locked @@ -86001,7 +86836,7 @@ commit 0953146be10a2d6c23ac53de90fd95e3e000c4e0 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 20 22:41:49 2009 +0200 +Date: Thu Aug 20 22:41:49 2009 +0200 Check if there is an active layer if active_layer_only is TRUE @@ -86010,7 +86845,7 @@ commit de409ea52a96251e5e8f32eb03643da0a9c4d0e5 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 20 22:22:17 2009 +0200 +Date: Thu Aug 20 22:22:17 2009 +0200 Fix sensitivity of the "Merge down" action @@ -86022,7 +86857,7 @@ commit 3309c35f18095916532a850584c380ecba17a3b6 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 20 22:11:33 2009 +0200 +Date: Thu Aug 20 22:11:33 2009 +0200 Fix typo: defualt -> default (spotted by Alexia) @@ -86030,15 +86865,15 @@ 1 file changed, 1 insertion(+), 1 deletion(-) commit 6c496f7d69ccd32221c0c5678961efe285d6f723 -Merge: 54e0b15 db8aa6c +Merge: 54e0b15b46 db8aa6cb21 Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Thu Aug 20 17:11:21 2009 -0300 +Date: Thu Aug 20 17:11:21 2009 -0300 Merge commit 'origin/soc-2009-dynamics' into soc-2009-dynamics commit db8aa6cb2131cb7de2743484f4f62fda8834b3fb Author: Alexia Death <alexiadeath@gmail.com> -Date: Thu Aug 20 22:46:17 2009 +0300 +Date: Thu Aug 20 22:46:17 2009 +0300 Make dynamics object have an effect on the paintpbrush. Currently pressure and velocity only. @@ -86052,7 +86887,7 @@ commit f42f0e16a9e2eec118acd9bc9fac1c67c5fa794e Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 20 21:20:20 2009 +0200 +Date: Thu Aug 20 21:20:20 2009 +0200 Add the "drawable-lock-content" action to the layer properties section @@ -86061,7 +86896,7 @@ commit 35a7052b8d2f888a6b54ca36500de80e707763fe Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 20 21:19:43 2009 +0200 +Date: Thu Aug 20 21:19:43 2009 +0200 Add actions and callbacks to toggle "lock-content" on drawables and vectors @@ -86069,14 +86904,14 @@ app/actions/drawable-actions.c | 32 ++++++++++++++++++++++---------- app/actions/drawable-commands.c | 35 +++++++++++++++++++++++++++++++++++ app/actions/drawable-commands.h | 2 ++ - app/actions/vectors-actions.c | 22 ++++++++++++++++------ + app/actions/vectors-actions.c | 22 ++++++++++++++++------ app/actions/vectors-commands.c | 31 +++++++++++++++++++++++++++++++ app/actions/vectors-commands.h | 2 ++ 6 files changed, 108 insertions(+), 16 deletions(-) commit 28061c23f1559c7c29e034a5043210b4011fd566 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 20 20:47:01 2009 +0200 +Date: Thu Aug 20 20:47:01 2009 +0200 Don't modify locked items from PDB wrappers @@ -86090,42 +86925,42 @@ * app/pdb/*-cmds.c: regenerated. - app/pdb/color-cmds.c | 32 + app/pdb/color-cmds.c | 32 ++++++++++++++--------------- - app/pdb/drawable-cmds.c | 18 ++++++++++------- - app/pdb/drawable-transform-cmds.c | 32 + app/pdb/drawable-cmds.c | 18 ++++++++++------- + app/pdb/drawable-transform-cmds.c | 32 ++++++++++++++--------------- - app/pdb/edit-cmds.c | 28 ++++++++++++------------- - app/pdb/floating-sel-cmds.c | 2 +- - app/pdb/gimppdb-utils.c | 6 +++++- - app/pdb/gimppdb-utils.h | 1 + - app/pdb/image-cmds.c | 8 ++++---- - app/pdb/layer-cmds.c | 20 +++++++++++------- - app/pdb/paint-tools-cmds.c | 34 + app/pdb/edit-cmds.c | 28 ++++++++++++------------- + app/pdb/floating-sel-cmds.c | 2 +- + app/pdb/gimppdb-utils.c | 6 +++++- + app/pdb/gimppdb-utils.h | 1 + + app/pdb/image-cmds.c | 8 ++++---- + app/pdb/layer-cmds.c | 20 +++++++++++------- + app/pdb/paint-tools-cmds.c | 34 +++++++++++++++---------------- - app/pdb/paths-cmds.c | 3 ++- - app/pdb/selection-cmds.c | 2 +- - app/pdb/text-tool-cmds.c | 4 ++-- - app/pdb/transform-tools-cmds.c | 12 +++++------ - tools/pdbgen/pdb/color.pdb | 32 + app/pdb/paths-cmds.c | 3 ++- + app/pdb/selection-cmds.c | 2 +- + app/pdb/text-tool-cmds.c | 4 ++-- + app/pdb/transform-tools-cmds.c | 12 +++++------ + tools/pdbgen/pdb/color.pdb | 32 ++++++++++++++--------------- - tools/pdbgen/pdb/drawable.pdb | 18 ++++++++++------- + tools/pdbgen/pdb/drawable.pdb | 18 ++++++++++------- tools/pdbgen/pdb/drawable_transform.pdb | 12 +++++------ - tools/pdbgen/pdb/edit.pdb | 28 ++++++++++++------------- - tools/pdbgen/pdb/floating_sel.pdb | 2 +- - tools/pdbgen/pdb/image.pdb | 8 ++++---- - tools/pdbgen/pdb/layer.pdb | 20 +++++++++++------- - tools/pdbgen/pdb/paint_tools.pdb | 36 + tools/pdbgen/pdb/edit.pdb | 28 ++++++++++++------------- + tools/pdbgen/pdb/floating_sel.pdb | 2 +- + tools/pdbgen/pdb/image.pdb | 8 ++++---- + tools/pdbgen/pdb/layer.pdb | 20 +++++++++++------- + tools/pdbgen/pdb/paint_tools.pdb | 36 ++++++++++++++++----------------- - tools/pdbgen/pdb/paths.pdb | 3 ++- - tools/pdbgen/pdb/selection.pdb | 2 +- - tools/pdbgen/pdb/text_tool.pdb | 4 ++-- - tools/pdbgen/pdb/transform_tools.pdb | 12 +++++------ + tools/pdbgen/pdb/paths.pdb | 3 ++- + tools/pdbgen/pdb/selection.pdb | 2 +- + tools/pdbgen/pdb/text_tool.pdb | 4 ++-- + tools/pdbgen/pdb/transform_tools.pdb | 12 +++++------ 26 files changed, 203 insertions(+), 176 deletions(-) commit b5c3e5a6b694f1dad0b6b8e545e9dd0def1f0087 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 20 19:34:30 2009 +0200 +Date: Thu Aug 20 19:34:30 2009 +0200 Also copy "lock_content" when duplicating an item @@ -86134,7 +86969,7 @@ commit 774850c46f833b357c99b645d69afdeb01ed1f8d Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 20 18:50:55 2009 +0200 +Date: Thu Aug 20 18:50:55 2009 +0200 Add gimp_pdb_item_is_writable() which sets an error if the item is locked @@ -86144,15 +86979,15 @@ 2 files changed, 24 insertions(+) commit 54e0b15b460798bdfe246aa09957b9511d5d534d -Merge: d73330e e04a761 +Merge: d73330e3fa e04a7617d5 Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Thu Aug 20 12:52:21 2009 -0300 +Date: Thu Aug 20 12:52:21 2009 -0300 Merge commit 'origin/soc-2009-dynamics' into soc-2009-dynamics commit d73330e3fab71b7807a8aa2155a5d494e039b49a Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Thu Aug 20 12:51:07 2009 -0300 +Date: Thu Aug 20 12:51:07 2009 -0300 Add UI to dynamics editor. @@ -86162,7 +86997,7 @@ commit e04a7617d5a5881f8fd38a240fc0acd874adb513 Author: Alexia Death <alexiadeath@gmail.com> -Date: Thu Aug 20 18:24:50 2009 +0300 +Date: Thu Aug 20 18:24:50 2009 +0300 Cleaning up the dynamics init a little bit more @@ -86175,7 +87010,7 @@ commit 7262e45df9cdc2fd743f75b23b6b1420730e9f53 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 20 17:11:31 2009 +0200 +Date: Thu Aug 20 17:11:31 2009 +0200 Made modifying actions insensitive when the active item is locked @@ -86183,15 +87018,15 @@ active item and it is not locked". app/actions/drawable-actions.c | 24 +++++++++++++----------- - app/actions/edit-actions.c | 24 +++++++++++++++--------- - app/actions/layers-actions.c | 23 ++++++++++++----------- - app/actions/select-actions.c | 12 +++++++++--- - app/actions/vectors-actions.c | 8 +++++--- + app/actions/edit-actions.c | 24 +++++++++++++++--------- + app/actions/layers-actions.c | 23 ++++++++++++----------- + app/actions/select-actions.c | 12 +++++++++--- + app/actions/vectors-actions.c | 8 +++++--- 5 files changed, 54 insertions(+), 37 deletions(-) commit ec6600a0b3dab3ccd3e99fb1096031e375e72a07 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 20 17:05:23 2009 +0200 +Date: Thu Aug 20 17:05:23 2009 +0200 Refuse to edit locked drawables @@ -86199,27 +87034,27 @@ and bail out with an appropriate error if it is. This currently prevents cloning from locked drawables, will fix that later. - app/tools/gimpblendtool.c | 7 +++++++ + app/tools/gimpblendtool.c | 7 +++++++ app/tools/gimpbrightnesscontrasttool.c | 4 +--- - app/tools/gimpbucketfilltool.c | 27 +++++++++++++++++++++++++++ - app/tools/gimpcolorbalancetool.c | 4 +--- - app/tools/gimpcolorizetool.c | 5 ++++- - app/tools/gimpcurvestool.c | 5 ++++- - app/tools/gimpdesaturatetool.c | 5 ++++- - app/tools/gimpgegltool.c | 4 +--- - app/tools/gimphuesaturationtool.c | 4 +--- - app/tools/gimpimagemaptool.c | 12 ++++++++++-- - app/tools/gimplevelstool.c | 5 ++++- - app/tools/gimppainttool.c | 28 ++++++++++++++++++++++++++++ - app/tools/gimpperspectiveclonetool.c | 5 +++++ - app/tools/gimpposterizetool.c | 5 ++++- - app/tools/gimpthresholdtool.c | 5 ++++- - app/tools/gimptransformtool.c | 18 +++++++++++++++++- + app/tools/gimpbucketfilltool.c | 27 +++++++++++++++++++++++++++ + app/tools/gimpcolorbalancetool.c | 4 +--- + app/tools/gimpcolorizetool.c | 5 ++++- + app/tools/gimpcurvestool.c | 5 ++++- + app/tools/gimpdesaturatetool.c | 5 ++++- + app/tools/gimpgegltool.c | 4 +--- + app/tools/gimphuesaturationtool.c | 4 +--- + app/tools/gimpimagemaptool.c | 12 ++++++++++-- + app/tools/gimplevelstool.c | 5 ++++- + app/tools/gimppainttool.c | 28 ++++++++++++++++++++++++++++ + app/tools/gimpperspectiveclonetool.c | 5 +++++ + app/tools/gimpposterizetool.c | 5 ++++- + app/tools/gimpthresholdtool.c | 5 ++++- + app/tools/gimptransformtool.c | 18 +++++++++++++++++- 16 files changed, 122 insertions(+), 21 deletions(-) commit 4af5324d585cea4d9783b5e38bf4cf7d2059570e Author: Alexia Death <alexiadeath@gmail.com> -Date: Thu Aug 20 15:53:40 2009 +0300 +Date: Thu Aug 20 15:53:40 2009 +0300 Cleaning up the dynamics init a little bit @@ -86229,7 +87064,7 @@ commit ee5b8c6552e935588c6049092a88e3db3aef4fc9 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 20 12:50:40 2009 +0200 +Date: Thu Aug 20 12:50:40 2009 +0200 Make the appearance of the "lock content" toggle configurable @@ -86254,7 +87089,7 @@ commit ff3197530549c5904b2a57f292a5b6225774fd7d Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 20 12:33:01 2009 +0200 +Date: Thu Aug 20 12:33:01 2009 +0200 Keep the lock buttons at the end of the options vbox @@ -86263,7 +87098,7 @@ commit 455e5239cbb9809ce4576de229fa73505825a579 Author: Alexia Death <alexiadeath@gmail.com> -Date: Thu Aug 20 12:34:45 2009 +0300 +Date: Thu Aug 20 12:34:45 2009 +0300 Adding the sub files for dynamics save and load @@ -86277,7 +87112,7 @@ commit 569a64d2c9ad4c6e520efc56bf7fc933a7ab272b Author: Alexia Death <alexiadeath@gmail.com> -Date: Thu Aug 20 12:26:02 2009 +0300 +Date: Thu Aug 20 12:26:02 2009 +0300 Created stubs for saving and loading dynamics @@ -86287,31 +87122,29 @@ commit 93f8216881715fac9572aa6073ca94cbc5a17162 Author: Alexia Death <alexiadeath@gmail.com> -Date: Thu Aug 20 04:25:26 2009 +0300 +Date: Thu Aug 20 04:25:26 2009 +0300 Renaming GimpDynamicsOptions to GimpDynamics and moving from paint/ to core/. A BIG change. - app/core/Makefile.am | 2 + - app/core/gimp.c | 6 +- - app/core/gimp.h | 4 +- - app/core/gimpcontext.c | 17 +- - app/core/gimpcontext.h | 4 +- - app/core/gimpdynamics.c | 930 - +++++++++++++++++++++++++++++++++++++++ - app/core/gimpdynamics.h | 92 ++++ - app/paint/Makefile.am | 2 - - app/paint/gimpbrushcore.c | 19 +- - app/paint/gimpbrushcore.h | 8 +- - app/paint/gimpdynamicsoptions.c | 930 - --------------------------------------- - app/paint/gimpdynamicsoptions.h | 91 ---- - app/widgets/gimpdynamicseditor.c | 6 +- - 13 files changed, 1057 insertions(+), 1054 deletions(-) + app/core/Makefile.am | 2 + + app/core/gimp.c | 6 +- + app/core/gimp.h | 4 +- + app/core/gimpcontext.c | 17 +-- + app/core/gimpcontext.h | 4 +- + .../gimpdynamicsoptions.c => core/gimpdynamics.c} | 158 + ++++++++++----------- + app/core/gimpdynamics.h | 92 ++++++++++++ + app/paint/Makefile.am | 2 - + app/paint/gimpbrushcore.c | 19 +-- + app/paint/gimpbrushcore.h | 8 +- + app/paint/gimpdynamicsoptions.h | 91 ------------ + app/widgets/gimpdynamicseditor.c | 6 +- + 12 files changed, 206 insertions(+), 203 deletions(-) commit 9fa9f41106f7a504b60368eb8ff1308446aa6b01 Author: Alexia Death <alexiadeath@gmail.com> -Date: Thu Aug 20 03:25:14 2009 +0300 +Date: Thu Aug 20 03:25:14 2009 +0300 Taking out unimplemented gimp_dynamics_load for now @@ -86320,18 +87153,18 @@ commit 460bf0ecdde18747e346ad07a6533e670531453d Author: Alexia Death <alexiadeath@gmail.com> -Date: Thu Aug 20 03:20:17 2009 +0300 +Date: Thu Aug 20 03:20:17 2009 +0300 Fixing some more props errors in context - app/core/core-enums.h | 2 +- - app/core/gimp.c | 9 ++++----- + app/core/core-enums.h | 2 +- + app/core/gimp.c | 9 ++++----- app/core/gimpcontext.c | 10 +++++----- 3 files changed, 10 insertions(+), 11 deletions(-) commit 17a377a55325098adc6c08e96990211f26229b6d Author: Alexia Death <alexiadeath@gmail.com> -Date: Thu Aug 20 02:31:59 2009 +0300 +Date: Thu Aug 20 02:31:59 2009 +0300 Fixing props errors in context @@ -86340,24 +87173,24 @@ commit ae10bd5778da7befdd611ff53696c7336b243a45 Author: Alexia Death <alexiadeath@gmail.com> -Date: Thu Aug 20 02:16:09 2009 +0300 +Date: Thu Aug 20 02:16:09 2009 +0300 Placeholder for quering dynamics values and a tesstpoint in brush core. - app/paint/gimpbrushcore.c | 11 +++++++---- + app/paint/gimpbrushcore.c | 11 +++++++---- app/paint/gimpdynamicsoptions.c | 6 ++++++ app/paint/gimpdynamicsoptions.h | 3 ++- 3 files changed, 15 insertions(+), 5 deletions(-) commit 56f59eab978e336b5c7d2792f03079cfe90df74a Author: Alexia Death <alexiadeath@gmail.com> -Date: Thu Aug 20 01:40:33 2009 +0300 +Date: Thu Aug 20 01:40:33 2009 +0300 Wiring the new dynamics object to brush core. Just a start for now. - app/paint/gimpbrushcore.c | 41 +++++++++++++++++++++ - app/paint/gimpbrushcore.h | 12 +++++-- + app/paint/gimpbrushcore.c | 41 +++++++++++++++++++++ + app/paint/gimpbrushcore.h | 12 +++++-- app/paint/gimpdynamicsoptions.c | 79 +++++++++++++++++++++++++++++++++++++++-- app/paint/gimpdynamicsoptions.h | 4 ++- @@ -86365,7 +87198,7 @@ commit f57d3ad02d793a7349e508a117eb805b2481c264 Author: Alexia Death <alexiadeath@gmail.com> -Date: Wed Aug 19 23:03:08 2009 +0300 +Date: Wed Aug 19 23:03:08 2009 +0300 Cleaning up the dynamics object @@ -86376,7 +87209,7 @@ commit 6e1d5ad83e86174d2ee66bf31524c3fbd9cfd871 Author: Alexia Death <alexiadeath@gmail.com> -Date: Wed Aug 19 22:41:08 2009 +0300 +Date: Wed Aug 19 22:41:08 2009 +0300 Giving shape to the new dynamics object @@ -86387,7 +87220,7 @@ commit 86ad1ff70e6f6a2908d3e79781410902076fc9fa Author: Michael Natterer <mitch@gimp.org> -Date: Wed Aug 19 21:29:34 2009 +0200 +Date: Wed Aug 19 21:29:34 2009 +0200 Add a "lock content" toggle that needs some more refinement hacking @@ -86397,7 +87230,7 @@ commit a16bfe749fd2a3dd5305dd89bfcd0189cef0fb71 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Aug 19 21:28:16 2009 +0200 +Date: Wed Aug 19 21:28:16 2009 +0200 Fix a comment @@ -86406,7 +87239,7 @@ commit fb1a67254680344b3c72ea74c3058b28a3758690 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Aug 19 13:37:41 2009 +0200 +Date: Wed Aug 19 13:37:41 2009 +0200 Bug 61019 - add a 'lock' flag per layer to protect it @@ -86416,12 +87249,12 @@ app/core/gimpitem.c | 111 ++++++++++++++++++++++++++++++++++++++++------------ - app/core/gimpitem.h | 19 ++++++--- + app/core/gimpitem.h | 19 ++++++--- 2 files changed, 100 insertions(+), 30 deletions(-) commit f7ba1d1f2e8488d08b0a56d9aa38798281cfe759 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Aug 19 11:37:06 2009 +0200 +Date: Wed Aug 19 11:37:06 2009 +0200 Add missing blank line after the vectors group of functions @@ -86430,7 +87263,7 @@ commit 7f94f3213b67ceeb98a4cce3ae0fdf2a6964a710 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Aug 19 11:08:56 2009 +0200 +Date: Wed Aug 19 11:08:56 2009 +0200 Pack boolean members into a bitfield to save two integers per item @@ -86439,7 +87272,7 @@ commit 5260a535e5f4107f2d0e956f055990db9d1fd8b7 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Aug 19 10:48:32 2009 +0200 +Date: Wed Aug 19 10:48:32 2009 +0200 Use the new option box API of GimpItemTreeView, remove own code for it @@ -86449,7 +87282,7 @@ commit 36530dd8beda1d898ee3fa5afc845c4da7505966 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Aug 19 10:44:38 2009 +0200 +Date: Wed Aug 19 10:44:38 2009 +0200 Add generic code for boxes of options to GimpItemTreeView @@ -86466,7 +87299,7 @@ commit 822e39498146fdefc2c4e6c94ef242077fc61597 Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Wed Aug 19 13:29:06 2009 -0300 +Date: Wed Aug 19 13:29:06 2009 -0300 Fix seg fault for gimpcontext @@ -86475,17 +87308,17 @@ commit 728b1c6847bb263021609045d4d5927e185666fc Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Wed Aug 19 12:28:30 2009 -0400 +Date: Wed Aug 19 12:28:30 2009 -0400 Eliminated some warnings when compiling TinyScheme. plug-ins/script-fu/tinyscheme/scheme-private.h | 2 ++ - plug-ins/script-fu/tinyscheme/scheme.h | 1 + + plug-ins/script-fu/tinyscheme/scheme.h | 1 + 2 files changed, 3 insertions(+) commit d655f0360765a9d390377ffa1a6564a130a5fe2f Author: Sven Neumann <sven@gimp.org> -Date: Wed Aug 19 16:59:15 2009 +0200 +Date: Wed Aug 19 16:59:15 2009 +0200 correct a comment @@ -86494,19 +87327,19 @@ commit 6aa4d553150de754a77b517e5aa4c9d741a4d787 Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Tue Aug 18 22:38:45 2009 -0300 +Date: Tue Aug 18 22:38:45 2009 -0300 Solve errors in gimpcontext for dynamics. - app/core/core-enums.h | 1 + - app/core/gimpcontext.c | 19 ++++++++++--------- - app/core/gimpcontext.h | 7 ------- + app/core/core-enums.h | 1 + + app/core/gimpcontext.c | 19 ++++++++++--------- + app/core/gimpcontext.h | 7 ------- app/widgets/gimpdynamicseditor.c | 12 +++++++----- 4 files changed, 18 insertions(+), 21 deletions(-) commit 9464d303a999aea805370234ef5814df6062fb75 Author: Sven Neumann <sven@gimp.org> -Date: Tue Aug 18 22:18:59 2009 +0200 +Date: Tue Aug 18 22:18:59 2009 +0200 print: don't store image specific settings globally @@ -86520,7 +87353,7 @@ commit bacce394b52d814418d62d6e0cad0ee1d073f829 Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Tue Aug 18 01:10:42 2009 -0400 +Date: Tue Aug 18 01:10:42 2009 -0400 De-tabified file. @@ -86529,7 +87362,7 @@ commit 5809ddcd32956569c9c7e35bad5a3fb7fb81d5be Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Tue Aug 18 00:50:56 2009 -0400 +Date: Tue Aug 18 00:50:56 2009 -0400 Eliminated a compiler warning. @@ -86538,22 +87371,22 @@ commit e602fc88af9db5d797c0a4c70324d5f606dd1295 Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Tue Aug 18 00:26:22 2009 -0400 +Date: Tue Aug 18 00:26:22 2009 -0400 Defined *compile-hook*. Changes based on official version of TinyScheme (CVS commit dated 2009/06/19 03:09). - plug-ins/script-fu/tinyscheme/init.scm | 16 ++++++++++++---- - plug-ins/script-fu/tinyscheme/opdefines.h | 1 + + plug-ins/script-fu/tinyscheme/init.scm | 16 ++++++++++++---- + plug-ins/script-fu/tinyscheme/opdefines.h | 1 + plug-ins/script-fu/tinyscheme/scheme-private.h | 11 ++++++----- - plug-ins/script-fu/tinyscheme/scheme.c | 24 + plug-ins/script-fu/tinyscheme/scheme.c | 24 ++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 9 deletions(-) commit 59ea11d78a3b44c53423f7907269258f65b00a08 Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Mon Aug 17 21:57:53 2009 -0400 +Date: Mon Aug 17 21:57:53 2009 -0400 Applied changes from CVS version 1.30 of official version of TinyScheme. @@ -86564,20 +87397,20 @@ commit 05f2bd1aace60b986f54b604116b21550c8a7faf Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Mon Aug 17 21:52:10 2009 -0400 +Date: Mon Aug 17 21:52:10 2009 -0400 Added style-control file variables for emacs to all C files. Changes based on official version of TinyScheme (CVS commit dated 2009/06/15 00:01). plug-ins/script-fu/tinyscheme/scheme-private.h | 6 ++++++ - plug-ins/script-fu/tinyscheme/scheme.c | 6 ++++++ - plug-ins/script-fu/tinyscheme/scheme.h | 5 +++++ + plug-ins/script-fu/tinyscheme/scheme.c | 6 ++++++ + plug-ins/script-fu/tinyscheme/scheme.h | 5 +++++ 3 files changed, 17 insertions(+) commit 70de6ab70f8d2e18d4e176b1c31019a309523230 Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Mon Aug 17 21:42:59 2009 -0400 +Date: Mon Aug 17 21:42:59 2009 -0400 Applied changes from CVS version 1.27 of official version of TinyScheme. @@ -86588,7 +87421,7 @@ commit 7ee46c4aa1f58fa775d2a7330a906c2e3ef94a01 Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Mon Aug 17 21:38:08 2009 -0400 +Date: Mon Aug 17 21:38:08 2009 -0400 Added scheme_register_foreign_func_list and declarations for it. Changes based on official version of TinyScheme (CVS commit dated @@ -86600,7 +87433,7 @@ commit 4c862bf6787986d30d1cd83c3acd9df9e07cbe57 Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Mon Aug 17 21:23:27 2009 -0400 +Date: Mon Aug 17 21:23:27 2009 -0400 Applied changes from CVS version 1.24 of official version of TinyScheme. @@ -86612,7 +87445,7 @@ commit 6a3a7befcf7ab4954d62f96263c6d9b3d8f88c9d Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Mon Aug 17 21:14:13 2009 -0400 +Date: Mon Aug 17 21:14:13 2009 -0400 Applied changes from CVS version 1.23 of official version of TinyScheme. @@ -86624,20 +87457,20 @@ commit 48c87c29fd68f445153f63245ba181cdacdd9a2d Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Mon Aug 17 21:03:02 2009 -0400 +Date: Mon Aug 17 21:03:02 2009 -0400 Made nested calling thru C safer by save/restore old state. Changes based on official version of TinyScheme (CVS commit dated 2008/05/25 03:27). plug-ins/script-fu/tinyscheme/scheme-private.h | 2 ++ - plug-ins/script-fu/tinyscheme/scheme.c | 34 + plug-ins/script-fu/tinyscheme/scheme.c | 34 ++++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) commit 76155d79df8d497d9a5994029247387e222da9e9 Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Mon Aug 17 19:29:02 2009 -0400 +Date: Mon Aug 17 19:29:02 2009 -0400 Minor changes to minimize differences to official version of TinyScheme. @@ -86650,7 +87483,7 @@ commit 1b8fe7b5f3cd183e3026457e05c0b0c5a041dc9d Author: Tomasz Dominikowski <dominikowski@gmail.com> -Date: Tue Aug 18 16:05:54 2009 +0200 +Date: Tue Aug 18 16:05:54 2009 +0200 Updated Polish translation @@ -86660,7 +87493,7 @@ commit 322be187905e005ca51c84898cdb8bc253151ca3 Author: Sven Neumann <sven@gimp.org> -Date: Tue Aug 18 08:53:12 2009 +0200 +Date: Tue Aug 18 08:53:12 2009 +0200 remove trailing whitespace @@ -86669,15 +87502,15 @@ commit f48a7e4a8beb8dc21b83d1781586b26521404b03 Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Mon Aug 17 23:47:26 2009 -0300 +Date: Mon Aug 17 23:47:26 2009 -0300 Add dynamics context and factory data and functions (need debugging). - app/core/gimp.c | 32 +++++++ - app/core/gimp.h | 1 + - app/core/gimpcontext.c | 182 + app/core/gimp.c | 32 +++++++ + app/core/gimp.h | 1 + + app/core/gimpcontext.c | 182 +++++++++++++++++++++++++++++++++++++++ - app/core/gimpcontext.h | 19 ++++ + app/core/gimpcontext.h | 19 ++++ app/paint/gimpdynamicsoptions.c | 20 +++++ app/paint/gimpdynamicsoptions.h | 2 +- app/widgets/gimpdynamicseditor.c | 19 +--- @@ -86685,7 +87518,7 @@ commit ada56e5c2c6459e17d085174d04a400fa9574c1b Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon Aug 17 23:34:18 2009 +0200 +Date: Mon Aug 17 23:34:18 2009 +0200 plug-ins: Improve JPEG2000 error messages @@ -86700,7 +87533,7 @@ commit f0bf313641934f8b05f728db3695739c84348c35 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Aug 16 18:06:11 2009 +0200 +Date: Sun Aug 16 18:06:11 2009 +0200 data: Obsolete flag gradients @@ -86712,7 +87545,7 @@ commit 7f6d7740ebf1c5b7a404157a3d901249c877ca12 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Aug 16 17:45:26 2009 +0200 +Date: Sun Aug 16 17:45:26 2009 +0200 devel-docs: Add Index of new symbols-item to release-howto.txt @@ -86721,7 +87554,7 @@ commit e032ad3b8e3cbba779f39ee6478b57d921e5b616 Author: Sven Neumann <sven@gimp.org> -Date: Sun Aug 16 12:06:54 2009 +0200 +Date: Sun Aug 16 12:06:54 2009 +0200 metadata: formatting @@ -86730,9 +87563,9 @@ 1 file changed, 70 insertions(+), 18 deletions(-) commit ec8b2eb911a43ed94b883d6a7e37ab1cddac1a98 -Merge: 29be769 dc249d4 +Merge: 29be769689 dc249d4dc3 Author: Roman Joost <romanofski@gimp.org> -Date: Sun Aug 16 09:27:24 2009 +1000 +Date: Sun Aug 16 09:27:24 2009 +1000 Merge branch 'roman-metadata_xmp_model_custom_signals' @@ -86742,7 +87575,7 @@ commit 29be769689a52332a9183438662b4d7b91ec3885 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 15 22:02:31 2009 +0200 +Date: Sat Aug 15 22:02:31 2009 +0200 Bump version to 2.7.1 @@ -86751,7 +87584,7 @@ commit 2c7e56098894ef6c1dc6225e0c538eded34cbb50 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 15 21:32:38 2009 +0200 +Date: Sat Aug 15 21:32:38 2009 +0200 Make GIMP 2.7.0 development release @@ -86762,7 +87595,7 @@ commit b8fec538f66382cfb6b56789d3057f5f96f747d8 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 15 21:19:58 2009 +0200 +Date: Sat Aug 15 21:19:58 2009 +0200 devel-docs: Add "Index of new symbols in GIMP 2.8" @@ -86771,7 +87604,7 @@ commit a0caa427ef058c198bec57e44fe5cf9f957b6073 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 15 21:09:56 2009 +0200 +Date: Sat Aug 15 21:09:56 2009 +0200 data: Lower brush "Round Fuzzy" spacing to 20, that looks better @@ -86780,7 +87613,7 @@ commit 74ceaab1b6f7cfc7f3a1362f81e72186d8ac3827 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 15 20:28:02 2009 +0200 +Date: Sat Aug 15 20:28:02 2009 +0200 devel-docs: Warn about using -j for 'make distcheck' @@ -86789,46 +87622,46 @@ commit fd481041bb2b3bf1c29c2b5346919e8acb8d3a5a Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 15 19:38:04 2009 +0200 +Date: Sat Aug 15 19:38:04 2009 +0200 devel-docs: Update 2.8 symbols (cont.) devel-docs/libgimpbase/tmpl/gimpbasetypes.sgml | 18 ++++++++++++++++++ - devel-docs/libgimpcolor/tmpl/gimphsv.sgml | 11 +++++++++++ - devel-docs/libgimpmodule/tmpl/gimpmodule.sgml | 8 ++++++++ + devel-docs/libgimpcolor/tmpl/gimphsv.sgml | 11 +++++++++++ + devel-docs/libgimpmodule/tmpl/gimpmodule.sgml | 8 ++++++++ devel-docs/libgimpwidgets/tmpl/gimpwidgets.sgml | 7 +++++++ 4 files changed, 44 insertions(+) commit eb734240448a2de9f196b1bcf8e888a6c0d44b76 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 15 17:06:43 2009 +0200 +Date: Sat Aug 15 17:06:43 2009 +0200 devel-docs: Update 2.8 symbols - devel-docs/libgimp/libgimp-sections.txt | 6 +++++ - devel-docs/libgimp/tmpl/gimpexport.sgml | 20 +++++++++++++++ - devel-docs/libgimp/tmpl/gimpimage.sgml | 9 +++++++ - devel-docs/libgimp/tmpl/gimptextlayer.sgml | 30 + devel-docs/libgimp/libgimp-sections.txt | 6 +++++ + devel-docs/libgimp/tmpl/gimpexport.sgml | 20 +++++++++++++++ + devel-docs/libgimp/tmpl/gimpimage.sgml | 9 +++++++ + devel-docs/libgimp/tmpl/gimptextlayer.sgml | 30 ++++++++++++++++++++++ devel-docs/libgimpbase/libgimpbase-sections.txt | 2 ++ devel-docs/libgimpcolor/libgimpcolor-sections.txt | 1 + - .../libgimpmodule/libgimpmodule-sections.txt | 1 + + .../libgimpmodule/libgimpmodule-sections.txt | 1 + .../libgimpwidgets/libgimpwidgets-sections.txt | 1 + 8 files changed, 70 insertions(+) commit bdd20b7bf536f5df8db1e11afd58e1c273a4376e Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 15 14:31:18 2009 +0200 +Date: Sat Aug 15 14:31:18 2009 +0200 Update gimprc with default brush docs/gimprc.5.in | 2 +- - etc/gimprc | 2 +- + etc/gimprc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 6b71aaed99b10d8ba1a60fd425fe89fbf8248232 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 15 14:31:04 2009 +0200 +Date: Sat Aug 15 14:31:04 2009 +0200 po: Update POTFILES.in @@ -86837,7 +87670,7 @@ commit e247791209591593aa052ca6434a0ee6980bf5e0 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 15 13:02:01 2009 +0200 +Date: Sat Aug 15 13:02:01 2009 +0200 devel-docs: Update release-howto.txt @@ -86846,7 +87679,7 @@ commit e9f3329ce050349606ca2aa738b11b09f78d95d0 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 15 12:05:18 2009 +0200 +Date: Sat Aug 15 12:05:18 2009 +0200 Update NEWS @@ -86855,7 +87688,7 @@ commit 966b81992b3a614542ba8413a50fea49dad7ffe9 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 15 11:58:08 2009 +0200 +Date: Sat Aug 15 11:58:08 2009 +0200 app: Add "FG to BG (Hardedge)" gradient @@ -86867,7 +87700,7 @@ commit 98aaae7cace40f8d3494fccda356e0930e9e2dc8 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 15 11:48:36 2009 +0200 +Date: Sat Aug 15 11:48:36 2009 +0200 app: Clean up internal gradient construction @@ -86879,7 +87712,7 @@ commit dc249d4dc33efcdf0e8579c40632def6e83db5e2 Author: Roman Joost <romanofski@gimp.org> -Date: Sat Aug 15 19:44:32 2009 +1000 +Date: Sat Aug 15 19:44:32 2009 +1000 XMP Model now emits a property-changed signal incl. a detail. @@ -86896,7 +87729,7 @@ commit f436ffd72268b44ee7d9a97f98485c7783a65b1c Author: Roman Joost <romanofski@gimp.org> -Date: Tue Jul 28 16:16:37 2009 +1000 +Date: Tue Jul 28 16:16:37 2009 +1000 Changed XMPModel to GtkTreeStore based object with one custom signal. @@ -86905,30 +87738,30 @@ has been changed by xmp_model_set_scalar_property. plug-ins/metadata/exif-decode.c | 2 +- - plug-ins/metadata/interface.c | 3 +- - plug-ins/metadata/interface.h | 1 - - plug-ins/metadata/metadata.c | 4 ++ + plug-ins/metadata/interface.c | 3 +- + plug-ins/metadata/interface.h | 1 - + plug-ins/metadata/metadata.c | 4 ++ plug-ins/metadata/xmp-encode.c | 2 +- plug-ins/metadata/xmp-encode.h | 1 + - plug-ins/metadata/xmp-model.c | 131 + plug-ins/metadata/xmp-model.c | 131 ++++++++++++++++++---------------------- - plug-ins/metadata/xmp-model.h | 72 ++++++++++++++++------ + plug-ins/metadata/xmp-model.h | 72 ++++++++++++++++------ plug-ins/metadata/xmp-schemas.c | 5 +- 9 files changed, 128 insertions(+), 93 deletions(-) commit e9905896fc49b77b437471f4671755cf53e53cc6 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 15 09:49:10 2009 +0200 +Date: Sat Aug 15 09:49:10 2009 +0200 devel-docs: Refer to website for patch submitting instructions - devel-docs/Makefile.am | 1 + + devel-docs/Makefile.am | 1 + devel-docs/submitting-patches.txt | 1 + 2 files changed, 2 insertions(+) commit b72e5a35b1e943a9b7017273a3580a11eebf18bc Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 15 09:41:20 2009 +0200 +Date: Sat Aug 15 09:41:20 2009 +0200 Revert "Add a button to create a group layer to the layers dialog" @@ -86942,7 +87775,7 @@ commit dcfa6b51c3b802a0d286c4800095bf09996467db Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 15 09:30:15 2009 +0200 +Date: Sat Aug 15 09:30:15 2009 +0200 Update authors for 2.7.0 @@ -86952,7 +87785,7 @@ commit 5d590e220f096ea314b421109bb9fc0a38c41923 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Aug 14 22:51:37 2009 +0200 +Date: Fri Aug 14 22:51:37 2009 +0200 po-tags: Update .gitignore @@ -86961,7 +87794,7 @@ commit 1436cc4e5c76886cbb05498e9b228b4fb503c5b2 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Aug 14 22:51:25 2009 +0200 +Date: Fri Aug 14 22:51:25 2009 +0200 data: Update default tags @@ -86971,7 +87804,7 @@ commit 3224fab79d3f560a2eb5793198073159de03e6fa Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Aug 14 22:02:25 2009 +0200 +Date: Fri Aug 14 22:02:25 2009 +0200 Update NEWS for 2.7.0 @@ -86980,7 +87813,7 @@ commit 8414cf77b0f51dcbcc90dfb112f02a09d88a52f5 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Aug 14 19:57:06 2009 +0200 +Date: Fri Aug 14 19:57:06 2009 +0200 app: Change default brush to "Round Fuzzy" @@ -86989,7 +87822,7 @@ commit a5d75f09a3f795888cb413f965e7dec504596203 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Aug 14 17:33:14 2009 +0200 +Date: Fri Aug 14 17:33:14 2009 +0200 data: Obsolete duplicate variants of smaller .gbr brushes @@ -86998,7 +87831,7 @@ commit 1dbf732943497b4428862966b32911ef770debad Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Aug 14 19:18:56 2009 +0200 +Date: Fri Aug 14 19:18:56 2009 +0200 app: Add temp_buf_dump() @@ -87006,12 +87839,12 @@ easier analysis, for example with GIMP. app/base/temp-buf.c | 29 +++++++++++++++++++++++++++++ - app/base/temp-buf.h | 2 ++ + app/base/temp-buf.h | 2 ++ 2 files changed, 31 insertions(+) commit 96a6e5c2db2bed568c17bd149e92f1239a702763 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Aug 14 08:14:39 2009 +0200 +Date: Fri Aug 14 08:14:39 2009 +0200 data: Obsolete all duplicate smaller .vbr variants @@ -87020,20 +87853,20 @@ commit 9e455dd604d9bc139f15ecc6faba6c0db85bb238 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Aug 14 08:09:23 2009 +0200 +Date: Fri Aug 14 08:09:23 2009 +0200 data: Add large ~100px variants of .vbr brushes - data/brushes/Calligraphic.vbr | 8 ++++++++ + data/brushes/Calligraphic.vbr | 8 ++++++++ data/brushes/Diagonal-Star.vbr | 10 ++++++++++ - data/brushes/Makefile.am | 4 ++++ - data/brushes/Round-Fuzzy.vbr | 8 ++++++++ - data/brushes/Round.vbr | 8 ++++++++ + data/brushes/Makefile.am | 4 ++++ + data/brushes/Round-Fuzzy.vbr | 8 ++++++++ + data/brushes/Round.vbr | 8 ++++++++ 5 files changed, 38 insertions(+) commit 6ba1cce69105a25065e5d284eb1994b8acee6988 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Aug 14 07:41:32 2009 +0200 +Date: Fri Aug 14 07:41:32 2009 +0200 data: Obsolete the square brushes @@ -87042,7 +87875,7 @@ commit 3a7800475736c094167c0264dcdc13fc57341eec Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Fri Aug 14 00:01:15 2009 -0300 +Date: Fri Aug 14 00:01:15 2009 -0300 Add UI to editor. @@ -87052,7 +87885,7 @@ commit 3d0c025a5175e6419fd7281bac8e2cc92db6b67a Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Aug 11 20:38:12 2009 +0200 +Date: Tue Aug 11 20:38:12 2009 +0200 app: Support obsolete data resources @@ -87068,7 +87901,7 @@ commit 4df574acd60acd4a1adfeae82b7c8866a6cf3ea7 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Aug 13 21:47:47 2009 +0200 +Date: Thu Aug 13 21:47:47 2009 +0200 Use separate shortcuts for 'File->Export to' and 'File->Overwrite' @@ -87078,15 +87911,15 @@ having 'File->Overwrite' as a separate GtkAction with its own keyboard shortcut slot. - app/actions/actions-types.h | 2 +- + app/actions/actions-types.h | 2 +- app/actions/file-actions.c | 37 +++++++++++++++++++++++++------------ - app/widgets/gimphelp-ids.h | 1 + - menus/image-menu.xml.in | 1 + + app/widgets/gimphelp-ids.h | 1 + + menus/image-menu.xml.in | 1 + 4 files changed, 28 insertions(+), 13 deletions(-) commit 60f11e18ae0d2cd257c9629069564a0d98bb01fe Author: Sven Neumann <sven@gimp.org> -Date: Fri Aug 7 21:11:45 2009 +0200 +Date: Fri Aug 7 21:11:45 2009 +0200 Bug 591017 – Tablet pan is not working as fast as it should @@ -87098,7 +87931,7 @@ commit 30382a599f99734f2664ff6a8380a7c30fcf8288 Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Tue Aug 11 00:53:31 2009 -0300 +Date: Tue Aug 11 00:53:31 2009 -0300 Fix bugs and make a working build. @@ -87108,7 +87941,7 @@ commit f19e60636ad7035ef3e11811cc4d52760a249369 Author: Michael Schumacher <schumaml@gmx.de> -Date: Tue Aug 11 00:02:37 2009 +0200 +Date: Tue Aug 11 00:02:37 2009 +0200 Bug 551444 – With Python 2.5, module extension should be .pyd @@ -87120,7 +87953,7 @@ commit 2396ecb91ac521b11ec679aea17269332afb6cb5 Author: Michael Schumacher <schumaml@gmx.de> -Date: Tue Aug 11 00:00:22 2009 +0200 +Date: Tue Aug 11 00:00:22 2009 +0200 Require libtool >= 2.2 on Microsoft Windows @@ -87132,7 +87965,7 @@ commit 71f2a9f8aede32983b21fd93a07df6b687b994d9 Author: Michael Schumacher <schumaml@gmx.de> -Date: Mon Aug 10 22:44:05 2009 +0200 +Date: Mon Aug 10 22:44:05 2009 +0200 Use xsltproc -o instead of output redirection for AUTHORS file. @@ -87145,7 +87978,7 @@ commit fc979283de60d67591cb61e11f5c9aba2f2b543d Author: Massimo Valentini <sixtysix@inwind.it> -Date: Mon Aug 10 21:26:53 2009 +0200 +Date: Mon Aug 10 21:26:53 2009 +0200 Bug 569833 – file-jpeg-save erroneous with small quality values @@ -87157,7 +87990,7 @@ commit ae6828c1cc3aa38a1cb5d1954c736f62d6a8d24d Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 10 13:28:14 2009 +0200 +Date: Mon Aug 10 13:28:14 2009 +0200 Add more precondition checks to vectors import functions @@ -87170,7 +88003,7 @@ commit d53aad9ffb20d936cd6419cf9f93c952128e3a50 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 10 12:15:54 2009 +0200 +Date: Mon Aug 10 12:15:54 2009 +0200 Use gimp_image_get_layer_list() instead of layer_iter(), some cleanup @@ -87180,7 +88013,7 @@ commit 28aa03e52549d658f8c023e4f40a2a78601f283f Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 7 10:27:50 2009 +0200 +Date: Fri Aug 7 10:27:50 2009 +0200 Move gimp_image_raise_layer_to_top() around @@ -87193,7 +88026,7 @@ commit dc53e8170502d710b3a429a182851fbd5f250772 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 7 10:14:11 2009 +0200 +Date: Fri Aug 7 10:14:11 2009 +0200 Make sure items passed as "parent" are actually group items @@ -87204,7 +88037,7 @@ commit 76615137465438dd59cdab9c35151ad57f69be46 Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Sun Aug 9 15:44:20 2009 -0400 +Date: Sun Aug 9 15:44:20 2009 -0400 Updated TinyScheme version number to 1.39. @@ -87218,7 +88051,7 @@ commit 01e27e8d6fbf994850f6f3843ee4317705e9608e Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Sun Aug 9 15:18:25 2009 -0400 +Date: Sun Aug 9 15:18:25 2009 -0400 Commented call to file_pop() left in inchar() by mistake. Fixes bug #553337. @@ -87233,7 +88066,7 @@ commit 66a2e41e2eab95f09aa3db8b97c271e08520777a Author: Jorge González <jorgegonz@svn.gnome.org> -Date: Sun Aug 9 19:36:45 2009 +0200 +Date: Sun Aug 9 19:36:45 2009 +0200 Updated Spanish translation @@ -87242,7 +88075,7 @@ commit c3b419e81c9f5ceeee39a38fc8f1e8d362b683b7 Author: Francisco Vila <paconet.org@gmail.com> -Date: Sun Aug 9 19:31:42 2009 +0200 +Date: Sun Aug 9 19:31:42 2009 +0200 Updated Spanish translation @@ -87252,22 +88085,22 @@ commit 6e483e95b292626c0ad846a1d866a1f589c60e4a Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 8 15:21:10 2009 +0200 +Date: Sat Aug 8 15:21:10 2009 +0200 Remove web-browser gimprc option The web-browser plug-in uses gtk_show_uri() now. - app/config/gimpguiconfig.c | 20 ++++++++------------ - app/config/gimprc-blurbs.h | 7 ------- + app/config/gimpguiconfig.c | 20 ++++++++------------ + app/config/gimprc-blurbs.h | 7 ------- app/dialogs/preferences-dialog.c | 10 ---------- - docs/gimprc.5.in | 9 --------- - etc/gimprc | 8 -------- + docs/gimprc.5.in | 9 --------- + etc/gimprc | 8 -------- 5 files changed, 8 insertions(+), 46 deletions(-) commit 29d9a94fd0b8124dccc8980309de78ef1336f8b2 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 8 15:16:12 2009 +0200 +Date: Sat Aug 8 15:16:12 2009 +0200 Bug 522483 – use gtk_show_uri() instead of calling firefox directly @@ -87280,7 +88113,7 @@ commit b1e969cc6d00ef2fba8b1a0f2768c03f3d9574a2 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 8 15:19:37 2009 +0200 +Date: Sat Aug 8 15:19:37 2009 +0200 app: Fix typo gimpgoruplayer @@ -87289,17 +88122,17 @@ commit 878afb6786be2e3a4aef3ebfa2ea92dcacdcec33 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 8 15:25:56 2009 +0200 +Date: Sat Aug 8 15:25:56 2009 +0200 Update gimprc docs/gimprc.5.in | 2 +- - etc/gimprc | 2 +- + etc/gimprc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 2591d7e368f5141d8bb32b9d55802a5888af0de9 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 8 14:19:37 2009 +0200 +Date: Sat Aug 8 14:19:37 2009 +0200 app: Don't use plug-in-web-browser in About Dialog @@ -87311,7 +88144,7 @@ commit f8930a5aaf05f918f0cd9fb752812e3d1d1f22a5 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Aug 8 10:30:10 2009 +0200 +Date: Sat Aug 8 10:30:10 2009 +0200 plug-ins: Translate win32 error messages in web-browser.c @@ -87320,7 +88153,7 @@ commit b9b05e7d39cc9c623d3c89b0d8ed373a89c3b284 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Aug 7 21:54:54 2009 +0200 +Date: Fri Aug 7 21:54:54 2009 +0200 app: Don't reuse the GeglProcessor @@ -87333,73 +88166,73 @@ commit 3db68e254aaba0f50c91577f27d532d4e3db5181 Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Sat Aug 8 00:25:55 2009 -0400 +Date: Sat Aug 8 00:25:55 2009 -0400 Applied changes based on official version of TinyScheme (CVS commit dated 2008/01/25 01:31). Put OP_T0LVL in charge of reacting to EOF. plug-ins/script-fu/tinyscheme/scheme-private.h | 4 +- - plug-ins/script-fu/tinyscheme/scheme.c | 77 + plug-ins/script-fu/tinyscheme/scheme.c | 77 +++++++++++--------------- 2 files changed, 34 insertions(+), 47 deletions(-) commit 21cebda8a95fc36a0738ed9a0e3e9d4c5baf7ea3 Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Fri Aug 7 23:56:40 2009 -0400 +Date: Fri Aug 7 23:56:40 2009 -0400 Applied changes based on official version of TinyScheme (CVS commits dated 2008/01/22 04:18). Fix for the load bug. plug-ins/script-fu/tinyscheme/scheme-private.h | 2 + - plug-ins/script-fu/tinyscheme/scheme.c | 107 + plug-ins/script-fu/tinyscheme/scheme.c | 107 +++++++++++++++++-------- 2 files changed, 74 insertions(+), 35 deletions(-) commit a527d2509883850e9a0cc7f71365064a796edaf9 Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Fri Aug 7 23:21:56 2009 -0300 +Date: Fri Aug 7 23:21:56 2009 -0300 Debug dynamics object files. - app/paint/Makefile.am | 2 + + app/paint/Makefile.am | 2 + app/paint/gimpdynamicsoptions.c | 623 +--------------------------------------- app/paint/gimpdynamicsoptions.h | 40 +-- - app/paint/paint-types.h | 2 + + app/paint/paint-types.h | 2 + 4 files changed, 15 insertions(+), 652 deletions(-) commit 997db31a2e7b9d55e118e6e35bc319185f8e0b48 Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Fri Aug 7 20:29:34 2009 -0300 +Date: Fri Aug 7 20:29:34 2009 -0300 Working version of dynamics editor and its menu. Dynamics editor shows up when clicked on dockable menu. - app/widgets/Makefile.am | 2 ++ + app/widgets/Makefile.am | 2 ++ app/widgets/gimpdynamicseditor.c | 25 ++++++++++++++++++++++--- app/widgets/gimpdynamicseditor.h | 2 +- - app/widgets/widgets-types.h | 2 +- + app/widgets/widgets-types.h | 2 +- 4 files changed, 26 insertions(+), 5 deletions(-) commit 9541fe03872d15d049c95809fa50b97ce5791129 Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Fri Aug 7 16:25:31 2009 -0400 +Date: Fri Aug 7 16:25:31 2009 -0400 Applied changes from CVS version 1.15 of official version of TinyScheme. Changed to always use snprintf (Patch due to Ramiro bsd1628). plug-ins/script-fu/tinyscheme/scheme-private.h | 4 +- - plug-ins/script-fu/tinyscheme/scheme.c | 112 + plug-ins/script-fu/tinyscheme/scheme.c | 112 ++++++++++++------------- 2 files changed, 55 insertions(+), 61 deletions(-) commit 28e7c3f612a4d89c73e1f9f95f5469d9e44340e6 Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Fri Aug 7 15:13:12 2009 -0400 +Date: Fri Aug 7 15:13:12 2009 -0400 Applied changes from CVS version 1.9 of official version of TinyScheme. @@ -87408,16 +88241,16 @@ allocated cells in foreign functions from the foreign functions to the TinyScheme interpreter. - plug-ins/script-fu/scheme-wrapper.c | 50 +++-------- + plug-ins/script-fu/scheme-wrapper.c | 50 +++-------- plug-ins/script-fu/tinyscheme/scheme-private.h | 1 - - plug-ins/script-fu/tinyscheme/scheme.c | 117 + plug-ins/script-fu/tinyscheme/scheme.c | 117 ++++++++++++++++++------- - plug-ins/script-fu/tinyscheme/scheme.h | 2 - + plug-ins/script-fu/tinyscheme/scheme.h | 2 - 4 files changed, 99 insertions(+), 71 deletions(-) commit 3d848b391793d812d98578508f7084fcc1f6cc5c Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Tue Aug 4 22:07:55 2009 -0400 +Date: Tue Aug 4 22:07:55 2009 -0400 Applied changes from CVS version 1.28 of scheme.c in official version of @@ -87429,7 +88262,7 @@ commit 7adb01a5899edb981a3517a397d9dc7d02732dcb Author: Alexia Death <alexiadeath@gmail.com> -Date: Fri Aug 7 20:45:16 2009 +0300 +Date: Fri Aug 7 20:45:16 2009 +0300 typos @@ -87439,7 +88272,7 @@ commit ac58002f5710bbdca4b188ed95302fce0f2b37e4 Author: Alexia Death <alexiadeath@gmail.com> -Date: Fri Aug 7 20:34:45 2009 +0300 +Date: Fri Aug 7 20:34:45 2009 +0300 Giving a boost. @@ -87449,7 +88282,7 @@ commit 97c09f2d014611d4d45911a420baf9c4062c8dae Author: Alexia Death <alexiadeath@gmail.com> -Date: Mon Aug 3 23:33:04 2009 +0300 +Date: Mon Aug 3 23:33:04 2009 +0300 and adding a sample of outouts based struct @@ -87458,7 +88291,7 @@ commit 7ed35dad9f2044c144c5bd6ca588f86619cc27c8 Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Fri Aug 7 14:09:53 2009 -0300 +Date: Fri Aug 7 14:09:53 2009 -0300 Adjust dynamics object. @@ -87468,18 +88301,18 @@ commit 96d690d62f3be940e6820a8b33d12c04627ec6f0 Author: Francisco Vila <paconet.org@gmail.com> -Date: Fri Aug 7 18:59:54 2009 +0200 +Date: Fri Aug 7 18:59:54 2009 +0200 Updated Spanish translation po-plug-ins/es.po | 10 +- - po/es.po | 343 + po/es.po | 343 +++++++++++++++++++++++++++++------------------------- 2 files changed, 187 insertions(+), 166 deletions(-) commit 4e9f198831b6f030df9206832cd2dec409b2cecd Author: Michael Natterer <mitch@gimp.org> -Date: Fri Aug 7 09:46:16 2009 +0200 +Date: Fri Aug 7 09:46:16 2009 +0200 Fix dropping an item into an empty group item immediately above it @@ -87488,7 +88321,7 @@ commit d2e1f2ac7402916644e4362c7fa11698e5f80064 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 6 21:34:54 2009 +0200 +Date: Thu Aug 6 21:34:54 2009 +0200 Add a button to create a group layer to the layers dialog @@ -87501,7 +88334,7 @@ commit d059f239ac7577d5c919d3d3fbc89cc1becf93a5 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 6 18:43:57 2009 +0200 +Date: Thu Aug 6 18:43:57 2009 +0200 Make reordering items between groups work in the core and the UI @@ -87534,30 +88367,30 @@ within its level of the tree (unrelated to above changes, but needed to make them work). - app/core/core-enums.c | 12 +- - app/core/core-enums.h | 6 +- - app/core/gimpchannelpropundo.c | 19 ++- - app/core/gimpchannelpropundo.h | 1 + - app/core/gimpimage-undo-push.c | 24 +-- - app/core/gimpimage-undo-push.h | 6 +- - app/core/gimpimage.c | 303 + app/core/core-enums.c | 12 +- + app/core/core-enums.h | 6 +- + app/core/gimpchannelpropundo.c | 19 ++- + app/core/gimpchannelpropundo.h | 1 + + app/core/gimpimage-undo-push.c | 24 +-- + app/core/gimpimage-undo-push.h | 6 +- + app/core/gimpimage.c | 303 ++++++++++++++++++++++++++---------- - app/core/gimpimage.h | 9 +- - app/core/gimplayerpropundo.c | 19 ++- - app/core/gimplayerpropundo.h | 11 +- - app/vectors/gimpvectorspropundo.c | 19 ++- - app/vectors/gimpvectorspropundo.h | 1 + - app/widgets/gimpchanneltreeview.c | 2 +- - app/widgets/gimpcontainertreeview.c | 30 +++- - app/widgets/gimpitemtreeview.c | 49 +++--- - app/widgets/gimpitemtreeview.h | 1 + - app/widgets/gimplayertreeview.c | 2 +- - app/widgets/gimpvectorstreeview.c | 2 +- + app/core/gimpimage.h | 9 +- + app/core/gimplayerpropundo.c | 19 ++- + app/core/gimplayerpropundo.h | 11 +- + app/vectors/gimpvectorspropundo.c | 19 ++- + app/vectors/gimpvectorspropundo.h | 1 + + app/widgets/gimpchanneltreeview.c | 2 +- + app/widgets/gimpcontainertreeview.c | 30 +++- + app/widgets/gimpitemtreeview.c | 49 +++--- + app/widgets/gimpitemtreeview.h | 1 + + app/widgets/gimplayertreeview.c | 2 +- + app/widgets/gimpvectorstreeview.c | 2 +- 18 files changed, 347 insertions(+), 169 deletions(-) commit e8bd830f486cb3f76df6185157891ddabd1b6100 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Aug 6 18:37:54 2009 +0200 +Date: Thu Aug 6 18:37:54 2009 +0200 Add action and callback for adding a group layer (works but is not used yet) @@ -87569,7 +88402,7 @@ commit b1bbbb230dd2e1bee62f4c06b5dee4e95468702b Author: Massimo Valentini <sixtysix@inwind.it> -Date: Wed Aug 5 23:40:39 2009 +0200 +Date: Wed Aug 5 23:40:39 2009 +0200 Bug 542003 – Reset button breaks field updates on width and height boxes @@ -87581,7 +88414,7 @@ commit b2c7c4f61bd65bf73ea8992ce055255e15d7b3e6 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Aug 5 18:57:08 2009 +0200 +Date: Wed Aug 5 18:57:08 2009 +0200 Add infrastructure for dragging things between branches of a tree @@ -87596,12 +88429,12 @@ app/widgets/gimpcontainertreeview-dnd.c | 72 +++++++++++++++++++++------------ - app/widgets/gimpitemtreeview.c | 54 ++++++++++++++----------- + app/widgets/gimpitemtreeview.c | 54 ++++++++++++++----------- 2 files changed, 78 insertions(+), 48 deletions(-) commit fe99eff373cd2191223d15192a512dea0ad3961e Author: Gabor Kelemen <kelemeng@gnome.hu> -Date: Wed Aug 5 15:02:52 2009 +0200 +Date: Wed Aug 5 15:02:52 2009 +0200 Typofix @@ -87610,7 +88443,7 @@ commit 8cda7dca56cb647f1fba4fa75b648bbbe4dc03ad Author: Michael Natterer <mitch@gimp.org> -Date: Wed Aug 5 14:17:07 2009 +0200 +Date: Wed Aug 5 14:17:07 2009 +0200 Add gimp_viewable_is_ancestor() @@ -87625,7 +88458,7 @@ commit 85148ea2b9e0c0ed3dd00bbeebcd8d41fa643e60 Author: Alan Monfort <alan.monfort@free.fr> -Date: Wed Aug 5 06:35:43 2009 +0200 +Date: Wed Aug 5 06:35:43 2009 +0200 Updated breton translation @@ -87634,20 +88467,20 @@ commit 237f5d37ba4691535387c944de68dedf9c3d1c3f Author: Alan Monfort <alan.monfort@free.fr> -Date: Wed Aug 5 06:26:14 2009 +0200 +Date: Wed Aug 5 06:26:14 2009 +0200 Updated breton translation po-libgimp/br.po | 70 +--- po-plug-ins/br.po | 141 ++++--- - po-tips/br.po | 323 +++------------- - po/br.po | 1119 + po-tips/br.po | 323 +++------------- + po/br.po | 1119 ++++++++++++++++++++++++++--------------------------- 4 files changed, 681 insertions(+), 972 deletions(-) commit 3a6c58afd2d5ec950bef1a1b655d1dc5947ff6f5 Author: Francisco Vila <paconet.org@gmail.com> -Date: Wed Aug 5 05:57:57 2009 +0200 +Date: Wed Aug 5 05:57:57 2009 +0200 Updated Spanish translation @@ -87657,7 +88490,7 @@ commit a17ab80c98b231a4aeae7a22286c86f313c5be03 Author: Francisco Vila <paconet.org@gmail.com> -Date: Wed Aug 5 05:47:32 2009 +0200 +Date: Wed Aug 5 05:47:32 2009 +0200 Updated Spanish translation @@ -87667,7 +88500,7 @@ commit 644d135071d6e7765e5b6b5b1aae9d97d420e151 Author: Francisco Vila <paconet.org@gmail.com> -Date: Wed Aug 5 05:42:52 2009 +0200 +Date: Wed Aug 5 05:42:52 2009 +0200 Updated Spanish translation @@ -87677,19 +88510,19 @@ commit 101262b47901d33ca79cfb4f8a6c4ca84269ddd1 Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Tue Aug 4 19:40:09 2009 -0400 +Date: Tue Aug 4 19:40:09 2009 -0400 Applied changes based on official version of TinyScheme (CVS commit dated 2008/06/28 19:28). Applied C++ patch by Shintaro Jingu. plug-ins/script-fu/tinyscheme/scheme-private.h | 7 +++++++ - plug-ins/script-fu/tinyscheme/scheme.h | 8 ++++++++ + plug-ins/script-fu/tinyscheme/scheme.h | 8 ++++++++ 2 files changed, 15 insertions(+) commit 60ddcb625bbda9ae1066c4c1b931ee0bb189fb6a Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Tue Aug 4 19:08:26 2009 -0400 +Date: Tue Aug 4 19:08:26 2009 -0400 Applied changes from CVS version 1.4 of init.c in official version of TinyScheme. Added unwind-protect (from Tom Breton). @@ -87700,7 +88533,7 @@ commit b11f68998639384bfaebaf8023f191c84330d327 Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Tue Aug 4 19:04:31 2009 -0400 +Date: Tue Aug 4 19:04:31 2009 -0400 Applied changes from CVS version 1.2 of init.scm in official version of @@ -87712,7 +88545,7 @@ commit 5e9907d68d8549787cff182f97e601b0764ecb9f Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Tue Aug 4 18:39:31 2009 -0400 +Date: Tue Aug 4 18:39:31 2009 -0400 Applied changes from CVS version 1.16 of official version of TinyScheme. @@ -87723,7 +88556,7 @@ commit 5c630f4ad8ef55d2249968102cb8f5cb8fadfe23 Author: Sven Neumann <sven@gimp.org> -Date: Tue Aug 4 23:20:49 2009 +0200 +Date: Tue Aug 4 23:20:49 2009 +0200 Change the default for the 'trust-dirty-flag' gimprc option back to FALSE @@ -87737,7 +88570,7 @@ commit 57ceb04b32c7e3b615c4f74c671566da0c7d8438 Author: Sven Neumann <sven@gimp.org> -Date: Tue Aug 4 22:45:39 2009 +0200 +Date: Tue Aug 4 22:45:39 2009 +0200 Only add the language entry if the iso-codes package is available @@ -87746,7 +88579,7 @@ commit 516735f10c511c0700c7fe7285731a757dabba0a Author: Sven Neumann <sven@gimp.org> -Date: Tue Aug 4 22:41:45 2009 +0200 +Date: Tue Aug 4 22:41:45 2009 +0200 add a blurb to the GimpText:language property @@ -87755,7 +88588,7 @@ commit 5febc2e417a7ad423e55d8ee427cfcddd3387b8c Author: Sven Neumann <sven@gimp.org> -Date: Tue Aug 4 22:31:52 2009 +0200 +Date: Tue Aug 4 22:31:52 2009 +0200 Add functions to get the ISO 639-1 language code from GimpLanguageEntry @@ -87766,12 +88599,12 @@ app/widgets/gimplanguageentry.h | 13 +++--- app/widgets/gimplanguagestore.c | 50 +++++++++++++++++++++++ app/widgets/gimplanguagestore.h | 3 ++ - app/widgets/gimppropwidgets.c | 13 +++--- + app/widgets/gimppropwidgets.c | 13 +++--- 5 files changed, 152 insertions(+), 17 deletions(-) commit bf8885f637ae288e429f6df87ca7ae29a5db17e0 Author: Sven Neumann <sven@gimp.org> -Date: Tue Aug 4 21:27:14 2009 +0200 +Date: Tue Aug 4 21:27:14 2009 +0200 Bug 132509 – Allow to choose language in text tool @@ -87784,7 +88617,7 @@ commit e2dbd56c5a4491be16fb32dbaa8aeadfe14b347c Author: Sven Neumann <sven@gimp.org> -Date: Tue Aug 4 21:26:32 2009 +0200 +Date: Tue Aug 4 21:26:32 2009 +0200 app: add stubs for gimp_prop_language_entry_new() @@ -87795,7 +88628,7 @@ commit 1b806e5fb60ede5a9d7b53e5d79e1c8fb732f930 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 4 22:43:53 2009 +0200 +Date: Tue Aug 4 22:43:53 2009 +0200 Set handler variables to NULL after disconnecting them @@ -87804,7 +88637,7 @@ commit 86239d3b554f9d6ea1f2903827cdea4c690d91ce Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 4 22:41:49 2009 +0200 +Date: Tue Aug 4 22:41:49 2009 +0200 Use GimpTreeHandler to connect to all layers in the image @@ -87814,7 +88647,7 @@ commit 6a64de7f48c3bbcc1ea3212f9cac6fbeef7b7a46 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 4 22:32:24 2009 +0200 +Date: Tue Aug 4 22:32:24 2009 +0200 Include "core/gimptreehandler.h" @@ -87823,17 +88656,17 @@ commit 6425f5404de16a430d4fb525181334028a7db59d Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 4 22:06:28 2009 +0200 +Date: Tue Aug 4 22:06:28 2009 +0200 Use GimpTreeHandler to connect to all vectors in the image app/display/gimpdisplayshell-handlers.c | 27 ++++++++++++--------------- - app/display/gimpdisplayshell.h | 6 +++--- + app/display/gimpdisplayshell.h | 6 +++--- 2 files changed, 15 insertions(+), 18 deletions(-) commit 2d5792d1da3c9b03e508f82245df42a58a1d6cfd Author: Sven Neumann <sven@gimp.org> -Date: Tue Aug 4 20:27:53 2009 +0200 +Date: Tue Aug 4 20:27:53 2009 +0200 app: increase the timeout for temporary status-bar messages to 8 seconds @@ -87843,29 +88676,29 @@ commit bf3d355fd7a95b132473746374408edddd1990b4 Author: Kevin Cozens <kcozens@cvs.gnome.org> -Date: Tue Aug 4 13:39:17 2009 -0400 +Date: Tue Aug 4 13:39:17 2009 -0400 Applied changes based on official version of TinyScheme (CVS commit dated 2007/12/22 10:48) which makes string output ports conform to SRFI-6. NOTE: SRFI-6 compliance is incomplete in official version of TinyScheme. - (See SourceForge bug #2832150) + (See SourceForge bug #2832150) Also included two minor additions/corrections to old ChangeLog files. - ChangeLog.pre-2-6 | 2 +- - ChangeLog.pre-git | 6 +- - plug-ins/script-fu/tinyscheme/Manual.txt | 2 +- - plug-ins/script-fu/tinyscheme/opdefines.h | 3 +- + ChangeLog.pre-2-6 | 2 +- + ChangeLog.pre-git | 6 +- + plug-ins/script-fu/tinyscheme/Manual.txt | 2 +- + plug-ins/script-fu/tinyscheme/opdefines.h | 3 +- plug-ins/script-fu/tinyscheme/scheme-private.h | 1 + - plug-ins/script-fu/tinyscheme/scheme.c | 100 + plug-ins/script-fu/tinyscheme/scheme.c | 100 ++++++++++++++++++++++++- 6 files changed, 104 insertions(+), 10 deletions(-) commit 57f44b89e858b36184abae919985c8fecfd50db4 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 4 20:20:09 2009 +0200 +Date: Tue Aug 4 20:20:09 2009 +0200 Use GimpTreeHandler to connect to all items' "visible" and "linked" callbacks @@ -87877,7 +88710,7 @@ commit 00682ee7cf6b604b2b4c3112aecaf6352d77cefc Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 4 20:19:13 2009 +0200 +Date: Tue Aug 4 20:19:13 2009 +0200 Replace the hash table of container handlers by a single GimpTreeHandler @@ -87888,7 +88721,7 @@ commit aaab0d40a9214e329ab8aa10aa7708aec92b8a2c Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 4 20:12:34 2009 +0200 +Date: Tue Aug 4 20:12:34 2009 +0200 Add GimpTreeHandler, a signal connection helper for object trees @@ -87904,8 +88737,8 @@ handler, but makes sure that dispose() is really executed (which actually disconnects things). - app/core/Makefile.am | 2 + - app/core/core-types.h | 1 + + app/core/Makefile.am | 2 + + app/core/core-types.h | 1 + app/core/gimptreehandler.c | 240 +++++++++++++++++++++++++++++++++++++++++++++ app/core/gimptreehandler.h | 64 ++++++++++++ @@ -87913,7 +88746,7 @@ commit e8c6e3dbd3d604647adfd80a0f97075479d1b15b Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 4 09:06:03 2009 +0200 +Date: Tue Aug 4 09:06:03 2009 +0200 Expand the treeview to newly inserted items @@ -87922,7 +88755,7 @@ commit 3c0df851d0d63654044a5a30e4de5b903768892e Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 4 00:21:07 2009 +0200 +Date: Tue Aug 4 00:21:07 2009 +0200 Make the preview column the expander column @@ -87931,7 +88764,7 @@ commit ea7c07647b7f01ebbee13ffac4f3093f27e7c769 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 4 00:14:53 2009 +0200 +Date: Tue Aug 4 00:14:53 2009 +0200 Some group layer fixes @@ -87944,7 +88777,7 @@ commit ac052aabf4bfc1ce9eda24674a9825f0fff73563 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Aug 4 00:13:58 2009 +0200 +Date: Tue Aug 4 00:13:58 2009 +0200 Add items at the right place again (did not affect item treeviews) @@ -87953,7 +88786,7 @@ commit 8a578354fe761baf3699920437e78f54f257c026 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 3 23:46:19 2009 +0200 +Date: Mon Aug 3 23:46:19 2009 +0200 Show expanders in treeviews showing actual trees @@ -87962,7 +88795,7 @@ commit ad806713ae1787b12eee12f44ac32d42efa1e318 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 3 23:42:55 2009 +0200 +Date: Mon Aug 3 23:42:55 2009 +0200 Add a per-class flags that indicates that a container view's model is a tree @@ -87980,12 +88813,12 @@ commit 7dafae7f2694cb8e23d9efeac2aaa4bbab28270e Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 3 23:24:46 2009 +0200 +Date: Mon Aug 3 23:24:46 2009 +0200 Add a GimpGroupLayer class (not used yet) - app/core/Makefile.am | 2 + - app/core/core-types.h | 1 + + app/core/Makefile.am | 2 + + app/core/core-types.h | 1 + app/core/gimpgrouplayer.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++ app/core/gimpgrouplayer.h | 56 +++++++++++++++ @@ -87993,7 +88826,7 @@ commit 6f555cc4072f770f9ed3e203865dbb00afedefca Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 3 23:19:25 2009 +0200 +Date: Mon Aug 3 23:19:25 2009 +0200 Make sure duplicated item groups end up at the right place @@ -88002,26 +88835,26 @@ group inside itself instead of above it app/actions/channels-commands.c | 10 ++++++++-- - app/actions/layers-commands.c | 10 ++++++++-- + app/actions/layers-commands.c | 10 ++++++++-- app/actions/vectors-commands.c | 10 ++++++++-- 3 files changed, 24 insertions(+), 6 deletions(-) commit a53d4566daff865c5e05f335d3366716e3e9b5f0 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 3 22:30:36 2009 +0200 +Date: Mon Aug 3 22:30:36 2009 +0200 Use GIMP_IMAGE_ACTIVE_PARENT instead of a NULL parent in all obvious places app/actions/channels-commands.c | 14 ++++++++------ - app/actions/edit-commands.c | 9 +++++---- - app/actions/layers-commands.c | 27 +++++++++++++++------------ + app/actions/edit-commands.c | 9 +++++---- + app/actions/layers-commands.c | 27 +++++++++++++++------------ app/actions/vectors-commands.c | 23 +++++++++++++---------- - app/core/gimpselection.c | 4 ++-- + app/core/gimpselection.c | 4 ++-- app/dialogs/file-open-dialog.c | 4 ++-- app/display/gimpdisplayshell-dnd.c | 25 +++++++++++++------------ - app/tools/gimptexttool.c | 12 ++++++------ - app/tools/gimpvectortool.c | 4 ++-- + app/tools/gimptexttool.c | 12 ++++++------ + app/tools/gimpvectortool.c | 4 ++-- app/widgets/gimpchanneltreeview.c | 4 ++-- app/widgets/gimplayertreeview.c | 4 ++-- app/widgets/gimpvectorstreeview.c | 4 ++-- @@ -88029,7 +88862,7 @@ commit 45529d4886572c049537d18324e6bac82afb8c64 Author: Sven Neumann <sven@gimp.org> -Date: Mon Aug 3 22:14:49 2009 +0200 +Date: Mon Aug 3 22:14:49 2009 +0200 Bug 590638 – Changing palettes from list to grid view loses "locked to dock" status @@ -88042,7 +88875,7 @@ commit 3e1c13bc96eeaf49fdf4976a68c5078b2da97ce4 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 3 22:06:40 2009 +0200 +Date: Mon Aug 3 22:06:40 2009 +0200 Support GIMP_IMAGE_ACTIVE_PARENT in the vectors import functions @@ -88051,7 +88884,7 @@ commit a3b4b595d0529e428e50c9f13580a9b7531421ed Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 3 21:47:21 2009 +0200 +Date: Mon Aug 3 21:47:21 2009 +0200 Add infrastructure to add items to the active item's parent container @@ -88072,7 +88905,7 @@ commit 7cf408ae9dbbcb46ba931dc1753dcac048d2b11d Author: Alexia Death <alexiadeath@gmail.com> -Date: Mon Aug 3 22:25:23 2009 +0300 +Date: Mon Aug 3 22:25:23 2009 +0300 Cleaning the Dynamics Options object a little bit @@ -88083,7 +88916,7 @@ commit 2a74fc1bcaa61d0a0fd4a23aa98503240ce524a4 Author: Sven Neumann <sven@gimp.org> -Date: Mon Aug 3 20:40:10 2009 +0200 +Date: Mon Aug 3 20:40:10 2009 +0200 use a shorter description in the gimp.doap file @@ -88095,7 +88928,7 @@ commit c4075975bf9a238dcdfc6a8fed1847db51a82140 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Aug 3 19:21:51 2009 +0200 +Date: Mon Aug 3 19:21:51 2009 +0200 Bring parent items to the public API in the core @@ -88154,54 +88987,54 @@ new GimpItemTreeView API. app/actions/channels-commands.c | 9 ++++-- - app/actions/debug-commands.c | 2 +- - app/actions/edit-commands.c | 6 ++-- - app/actions/layers-commands.c | 20 +++++++----- + app/actions/debug-commands.c | 2 +- + app/actions/edit-commands.c | 6 ++-- + app/actions/layers-commands.c | 20 +++++++----- app/actions/vectors-commands.c | 15 ++++++--- - app/core/gimp-edit.c | 4 +-- - app/core/gimpchannelundo.c | 26 ++++++++++++++-- - app/core/gimpchannelundo.h | 1 + + app/core/gimp-edit.c | 4 +-- + app/core/gimpchannelundo.c | 26 ++++++++++++++-- + app/core/gimpchannelundo.h | 1 + app/core/gimpimage-duplicate.c | 62 +++++++++++++++++++++++++++++++++----- - app/core/gimpimage-merge.c | 10 ++++-- + app/core/gimpimage-merge.c | 10 ++++-- app/core/gimpimage-quick-mask.c | 2 +- app/core/gimpimage-undo-push.c | 12 ++++++++ app/core/gimpimage-undo-push.h | 5 ++- - app/core/gimpimage.c | 42 ++++++++++++++++++-------- - app/core/gimpimage.h | 4 +++ + app/core/gimpimage.c | 42 ++++++++++++++++++-------- + app/core/gimpimage.h | 4 +++ app/core/gimplayer-floating-sel.c | 2 +- - app/core/gimplayerundo.c | 20 +++++++++++- - app/core/gimplayerundo.h | 1 + - app/core/gimpselection.c | 3 +- - app/core/gimptemplate.c | 2 +- + app/core/gimplayerundo.c | 20 +++++++++++- + app/core/gimplayerundo.h | 1 + + app/core/gimpselection.c | 3 +- + app/core/gimptemplate.c | 2 +- app/dialogs/file-open-dialog.c | 3 +- app/display/gimpdisplayshell-dnd.c | 18 +++++++---- - app/pdb/image-cmds.c | 12 ++++++-- - app/pdb/paths-cmds.c | 4 +-- - app/pdb/vectors-cmds.c | 8 +++-- - app/text/gimptext-compat.c | 2 +- - app/tools/gimptexttool.c | 10 +++--- - app/tools/gimpvectortool.c | 3 +- + app/pdb/image-cmds.c | 12 ++++++-- + app/pdb/paths-cmds.c | 4 +-- + app/pdb/vectors-cmds.c | 8 +++-- + app/text/gimptext-compat.c | 2 +- + app/tools/gimptexttool.c | 10 +++--- + app/tools/gimpvectortool.c | 3 +- app/vectors/gimpvectors-import.c | 15 +++++++-- app/vectors/gimpvectors-import.h | 2 ++ - app/vectors/gimpvectorsundo.c | 20 +++++++++++- - app/vectors/gimpvectorsundo.h | 1 + + app/vectors/gimpvectorsundo.c | 20 +++++++++++- + app/vectors/gimpvectorsundo.h | 1 + app/widgets/gimpchanneltreeview.c | 55 +++++++++++++++++---------------- app/widgets/gimpitemtreeview.c | 50 +++++++++++++++++++++++++++--- app/widgets/gimpitemtreeview.h | 6 ++++ app/widgets/gimplayertreeview.c | 57 ++++++++++++++++------------------- - app/widgets/gimptoolbox-dnd.c | 6 ++-- + app/widgets/gimptoolbox-dnd.c | 6 ++-- app/widgets/gimpvectorstreeview.c | 24 +++++++-------- - app/xcf/xcf-load.c | 4 +++ - tools/pdbgen/pdb/image.pdb | 12 ++++++-- - tools/pdbgen/pdb/paths.pdb | 4 +-- - tools/pdbgen/pdb/vectors.pdb | 8 +++-- + app/xcf/xcf-load.c | 4 +++ + tools/pdbgen/pdb/image.pdb | 12 ++++++-- + tools/pdbgen/pdb/paths.pdb | 4 +-- + tools/pdbgen/pdb/vectors.pdb | 8 +++-- 42 files changed, 410 insertions(+), 162 deletions(-) commit ce1212f5bba0aa1cf3a9a9ad544fadb0aa2f183b Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Mon Aug 3 11:54:32 2009 -0300 +Date: Mon Aug 3 11:54:32 2009 -0300 Add context parameter back to gimp_dynamics_editor_new. @@ -88211,7 +89044,7 @@ commit 4da7c67406fc15d635cad875ccd01e18785a87f2 Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Sun Aug 2 17:18:09 2009 -0300 +Date: Sun Aug 2 17:18:09 2009 -0300 Debug dynamics editor, and solve many bugs. @@ -88224,7 +89057,7 @@ commit 18603ac192493296b191197a3e2b62c710398afd Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Aug 2 21:35:10 2009 +0200 +Date: Sun Aug 2 21:35:10 2009 +0200 Bug 401754 – Port Hue, Saturation, Value to CIE LCH @@ -88239,20 +89072,20 @@ commit 1b0c3595c35f29e36eb28eaadc24f6c3a84731a5 Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Sun Aug 2 15:57:53 2009 -0300 +Date: Sun Aug 2 15:57:53 2009 -0300 Adjust dynamics editor codes and its function call in dialogs-constructor. - app/dialogs/dialogs-constructors.c | 4 +- + app/dialogs/dialogs-constructors.c | 4 +- app/widgets/gimpdynamicseditor.c | 321 +++++-------------------------------- - app/widgets/gimpdynamicseditor.h | 6 +- + app/widgets/gimpdynamicseditor.h | 6 +- 3 files changed, 41 insertions(+), 290 deletions(-) commit 87d463aed093139672d41f468e45522f9b2ce1b6 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 2 17:44:05 2009 +0200 +Date: Sun Aug 2 17:44:05 2009 +0200 Iterate over all an image's items recursively @@ -88264,20 +89097,20 @@ iterating it). Some places will need adjusting once we really have item trees. - app/core/gimpimage-convert.c | 15 ++++++----- - app/core/gimpimage-crop.c | 25 +++++++++-------- + app/core/gimpimage-convert.c | 15 ++++++----- + app/core/gimpimage-crop.c | 25 +++++++++-------- app/core/gimpimage-duplicate.c | 31 +++++++++++++++------ - app/core/gimpimage-flip.c | 37 +++++++++++++++---------- + app/core/gimpimage-flip.c | 37 +++++++++++++++---------- app/core/gimpimage-item-list.c | 25 ++++++++++------- - app/core/gimpimage-resize.c | 55 ++++++++++++++++++++++++------------- - app/core/gimpimage-rotate.c | 29 +++++++++++--------- - app/core/gimpimage-scale.c | 61 + app/core/gimpimage-resize.c | 55 ++++++++++++++++++++++++------------- + app/core/gimpimage-rotate.c | 29 +++++++++++--------- + app/core/gimpimage-scale.c | 61 ++++++++++++++++++++---------------------- 8 files changed, 167 insertions(+), 111 deletions(-) commit ec21c2880cdca327f5fbc1dbcbff1ca2b7d51cff Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 2 15:56:06 2009 +0200 +Date: Sun Aug 2 15:56:06 2009 +0200 Remove gimp_image_get_layer,channel,vectors_by_index() @@ -88290,7 +89123,7 @@ commit 3c76b2797b78243b8456288ed2b25a18e4508a33 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 2 15:48:27 2009 +0200 +Date: Sun Aug 2 15:48:27 2009 +0200 Get rid of using gimp_container_get_vectors_by_index() in xcf-load.c @@ -88302,7 +89135,7 @@ commit d7fa10c7080999ed97f58d5618f4abc519ddd914 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 2 15:43:04 2009 +0200 +Date: Sun Aug 2 15:43:04 2009 +0200 Get rid of using gimp_image_get_layer_by_index() in gimpimage.c @@ -88311,7 +89144,7 @@ commit 49b7f6b4369f197cfcbc49366dbda341ca56f659 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 2 15:36:00 2009 +0200 +Date: Sun Aug 2 15:36:00 2009 +0200 Implement adding/removing items to/from trees of items @@ -88326,7 +89159,7 @@ commit e7e5a6d19d100ac1b4a70ac6446e00712538a2a3 Author: Barak Itkin <lightningismyname@gmail.com> -Date: Sun Aug 2 15:30:57 2009 +0300 +Date: Sun Aug 2 15:30:57 2009 +0300 Bug 304399 – Color Palette Export to TXT, CSS, XML, or XHTML @@ -88341,7 +89174,7 @@ commit f026c52478bf59c70ebbbac5e3a9b68859af2596 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Aug 2 14:57:46 2009 +0200 +Date: Sun Aug 2 14:57:46 2009 +0200 Bug 568445 – Closing the Toolbox causes the program to close @@ -88353,7 +89186,7 @@ commit 8fb779aeaaf2d7d0ed394405103aa2d602be66eb Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Aug 2 14:09:37 2009 +0200 +Date: Sun Aug 2 14:09:37 2009 +0200 app: Formating @@ -88362,17 +89195,17 @@ commit 5a8c46840b9d6ccf98206cd943d033df8526c0c0 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Aug 2 14:03:13 2009 +0200 +Date: Sun Aug 2 14:03:13 2009 +0200 Regenerate gimprc docs/gimprc.5.in | 17 +++++++++-------- - etc/gimprc | 12 ++++++------ + etc/gimprc | 12 ++++++------ 2 files changed, 15 insertions(+), 14 deletions(-) commit cc7e372a84ce8e9c390f094d6f814182c37543cb Author: Christopher Howard <choward@indicium.us> -Date: Sat Jul 25 13:09:02 2009 -0800 +Date: Sat Jul 25 13:09:02 2009 -0800 Bug 589665 – Minor mistakes in gimprc documentation @@ -88387,7 +89220,7 @@ commit c1c882b4ecdcdf9d2710fe723032b75ef42d5ddb Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 2 13:16:31 2009 +0200 +Date: Sun Aug 2 13:16:31 2009 +0200 Change control+tab layer cycling to work within one group @@ -88400,7 +89233,7 @@ commit 72cfe6c701bd17c5b4cf74f5cba2f7bdf00903e9 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 2 13:03:52 2009 +0200 +Date: Sun Aug 2 13:03:52 2009 +0200 Use gimp_image_get_channels() instead of image->channels @@ -88409,7 +89242,7 @@ commit ccc167994c19cee9c47018e118e9b2c85676ce10 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 2 12:45:04 2009 +0200 +Date: Sun Aug 2 12:45:04 2009 +0200 Remove some old and unused GimpImage API cruft @@ -88423,19 +89256,19 @@ commit 7805bd2186253dfb2908a03832cc0b8c7d7d43cb Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 2 12:24:06 2009 +0200 +Date: Sun Aug 2 12:24:06 2009 +0200 Use the new item counting functions where appropriate - app/core/gimpimage.c | 2 +- - app/core/gimpimagefile.c | 2 +- + app/core/gimpimage.c | 2 +- + app/core/gimpimagefile.c | 2 +- app/display/gimpdisplayshell-title.c | 4 ++-- app/widgets/gimpimagepropview.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) commit 6be068ceab39bb8f8ea1a6a5d0adbda267a4499b Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 2 12:12:01 2009 +0200 +Date: Sun Aug 2 12:12:01 2009 +0200 Add functions to count the items in an image @@ -88445,15 +89278,15 @@ * app/core/gimpimage.[ch]: add get_n_layers(), get_n_channels() and get_n_vectors(). - app/core/gimpimage.c | 24 ++++++++++++++++++++++++ - app/core/gimpimage.h | 4 ++++ + app/core/gimpimage.c | 24 ++++++++++++++++++++++++ + app/core/gimpimage.h | 4 ++++ app/core/gimpitemstack.c | 24 ++++++++++++++++++++++++ app/core/gimpitemstack.h | 1 + 4 files changed, 53 insertions(+) commit d2e781f3754c5f56eddeff76cc09ca381d34cd87 Author: NISHIBORI Kiyotaka <ml.nishibori.kiyotaka@gmail.com> -Date: Sun Aug 2 18:57:02 2009 +0900 +Date: Sun Aug 2 18:57:02 2009 +0900 Updated Japanese translation Author: NISHIBORI Kiyotaka. @@ -88465,7 +89298,7 @@ commit b3e014759880c9dd5ff0f45595e60f7b82b52885 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 2 12:01:17 2009 +0200 +Date: Sun Aug 2 12:01:17 2009 +0200 Make layer selecting by actions work on the right container @@ -88474,7 +89307,7 @@ commit 77e233f4c76cb4b6cf69b9b483a9fec8e27e8f37 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Aug 2 11:07:40 2009 +0200 +Date: Sun Aug 2 11:07:40 2009 +0200 Bug 325564 – Use CIE LCH instead of HSL for layer mode "Color" @@ -88488,12 +89321,12 @@ commit 251ee3a7bedc527784c804bc7a7281535f301688 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 2 01:39:51 2009 +0200 +Date: Sun Aug 2 01:39:51 2009 +0200 Move get_item_by_tattoo() and by_name() functions from GimpImage to GimpItemStack - app/core/gimpimage.c | 74 + app/core/gimpimage.c | 74 ++++++++---------------------------------------- app/core/gimpitemstack.c | 64 +++++++++++++++++++++++++++++++++++++++++ app/core/gimpitemstack.h | 4 +++ @@ -88501,7 +89334,7 @@ commit 9381358b6bdbd9cfbc14f43be52f683a437b4aef Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 2 01:03:58 2009 +0200 +Date: Sun Aug 2 01:03:58 2009 +0200 Make setting the active layer, channel, vectors work for items in groups @@ -88511,7 +89344,7 @@ commit 99ceaf984a7f7dab2c72d359d3621a6adab6aef5 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 2 00:21:31 2009 +0200 +Date: Sun Aug 2 00:21:31 2009 +0200 Make getting items by name work on trees @@ -88520,7 +89353,7 @@ commit 227076b6d1eb8ff2e316f064cd7ad65f5ff9439c Author: Michael Natterer <mitch@gimp.org> -Date: Sun Aug 2 00:15:53 2009 +0200 +Date: Sun Aug 2 00:15:53 2009 +0200 Make getting items by tattoo work on trees @@ -88529,21 +89362,21 @@ commit 01c77b18d5f23262886fc6e9a5bf1f46e16f0195 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 1 23:07:07 2009 +0200 +Date: Sat Aug 1 23:07:07 2009 +0200 Use the new item iter API instead of the image APIs in some straightforward places - app/core/gimpimage.c | 63 + app/core/gimpimage.c | 63 ++++++++++++++++++++++--------------- - app/display/gimpdisplayshell-draw.c | 9 ++++-- - app/tools/gimpdrawtool.c | 11 +++++-- - app/widgets/gimplayertreeview.c | 9 ++++-- + app/display/gimpdisplayshell-draw.c | 9 ++++-- + app/tools/gimpdrawtool.c | 11 +++++-- + app/widgets/gimplayertreeview.c | 9 ++++-- 4 files changed, 58 insertions(+), 34 deletions(-) commit 603d3441e786834ef57f1bbd90c8dd5ba148e38f Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 1 22:54:49 2009 +0200 +Date: Sat Aug 1 22:54:49 2009 +0200 Use gimp_item_get_container_iter() instead of the GimpImage iter APIs @@ -88552,13 +89385,13 @@ within the group). app/actions/channels-actions.c | 6 +++++- - app/actions/layers-actions.c | 5 ++++- - app/actions/vectors-actions.c | 5 ++++- + app/actions/layers-actions.c | 5 ++++- + app/actions/vectors-actions.c | 5 ++++- 3 files changed, 13 insertions(+), 3 deletions(-) commit 5f66faf95318b66a97d6b2cc16d7bcfb3f4a8f01 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 1 22:53:31 2009 +0200 +Date: Sat Aug 1 22:53:31 2009 +0200 Should try the code before pushing... @@ -88567,7 +89400,7 @@ commit 6e29b94bd054e0dcedbdbd6905da12699c284fc8 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 1 22:40:32 2009 +0200 +Date: Sat Aug 1 22:40:32 2009 +0200 Add gimp_item_get_container_iter() @@ -88575,14 +89408,14 @@ in order to avoid including "core/gimplist.h" whenever a file needs access to the actual GList inside the container. - app/core/gimpitem.c | 15 +++ + app/core/gimpitem.c | 15 +++ app/core/gimpitem.h | 279 ++++++++++++++++++++++++++-------------------------- 2 files changed, 155 insertions(+), 139 deletions(-) commit 571d26a1982b95f65e3df69837a145c2a639a9f5 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 1 21:59:45 2009 +0200 +Date: Sat Aug 1 21:59:45 2009 +0200 Add functions for getting lists of all an image's items @@ -88593,15 +89426,15 @@ * app/core/gimpimage.[ch]: add gimp_image_get_layer_list(), channel_list(), vectors_list() which use above new function. - app/core/gimpimage.c | 24 ++++++++++++++++++++++++ - app/core/gimpimage.h | 4 ++++ + app/core/gimpimage.c | 24 ++++++++++++++++++++++++ + app/core/gimpimage.h | 4 ++++ app/core/gimpitemstack.c | 37 +++++++++++++++++++++++++++++++++++++ app/core/gimpitemstack.h | 2 ++ 4 files changed, 67 insertions(+) commit 2f018dfcc2f6d6368381a02f8f4beab9172d01fa Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 1 21:37:19 2009 +0200 +Date: Sat Aug 1 21:37:19 2009 +0200 Use the new item APIs for layer/channel/vectors reordering @@ -88615,7 +89448,7 @@ commit 88f49a5ddbd94e7516a7d28333b0aeb64a78325e Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 1 20:49:55 2009 +0200 +Date: Sat Aug 1 20:49:55 2009 +0200 Use gimp_item_get_index() all over the place @@ -88623,15 +89456,15 @@ use the new function everywhere. app/core/gimpchannelpropundo.c | 4 ++-- - app/core/gimpchannelundo.c | 3 +-- - app/core/gimpimage-merge.c | 2 +- - app/core/gimpimage.c | 35 + app/core/gimpchannelundo.c | 3 +-- + app/core/gimpimage-merge.c | 2 +- + app/core/gimpimage.c | 35 +---------------------------------- - app/core/gimpimage.h | 7 ------- - app/core/gimplayerpropundo.c | 4 ++-- - app/core/gimplayerundo.c | 3 +-- + app/core/gimpimage.h | 7 ------- + app/core/gimplayerpropundo.c | 4 ++-- + app/core/gimplayerundo.c | 3 +-- app/vectors/gimpvectorspropundo.c | 4 ++-- - app/vectors/gimpvectorsundo.c | 3 +-- + app/vectors/gimpvectorsundo.c | 3 +-- app/widgets/gimpchanneltreeview.c | 6 ++---- app/widgets/gimplayertreeview.c | 7 +++---- app/widgets/gimpvectorstreeview.c | 3 +-- @@ -88639,7 +89472,7 @@ commit a3cb1191b9f9ee9dc1e3c07d78936f1e7b466f95 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 1 20:32:13 2009 +0200 +Date: Sat Aug 1 20:32:13 2009 +0200 Actually assign the new get_container() impl to the vtable @@ -88648,7 +89481,7 @@ commit 297c2f00826b59c9b2a020618b878bdfb7bbb651 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 1 20:22:07 2009 +0200 +Date: Sat Aug 1 20:22:07 2009 +0200 Add gimp_item_get_container() and gimp_item_get_index() @@ -88671,11 +89504,11 @@ subclasses and return NULL. app/core/gimpchannel.c | 16 +++++++ - app/core/gimpitem.c | 34 +++++++++++++ - app/core/gimpitem.h | 114 + app/core/gimpitem.c | 34 +++++++++++++ + app/core/gimpitem.h | 114 ++++++++++++++++++++++--------------------- - app/core/gimplayer.c | 38 +++++++-------- - app/core/gimplayer.h | 2 - + app/core/gimplayer.c | 38 +++++++-------- + app/core/gimplayer.h | 2 - app/core/gimplayermask.c | 22 ++++++--- app/core/gimpselection.c | 9 ++++ app/vectors/gimpvectors.c | 120 @@ -88684,7 +89517,7 @@ commit fd8ebdacef6afd6671a61d50d6cfecee30544b4a Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 1 19:39:10 2009 +0200 +Date: Sat Aug 1 19:39:10 2009 +0200 gimp_item_is_attached(): an item is attached if its parent item is attached @@ -88694,7 +89527,7 @@ commit f4f5fc5f5575090c9adaabe6a9661de86b6477be Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 1 19:27:45 2009 +0200 +Date: Sat Aug 1 19:27:45 2009 +0200 Add utility function gimp_layer_get_container() @@ -88708,7 +89541,7 @@ commit ad66250f90f27b4e7bb0023df7a501cd1bb0f246 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 1 19:23:59 2009 +0200 +Date: Sat Aug 1 19:23:59 2009 +0200 Invalidate all the item stack's previews recursively @@ -88717,7 +89550,7 @@ commit 464ce841aa165f9502ec2ae749488a91b1977166 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 1 19:21:43 2009 +0200 +Date: Sat Aug 1 19:21:43 2009 +0200 When an item is removed, emit "removed" on all its children @@ -88726,7 +89559,7 @@ commit ee022e907eb2b9b5437f477fabdfe821ae61b04e Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 1 19:13:35 2009 +0200 +Date: Sat Aug 1 19:13:35 2009 +0200 Add basic support for trees of containers in GimpContainerView classes @@ -88744,20 +89577,20 @@ parent_insert_data to insert the item at the right place in the GtkTreeView. - app/widgets/gimpcontainercombobox.c | 2 ++ - app/widgets/gimpcontainerentry.c | 2 ++ - app/widgets/gimpcontainergridview.c | 2 ++ + app/widgets/gimpcontainercombobox.c | 2 ++ + app/widgets/gimpcontainerentry.c | 2 ++ + app/widgets/gimpcontainergridview.c | 2 ++ app/widgets/gimpcontainertreeview.c | 10 ++++++---- app/widgets/gimpcontainerview.c | 38 +++++++++++++++++++++++++++++++++++-- - app/widgets/gimpcontainerview.h | 1 + - app/widgets/gimpitemtreeview.c | 5 ++++- - app/widgets/gimplayertreeview.c | 5 ++++- + app/widgets/gimpcontainerview.h | 1 + + app/widgets/gimpitemtreeview.c | 5 ++++- + app/widgets/gimplayertreeview.c | 5 ++++- 8 files changed, 57 insertions(+), 8 deletions(-) commit 1e5da3939bc27ebd6f2c7a960fd2ce3648e91bfd Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 1 19:04:33 2009 +0200 +Date: Sat Aug 1 19:04:33 2009 +0200 Add basic infrastructure for trees of viewables @@ -88773,7 +89606,7 @@ commit 656e30cd3a6b1ab2380ea212d2c9b47b2c44d043 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 1 18:59:58 2009 +0200 +Date: Sat Aug 1 18:59:58 2009 +0200 Looking at widget->requisition in size_allocate() is useless @@ -88785,7 +89618,7 @@ commit 2abca796bfbf1386b7b01c5255575f16d51e351e Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 1 18:57:58 2009 +0200 +Date: Sat Aug 1 18:57:58 2009 +0200 Don't touch widget->requisition in size_request() @@ -88797,7 +89630,7 @@ commit f712a316dfde34facdc604a29e082bc54882a83f Author: Michael Natterer <mitch@gimp.org> -Date: Sat Aug 1 18:39:18 2009 +0200 +Date: Sat Aug 1 18:39:18 2009 +0200 Bug 589674 – "Send by Email" does not update "Filename" @@ -88809,7 +89642,7 @@ commit 6a41c872f628fc30ceb9fa02299824f06f76e088 Author: Stephen Griffiths <scgmk5@gmail.com> -Date: Wed Jul 29 21:55:31 2009 +1000 +Date: Wed Jul 29 21:55:31 2009 +1000 app: Make GimpToolEditor changes cancellable @@ -88817,14 +89650,14 @@ in Preferences. See enhancement request/bug #500930. app/dialogs/preferences-dialog.c | 21 +++---- - app/widgets/gimptooleditor.c | 116 + app/widgets/gimptooleditor.c | 116 ++++++++++++++++++++++++++++++++++----- - app/widgets/gimptooleditor.h | 14 +++-- + app/widgets/gimptooleditor.h | 14 +++-- 3 files changed, 120 insertions(+), 31 deletions(-) commit 9cddfeba7353187cc9fc6557133d8ab31ffc5dc5 Author: Christopher Howard <choward@indicium.us> -Date: Mon Jul 27 17:08:50 2009 -0800 +Date: Mon Jul 27 17:08:50 2009 -0800 Bug 589674 – "Send by Email" does not update "Filename" @@ -88837,7 +89670,7 @@ commit 0ee1b9da099284c5b4f011e4544fb15fb5e15e1b Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Fri Jul 31 11:58:55 2009 -0300 +Date: Fri Jul 31 11:58:55 2009 -0300 Add dynamics menu and actions that work. @@ -88852,7 +89685,7 @@ commit 441d287008ee588e1c2cb529bb760984f4fbc756 Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Fri Jul 31 05:39:46 2009 -0300 +Date: Fri Jul 31 05:39:46 2009 -0300 Fix menu issues. @@ -88863,13 +89696,13 @@ app/actions/dynamics-editor-actions.c | 7 ++++--- app/dialogs/dialogs-constructors.c | 4 ++-- - menus/dialogs-menuitems.xml | 2 +- - menus/image-menu.xml.in | 7 +++++++ + menus/dialogs-menuitems.xml | 2 +- + menus/image-menu.xml.in | 7 +++++++ 4 files changed, 14 insertions(+), 6 deletions(-) commit 7d3f1f0a68a647775dbc360755c032ec2fbe5dfa Author: Alexia Death <alexiadeath@gmail.com> -Date: Thu Jul 30 20:59:08 2009 +0300 +Date: Thu Jul 30 20:59:08 2009 +0300 Now lets add the dockable it opens. Now gimp_dynamics_editor_new needs to be implemented to actually have stuff in the dockable. @@ -88879,11 +89712,11 @@ commit 08a88f681dfe68fb226bf0a8ae0886249c4a8821 Author: Alexia Death <alexiadeath@gmail.com> -Date: Thu Jul 30 20:49:10 2009 +0300 +Date: Thu Jul 30 20:49:10 2009 +0300 Lo and behold, menu item. - app/actions/actions.c | 2 +- + app/actions/actions.c | 2 +- app/actions/dialogs-actions.c | 8 +++++--- app/widgets/gimphelp-ids.h | 2 ++ libgimpwidgets/gimpstock.h | 1 + @@ -88892,7 +89725,7 @@ commit 9c4a2ab4ea93655de72fcc26b72704b24dddb9e9 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Jul 30 18:59:12 2009 +0200 +Date: Thu Jul 30 18:59:12 2009 +0200 Move layer mask related functions together @@ -88901,15 +89734,15 @@ 2 files changed, 10 insertions(+), 10 deletions(-) commit 2e2f770f2a41a2953bb44589908727ba50716451 -Merge: 1e17368 8480477 +Merge: 1e1736894a 8480477f9d Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Thu Jul 30 12:01:58 2009 -0300 +Date: Thu Jul 30 12:01:58 2009 -0300 Merge branch 'add-menu-action' into soc-2009-dynamics commit 8480477f9dc735bdab5837f5673de229e0f52b8d Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Thu Jul 30 11:55:17 2009 -0300 +Date: Thu Jul 30 11:55:17 2009 -0300 Further changes to make dynamics editor and its menu. @@ -88922,8 +89755,8 @@ actions/dynamics-editor-actions.h (new files): add actions for dynamics. - app/actions/Makefile.am | 6 ++- - app/actions/actions.c | 5 +- + app/actions/Makefile.am | 6 ++- + app/actions/actions.c | 5 +- app/actions/dynamics-editor-actions.c | 97 +++++++++++++++++++++++++++++++++++ app/actions/dynamics-editor-actions.h | 27 ++++++++++ @@ -88933,7 +89766,7 @@ commit 13082657be8404e5604358da86a0dec934a0d150 Author: Denis Arnaud <darnaud@src.gnome.org> -Date: Thu Jul 30 04:54:25 2009 +0200 +Date: Thu Jul 30 04:54:25 2009 +0200 Updated breton translation @@ -88944,7 +89777,7 @@ commit 21dd836bf6a486194d7c0b245bb227f9e5ee84ac Author: Alan Monfort <alan.monfort@free.fr> -Date: Wed Jul 29 18:13:51 2009 +0200 +Date: Wed Jul 29 18:13:51 2009 +0200 Updated breton translation @@ -88954,7 +89787,7 @@ commit 55315a57f9d558b2210a22da7d75cca6325fd41b Author: Denis Arnaud <darnaud@src.gnome.org> -Date: Wed Jul 29 12:15:04 2009 +0200 +Date: Wed Jul 29 12:15:04 2009 +0200 Updated breton translation @@ -88964,7 +89797,7 @@ commit b68991dc4745fdd69b104949e52ddaec31fa2e5b Author: Denis Arnaud <darnaud@src.gnome.org> -Date: Wed Jul 29 05:19:42 2009 +0200 +Date: Wed Jul 29 05:19:42 2009 +0200 Updated breton translation @@ -88974,7 +89807,7 @@ commit 4ae4b45d5ff9b93b096aad7e535ff043624b5d82 Author: Denis Arnaud <darnaud@src.gnome.org> -Date: Wed Jul 29 05:19:02 2009 +0200 +Date: Wed Jul 29 05:19:02 2009 +0200 Updated breton translation @@ -88984,7 +89817,7 @@ commit bd50c5acbab66ed8ae0cd7cfc06d68d973db4f8a Author: Denis Arnaud <darnaud@src.gnome.org> -Date: Wed Jul 29 05:18:56 2009 +0200 +Date: Wed Jul 29 05:18:56 2009 +0200 Updated breton translation @@ -88993,7 +89826,7 @@ commit 4d2fa574ceeeb649066a000b6c1ff106cb85f056 Author: Denis Arnaud <darnaud@src.gnome.org> -Date: Wed Jul 29 05:18:46 2009 +0200 +Date: Wed Jul 29 05:18:46 2009 +0200 Updated breton translation @@ -89003,7 +89836,7 @@ commit 3dd535823aa37f874a5c8e604aeb7baab8997366 Author: Denis Arnaud <darnaud@src.gnome.org> -Date: Wed Jul 29 05:18:25 2009 +0200 +Date: Wed Jul 29 05:18:25 2009 +0200 Updated breton translation @@ -89012,15 +89845,15 @@ 1 file changed, 12 insertions(+), 205 deletions(-) commit 1e1736894a8125dd41b232dd854b6266679489e9 -Merge: 03e91b6 99e3d88 +Merge: 03e91b64f4 99e3d8891c Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Tue Jul 28 17:03:02 2009 -0300 +Date: Tue Jul 28 17:03:02 2009 -0300 Merge commit 'origin/soc-2009-dynamics' into soc-2009-dynamics commit 03e91b64f4311c8959d9a8fc75d123ba232c9ba9 Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Tue Jul 28 16:52:53 2009 -0300 +Date: Tue Jul 28 16:52:53 2009 -0300 Add menu item for dynamics dockable (menu bits) @@ -89036,21 +89869,21 @@ ../menus/dynamics-editor-menu.xml: (new file) - app/actions/actions.c | 3 +++ - app/actions/dialogs-actions.c | 6 ++++++ + app/actions/actions.c | 3 +++ + app/actions/dialogs-actions.c | 6 ++++++ app/dialogs/dialogs-constructors.c | 9 +++++++++ - app/menus/menus.c | 14 +++++++++++++- - app/menus/plug-in-menus.c | 7 +++++++ - app/pdb/makefile.msc | 1 + - etc/ps-menurc | 1 + - menus/Makefile.am | 1 + - menus/dialogs-menuitems.xml | 1 + + app/menus/menus.c | 14 +++++++++++++- + app/menus/plug-in-menus.c | 7 +++++++ + app/pdb/makefile.msc | 1 + + etc/ps-menurc | 1 + + menus/Makefile.am | 1 + + menus/dialogs-menuitems.xml | 1 + menus/dynamics-editor-menu.xml | 8 ++++++++ 10 files changed, 50 insertions(+), 1 deletion(-) commit 96126034c9035085def81e14d9db8566de2837e3 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Jul 28 21:02:32 2009 +0200 +Date: Tue Jul 28 21:02:32 2009 +0200 Get rid of antique code duplication @@ -89064,7 +89897,7 @@ commit 3ae83c5cede092b13ca66afe208c1432096fe76f Author: Michael Natterer <mitch@gimp.org> -Date: Tue Jul 28 19:17:42 2009 +0200 +Date: Tue Jul 28 19:17:42 2009 +0200 Fix setting a context for the unlikely case that the container is frozen @@ -89074,7 +89907,7 @@ commit eff6d4f93006479d5fd1061cdba7a3eba2da36d0 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Jul 28 19:15:36 2009 +0200 +Date: Tue Jul 28 19:15:36 2009 +0200 Cosmetic changes @@ -89083,7 +89916,7 @@ commit b54a0fdf886cd8ed8b658f98f4746ad66cb6e810 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Jul 28 19:08:07 2009 +0200 +Date: Tue Jul 28 19:08:07 2009 +0200 Replace the name_changed_handler_id GQuark by a hash of quarks @@ -89099,7 +89932,7 @@ commit 13ec6cca81efffb308eebe77cdb098bdea1bbf1e Author: Michael Natterer <mitch@gimp.org> -Date: Tue Jul 28 16:38:18 2009 +0200 +Date: Tue Jul 28 16:38:18 2009 +0200 Add utility functions for adding/removing a container to/from the view @@ -89127,7 +89960,7 @@ commit 062e90adcd387ed4aee4d16d1ef5e38768f0f955 Author: Alexandre Prokoudine <alexandre.prokoudine@gmail.com> -Date: Tue Jul 28 18:13:00 2009 +0400 +Date: Tue Jul 28 18:13:00 2009 +0400 Updated Russian translation @@ -89136,7 +89969,7 @@ commit ae3a0a5b470dc4433e83fe237bfffa209a6cd171 Author: Alexandre Prokoudine <alexandre.prokoudine@gmail.com> -Date: Tue Jul 28 18:12:54 2009 +0400 +Date: Tue Jul 28 18:12:54 2009 +0400 Updated Russian translation @@ -89146,7 +89979,7 @@ commit a5bb58c273917531777ff6ff46361e6b141eb8e9 Author: Alexandre Prokoudine <alexandre.prokoudine@gmail.com> -Date: Tue Jul 28 17:29:14 2009 +0400 +Date: Tue Jul 28 17:29:14 2009 +0400 Updated Russian translation @@ -89156,7 +89989,7 @@ commit 1b759561ce58c5bab3002cf6cbf67a01baada984 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Jul 28 15:01:57 2009 +0200 +Date: Tue Jul 28 15:01:57 2009 +0200 Keep the item hash table around permanently @@ -89171,7 +90004,7 @@ commit 3c844e867a4ede45ae4e309d4f999c4892759183 Author: Denis Arnaud <darnaud@src.gnome.org> -Date: Tue Jul 28 13:24:08 2009 +0200 +Date: Tue Jul 28 13:24:08 2009 +0200 Updated breton translation @@ -89181,7 +90014,7 @@ commit e7d541a6d0e92e3873e45bcd115a1691b4c21cda Author: Denis Arnaud <darnaud@src.gnome.org> -Date: Tue Jul 28 13:23:41 2009 +0200 +Date: Tue Jul 28 13:23:41 2009 +0200 Added breton translation for tags @@ -89190,7 +90023,7 @@ commit 05446a1416e0dea45c8b6cb2b18f99393b80d4ba Author: Denis Arnaud <darnaud@src.gnome.org> -Date: Tue Jul 28 13:23:04 2009 +0200 +Date: Tue Jul 28 13:23:04 2009 +0200 Added br in LINGUAS @@ -89199,17 +90032,17 @@ commit aed2d23e90dfd558439eb5fee999ed01c80bda38 Author: Alan Monfort <alan.monfort@free.fr> -Date: Tue Jul 28 06:19:06 2009 +0200 +Date: Tue Jul 28 06:19:06 2009 +0200 Added breton translation po-plug-ins/br.po | 0 - po/br.po | 0 + po/br.po | 0 2 files changed, 0 insertions(+), 0 deletions(-) commit 6fb5d6051ee4071830fda6093a8d7d4829a45ef5 Author: Alan Monfort <alan.monfort@free.fr> -Date: Tue Jul 28 06:18:54 2009 +0200 +Date: Tue Jul 28 06:18:54 2009 +0200 Added breton translation @@ -89218,7 +90051,7 @@ commit ff849661e8bdd240a823d840f6fb80ec1ae09486 Author: Alan Monfort <alan.monfort@free.fr> -Date: Tue Jul 28 06:18:23 2009 +0200 +Date: Tue Jul 28 06:18:23 2009 +0200 Added breton translation @@ -89227,17 +90060,17 @@ commit 3559aeb095d7fcb0cc58361609c507b0c31df32d Author: Denis Arnaud <darnaud@src.gnome.org> -Date: Tue Jul 28 05:13:48 2009 +0200 +Date: Tue Jul 28 05:13:48 2009 +0200 Added breton po-libgimp/br.po | 0 - po/LINGUAS | 1 + + po/LINGUAS | 1 + 2 files changed, 1 insertion(+) commit 0f95e1d57fc4e615f4ecf6bea26e315278d30388 Author: Denis Arnaud <darnaud@src.gnome.org> -Date: Tue Jul 28 05:13:34 2009 +0200 +Date: Tue Jul 28 05:13:34 2009 +0200 Added breton @@ -89246,7 +90079,7 @@ commit fc3e62a469a0b97968b1f6d3fcce793c437dff23 Author: Denis Arnaud <darnaud@src.gnome.org> -Date: Tue Jul 28 05:13:21 2009 +0200 +Date: Tue Jul 28 05:13:21 2009 +0200 Added breton @@ -89255,7 +90088,7 @@ commit 621c991fa6c24a6d19780f948591e0c1b3ce97b7 Author: Denis Arnaud <darnaud@src.gnome.org> -Date: Tue Jul 28 05:13:07 2009 +0200 +Date: Tue Jul 28 05:13:07 2009 +0200 Added breton @@ -89264,7 +90097,7 @@ commit 77c54ddf654459dbcf84da06fd71225048e99d2e Author: Denis Arnaud <darnaud@src.gnome.org> -Date: Tue Jul 28 05:12:40 2009 +0200 +Date: Tue Jul 28 05:12:40 2009 +0200 Added breton @@ -89273,7 +90106,7 @@ commit 0cbd4a8145b5183bdd9da6c5a373c9cb5b4ddf27 Author: Alan Monfort <alan.monfort@free.fr> -Date: Tue Jul 28 05:10:36 2009 +0200 +Date: Tue Jul 28 05:10:36 2009 +0200 Added breton translation @@ -89283,7 +90116,7 @@ commit 5b770ffb890cb97c64f93e45780b804b76b0caaa Author: Alan Monfort <alan.monfort@free.fr> -Date: Tue Jul 28 05:10:02 2009 +0200 +Date: Tue Jul 28 05:10:02 2009 +0200 Added breton translation @@ -89293,7 +90126,7 @@ commit 82c132bd63a961571a62a536ebfc1cfdd8561fda Author: Alan Monfort <alan.monfort@free.fr> -Date: Tue Jul 28 05:09:46 2009 +0200 +Date: Tue Jul 28 05:09:46 2009 +0200 Added breton translation @@ -89303,7 +90136,7 @@ commit b58ffe572cdf2f2900705c0b83a07d350e82238b Author: Alan Monfort <alan.monfort@free.fr> -Date: Tue Jul 28 05:09:34 2009 +0200 +Date: Tue Jul 28 05:09:34 2009 +0200 Added breton translation @@ -89313,7 +90146,7 @@ commit 13954c923d2c86813babc232097565b727d72de8 Author: Alan Monfort <alan.monfort@free.fr> -Date: Tue Jul 28 05:09:02 2009 +0200 +Date: Tue Jul 28 05:09:02 2009 +0200 Added breton translation @@ -89323,12 +90156,12 @@ commit 99e3d8891c4eeef234cfe4df164b4ad56e6c2a64 Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Mon Jul 27 14:22:11 2009 -0300 +Date: Mon Jul 27 14:22:11 2009 -0300 Two files added as working on gimp dynamics objects. - new file: gimpdynamicsoptions.c - new file: gimpdynamicsoptions.h + new file: gimpdynamicsoptions.c + new file: gimpdynamicsoptions.h app/paint/gimpdynamicsoptions.c | 1647 +++++++++++++++++++++++++++++++++++++++ @@ -89337,7 +90170,7 @@ commit 6a574ab1929ca82e30bd084bc54309e6fa37c9c6 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Jul 26 21:05:53 2009 +0200 +Date: Sun Jul 26 21:05:53 2009 +0200 Bug 589783 – Finnish translation typo @@ -89346,7 +90179,7 @@ commit 9f7866f08e92fc9f5740c0fd7e323b2c3689cb5e Author: Daniel Nylander <po@danielnylander.se> -Date: Sun Jul 26 16:44:41 2009 +0200 +Date: Sun Jul 26 16:44:41 2009 +0200 Updated Swedish translation @@ -89356,7 +90189,7 @@ commit 8b4cb09c498295206e885b94f1787479b7c70147 Author: Daniel Nylander <po@danielnylander.se> -Date: Sun Jul 26 16:37:37 2009 +0200 +Date: Sun Jul 26 16:37:37 2009 +0200 Updated Swedish translation @@ -89366,7 +90199,7 @@ commit 97668c2f0821abdbb32ece06db861b7088c32a9a Author: Daniel Nylander <po@danielnylander.se> -Date: Sun Jul 26 16:30:57 2009 +0200 +Date: Sun Jul 26 16:30:57 2009 +0200 Updated Swedish translation @@ -89376,7 +90209,7 @@ commit cf4d4b8a7d8f94dc0b45f265bab8ee8f25700783 Author: Daniel Nylander <po@danielnylander.se> -Date: Sun Jul 26 16:29:29 2009 +0200 +Date: Sun Jul 26 16:29:29 2009 +0200 Updated Swedish translation @@ -89385,7 +90218,7 @@ commit a5a2672345e4ece6e015af70a03c3ac3affda144 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Jul 26 14:19:58 2009 +0200 +Date: Sun Jul 26 14:19:58 2009 +0200 Set the tree view's "show-expanders" to FALSE @@ -89398,7 +90231,7 @@ commit 23ab1a6ac282cac328aad17e4ed3bed30d5c384e Author: Michael Natterer <mitch@gimp.org> -Date: Sun Jul 26 14:13:30 2009 +0200 +Date: Sun Jul 26 14:13:30 2009 +0200 Use the right area for click detection on treeview cells @@ -89412,7 +90245,7 @@ commit 2edfc47deb21a7762e8d2f5f6fec643ef2450a34 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Jul 25 18:21:23 2009 +0200 +Date: Sat Jul 25 18:21:23 2009 +0200 Rename private->hash_table to private->item_hash @@ -89422,22 +90255,22 @@ commit f7f31650a61d22beef99e921a124f323477ae800 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Jul 25 17:38:03 2009 +0200 +Date: Sat Jul 25 17:38:03 2009 +0200 Use GtkTreeStore instead of GtkListStore in GimpContainerTreeView app/widgets/gimpcontainertreeview.c | 36 +++++++++++++++++++----------------- - app/widgets/gimpdatafactoryview.c | 2 +- - app/widgets/gimpitemtreeview.c | 8 ++++---- - app/widgets/gimplayertreeview.c | 8 ++++---- - app/widgets/gimpsettingseditor.c | 2 +- - app/widgets/gimptemplateview.c | 2 +- + app/widgets/gimpdatafactoryview.c | 2 +- + app/widgets/gimpitemtreeview.c | 8 ++++---- + app/widgets/gimplayertreeview.c | 8 ++++---- + app/widgets/gimpsettingseditor.c | 2 +- + app/widgets/gimptemplateview.c | 2 +- 6 files changed, 30 insertions(+), 28 deletions(-) commit 4ea36f92f43e6d2609de4a186a22152876d469e4 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Jul 23 10:28:04 2009 +0200 +Date: Thu Jul 23 10:28:04 2009 +0200 Some straightforward tool editor cleanups @@ -89452,7 +90285,7 @@ commit e4581dbd548d983e6b1482e42f44d97108a03e9f Author: Michael Natterer <mitch@gimp.org> -Date: Sun Jul 26 21:05:53 2009 +0200 +Date: Sun Jul 26 21:05:53 2009 +0200 Bug 589783 – Finnish translation typo @@ -89461,7 +90294,7 @@ commit dee2bc4f38d21386789558daf7bef8a1cb335c48 Author: Daniel Nylander <po@danielnylander.se> -Date: Sun Jul 26 16:44:41 2009 +0200 +Date: Sun Jul 26 16:44:41 2009 +0200 Updated Swedish translation @@ -89471,7 +90304,7 @@ commit dd5f64ef6a0ef9f057bf90a3d88b867045fa0848 Author: Daniel Nylander <po@danielnylander.se> -Date: Sun Jul 26 16:37:37 2009 +0200 +Date: Sun Jul 26 16:37:37 2009 +0200 Updated Swedish translation @@ -89481,7 +90314,7 @@ commit 9888414c1fa02435992a46f8468500c03eaa1235 Author: Daniel Nylander <po@danielnylander.se> -Date: Sun Jul 26 16:30:57 2009 +0200 +Date: Sun Jul 26 16:30:57 2009 +0200 Updated Swedish translation @@ -89491,7 +90324,7 @@ commit 27b9bacfdaf313f25f96c0ff8bbda7a96a291ab2 Author: Daniel Nylander <po@danielnylander.se> -Date: Sun Jul 26 16:29:29 2009 +0200 +Date: Sun Jul 26 16:29:29 2009 +0200 Updated Swedish translation @@ -89500,7 +90333,7 @@ commit b78b6f6274daa2ba54ddd1d7aca68602b23dc62e Author: Michael Natterer <mitch@gimp.org> -Date: Sun Jul 26 14:19:58 2009 +0200 +Date: Sun Jul 26 14:19:58 2009 +0200 Set the tree view's "show-expanders" to FALSE @@ -89513,7 +90346,7 @@ commit bc51e8f98c383ec0dad495ddc218d92bb05d571f Author: Michael Natterer <mitch@gimp.org> -Date: Sun Jul 26 14:13:30 2009 +0200 +Date: Sun Jul 26 14:13:30 2009 +0200 Use the right area for click detection on treeview cells @@ -89527,7 +90360,7 @@ commit 07ecd55b1c21e545edebaccce26e1e48c1dc93d4 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Jul 25 18:21:23 2009 +0200 +Date: Sat Jul 25 18:21:23 2009 +0200 Rename private->hash_table to private->item_hash @@ -89537,22 +90370,22 @@ commit 344f52bbc22fa802eadde005f761970f18ba4541 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Jul 25 17:38:03 2009 +0200 +Date: Sat Jul 25 17:38:03 2009 +0200 Use GtkTreeStore instead of GtkListStore in GimpContainerTreeView app/widgets/gimpcontainertreeview.c | 36 +++++++++++++++++++----------------- - app/widgets/gimpdatafactoryview.c | 2 +- - app/widgets/gimpitemtreeview.c | 8 ++++---- - app/widgets/gimplayertreeview.c | 8 ++++---- - app/widgets/gimpsettingseditor.c | 2 +- - app/widgets/gimptemplateview.c | 2 +- + app/widgets/gimpdatafactoryview.c | 2 +- + app/widgets/gimpitemtreeview.c | 8 ++++---- + app/widgets/gimplayertreeview.c | 8 ++++---- + app/widgets/gimpsettingseditor.c | 2 +- + app/widgets/gimptemplateview.c | 2 +- 6 files changed, 30 insertions(+), 28 deletions(-) commit 472bf62b67a50f27c98e55d7bdee35221229368e Author: Michael Natterer <mitch@gimp.org> -Date: Thu Jul 23 10:28:04 2009 +0200 +Date: Thu Jul 23 10:28:04 2009 +0200 Some straightforward tool editor cleanups @@ -89567,7 +90400,7 @@ commit 01df67298a753adc1b95a492ff75a45d89c7bdf5 Author: Alexia Death <alexiadeath@gmail.com> -Date: Wed Jul 22 21:01:44 2009 +0300 +Date: Wed Jul 22 21:01:44 2009 +0300 Clean off gui creation for props that no longer exist @@ -89576,7 +90409,7 @@ commit 2e28c79973285b00e30d7877eda7670b9917c1d4 Author: Alexia Death <alexiadeath@gmail.com> -Date: Wed Jul 22 20:55:34 2009 +0300 +Date: Wed Jul 22 20:55:34 2009 +0300 Adding back some missing enum getters and setters right this time. Gimp runns now, allbeit with warnings @@ -89587,7 +90420,7 @@ commit 9e0f4f4e1f24e5f9a737de6afe54ca861b227b44 Author: Alexia Death <alexiadeath@gmail.com> -Date: Wed Jul 22 20:43:37 2009 +0300 +Date: Wed Jul 22 20:43:37 2009 +0300 Adding back some missing enum getters/setters @@ -89597,7 +90430,7 @@ commit a8a724615e84f1444f9db919b449f84bc8ff769d Author: Alexia Death <alexiadeath@gmail.com> -Date: Wed Jul 22 20:35:33 2009 +0300 +Date: Wed Jul 22 20:35:33 2009 +0300 Fixing some temp build stuff @@ -89605,15 +90438,15 @@ 1 file changed, 3 insertions(+), 3 deletions(-) commit d6a59dca3596200631ae339eeafb3cdb6a38ceec -Merge: 4aa3d3f 61db48a +Merge: 4aa3d3f7b0 61db48ac74 Author: Alexia Death <alexiadeath@gmail.com> -Date: Wed Jul 22 19:48:52 2009 +0300 +Date: Wed Jul 22 19:48:52 2009 +0300 Merge commit 'origin/master' into soc-2009-dynamics commit 61db48ac746e1b609dae3072d7fc0b702f1ff70d Author: Massimo Valentini <sixtysix@inwind.it> -Date: Wed Jul 22 18:17:00 2009 +0200 +Date: Wed Jul 22 18:17:00 2009 +0200 Bug 586851 – Transparent BMP files fail to load @@ -89624,7 +90457,7 @@ commit 4572cb9e74941330357f6872a50bca777677970d Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Jul 21 19:49:19 2009 +0200 +Date: Tue Jul 21 19:49:19 2009 +0200 app: Add the GimpToolEditor to preferences @@ -89636,7 +90469,7 @@ commit ce5cfe0f1c14ca44aad3024c31991cb79aae00ef Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Jul 21 23:51:21 2009 +0200 +Date: Tue Jul 21 23:51:21 2009 +0200 app: Rename gimptoolview.[ch] to gimptooleditor.[ch] @@ -89644,18 +90477,14 @@ file has already gone through this change, we do the file name change separately for better diffs. Part of fix for bug #500930. - app/widgets/Makefile.am | 4 +- - app/widgets/gimptooleditor.c | 416 - +++++++++++++++++++++++++++++++++++++++++++ - app/widgets/gimptooleditor.h | 58 ++++++ - app/widgets/gimptoolview.c | 416 - ------------------------------------------- - app/widgets/gimptoolview.h | 58 ------ - 5 files changed, 476 insertions(+), 476 deletions(-) + app/widgets/Makefile.am | 4 ++-- + app/widgets/{gimptoolview.c => gimptooleditor.c} | 2 +- + app/widgets/{gimptoolview.h => gimptooleditor.h} | 0 + 3 files changed, 3 insertions(+), 3 deletions(-) commit 450db18abb57f540889eb38f1c13297bedbd4c10 Author: Stephen Griffiths <scgmk5@gmail.com> -Date: Fri Jul 3 14:55:07 2009 +1000 +Date: Fri Jul 3 14:55:07 2009 +1000 app: Convert GimpToolView into a non-dockable GimpToolEditor @@ -89665,13 +90494,13 @@ app/widgets/gimptoolview.c | 441 ++++++++++++++++++++++++++++---------------- - app/widgets/gimptoolview.h | 51 +++-- - app/widgets/widgets-types.h | 2 +- + app/widgets/gimptoolview.h | 51 +++-- + app/widgets/widgets-types.h | 2 +- 3 files changed, 306 insertions(+), 188 deletions(-) commit c53113d0cca31f8a106791977363d6b0d34aa1e5 Author: Stephen Griffiths <scgmk5@gmail.com> -Date: Tue Jul 21 19:42:57 2009 +0200 +Date: Tue Jul 21 19:42:57 2009 +0200 app: Remove Tools dockable @@ -89679,23 +90508,23 @@ Toolbox page in preferences instead. This is part of the fix for bug #500930. - app/actions/dialogs-actions.c | 6 -- - app/actions/tools-actions.c | 82 -------------------- - app/actions/tools-commands.c | 152 + app/actions/dialogs-actions.c | 6 -- + app/actions/tools-actions.c | 82 -------------------- + app/actions/tools-commands.c | 152 ------------------------------------- - app/actions/tools-commands.h | 14 ---- + app/actions/tools-commands.h | 14 ---- app/dialogs/dialogs-constructors.c | 25 ------ - app/dialogs/dialogs-constructors.h | 6 -- - app/dialogs/dialogs.c | 2 - - app/menus/menus.c | 7 -- - menus/Makefile.am | 1 - - menus/dialogs-menuitems.xml | 1 - - menus/tools-menu.xml | 10 --- + app/dialogs/dialogs-constructors.h | 6 -- + app/dialogs/dialogs.c | 2 - + app/menus/menus.c | 7 -- + menus/Makefile.am | 1 - + menus/dialogs-menuitems.xml | 1 - + menus/tools-menu.xml | 10 --- 11 files changed, 306 deletions(-) commit 87f25f29d83266c1ed805fc3dd2802aee30bf246 Author: Sven Neumann <sven@gimp.org> -Date: Tue Jul 21 22:42:47 2009 +0200 +Date: Tue Jul 21 22:42:47 2009 +0200 Bug 589205 – help-browser uses deprecated (and sometimes broken) webkit call @@ -89707,33 +90536,33 @@ commit 4aa3d3f7b019a843ca6877843673067d118b1baf Author: Alexia Death <alexiadeath@gmail.com> -Date: Tue Jul 21 22:27:29 2009 +0300 +Date: Tue Jul 21 22:27:29 2009 +0300 Build fixes to the dynamics branch. it now builds. - app/paint/gimpairbrush.c | 22 +++++++++++----------- + app/paint/gimpairbrush.c | 22 +++++++++++----------- app/paint/gimpairbrushoptions.c | 8 ++++---- - app/paint/gimpbrushcore.c | 32 ++++++++++++++++---------------- - app/paint/gimpclone.c | 8 ++++---- - app/paint/gimpconvolve.c | 4 ++-- - app/paint/gimpdodgeburn.c | 8 ++++---- - app/paint/gimperaser.c | 8 ++++---- - app/paint/gimpheal.c | 8 ++++---- - app/paint/gimppaintbrush.c | 12 ++++++------ - app/paint/gimppaintoptions.c | 19 ++++++++++--------- - app/paint/gimpsmudge.c | 12 ++++++------ + app/paint/gimpbrushcore.c | 32 ++++++++++++++++---------------- + app/paint/gimpclone.c | 8 ++++---- + app/paint/gimpconvolve.c | 4 ++-- + app/paint/gimpdodgeburn.c | 8 ++++---- + app/paint/gimperaser.c | 8 ++++---- + app/paint/gimpheal.c | 8 ++++---- + app/paint/gimppaintbrush.c | 12 ++++++------ + app/paint/gimppaintoptions.c | 19 ++++++++++--------- + app/paint/gimpsmudge.c | 12 ++++++------ 11 files changed, 71 insertions(+), 70 deletions(-) commit 7cbf10b886f13e7e3b385d00549539634a831ed2 -Merge: daa3544 cabcc59 +Merge: daa3544379 cabcc592f0 Author: Alexia Death <alexiadeath@gmail.com> -Date: Tue Jul 21 21:17:37 2009 +0300 +Date: Tue Jul 21 21:17:37 2009 +0300 Merge branch 'master' into soc-2009-dynamics commit daa3544379d5f1035fb6628c746f556117c2ed92 Author: Alexia Death <alexiadeath@gmail.com> -Date: Tue Jul 21 20:13:45 2009 +0300 +Date: Tue Jul 21 20:13:45 2009 +0300 Merge master to dynamics branch @@ -89742,21 +90571,21 @@ 1 file changed, 251 insertions(+), 251 deletions(-) commit cea52220ea623a976e9a3183ce9da5909ea42357 -Merge: 8e0a214 e564cc2 +Merge: 8e0a214121 e564cc2e4e Author: Alexia Death <alexiadeath@gmail.com> -Date: Tue Jul 21 20:12:35 2009 +0300 +Date: Tue Jul 21 20:12:35 2009 +0300 Merge branch 'master' into soc-2009-dynamics Conflicts: - .gitignore - NEWS - app/widgets/gimptagpopup.c - po/ru.po + .gitignore + NEWS + app/widgets/gimptagpopup.c + po/ru.po commit cabcc592f03ff10bcdbc9c969c53f5c03603483a Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Jul 21 18:52:12 2009 +0200 +Date: Tue Jul 21 18:52:12 2009 +0200 Bug 582821 – 'Sphere Designer' does not reset correctly... @@ -89768,7 +90597,7 @@ commit 3801e20df8da2643ad5f4578daeb17840eff6841 Author: Barak Itkin <lightningismyname@gmail.com> -Date: Tue Jul 21 10:01:23 2009 +0300 +Date: Tue Jul 21 10:01:23 2009 +0300 Bug 582821 – 'Sphere Designer' does not reset correctly... @@ -89782,17 +90611,17 @@ commit d815fa32e70aad63e06c0963db791fe61a5489b0 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Jul 21 17:12:05 2009 +0200 +Date: Tue Jul 21 17:12:05 2009 +0200 Regenerate gimprc docs/gimprc.5.in | 14 -------------- - etc/gimprc | 12 ------------ + etc/gimprc | 12 ------------ 2 files changed, 26 deletions(-) commit f65905f083d72ad8c47d188f0ac2b1d0f477f340 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Jul 21 16:38:56 2009 +0200 +Date: Tue Jul 21 16:38:56 2009 +0200 app: Remove blurb for removed menu-mnemonics gimprc setting @@ -89802,7 +90631,7 @@ commit c6818c5710ac14f6826d62d04099758952a0ff6b Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Jul 21 16:38:00 2009 +0200 +Date: Tue Jul 21 16:38:00 2009 +0200 app: Remove transient-docks gimprc setting @@ -89811,61 +90640,61 @@ manager with the docks set to the 'Utility window' window hint. See discussion in bug #322577. - app/config/gimpguiconfig.c | 21 ++++++++---------- - app/config/gimpguiconfig.h | 1 - - app/config/gimprc-blurbs.h | 6 ----- + app/config/gimpguiconfig.c | 21 ++++++++---------- + app/config/gimpguiconfig.h | 1 - + app/config/gimprc-blurbs.h | 6 ----- app/dialogs/preferences-dialog.c | 7 ------ - app/widgets/gimpimagedock.c | 47 + app/widgets/gimpimagedock.c | 47 ---------------------------------------- 5 files changed, 9 insertions(+), 73 deletions(-) commit 19fe919dcea79d5b5693c5e5688ec0209dcea6a6 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Jul 21 14:10:29 2009 +0200 +Date: Tue Jul 21 14:10:29 2009 +0200 plug-ins: Port file plug-ins to new export API - plug-ins/common/file-aa.c | 20 +++----------------- - plug-ins/common/file-cel.c | 2 +- + plug-ins/common/file-aa.c | 20 +++----------------- + plug-ins/common/file-cel.c | 2 +- plug-ins/common/file-csource.c | 20 +++----------------- - plug-ins/common/file-dicom.c | 2 +- - plug-ins/common/file-gbr.c | 20 +++----------------- + plug-ins/common/file-dicom.c | 2 +- + plug-ins/common/file-gbr.c | 20 +++----------------- plug-ins/common/file-gif-save.c | 20 +++----------------- - plug-ins/common/file-gih.c | 20 +++----------------- - plug-ins/common/file-header.c | 2 +- + plug-ins/common/file-gih.c | 20 +++----------------- + plug-ins/common/file-header.c | 2 +- plug-ins/common/file-html-table.c | 18 ++---------------- - plug-ins/common/file-mng.c | 20 +++----------------- - plug-ins/common/file-pat.c | 20 +++----------------- - plug-ins/common/file-pcx.c | 2 +- - plug-ins/common/file-pix.c | 2 +- - plug-ins/common/file-png.c | 20 +++----------------- - plug-ins/common/file-pnm.c | 26 ++++++-------------------- - plug-ins/common/file-ps.c | 21 +++------------------ - plug-ins/common/file-psp.c | 20 +++----------------- - plug-ins/common/file-raw.c | 18 ++---------------- - plug-ins/common/file-sunras.c | 20 +++----------------- - plug-ins/common/file-tga.c | 20 +++----------------- + plug-ins/common/file-mng.c | 20 +++----------------- + plug-ins/common/file-pat.c | 20 +++----------------- + plug-ins/common/file-pcx.c | 2 +- + plug-ins/common/file-pix.c | 2 +- + plug-ins/common/file-png.c | 20 +++----------------- + plug-ins/common/file-pnm.c | 26 ++++++-------------------- + plug-ins/common/file-ps.c | 21 +++------------------ + plug-ins/common/file-psp.c | 20 +++----------------- + plug-ins/common/file-raw.c | 18 ++---------------- + plug-ins/common/file-sunras.c | 20 +++----------------- + plug-ins/common/file-tga.c | 20 +++----------------- plug-ins/common/file-tiff-save.c | 20 +++----------------- - plug-ins/common/file-xbm.c | 20 +++----------------- - plug-ins/common/file-xmc.c | 21 +++------------------ - plug-ins/common/file-xpm.c | 20 +++----------------- - plug-ins/common/file-xwd.c | 2 +- - plug-ins/file-bmp/bmp-write.c | 18 ++---------------- - plug-ins/file-bmp/bmp.c | 3 +-- - plug-ins/file-fits/fits.c | 2 +- - plug-ins/file-fli/fli-gimp.c | 20 +++----------------- + plug-ins/common/file-xbm.c | 20 +++----------------- + plug-ins/common/file-xmc.c | 21 +++------------------ + plug-ins/common/file-xpm.c | 20 +++----------------- + plug-ins/common/file-xwd.c | 2 +- + plug-ins/file-bmp/bmp-write.c | 18 ++---------------- + plug-ins/file-bmp/bmp.c | 3 +-- + plug-ins/file-fits/fits.c | 2 +- + plug-ins/file-fli/fli-gimp.c | 20 +++----------------- plug-ins/file-ico/ico-dialog.c | 20 ++++---------------- plug-ins/file-jpeg/jpeg-save.c | 19 +++---------------- - plug-ins/file-jpeg/jpeg.c | 2 +- - plug-ins/file-psd/psd-save.c | 2 +- - plug-ins/file-psd/psd.c | 2 +- - plug-ins/file-sgi/sgi.c | 20 +++----------------- - plug-ins/file-xjt/xjt.c | 18 ++---------------- + plug-ins/file-jpeg/jpeg.c | 2 +- + plug-ins/file-psd/psd-save.c | 2 +- + plug-ins/file-psd/psd.c | 2 +- + plug-ins/file-sgi/sgi.c | 20 +++----------------- + plug-ins/file-xjt/xjt.c | 18 ++---------------- 36 files changed, 86 insertions(+), 436 deletions(-) commit 8cd7f148d6bb63dfa6164984b328c628f7d9b274 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Wed Jul 15 12:12:13 2009 +0200 +Date: Wed Jul 15 12:12:13 2009 +0200 libgimp: Add export dialog API @@ -89881,7 +90710,7 @@ commit 9956fb5348596820318cbccaf6aafb6b39efff9e Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Jul 21 12:44:13 2009 +0200 +Date: Tue Jul 21 12:44:13 2009 +0200 libgimp: Clarify semantics of gimp_export_image() without format_name @@ -89890,21 +90719,21 @@ commit 8e0a214121a62293f23f92f4ed61d2332923727b Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Sun Jul 5 15:03:34 2009 -0300 +Date: Sun Jul 5 15:03:34 2009 -0300 Write dynamics objects separately. Needs debug. app/paint/gimpdynamicsoptions.c | 1647 --------------------------------------- app/paint/gimpdynamicsoptions.h | 117 --- - app/paint/gimppaintoptions.c | 1517 + app/paint/gimppaintoptions.c | 1517 +----------------------------------- - app/paint/gimppaintoptions.h | 53 -- + app/paint/gimppaintoptions.h | 53 -- 4 files changed, 4 insertions(+), 3330 deletions(-) commit c86b393e89a8fca42ffd11b04a9e7848d599ab43 Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Sun Jul 5 14:58:26 2009 -0300 +Date: Sun Jul 5 14:58:26 2009 -0300 Remove fading from core-types.h. @@ -89913,7 +90742,7 @@ commit 0bc13bb4a1acc21e3d2e18785160dd9fa502550f Author: zhenfeng <zhzzf_0808@hotmail.com> -Date: Wed Jun 17 17:17:49 2009 -0300 +Date: Wed Jun 17 17:17:49 2009 -0300 Fade dynamics. Added fade as one more dynamics driving factor on GUI. Implemented fading dynamics calculation. @@ -89921,32 +90750,32 @@ to get_dynamic_x. Adjusted function calls for get_dynamic_x. - * app/paint/gimppaintoptions.c: Added initialization for - fading dynamics. + * app/paint/gimppaintoptions.c: Added initialization for + fading dynamics. : Added fading related variables similar to Random. : Adjusted get_dynamics_mix function. : Added fading calculation in get_dynamics_x functions. : Adjusted get_dynamic_x functions for fade dynamics. - * app/paint/gimppaintoptions.h: Added fading_options in - GimpDynamicOptions. + * app/paint/gimppaintoptions.h: Added fading_options in + GimpDynamicOptions. - * app/tools/gimppaintoptions-gui.c: Added the function - fading_options_gui. + * app/tools/gimppaintoptions-gui.c: Added the function + fading_options_gui. - * app/core/core-types.h: Added fading as the extra point in - Gimpcoords. + * app/core/core-types.h: Added fading as the extra point + in Gimpcoords. (not quite sure if it is correct.) - * app/paint/gimpclone.c - * app/paint/gimpdodgeburn.c - * app/paint/gimperaser.c - * app/paint/gimpheal.c - * app/paint/gimppaintbrush.c - * app/paint/gimpsmudge.c - * app/paint/gimpairbrush.c - * app/paint/gimpbrushcore.c - * app/paint/gimpconvolve.c:Adjusted function calls. + * app/paint/gimpclone.c + * app/paint/gimpdodgeburn.c + * app/paint/gimperaser.c + * app/paint/gimpheal.c + * app/paint/gimppaintbrush.c + * app/paint/gimpsmudge.c + * app/paint/gimpairbrush.c + * app/paint/gimpbrushcore.c + * app/paint/gimpconvolve.c:Adjusted function calls. get_dynamic_opacity function calls were adjusted to have one more parameter, paint_core->pixel_dist. @@ -89955,13 +90784,13 @@ pixel_dist paint_core->pixel_dist - .gitignore | 11 ----------- + .gitignore | 11 ----------- app/core/core-types.h | 1 + 2 files changed, 1 insertion(+), 11 deletions(-) commit 03e9d6de7178d20e7192887acae56ec73da643c2 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon Jul 20 22:10:16 2009 +0200 +Date: Mon Jul 20 22:10:16 2009 +0200 Fix more g_mapped_file_free() warnings @@ -89971,7 +90800,7 @@ commit c78f7d1382ed1b717a7168a883f6ecb1455aa6bf Author: Massimo Valentini <sixtysix@inwind.it> -Date: Mon Jul 20 23:04:41 2009 +0200 +Date: Mon Jul 20 23:04:41 2009 +0200 Bug 570353 – first time open of .svg file ignores the requested units @@ -89984,7 +90813,7 @@ commit e0f21468d4f6d887a8f0f26baee6da59abe59618 Author: Massimo Valentini <sixtysix@inwind.it> -Date: Mon Jul 20 22:55:43 2009 +0200 +Date: Mon Jul 20 22:55:43 2009 +0200 Bug 555777 – Export to MNG animation fails @@ -90008,7 +90837,7 @@ commit 580b932c8c4b60ab257ebe73be43441cb4ee2958 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon Jul 20 17:46:07 2009 +0200 +Date: Mon Jul 20 17:46:07 2009 +0200 po: Update POTFILES.in @@ -90017,7 +90846,7 @@ commit b28b0e4687a5cdc60d31871abc3ff3583ba78a2c Author: Massimo Valentini <sixtysix@inwind.it> -Date: Mon Jul 20 14:59:29 2009 +0200 +Date: Mon Jul 20 14:59:29 2009 +0200 Bug 493778 – metadata plug-in crashes on some images @@ -90038,18 +90867,18 @@ commit cfbcdbd207cec95c59cedfd5145f702a3b1a203a Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon Jul 20 11:01:56 2009 +0200 +Date: Mon Jul 20 11:01:56 2009 +0200 app: Add WM debug output app/display/gimpdisplayshell.c | 17 ++++++++++++++++- app/widgets/gimpdialogfactory.c | 8 ++++++++ - app/widgets/gimpimagedock.c | 10 ++++++++++ + app/widgets/gimpimagedock.c | 10 ++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) commit 6318349bf862686a4f7204fa33852fb8ccbc0c1c Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon Jul 20 09:32:53 2009 +0200 +Date: Mon Jul 20 09:32:53 2009 +0200 app: Add GIMP_LOG_WM @@ -90062,7 +90891,7 @@ commit 1c0dea5772ddb9649b420fc392866205ac4eef37 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon Jul 20 13:14:09 2009 +0200 +Date: Mon Jul 20 13:14:09 2009 +0200 app: Use gtk_window_set_title() instead of gdk_window_set_title() @@ -90072,12 +90901,12 @@ project. app/display/gimpdisplayshell-progress.c | 9 +++------ - app/display/gimpdisplayshell-title.c | 6 ++---- + app/display/gimpdisplayshell-title.c | 6 ++---- 2 files changed, 5 insertions(+), 10 deletions(-) commit bacc1361cc6a0caab7d4ac571399431742b9ab47 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon Jul 20 10:48:45 2009 +0200 +Date: Mon Jul 20 10:48:45 2009 +0200 Update Swedish translation of default tags @@ -90086,7 +90915,7 @@ commit 37aca17f3dbf27c829707132e208fb37245cba09 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon Jul 20 10:45:46 2009 +0200 +Date: Mon Jul 20 10:45:46 2009 +0200 data: Change default 'circle' tag to 'round' @@ -90099,27 +90928,27 @@ commit 5ad570e3ccff7aabe20be4f8f457c907b58ac64a Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon Jul 20 12:39:09 2009 +0200 +Date: Mon Jul 20 12:39:09 2009 +0200 Fix compilation errors Fix compilation errors with obvious fixes. app/core/gimp-transform-resize.c | 6 ++++++ - app/core/gimpgradient-load.c | 8 ++++++-- - libgimpconfig/gimpscanner.c | 4 ++++ - plug-ins/common/file-wmf.c | 4 ++++ - plug-ins/common/lcms.c | 4 ++++ - plug-ins/common/mail.c | 4 ++++ + app/core/gimpgradient-load.c | 8 ++++++-- + libgimpconfig/gimpscanner.c | 4 ++++ + plug-ins/common/file-wmf.c | 4 ++++ + plug-ins/common/lcms.c | 4 ++++ + plug-ins/common/mail.c | 4 ++++ plug-ins/file-jpeg/jpeg-exif.c | 4 ++++ - plug-ins/flame/libifs.c | 37 + plug-ins/flame/libifs.c | 37 ------------------------------------- - plug-ins/flame/libifs.h | 1 - + plug-ins/flame/libifs.h | 1 - 9 files changed, 32 insertions(+), 40 deletions(-) commit b2b2b41e62644882fda64fcd63d17d5a78d9a428 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon Jul 20 11:53:02 2009 +0200 +Date: Mon Jul 20 11:53:02 2009 +0200 Get rid of artificial compiler warnings @@ -90127,31 +90956,31 @@ directive. They pollute the build output and don't work as incentives for fixing stuff. - app/actions/palettes-commands.c | 4 +--- - app/core/gimpcurve.c | 4 +--- - app/core/gimpdrawable-curves.c | 4 +--- - app/core/gimpdrawable.c | 12 +++--------- - app/core/gimpimagemap.c | 6 ------ - app/core/gimplayer.c | 4 +--- - app/core/gimpparamspecs-duplicate.c | 4 +--- - app/core/gimpparamspecs.c | 4 +--- - app/dialogs/quit-dialog.c | 4 +--- - app/gegl/gimpdesaturateconfig.c | 4 +--- - app/widgets/gimpcolormapeditor.c | 4 +--- - app/widgets/gimpdialogfactory.c | 4 +--- - app/widgets/gimpselectioneditor.c | 4 +--- - app/widgets/gimptoolbox.c | 4 +--- - app/widgets/gimpuimanager.c | 4 +--- - libgimpwidgets/gimpoldwidgets.c | 1 + - plug-ins/common/gradient-map.c | 4 +--- - plug-ins/file-xjt/xjt.c | 4 +--- - plug-ins/flame/flame.c | 4 +--- + app/actions/palettes-commands.c | 4 +--- + app/core/gimpcurve.c | 4 +--- + app/core/gimpdrawable-curves.c | 4 +--- + app/core/gimpdrawable.c | 12 +++--------- + app/core/gimpimagemap.c | 6 ------ + app/core/gimplayer.c | 4 +--- + app/core/gimpparamspecs-duplicate.c | 4 +--- + app/core/gimpparamspecs.c | 4 +--- + app/dialogs/quit-dialog.c | 4 +--- + app/gegl/gimpdesaturateconfig.c | 4 +--- + app/widgets/gimpcolormapeditor.c | 4 +--- + app/widgets/gimpdialogfactory.c | 4 +--- + app/widgets/gimpselectioneditor.c | 4 +--- + app/widgets/gimptoolbox.c | 4 +--- + app/widgets/gimpuimanager.c | 4 +--- + libgimpwidgets/gimpoldwidgets.c | 1 + + plug-ins/common/gradient-map.c | 4 +--- + plug-ins/file-xjt/xjt.c | 4 +--- + plug-ins/flame/flame.c | 4 +--- plug-ins/gradient-flare/gradient-flare.c | 4 +--- 20 files changed, 21 insertions(+), 66 deletions(-) commit e564cc2e4e921b87251f1ccd162170e23d822a4b Author: Michael Natterer <mitch@gimp.org> -Date: Sat Jul 18 19:57:10 2009 +0200 +Date: Sat Jul 18 19:57:10 2009 +0200 Fix motion event processing on the tag popup's scroll arrows @@ -90163,7 +90992,7 @@ commit 20aa60ac8ca8cc688ebbb8d18203da0d27bbcf7b Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Jul 18 19:55:07 2009 +0200 +Date: Sat Jul 18 19:55:07 2009 +0200 app: Fix a free cell renderer for GimpLanguageEntry @@ -90176,7 +91005,7 @@ commit 84fd35d83232584256381850f5d65537a9b66094 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Jul 18 19:34:42 2009 +0200 +Date: Sat Jul 18 19:34:42 2009 +0200 Connect to widget signals in init() instead of constructor() @@ -90185,7 +91014,7 @@ commit 48a8b89bea825311d5fe82336c4b4f59ef299736 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Jul 18 19:31:21 2009 +0200 +Date: Sat Jul 18 19:31:21 2009 +0200 Only redraw the affected tags when prelight changes, not the entire widget @@ -90195,7 +91024,7 @@ commit 5d76dd9bc50f21fad20496324e02eb6eea1f87e1 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Jul 18 19:23:26 2009 +0200 +Date: Sat Jul 18 19:23:26 2009 +0200 Fix unprelighting of the prelighted tag when there is no hit on any tag @@ -90205,18 +91034,18 @@ commit 24209f7625e3e34ffc662e5b5c42678a18e153da Author: Michael Natterer <mitch@gimp.org> -Date: Sat Jul 18 18:57:15 2009 +0200 +Date: Sat Jul 18 18:57:15 2009 +0200 Use g_value_dup_object() inatead of g_value_get_object() and g_object_ref() app/core/gimpfilteredcontainer.c | 3 +-- - app/widgets/gimptagpopup.c | 3 +-- + app/widgets/gimptagpopup.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) commit 6fd729cfb691cf2b0f6b9e1b9febea38711bfe41 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Jul 18 17:51:04 2009 +0200 +Date: Sat Jul 18 17:51:04 2009 +0200 Remove the possibility to disable mnemonics (bug #120034) @@ -90234,20 +91063,20 @@ * app/actions/actions.c: bye bye glue code. - app/actions/actions.c | 10 +---- - app/config/gimpguiconfig.c | 20 ++++----- - app/config/gimpguiconfig.h | 1 - + app/actions/actions.c | 10 +---- + app/config/gimpguiconfig.c | 20 ++++----- + app/config/gimpguiconfig.h | 1 - app/dialogs/preferences-dialog.c | 3 -- app/widgets/gimpactionfactory.c | 7 +-- app/widgets/gimpactionfactory.h | 5 +-- - app/widgets/gimpactiongroup.c | 93 + app/widgets/gimpactiongroup.c | 93 +++++++--------------------------------- - app/widgets/gimpactiongroup.h | 2 - + app/widgets/gimpactiongroup.h | 2 - 8 files changed, 28 insertions(+), 113 deletions(-) commit 0d81ce97177c10c8aee1f6b1d4addb1f5429eb2a Author: Michael Natterer <mitch@gimp.org> -Date: Sat Jul 18 16:59:43 2009 +0200 +Date: Sat Jul 18 16:59:43 2009 +0200 Bug 446171 – select content by click on layer icon @@ -90269,7 +91098,7 @@ commit 99ce3bd8b27bd0b71f4c95d4eea4a2c69c090b37 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Jul 18 09:37:46 2009 +0200 +Date: Sat Jul 18 09:37:46 2009 +0200 Bug 120563 – Add an easy way to use the default comment @@ -90283,7 +91112,7 @@ commit cb4aec187f436f20fa348f6cd264c3b9701e1e96 Author: Sven Neumann <sven@gimp.org> -Date: Thu Jul 16 22:37:09 2009 +0200 +Date: Thu Jul 16 22:37:09 2009 +0200 Update license to LGPL version 3 here as well. @@ -90292,7 +91121,7 @@ commit 65c21b6bc3eb1455cbd7f890b568d3504f7250f4 Author: Massimo Valentini <sixtysix@inwind.it> -Date: Thu Jul 16 22:24:59 2009 +0200 +Date: Thu Jul 16 22:24:59 2009 +0200 Bug 567466 – PNG comment not found if more than 1 tEXt chunks @@ -90304,7 +91133,7 @@ commit 48a6b0c59cbdfc07e904d7b000776b2ccc55504c Author: Massimo Valentini <sixtysix@inwind.it> -Date: Thu Jul 16 22:21:40 2009 +0200 +Date: Thu Jul 16 22:21:40 2009 +0200 Bug 585665 – Exporting to PSD with a blank text layer creates a corrupt file @@ -90316,17 +91145,17 @@ commit fc66ca5169aea63c0f52ff799511c644c4661eba Author: Mason Thomas <mason_thomas@hotmail.com> -Date: Wed Jul 15 22:50:06 2009 -0700 +Date: Wed Jul 15 22:50:06 2009 -0700 Clamp levels after input changes applied. - app/base/levels.c | 8 ++++---- + app/base/levels.c | 8 ++++---- app/gegl/gimpoperationlevels.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) commit b6f574ab38e6ea80f3d7f3123bb2dd60e7af66db Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Jul 16 20:16:07 2009 +0200 +Date: Thu Jul 16 20:16:07 2009 +0200 POTFILES.skip data/tags @@ -90334,25 +91163,25 @@ po-plug-ins/POTFILES.skip | 1 + po-python/POTFILES.skip | 1 + po-script-fu/POTFILES.skip | 1 + - po-tips/POTFILES.skip | 1 + - po/POTFILES.skip | 1 + + po-tips/POTFILES.skip | 1 + + po/POTFILES.skip | 1 + 6 files changed, 6 insertions(+) commit 7d7c053ae16085bb6294a4f7698ff3cf4b30602f Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Jul 16 19:39:06 2009 +0200 +Date: Thu Jul 16 19:39:06 2009 +0200 po-tags: Add Swedish translation of default tags - po-tags/.gitignore | 1 + - po-tags/LINGUAS | 3 +++ - po-tags/POTFILES.in | 6 ++++++ - po-tags/sv.po | 23 +++++++++++++++++++++++ + po-tags/.gitignore | 1 + + po-tags/LINGUAS | 3 +++ + po-tags/POTFILES.in | 6 ++++++ + po-tags/sv.po | 23 +++++++++++++++++++++++ 4 files changed, 33 insertions(+) commit b604553bbe8df5d7ce94a19e4e49820c398aa62e Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Jul 16 19:15:41 2009 +0200 +Date: Thu Jul 16 19:15:41 2009 +0200 data: Add translatable default tags on some brushes @@ -90362,7 +91191,7 @@ commit 93f664f429ebc24236d7aeebd2ae0fa7bb1140f8 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Jul 16 19:14:44 2009 +0200 +Date: Thu Jul 16 19:14:44 2009 +0200 data: Fix tags intltool-merge paths @@ -90371,7 +91200,7 @@ commit aa7c1d326761c99d7439df96fb97bbcf9c6c8182 Author: Alexandre Prokoudine <alexandre.prokoudine@gmail.com> -Date: Thu Jul 16 19:26:37 2009 +0400 +Date: Thu Jul 16 19:26:37 2009 +0400 Updated Russian translation @@ -90381,7 +91210,7 @@ commit 07dcd8ce107b505735c5a5a72317da69feb797b4 Author: Alexandre Prokoudine <alexandre.prokoudine@gmail.com> -Date: Thu Jul 16 17:48:22 2009 +0400 +Date: Thu Jul 16 17:48:22 2009 +0400 Updated Russian translation @@ -90391,7 +91220,7 @@ commit f455e5c56e359bf33a929552137b297b87788dda Author: Martin Nordholts <martinn@src.gnome.org> -Date: Wed Jul 15 21:26:23 2009 +0200 +Date: Wed Jul 15 21:26:23 2009 +0200 Add 'General' section to NEWS @@ -90400,224 +91229,224 @@ commit e805cb0cf4177ad11cde0119347ffe952e8797a2 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Jul 15 18:57:12 2009 +0200 +Date: Wed Jul 15 18:57:12 2009 +0200 Use gtk_dialog_get_content_area() instead of dialog->vbox - plug-ins/color-rotate/color-rotate-dialog.c | 4 ++-- - plug-ins/common/alien-map.c | 3 ++- - plug-ins/common/align-layers.c | 4 ++-- - plug-ins/common/apply-canvas.c | 3 ++- - plug-ins/common/blinds.c | 3 ++- - plug-ins/common/blur-gauss-selective.c | 3 ++- - plug-ins/common/blur-gauss.c | 3 ++- - plug-ins/common/blur-motion.c | 3 ++- - plug-ins/common/border-average.c | 3 ++- - plug-ins/common/bump-map.c | 3 ++- - plug-ins/common/cartoon.c | 3 ++- - plug-ins/common/channel-mixer.c | 3 ++- - plug-ins/common/checkerboard.c | 3 ++- - plug-ins/common/cml-explorer.c | 8 ++++---- - plug-ins/common/color-cube-analyze.c | 4 ++-- - plug-ins/common/color-exchange.c | 3 ++- - plug-ins/common/color-to-alpha.c | 3 ++- - plug-ins/common/colorify.c | 3 ++- - plug-ins/common/colormap-remap.c | 3 ++- - plug-ins/common/compose.c | 3 ++- - plug-ins/common/contrast-retinex.c | 3 ++- - plug-ins/common/convolution-matrix.c | 3 ++- - plug-ins/common/cubism.c | 3 ++- - plug-ins/common/curve-bend.c | 3 ++- - plug-ins/common/decompose.c | 4 ++-- - plug-ins/common/deinterlace.c | 3 ++- - plug-ins/common/depth-merge.c | 2 +- - plug-ins/common/despeckle.c | 3 ++- - plug-ins/common/destripe.c | 3 ++- - plug-ins/common/diffraction.c | 4 ++-- - plug-ins/common/displace.c | 3 ++- - plug-ins/common/edge-dog.c | 3 ++- - plug-ins/common/edge-neon.c | 3 ++- - plug-ins/common/edge-sobel.c | 3 ++- - plug-ins/common/edge.c | 3 ++- - plug-ins/common/emboss.c | 3 ++- - plug-ins/common/engrave.c | 3 ++- - plug-ins/common/file-aa.c | 2 +- - plug-ins/common/file-csource.c | 3 ++- - plug-ins/common/file-gbr.c | 3 ++- - plug-ins/common/file-gif-save.c | 3 ++- - plug-ins/common/file-gih.c | 3 ++- - plug-ins/common/file-html-table.c | 4 ++-- - plug-ins/common/file-mng.c | 3 ++- - plug-ins/common/file-pat.c | 3 ++- - plug-ins/common/file-pdf.c | 3 ++- - plug-ins/common/file-png.c | 2 +- - plug-ins/common/file-pnm.c | 2 +- - plug-ins/common/file-ps.c | 8 ++++---- - plug-ins/common/file-psp.c | 2 +- - plug-ins/common/file-raw.c | 7 ++++--- - plug-ins/common/file-sunras.c | 2 +- - plug-ins/common/file-svg.c | 4 ++-- - plug-ins/common/file-tga.c | 2 +- - plug-ins/common/file-tiff-load.c | 3 ++- - plug-ins/common/file-tiff-save.c | 2 +- - plug-ins/common/file-wmf.c | 4 ++-- - plug-ins/common/file-xbm.c | 2 +- - plug-ins/common/file-xmc.c | 2 +- - plug-ins/common/file-xpm.c | 2 +- - plug-ins/common/film.c | 3 ++- - plug-ins/common/filter-pack.c | 3 ++- - plug-ins/common/fractal-trace.c | 3 ++- - plug-ins/common/gee-zoom.c | 2 +- - plug-ins/common/gee.c | 2 +- - plug-ins/common/grid.c | 3 ++- - plug-ins/common/hot.c | 3 ++- - plug-ins/common/illusion.c | 3 ++- - plug-ins/common/iwarp.c | 4 ++-- - plug-ins/common/jigsaw.c | 3 ++- - plug-ins/common/lcms.c | 6 ++++-- - plug-ins/common/lens-apply.c | 3 ++- - plug-ins/common/lens-distortion.c | 3 ++- - plug-ins/common/lens-flare.c | 3 ++- - plug-ins/common/mail.c | 2 +- - plug-ins/common/max-rgb.c | 3 ++- - plug-ins/common/mosaic.c | 3 ++- - plug-ins/common/newsprint.c | 3 ++- - plug-ins/common/nl-filter.c | 3 ++- - plug-ins/common/noise-hsv.c | 3 ++- - plug-ins/common/noise-randomize.c | 3 ++- - plug-ins/common/noise-rgb.c | 3 ++- - plug-ins/common/noise-solid.c | 3 ++- - plug-ins/common/noise-spread.c | 3 ++- - plug-ins/common/nova.c | 3 ++- - plug-ins/common/oilify.c | 3 ++- - plug-ins/common/photocopy.c | 3 ++- - plug-ins/common/pixelize.c | 3 ++- - plug-ins/common/plasma.c | 3 ++- - plug-ins/common/plugin-browser.c | 2 +- - plug-ins/common/polar-coords.c | 3 ++- - plug-ins/common/qbist.c | 4 ++-- - plug-ins/common/red-eye-removal.c | 3 ++- - plug-ins/common/ripple.c | 3 ++- - plug-ins/common/sample-colorize.c | 2 +- - plug-ins/common/screenshot.c | 4 ++-- - plug-ins/common/sharpen.c | 3 ++- - plug-ins/common/shift.c | 3 ++- - plug-ins/common/sinus.c | 4 ++-- - plug-ins/common/smooth-palette.c | 5 +++-- - plug-ins/common/softglow.c | 3 ++- - plug-ins/common/sparkle.c | 3 ++- - plug-ins/common/sphere-designer.c | 3 ++- - plug-ins/common/threshold-alpha.c | 3 ++- - plug-ins/common/tile-glass.c | 3 ++- - plug-ins/common/tile-paper.c | 3 ++- - plug-ins/common/tile-small.c | 4 ++-- - plug-ins/common/tile.c | 3 ++- - plug-ins/common/unit-editor.c | 10 +++++----- - plug-ins/common/unsharp-mask.c | 3 ++- - plug-ins/common/value-propagate.c | 3 ++- - plug-ins/common/van-gogh-lic.c | 3 ++- - plug-ins/common/video.c | 3 ++- - plug-ins/common/warp.c | 3 ++- - plug-ins/common/waves.c | 3 ++- - plug-ins/common/whirl-pinch.c | 3 ++- - plug-ins/common/wind.c | 3 ++- - plug-ins/file-bmp/bmp-write.c | 3 ++- - plug-ins/file-fits/fits.c | 4 ++-- - plug-ins/file-fli/fli-gimp.c | 8 ++++---- - plug-ins/file-ico/ico-dialog.c | 4 ++-- - plug-ins/file-jpeg/jpeg-exif.c | 2 +- - plug-ins/file-jpeg/jpeg-save.c | 6 ++++-- - plug-ins/file-sgi/sgi.c | 2 +- - plug-ins/file-xjt/xjt.c | 3 ++- - plug-ins/flame/flame.c | 8 ++++---- + plug-ins/color-rotate/color-rotate-dialog.c | 4 ++-- + plug-ins/common/alien-map.c | 3 ++- + plug-ins/common/align-layers.c | 4 ++-- + plug-ins/common/apply-canvas.c | 3 ++- + plug-ins/common/blinds.c | 3 ++- + plug-ins/common/blur-gauss-selective.c | 3 ++- + plug-ins/common/blur-gauss.c | 3 ++- + plug-ins/common/blur-motion.c | 3 ++- + plug-ins/common/border-average.c | 3 ++- + plug-ins/common/bump-map.c | 3 ++- + plug-ins/common/cartoon.c | 3 ++- + plug-ins/common/channel-mixer.c | 3 ++- + plug-ins/common/checkerboard.c | 3 ++- + plug-ins/common/cml-explorer.c | 8 ++++---- + plug-ins/common/color-cube-analyze.c | 4 ++-- + plug-ins/common/color-exchange.c | 3 ++- + plug-ins/common/color-to-alpha.c | 3 ++- + plug-ins/common/colorify.c | 3 ++- + plug-ins/common/colormap-remap.c | 3 ++- + plug-ins/common/compose.c | 3 ++- + plug-ins/common/contrast-retinex.c | 3 ++- + plug-ins/common/convolution-matrix.c | 3 ++- + plug-ins/common/cubism.c | 3 ++- + plug-ins/common/curve-bend.c | 3 ++- + plug-ins/common/decompose.c | 4 ++-- + plug-ins/common/deinterlace.c | 3 ++- + plug-ins/common/depth-merge.c | 2 +- + plug-ins/common/despeckle.c | 3 ++- + plug-ins/common/destripe.c | 3 ++- + plug-ins/common/diffraction.c | 4 ++-- + plug-ins/common/displace.c | 3 ++- + plug-ins/common/edge-dog.c | 3 ++- + plug-ins/common/edge-neon.c | 3 ++- + plug-ins/common/edge-sobel.c | 3 ++- + plug-ins/common/edge.c | 3 ++- + plug-ins/common/emboss.c | 3 ++- + plug-ins/common/engrave.c | 3 ++- + plug-ins/common/file-aa.c | 2 +- + plug-ins/common/file-csource.c | 3 ++- + plug-ins/common/file-gbr.c | 3 ++- + plug-ins/common/file-gif-save.c | 3 ++- + plug-ins/common/file-gih.c | 3 ++- + plug-ins/common/file-html-table.c | 4 ++-- + plug-ins/common/file-mng.c | 3 ++- + plug-ins/common/file-pat.c | 3 ++- + plug-ins/common/file-pdf.c | 3 ++- + plug-ins/common/file-png.c | 2 +- + plug-ins/common/file-pnm.c | 2 +- + plug-ins/common/file-ps.c | 8 ++++---- + plug-ins/common/file-psp.c | 2 +- + plug-ins/common/file-raw.c | 7 ++++--- + plug-ins/common/file-sunras.c | 2 +- + plug-ins/common/file-svg.c | 4 ++-- + plug-ins/common/file-tga.c | 2 +- + plug-ins/common/file-tiff-load.c | 3 ++- + plug-ins/common/file-tiff-save.c | 2 +- + plug-ins/common/file-wmf.c | 4 ++-- + plug-ins/common/file-xbm.c | 2 +- + plug-ins/common/file-xmc.c | 2 +- + plug-ins/common/file-xpm.c | 2 +- + plug-ins/common/film.c | 3 ++- + plug-ins/common/filter-pack.c | 3 ++- + plug-ins/common/fractal-trace.c | 3 ++- + plug-ins/common/gee-zoom.c | 2 +- + plug-ins/common/gee.c | 2 +- + plug-ins/common/grid.c | 3 ++- + plug-ins/common/hot.c | 3 ++- + plug-ins/common/illusion.c | 3 ++- + plug-ins/common/iwarp.c | 4 ++-- + plug-ins/common/jigsaw.c | 3 ++- + plug-ins/common/lcms.c | 6 ++++-- + plug-ins/common/lens-apply.c | 3 ++- + plug-ins/common/lens-distortion.c | 3 ++- + plug-ins/common/lens-flare.c | 3 ++- + plug-ins/common/mail.c | 2 +- + plug-ins/common/max-rgb.c | 3 ++- + plug-ins/common/mosaic.c | 3 ++- + plug-ins/common/newsprint.c | 3 ++- + plug-ins/common/nl-filter.c | 3 ++- + plug-ins/common/noise-hsv.c | 3 ++- + plug-ins/common/noise-randomize.c | 3 ++- + plug-ins/common/noise-rgb.c | 3 ++- + plug-ins/common/noise-solid.c | 3 ++- + plug-ins/common/noise-spread.c | 3 ++- + plug-ins/common/nova.c | 3 ++- + plug-ins/common/oilify.c | 3 ++- + plug-ins/common/photocopy.c | 3 ++- + plug-ins/common/pixelize.c | 3 ++- + plug-ins/common/plasma.c | 3 ++- + plug-ins/common/plugin-browser.c | 2 +- + plug-ins/common/polar-coords.c | 3 ++- + plug-ins/common/qbist.c | 4 ++-- + plug-ins/common/red-eye-removal.c | 3 ++- + plug-ins/common/ripple.c | 3 ++- + plug-ins/common/sample-colorize.c | 2 +- + plug-ins/common/screenshot.c | 4 ++-- + plug-ins/common/sharpen.c | 3 ++- + plug-ins/common/shift.c | 3 ++- + plug-ins/common/sinus.c | 4 ++-- + plug-ins/common/smooth-palette.c | 5 +++-- + plug-ins/common/softglow.c | 3 ++- + plug-ins/common/sparkle.c | 3 ++- + plug-ins/common/sphere-designer.c | 3 ++- + plug-ins/common/threshold-alpha.c | 3 ++- + plug-ins/common/tile-glass.c | 3 ++- + plug-ins/common/tile-paper.c | 3 ++- + plug-ins/common/tile-small.c | 4 ++-- + plug-ins/common/tile.c | 3 ++- + plug-ins/common/unit-editor.c | 10 +++++----- + plug-ins/common/unsharp-mask.c | 3 ++- + plug-ins/common/value-propagate.c | 3 ++- + plug-ins/common/van-gogh-lic.c | 3 ++- + plug-ins/common/video.c | 3 ++- + plug-ins/common/warp.c | 3 ++- + plug-ins/common/waves.c | 3 ++- + plug-ins/common/whirl-pinch.c | 3 ++- + plug-ins/common/wind.c | 3 ++- + plug-ins/file-bmp/bmp-write.c | 3 ++- + plug-ins/file-fits/fits.c | 4 ++-- + plug-ins/file-fli/fli-gimp.c | 8 ++++---- + plug-ins/file-ico/ico-dialog.c | 4 ++-- + plug-ins/file-jpeg/jpeg-exif.c | 2 +- + plug-ins/file-jpeg/jpeg-save.c | 6 ++++-- + plug-ins/file-sgi/sgi.c | 2 +- + plug-ins/file-xjt/xjt.c | 3 ++- + plug-ins/flame/flame.c | 8 ++++---- plug-ins/fractal-explorer/fractal-explorer-dialogs.c | 4 ++-- - plug-ins/fractal-explorer/fractal-explorer.c | 4 ++-- - plug-ins/gfig/gfig-dialog.c | 14 ++++++++------ - plug-ins/gimpressionist/gimpressionist.c | 3 ++- - plug-ins/gimpressionist/orientmap.c | 2 +- - plug-ins/gimpressionist/presets.c | 3 ++- - plug-ins/gimpressionist/sizemap.c | 3 ++- - plug-ins/gradient-flare/gradient-flare.c | 8 ++++---- - plug-ins/ifs-compose/ifs-compose.c | 12 ++++++------ - plug-ins/imagemap/imap_default_dialog.c | 4 ++-- - plug-ins/lighting/lighting-ui.c | 4 ++-- - plug-ins/map-object/map-object-ui.c | 4 ++-- - plug-ins/maze/maze-dialog.c | 2 +- - plug-ins/metadata/interface.c | 4 ++-- - plug-ins/pagecurl/pagecurl.c | 2 +- - plug-ins/script-fu/script-fu-console.c | 4 ++-- - plug-ins/script-fu/script-fu-interface.c | 2 +- - plug-ins/script-fu/script-fu-server.c | 2 +- + plug-ins/fractal-explorer/fractal-explorer.c | 4 ++-- + plug-ins/gfig/gfig-dialog.c | 14 ++++++++------ + plug-ins/gimpressionist/gimpressionist.c | 3 ++- + plug-ins/gimpressionist/orientmap.c | 2 +- + plug-ins/gimpressionist/presets.c | 3 ++- + plug-ins/gimpressionist/sizemap.c | 3 ++- + plug-ins/gradient-flare/gradient-flare.c | 8 ++++---- + plug-ins/ifs-compose/ifs-compose.c | 12 ++++++------ + plug-ins/imagemap/imap_default_dialog.c | 4 ++-- + plug-ins/lighting/lighting-ui.c | 4 ++-- + plug-ins/map-object/map-object-ui.c | 4 ++-- + plug-ins/maze/maze-dialog.c | 2 +- + plug-ins/metadata/interface.c | 4 ++-- + plug-ins/pagecurl/pagecurl.c | 2 +- + plug-ins/script-fu/script-fu-console.c | 4 ++-- + plug-ins/script-fu/script-fu-interface.c | 2 +- + plug-ins/script-fu/script-fu-server.c | 2 +- plug-ins/selection-to-path/selection-to-path.c | 3 ++- - plug-ins/win-snap/winsnap.c | 3 ++- + plug-ins/win-snap/winsnap.c | 3 ++- 146 files changed, 299 insertions(+), 202 deletions(-) commit 997111bf0ae5abab53cd6cceb82a00b15f1cfd3a Author: Michael Natterer <mitch@gimp.org> -Date: Wed Jul 15 16:19:32 2009 +0200 +Date: Wed Jul 15 16:19:32 2009 +0200 Use gtk_dialog_get_content_area() instead of dialog->vbox app/actions/gradient-editor-commands.c | 6 ++++-- - app/dialogs/about-dialog.c | 2 +- - app/dialogs/channel-options-dialog.c | 3 ++- - app/dialogs/convert-dialog.c | 2 +- - app/dialogs/fade-dialog.c | 3 ++- + app/dialogs/about-dialog.c | 2 +- + app/dialogs/channel-options-dialog.c | 3 ++- + app/dialogs/convert-dialog.c | 2 +- + app/dialogs/fade-dialog.c | 3 ++- app/dialogs/file-open-location-dialog.c | 2 +- - app/dialogs/grid-dialog.c | 2 +- + app/dialogs/grid-dialog.c | 2 +- app/dialogs/image-merge-layers-dialog.c | 3 ++- - app/dialogs/image-new-dialog.c | 2 +- - app/dialogs/image-properties-dialog.c | 4 ++-- + app/dialogs/image-new-dialog.c | 2 +- + app/dialogs/image-properties-dialog.c | 4 ++-- app/dialogs/keyboard-shortcuts-dialog.c | 3 ++- - app/dialogs/layer-add-mask-dialog.c | 3 ++- - app/dialogs/layer-options-dialog.c | 2 +- - app/dialogs/module-dialog.c | 3 ++- - app/dialogs/offset-dialog.c | 2 +- - app/dialogs/palette-import-dialog.c | 2 +- - app/dialogs/preferences-dialog.c | 3 ++- - app/dialogs/print-size-dialog.c | 2 +- - app/dialogs/resize-dialog.c | 3 ++- + app/dialogs/layer-add-mask-dialog.c | 3 ++- + app/dialogs/layer-options-dialog.c | 2 +- + app/dialogs/module-dialog.c | 3 ++- + app/dialogs/offset-dialog.c | 2 +- + app/dialogs/palette-import-dialog.c | 2 +- + app/dialogs/preferences-dialog.c | 3 ++- + app/dialogs/print-size-dialog.c | 2 +- + app/dialogs/resize-dialog.c | 3 ++- app/dialogs/resolution-calibrate-dialog.c | 3 ++- - app/dialogs/scale-dialog.c | 3 ++- - app/dialogs/stroke-dialog.c | 3 ++- - app/dialogs/template-options-dialog.c | 3 ++- - app/dialogs/tips-dialog.c | 2 +- - app/dialogs/user-install-dialog.c | 4 ++-- - app/dialogs/vectors-options-dialog.c | 3 ++- + app/dialogs/scale-dialog.c | 3 ++- + app/dialogs/stroke-dialog.c | 3 ++- + app/dialogs/template-options-dialog.c | 3 ++- + app/dialogs/tips-dialog.c | 2 +- + app/dialogs/user-install-dialog.c | 4 ++-- + app/dialogs/vectors-options-dialog.c | 3 ++- app/display/gimpdisplayshell-filter-dialog.c | 3 ++- app/display/gimpdisplayshell-scale-dialog.c | 2 +- - app/gui/gui.c | 3 ++- - app/tools/gimpcolorpickertool.c | 4 ++-- - app/tools/gimpimagemaptool.c | 3 ++- - app/tools/gimpmeasuretool.c | 3 ++- - app/tools/gimpperspectivetool.c | 4 ++-- - app/tools/gimprotatetool.c | 4 ++-- - app/tools/gimpscaletool.c | 4 ++-- - app/tools/gimpsheartool.c | 4 ++-- - app/tools/gimptexttool.c | 2 +- - libgimpwidgets/gimpunitmenu.c | 3 ++- + app/gui/gui.c | 3 ++- + app/tools/gimpcolorpickertool.c | 4 ++-- + app/tools/gimpimagemaptool.c | 3 ++- + app/tools/gimpmeasuretool.c | 3 ++- + app/tools/gimpperspectivetool.c | 4 ++-- + app/tools/gimprotatetool.c | 4 ++-- + app/tools/gimpscaletool.c | 4 ++-- + app/tools/gimpsheartool.c | 4 ++-- + app/tools/gimptexttool.c | 2 +- + libgimpwidgets/gimpunitmenu.c | 3 ++- 38 files changed, 66 insertions(+), 46 deletions(-) commit 4da5ed3a8b86142967168f0f337c833f159eb3b6 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Jul 15 15:02:31 2009 +0200 +Date: Wed Jul 15 15:02:31 2009 +0200 Use gtk_widget_get_window() instead of widget->window - app/display/gimpdisplay-foreach.c | 3 ++- - app/display/gimpdisplayshell-cursor.c | 2 +- - app/display/gimpdisplayshell-draw.c | 8 ++++---- - app/display/gimpdisplayshell-layer-select.c | 2 +- - app/display/gimpdisplayshell-preview.c | 8 ++++---- + app/display/gimpdisplay-foreach.c | 3 ++- + app/display/gimpdisplayshell-cursor.c | 2 +- + app/display/gimpdisplayshell-draw.c | 8 ++++---- + app/display/gimpdisplayshell-layer-select.c | 2 +- + app/display/gimpdisplayshell-preview.c | 8 ++++---- app/display/gimpdisplayshell-progress.c | 12 ++++++++---- - app/display/gimpdisplayshell-title.c | 6 ++++-- - app/display/gimpnavigationeditor.c | 3 ++- - app/display/gimpstatusbar.c | 11 ++++++----- + app/display/gimpdisplayshell-title.c | 6 ++++-- + app/display/gimpnavigationeditor.c | 3 ++- + app/display/gimpstatusbar.c | 11 ++++++----- 9 files changed, 32 insertions(+), 23 deletions(-) commit 2d442e4576e28c6d9a3e1a5bb9919b703d8213b8 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Jul 15 14:52:27 2009 +0200 +Date: Wed Jul 15 14:52:27 2009 +0200 Use gtk_widget_get_window() instead of widget->window @@ -90626,7 +91455,7 @@ commit 2bfc48df7498a5d3ad41d0fc836de3a2fd420d8b Author: Michael Natterer <mitch@gimp.org> -Date: Wed Jul 15 14:29:43 2009 +0200 +Date: Wed Jul 15 14:29:43 2009 +0200 Use accessors instead of sealed GTK+ members @@ -90636,7 +91465,7 @@ commit 65421aa0b657bfc1ece16540294f8db5bf6def8f Author: Michael Natterer <mitch@gimp.org> -Date: Wed Jul 15 04:05:24 2009 +0200 +Date: Wed Jul 15 04:05:24 2009 +0200 Use accessors instead of widget->style and widget->window @@ -90646,7 +91475,7 @@ commit 84e933d80ba9d0511437604304543385dbac1727 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Jul 15 03:58:30 2009 +0200 +Date: Wed Jul 15 03:58:30 2009 +0200 Use accessors instead of widget->window and widget->style @@ -90655,7 +91484,7 @@ commit facb13fdba865121c4817d00a90e13a256bd6130 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Jul 15 01:53:30 2009 +0200 +Date: Wed Jul 15 01:53:30 2009 +0200 Use GtkOrientable API instead of accessing range->orientation directly @@ -90664,7 +91493,7 @@ commit 5ee13aec3235b19d239b47b897d29e917a2673ee Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Mon Jul 13 13:21:31 2009 -0300 +Date: Mon Jul 13 13:21:31 2009 -0300 Create a new GUI for dynamics dockable - needs debugging @@ -90676,36 +91505,36 @@ commit 543d373e15466420f35d15a7073260edc953f6b0 Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Thu Jul 2 14:45:32 2009 -0300 +Date: Thu Jul 2 14:45:32 2009 -0300 Fade dynamics. Add fade as one more dynamics driving factor on GUI. Implement fading dynamics calculation. Let fade work with all driven factors. Add pixel_dist parameter to get_dynamic_x. Adjusted function calls for get_dynamic_x. - * app/paint/gimppaintoptions.c: Add initialization for - fading dynamics. Add fading related variables similar - to Random. Adjust get_dynamics_mix function. Add fading - calculation in get_dynamics_x functions. Adjust get_dynamic_x - functions for fade dynamics. - - * app/paint/gimppaintoptions.h: Add fading_options in - GimpDynamicOptions. - - * app/tools/gimppaintoptions-gui.c: Add the function - fading_options_gui. - - * app/paint/gimpclone.c - * app/paint/gimpdodgeburn.c - * app/paint/gimperaser.c - * app/paint/gimpheal.c - * app/paint/gimppaintbrush.c - * app/paint/gimpsmudge.c - * app/paint/gimpairbrush.c - * app/paint/gimpbrushcore.c - * app/paint/gimpconvolve.c: Adjust function - calls. get_dynamic_opacity function calls were adjusted to have - one more parameter, paint_core->pixel_dist. + * app/paint/gimppaintoptions.c: Add initialization for + fading dynamics. Add fading related variables similar + to Random. Adjust get_dynamics_mix function. Add fading + calculation in get_dynamics_x functions. Adjust get_dynamic_x + functions for fade dynamics. + + * app/paint/gimppaintoptions.h: Add fading_options in + GimpDynamicOptions. + + * app/tools/gimppaintoptions-gui.c: Add the function + fading_options_gui. + + * app/paint/gimpclone.c + * app/paint/gimpdodgeburn.c + * app/paint/gimperaser.c + * app/paint/gimpheal.c + * app/paint/gimppaintbrush.c + * app/paint/gimpsmudge.c + * app/paint/gimpairbrush.c + * app/paint/gimpbrushcore.c + * app/paint/gimpconvolve.c: Adjust function + calls. get_dynamic_opacity function calls were adjusted to + have one more parameter, paint_core->pixel_dist. some key words: get_dynamic_ @@ -90717,7 +91546,7 @@ commit 578c6d6f18f947283c420cc00d0abb267a7916fd Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Jul 14 20:13:15 2009 +0200 +Date: Tue Jul 14 20:13:15 2009 +0200 Enable automake silent-rules by default @@ -90730,7 +91559,7 @@ commit 98ce2f9aa10fc704fb4a77be2727203cda9f0d7e Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Jul 14 11:49:54 2009 +0200 +Date: Tue Jul 14 11:49:54 2009 +0200 plug-ins: Use string literal as format in metadata plug-in @@ -90739,7 +91568,7 @@ commit 1eb007f56c86db6317640548a859b15b03b10920 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Jul 14 11:48:03 2009 +0200 +Date: Tue Jul 14 11:48:03 2009 +0200 plug-ins: Remove unused read_extended_data_block() in file-psd.c @@ -90748,7 +91577,7 @@ commit 414851833ac5a33382d3ea159fef6493118d3e87 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Jul 14 11:32:52 2009 +0200 +Date: Tue Jul 14 11:32:52 2009 +0200 Fix typo in NEWS @@ -90757,35 +91586,32 @@ commit 3f52973de0a4df904fa3fb6191f2d9044940c8fb Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon Jul 13 13:23:35 2009 +0200 +Date: Mon Jul 13 13:23:35 2009 +0200 Add Makefile.am rule to generate ChangeLog from git log Add Makefile.am rule to generate ChangeLog from git log copied from pango and Behdad Esfahbod. - .gitignore | 10 +- - ChangeLog | 5991 - ----------------------------------------------------- - ChangeLog.pre-git | 5959 - ++++++++++++++++++++++++++++++++++++++++++++++++++++ - Makefile.am | 21 + - 4 files changed, 5986 insertions(+), 5995 deletions(-) + .gitignore | 10 ++++++---- + ChangeLog => ChangeLog.pre-git | 32 -------------------------------- + Makefile.am | 21 +++++++++++++++++++++ + 3 files changed, 27 insertions(+), 36 deletions(-) commit dd244327f545ec33282c6b3e33b9533125384e72 Author: Alexandre Prokoudine <alexandre.prokoudine@gmail.com> -Date: Mon Jul 13 13:37:17 2009 +0400 +Date: Mon Jul 13 13:37:17 2009 +0400 Updated Russian translation po-python/ru.po | 44 +- - po/ru.po | 2511 + po/ru.po | 2511 +++++++++++++++++++++++++++++++------------------------ 2 files changed, 1437 insertions(+), 1118 deletions(-) commit da1ddff7c49ac6027a09362c37db7bd9c6730907 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon Jul 13 10:09:13 2009 +0200 +Date: Mon Jul 13 10:09:13 2009 +0200 po-python: Add text-brush.py to POTFILES.in @@ -90794,7 +91620,7 @@ commit 5d0eb202063d80735e8d908b87951523af05097e Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon Jul 13 08:20:42 2009 +0200 +Date: Mon Jul 13 08:20:42 2009 +0200 Cleanup NEWS @@ -90806,7 +91632,7 @@ commit 0d94e6e9313914b963ddbee4d6e1d0ad1cba2747 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Jul 14 20:13:15 2009 +0200 +Date: Tue Jul 14 20:13:15 2009 +0200 Enable automake silent-rules by default @@ -90819,7 +91645,7 @@ commit c6798bc247c0b5e3063f8e7eae0c46c685e5d75e Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Jul 14 11:49:54 2009 +0200 +Date: Tue Jul 14 11:49:54 2009 +0200 plug-ins: Use string literal as format in metadata plug-in @@ -90828,7 +91654,7 @@ commit 7976f21a35154cd78ad6dcf8d5586125b03b67f4 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Jul 14 11:48:03 2009 +0200 +Date: Tue Jul 14 11:48:03 2009 +0200 plug-ins: Remove unused read_extended_data_block() in file-psd.c @@ -90837,7 +91663,7 @@ commit e2f080b9d744a5a519cce3cf9ad7eaa6930f20da Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue Jul 14 11:32:52 2009 +0200 +Date: Tue Jul 14 11:32:52 2009 +0200 Fix typo in NEWS @@ -90846,7 +91672,7 @@ commit 7e4fb8d118a328cc41e3e621d916d5df1707ed0d Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Mon Jul 13 13:33:33 2009 -0300 +Date: Mon Jul 13 13:33:33 2009 -0300 Create a new dynamics object. @@ -90860,14 +91686,14 @@ commit aca8a6d597b726eee78314c219b64fb7bda2a21c Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Mon Jul 13 13:21:31 2009 -0300 +Date: Mon Jul 13 13:21:31 2009 -0300 Create a new GUI for dynamics dockable - needs debugging * app/widgets/gimpdynamicseditor.c * app/widgets/gimpdynamicseditor.h: Two files are added. - .gitignore | 2 +- + .gitignore | 2 +- app/widgets/gimpdynamicseditor.c | 992 +++++++++++++++++++++++++++++++++++++++ app/widgets/gimpdynamicseditor.h | 58 +++ @@ -90875,35 +91701,32 @@ commit d86a7c004459d4b4388e901d8ff3e7564a09016d Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon Jul 13 13:23:35 2009 +0200 +Date: Mon Jul 13 13:23:35 2009 +0200 Add Makefile.am rule to generate ChangeLog from git log Add Makefile.am rule to generate ChangeLog from git log copied from pango and Behdad Esfahbod. - .gitignore | 9 +- - ChangeLog | 5991 - ----------------------------------------------------- - ChangeLog.pre-git | 5959 - ++++++++++++++++++++++++++++++++++++++++++++++++++++ - Makefile.am | 21 + - 4 files changed, 5985 insertions(+), 5995 deletions(-) + .gitignore | 9 +++++---- + ChangeLog => ChangeLog.pre-git | 32 -------------------------------- + Makefile.am | 21 +++++++++++++++++++++ + 3 files changed, 26 insertions(+), 36 deletions(-) commit e1fd003d9502eaa7c38adaa420495ab7326ed242 Author: Alexandre Prokoudine <alexandre.prokoudine@gmail.com> -Date: Mon Jul 13 13:37:17 2009 +0400 +Date: Mon Jul 13 13:37:17 2009 +0400 Updated Russian translation po-python/ru.po | 44 +- - po/ru.po | 2511 + po/ru.po | 2511 +++++++++++++++++++++++++++++++------------------------ 2 files changed, 1437 insertions(+), 1118 deletions(-) commit e2c18a4d0291f119930333c6a265c3c18e2ebe40 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon Jul 13 10:09:13 2009 +0200 +Date: Mon Jul 13 10:09:13 2009 +0200 po-python: Add text-brush.py to POTFILES.in @@ -90912,7 +91735,7 @@ commit a46fbe82dd802ca0503787eebc6b8ec077577050 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon Jul 13 08:20:42 2009 +0200 +Date: Mon Jul 13 08:20:42 2009 +0200 Cleanup NEWS @@ -90924,7 +91747,7 @@ commit 3d6b86eef184f0788ffd90568fb5270c5b3a9d96 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Jul 12 17:14:08 2009 +0200 +Date: Sun Jul 12 17:14:08 2009 +0200 Clean up various calls to the response() callback @@ -90940,7 +91763,7 @@ commit 53bdcab4d8a4c2966d7cb887651ecf36522d42e3 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Jul 12 16:45:18 2009 +0200 +Date: Sun Jul 12 16:45:18 2009 +0200 Move dialog destruction to a utility function @@ -90949,27 +91772,27 @@ commit 22ea0ce3eee380071fdc14ef98abd111a95f50c8 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Jul 12 12:46:37 2009 +0200 +Date: Sun Jul 12 12:46:37 2009 +0200 Update library .def files - libgimp/gimp.def | 1 + + libgimp/gimp.def | 1 + libgimpwidgets/gimpwidgets.def | 1 + 2 files changed, 2 insertions(+) commit 51473d82a256e4f293decd3f2d36569d9a2daf73 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Jul 12 12:46:21 2009 +0200 +Date: Sun Jul 12 12:46:21 2009 +0200 Regenerate gimprc docs/gimprc.5.in | 40 ++++++++++++++++++++++++++++++++++------ - etc/gimprc | 33 +++++++++++++++++++++++++++++---- + etc/gimprc | 33 +++++++++++++++++++++++++++++---- 2 files changed, 63 insertions(+), 10 deletions(-) commit 84943c0d66709badfda032bb624bd954b07e70ce Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Jul 12 11:19:08 2009 +0200 +Date: Sun Jul 12 11:19:08 2009 +0200 app: Put gimp-file.h in file/Makefile.am @@ -90978,7 +91801,7 @@ commit 3cbb656a08bd6529673408a551bba823da554fda Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Jul 12 12:07:21 2009 +0200 +Date: Sun Jul 12 12:07:21 2009 +0200 app: Only show contributors for 2.8 in the about dialog @@ -90987,7 +91810,7 @@ commit f910375c2515be200ac6367755b256cce8341888 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Jul 12 09:57:04 2009 +0200 +Date: Sun Jul 12 09:57:04 2009 +0200 devel-docs: Add authors.xml to release-howto.txt @@ -90996,7 +91819,7 @@ commit cec18f1e77116a7306a1fbceba07907889b3e38d Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Jul 12 12:06:18 2009 +0200 +Date: Sun Jul 12 12:06:18 2009 +0200 Update authors.xml for 2.7.0 @@ -91009,7 +91832,7 @@ commit 94b9b6000a8fdc453c14258d9318652ab991af87 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Jul 12 09:45:57 2009 +0200 +Date: Sun Jul 12 09:45:57 2009 +0200 Update README @@ -91020,7 +91843,7 @@ commit b51f808a2fdb978f1a01b5016e4ec5002bc65158 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Jul 12 09:42:53 2009 +0200 +Date: Sun Jul 12 09:42:53 2009 +0200 Update NEWS for 2.7.0 @@ -91031,7 +91854,7 @@ commit 6249fda2c8ca2eb136b880c77a911eccc8206c21 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Jul 10 22:37:44 2009 +0200 +Date: Fri Jul 10 22:37:44 2009 +0200 Start updating NEWS for 2.7.0 @@ -91042,7 +91865,7 @@ commit ffe2afb6fb0753e8234d2d272d0de8aae6b98673 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 13:41:51 2009 +0200 +Date: Fri Jul 10 13:41:51 2009 +0200 Tag popup scrolling cleanup @@ -91057,7 +91880,7 @@ commit 34f3c20d67c63a42d275cb79d7f10c1fe166fab5 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 12:39:13 2009 +0200 +Date: Fri Jul 10 12:39:13 2009 +0200 Remove more obsolete variables and indentation levels @@ -91067,7 +91890,7 @@ commit e90a610e88e8b84b84e91e56a992547eda66a365 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 04:31:53 2009 +0200 +Date: Fri Jul 10 04:31:53 2009 +0200 Factor out tag hit detection into a utility function @@ -91076,7 +91899,7 @@ commit f441464656c927eace864e58a16c2aa536cdd976 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 04:20:54 2009 +0200 +Date: Fri Jul 10 04:20:54 2009 +0200 Fix tiny miscalculation of the tag name rendering position @@ -91085,7 +91908,7 @@ commit 357e24aebf4e5daf75eefaad0aa4e9df3c85d762 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 04:10:57 2009 +0200 +Date: Fri Jul 10 04:10:57 2009 +0200 More tag popup cleanup @@ -91101,7 +91924,7 @@ commit 3db3ad0703f4d083e7cd9366c201875a044c7a46 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 03:46:42 2009 +0200 +Date: Fri Jul 10 03:46:42 2009 +0200 Some more cleanup and a fix of a tiny earlier cleanup glitch @@ -91110,7 +91933,7 @@ commit df57181899e0b2a01d03b59a6f5ac9823c95dffa Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 03:40:44 2009 +0200 +Date: Fri Jul 10 03:40:44 2009 +0200 Remove useless member "ignore_button_release" @@ -91120,7 +91943,7 @@ commit 7fdefa92e0b3d8de9e8b46fe91f079c0e7d68c73 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 03:36:40 2009 +0200 +Date: Fri Jul 10 03:36:40 2009 +0200 Clean up spacings, tag size calculation and tag rendering @@ -91133,7 +91956,7 @@ commit 66c54126f08433ddcbc2e02a2d272350963d5219 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 02:46:13 2009 +0200 +Date: Fri Jul 10 02:46:13 2009 +0200 Use GTK_SHADOW_OUT for the tag popup's frame @@ -91142,7 +91965,7 @@ commit 59849bcb44234c321a58b87a226dca9fd8ed6cb5 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 02:25:25 2009 +0200 +Date: Fri Jul 10 02:25:25 2009 +0200 Use #defines instead of magic values for the tag spacing constants @@ -91151,7 +91974,7 @@ commit 3a1f3b4813072177c2e9d64adff39c8477b4f455 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 02:17:00 2009 +0200 +Date: Fri Jul 10 02:17:00 2009 +0200 Remove "close_rectangles" member and the feature it implemented @@ -91166,7 +91989,7 @@ commit 094b7f5d64b7a9405c78c19f9d65e5b0094cb311 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 01:57:29 2009 +0200 +Date: Fri Jul 10 01:57:29 2009 +0200 Various code cleanups @@ -91176,7 +91999,7 @@ commit e28727bdbd3e61b365d733ca67bdf3151c830017 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 01:03:55 2009 +0200 +Date: Fri Jul 10 01:03:55 2009 +0200 Widget construction / showing cleanup @@ -91191,7 +92014,7 @@ commit 487fc7402e8b4c605a52983eb2b79235cb9e29e0 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 00:51:45 2009 +0200 +Date: Fri Jul 10 00:51:45 2009 +0200 Rename member "drawing_area" to "tag_area" @@ -91201,7 +92024,7 @@ commit 7582753661fbd31ba6d597989f40a38ce2059d13 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 00:47:34 2009 +0200 +Date: Fri Jul 10 00:47:34 2009 +0200 Whitespace and minor code cleanup @@ -91211,7 +92034,7 @@ commit d408bed34feebf7488bec511ad5d5049df0c663f Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Jul 10 19:27:23 2009 +0200 +Date: Fri Jul 10 19:27:23 2009 +0200 app: Clarify gimp_display_shell_format_filename() @@ -91223,7 +92046,7 @@ commit c79af13a90ca6030ec95f233d8bfd1b55e34262a Author: Massimo Valentini <sixtysix@inwind.it> -Date: Tue Jul 7 17:09:21 2009 +0200 +Date: Tue Jul 7 17:09:21 2009 +0200 Bug 569661 – Import from PDF throws errors when entering resolution in pixels per millimetre @@ -91235,7 +92058,7 @@ commit 00ac7003022afb5825874a494ded4c642b1885e8 Author: Massimo Valentini <sixtysix@inwind.it> -Date: Tue Jul 7 17:07:12 2009 +0200 +Date: Tue Jul 7 17:07:12 2009 +0200 Bug 567262 – Black pixels appear in "Spread" filter preview @@ -91251,7 +92074,7 @@ commit 765fe81311837371bea51039e30c847f380ebad2 Author: Massimo Valentini <sixtysix@inwind.it> -Date: Tue Jul 7 17:05:42 2009 +0200 +Date: Tue Jul 7 17:05:42 2009 +0200 Bug 554658 – Path Dialog: Path preview pics not to see constantly @@ -91265,7 +92088,7 @@ commit f843e590fdabdb11dabef6d2efa2f67abbef5a74 Author: Massimo Valentini <sixtysix@inwind.it> -Date: Tue Jul 7 17:02:32 2009 +0200 +Date: Tue Jul 7 17:02:32 2009 +0200 Bug 167604 – gimp_gradient_get_color_at() may return out-of-bounds values @@ -91278,7 +92101,7 @@ commit 82741533489ac804f5c576c8144d49aa0b33b8f7 Author: Daniel Nylander <po@danielnylander.se> -Date: Tue Jul 7 16:55:32 2009 +0200 +Date: Tue Jul 7 16:55:32 2009 +0200 Updated Swedish translation @@ -91288,21 +92111,21 @@ commit 90a7d5792dec38a3f0d2eb38572072350cfeaaf9 Author: Roman Joost <romanofski@gimp.org> -Date: Mon Jul 6 10:20:39 2009 +1000 +Date: Mon Jul 6 10:20:39 2009 +1000 Disabled the build of the metadata plugin if libexif is disabled. Relates to Bug 587172 - Merge Exif data with XMP model. - configure.ac | 2 ++ - plug-ins/Makefile.am | 6 +++++- + configure.ac | 2 ++ + plug-ins/Makefile.am | 6 +++++- plug-ins/metadata/exif-decode.c | 4 ---- - plug-ins/metadata/metadata.c | 7 +------ + plug-ins/metadata/metadata.c | 7 +------ 4 files changed, 8 insertions(+), 11 deletions(-) commit 8be040d08908a875e4940bc0288b395c0bab4cef Author: Sven Neumann <sven@gimp.org> -Date: Mon Jul 6 22:08:45 2009 +0200 +Date: Mon Jul 6 22:08:45 2009 +0200 Bug 587710 – PAT file specification seems to have a wrong magic number @@ -91314,7 +92137,7 @@ commit c9171a3fbf186ce92b02f0262a44a08e21dad21f Author: Michael Natterer <mitch@gimp.org> -Date: Sun Jul 12 17:14:08 2009 +0200 +Date: Sun Jul 12 17:14:08 2009 +0200 Clean up various calls to the response() callback @@ -91330,7 +92153,7 @@ commit 669d26ee39fbf5cf74e5efe0b16ed9b36b693605 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Jul 12 16:45:18 2009 +0200 +Date: Sun Jul 12 16:45:18 2009 +0200 Move dialog destruction to a utility function @@ -91339,27 +92162,27 @@ commit f1b14dd6b72276ed8b222c43d10b9dc6703d6f4e Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Jul 12 12:46:37 2009 +0200 +Date: Sun Jul 12 12:46:37 2009 +0200 Update library .def files - libgimp/gimp.def | 1 + + libgimp/gimp.def | 1 + libgimpwidgets/gimpwidgets.def | 1 + 2 files changed, 2 insertions(+) commit ab48d9fe65d09ed030ee6a3d96d83ff42963cf8e Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Jul 12 12:46:21 2009 +0200 +Date: Sun Jul 12 12:46:21 2009 +0200 Regenerate gimprc docs/gimprc.5.in | 40 ++++++++++++++++++++++++++++++++++------ - etc/gimprc | 33 +++++++++++++++++++++++++++++---- + etc/gimprc | 33 +++++++++++++++++++++++++++++---- 2 files changed, 63 insertions(+), 10 deletions(-) commit 04349c8878ac2f9cc915b691b2b791c1b1518e9a Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Jul 12 11:19:08 2009 +0200 +Date: Sun Jul 12 11:19:08 2009 +0200 app: Put gimp-file.h in file/Makefile.am @@ -91368,7 +92191,7 @@ commit 1e7fd6cd27460a68550a323c31a8250a2ec7c734 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Jul 12 12:07:21 2009 +0200 +Date: Sun Jul 12 12:07:21 2009 +0200 app: Only show contributors for 2.8 in the about dialog @@ -91377,7 +92200,7 @@ commit 670a04668881fd65501a88389d901d6b72197a98 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Jul 12 09:57:04 2009 +0200 +Date: Sun Jul 12 09:57:04 2009 +0200 devel-docs: Add authors.xml to release-howto.txt @@ -91386,7 +92209,7 @@ commit d9b783764112b9cfe9a506ac4eff5115761157f1 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Jul 12 12:06:18 2009 +0200 +Date: Sun Jul 12 12:06:18 2009 +0200 Update authors.xml for 2.7.0 @@ -91399,7 +92222,7 @@ commit 8d041426342fe488f9da16043dd0b08ead8e69ae Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Jul 12 09:45:57 2009 +0200 +Date: Sun Jul 12 09:45:57 2009 +0200 Update README @@ -91410,7 +92233,7 @@ commit 065bb5dfbb85e59fd5c5136541ea8cdbdeacecda Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Jul 12 09:42:53 2009 +0200 +Date: Sun Jul 12 09:42:53 2009 +0200 Update NEWS for 2.7.0 @@ -91421,61 +92244,61 @@ commit 96baac783f43da753fbe31b1767f740a8d6c5ecd Author: zhenfeng zhao <zhzzf_0808@hotmail.com> -Date: Thu Jul 2 14:45:32 2009 -0300 +Date: Thu Jul 2 14:45:32 2009 -0300 Fade dynamics. Add fade as one more dynamics driving factor on GUI. Implement fading dynamics calculation. Let fade work with all driven factors. Add pixel_dist parameter to get_dynamic_x. Adjusted function calls for get_dynamic_x. - * app/paint/gimppaintoptions.c: Add initialization for - fading dynamics. Add fading related variables similar - to Random. Adjust get_dynamics_mix function. Add fading - calculation in get_dynamics_x functions. Adjust get_dynamic_x - functions for fade dynamics. - - * app/paint/gimppaintoptions.h: Add fading_options in - GimpDynamicOptions. - - * app/tools/gimppaintoptions-gui.c: Add the function - fading_options_gui. - - * app/paint/gimpclone.c - * app/paint/gimpdodgeburn.c - * app/paint/gimperaser.c - * app/paint/gimpheal.c - * app/paint/gimppaintbrush.c - * app/paint/gimpsmudge.c - * app/paint/gimpairbrush.c - * app/paint/gimpbrushcore.c - * app/paint/gimpconvolve.c: Adjust function - calls. get_dynamic_opacity function calls were adjusted to have - one more parameter, paint_core->pixel_dist. + * app/paint/gimppaintoptions.c: Add initialization for + fading dynamics. Add fading related variables similar + to Random. Adjust get_dynamics_mix function. Add fading + calculation in get_dynamics_x functions. Adjust get_dynamic_x + functions for fade dynamics. + + * app/paint/gimppaintoptions.h: Add fading_options in + GimpDynamicOptions. + + * app/tools/gimppaintoptions-gui.c: Add the function + fading_options_gui. + + * app/paint/gimpclone.c + * app/paint/gimpdodgeburn.c + * app/paint/gimperaser.c + * app/paint/gimpheal.c + * app/paint/gimppaintbrush.c + * app/paint/gimpsmudge.c + * app/paint/gimpairbrush.c + * app/paint/gimpbrushcore.c + * app/paint/gimpconvolve.c: Adjust function + calls. get_dynamic_opacity function calls were adjusted to + have one more parameter, paint_core->pixel_dist. some key words: get_dynamic_ pixel_dist paint_core->pixel_dist - .gitignore | 9 ++ - app/paint/gimpairbrush.c | 3 +- - app/paint/gimpbrushcore.c | 18 ++- - app/paint/gimpclone.c | 6 +- - app/paint/gimpconvolve.c | 3 +- - app/paint/gimpdodgeburn.c | 6 +- - app/paint/gimperaser.c | 6 +- - app/paint/gimpheal.c | 6 +- - app/paint/gimppaintbrush.c | 9 +- - app/paint/gimppaintoptions.c | 336 + .gitignore | 9 ++ + app/paint/gimpairbrush.c | 3 +- + app/paint/gimpbrushcore.c | 18 ++- + app/paint/gimpclone.c | 6 +- + app/paint/gimpconvolve.c | 3 +- + app/paint/gimpdodgeburn.c | 6 +- + app/paint/gimperaser.c | 6 +- + app/paint/gimpheal.c | 6 +- + app/paint/gimppaintbrush.c | 9 +- + app/paint/gimppaintoptions.c | 336 +++++++++++++++++++++++++++++++++++---- - app/paint/gimppaintoptions.h | 22 ++- - app/paint/gimpsmudge.c | 9 +- + app/paint/gimppaintoptions.h | 22 ++- + app/paint/gimpsmudge.c | 9 +- app/tools/gimppaintoptions-gui.c | 77 ++++++++- 13 files changed, 448 insertions(+), 62 deletions(-) commit 8402ed35408fe2bdc854c6f8fd4cc5e7f41b5e49 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Jul 10 22:37:44 2009 +0200 +Date: Fri Jul 10 22:37:44 2009 +0200 Start updating NEWS for 2.7.0 @@ -91486,7 +92309,7 @@ commit 7171dad36401fb866fa62488127d2beddf545292 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 13:41:51 2009 +0200 +Date: Fri Jul 10 13:41:51 2009 +0200 Tag popup scrolling cleanup @@ -91501,7 +92324,7 @@ commit 48bc1d1ced9b0fd886a5d7d22e652c5812217ba7 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 12:39:13 2009 +0200 +Date: Fri Jul 10 12:39:13 2009 +0200 Remove more obsolete variables and indentation levels @@ -91511,7 +92334,7 @@ commit 25a8a9ea9f967f063e4028e66e66b09e42de3703 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 04:31:53 2009 +0200 +Date: Fri Jul 10 04:31:53 2009 +0200 Factor out tag hit detection into a utility function @@ -91520,7 +92343,7 @@ commit 5a26780ed9c06f91eaf33903c34710a48d55d8ca Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 04:20:54 2009 +0200 +Date: Fri Jul 10 04:20:54 2009 +0200 Fix tiny miscalculation of the tag name rendering position @@ -91529,7 +92352,7 @@ commit bd00ac3891b0fb49c76fe868c6716a29912da975 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 04:10:57 2009 +0200 +Date: Fri Jul 10 04:10:57 2009 +0200 More tag popup cleanup @@ -91545,7 +92368,7 @@ commit e15e9c222d7074a1e7e0deff2989987d8dc35bb7 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 03:46:42 2009 +0200 +Date: Fri Jul 10 03:46:42 2009 +0200 Some more cleanup and a fix of a tiny earlier cleanup glitch @@ -91554,7 +92377,7 @@ commit 4699152a4f77c7de89e472b113f91c701db47afa Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 03:40:44 2009 +0200 +Date: Fri Jul 10 03:40:44 2009 +0200 Remove useless member "ignore_button_release" @@ -91564,7 +92387,7 @@ commit dd6b65179e40acce56aab9fa0fd06811e2f68a26 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 03:36:40 2009 +0200 +Date: Fri Jul 10 03:36:40 2009 +0200 Clean up spacings, tag size calculation and tag rendering @@ -91577,7 +92400,7 @@ commit 1f199ba0606485d4c7219e80796bc10907272f29 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 02:46:13 2009 +0200 +Date: Fri Jul 10 02:46:13 2009 +0200 Use GTK_SHADOW_OUT for the tag popup's frame @@ -91586,7 +92409,7 @@ commit 8995cdf9d7bdee6fe884205400975a47d13196e3 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 02:25:25 2009 +0200 +Date: Fri Jul 10 02:25:25 2009 +0200 Use #defines instead of magic values for the tag spacing constants @@ -91595,7 +92418,7 @@ commit 75ee288278021aed5272f1c3aaf1eeedbd43976f Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 02:17:00 2009 +0200 +Date: Fri Jul 10 02:17:00 2009 +0200 Remove "close_rectangles" member and the feature it implemented @@ -91610,7 +92433,7 @@ commit 3d85ee285a823ba5684d16261098b18a38273bf9 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 01:57:29 2009 +0200 +Date: Fri Jul 10 01:57:29 2009 +0200 Various code cleanups @@ -91620,7 +92443,7 @@ commit 1ecf4bed6754b3114800beb11b148fdc23a00f68 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 01:03:55 2009 +0200 +Date: Fri Jul 10 01:03:55 2009 +0200 Widget construction / showing cleanup @@ -91635,7 +92458,7 @@ commit 4d860185c15b1e54d7e8d1c6e0788895649ac744 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 00:51:45 2009 +0200 +Date: Fri Jul 10 00:51:45 2009 +0200 Rename member "drawing_area" to "tag_area" @@ -91645,7 +92468,7 @@ commit f350e5ac51e4573dce356e2448f46a6b1110f788 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jul 10 00:47:34 2009 +0200 +Date: Fri Jul 10 00:47:34 2009 +0200 Whitespace and minor code cleanup @@ -91655,7 +92478,7 @@ commit 8e7c19b76c2d693a00c26f168a92edb31c4eb7ef Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Jul 10 19:27:23 2009 +0200 +Date: Fri Jul 10 19:27:23 2009 +0200 app: Clarify gimp_display_shell_format_filename() @@ -91667,7 +92490,7 @@ commit a7bca9407d7dec994cbb116e32e84589d34840a5 Author: Massimo Valentini <sixtysix@inwind.it> -Date: Tue Jul 7 17:09:21 2009 +0200 +Date: Tue Jul 7 17:09:21 2009 +0200 Bug 569661 – Import from PDF throws errors when entering resolution in pixels per millimetre @@ -91679,7 +92502,7 @@ commit 34ccca92a5cdb273ec93dd94c3a91d7920384646 Author: Massimo Valentini <sixtysix@inwind.it> -Date: Tue Jul 7 17:07:12 2009 +0200 +Date: Tue Jul 7 17:07:12 2009 +0200 Bug 567262 – Black pixels appear in "Spread" filter preview @@ -91695,7 +92518,7 @@ commit 5be4f235a392be003c47ac652ce874528875170d Author: Massimo Valentini <sixtysix@inwind.it> -Date: Tue Jul 7 17:05:42 2009 +0200 +Date: Tue Jul 7 17:05:42 2009 +0200 Bug 554658 – Path Dialog: Path preview pics not to see constantly @@ -91709,7 +92532,7 @@ commit c837f25b40b97bba09845336ea0a997149aa3c5e Author: Massimo Valentini <sixtysix@inwind.it> -Date: Tue Jul 7 17:02:32 2009 +0200 +Date: Tue Jul 7 17:02:32 2009 +0200 Bug 167604 – gimp_gradient_get_color_at() may return out-of-bounds values @@ -91722,7 +92545,7 @@ commit 669011b07d0c36791bace582863b336e40c1fdb1 Author: Daniel Nylander <po@danielnylander.se> -Date: Tue Jul 7 16:55:32 2009 +0200 +Date: Tue Jul 7 16:55:32 2009 +0200 Updated Swedish translation @@ -91732,21 +92555,21 @@ commit 75484699da6698db862df2df5814541ec55ae2a3 Author: Roman Joost <romanofski@gimp.org> -Date: Mon Jul 6 10:20:39 2009 +1000 +Date: Mon Jul 6 10:20:39 2009 +1000 Disabled the build of the metadata plugin if libexif is disabled. Relates to Bug 587172 - Merge Exif data with XMP model. - configure.ac | 2 ++ - plug-ins/Makefile.am | 6 +++++- + configure.ac | 2 ++ + plug-ins/Makefile.am | 6 +++++- plug-ins/metadata/exif-decode.c | 4 ---- - plug-ins/metadata/metadata.c | 7 +------ + plug-ins/metadata/metadata.c | 7 +------ 4 files changed, 8 insertions(+), 11 deletions(-) commit 7a4b05d93dfa83f2254d30c3a6b4e97999869701 Author: Sven Neumann <sven@gimp.org> -Date: Mon Jul 6 22:08:45 2009 +0200 +Date: Mon Jul 6 22:08:45 2009 +0200 Bug 587710 – PAT file specification seems to have a wrong magic number @@ -91758,7 +92581,7 @@ commit fe09f320f82c2ff58b4a53f44aefa0794d23f06f Author: Sven Neumann <sven@gimp.org> -Date: Mon Jul 6 15:29:45 2009 +0200 +Date: Mon Jul 6 15:29:45 2009 +0200 remove trailing whitespace @@ -91767,7 +92590,7 @@ commit 27f12b2505ecb18fa3a29f12738c485a21350deb Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Jul 5 23:58:55 2009 +0200 +Date: Sun Jul 5 23:58:55 2009 +0200 app: Cleanup gimp_display_shell_format_filename() @@ -91777,7 +92600,7 @@ commit 073d026f6cbd5c566c5c7d94d46d55d80c6a48c2 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Jul 5 09:14:16 2009 +0200 +Date: Sun Jul 5 09:14:16 2009 +0200 app: Show "(overwritten)" and "(exported)" status of image @@ -91792,7 +92615,7 @@ commit 1662ff2523fd344929f3228095ccf8470d442d60 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Jul 3 22:51:11 2009 +0200 +Date: Fri Jul 3 22:51:11 2009 +0200 app: Keep track of GimpImage export dirtiness @@ -91811,7 +92634,7 @@ commit c4601b298dd0fe26837f9a59cf0a18ed70db89c8 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Jul 5 09:09:12 2009 +0200 +Date: Sun Jul 5 09:09:12 2009 +0200 app: Make 'Overwrite foo.png' work @@ -91823,7 +92646,7 @@ commit 31fe420b821e94e325474e4ebb7fbdbc19fa2e02 Author: drtvasudevan <agnihot3@gmail.com> -Date: Sun Jul 5 11:44:34 2009 +0530 +Date: Sun Jul 5 11:44:34 2009 +0530 Updated Tamil translation @@ -91833,7 +92656,7 @@ commit 7ae06f8a8fe416c9744e7ac4a541ad5a222299b1 Author: drtvasudevan <agnihot3@gmail.com> -Date: Sun Jul 5 11:39:31 2009 +0530 +Date: Sun Jul 5 11:39:31 2009 +0530 Updated Tamil translation @@ -91843,7 +92666,7 @@ commit 7829b0e23b2352abfecbd19f51dd86ffeddf7079 Author: drtvasudevan <agnihot3@gmail.com> -Date: Sun Jul 5 11:30:47 2009 +0530 +Date: Sun Jul 5 11:30:47 2009 +0530 Added ta translation @@ -91852,7 +92675,7 @@ commit 70c86d4e113f0e9a3c8d975d671dee51c7afe7e5 Author: drtvasudevan <agnihot3@gmail.com> -Date: Sun Jul 5 11:30:24 2009 +0530 +Date: Sun Jul 5 11:30:24 2009 +0530 Updated Tamil translation @@ -91862,25 +92685,25 @@ commit c181f4eb05543bf554a4f97a69e065e6efcbdec6 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Jul 3 21:11:21 2009 +0200 +Date: Fri Jul 3 21:11:21 2009 +0200 app: Add and use gimp_image_is_dirty() - app/actions/file-commands.c | 5 +++-- - app/core/gimpimage-undo.c | 3 ++- - app/core/gimpimage.c | 12 ++++++++++++ - app/core/gimpimage.h | 1 + + app/actions/file-commands.c | 5 +++-- + app/core/gimpimage-undo.c | 3 ++- + app/core/gimpimage.c | 12 ++++++++++++ + app/core/gimpimage.h | 1 + app/dialogs/file-save-dialog.c | 2 +- app/display/gimpdisplay-foreach.c | 10 ++++++---- app/display/gimpdisplayshell-close.c | 8 ++++---- app/display/gimpdisplayshell-title.c | 8 ++++---- - app/pdb/image-cmds.c | 2 +- - tools/pdbgen/pdb/image.pdb | 2 +- + app/pdb/image-cmds.c | 2 +- + tools/pdbgen/pdb/image.pdb | 2 +- 10 files changed, 35 insertions(+), 18 deletions(-) commit 0959414cd247a381b6e520547948286821063ef7 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Jul 3 08:20:40 2009 +0200 +Date: Fri Jul 3 08:20:40 2009 +0200 app: Simplify file_actions_update() @@ -91889,7 +92712,7 @@ commit a307ee2cc602c378d5f1b994b0a9043b29be99fa Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Jul 3 08:18:20 2009 +0200 +Date: Fri Jul 3 08:18:20 2009 +0200 menus: Untabify image-menu.xml.in @@ -91899,7 +92722,7 @@ commit 46cdf8b16cbd708735584fa4cfe0294eaebfe947 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Jul 3 08:16:08 2009 +0200 +Date: Fri Jul 3 08:16:08 2009 +0200 app: Put 'Export to' above 'Export...' @@ -91909,7 +92732,7 @@ commit 7deab857b4c688325433945e0565538297c745fb Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Jul 2 22:07:30 2009 +0200 +Date: Thu Jul 2 22:07:30 2009 +0200 app: Update default save name according to spec @@ -91922,7 +92745,7 @@ commit 631e128ddd1c6819ced5e9c6401e7246246da9d3 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Jul 2 21:33:00 2009 +0200 +Date: Thu Jul 2 21:33:00 2009 +0200 app: Forget import source after saving as XCF @@ -91936,7 +92759,7 @@ commit 8a1e826d99361434f31d3ec01da1d877b671dcd6 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Jul 2 21:20:51 2009 +0200 +Date: Thu Jul 2 21:20:51 2009 +0200 app: Show "Overwrite <filename>" in File menu @@ -91945,12 +92768,12 @@ GIMP_FILE_EXPORT_TO_URI_KEY along with import source any longer. app/actions/file-actions.c | 17 ++++++++++++++--- - app/file/file-open.c | 4 ---- + app/file/file-open.c | 4 ---- 2 files changed, 14 insertions(+), 7 deletions(-) commit ed9c12d1e7a7462af1747ba9b50c35781beaadec Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Jul 2 20:46:52 2009 +0200 +Date: Thu Jul 2 20:46:52 2009 +0200 app: Put "[<filename>] (imported)" in window title for imported files @@ -91962,7 +92785,7 @@ commit d9136aec3f85e61c3fbbc76929356878295c5a23 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Jul 2 20:44:48 2009 +0200 +Date: Thu Jul 2 20:44:48 2009 +0200 app: Support NULL ext to file_utils_uri_with_new_ext() @@ -91971,7 +92794,7 @@ commit e4976d8ad212f0c4036c0038c4a9617d7738e5a2 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Jul 2 12:24:13 2009 +0200 +Date: Thu Jul 2 12:24:13 2009 +0200 Bump GEGL and BABL versions here too @@ -91980,7 +92803,7 @@ commit e6e40af9abfca66ff8188f9f1bdcbdeb043c447d Author: Sven Neumann <sven@gimp.org> -Date: Wed Jul 1 22:33:38 2009 +0200 +Date: Wed Jul 1 22:33:38 2009 +0200 update the GEGL and babl requirements @@ -91989,7 +92812,7 @@ commit f07d89de2aafdc3f1e28f87017cfcb6ede2f2791 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Wed Jul 1 21:45:33 2009 +0200 +Date: Wed Jul 1 21:45:33 2009 +0200 Bug 587543 – crash in GNU Image Manipulation Program: Pressing shift+- @@ -92003,7 +92826,7 @@ commit 7df1c1fc9da84981516595f388f5129f0d72034e Author: Martin Nordholts <martinn@src.gnome.org> -Date: Wed Jul 1 20:40:42 2009 +0200 +Date: Wed Jul 1 20:40:42 2009 +0200 Require babl 0.1.0 and GEGL 0.1.0 @@ -92011,15 +92834,15 @@ 1 file changed, 2 insertions(+), 2 deletions(-) commit bc8683fe7243b06bc59a6199bed46d374b52fb0f -Merge: 0553776 5bc14cd +Merge: 05537763ef 5bc14cdc96 Author: Roman Joost <romanofski@gimp.org> -Date: Wed Jul 1 10:41:31 2009 +1000 +Date: Wed Jul 1 10:41:31 2009 +1000 Merge branch 'roman-metadata_editor' commit 05537763ef9f88cdfcccd03e5023b39886d4f9f7 Author: Sven Neumann <sven@gimp.org> -Date: Tue Jun 30 23:19:13 2009 +0200 +Date: Tue Jun 30 23:19:13 2009 +0200 Bug 567393 – Rectangle select tool size shrinks to 0 if size is larger than @@ -92036,7 +92859,7 @@ commit f804f6932a1d64562ecb6cb53de6a3ed27703568 Author: Alexia Death <alexiadeath@gmail.com> -Date: Tue Jun 30 22:12:28 2009 +0300 +Date: Tue Jun 30 22:12:28 2009 +0300 And some more format fixes to dz.po files, now in po/ @@ -92045,7 +92868,7 @@ commit 6a7213829074fabf2217d72fc1f04cbed9e5da16 Author: Alexia Death <alexiadeath@gmail.com> -Date: Tue Jun 30 22:06:23 2009 +0300 +Date: Tue Jun 30 22:06:23 2009 +0300 Fixes to another translation formating error in dz.po, this time in po-plug-ins @@ -92055,7 +92878,7 @@ commit 6391f76f19925b3afbc14ce8ceade8bd2755cead Author: Alexia Death <alexiadeath@gmail.com> -Date: Tue Jun 30 22:00:22 2009 +0300 +Date: Tue Jun 30 22:00:22 2009 +0300 Fixing formating errors in dz.po @@ -92064,18 +92887,18 @@ commit 5bc14cdc96736ac6a3e5ce2dbc667eec232073f5 Author: Roman Joost <romanofski@gimp.org> -Date: Tue Jun 30 18:41:38 2009 +1000 +Date: Tue Jun 30 18:41:38 2009 +1000 Reformatted source code and removed unused prototypes. plug-ins/metadata/exif-decode.c | 14 +++++++++++++- plug-ins/metadata/exif-decode.h | 4 ---- - plug-ins/metadata/metadata.c | 1 - + plug-ins/metadata/metadata.c | 1 - 3 files changed, 13 insertions(+), 6 deletions(-) commit 46ad0f6c2a079587274b1cef8647b4b9661f370a Author: Roman Joost <romanofski@gimp.org> -Date: Sun Jun 28 15:34:42 2009 +1000 +Date: Sun Jun 28 15:34:42 2009 +1000 Replace open by save button in the export dialog. @@ -92089,18 +92912,18 @@ commit e0fddee12829bca85565ca903a7d6e464c8cb2ec Author: Roman Joost <romanofski@gimp.org> -Date: Sun Jun 28 15:26:24 2009 +1000 +Date: Sun Jun 28 15:26:24 2009 +1000 Set scalar properties for XMP (exif). plug-ins/metadata/exif-decode.c | 52 +++++++++++++++++++++++++---------------- - plug-ins/metadata/metadata.c | 7 ++++-- + plug-ins/metadata/metadata.c | 7 ++++-- 2 files changed, 37 insertions(+), 22 deletions(-) commit 7230d2673c89e4e7b29d5ca43a7a12b94c6a8168 Author: Roman Joost <romanofski@gimp.org> -Date: Sat Jun 20 22:16:55 2009 +1000 +Date: Sat Jun 20 22:16:55 2009 +1000 Merges the exif-data to the xmp-model. @@ -92109,17 +92932,17 @@ is using the image id and to access the Exif data parasite. For each Exif property a corresponding value in the XMP model is created. - plug-ins/file-jpeg/gimpexif.c | 10 ++++ - plug-ins/metadata/Makefile.am | 12 ++-- + plug-ins/file-jpeg/gimpexif.c | 10 ++++ + plug-ins/metadata/Makefile.am | 12 ++-- plug-ins/metadata/exif-decode.c | 84 ++++++++++++++++++++++++++++ plug-ins/metadata/exif-decode.h | 35 ++++++++++++ - plug-ins/metadata/metadata.c | 119 + plug-ins/metadata/metadata.c | 119 +++++++++++++++++++++------------------- 5 files changed, 200 insertions(+), 60 deletions(-) commit b2c20bdbda62dedd28b6d23858cf8307277a0996 Author: Petr Kovar <pknbe@volny.cz> -Date: Mon Jun 29 00:58:21 2009 +0200 +Date: Mon Jun 29 00:58:21 2009 +0200 Fixed Czech translation @@ -92131,7 +92954,7 @@ commit 4c5c158bfad394686616af0f661c9462a3ce702f Author: Michael Natterer <mitch@gimp.org> -Date: Sun Jun 28 17:27:02 2009 +0200 +Date: Sun Jun 28 17:27:02 2009 +0200 Fix corner case of text tool up/down navigation @@ -92143,7 +92966,7 @@ commit 66cc3e5f22c61115d0c3057b4475f1a6a7508ea9 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Jun 28 11:02:26 2009 +0200 +Date: Sun Jun 28 11:02:26 2009 +0200 Check for automake-1.11 @@ -92152,7 +92975,7 @@ commit 780404699e1b3eb915d06973f6e5f32ed33aa383 Author: Christopher Montgomery <xiphmont@gmail.com> -Date: Mon Jun 29 02:52:48 2009 -0400 +Date: Mon Jun 29 02:52:48 2009 -0400 plug-ins: Add missing #include<X11/Xlib.h> that is breaking build @@ -92161,19 +92984,19 @@ commit bcfaed96d2c66394461ef57b47d17830e5f3b442 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Jun 27 21:51:52 2009 +0200 +Date: Sat Jun 27 21:51:52 2009 +0200 Simplify and clean up text tool clipboard handling. app/actions/text-tool-commands.c | 6 ++-- - app/tools/gimptexttool.c | 61 + app/tools/gimptexttool.c | 61 +++++++++++++++------------------------- - app/tools/gimptexttool.h | 8 ++---- + app/tools/gimptexttool.h | 8 ++---- 3 files changed, 28 insertions(+), 47 deletions(-) commit 8e09c536376559974eadabeca34bfb0fcfde3264 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Jun 27 21:31:06 2009 +0200 +Date: Sat Jun 27 21:31:06 2009 +0200 Some more text tool cleanup @@ -92187,7 +93010,7 @@ commit afb8d07fcfc0be7ea53a329c5dc3bef8bc99a527 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Jun 27 21:10:34 2009 +0200 +Date: Sat Jun 27 21:10:34 2009 +0200 Use PANGO_WRAP_WORD_CHAR so we don't cut off words which are wider than the layer @@ -92197,7 +93020,7 @@ commit 6d3522c7375505da93207f292ebef6605554019e Author: Michael Natterer <mitch@gimp.org> -Date: Sat Jun 27 15:38:30 2009 +0200 +Date: Sat Jun 27 15:38:30 2009 +0200 Make up/down work within wrapped lines @@ -92212,7 +93035,7 @@ commit 285c25a25732a1678864c393f6ae424039e51a8d Author: Michael Natterer <mitch@gimp.org> -Date: Sat Jun 27 14:55:45 2009 +0200 +Date: Sat Jun 27 14:55:45 2009 +0200 Some minor cleanup @@ -92221,7 +93044,7 @@ commit 51f81bd15ec028d869c11c33fa1a1e9d02d2d267 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Jun 26 08:16:43 2009 +0200 +Date: Fri Jun 26 08:16:43 2009 +0200 app: Reuse the GeglProcessor @@ -92235,7 +93058,7 @@ commit 1a2136408e1b6818888d2575b9c5640c890e1ab4 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Jun 25 13:22:25 2009 +0200 +Date: Thu Jun 25 13:22:25 2009 +0200 Implement overwrite-mode in the text tool @@ -92250,15 +93073,15 @@ app/tools/gimpdrawtool.c | 71 ++++++++++++++++++++++++++++++--------------- - app/tools/gimpdrawtool.h | 1 + + app/tools/gimpdrawtool.h | 1 + app/tools/gimptexttool.c | 43 +++++++++++++++++++++++++-- - app/tools/gimptexttool.h | 2 ++ - app/widgets/gimptextproxy.c | 7 +++++ + app/tools/gimptexttool.h | 2 ++ + app/widgets/gimptextproxy.c | 7 +++++ 5 files changed, 99 insertions(+), 25 deletions(-) commit 0ecf3b24d6b28e1fa9adf4536f1dd825ba9ea70f Author: Michael Natterer <mitch@gimp.org> -Date: Thu Jun 25 10:45:06 2009 +0200 +Date: Thu Jun 25 10:45:06 2009 +0200 Some text tool code cleanup @@ -92273,7 +93096,7 @@ commit 877844214c7a9ee0a4a8db75873637c6e124138e Author: Michael Natterer <mitch@gimp.org> -Date: Thu Jun 25 10:21:56 2009 +0200 +Date: Thu Jun 25 10:21:56 2009 +0200 Implement select-all / unselect-all bindings @@ -92282,17 +93105,17 @@ commit e78bda44b332ed7c90e461c10c0ca6c1eb3c7bc5 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Jun 24 21:31:39 2009 +0200 +Date: Wed Jun 24 21:31:39 2009 +0200 Implement insert_at_cursor() so bindings can insert text app/tools/gimptexttool.c | 13 +++++++++++++ - app/widgets/gimptextproxy.c | 9 +++++++++ + app/widgets/gimptextproxy.c | 9 +++++++++ 2 files changed, 22 insertions(+) commit 92a89666cfa15c722c9286b94b319fc7044df828 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Jun 24 21:06:31 2009 +0200 +Date: Wed Jun 24 21:06:31 2009 +0200 Implement GTK_DELETE_WHITESPACE (code stolen from GtkTextView) @@ -92301,24 +93124,20 @@ commit b5079eb1b78e84bc3ff21a921c1dc54caae1f827 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Jun 24 19:34:36 2009 +0200 +Date: Wed Jun 24 19:34:36 2009 +0200 Move the GimpTextProxy widget from app/tools/ to app/widgets/ - app/tools/Makefile.am | 2 - - app/tools/gimptextproxy.c | 113 - -------------------------------------------- - app/tools/gimptextproxy.h | 48 ------------------- - app/tools/gimptexttool.c | 2 +- - app/widgets/Makefile.am | 2 + - app/widgets/gimptextproxy.c | 113 - ++++++++++++++++++++++++++++++++++++++++++++ - app/widgets/gimptextproxy.h | 51 ++++++++++++++++++++ - 7 files changed, 167 insertions(+), 164 deletions(-) + app/tools/Makefile.am | 2 -- + app/tools/gimptexttool.c | 2 +- + app/widgets/Makefile.am | 2 ++ + app/{tools => widgets}/gimptextproxy.c | 0 + app/{tools => widgets}/gimptextproxy.h | 3 +++ + 5 files changed, 6 insertions(+), 3 deletions(-) commit 512c80cb051f522a51b5912f444ebf8ba8c0fef9 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Jun 24 19:26:24 2009 +0200 +Date: Wed Jun 24 19:26:24 2009 +0200 Keep the proxy text view from doing anything @@ -92327,7 +93146,7 @@ view has no chance of letting e.g. the display beep or doing anything else. - app/tools/Makefile.am | 2 + + app/tools/Makefile.am | 2 + app/tools/gimptextproxy.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++ app/tools/gimptextproxy.h | 48 ++++++++++++++++++++ @@ -92336,23 +93155,23 @@ commit e170ad77b1127d04fc3c33278991edff7d324b66 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Jun 24 19:08:24 2009 +0200 +Date: Wed Jun 24 19:08:24 2009 +0200 Remove the newly added tool clipboard facility again, we don't need it app/actions/edit-commands.c | 32 -------------------------------- app/tools/gimptexttool.c | 32 -------------------------------- - app/tools/gimptool.c | 24 ------------------------ - app/tools/gimptool.h | 7 ------- + app/tools/gimptool.c | 24 ------------------------ + app/tools/gimptool.h | 7 ------- app/tools/tool_manager.c | 21 --------------------- - app/tools/tool_manager.h | 3 --- + app/tools/tool_manager.h | 3 --- app/tools/tools-enums.c | 31 ------------------------------- app/tools/tools-enums.h | 12 ------------ 8 files changed, 162 deletions(-) commit 919c875d651e0bd7d368d2d08f22526d630c2fb0 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Jun 24 19:04:18 2009 +0200 +Date: Wed Jun 24 19:04:18 2009 +0200 Implement cut/copy/paste via the proxy text buffer's signals @@ -92361,7 +93180,7 @@ commit 5f65026f943f6f8d4e250337baed490d40cf1238 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Jun 24 18:48:27 2009 +0200 +Date: Wed Jun 24 18:48:27 2009 +0200 Implement GTK_DELETE_PARAGRAPH_ENDS (Ctrl+K in emacs) @@ -92370,7 +93189,7 @@ commit 1dcd5a6eaa8d7f84e3bf3eade4454da1e82dbcf8 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Jun 24 13:58:40 2009 +0200 +Date: Wed Jun 24 13:58:40 2009 +0200 Implement GTK_DELETE_WORD_ENDS and GTK_DELETE_WORDS @@ -92379,7 +93198,7 @@ commit 2d8ced10c068bf6467334df11eebe9ee6f42fbf4 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Jun 24 13:51:25 2009 +0200 +Date: Wed Jun 24 13:51:25 2009 +0200 Some text deleteion refactoring @@ -92388,14 +93207,14 @@ handling all text deletion types. app/actions/text-tool-commands.c | 5 ++- - app/tools/gimptexttool.c | 70 + app/tools/gimptexttool.c | 70 ++++++++++++++++++++++++---------------- - app/tools/gimptexttool.h | 3 +- + app/tools/gimptexttool.h | 3 +- 3 files changed, 46 insertions(+), 32 deletions(-) commit 1b69070556a0ed4b550c40f1e72fbf95016a9be7 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Jun 23 23:25:09 2009 +0200 +Date: Tue Jun 23 23:25:09 2009 +0200 Make key themes really work this time @@ -92411,14 +93230,14 @@ doing what the delete key does. app/display/gimpdisplayshell-callbacks.c | 4 +- - app/tools/gimptexttool.c | 69 + app/tools/gimptexttool.c | 69 +++++++++++++++++++++++--------- - app/widgets/gimpwindow.c | 7 +++- + app/widgets/gimpwindow.c | 7 +++- 3 files changed, 60 insertions(+), 20 deletions(-) commit e24793a6668842e969f97d766c20c873d145c343 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Jun 23 21:57:59 2009 +0200 +Date: Tue Jun 23 21:57:59 2009 +0200 Move the proxy text view to its own offscreen window @@ -92432,7 +93251,7 @@ commit 74f66028f9e9d3cdebae0819d9c4b741ca18b2a5 Author: Alexandre Prokoudine <alexandre.prokoudine@gmail.com> -Date: Tue Jun 23 18:18:42 2009 +0400 +Date: Tue Jun 23 18:18:42 2009 +0400 Slightly updated Russian translation @@ -92442,7 +93261,7 @@ commit 4c6463d6575a5da0f5cb0f535e1ed9f3d162ede7 Author: NISHIBORI Kiyotaka <ml.nishibori.kiyotaka@gmail.com> -Date: Tue Jun 23 22:35:33 2009 +0900 +Date: Tue Jun 23 22:35:33 2009 +0900 Updated Japanese translations. Authored by NISHIBORI Kiyotaka. @@ -92453,14 +93272,14 @@ +++++++++++++++++++++++----------------------------- po-python/ja.po | 187 +- po-script-fu/ja.po | 122 +- - po-tips/ja.po | 309 +- - po/ja.po | 8865 + po-tips/ja.po | 309 +- + po/ja.po | 8865 ++++++++++++++++++++++++++------------------------ 6 files changed, 9232 insertions(+), 10310 deletions(-) commit cfbfb4a6c04652dfcc9e66fc907b195c1c96d9db Author: Michael Natterer <mitch@gimp.org> -Date: Tue Jun 23 14:05:50 2009 +0200 +Date: Tue Jun 23 14:05:50 2009 +0200 Don't go to the end of the line if we are already there @@ -92473,7 +93292,7 @@ commit 25963fb1e174da6920cf81941a7b69840eca7ec4 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Jun 23 14:00:23 2009 +0200 +Date: Tue Jun 23 14:00:23 2009 +0200 Add some temp debug output @@ -92483,7 +93302,7 @@ commit 6e57a6721873bf87c09a2218256d0e84fda08bf2 Author: Michael Natterer <mitch@gimp.org> -Date: Tue Jun 23 00:18:31 2009 +0200 +Date: Tue Jun 23 00:18:31 2009 +0200 Fix moving back by words @@ -92492,7 +93311,7 @@ commit a23599816502fafd3354108d038f7d02b77be8ae Author: Michael Natterer <mitch@gimp.org> -Date: Mon Jun 22 23:52:42 2009 +0200 +Date: Mon Jun 22 23:52:42 2009 +0200 Actually use the hack from the last commit @@ -92503,7 +93322,7 @@ commit 64d6ebca00f832ed5e9bf2d43f81ec929fc2e26c Author: Michael Natterer <mitch@gimp.org> -Date: Mon Jun 22 23:47:04 2009 +0200 +Date: Mon Jun 22 23:47:04 2009 +0200 Make the text tool use GtkTextView's key bindings @@ -92526,7 +93345,7 @@ commit 9b1681216d018f9b30500a82a6a24b1f0306a3f2 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Jun 22 20:24:28 2009 +0200 +Date: Mon Jun 22 20:24:28 2009 +0200 Bug 586591 - Opening jpg image sets cpu activity to 100% @@ -92539,7 +93358,7 @@ commit 0ced7020d3ef54a75668afd5576aeda002a1e8e3 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Jun 22 13:55:52 2009 +0200 +Date: Mon Jun 22 13:55:52 2009 +0200 Add naive handling of PageUp/PageDown in the text tool @@ -92548,7 +93367,7 @@ commit 0f55bf15bc60d53dae9f53efa8237133312fa7a2 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Jun 21 23:37:18 2009 +0200 +Date: Sun Jun 21 23:37:18 2009 +0200 Enable cut/copy/paste for the text tool @@ -92568,17 +93387,17 @@ app/actions/edit-commands.c | 40 +++++++++++++++++-- app/tools/gimptexttool.c | 94 ++++++++++++++++++++++++++++++--------------- - app/tools/gimptool.c | 24 ++++++++++++ - app/tools/gimptool.h | 7 ++++ + app/tools/gimptool.c | 24 ++++++++++++ + app/tools/gimptool.h | 7 ++++ app/tools/tool_manager.c | 21 ++++++++++ - app/tools/tool_manager.h | 3 ++ + app/tools/tool_manager.h | 3 ++ app/tools/tools-enums.c | 31 +++++++++++++++ app/tools/tools-enums.h | 12 ++++++ 8 files changed, 197 insertions(+), 35 deletions(-) commit 1f91136e355582300253eb9f53ed8ec480309c4b Author: Michael Natterer <mitch@gimp.org> -Date: Sun Jun 21 17:33:25 2009 +0200 +Date: Sun Jun 21 17:33:25 2009 +0200 Make sure mouse selections work together nicely with keyboard navigation @@ -92597,7 +93416,7 @@ commit a7271e6b25839af5c3024569f096ffa551c8047c Author: Michael Natterer <mitch@gimp.org> -Date: Sun Jun 21 16:20:16 2009 +0200 +Date: Sun Jun 21 16:20:16 2009 +0200 Handle double and triple click and enable selecting words and lines @@ -92608,7 +93427,7 @@ commit cd880b3946c4a8fe894260ad76144c358264606d Author: Michael Natterer <mitch@gimp.org> -Date: Sun Jun 21 14:31:49 2009 +0200 +Date: Sun Jun 21 14:31:49 2009 +0200 Rename member "text_cursor_changing" to "selecting" and remove unreachable code @@ -92619,7 +93438,7 @@ commit 1a16b48c93316df7f2cf1be73245ab20ad0d2999 Author: Michael Natterer <mitch@gimp.org> -Date: Sat Jun 20 17:37:31 2009 +0200 +Date: Sat Jun 20 17:37:31 2009 +0200 Add infrastructure for sending double and triple clicks to tools @@ -92643,40 +93462,40 @@ became active by the preceding normal button press. app/display/gimpdisplayshell-callbacks.c | 60 +++++++++++++++++++++++- - app/tools/gimpaligntool.c | 14 +++--- - app/tools/gimpblendtool.c | 12 +++-- + app/tools/gimpaligntool.c | 14 +++--- + app/tools/gimpblendtool.c | 12 +++-- app/tools/gimpbrightnesscontrasttool.c | 12 +++-- - app/tools/gimpcolortool.c | 14 +++--- - app/tools/gimpcroptool.c | 12 +++-- - app/tools/gimpforegroundselecttool.c | 16 ++++--- - app/tools/gimpfreeselecttool.c | 12 +++-- - app/tools/gimpiscissorstool.c | 12 +++-- - app/tools/gimpmagnifytool.c | 12 +++-- - app/tools/gimpmeasuretool.c | 12 +++-- - app/tools/gimpmovetool.c | 12 +++-- - app/tools/gimppainttool.c | 16 ++++--- - app/tools/gimpperspectiveclonetool.c | 14 +++--- - app/tools/gimprectangleselecttool.c | 12 +++-- - app/tools/gimpregionselecttool.c | 12 +++-- - app/tools/gimpsourcetool.c | 80 + app/tools/gimpcolortool.c | 14 +++--- + app/tools/gimpcroptool.c | 12 +++-- + app/tools/gimpforegroundselecttool.c | 16 ++++--- + app/tools/gimpfreeselecttool.c | 12 +++-- + app/tools/gimpiscissorstool.c | 12 +++-- + app/tools/gimpmagnifytool.c | 12 +++-- + app/tools/gimpmeasuretool.c | 12 +++-- + app/tools/gimpmovetool.c | 12 +++-- + app/tools/gimppainttool.c | 16 ++++--- + app/tools/gimpperspectiveclonetool.c | 14 +++--- + app/tools/gimprectangleselecttool.c | 12 +++-- + app/tools/gimpregionselecttool.c | 12 +++-- + app/tools/gimpsourcetool.c | 80 ++++++++++++++++---------------- - app/tools/gimptexttool.c | 12 +++-- - app/tools/gimptool.c | 37 +++++++++------ - app/tools/gimptool.h | 2 + - app/tools/gimptoolcontrol.c | 71 + app/tools/gimptexttool.c | 12 +++-- + app/tools/gimptool.c | 37 +++++++++------ + app/tools/gimptool.h | 2 + + app/tools/gimptoolcontrol.c | 71 +++++++++++++++++++++------- - app/tools/gimptoolcontrol.h | 26 +++++++---- - app/tools/gimptransformtool.c | 12 +++-- - app/tools/gimpvectortool.c | 12 +++-- - app/tools/tool_manager.c | 13 +++--- - app/tools/tool_manager.h | 1 + - app/tools/tools-enums.c | 31 +++++++++++++ - app/tools/tools-enums.h | 12 +++++ + app/tools/gimptoolcontrol.h | 26 +++++++---- + app/tools/gimptransformtool.c | 12 +++-- + app/tools/gimpvectortool.c | 12 +++-- + app/tools/tool_manager.c | 13 +++--- + app/tools/tool_manager.h | 1 + + app/tools/tools-enums.c | 31 +++++++++++++ + app/tools/tools-enums.h | 12 +++++ 28 files changed, 380 insertions(+), 183 deletions(-) commit fa388d8cead551d05908e7eadf82af7b33747c08 Author: Michael Schumacher <schumaml@gmx.de> -Date: Sat Jun 20 12:46:42 2009 +0200 +Date: Sat Jun 20 12:46:42 2009 +0200 Corrected consistency of name length and wording of the v3 explanation @@ -92689,7 +93508,7 @@ commit 5865dcf63e4757749313c50a93bd188cc3fcbaee Author: Sven Neumann <sven@gimp.org> -Date: Fri Jun 19 20:44:49 2009 +0200 +Date: Fri Jun 19 20:44:49 2009 +0200 devel-docs: fix byte range in format documentation @@ -92703,7 +93522,7 @@ commit 2a88723a40e594fed66956decddfb35e5513ee08 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jun 19 17:08:34 2009 +0200 +Date: Fri Jun 19 17:08:34 2009 +0200 Bug 573256 - Text tool appearance doesn't account for DPI @@ -92719,15 +93538,15 @@ processing mouse events. app/text/gimptextlayout-render.c | 28 +------ - app/text/gimptextlayout.c | 177 + app/text/gimptextlayout.c | 177 +++++++++++++++++++++++++++++++++++++++ - app/text/gimptextlayout.h | 53 ++++++++---- - app/tools/gimptexttool.c | 40 +++++++-- + app/text/gimptextlayout.h | 53 ++++++++---- + app/tools/gimptexttool.c | 40 +++++++-- 4 files changed, 246 insertions(+), 52 deletions(-) commit 2e11cf878a44dae090245137ff994d5fb95af386 Author: Sven Neumann <sven@gimp.org> -Date: Fri Jun 19 09:31:10 2009 +0200 +Date: Fri Jun 19 09:31:10 2009 +0200 Adapt mkgen.pl to create the .gitignore file with Win32 executables @@ -92742,52 +93561,52 @@ commit eed061efbb55f4c26371ef71d7b5842bf066b5c4 Author: Michael Schumacher <schumaml@gmx.de> -Date: Fri Jun 19 00:14:17 2009 +0200 +Date: Fri Jun 19 00:14:17 2009 +0200 Adding Microsoft Windows executables to the .gitignore files All binaries have been added individually. Old binaries are supposed to show up as untracked. - libgimpthumb/.gitignore | 1 + + libgimpthumb/.gitignore | 1 + plug-ins/color-rotate/.gitignore | 1 + - plug-ins/common/.gitignore | 150 + plug-ins/common/.gitignore | 150 +++++++++++++++++++++++++++++++++- - plug-ins/file-bmp/.gitignore | 1 + + plug-ins/file-bmp/.gitignore | 1 + plug-ins/file-faxg3/.gitignore | 1 + - plug-ins/file-fits/.gitignore | 1 + - plug-ins/file-fli/.gitignore | 1 + - plug-ins/file-ico/.gitignore | 1 + - plug-ins/file-jpeg/.gitignore | 2 + - plug-ins/file-psd/.gitignore | 2 + - plug-ins/file-sgi/.gitignore | 1 + - plug-ins/file-uri/.gitignore | 1 + - plug-ins/file-xjt/.gitignore | 1 + - plug-ins/flame/.gitignore | 1 + + plug-ins/file-fits/.gitignore | 1 + + plug-ins/file-fli/.gitignore | 1 + + plug-ins/file-ico/.gitignore | 1 + + plug-ins/file-jpeg/.gitignore | 2 + + plug-ins/file-psd/.gitignore | 2 + + plug-ins/file-sgi/.gitignore | 1 + + plug-ins/file-uri/.gitignore | 1 + + plug-ins/file-xjt/.gitignore | 1 + + plug-ins/flame/.gitignore | 1 + plug-ins/fractal-explorer/.gitignore | 1 + - plug-ins/gfig/.gitignore | 1 + + plug-ins/gfig/.gitignore | 1 + plug-ins/gimpressionist/.gitignore | 1 + plug-ins/gradient-flare/.gitignore | 1 + plug-ins/help-browser/.gitignore | 1 + - plug-ins/help/.gitignore | 2 + + plug-ins/help/.gitignore | 2 + plug-ins/ifs-compose/.gitignore | 1 + - plug-ins/imagemap/.gitignore | 1 + - plug-ins/lighting/.gitignore | 1 + + plug-ins/imagemap/.gitignore | 1 + + plug-ins/lighting/.gitignore | 1 + plug-ins/map-object/.gitignore | 1 + - plug-ins/maze/.gitignore | 1 + - plug-ins/metadata/.gitignore | 3 + - plug-ins/pagecurl/.gitignore | 1 + - plug-ins/print/.gitignore | 1 + - plug-ins/script-fu/.gitignore | 1 + + plug-ins/maze/.gitignore | 1 + + plug-ins/metadata/.gitignore | 3 + + plug-ins/pagecurl/.gitignore | 1 + + plug-ins/print/.gitignore | 1 + + plug-ins/script-fu/.gitignore | 1 + plug-ins/selection-to-path/.gitignore | 1 + - plug-ins/twain/.gitignore | 1 + - plug-ins/win-snap/.gitignore | 8 +- - tools/.gitignore | 2 + + plug-ins/twain/.gitignore | 1 + + plug-ins/win-snap/.gitignore | 8 +- + tools/.gitignore | 2 + 33 files changed, 190 insertions(+), 5 deletions(-) commit d93941df7c7035da0ded7fe7f30e261d12076401 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Jun 17 21:29:08 2009 +0200 +Date: Wed Jun 17 21:29:08 2009 +0200 Bug 563029 - Closing maximized image doesn't restore document window size @@ -92800,7 +93619,7 @@ commit e2d90e3e1fb08182c5a47928663b52310536e050 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Jun 17 21:14:32 2009 +0200 +Date: Wed Jun 17 21:14:32 2009 +0200 Bug 585488 – Perspective transformation on a layer with a mask causes crash @@ -92817,7 +93636,7 @@ commit 8423757d3f180a051fa4ac97de5cf431da3b1877 Author: Michael Natterer <mitch@gimp.org> -Date: Wed Jun 17 20:55:05 2009 +0200 +Date: Wed Jun 17 20:55:05 2009 +0200 Add forgotten #include "libgimpbase/gimpbase.h" @@ -92826,7 +93645,7 @@ commit bdd8d8e3fbc05bbbbd7852b71af675c644e6518a Author: Michael Natterer <mitch@gimp.org> -Date: Wed Jun 17 20:46:28 2009 +0200 +Date: Wed Jun 17 20:46:28 2009 +0200 Use more x,y,width,height instead of x1,y1,x2,y2 @@ -92836,17 +93655,17 @@ Update callers accordingly and use x,y,width,height there too except in gimpperspectiveclone.c which does better with a bounding box. - app/paint/gimpdodgeburn.c | 27 ++++++++++------- - app/paint/gimppaintcore.c | 62 + app/paint/gimpdodgeburn.c | 27 ++++++++++------- + app/paint/gimppaintcore.c | 62 +++++++++++++++++++--------------------- - app/paint/gimppaintcore.h | 16 +++++------ + app/paint/gimppaintcore.h | 16 +++++------ app/paint/gimpperspectiveclone.c | 8 ++++-- - app/paint/gimpsourcecore.c | 46 +++++++++++++++-------------- + app/paint/gimpsourcecore.c | 46 +++++++++++++++-------------- 5 files changed, 84 insertions(+), 75 deletions(-) commit 13cb156a80154c1109a2fde2f67bfd2775f46d2d Author: Michael Natterer <mitch@gimp.org> -Date: Tue Jun 16 22:59:07 2009 +0200 +Date: Tue Jun 16 22:59:07 2009 +0200 Get rid of more x1,y1,x2,y2 uglyness @@ -92854,16 +93673,16 @@ x,y,witdh,height and update all callers accordingly. app/core/gimpdrawable-combine.c | 11 ++++++++--- - app/core/gimpdrawable.c | 16 +++++++--------- - app/core/gimpdrawable.h | 8 ++++---- - app/core/gimpimagemap.c | 12 +++++------- - app/core/gimpselection.c | 4 +++- - app/paint/gimppaintcore.c | 2 +- + app/core/gimpdrawable.c | 16 +++++++--------- + app/core/gimpdrawable.h | 8 ++++---- + app/core/gimpimagemap.c | 12 +++++------- + app/core/gimpselection.c | 4 +++- + app/paint/gimppaintcore.c | 2 +- 6 files changed, 28 insertions(+), 25 deletions(-) commit 06a3b3a85a01403db4262e80e9cf63005be40dbd Author: Michael Natterer <mitch@gimp.org> -Date: Tue Jun 16 22:09:48 2009 +0200 +Date: Tue Jun 16 22:09:48 2009 +0200 Bug 586008 - GIMP crashes when right-click canceling a drawing action initiated outside layer boundaries @@ -92876,7 +93695,7 @@ commit 6049768abf710fa78f4c87e426ef045d142bdd79 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Jun 15 19:28:06 2009 +0200 +Date: Mon Jun 15 19:28:06 2009 +0200 Bug 578630 - File Creation Permission Bug Only for Some File Types: Creating as 644 (rw-r--r--) when should be 664 (rw-rw-r--) @@ -92886,17 +93705,17 @@ as with fopen(). app/widgets/gimpwidgets-utils.c | 2 +- - plug-ins/common/file-gbr.c | 2 +- - plug-ins/common/file-gih.c | 2 +- - plug-ins/common/file-pat.c | 2 +- - plug-ins/common/file-pnm.c | 2 +- + plug-ins/common/file-gbr.c | 2 +- + plug-ins/common/file-gih.c | 2 +- + plug-ins/common/file-pat.c | 2 +- + plug-ins/common/file-pnm.c | 2 +- plug-ins/common/file-tiff-save.c | 2 +- - tools/test-clipboard.c | 2 +- + tools/test-clipboard.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) commit efd6cd9bc36da40839aa3b76700cf8b2319091ca Author: Per Kongstad <p_kongstad@op.pl> -Date: Sun Jun 14 23:36:51 2009 +0200 +Date: Sun Jun 14 23:36:51 2009 +0200 Updated Danish translation @@ -92906,7 +93725,7 @@ commit 52087997f0e9f02a1c761385a76cf4b8253ca341 Author: Mads Lundby <lundbymads@gmail.com> -Date: Sun Jun 14 23:28:25 2009 +0200 +Date: Sun Jun 14 23:28:25 2009 +0200 Updated Danish translation @@ -92916,7 +93735,7 @@ commit 9af87c83aa7865a7fb598bb9b7f4562f0310c7b8 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Jun 11 22:22:11 2009 +0200 +Date: Thu Jun 11 22:22:11 2009 +0200 Speed up the gegl projection by a factor of about 4 @@ -92929,7 +93748,7 @@ commit 907971bab371d6da95a457c22971abb36f446053 Author: Michael Natterer <mitch@gimp.org> -Date: Thu Jun 11 13:41:05 2009 +0200 +Date: Thu Jun 11 13:41:05 2009 +0200 Bug 563966 - Edit - Copy _Visible Named tooltip can be improved @@ -92940,7 +93759,7 @@ commit 9b6c9e1fe4f46d2d47c6d97d4147cf060abd07f8 Author: Michael Natterer <mitch@gimp.org> -Date: Sun Jun 7 23:52:37 2009 +0200 +Date: Sun Jun 7 23:52:37 2009 +0200 Bug 155733 – need to check return values of gimp_drawable_mask_bounds() @@ -92950,23 +93769,23 @@ either). Also got rid of some x2 and y2 variables that are not needed any longer. - plug-ins/common/blinds.c | 10 ++++++---- + plug-ins/common/blinds.c | 10 ++++++---- plug-ins/common/blur-gauss-selective.c | 28 ++++++++++++++-------------- - plug-ins/common/blur.c | 8 +++++++- - plug-ins/common/deinterlace.c | 9 +++------ - plug-ins/common/despeckle.c | 28 ++++++++++++++-------------- - plug-ins/common/iwarp.c | 22 +++++++++++++++------- - plug-ins/common/mosaic.c | 12 ++++++++---- - plug-ins/common/pixelize.c | 19 +++++++++++++------ - plug-ins/common/polar-coords.c | 9 +++++---- - plug-ins/common/sharpen.c | 14 ++++++++------ - plug-ins/common/value-propagate.c | 13 ++++++++----- - plug-ins/common/warp.c | 14 +++++++++----- + plug-ins/common/blur.c | 8 +++++++- + plug-ins/common/deinterlace.c | 9 +++------ + plug-ins/common/despeckle.c | 28 ++++++++++++++-------------- + plug-ins/common/iwarp.c | 22 +++++++++++++++------- + plug-ins/common/mosaic.c | 12 ++++++++---- + plug-ins/common/pixelize.c | 19 +++++++++++++------ + plug-ins/common/polar-coords.c | 9 +++++---- + plug-ins/common/sharpen.c | 14 ++++++++------ + plug-ins/common/value-propagate.c | 13 ++++++++----- + plug-ins/common/warp.c | 14 +++++++++----- 12 files changed, 110 insertions(+), 76 deletions(-) commit 90db6c0891b4d4dc53f0172d74511ef0ce5f7ec8 Author: Nicholas Doyle <njdoyle@gmail.com> -Date: Sat Jun 6 13:18:02 2009 -0300 +Date: Sat Jun 6 13:18:02 2009 -0300 plug-ins: Add support for opening raw 16bit (RGB565) color images @@ -92976,7 +93795,7 @@ commit f3f7b280799bc16af6800d9dcf59d1cfddd3c625 Author: Alexia Death <alexiadeath@gmail.com> -Date: Sat Jun 6 19:25:13 2009 +0300 +Date: Sat Jun 6 19:25:13 2009 +0300 Fix for another potentially crashing and while. @@ -92988,7 +93807,7 @@ commit 38e901202372413635b3bbf3506a9d543f69e983 Author: Michael Natterer <mitch@gimp.org> -Date: Fri Jun 5 22:21:19 2009 +0200 +Date: Fri Jun 5 22:21:19 2009 +0200 Bug 575158 – default view prefs should affect no-image window @@ -93002,7 +93821,7 @@ commit 8f37a96d70fc9e3e5d6bd7aa6ca7cda2fea57483 Author: Sven Neumann <sven@gimp.org> -Date: Thu Jun 4 11:30:25 2009 +0200 +Date: Thu Jun 4 11:30:25 2009 +0200 only spit out debug output if TILE_PROFILING is defined @@ -93011,21 +93830,21 @@ commit b2fc6d287616d102c072dba27ff07758414410be Author: Sven Neumann <sven@gimp.org> -Date: Thu Jun 4 11:13:42 2009 +0200 +Date: Thu Jun 4 11:13:42 2009 +0200 whitespace and coding style cleanups - app/base/tile-cache.c | 146 + app/base/tile-cache.c | 146 ++++++++++++++++++++++++++---------------------- - app/base/tile-cache.h | 13 ++--- + app/base/tile-cache.h | 13 ++--- app/base/tile-manager.c | 1 + - app/base/tile-swap.c | 63 +++++++++++---------- - app/base/tile.c | 9 ++- + app/base/tile-swap.c | 63 +++++++++++---------- + app/base/tile.c | 9 ++- 5 files changed, 126 insertions(+), 106 deletions(-) commit ac680f1cbdf5d98912e81965fbe09e08ea6f51fe Author: Sven Neumann <sven@gimp.org> -Date: Thu Jun 4 10:49:38 2009 +0200 +Date: Thu Jun 4 10:49:38 2009 +0200 whitespace cleanup and removed inclusion of <sys/types.h> @@ -93034,7 +93853,7 @@ commit 717d8b4e5617914abca7e0fac2614b7a021aea2f Author: Monty <xiphmont@gmail.com> -Date: Wed May 27 20:40:50 2009 -0400 +Date: Wed May 27 20:40:50 2009 -0400 Correct startup flaw in idle swapper start. @@ -93055,7 +93874,7 @@ commit e925338321dbf3d84f75598ade0bd6de428f3a9b Author: Monty <xiphmont@gmail.com> -Date: Wed May 27 17:56:22 2009 -0400 +Date: Wed May 27 17:56:22 2009 -0400 Replace two list 'flush clean first' cache strategy with an LRU strategy. @@ -93066,16 +93885,16 @@ not as efficient under light load, but degrades more gracefully under moderate and heavy load. - app/base/tile-cache.c | 217 + app/base/tile-cache.c | 217 +++++++++++++++++++++++++++--------------------- app/base/tile-manager.c | 11 +-- app/base/tile-private.h | 2 +- - app/base/tile.c | 13 ++- + app/base/tile.c | 13 ++- 4 files changed, 135 insertions(+), 108 deletions(-) commit ac51a588d643e61bd21e444d93690a1a392a536f Author: Monty <xiphmont@gmail.com> -Date: Tue May 26 04:39:10 2009 -0400 +Date: Tue May 26 04:39:10 2009 -0400 Add additional profiling to tile usage. @@ -93087,17 +93906,17 @@ bitrotted some; it was no longer tracking changes made to tile memory outside of tile.c. - app/base/tile-cache.c | 72 ++++++++++++++++++++-- + app/base/tile-cache.c | 72 ++++++++++++++++++++-- app/base/tile-manager.c | 12 ++++ app/base/tile-private.h | 14 +++++ - app/base/tile-swap.c | 158 + app/base/tile-swap.c | 158 ++++++++++++++++++++++++++++++++++++++++++++++-- - app/base/tile.c | 14 ++--- + app/base/tile.c | 14 ++--- 5 files changed, 252 insertions(+), 18 deletions(-) commit 2eaa777314e02d018b9c8e0432f9221fe92e4786 Author: Monty <xiphmont@gmail.com> -Date: Mon May 25 03:05:03 2009 -0400 +Date: Mon May 25 03:05:03 2009 -0400 Optimize TILE_DATA_POINTER() macro @@ -93111,7 +93930,7 @@ commit 874e16c669da8b1412ac69d20925fb52469b8153 Author: Sven Neumann <sven@gimp.org> -Date: Tue Jun 2 23:50:20 2009 +0200 +Date: Tue Jun 2 23:50:20 2009 +0200 Bug 522483 – use gtk_show_uri() instead of calling firefox directly @@ -93122,7 +93941,7 @@ commit c8ef19d25d679bd9ab9ca959dfa497e345e7b65f Author: Sven Neumann <sven@gimp.org> -Date: Tue Jun 2 21:19:52 2009 +0200 +Date: Tue Jun 2 21:19:52 2009 +0200 add new plug-ins to POTFILES.in @@ -93131,7 +93950,7 @@ commit 030aa9b26d048dfabe3c2294ed0657cadc05857c Author: Sven Neumann <sven@gimp.org> -Date: Tue Jun 2 21:04:49 2009 +0200 +Date: Tue Jun 2 21:04:49 2009 +0200 plug-ins: minor coding style adjustments in file-xmc.c @@ -93141,24 +93960,24 @@ commit 27cec2c3f2fcb3a3aa728283bac52bf534c670f9 Author: Takeshi Matsuyama <tksmashiw@gmail.com> -Date: Wed May 27 12:04:35 2009 +0900 +Date: Wed May 27 12:04:35 2009 +0900 plug-ins: add X11 Mouse Cursor plug-in This commit adds a plug-in to read and write X11 mouse cursor files. - INSTALL | 5 + - configure.ac | 24 + - plug-ins/common/.gitignore | 1 + - plug-ins/common/Makefile.am | 19 + - plug-ins/common/file-xmc.c | 2320 + INSTALL | 5 + + configure.ac | 24 + + plug-ins/common/.gitignore | 1 + + plug-ins/common/Makefile.am | 19 + + plug-ins/common/file-xmc.c | 2320 ++++++++++++++++++++++++++++++++++++++++ plug-ins/common/plugin-defs.pl | 1 + 6 files changed, 2370 insertions(+) commit aac9e75ec34ccbdb9a0c96dc821622728c4b71b7 Author: Sven Neumann <sven@gimp.org> -Date: Tue Jun 2 20:34:21 2009 +0200 +Date: Tue Jun 2 20:34:21 2009 +0200 updated mkgen.pl script for use with git @@ -93170,7 +93989,7 @@ commit 77439d689e810eb4455d9f5576f1f4492b19c290 Author: Michael Natterer <mitch@gimp.org> -Date: Mon Jun 1 22:55:43 2009 +0200 +Date: Mon Jun 1 22:55:43 2009 +0200 Bug 584408 - If brush selection popup overlaps color gradient, clicks pass through @@ -93185,11 +94004,11 @@ commit af965d82ddfa3b5af0a786ab7e0a2a15df40c49b Author: Sven Neumann <sven@gimp.org> -Date: Mon Jun 1 20:02:19 2009 +0200 +Date: Mon Jun 1 20:02:19 2009 +0200 Bug 584345 – when printing, the number of copies should be reset to 1 - at each new GIMP session + at each new GIMP session Do not store the number of copies in the print-settings resource file, but keep it in the print-settings that are attached to the image. @@ -93199,7 +94018,7 @@ commit 5e79335cf3a2a3904b4c0524e541edc5ff6d61ba Author: Sven Neumann <sven@gimp.org> -Date: Mon Jun 1 19:47:19 2009 +0200 +Date: Mon Jun 1 19:47:19 2009 +0200 git: ignore config.h.in~ @@ -93208,13 +94027,13 @@ commit 6e581ca990326ca083986ae209443612439b3e51 Author: Aurimas Juška <aurimas.juska@gmail.com> -Date: Mon Jun 1 18:44:30 2009 +0200 +Date: Mon Jun 1 18:44:30 2009 +0200 Add JPEG2000 load plug-in written by Aurimas Juška - configure.ac | 27 +++ - plug-ins/common/.gitignore | 1 + - plug-ins/common/Makefile.am | 16 ++ + configure.ac | 27 +++ + plug-ins/common/.gitignore | 1 + + plug-ins/common/Makefile.am | 16 ++ plug-ins/common/file-jp2-load.c | 418 ++++++++++++++++++++++++++++++++++++++++ plug-ins/common/plugin-defs.pl | 1 + @@ -93222,18 +94041,18 @@ commit f255dcad8a259ff6c8e259ee5a9b9173cc405f4f Author: drtvasudevan <agnihot3@gmail.com> -Date: Sat May 30 10:23:45 2009 +0530 +Date: Sat May 30 10:23:45 2009 +0530 Added ta translation po-tips/LINGUAS | 1 + - po-tips/ta.po | 218 + po-tips/ta.po | 218 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 219 insertions(+) commit ac11569830f3dfcd20f4310b8000781b652e26fc Author: Sven Neumann <sven@gimp.org> -Date: Fri May 29 23:33:54 2009 +0200 +Date: Fri May 29 23:33:54 2009 +0200 app: fix the questionable while loop in another place @@ -93248,7 +94067,7 @@ commit 936df1a18346d86625b9ed0411f302c7a315bc02 Author: Alexia Death <alexiadeath@gmail.com> -Date: Fri May 29 22:26:57 2009 +0300 +Date: Fri May 29 22:26:57 2009 +0300 app: Fix gimp_display_shell_eval_event that had some questionable whiles @@ -93258,7 +94077,7 @@ commit c73b71810dcf831b7fa520092c7020e429e557d0 Author: Michael Natterer <mitch@gimp.org> -Date: Fri May 29 20:49:40 2009 +0200 +Date: Fri May 29 20:49:40 2009 +0200 Use g_strdup_printf() instead of g_new() and g_sprintf() @@ -93267,7 +94086,7 @@ commit b559354af1f5733e7495c933ecd9093bd886bf55 Author: Christopher Montgomery <xiphmont@gmail.com> -Date: Thu May 28 21:06:53 2009 +0200 +Date: Thu May 28 21:06:53 2009 +0200 plug-ins: Make sure to flush output in ts_stdout_output_func() @@ -93276,7 +94095,7 @@ commit d5fddb5ba989cd2af8cc5e846d6959ac84cd320e Author: Stephen Griffiths <scgmk4@hotmail.com> -Date: Thu May 28 22:52:41 2009 +1000 +Date: Thu May 28 22:52:41 2009 +1000 app: gimpuimanager.c formatting @@ -93286,7 +94105,7 @@ commit 9dbbbba8d41a5e0043ebc1e5531eb95fe1583b98 Author: Timo Jyrinki <timo.jyrinki@iki.fi> -Date: Thu May 28 15:09:56 2009 +0300 +Date: Thu May 28 15:09:56 2009 +0300 Updated Finnish translation by Aapo Rantalainen @@ -93296,7 +94115,7 @@ commit e11eff9eff7d0d0b8d9b8cb05ec39e6c3d1c7b12 Author: drtvasudevan <agnihot3@gmail.com> -Date: Thu May 28 15:34:22 2009 +0530 +Date: Thu May 28 15:34:22 2009 +0530 Added Tamil translation @@ -93305,7 +94124,7 @@ commit 40c39d4f4d400bc70010112a0736bce395ba2ba4 Author: drtvasudevan <agnihot3@gmail.com> -Date: Thu May 28 15:31:31 2009 +0530 +Date: Thu May 28 15:31:31 2009 +0530 Added Tamil translation @@ -93315,19 +94134,19 @@ commit 3d98b99a3da6ca6ac29df5b363aa646bdda3b517 Author: Kappa8086 <kappa8086@gmail.com> -Date: Thu May 28 17:17:33 2009 +0800 +Date: Thu May 28 17:17:33 2009 +0800 Updated Simplified Chinese translations. po-libgimp/zh_CN.po | 60 ++--- po-script-fu/zh_CN.po | 77 +++--- - po/zh_CN.po | 692 + po/zh_CN.po | 692 +++++++++++++++++++++++++++++--------------------- 3 files changed, 454 insertions(+), 375 deletions(-) commit 4c8b0f1f7ecac700ff85f1ec9ed58ba7824ba45b Author: Aurimas Juška <aurimas.juska@gmail.com> -Date: Tue May 26 21:25:09 2009 +0300 +Date: Tue May 26 21:25:09 2009 +0300 Bug 573614 – Tags dropdowns for brushes, patterns, @@ -93340,7 +94159,7 @@ commit a427213fb8ac54768b1a25261aec3da6e97ad421 Author: Sven Neumann <sven@gimp.org> -Date: Tue May 26 12:23:26 2009 +0200 +Date: Tue May 26 12:23:26 2009 +0200 app: fix use of GIMP_LOG=help @@ -93352,7 +94171,7 @@ commit 294154ed7612e46a7066392ba46d99a21b5a648b Author: Michael Natterer <mitch@gimp.org> -Date: Mon May 25 21:14:33 2009 +0200 +Date: Mon May 25 21:14:33 2009 +0200 Remove unused code without any effect @@ -93361,7 +94180,7 @@ commit 53c661312b45b9810af35ab302f8931209e45b91 Author: Michael Natterer <mitch@gimp.org> -Date: Mon May 25 20:49:34 2009 +0200 +Date: Mon May 25 20:49:34 2009 +0200 Add GimpCoords* parameter to gimp_paint_core_interpolate() @@ -93370,14 +94189,14 @@ in the paint tool simpler, but that needs further refactoring anyway. app/paint/gimppaintcore-stroke.c | 16 +++++++--------- - app/paint/gimppaintcore.c | 4 ++++ - app/paint/gimppaintcore.h | 1 + - app/tools/gimppainttool.c | 34 ++++++++++++++++++---------------- + app/paint/gimppaintcore.c | 4 ++++ + app/paint/gimppaintcore.h | 1 + + app/tools/gimppainttool.c | 34 ++++++++++++++++++---------------- 4 files changed, 30 insertions(+), 25 deletions(-) commit b1a81c56c74b18d010df1c92e04dd3628817d99d Author: Alexandre Prokoudine <alexandre.prokoudine@gmail.com> -Date: Mon May 25 20:31:44 2009 +0400 +Date: Mon May 25 20:31:44 2009 +0400 Updated Russian translation @@ -93387,27 +94206,27 @@ commit c9674b4603d3fc21636a07eb1c3ce3ee5001742f Author: Michael Natterer <mitch@gimp.org> -Date: Sun May 24 22:29:18 2009 +0200 +Date: Sun May 24 22:29:18 2009 +0200 Use the new GtkAction accessors instead of g_object_get()/set() - app/actions/debug-commands.c | 11 +++++------ - app/widgets/gimpaction.c | 15 +++++---------- - app/widgets/gimpactiongroup.c | 2 +- - app/widgets/gimpactionview.c | 21 ++++----------------- + app/actions/debug-commands.c | 11 +++++------ + app/widgets/gimpaction.c | 15 +++++---------- + app/widgets/gimpactiongroup.c | 2 +- + app/widgets/gimpactionview.c | 21 ++++----------------- app/widgets/gimpcontrollereditor.c | 7 ++----- - app/widgets/gimpdockable.c | 4 +--- - app/widgets/gimpeditor.c | 16 ++++------------ - app/widgets/gimpradioaction.c | 25 ++++++++++--------------- + app/widgets/gimpdockable.c | 4 +--- + app/widgets/gimpeditor.c | 16 ++++------------ + app/widgets/gimpradioaction.c | 25 ++++++++++--------------- app/widgets/gimpstringaction.c | 2 +- app/widgets/gimptoggleaction.c | 24 +++++++++--------------- - app/widgets/gimpuimanager.c | 9 ++------- + app/widgets/gimpuimanager.c | 9 ++------- app/widgets/gimpwidgets-utils.c | 14 +++++--------- 12 files changed, 49 insertions(+), 101 deletions(-) commit be21d3a1e377ab2553fa18bd3e2b779a23ec9f5d Author: Michael Natterer <mitch@gimp.org> -Date: Sun May 24 18:43:31 2009 +0200 +Date: Sun May 24 18:43:31 2009 +0200 Restrict the set of modifiers that prevent treeview item activation @@ -93421,20 +94240,20 @@ commit 582cb0f14eb9f145bd2a2f5c9fda12309ae0229f Author: Manish Singh <yosh@gimp.org> -Date: Sun May 24 10:42:39 2009 -0700 +Date: Sun May 24 10:42:39 2009 -0700 Explicitly specify library dependencies at link time, so we can use gold. - libgimpthumb/Makefile.am | 5 ++++- - plug-ins/common/Makefile.am | 11 ++++++----- - plug-ins/common/mkgen.pl | 11 ++++++----- + libgimpthumb/Makefile.am | 5 ++++- + plug-ins/common/Makefile.am | 11 ++++++----- + plug-ins/common/mkgen.pl | 11 ++++++----- plug-ins/help-browser/Makefile.am | 1 + 4 files changed, 17 insertions(+), 11 deletions(-) commit b64fe8779a656e57a5ce2d28e8f0e27f18004af2 Author: Manish Singh <yosh@gimp.org> -Date: Sun May 24 10:41:18 2009 -0700 +Date: Sun May 24 10:41:18 2009 -0700 Use gtk_orientable_set_orientation() instead of deprecated gtk_toolbar_set_orientation() @@ -93444,7 +94263,7 @@ commit 819281ebc885239481e2873e5bab346a2408009f Author: Manish Singh <yosh@gimp.org> -Date: Sun May 24 10:39:57 2009 -0700 +Date: Sun May 24 10:39:57 2009 -0700 gimp_enum_get_value() takes const char *'s @@ -93453,19 +94272,19 @@ commit 7d76f25e260d84452e6af4393d16c2e3725cf7cb Author: Manish Singh <yosh@gimp.org> -Date: Sun May 24 10:38:09 2009 -0700 +Date: Sun May 24 10:38:09 2009 -0700 Use gtk_activatable_set_related_action() instead of deprecated gtk_action_connect_proxy() - app/widgets/gimpeditor.c | 2 +- - app/widgets/gimpuimanager.c | 3 ++- + app/widgets/gimpeditor.c | 2 +- + app/widgets/gimpuimanager.c | 3 ++- plug-ins/help-browser/dialog.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) commit ef8dabcc7f69ae4c58e530a9dedfc4020938b6f1 Author: Sven Neumann <sven@gimp.org> -Date: Sun May 24 18:19:19 2009 +0200 +Date: Sun May 24 18:19:19 2009 +0200 tools: improve status-bar hints for the Curves tool @@ -93474,7 +94293,7 @@ commit 57066577f82cd88658854aa500e16dcba3062030 Author: Michael Natterer <mitch@gimp.org> -Date: Sun May 24 17:54:25 2009 +0200 +Date: Sun May 24 17:54:25 2009 +0200 Don't try to set stuff on a NULL image @@ -93486,7 +94305,7 @@ commit 5fe53062ebfd8e7683f26cd6723181674e2d62dc Author: Michael Natterer <mitch@gimp.org> -Date: Sun May 24 17:42:44 2009 +0200 +Date: Sun May 24 17:42:44 2009 +0200 Fix typo in the class' stock-id @@ -93495,7 +94314,7 @@ commit 6c02aaa80294449c0d25eb77083e762ad15cb8eb Author: Sven Neumann <sven@gimp.org> -Date: Sun May 24 17:24:28 2009 +0200 +Date: Sun May 24 17:24:28 2009 +0200 libgimpwidgets: set Clear icon sensitivity @@ -93507,7 +94326,7 @@ commit 149cc5da09a989ad9c807d176584f856b9f2d35d Author: Sven Neumann <sven@gimp.org> -Date: Sun May 24 17:06:17 2009 +0200 +Date: Sun May 24 17:06:17 2009 +0200 libgimpwidgets: check icon position in the 'icon-press' signal handler @@ -93516,7 +94335,7 @@ commit 1832ba6b37667f75183fed988ea4a6fa22bba723 Author: Sven Neumann <sven@gimp.org> -Date: Sun May 24 17:02:55 2009 +0200 +Date: Sun May 24 17:02:55 2009 +0200 libgimpwidgets: add a Clear icon to the GimpBrowser's Search entry @@ -93525,7 +94344,7 @@ commit 2f9e2662c4f7934018f388a53a04719af58236d0 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri May 22 22:45:08 2009 +0200 +Date: Fri May 22 22:45:08 2009 +0200 app: Don't activate container tree view items while modkey pressed @@ -93538,7 +94357,7 @@ commit d80549496ae087d75af8f055d6d0c8beba7db91f Author: Michael Natterer <mitch@gimp.org> -Date: Fri May 22 13:07:56 2009 +0200 +Date: Fri May 22 13:07:56 2009 +0200 Don't define required versions of libraries we don't depend on any longer @@ -93548,7 +94367,7 @@ commit a1dc35baca358515c26bb03e1a33b1cc7f40824b Author: Michael Schumacher <schumaml@gmx.de> -Date: Fri May 22 00:04:14 2009 +0200 +Date: Fri May 22 00:04:14 2009 +0200 [libgimp] Added missing export gimp_image_get_uri @@ -93557,7 +94376,7 @@ commit bd59c03a620cc20f5c11fd15b531190e467eb3b4 Author: Sven Neumann <sven@gimp.org> -Date: Thu May 21 14:40:17 2009 +0200 +Date: Thu May 21 14:40:17 2009 +0200 use wildcards so files from master and gimp-2-6 branch are ignored @@ -93567,7 +94386,7 @@ commit 0935bdde12e71177c838759d312160a867f7c103 Author: Sven Neumann <sven@gimp.org> -Date: Thu May 21 19:06:07 2009 +0200 +Date: Thu May 21 19:06:07 2009 +0200 formatting @@ -93576,7 +94395,7 @@ commit cbfe411ea15a4dcc6d919123022ed37bcd951b60 Author: Sven Neumann <sven@gimp.org> -Date: Thu May 21 19:00:37 2009 +0200 +Date: Thu May 21 19:00:37 2009 +0200 Bug 577301 – Dithering with transparency is broken for "positioned" method @@ -93589,7 +94408,7 @@ commit 35ac02e66d177db4094f655ba26bf40a0f01bf43 Author: Sven Neumann <sven@gimp.org> -Date: Thu May 21 18:49:51 2009 +0200 +Date: Thu May 21 18:49:51 2009 +0200 Bug 557061 – Alpha to Logo @@ -93602,7 +94421,7 @@ commit ed748fd383f96f6f0da0d9094bf7bea89f0eb60b Author: Sven Neumann <sven@gimp.org> -Date: Thu May 21 14:29:08 2009 +0200 +Date: Thu May 21 14:29:08 2009 +0200 Bug 472644 – Rotate with clipping crops the whole layer @@ -93614,7 +94433,7 @@ commit 9afa690a741332646328800ac0379261a347b21c Author: Sven Neumann <sven@gimp.org> -Date: Thu May 21 13:37:17 2009 +0200 +Date: Thu May 21 13:37:17 2009 +0200 app: fixed version checks for babl and GEGL @@ -93627,22 +94446,22 @@ commit e0453b44b16e3573b93d6348630c1e6a9fcfbede Author: Michael Natterer <mitch@gimp.org> -Date: Tue May 19 21:37:56 2009 +0200 +Date: Tue May 19 21:37:56 2009 +0200 Make some GimpCoords* params const Add const to GimpCoords* params in GimpBrush::select_brush() and want_null_motio(). - app/core/gimpbrush.c | 40 +++++++++++++++++----------------- - app/core/gimpbrush.h | 50 +++++++++++++++++++++--------------------- + app/core/gimpbrush.c | 40 +++++++++++++++++----------------- + app/core/gimpbrush.h | 50 +++++++++++++++++++++--------------------- app/core/gimpbrushpipe.c | 56 ++++++++++++++++++++++++------------------------ 3 files changed, 73 insertions(+), 73 deletions(-) commit 23386d72799f5bf19557ed44632552c92a4d5964 Author: Sven Neumann <s.neumann@raumfeld.com> -Date: Wed May 13 10:19:52 2009 +0200 +Date: Wed May 13 10:19:52 2009 +0200 spelling @@ -93651,7 +94470,7 @@ commit b74bc2c97e668d819873ef482ad88b1dfc5319f2 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon May 18 19:12:23 2009 +0200 +Date: Mon May 18 19:12:23 2009 +0200 app: Swap 'Export' and 'Export to' shortcuts @@ -93663,7 +94482,7 @@ commit a6d8c7c5c4d6ff28f2d9b77eba62cb623578d9ba Author: Sven Neumann <sven@gimp.org> -Date: Mon May 18 00:01:34 2009 +0200 +Date: Mon May 18 00:01:34 2009 +0200 Revert "Make some GimpCoords* params const" @@ -93675,7 +94494,7 @@ commit 063a6f03aa701ea5eaad3da0155ff2f481852aed Author: Michael Natterer <mitch@gimp.org> -Date: Sun May 17 23:14:19 2009 +0200 +Date: Sun May 17 23:14:19 2009 +0200 Make some GimpCoords* params const @@ -93688,7 +94507,7 @@ commit cee39b090fa12211e9d7d14cdb0625f6cd460846 Author: Michael Natterer <mitch@gimp.org> -Date: Sun May 17 22:45:06 2009 +0200 +Date: Sun May 17 22:45:06 2009 +0200 Add more GimpCoords* parameters to reduce usage of global paint_core states @@ -93702,12 +94521,12 @@ app/paint/gimpbrushcore.c | 94 ++++++++++++++++++++-------------------------- app/paint/gimpbrushcore.h | 4 ++ - app/paint/gimpclone.c | 1 + + app/paint/gimpclone.c | 1 + app/paint/gimpconvolve.c | 6 ++- app/paint/gimpdodgeburn.c | 4 +- app/paint/gimperaser.c | 4 +- - app/paint/gimpheal.c | 5 ++- - app/paint/gimpink.c | 9 +++-- + app/paint/gimpheal.c | 5 ++- + app/paint/gimpink.c | 9 +++-- app/paint/gimppaintbrush.c | 5 ++- app/paint/gimppaintcore.c | 13 +++++-- app/paint/gimppaintcore.h | 6 ++- @@ -93717,7 +94536,7 @@ commit 4514546471fbbb83855a426662ece5edb7dde6f2 Author: Michael Natterer <mitch@gimp.org> -Date: Sun May 17 19:15:17 2009 +0200 +Date: Sun May 17 19:15:17 2009 +0200 Use Ctrl+R for "Shrink Wrap" and Ctrl+Shift+R for "Fit in Window". Also use 2-5 for the zoom-in actions and Shift+2-5 for the zoom-out @@ -93729,7 +94548,7 @@ commit 34b5e999057d6a4ad9e33d16923eec0c05502ab9 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun May 17 14:49:04 2009 +0200 +Date: Sun May 17 14:49:04 2009 +0200 Rename configure.in to configure.ac @@ -93737,20 +94556,17 @@ file. Configure.ac is the recomended and promoted name in the autoconf manual. - INSTALL | 2 +- - configure.ac | 2094 - +++++++++++++++++++++++++++++++++++++++++ - configure.in | 2094 - ----------------------------------------- - devel-docs/release-howto.txt | 4 +- - menus/Makefile.am | 2 +- - plug-ins/imagemap/Makefile.am | 2 +- - plug-ins/pygimp/INSTALL | 2 +- - 7 files changed, 2100 insertions(+), 2100 deletions(-) + INSTALL | 2 +- + configure.in => configure.ac | 2 +- + devel-docs/release-howto.txt | 4 ++-- + menus/Makefile.am | 2 +- + plug-ins/imagemap/Makefile.am | 2 +- + plug-ins/pygimp/INSTALL | 2 +- + 6 files changed, 7 insertions(+), 7 deletions(-) commit b4654d5c8d83618624f86a2f35de4c65ae4ba216 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun May 17 14:11:35 2009 +0200 +Date: Sun May 17 14:11:35 2009 +0200 Update .gitignore @@ -93759,7 +94575,7 @@ commit 2253ae52e9f59c31f85fc288c91a3b7c7de20691 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun May 17 14:01:36 2009 +0200 +Date: Sun May 17 14:01:36 2009 +0200 Revert "plug-ins: Change 'Screenshot' menu label to 'From Screenshot'" @@ -93771,7 +94587,7 @@ commit 34dbc7b2289aae37606d80f7ceb6bb6c5009ac9c Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun May 17 13:29:27 2009 +0200 +Date: Sun May 17 13:29:27 2009 +0200 plug-ins: Change 'Screenshot' menu label to 'From Screenshot' @@ -93783,7 +94599,7 @@ commit bcee243fa349c082e9405cf591291576bbf0581b Author: Fredrik Alströmer <roe@excu.se> -Date: Sun May 17 11:33:35 2009 +0200 +Date: Sun May 17 11:33:35 2009 +0200 Bug 76616 – Size entry widgets could use some simple math @@ -93794,17 +94610,17 @@ The parser also handles basic expresions such as "20cm + 20px" and "2 * 3.14in". - libgimpwidgets/Makefile.am | 29 ++- - libgimpwidgets/gimpeevl.c | 579 + libgimpwidgets/Makefile.am | 29 ++- + libgimpwidgets/gimpeevl.c | 579 +++++++++++++++++++++++++++++++++++++++++ - libgimpwidgets/gimpeevl.h | 67 +++++ + libgimpwidgets/gimpeevl.h | 67 +++++ libgimpwidgets/gimpsizeentry.c | 212 ++++++++++++++- - libgimpwidgets/test-eevl.c | 191 ++++++++++++++ + libgimpwidgets/test-eevl.c | 191 ++++++++++++++ 5 files changed, 1063 insertions(+), 15 deletions(-) commit 6742ebc94965af3e07fd713aa1cb602e6d3ee1fd Author: Sven Neumann <sven@gimp.org> -Date: Sun May 17 11:02:31 2009 +0200 +Date: Sun May 17 11:02:31 2009 +0200 app: don't call gimp_ui_manager_update() directly @@ -93818,7 +94634,7 @@ commit f24ff4aca2bba4961e744547b7b84a9e1985874a Author: Sven Neumann <sven@gimp.org> -Date: Sun May 17 11:01:28 2009 +0200 +Date: Sun May 17 11:01:28 2009 +0200 formatting @@ -93828,7 +94644,7 @@ commit 9738db7ca86dcc1546507ec86f54ff4e57cdefc5 Author: Sven Neumann <sven@gimp.org> -Date: Sun May 17 11:00:46 2009 +0200 +Date: Sun May 17 11:00:46 2009 +0200 minor change to improve readability, formatting @@ -93837,7 +94653,7 @@ commit 02551507dc3ce7943cdf1c0c028c71e60212e3fb Author: Sven Neumann <sven@gimp.org> -Date: Sun May 17 10:39:56 2009 +0200 +Date: Sun May 17 10:39:56 2009 +0200 minor change to improve readability @@ -93846,7 +94662,7 @@ commit c82f1e5ed9cb0b4defbad392da3c31fc224ee13a Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun May 17 08:35:00 2009 +0200 +Date: Sun May 17 08:35:00 2009 +0200 pdb: Update fileops.pdb @@ -93857,7 +94673,7 @@ commit 08beda17a23ebbc754ffec107083d06e02fc8d1a Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun May 17 08:30:13 2009 +0200 +Date: Sun May 17 08:30:13 2009 +0200 app: Update out-of-date comment on default export type @@ -93866,7 +94682,7 @@ commit d62a057e16a37e2f26d9d91aa6963a5fd0ee60f4 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat May 16 19:42:59 2009 +0200 +Date: Sat May 16 19:42:59 2009 +0200 app: Update 'Export to' after doing an export @@ -93877,7 +94693,7 @@ commit e392af5cb6008ee6d8b1c465a25cea211cfc36c1 Author: Sven Neumann <sven@gimp.org> -Date: Sat May 16 17:32:57 2009 +0200 +Date: Sat May 16 17:32:57 2009 +0200 app: improved a translatable string, formatting @@ -93886,7 +94702,7 @@ commit 131a42c5744750d85b8b085baf6ef2be0e92742f Author: Sven Neumann <sven@gimp.org> -Date: Sat May 16 17:28:43 2009 +0200 +Date: Sat May 16 17:28:43 2009 +0200 added missing file with translatable messages @@ -93895,7 +94711,7 @@ commit 80428dccf5f5fc89230bd9b94b33780ac174ea66 Author: Sven Neumann <sven@gimp.org> -Date: Sat May 16 16:14:58 2009 +0200 +Date: Sat May 16 16:14:58 2009 +0200 update run-time version checks for glib and gtk+ @@ -93905,7 +94721,7 @@ commit 86f16182610c34dd6967ac74adf1616194b62cb4 Author: Sven Neumann <sven@gimp.org> -Date: Sat May 16 16:10:05 2009 +0200 +Date: Sat May 16 16:10:05 2009 +0200 update the glib and gtk+ requirements we require a recent git checkout from GEGL, so check for 0.0.23 @@ -93916,7 +94732,7 @@ commit 2ff4bbd1111543bbc7567eb9a9864b0ce64cdef9 Author: Stephen Griffiths <scgmk4@hotmail.com> -Date: Tue May 5 21:38:23 2009 +1000 +Date: Tue May 5 21:38:23 2009 +1000 make action_message() visible externally and use it. @@ -93937,16 +94753,16 @@ * app/tools/gimpcoloroptions.c: added "average-radius" blurb and mark for translarion - app/actions/actions.c | 15 ++++-------- - app/actions/actions.h | 4 ++++ + app/actions/actions.c | 15 ++++-------- + app/actions/actions.h | 4 ++++ app/actions/context-commands.c | 53 ++++++++++++++++++++++++++++++++++++++++++ - app/tools/gimpcoloroptions.c | 3 ++- + app/tools/gimpcoloroptions.c | 3 ++- 4 files changed, 64 insertions(+), 11 deletions(-) commit 40fde28a620f4009ac207528deb0b6de9950ab36 Author: Stephen Griffiths <scgmk4@hotmail.com> -Date: Mon Apr 27 19:01:11 2009 +1000 +Date: Mon Apr 27 19:01:11 2009 +1000 Add status bar feedback for keyboard changes to brush paramaters. @@ -93967,13 +94783,13 @@ app/actions/context-commands.c | 81 ++++++++++++++++++++---------------------- - app/core/gimpbrush.c | 3 +- - app/paint/gimppaintoptions.c | 2 +- + app/core/gimpbrush.c | 3 +- + app/paint/gimppaintoptions.c | 2 +- 3 files changed, 41 insertions(+), 45 deletions(-) commit d603b391c8956b03cc0e74023583c33f5641da88 Author: Sven Neumann <sven@gimp.org> -Date: Sat May 16 14:53:57 2009 +0200 +Date: Sat May 16 14:53:57 2009 +0200 app: improved internationalisation, added translator comment @@ -93982,7 +94798,7 @@ commit 9cf6214c745fe3e4f296a5ba321403412b724255 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat May 16 14:42:17 2009 +0200 +Date: Sat May 16 14:42:17 2009 +0200 app: Sort 'Dump Keyboard Shortcuts' output @@ -93991,7 +94807,7 @@ commit a3a756091d3ba31a28077682ce4823d7a08ac3b0 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Apr 25 23:58:57 2009 +0200 +Date: Sat Apr 25 23:58:57 2009 +0200 app: Use Ctrl+E and Ctrl+Shift+E for export @@ -94003,9 +94819,9 @@ 2 files changed, 4 insertions(+), 4 deletions(-) commit cd8829b91b3ad0822692883787f58961e0c9bb36 -Merge: 5db0b72 c03c93b +Merge: 5db0b727d6 c03c93ba44 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat May 16 13:03:52 2009 +0200 +Date: Sat May 16 13:03:52 2009 +0200 Merge branch 'save-plus-export-base' @@ -94023,7 +94839,7 @@ commit c03c93ba44ec14fd7ffc9ce688c174ff7e87d798 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat May 16 12:41:24 2009 +0200 +Date: Sat May 16 12:41:24 2009 +0200 app: Don't bother asking for overwrite if the extension is invalid @@ -94033,7 +94849,7 @@ commit 3ce09f9684b8ceec2627b661a796f8d3f708fb97 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat May 16 11:29:48 2009 +0200 +Date: Sat May 16 11:29:48 2009 +0200 app: Show message about exported image in the statusrow @@ -94043,21 +94859,21 @@ commit c23370c3af216080437859391bc303a588f562f3 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat May 16 11:28:53 2009 +0200 +Date: Sat May 16 11:28:53 2009 +0200 app: Emit the GimpImage::exported signal when image is exported - app/actions/file-commands.c | 4 ++-- + app/actions/file-commands.c | 4 ++-- app/dialogs/file-save-dialog.c | 4 +++- app/dialogs/file-save-dialog.h | 1 + - app/file/file-save.c | 6 +++++- - app/file/file-save.h | 1 + - app/widgets/gimpdnd-xds.c | 13 +++++++++---- + app/file/file-save.c | 6 +++++- + app/file/file-save.h | 1 + + app/widgets/gimpdnd-xds.c | 13 +++++++++---- 6 files changed, 21 insertions(+), 8 deletions(-) commit 200c0025160b768a0865533b32f8b53f35dd33c9 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat May 16 11:27:45 2009 +0200 +Date: Sat May 16 11:27:45 2009 +0200 app: Add "exported" signal to GimpImage @@ -94067,7 +94883,7 @@ commit 2fcf33db5dc8daef5a518f3fa6e29ed5d155566c Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue May 5 03:04:21 2009 +0200 +Date: Tue May 5 03:04:21 2009 +0200 app: Don't reset save-a-copy URI on URI change @@ -94076,19 +94892,19 @@ commit d8f3cd1b2603a59987443ea4692e81ad956759ad Author: Martin Nordholts <martinn@src.gnome.org> -Date: Tue May 5 03:00:53 2009 +0200 +Date: Tue May 5 03:00:53 2009 +0200 app: Support default types for save and export - app/file/file-utils.c | 55 + app/file/file-utils.c | 55 ++++++++++++++++++++++++++++++++++++++++---- - app/file/file-utils.h | 2 ++ + app/file/file-utils.h | 2 ++ app/widgets/gimpfiledialog.c | 40 +++++++++++++++++++++++++++++++- 3 files changed, 92 insertions(+), 5 deletions(-) commit 3122eb491fb36155f0b60bd55e2e3af95e28bc87 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri May 1 17:04:26 2009 +0200 +Date: Fri May 1 17:04:26 2009 +0200 app: Implement save and export dialog default paths and filenames @@ -94098,7 +94914,7 @@ commit 11e5ecc5cab3b9a25a69ebd4a40ef3f17edcbd8d Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun May 3 10:17:59 2009 +0200 +Date: Sun May 3 10:17:59 2009 +0200 app: Update 'Export to' to the most recent export URI @@ -94110,17 +94926,17 @@ commit 72bc3aeed33a3f4d577c5f45a18ae4a69b566907 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun May 3 10:07:13 2009 +0200 +Date: Sun May 3 10:07:13 2009 +0200 app: Remember last export URI for each image app/dialogs/file-save-dialog.c | 25 +++++++++++++++++++------ - app/file/gimp-file.h | 2 ++ + app/file/gimp-file.h | 2 ++ 2 files changed, 21 insertions(+), 6 deletions(-) commit 9625c4610e85fee21eaf707cbd8beb482f551c90 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri May 1 17:04:06 2009 +0200 +Date: Fri May 1 17:04:06 2009 +0200 app: Store entire source URI for a duplicated image @@ -94130,22 +94946,22 @@ commit d3353f721b36213129aef7c7574a312cefe30f45 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Apr 26 08:24:02 2009 +0200 +Date: Sun Apr 26 08:24:02 2009 +0200 app: Rename 'Save as Template' to 'Create Template' Rename 'Save as Template' to 'Create Template' in the File menu. app/actions/file-actions.c | 22 +++++++++++----------- - app/actions/file-commands.c | 6 +++--- - app/actions/file-commands.h | 2 +- - app/widgets/gimphelp-ids.h | 1 + - menus/image-menu.xml.in | 2 +- + app/actions/file-commands.c | 6 +++--- + app/actions/file-commands.h | 2 +- + app/widgets/gimphelp-ids.h | 1 + + menus/image-menu.xml.in | 2 +- 5 files changed, 17 insertions(+), 16 deletions(-) commit 46a1afebcdd2c095fdfa4447de9ecf62709205f6 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Apr 26 16:14:09 2009 +0200 +Date: Sun Apr 26 16:14:09 2009 +0200 app: In some cases, fall back to export procs in absence of save proc @@ -94158,7 +94974,7 @@ commit 7a771a09d312a6ac96bad5b01c10b2472a4fce61 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Apr 26 17:44:10 2009 +0200 +Date: Sun Apr 26 17:44:10 2009 +0200 app: Implement 'File -> Export to' @@ -94170,7 +94986,7 @@ commit 64f7d9b93bcba2ba32b3f276ec189899a32cf973 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Apr 25 21:46:25 2009 +0200 +Date: Sat Apr 25 21:46:25 2009 +0200 app: Improve save and export error messages @@ -94180,39 +94996,39 @@ commit 10226ae4531407de438d9c0d66a2d244eb1a4f07 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Apr 25 10:54:56 2009 +0200 +Date: Sat Apr 25 10:54:56 2009 +0200 app: Show the Export Image dialog on File -> Export... Create a export dialog constructor in the dialog factory and invoke it on File -> Export - app/actions/file-commands.c | 59 + app/actions/file-commands.c | 59 ++++++++++++++++++++++++++++++++++++++ app/dialogs/dialogs-constructors.c | 8 ++++++ app/dialogs/dialogs-constructors.h | 3 ++ - app/dialogs/dialogs.c | 2 ++ + app/dialogs/dialogs.c | 2 ++ 4 files changed, 72 insertions(+) commit 0971d61fc4be3e846e3d218595465e0ad64e9061 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Apr 25 10:51:07 2009 +0200 +Date: Sat Apr 25 10:51:07 2009 +0200 app: Add an 'export' mode to the file save dialog - app/actions/file-commands.c | 2 +- + app/actions/file-commands.c | 2 +- app/dialogs/dialogs-constructors.c | 2 +- app/dialogs/file-save-dialog.c | 75 ++++++++++++++++++++++++++++++-------- app/dialogs/file-save-dialog.h | 3 +- - app/file/gimp-file.h | 1 + - app/widgets/gimpfiledialog.c | 7 +++- - app/widgets/gimpfiledialog.h | 2 + + app/file/gimp-file.h | 1 + + app/widgets/gimpfiledialog.c | 7 +++- + app/widgets/gimpfiledialog.h | 2 + 7 files changed, 72 insertions(+), 20 deletions(-) commit 3025dac65379c6e37aded06369208e1750a8862c Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri Apr 24 07:36:41 2009 +0200 +Date: Fri Apr 24 07:36:41 2009 +0200 app: Introduce and use GimpFileChooserAction @@ -94221,14 +95037,14 @@ app/dialogs/file-open-dialog.c | 2 +- app/dialogs/file-save-dialog.c | 2 +- - app/widgets/gimpfiledialog.c | 33 ++++++++++++++++++--------------- - app/widgets/gimpfiledialog.h | 2 +- - app/widgets/widgets-enums.h | 7 +++++++ + app/widgets/gimpfiledialog.c | 33 ++++++++++++++++++--------------- + app/widgets/gimpfiledialog.h | 2 +- + app/widgets/widgets-enums.h | 7 +++++++ 5 files changed, 28 insertions(+), 18 deletions(-) commit acef48602ccc9cd7bc2165620d96761427453496 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Apr 26 15:40:45 2009 +0200 +Date: Sun Apr 26 15:40:45 2009 +0200 app: Separate save procs from export procs @@ -94240,7 +95056,7 @@ commit 58eda135481167674c3d4a9a38da27519974bd90 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Apr 26 15:20:06 2009 +0200 +Date: Sun Apr 26 15:20:06 2009 +0200 app: Add GimpPlugInManager::export_procs member @@ -94248,13 +95064,13 @@ the export procedures. app/plug-in/gimppluginmanager-restore.c | 5 ++++- - app/plug-in/gimppluginmanager.c | 15 ++++++++++++--- - app/plug-in/gimppluginmanager.h | 1 + + app/plug-in/gimppluginmanager.c | 15 ++++++++++++--- + app/plug-in/gimppluginmanager.h | 1 + 3 files changed, 17 insertions(+), 4 deletions(-) commit e9ed9ce6cba3892ac2f69195e534482f94aee782 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Apr 25 15:28:08 2009 +0200 +Date: Sat Apr 25 15:28:08 2009 +0200 app: Add file_procedure_in_group() @@ -94267,7 +95083,7 @@ commit e3f57fbd38e20b6eb671cd996f61a66c2e57d0ff Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Apr 26 13:00:25 2009 +0200 +Date: Sun Apr 26 13:00:25 2009 +0200 app: Support File -> Revert of imported images @@ -94279,7 +95095,7 @@ commit 88e1064ed3f808f1dcb422798ae3093927a99e9c Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Apr 26 10:15:35 2009 +0200 +Date: Sun Apr 26 10:15:35 2009 +0200 app: Show imported image basename in titlebar @@ -94292,7 +95108,7 @@ commit a452fd918841090bfb49d7e9cbc98ac4b3bd8331 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Apr 26 11:39:38 2009 +0200 +Date: Sun Apr 26 11:39:38 2009 +0200 app: Update sensitivity and labels for export menu items @@ -94301,7 +95117,7 @@ commit e8531ce9477f5e4959129b9beebcf8c4f471813a Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Apr 23 20:44:12 2009 +0200 +Date: Thu Apr 23 20:44:12 2009 +0200 app: When importing a file, setup image state properly @@ -94316,7 +95132,7 @@ commit c1a226bc749dea0d9a59fe01e0e5d78a7efd5166 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Apr 23 18:59:40 2009 +0200 +Date: Thu Apr 23 18:59:40 2009 +0200 app: Rearrange menu items for Save + export @@ -94325,16 +95141,16 @@ by rearranging the menu items according to it and adding necessary stuff like help ids. - app/actions/actions-types.h | 4 +++- + app/actions/actions-types.h | 4 +++- app/actions/file-actions.c | 14 +++++++++++++- - app/actions/file-commands.c | 5 +++++ - app/widgets/gimphelp-ids.h | 4 +++- - menus/image-menu.xml.in | 7 ++++++- + app/actions/file-commands.c | 5 +++++ + app/widgets/gimphelp-ids.h | 4 +++- + menus/image-menu.xml.in | 7 ++++++- 5 files changed, 30 insertions(+), 4 deletions(-) commit 5db0b727d6391d1495bc8de022bc61162fb50d8b Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat May 16 00:05:15 2009 +0200 +Date: Sat May 16 00:05:15 2009 +0200 app: Don't set NULL URIs through GIMP_FILE_SAVE_LAST_URI_KEY @@ -94343,7 +95159,7 @@ commit 9dd5420d070967947544792f4c61dd2be638eefa Author: Michael Natterer <mitch@gimp.org> -Date: Sat May 16 00:37:04 2009 +0200 +Date: Sat May 16 00:37:04 2009 +0200 Depend on GLib >= 2.20.0 and GTK+ >= 2.16.1. Disable deprecated API for GLib < 2.23.0 and GTK+ < 2.19.0. @@ -94353,7 +95169,7 @@ commit f10bf1d7fdaa06b6a3266df1d344e715af234627 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun May 10 23:58:27 2009 +0200 +Date: Sun May 10 23:58:27 2009 +0200 app: Fix save overwrite logic for files with added extensions @@ -94368,7 +95184,7 @@ commit 8033f4c0d508e86dee233641981932e30e4a6ec1 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun May 10 21:35:43 2009 +0200 +Date: Sun May 10 21:35:43 2009 +0200 app: Fix potential memory leak in save dialog code @@ -94381,20 +95197,20 @@ commit 2d1b3ddf725792102e7ddd5523d0f8bea3d0c101 Author: Sven Neumann <sven@gimp.org> -Date: Tue May 12 09:44:58 2009 +0200 +Date: Tue May 12 09:44:58 2009 +0200 help-browser: removed obsolete check for zoom API Removed the check for the webkit zoom API and compile the respective code unconditionally. - configure.in | 9 --------- + configure.in | 9 --------- plug-ins/help-browser/dialog.c | 12 ------------ 2 files changed, 21 deletions(-) commit 2f4e3b236bc4573373a9d251dc502e55975b7beb Author: Sven Neumann <sven@gimp.org> -Date: Tue May 12 09:42:29 2009 +0200 +Date: Tue May 12 09:42:29 2009 +0200 configure: require webkit-1.0 >= 1.1.0 @@ -94403,7 +95219,7 @@ commit 02960ed3bdcaac7ed318458cff908b3b1ba08641 Author: Sven Neumann <sven@gimp.org> -Date: Tue May 12 09:39:21 2009 +0200 +Date: Tue May 12 09:39:21 2009 +0200 help-browser: fix history menus @@ -94418,7 +95234,7 @@ commit 259f3bd2ba74a19cd9ac5316e6d2a34fef3b09b5 Author: Sven Neumann <s.neumann@raumfeld.com> -Date: Fri May 8 16:24:15 2009 +0200 +Date: Fri May 8 16:24:15 2009 +0200 Fixed procedure name and internationalisation. Use a spin-button for the font-size. @@ -94428,7 +95244,7 @@ commit 61c065d2446e2955515f183276d43a0e4b83e884 Author: Sven Neumann <s.neumann@raumfeld.com> -Date: Fri May 8 16:15:47 2009 +0200 +Date: Fri May 8 16:15:47 2009 +0200 Use the proper API to locate the user gimp directory @@ -94436,9 +95252,9 @@ 1 file changed, 2 insertions(+), 5 deletions(-) commit 92479771964737fd66f525651fa69b99158be699 -Merge: 1c33708 4e40ff7 +Merge: 1c33708f5a 4e40ff7e65 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat May 9 20:48:46 2009 +0200 +Date: Sat May 9 20:48:46 2009 +0200 Merge branch 'minor-fixes' @@ -94451,7 +95267,7 @@ commit 4e40ff7e6509b4d14350a6c9895b8da5977a94d0 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu May 7 15:43:48 2009 +0200 +Date: Thu May 7 15:43:48 2009 +0200 app: Untabify gimpfiledialog.c @@ -94460,7 +95276,7 @@ commit f96bc446a6fe468021ce98356ea73889bfb6c361 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu May 7 15:32:35 2009 +0200 +Date: Thu May 7 15:32:35 2009 +0200 Minor formating fix in HACKING @@ -94469,7 +95285,7 @@ commit 1c33708f5ab10e7ded58cfb506ab847a266d3f62 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri May 8 17:40:13 2009 +0200 +Date: Fri May 8 17:40:13 2009 +0200 app: Add File -> Debug -> Dump Keyboard Shortcuts menu command @@ -94487,7 +95303,7 @@ commit 2aa81d432065dda08c48206a7a9cc6253bcead3c Author: Fotis Tsamis <ftsamis@gmail.com> -Date: Fri May 8 18:19:41 2009 +0100 +Date: Fri May 8 18:19:41 2009 +0100 Updated Greek translation @@ -94497,18 +95313,18 @@ commit 9779233d87335608c78a578b9f0b21b897513fa2 Author: João S. O. Bueno <gwidion@mpc.com.br> -Date: Thu May 7 12:33:03 2009 -0300 +Date: Thu May 7 12:33:03 2009 -0300 - New script for creating pipe brushes from typed text + New script for creating pipe brushes from typed text - plug-ins/pygimp/plug-ins/Makefile.am | 3 +- + plug-ins/pygimp/plug-ins/Makefile.am | 3 +- plug-ins/pygimp/plug-ins/text-brush.py | 97 ++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 1 deletion(-) commit 111615cd7fa033caeee136c0db4d8108b382a002 Author: Shankar Prasad <svenkate@redhat.com> -Date: Thu May 7 18:12:40 2009 +0530 +Date: Thu May 7 18:12:40 2009 +0530 Updated Kannada translations @@ -94517,7 +95333,7 @@ commit e3060f4be258416e81ee1b8a871d51415a2e01c8 Author: Shankar Prasad <svenkate@redhat.com> -Date: Thu May 7 18:11:39 2009 +0530 +Date: Thu May 7 18:11:39 2009 +0530 Updated Kannada translations @@ -94527,20 +95343,20 @@ commit 9c2aae1281dbf2cdab8e78475ac1dc79f6e5c020 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Wed May 6 17:09:31 2009 +0200 +Date: Wed May 6 17:09:31 2009 +0200 app: Update name of file_save_dialog_save_image() parameter Rename file_save_dialog_save_image() parameter save_a_copy to change_saved_state since that is the semantics it has now. - app/actions/file-commands.c | 2 +- + app/actions/file-commands.c | 2 +- app/dialogs/file-save-dialog.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) commit a0d9f6e57eecb6bb1e5a9de32f2c422ceeb24cda Author: Martin Nordholts <martinn@src.gnome.org> -Date: Wed May 6 15:03:30 2009 +0200 +Date: Wed May 6 15:03:30 2009 +0200 app: Rename file_save() parameter save_a_copy to change_saved_state @@ -94548,14 +95364,14 @@ that is the semantics it has now. app/dialogs/file-save-dialog.c | 2 +- - app/file/file-save.c | 4 ++-- - app/file/file-save.h | 2 +- - app/widgets/gimpdnd-xds.c | 2 +- + app/file/file-save.c | 4 ++-- + app/file/file-save.h | 2 +- + app/widgets/gimpdnd-xds.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) commit edac194b23f84bdfb1ee01654b01479845707d65 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon May 4 21:00:41 2009 +0200 +Date: Mon May 4 21:00:41 2009 +0200 app: Move save-on-copy URI remembering to the appropriate place @@ -94566,12 +95382,12 @@ remembered. app/dialogs/file-save-dialog.c | 21 ++++++++++++++++++++- - app/file/file-save.c | 14 +------------- + app/file/file-save.c | 14 +------------- 2 files changed, 21 insertions(+), 14 deletions(-) commit 0da1c4cb7c98057707ca01cc04d7f26252511e0b Author: Michael Natterer <mitch@gimp.org> -Date: Sun May 3 12:19:07 2009 +0200 +Date: Sun May 3 12:19:07 2009 +0200 Some style cleanup. @@ -94581,7 +95397,7 @@ commit 07ba32d6f8458ccfabfcb8debcd5335efe013050 Author: Michael Natterer <mitch@gimp.org> -Date: Sun May 3 12:08:21 2009 +0200 +Date: Sun May 3 12:08:21 2009 +0200 Stop accessing GimpPaintCore's coords members directly (no encapsulation yet). @@ -94614,28 +95430,28 @@ free of direct access to the paint core's coords members. More to come... - app/paint/gimpairbrush.c | 25 +++-- - app/paint/gimpbrushcore.c | 193 + app/paint/gimpairbrush.c | 25 +++-- + app/paint/gimpbrushcore.c | 193 ++++++++++++++++++++++----------------- - app/paint/gimpclone.c | 8 +- - app/paint/gimpconvolve.c | 41 +++++---- - app/paint/gimpdodgeburn.c | 16 ++-- - app/paint/gimperaser.c | 16 ++-- - app/paint/gimpheal.c | 8 +- - app/paint/gimpink.c | 36 +++++--- - app/paint/gimppaintbrush.c | 14 +-- - app/paint/gimppaintbrush.h | 1 + - app/paint/gimppaintcore.c | 43 +++++++++ - app/paint/gimppaintcore.h | 11 +++ + app/paint/gimpclone.c | 8 +- + app/paint/gimpconvolve.c | 41 +++++---- + app/paint/gimpdodgeburn.c | 16 ++-- + app/paint/gimperaser.c | 16 ++-- + app/paint/gimpheal.c | 8 +- + app/paint/gimpink.c | 36 +++++--- + app/paint/gimppaintbrush.c | 14 +-- + app/paint/gimppaintbrush.h | 1 + + app/paint/gimppaintcore.c | 43 +++++++++ + app/paint/gimppaintcore.h | 11 +++ app/paint/gimpperspectiveclone.c | 16 ++-- - app/paint/gimpsmudge.c | 51 ++++++----- - app/paint/gimpsourcecore.c | 24 +++-- - app/paint/gimpsourcecore.h | 4 +- + app/paint/gimpsmudge.c | 51 ++++++----- + app/paint/gimpsourcecore.c | 24 +++-- + app/paint/gimpsourcecore.h | 4 +- 16 files changed, 313 insertions(+), 194 deletions(-) commit 82d327a550135820c313ac21e328d8800c0bab8d Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun May 3 09:29:04 2009 +0200 +Date: Sun May 3 09:29:04 2009 +0200 Revert "app: Move last-save URI management to file_save()" @@ -94643,12 +95459,12 @@ can't save the last-save-URI on such a low level. app/dialogs/file-save-dialog.c | 4 ++++ - app/file/file-save.c | 4 ---- + app/file/file-save.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) commit f6cd700dd606be2112d746b0293f7f181c782245 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat May 2 22:41:08 2009 +0200 +Date: Sat May 2 22:41:08 2009 +0200 app: Move last-save URI management to file_save() @@ -94656,24 +95472,24 @@ file_save_dialog_response() to the more central place file_save(). app/dialogs/file-save-dialog.c | 4 ---- - app/file/file-save.c | 4 ++++ + app/file/file-save.c | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) commit 8064bbf22ec7527da05cb79513d8b79e71e91b6b Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun May 3 08:34:39 2009 +0200 +Date: Sun May 3 08:34:39 2009 +0200 app: Pass Gimp instead of GimpContext to file_save() app/dialogs/file-save-dialog.c | 4 ++-- - app/file/file-save.c | 9 +++++---- - app/file/file-save.h | 4 ++-- - app/widgets/gimpdnd-xds.c | 4 ++-- + app/file/file-save.c | 9 +++++---- + app/file/file-save.h | 4 ++-- + app/widgets/gimpdnd-xds.c | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) commit 3c1366a0c15b2d8bb7f3e038400c257af0ef87f4 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat May 2 15:58:32 2009 +0200 +Date: Sat May 2 15:58:32 2009 +0200 app: Merge almost identical higher level file_save() wrappers @@ -94682,7 +95498,7 @@ result file_save_dialog_save_image() in lack of a better name, and keep it in file-save-dialog.[ch] for now in lack of a better place. - app/actions/file-commands.c | 80 + app/actions/file-commands.c | 80 ++++-------------------------------------- app/dialogs/file-save-dialog.c | 33 +++++++++-------- app/dialogs/file-save-dialog.h | 12 ++++++- @@ -94690,7 +95506,7 @@ commit 290d433edf587e1a01ca4f7498914e88b9ab9066 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat May 2 15:33:05 2009 +0200 +Date: Sat May 2 15:33:05 2009 +0200 app: Remove image refs in file_save_dialog_save_image() @@ -94702,7 +95518,7 @@ commit 1bd506d91ddd92713db95fea498b649d4d0d1ddb Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat May 2 09:05:34 2009 +0200 +Date: Sat May 2 09:05:34 2009 +0200 app: Make file_save_dialog_save_image() more general @@ -94714,7 +95530,7 @@ commit 9a8efbe41003fccc75467d0724aaec342e4f1f1e Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri May 1 17:29:17 2009 +0200 +Date: Fri May 1 17:29:17 2009 +0200 app: Remove unused variable @@ -94723,7 +95539,7 @@ commit c5787f51fce80075b3a34c05ef037b18b88eef28 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri May 1 17:29:02 2009 +0200 +Date: Fri May 1 17:29:02 2009 +0200 app: Introduce gimp_file_dialog_get_dirname_from_uri() @@ -94736,7 +95552,7 @@ commit a93346d0a0511d71288ce61e2a847e80d4503224 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Fri May 1 12:22:41 2009 +0200 +Date: Fri May 1 12:22:41 2009 +0200 app: Gather save dialog uri defaults in one place @@ -94744,35 +95560,35 @@ it from file_save_dialog_new() to gimp_file_dialog_set_save_image() where the rest is. - app/actions/file-commands.c | 15 ++++++++++----- + app/actions/file-commands.c | 15 ++++++++++----- app/dialogs/file-save-dialog.c | 9 --------- - app/widgets/gimpfiledialog.c | 5 +++++ - app/widgets/gimpfiledialog.h | 1 + + app/widgets/gimpfiledialog.c | 5 +++++ + app/widgets/gimpfiledialog.h | 1 + 4 files changed, 16 insertions(+), 14 deletions(-) commit b0af6524b40397eaa61d11029d4bc89cbbb1721b Author: Sven Neumann <s.neumann@raumfeld.com> -Date: Fri May 1 09:03:13 2009 +0200 - - app/file: Rename gimpfile.h to gimp-file.h and fix include guards +Date: Fri May 1 09:03:13 2009 +0200 - The source filename convention would indicate that gimpfile.h - holds code for the GimpFile object. Rename it to gimp-file.h - to make clear that it doesn't. + app/file: Rename gimpfile.h to gimp-file.h and fix include + guards - app/actions/file-commands.c | 2 +- - app/dialogs/file-open-dialog.c | 2 +- - app/dialogs/file-save-dialog.c | 2 +- - app/file/file-open.c | 2 +- - app/file/file-save.c | 2 +- - app/file/gimp-file.h | 30 ++++++++++++++++++++++++++++++ - app/file/gimpfile.h | 30 ------------------------------ - app/widgets/gimpfiledialog.c | 2 +- - 8 files changed, 36 insertions(+), 36 deletions(-) + The source filename convention would indicate that gimpfile.h + holds code for the GimpFile object. Rename it to gimp-file.h + to make clear that it doesn't. + + app/actions/file-commands.c | 2 +- + app/dialogs/file-open-dialog.c | 2 +- + app/dialogs/file-save-dialog.c | 2 +- + app/file/file-open.c | 2 +- + app/file/file-save.c | 2 +- + app/file/{gimpfile.h => gimp-file.h} | 8 ++++---- + app/widgets/gimpfiledialog.c | 2 +- + 7 files changed, 10 insertions(+), 10 deletions(-) commit e622dc3cade791e3ad625ec6fbddbfa5d5f4f122 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Apr 30 19:53:19 2009 +0200 +Date: Thu Apr 30 19:53:19 2009 +0200 app: Introduce gimpfile.h @@ -94780,19 +95596,19 @@ keys used when managing save and open dialog URI defaults. More are to be added. - app/actions/file-commands.c | 3 ++- + app/actions/file-commands.c | 3 ++- app/dialogs/file-open-dialog.c | 3 ++- app/dialogs/file-save-dialog.c | 5 +++-- - app/file/Makefile.am | 3 ++- - app/file/file-open.c | 3 ++- - app/file/file-save.c | 5 +++-- - app/file/gimpfile.h | 30 ++++++++++++++++++++++++++++++ - app/widgets/gimpfiledialog.c | 3 ++- + app/file/Makefile.am | 3 ++- + app/file/file-open.c | 3 ++- + app/file/file-save.c | 5 +++-- + app/file/gimpfile.h | 30 ++++++++++++++++++++++++++++++ + app/widgets/gimpfiledialog.c | 3 ++- 8 files changed, 46 insertions(+), 9 deletions(-) commit a51521fe1d0fb33ae0c181d0822637208ca2c3c8 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Thu Apr 30 19:32:14 2009 +0200 +Date: Thu Apr 30 19:32:14 2009 +0200 app: Rename save-a-copy key @@ -94800,13 +95616,13 @@ since the key is more logical to have in the gimp file namespace and the "-ur"i suffix is more consistent with other similar keys. - app/file/file-save.c | 4 ++-- + app/file/file-save.c | 4 ++-- app/widgets/gimpfiledialog.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit 30ff5a15e9c221c2758587b1de8602064b6701d5 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Wed Apr 29 07:24:02 2009 +0200 +Date: Wed Apr 29 07:24:02 2009 +0200 Adjust gimp.doap slightly for better display on git.gnome.org/cgit @@ -94815,7 +95631,7 @@ commit 29ce36795ec5fb15721ea9d26919b496b1c92311 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Wed Apr 29 07:18:03 2009 +0200 +Date: Wed Apr 29 07:18:03 2009 +0200 Add gimp.doap @@ -94824,20 +95640,20 @@ commit f456d99bca7f18080c9e17b0704152a8b7204c78 Author: Marco Ciampa <ciampix@libero.it> -Date: Tue Apr 28 10:17:25 2009 +0200 +Date: Tue Apr 28 10:17:25 2009 +0200 Updated italian translation po-plug-ins/ChangeLog | 4 + po-plug-ins/it.po | 168 ++++++++--------- - po/ChangeLog | 4 + - po/it.po | 490 + po/ChangeLog | 4 + + po/it.po | 490 ++++++++++++++++++++++++++++---------------------- 4 files changed, 365 insertions(+), 301 deletions(-) commit d4fbcb01bbcc0fdfa1f9ae4ee5cab97bffa8dd10 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Mon Apr 27 08:16:21 2009 +0200 +Date: Mon Apr 27 08:16:21 2009 +0200 Add note to ChangeLog about it not being used during development @@ -94850,7 +95666,7 @@ commit 9e7edcd6f478a78b8436ba776e69c148c04eda63 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sun Apr 26 17:22:56 2009 +0200 +Date: Sun Apr 26 17:22:56 2009 +0200 app: Introduce file_write_with_uri_and_proc() @@ -94864,7 +95680,7 @@ commit c3be07e9376b5074d03cad8c4269be46fbc4e40b Author: Alexia Death <alexiadeath@gmail.com> -Date: Sun Apr 26 12:08:41 2009 +0300 +Date: Sun Apr 26 12:08:41 2009 +0300 Fixes to brush aspect ratio dynamics @@ -94875,30 +95691,30 @@ commit 6aafd3438070ee52e914b31e990a1982851de4a9 Author: Alexia Death <alexiadeath@gmail.com> -Date: Sat Apr 25 20:53:09 2009 +0300 +Date: Sat Apr 25 20:53:09 2009 +0300 Adds dynamic aspect ratio for brushes. - app/actions/tools-actions.c | 41 +++++++++++ - app/actions/tools-commands.c | 21 ++++++ - app/actions/tools-commands.h | 4 + + app/actions/tools-actions.c | 41 +++++++++++ + app/actions/tools-commands.c | 21 ++++++ + app/actions/tools-commands.h | 4 + app/core/gimpbrush-transform.c | 28 ++++--- app/core/gimpbrush-transform.h | 12 +-- - app/core/gimpbrush.c | 40 +++++----- - app/core/gimpbrushgenerated.c | 44 ++++++++--- - app/paint/gimpbrushcore.c | 75 +++++++++++-------- - app/paint/gimpbrushcore.h | 2 + - app/paint/gimppaintoptions.c | 154 + app/core/gimpbrush.c | 40 +++++----- + app/core/gimpbrushgenerated.c | 44 ++++++++--- + app/paint/gimpbrushcore.c | 75 +++++++++++-------- + app/paint/gimpbrushcore.h | 2 + + app/paint/gimppaintoptions.c | 154 ++++++++++++++++++++++++++++++++++++++- - app/paint/gimppaintoptions.h | 6 ++ - app/paint/gimpsmudge.c | 3 +- - app/tools/gimpbrushtool.c | 4 + + app/paint/gimppaintoptions.h | 6 ++ + app/paint/gimpsmudge.c | 3 +- + app/tools/gimpbrushtool.c | 4 + app/tools/gimppaintoptions-gui.c | 79 ++++++++++++++++++-- 14 files changed, 426 insertions(+), 87 deletions(-) commit 7bddad13207fde2f614aa849a65dd8fa0f45ba56 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Apr 25 18:11:21 2009 +0200 +Date: Sat Apr 25 18:11:21 2009 +0200 app: Introduce file_save_dialog_unknown_ext_msg() @@ -94906,27 +95722,27 @@ have a copy-pasted huge error message (and prepare for more intricate message handling). - ChangeLog | 7 ++++++ + ChangeLog | 7 ++++++ app/dialogs/file-save-dialog.c | 57 ++++++++++++++++++++++++------------------ 2 files changed, 39 insertions(+), 25 deletions(-) commit 64cbf6254fffaccdfd5726d9ad39492520f22866 Author: Martin Nordholts <martinn@src.gnome.org> -Date: Sat Apr 25 17:57:19 2009 +0200 +Date: Sat Apr 25 17:57:19 2009 +0200 Convert Subversion references to git - ChangeLog | 9 +++++++++ + ChangeLog | 9 +++++++++ HACKING | 55 +++++++++++++++++++++---------------------------------- - INSTALL | 8 ++++---- - README.i18n | 2 +- - autogen.sh | 6 +++--- + INSTALL | 8 ++++---- + README.i18n | 2 +- + autogen.sh | 6 +++--- 5 files changed, 38 insertions(+), 42 deletions(-) commit 5f81acb2d26825ad022c638e576b5eceacf47608 Author: Shlomi Fish <shlomif@iglu.org.il> -Date: Fri Apr 24 17:08:26 2009 +0200 +Date: Fri Apr 24 17:08:26 2009 +0200 Update link to GTK+ themes in README @@ -94936,7 +95752,7 @@ commit 42b28066b8df10c543eb7a8df2cf31705257e54f Author: Michael Natterer <mitch@gimp.org> -Date: Wed Apr 22 21:22:08 2009 +0200 +Date: Wed Apr 22 21:22:08 2009 +0200 Move the straight line constrain code to GimpPaintCore. @@ -94954,7 +95770,7 @@ commit 090e06ecdd3aee58d7c51b9f117dbabcd2602e5e Author: Michael Natterer <mitch@gimp.org> -Date: Wed Apr 22 21:08:42 2009 +0200 +Date: Wed Apr 22 21:08:42 2009 +0200 Move the stuff in tools-utils to the core so it can be used from app/paint/ in the next step. @@ -94970,22 +95786,22 @@ * app/tools/gimpmeasuretool.c * app/tools/gimppainttool.c: changed accordingly. - app/core/gimp-utils.c | 87 ++++++++++++++++++++++++++++ - app/core/gimp-utils.h | 13 +++++ - app/tools/Makefile.am | 2 - - app/tools/gimpblendtool.c | 14 ++--- + app/core/gimp-utils.c | 87 ++++++++++++++++++++++++++++ + app/core/gimp-utils.h | 13 +++++ + app/tools/Makefile.am | 2 - + app/tools/gimpblendtool.c | 14 ++--- app/tools/gimpeditselectiontool.c | 8 +-- app/tools/gimpfreeselecttool.c | 20 +++---- - app/tools/gimpmeasuretool.c | 14 ++--- - app/tools/gimppainttool.c | 8 +-- - app/tools/tools-utils.c | 118 + app/tools/gimpmeasuretool.c | 14 ++--- + app/tools/gimppainttool.c | 8 +-- + app/tools/tools-utils.c | 118 -------------------------------------- - app/tools/tools-utils.h | 38 ------------ + app/tools/tools-utils.h | 38 ------------ 10 files changed, 132 insertions(+), 190 deletions(-) commit 6fa2ece547efa1ad515648419f1444ce0b1e948a Author: Sven Neumann <s.neumann@phase-zero.de> -Date: Tue Apr 21 17:48:17 2009 +0200 +Date: Tue Apr 21 17:48:17 2009 +0200 Avoid use of temporary files for accessing remote files @@ -94995,17 +95811,17 @@ behavior of using temporary files if GIO can't give us a local path to the file. - plug-ins/file-uri/uri-backend-gvfs.c | 48 ++++++++++++++++++++++++---- + plug-ins/file-uri/uri-backend-gvfs.c | 48 ++++++++++++++++++++++++---- plug-ins/file-uri/uri-backend-libcurl.c | 7 +++++ - plug-ins/file-uri/uri-backend-wget.c | 7 +++++ - plug-ins/file-uri/uri-backend.h | 2 ++ - plug-ins/file-uri/uri.c | 56 + plug-ins/file-uri/uri-backend-wget.c | 7 +++++ + plug-ins/file-uri/uri-backend.h | 2 ++ + plug-ins/file-uri/uri.c | 56 ++++++++++++++++++++++----------- 5 files changed, 96 insertions(+), 24 deletions(-) commit 74424325abb54620b370f2595445b2b2a19fe5e7 Author: Sven Neumann <s.neumann@phase-zero.de> -Date: Tue Apr 21 10:24:52 2009 +0200 +Date: Tue Apr 21 10:24:52 2009 +0200 Fix default values for Image.new_layer() methods diff -Nru gimp-2.8.18/compile gimp-2.8.20/compile --- gimp-2.8.18/compile 2014-10-20 00:18:19.000000000 +0000 +++ gimp-2.8.20/compile 2016-11-01 23:33:03.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-03-05.13; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey <tromey@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -113,6 +112,11 @@ lib=$dir/$lib.lib break fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi done IFS=$save_IFS diff -Nru gimp-2.8.18/config.guess gimp-2.8.20/config.guess --- gimp-2.8.18/config.guess 2016-04-30 10:57:03.000000000 +0000 +++ gimp-2.8.20/config.guess 2016-11-12 20:18:52.000000000 +0000 @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2016-04-02' +timestamp='2016-10-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -186,9 +186,12 @@ *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. + # to ELF recently (or will in the future) and ABI. case "${UNAME_MACHINE_ARCH}" in - arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax) + earm*) + os=netbsdelf + ;; + arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ @@ -997,6 +1000,9 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + mips64el:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; openrisc*:Linux:*:*) echo or1k-unknown-linux-${LIBC} exit ;; @@ -1029,6 +1035,9 @@ ppcle:Linux:*:*) echo powerpcle-unknown-linux-${LIBC} exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; @@ -1408,18 +1417,17 @@ cat >&2 <<EOF $0: unable to guess system type -This script, last modified $timestamp, has failed to recognize -the operating system you are using. It is advised that you -download the most up to date version of the config scripts from +This script (version $timestamp), has failed to recognize the +operating system you are using. If your script is old, overwrite +config.guess and config.sub with the latest versions from: http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess and http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub -If the version you run ($0) is already up to date, please -send the following data and any information you think might be -pertinent to <config-patches@gnu.org> in order to provide the needed -information to handle your system. +If $0 has already been updated, send the following data and any +information you think might be pertinent to config-patches@gnu.org to +provide the necessary information to handle your system. config.guess timestamp = $timestamp diff -Nru gimp-2.8.18/config.h.in gimp-2.8.20/config.h.in --- gimp-2.8.18/config.h.in 2016-07-12 23:19:34.000000000 +0000 +++ gimp-2.8.20/config.h.in 2017-01-31 23:42:41.000000000 +0000 @@ -234,9 +234,6 @@ /* Define to 1 if you don't have the fd_set typedef. */ #undef NO_FD_SET -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT diff -Nru gimp-2.8.18/config.sub gimp-2.8.20/config.sub --- gimp-2.8.18/config.sub 2016-04-30 10:57:03.000000000 +0000 +++ gimp-2.8.20/config.sub 2016-11-12 20:18:52.000000000 +0000 @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2016-03-30' +timestamp='2016-11-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -117,7 +117,7 @@ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ - kopensolaris*-gnu* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -301,6 +301,7 @@ | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ | pyramid \ | riscv32 | riscv64 \ | rl78 | rx \ @@ -428,6 +429,7 @@ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ | pyramid-* \ | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ @@ -643,6 +645,14 @@ basic_machine=m68k-bull os=-sysv3 ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + os=$os"spe" + ;; ebmon29k) basic_machine=a29k-amd os=-ebmon @@ -1022,7 +1032,7 @@ ppc-* | ppcbe-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppcle | powerpclittle | ppc-le | powerpc-little) + ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) @@ -1032,7 +1042,7 @@ ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) + ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) @@ -1389,7 +1399,7 @@ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ @@ -1399,7 +1409,7 @@ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos*) + | -onefs* | -tirtos* | -phoenix* | -fuchsia*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) diff -Nru gimp-2.8.18/configure gimp-2.8.20/configure --- gimp-2.8.18/configure 2016-07-12 23:20:38.000000000 +0000 +++ gimp-2.8.20/configure 2017-01-31 23:41:11.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GIMP 2.8.18. +# Generated by GNU Autoconf 2.69 for GIMP 2.8.20. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='GIMP' PACKAGE_TARNAME='gimp' -PACKAGE_VERSION='2.8.18' -PACKAGE_STRING='GIMP 2.8.18' +PACKAGE_VERSION='2.8.20' +PACKAGE_STRING='GIMP 2.8.20' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP' PACKAGE_URL='' @@ -866,10 +866,10 @@ INTLLIBS INSTOBJEXT GMOFILES +DATADIRNAME CATOBJEXT CATALOGS MSGFMT_OPTS -DATADIRNAME ALL_LINGUAS INTLTOOL_PERL GMSGFMT @@ -1771,7 +1771,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GIMP 2.8.18 to adapt to many kinds of systems. +\`configure' configures GIMP 2.8.20 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1846,7 +1846,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GIMP 2.8.18:";; + short | recursive ) echo "Configuration of GIMP 2.8.20:";; esac cat <<\_ACEOF @@ -1854,17 +1854,20 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0') - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --enable-static[=PKGS] build static libraries [default=no] --enable-shared[=PKGS] build shared libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) - --disable-maintainer-mode disable make rules and dependencies not useful - (and sometimes confusing) to the casual installer + --disable-maintainer-mode + disable make rules and dependencies not useful (and + sometimes confusing) to the casual installer --disable-largefile omit support for large files --enable-debug turn on debugging (default=no) --enable-profile turn on profiling (default=no) @@ -2107,7 +2110,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GIMP configure 2.8.18 +GIMP configure 2.8.20 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2530,7 +2533,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GIMP $as_me 2.8.18, which was +It was created by GIMP $as_me 2.8.20, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2884,7 +2887,7 @@ -am__api_version='1.11' +am__api_version='1.15' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -3010,9 +3013,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -3023,32 +3023,40 @@ esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -3060,6 +3068,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -3070,8 +3088,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -3082,15 +3100,15 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -3099,10 +3117,10 @@ esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -3241,12 +3259,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -3329,6 +3341,45 @@ fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -3351,7 +3402,7 @@ # Define the identity of the package. PACKAGE='gimp' - VERSION='2.8.18' + VERSION='2.8.20' # Some tools Automake needs. @@ -3370,12 +3421,22 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> +mkdir_p='$(MKDIR_P)' + +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -3383,6 +3444,49 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + + # Enable silent build rules by default, requires at least # Automake-1.11. Disable by either passing --disable-silent-rules to # configure or passing V=1 to make @@ -3391,10 +3495,10 @@ enableval=$enable_silent_rules; fi -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=0;; +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; esac am_make=${MAKE-make} { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 @@ -3428,11 +3532,11 @@ GIMP_MAJOR_VERSION=2 GIMP_MINOR_VERSION=8 -GIMP_MICRO_VERSION=18 -GIMP_INTERFACE_AGE=18 -GIMP_BINARY_AGE=818 -GIMP_VERSION=2.8.18 -GIMP_REAL_VERSION=2.8.18 +GIMP_MICRO_VERSION=20 +GIMP_INTERFACE_AGE=20 +GIMP_BINARY_AGE=820 +GIMP_VERSION=2.8.20 +GIMP_REAL_VERSION=2.8.20 GIMP_API_VERSION=2.0 GIMP_APP_VERSION=2.8 GIMP_PLUGIN_VERSION=2.0 @@ -3498,7 +3602,7 @@ -LT_VERSION_INFO="800:18:800" +LT_VERSION_INFO="800:20:800" LT_CURRENT_MINUS_AGE=0 @@ -4310,6 +4414,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -4329,7 +4492,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -4385,8 +4548,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -4421,16 +4584,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4439,8 +4602,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -4448,7 +4611,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4502,131 +4665,6 @@ fi -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - # Initialize libtool @@ -9199,6 +9237,10 @@ $RM -r conftest* +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... if test -n "$compiler"; then lt_prog_compiler_no_builtin_flag= @@ -13022,8 +13064,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -13056,16 +13098,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -13074,8 +13116,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -13083,7 +13125,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -15667,44 +15709,6 @@ # Substitute ALL_LINGUAS so we can use it in po/Makefile -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - DATADIRNAME=share -else - case $host in - *-*-solaris*) - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : - DATADIRNAME=share -else - DATADIRNAME=lib -fi - - ;; - *) - DATADIRNAME=lib - ;; - esac -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi - - @@ -24623,6 +24627,14 @@ LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -25216,7 +25228,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GIMP $as_me 2.8.18, which was +This file was extended by GIMP $as_me 2.8.20, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25282,7 +25294,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GIMP config.status 2.8.18 +GIMP config.status 2.8.20 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -25691,8 +25703,8 @@ gimp_major_ver=2 gimp_minor_ver=8 - gimp_micro_ver=18 - gimp_ver=2.8.18 + gimp_micro_ver=20 + gimp_ver=2.8.20 gimp_api_ver=2.0 @@ -26474,7 +26486,7 @@ case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -26487,7 +26499,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -26521,21 +26533,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -26583,7 +26593,6 @@ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. diff -Nru gimp-2.8.18/configure.ac gimp-2.8.20/configure.ac --- gimp-2.8.18/configure.ac 2016-07-12 23:15:10.000000000 +0000 +++ gimp-2.8.20/configure.ac 2017-01-31 23:31:36.000000000 +0000 @@ -8,11 +8,11 @@ m4_define([gimp_major_version], [2]) m4_define([gimp_minor_version], [8]) -m4_define([gimp_micro_version], [18]) +m4_define([gimp_micro_version], [20]) m4_define([gimp_real_version], [gimp_major_version.gimp_minor_version.gimp_micro_version]) m4_define([gimp_version], [gimp_real_version]) -m4_define([gimp_interface_age], [18]) +m4_define([gimp_interface_age], [20]) m4_define([gimp_binary_age], [m4_eval(100 * gimp_minor_version + gimp_micro_version)]) diff -Nru gimp-2.8.18/cursors/Makefile.in gimp-2.8.20/cursors/Makefile.in --- gimp-2.8.18/cursors/Makefile.in 2016-07-12 23:19:50.000000000 +0000 +++ gimp-2.8.20/cursors/Makefile.in 2017-01-31 23:40:21.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = cursors -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -80,6 +129,8 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(noinst_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -573,7 +624,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu cursors/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu cursors/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -597,11 +647,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -738,15 +788,18 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + +.PRECIOUS: Makefile tool-cursors.list: $(CURSOR_IMAGES) Makefile.am diff -Nru gimp-2.8.18/data/brushes/Basic/Makefile.in gimp-2.8.20/data/brushes/Basic/Makefile.in --- gimp-2.8.18/data/brushes/Basic/Makefile.in 2016-07-12 23:19:51.000000000 +0000 +++ gimp-2.8.20/data/brushes/Basic/Makefile.in 2017-01-31 23:40:21.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/brushes/Basic -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(brushbasicdatadir)" DATA = $(brushbasicdata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -476,7 +527,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/brushes/Basic/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/brushes/Basic/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -521,11 +571,11 @@ @list='$(brushbasicdata_DATA)'; test -n "$(brushbasicdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(brushbasicdatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -664,16 +714,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-brushbasicdataDATA install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-brushbasicdataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-brushbasicdataDATA install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-brushbasicdataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/data/brushes/gimp-obsolete-files/Makefile.in gimp-2.8.20/data/brushes/gimp-obsolete-files/Makefile.in --- gimp-2.8.18/data/brushes/gimp-obsolete-files/Makefile.in 2016-07-12 23:19:53.000000000 +0000 +++ gimp-2.8.20/data/brushes/gimp-obsolete-files/Makefile.in 2017-01-31 23:40:24.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/brushes/gimp-obsolete-files -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(obsoletebrushdatadir)" DATA = $(obsoletebrushdata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -506,7 +557,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/brushes/gimp-obsolete-files/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/brushes/gimp-obsolete-files/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -551,11 +601,11 @@ @list='$(obsoletebrushdata_DATA)'; test -n "$(obsoletebrushdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(obsoletebrushdatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -694,17 +744,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ install-obsoletebrushdataDATA install-pdf install-pdf-am \ install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-obsoletebrushdataDATA + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-obsoletebrushdataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/data/brushes/Legacy/Makefile.in gimp-2.8.20/data/brushes/Legacy/Makefile.in --- gimp-2.8.18/data/brushes/Legacy/Makefile.in 2016-07-12 23:19:51.000000000 +0000 +++ gimp-2.8.20/data/brushes/Legacy/Makefile.in 2017-01-31 23:40:22.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/brushes/Legacy -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(brushlegacydatadir)" DATA = $(brushlegacydata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -473,7 +524,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/brushes/Legacy/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/brushes/Legacy/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -518,11 +568,11 @@ @list='$(brushlegacydata_DATA)'; test -n "$(brushlegacydatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(brushlegacydatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -661,16 +711,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-brushlegacydataDATA install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-brushlegacydataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-brushlegacydataDATA install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-brushlegacydataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/data/brushes/Makefile.in gimp-2.8.20/data/brushes/Makefile.in --- gimp-2.8.18/data/brushes/Makefile.in 2016-07-12 23:19:52.000000000 +0000 +++ gimp-2.8.20/data/brushes/Makefile.in 2017-01-31 23:40:22.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,35 +88,48 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/brushes -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -87,12 +137,33 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -481,7 +552,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/brushes/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/brushes/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -507,22 +577,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -537,57 +610,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -603,12 +631,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -620,15 +643,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -637,6 +656,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -797,22 +831,22 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/data/brushes/Media/Makefile.in gimp-2.8.20/data/brushes/Media/Makefile.in --- gimp-2.8.18/data/brushes/Media/Makefile.in 2016-07-12 23:19:52.000000000 +0000 +++ gimp-2.8.20/data/brushes/Media/Makefile.in 2017-01-31 23:40:22.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/brushes/Media -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(brushmediadatadir)" DATA = $(brushmediadata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -477,7 +528,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/brushes/Media/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/brushes/Media/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -522,11 +572,11 @@ @list='$(brushmediadata_DATA)'; test -n "$(brushmediadatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(brushmediadatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -665,16 +715,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-brushmediadataDATA install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-brushmediadataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-brushmediadataDATA install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-brushmediadataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/data/brushes/Sketch/Makefile.in gimp-2.8.20/data/brushes/Sketch/Makefile.in --- gimp-2.8.18/data/brushes/Sketch/Makefile.in 2016-07-12 23:19:52.000000000 +0000 +++ gimp-2.8.20/data/brushes/Sketch/Makefile.in 2017-01-31 23:40:23.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/brushes/Sketch -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(brushsketchdatadir)" DATA = $(brushsketchdata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -474,7 +525,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/brushes/Sketch/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/brushes/Sketch/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -519,11 +569,11 @@ @list='$(brushsketchdata_DATA)'; test -n "$(brushsketchdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(brushsketchdatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -662,16 +712,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-brushsketchdataDATA install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-brushsketchdataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-brushsketchdataDATA install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-brushsketchdataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/data/brushes/Splatters/Makefile.in gimp-2.8.20/data/brushes/Splatters/Makefile.in --- gimp-2.8.18/data/brushes/Splatters/Makefile.in 2016-07-12 23:19:53.000000000 +0000 +++ gimp-2.8.20/data/brushes/Splatters/Makefile.in 2017-01-31 23:40:23.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/brushes/Splatters -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(brushsplattersdatadir)" DATA = $(brushsplattersdata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -471,7 +522,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/brushes/Splatters/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/brushes/Splatters/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -516,11 +566,11 @@ @list='$(brushsplattersdata_DATA)'; test -n "$(brushsplattersdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(brushsplattersdatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -659,17 +709,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-brushsplattersdataDATA install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am \ - uninstall-brushsplattersdataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-brushsplattersdataDATA install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-brushsplattersdataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/data/brushes/Texture/Makefile.in gimp-2.8.20/data/brushes/Texture/Makefile.in --- gimp-2.8.18/data/brushes/Texture/Makefile.in 2016-07-12 23:19:53.000000000 +0000 +++ gimp-2.8.20/data/brushes/Texture/Makefile.in 2017-01-31 23:40:23.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/brushes/Texture -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(brushtexturedatadir)" DATA = $(brushtexturedata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -478,7 +529,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/brushes/Texture/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/brushes/Texture/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -523,11 +573,11 @@ @list='$(brushtexturedata_DATA)'; test -n "$(brushtexturedatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(brushtexturedatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -666,16 +716,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-brushtexturedataDATA install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-brushtexturedataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-brushtexturedataDATA install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-brushtexturedataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/data/dynamics/Basic/Makefile.in gimp-2.8.20/data/dynamics/Basic/Makefile.in --- gimp-2.8.18/data/dynamics/Basic/Makefile.in 2016-07-12 23:19:54.000000000 +0000 +++ gimp-2.8.20/data/dynamics/Basic/Makefile.in 2017-01-31 23:40:24.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/dynamics/Basic -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(dynamicsbasicdatadir)" DATA = $(dynamicsbasicdata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -473,7 +524,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/dynamics/Basic/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/dynamics/Basic/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -518,11 +568,11 @@ @list='$(dynamicsbasicdata_DATA)'; test -n "$(dynamicsbasicdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(dynamicsbasicdatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -661,17 +711,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-dynamicsbasicdataDATA install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am \ - uninstall-dynamicsbasicdataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-dynamicsbasicdataDATA install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-dynamicsbasicdataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/data/dynamics/FX/Makefile.in gimp-2.8.20/data/dynamics/FX/Makefile.in --- gimp-2.8.18/data/dynamics/FX/Makefile.in 2016-07-12 23:19:54.000000000 +0000 +++ gimp-2.8.20/data/dynamics/FX/Makefile.in 2017-01-31 23:40:24.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/dynamics/FX -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(dynamicsfxdatadir)" DATA = $(dynamicsfxdata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -469,7 +520,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/dynamics/FX/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/dynamics/FX/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -514,11 +564,11 @@ @list='$(dynamicsfxdata_DATA)'; test -n "$(dynamicsfxdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(dynamicsfxdatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -657,16 +707,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-dynamicsfxdataDATA install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dynamicsfxdataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-dynamicsfxdataDATA install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-dynamicsfxdataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/data/dynamics/Makefile.in gimp-2.8.20/data/dynamics/Makefile.in --- gimp-2.8.18/data/dynamics/Makefile.in 2016-07-12 23:19:54.000000000 +0000 +++ gimp-2.8.20/data/dynamics/Makefile.in 2017-01-31 23:40:25.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,35 +89,48 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/dynamics -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -117,12 +167,33 @@ DATA = $(dynamicsdata_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -518,7 +589,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/dynamics/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/dynamics/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -565,22 +635,25 @@ dir='$(DESTDIR)$(dynamicsdatadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -595,57 +668,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -661,12 +689,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -678,15 +701,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -695,6 +714,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -858,23 +892,23 @@ uninstall-am: uninstall-dynamicsdataDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am \ - install-dynamicsdataDATA install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-dynamicsdataDATA install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-dynamicsdataDATA + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-dynamicsdataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/data/environ/Makefile.in gimp-2.8.20/data/environ/Makefile.in --- gimp-2.8.18/data/environ/Makefile.in 2016-07-12 23:19:55.000000000 +0000 +++ gimp-2.8.20/data/environ/Makefile.in 2017-01-31 23:40:25.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/environ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(environdir)" DATA = $(environ_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -465,7 +516,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/environ/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/environ/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -510,11 +560,11 @@ @list='$(environ_DATA)'; test -n "$(environdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(environdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -653,16 +703,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-environDATA install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-environDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-environDATA install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-environDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/data/gradients/Makefile.in gimp-2.8.20/data/gradients/Makefile.in --- gimp-2.8.18/data/gradients/Makefile.in 2016-07-12 23:19:55.000000000 +0000 +++ gimp-2.8.20/data/gradients/Makefile.in 2017-01-31 23:40:25.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/gradients -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -109,6 +158,8 @@ am__installdirs = "$(DESTDIR)$(gradientdatadir)" \ "$(DESTDIR)$(obsoletegradientdatadir)" DATA = $(gradientdata_DATA) $(obsoletegradientdata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -548,7 +599,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/gradients/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/gradients/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -614,11 +664,11 @@ @list='$(obsoletegradientdata_DATA)'; test -n "$(obsoletegradientdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(obsoletegradientdatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -759,17 +809,21 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-gradientdataDATA \ - install-html install-html-am install-info install-info-am \ - install-man install-obsoletegradientdataDATA install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-gradientdataDATA install-html install-html-am \ + install-info install-info-am install-man \ + install-obsoletegradientdataDATA install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-gradientdataDATA uninstall-obsoletegradientdataDATA + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-gradientdataDATA \ + uninstall-obsoletegradientdataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/data/images/Makefile.in gimp-2.8.20/data/images/Makefile.in --- gimp-2.8.18/data/images/Makefile.in 2016-07-12 23:19:55.000000000 +0000 +++ gimp-2.8.20/data/images/Makefile.in 2017-01-31 23:40:26.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/images -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(imagedatadir)" DATA = $(imagedata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -471,7 +522,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/images/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/images/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -516,11 +566,11 @@ @list='$(imagedata_DATA)'; test -n "$(imagedatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(imagedatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -659,16 +709,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-imagedataDATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-imagedataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-imagedataDATA install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-imagedataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/data/interpreters/Makefile.in gimp-2.8.20/data/interpreters/Makefile.in --- gimp-2.8.18/data/interpreters/Makefile.in 2016-07-12 23:19:55.000000000 +0000 +++ gimp-2.8.20/data/interpreters/Makefile.in 2017-01-31 23:40:26.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/interpreters -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(interpretersdir)" DATA = $(interpreters_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -465,7 +516,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/interpreters/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/interpreters/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -510,11 +560,11 @@ @list='$(interpreters_DATA)'; test -n "$(interpretersdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(interpretersdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -653,16 +703,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-interpretersDATA \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-interpretersDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-interpretersDATA install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-interpretersDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/data/Makefile.in gimp-2.8.20/data/Makefile.in --- gimp-2.8.18/data/Makefile.in 2016-07-12 23:19:51.000000000 +0000 +++ gimp-2.8.20/data/Makefile.in 2017-01-31 23:40:21.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,35 +88,48 @@ build_triplet = @build@ host_triplet = @host@ subdir = data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -87,12 +137,33 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -486,7 +557,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -512,22 +582,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -542,57 +615,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -608,12 +636,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -625,15 +648,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -642,6 +661,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -802,22 +836,23 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-data-local install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-local install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am + +.PRECIOUS: Makefile install-data-local: diff -Nru gimp-2.8.18/data/palettes/Makefile.in gimp-2.8.20/data/palettes/Makefile.in --- gimp-2.8.18/data/palettes/Makefile.in 2016-07-12 23:19:56.000000000 +0000 +++ gimp-2.8.20/data/palettes/Makefile.in 2017-01-31 23:40:26.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/palettes -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(palettedatadir)" DATA = $(palettedata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -506,7 +557,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/palettes/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/palettes/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -551,11 +601,11 @@ @list='$(palettedata_DATA)'; test -n "$(palettedatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(palettedatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -694,16 +744,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ install-palettedataDATA install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-palettedataDATA + ps ps-am tags-am uninstall uninstall-am \ + uninstall-palettedataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/data/patterns/Makefile.in gimp-2.8.20/data/patterns/Makefile.in --- gimp-2.8.18/data/patterns/Makefile.in 2016-07-12 23:19:56.000000000 +0000 +++ gimp-2.8.20/data/patterns/Makefile.in 2017-01-31 23:40:27.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/patterns -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(patterndatadir)" DATA = $(patterndata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -524,7 +575,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/patterns/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/patterns/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -569,11 +619,11 @@ @list='$(patterndata_DATA)'; test -n "$(patterndatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(patterndatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -712,16 +762,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ install-patterndataDATA install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-patterndataDATA + ps ps-am tags-am uninstall uninstall-am \ + uninstall-patterndataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/data/tags/gimp-tags-default.xml gimp-2.8.20/data/tags/gimp-tags-default.xml --- gimp-2.8.18/data/tags/gimp-tags-default.xml 2016-07-12 23:24:37.000000000 +0000 +++ gimp-2.8.20/data/tags/gimp-tags-default.xml 2017-01-31 23:43:56.000000000 +0000 @@ -20,6 +20,7 @@ <thetag xml:lang="es">redondo</thetag> <thetag xml:lang="et">ümar</thetag> <thetag xml:lang="eu">biribila</thetag> + <thetag xml:lang="fi">pyöreä</thetag> <thetag xml:lang="fr">Arrondi</thetag> <thetag xml:lang="gd">cruinn</thetag> <thetag xml:lang="gl">redondo</thetag> @@ -70,6 +71,7 @@ <thetag xml:lang="es">borroso</thetag> <thetag xml:lang="et">hägune</thetag> <thetag xml:lang="eu">lauzoa</thetag> + <thetag xml:lang="fi">sumea</thetag> <thetag xml:lang="fr">Flou</thetag> <thetag xml:lang="gd">neo-phongail</thetag> <thetag xml:lang="gl">borroso</thetag> @@ -117,6 +119,7 @@ <thetag xml:lang="es">redondo</thetag> <thetag xml:lang="et">ümar</thetag> <thetag xml:lang="eu">biribila</thetag> + <thetag xml:lang="fi">pyöreä</thetag> <thetag xml:lang="fr">Arrondi</thetag> <thetag xml:lang="gd">cruinn</thetag> <thetag xml:lang="gl">redondo</thetag> diff -Nru gimp-2.8.18/data/tags/Makefile.in gimp-2.8.20/data/tags/Makefile.in --- gimp-2.8.18/data/tags/Makefile.in 2016-07-12 23:19:56.000000000 +0000 +++ gimp-2.8.20/data/tags/Makefile.in 2017-01-31 23:40:27.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/tags -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(tagsdatadir)" DATA = $(tagsdata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -472,7 +523,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/tags/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/tags/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -517,11 +567,11 @@ @list='$(tagsdata_DATA)'; test -n "$(tagsdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(tagsdatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -664,17 +714,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - dist-hook distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ + cscopelist-am ctags-am dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip install-tagsdataDATA installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-tagsdataDATA + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-tagsdataDATA + +.PRECIOUS: Makefile gimp-tags-default.xml: gimp-tags-default.xml.in $(wildcard $(top_srcdir)/po-tags/*.po) diff -Nru gimp-2.8.18/data/tips/gimp-tips.xml gimp-2.8.20/data/tips/gimp-tips.xml --- gimp-2.8.18/data/tips/gimp-tips.xml 2016-07-12 23:24:36.000000000 +0000 +++ gimp-2.8.20/data/tips/gimp-tips.xml 2017-01-31 23:43:56.000000000 +0000 @@ -18,7 +18,7 @@ <thetip xml:lang="ca">Podeu obtenir ajuda contextual per a la majoria de les funcions del GIMP prement la tecla F1 en qualsevol moment. Això també funciona dins els menús.</thetip> <thetip xml:lang="ca@valencia">Podeu obtindre ajuda contextual per a la majoria de les funcions del GIMP prement la tecla F1 en qualsevol moment. Això també funciona dins els menús.</thetip> <thetip xml:lang="cs">Kontextovou nápovědu k většině vlastností aplikace GIMP můžete kdykoli získat stisknutím klávesy F1. Funguje to i v nabídkách.</thetip> - <thetip xml:lang="da">Du kan få kontekstafhængig hjælp til de fleste af Gimp'ens faciliteter ved at trykke på F1-tasten på et hvilket som helst tidspunkt. Det virker også inde i menuer.</thetip> + <thetip xml:lang="da">Du kan få kontekstfølsom hjælp til de fleste af Gimp'ens funktionaliteter ved, når som helst, at trykke på F1-tasten. Det virker også inde i menuerne.</thetip> <thetip xml:lang="de">Durch Drücken der F1-Taste erhalten Sie für die meisten GIMP-Funktionen eine kontextabhängige Hilfe. Dies funktioniert auch innerhalb der Menüs.</thetip> <thetip xml:lang="dz">ཁྱོད་ཀྱིས་སྐབས་དོན་- ཚོར་ཅན་གྲོགས་རམ་འདི་ དུས་ཚོད་ནམ་རང་འབད་རུང་ ཨེཕ་༡་ལྡེ་མིག་དེ་ཨེབ་པའི་ཐོག་ལས་ ཇི་ཨའི་ཨེམ་པི་གི་ཁྱད་རྣམ་ཚུ་མང་ཤོས་ཀྱི་དོན་ལུ་ འཐོབ་ཚུགས། འདི་གིས་དཀར་ཆག་ནང་ལུ་ཡང་ལཱ་འབད་བཏུབ་ཨིན།</thetip> <thetip xml:lang="el">Μπορείτε να πάρετε εξειδικευμένη βοήθεια για τα χαρακτηριστικά του GIMP πιέζοντας το πλήκτρο F1 οποτεδήποτε. Αυτό επίσης δουλεύει μες τα μενού.</thetip> @@ -48,7 +48,7 @@ <thetip xml:lang="nn">Du kan få aktiv hjelp (kontekst hjelp) for det meste i GIMP ved å halde musepeikaren over aktuelt område og trykke F1-tasten.</thetip> <thetip xml:lang="oc">Podètz obténer una ajuda contextuala per la majorité des foncionalitats de GIMP en pressant a tout moment la tòca F1. Aquesta ajuda es aussi disponible dins les menus.</thetip> <thetip xml:lang="pa">ਕਦੀ ਵੀ ਸਵਿੱਚ F1 ਦਬਾ ਕੇ ਤੁਸੀਂ GIMP ਦੀਆਂ ਜਿਆਦਾਤਰ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਵਾਸਤੇ ਮੱਦਦ ਸੰਖੇਪ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦੇ ਹੋ। ਇਹ ਮੇਨੂ ਵਿੱਚ ਵੀ ਕੰਮ ਕਰਦਾ ਹੈ।</thetip> - <thetip xml:lang="pl">Pomoc do wielu narzędzi i efektów programu GIMP dostępna jest po naciśnięciu klawisza F1. Dostępna jest ona również w menu. </thetip> + <thetip xml:lang="pl">Pomoc do wielu narzędzi i efektów programu GIMP dostępna jest po naciśnięciu klawisza F1. Dostępna jest ona również w menu. </thetip> <thetip xml:lang="pt">Pode obter ajuda sensível ao contexto para a maioria das funcionalidades do GIMP premindo F1 em qualquer altura. Isto também funciona nos menus.</thetip> <thetip xml:lang="pt_BR">Você pode obter ajuda sensível ao contexto para a maioria das funcionalidades do GIMP pressionando a qualquer momento a tecla F1. Isso também funciona nos menus.</thetip> <thetip xml:lang="ro">Puteți să obțineți ajutor contextual pentru majoritatea caracteristicilor GIMP prin apăsarea în orice moment a tastei F1. Acest lucru funcționează de asemenea și în interiorul meniurilor.</thetip> @@ -77,7 +77,7 @@ <thetip xml:lang="ca">El GIMP utilitza capes per estructurar la imatge. És com si fos una pila de diapositives o filtres transparents que es sobreposen i es poden veure tots els continguts de cada capa.</thetip> <thetip xml:lang="ca@valencia">El GIMP utilitza capes per estructurar la imatge. És com si fos una pila de diapositives o filtres transparents que es sobreposen i es poden veure tots els continguts de cada capa.</thetip> <thetip xml:lang="cs">GIMP vám umožňuje svůj obrázek organizovat pomocí vrstev. Představte si je jako sadu fólií nebo filtrů, takže když se na ně díváte, vidíte kombinaci jejich obsahů.</thetip> - <thetip xml:lang="da">Gimp'en bruger lag til at lade dig organisere dit billede. Tænk på dem som en stabel lysbilleder eller filtre. Når du kigger gennem dem, ser du et billede der er sat sammen af deres individuelle indhold.</thetip> + <thetip xml:lang="da">Gimp'en bruger lag til at lade dig organisere dit billede. Tænk på dem som en stak lysbilleder eller filtre. Når du kigger gennem dem, ser du et billede der er sat sammen af deres indhold.</thetip> <thetip xml:lang="de">GIMP benutzt Ebenen, um Ihre Bilder zu verwalten. Diese können Sie sich als einen Stapel von Folien vorstellen. Sieht man durch diese hindurch, so entsteht das Bild durch die Überlagerung der Inhalte.</thetip> <thetip xml:lang="dz">ཇི་ཨའི་ཨེམ་པི་གིས་ ཁྱོད་ཀྱིས་ཁྱོད་རའི་གཟུགས་བརྙན་འགོ་འདྲེན་འཐབ་བཅུག་ནིའི་དོན་ལུ་ བང་རིམ་ཚུ་ལག་ལེན་འཐབ་ཨིན། ཁྱོད་ཀྱིས་དེ་ཚུ་ བཤུད་བརྙན་གྱི་བརྩེགས་ཕུང་དང་ཡང་ན་ ཚགས་མ་སྦེ་མནོ་་མནོ་བསམ་བཏངདེ་ཚེ་བརྒྱུད་དེ་བལྟ་མི་དེ་གིས་ དེ་ཚུའི་ནང་དོན་གྱི་སྣ་སྡུད་ཅིག་མཐོང་ཚུགས།་ཏེ་ </thetip> <thetip xml:lang="el">Το GIMP χρησιμοποιεί στρώσεις για να οργανώσετε την εικόνα σας. Σκεφτείτε τες ως μία στοίβα διαφανειών ή φίλτρων, έτσι κοιτώντας μέσα από αυτές βλέπετε μια σύνθετη από τα περιεχόμενα τους.</thetip> @@ -108,7 +108,7 @@ <thetip xml:lang="nn">GIMP bruker lag for å setje opp bilete. Desse laga kan gjerne samanliknast med ein stabel av lysark eller foliar. Det ferdige biletet er slik du ser det frå toppen av lagstabelen.</thetip> <thetip xml:lang="oc">GIMP utiliza des calques per vous ajudar a organiser votre image. Pensez a une pile de calques o de transparents, de telle façon qu'en regardant a travers eux vous verriez un imatge composée de leurs contenguts.</thetip> <thetip xml:lang="pa">ਤੁਹਾਡਾ ਚਿੱਤਰ ਤਿਆਰ ਕਰਨ ਵਾਸਤੇ ਜੈਮਪ ਲੇਅਰਾਂ ਵਰਤਦਾ ਹੈ।ਉਹਨਾਂ ਨੂੰ ਸਲਾਈਡਾਂ ਅਤੇ ਫਿਲਟਰਾਂ ਦਾ ਢੇਰ ਸੋਚਣਾ ,ਇਸ ਤਰਾਂ ਕਿ ਦੇਖਣ ਉਪਰੰਤ ਉਹ ਆਪਣੇ ਅੰਸ਼ਾਂ ਦਾ ਸਮੂਹ ਲਗਦੇ ਹਨ।</thetip> - <thetip xml:lang="pl">Program GIMP opiera swoje działanie na warstwach, które umożliwiają porządkowanie obrazu. Warstwy można sobie wyobrażać jako ułożone w stos przeźrocza lub filtry, natomiast efekt końcowy jest złożeniem zawartości składników stosu.</thetip> + <thetip xml:lang="pl">Program GIMP opiera swoje działanie na warstwach, które umożliwiają porządkowanie obrazu. Warstwy można sobie wyobrażać jako ułożone w stos przeźrocza lub filtry, natomiast efekt jest złożeniem zawartości składników stosu.</thetip> <thetip xml:lang="pt">O GIMP utiliza camadas que lhe permitem organizar a sua imagem. Pense nelas como uma pilha de diapositivos ou filtros, de forma a que olhando através da pilha observa um composto dos seus conteúdos.</thetip> <thetip xml:lang="pt_BR">O GIMP usa camadas para organizar a sua imagem. Pense nelas como uma pilha de transparências ou filtros, de modo que, olhando através dela, observa-se uma composição dos seus conteúdos.</thetip> <thetip xml:lang="ro">GIMP folosește straturi pentru a vă permite organizarea imaginii la care lucrați. Gândiți-vă la ele ca la o stivă de diapozitive sau de filtre, unde dacă vă uitați prin ele vedeți o compunere a conținutului lor.</thetip> @@ -137,7 +137,7 @@ <thetip xml:lang="ca">Podeu realitzar moltes operacions de capa anant al diàleg Capes i fent clic amb el botó dret a l'etiqueta de la capa.</thetip> <thetip xml:lang="ca@valencia">Podeu realitzar moltes operacions de capa anant al diàleg Capes i fent clic amb el botó dret a l'etiqueta de la capa.</thetip> <thetip xml:lang="cs">Mnoho operací s vrstvami můžete provést kliknutím pravým tlačítkem na textový popisek vrstvy v dialogovém okně Vrstvy.</thetip> - <thetip xml:lang="da">Du kan udføre mange lagoperationer ved at højreklikke på tekstetiketten til et lag i lagvinduet.</thetip> + <thetip xml:lang="da">Du kan udføre mange lag-handlinger ved at højreklikke på tekstetiketten til et lag i dialogen Lag.</thetip> <thetip xml:lang="de">Viele Ebenenoperationen werden durch Klicken mit der rechten Maustaste auf den Namen der Ebene im Ebenendialog durchgeführt.</thetip> <thetip xml:lang="dz">ཁྱོད་ཀྱིས་བང་རིམ་ཚུ་གི་ཌའི་ལོག་ནང་ལུ་ བང་རིམ་གྱི་ཚིག་ཡིག་ཁ་ཡིག་གུར་གཡས་ལུ་ ཨེབ་གཏང་འབད་བའི་ཐོག་ལས བང་རིམ་ལེ་ཤ་གི་བཀོལ་སྤྱོད་ཀྱི་ལཱ་འགན་འགྲུབ་ཚུགས།</thetip> <thetip xml:lang="el">Μπορείτε να κάνετε πολλές λειτουργίες στρώσης με δεξί κλικ στην ετικέτα κειμένου της στρώσης στο διάλογο στρώσεων.</thetip> @@ -171,7 +171,7 @@ <thetip xml:lang="nn">Du får tilgang til mange av lagoperasjonane ved å høgreklikka på tekstfeltet for eit lag i lagdialogen.</thetip> <thetip xml:lang="oc">Podètz realizar de nombrosas operacions en faisant un clic-dreit sul títol d'un calc dins la bóstia de dialòg dels calques.</thetip> <thetip xml:lang="pa">ਪਰਤ ਡਾਈਲਾਗ ਵਿਚ ਪਰਤ ਦੇ ਲੇਬਲ ਮੂਲ ਉੱਤੇ ਰਾਈਟ ਕਲਿੱਕ ਕਰਕੇ ਤੁਸੀਂ ਜਿਆਦਾ ਲੇਅਰ ਓਪਰੇਸ਼ਨ ਲਾਗੂ ਕਰ ਸਕਦੇ ਹੋ।</thetip> - <thetip xml:lang="pl">Wiele działań na warstwach (np. dopasowanie, przesuwanie) można wykonać klikając drugim przyciskiem myszy nazwę warstwy w oknie „Warstwy”.</thetip> + <thetip xml:lang="pl">Wiele działań na warstwach (np. dopasowanie, przesuwanie) można wykonać klikając drugim przyciskiem myszy nazwę warstwy w oknie „Warstwy”.</thetip> <thetip xml:lang="pt">Pode realizar muitas operações de camadas clicando com o botão direito na etiqueta de texto de uma camada no diálogo Camadas.</thetip> <thetip xml:lang="pt_BR">Você pode realizar muitas operações de camada clicando com o botão direito no rótulo de texto de uma camada no diálogo de Camadas.</thetip> <thetip xml:lang="ro">Puteți executa multe operații de strat prin clic-dreapta pe eticheta text a unui strat în dialogul de straturi.</thetip> @@ -199,6 +199,7 @@ <thetip xml:lang="ca">Quan deseu una imatge per tornar-hi a treballar més tard, utilitzeu el format XCF, el format de fitxer natiu del GIMP (utilitzeu l'extensió de fitxer <tt>.xcf</tt>). Aquest format preserva totes les capes i tot el que hi esteu fent. Un cop acabat el projecte, deseu-ho com a JPEG, PNG, GIF, etc.</thetip> <thetip xml:lang="ca@valencia">Quan alceu una imatge per tornar-hi a treballar més tard, utilitzeu el format XCF, el format de fitxer natiu del GIMP (utilitzeu l'extensió de fitxer <tt>.xcf</tt>). Este format preserva totes les capes i tot el que hi esteu fent. Un cop acabat el projecte, alceu-ho com a JPEG, PNG, GIF, etc.</thetip> <thetip xml:lang="cs">Když obrázek ukládáte pro pozdější práce, zkuste použít XCF, nativní formát souborů GIMP (použijte příponu souboru <tt>.xcf</tt>). Tím zachováte vrstvy a řadu dalších aspektů své probíhající práce. Až je projekt hotov, můžete jej exportovat jako JPEG, PNG, GIF, atd.</thetip> + <thetip xml:lang="da">Når du gemmer et billede for at arbejde på det senere, så prøv at bruge XCF som er Gimp'ens eget filformat (brug filendelsen <tt>.xcf</tt>). Dette bevarer lagene og alle andre aspekter af dit igangværende arbejde. Når et projekt er færdigt, kan du gemme det som JPEG, PNG, GIF, osv.</thetip> <thetip xml:lang="de">Wenn Sie ein Bild speichern, um später daran weiter zu arbeiten, sollten Sie dafür das GIMP-eigene Format XCF (mit der Endung <tt>.xcf</tt>) verwenden. Nur so werden alle Bildinformationen wie Ebenen, Kanäle und Hilfslinien gespeichert. Wenn Sie ein Projekt abgeschlossen haben können Sie es dann als JPEG, PNG, GIF usw. speichern.</thetip> <thetip xml:lang="el">Όταν αποθηκεύετε μια εικόνα για να την ξαναδουλέψετε αργότερα, δοκιμάστε τη χρήση του εγγενούς τύπου αρχείου XCF του GIMP (χρησιμοποιήστε την επέκταση αρχείου <tt>.xcf</tt>). Αυτό διατηρεί τις στρώσεις και πολλές πτυχές της τρέχουσας δουλειάς σας. Όταν τελειώσει το έργο, μπορείτε να την αποθηκεύσετε ως JPEG, PNG, GIF, κλ.</thetip> <thetip xml:lang="en_GB">When you save an image to work on it again later, try using XCF, GIMP's native file format (use the file extension <tt>.xcf</tt>). This preserves the layers and many aspects of your work-in-progress. Once a project is completed, you can export it as JPEG, PNG, GIF, etc.</thetip> @@ -219,7 +220,7 @@ <thetip xml:lang="nl">Als u een afbeelding opslaat om er later opnieuw mee te werken, gebruik dan GIMP's eigen bestandsformaat XCF (gebruik de extensie <tt>.xcf</tt>). Hiermee behoudt u de lagen en veel van de aspecten van uw werk-in-wording. Wanneer een project is voltooid, kunt u de afbeelding ook als JPEG, PNG, GIF en dergelijke opslaan.</thetip> <thetip xml:lang="nn">Når du lagrar eit bilete som er under arbeid, vil det bli lagra i GIMP sitt eige filformat XCF, (filendinga <tt>.xcf</tt>). Då vil det aller meste av det du har gjort også bli lagra. Dermed er det enklare å fortsette arbeidet seinare. Når prosjektet er ferdig, kan du eksportera det som JPEG, PNG, GIF el.l.</thetip> <thetip xml:lang="oc">Quand vous enregistrez un imatge per la retrabalhar mai tard, ensajatz lo format XCF qui es lo format natiu de GIMP (extension <tt>.xcf</tt>). Aquò conserve los calques e de nombroses aspects de vòstre trabalh en cors. Una fois qu'un projècte es acabat, podètz l'exporter en JPEG, PNG, GIF, etc.</thetip> - <thetip xml:lang="pl">Jeśli obraz jest zapisywany w celu ponowienia nad nim pracy w późniejszym czasie, to można spróbować użyć formatu XCF, własnego formatu programu GIMP (rozszerzenie <tt>.xcf</tt>). Pozwoli to na zapisanie warstw, zaznaczeń oraz wielu innych rzeczy dotyczących danego projektu. Po ukończeniu pracy można wyeksportować obraz do docelowego formatu, takiego jak JPEG, PNG, GIF itp.</thetip> + <thetip xml:lang="pl">Jeśli obraz jest zapisywany w celu ponowienia nad nim pracy w późniejszym czasie, to można spróbować użyć formatu XCF, własnego formatu programu GIMP (rozszerzenie <tt>.xcf</tt>). Pozwoli to na zapisanie warstw, zaznaczeń oraz wielu innych rzeczy dotyczących danego projektu. Po ukończeniu pracy można wyeksportować obraz do docelowego formatu, takiego jak JPEG, PNG, GIF itp.</thetip> <thetip xml:lang="pt">Ao gravar uma imagem para mais tarde a trabalhar, experimente utilizar XCF, o formato de imagem nativo do GIMP (utiliza a extensão de ficheiros <tt>.xcf</tt> ). Isto preserva as camadas e todos os aspetos do seu trabalho em curso. Assim que o seu projeto estiver terminado, pode gravá-lo como JPEG, PNG, GIF, etc.</thetip> <thetip xml:lang="pt_BR">Quando salvar uma imagem para trabalhar nela mais tarde, use XCF, o formato de arquivo nativo do GIMP (use a extensão de arquivo <tt>.xcf</tt>). Isto preserva as camadas e todos os aspectos do seu trabalho em andamento. Uma vez completado o projeto, você pode exporta-lo como JPEG, PNG, GIF, ...</thetip> <thetip xml:lang="ro">Când salvați o imagine pentru a lucra la ea mai târziu, folosiți XCF, formatul nativ GIMP (cu extensia <tt>.xcf</tt>). Astfel se conservă straturile și multe alte aspecte ale lucrului în desfășurare. Odată ce proiectul este complet, puteți să îl exportați ca JPEG, PNG, GIF, etc.</thetip> @@ -243,7 +244,7 @@ <thetip xml:lang="ca">La majoria de connectors només funcionen amb la capa activa de la imatge actual. Si voleu que el connector funcioni amb tota la imatge haureu de fusionar totes les capes (Imatge->Aplana la Imatge) .</thetip> <thetip xml:lang="ca@valencia">La majoria de connectors només funcionen amb la capa activa de la imatge actual. Si voleu que el connector funcione amb tota la imatge haureu de fusionar totes les capes (Imatge->Aplana la Imatge) .</thetip> <thetip xml:lang="cs">Většina zásuvných modulů pracuje na aktuální vrstvě aktuálního obrázku. Chcete-li, aby zásuvný modul pracoval s celým obrázkem, je často nutné sloučit obrázek do jedné vrstvy (Obrázek→Sloučit obrázek).</thetip> - <thetip xml:lang="da">De fleste udvidelsesmoduler arbejder på det aktive lag i det aktive billede. I nogle tilfælde bliver du nødt til at slå alle lagene sammen (Billede→Fladgør billede) hvis du vil have modulet til at virke på hele billedet.</thetip> + <thetip xml:lang="da">De fleste plugins arbejder på det aktive lag i det aktive billede. I nogle tilfælde bliver du nødt til at slå alle lagene sammen (Billede→Fladgør billede) hvis du vil have modulet til at virke på hele billedet.</thetip> <thetip xml:lang="de">Die meisten Plugins bearbeiten nur die aktive Ebene des aktuellen Bildes. In einigen Fällen müssen die Ebenen daher vereint werden (Bild→Bild zusammenfügen), wenn das Plugin auf das gesamte Bild angewendet werden soll.</thetip> <thetip xml:lang="dz">པ་ལག་ཨིནསི་མང་ཤོས་རང་ ད་ལྟོའི་གཟུགས་བརྙན་གྱི་བང་རིམ་གུར་ལཱ་འབདག་བཏུབ་ཨིན། གནད་དོན་ལ་ལུ་ཅིག་ནང་ལུ་ པ་ལག་ཨིན་དེ་གཟུགས་བརྙན་ཧྲིལ་བུམ་གུར་ལཱ་འབད་དགོ་པ་ཅིན་ ཁྱོད་ཀྱིས་བང་རིམ་ཚུ་ཆ་མཉམ་མཉམ་བསྡོམས་འབད་དགོ(གཟུགས་བརྙན་→གཟུགས་བརྙན་ལེབ་ཏེམ་བཟོ་) </thetip> <thetip xml:lang="el">Τα περισσότερα πρόσθετα δουλεύουν στην τρέχουσα στρώση της τρέχουσας εικόνας. Στις περισσότερες περιπτώσεις, πρέπει να συγχωνεύσετε όλες τις στρώσεις (Εικόνα→Ισοπέδωση εικόνας), εάν θέλετε το πρόσθετο να δουλέψει σε όλη την εικόνα.</thetip> @@ -273,7 +274,7 @@ <thetip xml:lang="nn">Dei fleste programtillegga arbeider på det aktive laget i det aktive biletet. Dersom du ønskjer at programtillegget skal verke på heile biletet, kan det hende du må flette saman alle laga (bilete->flat ut biletet) først.</thetip> <thetip xml:lang="oc">La màger part des filtres travaillent sul calc courant de l'imatge actuala. De còps vos caldrà fusionar totes los calques (Image→Aplatir l'imatge) se vous souhaitez que lo filtre agisca sus l'imatge entièr.</thetip> <thetip xml:lang="pa">ਬਹੁਤੀਆਂ ਪਲੱਗਇਨ ਮੌਜੂਦਾ ਚਿੱਤਰ ਦੀ ਮੌਜੂਦਾ ਪਰਤ ਉੱਤੇ ਹੀ ਕੰਮ ਕਰਦੀਆਂ ਹਨ। ਕੁਝ ਹਾਲਤਾਂ ਵਿਚ ਤੁਹਾਨੂੰ ਸਭ ਲੇਅਰਾਂ (ਚਿੱਤਰ→ਚਿੱਤਰ ਸਮਤਲ) ਨੂੰ ਸ਼ਾਮਿਲ ਕਰਨਾ ਪਵੇਗਾ, ਜੇ ਤੁਸੀਂ ਪਲੱਗਇਨ ਨੂੰ ਪੂਰੇ ਚਿੱਤਰ ਤੇ ਕੰਮ ਕਰਵਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ।</thetip> - <thetip xml:lang="pl">Większość wtyczek wykonuje działania tylko na aktywnej warstwie. Jeśli działanie dotyczyć ma wszystkich warstw, przed jej wykonaniem należy połączyć wszystkie warstwy w jedną („Obraz→Spłaszcz obraz”).</thetip> + <thetip xml:lang="pl">Większość wtyczek wykonuje działania tylko na aktywnej warstwie. Jeśli działanie dotyczyć ma wszystkich warstw, przed jej wykonaniem należy połączyć wszystkie warstwy w jedną („Obraz→Spłaszcz obraz”).</thetip> <thetip xml:lang="pt">A maioria das extensões funciona na camada atual da imagem atual. Nalguns casos, terá de unir todas as camadas numa só (Imagem→Aplanar imagem) se quiser trabalhar a imagem como um todo.</thetip> <thetip xml:lang="pt_BR">A maioria dos plug-ins funciona na camada ativa da imagem atual. Em alguns casos, é preciso combinar todas as camadas (Camadas→Achatar Imagem) se quiser que o plug-in funcione para toda a imagem.</thetip> <thetip xml:lang="ro">Majoritatea plugin-urilor lucrează pe stratul curent al imaginii curente. În unele cazuri, va trebui să combinați toate straturile (Imagine → Aplatizează imaginea) dacă vreți ca plugin-ul să lucreze pe întreaga imagine.</thetip> @@ -302,7 +303,7 @@ <thetip xml:lang="ca">Si el nom del diàleg del diàleg Capes es mostra <b>negreta</b>, aleshores voldrà dir que la capa no té un canal alfa (transparència). Podeu afegir un canal alfa al menú Capes->Transparència->Afegeix canal alfa.</thetip> <thetip xml:lang="ca@valencia">Si el nom del diàleg del diàleg Capes es mostra <b>negreta</b>, aleshores voldrà dir que la capa no té un canal alfa (transparència). Podeu afegir un canal alfa al menú Capes->Transparència->Afig canal alfa.</thetip> <thetip xml:lang="cs">Je-li název vrstvy v dialogovém okně Vrstvy zobrazen <b>tučně</b>, nemá vrstva alfa kanál. Alfa kanál můžete přidat pomocí Vrstva→Průhlednost→Přidat alfa kanál.</thetip> - <thetip xml:lang="da">Hvis et lags navn i lagvinduet vises med <b>fed</b>, har dette lag ikke en alfakanal. Du kan tilføje en alfakanal med Lag→Gennemsigtighed→Tilføj alfakanal.</thetip> + <thetip xml:lang="da">Hvis et lags navn i dialogen Lag vises med <b>fed</b>, har dette lag ikke en alfa-kanal. Du kan tilføje en alfa-kanal med Lag→Gennemsigtighed→Tilføj alfa-kanal.</thetip> <thetip xml:lang="de">Wenn im Ebenendialog ein Ebenenname in <b>fetter</b> Schrift angezeigt wird, bedeutet dies, dass diese Ebene keinen Alphakanal besitzt. Sie können einen Alphakanal hinzufügen, indem Sie »Ebene→Transparenz→Alphakanal hinzufügen« aufrufen.</thetip> <thetip xml:lang="dz">བང་རིམ་ཌའི་ལོག་ནང་གི་བང་རིམ་གྱི་མིང་དེ་ <b>རྒྱགས་པ་</b>,ནང་ལུ་བསྐྲམ་སྟོན་འབད་དེ་ཡོད་པ་ཅིན་ བང་རིམ་འདི་ལུ་ ཨཱལ་ཕ་རྒྱུ་ལམ་དེ་མེདཔ་ཨིན། ཁྱོད་ཀྱིས་ བང་རིམ་→དྭངས་གསལ་ཅན་→དེ་ལག་ལེན་འཐབ་པའི་ཐོག་ལས་ ཨཱལ་ཕ་རྒྱུ་ལམ་དེ་ ཁ་སྐོང་རྐྱབ་ཚུགས། ཨཱལ་ཕ་རྒྱུ་་ལམ་ཁ་སྐོང་རྐྱབས།</thetip> <thetip xml:lang="el">Εάν το όνομα στρώσης στο διάλογο στρώσεων εμφανίζεται σε <b>έντονα</b>, αυτή η στρώση δεν έχει κανάλι άλφα. Μπορείτε να προσθέσετε ένα άλφα κανάλι χρησιμοποιώντας Στρώση→Διαφάνεια→Προσθήκη καναλιού άλφα.</thetip> @@ -332,7 +333,7 @@ <thetip xml:lang="nn">Dersom lagnamnet er <b>utheva</b> i lagdialogen betyr dette at laget ikkje har alfakanal. Du kan legge til alfakanal ved hjelp av Lag→Gjennomsikt→Legg til alfakanal</thetip> <thetip xml:lang="oc">Se un nom de calc dins la bóstia de dialòg dels calques es afichat en <b>gras</b>, ce calc n'a pas de canal alfa. Podètz apondre un canal alfa en utilizant Calques→Transparéncia→Apondre un canal alfa.</thetip> <thetip xml:lang="pa">ਜੇ ਲੇਅਰ ਡਾਈਲਾਗ ਲੇਅਰ ਦਾ ਨਾਂ <b>ਗੂੜੇ</b> ਅੱਖਰਾਂ ਵਿੱਚ ਹੋਇਆ ਤਾਂ ਇਸ ਪਰਤ ਐਲਫਾ-ਚੈਨਲ ਵਿੱਚ ਨਹੀਂ ਹੋਵੇਗੀ। ਤੁਸੀਂ ਇਸ ਵਿੱਚ ਲੇਅਰ→ਟਰਾਂਸਪਰੇਸੀ→ਐਲਫ਼ਾ ਚੈਨਲ ਸ਼ਾਮਲ ਨਾਲ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ।</thetip> - <thetip xml:lang="pl">Jeśli nazwa warstwy w oknie „Warstwy” jest <b>pogrubiona</b>, oznacza to, że nie posiada ona kanału alfa (przezroczystości). Można dodać kanał alfa wybierając „Warstwa→Przezroczystość→Dodaj kanał alfa”.</thetip> + <thetip xml:lang="pl">Jeśli nazwa warstwy w oknie „Warstwy” jest <b>pogrubiona</b>, oznacza to, że nie ma ona kanału alfa (przezroczystości). Można dodać kanał alfa wybierając „Warstwa→Przezroczystość→Dodaj kanał alfa”.</thetip> <thetip xml:lang="pt">Se um nome de uma camada no diálogo Camadas estiver a <b>negrito</b>, essa camada não tem um canal alfa (de transparência). Adicione transparência à imagem escolhendo Camada→alfa→Adicionar canal alfa.</thetip> <thetip xml:lang="pt_BR">Se o nome de uma camada no diálogo de Camadas estiver em <b>negrito</b>, essa camada não tem um canal alfa (transparência). Você pode adicionar um canal alfa usando Camada→Transparência→Adicionar Canal Alfa.</thetip> <thetip xml:lang="ro">Dacă numele unui strat în dialogul de straturi este afișat <b>îngroșat</b>, acel strat nu are un canal alfa. Puteți adăuga un canal alfa folosind Strat → Transparență → Adaugă un canal alfa</thetip> @@ -361,7 +362,7 @@ <thetip xml:lang="ca">No tots els efectes es poden aplicar a tots els tipus d'imatges. Els efectes que no es puguin utilitzar estaran desactivats. Potser necessiteu canviar el mode de la imatge a RGB (Imatge->Mode->RGB), afegir un canal alfa (Capes-> Transparència-> Afegeix Canal Alfa) o aplanar la imatge (Imatge->Aplana la Imatge).</thetip> <thetip xml:lang="ca@valencia">No tots els efectes es poden aplicar a tots els tipus d'imatges. Els efectes que no es puguen utilitzar estaran desactivats. Potser necessiteu canviar el mode de la imatge a RGB (Imatge->Mode->RGB), afegir un canal alfa (Capes-> Transparència-> Afig Canal Alfa) o aplanar la imatge (Imatge->Aplana la Imatge).</thetip> <thetip xml:lang="cs">Některé efekty nemohou být aplikovány na všechny typy obrázků. To je indikováno zašedlou položkou nabídky. Možná budete muset změnit režim obrázku na RGB (Obrázek→Režim→RGB), přidat alfa kanál (Vrstva→Průhlednost→Přidat alfa kanál) nebo sloučit vrstvy do jedné (Obrázek→Sloučit obrázek).</thetip> - <thetip xml:lang="da">Ikke alle effekter kan bruges på alle typer billeder. Dette bliver indikeret ved et gråtonet menupunkt. Du får måske bruge for at ændre billedtilstanden til RGB (Billede→Tilstand→RGB), tilføje en alfakanal (Lag→Gennemsigtighed→Tilføj alfakanal) eller fladgøre det (Billede→Fladgør billede).</thetip> + <thetip xml:lang="da">Ikke alle effekter kan bruges på alle typer billeder. Dette angives ved et gråtonet menupunkt. Du får måske brug for at ændre billedtilstanden til RGB (Billede→Tilstand→RGB), tilføje en alfa-kanal (Lag→Gennemsigtighed→Tilføj alfa-kanal) eller fladgøre det (Billede→Fladgør billede).</thetip> <thetip xml:lang="de">Nicht alle Effekte können auf alle Bildtypen angewendet werden. Dies wird durch einen grauen Menüeintrag angezeigt. Es ist dann nötig, das Bild ins RGB-Format umzuwandeln (Bild→Modus→RGB), dem Bild Transparenz hinzuzufügen (Ebene→Transparenz→Alphakanal hinzufügen) oder die Ebenen des Bildes zu vereinigen (Bild→Bild zusammenfügen).</thetip> <thetip xml:lang="dz">ནུས་པ་ཚུ་ཆ་མཉམ་ གཟུགས་བརྙན་དབྱེ་ཁག་ཆ་མཆམ་ལུ་འཇུག་སྤྱོད་འབད་མི་བཏུབ། འདི་ཡང་ grayed-out དཀར་ཆག-ཐོ་བཀོད་ཀྱིས་བརྡ་སྟོནམ་ཨིན། ཁྱོད་ཀྱིས་གཟུགས་བརྙན་ཐབས་ལམ་དེ་ ཨཱར་བི་ཇི་ལུ་ བསྒྱུར་བཅོས་འབད་དགོཔ་འོང་། (གཟུགས་བརྙན་→ཐབས་ལམ་→ཨཱར་ཇི་བི་),ཨཱལ་ཕ་རྒྱུ་ལམ་ཁ་སྐོང་རྐྱབས་(བང་རིམ་→དྭངས་གསལ་→ཨཱལ་ཕ་རྒྱུ་ལམ་ཁ་སྐོང་རྐྱབས་) ཡང་ན་དེ་ལེབ་ཏེམ་བཟོ་(གཟུགས་བརྙན་→གཟུགས་བརྙན་ལེབ་ཏེམ་བཟོ)</thetip> <thetip xml:lang="el">Δεν μπορούν να εφαρμοστούν όλα τα εφέ σε όλα τα είδη των εικόνων. Αυτό φαίνεται από μια αχνή είσοδο μενού. Μπορεί να χρειαστεί να αλλάξετε την κατάσταση εικόνας σε RGB (Εικόνα→Κατάσταση→RGB), να προσθέσετε ένα άλφα κανάλι (Στρώση→Διαφάνεια→Προσθήκη καναλιού άλφα) ή να την ισοπεδώσετε (Εικόνα→Ισοπέδωση εικόνας).</thetip> @@ -391,7 +392,7 @@ <thetip xml:lang="nn">Ikkje alle funksjonane verkar på alle typer bilete. Dette blir vist ved at menyinnslaget er gråa ut. Skulle dette vere til hinder for arbeidet ditt, kan du prøve å endre biletet til RGB-modus (Bilete->Modus->RGB), legge til ein alfakanal (Lag->Gjennomsikt->Legg til alfakanal) eller flate ut biletet (Bilete->Flat ut biletet).</thetip> <thetip xml:lang="oc">Totes les efièits ne pòdon pas èsser appliqués sus totes les types d'imatges. Aquò es signalé per una entrada de menu grisée. Vous pourriez donc aver besoin de changer lo mòde de l'imatge en RVB (Image→Mode→RVB), apondre un canal alfa (Calque→Transparéncia→Apondre un canal alfa) o l'aplatir (Image→Aplatir l'imatge).</thetip> <thetip xml:lang="pa">ਸਾਰੇ ਪ੍ਰਭਾਵ ਸਾਰੀਆਂ ਕਿਸਮਾਂ ਦੇ ਚਿੱਤਰਾਂ ਤੇ ਲਾਗੂ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ। ਇਹ ਸੂਚੀ ਵਿਚਲੇ ਫਿੱਕੇ ਇੰਦਰਾਜ਼ ਤੋਂ ਪਤਾ ਚਲਦਾ ਹੈ। ਤੁਸੀਂ ਚਿੱਤਰ ਰੂਪ ਨੂੰ RGB ਬਦਲ ਸਕਦੇ ਹੋ (ਚਿੱਤਰ→ਮੋਡ→RGB), ਇਕ ਅਲ਼ਫਾ ਚੈਨਲ(ਲੇਅਰਾਂ→ਟਰਾਂਸਪਰੇਸੀ→ਅਲਫ਼ਾ ਚੈਨਲ ਸ਼ਾਮਲ) ਸ਼ਾਮਲ ਕਰੋ ਜਾਂ ਸਮਤਲ (ਚਿੱਤਰ→ਚਿੱਤਰ ਸਮਤਲ) ਕਰੋ।</thetip> - <thetip xml:lang="pl">Nie wszystkie efekty mogą być wykorzystywane na obrazach dowolnych typów. Efekty, których nie można użyć na bieżącym obrazie, są w menu szare. Aby ich użyć, należy zmienić tryb obrazu na RGB („Obraz→Tryb→RGB”), dodać kanał alfa („Warstwa→Przezroczystość→Dodaj kanał alfa”) lub spłaszczyć obraz („Obraz→Spłaszcz obraz”).</thetip> + <thetip xml:lang="pl">Nie wszystkie efekty mogą być wykorzystywane na obrazach dowolnych typów. Efekty, których nie można użyć na bieżącym obrazie, są w menu szare. Aby ich użyć, należy zmienić tryb obrazu na RGB („Obraz→Tryb→RGB”), dodać kanał alfa („Warstwa→Przezroczystość→Dodaj kanał alfa”) lub spłaszczyć obraz („Obraz→Spłaszcz obraz”).</thetip> <thetip xml:lang="pt">Nem todos os efeitos podem ser aplicados a todos os tipos de imagem. Isto é indicado por uma opção de menu cinzenta. Poderá ter que alterar o modo da imagem para RGB (Imagem→Modo→RGB), adicionar um canal alfa (Camadas→alfa→Adicionar canal alfa) ou unir todas as camadas numa só imagem (Imagem→Aplanar imagem).</thetip> <thetip xml:lang="pt_BR">Nem todos os efeitos podem ser aplicados a todos os tipos de imagens. Isto é indicado por uma opção de menu acinzentada. Você pode ter que modificar o modo da imagem para RGB (Imagem→Modo→RGB), adicionar um canal alfa (Camadas→Transparência→Adicionar Canal Alfa) ou achata-la (Imagem→Achatar Imagem).</thetip> <thetip xml:lang="ro">Nu toate efectele pot fi aplicate la toate tipurile de imagini. Acest lucru este indicat prin colorarea în gri a intrării de meniu inactive. Este posibil să trebuiască să schimbați modul imaginii la RGB (Imagine → Mod → RGB), să adăugați un canal alfa (Strat → Transparență → Adaugă un canal alfa), sau să o aplatizați (Imagine → Aplatizează imaginea).</thetip> @@ -446,7 +447,7 @@ <thetip xml:lang="nn">Du kan flytte eit utval utan å flytte innhaldet ved å halde nede <tt>Alt</tt>-tasten samstundes som du flytter utvalet. Dersom dette flytter dette heile biletet betyr det at denne tasten er i bruk av vindaugehandteraren i maskinen din. I noen tilfelle kan du setje opp handteraren til å ignorere <tt>Alt</tt>-tasten, eller du kan kanskje bruke <tt>Super</tt>-tasten eller "Windows logoen" i staden.</thetip> <thetip xml:lang="oc">Podètz ajuster o desplaçar una seleccion en utilizant <tt>Alt</tt> glissé. Se aquesta action provoque un desplaçament de la fenèstra c'est que votre gestionari de fenèstras utiliza ja la tòca <tt>Alt</tt>. La màger part des gestionaris de fenèstras pòdon èsser configurats per ignorer la tòca <tt>Alt</tt> o utilizar la tòca <tt>Logo</tt> (o logo Windows) à la place.</thetip> <thetip xml:lang="pa">ਤੁਸੀਂ <tt>Alt</tt>-drag ਰਾਹੀਂ ਚੋਣ ਨੂੰ ਤਰਤੀਬ ਅਤੇ ਬਦਲ ਸਕਦੇ ਹੋ। ਜੇ ਇਹ ਵਿੰਡੋ ਨੂੰ ਹਿਲਾਂਉਦੀ ਹੈ, ਤੁਹਾਡਾ ਵਿੰਡੋ ਮੈਨੇਜਰ ਪਹਿਲਾਂ ਹੀ <tt>Alt</tt> ਸਵਿੱਚ ਵਰਤਦਾ ਹੈ। ਬਹੁਤ ਵਿੰਡੋ ਮੈਨੇਜਰਾਂ ਨੂੰ <tt>Alt</tt> ਸਵਿੱਚ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰਨ ਜਾਂ <tt>Super</tt> ਸਵਿੱਚ (ਜਾਂ "ਵਿੰਡੋ ਲੋਗੋ") ਨੂੰ ਵਰਤਣ ਲਈ ਸੰਰਚਿਤ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ</thetip> - <thetip xml:lang="pl">Zaznaczenie można przesuwać, przeciągając je z klawiszem <tt>Alt</tt>. Jeśli to powoduje przesunięcie okna, oznacza to, że menedżer okien używa już klawisza <tt>Alt</tt>. Większość menedżerów okien jest skonfigurowanych tak, aby ignorować klawisz <tt>Alt</tt> lub używać zamiennie klawisza <tt>Super</tt> (lub „logo Windows”)</thetip> + <thetip xml:lang="pl">Zaznaczenie można przesuwać, przeciągając je z klawiszem <tt>Alt</tt>. Jeśli to powoduje przesunięcie okna, oznacza to, że menedżer okien używa już klawisza <tt>Alt</tt>. Większość menedżerów okien jest skonfigurowanych tak, aby ignorować klawisz <tt>Alt</tt> lub używać zamiennie klawisza <tt>Super</tt> (lub „logo Windows”)</thetip> <thetip xml:lang="pt">Pode ajustar ou mover uma seleção utilizando <tt>Alt</tt>-arrastar. Se isto fizer a janela mover-se, quer dizer que o seu gestor de janelas já utiliza a tecla <tt>Alt</tt>. A maioria dos gestores de janelas podem ser configurados para ignorar a tecla <tt>Alt</tt> ou para usar a tecla <tt>Super</tt> (ou "tecla do Windows") em vez dessa.</thetip> <thetip xml:lang="pt_BR">Você pode ajustar ou mover uma seleção usando <tt>Alt</tt> enquanto arrasta. Se isto fizer a janela mover, o seu gerenciador de janelas já está usando a tecla <tt>Alt</tt>. A maioria dos gerenciadores de janelas pode ser configurada para ignorar a tecla <tt>Alt</tt> ou usar a tecla <tt>Super</tt> (ou "Logotipo do Windows") no lugar.</thetip> <thetip xml:lang="ro">Puteți să ajustați sau să mutați o selecție prin folosirea <tt>Alt</tt>-și-tragere. Dacă acest lucru determină mișcarea ferestrei, înseamnă că gestionarul de fereastră folosește deja tasta <tt>Alt</tt>. Majoritatea gestionarelor de fereastră pot fi configurate să ignore tasta <tt>Alt</tt>, sau să folosească tasta <tt>Super</tt> (sau „sigla Windows”) în loc.</thetip> @@ -511,7 +512,7 @@ <thetip xml:lang="nn">Du kan dra og sleppe mange ting i GIMP. For eksempel kan du dra ein farge frå verktøykassa eller frå ein fargepalett og sleppe han i biletet. Biletet eller utvalet vil då bli fylt med den valde fargen.</thetip> <thetip xml:lang="oc">Podètz lisar e depausar beaucoup de choses dins GIMP. Per exemple, lisar una color dempuèi la bóstia d'aisinas o dempuèi una paleta de colors e la metre dins un imatge va emplenar l'imatge o la seleccion actuala amb aquesta color.</thetip> <thetip xml:lang="pa">ਤੁਸੀਂ ਜੈਮਪ ਵਿਚ ਇਕ ਤੋਂ ਜਿਆਦਾ ਚੀਜਾਂ ਖਿੱਚ ਅਤੇ ਛੱਡ ਸਕਦੇ ਹੋ। ਉਦਾਹਰਣ ਵਾਸਤੇ, ਟੂਲ ਡੱਬੇ ਜਾਂ ਪੈਲਅਟ ਵਿਚੋਂ ਰੰਗ ਖਿੱਚਣਾ ਅਤੇ ਚਿੱਤਰ ਉੱਤੇ ਛੱਡਣ ਨਾਲ ਮੌਜੂਦ ਚਿੱਤਰ ਰੰਗੀਨ ਹੋ ਜਾਵੇਗਾ ਜਾਂ ਉਸ ਰੰਗ ਦੀ ਚੋਣ ਨਾਲ।</thetip> - <thetip xml:lang="pl">W programie GIMP można przeciągać i upuszczać myszą wiele rzeczy. Na przykład przeciągnięcie koloru z przybornika (lub z palety kolorów) i upuszczenie go na obrazie spowoduje wypełnienie aktywnej warstwy (lub zaznaczenia) kolorem.</thetip> + <thetip xml:lang="pl">W programie GIMP można przeciągać i upuszczać myszą wiele rzeczy. Na przykład przeciągnięcie koloru z przybornika (lub z palety kolorów) i upuszczenie go na obrazie spowoduje wypełnienie aktywnej warstwy (lub zaznaczenia) kolorem.</thetip> <thetip xml:lang="pt">Pode arrastar e largar muitas coisas no GIMP. Por exemplo, arrastar uma cor da caixa de ferramentas ou de uma paleta de cores e largá-la numa imagem enche a seleção atual com essa cor.</thetip> <thetip xml:lang="pt_BR">Você pode arrastar e soltar muitas coisas no GIMP. Por exemplo, arrastar uma cor da caixa de ferramentas ou de uma paleta de cores e soltá-la numa imagem irá preencher a seleção atual com aquela cor.</thetip> <thetip xml:lang="ro">Puteți să trageți și să plasați multe chestii în GIMP. De exemplu, tragerea unei culori din trusa de instrumente sau dintr-o paletă de culoare și plasarea acesteia peste o imagine va umple selecția curentă cu acea culoare.</thetip> @@ -598,7 +599,7 @@ <thetip xml:lang="ca">Feu clic i arrossegueu el regle per posar una guia a la imatge. Totes les imatges seleccionades s'ajustaran a les guies. Podeu treure les guies arrossegant-les fora de la imatge amb l'eina Mou.</thetip> <thetip xml:lang="ca@valencia">Feu clic i arrossegueu el regle per posar una guia a la imatge. Totes les imatges seleccionades s'ajustaran a les guies. Podeu traure les guies arrossegant-les fora de la imatge amb l'eina Mou.</thetip> <thetip xml:lang="cs">Kliknutím na pravítku a tažením umístíte na obrázek vodítko. Všechny tažené výběry se budou přichytávat k vodítkům. Vodítka můžete odstranit jejich přetažením mimo obrázek nástrojem Přesun.</thetip> - <thetip xml:lang="da">Klik og træk på en lineal for at placere en hjælpelinje i billedet. Alle markeringer som bliver flyttet, vil så følge hjælpelinjerne. Du kan fjerne linjerne igen ved at trække dem af billedet med flytteværktøjet.</thetip> + <thetip xml:lang="da">Klik og træk på en lineal for at placere en hjælpelinje i billedet. Alle markeringer som bliver flyttet, vil blive fastgjort til hjælpelinjerne. Du kan fjerne linjerne igen ved at trække dem af billedet med flytteværktøjet.</thetip> <thetip xml:lang="de">Durch Anklicken des Lineals am Bildrand können Hilfslinien auf das Bild gezogen und dort platziert werden. Beim Anlegen und Verschieben von Auswahlen werden diese entlang dieser Hilfslinien eingerastet. Sie können Hilfslinien wieder entfernen, indem Sie diese mit dem Verschiebenwerkzeug über die Bildgrenzen hinaus verschieben.</thetip> <thetip xml:lang="dz">ལམ་སྟོན་པ་དེ་ གཟུགས་བརྙན་གུར་བཞག་ནིའི་དོན་ལུ་ ཐིག་ཤིང་གུར་ཨེབ་གཏང་འབད་དེ་འདྲུད། འདྲུད་མི་སེལ་འཐུ་ཆ་མཉམ་གྱི་ ལམ་སྟོན་པ་ལུ་པར་བཏབ་ཨིན། ཁྱོད་ཀྱིས་ ལམ་སྟོན་པ་ཚུ་ གཟུགས་བརྙན་གུ་ལས་སྤོ་བཤུད་ལག་ཆས་གཅིག་ཁར་ ཕྱི་ཁར་ལུ་ འདྲུད་པའི་ཐོག་ལས་ རྩ་བསྐྲད་གཏང་ཚུགས། </thetip> <thetip xml:lang="el">Κλικ και σύρσιμο σε χάρακα για τοποθέτηση οδηγού σε εικόνα. Όλες οι συρμένες επιλογές θα προσκολληθούν στους οδηγούς. Μπορείτε να αφαιρέσετε τους οδηγούς σύροντας τους εκτός εικόνας με το εργαλείο μετακίνησης.</thetip> @@ -630,7 +631,7 @@ <thetip xml:lang="nn">Du kan plassera hjelpelinjer i biletet ved å klikke og dra dei ut frå ein av linjalane rundt biletkanten. Alle utval som blir dradd ut og sleppt i biletet, vil feste seg til hjelpelinjene. Du fjerner hjelpelinjene ved å dra dei ut av biletet med flytteverktøyet.</thetip> <thetip xml:lang="oc">Clicatz sus una règla e lisatz la per plaçar un guide sus l'imatge. Totas las construccions de seleccion vont accrocher aux guides. Podètz levar les guides en les glissant fòra de l'imatge amb l'aisina desplaçar.</thetip> <thetip xml:lang="pa">ਚਿੱਤਰ ਉੱਤੇ ਸਹਾਇਕ ਸਥਾਪਿਤ ਕਰਨ ਲਈ ਪੈਮਾਨੇ ਨੂੰ ਕਲਿੱਕ ਕਰੋ ਤੇ ਖਿੱਚੋ।ਸਾਰੀਆਂ ਖਿਚੀਆਂ ਚੋਣਾਂ ਸਹਾਇਕ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੋ ਜਾਣਗੀਆਂ।ਤੁਸੀਂ Move ਟੂਲ ਨਾਲ ਚਿੱਤਰ ਵਿਚੋਂ ਬਾਹਰ ਖਿੱਚ ਕੇ ਸਹਾਇਕ ਨੂੰ ਹਟਾ ਸਕਦੇ ਹੋ।</thetip> - <thetip xml:lang="pl">Aby umieścić na obrazie prowadnicę, należy kliknąć linijkę i przeciągnąć ją w wybrane miejsce obrazu. Przy wszystkich działaniach wykonywanych z użyciem kursor myszy będzie przyciągany do prowadnic. Aby usunąć prowadnicę, wystarczy przeciągnąć ją narzędziem „Przesunięcie” poza obraz.</thetip> + <thetip xml:lang="pl">Aby umieścić na obrazie prowadnicę, należy kliknąć linijkę i przeciągnąć ją w wybrane miejsce obrazu. Przy wszystkich działaniach wykonywanych z użyciem kursor myszy będzie przyciągany do prowadnic. Aby usunąć prowadnicę, wystarczy przeciągnąć ją narzędziem „Przesunięcie” poza obraz.</thetip> <thetip xml:lang="pt">Clique e arraste numa régua para colocar uma guia numa imagem. Todas as seleções arrastadas serão atraídas para as guias. Pode remover as guias arrastando-as para fora da imagem com a ferramenta Mover.</thetip> <thetip xml:lang="pt_BR">Clique e arraste numa régua para colocar uma guia sobre a imagem. Todas as operações de seleção arrastadas serão atraídas para as guias. Você pode remover as guias arrastando-as para fora da imagem com a ferramenta de Movimento.</thetip> <thetip xml:lang="ro">Clic pe o riglă și trageți de ea pentru a așeza un ghidaj pe o imagine. Toate selecțiile trase vor acroșa la ghidaje. Puteți elimina ghidajele prin tragerea lor în afara imaginii cu instrumentul de mutare.</thetip> @@ -659,7 +660,7 @@ <thetip xml:lang="ca">Podeu arrossegar una capa des del diàleg Capes cap a la caixa d'eines. Això crearà una nova imatge només amb aquesta capa.</thetip> <thetip xml:lang="ca@valencia">Podeu arrossegar una capa des del diàleg Capes cap a la caixa d'eines. Això crearà una nova imatge només amb esta capa.</thetip> <thetip xml:lang="cs">Vrstvu můžete přetáhnout z dialogového okna Vrstvy a upustit ji na panel nástrojů. Tím vytvoříte nový obrázek obsahující jen tuto vrstvu.</thetip> - <thetip xml:lang="da">Du kan trække et lag fra lagvinduet og slippe det i værktøjskassen. Dette opretter et nyt billede som kun indeholder det lag.</thetip> + <thetip xml:lang="da">Du kan trække et lag fra dialogen Lag og slippe det i værktøjskassen. Dette opretter et nyt billede som kun indeholder det lag.</thetip> <thetip xml:lang="de">Sie können eine Ebene aus dem Ebenendialog in den Werkzeugkasten ziehen. Dadurch wird ein neues Bild erzeugt, welches nur diese Ebene enthält.</thetip> <thetip xml:lang="dz">ཁྱོད་ཀྱིས་བང་རིམ་དེ་ བང་རིམ་ཚུ་གི་དའི་ལོག་དེ་ནང་ལས་འདྲུད་དེ་ འ་ནི་དེ་ལག་ཆས་སྒྲོམ་ནང་ལུ་སར་འཇོག་འབད་ཚུགས། འདི་གིས་འ་ཕི་བང་རིམ་རྐྱངམ་ཅིག་ཡོད་མི་གཟུགས་བརྙན་གསརཔ་ཅིག་གསར་བསྐྲུན་འབད་འོང་།</thetip> <thetip xml:lang="el">Μπορείτε να σύρετε μια στρώση από το διάλογο στρώσεων και να την εναποθέσετε στην εργαλειοθήκη. Αυτό θα δημιουργήσει μια νέα εικόνα που περιέχει μόνο αυτήν τη στρώση.</thetip> @@ -694,7 +695,7 @@ <thetip xml:lang="nn">Du kan dra eit lag ut frå lagdialogen og sleppe det i verktøykassa. Dette vil lage eit nytt bilete som bare inneheld dette eine biletlaget.</thetip> <thetip xml:lang="oc">Podètz lisar un calc dempuèi la bóstia de dialòg dels calques e la metre dins la bóstia d'aisinas. Aquò creara un imatge novèl contenant uniquement ce calque.</thetip> <thetip xml:lang="pa">ਤੁਸੀਂ ਲੇਅਰ ਡਾਈਲਾਗ ਵਿਚੋਂ ਇਕ ਲੇਅਰ ਖਿੱਚ ਕੇ ਟੂਲ ਡਬੇ ਵਿਚ ਛੱਡ ਸਕਦੇ ਹੋ। ਇਸ ਨਾਲ ਸਿਰਫ ਉਸ ਲੇਅਰ ਵਾਲਾ ਇਕ ਨਵਾਂ ਚਿੱਤਰ ਬਣੇਗਾ।</thetip> - <thetip xml:lang="pl">Można przeciągnąć warstwę z okna „Warstwy” na przybornik. W ten sposób utworzony zostanie nowy obraz z zawartością tej warstwy.</thetip> + <thetip xml:lang="pl">Można przeciągnąć warstwę z okna „Warstwy” na przybornik. W ten sposób utworzony zostanie nowy obraz z zawartością tej warstwy.</thetip> <thetip xml:lang="pt">Pode arrastar uma camada do diálogo Camadas e largá-la na caixa de ferramentas. Isto criará uma nova imagem contendo só aquela camada.</thetip> <thetip xml:lang="pt_BR">Você pode arrastar uma camada do diálogo de "Camadas" e largá-la na caixa de ferramentas. Isto irá criar uma nova imagem contendo apenas aquela camada.</thetip> <thetip xml:lang="ro">Puteți trage un strat din dialogul de straturi și să îl lăsați să cadă peste trusa de instrumente. În acest fel se va crea o nouă imagine ce conține doar acel strat.</thetip> @@ -723,7 +724,7 @@ <thetip xml:lang="ca">Una selecció flotant ha d'estar fixada a una nova capa o a l'última capa activa abans de fer altres accions amb la imatge. Feu clic a "Capa Nova" o "Capa Àncora" botó en el diàleg Capes o utilitzeu els menús per fer el mateix.</thetip> <thetip xml:lang="ca@valencia">Una selecció flotant ha d'estar fixada a una nova capa o a l'última capa activa abans de fer altres accions amb la imatge. Feu clic a "Capa Nova" o "Capa Àncora" botó en el diàleg Capes o utilitzeu els menús per fer el mateix.</thetip> <thetip xml:lang="cs">Plovoucí výběr musí být před prováděním jiných operací na obrázku ukotven k nové vrstvě nebo k poslední aktivní vrstvě. Klikněte na tlačítko "Nová vrstva" nebo "Ukotvit vrstvu" v dialogovém okně Vrstvy nebo to proveďte pomocí nabídky.</thetip> - <thetip xml:lang="da">En flydende markering skal forankres til et nyt lag eller det sidste aktive lag før der kan foretages andre operationer på billedet. Klik på "Nyt lag"- eller "Forankr lag"-knappen i lagvinduet eller brug menuerne til at gøre det samme.</thetip> + <thetip xml:lang="da">En flydende markering skal forankres til et nyt lag eller det sidste aktive lag før der kan foretages andre operationer på billedet. Klik på "Nyt lag"- eller "Forankr lag"-knappen i dialogen Lag eller brug menuerne til at gøre det samme.</thetip> <thetip xml:lang="de">Eine schwebende Auswahl muss mit einer neuen Ebene oder der zuletzt aktiven Ebene verankert werden, bevor Sie andere Funktionen auf das Bild anwenden können. Klicken Sie dazu auf die Schaltfläche »Neue Ebene« oder »Ebene verankern« im Ebenendialog oder den Menüs.</thetip> <thetip xml:lang="dz">འཕུར་ལྡིང་འབད་ཡོད་པའི་སེལ་འཐུ་དེ་ བང་རིམ་གསརཔ་ལུ་དང་ ཡང་ན་ གཟུགས་བརྙན་གུ་ལུ་བཀོལ་སྤྱོད་མ་འབད་བའི་ཧེ་མ་ མཇུག་མམ་གྱི་ཤུགས་ལྡན་བང་རིམ་ལུ་ ཨེན་ཀོར་འབད་དགོ "གུར་ཨེབ་གཏང་འབད། བང་རིམ་གསརཔ་" ཡང་ན་ "དེ། ཨེན་ཀོར་འབད་ནི་བང་རིམ་" བང་རིམ་ཚུ་གུ་ཌའི་ལོག་ནང་གི་ཨེབ་རྟ་ ཡང་ན་ ཅོག་གཅིགཔ་སྦེ་འབད་ནི་དོན་ལུ་ དཀར་ཆག་ལག་ལེན་འཐབ།</thetip> <thetip xml:lang="el">Μια αιωρούμενη επιλογή πρέπει να αγκυρωθεί σε μια νέα στρώση ή στην τελευταία ενεργή στρώση πριν να γίνουν άλλες λειτουργίες στην εικόνα. Κλικ στο "Νέα στρώση" ή το κουμπί "Αγκίστρωση στρώσης" στο διάλογο στρώσεων ή χρησιμοποιήστε τα μενού για να κάνετε το ίδιο.</thetip> @@ -753,7 +754,7 @@ <thetip xml:lang="nl">Een zwevende selectie moet verankerd worden met een nieuwe laag of de laatste actieve laag voordat u andere bewerkingen op de afbeelding uitvoert. Klik hiertoe op de knoppen "Nieuwe laag" of "Laag verankeren" in het dialoogvenster Lagen of gebruik de menu's.</thetip> <thetip xml:lang="nn">Eit flytande utval må forankrast til eit nytt lag eller til det aktive laget før du kan arbeide vidare på resten av biletet. Klikk på "Nytt lag" eller "Forankre laget" i lagdialogen eller i lokalmenyen som kjem fram når du høgreklikkar i lagdialogen.</thetip> <thetip xml:lang="pa">ਚਿੱਤਰ ਤੇ ਕੋਈ ਹੋਰ ਕਾਰਵਾਈ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ, ਨਵੀਂ ਪਰਤ ਉੱਤੇ ਜਾਂ ਪਿਛਲੀ ਐਕਟਿਵ ਪਰਤ ਤੇ ਚਾਲੂ ਚੋਣ anchored ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ। ਪਰਤ ਡਾਈਲਾਗ ਵਿਚ "ਨਵੀਂ ਪਰਤ" ਜਾਂ "ਲੇਅਰ ਬਟਨ ਐਂਕਰ" ਕਲਿੱਕ ਕਰੋ ਜਾਂ ਅਜਿਹਾ ਸੂਚੀ ਵਰਤ ਕੇ ਕਰ ਸਕਦੇ ਹੋ।</thetip> - <thetip xml:lang="pl">Przed wykonaniem jakichkolwiek działań na oderwanym zaznaczeniu należy je przytwierdzić do nowej lub istniejącej warstwy. Aby to uzyskać, wystarczy w oknie „Warstwy” kliknąć przycisk „Nowa warstwa” lub „Zakotwicz warstwę”. Ten sam efekt można uzyskać korzystając z menu kontekstowego.</thetip> + <thetip xml:lang="pl">Przed wykonaniem jakichkolwiek działań na oderwanym zaznaczeniu należy je przytwierdzić do nowej lub istniejącej warstwy. Aby to uzyskać, wystarczy w oknie „Warstwy” kliknąć przycisk „Nowa warstwa” lub „Zakotwicz warstwę”. Ten sam efekt można uzyskać korzystając z menu kontekstowego.</thetip> <thetip xml:lang="pt">Uma seleção flutuante tem de estar ancorada a uma nova camada ou à última camada ativa antes de realizar outras operações com a imagem. Clique nos botões "Nova camada" ou "Ancorar camada" no diálogo Camadas ou utilize os menus para fazer o mesmo.</thetip> <thetip xml:lang="pt_BR">Uma seleção flutuante tem que estar ancorada a uma nova camada ou à última camada ativa antes de realizar outras operações com a imagem. Clique nos botões "Nova Camada" ou "Ancorar Camada" no diálogo de Camadas, ou use os menus para fazê-lo.</thetip> <thetip xml:lang="ro">O selecție flotantă trebuie să fie ancorată la un strat nou sau la ultimul strat activ, înainte de a efectua alte operații asupra imaginii. Clic pe butonul „Strat nou” sau „Ancorează stratul” în dialogul de straturi, sau folosiți meniurile pentru a face același lucru.</thetip> @@ -813,7 +814,7 @@ <thetip xml:lang="nn">GIMP har direkte støtte for gzip-kompresjon. Bare legg <tt>.gz</tt> (eller <tt>.bz2</tt> med bzip2) til filnamnet, og biletet blir komprimert når du lagrar det. Sjølvsagt kan du også opna komprimerte biletfiler.</thetip> <thetip xml:lang="oc">GIMP prend en charge la compression gzip a la volada. Apondètz simplement l'extension <tt>.gz</tt> (o <tt>.bz2</tt> se bzip2 es installé) al nom de fichièr e votre image serà compressée e sauvegardée. Bien sûr lo cargament d'imatges compressées fonctionne egalament.</thetip> <thetip xml:lang="pa">ਜੈਮਪ ਤੁਰੰਤ gzip ਕੰਪਰੈੱਸ ਲਈ ਸਹਾਇਕ ਹੈ। ਫਾਇਲ ਨਾਂ ਦੇ ਬਾਅਦ ਕੇਵਲ <tt>.gz</tt> (ਜਾਂ <tt>.bz2</tt>, ਜੇ bzip2 ਚਾਹੁੰਦੇ ਹੋ) ਦਿਓ ਅਤੇ ਤੁਹਾਡਾ ਚਿੱਤਰ ਕੰਪਰੈੱਸ ਕਰਕੇ ਸੰਭਾਲਿਆ ਜਾਵੇਗਾ। ਬੇਸ਼ੱਕ ਕੰਪਰੈੱਸ ਕੀਤੇ ਚਿੱਤਰ ਲੋਡ ਵੀ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ।</thetip> - <thetip xml:lang="pl">Program GIMP obsługuję kompresję gzip w locie. Dodanie rozszerzenie <tt>.gz</tt> (lub <tt>.bz2</tt>, jeśli program bzip2 jest zainstalowany) do nazwy pliku spowoduje skompresowanie obrazu. Oczywiście można także wczytywać skompresowane obrazy.</thetip> + <thetip xml:lang="pl">Program GIMP obsługuję kompresję gzip w locie. Dodanie rozszerzenie <tt>.gz</tt> (lub <tt>.bz2</tt>, jeśli program bzip2 jest zainstalowany) do nazwy pliku spowoduje skompresowanie obrazu. Oczywiście można także wczytywać skompresowane obrazy.</thetip> <thetip xml:lang="pt">O GIMP suporta compressão gzip automaticamente. Basta adicionar <tt>.gz</tt> (ou <tt>.bz2</tt>, se tiver o bzip2 instalado) ao nome do ficheiro e a sua imagem será gravada comprimida. Claro que também pode carregar as imagens comprimidas com a mesma facilidade.</thetip> <thetip xml:lang="pt_BR">O GIMP suporta compressão gzip automaticamente. Basta adicionar <tt>.gz</tt> (ou <tt>.bz2</tt>, se o bzip2 estiver instalado) ao nome do arquivo e a sua imagem será gravada comprimida. É claro que ler imagens comprimidas também funciona.</thetip> <thetip xml:lang="ro">GIMP suportă comprimarea gzip din mers. Trebuie doar să adăugați <tt>.gz</tt> (sau <tt>.bz2</tt>, dacă aveți instalat bzip2) la numele de fișier și imaginile vor fi salvate gata comprimate. Desigur că încărcarea imaginilor comprimate este de asemenea posibilă.</thetip> @@ -842,7 +843,7 @@ <thetip xml:lang="ca">Premeu i manteniu la tecla <tt>majúscules</tt> abans de fer una selecció i us permetrà afegir la selecció actual en comptes de reemplaçar-la. Utilitzeu <tt>Ctrl</tt> abans de fer una selecció per sostreure-la de l'actual.</thetip> <thetip xml:lang="ca@valencia">Premeu i manteniu la tecla <tt>majúscules</tt> abans de fer una selecció i vos permetrà afegir la selecció actual en comptes de reemplaçar-la. Utilitzeu <tt>Ctrl</tt> abans de fer una selecció per sostraure-la de l'actual.</thetip> <thetip xml:lang="cs">Zmáčknutím a držení klávesy <tt>Shift</tt> před provedením výběru vám umožňuje přidávat k aktuálnímu výběru místo jeho nahrazení. Použití <tt>Ctrl</tt> před provedením výběru odebírá od aktuálního.</thetip> - <thetip xml:lang="da">Hvis du holder <tt>Shift</tt>-tasten nede før du markerer noget, kan du tilføje til den aktuelle markering i stedet for at erstatte den. Hvis <tt>Ctrl</tt> holdes ned før noget markeres, trækkes der fra markeringen.</thetip> + <thetip xml:lang="da">Hvis du holder <tt>Skift</tt>-tasten nede før du markerer noget, kan du tilføje til den aktuelle markering i stedet for at erstatte den. Hvis <tt>Ctrl</tt> holdes ned før noget markeres, trækkes der fra markeringen.</thetip> <thetip xml:lang="de">Wird beim Erstellen einer Auswahl während des Mausklicks die <tt>Umschalt</tt>-Taste gedrückt, so wird die neue Auswahl einer bestehenden hinzugefügt. Wird die <tt>Strg</tt>-Taste gedrückt, so wird die neue Auswahl von der bestehenden abgezogen.</thetip> <thetip xml:lang="dz">ལྡེ་མིག་<tt>སོར་ལྡེ་</tt>དེ་ སེལ་འཐུ་མ་འབད་བའི་ཧེ་མ་ ཨེབ་ནི་དང་ འཆང་མི་དེ་གིས་ ཚབ་བཙུགས་ནི་གི་ཚབ་ལུ་ ད་ལྟོའི་སེལ་འཐུ་ལུ་ཁ་སྐོང་འབད་བཅུགཔ་ཨིན།སེལ་འཐུ་མ་འབད་བའི་ཧེ་མ་<tt>ཚད་འཛིན་</tt>དེལག་ལེན་འཐབ་མི་དེ་གིས་ ད་ལྟོ་གི་ནང་ལས་ཕབ་ཨིན།</thetip> <thetip xml:lang="el">Πιέζοντας και κρατώντας το πλήκτρο <tt>Shift</tt> πριν την δημιουργία επιλογής, σας επιτρέπει να προσθέσετε στην τρέχουσα επιλογή αντί να την αντικαταστήσετε. Χρησιμοποιώντας <tt>Ctrl</tt> πριν την επιλογή αφαιρεί από την τρέχουσα επιλογή.</thetip> @@ -876,7 +877,7 @@ <thetip xml:lang="nn">Hald nede <tt>Shift</tt>-tasten medan du lager eit utval dersom du ønskjer at utvalet skal bli lagt til det eksisterande utvalet i staden for å erstatte det. Bruker du i staden <tt>Ctrl</tt>-tasten, vil det nye utvalet bli trekt i frå det eksisterande.</thetip> <thetip xml:lang="oc">Presser e manténer la tòca <tt>Majuscula</tt> abans de far una seleccion vous permet de l'apondre a la seleccion actuala al luòc de la remplaçar. Utilizar <tt>Ctrl</tt> abans de far una seleccion la soustrait de la seleccion actuala.</thetip> <thetip xml:lang="pa">ਚੋਣ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ <tt>Shift</tt> ਸਵਿੱਚ ਦਬਾਅ ਕੇ ਪਕੜ ਨਾ ,ਮੌਜੂਦ ਚੇਣ ਨੂੰ ਬਾਹਰ ਕਰਨ ਦੀ ਥਾਂ,ਜਮਾਂ ਕਰਨ ਦੀ ਇਜਾਜਤ ਦਿੰਦਾ ਹੈ। ਚੋਣ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ <tt>Ctrl</tt> ਵਰਤਣ ਨਾਲ ਮੌਜੂਦ ਚੋਂ ਇਕ ਘਟਾਉਂਦਾ ਹੈ।</thetip> - <thetip xml:lang="pl">Podczas korzystania z któregokolwiek z narzędzi zaznaczania możliwe jest dodanie obszaru do już istniejącego zaznaczenia. W tym celu należy przed rozpoczęciem zaznaczania przycisnąć i przytrzymać klawisz <tt>Shift</tt>. Analogicznie, przyciśnięcie i przytrzymanie klawisza <tt>Ctrl</tt> spowoduje odjęcie nowego obszaru od istniejącego zaznaczenia.</thetip> + <thetip xml:lang="pl">Podczas korzystania z któregokolwiek z narzędzi zaznaczania możliwe jest dodanie obszaru do już istniejącego zaznaczenia. W tym celu należy przed rozpoczęciem zaznaczania przycisnąć i przytrzymać klawisz <tt>Shift</tt>. Analogicznie, przyciśnięcie i przytrzymanie klawisza <tt>Ctrl</tt> spowoduje odjęcie nowego obszaru od istniejącego zaznaczenia.</thetip> <thetip xml:lang="pt">Premir e segurar a tecla <tt>Shift</tt> antes de fazer uma seleção permite-lhe adicionar à seleção atual em vez de a substituir. Premir <tt>Ctrl</tt> antes de fazer uma seleção subtrai-a da seleção atual.</thetip> <thetip xml:lang="pt_BR">Pressionar e segurar a tecla <tt>Shift</tt> antes de fazer uma seleção permite aumentar uma seleção existente em vez de substituí-la. Usar o <tt>Ctrl</tt> antes de fazer uma seleção subtrai da seleção atual.</thetip> <thetip xml:lang="ro">Apăsarea și menținerea tastei <tt>Shift</tt> înainte de a face o selecție vă permite să adăugați la selecția curentă în loc să o înlocuiți. Folosind <tt>Ctrl</tt> înainte de a face o selecție permite scăderea din cea curentă.</thetip> @@ -905,7 +906,7 @@ <thetip xml:lang="ca">Podeu dibuixar quadrats o cercles simples utilitzant Edita->Traça la Selecció. Fent això resseguireu el contorn de la selecció actual. Si voleu dibuixar figures més complexes utilitzeu l'eina Camí o Filtres->Compon->Gfig.</thetip> <thetip xml:lang="ca@valencia">Podeu dibuixar quadrats o cercles simples utilitzant Edita->Traça la Selecció. Fent això resseguireu el contorn de la selecció actual. Si voleu dibuixar figures més complexes utilitzeu l'eina Camí o Filtres->Compon->Gfig.</thetip> <thetip xml:lang="cs">Použití Úpravy→Vykreslit výběr vám umožňuje kreslit jednoduché čtverce nebo kružnice. Příkaz vykresluje obrys aktuálního výběru. Složitější tvary můžete kreslit pomocí nástroje Cesty nebo pomocí Filtry→Vyobrazení→Obrazce Gimp.</thetip> - <thetip xml:lang="da">Du kan tegne simple firkanter eller cirkler med Rediger→Bestryg markering. Det bestryger kanten af den aktuelle markering. Mere komplekse figurer kan tegnes med baneværktøjet eller med Filtre→Generér→Figurer.</thetip> + <thetip xml:lang="da">Du kan tegne simple firkanter eller cirkler med Redigér→Bestryg markering. Det bestryger kanten af den aktuelle markering. Mere komplekse figurer kan tegnes med baneværktøjet eller med Filtre→Generér→Figurer.</thetip> <thetip xml:lang="de">Einfache Formen wie Ellipsen und Rechtecke können gezeichnet werden, indem eine bestehende Auswahl mit dem aktuellen Pinsel nachgezeichnet wird. Dazu steht der Befehl »Bearbeiten→Auswahl nachziehen« zur Verfügung. Komplexere Formen können mit dem Pfad-Werkzeug oder dem GFig-Plugin (Filter→Render→GFig) gezeichnet werden.</thetip> <thetip xml:lang="dz">ཁྱོད་ཀྱིས་གྲུ་བཞི་ཡང་ན་ སྒོར་ཐིག་འཇམ་སམ་ཚུ་ ཞུན་དག་→སི་ཊོག་ སེལ་འཐུ་ དེ་ལག་ལེན་འཐབ་པའི་ཐོག་ལས་འབྲི་ཚུགས། གོ་བཀའ་བའི་དབྱིབས་ཧེང་བཀལ་ འགྲུལ་ལམ་ལག་ཆས་ ཡང་ན་ ཚགས་མ་→ལྷག་སྟོན་འབད་ནི་→ཇི་ཕིག་དེ་གི་ཐོག་ལསའབྲི་ཚུགས།</thetip> <thetip xml:lang="el">Μπορείτε να σχεδιάσετε απλά τετράγωνα ή κύκλους χρησιμοποιώντας την επιλογή Επεξεργασία→Χρωματισμός επιλογής. Βάφει την ακμή της τρέχουσας επιλογής. Πιο σύνθετα σχήματα μπορούν να σχεδιαστούν χρησιμοποιώντας το εργαλείο μονοπάτι ή με Φίλτρα→Σχεδίαση→Gfig.</thetip> @@ -935,7 +936,7 @@ <thetip xml:lang="nn">Du kan teikne firkantar og sirklar ved å først lage eit utval i ønskt form ved hjelp av utvalsverktøya og deretter bruke kommandoen Rediger→Strek opp utvalet for å lage ein strek rundt utvalet. Har du behov for meir avanserte teikningar, er det enklare å bruke baneverktøyet eller Filter→Teikningar→Gfig-teikning.</thetip> <thetip xml:lang="oc">Podètz dessenhar de simples carrats o cercles en utilizant Edicion→Tracer la seleccion. Il trace les contorns de vòstra seleccion actuala. Des figures géométriques mai complexes son réalisables amb l'aisina camin o amb Filtres→Rendu→Figures géométriques.</thetip> <thetip xml:lang="pa">ਤੁਸੀਂ ਸੋਧ→ਸਟਰੋਕ ਚੋਣ ਵਰਤ ਕੇ ਸਾਧਾਰਣ ਵਰਗ ਜਾਂ ਚੱਕਰ ਉਲੀਕ ਸਕਦੇ ਹੋ। ਇਹ ਤੁਹਾਡੀ ਮੌਜੂਦ ਚੋਣ ਦੇ ਕਿਨਾਰੇ ਨੂੰ ਸਟਰੋਕ ਕਰਦੀ ਹੈ। ਪਾਥ ਟੂਲ ਜਾਂ ਫਿਲਟਰ→ਰੈਂਡਰ→Gfig ਵਰਤ ਕੇ ਜਿਆਦਾ ਔਖੀਆਂ ਸ਼ਕਲਾਂ ਵੀ ਉਲੀਕੀਆਂ ਜਾ ਸਕਦੀਆਂ ਹਨ।</thetip> - <thetip xml:lang="pl">„Edycja→Rysuj wzdłuż zaznaczenia” pozwala na rysowanie bieżącym pędzlem krzywych wzdłuż krawędzi zaznaczenia. Bardziej złożone figury można uzyskać, używając narzędzia „Ścieżki” lub opcji „Filtry→Renderowanie→Gfigury”.</thetip> + <thetip xml:lang="pl">„Edycja→Rysuj wzdłuż zaznaczenia” pozwala na rysowanie bieżącym pędzlem krzywych wzdłuż krawędzi zaznaczenia. Bardziej złożone figury można uzyskać za pomocą narzędzia „Ścieżki” lub opcji „Filtry→Renderowanie→Gfigury”.</thetip> <thetip xml:lang="pt">Pode desenhar quadrados ou círculos simples utilizando Editar→Traçar seleção. A ferramenta criará um traçado ao longo da margem da sua seleção atual. Formas mais complexas podem ser desenhadas com a ferramenta Caminhos ou com Filtros→Desenhar→Gfig.</thetip> <thetip xml:lang="pt_BR">Você pode desenhar quadrados ou círculos simples usando Editar→Contornar Seleção. Ela traça a margem da sua seleção atual. Formas mais complexas podem ser desenhadas usando a ferramenta de Vetores ou com Filtros→Renderizar→Gfig.</thetip> <thetip xml:lang="ro">Puteți desena pătrate sau cercuri simple folosind Editare → Conturează selecția. Această funcție va contura marginea selecției curente. Forme mai complexe pot fi desenate prin intermediul instrumentului Trasee, sau cu Filtre → Randare → Gfig.</thetip> @@ -994,7 +995,7 @@ <thetip xml:lang="nn">Dersom du skal streke opp ein bane (Rediger->Strek opp bane) kan du bruke teikneverktøya med gjeldande innstillingar. Du kan også bruke luftpenselen med fargeovergang, eller til og med viskeleret og utsmøringsverktøyet.</thetip> <thetip xml:lang="oc">Se vous tracez un camin (Edicion→Tracer un camin), un aisina courant de pintrura amb ses reglatges courants pòt èsser utilizat. Podètz utilisez lo pinceau en mode degradat o même la gomme o l'aisina esclarzir/escurezir.</thetip> <thetip xml:lang="pa">ਜੇ ਤੁਸੀ ਮਾਰਗ ਸਟਰੋਕ (ਸੋਧ→ਚੋਣ ਸਟਰੋਕ) ਕਰਦੇ ਹੋ ਤਾਂ ਰੰਗਤ ਟੂਲ ਮੌਜੂਦ ਸਥਿਤੀਆਂ ਅਨੁਸਾਰ ਵਰਤੇ ਜਾ ਸਕਦੇ ਹਨ।ਤੁਸੀਂ ਰਬੜ, Smudge ਟੂਲ ਅਤੇ gradient ਰੂਪ ਵਿਚ ਪੇਂਟ ਬੁਰਸ਼ ਵੀ ਵਰਤ ਸਕਦੇ ਹੋ।</thetip> - <thetip xml:lang="pl">Podczas rysowania wzdłuż ścieżki („Edycja→Rysuj wzdłuż ścieżki”) możliwe jest użycie dowolnego narzędzia rysowania z jego bieżącymi ustawieniami. Można więc pociągnąć ścieżkę „pędzlem” w trybie gradientu, „gumką” lub „rozsmarowywaniem”.</thetip> + <thetip xml:lang="pl">Podczas rysowania wzdłuż ścieżki („Edycja→Rysuj wzdłuż ścieżki”) możliwe jest użycie dowolnego narzędzia rysowania z jego bieżącymi ustawieniami. Można więc pociągnąć ścieżkę „pędzlem” w trybie gradientu, „gumką” lub „rozsmarowywaniem”.</thetip> <thetip xml:lang="pt">Se tiver traçado um caminho (Editar→Traçar caminho), as ferramentas de pintura podem ser utilizadas com as suas definições atuais. Pode usar o pincel em modo Gradiente ou mesmo a borracha ou a ferramenta Manchar.</thetip> <thetip xml:lang="pt_BR">Se você for contornar um vetor (Editar→Contornar Vetor), as ferramentas de desenho podem ser usadas em suas configurações atuais. Você pode usar a ferramenta de Preenchimento em modo degradê ou mesmo a ferramenta Borracha ou a ferramenta de Borrar.</thetip> <thetip xml:lang="ro">Dacă conturați un traseu (Editare → Conturează traseul...), instrumentele de pictură pot fi folosite cu configurările lor curente. Puteți folosi pensula de pictură în modul degrade, sau chiar instrumentul Radieră sau Mânjire.</thetip> @@ -1055,7 +1056,7 @@ <thetip xml:lang="nn">Du kan opprette og redigere komplekse utval ved hjelp av baneverktøyet. Bruk banedialogen for å redigere banane og å omforme dei til utval.</thetip> <thetip xml:lang="oc">Podètz crear e éditer des seleccions complexes en utilizant l'aisina camin. La bóstia de dialòg des camins vos permet de trabalhar sus de multiples camins e de les convertir en seleccions.</thetip> <thetip xml:lang="pa">ਤੁਸੀਂ ਪਾਥ ਟੂਲ ਵਰਤ ਕੇ ਔਖੀਆਂ ਚੁਣੌਤੀਆਂ ਬਣਾ ਅਤੇ ਬਦਲ ਸਕਦੇ ਹੋ। ਪਾਥ ਡਾਈਲਾਗ ਤੁਹਾਨੂੰ ਬਹੁਤੇ ਪਾਥ ਉੱਤੇ ਕੰਮ ਕਰਨ ਅਤੇ ਇਹਨਾਂ ਨੂੰ ਚੁਣੌਤੀਆਂ ਵਿੱਚ ਬਦਲਣ ਦੀ ਇਜ਼ਾਜਤ ਦਿੰਦੀ ਹੈ।</thetip> - <thetip xml:lang="pl">Przy użyciu narzędzia „Ścieżki”, można tworzyć i modyfikować skomplikowane zaznaczenia. Okno „Ścieżki” pozwala pracować nad wieloma ścieżkami i konwertować je do zaznaczenia.</thetip> + <thetip xml:lang="pl">Przy użyciu narzędzia „Ścieżki”, można tworzyć i modyfikować skomplikowane zaznaczenia. Okno „Ścieżki” pozwala pracować nad wieloma ścieżkami i konwertować je do zaznaczenia.</thetip> <thetip xml:lang="pt">Pode criar e editar seleções complexas utilizando a ferramenta Caminhos. O diálogo Caminhos permite-lhe trabalhar em múltiplos caminhos e convertê-los em seleções.</thetip> <thetip xml:lang="pt_BR">Você pode criar e editar seleções complexas usando a ferramenta de Vetores. O diálogo de "Vetores" permite a você trabalhar em vários vetores e convertê-los em seleções.</thetip> <thetip xml:lang="ro">Puteți crea și edita selecții complexe folosind instrumentul Trasee. Dialogul de trasee vă permite să lucrați pe trasee multiple și să le convertiți la selecții.</thetip> @@ -1114,7 +1115,7 @@ <thetip xml:lang="nl">U kunt de schildergereedschappen gebruiken om de selectie te veranderen. Klik op de knop "Snelmasker" linksonder in het weergavevenster. Verander uw selectie door in de afbeelding te schilderen en klik opnieuw op de knop om terug te schakelen naar een normale selectie.</thetip> <thetip xml:lang="nn">Du kan bruke teikneverktøya for å endre eit utval. Klikk på knappen "Snarmaske" nedst i biletvindauget. Forandra utvalet ved å teikne på det med eit av teikneverktøya og trykk "Snarmaske" ein gong til for å få biletet tilbake til normalvisinga igjen.</thetip> <thetip xml:lang="pa">ਚੋਣ ਨੂੰ ਬਦਲਣ ਲਈ ਤੁਸੀਂ ਰੰਗਤ ਟੂਲ ਵਰਤ ਸਕਦੇ ਹੋ। ਚਿੱਤਰ ਡਾਈਲਾਗ ਦੇ ਹੇਠਾਂ ਖੱਬੇ "ਤੁਰੰਤ ਮਾਸਕ" ਬਟਨ ਕਲਿੱਕ ਕਰੋ। ਚਿੱਤਰ ਨੂੰ ਰੰਗ ਕਰਕੇ ਆਪਣੀ ਚੋਣ ਬਦਲੋ ਅਤੇ ਇਸ ਨੂੰ ਸਧਾਰਣ ਚੋਣ ਵਿਚ ਬਦਲਣ ਵਾਸਤੇ ਮੁੜ ਬਟਨ ਕਲਿੱਕ ਕਰੋ।</thetip> - <thetip xml:lang="pl">Do zmiany zaznaczenia można używać narzędzi malowania. Wystarczy kliknąć przycisk „Szybka maska” w lewym dolnym rogu okna obrazu (mały kwadracik). Od tej chwili można modyfikować zaznaczenie jako kolor, używając bieżącego narzędzia. Po zakończeniu modyfikacji można przywrócić zwykły widok, klikając jeszcze raz na przycisk z „kwadracikiem”.</thetip> + <thetip xml:lang="pl">Do zmiany zaznaczenia można używać narzędzi malowania. Wystarczy kliknąć przycisk „Szybka maska” w lewym dolnym rogu okna obrazu (mały kwadracik). Od tej chwili można modyfikować zaznaczenie jako kolor za pomocą bieżącego narzędzia. Po zakończeniu modyfikacji można przywrócić zwykły widok, klikając jeszcze raz na przycisk z „kwadracikiem”.</thetip> <thetip xml:lang="pt_BR">Você pode usar as ferramentas de pintura para alterar a seleção. Clique no botão "Máscara Rápida" à esquerda inferior da janela de imagem. Altere a sua seleção pintando na imagem e clique novamente no botão para convertê-la de volta a uma seleção normal.</thetip> <thetip xml:lang="ro">Puteți folosi instrumentele de pictură pentru a modifica selecția. Clic pe butonul „Mască rapidă” din partea din stânga jos a unei ferestre cu o imagine. Modificați selecția prin desenare în imagine după care clic din nou pe buton pentru a-l converti la loc la o selecție normală.</thetip> <thetip xml:lang="ru">При редактировании границ выделенной области можно использовать инструменты для рисования. Для этого надо включить «Быструю маску», отредактировать выделение области рисующим инструментом, а потом выключить «Быструю маску».</thetip> @@ -1172,7 +1173,7 @@ <thetip xml:lang="nn">Du kan lagre eit utval til ein kanal (Vel→Lagra til kanal) og deretter gjere endringar på kanalen med teikneverktøya. Bruk knappane i kanaldialogen for å gjere den nye kanalen synleg eller usynleg, eller omforme kanalen til eit utval igjen.</thetip> <thetip xml:lang="oc">Podètz enregistrar una seleccion dins un canal (Seleccion→Enregistrar dins un canal) puèi la modificar amb n'importe quel aisina de dessin. En utilizant les botons de la bóstia de dialòg dels canals, podètz activer/desactivar la visibilitat de ce novèl canal o lo convertir cap a una seleccion.</thetip> <thetip xml:lang="pa">ਤੁਸੀਂ ਚੈਨਲ ਦੀ ਚੋਣ ਸਾਂਭ ਸਕਦੇ ਹੋ (ਚੋਣ→ਚੈਨਲ ਵਿੱਚ ਸੰਭਾਲੋ) ਅਤੇ ਫਿਰ ਕਿਸੇ ਪੇਂਟ ਟੂਲ ਨਾਲ ਇਹ ਚੈਨਲ ਬਦਲੋ। ਚੈਨਲ ਡਾਈਲਾਗ ਦੇ ਬਟਨ ਵਰਤ ਕੇ ਤੁਸੀਂ ਨਵੇਂ ਚੈਨਲ ਦੀ ਦਿੱਖ ਬਦਲ ਸਕਦੇ ਹੋ ਜਾਂ ਇਸ ਨੂੰ ਚੋਣ ਵਿਚ ਬਦਲ ਸਕਦੇ ਹੋ।</thetip> - <thetip xml:lang="pl">Można zapisywać zaznaczenie do kanału („Zaznaczenie→Zapisz do kanału”) i modyfikować je dowolnym narzędziem malarskim. Przyciskami w oknie „Kanały” można ustawić widoczność kanału lub konwertować go na zaznaczenie.</thetip> + <thetip xml:lang="pl">Można zapisywać zaznaczenie do kanału („Zaznaczenie→Zapisz do kanału”) i modyfikować je dowolnym narzędziem malarskim. Przyciskami w oknie „Kanały” można ustawić widoczność kanału lub konwertować go na zaznaczenie.</thetip> <thetip xml:lang="pt">Pode gravar uma seleção para um canal (Selecionar→Gravar num canal) e depois alterar este canal com quaisquer ferramentas de pintura. Utilizando os botões no diálogo Canais, pode alternar a visibilidade deste novo canal ou convertê-lo numa seleção.</thetip> <thetip xml:lang="pt_BR">Você pode salvar uma seleção em um canal (Seleção→Salvar para Canal) e depois modificar este canal com quaisquer ferramentas de desenho. Usando os botões do diálogo de Canais, você pode alternar a visibilidade deste novo canal ou convertê-lo numa seleção.</thetip> <thetip xml:lang="ro">Puteți salva o selecție la un canal (Selecție → Salvează în canal) și modifica după aceea acest canal cu orice instrument de pictură. Folosind butoanele în dialogul de canale, puteți comuta vizibilitatea acestui canal nou, sau să îl convertiți la selecție.</thetip> @@ -1205,7 +1206,7 @@ <thetip xml:lang="br">Ur wech bezañ gweredekaet ar 'Berradennoù klavier dialuskel' e boestad emziviz ar gwellvezioù, e c'hall ar berradennoù bezañ deverket en-dro : skrammit al lañser, diuzit un ergorenn diwar al lañser ha pouezit ar strollad stokelloù a fell deoc'h. Mar bez gweredekaet 'Enrollañ ar Berradennoù klavier dialuskel' e vint enrollet pa vo kuitaet GIMP. Moarvat e vo diweredekaet 'Berradennoù klavier dialuskel' war-lerc'h a-benn mirout ouzh deverkañ/dizeverkañ ar berradennoù dre wallzarvoud.</thetip> <thetip xml:lang="bs">Nakon što omogućite "Dinamičke kratice tastature" u Postavke dijalogu, možete rasporediti tipke kratica. Da tako dovođenjem u meni omogućite odabir stavke izbornika i odaberete na željeni taster za kombinaciju. ako"Save Keyboard Shortcuts" je omogućen, povezanost kratica je spašena kada napustite GIMP. Trebali biste onemogućiti "Dynamic Keyboard Shortcuts" nakon čega ćete spriječiti dodjeljivanje/dodavanje kratica;</thetip> <thetip xml:lang="cs">Když povolíte "Dynamické klávesové zkratky" v dialogovém okně Předvolby, můžete měnit klávesové zkratky. Provedete to otevřením nabídky, vybráním některé její položky a stisknutím požadované klávesové zkratky. Pokud je povoleno "Uložit klávesové zkratky", budou nové zkratky uloženy při ukončení GIMPu. Chcete-li se vyvarovat náhodné změny zkratek, zakažte volbu "Dynamické klávesové zkratky".</thetip> - <thetip xml:lang="da">Hvis du aktiverer "Dynamiske tastegenveje" under indstillingerne, kan du omdefinere genvejstaster i menuerne. Bring en menu frem, vælg et menupunkt og tryk den ønskede tastekombination. Genvejen bliver gemt når du afslutter Gimp'en hvis "Gem tastegenveje" er aktiveret. Du bør formodentlig deaktivere dynamiske tastegenveje bagefter for at forhindre omtildeling af en genvej ved et uheld.</thetip> + <thetip xml:lang="da">Hvis du aktiverer "Dynamiske tastaturgenveje" under indstillingerne, kan du omdefinere genvejstaster i menuerne. Bring en menu frem, vælg et menupunkt og tryk den ønskede tastekombination. Genvejen bliver gemt når du afslutter Gimp'en hvis "Gem tastaturgenveje" er aktiveret. Du bør formodentlig deaktivere "Dynamiske tastaturgenveje" bagefter for at forhindre omtildeling af en genvej ved et uheld.</thetip> <thetip xml:lang="de">Nachdem Sie in den Einstellungen »Dynamische Tastenkombinationen« aktiviert haben, können Sie Tastenkombinationen einfach zuweisen oder verändern. Wählen Sie dazu mit dem Mauspfeil den entsprechenden Menüeintrag aus und drücken Sie anschließend die neue Tastenkombination. Wenn »Tastenkombinationen speichern« aktiviert ist, werden die von Ihnen definierten Tastenkürzel auch über das Beenden von GIMP hinaus gespeichert. Eventuell sollten Sie »Dynamische Tastenkombinationen« danach wieder ausschalten, um ein unbeabsichtigtes Ändern der Belegungen zu verhindern.</thetip> <thetip xml:lang="dz">དགའ་གདམ་ཌའི་ལོག་ནང་ ཁྱོད་ཀྱིས་"ནུས་ཅན་ལྡེ་སྒྲོམ་མགྱོགས་ཐབས་" དེ་ ཤུགས་ཅན་བཟོ་ཚར་བའི་ཤུལ་ལས་ ཁྱོད་ཀྱིས་མགྱོགས་ཐབས་ལྡེ་མིག་ཚུ་འགན་སྤྲོད་འབད་ཚུགས། དེ་ཡང་ དཀར་ཆག་ཡར་འབག་འོང་སྟེ་འབད་ནི་དང་ དཀར་ཆག་གི་རྣམ་གྲངས་སེལ་འཐུ་འབད་བའི་ཐོག་ལས་དང་ རེ་འདུན་ཅན་གྱི་མཉམ་མཐུད་ལྡེ་སྒྲོམ་ཨེབ་པའི་ཐོག་ལས་འབད་དགོཔ་ཨིན། "ལྡེ་སྒྲོམ་མགྱོགས་ཐབས་སྲུང་བཞག་འབད་ནི་"དེ་ལྕོགས་ཅན་བཟོ་ཚར་བ་ཅིན་ ཁྱོད་ཀྱིས་ཇི་ཨའི་ཨེམ་པི་དེ་ཕྱིར་ཐོན་འབད་བའི་སྐབས་ལུ་ ཀི་བཱའིན་ཌིང་ཚུ་ སྲུང་བཞག་འབདཝ་ཨིན། ཁྱོད་ཀྱིས་ ཤུལ་ལས་" ནུས་ཅན་ལྡེ་སྒྲོམ་མགྱོགས་ཐབས་" འདི་ལྕོགས་མེད་བཟོ་དགོ་ དེ་ཡང་ གློ་བུར་དུ་འགན་སྤྲོད་འབད་ནི་/ལོག་འགན་སྤྲོད་འབད་བའི་མགྱོགས་ཐབས་ཚུ་སྔོན་བཀག་འབད་ནི་ལུ་ཨིན།</thetip> <thetip xml:lang="el">Μετά την ενεργοποίηση "δυναμικές συντομεύσεις πληκτρολογίου" στο διάλογο προτιμήσεων, μπορείτε να επανεκχωρήσετε τα πλήκτρα συντόμευσης. Αυτό γίνεται εμφανίζοντας το μενού, επιλέγοντας ένα στοιχείο μενού και πιέζοντας τον επιθυμητό συνδυασμό πλήκτρων. Εάν το "αποθήκευση συντομεύσεων πληκτρολογίου" έχει ενεργοποιηθεί, οι δεσμεύσεις πληκτρολογίου αποθηκεύονται με την έξοδο από το GIMP. Θα πρέπει να απενεργοποιήσετε το "δυναμικές συντομεύσεις πληκτρολογίου" κατόπιν για αποφυγή τυχαίων αποδόσεων/επαναποδόσεων συντομεύσεων.</thetip> @@ -1230,7 +1231,7 @@ <thetip xml:lang="ne">यदि तपाईँले प्राथमिकता संवादमा, " गतिशिल कुञ्जीपाटी सर्टकटहरू " सक्रिय गरिसक्नु भए पछि, तपाईँले सर्टकट कुञ्जीहरू पुन: मानाङ्कन गर्न सक्नुहुन्छ। यसलाई मेनु वस्तु छानेर र चाहिएको कुञ्जी संयोजन दवाएर मेनुलाई माथी ल्याएर त्यस्तो गर्नुहोस्। यदि " कुञ्जीपाटि सर्टकट " सङ्ग्रह गर्नुहोस्, सक्रिय छ भने, कुञ्जी संयोजनहरू तपाईँले गिम्प बन्द गर्नु भएपछि बचत हुन्छ।</thetip> <thetip xml:lang="nl">Als u in het dialoogvenster Voorkeuren "Dynamische sneltoetsen gebruiken" activeert, dan kunt u sneltoetsen wijzigen. Hiertoe selecteert u een menu-item en drukt u vervolgens de gewenste toetsencombinatie in. Als "Sla sneltoetsen op bij verlaten" is ingeschakeld, worden uw nieuwe sneltoetsen bij het afsluiten van de GIMP opgeslagen. Na het wijzigen van sneltoetsen kunt u wellicht beter "Dynamische sneltoetsen gebruiken" uitschakelen om te vermijden dat u later per ongeluk sneltoetsen toewijst of verandert. </thetip> <thetip xml:lang="nn">Du kan lage nye tastesnarvegar ved å opna "Set opp tastatursnarvegar" i brukarinnstillingane, gå inn på aktuell meny og trykke ønskt tastekombinasjon. Du kan anten trykke tasten "Lagra tastatursnarvegane nå" eller lagra ved avsluttinga av GIMP. Det kan vere ein idé å slå av "Bruk dynamiske snarvegtastar" for å unngå at snarvegane blir endra ved eit uhell.</thetip> - <thetip xml:lang="pl">Jeśli w preferencjach programu GIMP włączono opcję „Dynamiczne skróty klawiszowe”, wówczas można zmieniać skróty klawiszowe w trakcie działania. Aby to zrobić, wystarczy otworzyć menu z wybranym poleceniem, wyróżnić pozycję odpowiadającą poleceniu, a następnie przycisnąć kombinację klawiszy stanowiącą nowy skrót klawiszowy. Jeśli w preferencjach włączona jest opcja „Zapisywanie skrótów klawiszowych przed zakończeniem”, to wszystkie skróty klawiszowe zostaną zapamiętane podczas zakończenia programu GIMP. Następnym razem warto wyłączyć „Dynamiczne skróty klawiszowe”, aby uniknąć przypadkowej ich zmiany.</thetip> + <thetip xml:lang="pl">Jeśli w preferencjach programu GIMP włączono opcję „Dynamiczne skróty klawiszowe”, wówczas można zmieniać skróty klawiszowe w trakcie działania. Aby to zrobić, wystarczy otworzyć menu z wybranym poleceniem, wyróżnić pozycję odpowiadającą poleceniu, a następnie przycisnąć kombinację klawiszy stanowiącą nowy skrót klawiszowy. Jeśli w preferencjach włączona jest opcja „Zapisywanie skrótów klawiszowych przed zakończeniem”, to wszystkie skróty klawiszowe zostaną zapamiętane podczas zakończenia programu GIMP. Następnym razem warto wyłączyć „Dynamiczne skróty klawiszowe”, aby uniknąć przypadkowej ich zmiany.</thetip> <thetip xml:lang="pt">Após ativar "Atalhos de teclado dinâmicos" no diálogo Preferências, pode redefinir teclas de atalho. Para o fazer, faça surgir o menu, selecionando um item do menu e premindo a nova combinação de teclas de atalho. Se "Gravar atalhos de teclado" estiver ativo, os atalhos serão gravados quando sair do GIMP. Depois deverá desativar "Atalhos de teclado dinâmicos" para evitar a redefinição de atalhos acidentalmente.</thetip> <thetip xml:lang="pt_BR">Depois de habilitar os "Atalhos de Teclado Dinâmicos" no diálogo de Preferências, você poderá modificar os atalhos. Para fazer isso, deixe o cursor sobre um item do menu, e pressione a combinação de teclas desejada. Se a opção "Salvar Atalhos de Teclado" estiver habilitada, as modificações serão salvas quando sair do GIMP. Você deve provavelmente desabilitar os "Atalhos de Teclado Dinâmicos" depois, para evitar reconfigurá-los por acidente.</thetip> <thetip xml:lang="ro">După ce ați activat opțiunea „Scurtături dinamice de tastatură” în dialogul de preferințe, puteți reasocia scurtăturile de tastatură. Aceasta se face prin afișarea meniului, selectarea unui element al meniului și apăsarea combinației de taste dorite. Dacă opțiunea „Salvează scurtăturile de tastatură” este activată, tema de combinații de taste este salvată la ieșirea GIMP. Probabil că după aceea ar trebui să dezactivați „Scurtături dinamice de tastatură”, pentru a preveni asocierea sau reasocierea accidentală a scurtăturilor.</thetip> @@ -1259,7 +1260,7 @@ <thetip xml:lang="ca">Si teniu masses coses a la pantalla, podeu prémer <tt>Tab</tt> en una finestra d'imatge per commutar la caixa d'eines i els altres diàlegs.</thetip> <thetip xml:lang="ca@valencia">Si teniu masses coses a la pantalla, podeu prémer <tt>Tab</tt> en una finestra d'imatge per commutar la caixa d'eines i els altres diàlegs.</thetip> <thetip xml:lang="cs">Je-li vaše obrazovka přeplněná, můžete stisknutím klávesy <tt>Tab</tt> v okně obrázku přepnout viditelnost panelu nástrojů a dalších dialogových oken.</thetip> - <thetip xml:lang="da">Hvis din skærm er for tæt pakket med vinduer kan du trykke på tabulator flere gange i et billedvindue for at skjule værktøjskassen og andre vinduer.</thetip> + <thetip xml:lang="da">Hvis din skærm er for tætpakket med vinduer kan du trykke på <tt>Tab</tt> flere gange i et billedvindue for at skjule værktøjskassen og andre vinduer.</thetip> <thetip xml:lang="de">Wenn Ihre Arbeitsfläche zu unaufgeräumt ist, können Sie durch Drücken der <tt>Tabulator</tt>-Taste in einem Bildfenster den Werkzeugkasten oder andere Dialoge anzeigen oder ausblenden.</thetip> <thetip xml:lang="dz">ཁྱོད་ཀྱི་གསལ་གཞི་དེ་གནམ་མེད་ས་མེད་ཟིང་ཆ་ཅན་ཅིག་ཨིན་པ་ཅིན་ ལག་ཆས་སྒྲོམ་དང་གཞན་མི་ཌའི་ལོག་ཚུ་སོར་སྟོན་འབད་ནི་ལུ་ ཁྱོད་ཀྱིས་གཟུགས་བརྙན་སྒོ་སྒྲིག་ནང་གི་<tt>མཆོང་ལྡེ་</tt>འདི་ཨེབ་གཏང་།</thetip> <thetip xml:lang="el">Εάν η οθόνη σας είναι υπερβολικά ακατάστατη, μπορείτε να πατήσετε <tt>Tab</tt> στο παράθυρο εικόνας για εναλλαγή ορατότητας της κύριας εργαλειοθήκης και άλλων διαλόγων.</thetip> @@ -1318,7 +1319,7 @@ <thetip xml:lang="ca"><tt>Majúscules</tt>-feu clic a la icona en forma d'ull del diàleg Capes per amagar totes les capes excepte aquella. <tt>Majúscules</tt>-feu clic un altre cop per mostrar totes les capes.</thetip> <thetip xml:lang="ca@valencia"><tt>Majúscules</tt>-feu clic a la icona en forma d'ull del diàleg Capes per amagar totes les capes excepte aquella. <tt>Majúscules</tt>-feu clic un altre cop per mostrar totes les capes.</thetip> <thetip xml:lang="cs">Kliknutím se <tt>Shift</tt> na ikonu oka v dialogovém okně Vrstvy skryjete všechny vrstvy kromě této. Opětovným kliknutím se <tt>Shift</tt> zobrazíte všechny vrstvy.</thetip> - <thetip xml:lang="da"><tt>Shift</tt>-klik på øjeikonet i lagvinduet for at skjule alle lag pånær dette. <tt>Shift</tt>-klik igen for at vise alle lag.</thetip> + <thetip xml:lang="da"><tt>Skift</tt>-klik på øjeikonet i dialogen Lag for at skjule alle lag pånær dette. <tt>Skift</tt>-klik igen for at vise alle lag.</thetip> <thetip xml:lang="de">Im Ebenendialog werden durch das Anklicken des Augensymbols bei gedrückter <tt>Umschalt</tt>-Taste alle anderen Ebenen ausgeblendet. Ein weiterer Klick bei gedrückter <tt>Umschalt</tt>-Taste blendet alle Ebenen wieder ein.</thetip> <thetip xml:lang="dz"><tt>སོར་ལྡེ་</tt>བང་རིམ་ཆ་མཉམ་སྦ་བཞག་ནིའི་དོན་ལུ་ བང་རིམ་ཌའི་ལོག་ནང་གི་ མིག་ཏོ་ངོས་པར་གུར་ ཨེབ་གཏང་འབད་ དོ་འབདཝ་ད་ འ་ཕི་<tt>སོར་ལྡེ་</tt>-བང་རིམ་ཆ་མཉམ་སྟོན་ནིའི་དོན་ལུ་ ལོག་ཨེབ་གཏང་འབད།</thetip> <thetip xml:lang="el"><tt>Shift</tt>-κλικ στο εικονίδιο ματιού στο διάλογο στρώσεων για απόκρυψη όλων των στρώσεων πλην μιας. <tt>Shift</tt>-κλικ ξανά για εμφάνιση όλων των στρώσεων.</thetip> @@ -1353,7 +1354,7 @@ <thetip xml:lang="nn"><tt>Shift</tt>-klikk på eit augesymbol i lagdialogen for å gøyme alle laga unntatt det du klikka på. <tt>Shift</tt>-klikk igjen for å vise alle laga.</thetip> <thetip xml:lang="oc"><tt>Majuscula</tt> + clic sus l'icòna œil dins la bóstia de dialòg des calques per amagar totes los calques levat celui-là. <tt>Majuscula</tt>-clic à novèl per afichar totes los calques.</thetip> <thetip xml:lang="pa">ਸਭ ਲੇਅਰਾਂ ਢਕਣ ਵਾਸਤੇ, ਪਰ ਉਸ ਇਕ ਵਾਸਤੇ ਪਰਤ ਡਾਈਲਾਗ ਵਿਚ ਅੱਖ ਚਿੱਤਰ ਉੱਤੇ <tt>Shift</tt> -ਕਲਿਕ ਕਰੋ ਸਭ ਲੇਅਰਾਂ ਦਿਖਾਉਣ ਲਈ ਮੁੜ <tt>Shift</tt>-ਕਲਿੱਕ ਕਰੋ।</thetip> - <thetip xml:lang="pl"><tt>Shift</tt> i kliknięcie ikony oka umieszczonej obok podglądu wybranej warstwy (w oknie „Warstwy”) ukrywa wszystkie warstwy poza jedną. Ponowne kliknięcie ikony oka z klawiszem <tt>Shift</tt> wyświetli wszystkie warstwy.</thetip> + <thetip xml:lang="pl"><tt>Shift</tt> i kliknięcie ikony oka umieszczonej obok podglądu wybranej warstwy (w oknie „Warstwy”) ukrywa wszystkie warstwy poza jedną. Ponowne kliknięcie ikony oka z klawiszem <tt>Shift</tt> wyświetli wszystkie warstwy.</thetip> <thetip xml:lang="pt"><tt>Shift</tt> + clique no ícone do olho no diálogo Camadas para esconder todas as camadas menos esta. <tt>Shift</tt> + clique novamente para mostrar todas as camadas.</thetip> <thetip xml:lang="pt_BR">Clique com <tt>Shift</tt> pressionado no ícone do olho no diálogo de Camadas para esconder todas as outras camadas. Clique com <tt>Shift</tt> novamente para mostrar todas as outras camadas.</thetip> <thetip xml:lang="ro"><tt>Shift</tt>-clic pe simbolul ochi din dialogul de straturi determină ascunderea tuturor straturilor în afară de acela. <tt>Shift</tt>-clic din nou arată la loc toate straturile.</thetip> @@ -1382,7 +1383,7 @@ <thetip xml:lang="ca"><tt>Ctrl</tt>-feu clic a la previsualització de la màscara de capa, en el diàleg Capes es commuta l'efecte de la màscara de capa. <tt>Alt</tt>-feu clic a la previsualització de la màscara de capa, en el diàleg Capes es commuta directament la visualització de la màscara. </thetip> <thetip xml:lang="ca@valencia"><tt>Ctrl</tt>-feu clic a la previsualització de la màscara de capa, en el diàleg Capes es commuta l'efecte de la màscara de capa. <tt>Alt</tt>-feu clic a la previsualització de la màscara de capa, en el diàleg Capes es commuta directament la visualització de la màscara. </thetip> <thetip xml:lang="cs">Kliknutí s <tt>Ctrl</tt> na náhled masky vrstvy v dialogovém okně Vrstvy přepíná efekt masky vrstvy. Kliknutí s <tt>Alt</tt> na náhled masky vrstvy v dialogovém okně Vrstvy přepíná přímý pohled na vrstvu.</thetip> - <thetip xml:lang="da"><tt>Ctrl</tt>-klik på lagmaskens forhåndsvisning i lagvinduet slår virkningen af masken til og fra. <tt>Alt</tt>-klik på lagmaskens forhåndsvisning skifter mellem om masken vises direkte.</thetip> + <thetip xml:lang="da"><tt>Ctrl</tt>-klik på lagmaskens forhåndsvisning i dialogen Lag slår virkningen af masken til og fra. <tt>Alt</tt>-klik på lagmaskens forhåndsvisning skifter mellem om masken vises direkte.</thetip> <thetip xml:lang="de">Durch Anklicken der Ebenenmaske im Ebenendialog bei gedrückter <tt>Strg</tt>-Taste wird die Wirkung der Maske an- und ausgeschaltet. Wird dabei die <tt>Alt</tt>-Taste gedrückt, kann die Maske direkt betrachtet werden.</thetip> <thetip xml:lang="dz"><tt>Ctrl</tt>-བང་རིམ་ཌའི་ལོག་བང་རིམ་གདོང་ཁེབས་སྔོན་ལྟ་གུ་ཨེབ་གཏང་འབད་མི་དེ་གིས་ བང་རིམ་གདོང་ཁེབས་གྱི་ནུས་པ་འདི་སོར་སྟོན་འབདཝ་ཨིན། <tt>Alt</tt>- བང་རིམ་ཌའི་ལོག་ནང་བང་རིམ་གདོང་ཁེབས་སྔོན་ལྟ་གུ་ཨེབ་གཏང་འབད་མི་དེ་གིས་ གདོང་ཁེབས་ཐད་ཀར་དུ་མཐོང་མི་དེ་ལུ་སོར་སྟོན་འབདཝ་ཨིན།</thetip> <thetip xml:lang="el"><tt>Ctrl</tt>-κλικ στην προεπισκόπηση μάσκας στρώσης στο διάλογο στρώσεων εναλλάσσει το αποτέλεσμα της μάσκας στρώσης. <tt>Alt</tt>-κλικ στην προεπισκόπηση μάσκας στρώσης στο διάλογο στρώσεων εναλλάσσει την προβολή της μάσκας άμεσα.</thetip> @@ -1411,7 +1412,7 @@ <thetip xml:lang="nl"><tt>Ctrl</tt>-klik op het voorbeeld van het laagmasker in het dialoogvenster Lagen om de weergave van het effect van het laagmasker in of uit te schakelen. <tt>Alt</tt>-klik op het voorbeeld van het laagmasker in het dialoogvenster Lagen om onmiddellijk het masker te zien.</thetip> <thetip xml:lang="nn"><tt>Ctrl</tt>-klikk på miniatyren av lagmaska i lagdialogen slår effekten av lagmaska av og på. <tt>Alt</tt>-klikkar du i staden, vil dette slå av og på visinga av lagmaska.</thetip> <thetip xml:lang="oc">Un <tt>Ctrl</tt> + clic sus l'apercebut d'una masqueta de calc dins la bóstia de dialòg des calques active/desactiva l'efièit de la masqueta de calc. Un <tt>Alt</tt> + clic sus l'apercebut d'una masqueta de calc dins la bóstia de dialòg des calques active/desactiva l'afichatge dirècte de la masqueta.</thetip> - <thetip xml:lang="pl"><tt>Ctrl</tt> i kliknięcie na podglądzie warstwy maski w oknie „Warstwy” przełącza efekt warstwy maski. <tt>Alt</tt> i kliknięcie na podglądzie warstwy maski w oknie „Warstwy” przełącza podgląd maski.</thetip> + <thetip xml:lang="pl"><tt>Ctrl</tt> i kliknięcie podglądu warstwy maski w oknie „Warstwy” przełącza efekt warstwy maski. <tt>Alt</tt> i kliknięcie podglądu warstwy maski w oknie „Warstwy” przełącza podgląd maski.</thetip> <thetip xml:lang="pt"><tt>Ctrl</tt> + clique na antevisão de máscara de camada no diálogo Camadas alterna o efeito da máscara da camada. <tt>Alt</tt> + Alt na antevisão da máscara da camada no diálogo Camadas alterna a visualização da máscara diretamente.</thetip> <thetip xml:lang="pt_BR">Clique com <tt>Ctrl</tt> na miniatura da máscara no diálogo de Camadas para ligar e desligar o efeito da máscara de camada. Clicar com <tt>Alt</tt> na miniatura no diálogo de Camada liga e desliga a visualização direta da máscara.</thetip> <thetip xml:lang="ro"><tt>Ctrl</tt>-clic pe previzualizarea măștii de strat în dialogul de straturi comută efectul măștii de strat. <tt>Alt</tt>-clic pe previzualizarea măștii de strat în dialogul de straturi comută vizualizarea directă a măștii.</thetip> @@ -1470,7 +1471,7 @@ <thetip xml:lang="nn">Du kan bruke <tt>Ctrl</tt> + <tt>Tab</tt> for å bla deg gjennom alle laga i eit bilete (dersom ikkje vindaugehandteraren i maskinen din har lagt beslag på desse tastane).</thetip> <thetip xml:lang="oc">Podètz utilizar <tt>Ctrl</tt> + <tt>Tabulation</tt> per navigar al travers des calques d'un imatge (se vòstre environament ne capture pas ces touches...).</thetip> <thetip xml:lang="pa">ਚਿੱਤਰ ਦੀਆਂ ਲੇਅਰ ਦਾ ਚੱਕਰ ਲਾਉਣ ਵਾਸਤੇ ਤੁਸੀਂ <tt>Ctrl</tt>-<tt>Tab</tt> ਵਰਤ ਸਕਦੇ ਹੋ। (ਜੇ ਤੁਹਾਡਾ ਵਿੰਡੋ ਮੈਨੇਜਰ ਇਹਨਾਂ ਸਵਿੱਚਾਂ ਨੂੰ ਇਸਤੇਮਾਲ ਨਾ ਕਰੇ...)</thetip> - <thetip xml:lang="pl">Pomiędzy warstwami obrazu można przełączać się przy użyciu klawiszy <tt>Alt</tt>-<tt>Tab</tt> (o ile nie przechwyci ich menedżer okien).</thetip> + <thetip xml:lang="pl">Pomiędzy warstwami obrazu można przełączać się przy użyciu klawiszy <tt>Alt</tt>-<tt>Tab</tt> (o ile nie przechwyci ich menedżer okien).</thetip> <thetip xml:lang="pt">Pode utilizar <tt>Ctrl</tt>+<tt>Tab</tt> para circular entre todas as camadas numa imagem (se o seu gestor de janelas não aprisionar estas teclas..).</thetip> <thetip xml:lang="pt_BR">Você pode usar <tt>Ctrl</tt>-<tt>Tab</tt> para alternar entre todas as camadas numa imagem (se o seu gerenciador de janelas não capturar essas teclas...).</thetip> <thetip xml:lang="ro">Puteți folosi <tt>Ctrl</tt>-<tt>Tab</tt> pentru a comuta ciclic prin toate straturile unei imagini (asta dacă gestionarul de ferestre nu capturează aceste taste...).</thetip> @@ -1499,7 +1500,7 @@ <thetip xml:lang="ca"><tt>Ctrl</tt>-feu clic amb l'eina Cubell de pintura per tal d'utilitzar el color de fons en comptes del color del primer pla. El mateix, fent clic <tt>Ctrl</tt> amb l'eina Capturador de color s'obté el color de fons en comptes del color del primer pla.</thetip> <thetip xml:lang="ca@valencia"><tt>Ctrl</tt>-feu clic amb l'eina Cubell de pintura per tal d'utilitzar el color de fons en comptes del color del primer pla. El mateix, fent clic <tt>Ctrl</tt> amb l'eina Capturador de color s'obté el color de fons en comptes del color del primer pla.</thetip> <thetip xml:lang="cs">Při kliknutí s <tt>Ctrl</tt> bude nástroj Plechovka používat barvu pozadí místo barvy popředí. Stejně tak nástroj Pipeta při kliknutí s <tt>Ctrl</tt> nastaví barvu pozadí místo barvy popředí.</thetip> - <thetip xml:lang="da"><tt>Ctrl</tt>-klik med udfyldningsværktøjet for at bruge baggrundsfarven i stedet for forgrundsfarven. Tilsvarende vil <tt>Ctrl</tt>-klik med farveopsnapperværktøjet vælge baggrundsfarven i stedet for forgrundsfarven.</thetip> + <thetip xml:lang="da"><tt>Ctrl</tt>-klik med spandudfyldningsværktøjet for at bruge baggrundsfarven i stedet for forgrundsfarven. Tilsvarende vil <tt>Ctrl</tt>-klik med pipetteværktøjet vælge baggrundsfarven i stedet for forgrundsfarven.</thetip> <thetip xml:lang="de">Wird beim Anwenden des Farbeimers die <tt>Strg</tt>-Taste gedrückt, so wird statt der Vorder- die Hintergrundfarbe verwendet. Auch die Farbpipette setzt die Hinter- statt der Vordergrundfarbe, wenn die <tt>Strg</tt>-Taste gedrückt wird.</thetip> <thetip xml:lang="dz"><tt>Ctrl</tt>-གདོང་གཞིའི་ཚོས་གཞི་གི་ཚབ་ལུ་རྒྱབ་གཞི་ཚོས་གཞི་ལག་ལེན་འཐབ་ནི་ལུ་ བ་ཀེཊི་བཀང་བའི་ལག་ཆས་དང་ཅིག་ཁར་ཨེབ་གཏང་འབད། ཆ་འདྲ་བ་འབད་ <tt>Ctrl</tt>- ཚོས་གཞི་འདེམས་བྱེད་ལག་ཆས་དང་ཅིག་ཁར་ཨེབ་གཏང་འབད་མི་དེ་གིས་ གདོང་གཞི་ཚོས་གཞིའི་ཚབ་ལུ་རྒྱབ་གཞི་ཚོས་གཞི་འདི་ གཞི་སྒྲིག་འབདཝ་ཨིན།</thetip> <thetip xml:lang="el"><tt>Ctrl</tt>-κλικ με το εργαλείο κουβά γεμίσματος για χρήση του χρώματος παρασκηνίου αντί για το χρώμα προσκηνίου. Παρόμοια, <tt>Ctrl</tt>-κλικ με το εργαλείο σταγονόμετρο ορίζει το χρώμα παρασκηνίου αντί για το χρώμα προσκηνίου.</thetip> @@ -1529,7 +1530,7 @@ <thetip xml:lang="nl"><tt>Ctrl</tt>-klik met het gereedschap Emmer om met de achtergrondkleur i.p.v. de voorgrondkleur te vullen. Op vergelijkbare wijze stelt <tt>Ctrl</tt>-klikken met het pipet de achtergrondkleur in i.p.v. de voorgrondkleur.</thetip> <thetip xml:lang="nn"><tt>Ctrl</tt>-klikk når du ønskjer at fyllverktøyet eller fargeplukkaren skal arbeide på bakgrunnsfargen i staden for på forgrunnsfargen.</thetip> <thetip xml:lang="oc">Un <tt>Ctrl</tt> + clic amb l'aisina d'emplenatge e il utilizara la color de rèireplan al luòc de la color de primièr plan. D'un biais similar, un <tt>Ctrl</tt> + clic amb l'aisina pipeta capturarà la color de rèireplan al lieu de la color de primièr plan.</thetip> - <thetip xml:lang="pl"><tt>Ctrl</tt> i kliknięcie na „Wypełnienie kubełkiem”, powoduje że do wypełnienia zostanie użyty kolor tła, zamiast koloru pierwszoplanowego. Podobnie <tt>Ctrl</tt> i kliknięcie na „Kroplomierzu” ustawia kolor tła zamiast koloru pierwszoplanowego.</thetip> + <thetip xml:lang="pl"><tt>Ctrl</tt> i kliknięcie „Wypełnienie kubełkiem” powoduje, że do wypełnienia zostanie użyty kolor tła, zamiast koloru pierwszoplanowego. Podobnie <tt>Ctrl</tt> i kliknięcie „Kroplomierz” ustawia kolor tła zamiast koloru pierwszoplanowego.</thetip> <thetip xml:lang="pt"><tt>Ctrl</tt> + clique com a ferramenta Balde de tinta para que ela utilize a cor de fundo em vez da cor de primeiro plano. Da mesma maneira, <tt>Ctrl</tt> + clique com a ferramenta Pipeta utiliza a cor de fundo em vez da cor de primeiro plano.</thetip> <thetip xml:lang="pt_BR">Use a ferramenta de Preenchimento com o <tt>Ctrl</tt> apertado para usar a cor de fundo ao invés da cor de frente. Da mesma forma, clicar com a ferramenta de seleção de cores com <tt>Ctrl</tt> seleciona a cor de fundo.</thetip> <thetip xml:lang="ro"><tt>Ctrl</tt>-clic pe instrumentul Umplere cu găleata determină folosirea de către aceasta a culorii de fundal în locul celei de prim-plan. Similar, <tt>Ctrl</tt>-clic pe instrumentul Pipetă determină folosirea culorii de fundal în locul celei de prim-plan.</thetip> @@ -1590,7 +1591,7 @@ <thetip xml:lang="nn">Held du nede <tt>Ctrl</tt>-tasten når du brukar rotasjonsverkøtyet, vil du avgrense rotasjonen til vinklar som er multiplar av 15 grader.</thetip> <thetip xml:lang="oc">Un <tt>Ctrl</tt> + glissé amb l'aisina rotacion contraindra la rotation a des angles multiples de 15 grases.</thetip> <thetip xml:lang="pa">ਘੁੰਮਾਉਣ ਵਾਲਾ ਟੂਲ <tt>Ctrl</tt>-ਖਿੱਚ ਨਾਲ 15 ਡਿਗਰੀ ਦੇ ਕੋਣ ਉੱਤੇ ਘੁੰਮਾਵੇਗਾ।</thetip> - <thetip xml:lang="pl">Podczas korzystania z narzędzia „Obrót”, przeciąganie kursora przy wciśniętym klawiszu <tt>Ctrl</tt> wymusza obrót z krokiem co 15 stopni.</thetip> + <thetip xml:lang="pl">Podczas korzystania z narzędzia „Obrót”, przeciąganie kursora przy wciśniętym klawiszu <tt>Ctrl</tt> wymusza obrót z krokiem co 15 stopni.</thetip> <thetip xml:lang="pt"><tt>Ctrl</tt> + arrastar com a ferramenta Rotação restringirá a rotação a ângulos de 15 graus.</thetip> <thetip xml:lang="pt_BR">Arrastar com o <tt>Ctrl</tt> com a ferramenta de Rotação limita a rotação a ângulos de 15 graus.</thetip> <thetip xml:lang="ro"><tt>Ctrl</tt>-și-tragere cu instrumentul Rotire va constrânge unghiul de rotire în incremente de 15 grade.</thetip> @@ -1647,7 +1648,7 @@ <thetip xml:lang="nl">Als sommige van uw gescande foto's er niet fleurig genoeg uitzien, kunt u hun kleurtoonbereik gemakkelijk verbeteren met de knop "Automatisch" in het gereedschap Niveaus (Kleuren→Niveaus). Als er kleurzwemen in de foto zitten, kunt u deze verwijderen met het gereedschap Curves (Kleuren→Curves).</thetip> <thetip xml:lang="nn">Den enklaste måten å forbetra blasse fargar i eit bilete på, er å bruke "Auto"-knappen i nivåverktøyet (Lag->Fargar->Nivå). Uheldige fargestikk kan korrigerast med kurveverktøyet (Lag->Fargar->Kurver).</thetip> <thetip xml:lang="pa">ਜੇ ਤੁਹਾਡੀਆਂ ਸਕੈਨ ਕੀਤੀਆਂ ਤਸਵੀਰਾਂ ਠੀਕ ਤਰਾਂ ਰੰਗਦਾਰ ਨਹੀਂ ਦਿਸਦੀਆਂ,ਤੁਸੀਂ ਲੈਵਲ ਟੂਲ (ਰੰਗ→ਲੈਵਲ) ਵਿੱਚ "ਆਟੋ" ਸਵਿੱਚ ਨਾਲ ਓਹਨਾਂ ਦੇ ਰੰਗ ਦੀ ਗਹਿਰਾਈ ਨੂੰ ਸੁਧਾਰ ਸਕਦੇ ਹੋ। ਜੇ ਉਥੇ ਕੋਈ ਰੰਗ ਬਣਦਾ ਹੈ,ਤੁਸੀਂ ਉਸਨੂੰ ਕਰਵ ਟੂਲ (ਰੰਗ→ਕਰਵ) ਨਾਲ ਠੀਕ ਕਰ ਸਕਦੇ ਹੋ।</thetip> - <thetip xml:lang="pl">Jeśli zeskanowane zdjęcia są mało kolorowe, można poprawić ich kolorystykę korzystając z narzędzia „Poziomy” („Kolory→Poziomy”), klikając przycisk „Automatycznie”. Zniekształcenia kolorów można skorygować za pomocą narzędzia „Krzywe” („Kolory→Krzywe”).</thetip> + <thetip xml:lang="pl">Jeśli zeskanowane zdjęcia są mało kolorowe, można poprawić ich kolorystykę korzystając z narzędzia „Poziomy” („Kolory→Poziomy”), klikając przycisk „Automatycznie”. Zniekształcenia kolorów można skorygować za pomocą narzędzia „Krzywe” („Kolory→Krzywe”).</thetip> <thetip xml:lang="pt">Se algumas das suas fotografias digitalizadas não tiverem cor suficiente, pode facilmente melhorar o seu intervalo de cores com o botão "Auto" na ferramenta Níveis (Cores→Níveis). Se existirem quaisquer esbatimentos de cor, poderá corrigi-los com a ferramenta Cores (Cores→Curvas).</thetip> <thetip xml:lang="pt_BR">Se algumas das suas fotos digitalizadas não parecem coloridas o suficiente, você pode facilmente melhorar suas tonalidades com o botão "Automático" na ferramenta de Níveis (Cores→Níveis). Se existirem vazamentos de cores, você pode corrigi-los com a ferramenta de Curvas (Cores→Curvas).</thetip> <thetip xml:lang="ro">Dacă unele dintre fotografiile scanate nu arată suficient de colorate, puteți să îmbunătățiți cu ușurință gama lor tonală cu butonul „Automat” în instrumentul Niveluri (Culori → Niveluri). Dacă sunt prezente dominante de culoare, puteți să le corectați cu instrumentul Curbe (Culori → Curbe).</thetip> diff -Nru gimp-2.8.18/data/tips/Makefile.in gimp-2.8.20/data/tips/Makefile.in --- gimp-2.8.18/data/tips/Makefile.in 2016-07-12 23:19:57.000000000 +0000 +++ gimp-2.8.20/data/tips/Makefile.in 2017-01-31 23:40:27.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/tips -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(tipsdatadir)" DATA = $(tipsdata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -473,7 +524,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/tips/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/tips/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -518,11 +568,11 @@ @list='$(tipsdata_DATA)'; test -n "$(tipsdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(tipsdatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -665,17 +715,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - dist-hook distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ + cscopelist-am ctags-am dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip install-tipsdataDATA installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-tipsdataDATA + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-tipsdataDATA + +.PRECIOUS: Makefile gimp-tips.xml: gimp-tips.xml.in $(wildcard $(top_srcdir)/po-tips/*.po) diff -Nru gimp-2.8.18/data/tool-presets/FX/Makefile.in gimp-2.8.20/data/tool-presets/FX/Makefile.in --- gimp-2.8.18/data/tool-presets/FX/Makefile.in 2016-07-12 23:19:57.000000000 +0000 +++ gimp-2.8.20/data/tool-presets/FX/Makefile.in 2017-01-31 23:40:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/tool-presets/FX -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(toolpresetsfxdatadir)" DATA = $(toolpresetsfxdata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -474,7 +525,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/tool-presets/FX/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/tool-presets/FX/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -519,11 +569,11 @@ @list='$(toolpresetsfxdata_DATA)'; test -n "$(toolpresetsfxdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(toolpresetsfxdatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -662,17 +712,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-toolpresetsfxdataDATA installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am \ - uninstall-toolpresetsfxdataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-toolpresetsfxdataDATA installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-toolpresetsfxdataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/data/tool-presets/Makefile.in gimp-2.8.20/data/tool-presets/Makefile.in --- gimp-2.8.18/data/tool-presets/Makefile.in 2016-07-12 23:19:58.000000000 +0000 +++ gimp-2.8.20/data/tool-presets/Makefile.in 2017-01-31 23:40:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,35 +88,48 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/tool-presets -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -87,12 +137,33 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -478,7 +549,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/tool-presets/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/tool-presets/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -504,22 +574,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -534,57 +607,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -600,12 +628,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -617,15 +640,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -634,6 +653,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -794,22 +828,22 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/data/tool-presets/Paint/Makefile.in gimp-2.8.20/data/tool-presets/Paint/Makefile.in --- gimp-2.8.18/data/tool-presets/Paint/Makefile.in 2016-07-12 23:19:58.000000000 +0000 +++ gimp-2.8.20/data/tool-presets/Paint/Makefile.in 2017-01-31 23:40:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/tool-presets/Paint -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(toolpresetspaintdatadir)" DATA = $(toolpresetspaintdata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -482,7 +533,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/tool-presets/Paint/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/tool-presets/Paint/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -527,11 +577,11 @@ @list='$(toolpresetspaintdata_DATA)'; test -n "$(toolpresetspaintdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(toolpresetspaintdatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -670,17 +720,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-toolpresetspaintdataDATA installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am \ - uninstall-toolpresetspaintdataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-toolpresetspaintdataDATA installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-toolpresetspaintdataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/data/tool-presets/Selection/Makefile.in gimp-2.8.20/data/tool-presets/Selection/Makefile.in --- gimp-2.8.18/data/tool-presets/Selection/Makefile.in 2016-07-12 23:19:58.000000000 +0000 +++ gimp-2.8.20/data/tool-presets/Selection/Makefile.in 2017-01-31 23:40:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/tool-presets/Selection -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(toolpresetsselectiondatadir)" DATA = $(toolpresetsselectiondata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -468,7 +519,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/tool-presets/Selection/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/tool-presets/Selection/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -513,11 +563,11 @@ @list='$(toolpresetsselectiondata_DATA)'; test -n "$(toolpresetsselectiondatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(toolpresetsselectiondatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -656,17 +706,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-toolpresetsselectiondataDATA installcheck \ - installcheck-am installdirs maintainer-clean \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-toolpresetsselectiondataDATA \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-toolpresetsselectiondataDATA + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-toolpresetsselectiondataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/data/tool-presets/Sketch/Makefile.in gimp-2.8.20/data/tool-presets/Sketch/Makefile.in --- gimp-2.8.18/data/tool-presets/Sketch/Makefile.in 2016-07-12 23:19:58.000000000 +0000 +++ gimp-2.8.20/data/tool-presets/Sketch/Makefile.in 2017-01-31 23:40:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/tool-presets/Sketch -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(toolpresetssketchdatadir)" DATA = $(toolpresetssketchdata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -472,7 +523,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/tool-presets/Sketch/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu data/tool-presets/Sketch/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -517,11 +567,11 @@ @list='$(toolpresetssketchdata_DATA)'; test -n "$(toolpresetssketchdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(toolpresetssketchdatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -660,17 +710,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-toolpresetssketchdataDATA installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am \ - uninstall-toolpresetssketchdataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-toolpresetssketchdataDATA installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-toolpresetssketchdataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/debian/changelog gimp-2.8.20/debian/changelog --- gimp-2.8.18/debian/changelog 2016-07-14 23:46:43.000000000 +0000 +++ gimp-2.8.20/debian/changelog 2017-03-04 21:15:02.000000000 +0000 @@ -1,3 +1,9 @@ +gimp (2.8.20-1) unstable; urgency=low + + * New upstream version 2.8.20 + + -- Ari Pollak <ari@debian.org> Sat, 04 Mar 2017 16:15:02 -0500 + gimp (2.8.18-1) unstable; urgency=low * Imported Upstream version 2.8.18 (Closes: #820207) diff -Nru gimp-2.8.18/depcomp gimp-2.8.20/depcomp --- gimp-2.8.18/depcomp 2014-10-20 00:18:19.000000000 +0000 +++ gimp-2.8.20/depcomp 2016-11-01 23:33:03.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2012-03-27.16; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # 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 @@ -28,9 +27,9 @@ case $1 in '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -57,11 +56,65 @@ ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + # A tabulation character. tab=' ' # A newline character. nl=' ' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 @@ -75,6 +128,9 @@ rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -86,32 +142,32 @@ fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp fi if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 fi if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. - gccflag=-qmakedep=gcc,-MF - depmode=gcc + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -134,8 +190,7 @@ done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -143,13 +198,17 @@ ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -157,15 +216,14 @@ fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" ## This next piece of magic avoids the "deleted header file" problem. @@ -174,15 +232,15 @@ ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' "$nl" < "$tmpdepfile" | ## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -200,8 +258,7 @@ "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -209,7 +266,6 @@ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in @@ -217,19 +273,15 @@ # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr "$nl" ' ' >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; @@ -247,9 +299,8 @@ # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -262,9 +313,7 @@ "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -273,65 +322,113 @@ do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form 'foo.o: dependent.h'. - # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. - # However on - # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using '\': + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - # tcc 0.9.26 (FIXME still under development at the moment of writing) - # will emit a similar output, but also prepend the continuation lines - # with horizontal tabulation characters. - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi + + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" - # Each line is of the form 'foo.o: dependent.h', - # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ - < "$tmpdepfile" > "$depfile" - sed ' - s/[ '"$tab"'][ '"$tab"']*/ /g - s/^ *// - s/ *\\*$// - s/^[^:]*: *// - /^$/d - /:$/d - s/$/ :/ - ' < "$tmpdepfile" >> "$depfile" + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -342,9 +439,8 @@ # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -355,8 +451,7 @@ "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -366,76 +461,61 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in 'foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; msvc7) if test "$libtool" = yes; then @@ -446,8 +526,7 @@ "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -473,6 +552,7 @@ G p }' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash rm -f "$tmpdepfile" ;; @@ -524,13 +604,14 @@ # in the target name. This is to cope with DOS-style filenames: # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' "$nl" < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -583,10 +664,12 @@ # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -622,10 +705,10 @@ esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -657,15 +740,15 @@ shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | diff -Nru gimp-2.8.18/desktop/Makefile.in gimp-2.8.20/desktop/Makefile.in --- gimp-2.8.18/desktop/Makefile.in 2016-07-12 23:19:59.000000000 +0000 +++ gimp-2.8.20/desktop/Makefile.in 2017-01-31 23:40:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,27 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = desktop -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/gimp.desktop.in.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = gimp.desktop.in CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -115,6 +163,8 @@ DATA = $(appdata_DATA) $(applications_DATA) $(icons16_DATA) \ $(icons22_DATA) $(icons24_DATA) $(icons256_DATA) \ $(icons32_DATA) $(icons48_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gimp.desktop.in.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -501,7 +551,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu desktop/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu desktop/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -695,11 +744,11 @@ @list='$(icons48_DATA)'; test -n "$(icons48dir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(icons48dir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) @@ -849,23 +898,25 @@ .MAKE: install-am install-data-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - dist-hook distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-appdataDATA install-applicationsDATA \ - install-data install-data-am install-data-hook install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-icons16DATA install-icons22DATA \ - install-icons24DATA install-icons256DATA install-icons32DATA \ - install-icons48DATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-appdataDATA \ - uninstall-applicationsDATA uninstall-icons16DATA \ - uninstall-icons22DATA uninstall-icons24DATA \ - uninstall-icons256DATA uninstall-icons32DATA \ - uninstall-icons48DATA + cscopelist-am ctags-am dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-appdataDATA \ + install-applicationsDATA install-data install-data-am \ + install-data-hook install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am \ + install-icons16DATA install-icons22DATA install-icons24DATA \ + install-icons256DATA install-icons32DATA install-icons48DATA \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-appdataDATA uninstall-applicationsDATA \ + uninstall-icons16DATA uninstall-icons22DATA \ + uninstall-icons24DATA uninstall-icons256DATA \ + uninstall-icons32DATA uninstall-icons48DATA + +.PRECIOUS: Makefile # touch the toplevel icon directory as required by the icon theme spec diff -Nru gimp-2.8.18/devel-docs/app/Makefile.in gimp-2.8.20/devel-docs/app/Makefile.in --- gimp-2.8.18/devel-docs/app/Makefile.in 2016-07-12 23:20:00.000000000 +0000 +++ gimp-2.8.20/devel-docs/app/Makefile.in 2017-01-31 23:40:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,23 +20,61 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,28 +93,39 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/version.in $(top_srcdir)/gtk-doc.make subdir = devel-docs/app ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -85,6 +133,9 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/version.in \ + $(top_srcdir)/gtk-doc.make DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -636,7 +687,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/app/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu devel-docs/app/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -645,7 +695,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/gtk-doc.make: +$(top_srcdir)/gtk-doc.make $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -663,11 +713,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: @ENABLE_GTK_DOC_APP_FALSE@dist-hook: @@ -741,9 +791,9 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." +@ENABLE_GTK_DOC_APP_FALSE@install-data-local: @ENABLE_GTK_DOC_APP_FALSE@uninstall-local: @ENABLE_GTK_DOC_APP_FALSE@distclean-local: -@ENABLE_GTK_DOC_APP_FALSE@install-data-local: @ENABLE_GTK_DOC_APP_FALSE@maintainer-clean-local: @ENABLE_GTK_DOC_APP_FALSE@clean-local: clean: clean-am @@ -816,18 +866,20 @@ .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distclean-local distdir \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic \ + clean-libtool clean-local cscopelist-am ctags-am dist-hook \ + distclean distclean-generic distclean-libtool distclean-local \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-data-local \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-local + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-local + +.PRECIOUS: Makefile @ENABLE_GTK_DOC_APP_TRUE@gtkdoc-check.test: Makefile Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimp/html/home.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimp/html/home.png differ diff -Nru gimp-2.8.18/devel-docs/libgimp/html/index.html gimp-2.8.20/devel-docs/libgimp/html/index.html --- gimp-2.8.18/devel-docs/libgimp/html/index.html 2016-07-13 01:02:11.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimp/html/index.html 2017-02-01 06:04:35.000000000 +0000 @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GIMP Library Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for GIMP 2.8.18 + for GIMP 2.8.20 </p></div> </div> @@ -27,8 +27,7 @@ <dt><span class="chapter"><a href="libgimp-general.html">Functions not Related to Specific Images</a></span></dt> <dd><dl> <dt> -<span class="refentrytitle"><a href="libgimp-Gimp.html">Gimp</a></span><span class="refpurpose"> — Main functions needed for building a GIMP plug-in. - This header includes all other GIMP Library headers.</span> +<span class="refentrytitle"><a href="libgimp-gimp.html">gimp</a></span><span class="refpurpose"> — Miscellaneous procedures</span> </dt> <dt> <span class="refentrytitle"><a href="libgimp-gimpenums.html">gimpenums</a></span><span class="refpurpose"> — Enums and definitions.</span> Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimp/html/left-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimp/html/left-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimp/html/left.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimp/html/left.png differ diff -Nru gimp-2.8.18/devel-docs/libgimp/html/libgimp.devhelp2 gimp-2.8.20/devel-docs/libgimp/html/libgimp.devhelp2 --- gimp-2.8.18/devel-docs/libgimp/html/libgimp.devhelp2 2016-07-13 01:02:10.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimp/html/libgimp.devhelp2 2017-02-01 06:04:35.000000000 +0000 @@ -3,7 +3,7 @@ <chapters> <sub name="GIMP Library" link="libgimp.html"> <sub name="Functions not Related to Specific Images" link="libgimp-general.html"> - <sub name="Gimp" link="libgimp-Gimp.html"/> + <sub name="gimp" link="libgimp-gimp.html"/> <sub name="gimpenums" link="libgimp-gimpenums.html"/> <sub name="gimpbuffer" link="libgimp-gimpbuffer.html"/> <sub name="gimpcontext" link="libgimp-gimpcontext.html"/> @@ -99,60 +99,60 @@ <sub name="Index of deprecated symbols" link="libgimp-index-deprecated.html"/> </chapters> <functions> - <keyword type="function" name="gimp_version ()" link="libgimp-Gimp.html#gimp-version"/> - <keyword type="function" name="gimp_getpid ()" link="libgimp-Gimp.html#gimp-getpid" since="GIMP 2.4"/> - <keyword type="function" name="GimpInitProc ()" link="libgimp-Gimp.html#GimpInitProc"/> - <keyword type="function" name="GimpQuitProc ()" link="libgimp-Gimp.html#GimpQuitProc"/> - <keyword type="function" name="GimpQueryProc ()" link="libgimp-Gimp.html#GimpQueryProc"/> - <keyword type="function" name="GimpRunProc ()" link="libgimp-Gimp.html#GimpRunProc"/> - <keyword type="macro" name="MAIN" link="libgimp-Gimp.html#MAIN:CAPS"/> - <keyword type="function" name="gimp_main ()" link="libgimp-Gimp.html#gimp-main"/> - <keyword type="function" name="gimp_quit ()" link="libgimp-Gimp.html#gimp-quit"/> - <keyword type="function" name="gimp_install_procedure ()" link="libgimp-Gimp.html#gimp-install-procedure"/> - <keyword type="function" name="gimp_install_temp_proc ()" link="libgimp-Gimp.html#gimp-install-temp-proc"/> - <keyword type="function" name="gimp_uninstall_temp_proc ()" link="libgimp-Gimp.html#gimp-uninstall-temp-proc"/> - <keyword type="function" name="gimp_run_procedure ()" link="libgimp-Gimp.html#gimp-run-procedure"/> - <keyword type="function" name="gimp_run_procedure2 ()" link="libgimp-Gimp.html#gimp-run-procedure2"/> - <keyword type="function" name="gimp_destroy_params ()" link="libgimp-Gimp.html#gimp-destroy-params"/> - <keyword type="function" name="gimp_destroy_paramdefs ()" link="libgimp-Gimp.html#gimp-destroy-paramdefs"/> - <keyword type="function" name="gimp_get_pdb_error ()" link="libgimp-Gimp.html#gimp-get-pdb-error" since="GIMP 2.6"/> - <keyword type="function" name="gimp_tile_width ()" link="libgimp-Gimp.html#gimp-tile-width"/> - <keyword type="function" name="gimp_tile_height ()" link="libgimp-Gimp.html#gimp-tile-height"/> - <keyword type="function" name="gimp_shm_ID ()" link="libgimp-Gimp.html#gimp-shm-ID"/> - <keyword type="function" name="gimp_shm_addr ()" link="libgimp-Gimp.html#gimp-shm-addr"/> - <keyword type="function" name="gimp_gamma ()" link="libgimp-Gimp.html#gimp-gamma"/> - <keyword type="function" name="gimp_install_cmap ()" link="libgimp-Gimp.html#gimp-install-cmap" deprecated=""/> - <keyword type="function" name="gimp_min_colors ()" link="libgimp-Gimp.html#gimp-min-colors" deprecated=""/> - <keyword type="function" name="gimp_show_tool_tips ()" link="libgimp-Gimp.html#gimp-show-tool-tips"/> - <keyword type="function" name="gimp_show_help_button ()" link="libgimp-Gimp.html#gimp-show-help-button" since="GIMP 2.2"/> - <keyword type="function" name="gimp_check_size ()" link="libgimp-Gimp.html#gimp-check-size" since="GIMP 2.2"/> - <keyword type="function" name="gimp_check_type ()" link="libgimp-Gimp.html#gimp-check-type" since="GIMP 2.2"/> - <keyword type="function" name="gimp_default_display ()" link="libgimp-Gimp.html#gimp-default-display"/> - <keyword type="function" name="gimp_wm_class ()" link="libgimp-Gimp.html#gimp-wm-class"/> - <keyword type="function" name="gimp_display_name ()" link="libgimp-Gimp.html#gimp-display-name"/> - <keyword type="function" name="gimp_monitor_number ()" link="libgimp-Gimp.html#gimp-monitor-number"/> - <keyword type="function" name="gimp_user_time ()" link="libgimp-Gimp.html#gimp-user-time" since="GIMP 2.6"/> - <keyword type="function" name="gimp_get_progname ()" link="libgimp-Gimp.html#gimp-get-progname"/> - <keyword type="function" name="gimp_extension_enable ()" link="libgimp-Gimp.html#gimp-extension-enable"/> - <keyword type="function" name="gimp_extension_ack ()" link="libgimp-Gimp.html#gimp-extension-ack"/> - <keyword type="function" name="gimp_extension_process ()" link="libgimp-Gimp.html#gimp-extension-process"/> - <keyword type="function" name="gimp_attach_parasite ()" link="libgimp-Gimp.html#gimp-attach-parasite" since="GIMP 2.8"/> - <keyword type="function" name="gimp_detach_parasite ()" link="libgimp-Gimp.html#gimp-detach-parasite" since="GIMP 2.8"/> - <keyword type="function" name="gimp_parasite_find ()" link="libgimp-Gimp.html#gimp-parasite-find" deprecated="Use gimp_get_parasite() instead."/> - <keyword type="function" name="gimp_parasite_list ()" link="libgimp-Gimp.html#gimp-parasite-list" deprecated="Use gimp_get_parasite_list() instead."/> - <keyword type="function" name="gimp_get_parasite ()" link="libgimp-Gimp.html#gimp-get-parasite" since="GIMP 2.8"/> - <keyword type="function" name="gimp_get_parasite_list ()" link="libgimp-Gimp.html#gimp-get-parasite-list" since="GIMP 2.8"/> - <keyword type="function" name="gimp_parasite_attach ()" link="libgimp-Gimp.html#gimp-parasite-attach" deprecated="Use gimp_attach_parasite() instead."/> - <keyword type="function" name="gimp_parasite_detach ()" link="libgimp-Gimp.html#gimp-parasite-detach" deprecated="Use gimp_detach_parasite() instead."/> - <keyword type="function" name="gimp_attach_new_parasite ()" link="libgimp-Gimp.html#gimp-attach-new-parasite" deprecated="Use gimp_attach_parasite() instead."/> - <keyword type="macro" name="gimp_get_data" link="libgimp-Gimp.html#gimp-get-data"/> - <keyword type="macro" name="gimp_get_data_size" link="libgimp-Gimp.html#gimp-get-data-size"/> - <keyword type="macro" name="gimp_set_data" link="libgimp-Gimp.html#gimp-set-data"/> - <keyword type="struct" name="GimpPlugInInfo" link="libgimp-Gimp.html#GimpPlugInInfo"/> - <keyword type="struct" name="GimpParamDef" link="libgimp-Gimp.html#GimpParamDef"/> - <keyword type="struct" name="GimpParamRegion" link="libgimp-Gimp.html#GimpParamRegion"/> - <keyword type="union" name="GimpParamData" link="libgimp-Gimp.html#GimpParamData"/> - <keyword type="struct" name="GimpParam" link="libgimp-Gimp.html#GimpParam"/> + <keyword type="function" name="gimp_version ()" link="libgimp-gimp.html#gimp-version"/> + <keyword type="function" name="gimp_getpid ()" link="libgimp-gimp.html#gimp-getpid" since="GIMP 2.4"/> + <keyword type="function" name="GimpInitProc ()" link="libgimp-gimp.html#GimpInitProc"/> + <keyword type="function" name="GimpQuitProc ()" link="libgimp-gimp.html#GimpQuitProc"/> + <keyword type="function" name="GimpQueryProc ()" link="libgimp-gimp.html#GimpQueryProc"/> + <keyword type="function" name="GimpRunProc ()" link="libgimp-gimp.html#GimpRunProc"/> + <keyword type="macro" name="MAIN" link="libgimp-gimp.html#MAIN:CAPS"/> + <keyword type="function" name="gimp_main ()" link="libgimp-gimp.html#gimp-main"/> + <keyword type="function" name="gimp_quit ()" link="libgimp-gimp.html#gimp-quit"/> + <keyword type="function" name="gimp_install_procedure ()" link="libgimp-gimp.html#gimp-install-procedure"/> + <keyword type="function" name="gimp_install_temp_proc ()" link="libgimp-gimp.html#gimp-install-temp-proc"/> + <keyword type="function" name="gimp_uninstall_temp_proc ()" link="libgimp-gimp.html#gimp-uninstall-temp-proc"/> + <keyword type="function" name="gimp_run_procedure ()" link="libgimp-gimp.html#gimp-run-procedure"/> + <keyword type="function" name="gimp_run_procedure2 ()" link="libgimp-gimp.html#gimp-run-procedure2"/> + <keyword type="function" name="gimp_destroy_params ()" link="libgimp-gimp.html#gimp-destroy-params"/> + <keyword type="function" name="gimp_destroy_paramdefs ()" link="libgimp-gimp.html#gimp-destroy-paramdefs"/> + <keyword type="function" name="gimp_get_pdb_error ()" link="libgimp-gimp.html#gimp-get-pdb-error" since="GIMP 2.6"/> + <keyword type="function" name="gimp_tile_width ()" link="libgimp-gimp.html#gimp-tile-width"/> + <keyword type="function" name="gimp_tile_height ()" link="libgimp-gimp.html#gimp-tile-height"/> + <keyword type="function" name="gimp_shm_ID ()" link="libgimp-gimp.html#gimp-shm-ID"/> + <keyword type="function" name="gimp_shm_addr ()" link="libgimp-gimp.html#gimp-shm-addr"/> + <keyword type="function" name="gimp_gamma ()" link="libgimp-gimp.html#gimp-gamma"/> + <keyword type="function" name="gimp_install_cmap ()" link="libgimp-gimp.html#gimp-install-cmap" deprecated=""/> + <keyword type="function" name="gimp_min_colors ()" link="libgimp-gimp.html#gimp-min-colors" deprecated=""/> + <keyword type="function" name="gimp_show_tool_tips ()" link="libgimp-gimp.html#gimp-show-tool-tips"/> + <keyword type="function" name="gimp_show_help_button ()" link="libgimp-gimp.html#gimp-show-help-button" since="GIMP 2.2"/> + <keyword type="function" name="gimp_check_size ()" link="libgimp-gimp.html#gimp-check-size" since="GIMP 2.2"/> + <keyword type="function" name="gimp_check_type ()" link="libgimp-gimp.html#gimp-check-type" since="GIMP 2.2"/> + <keyword type="function" name="gimp_default_display ()" link="libgimp-gimp.html#gimp-default-display"/> + <keyword type="function" name="gimp_wm_class ()" link="libgimp-gimp.html#gimp-wm-class"/> + <keyword type="function" name="gimp_display_name ()" link="libgimp-gimp.html#gimp-display-name"/> + <keyword type="function" name="gimp_monitor_number ()" link="libgimp-gimp.html#gimp-monitor-number"/> + <keyword type="function" name="gimp_user_time ()" link="libgimp-gimp.html#gimp-user-time" since="GIMP 2.6"/> + <keyword type="function" name="gimp_get_progname ()" link="libgimp-gimp.html#gimp-get-progname"/> + <keyword type="function" name="gimp_extension_enable ()" link="libgimp-gimp.html#gimp-extension-enable"/> + <keyword type="function" name="gimp_extension_ack ()" link="libgimp-gimp.html#gimp-extension-ack"/> + <keyword type="function" name="gimp_extension_process ()" link="libgimp-gimp.html#gimp-extension-process"/> + <keyword type="function" name="gimp_attach_parasite ()" link="libgimp-gimp.html#gimp-attach-parasite" since="GIMP 2.8"/> + <keyword type="function" name="gimp_detach_parasite ()" link="libgimp-gimp.html#gimp-detach-parasite" since="GIMP 2.8"/> + <keyword type="function" name="gimp_parasite_find ()" link="libgimp-gimp.html#gimp-parasite-find" deprecated="Use gimp_get_parasite() instead."/> + <keyword type="function" name="gimp_parasite_list ()" link="libgimp-gimp.html#gimp-parasite-list" deprecated="Use gimp_get_parasite_list() instead."/> + <keyword type="function" name="gimp_get_parasite ()" link="libgimp-gimp.html#gimp-get-parasite" since="GIMP 2.8"/> + <keyword type="function" name="gimp_get_parasite_list ()" link="libgimp-gimp.html#gimp-get-parasite-list" since="GIMP 2.8"/> + <keyword type="function" name="gimp_parasite_attach ()" link="libgimp-gimp.html#gimp-parasite-attach" deprecated="Use gimp_attach_parasite() instead."/> + <keyword type="function" name="gimp_parasite_detach ()" link="libgimp-gimp.html#gimp-parasite-detach" deprecated="Use gimp_detach_parasite() instead."/> + <keyword type="function" name="gimp_attach_new_parasite ()" link="libgimp-gimp.html#gimp-attach-new-parasite" deprecated="Use gimp_attach_parasite() instead."/> + <keyword type="macro" name="gimp_get_data" link="libgimp-gimp.html#gimp-get-data"/> + <keyword type="macro" name="gimp_get_data_size" link="libgimp-gimp.html#gimp-get-data-size"/> + <keyword type="macro" name="gimp_set_data" link="libgimp-gimp.html#gimp-set-data"/> + <keyword type="struct" name="GimpPlugInInfo" link="libgimp-gimp.html#GimpPlugInInfo"/> + <keyword type="struct" name="GimpParamDef" link="libgimp-gimp.html#GimpParamDef"/> + <keyword type="struct" name="GimpParamRegion" link="libgimp-gimp.html#GimpParamRegion"/> + <keyword type="union" name="GimpParamData" link="libgimp-gimp.html#GimpParamData"/> + <keyword type="struct" name="GimpParam" link="libgimp-gimp.html#GimpParam"/> <keyword type="function" name="gimp_enums_init ()" link="libgimp-gimpenums.html#gimp-enums-init" since="GIMP 2.4"/> <keyword type="function" name="gimp_enums_get_type_names ()" link="libgimp-gimpenums.html#gimp-enums-get-type-names" since="GIMP 2.2"/> <keyword type="enum" name="enum GimpBrushApplicationMode" link="libgimp-gimpenums.html#GimpBrushApplicationMode"/> @@ -1185,9 +1185,9 @@ <keyword type="constant" name="GIMP_EXPORT_CANCEL" link="libgimp-gimpexport.html#GIMP-EXPORT-CANCEL:CAPS"/> <keyword type="constant" name="GIMP_EXPORT_IGNORE" link="libgimp-gimpexport.html#GIMP-EXPORT-IGNORE:CAPS"/> <keyword type="constant" name="GIMP_EXPORT_EXPORT" link="libgimp-gimpexport.html#GIMP-EXPORT-EXPORT:CAPS"/> - <keyword type="member" name="GimpPlugInInfo.init-proc" link="libgimp-Gimp.html#GimpPlugInInfo.init-proc"/> - <keyword type="member" name="GimpPlugInInfo.quit-proc" link="libgimp-Gimp.html#GimpPlugInInfo.quit-proc"/> - <keyword type="member" name="GimpPlugInInfo.query-proc" link="libgimp-Gimp.html#GimpPlugInInfo.query-proc"/> - <keyword type="member" name="GimpPlugInInfo.run-proc" link="libgimp-Gimp.html#GimpPlugInInfo.run-proc"/> + <keyword type="member" name="GimpPlugInInfo.init-proc" link="libgimp-gimp.html#GimpPlugInInfo.init-proc"/> + <keyword type="member" name="GimpPlugInInfo.quit-proc" link="libgimp-gimp.html#GimpPlugInInfo.quit-proc"/> + <keyword type="member" name="GimpPlugInInfo.query-proc" link="libgimp-gimp.html#GimpPlugInInfo.query-proc"/> + <keyword type="member" name="GimpPlugInInfo.run-proc" link="libgimp-gimp.html#GimpPlugInInfo.run-proc"/> </functions> </book> diff -Nru gimp-2.8.18/devel-docs/libgimp/html/libgimp-general.html gimp-2.8.20/devel-docs/libgimp/html/libgimp-general.html --- gimp-2.8.18/devel-docs/libgimp/html/libgimp-general.html 2016-07-13 01:02:11.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimp/html/libgimp-general.html 2017-02-01 06:04:35.000000000 +0000 @@ -7,7 +7,7 @@ <link rel="home" href="index.html" title="GIMP Library Reference Manual"> <link rel="up" href="libgimp.html" title="Part I. GIMP Library"> <link rel="prev" href="libgimp.html" title="Part I. GIMP Library"> -<link rel="next" href="libgimp-Gimp.html" title="Gimp"> +<link rel="next" href="libgimp-gimp.html" title="gimp"> <meta name="generator" content="GTK-Doc V1.25 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> @@ -17,15 +17,14 @@ <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td> <td><a accesskey="u" href="libgimp.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td> <td><a accesskey="p" href="libgimp.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td> -<td><a accesskey="n" href="libgimp-Gimp.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td> +<td><a accesskey="n" href="libgimp-gimp.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td> </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> <a name="libgimp-general"></a>Functions not Related to Specific Images</h2></div></div></div> <div class="toc"><dl class="toc"> <dt> -<span class="refentrytitle"><a href="libgimp-Gimp.html">Gimp</a></span><span class="refpurpose"> — Main functions needed for building a GIMP plug-in. - This header includes all other GIMP Library headers.</span> +<span class="refentrytitle"><a href="libgimp-gimp.html">gimp</a></span><span class="refpurpose"> — Miscellaneous procedures</span> </dt> <dt> <span class="refentrytitle"><a href="libgimp-gimpenums.html">gimpenums</a></span><span class="refpurpose"> — Enums and definitions.</span> diff -Nru gimp-2.8.18/devel-docs/libgimp/html/libgimp-gimpenums.html gimp-2.8.20/devel-docs/libgimp/html/libgimp-gimpenums.html --- gimp-2.8.18/devel-docs/libgimp/html/libgimp-gimpenums.html 2016-07-13 01:02:11.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimp/html/libgimp-gimpenums.html 2017-02-01 06:04:35.000000000 +0000 @@ -6,7 +6,7 @@ <meta name="generator" content="DocBook XSL Stylesheets V1.79.1"> <link rel="home" href="index.html" title="GIMP Library Reference Manual"> <link rel="up" href="libgimp-general.html" title="Functions not Related to Specific Images"> -<link rel="prev" href="libgimp-Gimp.html" title="Gimp"> +<link rel="prev" href="libgimp-gimp.html" title="gimp"> <link rel="next" href="libgimp-gimpbuffer.html" title="gimpbuffer"> <meta name="generator" content="GTK-Doc V1.25 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> @@ -19,7 +19,7 @@ </td> <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td> <td><a accesskey="u" href="libgimp-general.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td> -<td><a accesskey="p" href="libgimp-Gimp.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td> +<td><a accesskey="p" href="libgimp-gimp.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td> <td><a accesskey="n" href="libgimp-gimpbuffer.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td> </tr></table> <div class="refentry"> diff -Nru gimp-2.8.18/devel-docs/libgimp/html/libgimp-gimp.html gimp-2.8.20/devel-docs/libgimp/html/libgimp-gimp.html --- gimp-2.8.18/devel-docs/libgimp/html/libgimp-gimp.html 1970-01-01 00:00:00.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimp/html/libgimp-gimp.html 2017-02-01 06:04:35.000000000 +0000 @@ -0,0 +1,1730 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>gimp: GIMP Library Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

gimp

+

gimp — Miscellaneous procedures

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+gchar * + +gimp_version () +
+gint + +gimp_getpid () +
+void + +(*GimpInitProc) () +
+void + +(*GimpQuitProc) () +
+void + +(*GimpQueryProc) () +
+void + +(*GimpRunProc) () +
#defineMAIN
+gint + +gimp_main () +
+void + +gimp_quit () +
+void + +gimp_install_procedure () +
+void + +gimp_install_temp_proc () +
+void + +gimp_uninstall_temp_proc () +
+GimpParam * + +gimp_run_procedure () +
+GimpParam * + +gimp_run_procedure2 () +
+void + +gimp_destroy_params () +
+void + +gimp_destroy_paramdefs () +
const gchar * + +gimp_get_pdb_error () +
+guint + +gimp_tile_width () +
+guint + +gimp_tile_height () +
+gint + +gimp_shm_ID () +
+guchar * + +gimp_shm_addr () +
+gdouble + +gimp_gamma () +
+gboolean + +gimp_install_cmap () +
+gint + +gimp_min_colors () +
+gboolean + +gimp_show_tool_tips () +
+gboolean + +gimp_show_help_button () +
+GimpCheckSize + +gimp_check_size () +
+GimpCheckType + +gimp_check_type () +
+gint32 + +gimp_default_display () +
const gchar * + +gimp_wm_class () +
const gchar * + +gimp_display_name () +
+gint + +gimp_monitor_number () +
+guint32 + +gimp_user_time () +
const gchar * + +gimp_get_progname () +
+void + +gimp_extension_enable () +
+void + +gimp_extension_ack () +
+void + +gimp_extension_process () +
+gboolean + +gimp_attach_parasite () +
+gboolean + +gimp_detach_parasite () +
+GimpParasite * + +gimp_parasite_find () +
+gboolean + +gimp_parasite_list () +
+GimpParasite * + +gimp_get_parasite () +
+gchar ** + +gimp_get_parasite_list () +
+gboolean + +gimp_parasite_attach () +
+gboolean + +gimp_parasite_detach () +
+gboolean + +gimp_attach_new_parasite () +
+
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#definegimp_get_data
#definegimp_get_data_size
#definegimp_set_data
 GimpPlugInInfo
 GimpParamDef
 GimpParamRegion
 GimpParamData
 GimpParam
+
+
+

Description

+

Miscellaneous procedures not fitting in any category.

+
+
+

Functions

+
+

gimp_version ()

+
gchar *
+gimp_version (void);
+

Returns the host GIMP version.

+

This procedure returns the version number of the currently running +GIMP.

+
+

Returns

+

GIMP version number.

+
+
+
+
+

gimp_getpid ()

+
gint
+gimp_getpid (void);
+

Returns the PID of the host GIMP process.

+

This procedure returns the process ID of the currently running GIMP.

+
+

Returns

+

The PID.

+
+

Since: GIMP 2.4

+
+
+
+

GimpInitProc ()

+
void
+(*GimpInitProc) (void);
+
+
+
+

GimpQuitProc ()

+
void
+(*GimpQuitProc) (void);
+
+
+
+

GimpQueryProc ()

+
void
+(*GimpQueryProc) (void);
+
+
+
+

GimpRunProc ()

+
void
+(*GimpRunProc) (const gchar *name,
+                gint n_params,
+                const GimpParam *param,
+                gint *n_return_vals,
+                GimpParam **return_vals);
+
+
+
+

MAIN

+
#define             MAIN()
+

A macro that expands to the appropriate main() function for the +platform being compiled for.

+

To use this macro, simply place a line that contains just the code +MAIN() at the toplevel of your file. No semicolon should be used.

+
+
+
+

gimp_main ()

+
gint
+gimp_main (const GimpPlugInInfo *info,
+           gint argc,
+           gchar *argv[]);
+

The main procedure that must be called with the PLUG_IN_INFO structure +and the 'argc' and 'argv' that are passed to "main".

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

info

the PLUG_IN_INFO structure

 

argc

the number of arguments

 

argv

the arguments

 
+
+
+

Returns

+

an exit status as defined by the C library, +on success EXIT_SUCCESS.

+
+
+
+
+

gimp_quit ()

+
void
+gimp_quit (void);
+

Forcefully causes the GIMP library to exit and close down its +connection to main gimp application. This function never returns.

+
+
+
+

gimp_install_procedure ()

+
void
+gimp_install_procedure (const gchar *name,
+                        const gchar *blurb,
+                        const gchar *help,
+                        const gchar *author,
+                        const gchar *copyright,
+                        const gchar *date,
+                        const gchar *menu_label,
+                        const gchar *image_types,
+                        GimpPDBProcType type,
+                        gint n_params,
+                        gint n_return_vals,
+                        const GimpParamDef *params,
+                        const GimpParamDef *return_vals);
+

Installs a new procedure with the PDB (procedural database).

+

Call this function from within your plug-in's query() function for +each procedure your plug-in implements.

+

The name + parameter is mandatory and should be unique, or it will +overwrite an already existing procedure (overwrite procedures only +if you know what you're doing).

+

The blurb +, help +, author +, copyright + and date + parameters are +optional but then you shouldn't write procedures without proper +documentation, should you.

+

menu_label + defines the label that should be used for the +procedure's menu entry. The position where to register in the menu +hierarchy is chosen using gimp_plugin_menu_register(). This +function also still accepts the old (pre-2.2) way of registering a +menu entry and takes a string in the form +"<Domain>/Path/To/My/Menu" +(e.g. "<Image>/Filters/Render/Useless").

+

It is possible to register a procedure only for keyboard-shortcut +activation by passing a menu_label + to gimp_install_procedure() but +not registering any menu path with gimp_plugin_menu_register(). In +this case, the given menu_label + will only be used as the +procedure's user-visible name in the keyboard shortcut editor.

+

image_types + is a comma separated list of image types, or actually +drawable types, that this procedure can deal with. Wildcards are +possible here, so you could say "RGB*" instead of "RGB, RGBA" or +"*" for all image types. If the procedure doesn't need an image to +run, use the empty string.

+

type + must be one of GIMP_PLUGIN or GIMP_EXTENSION. Note that +temporary procedures must be installed using +gimp_install_temp_proc().

+

NOTE: Unlike the GIMP 1.2 API, GIMP_EXTENSION no longer means +that the procedure's menu prefix is <Toolbox>, but that +it will install temporary procedures. Therefore, the GIMP core +will wait until the GIMP_EXTENSION procedure has called +gimp_extension_ack(), which means that the procedure has done +its initialization, installed its temporary procedures and is +ready to run.

+

Not calling gimp_extension_ack() from a GIMP_EXTENSION +procedure will cause the GIMP core to lock up.

+

Additionally, a GIMP_EXTENSION procedure with no parameters +(n_params + == 0 and params + == NULL) is an "automatic" extension +that will be automatically started on each GIMP startup.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

name

the procedure's name.

 

blurb

a short text describing what the procedure does.

 

help

the help text for the procedure (usually considerably +longer than blurb +).

 

author

the procedure's author(s).

 

copyright

the procedure's copyright.

 

date

the date the procedure was added.

 

menu_label

the label to use for the procedure's menu entry, +or NULL if the procedure has no menu entry.

 

image_types

the drawable types the procedure can handle.

 

type

the type of the procedure.

 

n_params

the number of parameters the procedure takes.

 

n_return_vals

the number of return values the procedure returns.

 

params

the procedure's parameters.

 

return_vals

the procedure's return values.

 
+
+
+
+
+

gimp_install_temp_proc ()

+
void
+gimp_install_temp_proc (const gchar *name,
+                        const gchar *blurb,
+                        const gchar *help,
+                        const gchar *author,
+                        const gchar *copyright,
+                        const gchar *date,
+                        const gchar *menu_label,
+                        const gchar *image_types,
+                        GimpPDBProcType type,
+                        gint n_params,
+                        gint n_return_vals,
+                        const GimpParamDef *params,
+                        const GimpParamDef *return_vals,
+                        GimpRunProc run_proc);
+

Installs a new temporary procedure with the PDB (procedural database).

+

A temporary procedure is a procedure which is only available while +one of your plug-in's "real" procedures is running.

+

See gimp_install_procedure() for most details.

+

type + must be GIMP_TEMPORARY or the function +will fail.

+

run_proc + is the function which will be called to execute the +procedure.

+

NOTE: Normally, plug-in communication is triggered by the plug-in +and the GIMP core only responds to the plug-in's requests. You must +explicitly enable receiving of temporary procedure run requests +using either gimp_extension_enable() or +gimp_extension_process(). See this functions' documentation for +details.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

name

the procedure's name.

 

blurb

a short text describing what the procedure does.

 

help

the help text for the procedure (usually considerably +longer than blurb +).

 

author

the procedure's author(s).

 

copyright

the procedure's copyright.

 

date

the date the procedure was added.

 

menu_label

the procedure's menu label, or NULL if the procedure has +no menu entry.

 

image_types

the drawable types the procedure can handle.

 

type

the type of the procedure.

 

n_params

the number of parameters the procedure takes.

 

n_return_vals

the number of return values the procedure returns.

 

params

the procedure's parameters.

 

return_vals

the procedure's return values.

 

run_proc

the function to call for executing the procedure.

 
+
+
+
+
+

gimp_uninstall_temp_proc ()

+
void
+gimp_uninstall_temp_proc (const gchar *name);
+

Uninstalls a temporary procedure which has previously been +installed using gimp_install_temp_proc().

+
+

Parameters

+
+++++ + + + + + +

name

the procedure's name

 
+
+
+
+
+

gimp_run_procedure ()

+
GimpParam *
+gimp_run_procedure (const gchar *name,
+                    gint *n_return_vals,
+                    ...);
+

This function calls a GIMP procedure and returns its return values.

+

The procedure's parameters are given by a va_list in the format +(type, value, type, value) and must be terminated by GIMP_PDB_END.

+

This function converts the va_list of parameters into an array and +passes them to gimp_run_procedure2(). Please look there for further +information.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

name

the name of the procedure to run

 

n_return_vals

return location for the number of return values

 

...

list of procedure parameters

 
+
+
+

Returns

+

the procedure's return values unless there was an error, +in which case the zero-th return value will be the error status, and +the first return value will be a string detailing the error.

+
+
+
+
+

gimp_run_procedure2 ()

+
GimpParam *
+gimp_run_procedure2 (const gchar *name,
+                     gint *n_return_vals,
+                     gint n_params,
+                     const GimpParam *params);
+

This function calls a GIMP procedure and returns its return values. +To get more information about the available procedures and the +parameters they expect, please have a look at the Procedure Browser +as found in the Xtns menu in GIMP's toolbox.

+

As soon as you don't need the return values any longer, you should +free them using gimp_destroy_params().

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

name

the name of the procedure to run

 

n_return_vals

return location for the number of return values

 

n_params

the number of parameters the procedure takes.

 

params

the procedure's parameters array.

 
+
+
+

Returns

+

the procedure's return values unless there was an error, +in which case the zero-th return value will be the error status, and +if there are two values returned, the other return value will be a +string detailing the error.

+
+
+
+
+

gimp_destroy_params ()

+
void
+gimp_destroy_params (GimpParam *params,
+                     gint n_params);
+

Destroys a GimpParam array as returned by gimp_run_procedure() or +gimp_run_procedure2().

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

params

the GimpParam array to destroy

 

n_params

the number of elements in the array

 
+
+
+
+
+

gimp_destroy_paramdefs ()

+
void
+gimp_destroy_paramdefs (GimpParamDef *paramdefs,
+                        gint n_params);
+

Destroys a GimpParamDef array as returned by +gimp_procedural_db_proc_info().

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

paramdefs

the GimpParamDef array to destroy

 

n_params

the number of elements in the array

 
+
+
+
+
+

gimp_get_pdb_error ()

+
const gchar *
+gimp_get_pdb_error (void);
+

Retrieves the error message from the last procedure call.

+

If a procedure call fails, then it might pass an error message with +the return values. Plug-ins that are using the libgimp C wrappers +don't access the procedure return values directly. Thus ligimp +stores the error message and makes it available with this +function. The next procedure call unsets the error message again.

+

The returned string is owned by libgimp and must not be freed or +modified.

+
+

Returns

+

the error message

+
+

Since: GIMP 2.6

+
+
+
+

gimp_tile_width ()

+
guint
+gimp_tile_width (void);
+

Returns the tile width GIMP is using.

+

This is a constant value given at plug-in configuration time.

+
+

Returns

+

the tile_width

+
+
+
+
+

gimp_tile_height ()

+
guint
+gimp_tile_height (void);
+

Returns the tile height GIMP is using.

+

This is a constant value given at plug-in configuration time.

+
+

Returns

+

the tile_height

+
+
+
+
+

gimp_shm_ID ()

+
gint
+gimp_shm_ID (void);
+

Returns the shared memory ID used for passing tile data between the +GIMP core and the plug-in.

+

This is a constant value given at plug-in configuration time.

+
+

Returns

+

the shared memory ID

+
+
+
+
+

gimp_shm_addr ()

+
guchar *
+gimp_shm_addr (void);
+

Returns the address of the shared memory segment used for passing +tile data between the GIMP core and the plug-in.

+

This is a constant value given at plug-in configuration time.

+
+

Returns

+

the shared memory address

+
+
+
+
+

gimp_gamma ()

+
gdouble
+gimp_gamma (void);
+

Returns the global gamma value GIMP and all its plug-ins should +use.

+

This is a constant value given at plug-in configuration time.

+

NOTE: This function will always return 2.2, the gamma value for +sRGB. There's currently no way to change this and all operations +should assume that pixel data is in the sRGB colorspace.

+
+

Returns

+

the gamma value

+
+
+
+
+

gimp_install_cmap ()

+
gboolean
+gimp_install_cmap (void);
+

gimp_install_cmap is deprecated and should not be used in newly-written code.

+

Returns whether or not the plug-in should allocate an own colormap +when running on an 8 bit display. See also: gimp_min_colors().

+

This is a constant value given at plug-in configuration time.

+

Deprecated +: 2.8

+
+

Returns

+

the install_cmap boolean

+
+
+
+
+

gimp_min_colors ()

+
gint
+gimp_min_colors (void);
+

gimp_min_colors is deprecated and should not be used in newly-written code.

+

Returns the minimum number of colors to use when allocating an own +colormap on 8 bit displays.

+

This is a constant value given at plug-in configuration time.

+

See also: gimp_install_cmap()

+

Deprecated +: 2.8

+
+

Returns

+

the minimum number of colors to allocate

+
+
+
+
+

gimp_show_tool_tips ()

+
gboolean
+gimp_show_tool_tips (void);
+

Returns whether or not the plug-in should show tool-tips.

+

This is a constant value given at plug-in configuration time.

+
+

Returns

+

the show_tool_tips boolean

+
+
+
+
+

gimp_show_help_button ()

+
gboolean
+gimp_show_help_button (void);
+

Returns whether or not GimpDialog should automatically add a help +button if help_func and help_id are given.

+

This is a constant value given at plug-in configuration time.

+
+

Returns

+

the show_help_button boolean

+
+

Since: GIMP 2.2

+
+
+
+

gimp_check_size ()

+
GimpCheckSize
+gimp_check_size (void);
+

Returns the size of the checkerboard to be used in previews.

+

This is a constant value given at plug-in configuration time.

+
+

Returns

+

the check_size value

+
+

Since: GIMP 2.2

+
+
+
+

gimp_check_type ()

+
GimpCheckType
+gimp_check_type (void);
+

Returns the type of the checkerboard to be used in previews.

+

This is a constant value given at plug-in configuration time.

+
+

Returns

+

the check_type value

+
+

Since: GIMP 2.2

+
+
+
+

gimp_default_display ()

+
gint32
+gimp_default_display (void);
+

Returns the default display ID. This corresponds to the display the +running procedure's menu entry was invoked from.

+

This is a constant value given at plug-in configuration time.

+
+

Returns

+

the default display ID

+
+
+
+
+

gimp_wm_class ()

+
const gchar *
+gimp_wm_class (void);
+

Returns the window manager class to be used for plug-in windows.

+

This is a constant value given at plug-in configuration time.

+
+

Returns

+

the window manager class

+
+
+
+
+

gimp_display_name ()

+
const gchar *
+gimp_display_name (void);
+

Returns the display to be used for plug-in windows.

+

This is a constant value given at plug-in configuration time. +Will return NULL if GIMP has been started with no GUI, either +via "--no-interface" flag, or a console build.

+
+

Returns

+

the display name

+
+
+
+
+

gimp_monitor_number ()

+
gint
+gimp_monitor_number (void);
+

Returns the monitor number to be used for plug-in windows.

+

This is a constant value given at plug-in configuration time.

+
+

Returns

+

the monitor number

+
+
+
+
+

gimp_user_time ()

+
guint32
+gimp_user_time (void);
+

Returns the timestamp of the user interaction that should be set on +the plug-in window. This is handled transparently, plug-in authors +do not have to care about it.

+

This is a constant value given at plug-in configuration time.

+
+

Returns

+

timestamp for plug-in window

+
+

Since: GIMP 2.6

+
+
+
+

gimp_get_progname ()

+
const gchar *
+gimp_get_progname (void);
+

Returns the plug-in's executable name.

+
+

Returns

+

the executable name

+
+
+
+
+

gimp_extension_enable ()

+
void
+gimp_extension_enable (void);
+

Enables asynchronous processing of messages from the main GIMP +application.

+

Normally, a plug-in is not called by GIMP except for the call to +the procedure it implements. All subsequent communication is +triggered by the plug-in and all messages sent from GIMP to the +plug-in are just answers to requests the plug-in made.

+

If the plug-in however registered temporary procedures using +gimp_install_temp_proc(), it needs to be able to receive requests +to execute them. Usually this will be done by running +gimp_extension_process() in an endless loop.

+

If the plug-in cannot use gimp_extension_process(), i.e. if it has +a GUI and is hanging around in a GMainLoop, it must call +gimp_extension_enable().

+

Note that the plug-in does not need to be a GIMP_EXTENSION to +register temporary procedures.

+

See also: gimp_install_procedure(), gimp_install_temp_proc()

+
+
+
+

gimp_extension_ack ()

+
void
+gimp_extension_ack (void);
+

Notify the main GIMP application that the extension has been properly +initialized and is ready to run.

+

This function must be called from every +procedure that was registered as GIMP_EXTENSION.

+

Subsequently, extensions can process temporary procedure run +requests using either gimp_extension_enable() or +gimp_extension_process().

+

See also: gimp_install_procedure(), gimp_install_temp_proc()

+
+
+
+

gimp_extension_process ()

+
void
+gimp_extension_process (guint timeout);
+

Processes one message sent by GIMP and returns.

+

Call this function in an endless loop after calling +gimp_extension_ack() to process requests for running temporary +procedures.

+

See gimp_extension_enable() for an asynchronous way of doing the +same if running an endless loop is not an option.

+

See also: gimp_install_procedure(), gimp_install_temp_proc()

+
+

Parameters

+
+++++ + + + + + +

timeout

The timeout (in ms) to use for the select() call.

 
+
+
+
+
+

gimp_attach_parasite ()

+
gboolean
+gimp_attach_parasite (const GimpParasite *parasite);
+

Add a global parasite.

+

This procedure attaches a global parasite. It has no return values.

+
+

Parameters

+
+++++ + + + + + +

parasite

The parasite to attach.

 
+
+
+

Returns

+

TRUE on success.

+
+

Since: GIMP 2.8

+
+
+
+

gimp_detach_parasite ()

+
gboolean
+gimp_detach_parasite (const gchar *name);
+

Removes a global parasite.

+

This procedure detaches a global parasite from. It has no return +values.

+
+

Parameters

+
+++++ + + + + + +

name

The name of the parasite to detach.

 
+
+
+

Returns

+

TRUE on success.

+
+

Since: GIMP 2.8

+
+
+
+

gimp_parasite_find ()

+
GimpParasite *
+gimp_parasite_find (const gchar *name);
+
+

gimp_parasite_find is deprecated and should not be used in newly-written code.

+

Use gimp_get_parasite() instead.

+
+
+

Parameters

+
+++++ + + + + + +

name

The name of the parasite to find.

 
+
+
+

Returns

+

The found parasite.

+
+
+
+
+

gimp_parasite_list ()

+
gboolean
+gimp_parasite_list (gint *num_parasites,
+                    gchar ***parasites);
+
+

gimp_parasite_list is deprecated and should not be used in newly-written code.

+

Use gimp_get_parasite_list() instead.

+
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

num_parasites

The number of attached parasites.

 

parasites

The names of currently attached parasites.

 
+
+
+

Returns

+

TRUE on success.

+
+
+
+
+

gimp_get_parasite ()

+
GimpParasite *
+gimp_get_parasite (const gchar *name);
+

Look up a global parasite.

+

Finds and returns the global parasite that was previously attached.

+
+

Parameters

+
+++++ + + + + + +

name

The name of the parasite to find.

 
+
+
+

Returns

+

The found parasite.

+
+

Since: GIMP 2.8

+
+
+
+

gimp_get_parasite_list ()

+
gchar **
+gimp_get_parasite_list (gint *num_parasites);
+

List all parasites.

+

Returns a list of all currently attached global parasites.

+
+

Parameters

+
+++++ + + + + + +

num_parasites

The number of attached parasites.

 
+
+
+

Returns

+

The names of currently attached parasites.

+
+

Since: GIMP 2.8

+
+
+
+

gimp_parasite_attach ()

+
gboolean
+gimp_parasite_attach (const GimpParasite *parasite);
+
+

gimp_parasite_attach is deprecated and should not be used in newly-written code.

+

Use gimp_attach_parasite() instead.

+
+
+

Parameters

+
+++++ + + + + + +

parasite

The parasite to attach.

 
+
+
+

Returns

+

TRUE on success.

+
+
+
+
+

gimp_parasite_detach ()

+
gboolean
+gimp_parasite_detach (const gchar *name);
+
+

gimp_parasite_detach is deprecated and should not be used in newly-written code.

+

Use gimp_detach_parasite() instead.

+
+
+

Parameters

+
+++++ + + + + + +

name

The name of the parasite to detach.

 
+
+
+

Returns

+

TRUE on success.

+
+
+
+
+

gimp_attach_new_parasite ()

+
gboolean
+gimp_attach_new_parasite (const gchar *name,
+                          gint flags,
+                          gint size,
+                          gconstpointer data);
+
+

gimp_attach_new_parasite is deprecated and should not be used in newly-written code.

+

Use gimp_attach_parasite() instead.

+
+

Convenience function that creates a parasite and attaches it +to GIMP.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

name

the name of the GimpParasite to create and attach.

 

flags

the flags set on the GimpParasite.

 

size

the size of the parasite data in bytes.

 

data

a pointer to the data attached with the GimpParasite.

 
+
+
+

Returns

+

TRUE on successful creation and attachment of +the new parasite.

+

See Also: gimp_attach_parasite()

+
+
+
+
+

Types and Values

+
+

gimp_get_data

+
#define gimp_get_data         gimp_procedural_db_get_data
+
+
+
+
+

gimp_get_data_size

+
#define gimp_get_data_size    gimp_procedural_db_get_data_size
+
+
+
+
+

gimp_set_data

+
#define gimp_set_data         gimp_procedural_db_set_data
+
+
+
+
+

GimpPlugInInfo

+
typedef struct {
+  GimpInitProc  init_proc;
+  GimpQuitProc  quit_proc;
+  GimpQueryProc query_proc;
+  GimpRunProc   run_proc;
+} GimpPlugInInfo;
+
+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

GimpInitProc init_proc;

called when the gimp application initially starts up

 

GimpQuitProc quit_proc;

called when the gimp application exits

 

GimpQueryProc query_proc;

called by gimp so that the plug-in can inform the +gimp of what it does. (ie. installing a procedure database +procedure).

 

GimpRunProc run_proc;

called to run a procedure the plug-in installed in the +procedure database.

 
+
+
+
+
+

GimpParamDef

+
typedef struct {
+  GimpPDBArgType  type;
+  gchar          *name;
+  gchar          *description;
+} GimpParamDef;
+
+
+
+
+

GimpParamRegion

+
typedef struct {
+  gint32 x;
+  gint32 y;
+  gint32 width;
+  gint32 height;
+} GimpParamRegion;
+
+
+
+
+

GimpParamData

+
+
+
+

GimpParam

+
typedef struct {
+  GimpPDBArgType type;
+  GimpParamData  data;
+} GimpParam;
+
+
+
+
+
+
Generated by GTK-Doc V1.25
+ + \ No newline at end of file diff -Nru gimp-2.8.18/devel-docs/libgimp/html/libgimp-Gimp.html gimp-2.8.20/devel-docs/libgimp/html/libgimp-Gimp.html --- gimp-2.8.18/devel-docs/libgimp/html/libgimp-Gimp.html 2016-07-13 01:02:11.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimp/html/libgimp-Gimp.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,1732 +0,0 @@ - - - - -Gimp: GIMP Library Reference Manual - - - - - - - - - - - - - - - - -
-
-
- - -
-

Gimp

-

Gimp — Main functions needed for building a GIMP plug-in. - This header includes all other GIMP Library headers.

-
-
-

Functions

-
---- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-gchar * - -gimp_version () -
-gint - -gimp_getpid () -
-void - -(*GimpInitProc) () -
-void - -(*GimpQuitProc) () -
-void - -(*GimpQueryProc) () -
-void - -(*GimpRunProc) () -
#defineMAIN
-gint - -gimp_main () -
-void - -gimp_quit () -
-void - -gimp_install_procedure () -
-void - -gimp_install_temp_proc () -
-void - -gimp_uninstall_temp_proc () -
-GimpParam * - -gimp_run_procedure () -
-GimpParam * - -gimp_run_procedure2 () -
-void - -gimp_destroy_params () -
-void - -gimp_destroy_paramdefs () -
const gchar * - -gimp_get_pdb_error () -
-guint - -gimp_tile_width () -
-guint - -gimp_tile_height () -
-gint - -gimp_shm_ID () -
-guchar * - -gimp_shm_addr () -
-gdouble - -gimp_gamma () -
-gboolean - -gimp_install_cmap () -
-gint - -gimp_min_colors () -
-gboolean - -gimp_show_tool_tips () -
-gboolean - -gimp_show_help_button () -
-GimpCheckSize - -gimp_check_size () -
-GimpCheckType - -gimp_check_type () -
-gint32 - -gimp_default_display () -
const gchar * - -gimp_wm_class () -
const gchar * - -gimp_display_name () -
-gint - -gimp_monitor_number () -
-guint32 - -gimp_user_time () -
const gchar * - -gimp_get_progname () -
-void - -gimp_extension_enable () -
-void - -gimp_extension_ack () -
-void - -gimp_extension_process () -
-gboolean - -gimp_attach_parasite () -
-gboolean - -gimp_detach_parasite () -
-GimpParasite * - -gimp_parasite_find () -
-gboolean - -gimp_parasite_list () -
-GimpParasite * - -gimp_get_parasite () -
-gchar ** - -gimp_get_parasite_list () -
-gboolean - -gimp_parasite_attach () -
-gboolean - -gimp_parasite_detach () -
-gboolean - -gimp_attach_new_parasite () -
-
-
-

Types and Values

-
---- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#definegimp_get_data
#definegimp_get_data_size
#definegimp_set_data
 GimpPlugInInfo
 GimpParamDef
 GimpParamRegion
 GimpParamData
 GimpParam
-
-
-

Description

-

Main functions needed for building a GIMP plug-in. This header -includes all other GIMP Library headers.

-
-
-

Functions

-
-

gimp_version ()

-
gchar *
-gimp_version (void);
-

Returns the host GIMP version.

-

This procedure returns the version number of the currently running -GIMP.

-
-

Returns

-

GIMP version number.

-
-
-
-
-

gimp_getpid ()

-
gint
-gimp_getpid (void);
-

Returns the PID of the host GIMP process.

-

This procedure returns the process ID of the currently running GIMP.

-
-

Returns

-

The PID.

-
-

Since: GIMP 2.4

-
-
-
-

GimpInitProc ()

-
void
-(*GimpInitProc) (void);
-
-
-
-

GimpQuitProc ()

-
void
-(*GimpQuitProc) (void);
-
-
-
-

GimpQueryProc ()

-
void
-(*GimpQueryProc) (void);
-
-
-
-

GimpRunProc ()

-
void
-(*GimpRunProc) (const gchar *name,
-                gint n_params,
-                const GimpParam *param,
-                gint *n_return_vals,
-                GimpParam **return_vals);
-
-
-
-

MAIN

-
#define             MAIN()
-

A macro that expands to the appropriate main() function for the -platform being compiled for.

-

To use this macro, simply place a line that contains just the code -MAIN() at the toplevel of your file. No semicolon should be used.

-
-
-
-

gimp_main ()

-
gint
-gimp_main (const GimpPlugInInfo *info,
-           gint argc,
-           gchar *argv[]);
-

The main procedure that must be called with the PLUG_IN_INFO structure -and the 'argc' and 'argv' that are passed to "main".

-
-

Parameters

-
----- - - - - - - - - - - - - - - - - - -

info

the PLUG_IN_INFO structure

 

argc

the number of arguments

 

argv

the arguments

 
-
-
-

Returns

-

an exit status as defined by the C library, -on success EXIT_SUCCESS.

-
-
-
-
-

gimp_quit ()

-
void
-gimp_quit (void);
-

Forcefully causes the GIMP library to exit and close down its -connection to main gimp application. This function never returns.

-
-
-
-

gimp_install_procedure ()

-
void
-gimp_install_procedure (const gchar *name,
-                        const gchar *blurb,
-                        const gchar *help,
-                        const gchar *author,
-                        const gchar *copyright,
-                        const gchar *date,
-                        const gchar *menu_label,
-                        const gchar *image_types,
-                        GimpPDBProcType type,
-                        gint n_params,
-                        gint n_return_vals,
-                        const GimpParamDef *params,
-                        const GimpParamDef *return_vals);
-

Installs a new procedure with the PDB (procedural database).

-

Call this function from within your plug-in's query() function for -each procedure your plug-in implements.

-

The name - parameter is mandatory and should be unique, or it will -overwrite an already existing procedure (overwrite procedures only -if you know what you're doing).

-

The blurb -, help -, author -, copyright - and date - parameters are -optional but then you shouldn't write procedures without proper -documentation, should you.

-

menu_label - defines the label that should be used for the -procedure's menu entry. The position where to register in the menu -hierarchy is chosen using gimp_plugin_menu_register(). This -function also still accepts the old (pre-2.2) way of registering a -menu entry and takes a string in the form -"<Domain>/Path/To/My/Menu" -(e.g. "<Image>/Filters/Render/Useless").

-

It is possible to register a procedure only for keyboard-shortcut -activation by passing a menu_label - to gimp_install_procedure() but -not registering any menu path with gimp_plugin_menu_register(). In -this case, the given menu_label - will only be used as the -procedure's user-visible name in the keyboard shortcut editor.

-

image_types - is a comma separated list of image types, or actually -drawable types, that this procedure can deal with. Wildcards are -possible here, so you could say "RGB*" instead of "RGB, RGBA" or -"*" for all image types. If the procedure doesn't need an image to -run, use the empty string.

-

type - must be one of GIMP_PLUGIN or GIMP_EXTENSION. Note that -temporary procedures must be installed using -gimp_install_temp_proc().

-

NOTE: Unlike the GIMP 1.2 API, GIMP_EXTENSION no longer means -that the procedure's menu prefix is <Toolbox>, but that -it will install temporary procedures. Therefore, the GIMP core -will wait until the GIMP_EXTENSION procedure has called -gimp_extension_ack(), which means that the procedure has done -its initialization, installed its temporary procedures and is -ready to run.

-

Not calling gimp_extension_ack() from a GIMP_EXTENSION -procedure will cause the GIMP core to lock up.

-

Additionally, a GIMP_EXTENSION procedure with no parameters -(n_params - == 0 and params - == NULL) is an "automatic" extension -that will be automatically started on each GIMP startup.

-
-

Parameters

-
----- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

name

the procedure's name.

 

blurb

a short text describing what the procedure does.

 

help

the help text for the procedure (usually considerably -longer than blurb -).

 

author

the procedure's author(s).

 

copyright

the procedure's copyright.

 

date

the date the procedure was added.

 

menu_label

the label to use for the procedure's menu entry, -or NULL if the procedure has no menu entry.

 

image_types

the drawable types the procedure can handle.

 

type

the type of the procedure.

 

n_params

the number of parameters the procedure takes.

 

n_return_vals

the number of return values the procedure returns.

 

params

the procedure's parameters.

 

return_vals

the procedure's return values.

 
-
-
-
-
-

gimp_install_temp_proc ()

-
void
-gimp_install_temp_proc (const gchar *name,
-                        const gchar *blurb,
-                        const gchar *help,
-                        const gchar *author,
-                        const gchar *copyright,
-                        const gchar *date,
-                        const gchar *menu_label,
-                        const gchar *image_types,
-                        GimpPDBProcType type,
-                        gint n_params,
-                        gint n_return_vals,
-                        const GimpParamDef *params,
-                        const GimpParamDef *return_vals,
-                        GimpRunProc run_proc);
-

Installs a new temporary procedure with the PDB (procedural database).

-

A temporary procedure is a procedure which is only available while -one of your plug-in's "real" procedures is running.

-

See gimp_install_procedure() for most details.

-

type - must be GIMP_TEMPORARY or the function -will fail.

-

run_proc - is the function which will be called to execute the -procedure.

-

NOTE: Normally, plug-in communication is triggered by the plug-in -and the GIMP core only responds to the plug-in's requests. You must -explicitly enable receiving of temporary procedure run requests -using either gimp_extension_enable() or -gimp_extension_process(). See this functions' documentation for -details.

-
-

Parameters

-
----- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

name

the procedure's name.

 

blurb

a short text describing what the procedure does.

 

help

the help text for the procedure (usually considerably -longer than blurb -).

 

author

the procedure's author(s).

 

copyright

the procedure's copyright.

 

date

the date the procedure was added.

 

menu_label

the procedure's menu label, or NULL if the procedure has -no menu entry.

 

image_types

the drawable types the procedure can handle.

 

type

the type of the procedure.

 

n_params

the number of parameters the procedure takes.

 

n_return_vals

the number of return values the procedure returns.

 

params

the procedure's parameters.

 

return_vals

the procedure's return values.

 

run_proc

the function to call for executing the procedure.

 
-
-
-
-
-

gimp_uninstall_temp_proc ()

-
void
-gimp_uninstall_temp_proc (const gchar *name);
-

Uninstalls a temporary procedure which has previously been -installed using gimp_install_temp_proc().

-
-

Parameters

-
----- - - - - - -

name

the procedure's name

 
-
-
-
-
-

gimp_run_procedure ()

-
GimpParam *
-gimp_run_procedure (const gchar *name,
-                    gint *n_return_vals,
-                    ...);
-

This function calls a GIMP procedure and returns its return values.

-

The procedure's parameters are given by a va_list in the format -(type, value, type, value) and must be terminated by GIMP_PDB_END.

-

This function converts the va_list of parameters into an array and -passes them to gimp_run_procedure2(). Please look there for further -information.

-
-

Parameters

-
----- - - - - - - - - - - - - - - - - - -

name

the name of the procedure to run

 

n_return_vals

return location for the number of return values

 

...

list of procedure parameters

 
-
-
-

Returns

-

the procedure's return values unless there was an error, -in which case the zero-th return value will be the error status, and -the first return value will be a string detailing the error.

-
-
-
-
-

gimp_run_procedure2 ()

-
GimpParam *
-gimp_run_procedure2 (const gchar *name,
-                     gint *n_return_vals,
-                     gint n_params,
-                     const GimpParam *params);
-

This function calls a GIMP procedure and returns its return values. -To get more information about the available procedures and the -parameters they expect, please have a look at the Procedure Browser -as found in the Xtns menu in GIMP's toolbox.

-

As soon as you don't need the return values any longer, you should -free them using gimp_destroy_params().

-
-

Parameters

-
----- - - - - - - - - - - - - - - - - - - - - - - -

name

the name of the procedure to run

 

n_return_vals

return location for the number of return values

 

n_params

the number of parameters the procedure takes.

 

params

the procedure's parameters array.

 
-
-
-

Returns

-

the procedure's return values unless there was an error, -in which case the zero-th return value will be the error status, and -if there are two values returned, the other return value will be a -string detailing the error.

-
-
-
-
-

gimp_destroy_params ()

-
void
-gimp_destroy_params (GimpParam *params,
-                     gint n_params);
-

Destroys a GimpParam array as returned by gimp_run_procedure() or -gimp_run_procedure2().

-
-

Parameters

-
----- - - - - - - - - - - - - -

params

the GimpParam array to destroy

 

n_params

the number of elements in the array

 
-
-
-
-
-

gimp_destroy_paramdefs ()

-
void
-gimp_destroy_paramdefs (GimpParamDef *paramdefs,
-                        gint n_params);
-

Destroys a GimpParamDef array as returned by -gimp_procedural_db_proc_info().

-
-

Parameters

-
----- - - - - - - - - - - - - -

paramdefs

the GimpParamDef array to destroy

 

n_params

the number of elements in the array

 
-
-
-
-
-

gimp_get_pdb_error ()

-
const gchar *
-gimp_get_pdb_error (void);
-

Retrieves the error message from the last procedure call.

-

If a procedure call fails, then it might pass an error message with -the return values. Plug-ins that are using the libgimp C wrappers -don't access the procedure return values directly. Thus ligimp -stores the error message and makes it available with this -function. The next procedure call unsets the error message again.

-

The returned string is owned by libgimp and must not be freed or -modified.

-
-

Returns

-

the error message

-
-

Since: GIMP 2.6

-
-
-
-

gimp_tile_width ()

-
guint
-gimp_tile_width (void);
-

Returns the tile width GIMP is using.

-

This is a constant value given at plug-in configuration time.

-
-

Returns

-

the tile_width

-
-
-
-
-

gimp_tile_height ()

-
guint
-gimp_tile_height (void);
-

Returns the tile height GIMP is using.

-

This is a constant value given at plug-in configuration time.

-
-

Returns

-

the tile_height

-
-
-
-
-

gimp_shm_ID ()

-
gint
-gimp_shm_ID (void);
-

Returns the shared memory ID used for passing tile data between the -GIMP core and the plug-in.

-

This is a constant value given at plug-in configuration time.

-
-

Returns

-

the shared memory ID

-
-
-
-
-

gimp_shm_addr ()

-
guchar *
-gimp_shm_addr (void);
-

Returns the address of the shared memory segment used for passing -tile data between the GIMP core and the plug-in.

-

This is a constant value given at plug-in configuration time.

-
-

Returns

-

the shared memory address

-
-
-
-
-

gimp_gamma ()

-
gdouble
-gimp_gamma (void);
-

Returns the global gamma value GIMP and all its plug-ins should -use.

-

This is a constant value given at plug-in configuration time.

-

NOTE: This function will always return 2.2, the gamma value for -sRGB. There's currently no way to change this and all operations -should assume that pixel data is in the sRGB colorspace.

-
-

Returns

-

the gamma value

-
-
-
-
-

gimp_install_cmap ()

-
gboolean
-gimp_install_cmap (void);
-

gimp_install_cmap is deprecated and should not be used in newly-written code.

-

Returns whether or not the plug-in should allocate an own colormap -when running on an 8 bit display. See also: gimp_min_colors().

-

This is a constant value given at plug-in configuration time.

-

Deprecated -: 2.8

-
-

Returns

-

the install_cmap boolean

-
-
-
-
-

gimp_min_colors ()

-
gint
-gimp_min_colors (void);
-

gimp_min_colors is deprecated and should not be used in newly-written code.

-

Returns the minimum number of colors to use when allocating an own -colormap on 8 bit displays.

-

This is a constant value given at plug-in configuration time.

-

See also: gimp_install_cmap()

-

Deprecated -: 2.8

-
-

Returns

-

the minimum number of colors to allocate

-
-
-
-
-

gimp_show_tool_tips ()

-
gboolean
-gimp_show_tool_tips (void);
-

Returns whether or not the plug-in should show tool-tips.

-

This is a constant value given at plug-in configuration time.

-
-

Returns

-

the show_tool_tips boolean

-
-
-
-
-

gimp_show_help_button ()

-
gboolean
-gimp_show_help_button (void);
-

Returns whether or not GimpDialog should automatically add a help -button if help_func and help_id are given.

-

This is a constant value given at plug-in configuration time.

-
-

Returns

-

the show_help_button boolean

-
-

Since: GIMP 2.2

-
-
-
-

gimp_check_size ()

-
GimpCheckSize
-gimp_check_size (void);
-

Returns the size of the checkerboard to be used in previews.

-

This is a constant value given at plug-in configuration time.

-
-

Returns

-

the check_size value

-
-

Since: GIMP 2.2

-
-
-
-

gimp_check_type ()

-
GimpCheckType
-gimp_check_type (void);
-

Returns the type of the checkerboard to be used in previews.

-

This is a constant value given at plug-in configuration time.

-
-

Returns

-

the check_type value

-
-

Since: GIMP 2.2

-
-
-
-

gimp_default_display ()

-
gint32
-gimp_default_display (void);
-

Returns the default display ID. This corresponds to the display the -running procedure's menu entry was invoked from.

-

This is a constant value given at plug-in configuration time.

-
-

Returns

-

the default display ID

-
-
-
-
-

gimp_wm_class ()

-
const gchar *
-gimp_wm_class (void);
-

Returns the window manager class to be used for plug-in windows.

-

This is a constant value given at plug-in configuration time.

-
-

Returns

-

the window manager class

-
-
-
-
-

gimp_display_name ()

-
const gchar *
-gimp_display_name (void);
-

Returns the display to be used for plug-in windows.

-

This is a constant value given at plug-in configuration time. -Will return NULL if GIMP has been started with no GUI, either -via "--no-interface" flag, or a console build.

-
-

Returns

-

the display name

-
-
-
-
-

gimp_monitor_number ()

-
gint
-gimp_monitor_number (void);
-

Returns the monitor number to be used for plug-in windows.

-

This is a constant value given at plug-in configuration time.

-
-

Returns

-

the monitor number

-
-
-
-
-

gimp_user_time ()

-
guint32
-gimp_user_time (void);
-

Returns the timestamp of the user interaction that should be set on -the plug-in window. This is handled transparently, plug-in authors -do not have to care about it.

-

This is a constant value given at plug-in configuration time.

-
-

Returns

-

timestamp for plug-in window

-
-

Since: GIMP 2.6

-
-
-
-

gimp_get_progname ()

-
const gchar *
-gimp_get_progname (void);
-

Returns the plug-in's executable name.

-
-

Returns

-

the executable name

-
-
-
-
-

gimp_extension_enable ()

-
void
-gimp_extension_enable (void);
-

Enables asynchronous processing of messages from the main GIMP -application.

-

Normally, a plug-in is not called by GIMP except for the call to -the procedure it implements. All subsequent communication is -triggered by the plug-in and all messages sent from GIMP to the -plug-in are just answers to requests the plug-in made.

-

If the plug-in however registered temporary procedures using -gimp_install_temp_proc(), it needs to be able to receive requests -to execute them. Usually this will be done by running -gimp_extension_process() in an endless loop.

-

If the plug-in cannot use gimp_extension_process(), i.e. if it has -a GUI and is hanging around in a GMainLoop, it must call -gimp_extension_enable().

-

Note that the plug-in does not need to be a GIMP_EXTENSION to -register temporary procedures.

-

See also: gimp_install_procedure(), gimp_install_temp_proc()

-
-
-
-

gimp_extension_ack ()

-
void
-gimp_extension_ack (void);
-

Notify the main GIMP application that the extension has been properly -initialized and is ready to run.

-

This function must be called from every -procedure that was registered as GIMP_EXTENSION.

-

Subsequently, extensions can process temporary procedure run -requests using either gimp_extension_enable() or -gimp_extension_process().

-

See also: gimp_install_procedure(), gimp_install_temp_proc()

-
-
-
-

gimp_extension_process ()

-
void
-gimp_extension_process (guint timeout);
-

Processes one message sent by GIMP and returns.

-

Call this function in an endless loop after calling -gimp_extension_ack() to process requests for running temporary -procedures.

-

See gimp_extension_enable() for an asynchronous way of doing the -same if running an endless loop is not an option.

-

See also: gimp_install_procedure(), gimp_install_temp_proc()

-
-

Parameters

-
----- - - - - - -

timeout

The timeout (in ms) to use for the select() call.

 
-
-
-
-
-

gimp_attach_parasite ()

-
gboolean
-gimp_attach_parasite (const GimpParasite *parasite);
-

Add a global parasite.

-

This procedure attaches a global parasite. It has no return values.

-
-

Parameters

-
----- - - - - - -

parasite

The parasite to attach.

 
-
-
-

Returns

-

TRUE on success.

-
-

Since: GIMP 2.8

-
-
-
-

gimp_detach_parasite ()

-
gboolean
-gimp_detach_parasite (const gchar *name);
-

Removes a global parasite.

-

This procedure detaches a global parasite from. It has no return -values.

-
-

Parameters

-
----- - - - - - -

name

The name of the parasite to detach.

 
-
-
-

Returns

-

TRUE on success.

-
-

Since: GIMP 2.8

-
-
-
-

gimp_parasite_find ()

-
GimpParasite *
-gimp_parasite_find (const gchar *name);
-
-

gimp_parasite_find is deprecated and should not be used in newly-written code.

-

Use gimp_get_parasite() instead.

-
-
-

Parameters

-
----- - - - - - -

name

The name of the parasite to find.

 
-
-
-

Returns

-

The found parasite.

-
-
-
-
-

gimp_parasite_list ()

-
gboolean
-gimp_parasite_list (gint *num_parasites,
-                    gchar ***parasites);
-
-

gimp_parasite_list is deprecated and should not be used in newly-written code.

-

Use gimp_get_parasite_list() instead.

-
-
-

Parameters

-
----- - - - - - - - - - - - - -

num_parasites

The number of attached parasites.

 

parasites

The names of currently attached parasites.

 
-
-
-

Returns

-

TRUE on success.

-
-
-
-
-

gimp_get_parasite ()

-
GimpParasite *
-gimp_get_parasite (const gchar *name);
-

Look up a global parasite.

-

Finds and returns the global parasite that was previously attached.

-
-

Parameters

-
----- - - - - - -

name

The name of the parasite to find.

 
-
-
-

Returns

-

The found parasite.

-
-

Since: GIMP 2.8

-
-
-
-

gimp_get_parasite_list ()

-
gchar **
-gimp_get_parasite_list (gint *num_parasites);
-

List all parasites.

-

Returns a list of all currently attached global parasites.

-
-

Parameters

-
----- - - - - - -

num_parasites

The number of attached parasites.

 
-
-
-

Returns

-

The names of currently attached parasites.

-
-

Since: GIMP 2.8

-
-
-
-

gimp_parasite_attach ()

-
gboolean
-gimp_parasite_attach (const GimpParasite *parasite);
-
-

gimp_parasite_attach is deprecated and should not be used in newly-written code.

-

Use gimp_attach_parasite() instead.

-
-
-

Parameters

-
----- - - - - - -

parasite

The parasite to attach.

 
-
-
-

Returns

-

TRUE on success.

-
-
-
-
-

gimp_parasite_detach ()

-
gboolean
-gimp_parasite_detach (const gchar *name);
-
-

gimp_parasite_detach is deprecated and should not be used in newly-written code.

-

Use gimp_detach_parasite() instead.

-
-
-

Parameters

-
----- - - - - - -

name

The name of the parasite to detach.

 
-
-
-

Returns

-

TRUE on success.

-
-
-
-
-

gimp_attach_new_parasite ()

-
gboolean
-gimp_attach_new_parasite (const gchar *name,
-                          gint flags,
-                          gint size,
-                          gconstpointer data);
-
-

gimp_attach_new_parasite is deprecated and should not be used in newly-written code.

-

Use gimp_attach_parasite() instead.

-
-

Convenience function that creates a parasite and attaches it -to GIMP.

-
-

Parameters

-
----- - - - - - - - - - - - - - - - - - - - - - - -

name

the name of the GimpParasite to create and attach.

 

flags

the flags set on the GimpParasite.

 

size

the size of the parasite data in bytes.

 

data

a pointer to the data attached with the GimpParasite.

 
-
-
-

Returns

-

TRUE on successful creation and attachment of -the new parasite.

-

See Also: gimp_attach_parasite()

-
-
-
-
-

Types and Values

-
-

gimp_get_data

-
#define gimp_get_data         gimp_procedural_db_get_data
-
-
-
-
-

gimp_get_data_size

-
#define gimp_get_data_size    gimp_procedural_db_get_data_size
-
-
-
-
-

gimp_set_data

-
#define gimp_set_data         gimp_procedural_db_set_data
-
-
-
-
-

GimpPlugInInfo

-
typedef struct {
-  GimpInitProc  init_proc;
-  GimpQuitProc  quit_proc;
-  GimpQueryProc query_proc;
-  GimpRunProc   run_proc;
-} GimpPlugInInfo;
-
-
-

Members

-
----- - - - - - - - - - - - - - - - - - - - - - - -

GimpInitProc init_proc;

called when the gimp application initially starts up

 

GimpQuitProc quit_proc;

called when the gimp application exits

 

GimpQueryProc query_proc;

called by gimp so that the plug-in can inform the -gimp of what it does. (ie. installing a procedure database -procedure).

 

GimpRunProc run_proc;

called to run a procedure the plug-in installed in the -procedure database.

 
-
-
-
-
-

GimpParamDef

-
typedef struct {
-  GimpPDBArgType  type;
-  gchar          *name;
-  gchar          *description;
-} GimpParamDef;
-
-
-
-
-

GimpParamRegion

-
typedef struct {
-  gint32 x;
-  gint32 y;
-  gint32 width;
-  gint32 height;
-} GimpParamRegion;
-
-
-
-
-

GimpParamData

-
-
-
-

GimpParam

-
typedef struct {
-  GimpPDBArgType type;
-  GimpParamData  data;
-} GimpParam;
-
-
-
-
-
-
Generated by GTK-Doc V1.25
- - \ No newline at end of file diff -Nru gimp-2.8.18/devel-docs/libgimp/html/libgimp-gimpproceduraldb.html gimp-2.8.20/devel-docs/libgimp/html/libgimp-gimpproceduraldb.html --- gimp-2.8.18/devel-docs/libgimp/html/libgimp-gimpproceduraldb.html 2016-07-13 01:02:11.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimp/html/libgimp-gimpproceduraldb.html 2017-02-01 06:04:36.000000000 +0000 @@ -187,8 +187,8 @@ GimpPDBProcType *proc_type, gint *num_args, gint *num_values, - GimpParamDef **args, - GimpParamDef **return_vals); + GimpParamDef **args, + GimpParamDef **return_vals);
diff -Nru gimp-2.8.18/devel-docs/libgimp/html/libgimp-GimpProcView.html gimp-2.8.20/devel-docs/libgimp/html/libgimp-GimpProcView.html --- gimp-2.8.18/devel-docs/libgimp/html/libgimp-GimpProcView.html 2016-07-13 01:02:11.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimp/html/libgimp-GimpProcView.html 2017-02-01 06:04:36.000000000 +0000 @@ -66,8 +66,8 @@ GimpPDBProcType type, gint n_params, gint n_return_vals, - const GimpParamDef *params, - const GimpParamDef *return_vals); + const GimpParamDef *params, + const GimpParamDef *return_vals);

Since: GIMP 2.4

diff -Nru gimp-2.8.18/devel-docs/libgimp/html/libgimp.html gimp-2.8.20/devel-docs/libgimp/html/libgimp.html --- gimp-2.8.18/devel-docs/libgimp/html/libgimp.html 2016-07-13 01:02:11.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimp/html/libgimp.html 2017-02-01 06:04:35.000000000 +0000 @@ -35,8 +35,7 @@
Functions not Related to Specific Images
-Gimp — Main functions needed for building a GIMP plug-in. - This header includes all other GIMP Library headers. +gimp — Miscellaneous procedures
gimpenums — Enums and definitions. diff -Nru gimp-2.8.18/devel-docs/libgimp/html/libgimp-index-deprecated.html gimp-2.8.20/devel-docs/libgimp/html/libgimp-index-deprecated.html --- gimp-2.8.18/devel-docs/libgimp/html/libgimp-index-deprecated.html 2016-07-13 01:02:11.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimp/html/libgimp-index-deprecated.html 2017-02-01 06:04:35.000000000 +0000 @@ -24,7 +24,7 @@

A

-
gimp_attach_new_parasite, gimp_attach_new_parasite () +
gimp_attach_new_parasite, gimp_attach_new_parasite ()
@@ -268,7 +268,7 @@
gimp_image_set_cmap, gimp_image_set_cmap ()
-
gimp_install_cmap, gimp_install_cmap () +
gimp_install_cmap, gimp_install_cmap ()
@@ -296,7 +296,7 @@
GimpMenuCallback, GimpMenuCallback ()
-
gimp_min_colors, gimp_min_colors () +
gimp_min_colors, gimp_min_colors ()
@@ -327,13 +327,13 @@
gimp_palette_swap_colors, gimp_palette_swap_colors ()
-
gimp_parasite_attach, gimp_parasite_attach () +
gimp_parasite_attach, gimp_parasite_attach ()
-
gimp_parasite_detach, gimp_parasite_detach () +
gimp_parasite_detach, gimp_parasite_detach ()
-
gimp_parasite_find, gimp_parasite_find () +
gimp_parasite_find, gimp_parasite_find ()
-
gimp_parasite_list, gimp_parasite_list () +
gimp_parasite_list, gimp_parasite_list ()
gimp_path_delete, gimp_path_delete ()
diff -Nru gimp-2.8.18/devel-docs/libgimp/html/libgimp-index.html gimp-2.8.20/devel-docs/libgimp/html/libgimp-index.html --- gimp-2.8.18/devel-docs/libgimp/html/libgimp-index.html 2016-07-13 01:02:11.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimp/html/libgimp-index.html 2017-02-01 06:04:35.000000000 +0000 @@ -36,9 +36,9 @@
gimp_aspect_preview_new, gimp_aspect_preview_new ()
-
gimp_attach_new_parasite, gimp_attach_new_parasite () +
gimp_attach_new_parasite, gimp_attach_new_parasite ()
-
gimp_attach_parasite, gimp_attach_parasite () +
gimp_attach_parasite, gimp_attach_parasite ()
@@ -202,9 +202,9 @@
gimp_channel_set_show_masked, gimp_channel_set_show_masked ()
-
gimp_check_size, gimp_check_size () +
gimp_check_size, gimp_check_size ()
-
gimp_check_type, gimp_check_type () +
gimp_check_type, gimp_check_type ()
gimp_clone, gimp_clone ()
@@ -387,17 +387,17 @@

D

-
gimp_default_display, gimp_default_display () +
gimp_default_display, gimp_default_display ()
gimp_desaturate, gimp_desaturate ()
gimp_desaturate_full, gimp_desaturate_full ()
-
gimp_destroy_paramdefs, gimp_destroy_paramdefs () +
gimp_destroy_paramdefs, gimp_destroy_paramdefs ()
-
gimp_destroy_params, gimp_destroy_params () +
gimp_destroy_params, gimp_destroy_params ()
-
gimp_detach_parasite, gimp_detach_parasite () +
gimp_detach_parasite, gimp_detach_parasite ()
gimp_displays_flush, gimp_displays_flush ()
@@ -409,7 +409,7 @@
gimp_display_is_valid, gimp_display_is_valid ()
-
gimp_display_name, gimp_display_name () +
gimp_display_name, gimp_display_name ()
gimp_display_new, gimp_display_new ()
@@ -636,11 +636,11 @@
gimp_export_image, gimp_export_image ()
-
gimp_extension_ack, gimp_extension_ack () +
gimp_extension_ack, gimp_extension_ack ()
-
gimp_extension_enable, gimp_extension_enable () +
gimp_extension_enable, gimp_extension_enable ()
-
gimp_extension_process, gimp_extension_process () +
gimp_extension_process, gimp_extension_process ()
@@ -718,15 +718,15 @@

G

-
gimp_gamma, gimp_gamma () +
gimp_gamma, gimp_gamma ()
-
gimp_getpid, gimp_getpid () +
gimp_getpid, gimp_getpid ()
gimp_get_color_configuration, gimp_get_color_configuration ()
-
gimp_get_data, gimp_get_data +
gimp_get_data, gimp_get_data
-
gimp_get_data_size, gimp_get_data_size +
gimp_get_data_size, gimp_get_data_size
gimp_get_default_comment, gimp_get_default_comment ()
@@ -736,15 +736,15 @@
gimp_get_monitor_resolution, gimp_get_monitor_resolution ()
-
gimp_get_parasite, gimp_get_parasite () +
gimp_get_parasite, gimp_get_parasite ()
-
gimp_get_parasite_list, gimp_get_parasite_list () +
gimp_get_parasite_list, gimp_get_parasite_list ()
gimp_get_path_by_tattoo, gimp_get_path_by_tattoo ()
-
gimp_get_pdb_error, gimp_get_pdb_error () +
gimp_get_pdb_error, gimp_get_pdb_error ()
-
gimp_get_progname, gimp_get_progname () +
gimp_get_progname, gimp_get_progname ()
gimp_get_theme_dir, gimp_get_theme_dir ()
@@ -1168,15 +1168,15 @@
gimp_image_width, gimp_image_width ()
-
GimpInitProc, GimpInitProc () +
GimpInitProc, GimpInitProc ()
GimpInkBlobType, enum GimpInkBlobType
-
gimp_install_cmap, gimp_install_cmap () +
gimp_install_cmap, gimp_install_cmap ()
-
gimp_install_procedure, gimp_install_procedure () +
gimp_install_procedure, gimp_install_procedure ()
-
gimp_install_temp_proc, gimp_install_temp_proc () +
gimp_install_temp_proc, gimp_install_temp_proc ()
gimp_invert, gimp_invert ()
@@ -1348,9 +1348,9 @@

M

-
MAIN, MAIN +
MAIN, MAIN
-
gimp_main, gimp_main () +
gimp_main, gimp_main ()
GimpMaskApplyMode, enum GimpMaskApplyMode
@@ -1364,9 +1364,9 @@
gimp_message_set_handler, gimp_message_set_handler ()
-
gimp_min_colors, gimp_min_colors () +
gimp_min_colors, gimp_min_colors ()
-
gimp_monitor_number, gimp_monitor_number () +
gimp_monitor_number, gimp_monitor_number ()
@@ -1468,21 +1468,21 @@
gimp_palette_swap_colors, gimp_palette_swap_colors ()
-
GimpParam, GimpParam +
GimpParam, GimpParam
-
GimpParamData, GimpParamData +
GimpParamData, GimpParamData
-
GimpParamDef, GimpParamDef +
GimpParamDef, GimpParamDef
-
GimpParamRegion, GimpParamRegion +
GimpParamRegion, GimpParamRegion
-
gimp_parasite_attach, gimp_parasite_attach () +
gimp_parasite_attach, gimp_parasite_attach ()
-
gimp_parasite_detach, gimp_parasite_detach () +
gimp_parasite_detach, gimp_parasite_detach ()
-
gimp_parasite_find, gimp_parasite_find () +
gimp_parasite_find, gimp_parasite_find ()
-
gimp_parasite_list, gimp_parasite_list () +
gimp_parasite_list, gimp_parasite_list ()
gimp_path_delete, gimp_path_delete ()
@@ -1606,7 +1606,7 @@
gimp_pixel_rgn_set_row, gimp_pixel_rgn_set_row ()
-
GimpPlugInInfo, GimpPlugInInfo +
GimpPlugInInfo, GimpPlugInInfo
gimp_plugin_domain_register, gimp_plugin_domain_register ()
@@ -1699,11 +1699,11 @@

Q

-
GimpQueryProc, GimpQueryProc () +
GimpQueryProc, GimpQueryProc ()
-
gimp_quit, gimp_quit () +
gimp_quit, gimp_quit ()
-
GimpQuitProc, GimpQuitProc () +
GimpQuitProc, GimpQuitProc ()
@@ -1764,11 +1764,11 @@
GimpRunPatternCallback, GimpRunPatternCallback ()
-
GimpRunProc, GimpRunProc () +
GimpRunProc, GimpRunProc ()
-
gimp_run_procedure, gimp_run_procedure () +
gimp_run_procedure, gimp_run_procedure ()
-
gimp_run_procedure2, gimp_run_procedure2 () +
gimp_run_procedure2, gimp_run_procedure2 ()
@@ -1819,17 +1819,17 @@
gimp_select_button_close_popup, gimp_select_button_close_popup ()
-
gimp_set_data, gimp_set_data +
gimp_set_data, gimp_set_data
gimp_shear, gimp_shear ()
-
gimp_shm_addr, gimp_shm_addr () +
gimp_shm_addr, gimp_shm_addr ()
-
gimp_shm_ID, gimp_shm_ID () +
gimp_shm_ID, gimp_shm_ID ()
-
gimp_show_help_button, gimp_show_help_button () +
gimp_show_help_button, gimp_show_help_button ()
-
gimp_show_tool_tips, gimp_show_tool_tips () +
gimp_show_tool_tips, gimp_show_tool_tips ()
gimp_smudge, gimp_smudge ()
@@ -1922,7 +1922,7 @@
gimp_tile_flush, gimp_tile_flush ()
-
gimp_tile_height, gimp_tile_height () +
gimp_tile_height, gimp_tile_height ()
gimp_tile_ref, gimp_tile_ref ()
@@ -1930,7 +1930,7 @@
gimp_tile_unref, gimp_tile_unref ()
-
gimp_tile_width, gimp_tile_width () +
gimp_tile_width, gimp_tile_width ()
gimp_transform_2d, gimp_transform_2d ()
@@ -1945,9 +1945,9 @@
gimp_ui_init, gimp_ui_init ()
-
gimp_uninstall_temp_proc, gimp_uninstall_temp_proc () +
gimp_uninstall_temp_proc, gimp_uninstall_temp_proc ()
-
gimp_user_time, gimp_user_time () +
gimp_user_time, gimp_user_time ()
@@ -2040,7 +2040,7 @@
gimp_vectors_to_selection, gimp_vectors_to_selection (), gimp_vectors_to_selection ()
-
gimp_version, gimp_version () +
gimp_version, gimp_version ()
@@ -2051,7 +2051,7 @@
gimp_window_set_transient_for_display, gimp_window_set_transient_for_display ()
-
gimp_wm_class, gimp_wm_class () +
gimp_wm_class, gimp_wm_class ()
diff -Nru gimp-2.8.18/devel-docs/libgimp/html/libgimp-index-new-in-2-2.html gimp-2.8.20/devel-docs/libgimp/html/libgimp-index-new-in-2-2.html --- gimp-2.8.18/devel-docs/libgimp/html/libgimp-index-new-in-2-2.html 2016-07-13 01:02:11.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimp/html/libgimp-index-new-in-2-2.html 2017-02-01 06:04:35.000000000 +0000 @@ -52,9 +52,9 @@
gimp_channel_combo_box_new, gimp_channel_combo_box_new ()
-
gimp_check_size, gimp_check_size () +
gimp_check_size, gimp_check_size ()
-
gimp_check_type, gimp_check_type () +
gimp_check_type, gimp_check_type ()
gimp_colorize, gimp_colorize ()
@@ -311,7 +311,7 @@

S

-
gimp_show_help_button, gimp_show_help_button () +
gimp_show_help_button, gimp_show_help_button ()
diff -Nru gimp-2.8.18/devel-docs/libgimp/html/libgimp-index-new-in-2-4.html gimp-2.8.20/devel-docs/libgimp/html/libgimp-index-new-in-2-4.html --- gimp-2.8.18/devel-docs/libgimp/html/libgimp-index-new-in-2-4.html 2016-07-13 01:02:11.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimp/html/libgimp-index-new-in-2-4.html 2017-02-01 06:04:35.000000000 +0000 @@ -170,7 +170,7 @@

G

-
gimp_getpid, gimp_getpid () +
gimp_getpid, gimp_getpid ()
gimp_get_color_configuration, gimp_get_color_configuration ()
diff -Nru gimp-2.8.18/devel-docs/libgimp/html/libgimp-index-new-in-2-6.html gimp-2.8.20/devel-docs/libgimp/html/libgimp-index-new-in-2-6.html --- gimp-2.8.18/devel-docs/libgimp/html/libgimp-index-new-in-2-6.html 2016-07-13 01:02:11.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimp/html/libgimp-index-new-in-2-6.html 2017-02-01 06:04:35.000000000 +0000 @@ -35,7 +35,7 @@

G

-
gimp_get_pdb_error, gimp_get_pdb_error () +
gimp_get_pdb_error, gimp_get_pdb_error ()
gimp_gradient_get_number_of_segments, gimp_gradient_get_number_of_segments ()
@@ -131,7 +131,7 @@

U

-
gimp_user_time, gimp_user_time () +
gimp_user_time, gimp_user_time ()
diff -Nru gimp-2.8.18/devel-docs/libgimp/html/libgimp-index-new-in-2-8.html gimp-2.8.20/devel-docs/libgimp/html/libgimp-index-new-in-2-8.html --- gimp-2.8.18/devel-docs/libgimp/html/libgimp-index-new-in-2-8.html 2016-07-13 01:02:11.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimp/html/libgimp-index-new-in-2-8.html 2017-02-01 06:04:35.000000000 +0000 @@ -25,7 +25,7 @@

A

-
gimp_attach_parasite, gimp_attach_parasite () +
gimp_attach_parasite, gimp_attach_parasite ()
@@ -136,7 +136,7 @@

D

-
gimp_detach_parasite, gimp_detach_parasite () +
gimp_detach_parasite, gimp_detach_parasite ()
gimp_dynamics_get_list, gimp_dynamics_get_list ()
@@ -156,9 +156,9 @@

G

-
gimp_get_parasite, gimp_get_parasite () +
gimp_get_parasite, gimp_get_parasite ()
-
gimp_get_parasite_list, gimp_get_parasite_list () +
gimp_get_parasite_list, gimp_get_parasite_list ()
Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimp/html/right-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimp/html/right-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimp/html/right.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimp/html/right.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimp/html/up-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimp/html/up-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimp/html/up.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimp/html/up.png differ diff -Nru gimp-2.8.18/devel-docs/libgimp/Makefile.in gimp-2.8.20/devel-docs/libgimp/Makefile.in --- gimp-2.8.18/devel-docs/libgimp/Makefile.in 2016-07-12 23:20:00.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimp/Makefile.in 2017-01-31 23:40:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,23 +20,61 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,28 +93,39 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/version.in $(top_srcdir)/gtk-doc.make subdir = devel-docs/libgimp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -85,6 +133,9 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/version.in \ + $(top_srcdir)/gtk-doc.make DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -578,7 +629,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/libgimp/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu devel-docs/libgimp/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -587,7 +637,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/gtk-doc.make: +$(top_srcdir)/gtk-doc.make $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -605,11 +655,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -751,18 +801,20 @@ .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distclean-local distdir \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic \ + clean-libtool clean-local cscopelist-am ctags-am dist-hook \ + distclean distclean-generic distclean-libtool distclean-local \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-data-local \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-local + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-local + +.PRECIOUS: Makefile gtkdoc-check.test: Makefile Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpbase/html/home.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpbase/html/home.png differ diff -Nru gimp-2.8.18/devel-docs/libgimpbase/html/index.html gimp-2.8.20/devel-docs/libgimpbase/html/index.html --- gimp-2.8.18/devel-docs/libgimpbase/html/index.html 2016-07-13 01:02:03.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimpbase/html/index.html 2017-02-01 06:04:29.000000000 +0000 @@ -15,7 +15,7 @@

- for GIMP 2.8.18 + for GIMP 2.8.20

Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpbase/html/left-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpbase/html/left-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpbase/html/left.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpbase/html/left.png differ diff -Nru gimp-2.8.18/devel-docs/libgimpbase/html/libgimpbase-gimpversion.html gimp-2.8.20/devel-docs/libgimpbase/html/libgimpbase-gimpversion.html --- gimp-2.8.18/devel-docs/libgimpbase/html/libgimpbase-gimpversion.html 2016-07-13 01:02:04.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimpbase/html/libgimpbase-gimpversion.html 2017-02-01 06:04:30.000000000 +0000 @@ -124,14 +124,14 @@

GIMP_MICRO_VERSION

-
#define GIMP_MICRO_VERSION                              (18)
+
#define GIMP_MICRO_VERSION                              (20)
 

 
The micro GIMP version number.

GIMP_VERSION

-
#define GIMP_VERSION                                    "2.8.18"
+
#define GIMP_VERSION                                    "2.8.20"
 

 
The GIMP version as a string.
Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpbase/html/right-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpbase/html/right-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpbase/html/right.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpbase/html/right.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpbase/html/up-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpbase/html/up-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpbase/html/up.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpbase/html/up.png differ diff -Nru gimp-2.8.18/devel-docs/libgimpbase/Makefile.in gimp-2.8.20/devel-docs/libgimpbase/Makefile.in --- gimp-2.8.18/devel-docs/libgimpbase/Makefile.in 2016-07-12 23:20:00.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimpbase/Makefile.in 2017-01-31 23:40:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,23 +20,61 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,28 +93,39 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/version.in $(top_srcdir)/gtk-doc.make subdir = devel-docs/libgimpbase ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -85,6 +133,9 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/version.in \ + $(top_srcdir)/gtk-doc.make DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -564,7 +615,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/libgimpbase/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu devel-docs/libgimpbase/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -573,7 +623,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/gtk-doc.make: +$(top_srcdir)/gtk-doc.make $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -591,11 +641,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -737,18 +787,20 @@ .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distclean-local distdir \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic \ + clean-libtool clean-local cscopelist-am ctags-am dist-hook \ + distclean distclean-generic distclean-libtool distclean-local \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-data-local \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-local + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-local + +.PRECIOUS: Makefile gtkdoc-check.test: Makefile Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpcolor/html/home.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpcolor/html/home.png differ diff -Nru gimp-2.8.18/devel-docs/libgimpcolor/html/index.html gimp-2.8.20/devel-docs/libgimpcolor/html/index.html --- gimp-2.8.18/devel-docs/libgimpcolor/html/index.html 2016-07-13 01:02:04.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimpcolor/html/index.html 2017-02-01 06:04:30.000000000 +0000 @@ -15,7 +15,7 @@

- for GIMP 2.8.18 + for GIMP 2.8.20

Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpcolor/html/left-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpcolor/html/left-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpcolor/html/left.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpcolor/html/left.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpcolor/html/right-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpcolor/html/right-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpcolor/html/right.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpcolor/html/right.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpcolor/html/up-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpcolor/html/up-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpcolor/html/up.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpcolor/html/up.png differ diff -Nru gimp-2.8.18/devel-docs/libgimpcolor/Makefile.in gimp-2.8.20/devel-docs/libgimpcolor/Makefile.in --- gimp-2.8.18/devel-docs/libgimpcolor/Makefile.in 2016-07-12 23:20:01.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimpcolor/Makefile.in 2017-01-31 23:40:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,23 +20,61 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,28 +93,39 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/version.in $(top_srcdir)/gtk-doc.make subdir = devel-docs/libgimpcolor ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -85,6 +133,9 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/version.in \ + $(top_srcdir)/gtk-doc.make DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -557,7 +608,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/libgimpcolor/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu devel-docs/libgimpcolor/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -566,7 +616,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/gtk-doc.make: +$(top_srcdir)/gtk-doc.make $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -584,11 +634,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -730,18 +780,20 @@ .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distclean-local distdir \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic \ + clean-libtool clean-local cscopelist-am ctags-am dist-hook \ + distclean distclean-generic distclean-libtool distclean-local \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-data-local \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-local + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-local + +.PRECIOUS: Makefile gtkdoc-check.test: Makefile Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpconfig/html/home.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpconfig/html/home.png differ diff -Nru gimp-2.8.18/devel-docs/libgimpconfig/html/index.html gimp-2.8.20/devel-docs/libgimpconfig/html/index.html --- gimp-2.8.18/devel-docs/libgimpconfig/html/index.html 2016-07-13 01:02:05.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimpconfig/html/index.html 2017-02-01 06:04:31.000000000 +0000 @@ -15,7 +15,7 @@

- for GIMP 2.8.18 + for GIMP 2.8.20

Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpconfig/html/left-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpconfig/html/left-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpconfig/html/left.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpconfig/html/left.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpconfig/html/right-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpconfig/html/right-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpconfig/html/right.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpconfig/html/right.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpconfig/html/up-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpconfig/html/up-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpconfig/html/up.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpconfig/html/up.png differ diff -Nru gimp-2.8.18/devel-docs/libgimpconfig/Makefile.in gimp-2.8.20/devel-docs/libgimpconfig/Makefile.in --- gimp-2.8.18/devel-docs/libgimpconfig/Makefile.in 2016-07-12 23:20:01.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimpconfig/Makefile.in 2017-01-31 23:40:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,23 +20,61 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,28 +93,39 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/version.in $(top_srcdir)/gtk-doc.make subdir = devel-docs/libgimpconfig ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -85,6 +133,9 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/version.in \ + $(top_srcdir)/gtk-doc.make DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -570,7 +621,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/libgimpconfig/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu devel-docs/libgimpconfig/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -579,7 +629,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/gtk-doc.make: +$(top_srcdir)/gtk-doc.make $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -597,11 +647,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -743,18 +793,20 @@ .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distclean-local distdir \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic \ + clean-libtool clean-local cscopelist-am ctags-am dist-hook \ + distclean distclean-generic distclean-libtool distclean-local \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-data-local \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-local + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-local + +.PRECIOUS: Makefile gtkdoc-check.test: Makefile Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpmath/html/home.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpmath/html/home.png differ diff -Nru gimp-2.8.18/devel-docs/libgimpmath/html/index.html gimp-2.8.20/devel-docs/libgimpmath/html/index.html --- gimp-2.8.18/devel-docs/libgimpmath/html/index.html 2016-07-13 01:02:06.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimpmath/html/index.html 2017-02-01 06:04:31.000000000 +0000 @@ -15,7 +15,7 @@

- for GIMP 2.8.18 + for GIMP 2.8.20

Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpmath/html/left-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpmath/html/left-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpmath/html/left.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpmath/html/left.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpmath/html/right-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpmath/html/right-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpmath/html/right.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpmath/html/right.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpmath/html/up-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpmath/html/up-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpmath/html/up.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpmath/html/up.png differ diff -Nru gimp-2.8.18/devel-docs/libgimpmath/Makefile.in gimp-2.8.20/devel-docs/libgimpmath/Makefile.in --- gimp-2.8.18/devel-docs/libgimpmath/Makefile.in 2016-07-12 23:20:02.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimpmath/Makefile.in 2017-01-31 23:40:32.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,23 +20,61 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,28 +93,39 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/version.in $(top_srcdir)/gtk-doc.make subdir = devel-docs/libgimpmath ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -85,6 +133,9 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/version.in \ + $(top_srcdir)/gtk-doc.make DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -557,7 +608,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/libgimpmath/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu devel-docs/libgimpmath/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -566,7 +616,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/gtk-doc.make: +$(top_srcdir)/gtk-doc.make $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -584,11 +634,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -730,18 +780,20 @@ .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distclean-local distdir \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic \ + clean-libtool clean-local cscopelist-am ctags-am dist-hook \ + distclean distclean-generic distclean-libtool distclean-local \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-data-local \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-local + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-local + +.PRECIOUS: Makefile gtkdoc-check.test: Makefile Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpmodule/html/home.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpmodule/html/home.png differ diff -Nru gimp-2.8.18/devel-docs/libgimpmodule/html/index.html gimp-2.8.20/devel-docs/libgimpmodule/html/index.html --- gimp-2.8.18/devel-docs/libgimpmodule/html/index.html 2016-07-13 01:02:07.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimpmodule/html/index.html 2017-02-01 06:04:32.000000000 +0000 @@ -15,7 +15,7 @@

- for GIMP 2.8.18 + for GIMP 2.8.20

Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpmodule/html/left-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpmodule/html/left-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpmodule/html/left.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpmodule/html/left.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpmodule/html/right-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpmodule/html/right-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpmodule/html/right.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpmodule/html/right.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpmodule/html/up-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpmodule/html/up-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpmodule/html/up.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpmodule/html/up.png differ diff -Nru gimp-2.8.18/devel-docs/libgimpmodule/Makefile.in gimp-2.8.20/devel-docs/libgimpmodule/Makefile.in --- gimp-2.8.18/devel-docs/libgimpmodule/Makefile.in 2016-07-12 23:20:02.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimpmodule/Makefile.in 2017-01-31 23:40:32.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,23 +20,61 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,28 +93,39 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/version.in $(top_srcdir)/gtk-doc.make subdir = devel-docs/libgimpmodule ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -85,6 +133,9 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/version.in \ + $(top_srcdir)/gtk-doc.make DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -567,7 +618,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/libgimpmodule/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu devel-docs/libgimpmodule/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -576,7 +626,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/gtk-doc.make: +$(top_srcdir)/gtk-doc.make $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -594,11 +644,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -740,18 +790,20 @@ .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distclean-local distdir \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic \ + clean-libtool clean-local cscopelist-am ctags-am dist-hook \ + distclean distclean-generic distclean-libtool distclean-local \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-data-local \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-local + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-local + +.PRECIOUS: Makefile gtkdoc-check.test: Makefile Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpthumb/html/home.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpthumb/html/home.png differ diff -Nru gimp-2.8.18/devel-docs/libgimpthumb/html/index.html gimp-2.8.20/devel-docs/libgimpthumb/html/index.html --- gimp-2.8.18/devel-docs/libgimpthumb/html/index.html 2016-07-13 01:02:08.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimpthumb/html/index.html 2017-02-01 06:04:33.000000000 +0000 @@ -15,7 +15,7 @@

- for GIMP 2.8.18 + for GIMP 2.8.20

Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpthumb/html/left-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpthumb/html/left-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpthumb/html/left.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpthumb/html/left.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpthumb/html/right-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpthumb/html/right-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpthumb/html/right.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpthumb/html/right.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpthumb/html/up-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpthumb/html/up-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpthumb/html/up.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpthumb/html/up.png differ diff -Nru gimp-2.8.18/devel-docs/libgimpthumb/Makefile.in gimp-2.8.20/devel-docs/libgimpthumb/Makefile.in --- gimp-2.8.18/devel-docs/libgimpthumb/Makefile.in 2016-07-12 23:20:02.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimpthumb/Makefile.in 2017-01-31 23:40:33.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,23 +20,61 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,28 +93,39 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/version.in $(top_srcdir)/gtk-doc.make subdir = devel-docs/libgimpthumb ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -85,6 +133,9 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/version.in \ + $(top_srcdir)/gtk-doc.make DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -566,7 +617,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/libgimpthumb/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu devel-docs/libgimpthumb/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -575,7 +625,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/gtk-doc.make: +$(top_srcdir)/gtk-doc.make $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -593,11 +643,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -739,18 +789,20 @@ .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distclean-local distdir \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic \ + clean-libtool clean-local cscopelist-am ctags-am dist-hook \ + distclean distclean-generic distclean-libtool distclean-local \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-data-local \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-local + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-local + +.PRECIOUS: Makefile gtkdoc-check.test: Makefile Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpwidgets/html/home.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpwidgets/html/home.png differ diff -Nru gimp-2.8.18/devel-docs/libgimpwidgets/html/index.html gimp-2.8.20/devel-docs/libgimpwidgets/html/index.html --- gimp-2.8.18/devel-docs/libgimpwidgets/html/index.html 2016-07-13 01:02:09.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimpwidgets/html/index.html 2017-02-01 06:04:34.000000000 +0000 @@ -15,7 +15,7 @@

- for GIMP 2.8.18 + for GIMP 2.8.20

Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpwidgets/html/left-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpwidgets/html/left-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpwidgets/html/left.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpwidgets/html/left.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpwidgets/html/right-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpwidgets/html/right-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpwidgets/html/right.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpwidgets/html/right.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpwidgets/html/up-insensitive.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpwidgets/html/up-insensitive.png differ Binary files /tmp/tmp2rtFel/5QGYuaDJ64/gimp-2.8.18/devel-docs/libgimpwidgets/html/up.png and /tmp/tmp2rtFel/alP3T45FSy/gimp-2.8.20/devel-docs/libgimpwidgets/html/up.png differ diff -Nru gimp-2.8.18/devel-docs/libgimpwidgets/Makefile.in gimp-2.8.20/devel-docs/libgimpwidgets/Makefile.in --- gimp-2.8.18/devel-docs/libgimpwidgets/Makefile.in 2016-07-12 23:20:03.000000000 +0000 +++ gimp-2.8.20/devel-docs/libgimpwidgets/Makefile.in 2017-01-31 23:40:33.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,23 +20,61 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,28 +93,39 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/version.in $(top_srcdir)/gtk-doc.make subdir = devel-docs/libgimpwidgets ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -85,6 +133,9 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/version.in \ + $(top_srcdir)/gtk-doc.make DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -581,7 +632,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/libgimpwidgets/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu devel-docs/libgimpwidgets/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -590,7 +640,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/gtk-doc.make: +$(top_srcdir)/gtk-doc.make $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -608,11 +658,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -754,18 +804,20 @@ .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distclean-local distdir \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic \ + clean-libtool clean-local cscopelist-am ctags-am dist-hook \ + distclean distclean-generic distclean-libtool distclean-local \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-data-local \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-local + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-local + +.PRECIOUS: Makefile gtkdoc-check.test: Makefile diff -Nru gimp-2.8.18/devel-docs/Makefile.in gimp-2.8.20/devel-docs/Makefile.in --- gimp-2.8.18/devel-docs/Makefile.in 2016-07-12 23:19:59.000000000 +0000 +++ gimp-2.8.20/devel-docs/Makefile.in 2017-01-31 23:40:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,35 +88,48 @@ build_triplet = @build@ host_triplet = @host@ subdir = devel-docs -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -87,14 +137,35 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = tools libgimpbase libgimpcolor libgimpconfig \ libgimpmath libgimpmodule libgimpthumb libgimpwidgets libgimp \ app +am__DIST_COMMON = $(srcdir)/Makefile.in README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -512,7 +583,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu devel-docs/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -538,22 +608,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -568,57 +641,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -634,12 +662,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -651,15 +674,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -668,6 +687,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -831,12 +865,11 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive dist-hook distclean distclean-generic \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am dist-hook distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -845,8 +878,10 @@ install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am + +.PRECIOUS: Makefile # require gtk-doc when making dist diff -Nru gimp-2.8.18/devel-docs/release-howto.txt gimp-2.8.20/devel-docs/release-howto.txt --- gimp-2.8.18/devel-docs/release-howto.txt 2015-08-20 22:57:27.000000000 +0000 +++ gimp-2.8.20/devel-docs/release-howto.txt 2017-01-28 19:08:45.000000000 +0000 @@ -3,16 +3,34 @@ ---------------------------- a check-list for doing a GIMP release + ( ) Announce a string freeze on the GIMP Developer mailing list. - ( ) Check that you have working ssh access to ftp.gimp.org and that you - are a member of the ftp group. - - ( ) Check that ftp.gimp.org has enough space to upload the release and to - place it into the FTP area. If not, make place or ask Yosh to do that. + Mention that a release is planned, what brach will be frozen, and + how long the string freeze is going to last. Plan for a couple of + weeks at least. No translatable strings must be touched during + this time. An example announcement message is: + https://mail.gnome.org/archives/gimp-developer-list/2016-October/msg00004.html + + ( ) Announce the planned release on the GNOME I18N mailing list. + + Let them know about the planned release, what branch it's based + on, and how many changes to expect. An example message is: + https://mail.gnome.org/archives/gnome-i18n/2016-October/msg00035.html + + ( ) Wait until the date specified in the announcements, use this time + to get bug fixes applied which don't modify strings. + + ( ) Check that you have working ssh access to pentagon.gnome.org and + that you are a member of the gimpadmins group. If not, ask + Michael Natterer or Michael Schumacher for assistance. + + ( ) Check that download.gimp.org has enough space to upload the + release and to place it into the download area. If not, make + place or ask Michael Natterer or Michael Schumacher to do that. ( ) Check that you have admin access to the GIMP product on - bugzilla.gimp.org and to the news section on www.gimp.org, or that - someone can do the changes for you. + bugzilla.gimp.org and commit access to the gimp-web module, or + that someone can do the changes for you. ( ) Check if NEWS, authors.xml (and the generated AUTHORS), README or INSTALL need to be updated, as well as any release notes on @@ -26,13 +44,17 @@ release you are about to make. Releases always have even micro numbers. + [ ] In configure.ac, modify gimp_micro_version accordingly. + + [ ] In configure.ac, modify gimp_interface_age accordingly. + ( ) Make dist tarballs: - [ ] Start with a checkout of the GIMP tree. Make sure the checkout - is up to date, clean from uncommitted changes. + [ ] Start with a checkout of the GIMP tree. Make sure the + checkout is up to date, clean from uncommitted changes. - [ ] Run 'git clean -x -d -f' (Warning: you will lose any files that - are not added). + [ ] Run 'git clean -x -d -f' (Warning: you will lose any files + that are not added). [ ] Run 'git diff'. This should not generate any output, or your tree has local modifications. @@ -45,52 +67,80 @@ cause mysterious fails. [ ] If changes to generated files are made by the above command - (run 'git diff' to find out), commit+push them and repeat from - the beginning of this sub-section. + (run 'git diff' to find out), commit+push them and repeat + from the beginning of this sub-section. [ ] If there are problems reported by 'make distcheck', fix them. If you made changes in the tree to get 'make distcheck' - running, commit+push them and repeat from the beginning of this - sub-section. + running, commit+push them and repeat from the beginning of + this sub-section. - [ ] If 'make distcheck' passed and created tarballs, go to the next - item. + [ ] If 'make distcheck' passed and created tarballs, go to the + next item. - [ ] A successful run of the 'make distcheck' would create the final - dist tarballs. It will include a ChangeLog generated from the 'git - log'. Note that we don't bother with any release commit, that's - what tags are for (see below). + ( ) A successful run of the 'make distcheck' would create the final + dist tarballs. It will include a ChangeLog generated from the + 'git log'. Note that we don't bother with any release commit, + that's what tags are for (see below). - ( ) Use md5sum to create a checksum of the tarball (tar.bz2). + ( ) Tag the release (don't forget to push the tag) + git tag -s GIMP_2_x_y + git push origin GIMP_2_x_y - ( ) Upload the tarball (tar.bz2) and the .md5 file to your home directory - on ftp.gimp.org. Keep a copy of the .md5 file around. + ( ) Bump the version number (past the tagged version) in configure.ac + to the next odd micro and commit this change. GIT versions always + have odd micro numbers. - ( ) Tag the release (don't forget to push the tag) - git tag -s GIMP_2_x_y - git push origin GIMP_2_x_y + [ ] In configure.ac, modify gimp_micro_version accordingly. + + [ ] In configure.ac, modify gimp_interface_age accordingly. + + ( ) Publish dist tarballs: - ( ) Move the tarball and the .md5 file to its final destination in the - FTP area (/ftp/pub/gimp/v2.x). + [ ] Use md5sum to create a checksum of the tarball (tar.bz2). - ( ) Update the 0.0_LATEST-IS- file in the directory on the FTP server. + [ ] Upload the tarball (tar.bz2) and the .md5 file to your home + directory on pentagon.gnome.org. Keep a copy of the .md5 + file around. - ( ) Change permissions of the new files to make them writable by the 'ftp' - group. This will allow other members of this group to correct mistakes - and to update the 0.0_LATEST-IS- file next time. + [ ] Copy the tarball and the .md5 file to its final destination + in the download area (/srv/ftp/pub/gimp/v2.x). + + [ ] Update the 0.0_LATEST-IS- file in the corresponding directory + on the download server. + + [ ] Change permissions of the new files to make them writable by + the 'gimpadmins' group. This will allow other members of this + group to correct mistakes and to update the 0.0_LATEST-IS- + file next time. ( ) Add the new version to the GIMP product on bugzilla.gimp.org. - ( ) Check out or update the 'gimp-web' module and change - downloads/index.htrw. Commit this change, the web server should - then update itself soon (usually less than an hour). + ( ) Check out or update the 'gimp-web' module, check out its testing + branch. - ( ) Bump the version number (past the tagged version) in configure.ac - to the next odd micro and commit this change. GIT version always - have odd micro numbers. + [ ] Change the file content/downloads/index.md to reference the + new source release. + + [ ] Create a news items for the release in content/news/ + + [ ] Commit and push the changes, the web server should then + update itself soon (it checks for updates every 5 minutes). + Go to https://testing.gimp.org to verify the changes. ( ) Grab a properly chilled beverage and enjoy yourself. ( ) Give the mirrors a reasonably long time to update, then announce - the release on gimp.org and on the gimp-user and gimp-developer - mailing lists. + the release on gimp.org and send a release announcement to the + gimp-user and gimp-developer mailing lists. + + [ ] Check out the gimp-web master branch and merge or cherry-pick + the changes you did in the testing branch. + + [ ] Push the changes, the web server should then update itself + soon (it checks for updates every 15 minutes). + Go to https://www.gimp.org to verify the changes. + + [ ] Due to the tendency of news sites to front-run release + articles even before actual announcements appear, publish + everything as fast as possible. diff -Nru gimp-2.8.18/devel-docs/tools/Makefile.in gimp-2.8.20/devel-docs/tools/Makefile.in --- gimp-2.8.18/devel-docs/tools/Makefile.in 2016-07-12 23:20:03.000000000 +0000 +++ gimp-2.8.20/devel-docs/tools/Makefile.in 2017-01-31 23:40:34.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,16 +90,22 @@ host_triplet = @host@ EXTRA_PROGRAMS = doc-shooter$(EXEEXT) subdir = devel-docs/tools -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -80,6 +123,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -92,20 +148,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(doc_shooter_SOURCES) DIST_SOURCES = $(doc_shooter_SOURCES) am__can_run_installinfo = \ @@ -113,8 +165,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -502,7 +572,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/tools/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu devel-docs/tools/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -529,6 +598,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + doc-shooter$(EXEEXT): $(doc_shooter_OBJECTS) $(doc_shooter_DEPENDENCIES) $(EXTRA_doc_shooter_DEPENDENCIES) @rm -f doc-shooter$(EXEEXT) $(AM_V_CCLD)$(LINK) $(doc_shooter_OBJECTS) $(doc_shooter_LDADD) $(LIBS) @@ -549,14 +619,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -571,26 +641,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -602,15 +661,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -619,6 +674,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -760,18 +830,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-local clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-local clean-noinstPROGRAMS cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile clean-local: diff -Nru gimp-2.8.18/docs/gimprc.5.in gimp-2.8.20/docs/gimprc.5.in --- gimp-2.8.18/docs/gimprc.5.in 2016-07-13 01:01:30.000000000 +0000 +++ gimp-2.8.20/docs/gimprc.5.in 2017-02-01 01:28:05.000000000 +0000 @@ -60,7 +60,7 @@ integer value. .TP -(tile-cache-size 1034406k) +(tile-cache-size 1422010k) When the amount of pixel data exceeds this limit, GIMP will start to swap tiles to disk. This is a lot slower but it makes it possible to work on diff -Nru gimp-2.8.18/docs/Makefile.in gimp-2.8.20/docs/Makefile.in --- gimp-2.8.18/docs/Makefile.in 2016-07-12 23:20:03.000000000 +0000 +++ gimp-2.8.20/docs/Makefile.in 2017-01-31 23:40:34.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,28 +89,38 @@ host_triplet = @host@ @ENABLE_GIMP_CONSOLE_TRUE@am__append_1 = gimp-console-$(GIMP_APP_VERSION).1 subdir = docs -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/gimp.1.in $(srcdir)/gimprc.5.in \ - $(srcdir)/gimptool.1.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = gimp-2.8.1 gimprc-2.8.5 gimptool-2.0.1 CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -113,6 +160,9 @@ man5dir = $(mandir)/man5 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gimp.1.in \ + $(srcdir)/gimprc.5.in $(srcdir)/gimptool.1.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -481,7 +531,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu docs/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -597,27 +646,14 @@ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -756,17 +792,20 @@ .MAKE: install-am install-data-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-hook install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-man1 install-man5 install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-local uninstall-man uninstall-man1 uninstall-man5 + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-hook install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-man1 install-man5 \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am uninstall-local uninstall-man \ + uninstall-man1 uninstall-man5 + +.PRECIOUS: Makefile install-data-hook: diff -Nru gimp-2.8.18/etc/gimprc gimp-2.8.20/etc/gimprc --- gimp-2.8.18/etc/gimprc 2016-07-13 01:01:30.000000000 +0000 +++ gimp-2.8.20/etc/gimprc 2017-02-01 01:28:05.000000000 +0000 @@ -42,7 +42,7 @@ # specified in bytes, kilobytes, megabytes or gigabytes. If no suffix is # specified the size defaults to being specified in kilobytes. # -# (tile-cache-size 1034406k) +# (tile-cache-size 1422010k) # Specifies the language to use for the user interface. This is a string # value. diff -Nru gimp-2.8.18/etc/Makefile.in gimp-2.8.20/etc/Makefile.in --- gimp-2.8.18/etc/Makefile.in 2016-07-12 23:20:04.000000000 +0000 +++ gimp-2.8.20/etc/Makefile.in 2017-01-31 23:40:34.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = etc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(gimpsysconfdir)" DATA = $(gimpsysconf_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -474,7 +525,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu etc/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu etc/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -519,11 +569,11 @@ @list='$(gimpsysconf_DATA)'; test -n "$(gimpsysconfdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(gimpsysconfdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -662,16 +712,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-gimpsysconfDATA \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-gimpsysconfDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-gimpsysconfDATA install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-gimpsysconfDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/install-sh gimp-2.8.20/install-sh --- gimp-2.8.18/install-sh 2014-10-20 00:18:19.000000000 +0000 +++ gimp-2.8.20/install-sh 2016-11-01 23:33:03.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-01-19.21; # UTC +scriptversion=2014-09-12.12; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,25 +35,21 @@ # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for `test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -190,7 +186,7 @@ fi shift # arg dst_arg=$arg - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -202,12 +198,21 @@ echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -240,7 +245,7 @@ for src do - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $src in -* | [=\(\)!]) src=./$src;; esac @@ -269,41 +274,15 @@ # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,81 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + # $RANDOM is not portable (e.g. dash); use it when possible to + # lower collision chance + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + + # As "mkdir -p" follows symlinks and we work in /tmp possibly; so + # create the $tmpdir first (and fail if unsuccessful) to make sure + # that nobody tries to guess the $tmpdir name. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +377,51 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +456,12 @@ # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +474,24 @@ # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 diff -Nru gimp-2.8.18/libgimp/Makefile.in gimp-2.8.20/libgimp/Makefile.in --- gimp-2.8.18/libgimp/Makefile.in 2016-07-12 23:20:04.000000000 +0000 +++ gimp-2.8.20/libgimp/Makefile.in 2017-01-31 23:40:35.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,17 +91,23 @@ build_triplet = @build@ host_triplet = @host@ subdir = libgimp -DIST_COMMON = $(gimpinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in COPYING ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(gimpinclude_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -136,6 +179,7 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libgimp_2_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libgimp_2_0_la_LDFLAGS) $(LDFLAGS) -o \ @@ -156,6 +200,18 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libgimpui_2_0_la_LDFLAGS) $(LDFLAGS) \ -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -168,20 +224,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libgimp_2_0_la_SOURCES) $(libgimpui_2_0_la_SOURCES) DIST_SOURCES = $(libgimp_2_0_la_SOURCES) $(libgimpui_2_0_la_SOURCES) am__can_run_installinfo = \ @@ -191,8 +243,26 @@ esac DATA = $(noinst_DATA) HEADERS = $(gimpinclude_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp COPYING DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -917,7 +987,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libgimp/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu libgimp/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -935,6 +1004,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -961,14 +1031,18 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libgimp-2.0.la: $(libgimp_2_0_la_OBJECTS) $(libgimp_2_0_la_DEPENDENCIES) $(EXTRA_libgimp_2_0_la_DEPENDENCIES) $(AM_V_CCLD)$(libgimp_2_0_la_LINK) -rpath $(libdir) $(libgimp_2_0_la_OBJECTS) $(libgimp_2_0_la_LIBADD) $(LIBS) + libgimpui-2.0.la: $(libgimpui_2_0_la_OBJECTS) $(libgimpui_2_0_la_DEPENDENCIES) $(EXTRA_libgimpui_2_0_la_DEPENDENCIES) $(AM_V_CCLD)$(libgimpui_2_0_la_LINK) -rpath $(libdir) $(libgimpui_2_0_la_OBJECTS) $(libgimpui_2_0_la_LIBADD) $(LIBS) @@ -1085,14 +1159,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1128,26 +1202,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(gimpincludedir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1159,15 +1222,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1176,6 +1235,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1322,21 +1396,24 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-data-local install-dvi install-dvi-am install-exec \ - install-exec-am install-gimpincludeHEADERS install-html \ - install-html-am install-info install-info-am \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-data-local install-dvi install-dvi-am \ + install-exec install-exec-am install-gimpincludeHEADERS \ + install-html install-html-am install-info install-info-am \ install-libLTLIBRARIES install-man install-pdf install-pdf-am \ install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-gimpincludeHEADERS \ - uninstall-libLTLIBRARIES uninstall-local + tags tags-am uninstall uninstall-am \ + uninstall-gimpincludeHEADERS uninstall-libLTLIBRARIES \ + uninstall-local + +.PRECIOUS: Makefile @OS_WIN32_TRUE@install-libtool-import-lib: diff -Nru gimp-2.8.18/libgimpbase/gimpversion.h gimp-2.8.20/libgimpbase/gimpversion.h --- gimp-2.8.18/libgimpbase/gimpversion.h 2016-07-12 23:22:36.000000000 +0000 +++ gimp-2.8.20/libgimpbase/gimpversion.h 2017-01-31 23:42:27.000000000 +0000 @@ -42,14 +42,14 @@ * * The micro GIMP version number. **/ -#define GIMP_MICRO_VERSION (18) +#define GIMP_MICRO_VERSION (20) /** * GIMP_VERSION: * * The GIMP version as a string. **/ -#define GIMP_VERSION "2.8.18" +#define GIMP_VERSION "2.8.20" /** * GIMP_API_VERSION: diff -Nru gimp-2.8.18/libgimpbase/Makefile.in gimp-2.8.20/libgimpbase/Makefile.in --- gimp-2.8.18/libgimpbase/Makefile.in 2016-07-12 23:20:05.000000000 +0000 +++ gimp-2.8.20/libgimpbase/Makefile.in 2017-01-31 23:40:35.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,17 +93,23 @@ TESTS = test-cpu-accel$(EXEEXT) EXTRA_PROGRAMS = test-cpu-accel$(EXEEXT) subdir = libgimpbase -DIST_COMMON = $(libgimpbaseinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(libgimpbaseinclude_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -113,12 +156,25 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libgimpbase_2_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libgimpbase_2_0_la_LDFLAGS) \ $(LDFLAGS) -o $@ am_test_cpu_accel_OBJECTS = test-cpu-accel.$(OBJEXT) test_cpu_accel_OBJECTS = $(am_test_cpu_accel_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -131,20 +187,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libgimpbase_2_0_la_SOURCES) $(test_cpu_accel_SOURCES) DIST_SOURCES = $(libgimpbase_2_0_la_SOURCES) $(test_cpu_accel_SOURCES) am__can_run_installinfo = \ @@ -154,10 +206,204 @@ esac DATA = $(noinst_DATA) HEADERS = $(libgimpbaseinclude_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -626,7 +872,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -639,7 +885,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libgimpbase/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu libgimpbase/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -657,6 +902,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -683,14 +929,18 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libgimpbase-2.0.la: $(libgimpbase_2_0_la_OBJECTS) $(libgimpbase_2_0_la_DEPENDENCIES) $(EXTRA_libgimpbase_2_0_la_DEPENDENCIES) $(AM_V_CCLD)$(libgimpbase_2_0_la_LINK) -rpath $(libdir) $(libgimpbase_2_0_la_OBJECTS) $(libgimpbase_2_0_la_LIBADD) $(LIBS) + test-cpu-accel$(EXEEXT): $(test_cpu_accel_OBJECTS) $(test_cpu_accel_DEPENDENCIES) $(EXTRA_test_cpu_accel_DEPENDENCIES) @rm -f test-cpu-accel$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_cpu_accel_OBJECTS) $(test_cpu_accel_LDADD) $(LIBS) @@ -725,14 +975,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -768,26 +1018,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(libgimpbaseincludedir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -799,15 +1038,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -816,102 +1051,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +test-cpu-accel.log: test-cpu-accel$(EXEEXT) + @p='test-cpu-accel$(EXEEXT)'; \ + b='test-cpu-accel'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -971,6 +1291,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -1057,9 +1380,9 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-generic clean-libLTLIBRARIES clean-libtool ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-data-local install-dvi install-dvi-am \ @@ -1070,8 +1393,11 @@ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES \ - uninstall-libgimpbaseincludeHEADERS uninstall-local + recheck tags tags-am uninstall uninstall-am \ + uninstall-libLTLIBRARIES uninstall-libgimpbaseincludeHEADERS \ + uninstall-local + +.PRECIOUS: Makefile @OS_WIN32_TRUE@install-libtool-import-lib: diff -Nru gimp-2.8.18/libgimpcolor/Makefile.in gimp-2.8.20/libgimpcolor/Makefile.in --- gimp-2.8.18/libgimpcolor/Makefile.in 2016-07-12 23:20:05.000000000 +0000 +++ gimp-2.8.20/libgimpcolor/Makefile.in 2017-01-31 23:40:36.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,17 +92,23 @@ host_triplet = @host@ EXTRA_PROGRAMS = test-color-parser$(EXEEXT) subdir = libgimpcolor -DIST_COMMON = $(libgimpcolorinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(libgimpcolorinclude_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -109,12 +152,25 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libgimpcolor_2_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libgimpcolor_2_0_la_LDFLAGS) \ $(LDFLAGS) -o $@ test_color_parser_SOURCES = test-color-parser.c test_color_parser_OBJECTS = test-color-parser.$(OBJEXT) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -127,20 +183,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libgimpcolor_2_0_la_SOURCES) test-color-parser.c DIST_SOURCES = $(libgimpcolor_2_0_la_SOURCES) test-color-parser.c am__can_run_installinfo = \ @@ -150,10 +202,204 @@ esac DATA = $(noinst_DATA) HEADERS = $(libgimpcolorinclude_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -581,7 +827,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -594,7 +840,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libgimpcolor/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu libgimpcolor/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -612,6 +857,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -638,14 +884,18 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libgimpcolor-2.0.la: $(libgimpcolor_2_0_la_OBJECTS) $(libgimpcolor_2_0_la_DEPENDENCIES) $(EXTRA_libgimpcolor_2_0_la_DEPENDENCIES) $(AM_V_CCLD)$(libgimpcolor_2_0_la_LINK) -rpath $(libdir) $(libgimpcolor_2_0_la_OBJECTS) $(libgimpcolor_2_0_la_LIBADD) $(LIBS) + test-color-parser$(EXEEXT): $(test_color_parser_OBJECTS) $(test_color_parser_DEPENDENCIES) $(EXTRA_test_color_parser_DEPENDENCIES) @rm -f test-color-parser$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_color_parser_OBJECTS) $(test_color_parser_LDADD) $(LIBS) @@ -673,14 +923,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -716,26 +966,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(libgimpcolorincludedir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -747,15 +986,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -764,102 +999,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +test-color-parser.log: test-color-parser$(EXEEXT) + @p='test-color-parser$(EXEEXT)'; \ + b='test-color-parser'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -919,6 +1239,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -1004,9 +1327,9 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-generic clean-libLTLIBRARIES clean-libtool ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-data-local install-dvi install-dvi-am \ @@ -1017,8 +1340,11 @@ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES \ - uninstall-libgimpcolorincludeHEADERS uninstall-local + recheck tags tags-am uninstall uninstall-am \ + uninstall-libLTLIBRARIES uninstall-libgimpcolorincludeHEADERS \ + uninstall-local + +.PRECIOUS: Makefile @OS_WIN32_TRUE@install-libtool-import-lib: diff -Nru gimp-2.8.18/libgimpconfig/Makefile.in gimp-2.8.20/libgimpconfig/Makefile.in --- gimp-2.8.18/libgimpconfig/Makefile.in 2016-07-12 23:20:05.000000000 +0000 +++ gimp-2.8.20/libgimpconfig/Makefile.in 2017-01-31 23:40:36.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,17 +91,23 @@ build_triplet = @build@ host_triplet = @host@ subdir = libgimpconfig -DIST_COMMON = $(libgimpconfiginclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(libgimpconfiginclude_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -110,10 +153,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libgimpconfig_2_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libgimpconfig_2_0_la_LDFLAGS) \ $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -126,20 +182,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libgimpconfig_2_0_la_SOURCES) DIST_SOURCES = $(libgimpconfig_2_0_la_SOURCES) am__can_run_installinfo = \ @@ -149,8 +201,26 @@ esac DATA = $(noinst_DATA) HEADERS = $(libgimpconfiginclude_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -592,7 +662,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libgimpconfig/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu libgimpconfig/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -610,6 +679,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -636,12 +706,15 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libgimpconfig-2.0.la: $(libgimpconfig_2_0_la_OBJECTS) $(libgimpconfig_2_0_la_DEPENDENCIES) $(EXTRA_libgimpconfig_2_0_la_DEPENDENCIES) $(AM_V_CCLD)$(libgimpconfig_2_0_la_LINK) -rpath $(libdir) $(libgimpconfig_2_0_la_OBJECTS) $(libgimpconfig_2_0_la_LIBADD) $(LIBS) @@ -667,14 +740,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -710,26 +783,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(libgimpconfigincludedir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -741,15 +803,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -758,6 +816,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -905,22 +978,24 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-data-local install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libLTLIBRARIES \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-data-local install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libLTLIBRARIES \ install-libgimpconfigincludeHEADERS install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES \ + tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \ uninstall-libgimpconfigincludeHEADERS uninstall-local +.PRECIOUS: Makefile + @OS_WIN32_TRUE@install-libtool-import-lib: @OS_WIN32_TRUE@ $(INSTALL) .libs/libgimpconfig-$(GIMP_API_VERSION).dll.a $(DESTDIR)$(libdir) diff -Nru gimp-2.8.18/libgimpmath/Makefile.in gimp-2.8.20/libgimpmath/Makefile.in --- gimp-2.8.18/libgimpmath/Makefile.in 2016-07-12 23:20:06.000000000 +0000 +++ gimp-2.8.20/libgimpmath/Makefile.in 2017-01-31 23:40:37.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,17 +91,23 @@ build_triplet = @build@ host_triplet = @host@ subdir = libgimpmath -DIST_COMMON = $(libgimpmathinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(libgimpmathinclude_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -105,10 +148,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libgimpmath_2_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libgimpmath_2_0_la_LDFLAGS) \ $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -121,20 +177,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libgimpmath_2_0_la_SOURCES) DIST_SOURCES = $(libgimpmath_2_0_la_SOURCES) am__can_run_installinfo = \ @@ -144,8 +196,26 @@ esac DATA = $(noinst_DATA) HEADERS = $(libgimpmathinclude_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -545,7 +615,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libgimpmath/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu libgimpmath/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -563,6 +632,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -589,12 +659,15 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libgimpmath-2.0.la: $(libgimpmath_2_0_la_OBJECTS) $(libgimpmath_2_0_la_DEPENDENCIES) $(EXTRA_libgimpmath_2_0_la_DEPENDENCIES) $(AM_V_CCLD)$(libgimpmath_2_0_la_LINK) -rpath $(libdir) $(libgimpmath_2_0_la_OBJECTS) $(libgimpmath_2_0_la_LIBADD) $(LIBS) @@ -613,14 +686,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -656,26 +729,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(libgimpmathincludedir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -687,15 +749,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -704,6 +762,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -849,22 +922,24 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-data-local install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libLTLIBRARIES \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-data-local install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libLTLIBRARIES \ install-libgimpmathincludeHEADERS install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES \ + tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \ uninstall-libgimpmathincludeHEADERS uninstall-local +.PRECIOUS: Makefile + @OS_WIN32_TRUE@install-libtool-import-lib: @OS_WIN32_TRUE@ $(INSTALL) .libs/libgimpmath-$(GIMP_API_VERSION).dll.a $(DESTDIR)$(libdir) diff -Nru gimp-2.8.18/libgimpmodule/Makefile.in gimp-2.8.20/libgimpmodule/Makefile.in --- gimp-2.8.18/libgimpmodule/Makefile.in 2016-07-12 23:20:06.000000000 +0000 +++ gimp-2.8.20/libgimpmodule/Makefile.in 2017-01-31 23:40:37.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,17 +91,23 @@ build_triplet = @build@ host_triplet = @host@ subdir = libgimpmodule -DIST_COMMON = $(libgimpmoduleinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(libgimpmoduleinclude_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -105,10 +148,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libgimpmodule_2_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libgimpmodule_2_0_la_LDFLAGS) \ $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -121,20 +177,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libgimpmodule_2_0_la_SOURCES) DIST_SOURCES = $(libgimpmodule_2_0_la_SOURCES) am__can_run_installinfo = \ @@ -144,8 +196,26 @@ esac DATA = $(noinst_DATA) HEADERS = $(libgimpmoduleinclude_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -544,7 +614,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libgimpmodule/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu libgimpmodule/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -562,6 +631,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -588,12 +658,15 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libgimpmodule-2.0.la: $(libgimpmodule_2_0_la_OBJECTS) $(libgimpmodule_2_0_la_DEPENDENCIES) $(EXTRA_libgimpmodule_2_0_la_DEPENDENCIES) $(AM_V_CCLD)$(libgimpmodule_2_0_la_LINK) -rpath $(libdir) $(libgimpmodule_2_0_la_OBJECTS) $(libgimpmodule_2_0_la_LIBADD) $(LIBS) @@ -611,14 +684,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -654,26 +727,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(libgimpmoduleincludedir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -685,15 +747,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -702,6 +760,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -848,22 +921,24 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-data-local install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libLTLIBRARIES \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-data-local install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libLTLIBRARIES \ install-libgimpmoduleincludeHEADERS install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES \ + tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \ uninstall-libgimpmoduleincludeHEADERS uninstall-local +.PRECIOUS: Makefile + @OS_WIN32_TRUE@install-libtool-import-lib: @OS_WIN32_TRUE@ $(INSTALL) .libs/libgimpmodule-$(GIMP_API_VERSION).dll.a $(DESTDIR)$(libdir) diff -Nru gimp-2.8.18/libgimpthumb/Makefile.in gimp-2.8.20/libgimpthumb/Makefile.in --- gimp-2.8.18/libgimpthumb/Makefile.in 2016-07-12 23:20:07.000000000 +0000 +++ gimp-2.8.20/libgimpthumb/Makefile.in 2017-01-31 23:40:38.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,23 +18,61 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,17 +93,23 @@ host_triplet = @host@ noinst_PROGRAMS = gimp-thumbnail-list$(EXEEXT) subdir = libgimpthumb -DIST_COMMON = $(libgimpthumbinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(libgimpthumbinclude_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -110,6 +153,7 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libgimpthumb_2_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libgimpthumb_2_0_la_LDFLAGS) \ @@ -120,6 +164,18 @@ gimp_thumbnail_list_DEPENDENCIES = \ libgimpthumb-$(GIMP_API_VERSION).la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -132,20 +188,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libgimpthumb_2_0_la_SOURCES) \ $(gimp_thumbnail_list_SOURCES) DIST_SOURCES = $(libgimpthumb_2_0_la_SOURCES) \ @@ -157,8 +209,26 @@ esac DATA = $(noinst_DATA) HEADERS = $(libgimpthumbinclude_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -579,7 +649,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libgimpthumb/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu libgimpthumb/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -597,6 +666,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -623,12 +693,15 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libgimpthumb-2.0.la: $(libgimpthumb_2_0_la_OBJECTS) $(libgimpthumb_2_0_la_DEPENDENCIES) $(EXTRA_libgimpthumb_2_0_la_DEPENDENCIES) $(AM_V_CCLD)$(libgimpthumb_2_0_la_LINK) -rpath $(libdir) $(libgimpthumb_2_0_la_OBJECTS) $(libgimpthumb_2_0_la_LIBADD) $(LIBS) @@ -640,6 +713,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + gimp-thumbnail-list$(EXEEXT): $(gimp_thumbnail_list_OBJECTS) $(gimp_thumbnail_list_DEPENDENCIES) $(EXTRA_gimp_thumbnail_list_DEPENDENCIES) @rm -f gimp-thumbnail-list$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gimp_thumbnail_list_OBJECTS) $(gimp_thumbnail_list_LDADD) $(LIBS) @@ -661,14 +735,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -704,26 +778,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(libgimpthumbincludedir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -735,15 +798,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -752,6 +811,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -898,22 +972,25 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-data-local install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libLTLIBRARIES \ - install-libgimpthumbincludeHEADERS install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-local install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-libgimpthumbincludeHEADERS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-libLTLIBRARIES \ uninstall-libgimpthumbincludeHEADERS uninstall-local +.PRECIOUS: Makefile + @OS_WIN32_TRUE@install-libtool-import-lib: @OS_WIN32_TRUE@ $(INSTALL) .libs/libgimpthumb-$(GIMP_API_VERSION).dll.a $(DESTDIR)$(libdir) diff -Nru gimp-2.8.18/libgimpwidgets/gimppatheditor.c gimp-2.8.20/libgimpwidgets/gimppatheditor.c --- gimp-2.8.18/libgimpwidgets/gimppatheditor.c 2015-08-20 22:57:28.000000000 +0000 +++ gimp-2.8.20/libgimpwidgets/gimppatheditor.c 2017-01-28 19:08:45.000000000 +0000 @@ -781,7 +781,7 @@ if (gtk_tree_selection_get_selected (sel, NULL, &iter)) { gtk_tree_model_get (GTK_TREE_MODEL (editor->dir_list), &iter, - 0, &directory, + COLUMN_DIRECTORY, &directory, -1); g_signal_handlers_block_by_func (editor->file_entry, diff -Nru gimp-2.8.18/libgimpwidgets/gimpruler.c gimp-2.8.20/libgimpwidgets/gimpruler.c --- gimp-2.8.18/libgimpwidgets/gimpruler.c 2015-11-01 01:20:52.000000000 +0000 +++ gimp-2.8.20/libgimpwidgets/gimpruler.c 2017-01-28 19:08:45.000000000 +0000 @@ -659,6 +659,12 @@ (ABS (xdiff) > IMMEDIATE_REDRAW_THRESHOLD || ABS (ydiff) > IMMEDIATE_REDRAW_THRESHOLD)) { + if (priv->pos_redraw_idle_id) + { + g_source_remove (priv->pos_redraw_idle_id); + priv->pos_redraw_idle_id = 0; + } + gimp_ruler_queue_pos_redraw (ruler); } else if (! priv->pos_redraw_idle_id) @@ -1279,15 +1285,16 @@ GimpRulerPrivate *priv = GIMP_RULER_GET_PRIVATE (ruler); const GdkRectangle rect = gimp_ruler_get_pos_rect (ruler, priv->position); - gtk_widget_queue_draw_area (GTK_WIDGET(ruler), + gtk_widget_queue_draw_area (GTK_WIDGET (ruler), rect.x, rect.y, rect.width, rect.height); - if (priv->last_pos_rect.width != 0 || priv->last_pos_rect.height != 0) + if (priv->last_pos_rect.width != 0 && + priv->last_pos_rect.height != 0) { - gtk_widget_queue_draw_area (GTK_WIDGET(ruler), + gtk_widget_queue_draw_area (GTK_WIDGET (ruler), priv->last_pos_rect.x, priv->last_pos_rect.y, priv->last_pos_rect.width, @@ -1338,7 +1345,17 @@ cairo_fill (cr); } - priv->last_pos_rect = pos_rect; + if (priv->last_pos_rect.width != 0 && + priv->last_pos_rect.height != 0) + { + gdk_rectangle_union (&priv->last_pos_rect, + &pos_rect, + &priv->last_pos_rect); + } + else + { + priv->last_pos_rect = pos_rect; + } } static void diff -Nru gimp-2.8.18/libgimpwidgets/Makefile.in gimp-2.8.20/libgimpwidgets/Makefile.in --- gimp-2.8.18/libgimpwidgets/Makefile.in 2016-07-12 23:20:07.000000000 +0000 +++ gimp-2.8.20/libgimpwidgets/Makefile.in 2017-01-31 23:40:38.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,17 +92,23 @@ host_triplet = @host@ EXTRA_PROGRAMS = test-preview-area$(EXEEXT) test-eevl$(EXEEXT) subdir = libgimpwidgets -DIST_COMMON = $(libgimpwidgetsinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(libgimpwidgetsinclude_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -127,6 +170,7 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libgimpwidgets_2_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libgimpwidgets_2_0_la_LDFLAGS) \ @@ -135,6 +179,18 @@ test_eevl_OBJECTS = $(am_test_eevl_OBJECTS) am_test_preview_area_OBJECTS = test-preview-area.$(OBJEXT) test_preview_area_OBJECTS = $(am_test_preview_area_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -147,20 +203,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libgimpwidgets_2_0_la_SOURCES) $(test_eevl_SOURCES) \ $(test_preview_area_SOURCES) DIST_SOURCES = $(libgimpwidgets_2_0_la_SOURCES) $(test_eevl_SOURCES) \ @@ -172,10 +224,204 @@ esac DATA = $(noinst_DATA) HEADERS = $(libgimpwidgetsinclude_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -790,7 +1036,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -803,7 +1049,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libgimpwidgets/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu libgimpwidgets/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -821,6 +1066,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -847,17 +1093,22 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libgimpwidgets-2.0.la: $(libgimpwidgets_2_0_la_OBJECTS) $(libgimpwidgets_2_0_la_DEPENDENCIES) $(EXTRA_libgimpwidgets_2_0_la_DEPENDENCIES) $(AM_V_CCLD)$(libgimpwidgets_2_0_la_LINK) -rpath $(libdir) $(libgimpwidgets_2_0_la_OBJECTS) $(libgimpwidgets_2_0_la_LIBADD) $(LIBS) + test-eevl$(EXEEXT): $(test_eevl_OBJECTS) $(test_eevl_DEPENDENCIES) $(EXTRA_test_eevl_DEPENDENCIES) @rm -f test-eevl$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_eevl_OBJECTS) $(test_eevl_LDADD) $(LIBS) + test-preview-area$(EXEEXT): $(test_preview_area_OBJECTS) $(test_preview_area_DEPENDENCIES) $(EXTRA_test_preview_area_DEPENDENCIES) @rm -f test-preview-area$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_preview_area_OBJECTS) $(test_preview_area_LDADD) $(LIBS) @@ -936,14 +1187,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -979,26 +1230,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(libgimpwidgetsincludedir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1010,15 +1250,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1027,102 +1263,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +test-eevl.log: test-eevl$(EXEEXT) + @p='test-eevl$(EXEEXT)'; \ + b='test-eevl'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -1182,6 +1503,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -1268,9 +1592,9 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-generic clean-libLTLIBRARIES clean-libtool ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-data-local install-dvi install-dvi-am \ @@ -1281,9 +1605,12 @@ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libLTLIBRARIES \ uninstall-libgimpwidgetsincludeHEADERS uninstall-local +.PRECIOUS: Makefile + @OS_WIN32_TRUE@install-libtool-import-lib: @OS_WIN32_TRUE@ $(INSTALL) .libs/libgimpwidgets-$(GIMP_API_VERSION).dll.a $(DESTDIR)$(libdir) diff -Nru gimp-2.8.18/ltmain.sh gimp-2.8.20/ltmain.sh --- gimp-2.8.18/ltmain.sh 2016-02-07 16:49:05.000000000 +0000 +++ gimp-2.8.20/ltmain.sh 2016-08-20 12:34:31.000000000 +0000 @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.6 Debian-2.4.6-0.1" +VERSION="2.4.6 Debian-2.4.6-2" package_revision=2.4.6 @@ -2068,7 +2068,7 @@ compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname (GNU libtool) 2.4.6 + version: $progname $scriptversion Debian-2.4.6-2 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` diff -Nru gimp-2.8.18/m4macros/gtk-doc.m4 gimp-2.8.20/m4macros/gtk-doc.m4 --- gimp-2.8.18/m4macros/gtk-doc.m4 1970-01-01 00:00:00.000000000 +0000 +++ gimp-2.8.20/m4macros/gtk-doc.m4 2016-10-21 01:52:07.000000000 +0000 @@ -0,0 +1,88 @@ +dnl -*- mode: autoconf -*- + +# serial 2 + +dnl Usage: +dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) +AC_DEFUN([GTK_DOC_CHECK], +[ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + + ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"]) + AC_MSG_CHECKING([for gtk-doc]) + PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no]) + AC_MSG_RESULT($have_gtk_doc) + + if test "$have_gtk_doc" = "no"; then + AC_MSG_WARN([ + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found.]) + fi + + dnl check for tools we added during development + dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that + dnl may not be writable by the user. Currently, automake requires that the + dnl test name must end in '.test'. + dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638 + AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test]) + AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check]) + AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) + AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) + + dnl for overriding the documentation installation directory + AC_ARG_WITH([html-dir], + AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, + [with_html_dir='${datadir}/gtk-doc/html']) + HTML_DIR="$with_html_dir" + AC_SUBST([HTML_DIR]) + + dnl enable/disable documentation building + AC_ARG_ENABLE([gtk-doc], + AS_HELP_STRING([--enable-gtk-doc], + [use gtk-doc to build documentation [[default=no]]]),, + [enable_gtk_doc=no]) + + AC_MSG_CHECKING([whether to build gtk-doc documentation]) + AC_MSG_RESULT($enable_gtk_doc) + + if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then + AC_MSG_ERROR([ + You must have $gtk_doc_requires installed to build documentation for + $PACKAGE_NAME. Please install gtk-doc or disable building the + documentation by adding '--disable-gtk-doc' to '[$]0'.]) + fi + + dnl don't check for glib if we build glib + if test "x$PACKAGE_NAME" != "xglib"; then + dnl don't fail if someone does not have glib + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) + fi + + dnl enable/disable output formats + AC_ARG_ENABLE([gtk-doc-html], + AS_HELP_STRING([--enable-gtk-doc-html], + [build documentation in html format [[default=yes]]]),, + [enable_gtk_doc_html=yes]) + AC_ARG_ENABLE([gtk-doc-pdf], + AS_HELP_STRING([--enable-gtk-doc-pdf], + [build documentation in pdf format [[default=no]]]),, + [enable_gtk_doc_pdf=no]) + + if test -z "$GTKDOC_MKPDF"; then + enable_gtk_doc_pdf=no + fi + + if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 + fi + AC_SUBST([AM_DEFAULT_VERBOSITY]) + + AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes]) + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) + AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) + AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) +]) diff -Nru gimp-2.8.18/m4macros/intltool.m4 gimp-2.8.20/m4macros/intltool.m4 --- gimp-2.8.18/m4macros/intltool.m4 1970-01-01 00:00:00.000000000 +0000 +++ gimp-2.8.20/m4macros/intltool.m4 2016-09-21 21:45:39.000000000 +0000 @@ -0,0 +1,212 @@ +## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*- +## Copyright (C) 2001 Eazel, Inc. +## Author: Maciej Stachowiak +## Kenneth Christiansen +## +## 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 2 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, write to the Free Software +## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## As a special exception to the GNU General Public License, if you +## distribute this file as part of a program that contains a +## configuration script generated by Autoconf, you may include it under +## the same distribution terms that you use for the rest of that program. + +dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) +# serial 42 IT_PROG_INTLTOOL +AC_DEFUN([IT_PROG_INTLTOOL], [ +AC_PREREQ([2.50])dnl +AC_REQUIRE([AM_NLS])dnl + +case "$am__api_version" in + 1.[01234]) + AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) + ;; + *) + ;; +esac + +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +if test -n "$1"; then + AC_MSG_CHECKING([for intltool >= $1]) + AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || + AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) +fi + +AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) +AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) +AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then + AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) +fi + +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi +AC_SUBST([AM_DEFAULT_VERBOSITY]) + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' +AC_SUBST(INTLTOOL_V_MERGE) +AC_SUBST(INTLTOOL__v_MERGE_) +AC_SUBST(INTLTOOL__v_MERGE_0) + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' +AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) +AC_SUBST(intltool__v_merge_options_) +AC_SUBST(intltool__v_merge_options_0) + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + +_IT_SUBST(INTLTOOL_DESKTOP_RULE) +_IT_SUBST(INTLTOOL_DIRECTORY_RULE) +_IT_SUBST(INTLTOOL_KEYS_RULE) +_IT_SUBST(INTLTOOL_PROP_RULE) +_IT_SUBST(INTLTOOL_OAF_RULE) +_IT_SUBST(INTLTOOL_PONG_RULE) +_IT_SUBST(INTLTOOL_SERVER_RULE) +_IT_SUBST(INTLTOOL_SHEET_RULE) +_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) +_IT_SUBST(INTLTOOL_UI_RULE) +_IT_SUBST(INTLTOOL_XAM_RULE) +_IT_SUBST(INTLTOOL_KBD_RULE) +_IT_SUBST(INTLTOOL_XML_RULE) +_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) +_IT_SUBST(INTLTOOL_CAVES_RULE) +_IT_SUBST(INTLTOOL_SCHEMAS_RULE) +_IT_SUBST(INTLTOOL_THEME_RULE) +_IT_SUBST(INTLTOOL_SERVICE_RULE) +_IT_SUBST(INTLTOOL_POLICY_RULE) + +# Check the gettext tools to make sure they are GNU +AC_PATH_PROG(XGETTEXT, xgettext) +AC_PATH_PROG(MSGMERGE, msgmerge) +AC_PATH_PROG(MSGFMT, msgfmt) +AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi +xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" +mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" +mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" +if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi + +AC_PATH_PROG(INTLTOOL_PERL, perl) +if test -z "$INTLTOOL_PERL"; then + AC_MSG_ERROR([perl not found]) +fi +AC_MSG_CHECKING([for perl >= 5.8.1]) +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +if test $? -ne 0; then + AC_MSG_ERROR([perl 5.8.1 is required for intltool]) +else + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` + AC_MSG_RESULT([$IT_PERL_VERSION]) +fi +if test "x$2" != "xno-xml"; then + AC_MSG_CHECKING([for XML::Parser]) + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then + AC_MSG_RESULT([ok]) + else + AC_MSG_ERROR([XML::Parser perl module is required for intltool]) + fi +fi + +# Substitute ALL_LINGUAS so we can use it in po/Makefile +AC_SUBST(ALL_LINGUAS) + +IT_PO_SUBDIR([po]) + +]) + + +# IT_PO_SUBDIR(DIRNAME) +# --------------------- +# All po subdirs have to be declared with this macro; the subdir "po" is +# declared by IT_PROG_INTLTOOL. +# +AC_DEFUN([IT_PO_SUBDIR], +[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. +dnl +dnl The following CONFIG_COMMANDS should be executed at the very end +dnl of config.status. +AC_CONFIG_COMMANDS_PRE([ + AC_CONFIG_COMMANDS([$1/stamp-it], [ + if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then + AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) + fi + rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" + >"$1/stamp-it.tmp" + [sed '/^#/d + s/^[[].*] *// + /^[ ]*$/d + '"s|^| $ac_top_srcdir/|" \ + "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" + ] + [sed '/^POTFILES =/,/[^\\]$/ { + /^POTFILES =/!d + r $1/POTFILES + } + ' "$1/Makefile.in" >"$1/Makefile"] + rm -f "$1/Makefile.tmp" + mv "$1/stamp-it.tmp" "$1/stamp-it" + ]) +])dnl +]) + +# _IT_SUBST(VARIABLE) +# ------------------- +# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +# +AC_DEFUN([_IT_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) + +# deprecated macros +AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) +# A hint is needed for aclocal from Automake <= 1.9.4: +# AC_DEFUN([AC_PROG_INTLTOOL], ...) + diff -Nru gimp-2.8.18/m4macros/libtool.m4 gimp-2.8.20/m4macros/libtool.m4 --- gimp-2.8.18/m4macros/libtool.m4 1970-01-01 00:00:00.000000000 +0000 +++ gimp-2.8.20/m4macros/libtool.m4 2016-08-20 12:34:31.000000000 +0000 @@ -0,0 +1,8387 @@ +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +m4_define([_LT_COPYING], [dnl +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. +# +# GNU Libtool 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 . +]) + +# serial 58 LT_INIT + + +# LT_PREREQ(VERSION) +# ------------------ +# Complain and exit if this libtool version is less that VERSION. +m4_defun([LT_PREREQ], +[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, + [m4_default([$3], + [m4_fatal([Libtool version $1 or higher is required], + 63)])], + [$2])]) + + +# _LT_CHECK_BUILDDIR +# ------------------ +# Complain if the absolute build directory name contains unusual characters +m4_defun([_LT_CHECK_BUILDDIR], +[case `pwd` in + *\ * | *\ *) + AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; +esac +]) + + +# LT_INIT([OPTIONS]) +# ------------------ +AC_DEFUN([LT_INIT], +[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +AC_BEFORE([$0], [LT_LANG])dnl +AC_BEFORE([$0], [LT_OUTPUT])dnl +AC_BEFORE([$0], [LTDL_INIT])dnl +m4_require([_LT_CHECK_BUILDDIR])dnl + +dnl Autoconf doesn't catch unexpanded LT_ macros by default: +m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl +m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl +dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 +dnl unless we require an AC_DEFUNed macro: +AC_REQUIRE([LTOPTIONS_VERSION])dnl +AC_REQUIRE([LTSUGAR_VERSION])dnl +AC_REQUIRE([LTVERSION_VERSION])dnl +AC_REQUIRE([LTOBSOLETE_VERSION])dnl +m4_require([_LT_PROG_LTMAIN])dnl + +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) + +dnl Parse OPTIONS +_LT_SET_OPTIONS([$0], [$1]) + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS=$ltmain + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl + +_LT_SETUP + +# Only expand once: +m4_define([LT_INIT]) +])# LT_INIT + +# Old names: +AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) +AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PROG_LIBTOOL], []) +dnl AC_DEFUN([AM_PROG_LIBTOOL], []) + + +# _LT_PREPARE_CC_BASENAME +# ----------------------- +m4_defun([_LT_PREPARE_CC_BASENAME], [ +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in @S|@*""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +])# _LT_PREPARE_CC_BASENAME + + +# _LT_CC_BASENAME(CC) +# ------------------- +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. +m4_defun([_LT_CC_BASENAME], +[m4_require([_LT_PREPARE_CC_BASENAME])dnl +AC_REQUIRE([_LT_DECL_SED])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +func_cc_basename $1 +cc_basename=$func_cc_basename_result +]) + + +# _LT_FILEUTILS_DEFAULTS +# ---------------------- +# It is okay to use these file commands and assume they have been set +# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. +m4_defun([_LT_FILEUTILS_DEFAULTS], +[: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} +])# _LT_FILEUTILS_DEFAULTS + + +# _LT_SETUP +# --------- +m4_defun([_LT_SETUP], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl + +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl +_LT_DECL([], [host_alias], [0], [The host system])dnl +_LT_DECL([], [host], [0])dnl +_LT_DECL([], [host_os], [0])dnl +dnl +_LT_DECL([], [build_alias], [0], [The build system])dnl +_LT_DECL([], [build], [0])dnl +_LT_DECL([], [build_os], [0])dnl +dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +dnl +AC_REQUIRE([AC_PROG_LN_S])dnl +test -z "$LN_S" && LN_S="ln -s" +_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl +dnl +AC_REQUIRE([LT_CMD_MAX_LEN])dnl +_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl +_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl +dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl +m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_CHECK_MAGIC_METHOD])dnl +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl +m4_require([_LT_CMD_OLD_ARCHIVE])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_WITH_SYSROOT])dnl +m4_require([_LT_CMD_TRUNCATE])dnl + +_LT_CONFIG_LIBTOOL_INIT([ +# See if we are running on zsh, and set the options that allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST +fi +]) +if test -n "${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST +fi + +_LT_CHECK_OBJDIR + +m4_require([_LT_TAG_COMPILER])dnl + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test set != "${COLLECT_NAMES+set}"; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Global variables: +ofile=libtool +can_build_shared=yes + +# All known linkers require a '.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a + +with_gnu_ld=$lt_cv_prog_gnu_ld + +old_CC=$CC +old_CFLAGS=$CFLAGS + +# Set sane defaults for various variables +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$LD" && LD=ld +test -z "$ac_objext" && ac_objext=o + +_LT_CC_BASENAME([$compiler]) + +# Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + _LT_PATH_MAGIC + fi + ;; +esac + +# Use C for the default configuration in the libtool script +LT_SUPPORTED_TAG([CC]) +_LT_LANG_C_CONFIG +_LT_LANG_DEFAULT_CONFIG +_LT_CONFIG_COMMANDS +])# _LT_SETUP + + +# _LT_PREPARE_SED_QUOTE_VARS +# -------------------------- +# Define a few sed substitution that help us do robust quoting. +m4_defun([_LT_PREPARE_SED_QUOTE_VARS], +[# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\([["`\\]]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' +]) + +# _LT_PROG_LTMAIN +# --------------- +# Note that this code is called both from 'configure', and 'config.status' +# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, +# 'config.status' has no value for ac_aux_dir unless we are using Automake, +# so we pass a copy along to make sure it has a sensible value anyway. +m4_defun([_LT_PROG_LTMAIN], +[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl +_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) +ltmain=$ac_aux_dir/ltmain.sh +])# _LT_PROG_LTMAIN + + +## ------------------------------------- ## +## Accumulate code for creating libtool. ## +## ------------------------------------- ## + +# So that we can recreate a full libtool script including additional +# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS +# in macros and then make a single call at the end using the 'libtool' +# label. + + +# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) +# ---------------------------------------- +# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL_INIT], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_INIT], + [$1 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_INIT]) + + +# _LT_CONFIG_LIBTOOL([COMMANDS]) +# ------------------------------ +# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], + [$1 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) + + +# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) +# ----------------------------------------------------- +m4_defun([_LT_CONFIG_SAVE_COMMANDS], +[_LT_CONFIG_LIBTOOL([$1]) +_LT_CONFIG_LIBTOOL_INIT([$2]) +]) + + +# _LT_FORMAT_COMMENT([COMMENT]) +# ----------------------------- +# Add leading comment marks to the start of each line, and a trailing +# full-stop to the whole comment if one is not present already. +m4_define([_LT_FORMAT_COMMENT], +[m4_ifval([$1], [ +m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], + [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) +)]) + + + +## ------------------------ ## +## FIXME: Eliminate VARNAME ## +## ------------------------ ## + + +# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) +# ------------------------------------------------------------------- +# CONFIGNAME is the name given to the value in the libtool script. +# VARNAME is the (base) name used in the configure script. +# VALUE may be 0, 1 or 2 for a computed quote escaped value based on +# VARNAME. Any other value will be used directly. +m4_define([_LT_DECL], +[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], + [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], + [m4_ifval([$1], [$1], [$2])]) + lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) + m4_ifval([$4], + [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) + lt_dict_add_subkey([lt_decl_dict], [$2], + [tagged?], [m4_ifval([$5], [yes], [no])])]) +]) + + +# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) +# -------------------------------------------------------- +m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) + + +# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_tag_varnames], +[_lt_decl_filter([tagged?], [yes], $@)]) + + +# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) +# --------------------------------------------------------- +m4_define([_lt_decl_filter], +[m4_case([$#], + [0], [m4_fatal([$0: too few arguments: $#])], + [1], [m4_fatal([$0: too few arguments: $#: $1])], + [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], + [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], + [lt_dict_filter([lt_decl_dict], $@)])[]dnl +]) + + +# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) +# -------------------------------------------------- +m4_define([lt_decl_quote_varnames], +[_lt_decl_filter([value], [1], $@)]) + + +# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_dquote_varnames], +[_lt_decl_filter([value], [2], $@)]) + + +# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_varnames_tagged], +[m4_assert([$# <= 2])dnl +_$0(m4_quote(m4_default([$1], [[, ]])), + m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), + m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) +m4_define([_lt_decl_varnames_tagged], +[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) + + +# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_all_varnames], +[_$0(m4_quote(m4_default([$1], [[, ]])), + m4_if([$2], [], + m4_quote(lt_decl_varnames), + m4_quote(m4_shift($@))))[]dnl +]) +m4_define([_lt_decl_all_varnames], +[lt_join($@, lt_decl_varnames_tagged([$1], + lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl +]) + + +# _LT_CONFIG_STATUS_DECLARE([VARNAME]) +# ------------------------------------ +# Quote a variable value, and forward it to 'config.status' so that its +# declaration there will have the same value as in 'configure'. VARNAME +# must have a single quote delimited value for this to work. +m4_define([_LT_CONFIG_STATUS_DECLARE], +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) + + +# _LT_CONFIG_STATUS_DECLARATIONS +# ------------------------------ +# We delimit libtool config variables with single quotes, so when +# we write them to config.status, we have to be sure to quote all +# embedded single quotes properly. In configure, this macro expands +# each variable declared with _LT_DECL (and _LT_TAGDECL) into: +# +# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' +m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], +[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), + [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) + + +# _LT_LIBTOOL_TAGS +# ---------------- +# Output comment and list of tags supported by the script +m4_defun([_LT_LIBTOOL_TAGS], +[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl +available_tags='_LT_TAGS'dnl +]) + + +# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) +# ----------------------------------- +# Extract the dictionary values for VARNAME (optionally with TAG) and +# expand to a commented shell variable setting: +# +# # Some comment about what VAR is for. +# visible_name=$lt_internal_name +m4_define([_LT_LIBTOOL_DECLARE], +[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], + [description])))[]dnl +m4_pushdef([_libtool_name], + m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl +m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), + [0], [_libtool_name=[$]$1], + [1], [_libtool_name=$lt_[]$1], + [2], [_libtool_name=$lt_[]$1], + [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl +m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl +]) + + +# _LT_LIBTOOL_CONFIG_VARS +# ----------------------- +# Produce commented declarations of non-tagged libtool config variables +# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool' +# script. Tagged libtool config variables (even for the LIBTOOL CONFIG +# section) are produced by _LT_LIBTOOL_TAG_VARS. +m4_defun([_LT_LIBTOOL_CONFIG_VARS], +[m4_foreach([_lt_var], + m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) + + +# _LT_LIBTOOL_TAG_VARS(TAG) +# ------------------------- +m4_define([_LT_LIBTOOL_TAG_VARS], +[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) + + +# _LT_TAGVAR(VARNAME, [TAGNAME]) +# ------------------------------ +m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) + + +# _LT_CONFIG_COMMANDS +# ------------------- +# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of +# variables for single and double quote escaping we saved from calls +# to _LT_DECL, we can put quote escaped variables declarations +# into 'config.status', and then the shell code to quote escape them in +# for loops in 'config.status'. Finally, any additional code accumulated +# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. +m4_defun([_LT_CONFIG_COMMANDS], +[AC_PROVIDE_IFELSE([LT_OUTPUT], + dnl If the libtool generation code has been placed in $CONFIG_LT, + dnl instead of duplicating it all over again into config.status, + dnl then we will have config.status run $CONFIG_LT later, so it + dnl needs to know what name is stored there: + [AC_CONFIG_COMMANDS([libtool], + [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], + dnl If the libtool generation code is destined for config.status, + dnl expand the accumulated commands and init code now: + [AC_CONFIG_COMMANDS([libtool], + [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) +])#_LT_CONFIG_COMMANDS + + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], +[ + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +sed_quote_subst='$sed_quote_subst' +double_quote_subst='$double_quote_subst' +delay_variable_subst='$delay_variable_subst' +_LT_CONFIG_STATUS_DECLARATIONS +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$[]1 +_LTECHO_EOF' +} + +# Quote evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_quote_varnames); do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +# Double-quote double-evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_dquote_varnames); do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +_LT_OUTPUT_LIBTOOL_INIT +]) + +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) +# ------------------------------------ +# Generate a child script FILE with all initialization necessary to +# reuse the environment learned by the parent script, and make the +# file executable. If COMMENT is supplied, it is inserted after the +# '#!' sequence but before initialization text begins. After this +# macro, additional text can be appended to FILE to form the body of +# the child script. The macro ends with non-zero status if the +# file could not be fully written (such as if the disk is full). +m4_ifdef([AS_INIT_GENERATED], +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], +[m4_defun([_LT_GENERATED_FILE_INIT], +[m4_require([AS_PREPARE])]dnl +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl +[lt_write_fail=0 +cat >$1 <<_ASEOF || lt_write_fail=1 +#! $SHELL +# Generated by $as_me. +$2 +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$1 <<\_ASEOF || lt_write_fail=1 +AS_SHELL_SANITIZE +_AS_PREPARE +exec AS_MESSAGE_FD>&1 +_ASEOF +test 0 = "$lt_write_fail" && chmod +x $1[]dnl +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT + +# LT_OUTPUT +# --------- +# This macro allows early generation of the libtool script (before +# AC_OUTPUT is called), incase it is used in configure for compilation +# tests. +AC_DEFUN([LT_OUTPUT], +[: ${CONFIG_LT=./config.lt} +AC_MSG_NOTICE([creating $CONFIG_LT]) +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], +[# Run this file to recreate a libtool stub with the current configuration.]) + +cat >>"$CONFIG_LT" <<\_LTEOF +lt_cl_silent=false +exec AS_MESSAGE_LOG_FD>>config.log +{ + echo + AS_BOX([Running $as_me.]) +} >&AS_MESSAGE_LOG_FD + +lt_cl_help="\ +'$as_me' creates a local libtool stub from the current configuration, +for use in further configure time tests before the real libtool is +generated. + +Usage: $[0] [[OPTIONS]] + + -h, --help print this help, then exit + -V, --version print version number, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + +Report bugs to ." + +lt_cl_version="\ +m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl +m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) +configured by $[0], generated by m4_PACKAGE_STRING. + +Copyright (C) 2011 Free Software Foundation, Inc. +This config.lt script is free software; the Free Software Foundation +gives unlimited permision to copy, distribute and modify it." + +while test 0 != $[#] +do + case $[1] in + --version | --v* | -V ) + echo "$lt_cl_version"; exit 0 ;; + --help | --h* | -h ) + echo "$lt_cl_help"; exit 0 ;; + --debug | --d* | -d ) + debug=: ;; + --quiet | --q* | --silent | --s* | -q ) + lt_cl_silent=: ;; + + -*) AC_MSG_ERROR([unrecognized option: $[1] +Try '$[0] --help' for more information.]) ;; + + *) AC_MSG_ERROR([unrecognized argument: $[1] +Try '$[0] --help' for more information.]) ;; + esac + shift +done + +if $lt_cl_silent; then + exec AS_MESSAGE_FD>/dev/null +fi +_LTEOF + +cat >>"$CONFIG_LT" <<_LTEOF +_LT_OUTPUT_LIBTOOL_COMMANDS_INIT +_LTEOF + +cat >>"$CONFIG_LT" <<\_LTEOF +AC_MSG_NOTICE([creating $ofile]) +_LT_OUTPUT_LIBTOOL_COMMANDS +AS_EXIT(0) +_LTEOF +chmod +x "$CONFIG_LT" + +# configure is writing to config.log, but config.lt does its own redirection, +# appending to config.log, which fails on DOS, as config.log is still kept +# open by configure. Here we exec the FD to /dev/null, effectively closing +# config.log, so it can be properly (re)opened and appended to by config.lt. +lt_cl_success=: +test yes = "$silent" && + lt_config_lt_args="$lt_config_lt_args --quiet" +exec AS_MESSAGE_LOG_FD>/dev/null +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false +exec AS_MESSAGE_LOG_FD>>config.log +$lt_cl_success || AS_EXIT(1) +])# LT_OUTPUT + + +# _LT_CONFIG(TAG) +# --------------- +# If TAG is the built-in tag, create an initial libtool script with a +# default configuration from the untagged config vars. Otherwise add code +# to config.status for appending the configuration named by TAG from the +# matching tagged config vars. +m4_defun([_LT_CONFIG], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_CONFIG_SAVE_COMMANDS([ + m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl + m4_if(_LT_TAG, [C], [ + # See if we are running on zsh, and set the options that allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST + fi + + cfgfile=${ofile}T + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" + + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL +# Generated automatically by $as_me ($PACKAGE) $VERSION +# NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + +_LT_COPYING +_LT_LIBTOOL_TAGS + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} + +# ### BEGIN LIBTOOL CONFIG +_LT_LIBTOOL_CONFIG_VARS +_LT_LIBTOOL_TAG_VARS +# ### END LIBTOOL CONFIG + +_LT_EOF + + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +_LT_PREPARE_MUNGE_PATH_LIST +_LT_PREPARE_CC_BASENAME + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test set != "${COLLECT_NAMES+set}"; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +_LT_EOF + ;; + esac + + _LT_PROG_LTMAIN + + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +], +[cat <<_LT_EOF >> "$ofile" + +dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded +dnl in a comment (ie after a #). +# ### BEGIN LIBTOOL TAG CONFIG: $1 +_LT_LIBTOOL_TAG_VARS(_LT_TAG) +# ### END LIBTOOL TAG CONFIG: $1 +_LT_EOF +])dnl /m4_if +], +[m4_if([$1], [], [ + PACKAGE='$PACKAGE' + VERSION='$VERSION' + RM='$RM' + ofile='$ofile'], []) +])dnl /_LT_CONFIG_SAVE_COMMANDS +])# _LT_CONFIG + + +# LT_SUPPORTED_TAG(TAG) +# --------------------- +# Trace this macro to discover what tags are supported by the libtool +# --tag option, using: +# autoconf --trace 'LT_SUPPORTED_TAG:$1' +AC_DEFUN([LT_SUPPORTED_TAG], []) + + +# C support is built-in for now +m4_define([_LT_LANG_C_enabled], []) +m4_define([_LT_TAGS], []) + + +# LT_LANG(LANG) +# ------------- +# Enable libtool support for the given language if not already enabled. +AC_DEFUN([LT_LANG], +[AC_BEFORE([$0], [LT_OUTPUT])dnl +m4_case([$1], + [C], [_LT_LANG(C)], + [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], + [Java], [_LT_LANG(GCJ)], + [Fortran 77], [_LT_LANG(F77)], + [Fortran], [_LT_LANG(FC)], + [Windows Resource], [_LT_LANG(RC)], + [m4_ifdef([_LT_LANG_]$1[_CONFIG], + [_LT_LANG($1)], + [m4_fatal([$0: unsupported language: "$1"])])])dnl +])# LT_LANG + + +# _LT_LANG(LANGNAME) +# ------------------ +m4_defun([_LT_LANG], +[m4_ifdef([_LT_LANG_]$1[_enabled], [], + [LT_SUPPORTED_TAG([$1])dnl + m4_append([_LT_TAGS], [$1 ])dnl + m4_define([_LT_LANG_]$1[_enabled], [])dnl + _LT_LANG_$1_CONFIG($1)])dnl +])# _LT_LANG + + +m4_ifndef([AC_PROG_GO], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + +# _LT_LANG_DEFAULT_CONFIG +# ----------------------- +m4_defun([_LT_LANG_DEFAULT_CONFIG], +[AC_PROVIDE_IFELSE([AC_PROG_CXX], + [LT_LANG(CXX)], + [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) + +AC_PROVIDE_IFELSE([AC_PROG_F77], + [LT_LANG(F77)], + [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) + +AC_PROVIDE_IFELSE([AC_PROG_FC], + [LT_LANG(FC)], + [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) + +dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal +dnl pulling things in needlessly. +AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([LT_PROG_GCJ], + [LT_LANG(GCJ)], + [m4_ifdef([AC_PROG_GCJ], + [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([A][M_PROG_GCJ], + [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([LT_PROG_GCJ], + [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) + +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + +AC_PROVIDE_IFELSE([LT_PROG_RC], + [LT_LANG(RC)], + [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) +])# _LT_LANG_DEFAULT_CONFIG + +# Obsolete macros: +AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) +AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) +AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) +AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_CXX], []) +dnl AC_DEFUN([AC_LIBTOOL_F77], []) +dnl AC_DEFUN([AC_LIBTOOL_FC], []) +dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) +dnl AC_DEFUN([AC_LIBTOOL_RC], []) + + +# _LT_TAG_COMPILER +# ---------------- +m4_defun([_LT_TAG_COMPILER], +[AC_REQUIRE([AC_PROG_CC])dnl + +_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl +_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl +_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl +_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC +])# _LT_TAG_COMPILER + + +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with +# the simple compiler test code. +m4_defun([_LT_COMPILER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* +])# _LT_COMPILER_BOILERPLATE + + +# _LT_LINKER_BOILERPLATE +# ---------------------- +# Check for linker boilerplate output or warnings with +# the simple link test code. +m4_defun([_LT_LINKER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* +])# _LT_LINKER_BOILERPLATE + +# _LT_REQUIRED_DARWIN_CHECKS +# ------------------------- +m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ + case $host_os in + rhapsody* | darwin*) + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) + AC_CHECK_TOOL([LIPO], [lipo], [:]) + AC_CHECK_TOOL([OTOOL], [otool], [:]) + AC_CHECK_TOOL([OTOOL64], [otool64], [:]) + _LT_DECL([], [DSYMUTIL], [1], + [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) + _LT_DECL([], [NMEDIT], [1], + [Tool to change global to local symbols on Mac OS X]) + _LT_DECL([], [LIPO], [1], + [Tool to manipulate fat objects and archives on Mac OS X]) + _LT_DECL([], [OTOOL], [1], + [ldd/readelf like tool for Mach-O binaries on Mac OS X]) + _LT_DECL([], [OTOOL64], [1], + [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) + + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], + [lt_cv_apple_cc_single_mod=no + if test -z "$LT_MULTI_MODULE"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -rf libconftest.dylib* + rm -f conftest.* + fi]) + + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS=$save_LDFLAGS + ]) + + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], + [lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + ]) + case $host_os in + rhapsody* | darwin1.[[012]]) + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[[012]][[,.]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test yes = "$lt_cv_apple_cc_single_mod"; then + _lt_dar_single_mod='$single_module' + fi + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' + fi + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac +]) + + +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- +# Checks for linker and compiler features on darwin +m4_defun([_LT_DARWIN_LINKER_FEATURES], +[ + m4_require([_LT_REQUIRED_DARWIN_CHECKS]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_automatic, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + if test yes = "$lt_cv_ld_force_load"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='' + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined + case $cc_basename in + ifort*|nagfor*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test yes = "$_lt_dar_can_shared"; then + output_verbose_link_cmd=func_echo_all + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + m4_if([$1], [CXX], +[ if test yes != "$lt_cv_apple_cc_single_mod"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + fi +],[]) + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +]) + +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) +# ---------------------------------- +# Links a minimal program and checks the executable +# for the system default hardcoded library path. In most cases, +# this is /usr/lib:/lib, but when the MPI compilers are used +# the location of the communication and MPI libs are included too. +# If we don't find anything, use the default library path according +# to the aix ld manual. +# Store the results from the different compilers for each TAGNAME. +# Allow to override them for all tags through lt_cv_aix_libpath. +m4_defun([_LT_SYS_MODULE_PATH_AIX], +[m4_require([_LT_DECL_SED])dnl +if test set = "${lt_cv_aix_libpath+set}"; then + aix_libpath=$lt_cv_aix_libpath +else + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ + lt_aix_libpath_sed='[ + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }]' + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi],[]) + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib + fi + ]) + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) +fi +])# _LT_SYS_MODULE_PATH_AIX + + +# _LT_SHELL_INIT(ARG) +# ------------------- +m4_define([_LT_SHELL_INIT], +[m4_divert_text([M4SH-INIT], [$1 +])])# _LT_SHELL_INIT + + + +# _LT_PROG_ECHO_BACKSLASH +# ----------------------- +# Find how we can fake an echo command that does not interpret backslash. +# In particular, with Autoconf 2.60 or later we add some code to the start +# of the generated configure script that will find a shell with a builtin +# printf (that we can use as an echo command). +m4_defun([_LT_PROG_ECHO_BACKSLASH], +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +AC_MSG_CHECKING([how to print strings]) +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$[]1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + +case $ECHO in + printf*) AC_MSG_RESULT([printf]) ;; + print*) AC_MSG_RESULT([print -r]) ;; + *) AC_MSG_RESULT([cat]) ;; +esac + +m4_ifdef([_AS_DETECT_SUGGESTED], +[_AS_DETECT_SUGGESTED([ + test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test "X`printf %s $ECHO`" = "X$ECHO" \ + || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) + +_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) +_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) +])# _LT_PROG_ECHO_BACKSLASH + + +# _LT_WITH_SYSROOT +# ---------------- +AC_DEFUN([_LT_WITH_SYSROOT], +[AC_MSG_CHECKING([for sysroot]) +AC_ARG_WITH([sysroot], +[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], + [Search for dependent libraries within DIR (or the compiler's sysroot + if not specified).])], +[], [with_sysroot=no]) + +dnl lt_sysroot will always be passed unquoted. We quote it here +dnl in case the user passed a directory name. +lt_sysroot= +case $with_sysroot in #( + yes) + if test yes = "$GCC"; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + AC_MSG_RESULT([$with_sysroot]) + AC_MSG_ERROR([The sysroot must be an absolute path.]) + ;; +esac + + AC_MSG_RESULT([${lt_sysroot:-no}]) +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl +[dependent libraries, and where our libraries should be installed.])]) + +# _LT_ENABLE_LOCK +# --------------- +m4_defun([_LT_ENABLE_LOCK], +[AC_ARG_ENABLE([libtool-lock], + [AS_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +test no = "$enable_libtool_lock" || enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE=32 + ;; + *ELF-64*) + HPUX_IA64_MODE=64 + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + if test yes = "$lt_cv_prog_gnu_ld"; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; + +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -belf" + AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, + [AC_LANG_PUSH(C) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) + AC_LANG_POP]) + if test yes != "$lt_cv_cc_needs_belf"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS=$SAVE_CFLAGS + fi + ;; +*-*solaris*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) + case $host in + i?86-*-solaris*|x86_64-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD=${LD-ld}_sol2 + fi + ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; +esac + +need_locks=$enable_libtool_lock +])# _LT_ENABLE_LOCK + + +# _LT_PROG_AR +# ----------- +m4_defun([_LT_PROG_AR], +[AC_CHECK_TOOLS(AR, [ar], false) +: ${AR=ar} +: ${AR_FLAGS=cru} +_LT_DECL([], [AR], [1], [The archiver]) +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], + [lt_cv_ar_at_file=no + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], + [echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([lt_ar_try]) + if test 0 -eq "$ac_status"; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + AC_TRY_EVAL([lt_ar_try]) + if test 0 -ne "$ac_status"; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + ]) + ]) + +if test no = "$lt_cv_ar_at_file"; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi +_LT_DECL([], [archiver_list_spec], [1], + [How to feed a file listing to the archiver]) +])# _LT_PROG_AR + + +# _LT_CMD_OLD_ARCHIVE +# ------------------- +m4_defun([_LT_CMD_OLD_ARCHIVE], +[_LT_PROG_AR + +AC_CHECK_TOOL(STRIP, strip, :) +test -z "$STRIP" && STRIP=: +_LT_DECL([], [STRIP], [1], [A symbol stripping program]) + +AC_CHECK_TOOL(RANLIB, ranlib, :) +test -z "$RANLIB" && RANLIB=: +_LT_DECL([], [RANLIB], [1], + [Commands used to install an old-style archive]) + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + bitrig* | openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" +fi + +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac +_LT_DECL([], [old_postinstall_cmds], [2]) +_LT_DECL([], [old_postuninstall_cmds], [2]) +_LT_TAGDECL([], [old_archive_cmds], [2], + [Commands used to build an old-style archive]) +_LT_DECL([], [lock_old_archive_extraction], [0], + [Whether to use a lock for old archive extraction]) +])# _LT_CMD_OLD_ARCHIVE + + +# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------------------- +# Check whether the given compiler option works +AC_DEFUN([_LT_COMPILER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl +AC_CACHE_CHECK([$1], [$2], + [$2=no + m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + fi + $RM conftest* +]) + +if test yes = "[$]$2"; then + m4_if([$5], , :, [$5]) +else + m4_if([$6], , :, [$6]) +fi +])# _LT_COMPILER_OPTION + +# Old name: +AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) + + +# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------- +# Check whether the given linker option works +AC_DEFUN([_LT_LINKER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl +AC_CACHE_CHECK([$1], [$2], + [$2=no + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS $3" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&AS_MESSAGE_LOG_FD + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + else + $2=yes + fi + fi + $RM -r conftest* + LDFLAGS=$save_LDFLAGS +]) + +if test yes = "[$]$2"; then + m4_if([$4], , :, [$4]) +else + m4_if([$5], , :, [$5]) +fi +])# _LT_LINKER_OPTION + +# Old name: +AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) + + +# LT_CMD_MAX_LEN +#--------------- +AC_DEFUN([LT_CMD_MAX_LEN], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +# find the maximum length of command line arguments +AC_MSG_CHECKING([the maximum length of command line arguments]) +AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + i=0 + teststring=ABCD + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && + test 17 != "$i" # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; + esac +]) +if test -n "$lt_cv_sys_max_cmd_len"; then + AC_MSG_RESULT($lt_cv_sys_max_cmd_len) +else + AC_MSG_RESULT(none) +fi +max_cmd_len=$lt_cv_sys_max_cmd_len +_LT_DECL([], [max_cmd_len], [0], + [What is the maximum length of a command?]) +])# LT_CMD_MAX_LEN + +# Old name: +AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) + + +# _LT_HEADER_DLFCN +# ---------------- +m4_defun([_LT_HEADER_DLFCN], +[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl +])# _LT_HEADER_DLFCN + + +# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +# ---------------------------------------------------------------- +m4_defun([_LT_TRY_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl +if test yes = "$cross_compiling"; then : + [$4] +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +[#line $LINENO "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +/* When -fvisibility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +}] +_LT_EOF + if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) $1 ;; + x$lt_dlneed_uscore) $2 ;; + x$lt_dlunknown|x*) $3 ;; + esac + else : + # compilation failed + $3 + fi +fi +rm -fr conftest* +])# _LT_TRY_DLOPEN_SELF + + +# LT_SYS_DLOPEN_SELF +# ------------------ +AC_DEFUN([LT_SYS_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl +if test yes != "$enable_dlopen"; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen=load_add_on + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32* | cegcc*) + lt_cv_dlopen=LoadLibrary + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ + lt_cv_dlopen=dyld + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ]) + ;; + + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + + *) + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen=shl_load], + [AC_CHECK_LIB([dld], [shl_load], + [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], + [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=-ldld]) + ]) + ]) + ]) + ]) + ]) + ;; + esac + + if test no = "$lt_cv_dlopen"; then + enable_dlopen=no + else + enable_dlopen=yes + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS=$LDFLAGS + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS=$LIBS + LIBS="$lt_cv_dlopen_libs $LIBS" + + AC_CACHE_CHECK([whether a program can dlopen itself], + lt_cv_dlopen_self, [dnl + _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, + lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) + ]) + + if test yes = "$lt_cv_dlopen_self"; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + AC_CACHE_CHECK([whether a statically linked program can dlopen itself], + lt_cv_dlopen_self_static, [dnl + _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, + lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) + ]) + fi + + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi +_LT_DECL([dlopen_support], [enable_dlopen], [0], + [Whether dlopen is supported]) +_LT_DECL([dlopen_self], [enable_dlopen_self], [0], + [Whether dlopen of programs is supported]) +_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], + [Whether dlopen of statically linked programs is supported]) +])# LT_SYS_DLOPEN_SELF + +# Old name: +AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) + + +# _LT_COMPILER_C_O([TAGNAME]) +# --------------------------- +# Check to see if options -c and -o are simultaneously supported by compiler. +# This macro does not hard code the compiler like AC_PROG_CC_C_O. +m4_defun([_LT_COMPILER_C_O], +[m4_require([_LT_DECL_SED])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + fi + fi + chmod u+w . 2>&AS_MESSAGE_LOG_FD + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* +]) +_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], + [Does compiler simultaneously support -c and -o options?]) +])# _LT_COMPILER_C_O + + +# _LT_COMPILER_FILE_LOCKS([TAGNAME]) +# ---------------------------------- +# Check to see if we can do hard links to lock some files if needed +m4_defun([_LT_COMPILER_FILE_LOCKS], +[m4_require([_LT_ENABLE_LOCK])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_COMPILER_C_O([$1]) + +hard_links=nottested +if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then + # do not overwrite the value of need_locks provided by the user + AC_MSG_CHECKING([if we can lock with hard links]) + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + AC_MSG_RESULT([$hard_links]) + if test no = "$hard_links"; then + AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) + need_locks=warn + fi +else + need_locks=no +fi +_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) +])# _LT_COMPILER_FILE_LOCKS + + +# _LT_CHECK_OBJDIR +# ---------------- +m4_defun([_LT_CHECK_OBJDIR], +[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], +[rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null]) +objdir=$lt_cv_objdir +_LT_DECL([], [objdir], [0], + [The name of the directory that contains temporary libtool files])dnl +m4_pattern_allow([LT_OBJDIR])dnl +AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/", + [Define to the sub-directory where libtool stores uninstalled libraries.]) +])# _LT_CHECK_OBJDIR + + +# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) +# -------------------------------------- +# Check hardcoding attributes. +m4_defun([_LT_LINKER_HARDCODE_LIBPATH], +[AC_MSG_CHECKING([how to hardcode library paths into programs]) +_LT_TAGVAR(hardcode_action, $1)= +if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || + test -n "$_LT_TAGVAR(runpath_var, $1)" || + test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then + + # We can hardcode non-existent directories. + if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && + test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then + # Linking always hardcodes the temporary library directory. + _LT_TAGVAR(hardcode_action, $1)=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + _LT_TAGVAR(hardcode_action, $1)=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + _LT_TAGVAR(hardcode_action, $1)=unsupported +fi +AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) + +if test relink = "$_LT_TAGVAR(hardcode_action, $1)" || + test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then + # Fast installation is not supported + enable_fast_install=no +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then + # Fast installation is not necessary + enable_fast_install=needless +fi +_LT_TAGDECL([], [hardcode_action], [0], + [How to hardcode a shared library path into an executable]) +])# _LT_LINKER_HARDCODE_LIBPATH + + +# _LT_CMD_STRIPLIB +# ---------------- +m4_defun([_LT_CMD_STRIPLIB], +[m4_require([_LT_DECL_EGREP]) +striplib= +old_striplib= +AC_MSG_CHECKING([whether stripping libraries is possible]) +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP"; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) + AC_MSG_RESULT([no]) + ;; + esac +fi +_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) +_LT_DECL([], [striplib], [1]) +])# _LT_CMD_STRIPLIB + + +# _LT_PREPARE_MUNGE_PATH_LIST +# --------------------------- +# Make sure func_munge_path_list() is defined correctly. +m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], +[[# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x@S|@2 in + x) + ;; + *:) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" + ;; + x:*) + eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" + ;; + *) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + esac +} +]])# _LT_PREPARE_PATH_LIST + + +# _LT_SYS_DYNAMIC_LINKER([TAG]) +# ----------------------------- +# PORTME Fill in your ld.so characteristics +m4_defun([_LT_SYS_DYNAMIC_LINKER], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_OBJDUMP])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl +AC_MSG_CHECKING([dynamic linker characteristics]) +m4_if([$1], + [], [ +if test yes = "$GCC"; then + case $host_os in + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; + esac + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary... + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo = "/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[[lt_foo]]++; } + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } +}'` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi]) +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=.so +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +AC_ARG_VAR([LT_SYS_LIBRARY_PATH], +[User-defined run-time library search path.]) + +case $host_os in +aix3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='$libname$release$shared_ext$major' + ;; + +aix[[4-9]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test ia64 = "$host_cpu"; then + # AIX 5 supports IA64 + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[[01]] | aix4.[[01]].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a[(]lib.so.V[)]' + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; + +beos*) + library_names_spec='$libname$shared_ext' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[[45]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=.dll + need_version=no + need_lib_prefix=no + + case $GCC,$cc_basename in + yes,*) + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec=$LIB + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' + ;; + + *) + # Assume MSVC wrapper + library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; + esac + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[[23]].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2.*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[[01]]* | freebsdelf3.[[01]]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=no + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 + fi + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 + ;; + +interix[[3-9]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test yes = "$lt_cv_prog_gnu_ld"; then + version_type=linux # correct to gnu/linux during the next big refactor + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH + AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], + [lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], + [lt_cv_shlibpath_overrides_runpath=yes])]) + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + ]) + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; + +openbsd* | bitrig*) + version_type=sunos + sys_lib_dlsearch_path_spec=/usr/lib + need_lib_prefix=no + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no + else + need_version=yes + fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +os2*) + libname_spec='$name' + version_type=windows + shrext_cmds=.dll + need_version=no + need_lib_prefix=no + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + +rdos*) + dynamic_linker=no + ;; + +solaris*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test yes = "$with_gnu_ld"; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec; then + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=sco + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test yes = "$with_gnu_ld"; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +uts4*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no + ;; +esac +AC_MSG_RESULT([$dynamic_linker]) +test no = "$dynamic_linker" && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test yes = "$GCC"; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec +fi + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec +fi + +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + +_LT_DECL([], [variables_saved_for_relink], [1], + [Variables whose values should be saved in libtool wrapper scripts and + restored at link time]) +_LT_DECL([], [need_lib_prefix], [0], + [Do we need the "lib" prefix for modules?]) +_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) +_LT_DECL([], [version_type], [0], [Library versioning type]) +_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) +_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) +_LT_DECL([], [shlibpath_overrides_runpath], [0], + [Is shlibpath searched before the hard-coded library search path?]) +_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) +_LT_DECL([], [library_names_spec], [1], + [[List of archive names. First name is the real one, the rest are links. + The last name is the one that the linker finds with -lNAME]]) +_LT_DECL([], [soname_spec], [1], + [[The coded name of the library, if different from the real name]]) +_LT_DECL([], [install_override_mode], [1], + [Permission mode override for installation of shared libraries]) +_LT_DECL([], [postinstall_cmds], [2], + [Command to use after installation of a shared archive]) +_LT_DECL([], [postuninstall_cmds], [2], + [Command to use after uninstallation of a shared archive]) +_LT_DECL([], [finish_cmds], [2], + [Commands used to finish a libtool library installation in a directory]) +_LT_DECL([], [finish_eval], [1], + [[As "finish_cmds", except a single script fragment to be evaled but + not shown]]) +_LT_DECL([], [hardcode_into_libs], [0], + [Whether we should hardcode library paths into libraries]) +_LT_DECL([], [sys_lib_search_path_spec], [2], + [Compile-time system search path for libraries]) +_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2], + [Detected run-time system search path for libraries]) +_LT_DECL([], [configure_time_lt_sys_library_path], [2], + [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) +])# _LT_SYS_DYNAMIC_LINKER + + +# _LT_PATH_TOOL_PREFIX(TOOL) +# -------------------------- +# find a file program that can recognize shared library +AC_DEFUN([_LT_PATH_TOOL_PREFIX], +[m4_require([_LT_DECL_EGREP])dnl +AC_MSG_CHECKING([for $1]) +AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, +[case $MAGIC_CMD in +[[\\/*] | ?:[\\/]*]) + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR +dnl $ac_dummy forces splitting on constant user-supplied paths. +dnl POSIX.2 word splitting is done only on the output of word expansions, +dnl not every word. This closes a longstanding sh security hole. + ac_dummy="m4_if([$2], , $PATH, [$2])" + for ac_dir in $ac_dummy; do + IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$1"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"$1" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD=$lt_cv_path_MAGIC_CMD + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD + ;; +esac]) +MAGIC_CMD=$lt_cv_path_MAGIC_CMD +if test -n "$MAGIC_CMD"; then + AC_MSG_RESULT($MAGIC_CMD) +else + AC_MSG_RESULT(no) +fi +_LT_DECL([], [MAGIC_CMD], [0], + [Used to examine libraries when file_magic_cmd begins with "file"])dnl +])# _LT_PATH_TOOL_PREFIX + +# Old name: +AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) + + +# _LT_PATH_MAGIC +# -------------- +# find a file program that can recognize a shared library +m4_defun([_LT_PATH_MAGIC], +[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) + else + MAGIC_CMD=: + fi +fi +])# _LT_PATH_MAGIC + + +# LT_PATH_LD +# ---------- +# find the pathname to the GNU or non-GNU linker +AC_DEFUN([LT_PATH_LD], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl + +AC_ARG_WITH([gnu-ld], + [AS_HELP_STRING([--with-gnu-ld], + [assume the C compiler uses GNU ld @<:@default=no@:>@])], + [test no = "$withval" || with_gnu_ld=yes], + [with_gnu_ld=no])dnl + +ac_prog=ld +if test yes = "$GCC"; then + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by $CC]) + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return, which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD=$ac_prog + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test yes = "$with_gnu_ld"; then + AC_MSG_CHECKING([for GNU ld]) +else + AC_MSG_CHECKING([for non-GNU ld]) +fi +AC_CACHE_VAL(lt_cv_path_LD, +[if test -z "$LD"; then + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD=$ac_dir/$ac_prog + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &1 conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd], +[if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi]) +rm -f conftest.i conftest2.i conftest.out]) +])# _LT_PATH_DD + + +# _LT_CMD_TRUNCATE +# ---------------- +# find command to truncate a binary pipe +m4_defun([_LT_CMD_TRUNCATE], +[m4_require([_LT_PATH_DD]) +AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin], +[printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"]) +_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1], + [Command to truncate a binary pipe]) +])# _LT_CMD_TRUNCATE + + +# _LT_CHECK_MAGIC_METHOD +# ---------------------- +# how to check for library dependencies +# -- PORTME fill in with the dynamic library characteristics +m4_defun([_LT_CHECK_MAGIC_METHOD], +[m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) +AC_CACHE_CHECK([how to recognize dependent libraries], +lt_cv_deplibs_check_method, +[lt_cv_file_magic_cmd='$MAGIC_CMD' +lt_cv_file_magic_test_file= +lt_cv_deplibs_check_method='unknown' +# Need to set the preceding variable on all platforms that support +# interlibrary dependencies. +# 'none' -- dependencies not supported. +# 'unknown' -- same as none, but documents that we really don't know. +# 'pass_all' -- all dependencies passed with no checks. +# 'test_compile' -- check by making test program. +# 'file_magic [[regex]]' -- check by looking for files in library path +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. + +case $host_os in +aix[[4-9]]*) + lt_cv_deplibs_check_method=pass_all + ;; + +beos*) + lt_cv_deplibs_check_method=pass_all + ;; + +bsdi[[45]]*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; + +cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; + +mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; + +cegcc*) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; + +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; + +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; + +interix[[3-9]]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' + ;; + +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + +netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' + fi + ;; + +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; + +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + fi + ;; + +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; + +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; + +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; +esac +]) + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` + fi + ;; + esac +fi + +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown + +_LT_DECL([], [deplibs_check_method], [1], + [Method to check whether dependent libraries are shared objects]) +_LT_DECL([], [file_magic_cmd], [1], + [Command to use when deplibs_check_method = "file_magic"]) +_LT_DECL([], [file_magic_glob], [1], + [How to find potential files when deplibs_check_method = "file_magic"]) +_LT_DECL([], [want_nocaseglob], [1], + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) +])# _LT_CHECK_MAGIC_METHOD + + +# LT_PATH_NM +# ---------- +# find the pathname to a BSD- or MS-compatible name lister +AC_DEFUN([LT_PATH_NM], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, +[if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM=$NM +else + lt_nm_to_check=${ac_tool_prefix}nm + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break 2 + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break 2 + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac + fi + done + IFS=$lt_save_ifs + done + : ${lt_cv_path_NM=no} +fi]) +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM +else + # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols -headers" + ;; + *) + DUMPBIN=: + ;; + esac + fi + AC_SUBST([DUMPBIN]) + if test : != "$DUMPBIN"; then + NM=$DUMPBIN + fi +fi +test -z "$NM" && NM=nm +AC_SUBST([NM]) +_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl + +AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], + [lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) + cat conftest.out >&AS_MESSAGE_LOG_FD + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest*]) +])# LT_PATH_NM + +# Old names: +AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) +AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_PROG_NM], []) +dnl AC_DEFUN([AC_PROG_NM], []) + +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB +# -------------------------------- +# how to determine the name of the shared library +# associated with a specific link library. +# -- PORTME fill in with the dynamic library characteristics +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], +[m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) +m4_require([_LT_DECL_DLLTOOL]) +AC_CACHE_CHECK([how to associate runtime and link libraries], +lt_cv_sharedlib_from_linklib_cmd, +[lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd=$ECHO + ;; +esac +]) +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], + [Command to associate shared and link libraries]) +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB + + +# _LT_PATH_MANIFEST_TOOL +# ---------------------- +# locate the manifest tool +m4_defun([_LT_PATH_MANIFEST_TOOL], +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], + [lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&AS_MESSAGE_LOG_FD + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest*]) +if test yes != "$lt_cv_path_mainfest_tool"; then + MANIFEST_TOOL=: +fi +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl +])# _LT_PATH_MANIFEST_TOOL + + +# _LT_DLL_DEF_P([FILE]) +# --------------------- +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with func_dll_def_p in the libtool script +AC_DEFUN([_LT_DLL_DEF_P], +[dnl + test DEF = "`$SED -n dnl + -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace + -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments + -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl + -e q dnl Only consider the first "real" line + $1`" dnl +])# _LT_DLL_DEF_P + + +# LT_LIB_M +# -------- +# check for math library +AC_DEFUN([LT_LIB_M], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +LIBM= +case $host in +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) + # These system don't have libm, or don't need it + ;; +*-ncr-sysv4.3*) + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) + AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") + ;; +*) + AC_CHECK_LIB(m, cos, LIBM=-lm) + ;; +esac +AC_SUBST([LIBM]) +])# LT_LIB_M + +# Old name: +AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_CHECK_LIBM], []) + + +# _LT_COMPILER_NO_RTTI([TAGNAME]) +# ------------------------------- +m4_defun([_LT_COMPILER_NO_RTTI], +[m4_require([_LT_TAG_COMPILER])dnl + +_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + +if test yes = "$GCC"; then + case $cc_basename in + nvcc*) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; + *) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; + esac + + _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], + lt_cv_prog_compiler_rtti_exceptions, + [-fno-rtti -fno-exceptions], [], + [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) +fi +_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], + [Compiler flag to turn off builtin functions]) +])# _LT_COMPILER_NO_RTTI + + +# _LT_CMD_GLOBAL_SYMBOLS +# ---------------------- +m4_defun([_LT_CMD_GLOBAL_SYMBOLS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([LT_PATH_NM])dnl +AC_REQUIRE([LT_PATH_LD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_TAG_COMPILER])dnl + +# Check for command to grab the raw symbol name followed by C symbol from nm. +AC_MSG_CHECKING([command to parse $NM output from $compiler object]) +AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], +[ +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +# Character class describing NM global symbol codes. +symcode='[[BCDEGRST]]' + +# Regexp to match symbols that can be accessed directly from C. +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' + +# Define system-specific variables. +case $host_os in +aix*) + symcode='[[BCDT]]' + ;; +cygwin* | mingw* | pw32* | cegcc*) + symcode='[[ABCDGISTW]]' + ;; +hpux*) + if test ia64 = "$host_cpu"; then + symcode='[[ABCDEGRST]]' + fi + ;; +irix* | nonstopux*) + symcode='[[BCDEGRST]]' + ;; +osf*) + symcode='[[BCDEGQRST]]' + ;; +solaris*) + symcode='[[BDRT]]' + ;; +sco3.2v5*) + symcode='[[DT]]' + ;; +sysv4.2uw2*) + symcode='[[DT]]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[[ABDT]]' + ;; +sysv4) + symcode='[[DFNSTU]]' + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[[ABCDGIRSTW]]' ;; +esac + +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" + +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac + +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do + + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK ['"\ +" {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx]" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no + + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; +void nm_test_func(void); +void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +_LT_EOF + + if AC_TRY_EVAL(ac_compile); then + # Now try to grab the symbols. + nlist=conftest.nm + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi + + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT@&t@_DLSYM_CONST +#elif defined __osf__ +/* This system does not cope well with relocations in const data. */ +# define LT@&t@_DLSYM_CONST +#else +# define LT@&t@_DLSYM_CONST const +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +_LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' + + cat <<_LT_EOF >> conftest.$ac_ext + +/* The mapping between symbol names and symbols. */ +LT@&t@_DLSYM_CONST struct { + const char *name; + void *address; +} +lt__PROGRAM__LTX_preloaded_symbols[[]] = +{ + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} +}; + +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif + +#ifdef __cplusplus +} +#endif +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS + LIBS=conftstm.$ac_objext + CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then + pipe_works=yes + fi + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD + fi + else + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 + fi + rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test yes = "$pipe_works"; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done +]) +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + AC_MSG_RESULT(failed) +else + AC_MSG_RESULT(ok) +fi + +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + +_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], + [Take the output of nm and produce a listing of raw symbols and C names]) +_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], + [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1], + [Transform the output of nm into a list of symbols to manually relocate]) +_LT_DECL([global_symbol_to_c_name_address], + [lt_cv_sys_global_symbol_to_c_name_address], [1], + [Transform the output of nm in a C name address pair]) +_LT_DECL([global_symbol_to_c_name_address_lib_prefix], + [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], + [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([nm_interface], [lt_cv_nm_interface], [1], + [The name lister interface]) +_LT_DECL([], [nm_file_list_spec], [1], + [Specify filename containing input files for $NM]) +]) # _LT_CMD_GLOBAL_SYMBOLS + + +# _LT_COMPILER_PIC([TAGNAME]) +# --------------------------- +m4_defun([_LT_COMPILER_PIC], +[m4_require([_LT_TAG_COMPILER])dnl +_LT_TAGVAR(lt_prog_compiler_wl, $1)= +_LT_TAGVAR(lt_prog_compiler_pic, $1)= +_LT_TAGVAR(lt_prog_compiler_static, $1)= + +m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test yes = "$GXX"; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + else + case $host_os in + aix[[4-9]]*) + # All AIX code is PIC. + if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + chorus*) + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler + # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + dgux*) + case $cc_basename in + ec++*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + ghcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + fi + ;; + aCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + ;; + *) + ;; + esac + ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; + esac + ;; + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + KCC*) + # KAI C++ Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + ecpc* ) + # old Intel C++ for x86_64, which still supported -KPIC. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + icpc* ) + # Intel C++, used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + esac + ;; + esac + ;; + lynxos*) + ;; + m88k*) + ;; + mvs*) + case $cc_basename in + cxx*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' + ;; + *) + ;; + esac + ;; + netbsd* | netbsdelf*-gnu) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + ;; + RCC*) + # Rational C++ 2.4.1 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + cxx*) + # Digital/Compaq C++ + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) + ;; + esac + ;; + psos*) + ;; + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + ;; + *) + ;; + esac + ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + lcc*) + # Lucid + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + *) + ;; + esac + ;; + vxworks*) + ;; + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +], +[ + if test yes = "$GCC"; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + enable_shared=no + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac + ;; + + hpux9* | hpux10* | hpux11*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC (with -KPIC) is the default. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + # old Intel for x86_64, which still supported -KPIC. + ecc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' + ;; + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + ccc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All Alpha code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + *Sun\ C*) + # Sun C 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + esac + ;; + + newsos6) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + + osf3* | osf4* | osf5*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All OSF/1 code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + rdos*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + solaris*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; + esac + ;; + + sunos4*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + unicos*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + + uts4*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +]) +case $host_os in + # For platforms that do not support PIC, -DPIC is meaningless: + *djgpp*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + ;; +esac + +AC_CACHE_CHECK([for $compiler option to produce PIC], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], + [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], + [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], + [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in + "" | " "*) ;; + *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; + esac], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) +fi +_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], + [Additional compiler flags for building library objects]) + +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], + [How to pass a linker flag through the compiler]) +# +# Check to make sure the static flag actually works. +# +wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" +_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], + _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) +_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], + [Compiler flag to prevent dynamic linking]) +])# _LT_COMPILER_PIC + + +# _LT_LINKER_SHLIBS([TAGNAME]) +# ---------------------------- +# See if the linker supports building shared libraries. +m4_defun([_LT_LINKER_SHLIBS], +[AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +m4_if([$1], [CXX], [ + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + case $host_os in + aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds + ;; + cygwin* | mingw* | cegcc*) + case $cc_basename in + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + ;; + esac + ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac +], [ + runpath_var= + _LT_TAGVAR(allow_undefined_flag, $1)= + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(archive_cmds, $1)= + _LT_TAGVAR(archive_expsym_cmds, $1)= + _LT_TAGVAR(compiler_needs_object, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(hardcode_automatic, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_separator, $1)= + _LT_TAGVAR(hardcode_minus_L, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_TAGVAR(inherit_rpath, $1)=no + _LT_TAGVAR(link_all_deplibs, $1)=unknown + _LT_TAGVAR(module_cmds, $1)= + _LT_TAGVAR(module_expsym_cmds, $1)= + _LT_TAGVAR(old_archive_from_new_cmds, $1)= + _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= + _LT_TAGVAR(thread_safe_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + _LT_TAGVAR(include_expsyms, $1)= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. +dnl Note also adjust exclude_expsyms for C++ above. + extract_expsyms_cmds= + + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test yes != "$GCC"; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd* | bitrig*) + with_gnu_ld=no + ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no + if test yes = "$with_gnu_ld"; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; + *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test yes = "$lt_use_gnu_ld_interface"; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='$wl' + + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + supports_anon_versioning=no + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + + # See if GNU ld supports shared libraries. + case $host_os in + aix[[3-9]]*) + # On AIX/PPC, the GNU linker is very broken + if test ia64 != "$host_cpu"; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: the GNU linker, at least up to release 2.19, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. + +_LT_EOF + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test linux-dietlibc = "$host_os"; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test no = "$tmp_diet" + then + tmp_addflag=' $pic_flag' + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + _LT_TAGVAR(whole_archive_flag_spec, $1)= + tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; + xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + + if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in + tcc*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' + ;; + xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + sunos4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + + if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then + runpath_var= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + _LT_TAGVAR(hardcode_direct, $1)=unsupported + fi + ;; + + aix[[4-9]]*) + if test ia64 = "$host_cpu"; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag= + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then + aix_use_runtimelinking=yes + break + fi + done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac + + if test yes = "$GCC"; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`$CC -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + ;; + esac + shared_flag='-shared' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' + fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' + else + # not using gcc + if test ia64 = "$host_cpu"; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' + else + shared_flag='$wl-bM:SRE' + fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' + fi + fi + + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag + else + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' + fi + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; + + bsdi[[45]]*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + case $cc_basename in + cl*) + # Native MSVC + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + esac + ;; + + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; + + dgux*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2.*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + hpux9*) + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + ;; + + hpux10*) + if test yes,no = "$GCC,$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + fi + ;; + + hpux11*) + if test yes,no = "$GCC,$with_gnu_ld"; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + m4_if($1, [], [ + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + _LT_LINKER_OPTION([if $CC understands -b], + _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + ;; + esac + fi + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + # This should be the same for all languages, so no per-tag cache variable. + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], + [lt_cv_irix_exported_symbol], + [save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" + AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], + [C++], [[int foo (void) { return 0; }]], + [Fortran 77], [[ + subroutine foo + end]], + [Fortran], [[ + subroutine foo + end]])])], + [lt_cv_irix_exported_symbol=yes], + [lt_cv_irix_exported_symbol=no]) + LDFLAGS=$save_LDFLAGS]) + if test yes = "$lt_cv_irix_exported_symbol"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' + fi + _LT_TAGVAR(link_all_deplibs, $1)=no + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(ld_shlibs, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + newsos6) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *nto* | *qnx*) + ;; + + openbsd* | bitrig*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + fi + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + + osf3*) + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + solaris*) + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test yes = "$GCC"; then + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands '-z linker_flag'. GCC discards it without '$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test yes = "$GCC"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + fi + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + sunos4*) + if test sequent = "$host_vendor"; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4) + case $host_vendor in + sni) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' + _LT_TAGVAR(hardcode_direct, $1)=no + ;; + motorola) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4.3*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + _LT_TAGVAR(ld_shlibs, $1)=yes + fi + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We CANNOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' + runpath_var='LD_RUN_PATH' + + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + uts4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + + if test sni = "$host_vendor"; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym' + ;; + esac + fi + fi +]) +AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) +test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no + +_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld + +_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl +_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl +_LT_DECL([], [extract_expsyms_cmds], [2], + [The commands to extract the exported symbol list from a shared archive]) + +# +# Do we need to explicitly link libc? +# +case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in +x|xyes) + # Assume -lc should be added + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + + if test yes,yes = "$GCC,$enable_shared"; then + case $_LT_TAGVAR(archive_cmds, $1) in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + AC_CACHE_CHECK([whether -lc should be explicitly linked in], + [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), + [$RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) + _LT_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) + then + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no + else + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + ]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) + ;; + esac + fi + ;; +esac + +_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], + [Whether or not to add -lc for building shared libraries]) +_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], + [enable_shared_with_static_runtimes], [0], + [Whether or not to disallow shared libs when runtime libs are static]) +_LT_TAGDECL([], [export_dynamic_flag_spec], [1], + [Compiler flag to allow reflexive dlopens]) +_LT_TAGDECL([], [whole_archive_flag_spec], [1], + [Compiler flag to generate shared objects directly from archives]) +_LT_TAGDECL([], [compiler_needs_object], [1], + [Whether the compiler copes with passing no objects directly]) +_LT_TAGDECL([], [old_archive_from_new_cmds], [2], + [Create an old-style archive from a shared archive]) +_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], + [Create a temporary old-style archive to link instead of a shared archive]) +_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) +_LT_TAGDECL([], [archive_expsym_cmds], [2]) +_LT_TAGDECL([], [module_cmds], [2], + [Commands used to build a loadable module if different from building + a shared archive.]) +_LT_TAGDECL([], [module_expsym_cmds], [2]) +_LT_TAGDECL([], [with_gnu_ld], [1], + [Whether we are building with GNU ld or not]) +_LT_TAGDECL([], [allow_undefined_flag], [1], + [Flag that allows shared libraries with undefined symbols to be built]) +_LT_TAGDECL([], [no_undefined_flag], [1], + [Flag that enforces no undefined symbols]) +_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], + [Flag to hardcode $libdir into a binary during linking. + This must work even if $libdir does not exist]) +_LT_TAGDECL([], [hardcode_libdir_separator], [1], + [Whether we need a single "-rpath" flag with a separated argument]) +_LT_TAGDECL([], [hardcode_direct], [0], + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes + DIR into the resulting binary]) +_LT_TAGDECL([], [hardcode_direct_absolute], [0], + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes + DIR into the resulting binary and the resulting library dependency is + "absolute", i.e impossible to change by setting $shlibpath_var if the + library is relocated]) +_LT_TAGDECL([], [hardcode_minus_L], [0], + [Set to "yes" if using the -LDIR flag during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_shlibpath_var], [0], + [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_automatic], [0], + [Set to "yes" if building a shared library automatically hardcodes DIR + into the library and all subsequent libraries and executables linked + against it]) +_LT_TAGDECL([], [inherit_rpath], [0], + [Set to yes if linker adds runtime paths of dependent libraries + to runtime path list]) +_LT_TAGDECL([], [link_all_deplibs], [0], + [Whether libtool must link a program against all its dependency libraries]) +_LT_TAGDECL([], [always_export_symbols], [0], + [Set to "yes" if exported symbols are required]) +_LT_TAGDECL([], [export_symbols_cmds], [2], + [The commands to list exported symbols]) +_LT_TAGDECL([], [exclude_expsyms], [1], + [Symbols that should not be listed in the preloaded symbols]) +_LT_TAGDECL([], [include_expsyms], [1], + [Symbols that must always be exported]) +_LT_TAGDECL([], [prelink_cmds], [2], + [Commands necessary for linking programs (against libraries) with templates]) +_LT_TAGDECL([], [postlink_cmds], [2], + [Commands necessary for finishing linking programs]) +_LT_TAGDECL([], [file_list_spec], [1], + [Specify filename containing input files]) +dnl FIXME: Not yet implemented +dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], +dnl [Compiler flag to generate thread safe objects]) +])# _LT_LINKER_SHLIBS + + +# _LT_LANG_C_CONFIG([TAG]) +# ------------------------ +# Ensure that the configuration variables for a C compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_C_CONFIG], +[m4_require([_LT_DECL_EGREP])dnl +lt_save_CC=$CC +AC_LANG_PUSH(C) + +# Source file extension for C test sources. +ac_ext=c + +# Object file extension for compiled C test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' + +_LT_TAG_COMPILER +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + LT_SYS_DLOPEN_SELF + _LT_CMD_STRIPLIB + + # Report what library types will actually be built + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test no = "$can_build_shared" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test yes = "$enable_shared" && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + + aix[[4-9]]*) + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test yes = "$enable_shared" || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_CONFIG($1) +fi +AC_LANG_POP +CC=$lt_save_CC +])# _LT_LANG_C_CONFIG + + +# _LT_LANG_CXX_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a C++ compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_CXX_CONFIG], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl +if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then + AC_PROG_CXXCPP +else + _lt_caught_CXX_error=yes +fi + +AC_LANG_PUSH(C++) +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(compiler_needs_object, $1)=no +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for C++ test sources. +ac_ext=cpp + +# Object file extension for compiled C++ test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the CXX compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test yes != "$_lt_caught_CXX_error"; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests + lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX + lt_save_with_gnu_ld=$with_gnu_ld + lt_save_path_LD=$lt_cv_path_LD + if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else + $as_unset lt_cv_prog_gnu_ld + fi + if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX + else + $as_unset lt_cv_path_LD + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + + if test -n "$compiler"; then + # We don't want -fno-exception when compiling C++ code, so set the + # no_builtin_flag separately + if test yes = "$GXX"; then + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + else + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + fi + + if test yes = "$GXX"; then + # Set up default GNU C++ configuration + + LT_PATH_LD + + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test yes = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='$wl' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | + $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + with_gnu_ld=no + wlarc= + + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + GXX=no + with_gnu_ld=no + wlarc= + fi + + # PORTME: fill in a description of your system's C++ link characteristics + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + _LT_TAGVAR(ld_shlibs, $1)=yes + case $host_os in + aix3*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aix[[4-9]]*) + if test ia64 = "$host_cpu"; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag= + else + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac + + if test yes = "$GXX"; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`$CC -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + esac + shared_flag='-shared' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' + fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' + else + # not using gcc + if test ia64 = "$host_cpu"; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' + else + shared_flag='$wl-bM:SRE' + fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' + fi + fi + + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to + # export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + # The "-G" linker flag allows undefined symbols. + _LT_TAGVAR(no_undefined_flag, $1)='-bernotok' + # Determine the default libpath from the value encoded in an empty + # executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag + else + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' + fi + fi + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + cygwin* | mingw* | pw32* | cegcc*) + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # g++ + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; + + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + + dgux*) + case $cc_basename in + ec++*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + freebsd2.*) + # C++ shared libraries reported to be fairly broken before + # switch to ELF + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + freebsd-elf*) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + ;; + + freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + hpux9*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test yes = "$GXX"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + hpux10*|hpux11*) + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + ;; + *) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + ;; + esac + fi + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in + CC*) + # SGI C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + esac + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc* | ecpc* ) + # Intel C++ + with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + case `$CC -V` in + *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) + _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' + _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 6 and above use weak symbols + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + ;; + cxx*) + # Compaq C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' + + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + ;; + xl* | mpixl* | bgxl*) + # IBM XL 8.0 on PPC, with GNU ld + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='func_echo_all' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; + esac + ;; + + lynxos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + m88k*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + mvs*) + case $cc_basename in + cxx*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; + + *nto* | *qnx*) + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + + openbsd* | bitrig*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + fi + output_verbose_link_cmd=func_echo_all + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + case $host in + osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; + *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; + esac + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + cxx*) + case $host in + osf3*) + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + ;; + *) + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ + $RM $lib.exp' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + case $host in + osf3*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + psos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + lcc*) + # Lucid + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands '-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + + output_verbose_link_cmd='func_echo_all' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + + # The C++ compiler must be used to create the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + else + # g++ 2.7 appears to require '-G' NOT '-shared' on this + # platform. + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + fi + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' + ;; + esac + fi + ;; + esac + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We CANNOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ + '"$_LT_TAGVAR(old_archive_cmds, $1)" + _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ + '"$_LT_TAGVAR(reload_cmds, $1)" + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + vxworks*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + + AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) + test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no + + _LT_TAGVAR(GCC, $1)=$GXX + _LT_TAGVAR(LD, $1)=$LD + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC + with_gnu_ld=$lt_save_with_gnu_ld + lt_cv_path_LDCXX=$lt_cv_path_LD + lt_cv_path_LD=$lt_save_path_LD + lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld + lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +fi # test yes != "$_lt_caught_CXX_error" + +AC_LANG_POP +])# _LT_LANG_CXX_CONFIG + + +# _LT_FUNC_STRIPNAME_CNF +# ---------------------- +# func_stripname_cnf prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# +# This function is identical to the (non-XSI) version of func_stripname, +# except this one can be used by m4 code that may be executed by configure, +# rather than the libtool script. +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl +AC_REQUIRE([_LT_DECL_SED]) +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) +func_stripname_cnf () +{ + case @S|@2 in + .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; + *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;; + esac +} # func_stripname_cnf +])# _LT_FUNC_STRIPNAME_CNF + + +# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) +# --------------------------------- +# Figure out "hidden" library dependencies from verbose +# compiler output when linking a shared library. +# Parse the compiler output and extract the necessary +# objects, libraries and library flags. +m4_defun([_LT_SYS_HIDDEN_LIBDEPS], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl +# Dependencies to place before and after the object being linked: +_LT_TAGVAR(predep_objects, $1)= +_LT_TAGVAR(postdep_objects, $1)= +_LT_TAGVAR(predeps, $1)= +_LT_TAGVAR(postdeps, $1)= +_LT_TAGVAR(compiler_lib_search_path, $1)= + +dnl we can't use the lt_simple_compile_test_code here, +dnl because it contains code intended for an executable, +dnl not a library. It's possible we should let each +dnl tag define a new lt_????_link_test_code variable, +dnl but it's only used here... +m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF +int a; +void foo (void) { a = 0; } +_LT_EOF +], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF +class Foo +{ +public: + Foo (void) { a = 0; } +private: + int a; +}; +_LT_EOF +], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer*4 a + a=0 + return + end +_LT_EOF +], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer a + a=0 + return + end +_LT_EOF +], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF +public class foo { + private int a; + public void bar (void) { + a = 0; + } +}; +_LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF +]) + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac + +dnl Parse the compiler output and extract the necessary +dnl objects, libraries and library flags. +if AC_TRY_EVAL(ac_compile); then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. + + # Sentinel used to keep track of whether or not we are before + # the conftest object file. + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do + case $prev$p in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. + # Remove the space. + if test x-L = "$p" || + test x-R = "$p"; then + prev=$p + continue + fi + + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac + if test no = "$pre_test_object_deps_done"; then + case $prev in + -L | -R) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. + if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then + _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p + else + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p" + fi + ;; + # The "-l" case would never come before the object being + # linked, so don't bother handling this case. + esac + else + if test -z "$_LT_TAGVAR(postdeps, $1)"; then + _LT_TAGVAR(postdeps, $1)=$prev$p + else + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" + fi + fi + prev= + ;; + + *.lto.$objext) ;; # Ignore GCC LTO objects + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. + if test "$p" = "conftest.$objext"; then + pre_test_object_deps_done=yes + continue + fi + + if test no = "$pre_test_object_deps_done"; then + if test -z "$_LT_TAGVAR(predep_objects, $1)"; then + _LT_TAGVAR(predep_objects, $1)=$p + else + _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" + fi + else + if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then + _LT_TAGVAR(postdep_objects, $1)=$p + else + _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" + fi + fi + ;; + + *) ;; # Ignore the rest. + + esac + done + + # Clean up. + rm -f a.out a.exe +else + echo "libtool.m4: error: problem compiling $1 test program" +fi + +$RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS + +# PORTME: override above test on systems where it is broken +m4_if([$1], [CXX], +[case $host_os in +interix[[3-9]]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + _LT_TAGVAR(predep_objects,$1)= + _LT_TAGVAR(postdep_objects,$1)= + _LT_TAGVAR(postdeps,$1)= + ;; +esac +]) + +case " $_LT_TAGVAR(postdeps, $1) " in +*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; +esac + _LT_TAGVAR(compiler_lib_search_dirs, $1)= +if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'` +fi +_LT_TAGDECL([], [compiler_lib_search_dirs], [1], + [The directories searched by this compiler when creating a shared library]) +_LT_TAGDECL([], [predep_objects], [1], + [Dependencies to place before and after the objects being linked to + create a shared library]) +_LT_TAGDECL([], [postdep_objects], [1]) +_LT_TAGDECL([], [predeps], [1]) +_LT_TAGDECL([], [postdeps], [1]) +_LT_TAGDECL([], [compiler_lib_search_path], [1], + [The library search path used internally by the compiler when linking + a shared library]) +])# _LT_SYS_HIDDEN_LIBDEPS + + +# _LT_LANG_F77_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a Fortran 77 compiler are +# suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_F77_CONFIG], +[AC_LANG_PUSH(Fortran 77) +if test -z "$F77" || test no = "$F77"; then + _lt_disable_F77=yes +fi + +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for f77 test sources. +ac_ext=f + +# Object file extension for compiled f77 test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the F77 compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test yes != "$_lt_disable_F77"; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS + CC=${F77-"f77"} + CFLAGS=$FFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + GCC=$G77 + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test no = "$can_build_shared" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test yes = "$enable_shared" && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test yes = "$enable_shared" || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_TAGVAR(GCC, $1)=$G77 + _LT_TAGVAR(LD, $1)=$LD + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_F77" + +AC_LANG_POP +])# _LT_LANG_F77_CONFIG + + +# _LT_LANG_FC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for a Fortran compiler are +# suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_FC_CONFIG], +[AC_LANG_PUSH(Fortran) + +if test -z "$FC" || test no = "$FC"; then + _lt_disable_FC=yes +fi + +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for fc test sources. +ac_ext=${ac_fc_srcext-f} + +# Object file extension for compiled fc test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the FC compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test yes != "$_lt_disable_FC"; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS + CC=${FC-"f95"} + CFLAGS=$FCFLAGS + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu + + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test no = "$can_build_shared" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test yes = "$enable_shared" && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test yes = "$enable_shared" || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu + _LT_TAGVAR(LD, $1)=$LD + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_FC" + +AC_LANG_POP +])# _LT_LANG_FC_CONFIG + + +# _LT_LANG_GCJ_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Java Compiler compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_GCJ_CONFIG], +[AC_REQUIRE([LT_PROG_GCJ])dnl +AC_LANG_SAVE + +# Source file extension for Java test sources. +ac_ext=java + +# Object file extension for compiled Java test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="class foo {}" + +# Code to be used in simple link tests +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GCJ-"gcj"} +CFLAGS=$GCJFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)=$LD +_LT_CC_BASENAME([$compiler]) + +# GCJ did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GCJ_CONFIG + + +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)=$LD +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + +# _LT_LANG_RC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for the Windows resource compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_RC_CONFIG], +[AC_REQUIRE([LT_PROG_RC])dnl +AC_LANG_SAVE + +# Source file extension for RC test sources. +ac_ext=rc + +# Object file extension for compiled RC test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' + +# Code to be used in simple link tests +lt_simple_link_test_code=$lt_simple_compile_test_code + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC= +CC=${RC-"windres"} +CFLAGS= +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) +_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + +if test -n "$compiler"; then + : + _LT_CONFIG($1) +fi + +GCC=$lt_save_GCC +AC_LANG_RESTORE +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_RC_CONFIG + + +# LT_PROG_GCJ +# ----------- +AC_DEFUN([LT_PROG_GCJ], +[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], + [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], + [AC_CHECK_TOOL(GCJ, gcj,) + test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" + AC_SUBST(GCJFLAGS)])])[]dnl +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_GCJ], []) + + +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + +# LT_PROG_RC +# ---------- +AC_DEFUN([LT_PROG_RC], +[AC_CHECK_TOOL(RC, windres,) +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_RC], []) + + +# _LT_DECL_EGREP +# -------------- +# If we don't have a new enough Autoconf to choose the best grep +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_EGREP], +[AC_REQUIRE([AC_PROG_EGREP])dnl +AC_REQUIRE([AC_PROG_FGREP])dnl +test -z "$GREP" && GREP=grep +_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) +_LT_DECL([], [EGREP], [1], [An ERE matcher]) +_LT_DECL([], [FGREP], [1], [A literal string matcher]) +dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too +AC_SUBST([GREP]) +]) + + +# _LT_DECL_OBJDUMP +# -------------- +# If we don't have a new enough Autoconf to choose the best objdump +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_OBJDUMP], +[AC_CHECK_TOOL(OBJDUMP, objdump, false) +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) +AC_SUBST([OBJDUMP]) +]) + +# _LT_DECL_DLLTOOL +# ---------------- +# Ensure DLLTOOL variable is set. +m4_defun([_LT_DECL_DLLTOOL], +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) +AC_SUBST([DLLTOOL]) +]) + +# _LT_DECL_SED +# ------------ +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +m4_defun([_LT_DECL_SED], +[AC_PROG_SED +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" +_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) +_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], + [Sed that helps us avoid accidentally triggering echo(1) options like -n]) +])# _LT_DECL_SED + +m4_ifndef([AC_PROG_SED], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_SED. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ + +m4_defun([AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done +done +IFS=$as_save_IFS +lt_ac_max=0 +lt_ac_count=0 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f "$lt_ac_sed" && continue + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break + fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test 10 -lt "$lt_ac_count" && break + lt_ac_count=`expr $lt_ac_count + 1` + if test "$lt_ac_count" -gt "$lt_ac_max"; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done +done +]) +SED=$lt_cv_path_SED +AC_SUBST([SED]) +AC_MSG_RESULT([$SED]) +])#AC_PROG_SED +])#m4_ifndef + +# Old name: +AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_SED], []) + + +# _LT_CHECK_SHELL_FEATURES +# ------------------------ +# Find out whether the shell is Bourne or XSI compatible, +# or has some other useful features. +m4_defun([_LT_CHECK_SHELL_FEATURES], +[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset +else + lt_unset=false +fi +_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl + +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac +_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl +_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl +])# _LT_CHECK_SHELL_FEATURES + + +# _LT_PATH_CONVERSION_FUNCTIONS +# ----------------------------- +# Determine what file name conversion functions should be used by +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed +# for certain cross-compile configurations and native mingw. +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_MSG_CHECKING([how to convert $build file names to $host format]) +AC_CACHE_VAL(lt_cv_to_host_file_cmd, +[case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac +]) +to_host_file_cmd=$lt_cv_to_host_file_cmd +AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], + [0], [convert $build file names to $host format])dnl + +AC_MSG_CHECKING([how to convert $build file names to toolchain format]) +AC_CACHE_VAL(lt_cv_to_tool_file_cmd, +[#assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac +]) +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], + [0], [convert $build files to toolchain format])dnl +])# _LT_PATH_CONVERSION_FUNCTIONS diff -Nru gimp-2.8.18/m4macros/lt~obsolete.m4 gimp-2.8.20/m4macros/lt~obsolete.m4 --- gimp-2.8.18/m4macros/lt~obsolete.m4 1970-01-01 00:00:00.000000000 +0000 +++ gimp-2.8.20/m4macros/lt~obsolete.m4 2016-08-20 12:34:31.000000000 +0000 @@ -0,0 +1,99 @@ +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- +# +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software +# Foundation, Inc. +# Written by Scott James Remnant, 2004. +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 5 lt~obsolete.m4 + +# These exist entirely to fool aclocal when bootstrapping libtool. +# +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), +# which have later been changed to m4_define as they aren't part of the +# exported API, or moved to Autoconf or Automake where they belong. +# +# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN +# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us +# using a macro with the same name in our local m4/libtool.m4 it'll +# pull the old libtool.m4 in (it doesn't see our shiny new m4_define +# and doesn't know about Autoconf macros at all.) +# +# So we provide this file, which has a silly filename so it's always +# included after everything else. This provides aclocal with the +# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything +# because those macros already exist, or will be overwritten later. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# +# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. +# Yes, that means every name once taken will need to remain here until +# we give up compatibility with versions before 1.7, at which point +# we need to keep only those names which we still refer to. + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) + +m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) +m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) +m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) +m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) +m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) +m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) +m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) +m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) +m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) +m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) +m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) +m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) +m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) +m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) +m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) +m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) +m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) +m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) +m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) +m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) +m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) +m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) +m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) +m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) +m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) +m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) +m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) +m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) +m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) +m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) +m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) +m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) +m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) +m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) +m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) +m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) +m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) +m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) +m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) +m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) +m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) +m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) +m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) +m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) +m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) +m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) +m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) diff -Nru gimp-2.8.18/m4macros/ltoptions.m4 gimp-2.8.20/m4macros/ltoptions.m4 --- gimp-2.8.18/m4macros/ltoptions.m4 1970-01-01 00:00:00.000000000 +0000 +++ gimp-2.8.20/m4macros/ltoptions.m4 2016-08-20 12:34:31.000000000 +0000 @@ -0,0 +1,437 @@ +# Helper functions for option handling. -*- Autoconf -*- +# +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software +# Foundation, Inc. +# Written by Gary V. Vaughan, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 8 ltoptions.m4 + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) + + +# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) +# ------------------------------------------ +m4_define([_LT_MANGLE_OPTION], +[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) + + +# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) +# --------------------------------------- +# Set option OPTION-NAME for macro MACRO-NAME, and if there is a +# matching handler defined, dispatch to it. Other OPTION-NAMEs are +# saved as a flag. +m4_define([_LT_SET_OPTION], +[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl +m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), + _LT_MANGLE_DEFUN([$1], [$2]), + [m4_warning([Unknown $1 option '$2'])])[]dnl +]) + + +# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) +# ------------------------------------------------------------ +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +m4_define([_LT_IF_OPTION], +[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) + + +# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) +# ------------------------------------------------------- +# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME +# are set. +m4_define([_LT_UNLESS_OPTIONS], +[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), + [m4_define([$0_found])])])[]dnl +m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 +])[]dnl +]) + + +# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) +# ---------------------------------------- +# OPTION-LIST is a space-separated list of Libtool options associated +# with MACRO-NAME. If any OPTION has a matching handler declared with +# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about +# the unknown option and exit. +m4_defun([_LT_SET_OPTIONS], +[# Set options +m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [_LT_SET_OPTION([$1], _LT_Option)]) + +m4_if([$1],[LT_INIT],[ + dnl + dnl Simply set some default values (i.e off) if boolean options were not + dnl specified: + _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no + ]) + _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no + ]) + dnl + dnl If no reference was made to various pairs of opposing options, then + dnl we run the default mode handler for the pair. For example, if neither + dnl 'shared' nor 'disable-shared' was passed, we enable building of shared + dnl archives by default: + _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) + _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], + [_LT_ENABLE_FAST_INSTALL]) + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], + [_LT_WITH_AIX_SONAME([aix])]) + ]) +])# _LT_SET_OPTIONS + + +## --------------------------------- ## +## Macros to handle LT_INIT options. ## +## --------------------------------- ## + +# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) +# ----------------------------------------- +m4_define([_LT_MANGLE_DEFUN], +[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) + + +# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) +# ----------------------------------------------- +m4_define([LT_OPTION_DEFINE], +[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl +])# LT_OPTION_DEFINE + + +# dlopen +# ------ +LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes +]) + +AU_DEFUN([AC_LIBTOOL_DLOPEN], +[_LT_SET_OPTION([LT_INIT], [dlopen]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the 'dlopen' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) + + +# win32-dll +# --------- +# Declare package support for building win32 dll's. +LT_OPTION_DEFINE([LT_INIT], [win32-dll], +[enable_win32_dll=yes + +case $host in +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) + ;; +esac + +test -z "$AS" && AS=as +_LT_DECL([], [AS], [1], [Assembler program])dnl + +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl + +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl +])# win32-dll + +AU_DEFUN([AC_LIBTOOL_WIN32_DLL], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +_LT_SET_OPTION([LT_INIT], [win32-dll]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the 'win32-dll' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) + + +# _LT_ENABLE_SHARED([DEFAULT]) +# ---------------------------- +# implement the --enable-shared flag, and supports the 'shared' and +# 'disable-shared' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. +m4_define([_LT_ENABLE_SHARED], +[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([shared], + [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], + [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS=$lt_save_ifs + ;; + esac], + [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) + + _LT_DECL([build_libtool_libs], [enable_shared], [0], + [Whether or not to build shared libraries]) +])# _LT_ENABLE_SHARED + +LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) + +# Old names: +AC_DEFUN([AC_ENABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) +]) + +AC_DEFUN([AC_DISABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], [disable-shared]) +]) + +AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_SHARED], []) +dnl AC_DEFUN([AM_DISABLE_SHARED], []) + + + +# _LT_ENABLE_STATIC([DEFAULT]) +# ---------------------------- +# implement the --enable-static flag, and support the 'static' and +# 'disable-static' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. +m4_define([_LT_ENABLE_STATIC], +[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([static], + [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], + [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS=$lt_save_ifs + ;; + esac], + [enable_static=]_LT_ENABLE_STATIC_DEFAULT) + + _LT_DECL([build_old_libs], [enable_static], [0], + [Whether or not to build static libraries]) +])# _LT_ENABLE_STATIC + +LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) + +# Old names: +AC_DEFUN([AC_ENABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) +]) + +AC_DEFUN([AC_DISABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], [disable-static]) +]) + +AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_STATIC], []) +dnl AC_DEFUN([AM_DISABLE_STATIC], []) + + + +# _LT_ENABLE_FAST_INSTALL([DEFAULT]) +# ---------------------------------- +# implement the --enable-fast-install flag, and support the 'fast-install' +# and 'disable-fast-install' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. +m4_define([_LT_ENABLE_FAST_INSTALL], +[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([fast-install], + [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], + [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS=$lt_save_ifs + ;; + esac], + [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) + +_LT_DECL([fast_install], [enable_fast_install], [0], + [Whether or not to optimize for fast installation])dnl +])# _LT_ENABLE_FAST_INSTALL + +LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) + +# Old names: +AU_DEFUN([AC_ENABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the 'fast-install' option into LT_INIT's first parameter.]) +]) + +AU_DEFUN([AC_DISABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the 'disable-fast-install' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) +dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) + + +# _LT_WITH_AIX_SONAME([DEFAULT]) +# ---------------------------------- +# implement the --with-aix-soname flag, and support the `aix-soname=aix' +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. +m4_define([_LT_WITH_AIX_SONAME], +[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl +shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[[5-9]]*,yes) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) + AC_ARG_WITH([aix-soname], + [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], + [case $withval in + aix|svr4|both) + ;; + *) + AC_MSG_ERROR([Unknown argument to --with-aix-soname]) + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname], + [AC_CACHE_VAL([lt_cv_with_aix_soname], + [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) + with_aix_soname=$lt_cv_with_aix_soname]) + AC_MSG_RESULT([$with_aix_soname]) + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + +_LT_DECL([], [shared_archive_member_spec], [0], + [Shared archive member basename, for filename based shared library versioning on AIX])dnl +])# _LT_WITH_AIX_SONAME + +LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) + + +# _LT_WITH_PIC([MODE]) +# -------------------- +# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' +# LT_INIT options. +# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. +m4_define([_LT_WITH_PIC], +[AC_ARG_WITH([pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for lt_pkg in $withval; do + IFS=$lt_save_ifs + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS=$lt_save_ifs + ;; + esac], + [pic_mode=m4_default([$1], [default])]) + +_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl +])# _LT_WITH_PIC + +LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) + +# Old name: +AU_DEFUN([AC_LIBTOOL_PICMODE], +[_LT_SET_OPTION([LT_INIT], [pic-only]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the 'pic-only' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) + +## ----------------- ## +## LTDL_INIT Options ## +## ----------------- ## + +m4_define([_LTDL_MODE], []) +LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], + [m4_define([_LTDL_MODE], [nonrecursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [recursive], + [m4_define([_LTDL_MODE], [recursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [subproject], + [m4_define([_LTDL_MODE], [subproject])]) + +m4_define([_LTDL_TYPE], []) +LT_OPTION_DEFINE([LTDL_INIT], [installable], + [m4_define([_LTDL_TYPE], [installable])]) +LT_OPTION_DEFINE([LTDL_INIT], [convenience], + [m4_define([_LTDL_TYPE], [convenience])]) diff -Nru gimp-2.8.18/m4macros/ltsugar.m4 gimp-2.8.20/m4macros/ltsugar.m4 --- gimp-2.8.18/m4macros/ltsugar.m4 1970-01-01 00:00:00.000000000 +0000 +++ gimp-2.8.20/m4macros/ltsugar.m4 2016-08-20 12:34:31.000000000 +0000 @@ -0,0 +1,124 @@ +# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- +# +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Foundation, Inc. +# Written by Gary V. Vaughan, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 6 ltsugar.m4 + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) + + +# lt_join(SEP, ARG1, [ARG2...]) +# ----------------------------- +# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their +# associated separator. +# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier +# versions in m4sugar had bugs. +m4_define([lt_join], +[m4_if([$#], [1], [], + [$#], [2], [[$2]], + [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) +m4_define([_lt_join], +[m4_if([$#$2], [2], [], + [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) + + +# lt_car(LIST) +# lt_cdr(LIST) +# ------------ +# Manipulate m4 lists. +# These macros are necessary as long as will still need to support +# Autoconf-2.59, which quotes differently. +m4_define([lt_car], [[$1]]) +m4_define([lt_cdr], +[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], + [$#], 1, [], + [m4_dquote(m4_shift($@))])]) +m4_define([lt_unquote], $1) + + +# lt_append(MACRO-NAME, STRING, [SEPARATOR]) +# ------------------------------------------ +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. +# Note that neither SEPARATOR nor STRING are expanded; they are appended +# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). +# No SEPARATOR is output if MACRO-NAME was previously undefined (different +# than defined and empty). +# +# This macro is needed until we can rely on Autoconf 2.62, since earlier +# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. +m4_define([lt_append], +[m4_define([$1], + m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) + + + +# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) +# ---------------------------------------------------------- +# Produce a SEP delimited list of all paired combinations of elements of +# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list +# has the form PREFIXmINFIXSUFFIXn. +# Needed until we can rely on m4_combine added in Autoconf 2.62. +m4_define([lt_combine], +[m4_if(m4_eval([$# > 3]), [1], + [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl +[[m4_foreach([_Lt_prefix], [$2], + [m4_foreach([_Lt_suffix], + ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, + [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) + + +# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) +# ----------------------------------------------------------------------- +# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited +# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. +m4_define([lt_if_append_uniq], +[m4_ifdef([$1], + [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], + [lt_append([$1], [$2], [$3])$4], + [$5])], + [lt_append([$1], [$2], [$3])$4])]) + + +# lt_dict_add(DICT, KEY, VALUE) +# ----------------------------- +m4_define([lt_dict_add], +[m4_define([$1($2)], [$3])]) + + +# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) +# -------------------------------------------- +m4_define([lt_dict_add_subkey], +[m4_define([$1($2:$3)], [$4])]) + + +# lt_dict_fetch(DICT, KEY, [SUBKEY]) +# ---------------------------------- +m4_define([lt_dict_fetch], +[m4_ifval([$3], + m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), + m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) + + +# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) +# ----------------------------------------------------------------- +m4_define([lt_if_dict_fetch], +[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], + [$5], + [$6])]) + + +# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) +# -------------------------------------------------------------- +m4_define([lt_dict_filter], +[m4_if([$5], [], [], + [lt_join(m4_quote(m4_default([$4], [[, ]])), + lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), + [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl +]) diff -Nru gimp-2.8.18/m4macros/ltversion.m4 gimp-2.8.20/m4macros/ltversion.m4 --- gimp-2.8.18/m4macros/ltversion.m4 1970-01-01 00:00:00.000000000 +0000 +++ gimp-2.8.20/m4macros/ltversion.m4 2016-08-20 12:34:31.000000000 +0000 @@ -0,0 +1,23 @@ +# ltversion.m4 -- version numbers -*- Autoconf -*- +# +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# @configure_input@ + +# serial 4179 ltversion.m4 +# This file is part of GNU Libtool + +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) + +AC_DEFUN([LTVERSION_VERSION], +[macro_version='2.4.6' +macro_revision='2.4.6' +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) +_LT_DECL(, macro_revision, 0) +]) diff -Nru gimp-2.8.18/m4macros/Makefile.in gimp-2.8.20/m4macros/Makefile.in --- gimp-2.8.18/m4macros/Makefile.in 2016-07-12 23:20:08.000000000 +0000 +++ gimp-2.8.20/m4macros/Makefile.in 2017-01-31 23:40:39.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Makefile.am for gimp/m4macros VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,26 +91,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = m4macros -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -110,6 +159,8 @@ } am__installdirs = "$(DESTDIR)$(m4datadir)" DATA = $(m4data_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -475,7 +526,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4macros/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu m4macros/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -520,11 +570,11 @@ @list='$(m4data_DATA)'; test -n "$(m4datadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(m4datadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -663,16 +713,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-m4dataDATA install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-m4dataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-m4dataDATA install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-m4dataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/Makefile.in gimp-2.8.20/Makefile.in --- gimp-2.8.18/Makefile.in 2016-07-12 23:20:34.000000000 +0000 +++ gimp-2.8.20/Makefile.in 2017-01-31 23:40:06.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,22 +89,23 @@ build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/gimp-zip.in $(srcdir)/gimp.pc.in \ - $(srcdir)/gimpthumb.pc.in $(srcdir)/gimpui.pc.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - compile config.guess config.sub depcomp install-sh ltmain.sh \ - missing py-compile ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -75,21 +113,28 @@ CONFIG_CLEAN_FILES = gimp-zip gimp-2.0.pc gimpthumb-2.0.pc \ gimpui-2.0.pc CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -126,12 +171,39 @@ DATA = $(pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/gimp-zip.in $(srcdir)/gimp.pc.in \ + $(srcdir)/gimpthumb.pc.in $(srcdir)/gimpui.pc.in AUTHORS \ + COPYING ChangeLog INSTALL NEWS README compile config.guess \ + config.sub install-sh ltmain.sh missing py-compile DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -141,6 +213,7 @@ && rm -rf "$(distdir)" \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -168,6 +241,7 @@ reldir="$$dir2" GZIP_ENV = --best DIST_ARCHIVES = $(distdir).tar.bz2 $(distdir).tar.xz +DIST_TARGETS = dist-xz dist-bzip2 distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -597,7 +671,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -618,8 +691,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -671,22 +744,25 @@ dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -701,57 +777,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -767,12 +798,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -784,15 +810,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -801,9 +823,31 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -874,39 +918,40 @@ || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -917,8 +962,6 @@ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.lz*) \ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ @@ -930,18 +973,19 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod u+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -964,7 +1008,7 @@ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' @@ -1102,14 +1146,13 @@ uninstall-am: uninstall-pkgconfigDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) all install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am all-local am--refresh check check-am clean \ - clean-generic clean-libtool ctags ctags-recursive dist \ - dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma \ - dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-libtool \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ @@ -1120,9 +1163,11 @@ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ + ps ps-am tags tags-am uninstall uninstall-am \ uninstall-pkgconfigDATA +.PRECIOUS: Makefile + AUTHORS: authors.xml authors.xsl @HAVE_XSLTPROC_TRUE@ $(XSLTPROC) -o $(@) $(top_srcdir)/authors.xsl $< || rm -f $(@) diff -Nru gimp-2.8.18/menus/Makefile.in gimp-2.8.20/menus/Makefile.in --- gimp-2.8.18/menus/Makefile.in 2016-07-12 23:20:08.000000000 +0000 +++ gimp-2.8.20/menus/Makefile.in 2017-01-31 23:40:39.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = menus -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(menudatadir)" DATA = $(menudata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -511,7 +562,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu menus/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu menus/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -556,11 +606,11 @@ @list='$(menudata_DATA)'; test -n "$(menudatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(menudatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -703,16 +753,18 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - dist-hook distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ + cscopelist-am ctags-am dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-menudataDATA install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-menudataDATA + ps ps-am tags-am uninstall uninstall-am uninstall-menudataDATA + +.PRECIOUS: Makefile .xml.in.xml: diff -Nru gimp-2.8.18/missing gimp-2.8.20/missing --- gimp-2.8.18/missing 2014-10-20 00:18:19.000000000 +0000 +++ gimp-2.8.20/missing 2016-11-01 23:33:03.000000000 +0000 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.13; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # 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 @@ -26,68 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -99,228 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -Nru gimp-2.8.18/modules/display-filter-color-blind.c gimp-2.8.20/modules/display-filter-color-blind.c --- gimp-2.8.18/modules/display-filter-color-blind.c 2015-08-20 22:57:28.000000000 +0000 +++ gimp-2.8.20/modules/display-filter-color-blind.c 2017-01-28 19:08:45.000000000 +0000 @@ -274,7 +274,7 @@ gint i; for (i = 0; i < 256; i++) - colorblind->gamma_lut[i] = pow (i, 1.0 / gammaRGB); + colorblind->gamma_lut[i] = pow (i, gammaRGB); } static void diff -Nru gimp-2.8.18/modules/Makefile.in gimp-2.8.20/modules/Makefile.in --- gimp-2.8.18/modules/Makefile.in 2016-07-12 23:20:09.000000000 +0000 +++ gimp-2.8.20/modules/Makefile.in 2017-01-31 23:40:40.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,16 +90,22 @@ host_triplet = @host@ @PLATFORM_WIN32_TRUE@am__append_1 = -lgdi32 subdir = modules -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -114,6 +157,7 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libcolor_selector_cmyk_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(libcolor_selector_cmyk_la_CFLAGS) $(CFLAGS) \ @@ -222,6 +266,18 @@ $(libdisplay_filter_proof_la_CFLAGS) $(CFLAGS) \ $(libdisplay_filter_proof_la_LDFLAGS) $(LDFLAGS) -o $@ @HAVE_LCMS_TRUE@am_libdisplay_filter_proof_la_rpath = -rpath $(libdir) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -234,20 +290,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libcolor_selector_cmyk_la_SOURCES) \ $(libcolor_selector_water_la_SOURCES) \ $(libcolor_selector_wheel_la_SOURCES) \ @@ -275,8 +327,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -719,7 +789,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu modules/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -737,6 +806,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -763,32 +833,45 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libcolor-selector-cmyk.la: $(libcolor_selector_cmyk_la_OBJECTS) $(libcolor_selector_cmyk_la_DEPENDENCIES) $(EXTRA_libcolor_selector_cmyk_la_DEPENDENCIES) $(AM_V_CCLD)$(libcolor_selector_cmyk_la_LINK) -rpath $(libdir) $(libcolor_selector_cmyk_la_OBJECTS) $(libcolor_selector_cmyk_la_LIBADD) $(LIBS) + libcolor-selector-water.la: $(libcolor_selector_water_la_OBJECTS) $(libcolor_selector_water_la_DEPENDENCIES) $(EXTRA_libcolor_selector_water_la_DEPENDENCIES) $(AM_V_CCLD)$(libcolor_selector_water_la_LINK) -rpath $(libdir) $(libcolor_selector_water_la_OBJECTS) $(libcolor_selector_water_la_LIBADD) $(LIBS) + libcolor-selector-wheel.la: $(libcolor_selector_wheel_la_OBJECTS) $(libcolor_selector_wheel_la_DEPENDENCIES) $(EXTRA_libcolor_selector_wheel_la_DEPENDENCIES) $(AM_V_CCLD)$(libcolor_selector_wheel_la_LINK) -rpath $(libdir) $(libcolor_selector_wheel_la_OBJECTS) $(libcolor_selector_wheel_la_LIBADD) $(LIBS) + libcontroller-dx-dinput.la: $(libcontroller_dx_dinput_la_OBJECTS) $(libcontroller_dx_dinput_la_DEPENDENCIES) $(EXTRA_libcontroller_dx_dinput_la_DEPENDENCIES) $(AM_V_CCLD)$(libcontroller_dx_dinput_la_LINK) $(am_libcontroller_dx_dinput_la_rpath) $(libcontroller_dx_dinput_la_OBJECTS) $(libcontroller_dx_dinput_la_LIBADD) $(LIBS) + libcontroller-linux-input.la: $(libcontroller_linux_input_la_OBJECTS) $(libcontroller_linux_input_la_DEPENDENCIES) $(EXTRA_libcontroller_linux_input_la_DEPENDENCIES) $(AM_V_CCLD)$(libcontroller_linux_input_la_LINK) $(am_libcontroller_linux_input_la_rpath) $(libcontroller_linux_input_la_OBJECTS) $(libcontroller_linux_input_la_LIBADD) $(LIBS) + libcontroller-midi.la: $(libcontroller_midi_la_OBJECTS) $(libcontroller_midi_la_DEPENDENCIES) $(EXTRA_libcontroller_midi_la_DEPENDENCIES) $(AM_V_CCLD)$(libcontroller_midi_la_LINK) $(am_libcontroller_midi_la_rpath) $(libcontroller_midi_la_OBJECTS) $(libcontroller_midi_la_LIBADD) $(LIBS) + libdisplay-filter-color-blind.la: $(libdisplay_filter_color_blind_la_OBJECTS) $(libdisplay_filter_color_blind_la_DEPENDENCIES) $(EXTRA_libdisplay_filter_color_blind_la_DEPENDENCIES) $(AM_V_CCLD)$(libdisplay_filter_color_blind_la_LINK) -rpath $(libdir) $(libdisplay_filter_color_blind_la_OBJECTS) $(libdisplay_filter_color_blind_la_LIBADD) $(LIBS) + libdisplay-filter-gamma.la: $(libdisplay_filter_gamma_la_OBJECTS) $(libdisplay_filter_gamma_la_DEPENDENCIES) $(EXTRA_libdisplay_filter_gamma_la_DEPENDENCIES) $(AM_V_CCLD)$(libdisplay_filter_gamma_la_LINK) -rpath $(libdir) $(libdisplay_filter_gamma_la_OBJECTS) $(libdisplay_filter_gamma_la_LIBADD) $(LIBS) + libdisplay-filter-high-contrast.la: $(libdisplay_filter_high_contrast_la_OBJECTS) $(libdisplay_filter_high_contrast_la_DEPENDENCIES) $(EXTRA_libdisplay_filter_high_contrast_la_DEPENDENCIES) $(AM_V_CCLD)$(libdisplay_filter_high_contrast_la_LINK) -rpath $(libdir) $(libdisplay_filter_high_contrast_la_OBJECTS) $(libdisplay_filter_high_contrast_la_LIBADD) $(LIBS) + libdisplay-filter-lcms.la: $(libdisplay_filter_lcms_la_OBJECTS) $(libdisplay_filter_lcms_la_DEPENDENCIES) $(EXTRA_libdisplay_filter_lcms_la_DEPENDENCIES) $(AM_V_CCLD)$(libdisplay_filter_lcms_la_LINK) $(am_libdisplay_filter_lcms_la_rpath) $(libdisplay_filter_lcms_la_OBJECTS) $(libdisplay_filter_lcms_la_LIBADD) $(LIBS) + libdisplay-filter-proof.la: $(libdisplay_filter_proof_la_OBJECTS) $(libdisplay_filter_proof_la_DEPENDENCIES) $(EXTRA_libdisplay_filter_proof_la_DEPENDENCIES) $(AM_V_CCLD)$(libdisplay_filter_proof_la_LINK) $(am_libdisplay_filter_proof_la_rpath) $(libdisplay_filter_proof_la_OBJECTS) $(libdisplay_filter_proof_la_LIBADD) $(LIBS) @@ -819,14 +902,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -890,26 +973,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -921,15 +993,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -938,6 +1006,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1082,19 +1165,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libLTLIBRARIES install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES + tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/NEWS gimp-2.8.20/NEWS --- gimp-2.8.18/NEWS 2016-07-12 23:13:40.000000000 +0000 +++ gimp-2.8.20/NEWS 2017-01-31 22:18:33.000000000 +0000 @@ -7,6 +7,105 @@ here, just bug-fixes. +Overview of Changes from GIMP 2.8.18 to GIMP 2.8.20 +=================================================== + + +Core: + + - Avoid D-Bus error message when built without D-Bus support + - fix OS X min required conditional in gimpimagewindow.c + - Saving to existing .xcf.bz and .xcf.gz files didn't truncate them + and could lead to unnecessarily large files + - Text layer created by gimp-text-fontname doesn't respect border + when resized + - avoid seeking when saving XCF files to prevent corruption with + file network shares (fixed since 2014, but not mentioned in NEWS yet) + + +GUI: + + - Flow on Paint Dynamics editor dialog: the 'y' axis is indicating + 'Rate' instead 'Flow' + - Vertical ruler shows artifacts if the status bar isn't showing + - Tablet stylus misbehaves when crossing the edge of a dock in + multi-window-mode + - Disable the new "automatic window tabbing" feature introduced on macOS + Sierra + - Improve the visiblity of slider handles with dark themes + - Make it harder to switch to renaming if selecting already selected + items in resource lists + + +Tools: + + - make toggling to color picker mode of paint tools more robust + + +Libgimp: + + - call gimp_file_entry_set_filename() with filename encoding + + +Windows Installer: + + - Reduce the memory requirement when running the installer (has + already been shipped in a 2.8.18 installer-only update) + - Ship an updated libcairo to fix GTK+ UI rendering problems, like + missing palette border/bevel and shadowa under tab labels + + +macOS DMG: + + - Ship the Tango icon theme with the DMG for a complete set of icons + - fix the way mime data is copied into the bundle + - no longer copy Pango modules into the bundle + - prevent a crash caused by drag&drop on OSX by patching the included + GTK+ + - ship a patch for gettext to make sure the preferred UI language + will be used + + +Plug-ins: + + - Prevent the Python console from closing by the Escape key + - Help browser does not launch on OS X + - Filter 'Edge Detect/Difference of Gaussians' returns empty image + - only use -xobjective-c for compile commands + - mkgen.pl: fix calls to write_file() routine to write to current + directory + - When printing, the images are composed onto a white background to + prevent printing a black box instead of a transaprent image + - Fix color visison deficiency display filters to apply gamma + correction directly + + +Updated Translations: + + - Catalan + - Czech + - Danish + - Finnish + - French + - German + - Greek + - Hungarian + - Icelandic + - Italian + - Polish + - Portuguese + - Slovak + - Slovenian + - Scottish Gaelic + - Spanish + - Swedish + + +General: + + - Bug fixes + + Overview of Changes from GIMP 2.8.16 to GIMP 2.8.18 =================================================== diff -Nru gimp-2.8.18/plug-ins/color-rotate/images/Makefile.in gimp-2.8.20/plug-ins/color-rotate/images/Makefile.in --- gimp-2.8.18/plug-ins/color-rotate/images/Makefile.in 2016-07-12 23:20:10.000000000 +0000 +++ gimp-2.8.20/plug-ins/color-rotate/images/Makefile.in 2017-01-31 23:40:41.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = plug-ins/color-rotate/images -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -80,6 +129,8 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(noinst_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -443,7 +494,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/color-rotate/images/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/color-rotate/images/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -467,11 +517,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -608,15 +658,18 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + +.PRECIOUS: Makefile stock-icons.list: $(STOCK_IMAGES) Makefile.am diff -Nru gimp-2.8.18/plug-ins/color-rotate/Makefile.in gimp-2.8.20/plug-ins/color-rotate/Makefile.in --- gimp-2.8.18/plug-ins/color-rotate/Makefile.in 2016-07-12 23:20:10.000000000 +0000 +++ gimp-2.8.20/plug-ins/color-rotate/Makefile.in 2017-01-31 23:40:41.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = color-rotate$(EXEEXT) subdir = plug-ins/color-rotate ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -86,6 +128,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -98,29 +153,26 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(color_rotate_SOURCES) DIST_SOURCES = $(color_rotate_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -128,12 +180,35 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -560,7 +635,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/color-rotate/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/color-rotate/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -569,7 +643,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -588,10 +662,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -612,7 +688,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -625,6 +702,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + color-rotate$(EXEEXT): $(color_rotate_OBJECTS) $(color_rotate_DEPENDENCIES) $(EXTRA_color_rotate_DEPENDENCIES) @rm -f color-rotate$(EXEEXT) $(AM_V_CCLD)$(LINK) $(color_rotate_OBJECTS) $(color_rotate_LDADD) $(LIBS) @@ -647,14 +725,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -670,22 +748,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -700,57 +781,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -766,12 +802,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -783,15 +814,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -800,6 +827,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -968,24 +1010,24 @@ uninstall-am: uninstall-libexecPROGRAMS -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libexecPROGRAMS \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-libexecPROGRAMS -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecPROGRAMS install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-libexecPROGRAMS +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/common/edge-dog.c gimp-2.8.20/plug-ins/common/edge-dog.c --- gimp-2.8.18/plug-ins/common/edge-dog.c 2015-08-20 22:57:28.000000000 +0000 +++ gimp-2.8.20/plug-ins/common/edge-dog.c 2017-01-28 19:08:45.000000000 +0000 @@ -161,6 +161,7 @@ GimpRunMode run_mode; GimpPDBStatusType status = GIMP_PDB_SUCCESS; GError *error = NULL; + gint x, y, w, h; run_mode = param[0].data.d_int32; @@ -186,6 +187,13 @@ image_ID = param[1].data.d_image; drawable = gimp_drawable_get (param[2].data.d_drawable); + if (! gimp_drawable_mask_intersect (drawable->drawable_id, + &x, &y, &w, &h)) + { + g_message (_("Region affected by plug-in is empty")); + return; + } + /* set the tile cache size so that the gaussian blur works well */ gimp_tile_cache_ntiles (2 * (MAX (drawable->width, drawable->height) / @@ -458,13 +466,10 @@ gint32 layer1; gint32 layer2; gint width, height; - gint x1, y1, x2, y2; + gint x, y; guchar maxval = 255; - gimp_drawable_mask_bounds (drawable_id, &x1, &y1, &x2, &y2); - - width = (x2 - x1); - height = (y2 - y1); + gimp_drawable_mask_intersect (drawable_id, &x, &y, &width, &height); gimp_drawable_flush (drawable); @@ -496,7 +501,6 @@ gimp_drawable_flush (drawable); gimp_drawable_merge_shadow (drawable_id, TRUE); - gimp_drawable_update (drawable_id, x1, y1, width, height); if (dogvals.normalize || dogvals.invert) /* gimp_invert doesn't work properly with previews due to shadow handling @@ -506,8 +510,9 @@ normalize_invert (drawable, dogvals.normalize, maxval, dogvals.invert); gimp_drawable_flush (drawable); gimp_drawable_merge_shadow (drawable_id, TRUE); - gimp_drawable_update (drawable_id, x1, y1, width, height); } + + gimp_drawable_update (drawable_id, x, y, width, height); } @@ -517,56 +522,67 @@ GimpDrawable *drawable2, guchar *maxval) { - GimpPixelRgn src1_rgn, src2_rgn, dest_rgn; + GimpPixelRgn src_rgn, src1_rgn, src2_rgn, dest_rgn; gint width, height; gint bpp; gpointer pr; gint x, y, k; - gint x1, y1, x2, y2; gboolean has_alpha; *maxval = 0; - gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2); - - width = (x2 - x1); - height = (y2 - y1); - - if (width < 1 || height < 1) - return; + gimp_drawable_mask_intersect (drawable->drawable_id, + &x, &y, &width, &height); bpp = drawable->bpp; has_alpha = gimp_drawable_has_alpha (drawable->drawable_id); gimp_pixel_rgn_init (&src1_rgn, - drawable1, 0, 0, drawable1->width, drawable1->height, + drawable1, x, y, width, height, FALSE, FALSE); gimp_pixel_rgn_init (&src2_rgn, - drawable2, 0, 0, drawable1->width, drawable1->height, + drawable2, x, y, width, height, FALSE, FALSE); gimp_pixel_rgn_init (&dest_rgn, - drawable, 0, 0, drawable->width, drawable->height, + drawable, x, y, width, height, TRUE, TRUE); - for (pr = gimp_pixel_rgns_register (3, &src1_rgn, &src2_rgn, &dest_rgn); - pr != NULL; - pr = gimp_pixel_rgns_process (pr)) + if (has_alpha) + { + gimp_pixel_rgn_init (&src_rgn, + drawable, x, y, width, height, + FALSE, FALSE); + + pr = gimp_pixel_rgns_register (4, + &src_rgn, + &src1_rgn, + &src2_rgn, + &dest_rgn); + } + else { + pr = gimp_pixel_rgns_register (3, + &src1_rgn, + &src2_rgn, + &dest_rgn); + } + + for(; pr != NULL ; pr = gimp_pixel_rgns_process (pr)) + { + guchar *src = has_alpha ? src_rgn.data : NULL; guchar *src1 = src1_rgn.data; guchar *src2 = src2_rgn.data; guchar *dest = dest_rgn.data; - gint row = src1_rgn.y - y1; - for (y = 0; y < src1_rgn.h; y++, row++) + for (y = 0; y < src1_rgn.h; y++) { - guchar *s1 = src1; - guchar *s2 = src2; - guchar *d = dest; - gint col = src1_rgn.x - x1; + guchar *s = has_alpha ? src : NULL; + guchar *s1 = src1; + guchar *s2 = src2; + guchar *d = dest; - for (x = 0; x < src1_rgn.w; x++, col++) + for (x = 0; x < src1_rgn.w; x++) { - if (has_alpha) { for (k = 0; k < bpp-1; k++) @@ -574,6 +590,9 @@ d[k] = CLAMP0255 (s1[k] - s2[k]); *maxval = MAX (d[k], *maxval); } + + d[bpp - 1] = s[bpp - 1]; + s += bpp; } else { @@ -586,9 +605,10 @@ s1 += bpp; s2 += bpp; - d += bpp; + d += bpp; } + src = has_alpha ? src + src_rgn.rowstride : NULL; src1 += src1_rgn.rowstride; src2 += src2_rgn.rowstride; dest += dest_rgn.rowstride; @@ -880,10 +900,9 @@ } } - /* merge the shadow, update the drawable */ + /* merge the shadow */ gimp_drawable_flush (drawable); gimp_drawable_merge_shadow (drawable->drawable_id, TRUE); - gimp_drawable_update (drawable->drawable_id, x1, y1, (x2 - x1), (y2 - y1)); /* free buffers */ g_free (buf); diff -Nru gimp-2.8.18/plug-ins/common/gimprc.common gimp-2.8.20/plug-ins/common/gimprc.common --- gimp-2.8.18/plug-ins/common/gimprc.common 2015-08-20 22:57:28.000000000 +0000 +++ gimp-2.8.20/plug-ins/common/gimprc.common 2017-01-28 19:08:46.000000000 +0000 @@ -47,7 +47,6 @@ engrave_RC = engrave.rc.o file_aa_RC = file-aa.rc.o file_cel_RC = file-cel.rc.o -file_compressor_RC = file-compressor.rc.o file_csource_RC = file-csource.rc.o file_desktop_link_RC = file-desktop-link.rc.o file_dicom_RC = file-dicom.rc.o diff -Nru gimp-2.8.18/plug-ins/common/Makefile.am gimp-2.8.20/plug-ins/common/Makefile.am --- gimp-2.8.18/plug-ins/common/Makefile.am 2015-08-20 22:57:28.000000000 +0000 +++ gimp-2.8.20/plug-ins/common/Makefile.am 2017-01-28 19:08:45.000000000 +0000 @@ -13,6 +13,11 @@ libm = -lm endif +if PLATFORM_OSX +xobjective_c = "-xobjective-c" +framework_cocoa = -framework Cocoa +endif + if HAVE_WINDRES include $(top_srcdir)/build/windows/gimprc-plug-ins.rule include gimprc.common @@ -2616,6 +2621,10 @@ $(INTLLIBS) \ $(waves_RC) +web_browser_LDFLAGS = $(framework_cocoa) + +web_browser_CPPFLAGS = $(AM_CPPFLAGS) $(xobjective_c) + web_browser_SOURCES = \ web-browser.c diff -Nru gimp-2.8.18/plug-ins/common/Makefile.in gimp-2.8.20/plug-ins/common/Makefile.in --- gimp-2.8.18/plug-ins/common/Makefile.in 2016-07-12 23:20:13.000000000 +0000 +++ gimp-2.8.20/plug-ins/common/Makefile.in 2017-01-31 23:40:45.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,9 +90,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/gimprc.common \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = alien-map$(EXEEXT) align-layers$(EXEEXT) \ animation-optimize$(EXEEXT) animation-play$(EXEEXT) \ antialias$(EXEEXT) apply-canvas$(EXEEXT) blinds$(EXEEXT) \ @@ -118,14 +152,21 @@ screenshot$(EXEEXT) web-page$(EXEEXT) subdir = plug-ins/common ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -145,6 +186,7 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = am_align_layers_OBJECTS = align-layers.$(OBJEXT) align_layers_OBJECTS = $(am_align_layers_OBJECTS) align_layers_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \ @@ -1122,13 +1164,16 @@ $(libgimp) $(am__DEPENDENCIES_2) $(libgimpconfig) \ $(libgimpcolor) $(libgimpbase) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(waves_RC) -am_web_browser_OBJECTS = web-browser.$(OBJEXT) +am_web_browser_OBJECTS = web_browser-web-browser.$(OBJEXT) web_browser_OBJECTS = $(am_web_browser_OBJECTS) web_browser_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \ $(libgimpmodule) $(libgimp) $(am__DEPENDENCIES_2) \ $(libgimpconfig) $(libgimpcolor) $(libgimpbase) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(web_browser_RC) +web_browser_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(web_browser_LDFLAGS) $(LDFLAGS) -o $@ am_web_page_OBJECTS = web_page-web-page.$(OBJEXT) web_page_OBJECTS = $(am_web_page_OBJECTS) web_page_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \ @@ -1152,6 +1197,18 @@ $(libgimp) $(am__DEPENDENCIES_2) $(libgimpconfig) \ $(libgimpcolor) $(libgimpbase) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(wind_RC) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -1164,20 +1221,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(alien_map_SOURCES) $(align_layers_SOURCES) \ $(animation_optimize_SOURCES) $(animation_play_SOURCES) \ $(antialias_SOURCES) $(apply_canvas_SOURCES) $(blinds_SOURCES) \ @@ -1307,8 +1360,28 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gimprc.common \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -1650,6 +1723,8 @@ top_srcdir = @top_srcdir@ @OS_WIN32_TRUE@mwindows = -mwindows @OS_WIN32_FALSE@libm = -lm +@PLATFORM_OSX_TRUE@xobjective_c = "-xobjective-c" +@PLATFORM_OSX_TRUE@framework_cocoa = -framework Cocoa @HAVE_WINDRES_TRUE@GIMPPLUGINRC = $(top_srcdir)/build/windows/gimp-plug-ins.rc @HAVE_WINDRES_TRUE@alien_map_RC = alien-map.rc.o @HAVE_WINDRES_TRUE@align_layers_RC = align-layers.rc.o @@ -1700,7 +1775,6 @@ @HAVE_WINDRES_TRUE@engrave_RC = engrave.rc.o @HAVE_WINDRES_TRUE@file_aa_RC = file-aa.rc.o @HAVE_WINDRES_TRUE@file_cel_RC = file-cel.rc.o -@HAVE_WINDRES_TRUE@file_compressor_RC = file-compressor.rc.o @HAVE_WINDRES_TRUE@file_csource_RC = file-csource.rc.o @HAVE_WINDRES_TRUE@file_desktop_link_RC = file-desktop-link.rc.o @HAVE_WINDRES_TRUE@file_dicom_RC = file-dicom.rc.o @@ -4201,6 +4275,8 @@ $(INTLLIBS) \ $(waves_RC) +web_browser_LDFLAGS = $(framework_cocoa) +web_browser_CPPFLAGS = $(AM_CPPFLAGS) $(xobjective_c) web_browser_SOURCES = \ web-browser.c @@ -4287,7 +4363,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/common/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/common/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -4296,7 +4371,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(srcdir)/gimprc.common: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(srcdir)/gimprc.common $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -4315,10 +4390,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -4339,7 +4416,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -4352,438 +4430,583 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + alien-map$(EXEEXT): $(alien_map_OBJECTS) $(alien_map_DEPENDENCIES) $(EXTRA_alien_map_DEPENDENCIES) @rm -f alien-map$(EXEEXT) $(AM_V_CCLD)$(LINK) $(alien_map_OBJECTS) $(alien_map_LDADD) $(LIBS) + align-layers$(EXEEXT): $(align_layers_OBJECTS) $(align_layers_DEPENDENCIES) $(EXTRA_align_layers_DEPENDENCIES) @rm -f align-layers$(EXEEXT) $(AM_V_CCLD)$(LINK) $(align_layers_OBJECTS) $(align_layers_LDADD) $(LIBS) + animation-optimize$(EXEEXT): $(animation_optimize_OBJECTS) $(animation_optimize_DEPENDENCIES) $(EXTRA_animation_optimize_DEPENDENCIES) @rm -f animation-optimize$(EXEEXT) $(AM_V_CCLD)$(LINK) $(animation_optimize_OBJECTS) $(animation_optimize_LDADD) $(LIBS) + animation-play$(EXEEXT): $(animation_play_OBJECTS) $(animation_play_DEPENDENCIES) $(EXTRA_animation_play_DEPENDENCIES) @rm -f animation-play$(EXEEXT) $(AM_V_CCLD)$(LINK) $(animation_play_OBJECTS) $(animation_play_LDADD) $(LIBS) + antialias$(EXEEXT): $(antialias_OBJECTS) $(antialias_DEPENDENCIES) $(EXTRA_antialias_DEPENDENCIES) @rm -f antialias$(EXEEXT) $(AM_V_CCLD)$(LINK) $(antialias_OBJECTS) $(antialias_LDADD) $(LIBS) + apply-canvas$(EXEEXT): $(apply_canvas_OBJECTS) $(apply_canvas_DEPENDENCIES) $(EXTRA_apply_canvas_DEPENDENCIES) @rm -f apply-canvas$(EXEEXT) $(AM_V_CCLD)$(LINK) $(apply_canvas_OBJECTS) $(apply_canvas_LDADD) $(LIBS) + blinds$(EXEEXT): $(blinds_OBJECTS) $(blinds_DEPENDENCIES) $(EXTRA_blinds_DEPENDENCIES) @rm -f blinds$(EXEEXT) $(AM_V_CCLD)$(LINK) $(blinds_OBJECTS) $(blinds_LDADD) $(LIBS) + blur$(EXEEXT): $(blur_OBJECTS) $(blur_DEPENDENCIES) $(EXTRA_blur_DEPENDENCIES) @rm -f blur$(EXEEXT) $(AM_V_CCLD)$(LINK) $(blur_OBJECTS) $(blur_LDADD) $(LIBS) + blur-gauss$(EXEEXT): $(blur_gauss_OBJECTS) $(blur_gauss_DEPENDENCIES) $(EXTRA_blur_gauss_DEPENDENCIES) @rm -f blur-gauss$(EXEEXT) $(AM_V_CCLD)$(LINK) $(blur_gauss_OBJECTS) $(blur_gauss_LDADD) $(LIBS) + blur-gauss-selective$(EXEEXT): $(blur_gauss_selective_OBJECTS) $(blur_gauss_selective_DEPENDENCIES) $(EXTRA_blur_gauss_selective_DEPENDENCIES) @rm -f blur-gauss-selective$(EXEEXT) $(AM_V_CCLD)$(blur_gauss_selective_LINK) $(blur_gauss_selective_OBJECTS) $(blur_gauss_selective_LDADD) $(LIBS) + blur-motion$(EXEEXT): $(blur_motion_OBJECTS) $(blur_motion_DEPENDENCIES) $(EXTRA_blur_motion_DEPENDENCIES) @rm -f blur-motion$(EXEEXT) $(AM_V_CCLD)$(LINK) $(blur_motion_OBJECTS) $(blur_motion_LDADD) $(LIBS) + border-average$(EXEEXT): $(border_average_OBJECTS) $(border_average_DEPENDENCIES) $(EXTRA_border_average_DEPENDENCIES) @rm -f border-average$(EXEEXT) $(AM_V_CCLD)$(LINK) $(border_average_OBJECTS) $(border_average_LDADD) $(LIBS) + bump-map$(EXEEXT): $(bump_map_OBJECTS) $(bump_map_DEPENDENCIES) $(EXTRA_bump_map_DEPENDENCIES) @rm -f bump-map$(EXEEXT) $(AM_V_CCLD)$(LINK) $(bump_map_OBJECTS) $(bump_map_LDADD) $(LIBS) + cartoon$(EXEEXT): $(cartoon_OBJECTS) $(cartoon_DEPENDENCIES) $(EXTRA_cartoon_DEPENDENCIES) @rm -f cartoon$(EXEEXT) $(AM_V_CCLD)$(LINK) $(cartoon_OBJECTS) $(cartoon_LDADD) $(LIBS) + channel-mixer$(EXEEXT): $(channel_mixer_OBJECTS) $(channel_mixer_DEPENDENCIES) $(EXTRA_channel_mixer_DEPENDENCIES) @rm -f channel-mixer$(EXEEXT) $(AM_V_CCLD)$(LINK) $(channel_mixer_OBJECTS) $(channel_mixer_LDADD) $(LIBS) + checkerboard$(EXEEXT): $(checkerboard_OBJECTS) $(checkerboard_DEPENDENCIES) $(EXTRA_checkerboard_DEPENDENCIES) @rm -f checkerboard$(EXEEXT) $(AM_V_CCLD)$(LINK) $(checkerboard_OBJECTS) $(checkerboard_LDADD) $(LIBS) + cml-explorer$(EXEEXT): $(cml_explorer_OBJECTS) $(cml_explorer_DEPENDENCIES) $(EXTRA_cml_explorer_DEPENDENCIES) @rm -f cml-explorer$(EXEEXT) $(AM_V_CCLD)$(LINK) $(cml_explorer_OBJECTS) $(cml_explorer_LDADD) $(LIBS) + color-cube-analyze$(EXEEXT): $(color_cube_analyze_OBJECTS) $(color_cube_analyze_DEPENDENCIES) $(EXTRA_color_cube_analyze_DEPENDENCIES) @rm -f color-cube-analyze$(EXEEXT) $(AM_V_CCLD)$(LINK) $(color_cube_analyze_OBJECTS) $(color_cube_analyze_LDADD) $(LIBS) + color-enhance$(EXEEXT): $(color_enhance_OBJECTS) $(color_enhance_DEPENDENCIES) $(EXTRA_color_enhance_DEPENDENCIES) @rm -f color-enhance$(EXEEXT) $(AM_V_CCLD)$(LINK) $(color_enhance_OBJECTS) $(color_enhance_LDADD) $(LIBS) + color-exchange$(EXEEXT): $(color_exchange_OBJECTS) $(color_exchange_DEPENDENCIES) $(EXTRA_color_exchange_DEPENDENCIES) @rm -f color-exchange$(EXEEXT) $(AM_V_CCLD)$(LINK) $(color_exchange_OBJECTS) $(color_exchange_LDADD) $(LIBS) + color-to-alpha$(EXEEXT): $(color_to_alpha_OBJECTS) $(color_to_alpha_DEPENDENCIES) $(EXTRA_color_to_alpha_DEPENDENCIES) @rm -f color-to-alpha$(EXEEXT) $(AM_V_CCLD)$(LINK) $(color_to_alpha_OBJECTS) $(color_to_alpha_LDADD) $(LIBS) + colorify$(EXEEXT): $(colorify_OBJECTS) $(colorify_DEPENDENCIES) $(EXTRA_colorify_DEPENDENCIES) @rm -f colorify$(EXEEXT) $(AM_V_CCLD)$(LINK) $(colorify_OBJECTS) $(colorify_LDADD) $(LIBS) + colormap-remap$(EXEEXT): $(colormap_remap_OBJECTS) $(colormap_remap_DEPENDENCIES) $(EXTRA_colormap_remap_DEPENDENCIES) @rm -f colormap-remap$(EXEEXT) $(AM_V_CCLD)$(LINK) $(colormap_remap_OBJECTS) $(colormap_remap_LDADD) $(LIBS) + compose$(EXEEXT): $(compose_OBJECTS) $(compose_DEPENDENCIES) $(EXTRA_compose_DEPENDENCIES) @rm -f compose$(EXEEXT) $(AM_V_CCLD)$(LINK) $(compose_OBJECTS) $(compose_LDADD) $(LIBS) + contrast-normalize$(EXEEXT): $(contrast_normalize_OBJECTS) $(contrast_normalize_DEPENDENCIES) $(EXTRA_contrast_normalize_DEPENDENCIES) @rm -f contrast-normalize$(EXEEXT) $(AM_V_CCLD)$(LINK) $(contrast_normalize_OBJECTS) $(contrast_normalize_LDADD) $(LIBS) + contrast-retinex$(EXEEXT): $(contrast_retinex_OBJECTS) $(contrast_retinex_DEPENDENCIES) $(EXTRA_contrast_retinex_DEPENDENCIES) @rm -f contrast-retinex$(EXEEXT) $(AM_V_CCLD)$(LINK) $(contrast_retinex_OBJECTS) $(contrast_retinex_LDADD) $(LIBS) + contrast-stretch$(EXEEXT): $(contrast_stretch_OBJECTS) $(contrast_stretch_DEPENDENCIES) $(EXTRA_contrast_stretch_DEPENDENCIES) @rm -f contrast-stretch$(EXEEXT) $(AM_V_CCLD)$(LINK) $(contrast_stretch_OBJECTS) $(contrast_stretch_LDADD) $(LIBS) + contrast-stretch-hsv$(EXEEXT): $(contrast_stretch_hsv_OBJECTS) $(contrast_stretch_hsv_DEPENDENCIES) $(EXTRA_contrast_stretch_hsv_DEPENDENCIES) @rm -f contrast-stretch-hsv$(EXEEXT) $(AM_V_CCLD)$(LINK) $(contrast_stretch_hsv_OBJECTS) $(contrast_stretch_hsv_LDADD) $(LIBS) + convolution-matrix$(EXEEXT): $(convolution_matrix_OBJECTS) $(convolution_matrix_DEPENDENCIES) $(EXTRA_convolution_matrix_DEPENDENCIES) @rm -f convolution-matrix$(EXEEXT) $(AM_V_CCLD)$(LINK) $(convolution_matrix_OBJECTS) $(convolution_matrix_LDADD) $(LIBS) + crop-auto$(EXEEXT): $(crop_auto_OBJECTS) $(crop_auto_DEPENDENCIES) $(EXTRA_crop_auto_DEPENDENCIES) @rm -f crop-auto$(EXEEXT) $(AM_V_CCLD)$(LINK) $(crop_auto_OBJECTS) $(crop_auto_LDADD) $(LIBS) + crop-zealous$(EXEEXT): $(crop_zealous_OBJECTS) $(crop_zealous_DEPENDENCIES) $(EXTRA_crop_zealous_DEPENDENCIES) @rm -f crop-zealous$(EXEEXT) $(AM_V_CCLD)$(LINK) $(crop_zealous_OBJECTS) $(crop_zealous_LDADD) $(LIBS) + cubism$(EXEEXT): $(cubism_OBJECTS) $(cubism_DEPENDENCIES) $(EXTRA_cubism_DEPENDENCIES) @rm -f cubism$(EXEEXT) $(AM_V_CCLD)$(LINK) $(cubism_OBJECTS) $(cubism_LDADD) $(LIBS) + curve-bend$(EXEEXT): $(curve_bend_OBJECTS) $(curve_bend_DEPENDENCIES) $(EXTRA_curve_bend_DEPENDENCIES) @rm -f curve-bend$(EXEEXT) $(AM_V_CCLD)$(LINK) $(curve_bend_OBJECTS) $(curve_bend_LDADD) $(LIBS) + decompose$(EXEEXT): $(decompose_OBJECTS) $(decompose_DEPENDENCIES) $(EXTRA_decompose_DEPENDENCIES) @rm -f decompose$(EXEEXT) $(AM_V_CCLD)$(LINK) $(decompose_OBJECTS) $(decompose_LDADD) $(LIBS) + deinterlace$(EXEEXT): $(deinterlace_OBJECTS) $(deinterlace_DEPENDENCIES) $(EXTRA_deinterlace_DEPENDENCIES) @rm -f deinterlace$(EXEEXT) $(AM_V_CCLD)$(LINK) $(deinterlace_OBJECTS) $(deinterlace_LDADD) $(LIBS) + depth-merge$(EXEEXT): $(depth_merge_OBJECTS) $(depth_merge_DEPENDENCIES) $(EXTRA_depth_merge_DEPENDENCIES) @rm -f depth-merge$(EXEEXT) $(AM_V_CCLD)$(LINK) $(depth_merge_OBJECTS) $(depth_merge_LDADD) $(LIBS) + despeckle$(EXEEXT): $(despeckle_OBJECTS) $(despeckle_DEPENDENCIES) $(EXTRA_despeckle_DEPENDENCIES) @rm -f despeckle$(EXEEXT) $(AM_V_CCLD)$(LINK) $(despeckle_OBJECTS) $(despeckle_LDADD) $(LIBS) + destripe$(EXEEXT): $(destripe_OBJECTS) $(destripe_DEPENDENCIES) $(EXTRA_destripe_DEPENDENCIES) @rm -f destripe$(EXEEXT) $(AM_V_CCLD)$(LINK) $(destripe_OBJECTS) $(destripe_LDADD) $(LIBS) + diffraction$(EXEEXT): $(diffraction_OBJECTS) $(diffraction_DEPENDENCIES) $(EXTRA_diffraction_DEPENDENCIES) @rm -f diffraction$(EXEEXT) $(AM_V_CCLD)$(LINK) $(diffraction_OBJECTS) $(diffraction_LDADD) $(LIBS) + displace$(EXEEXT): $(displace_OBJECTS) $(displace_DEPENDENCIES) $(EXTRA_displace_DEPENDENCIES) @rm -f displace$(EXEEXT) $(AM_V_CCLD)$(LINK) $(displace_OBJECTS) $(displace_LDADD) $(LIBS) + edge$(EXEEXT): $(edge_OBJECTS) $(edge_DEPENDENCIES) $(EXTRA_edge_DEPENDENCIES) @rm -f edge$(EXEEXT) $(AM_V_CCLD)$(LINK) $(edge_OBJECTS) $(edge_LDADD) $(LIBS) + edge-dog$(EXEEXT): $(edge_dog_OBJECTS) $(edge_dog_DEPENDENCIES) $(EXTRA_edge_dog_DEPENDENCIES) @rm -f edge-dog$(EXEEXT) $(AM_V_CCLD)$(LINK) $(edge_dog_OBJECTS) $(edge_dog_LDADD) $(LIBS) + edge-laplace$(EXEEXT): $(edge_laplace_OBJECTS) $(edge_laplace_DEPENDENCIES) $(EXTRA_edge_laplace_DEPENDENCIES) @rm -f edge-laplace$(EXEEXT) $(AM_V_CCLD)$(LINK) $(edge_laplace_OBJECTS) $(edge_laplace_LDADD) $(LIBS) + edge-neon$(EXEEXT): $(edge_neon_OBJECTS) $(edge_neon_DEPENDENCIES) $(EXTRA_edge_neon_DEPENDENCIES) @rm -f edge-neon$(EXEEXT) $(AM_V_CCLD)$(LINK) $(edge_neon_OBJECTS) $(edge_neon_LDADD) $(LIBS) + edge-sobel$(EXEEXT): $(edge_sobel_OBJECTS) $(edge_sobel_DEPENDENCIES) $(EXTRA_edge_sobel_DEPENDENCIES) @rm -f edge-sobel$(EXEEXT) $(AM_V_CCLD)$(LINK) $(edge_sobel_OBJECTS) $(edge_sobel_LDADD) $(LIBS) + emboss$(EXEEXT): $(emboss_OBJECTS) $(emboss_DEPENDENCIES) $(EXTRA_emboss_DEPENDENCIES) @rm -f emboss$(EXEEXT) $(AM_V_CCLD)$(LINK) $(emboss_OBJECTS) $(emboss_LDADD) $(LIBS) + engrave$(EXEEXT): $(engrave_OBJECTS) $(engrave_DEPENDENCIES) $(EXTRA_engrave_DEPENDENCIES) @rm -f engrave$(EXEEXT) $(AM_V_CCLD)$(LINK) $(engrave_OBJECTS) $(engrave_LDADD) $(LIBS) + file-aa$(EXEEXT): $(file_aa_OBJECTS) $(file_aa_DEPENDENCIES) $(EXTRA_file_aa_DEPENDENCIES) @rm -f file-aa$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_aa_OBJECTS) $(file_aa_LDADD) $(LIBS) + file-cel$(EXEEXT): $(file_cel_OBJECTS) $(file_cel_DEPENDENCIES) $(EXTRA_file_cel_DEPENDENCIES) @rm -f file-cel$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_cel_OBJECTS) $(file_cel_LDADD) $(LIBS) + file-csource$(EXEEXT): $(file_csource_OBJECTS) $(file_csource_DEPENDENCIES) $(EXTRA_file_csource_DEPENDENCIES) @rm -f file-csource$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_csource_OBJECTS) $(file_csource_LDADD) $(LIBS) + file-desktop-link$(EXEEXT): $(file_desktop_link_OBJECTS) $(file_desktop_link_DEPENDENCIES) $(EXTRA_file_desktop_link_DEPENDENCIES) @rm -f file-desktop-link$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_desktop_link_OBJECTS) $(file_desktop_link_LDADD) $(LIBS) + file-dicom$(EXEEXT): $(file_dicom_OBJECTS) $(file_dicom_DEPENDENCIES) $(EXTRA_file_dicom_DEPENDENCIES) @rm -f file-dicom$(EXEEXT) $(AM_V_CCLD)$(file_dicom_LINK) $(file_dicom_OBJECTS) $(file_dicom_LDADD) $(LIBS) + file-gbr$(EXEEXT): $(file_gbr_OBJECTS) $(file_gbr_DEPENDENCIES) $(EXTRA_file_gbr_DEPENDENCIES) @rm -f file-gbr$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_gbr_OBJECTS) $(file_gbr_LDADD) $(LIBS) + file-gif-load$(EXEEXT): $(file_gif_load_OBJECTS) $(file_gif_load_DEPENDENCIES) $(EXTRA_file_gif_load_DEPENDENCIES) @rm -f file-gif-load$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_gif_load_OBJECTS) $(file_gif_load_LDADD) $(LIBS) + file-gif-save$(EXEEXT): $(file_gif_save_OBJECTS) $(file_gif_save_DEPENDENCIES) $(EXTRA_file_gif_save_DEPENDENCIES) @rm -f file-gif-save$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_gif_save_OBJECTS) $(file_gif_save_LDADD) $(LIBS) + file-gih$(EXEEXT): $(file_gih_OBJECTS) $(file_gih_DEPENDENCIES) $(EXTRA_file_gih_DEPENDENCIES) @rm -f file-gih$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_gih_OBJECTS) $(file_gih_LDADD) $(LIBS) + file-glob$(EXEEXT): $(file_glob_OBJECTS) $(file_glob_DEPENDENCIES) $(EXTRA_file_glob_DEPENDENCIES) @rm -f file-glob$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_glob_OBJECTS) $(file_glob_LDADD) $(LIBS) + file-header$(EXEEXT): $(file_header_OBJECTS) $(file_header_DEPENDENCIES) $(EXTRA_file_header_DEPENDENCIES) @rm -f file-header$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_header_OBJECTS) $(file_header_LDADD) $(LIBS) + file-html-table$(EXEEXT): $(file_html_table_OBJECTS) $(file_html_table_DEPENDENCIES) $(EXTRA_file_html_table_DEPENDENCIES) @rm -f file-html-table$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_html_table_OBJECTS) $(file_html_table_LDADD) $(LIBS) + file-jp2-load$(EXEEXT): $(file_jp2_load_OBJECTS) $(file_jp2_load_DEPENDENCIES) $(EXTRA_file_jp2_load_DEPENDENCIES) @rm -f file-jp2-load$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_jp2_load_OBJECTS) $(file_jp2_load_LDADD) $(LIBS) + file-mng$(EXEEXT): $(file_mng_OBJECTS) $(file_mng_DEPENDENCIES) $(EXTRA_file_mng_DEPENDENCIES) @rm -f file-mng$(EXEEXT) $(AM_V_CCLD)$(file_mng_LINK) $(file_mng_OBJECTS) $(file_mng_LDADD) $(LIBS) + file-pat$(EXEEXT): $(file_pat_OBJECTS) $(file_pat_DEPENDENCIES) $(EXTRA_file_pat_DEPENDENCIES) @rm -f file-pat$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_pat_OBJECTS) $(file_pat_LDADD) $(LIBS) + file-pcx$(EXEEXT): $(file_pcx_OBJECTS) $(file_pcx_DEPENDENCIES) $(EXTRA_file_pcx_DEPENDENCIES) @rm -f file-pcx$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_pcx_OBJECTS) $(file_pcx_LDADD) $(LIBS) + file-pdf-load$(EXEEXT): $(file_pdf_load_OBJECTS) $(file_pdf_load_DEPENDENCIES) $(EXTRA_file_pdf_load_DEPENDENCIES) @rm -f file-pdf-load$(EXEEXT) $(AM_V_CCLD)$(file_pdf_load_LINK) $(file_pdf_load_OBJECTS) $(file_pdf_load_LDADD) $(LIBS) + file-pdf-save$(EXEEXT): $(file_pdf_save_OBJECTS) $(file_pdf_save_DEPENDENCIES) $(EXTRA_file_pdf_save_DEPENDENCIES) @rm -f file-pdf-save$(EXEEXT) $(AM_V_CCLD)$(file_pdf_save_LINK) $(file_pdf_save_OBJECTS) $(file_pdf_save_LDADD) $(LIBS) + file-pix$(EXEEXT): $(file_pix_OBJECTS) $(file_pix_DEPENDENCIES) $(EXTRA_file_pix_DEPENDENCIES) @rm -f file-pix$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_pix_OBJECTS) $(file_pix_LDADD) $(LIBS) + file-png$(EXEEXT): $(file_png_OBJECTS) $(file_png_DEPENDENCIES) $(EXTRA_file_png_DEPENDENCIES) @rm -f file-png$(EXEEXT) $(AM_V_CCLD)$(file_png_LINK) $(file_png_OBJECTS) $(file_png_LDADD) $(LIBS) + file-pnm$(EXEEXT): $(file_pnm_OBJECTS) $(file_pnm_DEPENDENCIES) $(EXTRA_file_pnm_DEPENDENCIES) @rm -f file-pnm$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_pnm_OBJECTS) $(file_pnm_LDADD) $(LIBS) + file-ps$(EXEEXT): $(file_ps_OBJECTS) $(file_ps_DEPENDENCIES) $(EXTRA_file_ps_DEPENDENCIES) @rm -f file-ps$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_ps_OBJECTS) $(file_ps_LDADD) $(LIBS) + file-psp$(EXEEXT): $(file_psp_OBJECTS) $(file_psp_DEPENDENCIES) $(EXTRA_file_psp_DEPENDENCIES) @rm -f file-psp$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_psp_OBJECTS) $(file_psp_LDADD) $(LIBS) + file-raw$(EXEEXT): $(file_raw_OBJECTS) $(file_raw_DEPENDENCIES) $(EXTRA_file_raw_DEPENDENCIES) @rm -f file-raw$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_raw_OBJECTS) $(file_raw_LDADD) $(LIBS) + file-sunras$(EXEEXT): $(file_sunras_OBJECTS) $(file_sunras_DEPENDENCIES) $(EXTRA_file_sunras_DEPENDENCIES) @rm -f file-sunras$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_sunras_OBJECTS) $(file_sunras_LDADD) $(LIBS) + file-svg$(EXEEXT): $(file_svg_OBJECTS) $(file_svg_DEPENDENCIES) $(EXTRA_file_svg_DEPENDENCIES) @rm -f file-svg$(EXEEXT) $(AM_V_CCLD)$(file_svg_LINK) $(file_svg_OBJECTS) $(file_svg_LDADD) $(LIBS) + file-tga$(EXEEXT): $(file_tga_OBJECTS) $(file_tga_DEPENDENCIES) $(EXTRA_file_tga_DEPENDENCIES) @rm -f file-tga$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_tga_OBJECTS) $(file_tga_LDADD) $(LIBS) + file-tiff-load$(EXEEXT): $(file_tiff_load_OBJECTS) $(file_tiff_load_DEPENDENCIES) $(EXTRA_file_tiff_load_DEPENDENCIES) @rm -f file-tiff-load$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_tiff_load_OBJECTS) $(file_tiff_load_LDADD) $(LIBS) + file-tiff-save$(EXEEXT): $(file_tiff_save_OBJECTS) $(file_tiff_save_DEPENDENCIES) $(EXTRA_file_tiff_save_DEPENDENCIES) @rm -f file-tiff-save$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_tiff_save_OBJECTS) $(file_tiff_save_LDADD) $(LIBS) + file-wmf$(EXEEXT): $(file_wmf_OBJECTS) $(file_wmf_DEPENDENCIES) $(EXTRA_file_wmf_DEPENDENCIES) @rm -f file-wmf$(EXEEXT) $(AM_V_CCLD)$(file_wmf_LINK) $(file_wmf_OBJECTS) $(file_wmf_LDADD) $(LIBS) + file-xbm$(EXEEXT): $(file_xbm_OBJECTS) $(file_xbm_DEPENDENCIES) $(EXTRA_file_xbm_DEPENDENCIES) @rm -f file-xbm$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_xbm_OBJECTS) $(file_xbm_LDADD) $(LIBS) + file-xmc$(EXEEXT): $(file_xmc_OBJECTS) $(file_xmc_DEPENDENCIES) $(EXTRA_file_xmc_DEPENDENCIES) @rm -f file-xmc$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_xmc_OBJECTS) $(file_xmc_LDADD) $(LIBS) + file-xpm$(EXEEXT): $(file_xpm_OBJECTS) $(file_xpm_DEPENDENCIES) $(EXTRA_file_xpm_DEPENDENCIES) @rm -f file-xpm$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_xpm_OBJECTS) $(file_xpm_LDADD) $(LIBS) + file-xwd$(EXEEXT): $(file_xwd_OBJECTS) $(file_xwd_DEPENDENCIES) $(EXTRA_file_xwd_DEPENDENCIES) @rm -f file-xwd$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_xwd_OBJECTS) $(file_xwd_LDADD) $(LIBS) + film$(EXEEXT): $(film_OBJECTS) $(film_DEPENDENCIES) $(EXTRA_film_DEPENDENCIES) @rm -f film$(EXEEXT) $(AM_V_CCLD)$(LINK) $(film_OBJECTS) $(film_LDADD) $(LIBS) + filter-pack$(EXEEXT): $(filter_pack_OBJECTS) $(filter_pack_DEPENDENCIES) $(EXTRA_filter_pack_DEPENDENCIES) @rm -f filter-pack$(EXEEXT) $(AM_V_CCLD)$(LINK) $(filter_pack_OBJECTS) $(filter_pack_LDADD) $(LIBS) + fractal-trace$(EXEEXT): $(fractal_trace_OBJECTS) $(fractal_trace_DEPENDENCIES) $(EXTRA_fractal_trace_DEPENDENCIES) @rm -f fractal-trace$(EXEEXT) $(AM_V_CCLD)$(LINK) $(fractal_trace_OBJECTS) $(fractal_trace_LDADD) $(LIBS) + gradient-map$(EXEEXT): $(gradient_map_OBJECTS) $(gradient_map_DEPENDENCIES) $(EXTRA_gradient_map_DEPENDENCIES) @rm -f gradient-map$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gradient_map_OBJECTS) $(gradient_map_LDADD) $(LIBS) + grid$(EXEEXT): $(grid_OBJECTS) $(grid_DEPENDENCIES) $(EXTRA_grid_DEPENDENCIES) @rm -f grid$(EXEEXT) $(AM_V_CCLD)$(LINK) $(grid_OBJECTS) $(grid_LDADD) $(LIBS) + guillotine$(EXEEXT): $(guillotine_OBJECTS) $(guillotine_DEPENDENCIES) $(EXTRA_guillotine_DEPENDENCIES) @rm -f guillotine$(EXEEXT) $(AM_V_CCLD)$(LINK) $(guillotine_OBJECTS) $(guillotine_LDADD) $(LIBS) + hot$(EXEEXT): $(hot_OBJECTS) $(hot_DEPENDENCIES) $(EXTRA_hot_DEPENDENCIES) @rm -f hot$(EXEEXT) $(AM_V_CCLD)$(LINK) $(hot_OBJECTS) $(hot_LDADD) $(LIBS) + illusion$(EXEEXT): $(illusion_OBJECTS) $(illusion_DEPENDENCIES) $(EXTRA_illusion_DEPENDENCIES) @rm -f illusion$(EXEEXT) $(AM_V_CCLD)$(LINK) $(illusion_OBJECTS) $(illusion_LDADD) $(LIBS) + iwarp$(EXEEXT): $(iwarp_OBJECTS) $(iwarp_DEPENDENCIES) $(EXTRA_iwarp_DEPENDENCIES) @rm -f iwarp$(EXEEXT) $(AM_V_CCLD)$(LINK) $(iwarp_OBJECTS) $(iwarp_LDADD) $(LIBS) + jigsaw$(EXEEXT): $(jigsaw_OBJECTS) $(jigsaw_DEPENDENCIES) $(EXTRA_jigsaw_DEPENDENCIES) @rm -f jigsaw$(EXEEXT) $(AM_V_CCLD)$(LINK) $(jigsaw_OBJECTS) $(jigsaw_LDADD) $(LIBS) + lcms$(EXEEXT): $(lcms_OBJECTS) $(lcms_DEPENDENCIES) $(EXTRA_lcms_DEPENDENCIES) @rm -f lcms$(EXEEXT) $(AM_V_CCLD)$(lcms_LINK) $(lcms_OBJECTS) $(lcms_LDADD) $(LIBS) + lens-apply$(EXEEXT): $(lens_apply_OBJECTS) $(lens_apply_DEPENDENCIES) $(EXTRA_lens_apply_DEPENDENCIES) @rm -f lens-apply$(EXEEXT) $(AM_V_CCLD)$(LINK) $(lens_apply_OBJECTS) $(lens_apply_LDADD) $(LIBS) + lens-distortion$(EXEEXT): $(lens_distortion_OBJECTS) $(lens_distortion_DEPENDENCIES) $(EXTRA_lens_distortion_DEPENDENCIES) @rm -f lens-distortion$(EXEEXT) $(AM_V_CCLD)$(LINK) $(lens_distortion_OBJECTS) $(lens_distortion_LDADD) $(LIBS) + lens-flare$(EXEEXT): $(lens_flare_OBJECTS) $(lens_flare_DEPENDENCIES) $(EXTRA_lens_flare_DEPENDENCIES) @rm -f lens-flare$(EXEEXT) $(AM_V_CCLD)$(LINK) $(lens_flare_OBJECTS) $(lens_flare_LDADD) $(LIBS) + mail$(EXEEXT): $(mail_OBJECTS) $(mail_DEPENDENCIES) $(EXTRA_mail_DEPENDENCIES) @rm -f mail$(EXEEXT) $(AM_V_CCLD)$(LINK) $(mail_OBJECTS) $(mail_LDADD) $(LIBS) + max-rgb$(EXEEXT): $(max_rgb_OBJECTS) $(max_rgb_DEPENDENCIES) $(EXTRA_max_rgb_DEPENDENCIES) @rm -f max-rgb$(EXEEXT) $(AM_V_CCLD)$(LINK) $(max_rgb_OBJECTS) $(max_rgb_LDADD) $(LIBS) + mosaic$(EXEEXT): $(mosaic_OBJECTS) $(mosaic_DEPENDENCIES) $(EXTRA_mosaic_DEPENDENCIES) @rm -f mosaic$(EXEEXT) $(AM_V_CCLD)$(LINK) $(mosaic_OBJECTS) $(mosaic_LDADD) $(LIBS) + newsprint$(EXEEXT): $(newsprint_OBJECTS) $(newsprint_DEPENDENCIES) $(EXTRA_newsprint_DEPENDENCIES) @rm -f newsprint$(EXEEXT) $(AM_V_CCLD)$(LINK) $(newsprint_OBJECTS) $(newsprint_LDADD) $(LIBS) + nl-filter$(EXEEXT): $(nl_filter_OBJECTS) $(nl_filter_DEPENDENCIES) $(EXTRA_nl_filter_DEPENDENCIES) @rm -f nl-filter$(EXEEXT) $(AM_V_CCLD)$(LINK) $(nl_filter_OBJECTS) $(nl_filter_LDADD) $(LIBS) + noise-hsv$(EXEEXT): $(noise_hsv_OBJECTS) $(noise_hsv_DEPENDENCIES) $(EXTRA_noise_hsv_DEPENDENCIES) @rm -f noise-hsv$(EXEEXT) $(AM_V_CCLD)$(LINK) $(noise_hsv_OBJECTS) $(noise_hsv_LDADD) $(LIBS) + noise-randomize$(EXEEXT): $(noise_randomize_OBJECTS) $(noise_randomize_DEPENDENCIES) $(EXTRA_noise_randomize_DEPENDENCIES) @rm -f noise-randomize$(EXEEXT) $(AM_V_CCLD)$(LINK) $(noise_randomize_OBJECTS) $(noise_randomize_LDADD) $(LIBS) + noise-rgb$(EXEEXT): $(noise_rgb_OBJECTS) $(noise_rgb_DEPENDENCIES) $(EXTRA_noise_rgb_DEPENDENCIES) @rm -f noise-rgb$(EXEEXT) $(AM_V_CCLD)$(LINK) $(noise_rgb_OBJECTS) $(noise_rgb_LDADD) $(LIBS) + noise-solid$(EXEEXT): $(noise_solid_OBJECTS) $(noise_solid_DEPENDENCIES) $(EXTRA_noise_solid_DEPENDENCIES) @rm -f noise-solid$(EXEEXT) $(AM_V_CCLD)$(LINK) $(noise_solid_OBJECTS) $(noise_solid_LDADD) $(LIBS) + noise-spread$(EXEEXT): $(noise_spread_OBJECTS) $(noise_spread_DEPENDENCIES) $(EXTRA_noise_spread_DEPENDENCIES) @rm -f noise-spread$(EXEEXT) $(AM_V_CCLD)$(LINK) $(noise_spread_OBJECTS) $(noise_spread_LDADD) $(LIBS) + nova$(EXEEXT): $(nova_OBJECTS) $(nova_DEPENDENCIES) $(EXTRA_nova_DEPENDENCIES) @rm -f nova$(EXEEXT) $(AM_V_CCLD)$(LINK) $(nova_OBJECTS) $(nova_LDADD) $(LIBS) + oilify$(EXEEXT): $(oilify_OBJECTS) $(oilify_DEPENDENCIES) $(EXTRA_oilify_DEPENDENCIES) @rm -f oilify$(EXEEXT) $(AM_V_CCLD)$(LINK) $(oilify_OBJECTS) $(oilify_LDADD) $(LIBS) + photocopy$(EXEEXT): $(photocopy_OBJECTS) $(photocopy_DEPENDENCIES) $(EXTRA_photocopy_DEPENDENCIES) @rm -f photocopy$(EXEEXT) $(AM_V_CCLD)$(LINK) $(photocopy_OBJECTS) $(photocopy_LDADD) $(LIBS) + pixelize$(EXEEXT): $(pixelize_OBJECTS) $(pixelize_DEPENDENCIES) $(EXTRA_pixelize_DEPENDENCIES) @rm -f pixelize$(EXEEXT) $(AM_V_CCLD)$(LINK) $(pixelize_OBJECTS) $(pixelize_LDADD) $(LIBS) + plasma$(EXEEXT): $(plasma_OBJECTS) $(plasma_DEPENDENCIES) $(EXTRA_plasma_DEPENDENCIES) @rm -f plasma$(EXEEXT) $(AM_V_CCLD)$(LINK) $(plasma_OBJECTS) $(plasma_LDADD) $(LIBS) + plugin-browser$(EXEEXT): $(plugin_browser_OBJECTS) $(plugin_browser_DEPENDENCIES) $(EXTRA_plugin_browser_DEPENDENCIES) @rm -f plugin-browser$(EXEEXT) $(AM_V_CCLD)$(LINK) $(plugin_browser_OBJECTS) $(plugin_browser_LDADD) $(LIBS) + polar-coords$(EXEEXT): $(polar_coords_OBJECTS) $(polar_coords_DEPENDENCIES) $(EXTRA_polar_coords_DEPENDENCIES) @rm -f polar-coords$(EXEEXT) $(AM_V_CCLD)$(LINK) $(polar_coords_OBJECTS) $(polar_coords_LDADD) $(LIBS) + procedure-browser$(EXEEXT): $(procedure_browser_OBJECTS) $(procedure_browser_DEPENDENCIES) $(EXTRA_procedure_browser_DEPENDENCIES) @rm -f procedure-browser$(EXEEXT) $(AM_V_CCLD)$(LINK) $(procedure_browser_OBJECTS) $(procedure_browser_LDADD) $(LIBS) + qbist$(EXEEXT): $(qbist_OBJECTS) $(qbist_DEPENDENCIES) $(EXTRA_qbist_DEPENDENCIES) @rm -f qbist$(EXEEXT) $(AM_V_CCLD)$(LINK) $(qbist_OBJECTS) $(qbist_LDADD) $(LIBS) + red-eye-removal$(EXEEXT): $(red_eye_removal_OBJECTS) $(red_eye_removal_DEPENDENCIES) $(EXTRA_red_eye_removal_DEPENDENCIES) @rm -f red-eye-removal$(EXEEXT) $(AM_V_CCLD)$(LINK) $(red_eye_removal_OBJECTS) $(red_eye_removal_LDADD) $(LIBS) + ripple$(EXEEXT): $(ripple_OBJECTS) $(ripple_DEPENDENCIES) $(EXTRA_ripple_DEPENDENCIES) @rm -f ripple$(EXEEXT) $(AM_V_CCLD)$(LINK) $(ripple_OBJECTS) $(ripple_LDADD) $(LIBS) + rotate$(EXEEXT): $(rotate_OBJECTS) $(rotate_DEPENDENCIES) $(EXTRA_rotate_DEPENDENCIES) @rm -f rotate$(EXEEXT) $(AM_V_CCLD)$(LINK) $(rotate_OBJECTS) $(rotate_LDADD) $(LIBS) + sample-colorize$(EXEEXT): $(sample_colorize_OBJECTS) $(sample_colorize_DEPENDENCIES) $(EXTRA_sample_colorize_DEPENDENCIES) @rm -f sample-colorize$(EXEEXT) $(AM_V_CCLD)$(LINK) $(sample_colorize_OBJECTS) $(sample_colorize_LDADD) $(LIBS) + screenshot$(EXEEXT): $(screenshot_OBJECTS) $(screenshot_DEPENDENCIES) $(EXTRA_screenshot_DEPENDENCIES) @rm -f screenshot$(EXEEXT) $(AM_V_CCLD)$(screenshot_LINK) $(screenshot_OBJECTS) $(screenshot_LDADD) $(LIBS) + semi-flatten$(EXEEXT): $(semi_flatten_OBJECTS) $(semi_flatten_DEPENDENCIES) $(EXTRA_semi_flatten_DEPENDENCIES) @rm -f semi-flatten$(EXEEXT) $(AM_V_CCLD)$(LINK) $(semi_flatten_OBJECTS) $(semi_flatten_LDADD) $(LIBS) + sharpen$(EXEEXT): $(sharpen_OBJECTS) $(sharpen_DEPENDENCIES) $(EXTRA_sharpen_DEPENDENCIES) @rm -f sharpen$(EXEEXT) $(AM_V_CCLD)$(LINK) $(sharpen_OBJECTS) $(sharpen_LDADD) $(LIBS) + shift$(EXEEXT): $(shift_OBJECTS) $(shift_DEPENDENCIES) $(EXTRA_shift_DEPENDENCIES) @rm -f shift$(EXEEXT) $(AM_V_CCLD)$(LINK) $(shift_OBJECTS) $(shift_LDADD) $(LIBS) + sinus$(EXEEXT): $(sinus_OBJECTS) $(sinus_DEPENDENCIES) $(EXTRA_sinus_DEPENDENCIES) @rm -f sinus$(EXEEXT) $(AM_V_CCLD)$(LINK) $(sinus_OBJECTS) $(sinus_LDADD) $(LIBS) + smooth-palette$(EXEEXT): $(smooth_palette_OBJECTS) $(smooth_palette_DEPENDENCIES) $(EXTRA_smooth_palette_DEPENDENCIES) @rm -f smooth-palette$(EXEEXT) $(AM_V_CCLD)$(LINK) $(smooth_palette_OBJECTS) $(smooth_palette_LDADD) $(LIBS) + softglow$(EXEEXT): $(softglow_OBJECTS) $(softglow_DEPENDENCIES) $(EXTRA_softglow_DEPENDENCIES) @rm -f softglow$(EXEEXT) $(AM_V_CCLD)$(LINK) $(softglow_OBJECTS) $(softglow_LDADD) $(LIBS) + sparkle$(EXEEXT): $(sparkle_OBJECTS) $(sparkle_DEPENDENCIES) $(EXTRA_sparkle_DEPENDENCIES) @rm -f sparkle$(EXEEXT) $(AM_V_CCLD)$(LINK) $(sparkle_OBJECTS) $(sparkle_LDADD) $(LIBS) + sphere-designer$(EXEEXT): $(sphere_designer_OBJECTS) $(sphere_designer_DEPENDENCIES) $(EXTRA_sphere_designer_DEPENDENCIES) @rm -f sphere-designer$(EXEEXT) $(AM_V_CCLD)$(LINK) $(sphere_designer_OBJECTS) $(sphere_designer_LDADD) $(LIBS) + threshold-alpha$(EXEEXT): $(threshold_alpha_OBJECTS) $(threshold_alpha_DEPENDENCIES) $(EXTRA_threshold_alpha_DEPENDENCIES) @rm -f threshold-alpha$(EXEEXT) $(AM_V_CCLD)$(LINK) $(threshold_alpha_OBJECTS) $(threshold_alpha_LDADD) $(LIBS) + tile$(EXEEXT): $(tile_OBJECTS) $(tile_DEPENDENCIES) $(EXTRA_tile_DEPENDENCIES) @rm -f tile$(EXEEXT) $(AM_V_CCLD)$(LINK) $(tile_OBJECTS) $(tile_LDADD) $(LIBS) + tile-glass$(EXEEXT): $(tile_glass_OBJECTS) $(tile_glass_DEPENDENCIES) $(EXTRA_tile_glass_DEPENDENCIES) @rm -f tile-glass$(EXEEXT) $(AM_V_CCLD)$(LINK) $(tile_glass_OBJECTS) $(tile_glass_LDADD) $(LIBS) + tile-paper$(EXEEXT): $(tile_paper_OBJECTS) $(tile_paper_DEPENDENCIES) $(EXTRA_tile_paper_DEPENDENCIES) @rm -f tile-paper$(EXEEXT) $(AM_V_CCLD)$(LINK) $(tile_paper_OBJECTS) $(tile_paper_LDADD) $(LIBS) + tile-seamless$(EXEEXT): $(tile_seamless_OBJECTS) $(tile_seamless_DEPENDENCIES) $(EXTRA_tile_seamless_DEPENDENCIES) @rm -f tile-seamless$(EXEEXT) $(AM_V_CCLD)$(LINK) $(tile_seamless_OBJECTS) $(tile_seamless_LDADD) $(LIBS) + tile-small$(EXEEXT): $(tile_small_OBJECTS) $(tile_small_DEPENDENCIES) $(EXTRA_tile_small_DEPENDENCIES) @rm -f tile-small$(EXEEXT) $(AM_V_CCLD)$(LINK) $(tile_small_OBJECTS) $(tile_small_LDADD) $(LIBS) + unit-editor$(EXEEXT): $(unit_editor_OBJECTS) $(unit_editor_DEPENDENCIES) $(EXTRA_unit_editor_DEPENDENCIES) @rm -f unit-editor$(EXEEXT) $(AM_V_CCLD)$(LINK) $(unit_editor_OBJECTS) $(unit_editor_LDADD) $(LIBS) + unsharp-mask$(EXEEXT): $(unsharp_mask_OBJECTS) $(unsharp_mask_DEPENDENCIES) $(EXTRA_unsharp_mask_DEPENDENCIES) @rm -f unsharp-mask$(EXEEXT) $(AM_V_CCLD)$(LINK) $(unsharp_mask_OBJECTS) $(unsharp_mask_LDADD) $(LIBS) + value-invert$(EXEEXT): $(value_invert_OBJECTS) $(value_invert_DEPENDENCIES) $(EXTRA_value_invert_DEPENDENCIES) @rm -f value-invert$(EXEEXT) $(AM_V_CCLD)$(LINK) $(value_invert_OBJECTS) $(value_invert_LDADD) $(LIBS) + value-propagate$(EXEEXT): $(value_propagate_OBJECTS) $(value_propagate_DEPENDENCIES) $(EXTRA_value_propagate_DEPENDENCIES) @rm -f value-propagate$(EXEEXT) $(AM_V_CCLD)$(LINK) $(value_propagate_OBJECTS) $(value_propagate_LDADD) $(LIBS) + van-gogh-lic$(EXEEXT): $(van_gogh_lic_OBJECTS) $(van_gogh_lic_DEPENDENCIES) $(EXTRA_van_gogh_lic_DEPENDENCIES) @rm -f van-gogh-lic$(EXEEXT) $(AM_V_CCLD)$(LINK) $(van_gogh_lic_OBJECTS) $(van_gogh_lic_LDADD) $(LIBS) + video$(EXEEXT): $(video_OBJECTS) $(video_DEPENDENCIES) $(EXTRA_video_DEPENDENCIES) @rm -f video$(EXEEXT) $(AM_V_CCLD)$(LINK) $(video_OBJECTS) $(video_LDADD) $(LIBS) + warp$(EXEEXT): $(warp_OBJECTS) $(warp_DEPENDENCIES) $(EXTRA_warp_DEPENDENCIES) @rm -f warp$(EXEEXT) $(AM_V_CCLD)$(LINK) $(warp_OBJECTS) $(warp_LDADD) $(LIBS) + waves$(EXEEXT): $(waves_OBJECTS) $(waves_DEPENDENCIES) $(EXTRA_waves_DEPENDENCIES) @rm -f waves$(EXEEXT) $(AM_V_CCLD)$(LINK) $(waves_OBJECTS) $(waves_LDADD) $(LIBS) + web-browser$(EXEEXT): $(web_browser_OBJECTS) $(web_browser_DEPENDENCIES) $(EXTRA_web_browser_DEPENDENCIES) @rm -f web-browser$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(web_browser_OBJECTS) $(web_browser_LDADD) $(LIBS) + $(AM_V_CCLD)$(web_browser_LINK) $(web_browser_OBJECTS) $(web_browser_LDADD) $(LIBS) + web-page$(EXEEXT): $(web_page_OBJECTS) $(web_page_DEPENDENCIES) $(EXTRA_web_page_DEPENDENCIES) @rm -f web-page$(EXEEXT) $(AM_V_CCLD)$(web_page_LINK) $(web_page_OBJECTS) $(web_page_LDADD) $(LIBS) + whirl-pinch$(EXEEXT): $(whirl_pinch_OBJECTS) $(whirl_pinch_DEPENDENCIES) $(EXTRA_whirl_pinch_DEPENDENCIES) @rm -f whirl-pinch$(EXEEXT) $(AM_V_CCLD)$(LINK) $(whirl_pinch_OBJECTS) $(whirl_pinch_LDADD) $(LIBS) + wind$(EXEEXT): $(wind_OBJECTS) $(wind_DEPENDENCIES) $(EXTRA_wind_DEPENDENCIES) @rm -f wind$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wind_OBJECTS) $(wind_LDADD) $(LIBS) @@ -4935,7 +5158,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/warp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/waves.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/web-browser.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/web_browser-web-browser.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/web_page-web-page.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/whirl-pinch.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wind.Po@am__quote@ @@ -4945,14 +5168,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -5101,6 +5324,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(screenshot_CFLAGS) $(CFLAGS) -c -o screenshot-screenshot.obj `if test -f 'screenshot.c'; then $(CYGPATH_W) 'screenshot.c'; else $(CYGPATH_W) '$(srcdir)/screenshot.c'; fi` +web_browser-web-browser.o: web-browser.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(web_browser_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT web_browser-web-browser.o -MD -MP -MF $(DEPDIR)/web_browser-web-browser.Tpo -c -o web_browser-web-browser.o `test -f 'web-browser.c' || echo '$(srcdir)/'`web-browser.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/web_browser-web-browser.Tpo $(DEPDIR)/web_browser-web-browser.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='web-browser.c' object='web_browser-web-browser.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(web_browser_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o web_browser-web-browser.o `test -f 'web-browser.c' || echo '$(srcdir)/'`web-browser.c + +web_browser-web-browser.obj: web-browser.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(web_browser_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT web_browser-web-browser.obj -MD -MP -MF $(DEPDIR)/web_browser-web-browser.Tpo -c -o web_browser-web-browser.obj `if test -f 'web-browser.c'; then $(CYGPATH_W) 'web-browser.c'; else $(CYGPATH_W) '$(srcdir)/web-browser.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/web_browser-web-browser.Tpo $(DEPDIR)/web_browser-web-browser.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='web-browser.c' object='web_browser-web-browser.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(web_browser_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o web_browser-web-browser.obj `if test -f 'web-browser.c'; then $(CYGPATH_W) 'web-browser.c'; else $(CYGPATH_W) '$(srcdir)/web-browser.c'; fi` + web_page-web-page.o: web-page.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(web_page_CFLAGS) $(CFLAGS) -MT web_page-web-page.o -MD -MP -MF $(DEPDIR)/web_page-web-page.Tpo -c -o web_page-web-page.o `test -f 'web-page.c' || echo '$(srcdir)/'`web-page.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/web_page-web-page.Tpo $(DEPDIR)/web_page-web-page.Po @@ -5121,26 +5358,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -5152,15 +5378,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -5169,6 +5391,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -5313,19 +5550,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/common/mkgen.pl gimp-2.8.20/plug-ins/common/mkgen.pl --- gimp-2.8.18/plug-ins/common/mkgen.pl 2015-08-20 22:57:28.000000000 +0000 +++ gimp-2.8.20/plug-ins/common/mkgen.pl 2017-01-28 19:08:46.000000000 +0000 @@ -7,6 +7,8 @@ *write_file = \&Gimp::CodeGen::util::write_file; *FILE_EXT = \$Gimp::CodeGen::util::FILE_EXT; +$destdir = "."; + $ignorefile = ".gitignore"; $rcfile = "gimprc.common"; @@ -18,7 +20,7 @@ open IGNORE, "> $outignore"; open RC, "> $outrc"; -require 'plugin-defs.pl'; +require './plugin-defs.pl'; $bins = ""; $opts = ""; @@ -61,6 +63,11 @@ libm = -lm endif +if PLATFORM_OSX +xobjective_c = "-xobjective-c" +framework_cocoa = -framework Cocoa +endif + if HAVE_WINDRES include \$(top_srcdir)/build/windows/gimprc-plug-ins.rule include $rcfile @@ -150,6 +157,15 @@ } } + if (exists $plugins{$_}->{ldflags}) { + my $ldflags = $plugins{$_}->{ldflags}; + + print MK <{cflags}) { my $cflags = $plugins{$_}->{cflags}; my $cflagsvalue = $cflags =~ /FLAGS/ ? "\$($cflags)" : $cflags; @@ -160,6 +176,15 @@ EOT } + if (exists $plugins{$_}->{cppflags}) { + my $cppflags = $plugins{$_}->{cppflags}; + + print MK <{libdep}) { my @lib = split(/:/, $plugins{$_}->{libdep}); @@ -194,7 +219,7 @@ close MK; close IGNORE; -&write_file($outmk); -&write_file($outignore); -&write_file($outrc); +&write_file($outmk, $destdir); +&write_file($outignore, $destdir); +&write_file($outrc, $destdir); diff -Nru gimp-2.8.18/plug-ins/common/plugin-defs.pl gimp-2.8.20/plug-ins/common/plugin-defs.pl --- gimp-2.8.18/plug-ins/common/plugin-defs.pl 2015-08-20 22:57:28.000000000 +0000 +++ gimp-2.8.20/plug-ins/common/plugin-defs.pl 2017-01-28 19:08:46.000000000 +0000 @@ -140,7 +140,7 @@ 'video' => { ui => 1 }, 'warp' => { ui => 1 }, 'waves' => { ui => 1 }, - 'web-browser' => { ui => 1 }, + 'web-browser' => { ui => 1, ldflags => '$(framework_cocoa)', cppflags => '$(AM_CPPFLAGS) $(xobjective_c)' }, 'web-page' => { ui => 1, optional => 1, libs => 'WEBKIT_LIBS', cflags => 'WEBKIT_CFLAGS' }, 'whirl-pinch' => { ui => 1 }, 'wind' => { ui => 1 } diff -Nru gimp-2.8.18/plug-ins/common/web-browser.c gimp-2.8.20/plug-ins/common/web-browser.c --- gimp-2.8.18/plug-ins/common/web-browser.c 2015-08-15 07:52:41.000000000 +0000 +++ gimp-2.8.20/plug-ins/common/web-browser.c 2017-01-28 18:58:03.000000000 +0000 @@ -24,14 +24,19 @@ #include +#ifdef PLATFORM_OSX +#import +#endif + +#ifdef G_OS_WIN32 +#include +#endif + #include #include #include "libgimp/stdplugins-intl.h" -#ifdef G_OS_WIN32 -#include -#endif #define PLUG_IN_PROC "plug-in-web-browser" #define PLUG_IN_BINARY "web-browser" @@ -122,6 +127,7 @@ GError **error) { #ifdef G_OS_WIN32 + HINSTANCE hinst = ShellExecute (GetDesktopWindow(), "open", url, NULL, NULL, SW_SHOW); @@ -180,12 +186,28 @@ } return TRUE; + +#elif defined(PLATFORM_OSX) + + NSURL *ns_url; + gboolean retval; + + @autoreleasepool + { + ns_url = [NSURL URLWithString: [NSString stringWithUTF8String: url]]; + retval = [[NSWorkspace sharedWorkspace] openURL: ns_url]; + } + + return retval; + #else + gimp_ui_init (PLUG_IN_BINARY, FALSE); return gtk_show_uri (gdk_screen_get_default (), url, gtk_get_current_event_time(), error); + #endif } diff -Nru gimp-2.8.18/plug-ins/file-bmp/Makefile.in gimp-2.8.20/plug-ins/file-bmp/Makefile.in --- gimp-2.8.18/plug-ins/file-bmp/Makefile.in 2016-07-12 23:20:13.000000000 +0000 +++ gimp-2.8.20/plug-ins/file-bmp/Makefile.in 2017-01-31 23:40:45.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = file-bmp$(EXEEXT) subdir = plug-ins/file-bmp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -84,6 +126,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -96,20 +151,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(file_bmp_SOURCES) DIST_SOURCES = $(file_bmp_SOURCES) am__can_run_installinfo = \ @@ -117,8 +168,28 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -509,7 +580,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/file-bmp/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/file-bmp/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -518,7 +588,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -537,10 +607,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -561,7 +633,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -574,6 +647,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + file-bmp$(EXEEXT): $(file_bmp_OBJECTS) $(file_bmp_DEPENDENCIES) $(EXTRA_file_bmp_DEPENDENCIES) @rm -f file-bmp$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_bmp_OBJECTS) $(file_bmp_LDADD) $(LIBS) @@ -593,14 +667,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -615,26 +689,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -646,15 +709,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -663,6 +722,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -807,19 +881,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/file-compressor/file-compressor.c gimp-2.8.20/plug-ins/file-compressor/file-compressor.c --- gimp-2.8.18/plug-ins/file-compressor/file-compressor.c 2016-06-06 20:20:37.000000000 +0000 +++ gimp-2.8.20/plug-ins/file-compressor/file-compressor.c 2017-01-28 19:08:46.000000000 +0000 @@ -612,7 +612,7 @@ if (!in) goto out; - fd = g_open (outfile, O_CREAT | O_WRONLY | _O_BINARY, 0664); + fd = g_open (outfile, O_CREAT | O_WRONLY | O_TRUNC | _O_BINARY, 0664); if (fd == -1) goto out; @@ -734,7 +734,7 @@ if (!in) goto out; - fd = g_open (outfile, O_CREAT | O_WRONLY | _O_BINARY, 0664); + fd = g_open (outfile, O_CREAT | O_WRONLY | O_TRUNC | _O_BINARY, 0664); if (fd == -1) goto out; diff -Nru gimp-2.8.18/plug-ins/file-compressor/Makefile.in gimp-2.8.20/plug-ins/file-compressor/Makefile.in --- gimp-2.8.18/plug-ins/file-compressor/Makefile.in 2016-07-12 23:20:14.000000000 +0000 +++ gimp-2.8.20/plug-ins/file-compressor/Makefile.in 2017-01-31 23:40:45.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,16 +90,22 @@ host_triplet = @host@ libexec_PROGRAMS = file-compressor$(EXEEXT) subdir = plug-ins/file-compressor -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -81,6 +124,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -93,20 +149,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(file_compressor_SOURCES) DIST_SOURCES = $(file_compressor_SOURCES) am__can_run_installinfo = \ @@ -114,8 +166,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -498,7 +568,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/file-compressor/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/file-compressor/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -525,10 +594,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -549,7 +620,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -562,6 +634,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + file-compressor$(EXEEXT): $(file_compressor_OBJECTS) $(file_compressor_DEPENDENCIES) $(EXTRA_file_compressor_DEPENDENCIES) @rm -f file-compressor$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_compressor_OBJECTS) $(file_compressor_LDADD) $(LIBS) @@ -579,14 +652,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -601,26 +674,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -632,15 +694,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -649,6 +707,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -793,19 +866,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/plug-ins/file-faxg3/Makefile.in gimp-2.8.20/plug-ins/file-faxg3/Makefile.in --- gimp-2.8.18/plug-ins/file-faxg3/Makefile.in 2016-07-12 23:20:14.000000000 +0000 +++ gimp-2.8.20/plug-ins/file-faxg3/Makefile.in 2017-01-31 23:40:46.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = file-faxg3$(EXEEXT) subdir = plug-ins/file-faxg3 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -83,6 +125,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -95,20 +150,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(file_faxg3_SOURCES) DIST_SOURCES = $(file_faxg3_SOURCES) am__can_run_installinfo = \ @@ -116,8 +167,28 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -507,7 +578,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/file-faxg3/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/file-faxg3/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -516,7 +586,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -535,10 +605,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -559,7 +631,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -572,6 +645,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + file-faxg3$(EXEEXT): $(file_faxg3_OBJECTS) $(file_faxg3_DEPENDENCIES) $(EXTRA_file_faxg3_DEPENDENCIES) @rm -f file-faxg3$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_faxg3_OBJECTS) $(file_faxg3_LDADD) $(LIBS) @@ -590,14 +664,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -612,26 +686,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -643,15 +706,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -660,6 +719,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -804,19 +878,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/file-fits/Makefile.in gimp-2.8.20/plug-ins/file-fits/Makefile.in --- gimp-2.8.18/plug-ins/file-fits/Makefile.in 2016-07-12 23:20:14.000000000 +0000 +++ gimp-2.8.20/plug-ins/file-fits/Makefile.in 2017-01-31 23:40:46.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = file-fits$(EXEEXT) subdir = plug-ins/file-fits ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -83,6 +125,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -95,20 +150,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(file_fits_SOURCES) DIST_SOURCES = $(file_fits_SOURCES) am__can_run_installinfo = \ @@ -116,8 +167,28 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -508,7 +579,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/file-fits/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/file-fits/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -517,7 +587,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -536,10 +606,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -560,7 +632,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -573,6 +646,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + file-fits$(EXEEXT): $(file_fits_OBJECTS) $(file_fits_DEPENDENCIES) $(EXTRA_file_fits_DEPENDENCIES) @rm -f file-fits$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_fits_OBJECTS) $(file_fits_LDADD) $(LIBS) @@ -591,14 +665,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -613,26 +687,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -644,15 +707,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -661,6 +720,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -805,19 +879,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/file-fli/Makefile.in gimp-2.8.20/plug-ins/file-fli/Makefile.in --- gimp-2.8.18/plug-ins/file-fli/Makefile.in 2016-07-12 23:20:15.000000000 +0000 +++ gimp-2.8.20/plug-ins/file-fli/Makefile.in 2017-01-31 23:40:47.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = file-fli$(EXEEXT) subdir = plug-ins/file-fli ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -83,6 +125,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -95,20 +150,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(file_fli_SOURCES) DIST_SOURCES = $(file_fli_SOURCES) am__can_run_installinfo = \ @@ -116,8 +167,28 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -507,7 +578,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/file-fli/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/file-fli/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -516,7 +586,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -535,10 +605,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -559,7 +631,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -572,6 +645,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + file-fli$(EXEEXT): $(file_fli_OBJECTS) $(file_fli_DEPENDENCIES) $(EXTRA_file_fli_DEPENDENCIES) @rm -f file-fli$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_fli_OBJECTS) $(file_fli_LDADD) $(LIBS) @@ -590,14 +664,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -612,26 +686,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -643,15 +706,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -660,6 +719,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -804,19 +878,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/file-ico/Makefile.in gimp-2.8.20/plug-ins/file-ico/Makefile.in --- gimp-2.8.18/plug-ins/file-ico/Makefile.in 2016-07-12 23:20:15.000000000 +0000 +++ gimp-2.8.20/plug-ins/file-ico/Makefile.in 2017-01-31 23:40:47.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = file-ico$(EXEEXT) subdir = plug-ins/file-ico ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -85,9 +127,22 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = file_ico_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(file_ico_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -100,20 +155,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(file_ico_SOURCES) DIST_SOURCES = $(file_ico_SOURCES) am__can_run_installinfo = \ @@ -121,8 +172,28 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -519,7 +590,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/file-ico/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/file-ico/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -528,7 +598,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -547,10 +617,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -571,7 +643,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -584,6 +657,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + file-ico$(EXEEXT): $(file_ico_OBJECTS) $(file_ico_DEPENDENCIES) $(EXTRA_file_ico_DEPENDENCIES) @rm -f file-ico$(EXEEXT) $(AM_V_CCLD)$(file_ico_LINK) $(file_ico_OBJECTS) $(file_ico_LDADD) $(LIBS) @@ -604,14 +678,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -682,26 +756,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -713,15 +776,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -730,6 +789,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -874,19 +948,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/file-jpeg/Makefile.in gimp-2.8.20/plug-ins/file-jpeg/Makefile.in --- gimp-2.8.18/plug-ins/file-jpeg/Makefile.in 2016-07-12 23:20:16.000000000 +0000 +++ gimp-2.8.20/plug-ins/file-jpeg/Makefile.in 2017-01-31 23:40:48.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,8 +90,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = file-jpeg$(EXEEXT) @HAVE_LIBEXIF_TRUE@am__append_1 = \ @HAVE_LIBEXIF_TRUE@ jpeg-exif.c \ @@ -68,14 +103,21 @@ noinst_PROGRAMS = jpegqual$(EXEEXT) subdir = plug-ins/file-jpeg ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -102,10 +144,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = am_jpegqual_OBJECTS = jpeg-quality.$(OBJEXT) jpegqual.$(OBJEXT) jpegqual_OBJECTS = $(am_jpegqual_OBJECTS) jpegqual_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -118,20 +173,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(file_jpeg_SOURCES) $(jpegqual_SOURCES) DIST_SOURCES = $(am__file_jpeg_SOURCES_DIST) $(jpegqual_SOURCES) am__can_run_installinfo = \ @@ -139,8 +190,28 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -532,7 +603,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/file-jpeg/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/file-jpeg/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -541,7 +611,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -560,10 +630,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -584,7 +656,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -606,9 +679,11 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + file-jpeg$(EXEEXT): $(file_jpeg_OBJECTS) $(file_jpeg_DEPENDENCIES) $(EXTRA_file_jpeg_DEPENDENCIES) @rm -f file-jpeg$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_jpeg_OBJECTS) $(file_jpeg_LDADD) $(LIBS) + jpegqual$(EXEEXT): $(jpegqual_OBJECTS) $(jpegqual_DEPENDENCIES) $(EXTRA_jpegqual_DEPENDENCIES) @rm -f jpegqual$(EXEEXT) $(AM_V_CCLD)$(LINK) $(jpegqual_OBJECTS) $(jpegqual_LDADD) $(LIBS) @@ -634,14 +709,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -656,26 +731,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -687,15 +751,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -704,6 +764,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -848,20 +923,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool clean-noinstPROGRAMS ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecPROGRAMS install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool clean-noinstPROGRAMS \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libexecPROGRAMS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/file-psd/Makefile.in gimp-2.8.20/plug-ins/file-psd/Makefile.in --- gimp-2.8.18/plug-ins/file-psd/Makefile.in 2016-07-12 23:20:16.000000000 +0000 +++ gimp-2.8.20/plug-ins/file-psd/Makefile.in 2017-01-31 23:40:48.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = file-psd-load$(EXEEXT) file-psd-save$(EXEEXT) subdir = plug-ins/file-psd ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -86,9 +128,22 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = am_file_psd_save_OBJECTS = psd-save.$(OBJEXT) file_psd_save_OBJECTS = $(am_file_psd_save_OBJECTS) file_psd_save_DEPENDENCIES = $(am__DEPENDENCIES_2) $(file_psd_save_RC) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -101,20 +156,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(file_psd_load_SOURCES) $(file_psd_save_SOURCES) DIST_SOURCES = $(file_psd_load_SOURCES) $(file_psd_save_SOURCES) am__can_run_installinfo = \ @@ -122,8 +173,28 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -541,7 +612,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/file-psd/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/file-psd/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -550,7 +620,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -569,10 +639,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -593,7 +665,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -606,9 +679,11 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + file-psd-load$(EXEEXT): $(file_psd_load_OBJECTS) $(file_psd_load_DEPENDENCIES) $(EXTRA_file_psd_load_DEPENDENCIES) @rm -f file-psd-load$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_psd_load_OBJECTS) $(file_psd_load_LDADD) $(LIBS) + file-psd-save$(EXEEXT): $(file_psd_save_OBJECTS) $(file_psd_save_DEPENDENCIES) $(EXTRA_file_psd_save_DEPENDENCIES) @rm -f file-psd-save$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_psd_save_OBJECTS) $(file_psd_save_LDADD) $(LIBS) @@ -632,14 +707,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -654,26 +729,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -685,15 +749,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -702,6 +762,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -846,19 +921,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/file-sgi/Makefile.in gimp-2.8.20/plug-ins/file-sgi/Makefile.in --- gimp-2.8.18/plug-ins/file-sgi/Makefile.in 2016-07-12 23:20:16.000000000 +0000 +++ gimp-2.8.20/plug-ins/file-sgi/Makefile.in 2017-01-31 23:40:49.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = file-sgi$(EXEEXT) subdir = plug-ins/file-sgi ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -83,6 +125,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -95,20 +150,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(file_sgi_SOURCES) DIST_SOURCES = $(file_sgi_SOURCES) am__can_run_installinfo = \ @@ -116,8 +167,28 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -507,7 +578,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/file-sgi/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/file-sgi/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -516,7 +586,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -535,10 +605,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -559,7 +631,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -572,6 +645,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + file-sgi$(EXEEXT): $(file_sgi_OBJECTS) $(file_sgi_DEPENDENCIES) $(EXTRA_file_sgi_DEPENDENCIES) @rm -f file-sgi$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_sgi_OBJECTS) $(file_sgi_LDADD) $(LIBS) @@ -590,14 +664,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -612,26 +686,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -643,15 +706,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -660,6 +719,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -804,19 +878,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/file-uri/Makefile.in gimp-2.8.20/plug-ins/file-uri/Makefile.in --- gimp-2.8.18/plug-ins/file-uri/Makefile.in 2016-07-12 23:20:17.000000000 +0000 +++ gimp-2.8.20/plug-ins/file-uri/Makefile.in 2017-01-31 23:40:49.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = file-uri$(EXEEXT) subdir = plug-ins/file-uri ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -91,6 +133,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -103,20 +158,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(file_uri_SOURCES) DIST_SOURCES = $(am__file_uri_SOURCES_DIST) am__can_run_installinfo = \ @@ -124,8 +175,28 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -526,7 +597,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/file-uri/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/file-uri/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -535,7 +605,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -554,10 +624,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -578,7 +650,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -591,6 +664,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + file-uri$(EXEEXT): $(file_uri_OBJECTS) $(file_uri_DEPENDENCIES) $(EXTRA_file_uri_DEPENDENCIES) @rm -f file-uri$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_uri_OBJECTS) $(file_uri_LDADD) $(LIBS) @@ -611,14 +685,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -633,26 +707,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -664,15 +727,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -681,6 +740,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -825,19 +899,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/file-xjt/Makefile.in gimp-2.8.20/plug-ins/file-xjt/Makefile.in --- gimp-2.8.18/plug-ins/file-xjt/Makefile.in 2016-07-12 23:20:17.000000000 +0000 +++ gimp-2.8.20/plug-ins/file-xjt/Makefile.in 2017-01-31 23:40:49.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = file-xjt$(EXEEXT) subdir = plug-ins/file-xjt ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -83,6 +125,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -95,20 +150,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(file_xjt_SOURCES) DIST_SOURCES = $(file_xjt_SOURCES) am__can_run_installinfo = \ @@ -116,8 +167,28 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -510,7 +581,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/file-xjt/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/file-xjt/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -519,7 +589,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -538,10 +608,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -562,7 +634,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -575,6 +648,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + file-xjt$(EXEEXT): $(file_xjt_OBJECTS) $(file_xjt_DEPENDENCIES) $(EXTRA_file_xjt_DEPENDENCIES) @rm -f file-xjt$(EXEEXT) $(AM_V_CCLD)$(LINK) $(file_xjt_OBJECTS) $(file_xjt_LDADD) $(LIBS) @@ -593,14 +667,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -615,26 +689,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -646,15 +709,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -663,6 +722,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -807,19 +881,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/flame/Makefile.in gimp-2.8.20/plug-ins/flame/Makefile.in --- gimp-2.8.18/plug-ins/flame/Makefile.in 2016-07-12 23:20:18.000000000 +0000 +++ gimp-2.8.20/plug-ins/flame/Makefile.in 2017-01-31 23:40:50.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = flame$(EXEEXT) subdir = plug-ins/flame ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -84,6 +126,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -96,20 +151,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(flame_SOURCES) DIST_SOURCES = $(flame_SOURCES) am__can_run_installinfo = \ @@ -117,8 +168,28 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -516,7 +587,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/flame/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/flame/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -525,7 +595,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -544,10 +614,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -568,7 +640,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -581,6 +654,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + flame$(EXEEXT): $(flame_OBJECTS) $(flame_DEPENDENCIES) $(EXTRA_flame_DEPENDENCIES) @rm -f flame$(EXEEXT) $(AM_V_CCLD)$(LINK) $(flame_OBJECTS) $(flame_LDADD) $(LIBS) @@ -601,14 +675,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -623,26 +697,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -654,15 +717,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -671,6 +730,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -815,19 +889,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/fractal-explorer/examples/Makefile.in gimp-2.8.20/plug-ins/fractal-explorer/examples/Makefile.in --- gimp-2.8.18/plug-ins/fractal-explorer/examples/Makefile.in 2016-07-12 23:20:19.000000000 +0000 +++ gimp-2.8.20/plug-ins/fractal-explorer/examples/Makefile.in 2017-01-31 23:40:51.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = plug-ins/fractal-explorer/examples -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(fractalexplorerdatadir)" DATA = $(fractalexplorerdata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -499,7 +550,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/fractal-explorer/examples/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/fractal-explorer/examples/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -544,11 +594,11 @@ @list='$(fractalexplorerdata_DATA)'; test -n "$(fractalexplorerdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(fractalexplorerdatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -687,17 +737,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-fractalexplorerdataDATA \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am \ - uninstall-fractalexplorerdataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-fractalexplorerdataDATA install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-fractalexplorerdataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/plug-ins/fractal-explorer/Makefile.in gimp-2.8.20/plug-ins/fractal-explorer/Makefile.in --- gimp-2.8.18/plug-ins/fractal-explorer/Makefile.in 2016-07-12 23:20:18.000000000 +0000 +++ gimp-2.8.20/plug-ins/fractal-explorer/Makefile.in 2017-01-31 23:40:50.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = fractal-explorer$(EXEEXT) subdir = plug-ins/fractal-explorer ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -85,6 +127,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -97,29 +152,26 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(fractal_explorer_SOURCES) DIST_SOURCES = $(fractal_explorer_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -127,12 +179,35 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -551,7 +626,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/fractal-explorer/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/fractal-explorer/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -560,7 +634,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -579,10 +653,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -603,7 +679,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -616,6 +693,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + fractal-explorer$(EXEEXT): $(fractal_explorer_OBJECTS) $(fractal_explorer_DEPENDENCIES) $(EXTRA_fractal_explorer_DEPENDENCIES) @rm -f fractal-explorer$(EXEEXT) $(AM_V_CCLD)$(LINK) $(fractal_explorer_OBJECTS) $(fractal_explorer_LDADD) $(LIBS) @@ -634,14 +712,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -657,22 +735,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -687,57 +768,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -753,12 +789,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -770,15 +801,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -787,6 +814,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -955,24 +997,24 @@ uninstall-am: uninstall-libexecPROGRAMS -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libexecPROGRAMS \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-libexecPROGRAMS -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecPROGRAMS install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-libexecPROGRAMS +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/gfig/gfig-examples/Makefile.in gimp-2.8.20/plug-ins/gfig/gfig-examples/Makefile.in --- gimp-2.8.18/plug-ins/gfig/gfig-examples/Makefile.in 2016-07-12 23:20:19.000000000 +0000 +++ gimp-2.8.20/plug-ins/gfig/gfig-examples/Makefile.in 2017-01-31 23:40:51.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = plug-ins/gfig/gfig-examples -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(gfigdatadir)" DATA = $(gfigdata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -476,7 +527,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/gfig/gfig-examples/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/gfig/gfig-examples/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -521,11 +571,11 @@ @list='$(gfigdata_DATA)'; test -n "$(gfigdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(gfigdatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -664,16 +714,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-gfigdataDATA install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-gfigdataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-gfigdataDATA install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-gfigdataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/plug-ins/gfig/images/Makefile.in gimp-2.8.20/plug-ins/gfig/images/Makefile.in --- gimp-2.8.18/plug-ins/gfig/images/Makefile.in 2016-07-12 23:20:20.000000000 +0000 +++ gimp-2.8.20/plug-ins/gfig/images/Makefile.in 2017-01-31 23:40:52.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = plug-ins/gfig/images -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -80,6 +129,8 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(noinst_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -455,7 +506,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/gfig/images/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/gfig/images/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -479,11 +529,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -620,15 +670,18 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + +.PRECIOUS: Makefile stock-icons.list: $(STOCK_IMAGES) Makefile.am diff -Nru gimp-2.8.18/plug-ins/gfig/Makefile.in gimp-2.8.20/plug-ins/gfig/Makefile.in --- gimp-2.8.18/plug-ins/gfig/Makefile.in 2016-07-12 23:20:19.000000000 +0000 +++ gimp-2.8.20/plug-ins/gfig/Makefile.in 2017-01-31 23:40:51.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = gfig$(EXEEXT) subdir = plug-ins/gfig ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -89,6 +131,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -101,29 +156,26 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(gfig_SOURCES) DIST_SOURCES = $(gfig_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -131,12 +183,35 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -585,7 +660,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/gfig/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/gfig/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -594,7 +668,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -613,10 +687,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -637,7 +713,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -650,6 +727,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + gfig$(EXEEXT): $(gfig_OBJECTS) $(gfig_DEPENDENCIES) $(EXTRA_gfig_DEPENDENCIES) @rm -f gfig$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gfig_OBJECTS) $(gfig_LDADD) $(LIBS) @@ -682,14 +760,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -705,22 +783,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -735,57 +816,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -801,12 +837,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -818,15 +849,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -835,6 +862,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1003,24 +1045,24 @@ uninstall-am: uninstall-libexecPROGRAMS -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libexecPROGRAMS \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-libexecPROGRAMS -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecPROGRAMS install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-libexecPROGRAMS +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/gimpressionist/Brushes/Makefile.in gimp-2.8.20/plug-ins/gimpressionist/Brushes/Makefile.in --- gimp-2.8.18/plug-ins/gimpressionist/Brushes/Makefile.in 2016-07-12 23:20:20.000000000 +0000 +++ gimp-2.8.20/plug-ins/gimpressionist/Brushes/Makefile.in 2017-01-31 23:40:52.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = plug-ins/gimpressionist/Brushes -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(brushdatadir)" DATA = $(brushdata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -526,7 +577,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/gimpressionist/Brushes/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/gimpressionist/Brushes/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -571,11 +621,11 @@ @list='$(brushdata_DATA)'; test -n "$(brushdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(brushdatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -714,16 +764,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-brushdataDATA install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-brushdataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-brushdataDATA install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-brushdataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/plug-ins/gimpressionist/Makefile.in gimp-2.8.20/plug-ins/gimpressionist/Makefile.in --- gimp-2.8.18/plug-ins/gimpressionist/Makefile.in 2016-07-12 23:20:20.000000000 +0000 +++ gimp-2.8.20/plug-ins/gimpressionist/Makefile.in 2017-01-31 23:40:53.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = gimpressionist$(EXEEXT) subdir = plug-ins/gimpressionist ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -90,6 +132,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -102,29 +157,26 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(gimpressionist_SOURCES) DIST_SOURCES = $(gimpressionist_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -132,12 +184,35 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -588,7 +663,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/gimpressionist/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/gimpressionist/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -597,7 +671,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -616,10 +690,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -640,7 +716,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -653,6 +730,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + gimpressionist$(EXEEXT): $(gimpressionist_OBJECTS) $(gimpressionist_DEPENDENCIES) $(EXTRA_gimpressionist_DEPENDENCIES) @rm -f gimpressionist$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gimpressionist_OBJECTS) $(gimpressionist_LDADD) $(LIBS) @@ -687,14 +765,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -710,22 +788,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -740,57 +821,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -806,12 +842,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -823,15 +854,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -840,6 +867,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1008,24 +1050,24 @@ uninstall-am: uninstall-libexecPROGRAMS -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libexecPROGRAMS \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-libexecPROGRAMS -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecPROGRAMS install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-libexecPROGRAMS +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/gimpressionist/Paper/Makefile.in gimp-2.8.20/plug-ins/gimpressionist/Paper/Makefile.in --- gimp-2.8.18/plug-ins/gimpressionist/Paper/Makefile.in 2016-07-12 23:20:21.000000000 +0000 +++ gimp-2.8.20/plug-ins/gimpressionist/Paper/Makefile.in 2017-01-31 23:40:53.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = plug-ins/gimpressionist/Paper -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(paperdatadir)" DATA = $(paperdata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -475,7 +526,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/gimpressionist/Paper/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/gimpressionist/Paper/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -520,11 +570,11 @@ @list='$(paperdata_DATA)'; test -n "$(paperdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(paperdatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -663,16 +713,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-paperdataDATA \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-paperdataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-paperdataDATA install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am \ + uninstall-paperdataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/plug-ins/gimpressionist/Presets/Makefile.in gimp-2.8.20/plug-ins/gimpressionist/Presets/Makefile.in --- gimp-2.8.18/plug-ins/gimpressionist/Presets/Makefile.in 2016-07-12 23:20:21.000000000 +0000 +++ gimp-2.8.20/plug-ins/gimpressionist/Presets/Makefile.in 2017-01-31 23:40:53.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = plug-ins/gimpressionist/Presets -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(presetsdatadir)" DATA = $(presetsdata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -491,7 +542,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/gimpressionist/Presets/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/gimpressionist/Presets/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -536,11 +586,11 @@ @list='$(presetsdata_DATA)'; test -n "$(presetsdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(presetsdatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -679,16 +729,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-presetsdataDATA install-ps \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-presetsdataDATA install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-presetsdataDATA + ps ps-am tags-am uninstall uninstall-am \ + uninstall-presetsdataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/plug-ins/gradient-flare/flares/Makefile.in gimp-2.8.20/plug-ins/gradient-flare/flares/Makefile.in --- gimp-2.8.18/plug-ins/gradient-flare/flares/Makefile.in 2016-07-12 23:20:22.000000000 +0000 +++ gimp-2.8.20/plug-ins/gradient-flare/flares/Makefile.in 2017-01-31 23:40:54.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = plug-ins/gradient-flare/flares -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(flaredir)" DATA = $(flare_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -473,7 +524,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/gradient-flare/flares/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/gradient-flare/flares/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -518,11 +568,11 @@ @list='$(flare_DATA)'; test -n "$(flaredir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(flaredir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -661,16 +711,18 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-flareDATA install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-flareDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-flareDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-flareDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/plug-ins/gradient-flare/Makefile.in gimp-2.8.20/plug-ins/gradient-flare/Makefile.in --- gimp-2.8.18/plug-ins/gradient-flare/Makefile.in 2016-07-12 23:20:21.000000000 +0000 +++ gimp-2.8.20/plug-ins/gradient-flare/Makefile.in 2017-01-31 23:40:54.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = gradient-flare$(EXEEXT) subdir = plug-ins/gradient-flare ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -84,6 +126,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -96,29 +151,26 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(gradient_flare_SOURCES) DIST_SOURCES = $(gradient_flare_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -126,12 +178,35 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -545,7 +620,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/gradient-flare/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/gradient-flare/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -554,7 +628,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -573,10 +647,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -597,7 +673,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -610,6 +687,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + gradient-flare$(EXEEXT): $(gradient_flare_OBJECTS) $(gradient_flare_DEPENDENCIES) $(EXTRA_gradient_flare_DEPENDENCIES) @rm -f gradient-flare$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gradient_flare_OBJECTS) $(gradient_flare_LDADD) $(LIBS) @@ -627,14 +705,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -650,22 +728,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -680,57 +761,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -746,12 +782,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -763,15 +794,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -780,6 +807,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -948,24 +990,24 @@ uninstall-am: uninstall-libexecPROGRAMS -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libexecPROGRAMS \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-libexecPROGRAMS -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecPROGRAMS install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-libexecPROGRAMS +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/help/Makefile.in gimp-2.8.20/plug-ins/help/Makefile.in --- gimp-2.8.18/plug-ins/help/Makefile.in 2016-07-12 23:20:22.000000000 +0000 +++ gimp-2.8.20/plug-ins/help/Makefile.in 2017-01-31 23:40:55.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,23 +18,61 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,20 +91,25 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = help$(EXEEXT) noinst_PROGRAMS = gimp-help-lookup$(EXEEXT) subdir = plug-ins/help ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -76,10 +118,8 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libgimphelp_a_AR = $(AR) $(ARFLAGS) libgimphelp_a_LIBADD = am_libgimphelp_a_OBJECTS = gimphelp.$(OBJEXT) gimphelpdomain.$(OBJEXT) \ @@ -96,6 +136,7 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = am_help_OBJECTS = help.$(OBJEXT) help_OBJECTS = $(am_help_OBJECTS) help_LDADD = $(LDADD) @@ -104,6 +145,18 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(help_RC) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -116,17 +169,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libgimphelp_a_SOURCES) $(gimp_help_lookup_SOURCES) \ $(help_SOURCES) DIST_SOURCES = $(libgimphelp_a_SOURCES) $(gimp_help_lookup_SOURCES) \ @@ -136,8 +188,28 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -552,7 +624,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/help/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/help/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -561,7 +632,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -574,6 +645,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libgimphelp.a: $(libgimphelp_a_OBJECTS) $(libgimphelp_a_DEPENDENCIES) $(EXTRA_libgimphelp_a_DEPENDENCIES) $(AM_V_at)-rm -f libgimphelp.a $(AM_V_AR)$(libgimphelp_a_AR) libgimphelp.a $(libgimphelp_a_OBJECTS) $(libgimphelp_a_LIBADD) @@ -587,10 +659,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -611,7 +685,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -633,9 +708,11 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + gimp-help-lookup$(EXEEXT): $(gimp_help_lookup_OBJECTS) $(gimp_help_lookup_DEPENDENCIES) $(EXTRA_gimp_help_lookup_DEPENDENCIES) @rm -f gimp-help-lookup$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gimp_help_lookup_OBJECTS) $(gimp_help_lookup_LDADD) $(LIBS) + help$(EXEEXT): $(help_OBJECTS) $(help_DEPENDENCIES) $(EXTRA_help_DEPENDENCIES) @rm -f help$(EXEEXT) $(AM_V_CCLD)$(LINK) $(help_OBJECTS) $(help_LDADD) $(LIBS) @@ -659,14 +736,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -681,26 +758,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -712,15 +778,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -729,6 +791,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -873,20 +950,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ clean-libexecPROGRAMS clean-libtool clean-noinstLIBRARIES \ - clean-noinstPROGRAMS ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS + clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/help-browser/Makefile.in gimp-2.8.20/plug-ins/help-browser/Makefile.in --- gimp-2.8.18/plug-ins/help-browser/Makefile.in 2016-07-12 23:20:22.000000000 +0000 +++ gimp-2.8.20/plug-ins/help-browser/Makefile.in 2017-01-31 23:40:54.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = help-browser$(EXEEXT) subdir = plug-ins/help-browser ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -86,6 +128,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -98,20 +153,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(help_browser_SOURCES) DIST_SOURCES = $(help_browser_SOURCES) am__can_run_installinfo = \ @@ -119,8 +170,28 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -520,7 +591,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/help-browser/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/help-browser/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -529,7 +599,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -548,10 +618,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -572,7 +644,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -585,6 +658,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + help-browser$(EXEEXT): $(help_browser_OBJECTS) $(help_browser_DEPENDENCIES) $(EXTRA_help_browser_DEPENDENCIES) @rm -f help-browser$(EXEEXT) $(AM_V_CCLD)$(LINK) $(help_browser_OBJECTS) $(help_browser_LDADD) $(LIBS) @@ -606,14 +680,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -628,26 +702,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -659,15 +722,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -676,6 +735,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -820,19 +894,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/ifs-compose/Makefile.in gimp-2.8.20/plug-ins/ifs-compose/Makefile.in --- gimp-2.8.18/plug-ins/ifs-compose/Makefile.in 2016-07-12 23:20:23.000000000 +0000 +++ gimp-2.8.20/plug-ins/ifs-compose/Makefile.in 2017-01-31 23:40:55.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = ifs-compose$(EXEEXT) subdir = plug-ins/ifs-compose ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -84,6 +126,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -96,20 +151,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(ifs_compose_SOURCES) DIST_SOURCES = $(ifs_compose_SOURCES) am__can_run_installinfo = \ @@ -117,8 +168,28 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -512,7 +583,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/ifs-compose/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/ifs-compose/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -521,7 +591,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -540,10 +610,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -564,7 +636,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -577,6 +650,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + ifs-compose$(EXEEXT): $(ifs_compose_OBJECTS) $(ifs_compose_DEPENDENCIES) $(EXTRA_ifs_compose_DEPENDENCIES) @rm -f ifs-compose$(EXEEXT) $(AM_V_CCLD)$(LINK) $(ifs_compose_OBJECTS) $(ifs_compose_LDADD) $(LIBS) @@ -596,14 +670,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -618,26 +692,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -649,15 +712,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -666,6 +725,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -810,19 +884,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/imagemap/images/Makefile.in gimp-2.8.20/plug-ins/imagemap/images/Makefile.in --- gimp-2.8.18/plug-ins/imagemap/images/Makefile.in 2016-07-12 23:20:24.000000000 +0000 +++ gimp-2.8.20/plug-ins/imagemap/images/Makefile.in 2017-01-31 23:40:56.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = plug-ins/imagemap/images -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -80,6 +129,8 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(noinst_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -447,7 +498,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/imagemap/images/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/imagemap/images/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -471,11 +521,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -612,15 +662,18 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + +.PRECIOUS: Makefile stock-icons.list: $(STOCK_IMAGES) Makefile.am diff -Nru gimp-2.8.18/plug-ins/imagemap/Makefile.in gimp-2.8.20/plug-ins/imagemap/Makefile.in --- gimp-2.8.18/plug-ins/imagemap/Makefile.in 2016-07-12 23:20:23.000000000 +0000 +++ gimp-2.8.20/plug-ins/imagemap/Makefile.in 2017-01-31 23:40:56.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = imagemap$(EXEEXT) subdir = plug-ins/imagemap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -114,6 +156,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -126,29 +181,26 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(imagemap_SOURCES) DIST_SOURCES = $(imagemap_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -156,12 +208,35 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -692,7 +767,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/imagemap/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/imagemap/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -701,7 +775,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -720,10 +794,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -744,7 +820,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -757,6 +834,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + imagemap$(EXEEXT): $(imagemap_OBJECTS) $(imagemap_DEPENDENCIES) $(EXTRA_imagemap_DEPENDENCIES) @rm -f imagemap$(EXEEXT) $(AM_V_CCLD)$(LINK) $(imagemap_OBJECTS) $(imagemap_LDADD) $(LIBS) @@ -836,14 +914,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -859,22 +937,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -889,57 +970,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -955,12 +991,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -972,15 +1003,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -989,6 +1016,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1158,24 +1200,24 @@ uninstall-am: uninstall-libexecPROGRAMS -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libexecPROGRAMS \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-libexecPROGRAMS -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecPROGRAMS install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-libexecPROGRAMS +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/lighting/images/Makefile.in gimp-2.8.20/plug-ins/lighting/images/Makefile.in --- gimp-2.8.18/plug-ins/lighting/images/Makefile.in 2016-07-12 23:20:25.000000000 +0000 +++ gimp-2.8.20/plug-ins/lighting/images/Makefile.in 2017-01-31 23:40:57.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = plug-ins/lighting/images -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -80,6 +129,8 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(noinst_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -449,7 +500,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/lighting/images/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/lighting/images/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -473,11 +523,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -614,15 +664,18 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + +.PRECIOUS: Makefile stock-icons.list: $(STOCK_IMAGES) Makefile.am diff -Nru gimp-2.8.18/plug-ins/lighting/Makefile.in gimp-2.8.20/plug-ins/lighting/Makefile.in --- gimp-2.8.18/plug-ins/lighting/Makefile.in 2016-07-12 23:20:24.000000000 +0000 +++ gimp-2.8.20/plug-ins/lighting/Makefile.in 2017-01-31 23:40:57.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule TODO libexec_PROGRAMS = lighting$(EXEEXT) subdir = plug-ins/lighting ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -86,6 +128,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -98,29 +153,26 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(lighting_SOURCES) DIST_SOURCES = $(lighting_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -128,12 +180,35 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp README TODO DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -562,7 +637,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/lighting/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/lighting/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -571,7 +645,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -590,10 +664,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -614,7 +690,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -627,6 +704,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + lighting$(EXEEXT): $(lighting_OBJECTS) $(lighting_DEPENDENCIES) $(EXTRA_lighting_DEPENDENCIES) @rm -f lighting$(EXEEXT) $(AM_V_CCLD)$(LINK) $(lighting_OBJECTS) $(lighting_LDADD) $(LIBS) @@ -650,14 +728,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -673,22 +751,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -703,57 +784,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -769,12 +805,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -786,15 +817,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -803,6 +830,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -971,24 +1013,24 @@ uninstall-am: uninstall-libexecPROGRAMS -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libexecPROGRAMS \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-libexecPROGRAMS -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecPROGRAMS install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-libexecPROGRAMS +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/Makefile.in gimp-2.8.20/plug-ins/Makefile.in --- gimp-2.8.18/plug-ins/Makefile.in 2016-07-12 23:20:09.000000000 +0000 +++ gimp-2.8.20/plug-ins/Makefile.in 2017-01-31 23:40:40.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,35 +88,48 @@ build_triplet = @build@ host_triplet = @host@ subdir = plug-ins -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -87,9 +137,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = script-fu pygimp color-rotate file-bmp file-compressor \ @@ -98,6 +168,7 @@ gimpressionist gradient-flare help help-browser ifs-compose \ imagemap lighting map-object maze metadata pagecurl print \ selection-to-path twain ui win-snap common +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -528,7 +599,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -554,22 +624,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -584,57 +657,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -650,12 +678,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -667,15 +690,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -684,6 +703,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -844,22 +878,22 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/plug-ins/map-object/Makefile.in gimp-2.8.20/plug-ins/map-object/Makefile.in --- gimp-2.8.18/plug-ins/map-object/Makefile.in 2016-07-12 23:20:25.000000000 +0000 +++ gimp-2.8.20/plug-ins/map-object/Makefile.in 2017-01-31 23:40:58.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule TODO libexec_PROGRAMS = map-object$(EXEEXT) subdir = plug-ins/map-object ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -86,6 +128,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -98,20 +153,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(map_object_SOURCES) DIST_SOURCES = $(map_object_SOURCES) am__can_run_installinfo = \ @@ -119,8 +170,28 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp README TODO DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -525,7 +596,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/map-object/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/map-object/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -534,7 +604,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -553,10 +623,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -577,7 +649,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -590,6 +663,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + map-object$(EXEEXT): $(map_object_OBJECTS) $(map_object_DEPENDENCIES) $(EXTRA_map_object_DEPENDENCIES) @rm -f map-object$(EXEEXT) $(AM_V_CCLD)$(LINK) $(map_object_OBJECTS) $(map_object_LDADD) $(LIBS) @@ -614,14 +688,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -636,26 +710,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -667,15 +730,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -684,6 +743,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -828,19 +902,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/maze/Makefile.in gimp-2.8.20/plug-ins/maze/Makefile.in --- gimp-2.8.18/plug-ins/maze/Makefile.in 2016-07-12 23:20:26.000000000 +0000 +++ gimp-2.8.20/plug-ins/maze/Makefile.in 2017-01-31 23:40:58.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = maze$(EXEEXT) subdir = plug-ins/maze ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -84,6 +126,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -96,20 +151,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(maze_SOURCES) DIST_SOURCES = $(maze_SOURCES) am__can_run_installinfo = \ @@ -117,8 +168,28 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -513,7 +584,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/maze/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/maze/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -522,7 +592,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -541,10 +611,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -565,7 +637,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -578,6 +651,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + maze$(EXEEXT): $(maze_OBJECTS) $(maze_DEPENDENCIES) $(EXTRA_maze_DEPENDENCIES) @rm -f maze$(EXEEXT) $(AM_V_CCLD)$(LINK) $(maze_OBJECTS) $(maze_LDADD) $(LIBS) @@ -598,14 +672,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -620,26 +694,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -651,15 +714,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -668,6 +727,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -812,19 +886,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/metadata/Makefile.in gimp-2.8.20/plug-ins/metadata/Makefile.in --- gimp-2.8.18/plug-ins/metadata/Makefile.in 2016-07-12 23:20:26.000000000 +0000 +++ gimp-2.8.20/plug-ins/metadata/Makefile.in 2017-01-31 23:40:59.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,20 +90,25 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = metadata$(EXEEXT) noinst_PROGRAMS = xmpdump$(EXEEXT) subdir = plug-ins/metadata ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -88,6 +130,7 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = am_xmpdump_OBJECTS = xmpdump.$(OBJEXT) xmp-schemas.$(OBJEXT) \ xmp-encode.$(OBJEXT) xmp-model.$(OBJEXT) xmp-parse.$(OBJEXT) xmpdump_OBJECTS = $(am_xmpdump_OBJECTS) @@ -96,6 +139,18 @@ $(libgimpmath) $(libgimpconfig) $(libgimpcolor) $(libgimpbase) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(metadata_RC) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -108,20 +163,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(metadata_SOURCES) $(xmpdump_SOURCES) DIST_SOURCES = $(metadata_SOURCES) $(xmpdump_SOURCES) am__can_run_installinfo = \ @@ -129,8 +180,28 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -550,7 +621,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/metadata/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/metadata/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -559,7 +629,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -578,10 +648,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -602,7 +674,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -624,9 +697,11 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + metadata$(EXEEXT): $(metadata_OBJECTS) $(metadata_DEPENDENCIES) $(EXTRA_metadata_DEPENDENCIES) @rm -f metadata$(EXEEXT) $(AM_V_CCLD)$(LINK) $(metadata_OBJECTS) $(metadata_LDADD) $(LIBS) + xmpdump$(EXEEXT): $(xmpdump_OBJECTS) $(xmpdump_DEPENDENCIES) $(EXTRA_xmpdump_DEPENDENCIES) @rm -f xmpdump$(EXEEXT) $(AM_V_CCLD)$(LINK) $(xmpdump_OBJECTS) $(xmpdump_LDADD) $(LIBS) @@ -654,14 +729,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -676,26 +751,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -707,15 +771,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -724,6 +784,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -868,20 +943,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool clean-noinstPROGRAMS ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecPROGRAMS install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool clean-noinstPROGRAMS \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libexecPROGRAMS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/pagecurl/Makefile.in gimp-2.8.20/plug-ins/pagecurl/Makefile.in --- gimp-2.8.18/plug-ins/pagecurl/Makefile.in 2016-07-12 23:20:26.000000000 +0000 +++ gimp-2.8.20/plug-ins/pagecurl/Makefile.in 2017-01-31 23:40:59.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = pagecurl$(EXEEXT) subdir = plug-ins/pagecurl ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -84,6 +126,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -96,20 +151,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(pagecurl_SOURCES) $(nodist_pagecurl_SOURCES) DIST_SOURCES = $(pagecurl_SOURCES) am__can_run_installinfo = \ @@ -117,8 +168,28 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -521,7 +592,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/pagecurl/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/pagecurl/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -530,7 +600,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -549,10 +619,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -573,7 +645,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -586,6 +659,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + pagecurl$(EXEEXT): $(pagecurl_OBJECTS) $(pagecurl_DEPENDENCIES) $(EXTRA_pagecurl_DEPENDENCIES) @rm -f pagecurl$(EXEEXT) $(AM_V_CCLD)$(LINK) $(pagecurl_OBJECTS) $(pagecurl_LDADD) $(LIBS) @@ -603,14 +677,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -625,26 +699,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -656,15 +719,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -673,6 +732,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -821,19 +895,22 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/print/Makefile.in gimp-2.8.20/plug-ins/print/Makefile.in --- gimp-2.8.18/plug-ins/print/Makefile.in 2016-07-12 23:20:27.000000000 +0000 +++ gimp-2.8.20/plug-ins/print/Makefile.in 2017-01-31 23:41:00.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,20 +90,25 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = print$(EXEEXT) EXTRA_PROGRAMS = print$(EXEEXT) subdir = plug-ins/print ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -87,6 +129,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -99,20 +154,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(print_SOURCES) DIST_SOURCES = $(print_SOURCES) am__can_run_installinfo = \ @@ -120,8 +171,28 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -522,7 +593,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/print/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/print/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -531,7 +601,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -550,10 +620,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -574,7 +646,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -587,6 +660,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + print$(EXEEXT): $(print_OBJECTS) $(print_DEPENDENCIES) $(EXTRA_print_DEPENDENCIES) @rm -f print$(EXEEXT) $(AM_V_CCLD)$(LINK) $(print_OBJECTS) $(print_LDADD) $(LIBS) @@ -610,14 +684,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -632,26 +706,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -663,15 +726,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -680,6 +739,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -824,19 +898,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/print/print-draw-page.c gimp-2.8.20/plug-ins/print/print-draw-page.c --- gimp-2.8.18/plug-ins/print/print-draw-page.c 2015-08-20 22:57:29.000000000 +0000 +++ gimp-2.8.20/plug-ins/print/print-draw-page.c 2017-01-28 19:08:46.000000000 +0000 @@ -44,15 +44,22 @@ { cairo_t *cr = gtk_print_context_get_cairo_context (context); cairo_surface_t *surface; - gint width; - gint height; - gdouble scale_x; - gdouble scale_y; surface = print_surface_from_drawable (data->drawable_id, error); if (surface) { + gint width; + gint height; + gdouble scale_x; + gdouble scale_y; + + /* create a white rectangle covering the entire page, just + * to be safe; see bug #777233. + */ + cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 1.0); + cairo_paint (cr); + width = cairo_image_surface_get_width (surface); height = cairo_image_surface_get_height (surface); @@ -74,10 +81,8 @@ return TRUE; } - else - { - return FALSE; - } + + return FALSE; } diff -Nru gimp-2.8.18/plug-ins/pygimp/Makefile.in gimp-2.8.20/plug-ins/pygimp/Makefile.in --- gimp-2.8.18/plug-ins/pygimp/Makefile.in 2016-07-12 23:20:28.000000000 +0000 +++ gimp-2.8.20/plug-ins/pygimp/Makefile.in 2017-01-31 23:41:00.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,23 +16,61 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,17 +90,23 @@ build_triplet = @build@ host_triplet = @host@ subdir = plug-ins/pygimp -DIST_COMMON = $(pygimp_PYTHON) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in py-compile ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(pygimp_PYTHON) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -107,6 +150,7 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = _gimpenums_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(_gimpenums_la_LDFLAGS) $(LDFLAGS) -o $@ @@ -143,6 +187,18 @@ gimpthumb_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(gimpthumb_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -155,49 +211,70 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(_gimpenums_la_SOURCES) $(_gimpui_la_SOURCES) \ $(gimp_la_SOURCES) $(gimpcolor_la_SOURCES) \ $(gimpthumb_la_SOURCES) DIST_SOURCES = $(_gimpenums_la_SOURCES) $(_gimpui_la_SOURCES) \ $(gimp_la_SOURCES) $(gimpcolor_la_SOURCES) \ $(gimpthumb_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile) +am__pep3147_tweak = \ + sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.py|' py_compile = $(top_srcdir)/py-compile DATA = $(pygimp_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/py-compile py-compile DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -709,7 +786,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/pygimp/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/pygimp/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -727,6 +803,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-pygimpLTLIBRARIES: $(pygimp_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(pygimp_LTLIBRARIES)'; test -n "$(pygimpdir)" || list=; \ @@ -753,20 +830,27 @@ clean-pygimpLTLIBRARIES: -test -z "$(pygimp_LTLIBRARIES)" || rm -f $(pygimp_LTLIBRARIES) - @list='$(pygimp_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(pygimp_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + _gimpenums.la: $(_gimpenums_la_OBJECTS) $(_gimpenums_la_DEPENDENCIES) $(EXTRA__gimpenums_la_DEPENDENCIES) $(AM_V_CCLD)$(_gimpenums_la_LINK) -rpath $(pygimpdir) $(_gimpenums_la_OBJECTS) $(_gimpenums_la_LIBADD) $(LIBS) + _gimpui.la: $(_gimpui_la_OBJECTS) $(_gimpui_la_DEPENDENCIES) $(EXTRA__gimpui_la_DEPENDENCIES) $(AM_V_CCLD)$(_gimpui_la_LINK) -rpath $(pygimpdir) $(_gimpui_la_OBJECTS) $(_gimpui_la_LIBADD) $(LIBS) + gimp.la: $(gimp_la_OBJECTS) $(gimp_la_DEPENDENCIES) $(EXTRA_gimp_la_DEPENDENCIES) $(AM_V_CCLD)$(gimp_la_LINK) -rpath $(pygimpdir) $(gimp_la_OBJECTS) $(gimp_la_LIBADD) $(LIBS) + gimpcolor.la: $(gimpcolor_la_OBJECTS) $(gimpcolor_la_DEPENDENCIES) $(EXTRA_gimpcolor_la_DEPENDENCIES) $(AM_V_CCLD)$(gimpcolor_la_LINK) -rpath $(pygimpdir) $(gimpcolor_la_OBJECTS) $(gimpcolor_la_LIBADD) $(LIBS) + gimpthumb.la: $(gimpthumb_la_OBJECTS) $(gimpthumb_la_DEPENDENCIES) $(EXTRA_gimpthumb_la_DEPENDENCIES) $(AM_V_CCLD)$(gimpthumb_la_LINK) -rpath $(pygimpdir) $(gimpthumb_la_OBJECTS) $(gimpthumb_la_LIBADD) $(LIBS) @@ -798,14 +882,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -847,13 +931,23 @@ uninstall-pygimpPYTHON: @$(NORMAL_UNINSTALL) @list='$(pygimp_PYTHON)'; test -n "$(pygimpdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ + py_files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$py_files" || exit 0; \ dir='$(DESTDIR)$(pygimpdir)'; \ - filesc=`echo "$$files" | sed 's|$$|c|'`; \ - fileso=`echo "$$files" | sed 's|$$|o|'`; \ + pyc_files=`echo "$$py_files" | sed 's|$$|c|'`; \ + pyo_files=`echo "$$py_files" | sed 's|$$|o|'`; \ + py_files_pep3147=`echo "$$py_files" | $(am__pep3147_tweak)`; \ + echo "$$py_files_pep3147";\ + pyc_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|c|'`; \ + pyo_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|o|'`; \ st=0; \ - for files in "$$files" "$$filesc" "$$fileso"; do \ + for files in \ + "$$py_files" \ + "$$pyc_files" \ + "$$pyo_files" \ + "$$pyc_files_pep3147" \ + "$$pyo_files_pep3147" \ + ; do \ $(am__uninstall_files_from_dir) || st=$$?; \ done; \ exit $$st @@ -880,22 +974,25 @@ dir='$(DESTDIR)$(pygimpdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -910,57 +1007,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -976,12 +1028,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -993,15 +1040,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1010,6 +1053,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1181,12 +1239,11 @@ uninstall-am: uninstall-local uninstall-pygimpDATA \ uninstall-pygimpLTLIBRARIES uninstall-pygimpPYTHON -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - clean-pygimpLTLIBRARIES ctags ctags-recursive distclean \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool \ + clean-pygimpLTLIBRARIES cscopelist-am ctags ctags-am distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am \ @@ -1198,10 +1255,12 @@ installcheck installcheck-am installdirs installdirs-am \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ uninstall-local uninstall-pygimpDATA \ uninstall-pygimpLTLIBRARIES uninstall-pygimpPYTHON +.PRECIOUS: Makefile + install-env-file: $(mkinstalldirs) '$(DESTDIR)$(pyenvdir)' diff -Nru gimp-2.8.18/plug-ins/pygimp/plug-ins/Makefile.in gimp-2.8.20/plug-ins/pygimp/plug-ins/Makefile.in --- gimp-2.8.18/plug-ins/pygimp/plug-ins/Makefile.in 2016-07-12 23:20:28.000000000 +0000 +++ gimp-2.8.20/plug-ins/pygimp/plug-ins/Makefile.in 2017-01-31 23:41:01.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,23 +16,61 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,16 +90,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = plug-ins/pygimp/plug-ins -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -97,12 +140,18 @@ am__installdirs = "$(DESTDIR)$(pluginexecdir)" \ "$(DESTDIR)$(pluginexecdir)" SCRIPTS = $(pluginexec_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -111,6 +160,8 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(pluginexec_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -489,7 +540,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/pygimp/plug-ins/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/pygimp/plug-ins/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -569,11 +619,11 @@ @list='$(pluginexec_DATA)'; test -n "$(pluginexecdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(pluginexecdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -712,19 +762,21 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-pluginexecDATA \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginexecDATA \ install-pluginexecSCRIPTS install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-pluginexecDATA \ + tags-am uninstall uninstall-am uninstall-pluginexecDATA \ uninstall-pluginexecSCRIPTS +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru gimp-2.8.18/plug-ins/pygimp/plug-ins/pyconsole.py gimp-2.8.20/plug-ins/pygimp/plug-ins/pyconsole.py --- gimp-2.8.18/plug-ins/pygimp/plug-ins/pyconsole.py 2015-08-15 07:52:42.000000000 +0000 +++ gimp-2.8.20/plug-ins/pygimp/plug-ins/pyconsole.py 2017-01-28 19:08:46.000000000 +0000 @@ -250,7 +250,9 @@ keyval = event.keyval if not state: - if keyval == _keys.Return: + if keyval == _keys.Escape: + pass + elif keyval == _keys.Return: self._commit() elif keyval == _keys.Up: self.__history(-1) diff -Nru gimp-2.8.18/plug-ins/script-fu/ftx/Makefile.in gimp-2.8.20/plug-ins/script-fu/ftx/Makefile.in --- gimp-2.8.18/plug-ins/script-fu/ftx/Makefile.in 2016-07-12 23:20:29.000000000 +0000 +++ gimp-2.8.20/plug-ins/script-fu/ftx/Makefile.in 2017-01-31 23:41:02.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,16 +89,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = plug-ins/script-fu/ftx -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -70,14 +113,24 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libftx_a_AR = $(AR) $(ARFLAGS) libftx_a_LIBADD = am_libftx_a_OBJECTS = ftx.$(OBJEXT) libftx_a_OBJECTS = $(am_libftx_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -87,23 +140,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libftx_a_SOURCES) DIST_SOURCES = $(libftx_a_SOURCES) am__can_run_installinfo = \ @@ -111,8 +164,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -481,7 +552,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/script-fu/ftx/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/script-fu/ftx/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -502,6 +572,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libftx.a: $(libftx_a_OBJECTS) $(libftx_a_DEPENDENCIES) $(EXTRA_libftx_a_DEPENDENCIES) $(AM_V_at)-rm -f libftx.a $(AM_V_AR)$(libftx_a_AR) libftx.a $(libftx_a_OBJECTS) $(libftx_a_LIBADD) @@ -520,14 +591,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -542,26 +613,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -573,15 +633,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -590,6 +646,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -731,18 +802,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/plug-ins/script-fu/Makefile.in gimp-2.8.20/plug-ins/script-fu/Makefile.in --- gimp-2.8.18/plug-ins/script-fu/Makefile.in 2016-07-12 23:20:29.000000000 +0000 +++ gimp-2.8.20/plug-ins/script-fu/Makefile.in 2017-01-31 23:41:01.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = script-fu$(EXEEXT) subdir = plug-ins/script-fu ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -93,6 +135,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -105,29 +160,26 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(script_fu_SOURCES) DIST_SOURCES = $(script_fu_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -135,12 +187,35 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -597,7 +672,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/script-fu/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/script-fu/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -606,7 +680,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -625,10 +699,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -649,7 +725,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -662,6 +739,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + script-fu$(EXEEXT): $(script_fu_OBJECTS) $(script_fu_DEPENDENCIES) $(EXTRA_script_fu_DEPENDENCIES) @rm -f script-fu$(EXEEXT) $(AM_V_CCLD)$(LINK) $(script_fu_OBJECTS) $(script_fu_LDADD) $(LIBS) @@ -689,14 +767,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -712,22 +790,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -742,57 +823,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -808,12 +844,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -825,15 +856,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -842,6 +869,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1010,24 +1052,24 @@ uninstall-am: uninstall-libexecPROGRAMS -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libexecPROGRAMS \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-libexecPROGRAMS -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecPROGRAMS install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-libexecPROGRAMS +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/script-fu/scripts/images/Makefile.in gimp-2.8.20/plug-ins/script-fu/scripts/images/Makefile.in --- gimp-2.8.18/plug-ins/script-fu/scripts/images/Makefile.in 2016-07-12 23:20:30.000000000 +0000 +++ gimp-2.8.20/plug-ins/script-fu/scripts/images/Makefile.in 2017-01-31 23:41:02.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = plug-ins/script-fu/scripts/images -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(imagesdatadir)" DATA = $(imagesdata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -471,7 +522,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/script-fu/scripts/images/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/script-fu/scripts/images/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -516,11 +566,11 @@ @list='$(imagesdata_DATA)'; test -n "$(imagesdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(imagesdatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -659,16 +709,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-imagesdataDATA install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-imagesdataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-imagesdataDATA install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-imagesdataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/plug-ins/script-fu/scripts/Makefile.in gimp-2.8.20/plug-ins/script-fu/scripts/Makefile.in --- gimp-2.8.18/plug-ins/script-fu/scripts/Makefile.in 2016-07-12 23:20:29.000000000 +0000 +++ gimp-2.8.20/plug-ins/script-fu/scripts/Makefile.in 2017-01-31 23:41:02.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,35 +89,48 @@ build_triplet = @build@ host_triplet = @host@ subdir = plug-ins/script-fu/scripts -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -117,12 +167,33 @@ DATA = $(scriptdata_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -612,7 +683,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/script-fu/scripts/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/script-fu/scripts/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -659,22 +729,25 @@ dir='$(DESTDIR)$(scriptdatadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -689,57 +762,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -755,12 +783,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -772,15 +795,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -789,6 +808,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -952,23 +986,23 @@ uninstall-am: uninstall-scriptdataDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-scriptdataDATA install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-scriptdataDATA +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-scriptdataDATA install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-scriptdataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/plug-ins/script-fu/tinyscheme/Makefile.in gimp-2.8.20/plug-ins/script-fu/tinyscheme/Makefile.in --- gimp-2.8.18/plug-ins/script-fu/tinyscheme/Makefile.in 2016-07-12 23:20:30.000000000 +0000 +++ gimp-2.8.20/plug-ins/script-fu/tinyscheme/Makefile.in 2017-01-31 23:41:03.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +89,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = plug-ins/script-fu/tinyscheme -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - COPYING ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -71,14 +113,24 @@ ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libtinyscheme_a_AR = $(AR) $(ARFLAGS) libtinyscheme_a_LIBADD = am_libtinyscheme_a_OBJECTS = scheme.$(OBJEXT) libtinyscheme_a_OBJECTS = $(am_libtinyscheme_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -88,23 +140,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libtinyscheme_a_SOURCES) DIST_SOURCES = $(libtinyscheme_a_SOURCES) am__can_run_installinfo = \ @@ -112,8 +164,27 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp COPYING \ + README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -493,7 +564,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/script-fu/tinyscheme/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/script-fu/tinyscheme/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -514,6 +584,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libtinyscheme.a: $(libtinyscheme_a_OBJECTS) $(libtinyscheme_a_DEPENDENCIES) $(EXTRA_libtinyscheme_a_DEPENDENCIES) $(AM_V_at)-rm -f libtinyscheme.a $(AM_V_AR)$(libtinyscheme_a_AR) libtinyscheme.a $(libtinyscheme_a_OBJECTS) $(libtinyscheme_a_LIBADD) @@ -532,14 +603,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -554,26 +625,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -585,15 +645,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -602,6 +658,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -743,18 +814,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/plug-ins/selection-to-path/Makefile.in gimp-2.8.20/plug-ins/selection-to-path/Makefile.in --- gimp-2.8.18/plug-ins/selection-to-path/Makefile.in 2016-07-12 23:20:30.000000000 +0000 +++ gimp-2.8.20/plug-ins/selection-to-path/Makefile.in 2017-01-31 23:41:03.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,61 @@ # Version resources for Microsoft Windows VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,19 +90,24 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule libexec_PROGRAMS = selection-to-path$(EXEEXT) subdir = plug-ins/selection-to-path ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -87,6 +129,19 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -99,20 +154,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(selection_to_path_SOURCES) DIST_SOURCES = $(selection_to_path_SOURCES) am__can_run_installinfo = \ @@ -120,8 +171,28 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -534,7 +605,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/selection-to-path/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/selection-to-path/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -543,7 +613,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -562,10 +632,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -586,7 +658,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -599,6 +672,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + selection-to-path$(EXEEXT): $(selection_to_path_OBJECTS) $(selection_to_path_DEPENDENCIES) $(EXTRA_selection_to_path_DEPENDENCIES) @rm -f selection-to-path$(EXEEXT) $(AM_V_CCLD)$(LINK) $(selection_to_path_OBJECTS) $(selection_to_path_LDADD) $(LIBS) @@ -624,14 +698,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -646,26 +720,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -677,15 +740,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -694,6 +753,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -838,19 +912,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile @HAVE_WINDRES_TRUE@%.rc.o: diff -Nru gimp-2.8.18/plug-ins/twain/Makefile.in gimp-2.8.20/plug-ins/twain/Makefile.in --- gimp-2.8.18/plug-ins/twain/Makefile.in 2016-07-12 23:20:31.000000000 +0000 +++ gimp-2.8.20/plug-ins/twain/Makefile.in 2017-01-31 23:41:04.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,23 +18,61 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,18 +92,23 @@ build_triplet = @build@ host_triplet = @host@ libexec_PROGRAMS = twain$(EXEEXT) -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/windows/gimprc-plug-ins.rule subdir = plug-ins/twain ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -89,9 +131,22 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = twain_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(twain_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -104,20 +159,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(twain_SOURCES) DIST_SOURCES = $(am__twain_SOURCES_DIST) am__can_run_installinfo = \ @@ -153,8 +204,28 @@ $(am__cd) "$$dir" && rm -f $$files; }; \ } DATA = $(twaindata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/windows/gimprc-plug-ins.rule \ + $(top_srcdir)/depcomp README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -559,7 +630,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/twain/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/twain/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -568,7 +638,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/windows/gimprc-plug-ins.rule: +$(top_srcdir)/build/windows/gimprc-plug-ins.rule $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -587,10 +657,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -611,7 +683,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -624,6 +697,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + twain$(EXEEXT): $(twain_OBJECTS) $(twain_DEPENDENCIES) $(EXTRA_twain_DEPENDENCIES) @rm -f twain$(EXEEXT) $(AM_V_CCLD)$(twain_LINK) $(twain_OBJECTS) $(twain_LDADD) $(LIBS) @@ -645,14 +719,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -688,26 +762,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(twaindatadir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -719,15 +782,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -736,6 +795,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -880,21 +954,24 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip install-twaindataDATA \ - installcheck installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-twaindataDATA installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS \ + tags tags-am uninstall uninstall-am uninstall-libexecPROGRAMS \ uninstall-twaindataDATA +.PRECIOUS: Makefile + @HAVE_WINDRES_TRUE@%.rc.o: @HAVE_WINDRES_TRUE@ $(WINDRES) --define ORIGINALFILENAME_STR="$*$(EXEEXT)" \ diff -Nru gimp-2.8.18/plug-ins/ui/Makefile.in gimp-2.8.20/plug-ins/ui/Makefile.in --- gimp-2.8.18/plug-ins/ui/Makefile.in 2016-07-12 23:20:31.000000000 +0000 +++ gimp-2.8.20/plug-ins/ui/Makefile.in 2017-01-31 23:41:04.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = plug-ins/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(uidatadir)" DATA = $(uidata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -468,7 +519,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/ui/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/ui/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -513,11 +563,11 @@ @list='$(uidata_DATA)'; test -n "$(uidatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -656,16 +706,18 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uidataDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uidataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uidataDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uidataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/plug-ins/win-snap/Makefile.in gimp-2.8.20/plug-ins/win-snap/Makefile.in --- gimp-2.8.18/plug-ins/win-snap/Makefile.in 2016-07-12 23:20:31.000000000 +0000 +++ gimp-2.8.20/plug-ins/win-snap/Makefile.in 2017-01-31 23:41:04.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,16 +90,22 @@ host_triplet = @host@ libexec_PROGRAMS = win-snap$(EXEEXT) subdir = plug-ins/win-snap -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -80,9 +123,22 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = win_snap_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(win_snap_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -95,20 +151,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(win_snap_SOURCES) DIST_SOURCES = $(win_snap_SOURCES) am__can_run_installinfo = \ @@ -116,8 +168,26 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -510,7 +580,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/win-snap/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plug-ins/win-snap/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -537,10 +606,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -561,7 +632,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -574,6 +646,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + win-snap$(EXEEXT): $(win_snap_OBJECTS) $(win_snap_DEPENDENCIES) $(EXTRA_win_snap_DEPENDENCIES) @rm -f win-snap$(EXEEXT) $(AM_V_CCLD)$(win_snap_LINK) $(win_snap_OBJECTS) $(win_snap_LDADD) $(LIBS) @@ -591,14 +664,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -613,26 +686,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -644,15 +706,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -661,6 +719,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -805,19 +878,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS + +.PRECIOUS: Makefile winsnap-win32res.o: winsnap.rc select.cur small.ico winsnap.ico diff -Nru gimp-2.8.18/po/ca.po gimp-2.8.20/po/ca.po --- gimp-2.8.18/po/ca.po 2015-11-01 01:20:52.000000000 +0000 +++ gimp-2.8.20/po/ca.po 2017-01-31 19:04:08.000000000 +0000 @@ -13,9 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ca\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-05-24 05:28+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-01-30 21:24+0100\n" "PO-Revision-Date: 2015-05-24 09:03+0100\n" "Last-Translator: Albert F. \n" "Language-Team: Catalan \n" @@ -44,7 +43,12 @@ "Copyright © 1995-%s\n" "Spencer Kimball, Peter Mattis i l'equip de desenvolupament del GIMP" -#: ../app/about.h:34 +#. TRANSLATORS: do not end the license URL with a dot, because it would +#. * be in the link. Because of technical limitations, make sure the URL +#. * ends with a space, a newline or is end of text. +#. * Cf. bug 762282. +#. +#: ../app/about.h:39 msgid "" "GIMP 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 " @@ -57,7 +61,7 @@ "details.\n" "\n" "You should have received a copy of the GNU General Public License along with " -"GIMP. If not, see http://www.gnu.org/licenses/." +"GIMP. If not, see: http://www.gnu.org/licenses/" msgstr "" "El GIMP és programari lliure; podeu distribuir-lo i/o modificar-lo sota els " "termes de la llicència GNU General Public License de la manera en què està " @@ -275,7 +279,7 @@ #. initialize the list of gimp brushes #: ../app/actions/actions.c:112 ../app/core/gimp.c:951 -#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2783 msgid "Brushes" msgstr "Pinzells" @@ -322,7 +326,7 @@ #. Document History #: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:329 -#: ../app/dialogs/preferences-dialog.c:1577 +#: ../app/dialogs/preferences-dialog.c:1612 msgid "Document History" msgstr "Fitxers recents" @@ -353,7 +357,7 @@ msgstr "Fitxer" #: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:325 -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2803 msgid "Fonts" msgstr "Tipus de lletra" @@ -364,12 +368,12 @@ #. initialize the list of gimp gradients #: ../app/actions/actions.c:172 ../app/core/gimp.c:971 -#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2799 msgid "Gradients" msgstr "Degradats" #: ../app/actions/actions.c:175 ../app/core/gimp.c:983 -#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2770 +#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2807 msgid "Tool Presets" msgstr "Valors predefinits de l'eina" @@ -404,23 +408,23 @@ #. initialize the list of gimp palettes #: ../app/actions/actions.c:196 ../app/core/gimp.c:966 -#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2758 +#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2795 msgid "Palettes" msgstr "Paletes" #. initialize the list of gimp patterns #: ../app/actions/actions.c:199 ../app/core/gimp.c:961 -#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2791 msgid "Patterns" msgstr "Patrons" -#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2774 +#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2811 msgid "Plug-Ins" msgstr "Connectors" #. Quick Mask Color #: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:386 -#: ../app/dialogs/preferences-dialog.c:2032 +#: ../app/dialogs/preferences-dialog.c:2069 msgid "Quick Mask" msgstr "Màscara ràpida" @@ -447,7 +451,7 @@ msgstr "Editor de text" #: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:298 -#: ../app/dialogs/preferences-dialog.c:1861 ../app/gui/gui.c:441 +#: ../app/dialogs/preferences-dialog.c:1898 ../app/gui/gui.c:464 msgid "Tool Options" msgstr "Opcions de l'eina" @@ -748,8 +752,7 @@ msgid "Intersect this channel with the current selection" msgstr "Calcula la intersecció d'aquest canal amb la selecció actual" -#: ../app/actions/channels-commands.c:85 -#: ../app/actions/channels-commands.c:402 +#: ../app/actions/channels-commands.c:85 ../app/actions/channels-commands.c:402 msgid "Channel Attributes" msgstr "Atributs del canal" @@ -761,8 +764,7 @@ msgid "Edit Channel Color" msgstr "Edita el color del canal" -#: ../app/actions/channels-commands.c:91 -#: ../app/actions/channels-commands.c:123 +#: ../app/actions/channels-commands.c:91 ../app/actions/channels-commands.c:123 msgid "_Fill opacity:" msgstr "Opacitat d'_emplenat:" @@ -1000,8 +1002,7 @@ "\n" "%s" -#: ../app/actions/data-commands.c:118 -#: ../app/actions/tool-options-commands.c:72 +#: ../app/actions/data-commands.c:118 ../app/actions/tool-options-commands.c:72 #: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1529 #: ../app/core/gimppalette-import.c:211 ../app/core/gimppalette-load.c:224 #: ../app/core/gimppalette.c:399 ../app/dialogs/palette-import-dialog.c:771 @@ -1372,7 +1373,7 @@ msgstr "_Quant a" #: ../app/actions/dialogs-actions.c:333 -#: ../app/dialogs/preferences-dialog.c:1951 ../app/widgets/gimptoolbox.c:539 +#: ../app/dialogs/preferences-dialog.c:1988 ../app/widgets/gimptoolbox.c:539 msgid "Toolbox" msgstr "Caixa d'eines" @@ -2463,7 +2464,7 @@ msgid "No changes need to be saved" msgstr "No hi ha cap canvi per desar" -#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:701 +#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:703 #: ../app/dialogs/file-save-dialog.c:103 msgid "Save Image" msgstr "Desa la imatge" @@ -2503,11 +2504,11 @@ "Si torneu la imatge a l'estat desat al disc perdreu tots els canvis, " "incloent-hi tota la informació per desfer." -#: ../app/actions/file-commands.c:731 +#: ../app/actions/file-commands.c:733 msgid "(Unnamed Template)" msgstr "(Plantilla sense nom)" -#: ../app/actions/file-commands.c:782 +#: ../app/actions/file-commands.c:784 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -3258,15 +3259,13 @@ msgid "Set Image Print Resolution" msgstr "Defineix la resolució d'impressió de la imatge" -#: ../app/actions/image-commands.c:379 -#: ../app/pdb/drawable-transform-cmds.c:159 +#: ../app/actions/image-commands.c:379 ../app/pdb/drawable-transform-cmds.c:159 #: ../app/pdb/drawable-transform-cmds.c:247 #: ../app/pdb/item-transform-cmds.c:162 msgid "Flipping" msgstr "S'està capgirant" -#: ../app/actions/image-commands.c:403 -#: ../app/pdb/drawable-transform-cmds.c:602 +#: ../app/actions/image-commands.c:403 ../app/pdb/drawable-transform-cmds.c:602 #: ../app/pdb/drawable-transform-cmds.c:694 ../app/pdb/image-cmds.c:534 #: ../app/pdb/item-transform-cmds.c:433 ../app/pdb/transform-tools-cmds.c:245 #: ../app/tools/gimprotatetool.c:125 @@ -3287,7 +3286,7 @@ #. Scaling #: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 -#: ../app/dialogs/preferences-dialog.c:1906 +#: ../app/dialogs/preferences-dialog.c:1943 #: ../app/pdb/drawable-transform-cmds.c:783 #: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 #: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524 @@ -4654,14 +4653,13 @@ #: ../app/actions/text-editor-commands.c:143 #: ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58 #: ../app/core/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:443 -#: ../app/core/gimpbrushgenerated-load.c:73 -#: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54 -#: ../app/core/gimpgradient-load.c:63 ../app/core/gimppalette-load.c:77 -#: ../app/core/gimppalette-load.c:274 ../app/core/gimppalette-load.c:320 -#: ../app/core/gimppalette-load.c:377 ../app/core/gimppalette-load.c:467 -#: ../app/core/gimppalette-load.c:634 ../app/core/gimppattern-load.c:76 -#: ../app/tools/gimpcurvestool.c:642 ../app/tools/gimplevelstool.c:747 -#: ../app/xcf/xcf.c:359 +#: ../app/core/gimpbrushgenerated-load.c:73 ../app/core/gimpbrushpipe-load.c:81 +#: ../app/core/gimpcurve-load.c:54 ../app/core/gimpgradient-load.c:63 +#: ../app/core/gimppalette-load.c:77 ../app/core/gimppalette-load.c:274 +#: ../app/core/gimppalette-load.c:320 ../app/core/gimppalette-load.c:377 +#: ../app/core/gimppalette-load.c:467 ../app/core/gimppalette-load.c:634 +#: ../app/core/gimppattern-load.c:76 ../app/tools/gimpcurvestool.c:658 +#: ../app/tools/gimplevelstool.c:747 ../app/xcf/xcf.c:359 #, c-format msgid "Could not open '%s' for reading: %s" msgstr "No s'ha pogut obrir «%s» per a lectura: %s" @@ -6024,7 +6022,7 @@ #: ../app/config/gimpconfig-file.c:67 ../app/core/gimpbrushgenerated-save.c:62 #: ../app/core/gimpcurve-save.c:52 ../app/core/gimpgradient-save.c:50 #: ../app/core/gimpgradient-save.c:144 ../app/core/gimppalette-save.c:56 -#: ../app/gui/themes.c:248 ../app/tools/gimpcurvestool.c:695 +#: ../app/gui/themes.c:248 ../app/tools/gimpcurvestool.c:711 #: ../app/tools/gimplevelstool.c:800 ../app/vectors/gimpvectors-export.c:81 #: ../app/xcf/xcf.c:452 #, c-format @@ -7510,7 +7508,7 @@ msgstr "Paràsits" #. initialize the list of gimp dynamics -#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2750 +#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2787 #: ../app/tools/gimppaintoptions-gui.c:201 msgid "Dynamics" msgstr "Dinàmica" @@ -7521,7 +7519,7 @@ msgstr "Tipus de lletra (pot tardar una mica)" #. initialize the module list -#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2782 +#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2819 msgid "Modules" msgstr "Mòduls" @@ -7881,8 +7879,8 @@ msgid "Could not delete '%s': %s" msgstr "No s'ha pogut esborrar «%s»: %s" -#: ../app/core/gimpdatafactory.c:428 ../app/core/gimpdatafactory.c:457 -#: ../app/core/gimpdatafactory.c:623 ../app/core/gimpdatafactory.c:645 +#: ../app/core/gimpdatafactory.c:445 ../app/core/gimpdatafactory.c:470 +#: ../app/core/gimpdatafactory.c:637 ../app/core/gimpdatafactory.c:659 #, c-format msgid "" "Failed to save data:\n" @@ -7893,17 +7891,17 @@ "\n" "%s" -#: ../app/core/gimpdatafactory.c:537 ../app/core/gimpdatafactory.c:540 +#: ../app/core/gimpdatafactory.c:551 ../app/core/gimpdatafactory.c:554 #: ../app/core/gimpitem.c:495 ../app/core/gimpitem.c:498 msgid "copy" msgstr "còpia" -#: ../app/core/gimpdatafactory.c:549 ../app/core/gimpitem.c:507 +#: ../app/core/gimpdatafactory.c:563 ../app/core/gimpitem.c:507 #, c-format msgid "%s copy" msgstr "còpia de %s" -#: ../app/core/gimpdatafactory.c:742 +#: ../app/core/gimpdatafactory.c:756 #, c-format msgid "" "You have a writable data folder configured (%s), but this folder does not " @@ -7914,7 +7912,7 @@ "aquesta carpeta no existeix. Creeu la carpeta o arregleu-ne la configuració " "a la secció «Carpetes» del diàleg de preferències." -#: ../app/core/gimpdatafactory.c:763 +#: ../app/core/gimpdatafactory.c:777 #, c-format msgid "" "You have a writable data folder configured, but this folder is not part of " @@ -7926,12 +7924,12 @@ "editat el fitxer gimprc manualment, arregleu-ho a la secció «Carpetes» del " "diàleg de preferències." -#: ../app/core/gimpdatafactory.c:773 +#: ../app/core/gimpdatafactory.c:787 #, c-format msgid "You don't have any writable data folder configured." msgstr "No teniu configurada cap carpeta de dades on s'hi pugui escriure." -#: ../app/core/gimpdatafactory.c:941 +#: ../app/core/gimpdatafactory.c:955 #, c-format msgid "" "Failed to load data:\n" @@ -8287,17 +8285,17 @@ msgid "Translate Items" msgstr "Tradueix els elements" -#: ../app/core/gimpimage-item-list.c:78 +#: ../app/core/gimpimage-item-list.c:79 msgctxt "undo-type" msgid "Flip Items" msgstr "Capgira els elements" -#: ../app/core/gimpimage-item-list.c:105 +#: ../app/core/gimpimage-item-list.c:108 ../app/core/gimpitem-linked.c:125 msgctxt "undo-type" msgid "Rotate Items" msgstr "Gira els elements" -#: ../app/core/gimpimage-item-list.c:135 +#: ../app/core/gimpimage-item-list.c:140 msgctxt "undo-type" msgid "Transform Items" msgstr "Transforma els elements" @@ -8454,7 +8452,7 @@ msgid "Remove Path" msgstr "Suprimeix el camí" -#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1715 +#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1750 msgid "Folder" msgstr "Carpeta" @@ -8611,7 +8609,7 @@ msgid "Layer cannot be lowered more." msgstr "La capa no es pot abaixar més." -#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1529 +#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1532 #: ../app/core/gimplayermask.c:236 #, c-format msgid "%s mask" @@ -8626,47 +8624,47 @@ "Selecció flotant\n" "(%s)" -#: ../app/core/gimplayer.c:1449 +#: ../app/core/gimplayer.c:1452 msgid "Unable to add a layer mask since the layer already has one." msgstr "No es pot afegir una màscara de capa perquè la capa ja en té una." -#: ../app/core/gimplayer.c:1460 +#: ../app/core/gimplayer.c:1463 msgid "Cannot add layer mask of different dimensions than specified layer." msgstr "" "No es pot afegir una màscara de capa de mida diferent de la capa " "especificada." -#: ../app/core/gimplayer.c:1466 +#: ../app/core/gimplayer.c:1469 msgctxt "undo-type" msgid "Add Layer Mask" msgstr "Afegeix una màscara de capa" -#: ../app/core/gimplayer.c:1584 +#: ../app/core/gimplayer.c:1587 msgctxt "undo-type" msgid "Transfer Alpha to Mask" msgstr "Transfereix l'alfa a la màscara" -#: ../app/core/gimplayer.c:1754 +#: ../app/core/gimplayer.c:1757 msgctxt "undo-type" msgid "Apply Layer Mask" msgstr "Aplica la màscara de la capa" -#: ../app/core/gimplayer.c:1755 +#: ../app/core/gimplayer.c:1758 msgctxt "undo-type" msgid "Delete Layer Mask" msgstr "Suprimeix la màscara de la capa" -#: ../app/core/gimplayer.c:1874 +#: ../app/core/gimplayer.c:1877 msgctxt "undo-type" msgid "Add Alpha Channel" msgstr "Afegeix el canal alfa" -#: ../app/core/gimplayer.c:1928 +#: ../app/core/gimplayer.c:1931 msgctxt "undo-type" msgid "Remove Alpha Channel" msgstr "Suprimeix el canal alfa" -#: ../app/core/gimplayer.c:1948 +#: ../app/core/gimplayer.c:1951 msgctxt "undo-type" msgid "Layer to Image Size" msgstr "Mida de la imatge igual a la de la capa" @@ -9057,7 +9055,7 @@ "Are you sure you want to remove '%s' from the list and delete it on disk?" msgstr "Esteu segur que voleu suprimir «%s» de la llista i del disc?" -#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:162 +#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:174 #: ../app/gui/gui-message.c:149 msgid "GIMP Message" msgstr "Missatge del GIMP" @@ -9160,7 +9158,7 @@ msgid "_Export" msgstr "_Exporta" -#: ../app/dialogs/file-save-dialog.c:458 +#: ../app/dialogs/file-save-dialog.c:454 msgid "" "Saving remote files needs to determine the file format from the file " "extension. Please enter a file extension that matches the selected file " @@ -9170,11 +9168,11 @@ "l'extensió. Introduïu una extensió de fitxer que concordi amb el format de " "fitxer seleccionat o no n'introduïu cap." -#: ../app/dialogs/file-save-dialog.c:605 +#: ../app/dialogs/file-save-dialog.c:601 msgid "The given filename cannot be used for exporting" msgstr "No es pot utilitzar el nom de fitxer donat per exportar el fitxer" -#: ../app/dialogs/file-save-dialog.c:606 +#: ../app/dialogs/file-save-dialog.c:602 msgid "" "You can use this dialog to export to various file formats. If you want to " "save the image to the GIMP XCF format, use File→Save instead." @@ -9182,15 +9180,15 @@ "Podeu utilitzar aquest diàleg per exportar la imatge en diversos formats. Si " "voleu desar-la amb el format XCF del GIMP utilitzeu Fitxer→Desa." -#: ../app/dialogs/file-save-dialog.c:609 +#: ../app/dialogs/file-save-dialog.c:605 msgid "Take me to the Save dialog" msgstr "Porta'm al diàleg de desar" -#: ../app/dialogs/file-save-dialog.c:613 +#: ../app/dialogs/file-save-dialog.c:609 msgid "The given filename cannot be used for saving" msgstr "No es pot utilitzar el nom de fitxer donat per desar el fitxer" -#: ../app/dialogs/file-save-dialog.c:614 +#: ../app/dialogs/file-save-dialog.c:610 msgid "" "You can use this dialog to save to the GIMP XCF format. Use File→Export to " "export to other file formats." @@ -9198,15 +9196,15 @@ "Podeu utilitzar aquest diàleg per desar la imatge amb el format XCF del " "GIMP. Si voleu desar-la en un altre format utilitzeu Fitxer→Exporta." -#: ../app/dialogs/file-save-dialog.c:616 +#: ../app/dialogs/file-save-dialog.c:612 msgid "Take me to the Export dialog" msgstr "Porta'm al diàleg d'exportar" -#: ../app/dialogs/file-save-dialog.c:619 ../app/dialogs/file-save-dialog.c:694 +#: ../app/dialogs/file-save-dialog.c:615 ../app/dialogs/file-save-dialog.c:690 msgid "Extension Mismatch" msgstr "Extensió incorrecta" -#: ../app/dialogs/file-save-dialog.c:678 +#: ../app/dialogs/file-save-dialog.c:674 msgid "" "The given filename does not have any known file extension. Please enter a " "known file extension or select a file format from the file format list." @@ -9214,19 +9212,19 @@ "El nom de fitxer no té cap extensió reconeguda. Introduïu una extensió de " "fitxer coneguda o seleccioneu un format de fitxer de la llista de formats." -#: ../app/dialogs/file-save-dialog.c:710 +#: ../app/dialogs/file-save-dialog.c:706 msgid "The given file extension does not match the chosen file type." msgstr "L'extensió de fitxer no concorda amb el tipus de fitxer triat." -#: ../app/dialogs/file-save-dialog.c:714 +#: ../app/dialogs/file-save-dialog.c:710 msgid "Do you want to save the image using this name anyway?" msgstr "Voleu desar la imatge amb aquest nom igualment?" -#: ../app/dialogs/file-save-dialog.c:776 +#: ../app/dialogs/file-save-dialog.c:772 msgid "Saving canceled" msgstr "L'acció desar s'ha cancel·lat" -#: ../app/dialogs/file-save-dialog.c:784 ../app/widgets/gimpdnd-xds.c:186 +#: ../app/dialogs/file-save-dialog.c:780 ../app/widgets/gimpdnd-xds.c:186 #, c-format msgid "" "Saving '%s' failed:\n" @@ -9290,7 +9288,7 @@ msgstr "Crea una imatge nova" #: ../app/dialogs/image-new-dialog.c:135 -#: ../app/dialogs/preferences-dialog.c:2016 +#: ../app/dialogs/preferences-dialog.c:2053 msgid "_Template:" msgstr "Plan_tilla:" @@ -9522,7 +9520,7 @@ msgstr "Selecciona l'origen" #: ../app/dialogs/palette-import-dialog.c:214 -#: ../app/dialogs/preferences-dialog.c:1930 +#: ../app/dialogs/preferences-dialog.c:1967 msgid "_Gradient" msgstr "De_gradat" @@ -9584,21 +9582,21 @@ msgid "The selected source contains no colors." msgstr "L'origen seleccionat no té colors." -#: ../app/dialogs/preferences-dialog.c:268 +#: ../app/dialogs/preferences-dialog.c:266 msgid "Reset All Preferences" msgstr "Esborra totes les preferències" -#: ../app/dialogs/preferences-dialog.c:286 +#: ../app/dialogs/preferences-dialog.c:284 msgid "Do you really want to reset all preferences to default values?" msgstr "" "Voleu tornar a inicialitzar totes les preferències amb els seus valors per " "defecte?" -#: ../app/dialogs/preferences-dialog.c:356 +#: ../app/dialogs/preferences-dialog.c:362 msgid "You will have to restart GIMP for the following changes to take effect:" msgstr "Cal que reinicieu el GIMP perquè els següents canvis tinguin efecte:" -#: ../app/dialogs/preferences-dialog.c:538 +#: ../app/dialogs/preferences-dialog.c:544 msgid "" "Your keyboard shortcuts will be reset to default values the next time you " "start GIMP." @@ -9606,15 +9604,15 @@ "Les dreceres de teclat per defecte es recuperaran la propera vegada que " "engegueu el GIMP." -#: ../app/dialogs/preferences-dialog.c:549 +#: ../app/dialogs/preferences-dialog.c:555 msgid "Remove all Keyboard Shortcuts" msgstr "Suprimeix totes les dreceres de teclat" -#: ../app/dialogs/preferences-dialog.c:571 +#: ../app/dialogs/preferences-dialog.c:577 msgid "Do you really want to remove all keyboard shortcuts from all menus?" msgstr "Voleu eliminar totes les dreceres del teclat de tots els menús?" -#: ../app/dialogs/preferences-dialog.c:612 +#: ../app/dialogs/preferences-dialog.c:618 msgid "" "Your window setup will be reset to default values the next time you start " "GIMP." @@ -9622,7 +9620,7 @@ "La configuració de la finestra recuperarà els valors per defecte la propera " "vegada que inicieu el GIMP." -#: ../app/dialogs/preferences-dialog.c:647 +#: ../app/dialogs/preferences-dialog.c:653 msgid "" "Your input device settings will be reset to default values the next time you " "start GIMP." @@ -9630,7 +9628,7 @@ "Els paràmetres del dispositiu d'entrada recuperaran els valors per defecte " "la propera vegada que inicieu el GIMP." -#: ../app/dialogs/preferences-dialog.c:682 +#: ../app/dialogs/preferences-dialog.c:688 msgid "" "Your tool options will be reset to default values the next time you start " "GIMP." @@ -9638,762 +9636,770 @@ "Les opcions de l'eina recuperaran els valors per defecte la propera vegada " "que inicieu el GIMP." -#: ../app/dialogs/preferences-dialog.c:1268 +#: ../app/dialogs/preferences-dialog.c:1303 msgid "Show _menubar" msgstr "Mostra la barra de _menú" -#: ../app/dialogs/preferences-dialog.c:1272 +#: ../app/dialogs/preferences-dialog.c:1307 msgid "Show _rulers" msgstr "Mostra els _regles" -#: ../app/dialogs/preferences-dialog.c:1275 +#: ../app/dialogs/preferences-dialog.c:1310 msgid "Show scroll_bars" msgstr "Mostra les _barres de desplaçament" -#: ../app/dialogs/preferences-dialog.c:1278 +#: ../app/dialogs/preferences-dialog.c:1313 msgid "Show s_tatusbar" msgstr "Mostra la barra d'es_tat" -#: ../app/dialogs/preferences-dialog.c:1286 +#: ../app/dialogs/preferences-dialog.c:1321 msgid "Show s_election" msgstr "Mostra la s_elecció" -#: ../app/dialogs/preferences-dialog.c:1289 +#: ../app/dialogs/preferences-dialog.c:1324 msgid "Show _layer boundary" msgstr "Mostra e_l marc de la capa" -#: ../app/dialogs/preferences-dialog.c:1292 +#: ../app/dialogs/preferences-dialog.c:1327 msgid "Show _guides" msgstr "Mostra les _guies" -#: ../app/dialogs/preferences-dialog.c:1295 +#: ../app/dialogs/preferences-dialog.c:1330 msgid "Show gri_d" msgstr "Mostra la grae_lla" -#: ../app/dialogs/preferences-dialog.c:1301 +#: ../app/dialogs/preferences-dialog.c:1336 msgid "Canvas _padding mode:" msgstr "Tipus d'em_plenament del llenç:" -#: ../app/dialogs/preferences-dialog.c:1306 +#: ../app/dialogs/preferences-dialog.c:1341 msgid "Custom p_adding color:" msgstr "Color de f_arciment personalitzat:" -#: ../app/dialogs/preferences-dialog.c:1307 +#: ../app/dialogs/preferences-dialog.c:1342 msgid "Select Custom Canvas Padding Color" msgstr "Defineix un color d'emplenament personalitzat per al llenç" -#: ../app/dialogs/preferences-dialog.c:1405 +#: ../app/dialogs/preferences-dialog.c:1440 msgid "Preferences" msgstr "Preferències" -#: ../app/dialogs/preferences-dialog.c:1518 -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:1553 +#: ../app/dialogs/preferences-dialog.c:2827 msgid "Environment" msgstr "Entorn" -#: ../app/dialogs/preferences-dialog.c:1532 +#: ../app/dialogs/preferences-dialog.c:1567 msgid "Resource Consumption" msgstr "Consum dels recursos" -#: ../app/dialogs/preferences-dialog.c:1542 +#: ../app/dialogs/preferences-dialog.c:1577 msgid "Minimal number of _undo levels:" msgstr "N_ombre mínim de nivells a desfer:" -#: ../app/dialogs/preferences-dialog.c:1545 +#: ../app/dialogs/preferences-dialog.c:1580 msgid "Maximum undo _memory:" msgstr "_Memòria màxima per desfer:" -#: ../app/dialogs/preferences-dialog.c:1548 +#: ../app/dialogs/preferences-dialog.c:1583 msgid "Tile cache _size:" msgstr "_Mida de la memòria cau:" -#: ../app/dialogs/preferences-dialog.c:1551 +#: ../app/dialogs/preferences-dialog.c:1586 msgid "Maximum _new image size:" msgstr "Mida màxima de les imatges _noves:" -#: ../app/dialogs/preferences-dialog.c:1556 +#: ../app/dialogs/preferences-dialog.c:1591 msgid "Number of _processors to use:" msgstr "Nombre de _processadors a utilitzar:" #. Image Thumbnails -#: ../app/dialogs/preferences-dialog.c:1561 +#: ../app/dialogs/preferences-dialog.c:1596 msgid "Image Thumbnails" msgstr "Miniatures de la imatge" -#: ../app/dialogs/preferences-dialog.c:1566 +#: ../app/dialogs/preferences-dialog.c:1601 msgid "Size of _thumbnails:" msgstr "Mida de les minia_tures:" -#: ../app/dialogs/preferences-dialog.c:1570 +#: ../app/dialogs/preferences-dialog.c:1605 msgid "Maximum _filesize for thumbnailing:" msgstr "Mida màxima del _fitxer de miniatures:" -#: ../app/dialogs/preferences-dialog.c:1580 +#: ../app/dialogs/preferences-dialog.c:1615 msgid "Keep record of used files in the Recent Documents list" msgstr "" "Mantén un registre permanent dels fitxers utilitzats a la llista de fitxers " "recents" -#: ../app/dialogs/preferences-dialog.c:1589 +#: ../app/dialogs/preferences-dialog.c:1624 msgid "User Interface" msgstr "Interfície d'usuari" -#: ../app/dialogs/preferences-dialog.c:1592 +#: ../app/dialogs/preferences-dialog.c:1627 msgid "Interface" msgstr "Interfície" -#: ../app/dialogs/preferences-dialog.c:1602 +#: ../app/dialogs/preferences-dialog.c:1637 msgid "Language" msgstr "Idioma" #. Previews -#: ../app/dialogs/preferences-dialog.c:1608 +#: ../app/dialogs/preferences-dialog.c:1643 msgid "Previews" msgstr "Previsualitzacions" -#: ../app/dialogs/preferences-dialog.c:1611 +#: ../app/dialogs/preferences-dialog.c:1646 msgid "_Enable layer & channel previews" msgstr "Activa pr_evisualitzacions de capes i canals" -#: ../app/dialogs/preferences-dialog.c:1617 +#: ../app/dialogs/preferences-dialog.c:1652 msgid "_Default layer & channel preview size:" msgstr "Mi_da de les previsualitzacions de les capes i els canals:" # Quim: no hi cap "previsualització" -#: ../app/dialogs/preferences-dialog.c:1620 +#: ../app/dialogs/preferences-dialog.c:1655 msgid "Na_vigation preview size:" msgstr "Mida de la previsualització a la finestra de na_vegació:" #. Keyboard Shortcuts -#: ../app/dialogs/preferences-dialog.c:1624 +#: ../app/dialogs/preferences-dialog.c:1659 msgid "Keyboard Shortcuts" msgstr "Dreceres de teclat" -#: ../app/dialogs/preferences-dialog.c:1628 +#: ../app/dialogs/preferences-dialog.c:1663 msgid "_Use dynamic keyboard shortcuts" msgstr "_Utilitza les dreceres de teclat dinàmiques" -#: ../app/dialogs/preferences-dialog.c:1632 +#: ../app/dialogs/preferences-dialog.c:1667 msgid "Configure _Keyboard Shortcuts..." msgstr "Configura les dreceres de _teclat..." -#: ../app/dialogs/preferences-dialog.c:1639 +#: ../app/dialogs/preferences-dialog.c:1674 msgid "_Save keyboard shortcuts on exit" msgstr "De_sa les dreceres de teclat en sortir" -#: ../app/dialogs/preferences-dialog.c:1643 +#: ../app/dialogs/preferences-dialog.c:1678 msgid "Save Keyboard Shortcuts _Now" msgstr "Desa _ara les dreceres de teclat" -#: ../app/dialogs/preferences-dialog.c:1650 +#: ../app/dialogs/preferences-dialog.c:1685 msgid "_Reset Keyboard Shortcuts to Default Values" msgstr "_Recupera les dreceres de teclat per defecte" -#: ../app/dialogs/preferences-dialog.c:1659 +#: ../app/dialogs/preferences-dialog.c:1694 msgid "Remove _All Keyboard Shortcuts" msgstr "Suprimeix _totes les dreceres de teclat" -#: ../app/dialogs/preferences-dialog.c:1671 -#: ../app/dialogs/preferences-dialog.c:1710 +#: ../app/dialogs/preferences-dialog.c:1706 +#: ../app/dialogs/preferences-dialog.c:1745 msgid "Theme" msgstr "Tema" -#: ../app/dialogs/preferences-dialog.c:1680 +#: ../app/dialogs/preferences-dialog.c:1715 msgid "Select Theme" msgstr "Seleccioneu un tema" -#: ../app/dialogs/preferences-dialog.c:1762 +#: ../app/dialogs/preferences-dialog.c:1797 msgid "Reload C_urrent Theme" msgstr "Torna a carregar el tema act_ual" -#: ../app/dialogs/preferences-dialog.c:1774 +#: ../app/dialogs/preferences-dialog.c:1809 msgid "Help System" msgstr "Sistema d'ajuda" #. General -#: ../app/dialogs/preferences-dialog.c:1786 -#: ../app/dialogs/preferences-dialog.c:1873 -#: ../app/dialogs/preferences-dialog.c:2086 +#: ../app/dialogs/preferences-dialog.c:1821 +#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:2123 #: ../app/widgets/gimpcontrollereditor.c:185 msgid "General" msgstr "General" -#: ../app/dialogs/preferences-dialog.c:1789 +#: ../app/dialogs/preferences-dialog.c:1824 msgid "Show _tooltips" msgstr "Ajudes con_textuals" -#: ../app/dialogs/preferences-dialog.c:1792 +#: ../app/dialogs/preferences-dialog.c:1827 msgid "Show help _buttons" msgstr "Mostra els _botons d'ajuda" -#: ../app/dialogs/preferences-dialog.c:1805 +#: ../app/dialogs/preferences-dialog.c:1832 msgid "Use the online version" msgstr "Utilitza la versió en línia" -#: ../app/dialogs/preferences-dialog.c:1806 +#: ../app/dialogs/preferences-dialog.c:1833 msgid "Use a locally installed copy" msgstr "Utilitza una còpia instal·lada en local" -#: ../app/dialogs/preferences-dialog.c:1807 +#: ../app/dialogs/preferences-dialog.c:1834 msgid "User manual:" msgstr "Manual d'usuari:" -#: ../app/dialogs/preferences-dialog.c:1814 +#: ../app/dialogs/preferences-dialog.c:1841 msgid "There's a local installation of the user manual." msgstr "Hi ha una instal·lació en local del manual d'usuari." -#: ../app/dialogs/preferences-dialog.c:1819 +#: ../app/dialogs/preferences-dialog.c:1847 msgid "The user manual is not installed locally." msgstr "El manual d'usuari no està instal·lat en local." -#: ../app/dialogs/preferences-dialog.c:1844 +#. If there is no webkit available, assume we are on a platform +#. * that doesn't use the help browser, so don't bother showing +#. * the combo. +#. +#: ../app/dialogs/preferences-dialog.c:1860 msgid "Help Browser" msgstr "Navegador de l'ajuda" -#: ../app/dialogs/preferences-dialog.c:1848 +#: ../app/dialogs/preferences-dialog.c:1867 msgid "H_elp browser to use:" msgstr "Nav_egador de l'ajuda que es vol utilitzar:" -#: ../app/dialogs/preferences-dialog.c:1876 +#: ../app/dialogs/preferences-dialog.c:1873 +msgid "" +"The GIMP help browser doesn't seem to be installed. Using the web browser " +"instead." +msgstr "" + +#: ../app/dialogs/preferences-dialog.c:1913 msgid "_Save tool options on exit" msgstr "De_sa les opcions de l'eina en sortir" -#: ../app/dialogs/preferences-dialog.c:1880 +#: ../app/dialogs/preferences-dialog.c:1917 msgid "Save Tool Options _Now" msgstr "Desa les opcio_ns d'eina" -#: ../app/dialogs/preferences-dialog.c:1887 +#: ../app/dialogs/preferences-dialog.c:1924 msgid "_Reset Saved Tool Options to Default Values" msgstr "_Recupera els valors per defecte de l'eina" # Snapping Distance #. Snapping Distance -#: ../app/dialogs/preferences-dialog.c:1897 +#: ../app/dialogs/preferences-dialog.c:1934 msgid "Guide & Grid Snapping" msgstr "Ajust a les guies i a la graella" -#: ../app/dialogs/preferences-dialog.c:1902 +#: ../app/dialogs/preferences-dialog.c:1939 msgid "_Snap distance:" msgstr "Di_stància d'ajust:" -#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:1947 msgid "Default _interpolation:" msgstr "_Interpolació per defecte:" #. Global Brush, Pattern, ... -#: ../app/dialogs/preferences-dialog.c:1917 +#: ../app/dialogs/preferences-dialog.c:1954 msgid "Paint Options Shared Between Tools" msgstr "Opcions de pintura compartides entre les eines" -#: ../app/dialogs/preferences-dialog.c:1921 +#: ../app/dialogs/preferences-dialog.c:1958 msgid "_Brush" msgstr "_Pinzell" -#: ../app/dialogs/preferences-dialog.c:1924 +#: ../app/dialogs/preferences-dialog.c:1961 msgid "_Dynamics" msgstr "_Dinàmica" -#: ../app/dialogs/preferences-dialog.c:1927 +#: ../app/dialogs/preferences-dialog.c:1964 msgid "_Pattern" msgstr "_Patró" #. Move Tool -#: ../app/dialogs/preferences-dialog.c:1934 +#: ../app/dialogs/preferences-dialog.c:1971 msgid "Move Tool" msgstr "Moviment" -#: ../app/dialogs/preferences-dialog.c:1938 +#: ../app/dialogs/preferences-dialog.c:1975 msgid "Set layer or path as active" msgstr "Activa la capa o el camí" #. Appearance -#: ../app/dialogs/preferences-dialog.c:1963 -#: ../app/dialogs/preferences-dialog.c:2162 -#: ../app/widgets/gimpgrideditor.c:134 +#: ../app/dialogs/preferences-dialog.c:2000 +#: ../app/dialogs/preferences-dialog.c:2199 ../app/widgets/gimpgrideditor.c:134 msgid "Appearance" msgstr "Aparença" -#: ../app/dialogs/preferences-dialog.c:1967 +#: ../app/dialogs/preferences-dialog.c:2004 msgid "Show _foreground & background color" msgstr "Mostra el color de primer pla i de _fons" -#: ../app/dialogs/preferences-dialog.c:1971 +#: ../app/dialogs/preferences-dialog.c:2008 msgid "Show active _brush, pattern & gradient" msgstr "Mostra el _pinzell, patró i degradat actiu" -#: ../app/dialogs/preferences-dialog.c:1975 +#: ../app/dialogs/preferences-dialog.c:2012 msgid "Show active _image" msgstr "Mostra la _imatge activa" #. Tool Editor -#: ../app/dialogs/preferences-dialog.c:1983 +#: ../app/dialogs/preferences-dialog.c:2020 msgid "Tools configuration" msgstr "Configuració de les eines" -#: ../app/dialogs/preferences-dialog.c:1998 +#: ../app/dialogs/preferences-dialog.c:2035 msgid "Default New Image" msgstr "Nova imatge predeterminada" -#: ../app/dialogs/preferences-dialog.c:2001 +#: ../app/dialogs/preferences-dialog.c:2038 msgid "Default Image" msgstr "Imatge predeterminada" -#: ../app/dialogs/preferences-dialog.c:2035 +#: ../app/dialogs/preferences-dialog.c:2072 msgid "Set the default Quick Mask color" msgstr "Estableix el color de la màscara ràpida" -#: ../app/dialogs/preferences-dialog.c:2041 +#: ../app/dialogs/preferences-dialog.c:2078 msgid "Quick Mask color:" msgstr "Color de la màscara ràpida:" -#: ../app/dialogs/preferences-dialog.c:2051 +#: ../app/dialogs/preferences-dialog.c:2088 msgid "Default Image Grid" msgstr "Graella d'imatge predeterminada" -#: ../app/dialogs/preferences-dialog.c:2054 +#: ../app/dialogs/preferences-dialog.c:2091 msgid "Default Grid" msgstr "Graella predeterminada" -#: ../app/dialogs/preferences-dialog.c:2074 +#: ../app/dialogs/preferences-dialog.c:2111 msgid "Image Windows" msgstr "Finestres d'imatge" -#: ../app/dialogs/preferences-dialog.c:2089 +#: ../app/dialogs/preferences-dialog.c:2126 msgid "Use \"_Dot for dot\" by default" msgstr "Utilitza «punt a punt» per _defecte" -#: ../app/dialogs/preferences-dialog.c:2095 +#: ../app/dialogs/preferences-dialog.c:2132 msgid "Marching _ants speed:" msgstr "Velocit_at del contorn de la selecció:" #. Zoom & Resize Behavior -#: ../app/dialogs/preferences-dialog.c:2099 +#: ../app/dialogs/preferences-dialog.c:2136 msgid "Zoom & Resize Behavior" msgstr "Opcions d'ampliació i canvi de mida" -#: ../app/dialogs/preferences-dialog.c:2103 +#: ../app/dialogs/preferences-dialog.c:2140 msgid "Resize window on _zoom" msgstr "Canvia la mida de la finestra quan s'_ampliï la imatge" -#: ../app/dialogs/preferences-dialog.c:2106 +#: ../app/dialogs/preferences-dialog.c:2143 msgid "Resize window on image _size change" msgstr "Canvia la mida de la fine_stra quan es canviï la de la imatge" -#: ../app/dialogs/preferences-dialog.c:2112 +#: ../app/dialogs/preferences-dialog.c:2149 msgid "Fit to window" msgstr "Ajusta a la finestra" -#: ../app/dialogs/preferences-dialog.c:2114 +#: ../app/dialogs/preferences-dialog.c:2151 msgid "Initial zoom _ratio:" msgstr "_Factor d'ampliació inicial:" #. Space Bar -#: ../app/dialogs/preferences-dialog.c:2118 +#: ../app/dialogs/preferences-dialog.c:2155 msgid "Space Bar" msgstr "Barra d'espai" -#: ../app/dialogs/preferences-dialog.c:2124 +#: ../app/dialogs/preferences-dialog.c:2161 msgid "_While space bar is pressed:" msgstr "En _prémer la barra d'espai:" #. Mouse Pointers -#: ../app/dialogs/preferences-dialog.c:2128 +#: ../app/dialogs/preferences-dialog.c:2165 msgid "Mouse Pointers" msgstr "Punters de ratolí" -#: ../app/dialogs/preferences-dialog.c:2132 +#: ../app/dialogs/preferences-dialog.c:2169 msgid "Show _brush outline" msgstr "Mostra el contorn del pin_zell" -#: ../app/dialogs/preferences-dialog.c:2135 +#: ../app/dialogs/preferences-dialog.c:2172 msgid "Show pointer for paint _tools" msgstr "Mos_tra el punter per a les eines de pintar" -#: ../app/dialogs/preferences-dialog.c:2141 +#: ../app/dialogs/preferences-dialog.c:2178 msgid "Pointer _mode:" msgstr "_Mode del punter:" -#: ../app/dialogs/preferences-dialog.c:2144 +#: ../app/dialogs/preferences-dialog.c:2181 msgid "Pointer re_ndering:" msgstr "Re_nderització del punter:" -#: ../app/dialogs/preferences-dialog.c:2147 +#: ../app/dialogs/preferences-dialog.c:2184 msgid "Pointer _handedness:" msgstr "_Estil del punter:" -#: ../app/dialogs/preferences-dialog.c:2159 +#: ../app/dialogs/preferences-dialog.c:2196 msgid "Image Window Appearance" msgstr "Aparença de la finestra d'imatge" -#: ../app/dialogs/preferences-dialog.c:2170 +#: ../app/dialogs/preferences-dialog.c:2207 msgid "Default Appearance in Normal Mode" msgstr "Aparença predeterminada en mode normal" -#: ../app/dialogs/preferences-dialog.c:2175 +#: ../app/dialogs/preferences-dialog.c:2212 msgid "Default Appearance in Fullscreen Mode" msgstr "Aparença predeterminada en mode a pantalla completa" -#: ../app/dialogs/preferences-dialog.c:2184 +#: ../app/dialogs/preferences-dialog.c:2221 msgid "Image Title & Statusbar Format" msgstr "Format del títol d'imatge i de la barra d'estat" -#: ../app/dialogs/preferences-dialog.c:2187 +#: ../app/dialogs/preferences-dialog.c:2224 msgid "Title & Status" msgstr "Títol i estat" -#: ../app/dialogs/preferences-dialog.c:2205 +#: ../app/dialogs/preferences-dialog.c:2242 msgid "Current format" msgstr "Format actual" -#: ../app/dialogs/preferences-dialog.c:2206 +#: ../app/dialogs/preferences-dialog.c:2243 msgid "Default format" msgstr "Format predeterminat" -#: ../app/dialogs/preferences-dialog.c:2207 +#: ../app/dialogs/preferences-dialog.c:2244 msgid "Show zoom percentage" msgstr "Mostra el percentatge d'ampliació" -#: ../app/dialogs/preferences-dialog.c:2208 +#: ../app/dialogs/preferences-dialog.c:2245 msgid "Show zoom ratio" msgstr "Mostra el factor d'ampliació" -#: ../app/dialogs/preferences-dialog.c:2209 +#: ../app/dialogs/preferences-dialog.c:2246 msgid "Show image size" msgstr "Mostra la mida de la imatge" -#: ../app/dialogs/preferences-dialog.c:2222 +#: ../app/dialogs/preferences-dialog.c:2259 msgid "Image Title Format" msgstr "Format del títol de la imatge" -#: ../app/dialogs/preferences-dialog.c:2224 +#: ../app/dialogs/preferences-dialog.c:2261 msgid "Image Statusbar Format" msgstr "Format de la imatge de la barra d'estat" -#: ../app/dialogs/preferences-dialog.c:2309 +#: ../app/dialogs/preferences-dialog.c:2346 msgid "Display" msgstr "Visualització" # Quim: llista d'opcions per definir com ha de ser el fons de la nova capa #. Transparency -#: ../app/dialogs/preferences-dialog.c:2321 +#: ../app/dialogs/preferences-dialog.c:2358 msgid "Transparency" msgstr "Transparent" # check: quadre, com en un taulell d'escacs, cada peça # ocupa un "check" -#: ../app/dialogs/preferences-dialog.c:2325 +#: ../app/dialogs/preferences-dialog.c:2362 msgid "_Check style:" msgstr "_Revisa l'estil:" -#: ../app/dialogs/preferences-dialog.c:2328 +#: ../app/dialogs/preferences-dialog.c:2365 msgid "Check _size:" msgstr "Revis_a la mida:" -#: ../app/dialogs/preferences-dialog.c:2331 +#: ../app/dialogs/preferences-dialog.c:2368 msgid "Monitor Resolution" msgstr "Resolució del monitor" # Quim: pixels surt a preferencies-graella i hauria de ser en minúscoles #. Pixels -#: ../app/dialogs/preferences-dialog.c:2335 -#: ../app/display/gimpcursorview.c:206 ../app/widgets/gimpgrideditor.c:199 -#: ../app/widgets/gimpgrideditor.c:231 +#: ../app/dialogs/preferences-dialog.c:2372 ../app/display/gimpcursorview.c:208 +#: ../app/widgets/gimpgrideditor.c:199 ../app/widgets/gimpgrideditor.c:231 msgid "Pixels" msgstr "píxels" -#: ../app/dialogs/preferences-dialog.c:2353 +#: ../app/dialogs/preferences-dialog.c:2390 msgid "Horizontal" msgstr "Horitzontal" -#: ../app/dialogs/preferences-dialog.c:2355 +#: ../app/dialogs/preferences-dialog.c:2392 msgid "Vertical" msgstr "Vertical" -#: ../app/dialogs/preferences-dialog.c:2357 +#: ../app/dialogs/preferences-dialog.c:2394 #: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "ppi" -#: ../app/dialogs/preferences-dialog.c:2373 +#: ../app/dialogs/preferences-dialog.c:2410 #, c-format msgid "_Detect automatically (currently %d × %d ppi)" msgstr "_Detecta-la automàticament (actualment, %d x %d ppi)" -#: ../app/dialogs/preferences-dialog.c:2391 +#: ../app/dialogs/preferences-dialog.c:2428 msgid "_Enter manually" msgstr "Introdu_eix-la manualment" -#: ../app/dialogs/preferences-dialog.c:2406 +#: ../app/dialogs/preferences-dialog.c:2443 msgid "C_alibrate..." msgstr "C_alibra..." -#: ../app/dialogs/preferences-dialog.c:2434 +#: ../app/dialogs/preferences-dialog.c:2471 msgid "Color Management" msgstr "Gestió de color" -#: ../app/dialogs/preferences-dialog.c:2454 +#: ../app/dialogs/preferences-dialog.c:2491 msgid "_RGB profile:" msgstr "Perfil _RGB:" -#: ../app/dialogs/preferences-dialog.c:2455 +#: ../app/dialogs/preferences-dialog.c:2492 msgid "Select RGB Color Profile" msgstr "Seleccioneu el perfil de color RGB" -#: ../app/dialogs/preferences-dialog.c:2456 +#: ../app/dialogs/preferences-dialog.c:2493 msgid "_CMYK profile:" msgstr "Perfil _CMYK:" -#: ../app/dialogs/preferences-dialog.c:2457 +#: ../app/dialogs/preferences-dialog.c:2494 msgid "Select CMYK Color Profile" msgstr "Seleccioneu el perfil de color CMYK" -#: ../app/dialogs/preferences-dialog.c:2458 +#: ../app/dialogs/preferences-dialog.c:2495 msgid "_Monitor profile:" msgstr "Perfil del _monitor:" -#: ../app/dialogs/preferences-dialog.c:2459 +#: ../app/dialogs/preferences-dialog.c:2496 msgid "Select Monitor Color Profile" msgstr "Seleccioneu el perfil de color del monitor" -#: ../app/dialogs/preferences-dialog.c:2460 +#: ../app/dialogs/preferences-dialog.c:2497 msgid "_Print simulation profile:" msgstr "Imprimeix el _perfil de simulació:" -#: ../app/dialogs/preferences-dialog.c:2461 +#: ../app/dialogs/preferences-dialog.c:2498 msgid "Select Printer Color Profile" msgstr "Seleccioneu el perfil de color" -#: ../app/dialogs/preferences-dialog.c:2472 +#: ../app/dialogs/preferences-dialog.c:2509 msgid "_Mode of operation:" msgstr "_Mode d'operació:" -#: ../app/dialogs/preferences-dialog.c:2502 +#: ../app/dialogs/preferences-dialog.c:2539 msgid "_Try to use the system monitor profile" msgstr "_Prova d'utilitzar el perfil de monitor del sistema" -#: ../app/dialogs/preferences-dialog.c:2512 +#: ../app/dialogs/preferences-dialog.c:2549 msgid "_Display rendering intent:" msgstr "_Prova del renderitzat de pantalla:" -#: ../app/dialogs/preferences-dialog.c:2521 +#: ../app/dialogs/preferences-dialog.c:2558 msgid "_Softproof rendering intent:" msgstr "P_seudoprova de renderitzat:" -#: ../app/dialogs/preferences-dialog.c:2534 +#: ../app/dialogs/preferences-dialog.c:2571 msgid "Mark out of gamut colors" msgstr "Marca els colors de la gamma" -#: ../app/dialogs/preferences-dialog.c:2539 +#: ../app/dialogs/preferences-dialog.c:2576 msgid "Select Warning Color" msgstr "Selecciona un color d'avís" -#: ../app/dialogs/preferences-dialog.c:2552 +#: ../app/dialogs/preferences-dialog.c:2589 msgid "File Open behaviour:" msgstr "Quan s'obri un fitxer:" -#: ../app/dialogs/preferences-dialog.c:2564 +#: ../app/dialogs/preferences-dialog.c:2601 msgid "Input Devices" msgstr "Dispositius d'entrada" #. Extended Input Devices -#: ../app/dialogs/preferences-dialog.c:2574 +#: ../app/dialogs/preferences-dialog.c:2611 msgid "Extended Input Devices" msgstr "Dispositius d'entrada expandits" -#: ../app/dialogs/preferences-dialog.c:2578 +#: ../app/dialogs/preferences-dialog.c:2615 msgid "Configure E_xtended Input Devices..." msgstr "Configura dispositius d'entrada e_xpandits..." -#: ../app/dialogs/preferences-dialog.c:2585 +#: ../app/dialogs/preferences-dialog.c:2622 msgid "_Save input device settings on exit" msgstr "De_sa els paràmetres dels dispositius d'entrada en sortir" -#: ../app/dialogs/preferences-dialog.c:2589 +#: ../app/dialogs/preferences-dialog.c:2626 msgid "Save Input Device Settings _Now" msgstr "Desa _ara els paràmetres dels dispositius" -#: ../app/dialogs/preferences-dialog.c:2596 +#: ../app/dialogs/preferences-dialog.c:2633 msgid "_Reset Saved Input Device Settings to Default Values" msgstr "_Recupera els valors per defecte dels dispositius d'entrada" -#: ../app/dialogs/preferences-dialog.c:2611 +#: ../app/dialogs/preferences-dialog.c:2648 msgid "Additional Input Controllers" msgstr "Controladors d'entrada addicionals" -#: ../app/dialogs/preferences-dialog.c:2614 +#: ../app/dialogs/preferences-dialog.c:2651 msgid "Input Controllers" msgstr "Controladors d'entrada" -#: ../app/dialogs/preferences-dialog.c:2630 +#: ../app/dialogs/preferences-dialog.c:2667 msgid "Window Management" msgstr "Gestió de finestres" -#: ../app/dialogs/preferences-dialog.c:2639 +#: ../app/dialogs/preferences-dialog.c:2676 msgid "Window Manager Hints" msgstr "Consells per al gestor de finestres" -#: ../app/dialogs/preferences-dialog.c:2645 +#: ../app/dialogs/preferences-dialog.c:2682 msgid "Hint for _docks and toolbox:" msgstr "Ajudes per a la caixa _d'eines i els plafons:" -#: ../app/dialogs/preferences-dialog.c:2648 +#: ../app/dialogs/preferences-dialog.c:2685 msgid "Focus" msgstr "Focus" -#: ../app/dialogs/preferences-dialog.c:2652 +#: ../app/dialogs/preferences-dialog.c:2689 msgid "Activate the _focused image" msgstr "Activa la imatge amb _focus" #. Window Positions -#: ../app/dialogs/preferences-dialog.c:2656 +#: ../app/dialogs/preferences-dialog.c:2693 msgid "Window Positions" msgstr "Posicions de la finestra" -#: ../app/dialogs/preferences-dialog.c:2659 +#: ../app/dialogs/preferences-dialog.c:2696 msgid "_Save window positions on exit" msgstr "De_sa les posicions de les finestres en sortir" -#: ../app/dialogs/preferences-dialog.c:2663 +#: ../app/dialogs/preferences-dialog.c:2700 msgid "Save Window Positions _Now" msgstr "Desa _ara les posicions de la finestra" -#: ../app/dialogs/preferences-dialog.c:2670 +#: ../app/dialogs/preferences-dialog.c:2707 msgid "_Reset Saved Window Positions to Default Values" msgstr "_Recupera les posicions per defecte de les finestres" -#: ../app/dialogs/preferences-dialog.c:2685 +#: ../app/dialogs/preferences-dialog.c:2722 msgid "Folders" msgstr "Carpetes" -#: ../app/dialogs/preferences-dialog.c:2705 +#: ../app/dialogs/preferences-dialog.c:2742 msgid "Temporary folder:" msgstr "Carpeta temporal:" -#: ../app/dialogs/preferences-dialog.c:2706 +#: ../app/dialogs/preferences-dialog.c:2743 msgid "Select Folder for Temporary Files" msgstr "Selecciona una carpeta per als fitxers temporals" -#: ../app/dialogs/preferences-dialog.c:2710 +#: ../app/dialogs/preferences-dialog.c:2747 msgid "Swap folder:" msgstr "Directori d'intercanvi:" -#: ../app/dialogs/preferences-dialog.c:2711 +#: ../app/dialogs/preferences-dialog.c:2748 msgid "Select Swap Folder" msgstr "Seleccioneu el directori d'intercanvi" -#: ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/preferences-dialog.c:2783 msgid "Brush Folders" msgstr "Carpetes de pinzells" -#: ../app/dialogs/preferences-dialog.c:2748 +#: ../app/dialogs/preferences-dialog.c:2785 msgid "Select Brush Folders" msgstr "Selecciona carpetes de pinzells" -#: ../app/dialogs/preferences-dialog.c:2750 +#: ../app/dialogs/preferences-dialog.c:2787 msgid "Dynamics Folders" msgstr "Carpetes de dinàmiques" -#: ../app/dialogs/preferences-dialog.c:2752 +#: ../app/dialogs/preferences-dialog.c:2789 msgid "Select Dynamics Folders" msgstr "Selecciona carpetes de dinàmiques" -#: ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/preferences-dialog.c:2791 msgid "Pattern Folders" msgstr "Carpetes de patrons" -#: ../app/dialogs/preferences-dialog.c:2756 +#: ../app/dialogs/preferences-dialog.c:2793 msgid "Select Pattern Folders" msgstr "Selecciona carpetes de patrons" -#: ../app/dialogs/preferences-dialog.c:2758 +#: ../app/dialogs/preferences-dialog.c:2795 msgid "Palette Folders" msgstr "Carpeta de paletes" -#: ../app/dialogs/preferences-dialog.c:2760 +#: ../app/dialogs/preferences-dialog.c:2797 msgid "Select Palette Folders" msgstr "Selecciona carpetes de paletes" -#: ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/preferences-dialog.c:2799 msgid "Gradient Folders" msgstr "Carpetes de degradats" -#: ../app/dialogs/preferences-dialog.c:2764 +#: ../app/dialogs/preferences-dialog.c:2801 msgid "Select Gradient Folders" msgstr "Selecciona carpetes de degradats" -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2803 msgid "Font Folders" msgstr "Carpetes de tipus de lletra" -#: ../app/dialogs/preferences-dialog.c:2768 +#: ../app/dialogs/preferences-dialog.c:2805 msgid "Select Font Folders" msgstr "Selecciona carpetes de tipus de lletra" -#: ../app/dialogs/preferences-dialog.c:2770 +#: ../app/dialogs/preferences-dialog.c:2807 msgid "Tool Preset Folders" msgstr "Carpetes de valors predefinits de l'eina" -#: ../app/dialogs/preferences-dialog.c:2772 +#: ../app/dialogs/preferences-dialog.c:2809 msgid "Select Tool Preset Folders" msgstr "Selecciona carpetes de valors predefinits de l'eina" -#: ../app/dialogs/preferences-dialog.c:2774 +#: ../app/dialogs/preferences-dialog.c:2811 msgid "Plug-In Folders" msgstr "Carpetes de connectors" -#: ../app/dialogs/preferences-dialog.c:2776 +#: ../app/dialogs/preferences-dialog.c:2813 msgid "Select Plug-In Folders" msgstr "Selecciona carpetes de connectors" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2815 msgid "Scripts" msgstr "Funcions (scripts)" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2815 msgid "Script-Fu Folders" msgstr "Carpetes de funcions" -#: ../app/dialogs/preferences-dialog.c:2780 +#: ../app/dialogs/preferences-dialog.c:2817 msgid "Select Script-Fu Folders" msgstr "Selecciona carpetes de funcions" -#: ../app/dialogs/preferences-dialog.c:2782 +#: ../app/dialogs/preferences-dialog.c:2819 msgid "Module Folders" msgstr "Carpetes de mòduls" -#: ../app/dialogs/preferences-dialog.c:2784 +#: ../app/dialogs/preferences-dialog.c:2821 msgid "Select Module Folders" msgstr "Selecciona les carpetes de mòduls" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Interpreters" msgstr "Intèrprets" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Interpreter Folders" msgstr "Carpetes d'intèrprets" -#: ../app/dialogs/preferences-dialog.c:2788 +#: ../app/dialogs/preferences-dialog.c:2825 msgid "Select Interpreter Folders" msgstr "Selecciona carpetes d'intèrprets" -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:2827 msgid "Environment Folders" msgstr "Carpetes d'entorn" -#: ../app/dialogs/preferences-dialog.c:2792 +#: ../app/dialogs/preferences-dialog.c:2829 msgid "Select Environment Folders" msgstr "Selecciona carpetes d'entorn" -#: ../app/dialogs/preferences-dialog.c:2794 +#: ../app/dialogs/preferences-dialog.c:2831 msgid "Themes" msgstr "Temes" -#: ../app/dialogs/preferences-dialog.c:2794 +#: ../app/dialogs/preferences-dialog.c:2831 msgid "Theme Folders" msgstr "Carpetes de temes" -#: ../app/dialogs/preferences-dialog.c:2796 +#: ../app/dialogs/preferences-dialog.c:2833 msgid "Select Theme Folders" msgstr "Selecciona carpetes de temes" @@ -10471,8 +10477,7 @@ msgid "Press %s to discard all changes and close all images." msgstr "Premeu %s per descartar tots els canvis i tancar totes les imatges." -#: ../app/dialogs/quit-dialog.c:341 -#: ../app/display/gimpdisplayshell-close.c:180 +#: ../app/dialogs/quit-dialog.c:341 ../app/display/gimpdisplayshell-close.c:180 msgid "_Discard Changes" msgstr "No _desis els canvis" @@ -10685,51 +10690,51 @@ msgid "Line spacing" msgstr "Espaiat de la línia" -#: ../app/display/gimpcursorview.c:216 ../app/display/gimpcursorview.c:222 -#: ../app/display/gimpcursorview.c:241 ../app/display/gimpcursorview.c:247 -#: ../app/display/gimpcursorview.c:266 ../app/display/gimpcursorview.c:272 -#: ../app/display/gimpcursorview.c:288 ../app/display/gimpcursorview.c:295 -#: ../app/display/gimpcursorview.c:672 ../app/display/gimpcursorview.c:673 -#: ../app/display/gimpcursorview.c:674 ../app/display/gimpcursorview.c:675 -#: ../app/display/gimpcursorview.c:788 ../app/display/gimpcursorview.c:789 -#: ../app/display/gimpcursorview.c:790 ../app/display/gimpcursorview.c:791 +#: ../app/display/gimpcursorview.c:218 ../app/display/gimpcursorview.c:224 +#: ../app/display/gimpcursorview.c:243 ../app/display/gimpcursorview.c:249 +#: ../app/display/gimpcursorview.c:268 ../app/display/gimpcursorview.c:274 +#: ../app/display/gimpcursorview.c:290 ../app/display/gimpcursorview.c:297 +#: ../app/display/gimpcursorview.c:688 ../app/display/gimpcursorview.c:689 +#: ../app/display/gimpcursorview.c:690 ../app/display/gimpcursorview.c:691 +#: ../app/display/gimpcursorview.c:804 ../app/display/gimpcursorview.c:805 +#: ../app/display/gimpcursorview.c:806 ../app/display/gimpcursorview.c:807 #: ../app/widgets/gimpcolorframe.c:633 msgid "n/a" msgstr "n/a" -#: ../app/display/gimpcursorview.c:219 ../app/display/gimpcursorview.c:244 -#: ../app/display/gimpcursorview.c:269 +#: ../app/display/gimpcursorview.c:221 ../app/display/gimpcursorview.c:246 +#: ../app/display/gimpcursorview.c:271 #: ../app/widgets/gimpdeviceinfoeditor.c:138 msgid "X" msgstr "X" -#: ../app/display/gimpcursorview.c:225 ../app/display/gimpcursorview.c:250 -#: ../app/display/gimpcursorview.c:275 +#: ../app/display/gimpcursorview.c:227 ../app/display/gimpcursorview.c:252 +#: ../app/display/gimpcursorview.c:277 #: ../app/widgets/gimpdeviceinfoeditor.c:139 msgid "Y" msgstr "Y" #. Units -#: ../app/display/gimpcursorview.c:231 +#: ../app/display/gimpcursorview.c:233 msgid "Units" msgstr "Unitats" #. Selection Bounding Box -#: ../app/display/gimpcursorview.c:256 +#: ../app/display/gimpcursorview.c:258 msgid "Selection Bounding Box" msgstr "Selecció capsa contenidora" #. Width -#: ../app/display/gimpcursorview.c:292 +#: ../app/display/gimpcursorview.c:294 msgid "W" msgstr "W" #. Height -#: ../app/display/gimpcursorview.c:299 +#: ../app/display/gimpcursorview.c:301 msgid "H" msgstr "H" -#: ../app/display/gimpcursorview.c:328 +#: ../app/display/gimpcursorview.c:330 msgid "_Sample Merged" msgstr "Mo_stra fusionada" @@ -10749,8 +10754,8 @@ msgid "Navigate the image display" msgstr "Navega per la imatge" -#: ../app/display/gimpdisplayshell.c:746 -#: ../app/display/gimpdisplayshell.c:1331 ../app/widgets/gimptoolbox.c:253 +#: ../app/display/gimpdisplayshell.c:746 ../app/display/gimpdisplayshell.c:1331 +#: ../app/widgets/gimptoolbox.c:253 msgid "Drop image files here to open them" msgstr "Arrossega-hi fitxers d'imatges per obrir-los" @@ -10827,7 +10832,7 @@ #: ../app/display/gimpdisplayshell-dnd.c:471 ../app/tools/gimpblendtool.c:180 #: ../app/tools/gimpbucketfilltool.c:143 ../app/tools/gimpcroptool.c:325 #: ../app/tools/gimpimagemaptool.c:287 ../app/tools/gimppainttool.c:266 -#: ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:1477 +#: ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:1481 msgid "The active layer's pixels are locked." msgstr "Els píxels de la capa activa estan bloquejats." @@ -10903,27 +10908,27 @@ msgid "Not a regular file" msgstr "No és un fitxer vàlid" -#: ../app/file/file-open.c:191 +#: ../app/file/file-open.c:197 #, c-format msgid "%s plug-in returned SUCCESS but did not return an image" msgstr "" "%s la resposta del connector és correcta però no ha retornat cap imatge" -#: ../app/file/file-open.c:202 +#: ../app/file/file-open.c:208 #, c-format msgid "%s plug-In could not open image" msgstr "El connector %s no ha pogut obrir la imatge" -#: ../app/file/file-open.c:533 +#: ../app/file/file-open.c:539 msgid "Image doesn't contain any layers" msgstr "La imatge no conté cap capa" -#: ../app/file/file-open.c:593 +#: ../app/file/file-open.c:599 #, c-format msgid "Opening '%s' failed: %s" msgstr "No s'ha pogut obrir «%s»: %s" -#: ../app/file/file-open.c:703 +#: ../app/file/file-open.c:709 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -10999,16 +11004,16 @@ #. * but xgettext extracts it anyway mistakenly into GIMP po files. #. * Leave an empty string as translation. It does not matter. #. -#: ../app/gui/gui.c:207 +#: ../app/gui/gui.c:219 msgid "default:LTR" msgstr "default:LTR" #. initialize the document history -#: ../app/gui/gui.c:438 +#: ../app/gui/gui.c:461 msgid "Documents" msgstr "Documents" -#: ../app/gui/splash.c:115 +#: ../app/gui/splash.c:112 msgid "GIMP Startup" msgstr "Inici del GIMP" @@ -11447,8 +11452,7 @@ "La funció «%s» s'ha cridat amb un paràmetre (núm. %d) amb el tipus " "incorrecte. S'esperava un %s, però ha arribat un %s." -#: ../app/pdb/gimppdbcontext.c:89 -#: ../app/tools/gimpforegroundselectoptions.c:79 +#: ../app/pdb/gimppdbcontext.c:89 ../app/tools/gimpforegroundselectoptions.c:79 #: ../app/tools/gimpselectionoptions.c:78 msgid "Smooth edges" msgstr "Arrodoneix les vores" @@ -11544,10 +11548,6 @@ msgid "Free Select" msgstr "Selecció lliure" -#: ../app/pdb/layer-cmds.c:475 ../app/pdb/layer-cmds.c:513 -msgid "Move Layer" -msgstr "Mou la capa" - #: ../app/pdb/text-layer-cmds.c:91 #, c-format msgid "Failed to create text layer" @@ -11636,11 +11636,11 @@ "Error en l'execució de la funció «%s»:\n" "%s" -#: ../app/plug-in/gimpplugin-progress.c:331 +#: ../app/plug-in/gimpplugin-progress.c:339 msgid "Cancelled" msgstr "Cancel·lada" -#: ../app/plug-in/gimpplugin.c:643 +#: ../app/plug-in/gimpplugin.c:648 #, c-format msgid "" "Plug-in crashed: \"%s\"\n" @@ -11656,9 +11656,9 @@ "Hauríeu de desar les imatges i tornar a iniciar el GIMP per a treballar amb " "seguretat." -#: ../app/plug-in/gimppluginmanager-call.c:173 -#: ../app/plug-in/gimppluginmanager-call.c:223 -#: ../app/plug-in/gimppluginmanager-call.c:321 +#: ../app/plug-in/gimppluginmanager-call.c:185 +#: ../app/plug-in/gimppluginmanager-call.c:235 +#: ../app/plug-in/gimppluginmanager-call.c:333 #, c-format msgid "Failed to run plug-in \"%s\"" msgstr "No s'ha pogut executar el connector «%s»" @@ -11830,7 +11830,7 @@ "Algunes propietats del text poden estar malament. Llevat que es vulgui " "editar la capa del text, no cal preocupar-se." -#: ../app/text/gimptextlayout.c:577 +#: ../app/text/gimptextlayout.c:578 msgid "" "The new text layout cannot be generated. Most likely the font size is too " "big." @@ -12031,7 +12031,7 @@ msgid "No gradient available for use with this tool." msgstr "No es pot utilitzar cap degradat amb aquesta eina." -#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:624 +#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:625 #, c-format msgid "%s for constrained angles" msgstr "%s per a angles restringits" @@ -12226,8 +12226,7 @@ msgid "Click to set a new clone source" msgstr "Feu clic per seleccionar la imatge a clonar" -#: ../app/tools/gimpclonetool.c:109 -#: ../app/tools/gimpperspectiveclonetool.c:899 +#: ../app/tools/gimpclonetool.c:109 ../app/tools/gimpperspectiveclonetool.c:899 msgid "Source" msgstr "Origen" @@ -12344,18 +12343,15 @@ msgid "Select Color" msgstr "Selecciona un color" -#: ../app/tools/gimpcolorizetool.c:241 -#: ../app/tools/gimphuesaturationtool.c:381 +#: ../app/tools/gimpcolorizetool.c:241 ../app/tools/gimphuesaturationtool.c:381 msgid "_Hue:" msgstr "_To:" -#: ../app/tools/gimpcolorizetool.c:254 -#: ../app/tools/gimphuesaturationtool.c:413 +#: ../app/tools/gimpcolorizetool.c:254 ../app/tools/gimphuesaturationtool.c:413 msgid "_Saturation:" msgstr "_Saturació:" -#: ../app/tools/gimpcolorizetool.c:267 -#: ../app/tools/gimphuesaturationtool.c:397 +#: ../app/tools/gimpcolorizetool.c:267 ../app/tools/gimphuesaturationtool.c:397 msgid "_Lightness:" msgstr "_Lluminositat:" @@ -12365,8 +12361,7 @@ #: ../app/tools/gimpcoloroptions.c:157 #: ../app/tools/gimprectangleselectoptions.c:163 -#: ../app/tools/gimpselectionoptions.c:277 -#: ../app/widgets/gimpbrusheditor.c:155 +#: ../app/tools/gimpselectionoptions.c:277 ../app/widgets/gimpbrusheditor.c:155 msgid "Radius" msgstr "Radi" @@ -12540,65 +12535,65 @@ msgid "There is no active layer to crop." msgstr "No hi ha cap capa activa on retallar." -#: ../app/tools/gimpcurvestool.c:143 +#: ../app/tools/gimpcurvestool.c:145 msgid "Curves" msgstr "Corbes de color" -#: ../app/tools/gimpcurvestool.c:144 +#: ../app/tools/gimpcurvestool.c:146 msgid "Curves Tool: Adjust color curves" msgstr "L'eina Corbes de color: ajusta les corbes de color" -#: ../app/tools/gimpcurvestool.c:145 +#: ../app/tools/gimpcurvestool.c:147 msgid "_Curves..." msgstr "_Corbes de color..." # Albert: He deixat aquesta traducció perquè imagino que es va considerar més explicativa de la funció. -#: ../app/tools/gimpcurvestool.c:171 +#: ../app/tools/gimpcurvestool.c:174 msgid "Adjust Color Curves" msgstr "Ajusta els colors definint una corba de transformació per a cada canal" -#: ../app/tools/gimpcurvestool.c:173 +#: ../app/tools/gimpcurvestool.c:176 msgid "Import Curves" msgstr "Importa les corbes" -#: ../app/tools/gimpcurvestool.c:174 +#: ../app/tools/gimpcurvestool.c:177 msgid "Export Curves" msgstr "Exporta les corbes" -#: ../app/tools/gimpcurvestool.c:225 +#: ../app/tools/gimpcurvestool.c:239 msgid "Curves does not operate on indexed layers." msgstr "L'eina Corbes de color no funciona en capes indexades." -#: ../app/tools/gimpcurvestool.c:333 +#: ../app/tools/gimpcurvestool.c:348 msgid "Click to add a control point" msgstr "Feu clic per afegir un punt de control" -#: ../app/tools/gimpcurvestool.c:338 +#: ../app/tools/gimpcurvestool.c:353 msgid "Click to add control points to all channels" msgstr "Feu clic per afegir punts de control a tots els canals" -#: ../app/tools/gimpcurvestool.c:343 +#: ../app/tools/gimpcurvestool.c:358 msgid "Click to locate on curve (try Shift, Ctrl)" msgstr "Feu clic per ubicar la corba (proveu Maj o Ctrl)" -#: ../app/tools/gimpcurvestool.c:456 ../app/tools/gimplevelstool.c:384 +#: ../app/tools/gimpcurvestool.c:473 ../app/tools/gimplevelstool.c:384 msgid "Cha_nnel:" msgstr "Ca_nal:" -#: ../app/tools/gimpcurvestool.c:482 ../app/tools/gimplevelstool.c:408 +#: ../app/tools/gimpcurvestool.c:499 ../app/tools/gimplevelstool.c:408 msgid "R_eset Channel" msgstr "_Inicialitza el canal" -#: ../app/tools/gimpcurvestool.c:576 ../app/widgets/gimpdeviceinfoeditor.c:461 +#: ../app/tools/gimpcurvestool.c:590 ../app/widgets/gimpdeviceinfoeditor.c:461 msgid "Curve _type:" msgstr "_Tipus de corba:" -#: ../app/tools/gimpcurvestool.c:651 ../app/tools/gimplevelstool.c:756 +#: ../app/tools/gimpcurvestool.c:667 ../app/tools/gimplevelstool.c:756 #, c-format msgid "Could not read header from '%s': %s" msgstr "No s'ha pogut llegir la capçalera de «%s»: %s" -#: ../app/tools/gimpcurvestool.c:724 +#: ../app/tools/gimpcurvestool.c:740 msgid "Use _old curves file format" msgstr "Utilitza el format de fitxer de corba _antic" @@ -12676,20 +12671,16 @@ msgid "Exposure" msgstr "Exposició" -#: ../app/tools/gimpeditselectiontool.c:242 -msgid "Move Selection" -msgstr "Mou la selecció" +#: ../app/tools/gimpeditselectiontool.c:484 +#: ../app/tools/gimpeditselectiontool.c:670 +msgid "Move: " +msgstr "Mou: " -#: ../app/tools/gimpeditselectiontool.c:246 -#: ../app/tools/gimpeditselectiontool.c:1241 +#: ../app/tools/gimpeditselectiontool.c:982 +#: ../app/tools/gimpeditselectiontool.c:1234 msgid "Move Floating Selection" msgstr "Mou la selecció flotant" -#: ../app/tools/gimpeditselectiontool.c:455 -#: ../app/tools/gimpeditselectiontool.c:732 -msgid "Move: " -msgstr "Mou: " - #: ../app/tools/gimpellipseselecttool.c:66 msgid "Ellipse Select" msgstr "Selecció el·líptica" @@ -13098,8 +13089,7 @@ msgid "Size" msgstr "Mida" -#: ../app/tools/gimpinkoptions-gui.c:71 -#: ../app/tools/gimppaintoptions-gui.c:181 +#: ../app/tools/gimpinkoptions-gui.c:71 ../app/tools/gimppaintoptions-gui.c:181 #: ../app/widgets/gimpbrusheditor.c:199 msgid "Angle" msgstr "Angle" @@ -13109,8 +13099,7 @@ msgid "Sensitivity" msgstr "Sensibilitat" -#: ../app/tools/gimpinkoptions-gui.c:94 -#: ../app/widgets/gimpdynamicseditor.c:144 +#: ../app/tools/gimpinkoptions-gui.c:94 ../app/widgets/gimpdynamicseditor.c:144 #: ../app/widgets/gimpdynamicsoutputeditor.c:72 msgid "Tilt" msgstr "Inclinació" @@ -13334,7 +13323,7 @@ #: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084 #: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168 -#: ../app/tools/gimppainttool.c:633 +#: ../app/tools/gimppainttool.c:634 msgid "pixels" msgstr "píxels" @@ -13418,8 +13407,8 @@ msgstr "_Pinzell" #: ../app/tools/gimppaintoptions-gui.c:89 -#: ../app/tools/gimpselectionoptions.c:217 -#: ../app/widgets/gimpbrushselect.c:190 ../app/widgets/gimplayertreeview.c:268 +#: ../app/tools/gimpselectionoptions.c:217 ../app/widgets/gimpbrushselect.c:190 +#: ../app/widgets/gimplayertreeview.c:268 msgid "Mode:" msgstr "Mode:" @@ -13463,8 +13452,7 @@ msgid "Fade length" msgstr "Llargada de l'esvaïment" -#: ../app/tools/gimppaintoptions-gui.c:332 -#: ../app/widgets/gimpviewablebox.c:311 +#: ../app/tools/gimppaintoptions-gui.c:332 ../app/widgets/gimpviewablebox.c:311 msgid "Reverse" msgstr "Torna a l'estat anterior" @@ -13505,7 +13493,7 @@ msgid "Cannot paint on layer groups." msgstr "No es pot pintar en un grup de capes." -#: ../app/tools/gimppainttool.c:679 +#: ../app/tools/gimppainttool.c:680 #, c-format msgid "%s for a straight line" msgstr "%s per a una línia recta" @@ -14125,15 +14113,15 @@ msgid "The selection does not intersect with the layer." msgstr "La selecció no interseca amb la capa." -#: ../app/tools/gimptransformtool.c:1476 +#: ../app/tools/gimptransformtool.c:1480 msgid "There is no layer to transform." msgstr "No hi ha cap capa per transformar." -#: ../app/tools/gimptransformtool.c:1487 +#: ../app/tools/gimptransformtool.c:1491 msgid "There is no path to transform." msgstr "No hi ha cap camí per transformar." -#: ../app/tools/gimptransformtool.c:1488 +#: ../app/tools/gimptransformtool.c:1492 msgid "The active path's strokes are locked." msgstr "Els punts del camí estan bloquejats." @@ -14561,8 +14549,7 @@ msgstr "Relació d'aspecte" #: ../app/widgets/gimpbrusheditor.c:210 -#: ../app/widgets/gimpbrushfactoryview.c:80 -#: ../app/widgets/gimpgrideditor.c:174 +#: ../app/widgets/gimpbrushfactoryview.c:80 ../app/widgets/gimpgrideditor.c:174 msgid "Spacing" msgstr "Espaiat" @@ -14614,7 +14601,7 @@ msgid "No filter selected" msgstr "No hi ha cap filtre seleccionat" -#: ../app/widgets/gimpcoloreditor.c:260 +#: ../app/widgets/gimpcoloreditor.c:264 msgid "" "Hexadecimal color notation as used in HTML and CSS. This entry also accepts " "CSS color names." @@ -15370,15 +15357,15 @@ msgid "Height" msgstr "Alçada" -#: ../app/widgets/gimphelp.c:297 +#: ../app/widgets/gimphelp.c:308 msgid "Help browser is missing" msgstr "No s'ha trobat el navegador de l'ajuda" -#: ../app/widgets/gimphelp.c:298 +#: ../app/widgets/gimphelp.c:309 msgid "The GIMP help browser is not available." msgstr "El navegador de l'ajuda del GIMP no està disponible." -#: ../app/widgets/gimphelp.c:299 +#: ../app/widgets/gimphelp.c:310 msgid "" "The GIMP help browser plug-in appears to be missing from your installation. " "You may instead use the web browser for reading the help pages." @@ -15387,31 +15374,37 @@ "instal·lat. En el seu lloc podeu utilitzar un navegador web per llegir les " "pàgines d'ajuda." -#: ../app/widgets/gimphelp.c:340 +#: ../app/widgets/gimphelp.c:351 msgid "Help browser doesn't start" msgstr "El navegador de l'ajuda no ha funcionat" -#: ../app/widgets/gimphelp.c:341 +#: ../app/widgets/gimphelp.c:352 msgid "Could not start the GIMP help browser plug-in." msgstr "No s'ha pogut iniciar el connector del navegador de l'ajuda del GIMP." -#: ../app/widgets/gimphelp.c:368 +#: ../app/widgets/gimphelp.c:354 +msgid "You may instead use the web browser for reading the help pages." +msgstr "" +"En el seu lloc podeu utilitzar un navegador web per llegir les " +"pàgines d'ajuda." + +#: ../app/widgets/gimphelp.c:380 msgid "Use _Web Browser" msgstr "Utilitza un navegador _web" -#: ../app/widgets/gimphelp.c:712 +#: ../app/widgets/gimphelp.c:724 msgid "GIMP user manual is missing" msgstr "Falta el manual d'usuari del GIMP" -#: ../app/widgets/gimphelp.c:719 +#: ../app/widgets/gimphelp.c:731 msgid "_Read Online" msgstr "_Llegeix-lo del web" -#: ../app/widgets/gimphelp.c:743 +#: ../app/widgets/gimphelp.c:755 msgid "The GIMP user manual is not installed on your computer." msgstr "El manual d'usuari del GIMP no està instal·lat en el vostre ordinador." -#: ../app/widgets/gimphelp.c:746 +#: ../app/widgets/gimphelp.c:758 msgid "" "You may either install the additional help package or change your " "preferences to use the online version." @@ -15689,7 +15682,7 @@ #. * IMPORTANT: use only one of Unicode terminal punctuation chars. #. * http://unicode.org/review/pr-23.html #. -#: ../app/widgets/gimptagentry.c:1734 +#: ../app/widgets/gimptagentry.c:1750 msgid "," msgstr "," @@ -15732,17 +15725,17 @@ msgid "%d ppi, %s" msgstr "%d ppi, %s" -#: ../app/widgets/gimptextbuffer-serialize.c:344 +#: ../app/widgets/gimptextbuffer-serialize.c:269 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "En aquest context, l'atribut \"%s\" no és vàlid en l'element <%s>" -#: ../app/widgets/gimptextbuffer-serialize.c:416 +#: ../app/widgets/gimptextbuffer-serialize.c:341 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "El primer element del text ha de ser en comptes de <%s>" -#: ../app/widgets/gimptextbuffer.c:1459 +#: ../app/widgets/gimptextbuffer.c:1460 #, c-format msgid "Invalid UTF-8 data in file '%s'." msgstr "Hi ha dades UTF-8 no vàlides al fitxer «%s»." @@ -15810,12 +15803,12 @@ msgid "No selection" msgstr "Cap selecció" -#: ../app/widgets/gimpthumbbox.c:596 ../app/widgets/gimpthumbbox.c:617 +#: ../app/widgets/gimpthumbbox.c:612 ../app/widgets/gimpthumbbox.c:633 #, c-format msgid "Thumbnail %d of %d" msgstr "Miniatura %d de %d" -#: ../app/widgets/gimpthumbbox.c:730 ../app/widgets/gimpthumbbox.c:740 +#: ../app/widgets/gimpthumbbox.c:746 ../app/widgets/gimpthumbbox.c:756 msgid "Creating preview..." msgstr "S'està creant la previsualització ..." @@ -16244,6 +16237,12 @@ msgid "Create images and edit photographs" msgstr "Creeu imatges i editeu fotografies" +#~ msgid "Move Layer" +#~ msgstr "Mou la capa" + +#~ msgid "Move Selection" +#~ msgstr "Mou la selecció" + #~ msgid "Ask for confirmation before closing an image without saving." #~ msgstr "Demana confirmació abans de tancar una imatge sense desar." diff -Nru gimp-2.8.18/po/ca@valencia.po gimp-2.8.20/po/ca@valencia.po --- gimp-2.8.18/po/ca@valencia.po 2015-08-20 22:57:38.000000000 +0000 +++ gimp-2.8.20/po/ca@valencia.po 2017-01-28 19:08:48.000000000 +0000 @@ -17,7 +17,7 @@ "PO-Revision-Date: 2012-03-20 21:54+0100\n" "Last-Translator: Albert F. \n" "Language-Team: Catalan \n" -"Language: ca-XV\n" +"Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po/da.po gimp-2.8.20/po/da.po --- gimp-2.8.18/po/da.po 2016-05-25 22:26:48.000000000 +0000 +++ gimp-2.8.20/po/da.po 2017-01-28 19:08:48.000000000 +0000 @@ -20,7 +20,7 @@ "Project-Id-Version: gimp\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-09-22 17:48+0000\n" +"POT-Creation-Date: 2016-03-16 07:07+0000\n" "PO-Revision-Date: 2016-02-26 00:00+0200\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish \n" @@ -50,9 +50,8 @@ "Spencer Kimball, Peter Mattis and the GIMP Development Team" msgstr "" "Copyright © 1995-%s\n" -"Spencer Kimball, Peter Mattis og GIMP's udviklingsteam" +"Spencer Kimball, Peter Mattis og GIMPs udviklingsteam" -# scootergrisen: kildesprog: forslå at sætte linket i HTML-kode #: ../app/about.h:34 msgid "" "GIMP is free software: you can redistribute it and/or modify it under the " @@ -307,16 +306,14 @@ msgid "Debug" msgstr "Fejlfinding" -# scootergrisen: ja dialoger er jo så ikke vinduer, kig på senere om kan gøres bedre #: ../app/actions/actions.c:136 msgid "Dialogs" -msgstr "Vinduer/Dialoger" +msgstr "Dialoger" #: ../app/actions/actions.c:139 msgid "Dock" msgstr "Fastgør" -# scootergrisen: måske "Dokbar" #: ../app/actions/actions.c:142 msgid "Dockable" msgstr "Dokbare" @@ -644,7 +641,7 @@ #: ../app/actions/channels-actions.c:61 msgctxt "channels-action" msgid "Create a new channel with last used values" -msgstr "Opret en ny kanal med de sidst anvendte værdier" +msgstr "Opret en ny kanal med de sidst brugte værdier" #: ../app/actions/channels-actions.c:66 msgctxt "channels-action" @@ -716,7 +713,6 @@ msgid "Replace the selection with this channel" msgstr "Erstat markeringen med denne kanal" -# scootergrisen: måske Føj til #: ../app/actions/channels-actions.c:114 msgctxt "channels-action" msgid "_Add to Selection" @@ -737,7 +733,6 @@ msgid "Subtract this channel from the current selection" msgstr "Træk denne kanal fra den nuværende markering" -# scootergrisen: måske se om der findes et bedre ord for kryds med, her og andre steder #: ../app/actions/channels-actions.c:126 msgctxt "channels-action" msgid "_Intersect with Selection" @@ -918,11 +913,10 @@ msgid "_Hardness" msgstr "_Hårdhed" -# scootergrisen: måske "_Højde-bredde-forhold" #: ../app/actions/context-actions.c:75 msgctxt "context-action" msgid "_Aspect Ratio" -msgstr "_Størrelsesforhold" +msgstr "_Højde-bredde-forhold" #: ../app/actions/context-actions.c:77 msgctxt "context-action" @@ -1840,7 +1834,6 @@ msgstr "Slet denne dynamik" # engelsk fejl 2 s'er -# scootergrisen: måske "_Opdatér dynamik" #: ../app/actions/dynamics-actions.c:70 msgctxt "dynamics-action" msgid "_Refresh Dynamics" @@ -2162,7 +2155,7 @@ #: ../app/actions/edit-commands.c:325 ../app/actions/edit-commands.c:360 #: ../app/actions/edit-commands.c:543 msgid "There is no image data in the clipboard to paste." -msgstr "Der er ingen billeddata i udklipsholderen at indsætte." +msgstr "Der er ikke nogen billeddata i udklipsholderen til at indsætte." #: ../app/actions/edit-commands.c:348 ../app/core/gimpbrushclipboard.c:172 #: ../app/core/gimppatternclipboard.c:172 ../app/widgets/gimpclipboard.c:345 @@ -2222,7 +2215,7 @@ #: ../app/actions/error-console-actions.c:50 msgctxt "error-console-action" msgid "Select all error messages" -msgstr "Marker alle fejlbeskeder" +msgstr "Markér alle fejlmeddelelser" #: ../app/actions/error-console-actions.c:58 msgctxt "error-console-action" @@ -2232,7 +2225,7 @@ #: ../app/actions/error-console-actions.c:59 msgctxt "error-console-action" msgid "Write all error messages to a file" -msgstr "Gem alle fejlbeskeder i en fil" +msgstr "Gem alle fejlmeddelelser i en fil" #: ../app/actions/error-console-actions.c:64 msgctxt "error-console-action" @@ -2242,7 +2235,7 @@ #: ../app/actions/error-console-actions.c:65 msgctxt "error-console-action" msgid "Write the selected error messages to a file" -msgstr "Gem de markerede fejlbeskeder i en fil" +msgstr "Gem de markerede fejlmeddelelser i en fil" #: ../app/actions/error-console-commands.c:84 msgid "Cannot save. Nothing is selected." @@ -2390,7 +2383,6 @@ msgid "Save this image and close its window" msgstr "Gem billedet og luk dets vindue" -# scootergrisen: kildesprog: forslå at tilføje "..." #: ../app/actions/file-actions.c:146 msgctxt "file-action" msgid "Export" @@ -2448,7 +2440,7 @@ msgid "No changes need to be saved" msgstr "Ingen ændringer skal gemmes" -#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:701 +#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:703 #: ../app/dialogs/file-save-dialog.c:103 msgid "Save Image" msgstr "Gem billede" @@ -2486,11 +2478,11 @@ "Ved at gendanne billedet til den tilstand, der er gemt på disken, vil du " "miste alle ændringer, inklusive al fortrydelsesinformation." -#: ../app/actions/file-commands.c:731 +#: ../app/actions/file-commands.c:733 msgid "(Unnamed Template)" msgstr "(unavngivet skabelon)" -#: ../app/actions/file-commands.c:782 +#: ../app/actions/file-commands.c:784 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -2967,7 +2959,7 @@ #: ../app/actions/help-actions.c:41 msgctxt "help-action" msgid "Open the GIMP user manual" -msgstr "Åbn GIMP's brugermanual" +msgstr "Åbn GIMPs brugermanual" #: ../app/actions/help-actions.c:46 msgctxt "help-action" @@ -3030,7 +3022,6 @@ msgid "C_omponents" msgstr "K_omponenter" -# scootergrisen: "nyt" som i nyt billede... hmmm kan da godt være andre programmer bruger "ny" #: ../app/actions/image-actions.c:67 msgctxt "image-action" msgid "_New..." @@ -3106,7 +3097,6 @@ msgid "_Duplicate" msgstr "_Duplikér" -# scootergrisen: dublet/kopi #: ../app/actions/image-actions.c:110 msgctxt "image-action" msgid "Create a duplicate of this image" @@ -3165,12 +3155,12 @@ #: ../app/actions/image-actions.c:147 msgctxt "image-convert-action" msgid "_Grayscale" -msgstr "_Gråtoner" +msgstr "_Gråtone" #: ../app/actions/image-actions.c:148 msgctxt "image-convert-action" msgid "Convert the image to grayscale" -msgstr "Konvertér billedet til gråtoner" +msgstr "Konvertér billedet til gråtone" #: ../app/actions/image-actions.c:152 msgctxt "image-convert-action" @@ -3245,7 +3235,6 @@ msgid "Set Image Print Resolution" msgstr "Indstil udskriftsopløsning" -# scootergrisen: måske "Omvender" #: ../app/actions/image-commands.c:379 #: ../app/pdb/drawable-transform-cmds.c:159 #: ../app/pdb/drawable-transform-cmds.c:247 @@ -3405,7 +3394,6 @@ msgid "Create a new layer with last used values" msgstr "Opret et nyt lag med de senest anvendte værdier" -# scootergrisen: måske "Nyt fra _synligt" #: ../app/actions/layers-actions.c:94 msgctxt "layers-action" msgid "New from _Visible" @@ -3431,7 +3419,6 @@ msgid "D_uplicate Layer" msgstr "_Duplikér lag" -# scootergrisen: dublet/kopi #: ../app/actions/layers-actions.c:109 msgctxt "layers-action" msgid "Create a duplicate of the layer and add it to the image" @@ -3567,7 +3554,6 @@ msgid "Warp this layer's text along the current path" msgstr "Anbring dette lags tekst langs den aktuelle bane" -# scootergrisen: bedst at det mindre om lærredstørrelse #: ../app/actions/layers-actions.c:192 msgctxt "layers-action" msgid "Layer B_oundary Size..." @@ -3704,7 +3690,6 @@ msgid "Replace the selection with the layer mask" msgstr "Erstat markeringen med lagmasken" -# scootergrisen: måske Føj til #: ../app/actions/layers-actions.c:290 msgctxt "layers-action" msgid "_Add to Selection" @@ -3745,7 +3730,6 @@ msgid "Replace the selection with the layer's alpha channel" msgstr "Erstat markeringen med lagets alfa-kanal" -# scootergrisen: måske Føj til #: ../app/actions/layers-actions.c:318 msgctxt "layers-action" msgid "A_dd to Selection" @@ -3851,7 +3835,6 @@ msgid "Visible" msgstr "Synlig" -# scootergrisen: tjek hvad der er bedst (se lærredets kanter) # vælg er fint her fordi det er i en vinduestitel #: ../app/actions/layers-commands.c:618 msgid "Set Layer Boundary Size" @@ -4139,13 +4122,11 @@ msgid "Edge-De_tect" msgstr "Kant_genkendelse" -# scootergrisen: Forbedre? #: ../app/actions/plug-in-actions.c:95 msgctxt "plug-in-action" msgid "En_hance" msgstr "_Forbedring" -# scootergrisen: _Kombinering/kombinér? #: ../app/actions/plug-in-actions.c:97 msgctxt "plug-in-action" msgid "C_ombine" @@ -4161,11 +4142,10 @@ msgid "_Light and Shadow" msgstr "_Lys og skygge" -# scootergrisen: måske forslå uden s på kildesprog så det bliver "Forvrængning" på dansk uden er. #: ../app/actions/plug-in-actions.c:103 msgctxt "plug-in-action" msgid "_Distorts" -msgstr "_Forvrængninger" +msgstr "_Forvrænger" #: ../app/actions/plug-in-actions.c:105 msgctxt "plug-in-action" @@ -4247,11 +4227,10 @@ msgid "Re_peat \"%s\"" msgstr "_Gentag \"%s\"" -# scootergrisen: måske _igen #: ../app/actions/plug-in-actions.c:552 #, c-format msgid "R_e-Show \"%s\"" -msgstr "Vis \"%s\" ig_en" +msgstr "Vis \"%s\" _igen" #: ../app/actions/plug-in-actions.c:568 msgid "Repeat Last" @@ -4336,7 +4315,6 @@ msgstr "Markeringsredigeringsmenu" # et navneord ser bedst ud i stedet for 'Markér' -# scootergrisen: skal vel ikke hedder "Markér > Invertér", så prøv med markering, så kildesprog skulle vel hedde Selection #: ../app/actions/select-actions.c:47 msgctxt "select-action" msgid "_Select" @@ -4464,15 +4442,13 @@ #: ../app/actions/select-actions.c:118 msgctxt "select-action" msgid "Stroke the selection with last used values" -msgstr "Bestryg markeringen med de sidst anvendte værdier" +msgstr "Bestryg markeringen med de sidst brugte værdier" -# scootergrisen: feather ~ udtynd/pelset #: ../app/actions/select-commands.c:156 msgid "Feather Selection" msgstr "Udtynd markering" # 'over' kommer sig af at der følger antallet af pixels fra kanten som det næste -# scootergrisen: feather ~ udtynd/pelset #: ../app/actions/select-commands.c:160 msgid "Feather selection by" msgstr "Udtynd det markerede over" @@ -4507,7 +4483,6 @@ msgid "Border selection by" msgstr "Indram det markerede med" -# scootergrisen: feather ~ udtynd/pelset #. Feather button #: ../app/actions/select-commands.c:280 msgid "_Feather border" @@ -4662,7 +4637,7 @@ #: ../app/core/gimppalette-load.c:274 ../app/core/gimppalette-load.c:320 #: ../app/core/gimppalette-load.c:377 ../app/core/gimppalette-load.c:467 #: ../app/core/gimppalette-load.c:634 ../app/core/gimppattern-load.c:76 -#: ../app/tools/gimpcurvestool.c:642 ../app/tools/gimplevelstool.c:747 +#: ../app/tools/gimpcurvestool.c:658 ../app/tools/gimplevelstool.c:747 #: ../app/xcf/xcf.c:359 #, c-format msgid "Could not open '%s' for reading: %s" @@ -5102,7 +5077,6 @@ msgid "Replace selection with path" msgstr "Erstat markeringen med bane" -# scootergrisen: måske Føj til #: ../app/actions/vectors-actions.c:180 msgctxt "vectors-action" msgid "_Add to Selection" @@ -5315,7 +5289,6 @@ msgid "Display the selection outline" msgstr "Vis markeringsomridset" -# scootergrisen: tjek hvad der er bedst (se lærredets kanter) #: ../app/actions/view-actions.c:147 msgctxt "view-action" msgid "Show _Layer Boundary" @@ -5356,11 +5329,10 @@ msgid "Display the image's color sample points" msgstr "Vis billedets farveprøvepunkter" -# scootergrisen: måske "_Fastgør til hjælpelinjer" #: ../app/actions/view-actions.c:175 msgctxt "view-action" msgid "Sn_ap to Guides" -msgstr "F_astgør til hjælpelinjer" +msgstr "_Fastgør til hjælpelinjer" #: ../app/actions/view-actions.c:176 msgctxt "view-action" @@ -5417,17 +5389,15 @@ msgid "Show this window's rulers" msgstr "Vis dette vindues linealer" -# scootergrisen: måske rullebjælker #: ../app/actions/view-actions.c:217 msgctxt "view-action" msgid "Show Scroll_bars" -msgstr "Vis _rullepaneler" +msgstr "Vis _rullebjælker" -# scootergrisen: måske rullebjælker #: ../app/actions/view-actions.c:218 msgctxt "view-action" msgid "Show this window's scrollbars" -msgstr "Vis dette vindues rullepaneler" +msgstr "Vis dette vindues rullebjælker" #: ../app/actions/view-actions.c:224 msgctxt "view-action" @@ -5621,7 +5591,7 @@ msgid "Use the dark check color" msgstr "Brug den mørke ternfarve" -# scootergrisen: forslå at fjerne "Select " fra kildesprog +# scootergrisen: kildesprog: forslå at fjerne "Select " fra kildesprog #: ../app/actions/view-actions.c:411 msgctxt "view-padding-color" msgid "Select _Custom Color..." @@ -5724,8 +5694,8 @@ msgid "" "When enabled docks and other dialogs are hidden, leaving only image windows." msgstr "" -"Når denne er aktiveret skjules dokker og andre dialoger, så kun billedvinduer " -"vises." +"Når denne er aktiveret skjules dokker og andre dialoger, så kun " +"billedvinduer vises." #: ../app/actions/windows-actions.c:122 msgctxt "windows-action" @@ -6035,7 +6005,7 @@ #: ../app/config/gimpconfig-file.c:67 ../app/core/gimpbrushgenerated-save.c:62 #: ../app/core/gimpcurve-save.c:52 ../app/core/gimpgradient-save.c:50 #: ../app/core/gimpgradient-save.c:144 ../app/core/gimppalette-save.c:56 -#: ../app/gui/themes.c:248 ../app/tools/gimpcurvestool.c:695 +#: ../app/gui/themes.c:248 ../app/tools/gimpcurvestool.c:711 #: ../app/tools/gimplevelstool.c:800 ../app/vectors/gimpvectors-export.c:81 #: ../app/xcf/xcf.c:452 #, c-format @@ -6121,8 +6091,8 @@ "When enabled, this will ensure that each pixel of an image gets mapped to a " "pixel on the screen." msgstr "" -"Når denne er aktiveret, vil dette sikre, at hvert pixel i et billede " -"bliver afbildet til en pixel på skærmen." +"Når denne er aktiveret, vil dette sikre, at hvert pixel i et billede bliver " +"afbildet til en pixel på skærmen." #: ../app/config/gimprc-blurbs.h:93 msgid "This is the distance in pixels where Guide and Grid snapping activates." @@ -6130,7 +6100,7 @@ "Dette er afstanden målt i pixels, hvor det aktiveres, at der rettes ind " "efter hjælpelinjer og gitter." -# scootergrisen: Frøudfyldningen? +# scootergrisen: seed fill starts - Frøudfyldningen? #: ../app/config/gimprc-blurbs.h:109 msgid "" "Tools such as fuzzy-select and bucket fill find regions based on a seed-fill " @@ -6151,9 +6121,8 @@ "This may affect the way your window manager decorates and handles these " "windows." msgstr "" -"Vinduestypehintet der sættes på dokvinduer og vinduet værktøjskasse. " -"Dette kan påvirke den måde din vindueshåndtering dekorerer og håndterer " -"vinduerne." +"Vinduestypehintet der sættes på dokvinduer og vinduet værktøjskasse. Dette " +"kan påvirke den måde din vindueshåndtering dekorerer og håndterer vinduerne." #: ../app/config/gimprc-blurbs.h:154 msgid "When enabled, the selected brush will be used for all tools." @@ -6163,7 +6132,8 @@ #: ../app/config/gimprc-blurbs.h:157 msgid "When enabled, the selected dynamics will be used for all tools." msgstr "" -"Når denne er aktiveret, vil den valgte dynamik blive brugt til alle værktøjer." +"Når denne er aktiveret, vil den valgte dynamik blive brugt til alle " +"værktøjer." #: ../app/config/gimprc-blurbs.h:163 msgid "When enabled, the selected gradient will be used for all tools." @@ -6174,7 +6144,8 @@ #: ../app/config/gimprc-blurbs.h:166 msgid "When enabled, the selected pattern will be used for all tools." msgstr "" -"Når denne er aktiveret, vil det valgte mønster blive brugt til alle værktøjer." +"Når denne er aktiveret, vil det valgte mønster blive brugt til alle " +"værktøjer." #: ../app/config/gimprc-blurbs.h:180 msgid "Sets the browser used by the help system." @@ -6193,8 +6164,8 @@ "When enabled, this will ensure that the full image is visible after a file " "is opened, otherwise it will be displayed with a scale of 1:1." msgstr "" -"Når denne er aktiveret, sikr dette at det komplette billede er synligt efter en fil er åbnet, ellers vil " -"den blive vist i skalaforholdet 1:1." +"Når denne er aktiveret, sikr dette at det komplette billede er synligt efter " +"en fil er åbnet, ellers vil den blive vist i skalaforholdet 1:1." #: ../app/config/gimprc-blurbs.h:201 msgid "" @@ -6208,8 +6179,7 @@ #: ../app/config/gimprc-blurbs.h:211 msgid "How many recently opened image filenames to keep on the File menu." msgstr "" -"Hvor mange filnavne over senest åbnede billeder, der skal gemmes i " -"filmenuen." +"Hvor mange filnavne over senest åbnede billeder, der skal gemmes i filmenuen." #: ../app/config/gimprc-blurbs.h:214 msgid "" @@ -6252,8 +6222,8 @@ "If enabled, the move tool sets the edited layer or path as active. This " "used to be the default behaviour in older versions." msgstr "" -"Hvis denne er aktiveret, vil flytteværktøjet gøre det redigerede lag eller den " -"redigerede bane aktiv. Det var standardopførslen i tidligere versioner." +"Hvis denne er aktiveret, vil flytteværktøjet gøre det redigerede lag eller " +"den redigerede bane aktiv. Det var standardopførslen i tidligere versioner." #: ../app/config/gimprc-blurbs.h:242 msgid "" @@ -6275,11 +6245,11 @@ "Conversely, on some X servers enabling this option results in faster " "painting." msgstr "" -"Når denne er aktiveret, vil X-serveren blive spurgt om musens aktuelle position ved " -"hver bevægelseshændelse, i stedet for at bero på positionshintet. Det " -"betyder, at maling med større pensler bør være mere præcis, men det kan være " -"langsommere. Omvendt, kan det på nogle X-servere resultere i hurtigere " -"maling." +"Når denne er aktiveret, vil X-serveren blive spurgt om musens aktuelle " +"position ved hver bevægelseshændelse, i stedet for at bero på " +"positionshintet. Det betyder, at maling med større pensler bør være mere " +"præcis, men det kan være langsommere. Omvendt, kan det på nogle X-servere " +"resultere i hurtigere maling." #: ../app/config/gimprc-blurbs.h:275 msgid "" @@ -6353,8 +6323,8 @@ "When enabled, all paint tools will show a preview of the current brush's " "outline." msgstr "" -"Når denne er aktiveret, vil alle tegneværktøjer vise en forhåndsvisning af den " -"aktuelle pensels omrids." +"Når denne er aktiveret, vil alle tegneværktøjer vise en forhåndsvisning af " +"den aktuelle pensels omrids." #: ../app/config/gimprc-blurbs.h:319 msgid "" @@ -6362,7 +6332,7 @@ "related help page. Without this button, the help page can still be reached " "by pressing F1." msgstr "" -"Når denne er aktiveret, vil vinduer vise en hjælpeknap, som giver adgang til " +"Når denne er aktiveret, vil dialoger vise en hjælpeknap, som giver adgang til " "den relaterede hjælpeside. Hjælpesiden kan stadig nås uden denne knap ved at " "trykke på F1." @@ -6379,43 +6349,41 @@ "When enabled, the menubar is visible by default. This can also be toggled " "with the \"View->Show Menubar\" command." msgstr "" -"Når denne er aktiveret, vises menulinjen som standard. Dette kan også slås til og fra " -"med kommandoen \"Vis->Vis menulinje\"." +"Når denne er aktiveret, vises menulinjen som standard. Dette kan også slås " +"til og fra med kommandoen \"Vis->Vis menulinje\"." #: ../app/config/gimprc-blurbs.h:332 msgid "" "When enabled, the rulers are visible by default. This can also be toggled " "with the \"View->Show Rulers\" command." msgstr "" -"Når denne er aktiveret, vises linealerne som standard. Dette kan også slås til og fra " -"med kommandoen \"Vis->Vis linealer\"." +"Når denne er aktiveret, vises linealerne som standard. Dette kan også slås " +"til og fra med kommandoen \"Vis->Vis linealer\"." -# scootergrisen: måske rullebjælker #: ../app/config/gimprc-blurbs.h:336 msgid "" "When enabled, the scrollbars are visible by default. This can also be " "toggled with the \"View->Show Scrollbars\" command." msgstr "" -"Når denne er aktiveret, vises rullepaneler som standard. Dette kan også slås til og fra " -"med kommandoen \"Vis->Vis rullepaneler\"." +"Når denne er aktiveret, vises rullebjælker som standard. Dette kan også slås " +"til og fra med kommandoen \"Vis->Vis rullebjælker\"." #: ../app/config/gimprc-blurbs.h:340 msgid "" "When enabled, the statusbar is visible by default. This can also be toggled " "with the \"View->Show Statusbar\" command." msgstr "" -"Når denne er aktiveret, vises statuslinjen som standard. Dette kan også slås til og fra " -"med kommandoen \"Vis->Vis statuslinje\"." +"Når denne er aktiveret, vises statuslinjen som standard. Dette kan også slås " +"til og fra med kommandoen \"Vis->Vis statuslinje\"." #: ../app/config/gimprc-blurbs.h:344 msgid "" "When enabled, the selection is visible by default. This can also be toggled " "with the \"View->Show Selection\" command." msgstr "" -"Når denne er aktiveret, vises markeringen som standard. Dette kan også slås til og fra " -"med kommandoen \"Vis->Vis markering\"." +"Når denne er aktiveret, vises markeringen som standard. Dette kan også slås " +"til og fra med kommandoen \"Vis->Vis markering\"." -# scootergrisen: tjek hvad der er bedst (se lærredets kanter) #: ../app/config/gimprc-blurbs.h:348 msgid "" "When enabled, the layer boundary is visible by default. This can also be " @@ -6437,16 +6405,16 @@ "When enabled, the grid is visible by default. This can also be toggled with " "the \"View->Show Grid\" command." msgstr "" -"Når denne er aktiveret, vises gitteret som standard. Dette kan også slås til og fra med " -"kommandoen \"Vis->Vis gitter\"." +"Når denne er aktiveret, vises gitteret som standard. Dette kan også slås til " +"og fra med kommandoen \"Vis->Vis gitter\"." #: ../app/config/gimprc-blurbs.h:360 msgid "" "When enabled, the sample points are visible by default. This can also be " "toggled with the \"View->Show Sample Points\" command." msgstr "" -"Når denne er aktiveret, vises prøvepunkter som standard. Dette kan også slås til og fra " -"med kommandoen \"Vis->Vis prøvepunkter\"." +"Når denne er aktiveret, vises prøvepunkter som standard. Dette kan også slås " +"til og fra med kommandoen \"Vis->Vis prøvepunkter\"." #: ../app/config/gimprc-blurbs.h:364 msgid "Show a tooltip when the pointer hovers over an item." @@ -6543,8 +6511,7 @@ #: ../app/config/gimprc-blurbs.h:426 msgid "Show the currently selected brush, pattern and gradient in the toolbox." -msgstr "" -"Vis den valgte pensel, mønster og farveovergang i værktøjskassen." +msgstr "Vis den valgte pensel, mønster og farveovergang i værktøjskassen." #: ../app/config/gimprc-blurbs.h:429 msgid "Show the currently active image in the toolbox." @@ -6563,8 +6530,8 @@ "When enabled, GIMP will not save an image if it has not been changed since " "it was opened." msgstr "" -"Når denne er aktiveret, vil GIMP ikke gemme et billede, hvis det ikke er blevet " -"ændret siden, det blev åbnet." +"Når denne er aktiveret, vil GIMP ikke gemme et billede, hvis det ikke er " +"blevet ændret siden, det blev åbnet." #: ../app/config/gimprc-blurbs.h:445 msgid "" @@ -6659,7 +6626,6 @@ msgid "Selection" msgstr "Markering" -# scootergrisen: måske "Aktive lag" eller "Aktiv lag" er bedre, ligesom "Aktiv kanal" og "Aktiv bane" #: ../app/core/core-enums.c:219 msgctxt "align-reference-type" msgid "Active layer" @@ -6690,7 +6656,6 @@ msgid "White" msgstr "Hvid" -# scootergrisen: Fyldtype for lag : Gennemsigtig #: ../app/core/core-enums.c:256 msgctxt "fill-type" msgid "Transparency" @@ -6881,11 +6846,10 @@ msgid "Small" msgstr "Små" -# scootergrisen: se om medium er bedre #: ../app/core/core-enums.c:591 msgctxt "view-size" msgid "Medium" -msgstr "Mellem/medium" +msgstr "Medium" #: ../app/core/core-enums.c:592 msgctxt "view-size" @@ -7184,7 +7148,6 @@ msgid "Lock/Unlock alpha channel" msgstr "Lås/oplås alfa-kanal" -# scootergrisen: måske stands #: ../app/core/core-enums.c:891 msgctxt "undo-type" msgid "Suspend group layer resize" @@ -7360,7 +7323,6 @@ msgid "Force" msgstr "Gennemtving" -# scootergrisen: måske højde-/breddeforhold #: ../app/core/core-enums.c:1298 msgctxt "dynamics-output-type" msgid "Aspect ratio" @@ -7376,11 +7338,10 @@ msgid "Rate" msgstr "Hastighed" -# scootergrisen: måske "Flow" #: ../app/core/core-enums.c:1301 msgctxt "dynamics-output-type" msgid "Flow" -msgstr "Flyd" +msgstr "Flow" # scootergrisen: måske flimmer eller rysten #: ../app/core/core-enums.c:1302 @@ -7599,8 +7560,8 @@ "This might be an obsolete GIMP brush file, try loading it as image and save " "it again." msgstr "" -"Fatal fortolkningsfejl i penselfilen \"%s\": penseldybden er ikke understøttet" -"%d\n" +"Fatal fortolkningsfejl i penselfilen \"%s\": penseldybden er ikke " +"understøttet%d\n" "GIMP-pensler skal være gråtone eller RGBA.\n" "Dette kan være en forældet GIMP-penselfil. Prøv at indlæs den som et billede " "og gem den igen." @@ -7611,8 +7572,8 @@ "Fatal parse error in brush file '%s': Unsupported brush depth %d\n" "GIMP brushes must be GRAY or RGBA." msgstr "" -"Fatal fortolkningsfejl i penselfilen \"%s\": penseldybden er ikke understøttet" -"%d\n" +"Fatal fortolkningsfejl i penselfilen \"%s\": penseldybden er ikke " +"understøttet%d\n" "GIMP-pensler skal være gråtone eller RGBA." #: ../app/core/gimpbrush-load.c:471 ../app/core/gimpbrush-load.c:909 @@ -7686,10 +7647,9 @@ msgid "Brush Hardness" msgstr "Penselhårdhed" -# scootergrisen: måske "højde-bredde-forhold" #: ../app/core/gimpbrushgenerated.c:159 ../app/paint/gimppaintoptions.c:151 msgid "Brush Aspect Ratio" -msgstr "Størrelsesforhold for pensel" +msgstr "Højde-bredde-forhold for pensel" #: ../app/core/gimpbrushgenerated.c:166 ../app/paint/gimppaintoptions.c:155 msgid "Brush Angle" @@ -7814,7 +7774,6 @@ msgid "Channel cannot be lowered more." msgstr "Kanalen kan ikke sænkes mere." -# scootergrisen: feather ~ udtynd/pelset #: ../app/core/gimpchannel.c:310 msgctxt "undo-type" msgid "Feather Channel" @@ -8051,7 +8010,6 @@ msgid "Threshold" msgstr "Tærskel" -# scootergrisen: måske "Omvend" #: ../app/core/gimpdrawable-transform.c:677 msgctxt "undo-type" msgid "Flip" @@ -8827,7 +8785,6 @@ msgid "Stroke Selection" msgstr "Bestryg markering" -# scootergrisen: feather ~ udtynd/pelset #: ../app/core/gimpselection.c:172 msgctxt "undo-type" msgid "Feather Selection" @@ -8986,7 +8943,7 @@ #: ../app/dialogs/about-dialog.c:123 msgid "Visit the GIMP website" -msgstr "Besøg GIMP's websted" +msgstr "Besøg GIMPs websted" #. Translators: insert your names here, #. separated by newline @@ -9200,7 +9157,7 @@ "save the image to the GIMP XCF format, use File→Save instead." msgstr "" "Du kan bruge denne dialog til at eksportere diverse filformater. Hvis du vil " -"gemme billedet i GIMP's XCF-format, så brug i stedet Fil→Gem." +"gemme billedet i GIMPs XCF-format, så brug i stedet Fil→Gem." #: ../app/dialogs/file-save-dialog.c:605 msgid "Take me to the Save dialog" @@ -9215,8 +9172,8 @@ "You can use this dialog to save to the GIMP XCF format. Use File→Export to " "export to other file formats." msgstr "" -"Du kan bruge denne dialog til at gemme i GIMP's XCF-format. Brug Fil→Eksportér " -"for at eksportere andre filformater." +"Du kan bruge denne dialog til at gemme i GIMPs XCF-format. Brug " +"Fil→Eksportér for at eksportere andre filformater." #: ../app/dialogs/file-save-dialog.c:612 msgid "Take me to the Export dialog" @@ -9396,7 +9353,7 @@ "To edit a shortcut key, click on the corresponding row and type a new " "accelerator, or press backspace to clear." msgstr "" -"Klik på en række og tryk på en ny genvejstast, eller tryk på tilbage-tasten " +"Klik på en række og tryk på en ny genvejstast, eller tryk på tilbagetasten " "for at rydde." #: ../app/dialogs/keyboard-shortcuts-dialog.c:81 @@ -9598,11 +9555,10 @@ msgid "I_nterval:" msgstr "_Interval:" -# scootergrisen: måske "Forhåndsvisning" #. The "Preview" frame #: ../app/dialogs/palette-import-dialog.c:361 msgid "Preview" -msgstr "Forhåndsvis" +msgstr "Forhåndsvisning" #: ../app/dialogs/palette-import-dialog.c:382 msgid "The selected source contains no colors." @@ -9649,8 +9605,8 @@ "Your input device settings will be reset to default values the next time you " "start GIMP." msgstr "" -"Dine indstillinger for inputenheder vil blive nulstillet til standardværdierne, " -"næste gang du starter GIMP." +"Dine indstillinger for inputenheder vil blive nulstillet til " +"standardværdierne, næste gang du starter GIMP." #: ../app/dialogs/preferences-dialog.c:682 msgid "" @@ -9668,10 +9624,9 @@ msgid "Show _rulers" msgstr "Vis lineale_r" -# scootergrisen: måske rullebjælker #: ../app/dialogs/preferences-dialog.c:1275 msgid "Show scroll_bars" -msgstr "Vis rulle_paneler" +msgstr "Vis rulle_bjælker" #: ../app/dialogs/preferences-dialog.c:1278 msgid "Show s_tatusbar" @@ -9681,7 +9636,6 @@ msgid "Show s_election" msgstr "Vis mark_ering" -# scootergrisen: tjek hvad der er bedst (se lærredets kanter) #: ../app/dialogs/preferences-dialog.c:1289 msgid "Show _layer boundary" msgstr "Vis _lagets kant" @@ -10118,7 +10072,7 @@ #. Pixels #: ../app/dialogs/preferences-dialog.c:2335 -#: ../app/display/gimpcursorview.c:206 ../app/widgets/gimpgrideditor.c:199 +#: ../app/display/gimpcursorview.c:208 ../app/widgets/gimpgrideditor.c:199 #: ../app/widgets/gimpgrideditor.c:231 msgid "Pixels" msgstr "Pixels" @@ -10241,11 +10195,11 @@ #: ../app/dialogs/preferences-dialog.c:2611 msgid "Additional Input Controllers" -msgstr "Yderligere inputcontrollere" +msgstr "Yderligere inputstyreenhed" #: ../app/dialogs/preferences-dialog.c:2614 msgid "Input Controllers" -msgstr "Inputcontrollere" +msgstr "Inputstyreenheder" #: ../app/dialogs/preferences-dialog.c:2630 msgid "Window Management" @@ -10435,18 +10389,16 @@ msgid "H_eight:" msgstr "_Højde:" -# scootergrisen: stor eller lille x? #. the resolution labels #: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:260 #: ../app/widgets/gimptemplateeditor.c:309 msgid "_X resolution:" -msgstr "_X-opløsning:" +msgstr "_x-opløsning:" -# scootergrisen: stor eller lille y? #: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:263 #: ../app/widgets/gimptemplateeditor.c:316 msgid "_Y resolution:" -msgstr "_Y-opløsning:" +msgstr "_y-opløsning:" #: ../app/dialogs/print-size-dialog.c:240 ../app/widgets/gimpsizebox.c:256 #, c-format @@ -10703,51 +10655,51 @@ msgid "Line spacing" msgstr "Linjemellemrum" -#: ../app/display/gimpcursorview.c:216 ../app/display/gimpcursorview.c:222 -#: ../app/display/gimpcursorview.c:241 ../app/display/gimpcursorview.c:247 -#: ../app/display/gimpcursorview.c:266 ../app/display/gimpcursorview.c:272 -#: ../app/display/gimpcursorview.c:288 ../app/display/gimpcursorview.c:295 -#: ../app/display/gimpcursorview.c:672 ../app/display/gimpcursorview.c:673 -#: ../app/display/gimpcursorview.c:674 ../app/display/gimpcursorview.c:675 -#: ../app/display/gimpcursorview.c:788 ../app/display/gimpcursorview.c:789 -#: ../app/display/gimpcursorview.c:790 ../app/display/gimpcursorview.c:791 +#: ../app/display/gimpcursorview.c:218 ../app/display/gimpcursorview.c:224 +#: ../app/display/gimpcursorview.c:243 ../app/display/gimpcursorview.c:249 +#: ../app/display/gimpcursorview.c:268 ../app/display/gimpcursorview.c:274 +#: ../app/display/gimpcursorview.c:290 ../app/display/gimpcursorview.c:297 +#: ../app/display/gimpcursorview.c:688 ../app/display/gimpcursorview.c:689 +#: ../app/display/gimpcursorview.c:690 ../app/display/gimpcursorview.c:691 +#: ../app/display/gimpcursorview.c:804 ../app/display/gimpcursorview.c:805 +#: ../app/display/gimpcursorview.c:806 ../app/display/gimpcursorview.c:807 #: ../app/widgets/gimpcolorframe.c:633 msgid "n/a" msgstr "-" -#: ../app/display/gimpcursorview.c:219 ../app/display/gimpcursorview.c:244 -#: ../app/display/gimpcursorview.c:269 +#: ../app/display/gimpcursorview.c:221 ../app/display/gimpcursorview.c:246 +#: ../app/display/gimpcursorview.c:271 #: ../app/widgets/gimpdeviceinfoeditor.c:138 msgid "X" msgstr "X" -#: ../app/display/gimpcursorview.c:225 ../app/display/gimpcursorview.c:250 -#: ../app/display/gimpcursorview.c:275 +#: ../app/display/gimpcursorview.c:227 ../app/display/gimpcursorview.c:252 +#: ../app/display/gimpcursorview.c:277 #: ../app/widgets/gimpdeviceinfoeditor.c:139 msgid "Y" msgstr "Y" #. Units -#: ../app/display/gimpcursorview.c:231 +#: ../app/display/gimpcursorview.c:233 msgid "Units" msgstr "Enheder" #. Selection Bounding Box -#: ../app/display/gimpcursorview.c:256 +#: ../app/display/gimpcursorview.c:258 msgid "Selection Bounding Box" msgstr "Markeringings afgrænsningskant" #. Width -#: ../app/display/gimpcursorview.c:292 +#: ../app/display/gimpcursorview.c:294 msgid "W" msgstr "B" #. Height -#: ../app/display/gimpcursorview.c:299 +#: ../app/display/gimpcursorview.c:301 msgid "H" msgstr "H" -#: ../app/display/gimpcursorview.c:328 +#: ../app/display/gimpcursorview.c:330 msgid "_Sample Merged" msgstr "Udtag prøve _forenet" @@ -10994,21 +10946,20 @@ #: ../app/gegl/gimpoperationcagecoefcalc.c:67 msgid "Compute a set of coefficient buffer for the GIMP cage tool" -msgstr "Udregn et sæt koefficient-buffere for GIMP's bur-værktøjet" +msgstr "Udregn et sæt koefficient-buffere for GIMPs bur-værktøjet" #: ../app/gegl/gimpoperationcagetransform.c:106 msgid "" "Convert a set of coefficient buffer to a coordinate buffer for the GIMP cage " "tool" msgstr "" -"Konvertér et sæt koefficient-buffere til en koordinat-buffer for GIMP's bur-" +"Konvertér et sæt koefficient-buffere til en koordinat-buffer for GIMPs bur-" "værktøjet" #: ../app/gegl/gimpoperationcagetransform.c:128 msgid "Fill with plain color" msgstr "Udfyld med ensartet farve" -# scootergrisen: se om kan gøre strengen lidt kortere hvis det kan lade sig gøre. Så der ikke er vandret scrollbar. #: ../app/gegl/gimpoperationcagetransform.c:129 #: ../app/tools/gimpcageoptions.c:144 msgid "Fill the original position of the cage with a plain color" @@ -11080,7 +11031,6 @@ msgid "Ink Blob Size" msgstr "Blækklattens størrelse" -# scootergrisen: måske højde-/breddeforhold #: ../app/paint/gimpinkoptions.c:99 msgid "Ink Blob Aspect Ratio" msgstr "Blækklattens højde-bredde-forhold" @@ -11117,10 +11067,9 @@ msgid "Distance of scattering" msgstr "Spredningsareal" -# scootergrisen: måske toner ud #: ../app/paint/gimppaintoptions.c:185 msgid "Distance over which strokes fade out" -msgstr "Afstanden hvor strøg nedtoner" +msgstr "Afstanden hvor strøg toner ud" #: ../app/paint/gimppaintoptions.c:193 msgid "Reverse direction of fading" @@ -11228,7 +11177,6 @@ msgid "Plug-In" msgstr "Plugin" -# scootergrisen: Perspektiv/Perspektivér? #: ../app/pdb/drawable-transform-cmds.c:345 #: ../app/pdb/drawable-transform-cmds.c:443 #: ../app/pdb/item-transform-cmds.c:262 ../app/pdb/transform-tools-cmds.c:163 @@ -11389,8 +11337,7 @@ #, c-format msgid "Item '%s' (%d) cannot be used because it is attached to another image" msgstr "" -"Elementet \"%s\" (%d) kan ikke bruges, da det er vedhæftet et " -"andet billede" +"Elementet \"%s\" (%d) kan ikke bruges, da det er vedhæftet et andet billede" #: ../app/pdb/gimppdb-utils.c:392 #, c-format @@ -11674,12 +11621,12 @@ "Pluginet gik ned: \"%s\"\n" "(%s)\n" "\n" -"Det døende modul kan have skabt uorden i GIMP's interne tilstand. Du kan evt. " -"gemme dine billeder og genstarte GIMP for at være på den sikre side." +"Det døende modul kan have skabt uorden i GIMPs interne tilstand. Du kan " +"evt. gemme dine billeder og genstarte GIMP for at være på den sikre side." -#: ../app/plug-in/gimppluginmanager-call.c:173 -#: ../app/plug-in/gimppluginmanager-call.c:223 -#: ../app/plug-in/gimppluginmanager-call.c:321 +#: ../app/plug-in/gimppluginmanager-call.c:185 +#: ../app/plug-in/gimppluginmanager-call.c:235 +#: ../app/plug-in/gimppluginmanager-call.c:333 #, c-format msgid "Failed to run plug-in \"%s\"" msgstr "Kunne ikke køre plugin \"%s\"" @@ -11706,11 +11653,11 @@ #: ../app/plug-in/gimppluginmanager.c:296 msgid "Plug-In Interpreters" -msgstr "Plugin-fortolkere" +msgstr "Pluginfortolkere" #: ../app/plug-in/gimppluginmanager.c:303 msgid "Plug-In Environment" -msgstr "Plugin-miljø" +msgstr "Pluginmiljø" #: ../app/plug-in/gimppluginprocedure.c:978 #, c-format @@ -11851,8 +11798,8 @@ "The new text layout cannot be generated. Most likely the font size is too " "big." msgstr "" -"Det nye tekstlag kan ikke genereres. Skriftstørrelsen er formodentligt " -"for stor." +"Det nye tekstlag kan ikke genereres. Skriftstørrelsen er formodentligt for " +"stor." #: ../app/text/text-enums.c:23 msgctxt "text-box-mode" @@ -11889,10 +11836,9 @@ msgid "Rate" msgstr "Hastighed" -# scootergrisen: måske "Flow" #: ../app/tools/gimpairbrushtool.c:97 msgid "Flow" -msgstr "Flyd" +msgstr "Flow" #: ../app/tools/gimpalignoptions.c:91 msgid "Reference image object a layer will be aligned on" @@ -12036,10 +11982,9 @@ msgid "Blend Tool: Fill selected area with a color gradient" msgstr "Blandingsværktøj: Udfyld markeret område med en farveovergang" -# scootergrisen: måske bare "Bland"? #: ../app/tools/gimpblendtool.c:111 msgid "Blen_d" -msgstr "_Blanding/Bland" +msgstr "_Bland" #: ../app/tools/gimpblendtool.c:166 msgid "Blend does not operate on indexed layers." @@ -12549,70 +12494,70 @@ msgid "There is no active layer to crop." msgstr "Der er ikke noget aktivt lag at beskære." -#: ../app/tools/gimpcurvestool.c:144 +#: ../app/tools/gimpcurvestool.c:145 msgid "Curves" msgstr "Kurver" -#: ../app/tools/gimpcurvestool.c:145 +#: ../app/tools/gimpcurvestool.c:146 msgid "Curves Tool: Adjust color curves" msgstr "Kurveværktøj: Justér farvekurver" -#: ../app/tools/gimpcurvestool.c:146 +#: ../app/tools/gimpcurvestool.c:147 msgid "_Curves..." msgstr "_Kurver..." -#: ../app/tools/gimpcurvestool.c:172 +#: ../app/tools/gimpcurvestool.c:174 msgid "Adjust Color Curves" msgstr "Justér farvekurver" -#: ../app/tools/gimpcurvestool.c:174 +#: ../app/tools/gimpcurvestool.c:176 msgid "Import Curves" msgstr "Importér kurver" -#: ../app/tools/gimpcurvestool.c:175 +#: ../app/tools/gimpcurvestool.c:177 msgid "Export Curves" msgstr "Eksportér kurver" -#: ../app/tools/gimpcurvestool.c:226 +#: ../app/tools/gimpcurvestool.c:239 msgid "Curves does not operate on indexed layers." msgstr "Kurver virker ikke på indekserede lag." -#: ../app/tools/gimpcurvestool.c:334 +#: ../app/tools/gimpcurvestool.c:348 msgid "Click to add a control point" msgstr "Klik for at tilføje et kontrolpunkt" -#: ../app/tools/gimpcurvestool.c:339 +#: ../app/tools/gimpcurvestool.c:353 msgid "Click to add control points to all channels" msgstr "Klik for at tilføje kontrolpunkter til alle kanaler" -#: ../app/tools/gimpcurvestool.c:344 +#: ../app/tools/gimpcurvestool.c:358 msgid "Click to locate on curve (try Shift, Ctrl)" msgstr "Klik for at finde på kurve (prøv Skift, Ctrl)" -#: ../app/tools/gimpcurvestool.c:457 ../app/tools/gimplevelstool.c:384 +#: ../app/tools/gimpcurvestool.c:473 ../app/tools/gimplevelstool.c:384 msgid "Cha_nnel:" msgstr "Ka_nal:" -#: ../app/tools/gimpcurvestool.c:483 ../app/tools/gimplevelstool.c:408 +#: ../app/tools/gimpcurvestool.c:499 ../app/tools/gimplevelstool.c:408 msgid "R_eset Channel" msgstr "N_ulstil kanal" -#: ../app/tools/gimpcurvestool.c:574 ../app/widgets/gimpdeviceinfoeditor.c:461 +#: ../app/tools/gimpcurvestool.c:590 ../app/widgets/gimpdeviceinfoeditor.c:461 msgid "Curve _type:" msgstr "Kurve_type:" -#: ../app/tools/gimpcurvestool.c:651 ../app/tools/gimplevelstool.c:756 +#: ../app/tools/gimpcurvestool.c:667 ../app/tools/gimplevelstool.c:756 #, c-format msgid "Could not read header from '%s': %s" msgstr "Kunne ikke læse hoved fra \"%s\": %s" -#: ../app/tools/gimpcurvestool.c:724 +#: ../app/tools/gimpcurvestool.c:740 msgid "Use _old curves file format" msgstr "Brug _gammelt filformat til kurver" #: ../app/tools/gimpdesaturatetool.c:78 msgid "Desaturate Tool: Turn colors into shades of gray" -msgstr "Afmætningsværktøj: Lav farver om til gråtoner" +msgstr "Afmætningsværktøj: Lav farver om til toner af grå" # scootergrisen: måske _Afmæt/_Afmætning.... Se Posterisér/Posterisering #: ../app/tools/gimpdesaturatetool.c:79 @@ -12635,10 +12580,10 @@ msgid "Dodge / Burn" msgstr "Lysne/brænde" -# scootergrisen: svært? #: ../app/tools/gimpdodgeburntool.c:74 msgid "Dodge / Burn Tool: Selectively lighten or darken using a brush" -msgstr "Lysne-/brændeværktøj: Selektivt lysere eller mørkere ved brug af en pensel" +msgstr "" +"Lysne-/brændeværktøj: Selektivt lysere eller mørkere ved brug af en pensel" #: ../app/tools/gimpdodgeburntool.c:75 msgid "Dod_ge / Burn" @@ -12735,24 +12680,20 @@ msgid "Anti erase (%s)" msgstr "Antislet (%s)" -# scootergrisen: måske "Retning for omvending" #: ../app/tools/gimpflipoptions.c:66 msgid "Direction of flipping" msgstr "Retning for vending" -# scootergrisen: forslå at ret til "Transform" i kildesprog, ligesom de andre værktøjer rotér, skalér osv. #: ../app/tools/gimpflipoptions.c:133 msgid "Affect:" msgstr "Påvirk:" -# scootergrisen: forslå at ret til "Direction (%s)" som bruges af andre værktøj #. tool toggle #: ../app/tools/gimpflipoptions.c:142 #, c-format msgid "Flip Type (%s)" msgstr "Vendingstype (%s)" -# scootergrisen: måske "Omvend" #: ../app/tools/gimpfliptool.c:84 msgid "Flip" msgstr "Vend" @@ -12776,7 +12717,6 @@ msgid "Flip vertically" msgstr "Vend lodret" -# scootergrisen: måske "Omvend" #. probably this is not actually reached today, but #. * could be if someone defined FLIP_DIAGONAL, say... #. @@ -12900,7 +12840,7 @@ msgid "" "Free Select Tool: Select a hand-drawn region with free and polygonal segments" msgstr "" -"Fri markeringsværktøj: Markér et håndtegnet område med frie og polygonale " +"Frimarkeringsværktøj: Markér et håndtegnet område med frie og polygonale " "segmenter" #: ../app/tools/gimpfreeselecttool.c:198 @@ -13084,10 +13024,9 @@ msgid "Settings saved to '%s'" msgstr "Indstillinger gemt i \"%s\"" -# scootergrisen: måske "_Forhåndsvisning" #: ../app/tools/gimpimagemaptool.c:363 msgid "_Preview" -msgstr "_Forhåndsvis" +msgstr "_Forhåndsvisning" #. adjust sliders #: ../app/tools/gimpinkoptions-gui.c:54 @@ -13250,7 +13189,6 @@ msgid "Use _old levels file format" msgstr "Brug _gammelt niveaufilformat" -# scootergrisen: accommodate? #: ../app/tools/gimpmagnifyoptions.c:79 msgid "Resize image window to accommodate new zoom level" msgstr "Tilpas størrelsen på billedvinduet for at rumme det nye zoomniveau" @@ -13429,12 +13367,10 @@ msgid "Reset size to brush's native size" msgstr "Nulstil størrelse til pensels normale størrelse" -# scootergrisen: måske højde-/breddeforhold #: ../app/tools/gimppaintoptions-gui.c:157 msgid "Aspect Ratio" msgstr "Højde-bredde-forhold" -# scootergrisen: måske højde-/breddeforhold #: ../app/tools/gimppaintoptions-gui.c:174 msgid "Reset aspect ratio to brush's native" msgstr "Nulstil højde-bredde-forhold til penslens standard" @@ -13616,7 +13552,6 @@ msgid "Unit of selection size" msgstr "Enhed for markeringsstørrelse" -# scootergrisen: måske højde-/breddeforhold #: ../app/tools/gimprectangleoptions.c:187 msgid "Enable lock of aspect ratio, width, height or size" msgstr "Aktivér låsning af højde-bredde-forhold, bredde, højde eller størrelse" @@ -13650,7 +13585,6 @@ msgid "Expand from center" msgstr "Udvid fra midten" -# scootergrisen: måske find et bedre ord. Måske fastgjort #: ../app/tools/gimprectangleoptions.c:862 msgid "Fixed:" msgstr "Fast:" @@ -13717,15 +13651,13 @@ msgid "Selection criterion" msgstr "Markeringskriterium" -# scootergrisen: måske "Vælg gennemsigtige områder" er bedre #: ../app/tools/gimpregionselectoptions.c:204 msgid "Select transparent areas" -msgstr "Markér gennemsigtige områder" +msgstr "Vælg gennemsigtige områder" -# scootergrisen: måske "Vælg efter:" er bedre #: ../app/tools/gimpregionselectoptions.c:226 msgid "Select by:" -msgstr "Markér med:" +msgstr "Vælg efter:" #: ../app/tools/gimpregionselecttool.c:165 msgid "Move the mouse to change threshold" @@ -13779,12 +13711,10 @@ msgid "Scale to %d x %d" msgstr "Skalér til %d x %d" -# scootergrisen: feather ~ udtynd/pelset #: ../app/tools/gimpselectionoptions.c:84 msgid "Enable feathering of selection edges" msgstr "Aktivér udtyndning for markeringskanter" -# scootergrisen: feather ~ udtynd/pelset #: ../app/tools/gimpselectionoptions.c:90 msgid "Radius of feathering" msgstr "Radius af udtyndning" @@ -13793,7 +13723,6 @@ msgid "Antialiasing" msgstr "Udjævning" -# scootergrisen: feather ~ udtynd/pelset #: ../app/tools/gimpselectionoptions.c:281 msgid "Feather edges" msgstr "Udtynd kanter" @@ -13943,12 +13872,9 @@ msgid "Font" msgstr "Skrifttype" -# scootergrisen: se om kan finde på noget bedre, editor er et ekstra vindue/dialog hvor der er lidt ekstra muligheder -# scootergrisen: før stod der "Brug tekstredigering" -# scootergrisen: forslå at rette "Use editor" til "Use editor window" #: ../app/tools/gimptextoptions.c:535 msgid "Use editor" -msgstr "Brug redigeringsvindue" +msgstr "Brug redigeringsdialog" #: ../app/tools/gimptextoptions.c:555 msgid "Hinting:" @@ -13962,7 +13888,6 @@ msgid "Color:" msgstr "Farve:" -# scootergrisen: det er vist til hvordan teksten skal stå vandret. Se om kan finde noget bedre #: ../app/tools/gimptextoptions.c:570 msgid "Justify:" msgstr "Justering:" @@ -14063,10 +13988,9 @@ msgid "How to clip" msgstr "Sådan beskæres" -# scootergrisen: måske "Forhåndsvis det transformerede billede" #: ../app/tools/gimptransformoptions.c:117 msgid "Show a preview of the transformed image" -msgstr "Vis en forhåndsvisning af det transformerede billede" +msgstr "Forhåndsvis det transformerede billede" #: ../app/tools/gimptransformoptions.c:122 msgid "Opacity of the preview image" @@ -14118,13 +14042,11 @@ msgid "Limit rotation steps to 15 degrees" msgstr "Begræns rotationstrin til 15 grader" -# scootergrisen: måske "højde-bredde-forhold" #: ../app/tools/gimptransformoptions.c:351 #, c-format msgid "Keep aspect (%s)" -msgstr "Behold størrelsesforhold (%s)" +msgstr "Bevar højde-bredde (%s)" -# scootergrisen: måske højde-/breddeforhold #: ../app/tools/gimptransformoptions.c:352 msgid "Keep the original aspect ratio" msgstr "Bevar det oprindelige højde-bredde-forhold" @@ -14162,7 +14084,6 @@ msgid "Polygonal" msgstr "Polygonal" -# scootergrisen: måske Føj til #: ../app/tools/gimpvectoroptions.c:178 #, c-format msgid "" @@ -14322,7 +14243,6 @@ msgid "There is no active layer or channel to stroke to" msgstr "Der er ikke noget aktivt lag eller en aktiv kanal at bestryge" -# scootergrisen: måske højde-/breddeforhold #: ../app/tools/tools-enums.c:150 msgctxt "rectangle-tool-fixed-rule" msgid "Aspect ratio" @@ -14353,7 +14273,6 @@ msgid "Fixed size" msgstr "Fast størrelse" -# scootergrisen: måske højde-/breddeforhold #: ../app/tools/tools-enums.c:184 msgctxt "rect-select-mode" msgid "Fixed aspect ratio" @@ -14570,7 +14489,6 @@ msgid "Hardness" msgstr "Hårdhed" -# scootergrisen: måske højde-/breddeforhold #: ../app/widgets/gimpbrusheditor.c:188 msgid "Aspect ratio" msgstr "Højde-bredde-forhold" @@ -14693,7 +14611,6 @@ msgid "Color index:" msgstr "Farveindeks:" -# scootergrisen: se om kan finde noget bedre. Står ud fra box med hexværdi som AABBCC #: ../app/widgets/gimpcolormapeditor.c:210 msgid "HTML notation:" msgstr "HTML-notation:" @@ -14912,7 +14829,7 @@ #: ../app/widgets/gimpcontrollerlist.c:635 msgid "Configure Input Controller" -msgstr "Indstil inputcontroller" +msgstr "Indstil inputstyreenhed" #: ../app/widgets/gimpcontrollermouse.c:70 #: ../app/widgets/gimpcontrollermouse.c:73 @@ -15033,7 +14950,6 @@ msgid "Save" msgstr "Gem" -# scootergrisen: måske "Nulstil" #: ../app/widgets/gimpdataeditor.c:223 msgid "Revert" msgstr "Genindlæs" @@ -15419,7 +15335,7 @@ #: ../app/widgets/gimphelp.c:712 msgid "GIMP user manual is missing" -msgstr "GIMP's brugermanual mangler" +msgstr "GIMPs brugermanual mangler" #: ../app/widgets/gimphelp.c:719 msgid "_Read Online" @@ -15427,7 +15343,7 @@ #: ../app/widgets/gimphelp.c:743 msgid "The GIMP user manual is not installed on your computer." -msgstr "GIMP's brugermanual er ikke installeret på din computer." +msgstr "GIMPs brugermanual er ikke installeret på din computer." #: ../app/widgets/gimphelp.c:746 msgid "" @@ -15514,15 +15430,13 @@ msgid "Size in memory:" msgstr "Størrelse i hukommelse:" -# scootergrisen: måske "Fortryd-trin:" eller "Fortrydelsestrin:" #: ../app/widgets/gimpimagepropview.c:144 msgid "Undo steps:" -msgstr "Fortryd trin:" +msgstr "Fortrydelsestrin:" -# scootergrisen: måske "Omgør-trin:" eller "Omgørelsestrin:" #: ../app/widgets/gimpimagepropview.c:147 msgid "Redo steps:" -msgstr "Omgør trin:" +msgstr "Omgørelsestrin:" #: ../app/widgets/gimpimagepropview.c:152 msgid "Number of pixels:" @@ -15677,12 +15591,10 @@ msgid "_Line Style" msgstr "_Linjetype" -# scootergrisen: find noget bedre #: ../app/widgets/gimpstrokeeditor.c:160 msgid "_Cap style:" msgstr "_Endestil:" -# scootergrisen: find noget bedre #: ../app/widgets/gimpstrokeeditor.c:166 msgid "_Join style:" msgstr "_Koblingsstil:" @@ -15825,7 +15737,6 @@ "%s-klik for at gennemtvinge opdatering, selv hvis forhåndsvisningen er " "opdateret" -# scootergrisen: måske "_Forhåndsvisning" #: ../app/widgets/gimpthumbbox.c:347 msgid "Pr_eview" msgstr "_Forhåndsvisning" @@ -15968,7 +15879,6 @@ msgid "Apply stored font" msgstr "Anvend gemt skrifttype" -# scootergrisen: måske "Forudindstilling for %s" #: ../app/widgets/gimptoolpreseteditor.c:292 #, c-format msgid "%s Preset" @@ -15988,7 +15898,7 @@ #: ../app/widgets/gimpuimanager.c:744 msgid "Please make sure the menu XML files are correctly installed." -msgstr "Kontroller at XML-filerne til menuen er korrekt installeret." +msgstr "Sørg for at XML-filerne til menuen er korrekt installeret." #: ../app/widgets/gimpuimanager.c:750 #, c-format @@ -16221,12 +16131,10 @@ msgid "round" msgstr "rund" -# scootergrisen: feather ~ udtynd/pelset -# scootergrisen: måske "uklar" #. fuzzy as in a feathered, blurred, unfocused, soft brush #: ../data/tags/gimp-tags-default.xml.in.h:3 msgid "fuzzy" -msgstr "pelset" +msgstr "sløret" #: ../desktop/gimp.appdata.xml.in.h:1 msgid "" diff -Nru gimp-2.8.18/po/de.po gimp-2.8.20/po/de.po --- gimp-2.8.18/po/de.po 2016-05-25 22:26:48.000000000 +0000 +++ gimp-2.8.20/po/de.po 2017-01-28 19:08:48.000000000 +0000 @@ -19,17 +19,17 @@ msgstr "" "Project-Id-Version: gimp 2.8\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-28 14:57+0000\n" -"PO-Revision-Date: 2016-03-28 17:00+0200\n" -"Last-Translator: Mario Blättermann \n" +"product=gimp&keywords=I18N+L10N&component=Internationalisation\n" +"POT-Creation-Date: 2017-01-10 15:36+0000\n" +"PO-Revision-Date: 2017-01-13 12:34+0100\n" +"Last-Translator: Christian Kirbach \n" "Language-Team: Deutsch \n" "Language: de\n" "MIME-Version: 1.0\n" "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.8.7.1\n" +"X-Generator: Poedit 1.8.11\n" "X-Project-Style: gnome\n" #: ../app/about.h:23 @@ -288,7 +288,7 @@ #. initialize the list of gimp brushes #: ../app/actions/actions.c:112 ../app/core/gimp.c:951 -#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2783 msgid "Brushes" msgstr "Pinsel" @@ -335,7 +335,7 @@ #. Document History #: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:329 -#: ../app/dialogs/preferences-dialog.c:1577 +#: ../app/dialogs/preferences-dialog.c:1612 msgid "Document History" msgstr "Dokumentenindex" @@ -366,7 +366,7 @@ msgstr "Datei" #: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:325 -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2803 msgid "Fonts" msgstr "Schriften" @@ -377,12 +377,12 @@ #. initialize the list of gimp gradients #: ../app/actions/actions.c:172 ../app/core/gimp.c:971 -#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2799 msgid "Gradients" msgstr "Farbverläufe" #: ../app/actions/actions.c:175 ../app/core/gimp.c:983 -#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2770 +#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2807 msgid "Tool Presets" msgstr "Werkzeug-Voreinstellungen" @@ -416,23 +416,23 @@ #. initialize the list of gimp palettes #: ../app/actions/actions.c:196 ../app/core/gimp.c:966 -#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2758 +#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2795 msgid "Palettes" msgstr "Paletten" #. initialize the list of gimp patterns #: ../app/actions/actions.c:199 ../app/core/gimp.c:961 -#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2791 msgid "Patterns" msgstr "Muster" -#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2774 +#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2811 msgid "Plug-Ins" msgstr "Plugins" #. Quick Mask Color #: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:386 -#: ../app/dialogs/preferences-dialog.c:2032 +#: ../app/dialogs/preferences-dialog.c:2069 msgid "Quick Mask" msgstr "Schnellmaske" @@ -459,7 +459,7 @@ msgstr "Texteditor" #: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:298 -#: ../app/dialogs/preferences-dialog.c:1861 ../app/gui/gui.c:441 +#: ../app/dialogs/preferences-dialog.c:1898 ../app/gui/gui.c:464 msgid "Tool Options" msgstr "Werkzeugeinstellungen" @@ -1377,7 +1377,7 @@ msgstr "_Info" #: ../app/actions/dialogs-actions.c:333 -#: ../app/dialogs/preferences-dialog.c:1951 ../app/widgets/gimptoolbox.c:539 +#: ../app/dialogs/preferences-dialog.c:1988 ../app/widgets/gimptoolbox.c:539 msgid "Toolbox" msgstr "Werkzeugkasten" @@ -3280,7 +3280,7 @@ #. Scaling #: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 -#: ../app/dialogs/preferences-dialog.c:1906 +#: ../app/dialogs/preferences-dialog.c:1943 #: ../app/pdb/drawable-transform-cmds.c:783 #: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 #: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524 @@ -7512,7 +7512,7 @@ msgstr "Parasiten" #. initialize the list of gimp dynamics -#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2750 +#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2787 #: ../app/tools/gimppaintoptions-gui.c:201 msgid "Dynamics" msgstr "Zeichendynamiken" @@ -7523,7 +7523,7 @@ msgstr "Schriften (dies kann einen Augenblick dauern)" #. initialize the module list -#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2782 +#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2819 msgid "Modules" msgstr "Module" @@ -8471,7 +8471,7 @@ msgid "Remove Path" msgstr "Pfad entfernen" -#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1715 +#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1750 msgid "Folder" msgstr "Ordner" @@ -8628,7 +8628,7 @@ msgid "Layer cannot be lowered more." msgstr "Diese Ebene kann nicht weiter abgesenkt werden." -#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1529 +#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1532 #: ../app/core/gimplayermask.c:236 #, c-format msgid "%s mask" @@ -8643,49 +8643,49 @@ "Schwebende Auswahl\n" "(%s)" -#: ../app/core/gimplayer.c:1449 +#: ../app/core/gimplayer.c:1452 msgid "Unable to add a layer mask since the layer already has one." msgstr "" "Es konnte keine Ebenenmaske hinzugefügt werden, da diese Ebene bereits eine " "Maske hat." -#: ../app/core/gimplayer.c:1460 +#: ../app/core/gimplayer.c:1463 msgid "Cannot add layer mask of different dimensions than specified layer." msgstr "" "Ebenenmasken mit anderen Abmessungen als die der Ebene können nicht " "hinzufügt werden." -#: ../app/core/gimplayer.c:1466 +#: ../app/core/gimplayer.c:1469 msgctxt "undo-type" msgid "Add Layer Mask" msgstr "Ebenenmaske hinzufügen" -#: ../app/core/gimplayer.c:1584 +#: ../app/core/gimplayer.c:1587 msgctxt "undo-type" msgid "Transfer Alpha to Mask" msgstr "Alpha in Maske übernehmen" -#: ../app/core/gimplayer.c:1754 +#: ../app/core/gimplayer.c:1757 msgctxt "undo-type" msgid "Apply Layer Mask" msgstr "Ebenenmaske anwenden" -#: ../app/core/gimplayer.c:1755 +#: ../app/core/gimplayer.c:1758 msgctxt "undo-type" msgid "Delete Layer Mask" msgstr "Ebenenmaske löschen" -#: ../app/core/gimplayer.c:1874 +#: ../app/core/gimplayer.c:1877 msgctxt "undo-type" msgid "Add Alpha Channel" msgstr "Alphakanal hinzufügen" -#: ../app/core/gimplayer.c:1928 +#: ../app/core/gimplayer.c:1931 msgctxt "undo-type" msgid "Remove Alpha Channel" msgstr "Alphakanal entfernen" -#: ../app/core/gimplayer.c:1948 +#: ../app/core/gimplayer.c:1951 msgctxt "undo-type" msgid "Layer to Image Size" msgstr "Ebene auf Bildgröße skalieren" @@ -9099,7 +9099,7 @@ "Sind Sie sicher, dass »%s« aus der Liste entfernt und von der Festplatte " "gelöscht werden soll?" -#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:162 +#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:174 #: ../app/gui/gui-message.c:149 msgid "GIMP Message" msgstr "GIMP-Meldung" @@ -9337,7 +9337,7 @@ msgstr "Ein neues Bild erstellen" #: ../app/dialogs/image-new-dialog.c:135 -#: ../app/dialogs/preferences-dialog.c:2016 +#: ../app/dialogs/preferences-dialog.c:2053 msgid "_Template:" msgstr "_Vorlagen:" @@ -9572,7 +9572,7 @@ msgstr "Quelle auswählen" #: ../app/dialogs/palette-import-dialog.c:214 -#: ../app/dialogs/preferences-dialog.c:1930 +#: ../app/dialogs/preferences-dialog.c:1967 msgid "_Gradient" msgstr "Far_bverlauf" @@ -9631,21 +9631,21 @@ msgid "The selected source contains no colors." msgstr "Die ausgewählte Quelle enthält keine Farben." -#: ../app/dialogs/preferences-dialog.c:268 +#: ../app/dialogs/preferences-dialog.c:266 msgid "Reset All Preferences" msgstr "Alle Einstellungen zurücksetzen" -#: ../app/dialogs/preferences-dialog.c:286 +#: ../app/dialogs/preferences-dialog.c:284 msgid "Do you really want to reset all preferences to default values?" msgstr "" "Möchten Sie wirklich alle Einstellungen auf die Standardwerte zurücksetzen?" -#: ../app/dialogs/preferences-dialog.c:356 +#: ../app/dialogs/preferences-dialog.c:362 msgid "You will have to restart GIMP for the following changes to take effect:" msgstr "" "Sie müssen GIMP neu starten, damit die folgenden Änderungen aktiv werden:" -#: ../app/dialogs/preferences-dialog.c:538 +#: ../app/dialogs/preferences-dialog.c:544 msgid "" "Your keyboard shortcuts will be reset to default values the next time you " "start GIMP." @@ -9653,16 +9653,16 @@ "Die Tastenkombinationen werden beim nächsten Start von GIMP auf die " "Standardwerte zurückgesetzt." -#: ../app/dialogs/preferences-dialog.c:549 +#: ../app/dialogs/preferences-dialog.c:555 msgid "Remove all Keyboard Shortcuts" msgstr "Alle Tastenkombinationen entfernen" -#: ../app/dialogs/preferences-dialog.c:571 +#: ../app/dialogs/preferences-dialog.c:577 msgid "Do you really want to remove all keyboard shortcuts from all menus?" msgstr "" "Wollen Sie wirklich alle Tastenkombinationen von allen Menüs entfernen?" -#: ../app/dialogs/preferences-dialog.c:612 +#: ../app/dialogs/preferences-dialog.c:618 msgid "" "Your window setup will be reset to default values the next time you start " "GIMP." @@ -9670,7 +9670,7 @@ "Die Fenstereinstellungen werden beim nächsten Start von GIMP auf die " "Standardwerte zurückgesetzt." -#: ../app/dialogs/preferences-dialog.c:647 +#: ../app/dialogs/preferences-dialog.c:653 msgid "" "Your input device settings will be reset to default values the next time you " "start GIMP." @@ -9678,7 +9678,7 @@ "Die Einstellungen für Eingabegeräte werden beim nächsten Start von GIMP auf " "die Standardwerte zurückgesetzt." -#: ../app/dialogs/preferences-dialog.c:682 +#: ../app/dialogs/preferences-dialog.c:688 msgid "" "Your tool options will be reset to default values the next time you start " "GIMP." @@ -9686,753 +9686,765 @@ "Die Werkzeugeinstellungen werden beim nächsten Start von GIMP auf die " "Standardwerte zurückgesetzt." -#: ../app/dialogs/preferences-dialog.c:1268 +#: ../app/dialogs/preferences-dialog.c:1303 msgid "Show _menubar" msgstr "_Menüleiste anzeigen" -#: ../app/dialogs/preferences-dialog.c:1272 +#: ../app/dialogs/preferences-dialog.c:1307 msgid "Show _rulers" msgstr "_Lineale anzeigen" -#: ../app/dialogs/preferences-dialog.c:1275 +#: ../app/dialogs/preferences-dialog.c:1310 msgid "Show scroll_bars" msgstr "_Bildlaufleisten anzeigen" -#: ../app/dialogs/preferences-dialog.c:1278 +#: ../app/dialogs/preferences-dialog.c:1313 msgid "Show s_tatusbar" msgstr "S_tatusleiste anzeigen" -#: ../app/dialogs/preferences-dialog.c:1286 +#: ../app/dialogs/preferences-dialog.c:1321 msgid "Show s_election" msgstr "Auswahl anz_eigen" -#: ../app/dialogs/preferences-dialog.c:1289 +#: ../app/dialogs/preferences-dialog.c:1324 msgid "Show _layer boundary" msgstr "_Ebenenrahmen anzeigen" -#: ../app/dialogs/preferences-dialog.c:1292 +#: ../app/dialogs/preferences-dialog.c:1327 msgid "Show _guides" msgstr "_Hilfslinien anzeigen" -#: ../app/dialogs/preferences-dialog.c:1295 +#: ../app/dialogs/preferences-dialog.c:1330 msgid "Show gri_d" msgstr "_Raster anzeigen" -#: ../app/dialogs/preferences-dialog.c:1301 +#: ../app/dialogs/preferences-dialog.c:1336 msgid "Canvas _padding mode:" msgstr "Modus des Leinwand_rahmens:" -#: ../app/dialogs/preferences-dialog.c:1306 +#: ../app/dialogs/preferences-dialog.c:1341 msgid "Custom p_adding color:" msgstr "Benutzerdefinierte _Rahmenfarbe:" -#: ../app/dialogs/preferences-dialog.c:1307 +#: ../app/dialogs/preferences-dialog.c:1342 msgid "Select Custom Canvas Padding Color" msgstr "Farbe des Leinwandrahmens festlegen" -#: ../app/dialogs/preferences-dialog.c:1405 +#: ../app/dialogs/preferences-dialog.c:1440 msgid "Preferences" msgstr "Einstellungen" -#: ../app/dialogs/preferences-dialog.c:1518 -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:1553 +#: ../app/dialogs/preferences-dialog.c:2827 msgid "Environment" msgstr "Umgebung" -#: ../app/dialogs/preferences-dialog.c:1532 +#: ../app/dialogs/preferences-dialog.c:1567 msgid "Resource Consumption" msgstr "Ressourcenverbrauch" -#: ../app/dialogs/preferences-dialog.c:1542 +#: ../app/dialogs/preferences-dialog.c:1577 msgid "Minimal number of _undo levels:" msgstr "Minimale Anzahl an _Journalschritten:" -#: ../app/dialogs/preferences-dialog.c:1545 +#: ../app/dialogs/preferences-dialog.c:1580 msgid "Maximum undo _memory:" msgstr "_Maximaler Speicher für das Journal:" -#: ../app/dialogs/preferences-dialog.c:1548 +#: ../app/dialogs/preferences-dialog.c:1583 msgid "Tile cache _size:" msgstr "Größe des gesamten _Speichers:" -#: ../app/dialogs/preferences-dialog.c:1551 +#: ../app/dialogs/preferences-dialog.c:1586 msgid "Maximum _new image size:" msgstr "Maximale Größe _neuer Bilder:" -#: ../app/dialogs/preferences-dialog.c:1556 +#: ../app/dialogs/preferences-dialog.c:1591 msgid "Number of _processors to use:" msgstr "Zahl der zu verwendenden _Prozessoren:" #. Image Thumbnails -#: ../app/dialogs/preferences-dialog.c:1561 +#: ../app/dialogs/preferences-dialog.c:1596 msgid "Image Thumbnails" msgstr "Vorschaubilder" -#: ../app/dialogs/preferences-dialog.c:1566 +#: ../app/dialogs/preferences-dialog.c:1601 msgid "Size of _thumbnails:" msgstr "Größe der _Vorschaubilder:" -#: ../app/dialogs/preferences-dialog.c:1570 +#: ../app/dialogs/preferences-dialog.c:1605 msgid "Maximum _filesize for thumbnailing:" msgstr "Maximale Datei_größe für Vorschaubilder:" -#: ../app/dialogs/preferences-dialog.c:1580 +#: ../app/dialogs/preferences-dialog.c:1615 msgid "Keep record of used files in the Recent Documents list" msgstr "Verwendete Dateien in den zuletzt geöffneten Dokumenten anzeigen" -#: ../app/dialogs/preferences-dialog.c:1589 +#: ../app/dialogs/preferences-dialog.c:1624 msgid "User Interface" msgstr "Benutzeroberfläche" -#: ../app/dialogs/preferences-dialog.c:1592 +#: ../app/dialogs/preferences-dialog.c:1627 msgid "Interface" msgstr "Oberfläche" -#: ../app/dialogs/preferences-dialog.c:1602 +#: ../app/dialogs/preferences-dialog.c:1637 msgid "Language" msgstr "Sprache" #. Previews -#: ../app/dialogs/preferences-dialog.c:1608 +#: ../app/dialogs/preferences-dialog.c:1643 msgid "Previews" msgstr "Vorschaubilder" -#: ../app/dialogs/preferences-dialog.c:1611 +#: ../app/dialogs/preferences-dialog.c:1646 msgid "_Enable layer & channel previews" msgstr "_Vorschau von Ebenen und Kanälen aktivieren" -#: ../app/dialogs/preferences-dialog.c:1617 +#: ../app/dialogs/preferences-dialog.c:1652 msgid "_Default layer & channel preview size:" msgstr "Standard_größe der Vorschau von Ebenen und Kanälen:" -#: ../app/dialogs/preferences-dialog.c:1620 +#: ../app/dialogs/preferences-dialog.c:1655 msgid "Na_vigation preview size:" msgstr "Größe der _Navigationsvorschau:" #. Keyboard Shortcuts -#: ../app/dialogs/preferences-dialog.c:1624 +#: ../app/dialogs/preferences-dialog.c:1659 msgid "Keyboard Shortcuts" msgstr "Tastenkombinationen" -#: ../app/dialogs/preferences-dialog.c:1628 +#: ../app/dialogs/preferences-dialog.c:1663 msgid "_Use dynamic keyboard shortcuts" msgstr "Dynamische _Tastenkombinationen benutzen" -#: ../app/dialogs/preferences-dialog.c:1632 +#: ../app/dialogs/preferences-dialog.c:1667 msgid "Configure _Keyboard Shortcuts..." msgstr "Tastenkombinationen _konfigurieren …" -#: ../app/dialogs/preferences-dialog.c:1639 +#: ../app/dialogs/preferences-dialog.c:1674 msgid "_Save keyboard shortcuts on exit" msgstr "Tastenkombination beim Beenden _speichern" -#: ../app/dialogs/preferences-dialog.c:1643 +#: ../app/dialogs/preferences-dialog.c:1678 msgid "Save Keyboard Shortcuts _Now" msgstr "Tastenkombinationen _jetzt speichern" -#: ../app/dialogs/preferences-dialog.c:1650 +#: ../app/dialogs/preferences-dialog.c:1685 msgid "_Reset Keyboard Shortcuts to Default Values" msgstr "Tastenkombinationen auf Standardwerte _zurücksetzen" -#: ../app/dialogs/preferences-dialog.c:1659 +#: ../app/dialogs/preferences-dialog.c:1694 msgid "Remove _All Keyboard Shortcuts" msgstr "Alle Tastenkombinationen entfernen" -#: ../app/dialogs/preferences-dialog.c:1671 -#: ../app/dialogs/preferences-dialog.c:1710 +#: ../app/dialogs/preferences-dialog.c:1706 +#: ../app/dialogs/preferences-dialog.c:1745 msgid "Theme" msgstr "Thema" -#: ../app/dialogs/preferences-dialog.c:1680 +#: ../app/dialogs/preferences-dialog.c:1715 msgid "Select Theme" msgstr "Thema auswählen" -#: ../app/dialogs/preferences-dialog.c:1762 +#: ../app/dialogs/preferences-dialog.c:1797 msgid "Reload C_urrent Theme" msgstr "_Aktuelles Thema neu laden" -#: ../app/dialogs/preferences-dialog.c:1774 +#: ../app/dialogs/preferences-dialog.c:1809 msgid "Help System" msgstr "Hilfesystem" #. General -#: ../app/dialogs/preferences-dialog.c:1786 -#: ../app/dialogs/preferences-dialog.c:1873 -#: ../app/dialogs/preferences-dialog.c:2086 +#: ../app/dialogs/preferences-dialog.c:1821 +#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:2123 #: ../app/widgets/gimpcontrollereditor.c:185 msgid "General" msgstr "Allgemein" -#: ../app/dialogs/preferences-dialog.c:1789 +#: ../app/dialogs/preferences-dialog.c:1824 msgid "Show _tooltips" msgstr "_Minihilfen anzeigen" -#: ../app/dialogs/preferences-dialog.c:1792 +#: ../app/dialogs/preferences-dialog.c:1827 msgid "Show help _buttons" msgstr "Hilfeknöpfe an_zeigen" -#: ../app/dialogs/preferences-dialog.c:1805 +#: ../app/dialogs/preferences-dialog.c:1832 msgid "Use the online version" msgstr "Die online Version verwenden" -#: ../app/dialogs/preferences-dialog.c:1806 +#: ../app/dialogs/preferences-dialog.c:1833 msgid "Use a locally installed copy" msgstr "Die lokal installierte Kopie verwenden" -#: ../app/dialogs/preferences-dialog.c:1807 +#: ../app/dialogs/preferences-dialog.c:1834 msgid "User manual:" msgstr "Benutzerhandbuch:" -#: ../app/dialogs/preferences-dialog.c:1814 +#: ../app/dialogs/preferences-dialog.c:1841 msgid "There's a local installation of the user manual." msgstr "Das Benutzerhandbuch ist lokal installiert." -#: ../app/dialogs/preferences-dialog.c:1819 +#: ../app/dialogs/preferences-dialog.c:1847 msgid "The user manual is not installed locally." msgstr "Das Benutzerhandbuch ist nicht lokal installiert." -#: ../app/dialogs/preferences-dialog.c:1844 +#. If there is no webkit available, assume we are on a platform +#. * that doesn't use the help browser, so don't bother showing +#. * the combo. +#. +#: ../app/dialogs/preferences-dialog.c:1860 msgid "Help Browser" msgstr "Hilfe-Browser" -#: ../app/dialogs/preferences-dialog.c:1848 +#: ../app/dialogs/preferences-dialog.c:1867 msgid "H_elp browser to use:" msgstr "Zu verwendender Hilfe-_Browser:" -#: ../app/dialogs/preferences-dialog.c:1876 +#: ../app/dialogs/preferences-dialog.c:1873 +msgid "" +"The GIMP help browser doesn't seem to be installed. Using the web browser " +"instead." +msgstr "" +"Der GIMP Hilfe-Browser scheint nicht installiert zu sein. Stattdessen wird " +"der Webbrowser genutzt." + +#: ../app/dialogs/preferences-dialog.c:1913 msgid "_Save tool options on exit" msgstr "Werkzeugeinstellungen beim Beenden _speichern" -#: ../app/dialogs/preferences-dialog.c:1880 +#: ../app/dialogs/preferences-dialog.c:1917 msgid "Save Tool Options _Now" msgstr "Werkzeugeinstellungen _jetzt speichern" -#: ../app/dialogs/preferences-dialog.c:1887 +#: ../app/dialogs/preferences-dialog.c:1924 msgid "_Reset Saved Tool Options to Default Values" msgstr "Werkzeugeinstellungen jetzt auf _Vorgabewerte setzen" #. Snapping Distance -#: ../app/dialogs/preferences-dialog.c:1897 +#: ../app/dialogs/preferences-dialog.c:1934 msgid "Guide & Grid Snapping" msgstr "Magnetische Hilfslinien und Raster" -#: ../app/dialogs/preferences-dialog.c:1902 +#: ../app/dialogs/preferences-dialog.c:1939 msgid "_Snap distance:" msgstr "_Reichweite des Magneten:" -#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:1947 msgid "Default _interpolation:" msgstr "Voreingestellte _Interpolationsart:" #. Global Brush, Pattern, ... -#: ../app/dialogs/preferences-dialog.c:1917 +#: ../app/dialogs/preferences-dialog.c:1954 msgid "Paint Options Shared Between Tools" msgstr "Maleinstellungen werkzeugübergreifend nutzen" -#: ../app/dialogs/preferences-dialog.c:1921 +#: ../app/dialogs/preferences-dialog.c:1958 msgid "_Brush" msgstr "_Pinsel" -#: ../app/dialogs/preferences-dialog.c:1924 +#: ../app/dialogs/preferences-dialog.c:1961 msgid "_Dynamics" msgstr "_Zeichendynamik" -#: ../app/dialogs/preferences-dialog.c:1927 +#: ../app/dialogs/preferences-dialog.c:1964 msgid "_Pattern" msgstr "_Muster" #. Move Tool -#: ../app/dialogs/preferences-dialog.c:1934 +#: ../app/dialogs/preferences-dialog.c:1971 msgid "Move Tool" msgstr "Verschiebewerkzeug" -#: ../app/dialogs/preferences-dialog.c:1938 +#: ../app/dialogs/preferences-dialog.c:1975 msgid "Set layer or path as active" msgstr "Ebene oder Pfad aktivieren" #. Appearance -#: ../app/dialogs/preferences-dialog.c:1963 -#: ../app/dialogs/preferences-dialog.c:2162 ../app/widgets/gimpgrideditor.c:134 +#: ../app/dialogs/preferences-dialog.c:2000 +#: ../app/dialogs/preferences-dialog.c:2199 ../app/widgets/gimpgrideditor.c:134 msgid "Appearance" msgstr "Darstellung" -#: ../app/dialogs/preferences-dialog.c:1967 +#: ../app/dialogs/preferences-dialog.c:2004 msgid "Show _foreground & background color" msgstr "_Vordergrund- und Hintergrundfarbe anzeigen" -#: ../app/dialogs/preferences-dialog.c:1971 +#: ../app/dialogs/preferences-dialog.c:2008 msgid "Show active _brush, pattern & gradient" msgstr "Aktive _Pinsel, Muster und Farbverläufe anzeigen" -#: ../app/dialogs/preferences-dialog.c:1975 +#: ../app/dialogs/preferences-dialog.c:2012 msgid "Show active _image" msgstr "Aktuelles _Bild anzeigen" #. Tool Editor -#: ../app/dialogs/preferences-dialog.c:1983 +#: ../app/dialogs/preferences-dialog.c:2020 msgid "Tools configuration" msgstr "Konfiguration der Werkzeuge" -#: ../app/dialogs/preferences-dialog.c:1998 +#: ../app/dialogs/preferences-dialog.c:2035 msgid "Default New Image" msgstr "Eigenschaften eines neuen Bildes" -#: ../app/dialogs/preferences-dialog.c:2001 +#: ../app/dialogs/preferences-dialog.c:2038 msgid "Default Image" msgstr "Neues Bild" -#: ../app/dialogs/preferences-dialog.c:2035 +#: ../app/dialogs/preferences-dialog.c:2072 msgid "Set the default Quick Mask color" msgstr "Farbe der schnellen Maske festlegen" -#: ../app/dialogs/preferences-dialog.c:2041 +#: ../app/dialogs/preferences-dialog.c:2078 msgid "Quick Mask color:" msgstr "Farbe der schnellen Maske:" -#: ../app/dialogs/preferences-dialog.c:2051 +#: ../app/dialogs/preferences-dialog.c:2088 msgid "Default Image Grid" msgstr "Standardbildraster" -#: ../app/dialogs/preferences-dialog.c:2054 +#: ../app/dialogs/preferences-dialog.c:2091 msgid "Default Grid" msgstr "Standardraster" -#: ../app/dialogs/preferences-dialog.c:2074 +#: ../app/dialogs/preferences-dialog.c:2111 msgid "Image Windows" msgstr "Bildfenster" -#: ../app/dialogs/preferences-dialog.c:2089 +#: ../app/dialogs/preferences-dialog.c:2126 msgid "Use \"_Dot for dot\" by default" msgstr "»_Punkt für Punkt« als Standard verwenden" -#: ../app/dialogs/preferences-dialog.c:2095 +#: ../app/dialogs/preferences-dialog.c:2132 msgid "Marching _ants speed:" msgstr "Geschwindigkeit der laufenden _Ameisen:" #. Zoom & Resize Behavior -#: ../app/dialogs/preferences-dialog.c:2099 +#: ../app/dialogs/preferences-dialog.c:2136 msgid "Zoom & Resize Behavior" msgstr "Verhalten bei Größenänderungen" -#: ../app/dialogs/preferences-dialog.c:2103 +#: ../app/dialogs/preferences-dialog.c:2140 msgid "Resize window on _zoom" msgstr "Fenstergröße beim _Vergrößern und Verkleinern anpassen" -#: ../app/dialogs/preferences-dialog.c:2106 +#: ../app/dialogs/preferences-dialog.c:2143 msgid "Resize window on image _size change" msgstr "Fenstergröße anpassen, wenn sich die _Bildgröße ändert" -#: ../app/dialogs/preferences-dialog.c:2112 +#: ../app/dialogs/preferences-dialog.c:2149 msgid "Fit to window" msgstr "An Fenster anpassen" -#: ../app/dialogs/preferences-dialog.c:2114 +#: ../app/dialogs/preferences-dialog.c:2151 msgid "Initial zoom _ratio:" msgstr "Anfänglicher _Vergrößerungsfaktor:" #. Space Bar -#: ../app/dialogs/preferences-dialog.c:2118 +#: ../app/dialogs/preferences-dialog.c:2155 msgid "Space Bar" msgstr "Leertaste" -#: ../app/dialogs/preferences-dialog.c:2124 +#: ../app/dialogs/preferences-dialog.c:2161 msgid "_While space bar is pressed:" msgstr "_Während die Leertaste gedrückt ist:" #. Mouse Pointers -#: ../app/dialogs/preferences-dialog.c:2128 +#: ../app/dialogs/preferences-dialog.c:2165 msgid "Mouse Pointers" msgstr "Mauszeiger" -#: ../app/dialogs/preferences-dialog.c:2132 +#: ../app/dialogs/preferences-dialog.c:2169 msgid "Show _brush outline" msgstr "Pinsel_umriss anzeigen" -#: ../app/dialogs/preferences-dialog.c:2135 +#: ../app/dialogs/preferences-dialog.c:2172 msgid "Show pointer for paint _tools" msgstr "Zeiger des Mal_werkzeugs anzeigen" -#: ../app/dialogs/preferences-dialog.c:2141 +#: ../app/dialogs/preferences-dialog.c:2178 msgid "Pointer _mode:" msgstr "Zeiger_modus:" -#: ../app/dialogs/preferences-dialog.c:2144 +#: ../app/dialogs/preferences-dialog.c:2181 msgid "Pointer re_ndering:" msgstr "Zeiger_anzeige:" -#: ../app/dialogs/preferences-dialog.c:2147 +#: ../app/dialogs/preferences-dialog.c:2184 msgid "Pointer _handedness:" msgstr "Mauszeiger_händigkeit:" -#: ../app/dialogs/preferences-dialog.c:2159 +#: ../app/dialogs/preferences-dialog.c:2196 msgid "Image Window Appearance" msgstr "Darstellung der Bildfenster" -#: ../app/dialogs/preferences-dialog.c:2170 +#: ../app/dialogs/preferences-dialog.c:2207 msgid "Default Appearance in Normal Mode" msgstr "Voreingestellte Darstellung im normalen Modus" -#: ../app/dialogs/preferences-dialog.c:2175 +#: ../app/dialogs/preferences-dialog.c:2212 msgid "Default Appearance in Fullscreen Mode" msgstr "Voreingestellte Darstellung im Vollbildmodus" -#: ../app/dialogs/preferences-dialog.c:2184 +#: ../app/dialogs/preferences-dialog.c:2221 msgid "Image Title & Statusbar Format" msgstr "Format des Bildtitels und der Statusleiste" -#: ../app/dialogs/preferences-dialog.c:2187 +#: ../app/dialogs/preferences-dialog.c:2224 msgid "Title & Status" msgstr "Titel und Status" -#: ../app/dialogs/preferences-dialog.c:2205 +#: ../app/dialogs/preferences-dialog.c:2242 msgid "Current format" msgstr "Derzeitiges Format" -#: ../app/dialogs/preferences-dialog.c:2206 +#: ../app/dialogs/preferences-dialog.c:2243 msgid "Default format" msgstr "Standardformat" -#: ../app/dialogs/preferences-dialog.c:2207 +#: ../app/dialogs/preferences-dialog.c:2244 msgid "Show zoom percentage" msgstr "Bildgröße in Prozent anzeigen" -#: ../app/dialogs/preferences-dialog.c:2208 +#: ../app/dialogs/preferences-dialog.c:2245 msgid "Show zoom ratio" msgstr "Maßstab als Verhältnis anzeigen" -#: ../app/dialogs/preferences-dialog.c:2209 +#: ../app/dialogs/preferences-dialog.c:2246 msgid "Show image size" msgstr "Bildgröße anzeigen" -#: ../app/dialogs/preferences-dialog.c:2222 +#: ../app/dialogs/preferences-dialog.c:2259 msgid "Image Title Format" msgstr "Format des Bildtitels" -#: ../app/dialogs/preferences-dialog.c:2224 +#: ../app/dialogs/preferences-dialog.c:2261 msgid "Image Statusbar Format" msgstr "Format der Statusleiste" -#: ../app/dialogs/preferences-dialog.c:2309 +#: ../app/dialogs/preferences-dialog.c:2346 msgid "Display" msgstr "Anzeige" #. Transparency -#: ../app/dialogs/preferences-dialog.c:2321 +#: ../app/dialogs/preferences-dialog.c:2358 msgid "Transparency" msgstr "Transparenz" -#: ../app/dialogs/preferences-dialog.c:2325 +#: ../app/dialogs/preferences-dialog.c:2362 msgid "_Check style:" msgstr "_Schachbrett-Stil:" -#: ../app/dialogs/preferences-dialog.c:2328 +#: ../app/dialogs/preferences-dialog.c:2365 msgid "Check _size:" msgstr "Schachbrett_größe:" -#: ../app/dialogs/preferences-dialog.c:2331 +#: ../app/dialogs/preferences-dialog.c:2368 msgid "Monitor Resolution" msgstr "Bildschirmauflösung" #. Pixels -#: ../app/dialogs/preferences-dialog.c:2335 ../app/display/gimpcursorview.c:208 +#: ../app/dialogs/preferences-dialog.c:2372 ../app/display/gimpcursorview.c:208 #: ../app/widgets/gimpgrideditor.c:199 ../app/widgets/gimpgrideditor.c:231 msgid "Pixels" msgstr "Pixel" -#: ../app/dialogs/preferences-dialog.c:2353 +#: ../app/dialogs/preferences-dialog.c:2390 msgid "Horizontal" msgstr "Horizontal" -#: ../app/dialogs/preferences-dialog.c:2355 +#: ../app/dialogs/preferences-dialog.c:2392 msgid "Vertical" msgstr "Vertikal" -#: ../app/dialogs/preferences-dialog.c:2357 +#: ../app/dialogs/preferences-dialog.c:2394 #: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "PPI" # c-format -#: ../app/dialogs/preferences-dialog.c:2373 +#: ../app/dialogs/preferences-dialog.c:2410 #, c-format msgid "_Detect automatically (currently %d × %d ppi)" msgstr "Automatisch _erkennen (aktuell %d × %d DPI)" -#: ../app/dialogs/preferences-dialog.c:2391 +#: ../app/dialogs/preferences-dialog.c:2428 msgid "_Enter manually" msgstr "_Manuell eingeben" -#: ../app/dialogs/preferences-dialog.c:2406 +#: ../app/dialogs/preferences-dialog.c:2443 msgid "C_alibrate..." msgstr "_Kalibrieren …" -#: ../app/dialogs/preferences-dialog.c:2434 +#: ../app/dialogs/preferences-dialog.c:2471 msgid "Color Management" msgstr "Farbverwaltung" -#: ../app/dialogs/preferences-dialog.c:2454 +#: ../app/dialogs/preferences-dialog.c:2491 msgid "_RGB profile:" msgstr "_RGB-Profil:" -#: ../app/dialogs/preferences-dialog.c:2455 +#: ../app/dialogs/preferences-dialog.c:2492 msgid "Select RGB Color Profile" msgstr "RGB-Farbprofil auswählen" -#: ../app/dialogs/preferences-dialog.c:2456 +#: ../app/dialogs/preferences-dialog.c:2493 msgid "_CMYK profile:" msgstr "_CMYK-Profil:" -#: ../app/dialogs/preferences-dialog.c:2457 +#: ../app/dialogs/preferences-dialog.c:2494 msgid "Select CMYK Color Profile" msgstr "CMYK-Farbprofil auswählen" -#: ../app/dialogs/preferences-dialog.c:2458 +#: ../app/dialogs/preferences-dialog.c:2495 msgid "_Monitor profile:" msgstr "_Bildschirmprofil:" -#: ../app/dialogs/preferences-dialog.c:2459 +#: ../app/dialogs/preferences-dialog.c:2496 msgid "Select Monitor Color Profile" msgstr "Bildschirmfarbprofil auswählen" -#: ../app/dialogs/preferences-dialog.c:2460 +#: ../app/dialogs/preferences-dialog.c:2497 msgid "_Print simulation profile:" msgstr "_Drucksimulationsprofil:" -#: ../app/dialogs/preferences-dialog.c:2461 +#: ../app/dialogs/preferences-dialog.c:2498 msgid "Select Printer Color Profile" msgstr "Druckerfarbprofil auswählen" -#: ../app/dialogs/preferences-dialog.c:2472 +#: ../app/dialogs/preferences-dialog.c:2509 msgid "_Mode of operation:" msgstr "_Arbeitsmodus:" -#: ../app/dialogs/preferences-dialog.c:2502 +#: ../app/dialogs/preferences-dialog.c:2539 msgid "_Try to use the system monitor profile" msgstr "_Wenn möglich das System-Bildschirmprofil verwenden" -#: ../app/dialogs/preferences-dialog.c:2512 +#: ../app/dialogs/preferences-dialog.c:2549 msgid "_Display rendering intent:" msgstr "_Farbanpassung des Bildschirms:" -#: ../app/dialogs/preferences-dialog.c:2521 +#: ../app/dialogs/preferences-dialog.c:2558 msgid "_Softproof rendering intent:" msgstr "Fa_rbanpassung der Drucksimulation:" -#: ../app/dialogs/preferences-dialog.c:2534 +#: ../app/dialogs/preferences-dialog.c:2571 msgid "Mark out of gamut colors" msgstr "Farben außerhalb des Gamut markieren" -#: ../app/dialogs/preferences-dialog.c:2539 +#: ../app/dialogs/preferences-dialog.c:2576 msgid "Select Warning Color" msgstr "Warnfarbe auswählen" -#: ../app/dialogs/preferences-dialog.c:2552 +#: ../app/dialogs/preferences-dialog.c:2589 msgid "File Open behaviour:" msgstr "Verhalten des Datei-Öffnen-Dialogs:" -#: ../app/dialogs/preferences-dialog.c:2564 +#: ../app/dialogs/preferences-dialog.c:2601 msgid "Input Devices" msgstr "Eingabegeräte" #. Extended Input Devices -#: ../app/dialogs/preferences-dialog.c:2574 +#: ../app/dialogs/preferences-dialog.c:2611 msgid "Extended Input Devices" msgstr "Erweiterte Eingabegeräte" -#: ../app/dialogs/preferences-dialog.c:2578 +#: ../app/dialogs/preferences-dialog.c:2615 msgid "Configure E_xtended Input Devices..." msgstr "_Erweiterte Eingabegeräte konfigurieren …" -#: ../app/dialogs/preferences-dialog.c:2585 +#: ../app/dialogs/preferences-dialog.c:2622 msgid "_Save input device settings on exit" msgstr "Gerätestatus beim Beenden _speichern" -#: ../app/dialogs/preferences-dialog.c:2589 +#: ../app/dialogs/preferences-dialog.c:2626 msgid "Save Input Device Settings _Now" msgstr "Gerätestatus _jetzt speichern" -#: ../app/dialogs/preferences-dialog.c:2596 +#: ../app/dialogs/preferences-dialog.c:2633 msgid "_Reset Saved Input Device Settings to Default Values" msgstr "Gerätestatus _jetzt auf Standardwerte setzen" -#: ../app/dialogs/preferences-dialog.c:2611 +#: ../app/dialogs/preferences-dialog.c:2648 msgid "Additional Input Controllers" msgstr "Zusätzliche Eingabegeräte" -#: ../app/dialogs/preferences-dialog.c:2614 +#: ../app/dialogs/preferences-dialog.c:2651 msgid "Input Controllers" msgstr "Eingabesteuerung" -#: ../app/dialogs/preferences-dialog.c:2630 +#: ../app/dialogs/preferences-dialog.c:2667 msgid "Window Management" msgstr "Fensterverwaltung" -#: ../app/dialogs/preferences-dialog.c:2639 +#: ../app/dialogs/preferences-dialog.c:2676 msgid "Window Manager Hints" msgstr "Fenster-Manager-Hinweise" -#: ../app/dialogs/preferences-dialog.c:2645 +#: ../app/dialogs/preferences-dialog.c:2682 msgid "Hint for _docks and toolbox:" msgstr "Hinweis für _Docks und den Werkzeugkasten:" -#: ../app/dialogs/preferences-dialog.c:2648 +#: ../app/dialogs/preferences-dialog.c:2685 msgid "Focus" msgstr "Fokus" -#: ../app/dialogs/preferences-dialog.c:2652 +#: ../app/dialogs/preferences-dialog.c:2689 msgid "Activate the _focused image" msgstr "Das _fokussierte Bild aktivieren" #. Window Positions -#: ../app/dialogs/preferences-dialog.c:2656 +#: ../app/dialogs/preferences-dialog.c:2693 msgid "Window Positions" msgstr "Fensterpositionen" -#: ../app/dialogs/preferences-dialog.c:2659 +#: ../app/dialogs/preferences-dialog.c:2696 msgid "_Save window positions on exit" msgstr "Fensterpositionen beim Beenden _speichern" -#: ../app/dialogs/preferences-dialog.c:2663 +#: ../app/dialogs/preferences-dialog.c:2700 msgid "Save Window Positions _Now" msgstr "Fensterpositionen _jetzt speichern" -#: ../app/dialogs/preferences-dialog.c:2670 +#: ../app/dialogs/preferences-dialog.c:2707 msgid "_Reset Saved Window Positions to Default Values" msgstr "Fensterpositionen _jetzt auf Standardwerte setzen" -#: ../app/dialogs/preferences-dialog.c:2685 +#: ../app/dialogs/preferences-dialog.c:2722 msgid "Folders" msgstr "Ordner" -#: ../app/dialogs/preferences-dialog.c:2705 +#: ../app/dialogs/preferences-dialog.c:2742 msgid "Temporary folder:" msgstr "Temporärer Ordner:" -#: ../app/dialogs/preferences-dialog.c:2706 +#: ../app/dialogs/preferences-dialog.c:2743 msgid "Select Folder for Temporary Files" msgstr "Ordner für temporäre Dateien auswählen" -#: ../app/dialogs/preferences-dialog.c:2710 +#: ../app/dialogs/preferences-dialog.c:2747 msgid "Swap folder:" msgstr "Auslagerungsordner:" -#: ../app/dialogs/preferences-dialog.c:2711 +#: ../app/dialogs/preferences-dialog.c:2748 msgid "Select Swap Folder" msgstr "Auslagerungsordner auswählen" -#: ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/preferences-dialog.c:2783 msgid "Brush Folders" msgstr "Pinselordner" -#: ../app/dialogs/preferences-dialog.c:2748 +#: ../app/dialogs/preferences-dialog.c:2785 msgid "Select Brush Folders" msgstr "Pinselordner auswählen" -#: ../app/dialogs/preferences-dialog.c:2750 +#: ../app/dialogs/preferences-dialog.c:2787 msgid "Dynamics Folders" msgstr "Ordner mit Dynamiken" -#: ../app/dialogs/preferences-dialog.c:2752 +#: ../app/dialogs/preferences-dialog.c:2789 msgid "Select Dynamics Folders" msgstr "Ordner mit Dynamiken auswählen" -#: ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/preferences-dialog.c:2791 msgid "Pattern Folders" msgstr "Ordner für Muster" -#: ../app/dialogs/preferences-dialog.c:2756 +#: ../app/dialogs/preferences-dialog.c:2793 msgid "Select Pattern Folders" msgstr "Ordner für Muster auswählen" -#: ../app/dialogs/preferences-dialog.c:2758 +#: ../app/dialogs/preferences-dialog.c:2795 msgid "Palette Folders" msgstr "Palettenordner" -#: ../app/dialogs/preferences-dialog.c:2760 +#: ../app/dialogs/preferences-dialog.c:2797 msgid "Select Palette Folders" msgstr "Palettenordner auswählen" -#: ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/preferences-dialog.c:2799 msgid "Gradient Folders" msgstr "Farbverlaufsordner" -#: ../app/dialogs/preferences-dialog.c:2764 +#: ../app/dialogs/preferences-dialog.c:2801 msgid "Select Gradient Folders" msgstr "Farbverlaufsordner auswählen" -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2803 msgid "Font Folders" msgstr "Schriftenordner" -#: ../app/dialogs/preferences-dialog.c:2768 +#: ../app/dialogs/preferences-dialog.c:2805 msgid "Select Font Folders" msgstr "Schriftenordner auswählen" -#: ../app/dialogs/preferences-dialog.c:2770 +#: ../app/dialogs/preferences-dialog.c:2807 msgid "Tool Preset Folders" msgstr "Ordner für Werkzeug-Voreinstellungen" -#: ../app/dialogs/preferences-dialog.c:2772 +#: ../app/dialogs/preferences-dialog.c:2809 msgid "Select Tool Preset Folders" msgstr "Ordner für Werkzeug-Voreinstellungen auswählen" -#: ../app/dialogs/preferences-dialog.c:2774 +#: ../app/dialogs/preferences-dialog.c:2811 msgid "Plug-In Folders" msgstr "Plugin-Ordner" -#: ../app/dialogs/preferences-dialog.c:2776 +#: ../app/dialogs/preferences-dialog.c:2813 msgid "Select Plug-In Folders" msgstr "Plugin-Ordner auswählen" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2815 msgid "Scripts" msgstr "Skripte" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2815 msgid "Script-Fu Folders" msgstr "Skript-Fu-Ordner" -#: ../app/dialogs/preferences-dialog.c:2780 +#: ../app/dialogs/preferences-dialog.c:2817 msgid "Select Script-Fu Folders" msgstr "Skript-Fu-Ordner auswählen" -#: ../app/dialogs/preferences-dialog.c:2782 +#: ../app/dialogs/preferences-dialog.c:2819 msgid "Module Folders" msgstr "Modulordner" -#: ../app/dialogs/preferences-dialog.c:2784 +#: ../app/dialogs/preferences-dialog.c:2821 msgid "Select Module Folders" msgstr "Modulordner auswählen" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Interpreters" msgstr "Interpreter" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Interpreter Folders" msgstr "Interpreterordner" -#: ../app/dialogs/preferences-dialog.c:2788 +#: ../app/dialogs/preferences-dialog.c:2825 msgid "Select Interpreter Folders" msgstr "Interpreterordner auswählen" -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:2827 msgid "Environment Folders" msgstr "Umgebungsordner" -#: ../app/dialogs/preferences-dialog.c:2792 +#: ../app/dialogs/preferences-dialog.c:2829 msgid "Select Environment Folders" msgstr "Umgebungsordner auswählen" -#: ../app/dialogs/preferences-dialog.c:2794 +#: ../app/dialogs/preferences-dialog.c:2831 msgid "Themes" msgstr "Themen" -#: ../app/dialogs/preferences-dialog.c:2794 +#: ../app/dialogs/preferences-dialog.c:2831 msgid "Theme Folders" msgstr "Themenordner" -#: ../app/dialogs/preferences-dialog.c:2796 +#: ../app/dialogs/preferences-dialog.c:2833 msgid "Select Theme Folders" msgstr "Themenordner auswählen" @@ -10950,28 +10962,28 @@ msgid "Not a regular file" msgstr "Keine reguläre Datei" -#: ../app/file/file-open.c:191 +#: ../app/file/file-open.c:197 #, c-format msgid "%s plug-in returned SUCCESS but did not return an image" msgstr "" "Das Plugin %s meldete einen Erfolg, es wurde jedoch kein Bild zurück " "geliefert" -#: ../app/file/file-open.c:202 +#: ../app/file/file-open.c:208 #, c-format msgid "%s plug-In could not open image" msgstr "Das Plugin %s konnte das Bild nicht öffnen" -#: ../app/file/file-open.c:533 +#: ../app/file/file-open.c:539 msgid "Image doesn't contain any layers" msgstr "Das Bild enthält keine Ebenen" -#: ../app/file/file-open.c:593 +#: ../app/file/file-open.c:599 #, c-format msgid "Opening '%s' failed: %s" msgstr "»%s« konnte nicht geöffnet werden: %s" -#: ../app/file/file-open.c:703 +#: ../app/file/file-open.c:709 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -11046,16 +11058,16 @@ #. * but xgettext extracts it anyway mistakenly into GIMP po files. #. * Leave an empty string as translation. It does not matter. #. -#: ../app/gui/gui.c:207 +#: ../app/gui/gui.c:219 msgid "default:LTR" msgstr "default:LTR" #. initialize the document history -#: ../app/gui/gui.c:438 +#: ../app/gui/gui.c:461 msgid "Documents" msgstr "Dokumente" -#: ../app/gui/splash.c:115 +#: ../app/gui/splash.c:112 msgid "GIMP Startup" msgstr "GIMP-Start" @@ -11691,7 +11703,7 @@ "Fehler beim Ausführen der Prozedur »%s«:\n" "%s" -#: ../app/plug-in/gimpplugin-progress.c:331 +#: ../app/plug-in/gimpplugin-progress.c:339 msgid "Cancelled" msgstr "Abgebrochen" @@ -11880,7 +11892,7 @@ "Möglicherweise sind eines oder mehrere Textattribute fehlerhaft. Falls Sie " "die Textebene nicht bearbeiten, können Sie dies einfach ignorieren." -#: ../app/text/gimptextlayout.c:577 +#: ../app/text/gimptextlayout.c:578 msgid "" "The new text layout cannot be generated. Most likely the font size is too " "big." @@ -12081,7 +12093,7 @@ msgid "No gradient available for use with this tool." msgstr "Es ist kein Farbverlauf zur Verwendung mit diesem Werkzeug vorhanden." -#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:624 +#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:625 #, c-format msgid "%s for constrained angles" msgstr "%s für eingeschränkte Winkel" @@ -13349,7 +13361,7 @@ #: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084 #: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168 -#: ../app/tools/gimppainttool.c:633 +#: ../app/tools/gimppainttool.c:634 msgid "pixels" msgstr "Pixel" @@ -13520,7 +13532,7 @@ msgid "Cannot paint on layer groups." msgstr "Es kann nicht auf Ebenenmasken gezeichnet werden." -#: ../app/tools/gimppainttool.c:679 +#: ../app/tools/gimppainttool.c:680 #, c-format msgid "%s for a straight line" msgstr "%s für eine gerade Linie" @@ -14629,7 +14641,7 @@ msgid "No filter selected" msgstr "Kein Filter ausgewählt" -#: ../app/widgets/gimpcoloreditor.c:260 +#: ../app/widgets/gimpcoloreditor.c:264 msgid "" "Hexadecimal color notation as used in HTML and CSS. This entry also accepts " "CSS color names." @@ -15390,15 +15402,15 @@ msgid "Height" msgstr "Höhe" -#: ../app/widgets/gimphelp.c:297 +#: ../app/widgets/gimphelp.c:308 msgid "Help browser is missing" msgstr "Hilfe-Browser fehlt" -#: ../app/widgets/gimphelp.c:298 +#: ../app/widgets/gimphelp.c:309 msgid "The GIMP help browser is not available." msgstr "Der GIMP-Hilfe-Browser ist nicht verfügbar." -#: ../app/widgets/gimphelp.c:299 +#: ../app/widgets/gimphelp.c:310 msgid "" "The GIMP help browser plug-in appears to be missing from your installation. " "You may instead use the web browser for reading the help pages." @@ -15406,31 +15418,37 @@ "Das Hilfe-Browser-Plugin scheint in Ihrer GIMP-Installation zu fehlen. Sie " "können stattdessen den Internet-Browser verwenden, um die Hilfe zu lesen." -#: ../app/widgets/gimphelp.c:340 +#: ../app/widgets/gimphelp.c:351 msgid "Help browser doesn't start" msgstr "Der Hilfe-Browser startet nicht" -#: ../app/widgets/gimphelp.c:341 +#: ../app/widgets/gimphelp.c:352 msgid "Could not start the GIMP help browser plug-in." msgstr "Der GIMP-Hilfe-Browser konnte nicht gestartet werden." -#: ../app/widgets/gimphelp.c:368 +#: ../app/widgets/gimphelp.c:354 +msgid "You may instead use the web browser for reading the help pages." +msgstr "" +"Sie können stattdessen den Internet-Browser verwenden, um die Hilfeseiten zu " +"lesen." + +#: ../app/widgets/gimphelp.c:380 msgid "Use _Web Browser" msgstr "Internet-_Browser nutzen" -#: ../app/widgets/gimphelp.c:712 +#: ../app/widgets/gimphelp.c:724 msgid "GIMP user manual is missing" msgstr "Das GIMP-Benutzerhandbuch fehlt" -#: ../app/widgets/gimphelp.c:719 +#: ../app/widgets/gimphelp.c:731 msgid "_Read Online" msgstr "_Online lesen" -#: ../app/widgets/gimphelp.c:743 +#: ../app/widgets/gimphelp.c:755 msgid "The GIMP user manual is not installed on your computer." msgstr "Das GIMP-Benutzerhandbuch ist nicht auf diesem Rechner installiert." -#: ../app/widgets/gimphelp.c:746 +#: ../app/widgets/gimphelp.c:758 msgid "" "You may either install the additional help package or change your " "preferences to use the online version." @@ -15752,17 +15770,17 @@ msgid "%d ppi, %s" msgstr "%d PPI, %s" -#: ../app/widgets/gimptextbuffer-serialize.c:344 +#: ../app/widgets/gimptextbuffer-serialize.c:269 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "Attribut »%s« ist mit dem Element <%s> in diesem Kontext ungültig" -#: ../app/widgets/gimptextbuffer-serialize.c:416 +#: ../app/widgets/gimptextbuffer-serialize.c:341 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "Das äußerste Element im Text muss und nicht <%s> sein" -#: ../app/widgets/gimptextbuffer.c:1459 +#: ../app/widgets/gimptextbuffer.c:1460 #, c-format msgid "Invalid UTF-8 data in file '%s'." msgstr "Ungültige UTF-8-Daten in Datei »%s«." diff -Nru gimp-2.8.18/po/el.po gimp-2.8.20/po/el.po --- gimp-2.8.18/po/el.po 2016-06-09 17:31:25.000000000 +0000 +++ gimp-2.8.20/po/el.po 2017-01-28 19:08:48.000000000 +0000 @@ -13,9 +13,9 @@ msgstr "" "Project-Id-Version: gimp.master.el.po\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gimp&ke" -"ywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-05-29 12:44+0000\n" -"PO-Revision-Date: 2016-06-07 09:17+0300\n" +"ywords=I18N+L10N&component=Internationalisation\n" +"POT-Creation-Date: 2016-09-14 16:35+0000\n" +"PO-Revision-Date: 2016-09-15 05:19+0300\n" "Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) \n" "Language-Team: team@lists.gnome.gr\n" "Language: el\n" @@ -54,19 +54,6 @@ #. * Cf. bug 762282. #. #: ../app/about.h:39 -#| msgid "" -#| "GIMP 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.\n" -#| "\n" -#| "GIMP 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.\n" -#| "\n" -#| "You should have received a copy of the GNU General Public License along " -#| "with GIMP. If not, see http://www.gnu.org/licenses/." msgid "" "GIMP 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 " @@ -296,7 +283,7 @@ #. initialize the list of gimp brushes #: ../app/actions/actions.c:112 ../app/core/gimp.c:951 -#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2783 msgid "Brushes" msgstr "Πινέλα" @@ -346,7 +333,7 @@ #. Document History #: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:329 -#: ../app/dialogs/preferences-dialog.c:1577 +#: ../app/dialogs/preferences-dialog.c:1612 msgid "Document History" msgstr "Ιστορικό εγγράφου" @@ -379,7 +366,7 @@ msgstr "Αρχείο" #: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:325 -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2803 msgid "Fonts" msgstr "Γραμματοσειρές" @@ -390,12 +377,12 @@ #. initialize the list of gimp gradients #: ../app/actions/actions.c:172 ../app/core/gimp.c:971 -#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2799 msgid "Gradients" msgstr "Διαβαθμίσεις" #: ../app/actions/actions.c:175 ../app/core/gimp.c:983 -#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2770 +#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2807 msgid "Tool Presets" msgstr "Προεπιλογές εργαλείων" @@ -431,23 +418,23 @@ #. initialize the list of gimp palettes #: ../app/actions/actions.c:196 ../app/core/gimp.c:966 -#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2758 +#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2795 msgid "Palettes" msgstr "Παλέτες" #. initialize the list of gimp patterns #: ../app/actions/actions.c:199 ../app/core/gimp.c:961 -#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2791 msgid "Patterns" msgstr "Μοτίβα" -#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2774 +#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2811 msgid "Plug-Ins" msgstr "Πρόσθετα" #. Quick Mask Color #: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:386 -#: ../app/dialogs/preferences-dialog.c:2032 +#: ../app/dialogs/preferences-dialog.c:2069 msgid "Quick Mask" msgstr "Γρήγορη μάσκα" @@ -475,7 +462,7 @@ msgstr "Επεξεργαστής κειμένου" #: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:298 -#: ../app/dialogs/preferences-dialog.c:1861 ../app/gui/gui.c:441 +#: ../app/dialogs/preferences-dialog.c:1898 ../app/gui/gui.c:441 msgid "Tool Options" msgstr "Επιλογές εργαλείων" @@ -1396,7 +1383,7 @@ msgstr "Πε_ρί" #: ../app/actions/dialogs-actions.c:333 -#: ../app/dialogs/preferences-dialog.c:1951 ../app/widgets/gimptoolbox.c:539 +#: ../app/dialogs/preferences-dialog.c:1988 ../app/widgets/gimptoolbox.c:539 msgid "Toolbox" msgstr "Εργαλειοθήκη" @@ -3301,7 +3288,7 @@ #. Scaling #: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 -#: ../app/dialogs/preferences-dialog.c:1906 +#: ../app/dialogs/preferences-dialog.c:1943 #: ../app/pdb/drawable-transform-cmds.c:783 #: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 #: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524 @@ -7538,7 +7525,7 @@ msgstr "Παράσιτα" #. initialize the list of gimp dynamics -#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2750 +#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2787 #: ../app/tools/gimppaintoptions-gui.c:201 msgid "Dynamics" msgstr "Δυναμικές" @@ -7549,7 +7536,7 @@ msgstr "Γραμματοσειρές (πιθανή καθυστέρηση)" #. initialize the module list -#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2782 +#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2819 msgid "Modules" msgstr "Αρθρώματα" @@ -8496,7 +8483,7 @@ msgid "Remove Path" msgstr "Αφαίρεση μονοπατιού" -#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1715 +#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1750 msgid "Folder" msgstr "Φάκελος" @@ -9350,7 +9337,7 @@ msgstr "Δημιουργία νέας εικόνας" #: ../app/dialogs/image-new-dialog.c:135 -#: ../app/dialogs/preferences-dialog.c:2016 +#: ../app/dialogs/preferences-dialog.c:2053 msgid "_Template:" msgstr "_Πρότυπο:" @@ -9592,7 +9579,7 @@ msgstr "Επιλογή πηγής" #: ../app/dialogs/palette-import-dialog.c:214 -#: ../app/dialogs/preferences-dialog.c:1930 +#: ../app/dialogs/preferences-dialog.c:1967 msgid "_Gradient" msgstr "_Διαβάθμιση" @@ -9654,22 +9641,22 @@ msgid "The selected source contains no colors." msgstr "Η επιλεγμένη πηγή δεν περιέχει χρώματα." -#: ../app/dialogs/preferences-dialog.c:268 +#: ../app/dialogs/preferences-dialog.c:266 msgid "Reset All Preferences" msgstr "Επαναφορά όλων των προτιμήσεων" -#: ../app/dialogs/preferences-dialog.c:286 +#: ../app/dialogs/preferences-dialog.c:284 msgid "Do you really want to reset all preferences to default values?" msgstr "" "Σίγουρα θέλετε να επαναφέρετε όλες τις προτιμήσεις στις προκαθορισμένες " "τιμές;" -#: ../app/dialogs/preferences-dialog.c:356 +#: ../app/dialogs/preferences-dialog.c:362 msgid "You will have to restart GIMP for the following changes to take effect:" msgstr "" "Θα πρέπει να επανεκκινήσετε το GIMP για να εφαρμοστούν οι παρακάτω αλλαγές:" -#: ../app/dialogs/preferences-dialog.c:538 +#: ../app/dialogs/preferences-dialog.c:544 msgid "" "Your keyboard shortcuts will be reset to default values the next time you " "start GIMP." @@ -9677,17 +9664,17 @@ "Οι συντομεύσεις πληκτρολογίου θα επανέλθουν στις προεπιλεγμένες τους τιμές " "με την επανεκκίνηση του GIMP." -#: ../app/dialogs/preferences-dialog.c:549 +#: ../app/dialogs/preferences-dialog.c:555 msgid "Remove all Keyboard Shortcuts" msgstr "Αφαίρεση όλων των συντομεύσεων πληκτρολογίου" -#: ../app/dialogs/preferences-dialog.c:571 +#: ../app/dialogs/preferences-dialog.c:577 msgid "Do you really want to remove all keyboard shortcuts from all menus?" msgstr "" "Σίγουρα θέλετε να αφαιρέσετε όλες τις συντομεύσεις πληκτρολογίου από όλα τα " "μενού;" -#: ../app/dialogs/preferences-dialog.c:612 +#: ../app/dialogs/preferences-dialog.c:618 msgid "" "Your window setup will be reset to default values the next time you start " "GIMP." @@ -9695,7 +9682,7 @@ "Οι προτιμήσεις των παραθύρων θα επανέλθουν στις προεπιλεγμένες τους τιμές με " "την επανεκκίνηση του GIMP." -#: ../app/dialogs/preferences-dialog.c:647 +#: ../app/dialogs/preferences-dialog.c:653 msgid "" "Your input device settings will be reset to default values the next time you " "start GIMP." @@ -9703,7 +9690,7 @@ "Οι ρυθμίσεις των συσκευών εισόδου θα επανέλθουν στις προεπιλεγμένες με την " "επανεκκίνηση του GIMP." -#: ../app/dialogs/preferences-dialog.c:682 +#: ../app/dialogs/preferences-dialog.c:688 msgid "" "Your tool options will be reset to default values the next time you start " "GIMP." @@ -9712,774 +9699,786 @@ "επανεκκίνηση του GIMP." # -#: ../app/dialogs/preferences-dialog.c:1268 +#: ../app/dialogs/preferences-dialog.c:1303 msgid "Show _menubar" msgstr "Εμφάνιση γραμμής _μενού" -#: ../app/dialogs/preferences-dialog.c:1272 +#: ../app/dialogs/preferences-dialog.c:1307 msgid "Show _rulers" msgstr "Εμφάνιση _χάρακα" -#: ../app/dialogs/preferences-dialog.c:1275 +#: ../app/dialogs/preferences-dialog.c:1310 msgid "Show scroll_bars" msgstr "Εμφάνιση γραμμών κύ_λισης" # -#: ../app/dialogs/preferences-dialog.c:1278 +#: ../app/dialogs/preferences-dialog.c:1313 msgid "Show s_tatusbar" msgstr "Εμφάνιση γραμμής _κατάστασης" -#: ../app/dialogs/preferences-dialog.c:1286 +#: ../app/dialogs/preferences-dialog.c:1321 msgid "Show s_election" msgstr "Εμφάνιση ορίων _επιλογής" -#: ../app/dialogs/preferences-dialog.c:1289 +#: ../app/dialogs/preferences-dialog.c:1324 msgid "Show _layer boundary" msgstr "Εμφάνιση ορίων _στρώσης" -#: ../app/dialogs/preferences-dialog.c:1292 +#: ../app/dialogs/preferences-dialog.c:1327 msgid "Show _guides" msgstr "Εμφάνιση _οδηγών" -#: ../app/dialogs/preferences-dialog.c:1295 +#: ../app/dialogs/preferences-dialog.c:1330 msgid "Show gri_d" msgstr "Εμφάνιση πλέγμα_τος" -#: ../app/dialogs/preferences-dialog.c:1301 +#: ../app/dialogs/preferences-dialog.c:1336 msgid "Canvas _padding mode:" msgstr "Κατάσταση _υπόβαθρου καμβά:" -#: ../app/dialogs/preferences-dialog.c:1306 +#: ../app/dialogs/preferences-dialog.c:1341 msgid "Custom p_adding color:" msgstr "Προσαρμοσμένο χρώμα υ_πόβαθρου:" -#: ../app/dialogs/preferences-dialog.c:1307 +#: ../app/dialogs/preferences-dialog.c:1342 msgid "Select Custom Canvas Padding Color" msgstr "Επιλογή προσαρμοσμένου χρώματος υπόβαθρου" # -#: ../app/dialogs/preferences-dialog.c:1405 +#: ../app/dialogs/preferences-dialog.c:1440 msgid "Preferences" msgstr "Προτιμήσεις" # -#: ../app/dialogs/preferences-dialog.c:1518 -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:1553 +#: ../app/dialogs/preferences-dialog.c:2827 msgid "Environment" msgstr "Περιβάλλον" -#: ../app/dialogs/preferences-dialog.c:1532 +#: ../app/dialogs/preferences-dialog.c:1567 msgid "Resource Consumption" msgstr "Κατανάλωση πόρων" -#: ../app/dialogs/preferences-dialog.c:1542 +#: ../app/dialogs/preferences-dialog.c:1577 msgid "Minimal number of _undo levels:" msgstr "Ελάχιστος αριθμός _αναιρέσεων:" -#: ../app/dialogs/preferences-dialog.c:1545 +#: ../app/dialogs/preferences-dialog.c:1580 msgid "Maximum undo _memory:" msgstr "Μέγιστη _μνήμη αναιρέσεων:" -#: ../app/dialogs/preferences-dialog.c:1548 +#: ../app/dialogs/preferences-dialog.c:1583 msgid "Tile cache _size:" msgstr "_Μέγεθος κρυφής μνήμης παράθεσης:" -#: ../app/dialogs/preferences-dialog.c:1551 +#: ../app/dialogs/preferences-dialog.c:1586 msgid "Maximum _new image size:" msgstr "Μέγιστο μέγεθος _νέας εικόνας:" -#: ../app/dialogs/preferences-dialog.c:1556 +#: ../app/dialogs/preferences-dialog.c:1591 msgid "Number of _processors to use:" msgstr "Αριθμός ε_πεξεργαστών:" #. Image Thumbnails -#: ../app/dialogs/preferences-dialog.c:1561 +#: ../app/dialogs/preferences-dialog.c:1596 msgid "Image Thumbnails" msgstr "Μικρογραφίες εικόνων" -#: ../app/dialogs/preferences-dialog.c:1566 +#: ../app/dialogs/preferences-dialog.c:1601 msgid "Size of _thumbnails:" msgstr "Μέγεθος _μικρογραφιών:" -#: ../app/dialogs/preferences-dialog.c:1570 +#: ../app/dialogs/preferences-dialog.c:1605 msgid "Maximum _filesize for thumbnailing:" msgstr "Μέγιστο μέγεθος _αρχείου μικρογραφίας:" -#: ../app/dialogs/preferences-dialog.c:1580 +#: ../app/dialogs/preferences-dialog.c:1615 msgid "Keep record of used files in the Recent Documents list" msgstr "Απομνημόνευση αρχείων στη λίστα πρόσφατων εγγράφων" -#: ../app/dialogs/preferences-dialog.c:1589 +#: ../app/dialogs/preferences-dialog.c:1624 msgid "User Interface" msgstr "Διεπαφή χρήστη" -#: ../app/dialogs/preferences-dialog.c:1592 +#: ../app/dialogs/preferences-dialog.c:1627 msgid "Interface" msgstr "Διεπαφή" -#: ../app/dialogs/preferences-dialog.c:1602 +#: ../app/dialogs/preferences-dialog.c:1637 msgid "Language" msgstr "Γλώσσα" #. Previews -#: ../app/dialogs/preferences-dialog.c:1608 +#: ../app/dialogs/preferences-dialog.c:1643 msgid "Previews" msgstr "Προεπισκοπήσεις" -#: ../app/dialogs/preferences-dialog.c:1611 +#: ../app/dialogs/preferences-dialog.c:1646 msgid "_Enable layer & channel previews" msgstr "_Ενεργοποίηση προεπισκοπήσεων στρώσεων και καναλιών" -#: ../app/dialogs/preferences-dialog.c:1617 +#: ../app/dialogs/preferences-dialog.c:1652 msgid "_Default layer & channel preview size:" msgstr "_Προεπιλεγμένο μέγεθος προεπισκοπήσεων στρώσεων και καναλιών:" -#: ../app/dialogs/preferences-dialog.c:1620 +#: ../app/dialogs/preferences-dialog.c:1655 msgid "Na_vigation preview size:" msgstr "Μέ_γεθος προεπισκοπήσεων περιήγησης:" #. Keyboard Shortcuts -#: ../app/dialogs/preferences-dialog.c:1624 +#: ../app/dialogs/preferences-dialog.c:1659 msgid "Keyboard Shortcuts" msgstr "Συντομεύσεις πληκτρολογίου" -#: ../app/dialogs/preferences-dialog.c:1628 +#: ../app/dialogs/preferences-dialog.c:1663 msgid "_Use dynamic keyboard shortcuts" msgstr "Δυναμικές συντομεύσεις _πληκτρολογίου" -#: ../app/dialogs/preferences-dialog.c:1632 +#: ../app/dialogs/preferences-dialog.c:1667 msgid "Configure _Keyboard Shortcuts..." msgstr "Ρύθμιση συντομεύσεων _πληκτρολογίου..." # -#: ../app/dialogs/preferences-dialog.c:1639 +#: ../app/dialogs/preferences-dialog.c:1674 msgid "_Save keyboard shortcuts on exit" msgstr "_Αποθήκευση συντομεύσεων πληκτρολογίου στην έξοδο" # -#: ../app/dialogs/preferences-dialog.c:1643 +#: ../app/dialogs/preferences-dialog.c:1678 msgid "Save Keyboard Shortcuts _Now" msgstr "Αποθήκευση συντομεύσεων πληκτρολογίου _τώρα" -#: ../app/dialogs/preferences-dialog.c:1650 +#: ../app/dialogs/preferences-dialog.c:1685 msgid "_Reset Keyboard Shortcuts to Default Values" msgstr "_Επαναφορά προεπιλεγμένων συντομεύσεων πληκτρολογίου" -#: ../app/dialogs/preferences-dialog.c:1659 +#: ../app/dialogs/preferences-dialog.c:1694 msgid "Remove _All Keyboard Shortcuts" msgstr "Αφαίρεση ό_λων των συντομεύσεων πληκτρολογίου" -#: ../app/dialogs/preferences-dialog.c:1671 -#: ../app/dialogs/preferences-dialog.c:1710 +#: ../app/dialogs/preferences-dialog.c:1706 +#: ../app/dialogs/preferences-dialog.c:1745 msgid "Theme" msgstr "Θέμα" # -#: ../app/dialogs/preferences-dialog.c:1680 +#: ../app/dialogs/preferences-dialog.c:1715 msgid "Select Theme" msgstr "Επιλογή θέματος" -#: ../app/dialogs/preferences-dialog.c:1762 +#: ../app/dialogs/preferences-dialog.c:1797 msgid "Reload C_urrent Theme" msgstr "Eπαναφόρτωση _τρέχοντος θέματος" -#: ../app/dialogs/preferences-dialog.c:1774 +#: ../app/dialogs/preferences-dialog.c:1809 msgid "Help System" msgstr "Σύστημα βοήθειας" # #. General -#: ../app/dialogs/preferences-dialog.c:1786 -#: ../app/dialogs/preferences-dialog.c:1873 -#: ../app/dialogs/preferences-dialog.c:2086 +#: ../app/dialogs/preferences-dialog.c:1821 +#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:2123 #: ../app/widgets/gimpcontrollereditor.c:185 msgid "General" msgstr "Γενικά" -#: ../app/dialogs/preferences-dialog.c:1789 +#: ../app/dialogs/preferences-dialog.c:1824 msgid "Show _tooltips" msgstr "Εμφάνιση _συμβουλών εργαλείων" -#: ../app/dialogs/preferences-dialog.c:1792 +#: ../app/dialogs/preferences-dialog.c:1827 msgid "Show help _buttons" msgstr "Εμφάνιση _κουμπιών βοήθειας" -#: ../app/dialogs/preferences-dialog.c:1805 +#: ../app/dialogs/preferences-dialog.c:1832 msgid "Use the online version" msgstr "Χρήση διαδικτυακής έκδοσης" -#: ../app/dialogs/preferences-dialog.c:1806 +#: ../app/dialogs/preferences-dialog.c:1833 msgid "Use a locally installed copy" msgstr "Χρήση εγκατεστημένης έκδοσης" -#: ../app/dialogs/preferences-dialog.c:1807 +#: ../app/dialogs/preferences-dialog.c:1834 msgid "User manual:" msgstr "Εγχειρίδιο χρήσης:" -#: ../app/dialogs/preferences-dialog.c:1814 +#: ../app/dialogs/preferences-dialog.c:1841 msgid "There's a local installation of the user manual." msgstr "Υπάρχει τοπική εγκατάσταση του εγχειριδίου χρήστη." -#: ../app/dialogs/preferences-dialog.c:1819 +#: ../app/dialogs/preferences-dialog.c:1847 msgid "The user manual is not installed locally." msgstr "Το εγχειρίδιο χρήσης δεν είναι εγκατεστημένο τοπικά." -#: ../app/dialogs/preferences-dialog.c:1844 +#. If there is no webkit available, assume we are on a platform +#. * that doesn't use the help browser, so don't bother showing +#. * the combo. +#. +#: ../app/dialogs/preferences-dialog.c:1860 msgid "Help Browser" msgstr "Περιηγητής βοήθειας" -#: ../app/dialogs/preferences-dialog.c:1848 +#: ../app/dialogs/preferences-dialog.c:1867 msgid "H_elp browser to use:" msgstr "Π_εριηγητής βοήθειας για χρήση:" -#: ../app/dialogs/preferences-dialog.c:1876 +#: ../app/dialogs/preferences-dialog.c:1873 +msgid "" +"The GIMP help browser doesn't seem to be installed. Using the web browser " +"instead." +msgstr "" +"Ο περιηγητής βοήθειας του GIMP δεν φαίνεται να είναι εγκατεστημένος. " +"Χρησιμοποιήστε αντ' αυτού τον περιηγητή ιστού." + +#: ../app/dialogs/preferences-dialog.c:1913 msgid "_Save tool options on exit" msgstr "_Αποθήκευση επιλογών εργαλείων στην έξοδο" -#: ../app/dialogs/preferences-dialog.c:1880 +#: ../app/dialogs/preferences-dialog.c:1917 msgid "Save Tool Options _Now" msgstr "Αποθήκευση επιλογών εργαλείων _τώρα" -#: ../app/dialogs/preferences-dialog.c:1887 +#: ../app/dialogs/preferences-dialog.c:1924 msgid "_Reset Saved Tool Options to Default Values" msgstr "Επαναφο_ρά αποθηκευμένων επιλογών εργαλείων στις προεπιλεγμένες τιμές" #. Snapping Distance -#: ../app/dialogs/preferences-dialog.c:1897 +#: ../app/dialogs/preferences-dialog.c:1934 msgid "Guide & Grid Snapping" msgstr "Προσκόλληση οδηγών και πλέγματος" -#: ../app/dialogs/preferences-dialog.c:1902 +#: ../app/dialogs/preferences-dialog.c:1939 msgid "_Snap distance:" msgstr "Απόσταση προσ_κόλλησης:" -#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:1947 msgid "Default _interpolation:" msgstr "Προεπιλεγμένη _παρεμβολή:" #. Global Brush, Pattern, ... -#: ../app/dialogs/preferences-dialog.c:1917 +#: ../app/dialogs/preferences-dialog.c:1954 msgid "Paint Options Shared Between Tools" msgstr "Κοινές επιλογές ζωγραφικής για όλα τα εργαλεία" -#: ../app/dialogs/preferences-dialog.c:1921 +#: ../app/dialogs/preferences-dialog.c:1958 msgid "_Brush" msgstr "_Πινέλο" -#: ../app/dialogs/preferences-dialog.c:1924 +#: ../app/dialogs/preferences-dialog.c:1961 msgid "_Dynamics" msgstr "_Δυναμικές" -#: ../app/dialogs/preferences-dialog.c:1927 +#: ../app/dialogs/preferences-dialog.c:1964 msgid "_Pattern" msgstr "_Μοτίβο" #. Move Tool -#: ../app/dialogs/preferences-dialog.c:1934 +#: ../app/dialogs/preferences-dialog.c:1971 msgid "Move Tool" msgstr "Εργαλείο μετακίνησης" -#: ../app/dialogs/preferences-dialog.c:1938 +#: ../app/dialogs/preferences-dialog.c:1975 msgid "Set layer or path as active" msgstr "Ενεργοποιεί τη στρώση ή το μονοπάτι" #. Appearance -#: ../app/dialogs/preferences-dialog.c:1963 -#: ../app/dialogs/preferences-dialog.c:2162 ../app/widgets/gimpgrideditor.c:134 +#: ../app/dialogs/preferences-dialog.c:2000 +#: ../app/dialogs/preferences-dialog.c:2199 ../app/widgets/gimpgrideditor.c:134 msgid "Appearance" msgstr "Εμφάνιση" -#: ../app/dialogs/preferences-dialog.c:1967 +#: ../app/dialogs/preferences-dialog.c:2004 msgid "Show _foreground & background color" msgstr "Εμφάνιση _χρώματος προσκηνίου και παρασκηνίου" -#: ../app/dialogs/preferences-dialog.c:1971 +#: ../app/dialogs/preferences-dialog.c:2008 msgid "Show active _brush, pattern & gradient" msgstr "Εμφάνιση ενεργού _πινέλου, μοτίβου και διαβάθμισης" -#: ../app/dialogs/preferences-dialog.c:1975 +#: ../app/dialogs/preferences-dialog.c:2012 msgid "Show active _image" msgstr "Εμφάνιση ενεργής _εικόνας" #. Tool Editor -#: ../app/dialogs/preferences-dialog.c:1983 +#: ../app/dialogs/preferences-dialog.c:2020 msgid "Tools configuration" msgstr "Ρύθμιση εργαλείων" -#: ../app/dialogs/preferences-dialog.c:1998 +#: ../app/dialogs/preferences-dialog.c:2035 msgid "Default New Image" msgstr "Προεπιλεγμένη νέα εικόνα" -#: ../app/dialogs/preferences-dialog.c:2001 +#: ../app/dialogs/preferences-dialog.c:2038 msgid "Default Image" msgstr "Προεπιλεγμένη εικόνα" -#: ../app/dialogs/preferences-dialog.c:2035 +#: ../app/dialogs/preferences-dialog.c:2072 msgid "Set the default Quick Mask color" msgstr "Ορίζει το προεπιλεγμένο χρώμα γρήγορης μάσκας" -#: ../app/dialogs/preferences-dialog.c:2041 +#: ../app/dialogs/preferences-dialog.c:2078 msgid "Quick Mask color:" msgstr "Χρώμα γρήγορης μάσκας:" -#: ../app/dialogs/preferences-dialog.c:2051 +#: ../app/dialogs/preferences-dialog.c:2088 msgid "Default Image Grid" msgstr "Προεπιλεγμένο πλέγμα εικόνας" -#: ../app/dialogs/preferences-dialog.c:2054 +#: ../app/dialogs/preferences-dialog.c:2091 msgid "Default Grid" msgstr "Προεπιλεγμένο πλέγμα" -#: ../app/dialogs/preferences-dialog.c:2074 +#: ../app/dialogs/preferences-dialog.c:2111 msgid "Image Windows" msgstr "Παράθυρα εικόνων" -#: ../app/dialogs/preferences-dialog.c:2089 +#: ../app/dialogs/preferences-dialog.c:2126 msgid "Use \"_Dot for dot\" by default" msgstr "Προεπιλογή του \"κο_υκκίδα για κουκκίδα\"" -#: ../app/dialogs/preferences-dialog.c:2095 +#: ../app/dialogs/preferences-dialog.c:2132 msgid "Marching _ants speed:" msgstr "Ταχύτητα _διακεκομμένων γραμμών:" #. Zoom & Resize Behavior -#: ../app/dialogs/preferences-dialog.c:2099 +#: ../app/dialogs/preferences-dialog.c:2136 msgid "Zoom & Resize Behavior" msgstr "Συμπεριφορά εστίασης και αλλαγής μεγέθους" -#: ../app/dialogs/preferences-dialog.c:2103 +#: ../app/dialogs/preferences-dialog.c:2140 msgid "Resize window on _zoom" msgstr "Αλλαγή διαστάσεων παραθύρου σε εστίασ_η" -#: ../app/dialogs/preferences-dialog.c:2106 +#: ../app/dialogs/preferences-dialog.c:2143 msgid "Resize window on image _size change" msgstr "Αλλαγή μεγέθους παραθύρου στην αλλαγή με_γέθους εικόνας" -#: ../app/dialogs/preferences-dialog.c:2112 +#: ../app/dialogs/preferences-dialog.c:2149 msgid "Fit to window" msgstr "Προσαρμογή στο παράθυρο" -#: ../app/dialogs/preferences-dialog.c:2114 +#: ../app/dialogs/preferences-dialog.c:2151 msgid "Initial zoom _ratio:" msgstr "Αρχικός _λόγος εστίασης:" #. Space Bar -#: ../app/dialogs/preferences-dialog.c:2118 +#: ../app/dialogs/preferences-dialog.c:2155 msgid "Space Bar" msgstr "Διάστημα" -#: ../app/dialogs/preferences-dialog.c:2124 +#: ../app/dialogs/preferences-dialog.c:2161 msgid "_While space bar is pressed:" msgstr "Όταν είναι _πατημένο το διάστημα:" #. Mouse Pointers -#: ../app/dialogs/preferences-dialog.c:2128 +#: ../app/dialogs/preferences-dialog.c:2165 msgid "Mouse Pointers" msgstr "Δείκτες ποντικιού" -#: ../app/dialogs/preferences-dialog.c:2132 +#: ../app/dialogs/preferences-dialog.c:2169 msgid "Show _brush outline" msgstr "Εμφάνιση περιγράμματος _πινέλου" -#: ../app/dialogs/preferences-dialog.c:2135 +#: ../app/dialogs/preferences-dialog.c:2172 msgid "Show pointer for paint _tools" msgstr "Εμφάνιση δείκτη στα _εργαλεία ζωγραφικής" -#: ../app/dialogs/preferences-dialog.c:2141 +#: ../app/dialogs/preferences-dialog.c:2178 msgid "Pointer _mode:" msgstr "_Κατάσταση δείκτη:" -#: ../app/dialogs/preferences-dialog.c:2144 +#: ../app/dialogs/preferences-dialog.c:2181 msgid "Pointer re_ndering:" msgstr "Μορ_φή δείκτη:" -#: ../app/dialogs/preferences-dialog.c:2147 +#: ../app/dialogs/preferences-dialog.c:2184 msgid "Pointer _handedness:" msgstr "Κατεύ_θυνση δείκτη:" -#: ../app/dialogs/preferences-dialog.c:2159 +#: ../app/dialogs/preferences-dialog.c:2196 msgid "Image Window Appearance" msgstr "Εμφάνιση παραθύρου εικόνας" -#: ../app/dialogs/preferences-dialog.c:2170 +#: ../app/dialogs/preferences-dialog.c:2207 msgid "Default Appearance in Normal Mode" msgstr "Προεπιλεγμένη εμφάνιση κανονικών παραθύρων" -#: ../app/dialogs/preferences-dialog.c:2175 +#: ../app/dialogs/preferences-dialog.c:2212 msgid "Default Appearance in Fullscreen Mode" msgstr "Προεπιλεγμένη εμφάνιση πλήρους οθόνης" -#: ../app/dialogs/preferences-dialog.c:2184 +#: ../app/dialogs/preferences-dialog.c:2221 msgid "Image Title & Statusbar Format" msgstr "Τύπος τίτλου και κατάστασης εικόνας" -#: ../app/dialogs/preferences-dialog.c:2187 +#: ../app/dialogs/preferences-dialog.c:2224 msgid "Title & Status" msgstr "Τίτλος & κατάσταση" -#: ../app/dialogs/preferences-dialog.c:2205 +#: ../app/dialogs/preferences-dialog.c:2242 msgid "Current format" msgstr "Τρέχουσα μορφή" -#: ../app/dialogs/preferences-dialog.c:2206 +#: ../app/dialogs/preferences-dialog.c:2243 msgid "Default format" msgstr "Προεπιλεγμένη μορφή" # -#: ../app/dialogs/preferences-dialog.c:2207 +#: ../app/dialogs/preferences-dialog.c:2244 msgid "Show zoom percentage" msgstr "Εμφάνιση ποσοστού εστίασης" -#: ../app/dialogs/preferences-dialog.c:2208 +#: ../app/dialogs/preferences-dialog.c:2245 msgid "Show zoom ratio" msgstr "Εμφάνιση λόγου εστίασης" -#: ../app/dialogs/preferences-dialog.c:2209 +#: ../app/dialogs/preferences-dialog.c:2246 msgid "Show image size" msgstr "Εμφάνιση μεγέθους εικόνας" -#: ../app/dialogs/preferences-dialog.c:2222 +#: ../app/dialogs/preferences-dialog.c:2259 msgid "Image Title Format" msgstr "Μορφή τίτλου εικόνας" -#: ../app/dialogs/preferences-dialog.c:2224 +#: ../app/dialogs/preferences-dialog.c:2261 msgid "Image Statusbar Format" msgstr "Μορφή γραμμής κατάστασης εικόνας" # -#: ../app/dialogs/preferences-dialog.c:2309 +#: ../app/dialogs/preferences-dialog.c:2346 msgid "Display" msgstr "Οθόνη" #. Transparency -#: ../app/dialogs/preferences-dialog.c:2321 +#: ../app/dialogs/preferences-dialog.c:2358 msgid "Transparency" msgstr "Διαφάνεια" # # FIX? State = Politeia normally, but in Greece we have # # different subdivisions, so...? -#: ../app/dialogs/preferences-dialog.c:2325 +#: ../app/dialogs/preferences-dialog.c:2362 msgid "_Check style:" msgstr "Μορφή _σκακιέρας:" -#: ../app/dialogs/preferences-dialog.c:2328 +#: ../app/dialogs/preferences-dialog.c:2365 msgid "Check _size:" msgstr "_Μέγεθος σκακιέρας:" -#: ../app/dialogs/preferences-dialog.c:2331 +#: ../app/dialogs/preferences-dialog.c:2368 msgid "Monitor Resolution" msgstr "Ανάλυση οθόνης" # #. Pixels -#: ../app/dialogs/preferences-dialog.c:2335 ../app/display/gimpcursorview.c:208 +#: ../app/dialogs/preferences-dialog.c:2372 ../app/display/gimpcursorview.c:208 #: ../app/widgets/gimpgrideditor.c:199 ../app/widgets/gimpgrideditor.c:231 msgid "Pixels" msgstr "Εικονοστοιχεία" -#: ../app/dialogs/preferences-dialog.c:2353 +#: ../app/dialogs/preferences-dialog.c:2390 msgid "Horizontal" msgstr "Οριζόντια" -#: ../app/dialogs/preferences-dialog.c:2355 +#: ../app/dialogs/preferences-dialog.c:2392 msgid "Vertical" msgstr "Κάθετη" -#: ../app/dialogs/preferences-dialog.c:2357 +#: ../app/dialogs/preferences-dialog.c:2394 #: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "ppi" -#: ../app/dialogs/preferences-dialog.c:2373 +#: ../app/dialogs/preferences-dialog.c:2410 #, c-format msgid "_Detect automatically (currently %d × %d ppi)" msgstr "_Αυτόματη ανίχνευση (τρέχουσα %d × %d ppi)" -#: ../app/dialogs/preferences-dialog.c:2391 +#: ../app/dialogs/preferences-dialog.c:2428 msgid "_Enter manually" msgstr "_Εισαγωγή χειροκίνητα" -#: ../app/dialogs/preferences-dialog.c:2406 +#: ../app/dialogs/preferences-dialog.c:2443 msgid "C_alibrate..." msgstr "_Βαθμονόμηση..." -#: ../app/dialogs/preferences-dialog.c:2434 +#: ../app/dialogs/preferences-dialog.c:2471 msgid "Color Management" msgstr "Διαχείριση χρωμάτων" -#: ../app/dialogs/preferences-dialog.c:2454 +#: ../app/dialogs/preferences-dialog.c:2491 msgid "_RGB profile:" msgstr "Κατατομή _RGB:" -#: ../app/dialogs/preferences-dialog.c:2455 +#: ../app/dialogs/preferences-dialog.c:2492 msgid "Select RGB Color Profile" msgstr "Επιλογή κατατομής χρωμάτων RGB" -#: ../app/dialogs/preferences-dialog.c:2456 +#: ../app/dialogs/preferences-dialog.c:2493 msgid "_CMYK profile:" msgstr "Κατατομή _CMYK:" -#: ../app/dialogs/preferences-dialog.c:2457 +#: ../app/dialogs/preferences-dialog.c:2494 msgid "Select CMYK Color Profile" msgstr "Επιλογή κατατομής χρωμάτων CMYK" -#: ../app/dialogs/preferences-dialog.c:2458 +#: ../app/dialogs/preferences-dialog.c:2495 msgid "_Monitor profile:" msgstr "Κατατομή _οθόνης:" -#: ../app/dialogs/preferences-dialog.c:2459 +#: ../app/dialogs/preferences-dialog.c:2496 msgid "Select Monitor Color Profile" msgstr "Επιλογή κατατομής χρωμάτων οθόνης" -#: ../app/dialogs/preferences-dialog.c:2460 +#: ../app/dialogs/preferences-dialog.c:2497 msgid "_Print simulation profile:" msgstr "Κατατομή προσομοίωσης _εκτύπωσης:" -#: ../app/dialogs/preferences-dialog.c:2461 +#: ../app/dialogs/preferences-dialog.c:2498 msgid "Select Printer Color Profile" msgstr "Επιλογή κατατομής χρωμάτων εκτυπωτή" -#: ../app/dialogs/preferences-dialog.c:2472 +#: ../app/dialogs/preferences-dialog.c:2509 msgid "_Mode of operation:" msgstr "_Κατάσταση λειτουργίας:" -#: ../app/dialogs/preferences-dialog.c:2502 +#: ../app/dialogs/preferences-dialog.c:2539 msgid "_Try to use the system monitor profile" msgstr "_Δοκιμάστε τη χρήση κατατομής οθόνης συστήματος" -#: ../app/dialogs/preferences-dialog.c:2512 +#: ../app/dialogs/preferences-dialog.c:2549 msgid "_Display rendering intent:" msgstr "Ε_μφάνιση στόχου χρωματικής απόδοσης:" -#: ../app/dialogs/preferences-dialog.c:2521 +#: ../app/dialogs/preferences-dialog.c:2558 msgid "_Softproof rendering intent:" msgstr "Στόχος χρωματικής σπόδοσης _προσομοίωσης εκτύπωσης:" -#: ../app/dialogs/preferences-dialog.c:2534 +#: ../app/dialogs/preferences-dialog.c:2571 msgid "Mark out of gamut colors" msgstr "Σήμανση χρωμάτων εκτός φάσματος" -#: ../app/dialogs/preferences-dialog.c:2539 +#: ../app/dialogs/preferences-dialog.c:2576 msgid "Select Warning Color" msgstr "Επιλογή χρώματος προειδοποίησης" -#: ../app/dialogs/preferences-dialog.c:2552 +#: ../app/dialogs/preferences-dialog.c:2589 msgid "File Open behaviour:" msgstr "Συμπεριφορά ανοίγματος αρχείου:" -#: ../app/dialogs/preferences-dialog.c:2564 +#: ../app/dialogs/preferences-dialog.c:2601 msgid "Input Devices" msgstr "Συσκευές εισόδου" #. Extended Input Devices -#: ../app/dialogs/preferences-dialog.c:2574 +#: ../app/dialogs/preferences-dialog.c:2611 msgid "Extended Input Devices" msgstr "Εκτεταμένες συσκευές εισόδου" -#: ../app/dialogs/preferences-dialog.c:2578 +#: ../app/dialogs/preferences-dialog.c:2615 msgid "Configure E_xtended Input Devices..." msgstr "Ρύθμιση ε_κτεταμένων συσκευών εισόδου..." -#: ../app/dialogs/preferences-dialog.c:2585 +#: ../app/dialogs/preferences-dialog.c:2622 msgid "_Save input device settings on exit" msgstr "_Αποθήκευση ρυθμίσεων συσκευών εισόδου στην έξοδο" -#: ../app/dialogs/preferences-dialog.c:2589 +#: ../app/dialogs/preferences-dialog.c:2626 msgid "Save Input Device Settings _Now" msgstr "Αποθήκευση ρυθμίσεων συσκευών εισόδου _τώρα" -#: ../app/dialogs/preferences-dialog.c:2596 +#: ../app/dialogs/preferences-dialog.c:2633 msgid "_Reset Saved Input Device Settings to Default Values" msgstr "" "Επαναφο_ρά αποθηκευμένων ρυθμίσεων συσκευών εισόδου στις προεπιλεγμένες τιμές" -#: ../app/dialogs/preferences-dialog.c:2611 +#: ../app/dialogs/preferences-dialog.c:2648 msgid "Additional Input Controllers" msgstr "Πρόσθετοι ελεγκτές εισόδου" -#: ../app/dialogs/preferences-dialog.c:2614 +#: ../app/dialogs/preferences-dialog.c:2651 msgid "Input Controllers" msgstr "Ελεγκτές εισόδου" -#: ../app/dialogs/preferences-dialog.c:2630 +#: ../app/dialogs/preferences-dialog.c:2667 msgid "Window Management" msgstr "Διαχείριση παραθύρων" -#: ../app/dialogs/preferences-dialog.c:2639 +#: ../app/dialogs/preferences-dialog.c:2676 msgid "Window Manager Hints" msgstr "Συμβουλές διαχειριστή παραθύρων" -#: ../app/dialogs/preferences-dialog.c:2645 +#: ../app/dialogs/preferences-dialog.c:2682 msgid "Hint for _docks and toolbox:" msgstr "Συμβουλή _προσαρτήσεων και εργαλειοθηκών:" -#: ../app/dialogs/preferences-dialog.c:2648 +#: ../app/dialogs/preferences-dialog.c:2685 msgid "Focus" msgstr "Εστίαση" -#: ../app/dialogs/preferences-dialog.c:2652 +#: ../app/dialogs/preferences-dialog.c:2689 msgid "Activate the _focused image" msgstr "Ενεργοποίηση _εστιασμένης εικόνας" # #. Window Positions -#: ../app/dialogs/preferences-dialog.c:2656 +#: ../app/dialogs/preferences-dialog.c:2693 msgid "Window Positions" msgstr "Θέσεις παραθύρων" # -#: ../app/dialogs/preferences-dialog.c:2659 +#: ../app/dialogs/preferences-dialog.c:2696 msgid "_Save window positions on exit" msgstr "_Αποθήκευση θέσεων παραθύρων στην έξοδο" # -#: ../app/dialogs/preferences-dialog.c:2663 +#: ../app/dialogs/preferences-dialog.c:2700 msgid "Save Window Positions _Now" msgstr "Αποθήκευση θέσεων παραθύρων _τώρα" -#: ../app/dialogs/preferences-dialog.c:2670 +#: ../app/dialogs/preferences-dialog.c:2707 msgid "_Reset Saved Window Positions to Default Values" msgstr "_Επαναφορά αποθηκευμένων θέσεων παραθύρων στις προεπιλεγμένες τιμές" -#: ../app/dialogs/preferences-dialog.c:2685 +#: ../app/dialogs/preferences-dialog.c:2722 msgid "Folders" msgstr "Φάκελοι" -#: ../app/dialogs/preferences-dialog.c:2705 +#: ../app/dialogs/preferences-dialog.c:2742 msgid "Temporary folder:" msgstr "Προσωρινός φάκελος:" -#: ../app/dialogs/preferences-dialog.c:2706 +#: ../app/dialogs/preferences-dialog.c:2743 msgid "Select Folder for Temporary Files" msgstr "Επιλογή φακέλου για τα προσωρινά αρχεία" -#: ../app/dialogs/preferences-dialog.c:2710 +#: ../app/dialogs/preferences-dialog.c:2747 msgid "Swap folder:" msgstr "Φάκελος εναλλαγής:" -#: ../app/dialogs/preferences-dialog.c:2711 +#: ../app/dialogs/preferences-dialog.c:2748 msgid "Select Swap Folder" msgstr "Επιλογή φακέλου εναλλαγής" -#: ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/preferences-dialog.c:2783 msgid "Brush Folders" msgstr "Φάκελοι πινέλων" # -#: ../app/dialogs/preferences-dialog.c:2748 +#: ../app/dialogs/preferences-dialog.c:2785 msgid "Select Brush Folders" msgstr "Επιλογή φακέλων πινέλων" -#: ../app/dialogs/preferences-dialog.c:2750 +#: ../app/dialogs/preferences-dialog.c:2787 msgid "Dynamics Folders" msgstr "Φάκελοι δυναμικών" -#: ../app/dialogs/preferences-dialog.c:2752 +#: ../app/dialogs/preferences-dialog.c:2789 msgid "Select Dynamics Folders" msgstr "Επιλογή φακέλων δυναμικών" -#: ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/preferences-dialog.c:2791 msgid "Pattern Folders" msgstr "Φάκελοι μοτίβων" # -#: ../app/dialogs/preferences-dialog.c:2756 +#: ../app/dialogs/preferences-dialog.c:2793 msgid "Select Pattern Folders" msgstr "Επιλογή φακέλων μοτίβων" -#: ../app/dialogs/preferences-dialog.c:2758 +#: ../app/dialogs/preferences-dialog.c:2795 msgid "Palette Folders" msgstr "Φάκελοι παλετών" -#: ../app/dialogs/preferences-dialog.c:2760 +#: ../app/dialogs/preferences-dialog.c:2797 msgid "Select Palette Folders" msgstr "Επιλογή φακέλων παλετών" -#: ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/preferences-dialog.c:2799 msgid "Gradient Folders" msgstr "Φάκελοι διαβαθμίσεων" -#: ../app/dialogs/preferences-dialog.c:2764 +#: ../app/dialogs/preferences-dialog.c:2801 msgid "Select Gradient Folders" msgstr "Επιλογή φακέλων διαβαθμίσεων" -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2803 msgid "Font Folders" msgstr "Φάκελοι γραμματοσειρών" # -#: ../app/dialogs/preferences-dialog.c:2768 +#: ../app/dialogs/preferences-dialog.c:2805 msgid "Select Font Folders" msgstr "Επιλογή φακέλων γραμματοσειρών" -#: ../app/dialogs/preferences-dialog.c:2770 +#: ../app/dialogs/preferences-dialog.c:2807 msgid "Tool Preset Folders" msgstr "Φάκελοι προεπιλεγμένων εργαλείων" -#: ../app/dialogs/preferences-dialog.c:2772 +#: ../app/dialogs/preferences-dialog.c:2809 msgid "Select Tool Preset Folders" msgstr "Επιλογή φακέλων προεπιλογής εργαλείου" -#: ../app/dialogs/preferences-dialog.c:2774 +#: ../app/dialogs/preferences-dialog.c:2811 msgid "Plug-In Folders" msgstr "Φάκελοι προσθέτων" -#: ../app/dialogs/preferences-dialog.c:2776 +#: ../app/dialogs/preferences-dialog.c:2813 msgid "Select Plug-In Folders" msgstr "Επιλογή φακέλων προσθέτων" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2815 msgid "Scripts" msgstr "Σενάρια" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2815 msgid "Script-Fu Folders" msgstr "Φάκελοι Script-Fu" # -#: ../app/dialogs/preferences-dialog.c:2780 +#: ../app/dialogs/preferences-dialog.c:2817 msgid "Select Script-Fu Folders" msgstr "Επιλογή φακέλων Script-Fu" -#: ../app/dialogs/preferences-dialog.c:2782 +#: ../app/dialogs/preferences-dialog.c:2819 msgid "Module Folders" msgstr "Φάκελοι αρθρωμάτων" -#: ../app/dialogs/preferences-dialog.c:2784 +#: ../app/dialogs/preferences-dialog.c:2821 msgid "Select Module Folders" msgstr "Επιλογή φακέλων αρθρωμάτων" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Interpreters" msgstr "Διερμηνευτές" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Interpreter Folders" msgstr "Φάκελοι διερμηνευτών" -#: ../app/dialogs/preferences-dialog.c:2788 +#: ../app/dialogs/preferences-dialog.c:2825 msgid "Select Interpreter Folders" msgstr "Επιλογή φακέλων διερμηνευτών" # -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:2827 msgid "Environment Folders" msgstr "Φάκελοι περιβάλλοντος" # -#: ../app/dialogs/preferences-dialog.c:2792 +#: ../app/dialogs/preferences-dialog.c:2829 msgid "Select Environment Folders" msgstr "Επιλογή φακέλων περιβάλλοντος" -#: ../app/dialogs/preferences-dialog.c:2794 +#: ../app/dialogs/preferences-dialog.c:2831 msgid "Themes" msgstr "Θέματα" -#: ../app/dialogs/preferences-dialog.c:2794 +#: ../app/dialogs/preferences-dialog.c:2831 msgid "Theme Folders" msgstr "Φάκελοι θεμάτων" -#: ../app/dialogs/preferences-dialog.c:2796 +#: ../app/dialogs/preferences-dialog.c:2833 msgid "Select Theme Folders" msgstr "Επιλογή φακέλων θεμάτων" @@ -11003,26 +11002,26 @@ msgid "Not a regular file" msgstr "Μη κανονικό αρχείο" -#: ../app/file/file-open.c:191 +#: ../app/file/file-open.c:197 #, c-format msgid "%s plug-in returned SUCCESS but did not return an image" msgstr "Το πρόσθετο %s επέστρεψε ΕΠΙΤΥΧΙΑ αλλά δεν επέστρεψε εικόνα" -#: ../app/file/file-open.c:202 +#: ../app/file/file-open.c:208 #, c-format msgid "%s plug-In could not open image" msgstr "Το πρόσθετο %s δεν μπόρεσε να ανοίξει την εικόνα" -#: ../app/file/file-open.c:533 +#: ../app/file/file-open.c:539 msgid "Image doesn't contain any layers" msgstr "Η εικόνα δεν περιέχει στρώσεις" -#: ../app/file/file-open.c:593 +#: ../app/file/file-open.c:599 #, c-format msgid "Opening '%s' failed: %s" msgstr "Το άνοιγμα του '%s' απέτυχε: %s" -#: ../app/file/file-open.c:703 +#: ../app/file/file-open.c:709 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -11739,7 +11738,7 @@ "Σφάλμα κατά την εκτέλεση της διαδικασίας '%s':\n" "%s" -#: ../app/plug-in/gimpplugin-progress.c:331 +#: ../app/plug-in/gimpplugin-progress.c:339 msgid "Cancelled" msgstr "Ακυρώθηκε" @@ -15465,15 +15464,15 @@ msgid "Height" msgstr "Ύψος" -#: ../app/widgets/gimphelp.c:297 +#: ../app/widgets/gimphelp.c:308 msgid "Help browser is missing" msgstr "Δεν βρέθηκε o περιηγητής βοήθειας" -#: ../app/widgets/gimphelp.c:298 +#: ../app/widgets/gimphelp.c:309 msgid "The GIMP help browser is not available." msgstr "Ο περιηγητής βοήθειας του GIMP δεν είναι διαθέσιμος." -#: ../app/widgets/gimphelp.c:299 +#: ../app/widgets/gimphelp.c:310 msgid "" "The GIMP help browser plug-in appears to be missing from your installation. " "You may instead use the web browser for reading the help pages." @@ -15482,31 +15481,41 @@ "εγκατάσταση σας. Εναλλακτικά, μπορείτε να χρησιμοποιήσετε τον περιηγητή " "ιστού για ανάγνωση των σελίδων βοήθειας." -#: ../app/widgets/gimphelp.c:340 +#: ../app/widgets/gimphelp.c:351 msgid "Help browser doesn't start" msgstr "Ο περιηγητής βοήθειας δεν ξεκινά" -#: ../app/widgets/gimphelp.c:341 +#: ../app/widgets/gimphelp.c:352 msgid "Could not start the GIMP help browser plug-in." msgstr "Δεν ήταν δυνατή η εκκίνηση του πρόσθετου περιηγητή βοήθειας του GIMP." -#: ../app/widgets/gimphelp.c:368 +#: ../app/widgets/gimphelp.c:354 +#| msgid "" +#| "The GIMP help browser plug-in appears to be missing from your " +#| "installation. You may instead use the web browser for reading the help " +#| "pages." +msgid "You may instead use the web browser for reading the help pages." +msgstr "" +"Εναλλακτικά, μπορείτε να χρησιμοποιήσετε τον περιηγητή ιστού για ανάγνωση " +"των σελίδων βοήθειας." + +#: ../app/widgets/gimphelp.c:380 msgid "Use _Web Browser" msgstr "Χρήση _περιηγητή ιστού" -#: ../app/widgets/gimphelp.c:712 +#: ../app/widgets/gimphelp.c:724 msgid "GIMP user manual is missing" msgstr "Το εγχειρίδιο χρήσης του GIMP λείπει" -#: ../app/widgets/gimphelp.c:719 +#: ../app/widgets/gimphelp.c:731 msgid "_Read Online" msgstr "_Ανάγνωση στο διαδίκτυο" -#: ../app/widgets/gimphelp.c:743 +#: ../app/widgets/gimphelp.c:755 msgid "The GIMP user manual is not installed on your computer." msgstr "Το εγχειρίδιο χρήσης του GIMP δεν είναι εγκατεστημένο στο σύστημά σας." -#: ../app/widgets/gimphelp.c:746 +#: ../app/widgets/gimphelp.c:758 msgid "" "You may either install the additional help package or change your " "preferences to use the online version." @@ -15841,19 +15850,19 @@ msgid "%d ppi, %s" msgstr "%d ppi, %s" -#: ../app/widgets/gimptextbuffer-serialize.c:344 +#: ../app/widgets/gimptextbuffer-serialize.c:269 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "" "Το γνώρισμα \"%s\" είναι άκυρο στο στοιχείο <%s> σε αυτό το περιεχόμενο" -#: ../app/widgets/gimptextbuffer-serialize.c:416 +#: ../app/widgets/gimptextbuffer-serialize.c:341 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "Το εξώτερο στοιχείο πρέπει να είναι και όχι <%s>" # -#: ../app/widgets/gimptextbuffer.c:1459 +#: ../app/widgets/gimptextbuffer.c:1460 #, c-format msgid "Invalid UTF-8 data in file '%s'." msgstr "Μη έγκυρα δεδομένα UTF-8 στο αρχείο '%s'." diff -Nru gimp-2.8.18/po/es.po gimp-2.8.20/po/es.po --- gimp-2.8.18/po/es.po 2015-11-01 01:20:52.000000000 +0000 +++ gimp-2.8.20/po/es.po 2017-01-28 19:08:48.000000000 +0000 @@ -1,16305 +1,16334 @@ # translation of gimp.master.po to Español # Copyright © 1998-2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # This file is distributed under the same license as the gimp package. -# +# # Rodrigo Sancho Senosiain -# +# # Pablo G. del Campo , 2003, 2004. # Alonso Lara , 2005. # Francisco Javier F. Serrador , 2003, 2004, 2005, 2006. # Joaquín Ignacio Aramendía , 2011. # Jorge González , 2007, 2008, 2009, 2010, 2011. # Francisco Vila , 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012. -# -# Daniel Mustieles , 2011, 2012, 2013, 2014, 2015. -msgid "" -msgstr "" -"Project-Id-Version: gimp.master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-06-08 05:27+0000\n" -"PO-Revision-Date: 2015-06-08 \n" -"Last-Translator: Daniel Mustieles \n" -"Language-Team: Español; Castellano \n" -"Language: es\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Gtranslator 2.91.6\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../app/about.h:23 -msgid "GIMP" -msgstr "GIMP" - -#: ../app/about.h:26 ../desktop/gimp.desktop.in.in.h:1 -msgid "GNU Image Manipulation Program" -msgstr "Programa de manipulación de imágenes de GNU" - -#. The year of the last commit (UTC) will be inserted into this string. -#: ../app/about.h:30 -#, c-format -msgid "" -"Copyright © 1995-%s\n" -"Spencer Kimball, Peter Mattis and the GIMP Development Team" -msgstr "" -"Copyright © 1995-%s\n" -"Spencer Kimball, Peter Mattis y el equipo de desarrollo de GIMP" - -#: ../app/about.h:34 -msgid "" -"GIMP 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.\n" -"\n" -"GIMP 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.\n" -"\n" -"You should have received a copy of the GNU General Public License along with " -"GIMP. If not, see http://www.gnu.org/licenses/." -msgstr "" -"GIMP es software libre: puede redistribuirlo y/o modificarlo bajo los " -"términos de la Licencia Pública General de GNU según se encuentra publicada " -"por la Free Software Foundation, bien de la versión 3 de dicha Licencia o " -"bien (según su elección) de cualquier versión posterior.\n" -"\n" -"Este programa se distribuye con la esperanza de que sea útil, pero SIN " -"NINGUNA GARANTÍA, incluso sin la garantía MERCANTIL implícita ni la de " -"garantizar la ADECUACIÓN A UN PROPÓSITO PARTICULAR. Véase la Licencia " -"Pública General de GNU para más detalles.\n" -"\n" -"Debería haber recibido una copia de la Licencia Pública General de GNU " -"junto con este programa. Si no ha sido así, consulte ." - -#: ../app/app.c:225 -#, c-format -msgid "" -"Unable to open a test swap file.\n" -"\n" -"To avoid data loss, please check the location and permissions of the swap " -"directory defined in your Preferences (currently \"%s\")." -msgstr "" -"No se ha podido abrir un archivo de intercambio de prueba.\n" -"\n" -"Para evitar la pérdida de datos, compruebe la ubicación y los permisos de la " -"carpeta de intercambio definida en sus preferencias (actualmente es «%s»)." - -#: ../app/batch.c:75 -#, c-format -msgid "No batch interpreter specified, using the default '%s'.\n" -msgstr "" -"No hay un intérprete por lotes especificado, usando el predeterminado «%s».\n" - -#: ../app/batch.c:93 ../app/batch.c:111 -#, c-format -msgid "The batch interpreter '%s' is not available. Batch mode disabled." -msgstr "" -"El intérprete del proceso por lotes «%s» no está disponible, el modo de lotes " -"se desactivará." - -#: ../app/main.c:148 -msgid "Show version information and exit" -msgstr "Mostrar información de la versión y salir" - -#: ../app/main.c:153 -msgid "Show license information and exit" -msgstr "Mostrar información de la licencia y salir" - -#: ../app/main.c:158 -msgid "Be more verbose" -msgstr "Ser más detallado" - -#: ../app/main.c:163 -msgid "Start a new GIMP instance" -msgstr "Iniciar una instancia de GIMP nueva" - -#: ../app/main.c:168 -msgid "Open images as new" -msgstr "Abrir imágenes como nuevas" - -#: ../app/main.c:173 -msgid "Run without a user interface" -msgstr "Ejecutar sin una interfaz de usuario" - -#: ../app/main.c:178 -msgid "Do not load brushes, gradients, patterns, ..." -msgstr "No cargar los pinceles, los degradados, los patrones, …" - -#: ../app/main.c:183 -msgid "Do not load any fonts" -msgstr "No cargar ninguna tipografía" - -#: ../app/main.c:188 -msgid "Do not show a splash screen" -msgstr "No mostrar una pantalla de arranque" - -#: ../app/main.c:193 -msgid "Do not use shared memory between GIMP and plugins" -msgstr "No compartir la memoria entre GIMP y los complementos" - -#: ../app/main.c:198 -msgid "Do not use special CPU acceleration functions" -msgstr "No utilizar las funciones de aceleración especiales de la CPU" - -#: ../app/main.c:203 -msgid "Use an alternate sessionrc file" -msgstr "Usar un archivo «sessionrc» alternativo" - -#: ../app/main.c:208 -msgid "Use an alternate user gimprc file" -msgstr "Usar un archivo de usuario «gimprc» alternativo" - -#: ../app/main.c:213 -msgid "Use an alternate system gimprc file" -msgstr "Usar un archivo de sistema «gimprc» alternativo" - -#: ../app/main.c:218 -msgid "Batch command to run (can be used multiple times)" -msgstr "Instrucción por lotes que ejecutar (puede usarse varias veces)" - -#: ../app/main.c:223 -msgid "The procedure to process batch commands with" -msgstr "El procedimiento con el que se procesarán las instrucciones en lotes" - -#: ../app/main.c:228 -msgid "Send messages to console instead of using a dialog" -msgstr "Enviar las advertencias a la consola en vez de usar un diálogo" - -#. don't translate the mode names (off|on|warn) -#: ../app/main.c:234 -msgid "PDB compatibility mode (off|on|warn)" -msgstr "Modo de compatibilidad PDB (off|on|warn)" - -#. don't translate the mode names (never|query|always) -#: ../app/main.c:240 -msgid "Debug in case of a crash (never|query|always)" -msgstr "Depurar en caso de error (never|query|always)" - -#: ../app/main.c:245 -msgid "Enable non-fatal debugging signal handlers" -msgstr "Activar los manejadores de señales no fatales de depuración" - -#: ../app/main.c:250 -msgid "Make all warnings fatal" -msgstr "Hacer todas las advertencias fatales" - -#: ../app/main.c:255 -msgid "Output a gimprc file with default settings" -msgstr "Sacar un archivo gimprc con la configuración predeterminada" - -#: ../app/main.c:271 -msgid "Output a sorted list of deprecated procedures in the PDB" -msgstr "" -"Mostrar una lista ordenada de los procedimientos obsoletos dentro del PDB" - -#: ../app/main.c:433 -msgid "[FILE|URI...]" -msgstr "[ARCHIVO|URI…]" - -#: ../app/main.c:455 -msgid "" -"GIMP could not initialize the graphical user interface.\n" -"Make sure a proper setup for your display environment exists." -msgstr "" -"GIMP no ha podido inicializar la interfaz gráfica de usuario.\n" -"Asegúrese de que exista una instalación apropiada para su pantalla." - -#: ../app/main.c:474 -msgid "Another GIMP instance is already running." -msgstr "Ya se está ejecutando otra instancia de GIMP." - -#: ../app/main.c:546 -msgid "GIMP output. Type any character to close this window." -msgstr "" -"Salida de GIMP. Teclee un carácter cualquiera para cerrar esta ventana." - -#: ../app/main.c:547 -#, c-format -msgid "(Type any character to close this window)\n" -msgstr "(Teclee un carácter cualquiera para cerrar esta ventana)\n" - -#: ../app/main.c:564 -msgid "GIMP output. You can minimize this window, but don't close it." -msgstr "Salida de GIMP. Puede minimizar esta ventana, pero no la cierre." - -#: ../app/sanity.c:433 -#, c-format -msgid "" -"The configured filename encoding cannot be converted to UTF-8: %s\n" -"\n" -"Please check the value of the environment variable G_FILENAME_ENCODING." -msgstr "" -"La codificación configurada para el nombre del fichero no puede ser " -"convertida a UTF-8: %s\n" -"\n" -"Compruebe el valor de la variable de entorno G_FILENAME_ENCODING." - -#: ../app/sanity.c:452 -#, c-format -msgid "" -"The name of the directory holding the GIMP user configuration cannot be " -"converted to UTF-8: %s\n" -"\n" -"Your filesystem probably stores files in an encoding other than UTF-8 and " -"you didn't tell GLib about this. Please set the environment variable " -"G_FILENAME_ENCODING." -msgstr "" -"El nombre de la carpeta que contiene la configuración de usuario de GIMP no " -"se puede convertir a UTF-8: %s\n" -" \n" -"Lo más probable es que su sistema de ficheros almacene los archivos en una " -"codificación diferente a UTF-8 y no ha dicho esto a Glib. Por favor, " -"establezca la variable de entorno G_FILENAME_ENCODING." - -#. show versions of libraries used by GIMP -#: ../app/version.c:63 ../app/version.c:130 -#, c-format -msgid "using %s version %s (compiled against version %s)" -msgstr "utilizando %s versión %s (compilado contra la versión %s)" - -#: ../app/version.c:138 -#, c-format -msgid "%s version %s" -msgstr "%s versión %s" - -#: ../app/actions/actions.c:109 ../app/dialogs/dialogs.c:388 -#: ../app/widgets/gimpbrusheditor.c:88 -msgid "Brush Editor" -msgstr "Editor de pinceles" - -#. initialize the list of gimp brushes -#: ../app/actions/actions.c:112 ../app/core/gimp.c:951 -#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2746 -msgid "Brushes" -msgstr "Pinceles" - -#: ../app/actions/actions.c:115 ../app/dialogs/dialogs.c:327 -msgid "Buffers" -msgstr "Búferes" - -#: ../app/actions/actions.c:118 ../app/dialogs/dialogs.c:346 -msgid "Channels" -msgstr "Canales" - -#: ../app/actions/actions.c:121 ../app/dialogs/convert-dialog.c:174 -#: ../app/dialogs/dialogs.c:354 -msgid "Colormap" -msgstr "Mapa de colores" - -#: ../app/actions/actions.c:124 -msgid "Configuration" -msgstr "Configuración" - -#: ../app/actions/actions.c:127 -msgid "Context" -msgstr "Contexto" - -#: ../app/actions/actions.c:130 ../app/dialogs/dialogs.c:310 -msgid "Pointer Information" -msgstr "Información del puntero" - -#: ../app/actions/actions.c:133 -msgid "Debug" -msgstr "Depurar" - -#: ../app/actions/actions.c:136 -msgid "Dialogs" -msgstr "Diálogos" - -#: ../app/actions/actions.c:139 -msgid "Dock" -msgstr "Empotrar" - -#: ../app/actions/actions.c:142 -msgid "Dockable" -msgstr "Empotrable" - -#. Document History -#: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:329 -#: ../app/dialogs/preferences-dialog.c:1577 -msgid "Document History" -msgstr "Historial del documento" - -#: ../app/actions/actions.c:148 -msgid "Drawable" -msgstr "Dibujable" - -#. Some things do not have grids, so just list -#: ../app/actions/actions.c:151 ../app/dialogs/dialogs.c:335 -msgid "Paint Dynamics" -msgstr "Dinámica de la pintura" - -#: ../app/actions/actions.c:154 ../app/dialogs/dialogs.c:392 -#: ../app/widgets/gimpdynamicseditor.c:92 -msgid "Paint Dynamics Editor" -msgstr "Editor de dinámica de la pintura" - -#: ../app/actions/actions.c:157 -msgid "Edit" -msgstr "Editar" - -#: ../app/actions/actions.c:160 ../app/dialogs/dialogs.c:306 -msgid "Error Console" -msgstr "Consola de errores" - -#: ../app/actions/actions.c:163 -msgid "File" -msgstr "Archivo" - -#: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:325 -#: ../app/dialogs/preferences-dialog.c:2766 -msgid "Fonts" -msgstr "Tipografías" - -#: ../app/actions/actions.c:169 ../app/dialogs/dialogs.c:396 -#: ../app/widgets/gimpgradienteditor.c:269 -msgid "Gradient Editor" -msgstr "Editor de degradados" - -#. initialize the list of gimp gradients -#: ../app/actions/actions.c:172 ../app/core/gimp.c:971 -#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2762 -msgid "Gradients" -msgstr "Degradados" - -#: ../app/actions/actions.c:175 ../app/core/gimp.c:983 -#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2770 -msgid "Tool Presets" -msgstr "Ajustes prefijados de las herramientas" - -#: ../app/actions/actions.c:178 ../app/dialogs/dialogs.c:404 -#: ../app/widgets/gimptoolpreseteditor.c:92 -msgid "Tool Preset Editor" -msgstr "Editor de ajustes prefijados de las herramientas" - -#: ../app/actions/actions.c:181 -msgid "Help" -msgstr "Ayuda" - -#: ../app/actions/actions.c:184 -msgid "Image" -msgstr "Imagen" - -#. list & grid views -#: ../app/actions/actions.c:187 ../app/dialogs/dialogs.c:315 -msgid "Images" -msgstr "Imágenes" - -#: ../app/actions/actions.c:190 ../app/dialogs/dialogs.c:342 -#: ../app/dialogs/resize-dialog.c:287 -msgid "Layers" -msgstr "Capas" - -#: ../app/actions/actions.c:193 ../app/dialogs/dialogs.c:400 -#: ../app/widgets/gimppaletteeditor.c:148 -msgid "Palette Editor" -msgstr "Editor de paleta" - -#. initialize the list of gimp palettes -#: ../app/actions/actions.c:196 ../app/core/gimp.c:966 -#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2758 -msgid "Palettes" -msgstr "Paletas" - -#. initialize the list of gimp patterns -#: ../app/actions/actions.c:199 ../app/core/gimp.c:961 -#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2754 -msgid "Patterns" -msgstr "Patrones" - -#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2774 -msgid "Plug-Ins" -msgstr "Complementos" - -#. Quick Mask Color -#: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:386 -#: ../app/dialogs/preferences-dialog.c:2032 -msgid "Quick Mask" -msgstr "Máscara rápida" - -#: ../app/actions/actions.c:208 ../app/dialogs/dialogs.c:370 -msgid "Sample Points" -msgstr "Puntos de muestra" - -#: ../app/actions/actions.c:211 -msgid "Select" -msgstr "Seleccionar" - -#. initialize the template list -#: ../app/actions/actions.c:214 ../app/core/gimp.c:989 -#: ../app/dialogs/dialogs.c:331 -msgid "Templates" -msgstr "Plantillas" - -#: ../app/actions/actions.c:217 -msgid "Text Tool" -msgstr "Herramienta de texto" - -#: ../app/actions/actions.c:220 -msgid "Text Editor" -msgstr "Editor de textos" - -#: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:298 -#: ../app/dialogs/preferences-dialog.c:1861 ../app/gui/gui.c:441 -msgid "Tool Options" -msgstr "Opciones de herramienta" - -#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:391 -msgid "Tools" -msgstr "Herramientas" - -#: ../app/actions/actions.c:229 ../app/dialogs/dialogs.c:350 -#: ../app/tools/gimpvectortool.c:160 -msgid "Paths" -msgstr "Rutas" - -#: ../app/actions/actions.c:232 -msgid "View" -msgstr "Vista" - -#: ../app/actions/actions.c:235 -msgid "Windows" -msgstr "Ventanas" - -#. value description and new value shown in the status bar -#: ../app/actions/actions.c:584 -#, c-format -msgid "%s: %.2f" -msgstr "%s: %.2f" - -#. value description and new value shown in the status bar -#: ../app/actions/actions.c:610 -#, c-format -msgid "%s: %d" -msgstr "%s: %d" - -#: ../app/actions/brush-editor-actions.c:42 -msgctxt "brush-editor-action" -msgid "Brush Editor Menu" -msgstr "Menú del editor de pinceles" - -#: ../app/actions/brush-editor-actions.c:49 -msgctxt "brush-editor-action" -msgid "Edit Active Brush" -msgstr "Editar pincel activo" - -#: ../app/actions/brushes-actions.c:42 -msgctxt "brushes-action" -msgid "Brushes Menu" -msgstr "Menú de pinceles" - -#: ../app/actions/brushes-actions.c:46 -msgctxt "brushes-action" -msgid "_Open Brush as Image" -msgstr "_Abrir el pincel como una imagen" - -#: ../app/actions/brushes-actions.c:47 -msgctxt "brushes-action" -msgid "Open brush as image" -msgstr "Abre el pincel como una imagen" - -#: ../app/actions/brushes-actions.c:52 -msgctxt "brushes-action" -msgid "_New Brush" -msgstr "_Pincel nuevo" - -#: ../app/actions/brushes-actions.c:53 -msgctxt "brushes-action" -msgid "Create a new brush" -msgstr "Crear un pincel nuevo" - -#: ../app/actions/brushes-actions.c:58 -msgctxt "brushes-action" -msgid "D_uplicate Brush" -msgstr "D_uplicar pincel" - -#: ../app/actions/brushes-actions.c:59 -msgctxt "brushes-action" -msgid "Duplicate this brush" -msgstr "Duplicar este pincel" - -#: ../app/actions/brushes-actions.c:64 -msgctxt "brushes-action" -msgid "Copy Brush _Location" -msgstr "Copiar la _localización del pincel" - -#: ../app/actions/brushes-actions.c:65 -msgctxt "brushes-action" -msgid "Copy brush file location to clipboard" -msgstr "Copiar al portapapeles la localización del pincel" - -#: ../app/actions/brushes-actions.c:70 -msgctxt "brushes-action" -msgid "_Delete Brush" -msgstr "_Eliminar pincel" - -#: ../app/actions/brushes-actions.c:71 -msgctxt "brushes-action" -msgid "Delete this brush" -msgstr "Eliminar este pincel" - -#: ../app/actions/brushes-actions.c:76 -msgctxt "brushes-action" -msgid "_Refresh Brushes" -msgstr "_Refrescar pinceles" - -#: ../app/actions/brushes-actions.c:77 -msgctxt "brushes-action" -msgid "Refresh brushes" -msgstr "Refrescar los pinceles" - -#: ../app/actions/brushes-actions.c:85 -msgctxt "brushes-action" -msgid "_Edit Brush..." -msgstr "_Editar pincel…" - -#: ../app/actions/brushes-actions.c:86 -msgctxt "brushes-action" -msgid "Edit this brush" -msgstr "Editar este pincel" - -#: ../app/actions/buffers-actions.c:41 -msgctxt "buffers-action" -msgid "Buffers Menu" -msgstr "Menú de búferes" - -#: ../app/actions/buffers-actions.c:45 -msgctxt "buffers-action" -msgid "_Paste Buffer" -msgstr "_Pegar búfer" - -#: ../app/actions/buffers-actions.c:46 -msgctxt "buffers-action" -msgid "Paste the selected buffer" -msgstr "Pega el búfer seleccionado" - -#: ../app/actions/buffers-actions.c:51 -msgctxt "buffers-action" -msgid "Paste Buffer _Into" -msgstr "Pegar búfer _en" - -#: ../app/actions/buffers-actions.c:52 -msgctxt "buffers-action" -msgid "Paste the selected buffer into the selection" -msgstr "Pega el búfer seleccionado en la selección" - -#: ../app/actions/buffers-actions.c:57 -msgctxt "buffers-action" -msgid "Paste Buffer as _New" -msgstr "Pegar búfer como _nuevo" - -#: ../app/actions/buffers-actions.c:58 -msgctxt "buffers-action" -msgid "Paste the selected buffer as a new image" -msgstr "Pegar el búfer seleccionado como imagen nueva" - -#: ../app/actions/buffers-actions.c:63 -msgctxt "buffers-action" -msgid "_Delete Buffer" -msgstr "_Eliminar búfer" - -#: ../app/actions/buffers-actions.c:64 -msgctxt "buffers-action" -msgid "Delete the selected buffer" -msgstr "Borra el búfer seleccionado" - -#: ../app/actions/channels-actions.c:44 -msgctxt "channels-action" -msgid "Channels Menu" -msgstr "Menú de canales" - -#: ../app/actions/channels-actions.c:48 -msgctxt "channels-action" -msgid "_Edit Channel Attributes..." -msgstr "_Editar los atributos del canal…" - -#: ../app/actions/channels-actions.c:49 -msgctxt "channels-action" -msgid "Edit the channel's name, color and opacity" -msgstr "Editar el nombre, color y opacidad del canal" - -#: ../app/actions/channels-actions.c:54 -msgctxt "channels-action" -msgid "_New Channel..." -msgstr "Canal _nuevo…" - -#: ../app/actions/channels-actions.c:55 -msgctxt "channels-action" -msgid "Create a new channel" -msgstr "Crear un canal nuevo" - -#: ../app/actions/channels-actions.c:60 -msgctxt "channels-action" -msgid "_New Channel" -msgstr "Canal _nuevo" - -#: ../app/actions/channels-actions.c:61 -msgctxt "channels-action" -msgid "Create a new channel with last used values" -msgstr "Crear un canal nuevo con los últimos valores utilizados" - -#: ../app/actions/channels-actions.c:66 -msgctxt "channels-action" -msgid "D_uplicate Channel" -msgstr "D_uplicar canal" - -#: ../app/actions/channels-actions.c:68 -msgctxt "channels-action" -msgid "Create a duplicate of this channel and add it to the image" -msgstr "Crear una copia de este canal y añadirlo a la imagen" - -#: ../app/actions/channels-actions.c:73 -msgctxt "channels-action" -msgid "_Delete Channel" -msgstr "_Eliminar canal" - -#: ../app/actions/channels-actions.c:74 -msgctxt "channels-action" -msgid "Delete this channel" -msgstr "Eliminar este canal" - -#: ../app/actions/channels-actions.c:79 -msgctxt "channels-action" -msgid "_Raise Channel" -msgstr "_Elevar canal" - -#: ../app/actions/channels-actions.c:80 -msgctxt "channels-action" -msgid "Raise this channel one step in the channel stack" -msgstr "Elevar este canal un nivel en la pila de canales" - -#: ../app/actions/channels-actions.c:85 -msgctxt "channels-action" -msgid "Raise Channel to _Top" -msgstr "Elevar canal a la _cima" - -#: ../app/actions/channels-actions.c:87 -msgctxt "channels-action" -msgid "Raise this channel to the top of the channel stack" -msgstr "Elevar este canal hasta la cima de la pila de canales" - -#: ../app/actions/channels-actions.c:92 -msgctxt "channels-action" -msgid "_Lower Channel" -msgstr "_Bajar canal" - -#: ../app/actions/channels-actions.c:93 -msgctxt "channels-action" -msgid "Lower this channel one step in the channel stack" -msgstr "Bajar este canal un nivel en la pila de canales" - -#: ../app/actions/channels-actions.c:98 -msgctxt "channels-action" -msgid "Lower Channel to _Bottom" -msgstr "Bajar el canal al _fondo" - -#: ../app/actions/channels-actions.c:100 -msgctxt "channels-action" -msgid "Lower this channel to the bottom of the channel stack" -msgstr "Bajar este canal hasta el fondo de la pila de canales" - -#: ../app/actions/channels-actions.c:108 -msgctxt "channels-action" -msgid "Channel to Sele_ction" -msgstr "Canal a sele_cción" - -#: ../app/actions/channels-actions.c:109 -msgctxt "channels-action" -msgid "Replace the selection with this channel" -msgstr "Sustituir la selección con este canal" - -#: ../app/actions/channels-actions.c:114 -msgctxt "channels-action" -msgid "_Add to Selection" -msgstr "_Añadir a selección" - -#: ../app/actions/channels-actions.c:115 -msgctxt "channels-action" -msgid "Add this channel to the current selection" -msgstr "Añadir este canal a la selección actual" - -#: ../app/actions/channels-actions.c:120 -msgctxt "channels-action" -msgid "_Subtract from Selection" -msgstr "_Sustraer de la selección" - -#: ../app/actions/channels-actions.c:121 -msgctxt "channels-action" -msgid "Subtract this channel from the current selection" -msgstr "Sustraer este canal de la selección actual" - -#: ../app/actions/channels-actions.c:126 -msgctxt "channels-action" -msgid "_Intersect with Selection" -msgstr "_Intersectar con la selección" - -#: ../app/actions/channels-actions.c:127 -msgctxt "channels-action" -msgid "Intersect this channel with the current selection" -msgstr "Intersectar este canal con la selección actual" - -#: ../app/actions/channels-commands.c:85 -#: ../app/actions/channels-commands.c:402 -msgid "Channel Attributes" -msgstr "Atributos del canal" - -#: ../app/actions/channels-commands.c:88 -msgid "Edit Channel Attributes" -msgstr "Editar los atributos del canal" - -#: ../app/actions/channels-commands.c:90 -msgid "Edit Channel Color" -msgstr "Editar el color del canal" - -#: ../app/actions/channels-commands.c:91 -#: ../app/actions/channels-commands.c:123 -msgid "_Fill opacity:" -msgstr "Opacidad del _relleno:" - -#: ../app/actions/channels-commands.c:116 ../app/core/gimpchannel.c:272 -#: ../app/widgets/gimpchanneltreeview.c:331 -msgid "Channel" -msgstr "Canal" - -#: ../app/actions/channels-commands.c:117 -#: ../app/actions/channels-commands.c:159 -#: ../app/widgets/gimpchanneltreeview.c:326 -msgid "New Channel" -msgstr "Canal nuevo" - -#: ../app/actions/channels-commands.c:120 -msgid "New Channel Options" -msgstr "Opciones del canal nuevo" - -#: ../app/actions/channels-commands.c:122 -msgid "New Channel Color" -msgstr "Canal de color nuevo" - -#: ../app/actions/channels-commands.c:244 ../app/core/gimpimage-new.c:257 -#: ../app/display/gimpdisplayshell-dnd.c:646 -#: ../app/widgets/gimpchanneltreeview.c:258 -#: ../app/widgets/gimplayertreeview.c:776 -#, c-format -msgid "%s Channel Copy" -msgstr "Copia del canal %s" - -#: ../app/actions/colormap-actions.c:44 -msgctxt "colormap-action" -msgid "Colormap Menu" -msgstr "Menú del mapa de colores" - -#: ../app/actions/colormap-actions.c:48 -msgctxt "colormap-action" -msgid "_Edit Color..." -msgstr "_Editar color…" - -#: ../app/actions/colormap-actions.c:49 -msgctxt "colormap-action" -msgid "Edit this color" -msgstr "Editar este color" - -#: ../app/actions/colormap-actions.c:57 -msgctxt "colormap-action" -msgid "_Add Color from FG" -msgstr "_Añadir color desde el frente" - -#: ../app/actions/colormap-actions.c:58 -msgctxt "colormap-action" -msgid "Add current foreground color" -msgstr "Añade el color de frente actual" - -#: ../app/actions/colormap-actions.c:63 -msgctxt "colormap-action" -msgid "_Add Color from BG" -msgstr "_Añadir color desde el fondo" - -#: ../app/actions/colormap-actions.c:64 -msgctxt "colormap-action" -msgid "Add current background color" -msgstr "Añade el color de fondo actual" - -#: ../app/actions/colormap-commands.c:73 -#, c-format -msgid "Edit colormap entry #%d" -msgstr "Editar la entrada #%d del mapa de colores" - -#: ../app/actions/colormap-commands.c:80 -msgid "Edit Colormap Entry" -msgstr "Editar la entrada del mapa de colores" - -#: ../app/actions/config-actions.c:38 -msgctxt "config-action" -msgid "Use _GEGL" -msgstr "Usar _GEGL" - -#: ../app/actions/config-actions.c:39 -msgctxt "config-action" -msgid "If possible, use GEGL for image processing" -msgstr "Si es posible, utilizar GEGL para el procesado de las imágenes" - -#: ../app/actions/context-actions.c:46 -msgctxt "context-action" -msgid "_Context" -msgstr "_Contexto" - -#: ../app/actions/context-actions.c:48 -msgctxt "context-action" -msgid "_Colors" -msgstr "C_olores" - -#: ../app/actions/context-actions.c:50 -msgctxt "context-action" -msgid "_Opacity" -msgstr "_Opacidad" - -#: ../app/actions/context-actions.c:52 -msgctxt "context-action" -msgid "Paint _Mode" -msgstr "Modo _pintura" - -#: ../app/actions/context-actions.c:54 -msgctxt "context-action" -msgid "_Tool" -msgstr "_Herramienta" - -#: ../app/actions/context-actions.c:56 -msgctxt "context-action" -msgid "_Brush" -msgstr "_Pincel" - -#: ../app/actions/context-actions.c:58 -msgctxt "context-action" -msgid "_Pattern" -msgstr "_Patrón" - -#: ../app/actions/context-actions.c:60 -msgctxt "context-action" -msgid "_Palette" -msgstr "_Paleta" - +# +# Daniel Mustieles , 2011, 2012, 2013, 2014, 2015. , 2016. +# +msgid "" +msgstr "" +"Project-Id-Version: gimp.master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=gimp&keywords=I18N+L10N&component=Internationalisation\n" +"POT-Creation-Date: 2016-10-09 10:53+0000\n" +"PO-Revision-Date: 2016-10-10 10:30+0200\n" +"Last-Translator: Daniel Mustieles \n" +"Language-Team: Español; Castellano \n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Gtranslator 2.91.6\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../app/about.h:23 +msgid "GIMP" +msgstr "GIMP" + +#: ../app/about.h:26 ../desktop/gimp.desktop.in.in.h:1 +msgid "GNU Image Manipulation Program" +msgstr "Programa de manipulación de imágenes de GNU" + +#. The year of the last commit (UTC) will be inserted into this string. +#: ../app/about.h:30 +#, c-format +msgid "" +"Copyright © 1995-%s\n" +"Spencer Kimball, Peter Mattis and the GIMP Development Team" +msgstr "" +"Copyright © 1995-%s\n" +"Spencer Kimball, Peter Mattis y el equipo de desarrollo de GIMP" + +#. TRANSLATORS: do not end the license URL with a dot, because it would +#. * be in the link. Because of technical limitations, make sure the URL +#. * ends with a space, a newline or is end of text. +#. * Cf. bug 762282. +#. +#: ../app/about.h:39 +msgid "" +"GIMP 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.\n" +"\n" +"GIMP 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.\n" +"\n" +"You should have received a copy of the GNU General Public License along with " +"GIMP. If not, see: http://www.gnu.org/licenses/" +msgstr "" +"GIMP es software libre: puede redistribuirlo y/o modificarlo bajo los " +"términos de la Licencia Pública General de GNU según se encuentra publicada " +"por la Free Software Foundation, bien de la versión 3 de dicha Licencia o " +"bien (según su elección) de cualquier versión posterior.\n" +"\n" +"Este programa se distribuye con la esperanza de que sea útil, pero SIN " +"NINGUNA GARANTÍA, incluso sin la garantía MERCANTIL implícita ni la de " +"garantizar la ADECUACIÓN A UN PROPÓSITO PARTICULAR. Véase la Licencia " +"Pública General de GNU para más detalles.\n" +"\n" +"Debería haber recibido una copia de la Licencia Pública General de GNU " +"junto con este programa. Si no ha sido así, consulte: http://www.gnu.org/" +"licenses/." + +#: ../app/app.c:225 +#, c-format +msgid "" +"Unable to open a test swap file.\n" +"\n" +"To avoid data loss, please check the location and permissions of the swap " +"directory defined in your Preferences (currently \"%s\")." +msgstr "" +"No se ha podido abrir un archivo de intercambio de prueba.\n" +"\n" +"Para evitar la pérdida de datos, compruebe la ubicación y los permisos de la " +"carpeta de intercambio definida en sus preferencias (actualmente es «%s»)." + +#: ../app/batch.c:75 +#, c-format +msgid "No batch interpreter specified, using the default '%s'.\n" +msgstr "" +"No hay un intérprete por lotes especificado, usando el predeterminado «%s».\n" + +#: ../app/batch.c:93 ../app/batch.c:111 +#, c-format +msgid "The batch interpreter '%s' is not available. Batch mode disabled." +msgstr "" +"El intérprete del proceso por lotes «%s» no está disponible, el modo de " +"lotes se desactivará." + +#: ../app/main.c:148 +msgid "Show version information and exit" +msgstr "Mostrar información de la versión y salir" + +#: ../app/main.c:153 +msgid "Show license information and exit" +msgstr "Mostrar información de la licencia y salir" + +#: ../app/main.c:158 +msgid "Be more verbose" +msgstr "Ser más detallado" + +#: ../app/main.c:163 +msgid "Start a new GIMP instance" +msgstr "Iniciar una instancia de GIMP nueva" + +#: ../app/main.c:168 +msgid "Open images as new" +msgstr "Abrir imágenes como nuevas" + +#: ../app/main.c:173 +msgid "Run without a user interface" +msgstr "Ejecutar sin una interfaz de usuario" + +#: ../app/main.c:178 +msgid "Do not load brushes, gradients, patterns, ..." +msgstr "No cargar los pinceles, los degradados, los patrones, …" + +#: ../app/main.c:183 +msgid "Do not load any fonts" +msgstr "No cargar ninguna tipografía" + +#: ../app/main.c:188 +msgid "Do not show a splash screen" +msgstr "No mostrar una pantalla de arranque" + +#: ../app/main.c:193 +msgid "Do not use shared memory between GIMP and plugins" +msgstr "No compartir la memoria entre GIMP y los complementos" + +#: ../app/main.c:198 +msgid "Do not use special CPU acceleration functions" +msgstr "No utilizar las funciones de aceleración especiales de la CPU" + +#: ../app/main.c:203 +msgid "Use an alternate sessionrc file" +msgstr "Usar un archivo «sessionrc» alternativo" + +#: ../app/main.c:208 +msgid "Use an alternate user gimprc file" +msgstr "Usar un archivo de usuario «gimprc» alternativo" + +#: ../app/main.c:213 +msgid "Use an alternate system gimprc file" +msgstr "Usar un archivo de sistema «gimprc» alternativo" + +#: ../app/main.c:218 +msgid "Batch command to run (can be used multiple times)" +msgstr "Instrucción por lotes que ejecutar (puede usarse varias veces)" + +#: ../app/main.c:223 +msgid "The procedure to process batch commands with" +msgstr "El procedimiento con el que se procesarán las instrucciones en lotes" + +#: ../app/main.c:228 +msgid "Send messages to console instead of using a dialog" +msgstr "Enviar las advertencias a la consola en vez de usar un diálogo" + +#. don't translate the mode names (off|on|warn) +#: ../app/main.c:234 +msgid "PDB compatibility mode (off|on|warn)" +msgstr "Modo de compatibilidad PDB (off|on|warn)" + +#. don't translate the mode names (never|query|always) +#: ../app/main.c:240 +msgid "Debug in case of a crash (never|query|always)" +msgstr "Depurar en caso de error (never|query|always)" + +#: ../app/main.c:245 +msgid "Enable non-fatal debugging signal handlers" +msgstr "Activar los manejadores de señales no fatales de depuración" + +#: ../app/main.c:250 +msgid "Make all warnings fatal" +msgstr "Hacer todas las advertencias fatales" + +#: ../app/main.c:255 +msgid "Output a gimprc file with default settings" +msgstr "Sacar un archivo gimprc con la configuración predeterminada" + +#: ../app/main.c:271 +msgid "Output a sorted list of deprecated procedures in the PDB" +msgstr "" +"Mostrar una lista ordenada de los procedimientos obsoletos dentro del PDB" + +#: ../app/main.c:433 +msgid "[FILE|URI...]" +msgstr "[ARCHIVO|URI…]" + +#: ../app/main.c:455 +msgid "" +"GIMP could not initialize the graphical user interface.\n" +"Make sure a proper setup for your display environment exists." +msgstr "" +"GIMP no ha podido inicializar la interfaz gráfica de usuario.\n" +"Asegúrese de que exista una instalación apropiada para su pantalla." + +#: ../app/main.c:474 +msgid "Another GIMP instance is already running." +msgstr "Ya se está ejecutando otra instancia de GIMP." + +#: ../app/main.c:546 +msgid "GIMP output. Type any character to close this window." +msgstr "" +"Salida de GIMP. Teclee un carácter cualquiera para cerrar esta ventana." + +#: ../app/main.c:547 +#, c-format +msgid "(Type any character to close this window)\n" +msgstr "(Teclee un carácter cualquiera para cerrar esta ventana)\n" + +#: ../app/main.c:564 +msgid "GIMP output. You can minimize this window, but don't close it." +msgstr "Salida de GIMP. Puede minimizar esta ventana, pero no la cierre." + +#: ../app/sanity.c:433 +#, c-format +msgid "" +"The configured filename encoding cannot be converted to UTF-8: %s\n" +"\n" +"Please check the value of the environment variable G_FILENAME_ENCODING." +msgstr "" +"La codificación configurada para el nombre del fichero no puede ser " +"convertida a UTF-8: %s\n" +"\n" +"Compruebe el valor de la variable de entorno G_FILENAME_ENCODING." + +#: ../app/sanity.c:452 +#, c-format +msgid "" +"The name of the directory holding the GIMP user configuration cannot be " +"converted to UTF-8: %s\n" +"\n" +"Your filesystem probably stores files in an encoding other than UTF-8 and " +"you didn't tell GLib about this. Please set the environment variable " +"G_FILENAME_ENCODING." +msgstr "" +"El nombre de la carpeta que contiene la configuración de usuario de GIMP no " +"se puede convertir a UTF-8: %s\n" +" \n" +"Lo más probable es que su sistema de ficheros almacene los archivos en una " +"codificación diferente a UTF-8 y no ha dicho esto a Glib. Por favor, " +"establezca la variable de entorno G_FILENAME_ENCODING." + +#. show versions of libraries used by GIMP +#: ../app/version.c:63 ../app/version.c:130 +#, c-format +msgid "using %s version %s (compiled against version %s)" +msgstr "utilizando %s versión %s (compilado contra la versión %s)" + +#: ../app/version.c:138 +#, c-format +msgid "%s version %s" +msgstr "%s versión %s" + +#: ../app/actions/actions.c:109 ../app/dialogs/dialogs.c:388 +#: ../app/widgets/gimpbrusheditor.c:88 +msgid "Brush Editor" +msgstr "Editor de pinceles" + +#. initialize the list of gimp brushes +#: ../app/actions/actions.c:112 ../app/core/gimp.c:951 +#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2783 +msgid "Brushes" +msgstr "Pinceles" + +#: ../app/actions/actions.c:115 ../app/dialogs/dialogs.c:327 +msgid "Buffers" +msgstr "Búferes" + +#: ../app/actions/actions.c:118 ../app/dialogs/dialogs.c:346 +msgid "Channels" +msgstr "Canales" + +#: ../app/actions/actions.c:121 ../app/dialogs/convert-dialog.c:174 +#: ../app/dialogs/dialogs.c:354 +msgid "Colormap" +msgstr "Mapa de colores" + +#: ../app/actions/actions.c:124 +msgid "Configuration" +msgstr "Configuración" + +#: ../app/actions/actions.c:127 +msgid "Context" +msgstr "Contexto" + +#: ../app/actions/actions.c:130 ../app/dialogs/dialogs.c:310 +msgid "Pointer Information" +msgstr "Información del puntero" + +#: ../app/actions/actions.c:133 +msgid "Debug" +msgstr "Depurar" + +#: ../app/actions/actions.c:136 +msgid "Dialogs" +msgstr "Diálogos" + +#: ../app/actions/actions.c:139 +msgid "Dock" +msgstr "Empotrar" + +#: ../app/actions/actions.c:142 +msgid "Dockable" +msgstr "Empotrable" + +#. Document History +#: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:329 +#: ../app/dialogs/preferences-dialog.c:1612 +msgid "Document History" +msgstr "Historial del documento" + +#: ../app/actions/actions.c:148 +msgid "Drawable" +msgstr "Dibujable" + +#. Some things do not have grids, so just list +#: ../app/actions/actions.c:151 ../app/dialogs/dialogs.c:335 +msgid "Paint Dynamics" +msgstr "Dinámica de la pintura" + +#: ../app/actions/actions.c:154 ../app/dialogs/dialogs.c:392 +#: ../app/widgets/gimpdynamicseditor.c:92 +msgid "Paint Dynamics Editor" +msgstr "Editor de dinámica de la pintura" + +#: ../app/actions/actions.c:157 +msgid "Edit" +msgstr "Editar" + +#: ../app/actions/actions.c:160 ../app/dialogs/dialogs.c:306 +msgid "Error Console" +msgstr "Consola de errores" + +#: ../app/actions/actions.c:163 +msgid "File" +msgstr "Archivo" + +#: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:325 +#: ../app/dialogs/preferences-dialog.c:2803 +msgid "Fonts" +msgstr "Tipografías" + +#: ../app/actions/actions.c:169 ../app/dialogs/dialogs.c:396 +#: ../app/widgets/gimpgradienteditor.c:269 +msgid "Gradient Editor" +msgstr "Editor de degradados" + +#. initialize the list of gimp gradients +#: ../app/actions/actions.c:172 ../app/core/gimp.c:971 +#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2799 +msgid "Gradients" +msgstr "Degradados" + +#: ../app/actions/actions.c:175 ../app/core/gimp.c:983 +#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2807 +msgid "Tool Presets" +msgstr "Ajustes prefijados de las herramientas" + +#: ../app/actions/actions.c:178 ../app/dialogs/dialogs.c:404 +#: ../app/widgets/gimptoolpreseteditor.c:92 +msgid "Tool Preset Editor" +msgstr "Editor de ajustes prefijados de las herramientas" + +#: ../app/actions/actions.c:181 +msgid "Help" +msgstr "Ayuda" + +#: ../app/actions/actions.c:184 +msgid "Image" +msgstr "Imagen" + +#. list & grid views +#: ../app/actions/actions.c:187 ../app/dialogs/dialogs.c:315 +msgid "Images" +msgstr "Imágenes" + +#: ../app/actions/actions.c:190 ../app/dialogs/dialogs.c:342 +#: ../app/dialogs/resize-dialog.c:287 +msgid "Layers" +msgstr "Capas" + +#: ../app/actions/actions.c:193 ../app/dialogs/dialogs.c:400 +#: ../app/widgets/gimppaletteeditor.c:148 +msgid "Palette Editor" +msgstr "Editor de paleta" + +#. initialize the list of gimp palettes +#: ../app/actions/actions.c:196 ../app/core/gimp.c:966 +#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2795 +msgid "Palettes" +msgstr "Paletas" + +#. initialize the list of gimp patterns +#: ../app/actions/actions.c:199 ../app/core/gimp.c:961 +#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2791 +msgid "Patterns" +msgstr "Patrones" + +#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2811 +msgid "Plug-Ins" +msgstr "Complementos" + +#. Quick Mask Color +#: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:386 +#: ../app/dialogs/preferences-dialog.c:2069 +msgid "Quick Mask" +msgstr "Máscara rápida" + +#: ../app/actions/actions.c:208 ../app/dialogs/dialogs.c:370 +msgid "Sample Points" +msgstr "Puntos de muestra" + +#: ../app/actions/actions.c:211 +msgid "Select" +msgstr "Seleccionar" + +#. initialize the template list +#: ../app/actions/actions.c:214 ../app/core/gimp.c:989 +#: ../app/dialogs/dialogs.c:331 +msgid "Templates" +msgstr "Plantillas" + +#: ../app/actions/actions.c:217 +msgid "Text Tool" +msgstr "Herramienta de texto" + +#: ../app/actions/actions.c:220 +msgid "Text Editor" +msgstr "Editor de textos" + +#: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:298 +#: ../app/dialogs/preferences-dialog.c:1898 ../app/gui/gui.c:441 +msgid "Tool Options" +msgstr "Opciones de herramienta" + +#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:391 +msgid "Tools" +msgstr "Herramientas" + +#: ../app/actions/actions.c:229 ../app/dialogs/dialogs.c:350 +#: ../app/tools/gimpvectortool.c:160 +msgid "Paths" +msgstr "Rutas" + +#: ../app/actions/actions.c:232 +msgid "View" +msgstr "Vista" + +#: ../app/actions/actions.c:235 +msgid "Windows" +msgstr "Ventanas" + +#. value description and new value shown in the status bar +#: ../app/actions/actions.c:584 +#, c-format +msgid "%s: %.2f" +msgstr "%s: %.2f" + +#. value description and new value shown in the status bar +#: ../app/actions/actions.c:610 +#, c-format +msgid "%s: %d" +msgstr "%s: %d" + +#: ../app/actions/brush-editor-actions.c:42 +msgctxt "brush-editor-action" +msgid "Brush Editor Menu" +msgstr "Menú del editor de pinceles" + +#: ../app/actions/brush-editor-actions.c:49 +msgctxt "brush-editor-action" +msgid "Edit Active Brush" +msgstr "Editar pincel activo" + +#: ../app/actions/brushes-actions.c:42 +msgctxt "brushes-action" +msgid "Brushes Menu" +msgstr "Menú de pinceles" + +#: ../app/actions/brushes-actions.c:46 +msgctxt "brushes-action" +msgid "_Open Brush as Image" +msgstr "_Abrir el pincel como una imagen" + +#: ../app/actions/brushes-actions.c:47 +msgctxt "brushes-action" +msgid "Open brush as image" +msgstr "Abre el pincel como una imagen" + +#: ../app/actions/brushes-actions.c:52 +msgctxt "brushes-action" +msgid "_New Brush" +msgstr "_Pincel nuevo" + +#: ../app/actions/brushes-actions.c:53 +msgctxt "brushes-action" +msgid "Create a new brush" +msgstr "Crear un pincel nuevo" + +#: ../app/actions/brushes-actions.c:58 +msgctxt "brushes-action" +msgid "D_uplicate Brush" +msgstr "D_uplicar pincel" + +#: ../app/actions/brushes-actions.c:59 +msgctxt "brushes-action" +msgid "Duplicate this brush" +msgstr "Duplicar este pincel" + +#: ../app/actions/brushes-actions.c:64 +msgctxt "brushes-action" +msgid "Copy Brush _Location" +msgstr "Copiar la _localización del pincel" + +#: ../app/actions/brushes-actions.c:65 +msgctxt "brushes-action" +msgid "Copy brush file location to clipboard" +msgstr "Copiar al portapapeles la localización del pincel" + +#: ../app/actions/brushes-actions.c:70 +msgctxt "brushes-action" +msgid "_Delete Brush" +msgstr "_Eliminar pincel" + +#: ../app/actions/brushes-actions.c:71 +msgctxt "brushes-action" +msgid "Delete this brush" +msgstr "Eliminar este pincel" + +#: ../app/actions/brushes-actions.c:76 +msgctxt "brushes-action" +msgid "_Refresh Brushes" +msgstr "_Refrescar pinceles" + +#: ../app/actions/brushes-actions.c:77 +msgctxt "brushes-action" +msgid "Refresh brushes" +msgstr "Refrescar los pinceles" + +#: ../app/actions/brushes-actions.c:85 +msgctxt "brushes-action" +msgid "_Edit Brush..." +msgstr "_Editar pincel…" + +#: ../app/actions/brushes-actions.c:86 +msgctxt "brushes-action" +msgid "Edit this brush" +msgstr "Editar este pincel" + +#: ../app/actions/buffers-actions.c:41 +msgctxt "buffers-action" +msgid "Buffers Menu" +msgstr "Menú de búferes" + +#: ../app/actions/buffers-actions.c:45 +msgctxt "buffers-action" +msgid "_Paste Buffer" +msgstr "_Pegar búfer" + +#: ../app/actions/buffers-actions.c:46 +msgctxt "buffers-action" +msgid "Paste the selected buffer" +msgstr "Pega el búfer seleccionado" + +#: ../app/actions/buffers-actions.c:51 +msgctxt "buffers-action" +msgid "Paste Buffer _Into" +msgstr "Pegar búfer _en" + +#: ../app/actions/buffers-actions.c:52 +msgctxt "buffers-action" +msgid "Paste the selected buffer into the selection" +msgstr "Pega el búfer seleccionado en la selección" + +#: ../app/actions/buffers-actions.c:57 +msgctxt "buffers-action" +msgid "Paste Buffer as _New" +msgstr "Pegar búfer como _nuevo" + +#: ../app/actions/buffers-actions.c:58 +msgctxt "buffers-action" +msgid "Paste the selected buffer as a new image" +msgstr "Pegar el búfer seleccionado como imagen nueva" + +#: ../app/actions/buffers-actions.c:63 +msgctxt "buffers-action" +msgid "_Delete Buffer" +msgstr "_Eliminar búfer" + +#: ../app/actions/buffers-actions.c:64 +msgctxt "buffers-action" +msgid "Delete the selected buffer" +msgstr "Borra el búfer seleccionado" + +#: ../app/actions/channels-actions.c:44 +msgctxt "channels-action" +msgid "Channels Menu" +msgstr "Menú de canales" + +#: ../app/actions/channels-actions.c:48 +msgctxt "channels-action" +msgid "_Edit Channel Attributes..." +msgstr "_Editar los atributos del canal…" + +#: ../app/actions/channels-actions.c:49 +msgctxt "channels-action" +msgid "Edit the channel's name, color and opacity" +msgstr "Editar el nombre, color y opacidad del canal" + +#: ../app/actions/channels-actions.c:54 +msgctxt "channels-action" +msgid "_New Channel..." +msgstr "Canal _nuevo…" + +#: ../app/actions/channels-actions.c:55 +msgctxt "channels-action" +msgid "Create a new channel" +msgstr "Crear un canal nuevo" + +#: ../app/actions/channels-actions.c:60 +msgctxt "channels-action" +msgid "_New Channel" +msgstr "Canal _nuevo" + +#: ../app/actions/channels-actions.c:61 +msgctxt "channels-action" +msgid "Create a new channel with last used values" +msgstr "Crear un canal nuevo con los últimos valores utilizados" + +#: ../app/actions/channels-actions.c:66 +msgctxt "channels-action" +msgid "D_uplicate Channel" +msgstr "D_uplicar canal" + +#: ../app/actions/channels-actions.c:68 +msgctxt "channels-action" +msgid "Create a duplicate of this channel and add it to the image" +msgstr "Crear una copia de este canal y añadirlo a la imagen" + +#: ../app/actions/channels-actions.c:73 +msgctxt "channels-action" +msgid "_Delete Channel" +msgstr "_Eliminar canal" + +#: ../app/actions/channels-actions.c:74 +msgctxt "channels-action" +msgid "Delete this channel" +msgstr "Eliminar este canal" + +#: ../app/actions/channels-actions.c:79 +msgctxt "channels-action" +msgid "_Raise Channel" +msgstr "_Elevar canal" + +#: ../app/actions/channels-actions.c:80 +msgctxt "channels-action" +msgid "Raise this channel one step in the channel stack" +msgstr "Elevar este canal un nivel en la pila de canales" + +#: ../app/actions/channels-actions.c:85 +msgctxt "channels-action" +msgid "Raise Channel to _Top" +msgstr "Elevar canal a la _cima" + +#: ../app/actions/channels-actions.c:87 +msgctxt "channels-action" +msgid "Raise this channel to the top of the channel stack" +msgstr "Elevar este canal hasta la cima de la pila de canales" + +#: ../app/actions/channels-actions.c:92 +msgctxt "channels-action" +msgid "_Lower Channel" +msgstr "_Bajar canal" + +#: ../app/actions/channels-actions.c:93 +msgctxt "channels-action" +msgid "Lower this channel one step in the channel stack" +msgstr "Bajar este canal un nivel en la pila de canales" + +#: ../app/actions/channels-actions.c:98 +msgctxt "channels-action" +msgid "Lower Channel to _Bottom" +msgstr "Bajar el canal al _fondo" + +#: ../app/actions/channels-actions.c:100 +msgctxt "channels-action" +msgid "Lower this channel to the bottom of the channel stack" +msgstr "Bajar este canal hasta el fondo de la pila de canales" + +#: ../app/actions/channels-actions.c:108 +msgctxt "channels-action" +msgid "Channel to Sele_ction" +msgstr "Canal a sele_cción" + +#: ../app/actions/channels-actions.c:109 +msgctxt "channels-action" +msgid "Replace the selection with this channel" +msgstr "Sustituir la selección con este canal" + +#: ../app/actions/channels-actions.c:114 +msgctxt "channels-action" +msgid "_Add to Selection" +msgstr "_Añadir a selección" + +#: ../app/actions/channels-actions.c:115 +msgctxt "channels-action" +msgid "Add this channel to the current selection" +msgstr "Añadir este canal a la selección actual" + +#: ../app/actions/channels-actions.c:120 +msgctxt "channels-action" +msgid "_Subtract from Selection" +msgstr "_Sustraer de la selección" + +#: ../app/actions/channels-actions.c:121 +msgctxt "channels-action" +msgid "Subtract this channel from the current selection" +msgstr "Sustraer este canal de la selección actual" + +#: ../app/actions/channels-actions.c:126 +msgctxt "channels-action" +msgid "_Intersect with Selection" +msgstr "_Intersectar con la selección" + +#: ../app/actions/channels-actions.c:127 +msgctxt "channels-action" +msgid "Intersect this channel with the current selection" +msgstr "Intersectar este canal con la selección actual" + +#: ../app/actions/channels-commands.c:85 +#: ../app/actions/channels-commands.c:402 +msgid "Channel Attributes" +msgstr "Atributos del canal" + +#: ../app/actions/channels-commands.c:88 +msgid "Edit Channel Attributes" +msgstr "Editar los atributos del canal" + +#: ../app/actions/channels-commands.c:90 +msgid "Edit Channel Color" +msgstr "Editar el color del canal" + +#: ../app/actions/channels-commands.c:91 +#: ../app/actions/channels-commands.c:123 +msgid "_Fill opacity:" +msgstr "Opacidad del _relleno:" + +#: ../app/actions/channels-commands.c:116 ../app/core/gimpchannel.c:272 +#: ../app/widgets/gimpchanneltreeview.c:331 +msgid "Channel" +msgstr "Canal" + +#: ../app/actions/channels-commands.c:117 +#: ../app/actions/channels-commands.c:159 +#: ../app/widgets/gimpchanneltreeview.c:326 +msgid "New Channel" +msgstr "Canal nuevo" + +#: ../app/actions/channels-commands.c:120 +msgid "New Channel Options" +msgstr "Opciones del canal nuevo" + +#: ../app/actions/channels-commands.c:122 +msgid "New Channel Color" +msgstr "Canal de color nuevo" + +#: ../app/actions/channels-commands.c:244 ../app/core/gimpimage-new.c:257 +#: ../app/display/gimpdisplayshell-dnd.c:646 +#: ../app/widgets/gimpchanneltreeview.c:258 +#: ../app/widgets/gimplayertreeview.c:776 +#, c-format +msgid "%s Channel Copy" +msgstr "Copia del canal %s" + +#: ../app/actions/colormap-actions.c:44 +msgctxt "colormap-action" +msgid "Colormap Menu" +msgstr "Menú del mapa de colores" + +#: ../app/actions/colormap-actions.c:48 +msgctxt "colormap-action" +msgid "_Edit Color..." +msgstr "_Editar color…" + +#: ../app/actions/colormap-actions.c:49 +msgctxt "colormap-action" +msgid "Edit this color" +msgstr "Editar este color" + +#: ../app/actions/colormap-actions.c:57 +msgctxt "colormap-action" +msgid "_Add Color from FG" +msgstr "_Añadir color desde el frente" + +#: ../app/actions/colormap-actions.c:58 +msgctxt "colormap-action" +msgid "Add current foreground color" +msgstr "Añade el color de frente actual" + +#: ../app/actions/colormap-actions.c:63 +msgctxt "colormap-action" +msgid "_Add Color from BG" +msgstr "_Añadir color desde el fondo" + +#: ../app/actions/colormap-actions.c:64 +msgctxt "colormap-action" +msgid "Add current background color" +msgstr "Añade el color de fondo actual" + +#: ../app/actions/colormap-commands.c:73 +#, c-format +msgid "Edit colormap entry #%d" +msgstr "Editar la entrada #%d del mapa de colores" + +#: ../app/actions/colormap-commands.c:80 +msgid "Edit Colormap Entry" +msgstr "Editar la entrada del mapa de colores" + +#: ../app/actions/config-actions.c:38 +msgctxt "config-action" +msgid "Use _GEGL" +msgstr "Usar _GEGL" + +#: ../app/actions/config-actions.c:39 +msgctxt "config-action" +msgid "If possible, use GEGL for image processing" +msgstr "Si es posible, utilizar GEGL para el procesado de las imágenes" + +#: ../app/actions/context-actions.c:46 +msgctxt "context-action" +msgid "_Context" +msgstr "_Contexto" + +#: ../app/actions/context-actions.c:48 +msgctxt "context-action" +msgid "_Colors" +msgstr "C_olores" + +#: ../app/actions/context-actions.c:50 +msgctxt "context-action" +msgid "_Opacity" +msgstr "_Opacidad" + +#: ../app/actions/context-actions.c:52 +msgctxt "context-action" +msgid "Paint _Mode" +msgstr "Modo _pintura" + +#: ../app/actions/context-actions.c:54 +msgctxt "context-action" +msgid "_Tool" +msgstr "_Herramienta" + +#: ../app/actions/context-actions.c:56 +msgctxt "context-action" +msgid "_Brush" +msgstr "_Pincel" + +#: ../app/actions/context-actions.c:58 +msgctxt "context-action" +msgid "_Pattern" +msgstr "_Patrón" + +#: ../app/actions/context-actions.c:60 +msgctxt "context-action" +msgid "_Palette" +msgstr "_Paleta" + # Es Degradado -#: ../app/actions/context-actions.c:62 -msgctxt "context-action" -msgid "_Gradient" -msgstr "_Degradado" - -#: ../app/actions/context-actions.c:64 -msgctxt "context-action" -msgid "_Font" -msgstr "_Tipografía" - -#: ../app/actions/context-actions.c:67 -msgctxt "context-action" -msgid "_Shape" -msgstr "_Forma" - -#: ../app/actions/context-actions.c:69 -msgctxt "context-action" -msgid "_Radius" -msgstr "_Radio" - -#: ../app/actions/context-actions.c:71 -msgctxt "context-action" -msgid "S_pikes" -msgstr "_Púas [Spikes]" - -#: ../app/actions/context-actions.c:73 -msgctxt "context-action" -msgid "_Hardness" -msgstr "_Dureza" - -#: ../app/actions/context-actions.c:75 -msgctxt "context-action" -msgid "_Aspect Ratio" -msgstr "Proporción de _aspecto" - -#: ../app/actions/context-actions.c:77 -msgctxt "context-action" -msgid "A_ngle" -msgstr "Á_ngulo" - -#: ../app/actions/context-actions.c:80 -msgctxt "context-action" -msgid "_Default Colors" -msgstr "Colores pre_definidos" - -#: ../app/actions/context-actions.c:82 -msgctxt "context-action" -msgid "Set foreground color to black, background color to white" -msgstr "Pone el color de frente a negro y el color de fondo a blanco" - -#: ../app/actions/context-actions.c:87 -msgctxt "context-action" -msgid "S_wap Colors" -msgstr "In_tercambiar los colores" - -#: ../app/actions/context-actions.c:88 -msgctxt "context-action" -msgid "Exchange foreground and background colors" -msgstr "Intercambia los colores de frente y fondo" - -#: ../app/actions/context-commands.c:426 -#, c-format -msgid "Paint Mode: %s" -msgstr "Modo de pintura: %s" - -#: ../app/actions/context-commands.c:552 -#, c-format -msgid "Brush Shape: %s" -msgstr "Forma del pincel: %s" - -#: ../app/actions/context-commands.c:612 -#, c-format -msgid "Brush Radius: %2.2f" -msgstr "Radio del pincel: %2.2f" - -#: ../app/actions/context-commands.c:720 -#, c-format -msgid "Brush Angle: %2.2f" -msgstr "Ángulo del pincel: %2.2f" - -#: ../app/actions/cursor-info-actions.c:40 -msgctxt "cursor-info-action" -msgid "Pointer Information Menu" -msgstr "Menú de información del puntero" - -#: ../app/actions/cursor-info-actions.c:47 -msgctxt "cursor-info-action" -msgid "_Sample Merged" -msgstr "_Muestra combinada" - -#: ../app/actions/cursor-info-actions.c:48 -msgctxt "cursor-info-action" -msgid "Use the composite color of all visible layers" -msgstr "Usar el color compuesto de todas las capas visibles" - -#: ../app/actions/data-commands.c:89 ../app/actions/documents-commands.c:344 -#: ../app/actions/file-commands.c:201 ../app/dialogs/file-open-dialog.c:220 -#: ../app/dialogs/file-open-dialog.c:265 -#: ../app/dialogs/file-open-location-dialog.c:213 -#: ../app/dialogs/file-open-location-dialog.c:225 -#: ../app/display/gimpdisplayshell-dnd.c:592 -#: ../app/widgets/gimplayertreeview.c:736 ../app/widgets/gimptoolbox-dnd.c:168 -#: ../app/widgets/gimptoolbox.c:817 -#, c-format -msgid "" -"Opening '%s' failed:\n" -"\n" -"%s" -msgstr "" -"La apertura de «%s» ha fallado:\n" -"%s" - -#: ../app/actions/data-commands.c:118 -#: ../app/actions/tool-options-commands.c:72 -#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1529 -#: ../app/core/gimppalette-import.c:211 ../app/core/gimppalette-load.c:224 -#: ../app/core/gimppalette.c:399 ../app/dialogs/palette-import-dialog.c:771 -#: ../app/widgets/gimpdnd-xds.c:94 -msgid "Untitled" -msgstr "Sin nombre" - -#: ../app/actions/dialogs-actions.c:49 -msgctxt "windows-action" -msgid "Tool_box" -msgstr "_Caja de herramientas" - -#: ../app/actions/dialogs-actions.c:55 -msgctxt "dialogs-action" -msgid "Tool _Options" -msgstr "_Opciones de herramienta" - -#: ../app/actions/dialogs-actions.c:56 -msgctxt "dialogs-action" -msgid "Open the tool options dialog" -msgstr "Abre el diálogo de opciones de herramienta" - -#: ../app/actions/dialogs-actions.c:61 -msgctxt "dialogs-action" -msgid "_Device Status" -msgstr "Estado del _dispositivo" - -#: ../app/actions/dialogs-actions.c:62 -msgctxt "dialogs-action" -msgid "Open the device status dialog" -msgstr "Abre el diálogo de estado de los dispositivos" - -#: ../app/actions/dialogs-actions.c:67 -msgctxt "dialogs-action" -msgid "_Layers" -msgstr "_Capas" - -#: ../app/actions/dialogs-actions.c:68 -msgctxt "dialogs-action" -msgid "Open the layers dialog" -msgstr "Abre el diálogo de capas" - -#: ../app/actions/dialogs-actions.c:73 -msgctxt "dialogs-action" -msgid "_Channels" -msgstr "_Canales" - -#: ../app/actions/dialogs-actions.c:74 -msgctxt "dialogs-action" -msgid "Open the channels dialog" -msgstr "Abre el diálogo de canales" - -#: ../app/actions/dialogs-actions.c:79 -msgctxt "dialogs-action" -msgid "_Paths" -msgstr "_Rutas" - -#: ../app/actions/dialogs-actions.c:80 -msgctxt "dialogs-action" -msgid "Open the paths dialog" -msgstr "Abre el diálogo de rutas" - -#: ../app/actions/dialogs-actions.c:85 -msgctxt "dialogs-action" -msgid "Color_map" -msgstr "_Mapa de colores" - -#: ../app/actions/dialogs-actions.c:86 -msgctxt "dialogs-action" -msgid "Open the colormap dialog" -msgstr "Abre el diálogo de mapas de color" - -#: ../app/actions/dialogs-actions.c:91 -msgctxt "dialogs-action" -msgid "Histogra_m" -msgstr "Histogra_ma" - -#: ../app/actions/dialogs-actions.c:92 -msgctxt "dialogs-action" -msgid "Open the histogram dialog" -msgstr "Abre el diálogo de histograma" - -#: ../app/actions/dialogs-actions.c:97 -msgctxt "dialogs-action" -msgid "_Selection Editor" -msgstr "Editor de _selección" - -#: ../app/actions/dialogs-actions.c:98 -msgctxt "dialogs-action" -msgid "Open the selection editor" -msgstr "Abre el editor de selección" - -#: ../app/actions/dialogs-actions.c:103 -msgctxt "dialogs-action" -msgid "Na_vigation" -msgstr "Na_vegación" - -#: ../app/actions/dialogs-actions.c:104 -msgctxt "dialogs-action" -msgid "Open the display navigation dialog" -msgstr "Abre el diálogo de navegación por la presentación" - -#: ../app/actions/dialogs-actions.c:109 -msgctxt "dialogs-action" -msgid "Undo _History" -msgstr "_Historial de deshacer" - -#: ../app/actions/dialogs-actions.c:110 -msgctxt "dialogs-action" -msgid "Open the undo history dialog" -msgstr "Abre el diálogo del historial de deshacer" - -#: ../app/actions/dialogs-actions.c:115 -msgctxt "dialogs-action" -msgid "Pointer" -msgstr "Puntero" - -#: ../app/actions/dialogs-actions.c:116 -msgctxt "dialogs-action" -msgid "Open the pointer information dialog" -msgstr "Abre el diálogo de información del puntero" - -#: ../app/actions/dialogs-actions.c:121 -msgctxt "dialogs-action" -msgid "_Sample Points" -msgstr "Punto_s de muestra" - -#: ../app/actions/dialogs-actions.c:122 -msgctxt "dialogs-action" -msgid "Open the sample points dialog" -msgstr "Abre el diálogo de puntos de muestreo" - -#: ../app/actions/dialogs-actions.c:127 -msgctxt "dialogs-action" -msgid "Colo_rs" -msgstr "Colo_res" - -#: ../app/actions/dialogs-actions.c:128 -msgctxt "dialogs-action" -msgid "Open the FG/BG color dialog" -msgstr "Abre el diálogo de colores de frente/fondo" - -#: ../app/actions/dialogs-actions.c:133 -msgctxt "dialogs-action" -msgid "_Brushes" -msgstr "_Pinceles" - -#: ../app/actions/dialogs-actions.c:134 -msgctxt "dialogs-action" -msgid "Open the brushes dialog" -msgstr "Abre el diálogo de pinceles" - -#: ../app/actions/dialogs-actions.c:139 -msgctxt "dialogs-action" -msgid "Brush Editor" -msgstr "Editor de pinceles" - -#: ../app/actions/dialogs-actions.c:140 -msgctxt "dialogs-action" -msgid "Open the brush editor" -msgstr "Abrir el editor de pinceles" - -#: ../app/actions/dialogs-actions.c:145 -msgctxt "dialogs-action" -msgid "Paint Dynamics" -msgstr "Dinámica de la pintura" - -#: ../app/actions/dialogs-actions.c:146 -msgctxt "dialogs-action" -msgid "Open paint dynamics dialog" -msgstr "Abre el diálogo de dinámica de la pintura" - -#: ../app/actions/dialogs-actions.c:151 -msgctxt "dialogs-action" -msgid "Paint Dynamics Editor" -msgstr "Editor de dinámica de la pintura" - -#: ../app/actions/dialogs-actions.c:152 -msgctxt "dialogs-action" -msgid "Open the paint dynamics editor" -msgstr "Abre el editor de dinámica de la pintura" - -#: ../app/actions/dialogs-actions.c:157 -msgctxt "dialogs-action" -msgid "P_atterns" -msgstr "_Patrones" - -#: ../app/actions/dialogs-actions.c:158 -msgctxt "dialogs-action" -msgid "Open the patterns dialog" -msgstr "Abre el diálogo de patrones" - +#: ../app/actions/context-actions.c:62 +msgctxt "context-action" +msgid "_Gradient" +msgstr "_Degradado" + +#: ../app/actions/context-actions.c:64 +msgctxt "context-action" +msgid "_Font" +msgstr "_Tipografía" + +#: ../app/actions/context-actions.c:67 +msgctxt "context-action" +msgid "_Shape" +msgstr "_Forma" + +#: ../app/actions/context-actions.c:69 +msgctxt "context-action" +msgid "_Radius" +msgstr "_Radio" + +#: ../app/actions/context-actions.c:71 +msgctxt "context-action" +msgid "S_pikes" +msgstr "_Púas [Spikes]" + +#: ../app/actions/context-actions.c:73 +msgctxt "context-action" +msgid "_Hardness" +msgstr "_Dureza" + +#: ../app/actions/context-actions.c:75 +msgctxt "context-action" +msgid "_Aspect Ratio" +msgstr "Proporción de _aspecto" + +#: ../app/actions/context-actions.c:77 +msgctxt "context-action" +msgid "A_ngle" +msgstr "Á_ngulo" + +#: ../app/actions/context-actions.c:80 +msgctxt "context-action" +msgid "_Default Colors" +msgstr "Colores pre_definidos" + +#: ../app/actions/context-actions.c:82 +msgctxt "context-action" +msgid "Set foreground color to black, background color to white" +msgstr "Pone el color de frente a negro y el color de fondo a blanco" + +#: ../app/actions/context-actions.c:87 +msgctxt "context-action" +msgid "S_wap Colors" +msgstr "In_tercambiar los colores" + +#: ../app/actions/context-actions.c:88 +msgctxt "context-action" +msgid "Exchange foreground and background colors" +msgstr "Intercambia los colores de frente y fondo" + +#: ../app/actions/context-commands.c:426 +#, c-format +msgid "Paint Mode: %s" +msgstr "Modo de pintura: %s" + +#: ../app/actions/context-commands.c:552 +#, c-format +msgid "Brush Shape: %s" +msgstr "Forma del pincel: %s" + +#: ../app/actions/context-commands.c:612 +#, c-format +msgid "Brush Radius: %2.2f" +msgstr "Radio del pincel: %2.2f" + +#: ../app/actions/context-commands.c:720 +#, c-format +msgid "Brush Angle: %2.2f" +msgstr "Ángulo del pincel: %2.2f" + +#: ../app/actions/cursor-info-actions.c:40 +msgctxt "cursor-info-action" +msgid "Pointer Information Menu" +msgstr "Menú de información del puntero" + +#: ../app/actions/cursor-info-actions.c:47 +msgctxt "cursor-info-action" +msgid "_Sample Merged" +msgstr "_Muestra combinada" + +#: ../app/actions/cursor-info-actions.c:48 +msgctxt "cursor-info-action" +msgid "Use the composite color of all visible layers" +msgstr "Usar el color compuesto de todas las capas visibles" + +#: ../app/actions/data-commands.c:89 ../app/actions/documents-commands.c:344 +#: ../app/actions/file-commands.c:201 ../app/dialogs/file-open-dialog.c:220 +#: ../app/dialogs/file-open-dialog.c:265 +#: ../app/dialogs/file-open-location-dialog.c:213 +#: ../app/dialogs/file-open-location-dialog.c:225 +#: ../app/display/gimpdisplayshell-dnd.c:592 +#: ../app/widgets/gimplayertreeview.c:736 ../app/widgets/gimptoolbox-dnd.c:168 +#: ../app/widgets/gimptoolbox.c:817 +#, c-format +msgid "" +"Opening '%s' failed:\n" +"\n" +"%s" +msgstr "" +"La apertura de «%s» ha fallado:\n" +"%s" + +#: ../app/actions/data-commands.c:118 +#: ../app/actions/tool-options-commands.c:72 +#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1529 +#: ../app/core/gimppalette-import.c:211 ../app/core/gimppalette-load.c:224 +#: ../app/core/gimppalette.c:399 ../app/dialogs/palette-import-dialog.c:771 +#: ../app/widgets/gimpdnd-xds.c:94 +msgid "Untitled" +msgstr "Sin nombre" + +#: ../app/actions/dialogs-actions.c:49 +msgctxt "windows-action" +msgid "Tool_box" +msgstr "_Caja de herramientas" + +#: ../app/actions/dialogs-actions.c:55 +msgctxt "dialogs-action" +msgid "Tool _Options" +msgstr "_Opciones de herramienta" + +#: ../app/actions/dialogs-actions.c:56 +msgctxt "dialogs-action" +msgid "Open the tool options dialog" +msgstr "Abre el diálogo de opciones de herramienta" + +#: ../app/actions/dialogs-actions.c:61 +msgctxt "dialogs-action" +msgid "_Device Status" +msgstr "Estado del _dispositivo" + +#: ../app/actions/dialogs-actions.c:62 +msgctxt "dialogs-action" +msgid "Open the device status dialog" +msgstr "Abre el diálogo de estado de los dispositivos" + +#: ../app/actions/dialogs-actions.c:67 +msgctxt "dialogs-action" +msgid "_Layers" +msgstr "_Capas" + +#: ../app/actions/dialogs-actions.c:68 +msgctxt "dialogs-action" +msgid "Open the layers dialog" +msgstr "Abre el diálogo de capas" + +#: ../app/actions/dialogs-actions.c:73 +msgctxt "dialogs-action" +msgid "_Channels" +msgstr "_Canales" + +#: ../app/actions/dialogs-actions.c:74 +msgctxt "dialogs-action" +msgid "Open the channels dialog" +msgstr "Abre el diálogo de canales" + +#: ../app/actions/dialogs-actions.c:79 +msgctxt "dialogs-action" +msgid "_Paths" +msgstr "_Rutas" + +#: ../app/actions/dialogs-actions.c:80 +msgctxt "dialogs-action" +msgid "Open the paths dialog" +msgstr "Abre el diálogo de rutas" + +#: ../app/actions/dialogs-actions.c:85 +msgctxt "dialogs-action" +msgid "Color_map" +msgstr "_Mapa de colores" + +#: ../app/actions/dialogs-actions.c:86 +msgctxt "dialogs-action" +msgid "Open the colormap dialog" +msgstr "Abre el diálogo de mapas de color" + +#: ../app/actions/dialogs-actions.c:91 +msgctxt "dialogs-action" +msgid "Histogra_m" +msgstr "Histogra_ma" + +#: ../app/actions/dialogs-actions.c:92 +msgctxt "dialogs-action" +msgid "Open the histogram dialog" +msgstr "Abre el diálogo de histograma" + +#: ../app/actions/dialogs-actions.c:97 +msgctxt "dialogs-action" +msgid "_Selection Editor" +msgstr "Editor de _selección" + +#: ../app/actions/dialogs-actions.c:98 +msgctxt "dialogs-action" +msgid "Open the selection editor" +msgstr "Abre el editor de selección" + +#: ../app/actions/dialogs-actions.c:103 +msgctxt "dialogs-action" +msgid "Na_vigation" +msgstr "Na_vegación" + +#: ../app/actions/dialogs-actions.c:104 +msgctxt "dialogs-action" +msgid "Open the display navigation dialog" +msgstr "Abre el diálogo de navegación por la presentación" + +#: ../app/actions/dialogs-actions.c:109 +msgctxt "dialogs-action" +msgid "Undo _History" +msgstr "_Historial de deshacer" + +#: ../app/actions/dialogs-actions.c:110 +msgctxt "dialogs-action" +msgid "Open the undo history dialog" +msgstr "Abre el diálogo del historial de deshacer" + +#: ../app/actions/dialogs-actions.c:115 +msgctxt "dialogs-action" +msgid "Pointer" +msgstr "Puntero" + +#: ../app/actions/dialogs-actions.c:116 +msgctxt "dialogs-action" +msgid "Open the pointer information dialog" +msgstr "Abre el diálogo de información del puntero" + +#: ../app/actions/dialogs-actions.c:121 +msgctxt "dialogs-action" +msgid "_Sample Points" +msgstr "Punto_s de muestra" + +#: ../app/actions/dialogs-actions.c:122 +msgctxt "dialogs-action" +msgid "Open the sample points dialog" +msgstr "Abre el diálogo de puntos de muestreo" + +#: ../app/actions/dialogs-actions.c:127 +msgctxt "dialogs-action" +msgid "Colo_rs" +msgstr "Colo_res" + +#: ../app/actions/dialogs-actions.c:128 +msgctxt "dialogs-action" +msgid "Open the FG/BG color dialog" +msgstr "Abre el diálogo de colores de frente/fondo" + +#: ../app/actions/dialogs-actions.c:133 +msgctxt "dialogs-action" +msgid "_Brushes" +msgstr "_Pinceles" + +#: ../app/actions/dialogs-actions.c:134 +msgctxt "dialogs-action" +msgid "Open the brushes dialog" +msgstr "Abre el diálogo de pinceles" + +#: ../app/actions/dialogs-actions.c:139 +msgctxt "dialogs-action" +msgid "Brush Editor" +msgstr "Editor de pinceles" + +#: ../app/actions/dialogs-actions.c:140 +msgctxt "dialogs-action" +msgid "Open the brush editor" +msgstr "Abrir el editor de pinceles" + +#: ../app/actions/dialogs-actions.c:145 +msgctxt "dialogs-action" +msgid "Paint Dynamics" +msgstr "Dinámica de la pintura" + +#: ../app/actions/dialogs-actions.c:146 +msgctxt "dialogs-action" +msgid "Open paint dynamics dialog" +msgstr "Abre el diálogo de dinámica de la pintura" + +#: ../app/actions/dialogs-actions.c:151 +msgctxt "dialogs-action" +msgid "Paint Dynamics Editor" +msgstr "Editor de dinámica de la pintura" + +#: ../app/actions/dialogs-actions.c:152 +msgctxt "dialogs-action" +msgid "Open the paint dynamics editor" +msgstr "Abre el editor de dinámica de la pintura" + +#: ../app/actions/dialogs-actions.c:157 +msgctxt "dialogs-action" +msgid "P_atterns" +msgstr "_Patrones" + +#: ../app/actions/dialogs-actions.c:158 +msgctxt "dialogs-action" +msgid "Open the patterns dialog" +msgstr "Abre el diálogo de patrones" + # Es Degradado -#: ../app/actions/dialogs-actions.c:163 -msgctxt "dialogs-action" -msgid "_Gradients" -msgstr "_Degradados" - -#: ../app/actions/dialogs-actions.c:164 -msgctxt "dialogs-action" -msgid "Open the gradients dialog" -msgstr "Abre el diálogo de degradados" - -#: ../app/actions/dialogs-actions.c:169 -msgctxt "dialogs-action" -msgid "Gradient Editor" -msgstr "Editor de degradados" - -#: ../app/actions/dialogs-actions.c:170 -msgctxt "dialogs-action" -msgid "Open the gradient editor" -msgstr "Abrir el editor de degradados" - -#: ../app/actions/dialogs-actions.c:175 -msgctxt "dialogs-action" -msgid "Pal_ettes" -msgstr "Pal_etas" - -#: ../app/actions/dialogs-actions.c:176 -msgctxt "dialogs-action" -msgid "Open the palettes dialog" -msgstr "Abre el diálogo de paletas" - -#: ../app/actions/dialogs-actions.c:181 -msgctxt "dialogs-action" -msgid "Palette Editor" -msgstr "Editor de paleta" - -#: ../app/actions/dialogs-actions.c:182 -msgctxt "dialogs-action" -msgid "Open the palette editor" -msgstr "Abrir el editor de paletas" - -#: ../app/actions/dialogs-actions.c:187 -msgctxt "dialogs-action" -msgid "Tool presets" -msgstr "Ajustes prefijados de herramienta" - -#: ../app/actions/dialogs-actions.c:188 -msgctxt "dialogs-action" -msgid "Open tool presets dialog" -msgstr "Abre el diálogo de ajustes prefijados de herramienta" - -#: ../app/actions/dialogs-actions.c:193 -msgctxt "dialogs-action" -msgid "_Fonts" -msgstr "_Tipografías" - -#: ../app/actions/dialogs-actions.c:194 -msgctxt "dialogs-action" -msgid "Open the fonts dialog" -msgstr "Abre el diálogo de tipografías" - -#: ../app/actions/dialogs-actions.c:199 -msgctxt "dialogs-action" -msgid "B_uffers" -msgstr "B_úferes" - -#: ../app/actions/dialogs-actions.c:200 -msgctxt "dialogs-action" -msgid "Open the named buffers dialog" -msgstr "Abre el diálogo de búferes con nombre" - -#: ../app/actions/dialogs-actions.c:205 -msgctxt "dialogs-action" -msgid "_Images" -msgstr "_Imágenes" - -#: ../app/actions/dialogs-actions.c:206 -msgctxt "dialogs-action" -msgid "Open the images dialog" -msgstr "Abre el diálogo de imágenes" - -#: ../app/actions/dialogs-actions.c:211 -msgctxt "dialogs-action" -msgid "Document Histor_y" -msgstr "_Historial del documento" - -#: ../app/actions/dialogs-actions.c:212 -msgctxt "dialogs-action" -msgid "Open the document history dialog" -msgstr "Abre el diálogo de la historia del documento" - -#: ../app/actions/dialogs-actions.c:217 -msgctxt "dialogs-action" -msgid "_Templates" -msgstr "Plan_tillas" - -#: ../app/actions/dialogs-actions.c:218 -msgctxt "dialogs-action" -msgid "Open the image templates dialog" -msgstr "Abre el diálogo de las plantillas de imagen" - -#: ../app/actions/dialogs-actions.c:223 -msgctxt "dialogs-action" -msgid "Error Co_nsole" -msgstr "Co_nsola de errores" - -#: ../app/actions/dialogs-actions.c:224 -msgctxt "dialogs-action" -msgid "Open the error console" -msgstr "Abre la consola de errores" - -#: ../app/actions/dialogs-actions.c:234 -msgctxt "dialogs-action" -msgid "_Preferences" -msgstr "_Preferencias" - -#: ../app/actions/dialogs-actions.c:235 -msgctxt "dialogs-action" -msgid "Open the preferences dialog" -msgstr "Abre el diálogo de preferencias" - -#: ../app/actions/dialogs-actions.c:240 -msgctxt "dialogs-action" -msgid "_Input Devices" -msgstr "D_ispositivos de entrada" - -#: ../app/actions/dialogs-actions.c:241 -msgctxt "dialogs-action" -msgid "Open the input devices editor" -msgstr "Abrir el editor de dispositivos de entrada" - -#: ../app/actions/dialogs-actions.c:246 -msgctxt "dialogs-action" -msgid "_Keyboard Shortcuts" -msgstr "Combinaciones de _teclas" - -#: ../app/actions/dialogs-actions.c:247 -msgctxt "dialogs-action" -msgid "Open the keyboard shortcuts editor" -msgstr "Abre el editor de combinaciones de teclas" - -#: ../app/actions/dialogs-actions.c:252 -msgctxt "dialogs-action" -msgid "_Modules" -msgstr "_Módulos" - -#: ../app/actions/dialogs-actions.c:253 -msgctxt "dialogs-action" -msgid "Open the module manager dialog" -msgstr "Abre el diálogo del gestor de módulos" - -#: ../app/actions/dialogs-actions.c:258 -msgctxt "dialogs-action" -msgid "_Tip of the Day" -msgstr "_Consejo del día" - -#: ../app/actions/dialogs-actions.c:259 -msgctxt "dialogs-action" -msgid "Show some helpful tips on using GIMP" -msgstr "Mostrar consejos útiles sobre el uso de GIMP" - -#: ../app/actions/dialogs-actions.c:265 ../app/actions/dialogs-actions.c:271 -msgctxt "dialogs-action" -msgid "About GIMP" -msgstr "Acerca de GIMP" - -#: ../app/actions/dialogs-actions.c:267 -msgctxt "dialogs-action" -msgid "About" -msgstr "Acerca de" - -#: ../app/actions/dialogs-actions.c:269 -msgctxt "dialogs-action" -msgid "_About" -msgstr "A_cerca de" - -#: ../app/actions/dialogs-actions.c:333 -#: ../app/dialogs/preferences-dialog.c:1951 ../app/widgets/gimptoolbox.c:539 -msgid "Toolbox" -msgstr "Caja de herramientas" - -#: ../app/actions/dialogs-actions.c:334 -msgid "Raise the toolbox" -msgstr "Saca la caja de herramientas" - -#: ../app/actions/dialogs-actions.c:338 -msgid "New Toolbox" -msgstr "Caja de herramientas nueva" - -#: ../app/actions/dialogs-actions.c:339 -msgid "Create a new toolbox" -msgstr "Crea una caja de herramientas nueva" - -#: ../app/actions/dock-actions.c:45 -msgctxt "dock-action" -msgid "M_ove to Screen" -msgstr "_Mover a la pantalla" - -#: ../app/actions/dock-actions.c:49 -msgctxt "dock-action" -msgid "Close Dock" -msgstr "Cerrar empotrable" - -#: ../app/actions/dock-actions.c:54 -msgctxt "dock-action" -msgid "_Open Display..." -msgstr "_Abrir pantalla…" - -#: ../app/actions/dock-actions.c:55 -msgctxt "dock-action" -msgid "Connect to another display" -msgstr "Conectar a otra pantalla" - -#: ../app/actions/dock-actions.c:63 -msgctxt "dock-action" -msgid "_Show Image Selection" -msgstr "_Mostrar la selección de la imagen" - -#: ../app/actions/dock-actions.c:69 -msgctxt "dock-action" -msgid "Auto _Follow Active Image" -msgstr "_Seguir automáticamente la imagen activa" - -#: ../app/actions/dockable-actions.c:48 -msgctxt "dockable-action" -msgid "Dialogs Menu" -msgstr "Menú de diálogos" - -#: ../app/actions/dockable-actions.c:53 -msgctxt "dockable-action" -msgid "_Add Tab" -msgstr "_Añadir pestaña" - -#: ../app/actions/dockable-actions.c:55 -msgctxt "dockable-action" -msgid "_Preview Size" -msgstr "Tamaño de la vista _previa" - -#: ../app/actions/dockable-actions.c:57 -msgctxt "dockable-action" -msgid "_Tab Style" -msgstr "Es_tilo de pestaña" - -#: ../app/actions/dockable-actions.c:60 -msgctxt "dockable-action" -msgid "_Close Tab" -msgstr "_Cerrar pestaña" - -#: ../app/actions/dockable-actions.c:65 -msgctxt "dockable-action" -msgid "_Detach Tab" -msgstr "_Desprender pestaña" - -#: ../app/actions/dockable-actions.c:84 -msgctxt "preview-size" -msgid "_Tiny" -msgstr "_Diminuto" - -#: ../app/actions/dockable-actions.c:86 -msgctxt "preview-size" -msgid "E_xtra Small" -msgstr "_Muy pequeño" - -#: ../app/actions/dockable-actions.c:88 -msgctxt "preview-size" -msgid "_Small" -msgstr "_Pequeño" - -#: ../app/actions/dockable-actions.c:90 -msgctxt "preview-size" -msgid "_Medium" -msgstr "_Mediano" - -#: ../app/actions/dockable-actions.c:92 -msgctxt "preview-size" -msgid "_Large" -msgstr "_Grande" - -#: ../app/actions/dockable-actions.c:94 -msgctxt "preview-size" -msgid "Ex_tra Large" -msgstr "_Muy grande" - -#: ../app/actions/dockable-actions.c:96 -msgctxt "preview-size" -msgid "_Huge" -msgstr "_Enorme" - -#: ../app/actions/dockable-actions.c:98 -msgctxt "preview-size" -msgid "_Enormous" -msgstr "_Monumental" - -#: ../app/actions/dockable-actions.c:100 -msgctxt "preview-size" -msgid "_Gigantic" -msgstr "_Gigantesco" - -#: ../app/actions/dockable-actions.c:106 -msgctxt "tab-style" -msgid "_Icon" -msgstr "_Icono" - -#: ../app/actions/dockable-actions.c:108 -msgctxt "tab-style" -msgid "Current _Status" -msgstr "E_stado actual" - -#: ../app/actions/dockable-actions.c:110 -msgctxt "tab-style" -msgid "_Text" -msgstr "_Texto" - -#: ../app/actions/dockable-actions.c:112 -msgctxt "tab-style" -msgid "I_con & Text" -msgstr "I_cono y texto" - -#: ../app/actions/dockable-actions.c:114 -msgctxt "tab-style" -msgid "St_atus & Text" -msgstr "Est_ado y texto" - -#: ../app/actions/dockable-actions.c:116 ../app/widgets/widgets-enums.c:224 -msgctxt "tab-style" -msgid "Automatic" -msgstr "Automático" - -#: ../app/actions/dockable-actions.c:126 -msgctxt "dockable-action" -msgid "Loc_k Tab to Dock" -msgstr "_Fijar la pestaña en el empotrable" - -#: ../app/actions/dockable-actions.c:128 -msgctxt "dockable-action" -msgid "Protect this tab from being dragged with the mouse pointer" -msgstr "Proteger esta pestaña para evitar el arrastre con el ratón" - -#: ../app/actions/dockable-actions.c:134 -msgctxt "dockable-action" -msgid "Show _Button Bar" -msgstr "Mostrar la _barra de botones" - -#: ../app/actions/dockable-actions.c:143 -msgctxt "dockable-action" -msgid "View as _List" -msgstr "Ver como _lista" - -#: ../app/actions/dockable-actions.c:148 -msgctxt "dockable-action" -msgid "View as _Grid" -msgstr "Ver como reji_lla" - -#: ../app/actions/documents-actions.c:41 -msgctxt "documents-action" -msgid "Documents Menu" -msgstr "Menú de documentos" - -#: ../app/actions/documents-actions.c:45 -msgctxt "documents-action" -msgid "_Open Image" -msgstr "_Abrir imagen" - -#: ../app/actions/documents-actions.c:46 -msgctxt "documents-action" -msgid "Open the selected entry" -msgstr "Abrir la entrada seleccionada" - -#: ../app/actions/documents-actions.c:51 -msgctxt "documents-action" -msgid "_Raise or Open Image" -msgstr "_Elevar o abrir imagen" - -#: ../app/actions/documents-actions.c:52 -msgctxt "documents-action" -msgid "Raise window if already open" -msgstr "Elevar la ventana si ya está abierta" - -#: ../app/actions/documents-actions.c:57 -msgctxt "documents-action" -msgid "File Open _Dialog" -msgstr "_Diálogo de apertura de archivos" - -#: ../app/actions/documents-actions.c:58 -msgctxt "documents-action" -msgid "Open image dialog" -msgstr "Diálogo de apertura de imagen" - -#: ../app/actions/documents-actions.c:63 -msgctxt "documents-action" -msgid "Copy Image _Location" -msgstr "Copiar la _localización de la imagen" - -#: ../app/actions/documents-actions.c:64 -msgctxt "documents-action" -msgid "Copy image location to clipboard" -msgstr "Copiar al portapapeles la localización de la imagen" - -#: ../app/actions/documents-actions.c:69 -msgctxt "documents-action" -msgid "Remove _Entry" -msgstr "Eliminar _entrada" - -#: ../app/actions/documents-actions.c:70 -msgctxt "documents-action" -msgid "Remove the selected entry" -msgstr "Elimina la entrada seleccionada" - -#: ../app/actions/documents-actions.c:75 -msgctxt "documents-action" -msgid "_Clear History" -msgstr "_Limpiar el histórico" - -#: ../app/actions/documents-actions.c:76 -msgctxt "documents-action" -msgid "Clear the entire document history" -msgstr "Borrar todo el histórico del documento" - -#: ../app/actions/documents-actions.c:81 -msgctxt "documents-action" -msgid "Recreate _Preview" -msgstr "Regenerar la vista _previa" - -#: ../app/actions/documents-actions.c:82 -msgctxt "documents-action" -msgid "Recreate preview" -msgstr "Regenerar la vista previa" - -#: ../app/actions/documents-actions.c:87 -msgctxt "documents-action" -msgid "Reload _all Previews" -msgstr "Recargar _todas las vistas previas" - -#: ../app/actions/documents-actions.c:88 -msgctxt "documents-action" -msgid "Reload all previews" -msgstr "Recarga todas las vistas previas" - -#: ../app/actions/documents-actions.c:93 -msgctxt "documents-action" -msgid "Remove Dangling E_ntries" -msgstr "Eliminar las entradas _colgantes" - -#: ../app/actions/documents-actions.c:95 -msgctxt "documents-action" -msgid "Remove entries for which the corresponding file is not available" -msgstr "" -"Elimina las entradas para las que no está disponible el archivo " -"correspondiente" - -#: ../app/actions/documents-commands.c:192 -msgid "Clear Document History" -msgstr "Borrar el histórico del documento" - -#: ../app/actions/documents-commands.c:215 -msgid "Clear the Recent Documents list?" -msgstr "¿Borrar la lista de documentos recientes?" - -#: ../app/actions/documents-commands.c:218 -msgid "" -"Clearing the document history will permanently remove all images from the " -"recent documents list." -msgstr "" -"Al borrar el histórico de documentos se suprimirán de forma permanente todas " -"las imágenes de la lista de documentos recientes." - -#: ../app/actions/drawable-actions.c:45 -msgctxt "drawable-action" -msgid "_Equalize" -msgstr "_Ecualizar" - -#: ../app/actions/drawable-actions.c:46 -msgctxt "drawable-action" -msgid "Automatic contrast enhancement" -msgstr "Realce automático del contraste" - -#: ../app/actions/drawable-actions.c:51 -msgctxt "drawable-action" -msgid "In_vert" -msgstr "In_vertir" - -#: ../app/actions/drawable-actions.c:52 -msgctxt "drawable-action" -msgid "Invert the colors" -msgstr "Invertir los colores" - -#: ../app/actions/drawable-actions.c:57 -msgctxt "drawable-action" -msgid "_White Balance" -msgstr "_Balance de blancos" - -#: ../app/actions/drawable-actions.c:58 -msgctxt "drawable-action" -msgid "Automatic white balance correction" -msgstr "Corrección automática del balance de blancos" - -#: ../app/actions/drawable-actions.c:63 -msgctxt "drawable-action" -msgid "_Offset..." -msgstr "_Desplazamiento…" - -#: ../app/actions/drawable-actions.c:65 -msgctxt "drawable-action" -msgid "Shift the pixels, optionally wrapping them at the borders" -msgstr "Desplazar los píxeles y opcionalmente redoblarlos en los bordes" - -#: ../app/actions/drawable-actions.c:73 -msgctxt "drawable-action" -msgid "_Visible" -msgstr "_Visible" - -#: ../app/actions/drawable-actions.c:74 -msgctxt "drawable-action" -msgid "Toggle visibility" -msgstr "Alternar el estado de visibilidad" - -#: ../app/actions/drawable-actions.c:80 -msgctxt "drawable-action" -msgid "_Linked" -msgstr "_Enlazado" - -#: ../app/actions/drawable-actions.c:81 -msgctxt "drawable-action" -msgid "Toggle the linked state" -msgstr "Alternar el estado de enlazado" - -#. GIMP_STOCK_LOCK -#: ../app/actions/drawable-actions.c:87 -msgctxt "drawable-action" -msgid "L_ock pixels" -msgstr "Fijar píxe_les" - -#: ../app/actions/drawable-actions.c:89 -msgctxt "drawable-action" -msgid "Keep the pixels on this drawable from being modified" -msgstr "Evita que se puedan modificar los píxeles de este dibujable" - -#: ../app/actions/drawable-actions.c:98 -msgctxt "drawable-action" -msgid "Flip _Horizontally" -msgstr "Voltear _horizontalmente" - -#: ../app/actions/drawable-actions.c:99 -msgctxt "drawable-action" -msgid "Flip horizontally" -msgstr "Voltear horizontalmente" - -#: ../app/actions/drawable-actions.c:104 -msgctxt "drawable-action" -msgid "Flip _Vertically" -msgstr "Voltear _verticalmente" - -#: ../app/actions/drawable-actions.c:105 -msgctxt "drawable-action" -msgid "Flip vertically" -msgstr "Voltear verticalmente" - -#: ../app/actions/drawable-actions.c:113 -msgctxt "drawable-action" -msgid "Rotate 90° _clockwise" -msgstr "Rotar 90° en sentido _horario" - -#: ../app/actions/drawable-actions.c:114 -msgctxt "drawable-action" -msgid "Rotate 90 degrees to the right" -msgstr "Rotar 90 grados hacia la derecha" - -#: ../app/actions/drawable-actions.c:119 -msgctxt "drawable-action" -msgid "Rotate _180°" -msgstr "Rotar _180°" - +#: ../app/actions/dialogs-actions.c:163 +msgctxt "dialogs-action" +msgid "_Gradients" +msgstr "_Degradados" + +#: ../app/actions/dialogs-actions.c:164 +msgctxt "dialogs-action" +msgid "Open the gradients dialog" +msgstr "Abre el diálogo de degradados" + +#: ../app/actions/dialogs-actions.c:169 +msgctxt "dialogs-action" +msgid "Gradient Editor" +msgstr "Editor de degradados" + +#: ../app/actions/dialogs-actions.c:170 +msgctxt "dialogs-action" +msgid "Open the gradient editor" +msgstr "Abrir el editor de degradados" + +#: ../app/actions/dialogs-actions.c:175 +msgctxt "dialogs-action" +msgid "Pal_ettes" +msgstr "Pal_etas" + +#: ../app/actions/dialogs-actions.c:176 +msgctxt "dialogs-action" +msgid "Open the palettes dialog" +msgstr "Abre el diálogo de paletas" + +#: ../app/actions/dialogs-actions.c:181 +msgctxt "dialogs-action" +msgid "Palette Editor" +msgstr "Editor de paleta" + +#: ../app/actions/dialogs-actions.c:182 +msgctxt "dialogs-action" +msgid "Open the palette editor" +msgstr "Abrir el editor de paletas" + +#: ../app/actions/dialogs-actions.c:187 +msgctxt "dialogs-action" +msgid "Tool presets" +msgstr "Ajustes prefijados de herramienta" + +#: ../app/actions/dialogs-actions.c:188 +msgctxt "dialogs-action" +msgid "Open tool presets dialog" +msgstr "Abre el diálogo de ajustes prefijados de herramienta" + +#: ../app/actions/dialogs-actions.c:193 +msgctxt "dialogs-action" +msgid "_Fonts" +msgstr "_Tipografías" + +#: ../app/actions/dialogs-actions.c:194 +msgctxt "dialogs-action" +msgid "Open the fonts dialog" +msgstr "Abre el diálogo de tipografías" + +#: ../app/actions/dialogs-actions.c:199 +msgctxt "dialogs-action" +msgid "B_uffers" +msgstr "B_úferes" + +#: ../app/actions/dialogs-actions.c:200 +msgctxt "dialogs-action" +msgid "Open the named buffers dialog" +msgstr "Abre el diálogo de búferes con nombre" + +#: ../app/actions/dialogs-actions.c:205 +msgctxt "dialogs-action" +msgid "_Images" +msgstr "_Imágenes" + +#: ../app/actions/dialogs-actions.c:206 +msgctxt "dialogs-action" +msgid "Open the images dialog" +msgstr "Abre el diálogo de imágenes" + +#: ../app/actions/dialogs-actions.c:211 +msgctxt "dialogs-action" +msgid "Document Histor_y" +msgstr "_Historial del documento" + +#: ../app/actions/dialogs-actions.c:212 +msgctxt "dialogs-action" +msgid "Open the document history dialog" +msgstr "Abre el diálogo de la historia del documento" + +#: ../app/actions/dialogs-actions.c:217 +msgctxt "dialogs-action" +msgid "_Templates" +msgstr "Plan_tillas" + +#: ../app/actions/dialogs-actions.c:218 +msgctxt "dialogs-action" +msgid "Open the image templates dialog" +msgstr "Abre el diálogo de las plantillas de imagen" + +#: ../app/actions/dialogs-actions.c:223 +msgctxt "dialogs-action" +msgid "Error Co_nsole" +msgstr "Co_nsola de errores" + +#: ../app/actions/dialogs-actions.c:224 +msgctxt "dialogs-action" +msgid "Open the error console" +msgstr "Abre la consola de errores" + +#: ../app/actions/dialogs-actions.c:234 +msgctxt "dialogs-action" +msgid "_Preferences" +msgstr "_Preferencias" + +#: ../app/actions/dialogs-actions.c:235 +msgctxt "dialogs-action" +msgid "Open the preferences dialog" +msgstr "Abre el diálogo de preferencias" + +#: ../app/actions/dialogs-actions.c:240 +msgctxt "dialogs-action" +msgid "_Input Devices" +msgstr "D_ispositivos de entrada" + +#: ../app/actions/dialogs-actions.c:241 +msgctxt "dialogs-action" +msgid "Open the input devices editor" +msgstr "Abrir el editor de dispositivos de entrada" + +#: ../app/actions/dialogs-actions.c:246 +msgctxt "dialogs-action" +msgid "_Keyboard Shortcuts" +msgstr "Combinaciones de _teclas" + +#: ../app/actions/dialogs-actions.c:247 +msgctxt "dialogs-action" +msgid "Open the keyboard shortcuts editor" +msgstr "Abre el editor de combinaciones de teclas" + +#: ../app/actions/dialogs-actions.c:252 +msgctxt "dialogs-action" +msgid "_Modules" +msgstr "_Módulos" + +#: ../app/actions/dialogs-actions.c:253 +msgctxt "dialogs-action" +msgid "Open the module manager dialog" +msgstr "Abre el diálogo del gestor de módulos" + +#: ../app/actions/dialogs-actions.c:258 +msgctxt "dialogs-action" +msgid "_Tip of the Day" +msgstr "_Consejo del día" + +#: ../app/actions/dialogs-actions.c:259 +msgctxt "dialogs-action" +msgid "Show some helpful tips on using GIMP" +msgstr "Mostrar consejos útiles sobre el uso de GIMP" + +#: ../app/actions/dialogs-actions.c:265 ../app/actions/dialogs-actions.c:271 +msgctxt "dialogs-action" +msgid "About GIMP" +msgstr "Acerca de GIMP" + +#: ../app/actions/dialogs-actions.c:267 +msgctxt "dialogs-action" +msgid "About" +msgstr "Acerca de" + +#: ../app/actions/dialogs-actions.c:269 +msgctxt "dialogs-action" +msgid "_About" +msgstr "A_cerca de" + +#: ../app/actions/dialogs-actions.c:333 +#: ../app/dialogs/preferences-dialog.c:1988 ../app/widgets/gimptoolbox.c:539 +msgid "Toolbox" +msgstr "Caja de herramientas" + +#: ../app/actions/dialogs-actions.c:334 +msgid "Raise the toolbox" +msgstr "Saca la caja de herramientas" + +#: ../app/actions/dialogs-actions.c:338 +msgid "New Toolbox" +msgstr "Caja de herramientas nueva" + +#: ../app/actions/dialogs-actions.c:339 +msgid "Create a new toolbox" +msgstr "Crea una caja de herramientas nueva" + +#: ../app/actions/dock-actions.c:45 +msgctxt "dock-action" +msgid "M_ove to Screen" +msgstr "_Mover a la pantalla" + +#: ../app/actions/dock-actions.c:49 +msgctxt "dock-action" +msgid "Close Dock" +msgstr "Cerrar empotrable" + +#: ../app/actions/dock-actions.c:54 +msgctxt "dock-action" +msgid "_Open Display..." +msgstr "_Abrir pantalla…" + +#: ../app/actions/dock-actions.c:55 +msgctxt "dock-action" +msgid "Connect to another display" +msgstr "Conectar a otra pantalla" + +#: ../app/actions/dock-actions.c:63 +msgctxt "dock-action" +msgid "_Show Image Selection" +msgstr "_Mostrar la selección de la imagen" + +#: ../app/actions/dock-actions.c:69 +msgctxt "dock-action" +msgid "Auto _Follow Active Image" +msgstr "_Seguir automáticamente la imagen activa" + +#: ../app/actions/dockable-actions.c:48 +msgctxt "dockable-action" +msgid "Dialogs Menu" +msgstr "Menú de diálogos" + +#: ../app/actions/dockable-actions.c:53 +msgctxt "dockable-action" +msgid "_Add Tab" +msgstr "_Añadir pestaña" + +#: ../app/actions/dockable-actions.c:55 +msgctxt "dockable-action" +msgid "_Preview Size" +msgstr "Tamaño de la vista _previa" + +#: ../app/actions/dockable-actions.c:57 +msgctxt "dockable-action" +msgid "_Tab Style" +msgstr "Es_tilo de pestaña" + +#: ../app/actions/dockable-actions.c:60 +msgctxt "dockable-action" +msgid "_Close Tab" +msgstr "_Cerrar pestaña" + +#: ../app/actions/dockable-actions.c:65 +msgctxt "dockable-action" +msgid "_Detach Tab" +msgstr "_Desprender pestaña" + +#: ../app/actions/dockable-actions.c:84 +msgctxt "preview-size" +msgid "_Tiny" +msgstr "_Diminuto" + +#: ../app/actions/dockable-actions.c:86 +msgctxt "preview-size" +msgid "E_xtra Small" +msgstr "_Muy pequeño" + +#: ../app/actions/dockable-actions.c:88 +msgctxt "preview-size" +msgid "_Small" +msgstr "_Pequeño" + +#: ../app/actions/dockable-actions.c:90 +msgctxt "preview-size" +msgid "_Medium" +msgstr "_Mediano" + +#: ../app/actions/dockable-actions.c:92 +msgctxt "preview-size" +msgid "_Large" +msgstr "_Grande" + +#: ../app/actions/dockable-actions.c:94 +msgctxt "preview-size" +msgid "Ex_tra Large" +msgstr "_Muy grande" + +#: ../app/actions/dockable-actions.c:96 +msgctxt "preview-size" +msgid "_Huge" +msgstr "_Enorme" + +#: ../app/actions/dockable-actions.c:98 +msgctxt "preview-size" +msgid "_Enormous" +msgstr "_Monumental" + +#: ../app/actions/dockable-actions.c:100 +msgctxt "preview-size" +msgid "_Gigantic" +msgstr "_Gigantesco" + +#: ../app/actions/dockable-actions.c:106 +msgctxt "tab-style" +msgid "_Icon" +msgstr "_Icono" + +#: ../app/actions/dockable-actions.c:108 +msgctxt "tab-style" +msgid "Current _Status" +msgstr "E_stado actual" + +#: ../app/actions/dockable-actions.c:110 +msgctxt "tab-style" +msgid "_Text" +msgstr "_Texto" + +#: ../app/actions/dockable-actions.c:112 +msgctxt "tab-style" +msgid "I_con & Text" +msgstr "I_cono y texto" + +#: ../app/actions/dockable-actions.c:114 +msgctxt "tab-style" +msgid "St_atus & Text" +msgstr "Est_ado y texto" + +#: ../app/actions/dockable-actions.c:116 ../app/widgets/widgets-enums.c:224 +msgctxt "tab-style" +msgid "Automatic" +msgstr "Automático" + +#: ../app/actions/dockable-actions.c:126 +msgctxt "dockable-action" +msgid "Loc_k Tab to Dock" +msgstr "_Fijar la pestaña en el empotrable" + +#: ../app/actions/dockable-actions.c:128 +msgctxt "dockable-action" +msgid "Protect this tab from being dragged with the mouse pointer" +msgstr "Proteger esta pestaña para evitar el arrastre con el ratón" + +#: ../app/actions/dockable-actions.c:134 +msgctxt "dockable-action" +msgid "Show _Button Bar" +msgstr "Mostrar la _barra de botones" + +#: ../app/actions/dockable-actions.c:143 +msgctxt "dockable-action" +msgid "View as _List" +msgstr "Ver como _lista" + +#: ../app/actions/dockable-actions.c:148 +msgctxt "dockable-action" +msgid "View as _Grid" +msgstr "Ver como reji_lla" + +#: ../app/actions/documents-actions.c:41 +msgctxt "documents-action" +msgid "Documents Menu" +msgstr "Menú de documentos" + +#: ../app/actions/documents-actions.c:45 +msgctxt "documents-action" +msgid "_Open Image" +msgstr "_Abrir imagen" + +#: ../app/actions/documents-actions.c:46 +msgctxt "documents-action" +msgid "Open the selected entry" +msgstr "Abrir la entrada seleccionada" + +#: ../app/actions/documents-actions.c:51 +msgctxt "documents-action" +msgid "_Raise or Open Image" +msgstr "_Elevar o abrir imagen" + +#: ../app/actions/documents-actions.c:52 +msgctxt "documents-action" +msgid "Raise window if already open" +msgstr "Elevar la ventana si ya está abierta" + +#: ../app/actions/documents-actions.c:57 +msgctxt "documents-action" +msgid "File Open _Dialog" +msgstr "_Diálogo de apertura de archivos" + +#: ../app/actions/documents-actions.c:58 +msgctxt "documents-action" +msgid "Open image dialog" +msgstr "Diálogo de apertura de imagen" + +#: ../app/actions/documents-actions.c:63 +msgctxt "documents-action" +msgid "Copy Image _Location" +msgstr "Copiar la _localización de la imagen" + +#: ../app/actions/documents-actions.c:64 +msgctxt "documents-action" +msgid "Copy image location to clipboard" +msgstr "Copiar al portapapeles la localización de la imagen" + +#: ../app/actions/documents-actions.c:69 +msgctxt "documents-action" +msgid "Remove _Entry" +msgstr "Eliminar _entrada" + +#: ../app/actions/documents-actions.c:70 +msgctxt "documents-action" +msgid "Remove the selected entry" +msgstr "Elimina la entrada seleccionada" + +#: ../app/actions/documents-actions.c:75 +msgctxt "documents-action" +msgid "_Clear History" +msgstr "_Limpiar el histórico" + +#: ../app/actions/documents-actions.c:76 +msgctxt "documents-action" +msgid "Clear the entire document history" +msgstr "Borrar todo el histórico del documento" + +#: ../app/actions/documents-actions.c:81 +msgctxt "documents-action" +msgid "Recreate _Preview" +msgstr "Regenerar la vista _previa" + +#: ../app/actions/documents-actions.c:82 +msgctxt "documents-action" +msgid "Recreate preview" +msgstr "Regenerar la vista previa" + +#: ../app/actions/documents-actions.c:87 +msgctxt "documents-action" +msgid "Reload _all Previews" +msgstr "Recargar _todas las vistas previas" + +#: ../app/actions/documents-actions.c:88 +msgctxt "documents-action" +msgid "Reload all previews" +msgstr "Recarga todas las vistas previas" + +#: ../app/actions/documents-actions.c:93 +msgctxt "documents-action" +msgid "Remove Dangling E_ntries" +msgstr "Eliminar las entradas _colgantes" + +#: ../app/actions/documents-actions.c:95 +msgctxt "documents-action" +msgid "Remove entries for which the corresponding file is not available" +msgstr "" +"Elimina las entradas para las que no está disponible el archivo " +"correspondiente" + +#: ../app/actions/documents-commands.c:192 +msgid "Clear Document History" +msgstr "Borrar el histórico del documento" + +#: ../app/actions/documents-commands.c:215 +msgid "Clear the Recent Documents list?" +msgstr "¿Borrar la lista de documentos recientes?" + +#: ../app/actions/documents-commands.c:218 +msgid "" +"Clearing the document history will permanently remove all images from the " +"recent documents list." +msgstr "" +"Al borrar el histórico de documentos se suprimirán de forma permanente todas " +"las imágenes de la lista de documentos recientes." + +#: ../app/actions/drawable-actions.c:45 +msgctxt "drawable-action" +msgid "_Equalize" +msgstr "_Ecualizar" + +#: ../app/actions/drawable-actions.c:46 +msgctxt "drawable-action" +msgid "Automatic contrast enhancement" +msgstr "Realce automático del contraste" + +#: ../app/actions/drawable-actions.c:51 +msgctxt "drawable-action" +msgid "In_vert" +msgstr "In_vertir" + +#: ../app/actions/drawable-actions.c:52 +msgctxt "drawable-action" +msgid "Invert the colors" +msgstr "Invertir los colores" + +#: ../app/actions/drawable-actions.c:57 +msgctxt "drawable-action" +msgid "_White Balance" +msgstr "_Balance de blancos" + +#: ../app/actions/drawable-actions.c:58 +msgctxt "drawable-action" +msgid "Automatic white balance correction" +msgstr "Corrección automática del balance de blancos" + +#: ../app/actions/drawable-actions.c:63 +msgctxt "drawable-action" +msgid "_Offset..." +msgstr "_Desplazamiento…" + +#: ../app/actions/drawable-actions.c:65 +msgctxt "drawable-action" +msgid "Shift the pixels, optionally wrapping them at the borders" +msgstr "Desplazar los píxeles y opcionalmente redoblarlos en los bordes" + +#: ../app/actions/drawable-actions.c:73 +msgctxt "drawable-action" +msgid "_Visible" +msgstr "_Visible" + +#: ../app/actions/drawable-actions.c:74 +msgctxt "drawable-action" +msgid "Toggle visibility" +msgstr "Alternar el estado de visibilidad" + +#: ../app/actions/drawable-actions.c:80 +msgctxt "drawable-action" +msgid "_Linked" +msgstr "_Enlazado" + +#: ../app/actions/drawable-actions.c:81 +msgctxt "drawable-action" +msgid "Toggle the linked state" +msgstr "Alternar el estado de enlazado" + +#. GIMP_STOCK_LOCK +#: ../app/actions/drawable-actions.c:87 +msgctxt "drawable-action" +msgid "L_ock pixels" +msgstr "Fijar píxe_les" + +#: ../app/actions/drawable-actions.c:89 +msgctxt "drawable-action" +msgid "Keep the pixels on this drawable from being modified" +msgstr "Evita que se puedan modificar los píxeles de este dibujable" + +#: ../app/actions/drawable-actions.c:98 +msgctxt "drawable-action" +msgid "Flip _Horizontally" +msgstr "Voltear _horizontalmente" + +#: ../app/actions/drawable-actions.c:99 +msgctxt "drawable-action" +msgid "Flip horizontally" +msgstr "Voltear horizontalmente" + +#: ../app/actions/drawable-actions.c:104 +msgctxt "drawable-action" +msgid "Flip _Vertically" +msgstr "Voltear _verticalmente" + +#: ../app/actions/drawable-actions.c:105 +msgctxt "drawable-action" +msgid "Flip vertically" +msgstr "Voltear verticalmente" + +#: ../app/actions/drawable-actions.c:113 +msgctxt "drawable-action" +msgid "Rotate 90° _clockwise" +msgstr "Rotar 90° en sentido _horario" + +#: ../app/actions/drawable-actions.c:114 +msgctxt "drawable-action" +msgid "Rotate 90 degrees to the right" +msgstr "Rotar 90 grados hacia la derecha" + +#: ../app/actions/drawable-actions.c:119 +msgctxt "drawable-action" +msgid "Rotate _180°" +msgstr "Rotar _180°" + # Poner cabeza abajo -#: ../app/actions/drawable-actions.c:120 -msgctxt "drawable-action" -msgid "Turn upside-down" -msgstr "Voltear verticalmente" - -#: ../app/actions/drawable-actions.c:125 -msgctxt "drawable-action" -msgid "Rotate 90° counter-clock_wise" -msgstr "Rotar 90° en sentido _antihorario" - -#: ../app/actions/drawable-actions.c:126 -msgctxt "drawable-action" -msgid "Rotate 90 degrees to the left" -msgstr "Rotar 90 grados hacia la izquierda" - -#: ../app/actions/drawable-commands.c:63 -msgid "Equalize does not operate on indexed layers." -msgstr "La ecualización no funciona en capas indexadas." - -#: ../app/actions/drawable-commands.c:87 -msgid "Invert does not operate on indexed layers." -msgstr "La inversión no funciona con capas indexadas." - -#: ../app/actions/drawable-commands.c:111 -msgid "White Balance operates only on RGB color layers." -msgstr "El balance de blancos sólo funciona sobre capas con color RGB." - -#: ../app/actions/dynamics-actions.c:42 -msgctxt "dynamics-action" -msgid "Paint Dynamics Menu" -msgstr "Menú de dinámica de la pintura" - -#: ../app/actions/dynamics-actions.c:46 -msgctxt "dynamics-action" -msgid "_New Dynamics" -msgstr "_Nueva dinámica" - -#: ../app/actions/dynamics-actions.c:47 -msgctxt "dynamics-action" -msgid "Create a new dynamics" -msgstr "Crear una dinámica nueva" - -#: ../app/actions/dynamics-actions.c:52 -msgctxt "dynamics-action" -msgid "D_uplicate Dynamics" -msgstr "D_uplicar la dinámica" - -#: ../app/actions/dynamics-actions.c:53 -msgctxt "dynamics-action" -msgid "Duplicate this dynamics" -msgstr "Duplicar esta dinámica" - -#: ../app/actions/dynamics-actions.c:58 -msgctxt "dynamics-action" -msgid "Copy Dynamics _Location" -msgstr "Copiar ruta de la dinámica" - -#: ../app/actions/dynamics-actions.c:59 -msgctxt "dynamics-action" -msgid "Copy dynamics file location to clipboard" -msgstr "Copiar al portapapeles la ruta del archivo de dinámica" - -#: ../app/actions/dynamics-actions.c:64 -msgctxt "dynamics-action" -msgid "_Delete Dynamics" -msgstr "Eliminar _dinámica" - -#: ../app/actions/dynamics-actions.c:65 -msgctxt "dynamics-action" -msgid "Delete this dynamics" -msgstr "Eliminar esta dinámica" - -#: ../app/actions/dynamics-actions.c:70 -msgctxt "dynamics-action" -msgid "_Refresh Dynamics" -msgstr "_Renovar dinámica" - -#: ../app/actions/dynamics-actions.c:71 -msgctxt "dynamics-action" -msgid "Refresh dynamics" -msgstr "Renovar la dinámica" - -#: ../app/actions/dynamics-actions.c:79 -msgctxt "dynamics-action" -msgid "_Edit Dynamics..." -msgstr "_Editar la dinámica…" - -#: ../app/actions/dynamics-actions.c:80 -msgctxt "dynamics-action" -msgid "Edit dynamics" -msgstr "Editar la dinámica" - -#: ../app/actions/dynamics-editor-actions.c:42 -msgctxt "dynamics-editor-action" -msgid "Paint Dynamics Editor Menu" -msgstr "Menú del editor de dinámica de la pintura" - -#: ../app/actions/dynamics-editor-actions.c:50 -msgctxt "dynamics-editor-action" -msgid "Edit Active Dynamics" -msgstr "Editar la dinámica activa" - -#: ../app/actions/edit-actions.c:63 -msgctxt "edit-action" -msgid "_Edit" -msgstr "_Editar" - -#: ../app/actions/edit-actions.c:64 -msgctxt "edit-action" -msgid "Paste _as" -msgstr "Peg_ar como" - -#: ../app/actions/edit-actions.c:65 -msgctxt "edit-action" -msgid "_Buffer" -msgstr "_Búfer" - -#: ../app/actions/edit-actions.c:68 -msgctxt "edit-action" -msgid "Undo History Menu" -msgstr "Menú del historial de deshacer" - -#: ../app/actions/edit-actions.c:72 -msgctxt "edit-action" -msgid "_Undo" -msgstr "Des_hacer" - -#: ../app/actions/edit-actions.c:73 -msgctxt "edit-action" -msgid "Undo the last operation" -msgstr "Deshacer la última operación" - -#: ../app/actions/edit-actions.c:78 -msgctxt "edit-action" -msgid "_Redo" -msgstr "_Rehacer" - -#: ../app/actions/edit-actions.c:79 -msgctxt "edit-action" -msgid "Redo the last operation that was undone" -msgstr "Rehacer la última operación deshecha" - -#: ../app/actions/edit-actions.c:84 -msgctxt "edit-action" -msgid "Strong Undo" -msgstr "Deshacer fuerte" - -#: ../app/actions/edit-actions.c:85 -msgctxt "edit-action" -msgid "Undo the last operation, skipping visibility changes" -msgstr "Deshacer la última operación, saltándose cambios de visibilidad" - -#: ../app/actions/edit-actions.c:90 -msgctxt "edit-action" -msgid "Strong Redo" -msgstr "Rehacer fuerte" - -#: ../app/actions/edit-actions.c:92 -msgctxt "edit-action" -msgid "Redo the last operation that was undone, skipping visibility changes" -msgstr "" -"Rehacer la última operación deshecha, saltándose cambios de visibilidad" - -#: ../app/actions/edit-actions.c:97 -msgctxt "edit-action" -msgid "_Clear Undo History" -msgstr "_Vaciar historial de deshacer" - -#: ../app/actions/edit-actions.c:98 -msgctxt "edit-action" -msgid "Remove all operations from the undo history" -msgstr "Eliminar todas las operaciones del historial de deshacer" - -#: ../app/actions/edit-actions.c:103 -msgctxt "edit-action" -msgid "_Fade..." -msgstr "_Desvanecer…" - -#: ../app/actions/edit-actions.c:105 -msgctxt "edit-action" -msgid "Modify paint mode and opacity of the last pixel manipulation" -msgstr "" -"Modificar el modo de pintura y la opacidad de la última manipulación de " -"píxeles" - -#: ../app/actions/edit-actions.c:110 -msgctxt "edit-action" -msgid "Cu_t" -msgstr "Cor_tar" - -#: ../app/actions/edit-actions.c:111 -msgctxt "edit-action" -msgid "Move the selected pixels to the clipboard" -msgstr "Mover los píxeles seleccionados al portapapeles" - -#: ../app/actions/edit-actions.c:116 -msgctxt "edit-action" -msgid "_Copy" -msgstr "_Copiar" - -#: ../app/actions/edit-actions.c:117 -msgctxt "edit-action" -msgid "Copy the selected pixels to the clipboard" -msgstr "Copiar los píxeles seleccionados al portapapeles" - -#. GIMP_STOCK_COPY_VISIBLE, -#: ../app/actions/edit-actions.c:122 -msgctxt "edit-action" -msgid "Copy _Visible" -msgstr "Copia _visible" - -#: ../app/actions/edit-actions.c:123 -msgctxt "edit-action" -msgid "Copy what is visible in the selected region" -msgstr "Copiar lo que es visible dentro de la región seleccionada" - -#: ../app/actions/edit-actions.c:128 -msgctxt "edit-action" -msgid "_Paste" -msgstr "_Pegar" - -#: ../app/actions/edit-actions.c:129 -msgctxt "edit-action" -msgid "Paste the content of the clipboard" -msgstr "Pegar el contenido del portapapeles" - -#: ../app/actions/edit-actions.c:134 -msgctxt "edit-action" -msgid "Paste _Into" -msgstr "Pegar _en" - -#: ../app/actions/edit-actions.c:136 -msgctxt "edit-action" -msgid "Paste the content of the clipboard into the current selection" -msgstr "Pegar el contenido del portapapeles dentro de la selección actual" - -#: ../app/actions/edit-actions.c:141 -msgctxt "edit-action" -msgid "From _Clipboard" -msgstr "Desde el por_tapapeles" - -#: ../app/actions/edit-actions.c:142 ../app/actions/edit-actions.c:148 -msgctxt "edit-action" -msgid "Create a new image from the content of the clipboard" -msgstr "Crear una imagen nueva a partir del contenido del portapapeles" - -#: ../app/actions/edit-actions.c:147 -msgctxt "edit-action" -msgid "_New Image" -msgstr "Imagen _nueva" - -#: ../app/actions/edit-actions.c:153 -msgctxt "edit-action" -msgid "New _Layer" -msgstr "_Capa nueva" - -#: ../app/actions/edit-actions.c:154 -msgctxt "edit-action" -msgid "Create a new layer from the content of the clipboard" -msgstr "Crear una capa nueva a partir del contenido del portapapeles" - -#: ../app/actions/edit-actions.c:159 -msgctxt "edit-action" -msgid "Cu_t Named..." -msgstr "Cor_tar con nombre…" - -#: ../app/actions/edit-actions.c:160 -msgctxt "edit-action" -msgid "Move the selected pixels to a named buffer" -msgstr "Mover los píxeles seleccionados a un búfer con nombre" - -#: ../app/actions/edit-actions.c:165 -msgctxt "edit-action" -msgid "_Copy Named..." -msgstr "_Copiar con nombre…" - -#: ../app/actions/edit-actions.c:166 -msgctxt "edit-action" -msgid "Copy the selected pixels to a named buffer" -msgstr "Copiar los píxeles seleccionados a un búfer con nombre" - -#. GIMP_STOCK_COPY_VISIBLE, -#: ../app/actions/edit-actions.c:171 -msgctxt "edit-action" -msgid "Copy _Visible Named..." -msgstr "Copiar _visible con nombre…" - -#: ../app/actions/edit-actions.c:173 -msgctxt "edit-action" -msgid "Copy what is visible in the selected region to a named buffer" -msgstr "" -"Copiar la parte visible dentro de la región seleccionada a un búfer con " -"nombre" - -#: ../app/actions/edit-actions.c:178 -msgctxt "edit-action" -msgid "_Paste Named..." -msgstr "_Pegar con nombre…" - -#: ../app/actions/edit-actions.c:179 -msgctxt "edit-action" -msgid "Paste the content of a named buffer" -msgstr "Pegar el contenido de un búfer con nombre" - -#: ../app/actions/edit-actions.c:184 -msgctxt "edit-action" -msgid "Cl_ear" -msgstr "_Limpiar" - -#: ../app/actions/edit-actions.c:185 -msgctxt "edit-action" -msgid "Clear the selected pixels" -msgstr "Borrar los píxeles seleccionados" - -#: ../app/actions/edit-actions.c:193 -msgctxt "edit-action" -msgid "Fill with _FG Color" -msgstr "Rellenar con el color de _frente" - -#: ../app/actions/edit-actions.c:194 -msgctxt "edit-action" -msgid "Fill the selection using the foreground color" -msgstr "Rellenar la selección utilizando el color de frente" - -#: ../app/actions/edit-actions.c:199 -msgctxt "edit-action" -msgid "Fill with B_G Color" -msgstr "Rellenar con el color de fo_ndo" - -#: ../app/actions/edit-actions.c:200 -msgctxt "edit-action" -msgid "Fill the selection using the background color" -msgstr "Rellenar la selección con el color del fondo" - -#: ../app/actions/edit-actions.c:205 -msgctxt "edit-action" -msgid "Fill _with Pattern" -msgstr "Rellenar con un pa_trón" - -#: ../app/actions/edit-actions.c:206 -msgctxt "edit-action" -msgid "Fill the selection using the active pattern" -msgstr "Rellenar la selección utilizando el patrón activo" - -#: ../app/actions/edit-actions.c:304 -#, c-format -msgid "_Undo %s" -msgstr "De_shacer %s" - -#: ../app/actions/edit-actions.c:311 -#, c-format -msgid "_Redo %s" -msgstr "_Rehacer %s" - -#: ../app/actions/edit-actions.c:326 -#, c-format -msgid "_Fade %s..." -msgstr "_Desvanecer %s…" - -#: ../app/actions/edit-actions.c:338 -msgid "_Undo" -msgstr "Des_hacer" - -#: ../app/actions/edit-actions.c:339 -msgid "_Redo" -msgstr "_Rehacer" - -#: ../app/actions/edit-actions.c:340 -msgid "_Fade..." -msgstr "_Desvanecer…" - -#: ../app/actions/edit-commands.c:137 -msgid "Clear Undo History" -msgstr "Vaciar historial de deshacer" - -#: ../app/actions/edit-commands.c:163 -msgid "Really clear image's undo history?" -msgstr "¿Seguro que quiere vaciar el histórico de deshacer de la imagen?" - -#: ../app/actions/edit-commands.c:176 -#, c-format -msgid "Clearing the undo history of this image will gain %s of memory." -msgstr "" -"Al limpiar el historial de deshacer de esta imagen se recuperarán %s de " -"memoria." - -#: ../app/actions/edit-commands.c:206 -msgid "Cut pixels to the clipboard" -msgstr "Cortar los píxeles al portapapeles" - -#: ../app/actions/edit-commands.c:236 ../app/actions/edit-commands.c:265 -msgid "Copied pixels to the clipboard" -msgstr "Píxeles copiados a una memoria intermedia con nombre" - -#: ../app/actions/edit-commands.c:325 ../app/actions/edit-commands.c:360 -#: ../app/actions/edit-commands.c:543 -msgid "There is no image data in the clipboard to paste." -msgstr "No hay datos de imágenes para pegar en el portapapeles." - -#: ../app/actions/edit-commands.c:348 ../app/core/gimpbrushclipboard.c:172 -#: ../app/core/gimppatternclipboard.c:172 ../app/widgets/gimpclipboard.c:345 -msgid "Clipboard" -msgstr "Portapapeles" - -#: ../app/actions/edit-commands.c:374 -msgid "Cut Named" -msgstr "Cortar (con nombre)" - -#: ../app/actions/edit-commands.c:377 ../app/actions/edit-commands.c:418 -#: ../app/actions/edit-commands.c:438 -msgid "Enter a name for this buffer" -msgstr "Ponga un nombre a este búfer" - -#: ../app/actions/edit-commands.c:415 -msgid "Copy Named" -msgstr "Copiar (con nombre)" - -#: ../app/actions/edit-commands.c:435 -msgid "Copy Visible Named " -msgstr "Copiar visible con nombre" - -#: ../app/actions/edit-commands.c:560 -msgid "There is no active layer or channel to cut from." -msgstr "No hay una capa o canal activo desde donde cortar." - -#: ../app/actions/edit-commands.c:565 ../app/actions/edit-commands.c:597 -#: ../app/actions/edit-commands.c:621 -msgid "(Unnamed Buffer)" -msgstr "(Búfer sin nombre)" - -#: ../app/actions/edit-commands.c:592 -msgid "There is no active layer or channel to copy from." -msgstr "No hay una capa o canal activo desde donde se pueda copiar." - -#: ../app/actions/error-console-actions.c:39 -msgctxt "error-console-action" -msgid "Error Console Menu" -msgstr "Menú de la consola de error" - -#: ../app/actions/error-console-actions.c:43 -msgctxt "error-console-action" -msgid "_Clear" -msgstr "_Limpiar" - -#: ../app/actions/error-console-actions.c:44 -msgctxt "error-console-action" -msgid "Clear error console" -msgstr "Limpiar consola de errores" - -#: ../app/actions/error-console-actions.c:49 -msgctxt "error-console-action" -msgid "Select _All" -msgstr "Seleccionar _todo" - -#: ../app/actions/error-console-actions.c:50 -msgctxt "error-console-action" -msgid "Select all error messages" -msgstr "Seleccionar todos los errores" - -#: ../app/actions/error-console-actions.c:58 -msgctxt "error-console-action" -msgid "_Save Error Log to File..." -msgstr "_Guardar el registro de errores en un archivo…" - -#: ../app/actions/error-console-actions.c:59 -msgctxt "error-console-action" -msgid "Write all error messages to a file" -msgstr "Escribir todos los mensajes de error en un archivo" - -#: ../app/actions/error-console-actions.c:64 -msgctxt "error-console-action" -msgid "Save S_election to File..." -msgstr "Guardar la _selección en un archivo…" - -#: ../app/actions/error-console-actions.c:65 -msgctxt "error-console-action" -msgid "Write the selected error messages to a file" -msgstr "Escribir los mensajes de error seleccionados en un archivo" - -#: ../app/actions/error-console-commands.c:84 -msgid "Cannot save. Nothing is selected." -msgstr "No se puede guardar. No hay nada seleccionado." - -#: ../app/actions/error-console-commands.c:95 -msgid "Save Error Log to File" -msgstr "Guardar registro de errores en un archivo" - -#: ../app/actions/error-console-commands.c:157 -#, c-format -msgid "" -"Error writing file '%s':\n" -"%s" -msgstr "" -"Error al escribir el archivo «%s»:\n" -"%s" - -#: ../app/actions/file-actions.c:71 -msgctxt "file-action" -msgid "_File" -msgstr "_Archivo" - -#: ../app/actions/file-actions.c:72 -msgctxt "file-action" -msgid "Crea_te" -msgstr "C_rear" - -#: ../app/actions/file-actions.c:73 -msgctxt "file-action" -msgid "Open _Recent" -msgstr "Abrir _reciente" - -#: ../app/actions/file-actions.c:76 -msgctxt "file-action" -msgid "_Open..." -msgstr "_Abrir…" - -#: ../app/actions/file-actions.c:77 -msgctxt "file-action" -msgid "Open an image file" -msgstr "Abrir un archivo de imagen" - -#: ../app/actions/file-actions.c:82 -msgctxt "file-action" -msgid "Op_en as Layers..." -msgstr "_Abrir como capas…" - -#: ../app/actions/file-actions.c:83 -msgctxt "file-action" -msgid "Open an image file as layers" -msgstr "Abrir un archivo de imagen como capas" - +#: ../app/actions/drawable-actions.c:120 +msgctxt "drawable-action" +msgid "Turn upside-down" +msgstr "Voltear verticalmente" + +#: ../app/actions/drawable-actions.c:125 +msgctxt "drawable-action" +msgid "Rotate 90° counter-clock_wise" +msgstr "Rotar 90° en sentido _antihorario" + +#: ../app/actions/drawable-actions.c:126 +msgctxt "drawable-action" +msgid "Rotate 90 degrees to the left" +msgstr "Rotar 90 grados hacia la izquierda" + +#: ../app/actions/drawable-commands.c:63 +msgid "Equalize does not operate on indexed layers." +msgstr "La ecualización no funciona en capas indexadas." + +#: ../app/actions/drawable-commands.c:87 +msgid "Invert does not operate on indexed layers." +msgstr "La inversión no funciona con capas indexadas." + +#: ../app/actions/drawable-commands.c:111 +msgid "White Balance operates only on RGB color layers." +msgstr "El balance de blancos sólo funciona sobre capas con color RGB." + +#: ../app/actions/dynamics-actions.c:42 +msgctxt "dynamics-action" +msgid "Paint Dynamics Menu" +msgstr "Menú de dinámica de la pintura" + +#: ../app/actions/dynamics-actions.c:46 +msgctxt "dynamics-action" +msgid "_New Dynamics" +msgstr "_Nueva dinámica" + +#: ../app/actions/dynamics-actions.c:47 +msgctxt "dynamics-action" +msgid "Create a new dynamics" +msgstr "Crear una dinámica nueva" + +#: ../app/actions/dynamics-actions.c:52 +msgctxt "dynamics-action" +msgid "D_uplicate Dynamics" +msgstr "D_uplicar la dinámica" + +#: ../app/actions/dynamics-actions.c:53 +msgctxt "dynamics-action" +msgid "Duplicate this dynamics" +msgstr "Duplicar esta dinámica" + +#: ../app/actions/dynamics-actions.c:58 +msgctxt "dynamics-action" +msgid "Copy Dynamics _Location" +msgstr "Copiar ruta de la dinámica" + +#: ../app/actions/dynamics-actions.c:59 +msgctxt "dynamics-action" +msgid "Copy dynamics file location to clipboard" +msgstr "Copiar al portapapeles la ruta del archivo de dinámica" + +#: ../app/actions/dynamics-actions.c:64 +msgctxt "dynamics-action" +msgid "_Delete Dynamics" +msgstr "Eliminar _dinámica" + +#: ../app/actions/dynamics-actions.c:65 +msgctxt "dynamics-action" +msgid "Delete this dynamics" +msgstr "Eliminar esta dinámica" + +#: ../app/actions/dynamics-actions.c:70 +msgctxt "dynamics-action" +msgid "_Refresh Dynamics" +msgstr "_Renovar dinámica" + +#: ../app/actions/dynamics-actions.c:71 +msgctxt "dynamics-action" +msgid "Refresh dynamics" +msgstr "Renovar la dinámica" + +#: ../app/actions/dynamics-actions.c:79 +msgctxt "dynamics-action" +msgid "_Edit Dynamics..." +msgstr "_Editar la dinámica…" + +#: ../app/actions/dynamics-actions.c:80 +msgctxt "dynamics-action" +msgid "Edit dynamics" +msgstr "Editar la dinámica" + +#: ../app/actions/dynamics-editor-actions.c:42 +msgctxt "dynamics-editor-action" +msgid "Paint Dynamics Editor Menu" +msgstr "Menú del editor de dinámica de la pintura" + +#: ../app/actions/dynamics-editor-actions.c:50 +msgctxt "dynamics-editor-action" +msgid "Edit Active Dynamics" +msgstr "Editar la dinámica activa" + +#: ../app/actions/edit-actions.c:63 +msgctxt "edit-action" +msgid "_Edit" +msgstr "_Editar" + +#: ../app/actions/edit-actions.c:64 +msgctxt "edit-action" +msgid "Paste _as" +msgstr "Peg_ar como" + +#: ../app/actions/edit-actions.c:65 +msgctxt "edit-action" +msgid "_Buffer" +msgstr "_Búfer" + +#: ../app/actions/edit-actions.c:68 +msgctxt "edit-action" +msgid "Undo History Menu" +msgstr "Menú del historial de deshacer" + +#: ../app/actions/edit-actions.c:72 +msgctxt "edit-action" +msgid "_Undo" +msgstr "Des_hacer" + +#: ../app/actions/edit-actions.c:73 +msgctxt "edit-action" +msgid "Undo the last operation" +msgstr "Deshacer la última operación" + +#: ../app/actions/edit-actions.c:78 +msgctxt "edit-action" +msgid "_Redo" +msgstr "_Rehacer" + +#: ../app/actions/edit-actions.c:79 +msgctxt "edit-action" +msgid "Redo the last operation that was undone" +msgstr "Rehacer la última operación deshecha" + +#: ../app/actions/edit-actions.c:84 +msgctxt "edit-action" +msgid "Strong Undo" +msgstr "Deshacer fuerte" + +#: ../app/actions/edit-actions.c:85 +msgctxt "edit-action" +msgid "Undo the last operation, skipping visibility changes" +msgstr "Deshacer la última operación, saltándose cambios de visibilidad" + +#: ../app/actions/edit-actions.c:90 +msgctxt "edit-action" +msgid "Strong Redo" +msgstr "Rehacer fuerte" + +#: ../app/actions/edit-actions.c:92 +msgctxt "edit-action" +msgid "Redo the last operation that was undone, skipping visibility changes" +msgstr "" +"Rehacer la última operación deshecha, saltándose cambios de visibilidad" + +#: ../app/actions/edit-actions.c:97 +msgctxt "edit-action" +msgid "_Clear Undo History" +msgstr "_Vaciar historial de deshacer" + +#: ../app/actions/edit-actions.c:98 +msgctxt "edit-action" +msgid "Remove all operations from the undo history" +msgstr "Eliminar todas las operaciones del historial de deshacer" + +#: ../app/actions/edit-actions.c:103 +msgctxt "edit-action" +msgid "_Fade..." +msgstr "_Desvanecer…" + +#: ../app/actions/edit-actions.c:105 +msgctxt "edit-action" +msgid "Modify paint mode and opacity of the last pixel manipulation" +msgstr "" +"Modificar el modo de pintura y la opacidad de la última manipulación de " +"píxeles" + +#: ../app/actions/edit-actions.c:110 +msgctxt "edit-action" +msgid "Cu_t" +msgstr "Cor_tar" + +#: ../app/actions/edit-actions.c:111 +msgctxt "edit-action" +msgid "Move the selected pixels to the clipboard" +msgstr "Mover los píxeles seleccionados al portapapeles" + +#: ../app/actions/edit-actions.c:116 +msgctxt "edit-action" +msgid "_Copy" +msgstr "_Copiar" + +#: ../app/actions/edit-actions.c:117 +msgctxt "edit-action" +msgid "Copy the selected pixels to the clipboard" +msgstr "Copiar los píxeles seleccionados al portapapeles" + +#. GIMP_STOCK_COPY_VISIBLE, +#: ../app/actions/edit-actions.c:122 +msgctxt "edit-action" +msgid "Copy _Visible" +msgstr "Copia _visible" + +#: ../app/actions/edit-actions.c:123 +msgctxt "edit-action" +msgid "Copy what is visible in the selected region" +msgstr "Copiar lo que es visible dentro de la región seleccionada" + +#: ../app/actions/edit-actions.c:128 +msgctxt "edit-action" +msgid "_Paste" +msgstr "_Pegar" + +#: ../app/actions/edit-actions.c:129 +msgctxt "edit-action" +msgid "Paste the content of the clipboard" +msgstr "Pegar el contenido del portapapeles" + +#: ../app/actions/edit-actions.c:134 +msgctxt "edit-action" +msgid "Paste _Into" +msgstr "Pegar _en" + +#: ../app/actions/edit-actions.c:136 +msgctxt "edit-action" +msgid "Paste the content of the clipboard into the current selection" +msgstr "Pegar el contenido del portapapeles dentro de la selección actual" + +#: ../app/actions/edit-actions.c:141 +msgctxt "edit-action" +msgid "From _Clipboard" +msgstr "Desde el por_tapapeles" + +#: ../app/actions/edit-actions.c:142 ../app/actions/edit-actions.c:148 +msgctxt "edit-action" +msgid "Create a new image from the content of the clipboard" +msgstr "Crear una imagen nueva a partir del contenido del portapapeles" + +#: ../app/actions/edit-actions.c:147 +msgctxt "edit-action" +msgid "_New Image" +msgstr "Imagen _nueva" + +#: ../app/actions/edit-actions.c:153 +msgctxt "edit-action" +msgid "New _Layer" +msgstr "_Capa nueva" + +#: ../app/actions/edit-actions.c:154 +msgctxt "edit-action" +msgid "Create a new layer from the content of the clipboard" +msgstr "Crear una capa nueva a partir del contenido del portapapeles" + +#: ../app/actions/edit-actions.c:159 +msgctxt "edit-action" +msgid "Cu_t Named..." +msgstr "Cor_tar con nombre…" + +#: ../app/actions/edit-actions.c:160 +msgctxt "edit-action" +msgid "Move the selected pixels to a named buffer" +msgstr "Mover los píxeles seleccionados a un búfer con nombre" + +#: ../app/actions/edit-actions.c:165 +msgctxt "edit-action" +msgid "_Copy Named..." +msgstr "_Copiar con nombre…" + +#: ../app/actions/edit-actions.c:166 +msgctxt "edit-action" +msgid "Copy the selected pixels to a named buffer" +msgstr "Copiar los píxeles seleccionados a un búfer con nombre" + +#. GIMP_STOCK_COPY_VISIBLE, +#: ../app/actions/edit-actions.c:171 +msgctxt "edit-action" +msgid "Copy _Visible Named..." +msgstr "Copiar _visible con nombre…" + +#: ../app/actions/edit-actions.c:173 +msgctxt "edit-action" +msgid "Copy what is visible in the selected region to a named buffer" +msgstr "" +"Copiar la parte visible dentro de la región seleccionada a un búfer con " +"nombre" + +#: ../app/actions/edit-actions.c:178 +msgctxt "edit-action" +msgid "_Paste Named..." +msgstr "_Pegar con nombre…" + +#: ../app/actions/edit-actions.c:179 +msgctxt "edit-action" +msgid "Paste the content of a named buffer" +msgstr "Pegar el contenido de un búfer con nombre" + +#: ../app/actions/edit-actions.c:184 +msgctxt "edit-action" +msgid "Cl_ear" +msgstr "_Limpiar" + +#: ../app/actions/edit-actions.c:185 +msgctxt "edit-action" +msgid "Clear the selected pixels" +msgstr "Borrar los píxeles seleccionados" + +#: ../app/actions/edit-actions.c:193 +msgctxt "edit-action" +msgid "Fill with _FG Color" +msgstr "Rellenar con el color de _frente" + +#: ../app/actions/edit-actions.c:194 +msgctxt "edit-action" +msgid "Fill the selection using the foreground color" +msgstr "Rellenar la selección utilizando el color de frente" + +#: ../app/actions/edit-actions.c:199 +msgctxt "edit-action" +msgid "Fill with B_G Color" +msgstr "Rellenar con el color de fo_ndo" + +#: ../app/actions/edit-actions.c:200 +msgctxt "edit-action" +msgid "Fill the selection using the background color" +msgstr "Rellenar la selección con el color del fondo" + +#: ../app/actions/edit-actions.c:205 +msgctxt "edit-action" +msgid "Fill _with Pattern" +msgstr "Rellenar con un pa_trón" + +#: ../app/actions/edit-actions.c:206 +msgctxt "edit-action" +msgid "Fill the selection using the active pattern" +msgstr "Rellenar la selección utilizando el patrón activo" + +#: ../app/actions/edit-actions.c:304 +#, c-format +msgid "_Undo %s" +msgstr "De_shacer %s" + +#: ../app/actions/edit-actions.c:311 +#, c-format +msgid "_Redo %s" +msgstr "_Rehacer %s" + +#: ../app/actions/edit-actions.c:326 +#, c-format +msgid "_Fade %s..." +msgstr "_Desvanecer %s…" + +#: ../app/actions/edit-actions.c:338 +msgid "_Undo" +msgstr "Des_hacer" + +#: ../app/actions/edit-actions.c:339 +msgid "_Redo" +msgstr "_Rehacer" + +#: ../app/actions/edit-actions.c:340 +msgid "_Fade..." +msgstr "_Desvanecer…" + +#: ../app/actions/edit-commands.c:137 +msgid "Clear Undo History" +msgstr "Vaciar historial de deshacer" + +#: ../app/actions/edit-commands.c:163 +msgid "Really clear image's undo history?" +msgstr "¿Seguro que quiere vaciar el histórico de deshacer de la imagen?" + +#: ../app/actions/edit-commands.c:176 +#, c-format +msgid "Clearing the undo history of this image will gain %s of memory." +msgstr "" +"Al limpiar el historial de deshacer de esta imagen se recuperarán %s de " +"memoria." + +#: ../app/actions/edit-commands.c:206 +msgid "Cut pixels to the clipboard" +msgstr "Cortar los píxeles al portapapeles" + +#: ../app/actions/edit-commands.c:236 ../app/actions/edit-commands.c:265 +msgid "Copied pixels to the clipboard" +msgstr "Píxeles copiados a una memoria intermedia con nombre" + +#: ../app/actions/edit-commands.c:325 ../app/actions/edit-commands.c:360 +#: ../app/actions/edit-commands.c:543 +msgid "There is no image data in the clipboard to paste." +msgstr "No hay datos de imágenes para pegar en el portapapeles." + +#: ../app/actions/edit-commands.c:348 ../app/core/gimpbrushclipboard.c:172 +#: ../app/core/gimppatternclipboard.c:172 ../app/widgets/gimpclipboard.c:345 +msgid "Clipboard" +msgstr "Portapapeles" + +#: ../app/actions/edit-commands.c:374 +msgid "Cut Named" +msgstr "Cortar (con nombre)" + +#: ../app/actions/edit-commands.c:377 ../app/actions/edit-commands.c:418 +#: ../app/actions/edit-commands.c:438 +msgid "Enter a name for this buffer" +msgstr "Ponga un nombre a este búfer" + +#: ../app/actions/edit-commands.c:415 +msgid "Copy Named" +msgstr "Copiar (con nombre)" + +#: ../app/actions/edit-commands.c:435 +msgid "Copy Visible Named " +msgstr "Copiar visible con nombre" + +#: ../app/actions/edit-commands.c:560 +msgid "There is no active layer or channel to cut from." +msgstr "No hay una capa o canal activo desde donde cortar." + +#: ../app/actions/edit-commands.c:565 ../app/actions/edit-commands.c:597 +#: ../app/actions/edit-commands.c:621 +msgid "(Unnamed Buffer)" +msgstr "(Búfer sin nombre)" + +#: ../app/actions/edit-commands.c:592 +msgid "There is no active layer or channel to copy from." +msgstr "No hay una capa o canal activo desde donde se pueda copiar." + +#: ../app/actions/error-console-actions.c:39 +msgctxt "error-console-action" +msgid "Error Console Menu" +msgstr "Menú de la consola de error" + +#: ../app/actions/error-console-actions.c:43 +msgctxt "error-console-action" +msgid "_Clear" +msgstr "_Limpiar" + +#: ../app/actions/error-console-actions.c:44 +msgctxt "error-console-action" +msgid "Clear error console" +msgstr "Limpiar consola de errores" + +#: ../app/actions/error-console-actions.c:49 +msgctxt "error-console-action" +msgid "Select _All" +msgstr "Seleccionar _todo" + +#: ../app/actions/error-console-actions.c:50 +msgctxt "error-console-action" +msgid "Select all error messages" +msgstr "Seleccionar todos los errores" + +#: ../app/actions/error-console-actions.c:58 +msgctxt "error-console-action" +msgid "_Save Error Log to File..." +msgstr "_Guardar el registro de errores en un archivo…" + +#: ../app/actions/error-console-actions.c:59 +msgctxt "error-console-action" +msgid "Write all error messages to a file" +msgstr "Escribir todos los mensajes de error en un archivo" + +#: ../app/actions/error-console-actions.c:64 +msgctxt "error-console-action" +msgid "Save S_election to File..." +msgstr "Guardar la _selección en un archivo…" + +#: ../app/actions/error-console-actions.c:65 +msgctxt "error-console-action" +msgid "Write the selected error messages to a file" +msgstr "Escribir los mensajes de error seleccionados en un archivo" + +#: ../app/actions/error-console-commands.c:84 +msgid "Cannot save. Nothing is selected." +msgstr "No se puede guardar. No hay nada seleccionado." + +#: ../app/actions/error-console-commands.c:95 +msgid "Save Error Log to File" +msgstr "Guardar registro de errores en un archivo" + +#: ../app/actions/error-console-commands.c:157 +#, c-format +msgid "" +"Error writing file '%s':\n" +"%s" +msgstr "" +"Error al escribir el archivo «%s»:\n" +"%s" + +#: ../app/actions/file-actions.c:71 +msgctxt "file-action" +msgid "_File" +msgstr "_Archivo" + +#: ../app/actions/file-actions.c:72 +msgctxt "file-action" +msgid "Crea_te" +msgstr "C_rear" + +#: ../app/actions/file-actions.c:73 +msgctxt "file-action" +msgid "Open _Recent" +msgstr "Abrir _reciente" + +#: ../app/actions/file-actions.c:76 +msgctxt "file-action" +msgid "_Open..." +msgstr "_Abrir…" + +#: ../app/actions/file-actions.c:77 +msgctxt "file-action" +msgid "Open an image file" +msgstr "Abrir un archivo de imagen" + +#: ../app/actions/file-actions.c:82 +msgctxt "file-action" +msgid "Op_en as Layers..." +msgstr "_Abrir como capas…" + +#: ../app/actions/file-actions.c:83 +msgctxt "file-action" +msgid "Open an image file as layers" +msgstr "Abrir un archivo de imagen como capas" + # Location lo traducimos por lugar (Serrador) -#: ../app/actions/file-actions.c:88 -msgctxt "file-action" -msgid "Open _Location..." -msgstr "Abrir _lugar…" - -#: ../app/actions/file-actions.c:89 -msgctxt "file-action" -msgid "Open an image file from a specified location" -msgstr "Abrir un archivo de imagen desde una ubicación especificada" - -#: ../app/actions/file-actions.c:94 -msgctxt "file-action" -msgid "Create Template..." -msgstr "Crear plantilla…" - -#: ../app/actions/file-actions.c:95 -msgctxt "file-action" -msgid "Create a new template from this image" -msgstr "Crear una nueva plantilla a partir de esta imagen" - -#: ../app/actions/file-actions.c:100 -msgctxt "file-action" -msgid "Re_vert" -msgstr "Re_vertir" - -#: ../app/actions/file-actions.c:101 -msgctxt "file-action" -msgid "Reload the image file from disk" -msgstr "Volver a cargar la imagen desde el disco" - -#: ../app/actions/file-actions.c:106 -msgctxt "file-action" -msgid "Close all" -msgstr "Cerrar todo" - -#: ../app/actions/file-actions.c:107 -msgctxt "file-action" -msgid "Close all opened images" -msgstr "Cerrar todas las imágenes abiertas" - -#: ../app/actions/file-actions.c:112 -msgctxt "file-action" -msgid "_Quit" -msgstr "_Salir" - -#: ../app/actions/file-actions.c:113 -msgctxt "file-action" -msgid "Quit the GNU Image Manipulation Program" -msgstr "Salir del programa de manipulación de imágenes de GNU" - -#: ../app/actions/file-actions.c:121 -msgctxt "file-action" -msgid "_Save" -msgstr "_Guardar" - -#: ../app/actions/file-actions.c:122 -msgctxt "file-action" -msgid "Save this image" -msgstr "Guardar esta imagen" - -#: ../app/actions/file-actions.c:127 -msgctxt "file-action" -msgid "Save _As..." -msgstr "Guardar _como…" - -#: ../app/actions/file-actions.c:128 -msgctxt "file-action" -msgid "Save this image with a different name" -msgstr "Guardar esta imagen con un nombre diferente" - -#: ../app/actions/file-actions.c:133 -msgctxt "file-action" -msgid "Save a Cop_y..." -msgstr "Guardar una cop_ia…" - -#: ../app/actions/file-actions.c:135 -msgctxt "file-action" -msgid "" -"Save a copy of this image, without affecting the source file (if any) or the " -"current state of the image" -msgstr "" -"Guardar una copia de esta imagen, sin afectar al archivo original (si " -"existe) o al estado actual de la imagen" - -#: ../app/actions/file-actions.c:140 -msgctxt "file-action" -msgid "Save and Close..." -msgstr "Guardar y cerrar…" - -#: ../app/actions/file-actions.c:141 -msgctxt "file-action" -msgid "Save this image and close its window" -msgstr "Guardar esta imagen y cerrar su ventana" - -#: ../app/actions/file-actions.c:146 -msgctxt "file-action" -msgid "Export" -msgstr "Exportar" - -#: ../app/actions/file-actions.c:147 -msgctxt "file-action" -msgid "Export the image again" -msgstr "Volver a exportar la imagen" - -#: ../app/actions/file-actions.c:152 -msgctxt "file-action" -msgid "Over_write" -msgstr "_Sobrescribir" - -#: ../app/actions/file-actions.c:153 -msgctxt "file-action" -msgid "Export the image back to the imported file in the import format" -msgstr "" -"Volver a exportar la imagen a la fuente de importación en el formato de " -"importación" - -#: ../app/actions/file-actions.c:158 -msgctxt "file-action" -msgid "Export As..." -msgstr "Exportar como…" - -#: ../app/actions/file-actions.c:159 -msgctxt "file-action" -msgid "Export the image to various file formats such as PNG or JPEG" -msgstr "Exportar la imagen a diversos formatos de archivo como PNG o JPEG" - -#: ../app/actions/file-actions.c:292 -#, c-format -msgid "Export to %s" -msgstr "Exportar a %s" - -#: ../app/actions/file-actions.c:298 -#, c-format -msgid "Over_write %s" -msgstr "_Sobrescribir %s" - -#: ../app/actions/file-actions.c:306 -msgid "Export" -msgstr "Exportar" - -#: ../app/actions/file-commands.c:119 ../app/actions/file-commands.c:497 -#: ../app/dialogs/file-open-dialog.c:77 -msgid "Open Image" -msgstr "Abrir imagen" - -#: ../app/actions/file-commands.c:140 -msgid "Open Image as Layers" -msgstr "Abrir imagen como capas" - -#: ../app/actions/file-commands.c:272 -msgid "No changes need to be saved" -msgstr "No es necesario guardar ningún cambio" - -#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:701 -#: ../app/dialogs/file-save-dialog.c:103 -msgid "Save Image" -msgstr "Guardar imagen" - -#: ../app/actions/file-commands.c:285 -msgid "Save a Copy of the Image" -msgstr "Guardar una copia de la imagen" - -#: ../app/actions/file-commands.c:371 -msgid "Create New Template" -msgstr "Crear una plantilla nueva" - -#: ../app/actions/file-commands.c:375 -msgid "Enter a name for this template" -msgstr "Introduzca un nombre para esta plantilla" - -#: ../app/actions/file-commands.c:405 -msgid "Revert failed. No file name associated with this image." -msgstr "" -"Falló al revertir. No hay un nombre de archivo asociado con esta imagen." - -#: ../app/actions/file-commands.c:417 -msgid "Revert Image" -msgstr "Revertir imagen" - -#: ../app/actions/file-commands.c:443 -#, c-format -msgid "Revert '%s' to '%s'?" -msgstr "¿Quiere revertir «%s» a «%s»?" - -#: ../app/actions/file-commands.c:449 -msgid "" -"By reverting the image to the state saved on disk, you will lose all " -"changes, including all undo information." -msgstr "" -"Al revertir la imagen al estado guardado en el disco, perderá todos sus " -"cambios, incluyendo toda la información de deshacer." - -#: ../app/actions/file-commands.c:731 -msgid "(Unnamed Template)" -msgstr "(Plantilla sin nombre)" - -#: ../app/actions/file-commands.c:782 -#, c-format -msgid "" -"Reverting to '%s' failed:\n" -"\n" -"%s" -msgstr "" -"La reversión de «%s» ha fallado:\n" -"\n" -"%s" - -#: ../app/actions/fonts-actions.c:43 -msgctxt "fonts-action" -msgid "Fonts Menu" -msgstr "Menú de tipografías" - -#: ../app/actions/fonts-actions.c:47 -msgctxt "fonts-action" -msgid "_Rescan Font List" -msgstr "_Recargar la lista de tipografías" - -#: ../app/actions/fonts-actions.c:48 -msgctxt "fonts-action" -msgid "Rescan the installed fonts" -msgstr "Reexaminar las tipografías instaladas" - -#: ../app/actions/gradient-editor-actions.c:45 -msgctxt "gradient-editor-action" -msgid "Gradient Editor Menu" -msgstr "Menú del editor de degradados" - -#: ../app/actions/gradient-editor-actions.c:49 -msgctxt "gradient-editor-action" -msgid "Left Color Type" -msgstr "Tipo de color izquierdo" - -#: ../app/actions/gradient-editor-actions.c:51 -msgctxt "gradient-editor-action" -msgid "_Load Left Color From" -msgstr "_Cargar color izquierdo desde" - -#: ../app/actions/gradient-editor-actions.c:53 -msgctxt "gradient-editor-action" -msgid "_Save Left Color To" -msgstr "G_uardar color izquierdo en" - -#: ../app/actions/gradient-editor-actions.c:56 -msgctxt "gradient-editor-action" -msgid "Right Color Type" -msgstr "Tipo de color derecho" - -#: ../app/actions/gradient-editor-actions.c:58 -msgctxt "gradient-editor-action" -msgid "Load Right Color Fr_om" -msgstr "Cargar color derecho _desde" - -#: ../app/actions/gradient-editor-actions.c:60 -msgctxt "gradient-editor-action" -msgid "Sa_ve Right Color To" -msgstr "G_uardar color derecho en" - -#: ../app/actions/gradient-editor-actions.c:66 -msgctxt "gradient-editor-action" -msgid "L_eft Endpoint's Color..." -msgstr "Color del punto final izqui_erdo…" - -#: ../app/actions/gradient-editor-actions.c:71 -msgctxt "gradient-editor-action" -msgid "R_ight Endpoint's Color..." -msgstr "Color del punto f_inal derecho…" - -#: ../app/actions/gradient-editor-actions.c:111 -msgctxt "gradient-editor-action" -msgid "Ble_nd Endpoints' Colors" -msgstr "Mezclar colores de los pu_ntos finales" - -#: ../app/actions/gradient-editor-actions.c:116 -msgctxt "gradient-editor-action" -msgid "Blend Endpoints' Opacit_y" -msgstr "Mezclar opacidad de los puntos f_inales" - -#: ../app/actions/gradient-editor-actions.c:124 -msgctxt "gradient-editor-action" -msgid "Edit Active Gradient" -msgstr "Edita el degradado activo" - -#: ../app/actions/gradient-editor-actions.c:155 -msgctxt "gradient-editor-action" -msgid "_Left Neighbor's Right Endpoint" -msgstr "Punto final derecho del vecino _izquierdo" - -#: ../app/actions/gradient-editor-actions.c:160 -msgctxt "gradient-editor-action" -msgid "_Right Endpoint" -msgstr "Punto final _derecho" - -#: ../app/actions/gradient-editor-actions.c:165 -#: ../app/actions/gradient-editor-actions.c:213 -msgctxt "gradient-editor-action" -msgid "_Foreground Color" -msgstr "Color del _frente" - -#: ../app/actions/gradient-editor-actions.c:170 -#: ../app/actions/gradient-editor-actions.c:218 -msgctxt "gradient-editor-action" -msgid "_Background Color" -msgstr "Color del _fondo" - -#: ../app/actions/gradient-editor-actions.c:203 -msgctxt "gradient-editor-action" -msgid "_Right Neighbor's Left Endpoint" -msgstr "Punto final izquierdo del vecino de_recho" - -#: ../app/actions/gradient-editor-actions.c:208 -msgctxt "gradient-editor-action" -msgid "_Left Endpoint" -msgstr "Punto final _izquierdo" - -#: ../app/actions/gradient-editor-actions.c:257 -#: ../app/actions/gradient-editor-actions.c:287 -msgctxt "gradient-editor-color-type" -msgid "_Fixed" -msgstr "_Fijo" - -#: ../app/actions/gradient-editor-actions.c:262 -#: ../app/actions/gradient-editor-actions.c:292 -msgctxt "gradient-editor-color-type" -msgid "F_oreground Color" -msgstr "Color del _frente" - -#: ../app/actions/gradient-editor-actions.c:268 -#: ../app/actions/gradient-editor-actions.c:298 -msgctxt "gradient-editor-color-type" -msgid "Fo_reground Color (Transparent)" -msgstr "_Color de frente (transparente)" - -#: ../app/actions/gradient-editor-actions.c:273 -#: ../app/actions/gradient-editor-actions.c:303 -msgctxt "gradient-editor-color-type" -msgid "_Background Color" -msgstr "Color del _fondo" - -#: ../app/actions/gradient-editor-actions.c:279 -#: ../app/actions/gradient-editor-actions.c:309 -msgctxt "gradient-editor-color-type" -msgid "B_ackground Color (Transparent)" -msgstr "Color de f_ondo (transparente)" - -#: ../app/actions/gradient-editor-actions.c:317 -msgctxt "gradient-editor-blending" -msgid "_Linear" -msgstr "_Lineal" - -#: ../app/actions/gradient-editor-actions.c:322 -msgctxt "gradient-editor-blending" -msgid "_Curved" -msgstr "_Curvado" - -#: ../app/actions/gradient-editor-actions.c:327 -msgctxt "gradient-editor-blending" -msgid "_Sinusoidal" -msgstr "_Sinusoidal" - -#: ../app/actions/gradient-editor-actions.c:332 -msgctxt "gradient-editor-blending" -msgid "Spherical (i_ncreasing)" -msgstr "Esférica (i_ncremental)" - -#: ../app/actions/gradient-editor-actions.c:337 -msgctxt "gradient-editor-blending" -msgid "Spherical (_decreasing)" -msgstr "Esférica (_decreciente)" - -#: ../app/actions/gradient-editor-actions.c:342 -msgctxt "gradient-editor-blending" -msgid "(Varies)" -msgstr "(Variaciones)" - -#: ../app/actions/gradient-editor-actions.c:350 -msgctxt "gradient-editor-coloring" -msgid "_RGB" -msgstr "_RGB" - -#: ../app/actions/gradient-editor-actions.c:355 -msgctxt "gradient-editor-coloring" -msgid "HSV (_counter-clockwise hue)" -msgstr "HSV (tono en _sentido antihorario)" - -#: ../app/actions/gradient-editor-actions.c:360 -msgctxt "gradient-editor-coloring" -msgid "HSV (clockwise _hue)" -msgstr "HSV (tono en sentido _horario)" - -#: ../app/actions/gradient-editor-actions.c:365 -msgctxt "gradient-editor-coloring" -msgid "(Varies)" -msgstr "(Variaciones)" - -#: ../app/actions/gradient-editor-actions.c:373 -msgid "Zoom In" -msgstr "Ampliar" - -#: ../app/actions/gradient-editor-actions.c:374 -#: ../app/actions/palette-editor-actions.c:89 -msgid "Zoom in" -msgstr "Ampliar" - -#: ../app/actions/gradient-editor-actions.c:379 -msgid "Zoom Out" -msgstr "Reducir" - -#: ../app/actions/gradient-editor-actions.c:380 -#: ../app/actions/palette-editor-actions.c:95 -msgid "Zoom out" -msgstr "Reducir" - -#: ../app/actions/gradient-editor-actions.c:385 -msgid "Zoom All" -msgstr "Ampliar todo" - -#: ../app/actions/gradient-editor-actions.c:386 -#: ../app/actions/palette-editor-actions.c:101 -msgid "Zoom all" -msgstr "Ampliar todo" - -#: ../app/actions/gradient-editor-actions.c:776 -msgid "_Blending Function for Segment" -msgstr "Función de _mezcla para el segmento" - -#: ../app/actions/gradient-editor-actions.c:778 -msgid "Coloring _Type for Segment" -msgstr "_Tipo de coloreado para el segmento" - +#: ../app/actions/file-actions.c:88 +msgctxt "file-action" +msgid "Open _Location..." +msgstr "Abrir _lugar…" + +#: ../app/actions/file-actions.c:89 +msgctxt "file-action" +msgid "Open an image file from a specified location" +msgstr "Abrir un archivo de imagen desde una ubicación especificada" + +#: ../app/actions/file-actions.c:94 +msgctxt "file-action" +msgid "Create Template..." +msgstr "Crear plantilla…" + +#: ../app/actions/file-actions.c:95 +msgctxt "file-action" +msgid "Create a new template from this image" +msgstr "Crear una nueva plantilla a partir de esta imagen" + +#: ../app/actions/file-actions.c:100 +msgctxt "file-action" +msgid "Re_vert" +msgstr "Re_vertir" + +#: ../app/actions/file-actions.c:101 +msgctxt "file-action" +msgid "Reload the image file from disk" +msgstr "Volver a cargar la imagen desde el disco" + +#: ../app/actions/file-actions.c:106 +msgctxt "file-action" +msgid "Close all" +msgstr "Cerrar todo" + +#: ../app/actions/file-actions.c:107 +msgctxt "file-action" +msgid "Close all opened images" +msgstr "Cerrar todas las imágenes abiertas" + +#: ../app/actions/file-actions.c:112 +msgctxt "file-action" +msgid "_Quit" +msgstr "_Salir" + +#: ../app/actions/file-actions.c:113 +msgctxt "file-action" +msgid "Quit the GNU Image Manipulation Program" +msgstr "Salir del programa de manipulación de imágenes de GNU" + +#: ../app/actions/file-actions.c:121 +msgctxt "file-action" +msgid "_Save" +msgstr "_Guardar" + +#: ../app/actions/file-actions.c:122 +msgctxt "file-action" +msgid "Save this image" +msgstr "Guardar esta imagen" + +#: ../app/actions/file-actions.c:127 +msgctxt "file-action" +msgid "Save _As..." +msgstr "Guardar _como…" + +#: ../app/actions/file-actions.c:128 +msgctxt "file-action" +msgid "Save this image with a different name" +msgstr "Guardar esta imagen con un nombre diferente" + +#: ../app/actions/file-actions.c:133 +msgctxt "file-action" +msgid "Save a Cop_y..." +msgstr "Guardar una cop_ia…" + +#: ../app/actions/file-actions.c:135 +msgctxt "file-action" +msgid "" +"Save a copy of this image, without affecting the source file (if any) or the " +"current state of the image" +msgstr "" +"Guardar una copia de esta imagen, sin afectar al archivo original (si " +"existe) o al estado actual de la imagen" + +#: ../app/actions/file-actions.c:140 +msgctxt "file-action" +msgid "Save and Close..." +msgstr "Guardar y cerrar…" + +#: ../app/actions/file-actions.c:141 +msgctxt "file-action" +msgid "Save this image and close its window" +msgstr "Guardar esta imagen y cerrar su ventana" + +#: ../app/actions/file-actions.c:146 +msgctxt "file-action" +msgid "Export" +msgstr "Exportar" + +#: ../app/actions/file-actions.c:147 +msgctxt "file-action" +msgid "Export the image again" +msgstr "Volver a exportar la imagen" + +#: ../app/actions/file-actions.c:152 +msgctxt "file-action" +msgid "Over_write" +msgstr "_Sobrescribir" + +#: ../app/actions/file-actions.c:153 +msgctxt "file-action" +msgid "Export the image back to the imported file in the import format" +msgstr "" +"Volver a exportar la imagen a la fuente de importación en el formato de " +"importación" + +#: ../app/actions/file-actions.c:158 +msgctxt "file-action" +msgid "Export As..." +msgstr "Exportar como…" + +#: ../app/actions/file-actions.c:159 +msgctxt "file-action" +msgid "Export the image to various file formats such as PNG or JPEG" +msgstr "Exportar la imagen a diversos formatos de archivo como PNG o JPEG" + +#: ../app/actions/file-actions.c:292 +#, c-format +msgid "Export to %s" +msgstr "Exportar a %s" + +#: ../app/actions/file-actions.c:298 +#, c-format +msgid "Over_write %s" +msgstr "_Sobrescribir %s" + +#: ../app/actions/file-actions.c:306 +msgid "Export" +msgstr "Exportar" + +#: ../app/actions/file-commands.c:119 ../app/actions/file-commands.c:497 +#: ../app/dialogs/file-open-dialog.c:77 +msgid "Open Image" +msgstr "Abrir imagen" + +#: ../app/actions/file-commands.c:140 +msgid "Open Image as Layers" +msgstr "Abrir imagen como capas" + +#: ../app/actions/file-commands.c:272 +msgid "No changes need to be saved" +msgstr "No es necesario guardar ningún cambio" + +#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:703 +#: ../app/dialogs/file-save-dialog.c:103 +msgid "Save Image" +msgstr "Guardar imagen" + +#: ../app/actions/file-commands.c:285 +msgid "Save a Copy of the Image" +msgstr "Guardar una copia de la imagen" + +#: ../app/actions/file-commands.c:371 +msgid "Create New Template" +msgstr "Crear una plantilla nueva" + +#: ../app/actions/file-commands.c:375 +msgid "Enter a name for this template" +msgstr "Introduzca un nombre para esta plantilla" + +#: ../app/actions/file-commands.c:405 +msgid "Revert failed. No file name associated with this image." +msgstr "" +"Falló al revertir. No hay un nombre de archivo asociado con esta imagen." + +#: ../app/actions/file-commands.c:417 +msgid "Revert Image" +msgstr "Revertir imagen" + +#: ../app/actions/file-commands.c:443 +#, c-format +msgid "Revert '%s' to '%s'?" +msgstr "¿Quiere revertir «%s» a «%s»?" + +#: ../app/actions/file-commands.c:449 +msgid "" +"By reverting the image to the state saved on disk, you will lose all " +"changes, including all undo information." +msgstr "" +"Al revertir la imagen al estado guardado en el disco, perderá todos sus " +"cambios, incluyendo toda la información de deshacer." + +#: ../app/actions/file-commands.c:733 +msgid "(Unnamed Template)" +msgstr "(Plantilla sin nombre)" + +#: ../app/actions/file-commands.c:784 +#, c-format +msgid "" +"Reverting to '%s' failed:\n" +"\n" +"%s" +msgstr "" +"La reversión de «%s» ha fallado:\n" +"\n" +"%s" + +#: ../app/actions/fonts-actions.c:43 +msgctxt "fonts-action" +msgid "Fonts Menu" +msgstr "Menú de tipografías" + +#: ../app/actions/fonts-actions.c:47 +msgctxt "fonts-action" +msgid "_Rescan Font List" +msgstr "_Recargar la lista de tipografías" + +#: ../app/actions/fonts-actions.c:48 +msgctxt "fonts-action" +msgid "Rescan the installed fonts" +msgstr "Reexaminar las tipografías instaladas" + +#: ../app/actions/gradient-editor-actions.c:45 +msgctxt "gradient-editor-action" +msgid "Gradient Editor Menu" +msgstr "Menú del editor de degradados" + +#: ../app/actions/gradient-editor-actions.c:49 +msgctxt "gradient-editor-action" +msgid "Left Color Type" +msgstr "Tipo de color izquierdo" + +#: ../app/actions/gradient-editor-actions.c:51 +msgctxt "gradient-editor-action" +msgid "_Load Left Color From" +msgstr "_Cargar color izquierdo desde" + +#: ../app/actions/gradient-editor-actions.c:53 +msgctxt "gradient-editor-action" +msgid "_Save Left Color To" +msgstr "G_uardar color izquierdo en" + +#: ../app/actions/gradient-editor-actions.c:56 +msgctxt "gradient-editor-action" +msgid "Right Color Type" +msgstr "Tipo de color derecho" + +#: ../app/actions/gradient-editor-actions.c:58 +msgctxt "gradient-editor-action" +msgid "Load Right Color Fr_om" +msgstr "Cargar color derecho _desde" + +#: ../app/actions/gradient-editor-actions.c:60 +msgctxt "gradient-editor-action" +msgid "Sa_ve Right Color To" +msgstr "G_uardar color derecho en" + +#: ../app/actions/gradient-editor-actions.c:66 +msgctxt "gradient-editor-action" +msgid "L_eft Endpoint's Color..." +msgstr "Color del punto final izqui_erdo…" + +#: ../app/actions/gradient-editor-actions.c:71 +msgctxt "gradient-editor-action" +msgid "R_ight Endpoint's Color..." +msgstr "Color del punto f_inal derecho…" + +#: ../app/actions/gradient-editor-actions.c:111 +msgctxt "gradient-editor-action" +msgid "Ble_nd Endpoints' Colors" +msgstr "Mezclar colores de los pu_ntos finales" + +#: ../app/actions/gradient-editor-actions.c:116 +msgctxt "gradient-editor-action" +msgid "Blend Endpoints' Opacit_y" +msgstr "Mezclar opacidad de los puntos f_inales" + +#: ../app/actions/gradient-editor-actions.c:124 +msgctxt "gradient-editor-action" +msgid "Edit Active Gradient" +msgstr "Edita el degradado activo" + +#: ../app/actions/gradient-editor-actions.c:155 +msgctxt "gradient-editor-action" +msgid "_Left Neighbor's Right Endpoint" +msgstr "Punto final derecho del vecino _izquierdo" + +#: ../app/actions/gradient-editor-actions.c:160 +msgctxt "gradient-editor-action" +msgid "_Right Endpoint" +msgstr "Punto final _derecho" + +#: ../app/actions/gradient-editor-actions.c:165 +#: ../app/actions/gradient-editor-actions.c:213 +msgctxt "gradient-editor-action" +msgid "_Foreground Color" +msgstr "Color del _frente" + +#: ../app/actions/gradient-editor-actions.c:170 +#: ../app/actions/gradient-editor-actions.c:218 +msgctxt "gradient-editor-action" +msgid "_Background Color" +msgstr "Color del _fondo" + +#: ../app/actions/gradient-editor-actions.c:203 +msgctxt "gradient-editor-action" +msgid "_Right Neighbor's Left Endpoint" +msgstr "Punto final izquierdo del vecino de_recho" + +#: ../app/actions/gradient-editor-actions.c:208 +msgctxt "gradient-editor-action" +msgid "_Left Endpoint" +msgstr "Punto final _izquierdo" + +#: ../app/actions/gradient-editor-actions.c:257 +#: ../app/actions/gradient-editor-actions.c:287 +msgctxt "gradient-editor-color-type" +msgid "_Fixed" +msgstr "_Fijo" + +#: ../app/actions/gradient-editor-actions.c:262 +#: ../app/actions/gradient-editor-actions.c:292 +msgctxt "gradient-editor-color-type" +msgid "F_oreground Color" +msgstr "Color del _frente" + +#: ../app/actions/gradient-editor-actions.c:268 +#: ../app/actions/gradient-editor-actions.c:298 +msgctxt "gradient-editor-color-type" +msgid "Fo_reground Color (Transparent)" +msgstr "_Color de frente (transparente)" + +#: ../app/actions/gradient-editor-actions.c:273 +#: ../app/actions/gradient-editor-actions.c:303 +msgctxt "gradient-editor-color-type" +msgid "_Background Color" +msgstr "Color del _fondo" + +#: ../app/actions/gradient-editor-actions.c:279 +#: ../app/actions/gradient-editor-actions.c:309 +msgctxt "gradient-editor-color-type" +msgid "B_ackground Color (Transparent)" +msgstr "Color de f_ondo (transparente)" + +#: ../app/actions/gradient-editor-actions.c:317 +msgctxt "gradient-editor-blending" +msgid "_Linear" +msgstr "_Lineal" + +#: ../app/actions/gradient-editor-actions.c:322 +msgctxt "gradient-editor-blending" +msgid "_Curved" +msgstr "_Curvado" + +#: ../app/actions/gradient-editor-actions.c:327 +msgctxt "gradient-editor-blending" +msgid "_Sinusoidal" +msgstr "_Sinusoidal" + +#: ../app/actions/gradient-editor-actions.c:332 +msgctxt "gradient-editor-blending" +msgid "Spherical (i_ncreasing)" +msgstr "Esférica (i_ncremental)" + +#: ../app/actions/gradient-editor-actions.c:337 +msgctxt "gradient-editor-blending" +msgid "Spherical (_decreasing)" +msgstr "Esférica (_decreciente)" + +#: ../app/actions/gradient-editor-actions.c:342 +msgctxt "gradient-editor-blending" +msgid "(Varies)" +msgstr "(Variaciones)" + +#: ../app/actions/gradient-editor-actions.c:350 +msgctxt "gradient-editor-coloring" +msgid "_RGB" +msgstr "_RGB" + +#: ../app/actions/gradient-editor-actions.c:355 +msgctxt "gradient-editor-coloring" +msgid "HSV (_counter-clockwise hue)" +msgstr "HSV (tono en _sentido antihorario)" + +#: ../app/actions/gradient-editor-actions.c:360 +msgctxt "gradient-editor-coloring" +msgid "HSV (clockwise _hue)" +msgstr "HSV (tono en sentido _horario)" + +#: ../app/actions/gradient-editor-actions.c:365 +msgctxt "gradient-editor-coloring" +msgid "(Varies)" +msgstr "(Variaciones)" + +#: ../app/actions/gradient-editor-actions.c:373 +msgid "Zoom In" +msgstr "Ampliar" + +#: ../app/actions/gradient-editor-actions.c:374 +#: ../app/actions/palette-editor-actions.c:89 +msgid "Zoom in" +msgstr "Ampliar" + +#: ../app/actions/gradient-editor-actions.c:379 +msgid "Zoom Out" +msgstr "Reducir" + +#: ../app/actions/gradient-editor-actions.c:380 +#: ../app/actions/palette-editor-actions.c:95 +msgid "Zoom out" +msgstr "Reducir" + +#: ../app/actions/gradient-editor-actions.c:385 +msgid "Zoom All" +msgstr "Ampliar todo" + +#: ../app/actions/gradient-editor-actions.c:386 +#: ../app/actions/palette-editor-actions.c:101 +msgid "Zoom all" +msgstr "Ampliar todo" + +#: ../app/actions/gradient-editor-actions.c:776 +msgid "_Blending Function for Segment" +msgstr "Función de _mezcla para el segmento" + +#: ../app/actions/gradient-editor-actions.c:778 +msgid "Coloring _Type for Segment" +msgstr "_Tipo de coloreado para el segmento" + # Voltear segmento? (Serrador) -#: ../app/actions/gradient-editor-actions.c:781 -msgid "_Flip Segment" -msgstr "_Voltear segmento" - -#: ../app/actions/gradient-editor-actions.c:783 -msgid "_Replicate Segment..." -msgstr "_Replicar segmento…" - -#: ../app/actions/gradient-editor-actions.c:785 -msgid "Split Segment at _Midpoint" -msgstr "Partir segmento por la _mitad" - -#: ../app/actions/gradient-editor-actions.c:787 -msgid "Split Segment _Uniformly..." -msgstr "Partir segmento _uniformemente…" - -#: ../app/actions/gradient-editor-actions.c:789 -msgid "_Delete Segment" -msgstr "Elimi_nar segmento" - -#: ../app/actions/gradient-editor-actions.c:791 -msgid "Re-_center Segment's Midpoint" -msgstr "Re_centrar punto medio del segmento" - -#: ../app/actions/gradient-editor-actions.c:793 -msgid "Re-distribute _Handles in Segment" -msgstr "Redistribuir los _tiradores en el segmento" - -#: ../app/actions/gradient-editor-actions.c:798 -msgid "_Blending Function for Selection" -msgstr "Función de m_ezcla para la selección" - -#: ../app/actions/gradient-editor-actions.c:800 -msgid "Coloring _Type for Selection" -msgstr "_Tipo de coloreado para la selección" - -#: ../app/actions/gradient-editor-actions.c:803 -msgid "_Flip Selection" -msgstr "_Invertir selección simétricamente" - -#: ../app/actions/gradient-editor-actions.c:805 -msgid "_Replicate Selection..." -msgstr "_Replicar selección…" - -#: ../app/actions/gradient-editor-actions.c:807 -msgid "Split Segments at _Midpoints" -msgstr "Partir segmentos por la _mitad" - -#: ../app/actions/gradient-editor-actions.c:809 -msgid "Split Segments _Uniformly..." -msgstr "Partir segmentos _uniformemente…" - -#: ../app/actions/gradient-editor-actions.c:811 -msgid "_Delete Selection" -msgstr "Elimi_nar selección" - -#: ../app/actions/gradient-editor-actions.c:813 -msgid "Re-_center Midpoints in Selection" -msgstr "Re_centrar puntos medios en la selección" - -#: ../app/actions/gradient-editor-actions.c:815 -msgid "Re-distribute _Handles in Selection" -msgstr "Redistribuir los _tiradores en la selección" - -#: ../app/actions/gradient-editor-commands.c:84 -msgid "Left Endpoint Color" -msgstr "Color del punto final izquierdo" - -#: ../app/actions/gradient-editor-commands.c:86 -msgid "Gradient Segment's Left Endpoint Color" -msgstr "Color del punto final izquierdo del segmento del degradado" - -#: ../app/actions/gradient-editor-commands.c:235 -msgid "Right Endpoint Color" -msgstr "Color del punto final derecho" - -#: ../app/actions/gradient-editor-commands.c:237 -msgid "Gradient Segment's Right Endpoint Color" -msgstr "Color del punto final derecho del segmento del degradado" - -#: ../app/actions/gradient-editor-commands.c:451 -msgid "Replicate Segment" -msgstr "Replicar segmento" - -#: ../app/actions/gradient-editor-commands.c:452 -msgid "Replicate Gradient Segment" -msgstr "Replicar segmento del degradado" - -#: ../app/actions/gradient-editor-commands.c:456 -msgid "Replicate Selection" -msgstr "Replicar selección" - -#: ../app/actions/gradient-editor-commands.c:457 -msgid "Replicate Gradient Selection" -msgstr "Replicar selección del degradado" - -#: ../app/actions/gradient-editor-commands.c:470 -msgid "Replicate" -msgstr "Replicar" - -#: ../app/actions/gradient-editor-commands.c:491 -msgid "" -"Select the number of times\n" -"to replicate the selected segment." -msgstr "" -"Seleccione la cantidad de veces\n" -"a replicar el segmento seleccionado." - -#: ../app/actions/gradient-editor-commands.c:494 -msgid "" -"Select the number of times\n" -"to replicate the selection." -msgstr "" -"Seleccione la cantidad de veces\n" -"a replicar la selección." - -#: ../app/actions/gradient-editor-commands.c:553 -msgid "Split Segment Uniformly" -msgstr "Partir el segmento uniformemente" - -#: ../app/actions/gradient-editor-commands.c:554 -msgid "Split Gradient Segment Uniformly" -msgstr "Partir el segmento de degradado uniformemente" - -#: ../app/actions/gradient-editor-commands.c:558 -msgid "Split Segments Uniformly" -msgstr "Partir los segmentos uniformemente" - -#: ../app/actions/gradient-editor-commands.c:559 -msgid "Split Gradient Segments Uniformly" -msgstr "Partir los segmentos de degradado uniformemente" - -#: ../app/actions/gradient-editor-commands.c:572 -msgid "Split" -msgstr "Partir" - -#: ../app/actions/gradient-editor-commands.c:594 -msgid "" -"Select the number of uniform parts\n" -"in which to split the selected segment." -msgstr "" -"Seleccione la cantidad de partes uniformes \n" -"en que quiere partir el segmento seleccionado." - -#: ../app/actions/gradient-editor-commands.c:597 -msgid "" -"Select the number of uniform parts\n" -"in which to split the segments in the selection." -msgstr "" -"Seleccione la cantidad de partes uniformes \n" -"en que quiere partir los segmentos en la selección." - -#: ../app/actions/gradients-actions.c:43 -msgctxt "gradients-action" -msgid "Gradients Menu" -msgstr "Menú de degradados" - -#: ../app/actions/gradients-actions.c:47 -msgctxt "gradients-action" -msgid "_New Gradient" -msgstr "Degradado _nuevo" - -#: ../app/actions/gradients-actions.c:48 -msgctxt "gradients-action" -msgid "Create a new gradient" -msgstr "Crea un degradado nuevo" - -#: ../app/actions/gradients-actions.c:53 -msgctxt "gradients-action" -msgid "D_uplicate Gradient" -msgstr "D_uplicar degradado" - -#: ../app/actions/gradients-actions.c:54 -msgctxt "gradients-action" -msgid "Duplicate this gradient" -msgstr "Duplicar este degradado" - -#: ../app/actions/gradients-actions.c:59 -msgctxt "gradients-action" -msgid "Copy Gradient _Location" -msgstr "Copiar la _localización del degradado" - -#: ../app/actions/gradients-actions.c:60 -msgctxt "gradients-action" -msgid "Copy gradient file location to clipboard" -msgstr "Copiar al portapapeles la localización del archivo de degradado" - -#: ../app/actions/gradients-actions.c:65 -msgctxt "gradients-action" -msgid "Save as _POV-Ray..." -msgstr "Guardar como _POV-Ray…" - -#: ../app/actions/gradients-actions.c:66 -msgctxt "gradients-action" -msgid "Save gradient as POV-Ray" -msgstr "Guardar degradado como POV-Ray" - -#: ../app/actions/gradients-actions.c:71 -msgctxt "gradients-action" -msgid "_Delete Gradient" -msgstr "_Eliminar degradado" - -#: ../app/actions/gradients-actions.c:72 -msgctxt "gradients-action" -msgid "Delete this gradient" -msgstr "Borra este degradado" - -#: ../app/actions/gradients-actions.c:77 -msgctxt "gradients-action" -msgid "_Refresh Gradients" -msgstr "_Refrescar degradados" - -#: ../app/actions/gradients-actions.c:78 -msgctxt "gradients-action" -msgid "Refresh gradients" -msgstr "Refresca los degradados" - -#: ../app/actions/gradients-actions.c:86 -msgctxt "gradients-action" -msgid "_Edit Gradient..." -msgstr "_Editar degradado…" - -#: ../app/actions/gradients-actions.c:87 -msgctxt "gradients-action" -msgid "Edit gradient" -msgstr "Edita el degradado" - -#: ../app/actions/gradients-commands.c:65 -#, c-format -msgid "Save '%s' as POV-Ray" -msgstr "Guardar «%s» como POV-Ray" - -#: ../app/actions/help-actions.c:37 ../app/actions/help-actions.c:40 -msgctxt "help-action" -msgid "_Help" -msgstr "Ay_uda" - -#: ../app/actions/help-actions.c:41 -msgctxt "help-action" -msgid "Open the GIMP user manual" -msgstr "Abrir el manual del usuario de GIMP" - -#: ../app/actions/help-actions.c:46 -msgctxt "help-action" -msgid "_Context Help" -msgstr "Ayuda _contextual" - -#: ../app/actions/help-actions.c:47 -msgctxt "help-action" -msgid "Show the help for a specific user interface item" -msgstr "Mostrar la ayuda para un elemento específico del interfaz de usuario" - -#: ../app/actions/image-actions.c:48 ../app/actions/image-actions.c:52 -msgctxt "image-action" -msgid "Image Menu" -msgstr "Menú de imagen" - -#: ../app/actions/image-actions.c:55 -msgctxt "image-action" -msgid "_Image" -msgstr "_Imagen" - -#: ../app/actions/image-actions.c:56 -msgctxt "image-action" -msgid "_Mode" -msgstr "_Modo" - -#: ../app/actions/image-actions.c:57 -msgctxt "image-action" -msgid "_Transform" -msgstr "_Transformar" - -#: ../app/actions/image-actions.c:58 -msgctxt "image-action" -msgid "_Guides" -msgstr "Líneas g_uía" - -#: ../app/actions/image-actions.c:60 -msgctxt "image-action" -msgid "_Colors" -msgstr "_Colores" - -#: ../app/actions/image-actions.c:61 -msgctxt "image-action" -msgid "I_nfo" -msgstr "In_fo" - -#: ../app/actions/image-actions.c:62 -msgctxt "image-action" -msgid "_Auto" -msgstr "_Auto" - -#: ../app/actions/image-actions.c:63 -msgctxt "image-action" -msgid "_Map" -msgstr "_Mapa" - -#: ../app/actions/image-actions.c:64 -msgctxt "image-action" -msgid "C_omponents" -msgstr "_Componentes" - -#: ../app/actions/image-actions.c:67 -msgctxt "image-action" -msgid "_New..." -msgstr "_Nuevo…" - -#: ../app/actions/image-actions.c:68 -msgctxt "image-action" -msgid "Create a new image" -msgstr "Crea una imagen nueva" - -#: ../app/actions/image-actions.c:73 -msgctxt "image-action" -msgid "Can_vas Size..." -msgstr "Tamaño del _lienzo…" - -#: ../app/actions/image-actions.c:74 -msgctxt "image-action" -msgid "Adjust the image dimensions" -msgstr "Ajustar las dimensiones de la imagen" - -#: ../app/actions/image-actions.c:79 -msgctxt "image-action" -msgid "Fit Canvas to L_ayers" -msgstr "_Ajustar lienzo a las capas" - -#: ../app/actions/image-actions.c:80 -msgctxt "image-action" -msgid "Resize the image to enclose all layers" -msgstr "Redimensionar la imagen para cubrir todas las capas" - -#: ../app/actions/image-actions.c:85 -msgctxt "image-action" -msgid "F_it Canvas to Selection" -msgstr "L_ienzo al tamaño de la selección" - -#: ../app/actions/image-actions.c:86 -msgctxt "image-action" -msgid "Resize the image to the extents of the selection" -msgstr "Cambia el tamaño de la imagen a las dimensiones de la selección" - -#: ../app/actions/image-actions.c:91 -msgctxt "image-action" -msgid "_Print Size..." -msgstr "Tamaño de la im_presión…" - -#: ../app/actions/image-actions.c:92 -msgctxt "image-action" -msgid "Adjust the print resolution" -msgstr "Ajustar la resolución de impresión" - -#: ../app/actions/image-actions.c:97 -msgctxt "image-action" -msgid "_Scale Image..." -msgstr "E_scalar la imagen…" - -#: ../app/actions/image-actions.c:98 -msgctxt "image-action" -msgid "Change the size of the image content" -msgstr "Cambia el tamaño del contenido de la imagen" - -#: ../app/actions/image-actions.c:103 -msgctxt "image-action" -msgid "_Crop to Selection" -msgstr "Re_cortar a la selección" - -#: ../app/actions/image-actions.c:104 -msgctxt "image-action" -msgid "Crop the image to the extents of the selection" -msgstr "Recorta la imagen a las dimensiones de la selección" - -#: ../app/actions/image-actions.c:109 -msgctxt "image-action" -msgid "_Duplicate" -msgstr "_Duplicar" - -#: ../app/actions/image-actions.c:110 -msgctxt "image-action" -msgid "Create a duplicate of this image" -msgstr "Crea un duplicado de esta imagen" - -#: ../app/actions/image-actions.c:115 -msgctxt "image-action" -msgid "Merge Visible _Layers..." -msgstr "Combinar las capas _visibles…" - -#: ../app/actions/image-actions.c:116 -msgctxt "image-action" -msgid "Merge all visible layers into one layer" -msgstr "Combina todas las capas visibles en una sola capa" - -#: ../app/actions/image-actions.c:121 -msgctxt "image-action" -msgid "_Flatten Image" -msgstr "A_planar la imagen" - -#: ../app/actions/image-actions.c:122 -msgctxt "image-action" -msgid "Merge all layers into one and remove transparency" -msgstr "Combina todas las capas en una y quita la transparencia" - -#: ../app/actions/image-actions.c:127 -msgctxt "image-action" -msgid "Configure G_rid..." -msgstr "Configurar la _rejilla…" - -#: ../app/actions/image-actions.c:128 -msgctxt "image-action" -msgid "Configure the grid for this image" -msgstr "Configura la rejilla para esta imagen" - -#: ../app/actions/image-actions.c:133 -msgctxt "image-action" -msgid "Image Pr_operties" -msgstr "_Propiedades de la imagen" - -#: ../app/actions/image-actions.c:134 -msgctxt "image-action" -msgid "Display information about this image" -msgstr "Muestra información sobre esta imagen" - -#: ../app/actions/image-actions.c:142 -msgctxt "image-convert-action" -msgid "_RGB" -msgstr "_RGB" - -#: ../app/actions/image-actions.c:143 -msgctxt "image-convert-action" -msgid "Convert the image to the RGB colorspace" -msgstr "Convierte la imagen al espacio de colores RGB" - -#: ../app/actions/image-actions.c:147 -msgctxt "image-convert-action" -msgid "_Grayscale" -msgstr "Escala de gr_ises" - -#: ../app/actions/image-actions.c:148 -msgctxt "image-convert-action" -msgid "Convert the image to grayscale" -msgstr "Convierte la imagen a tonos de grises" - -#: ../app/actions/image-actions.c:152 -msgctxt "image-convert-action" -msgid "_Indexed..." -msgstr "_Indexado…" - -#: ../app/actions/image-actions.c:153 -msgctxt "image-convert-action" -msgid "Convert the image to indexed colors" -msgstr "Convierte la imagen a colores indexados" - -#: ../app/actions/image-actions.c:160 -msgctxt "image-action" -msgid "Flip _Horizontally" -msgstr "Voltear _horizontalmente" - -#: ../app/actions/image-actions.c:161 -msgctxt "image-action" -msgid "Flip image horizontally" -msgstr "Voltea la imagen horizontalmente" - -#: ../app/actions/image-actions.c:166 -msgctxt "image-action" -msgid "Flip _Vertically" -msgstr "Voltear _verticalmente" - -#: ../app/actions/image-actions.c:167 -msgctxt "image-action" -msgid "Flip image vertically" -msgstr "Voltea la imagen verticalmente" - -#: ../app/actions/image-actions.c:175 -msgctxt "image-action" -msgid "Rotate 90° _clockwise" -msgstr "Rotar 90° en sentido _horario" - -#: ../app/actions/image-actions.c:176 -msgctxt "image-action" -msgid "Rotate the image 90 degrees to the right" -msgstr "Rota la imagen 90 grados a la derecha" - -#: ../app/actions/image-actions.c:181 -msgctxt "image-action" -msgid "Rotate _180°" -msgstr "Rotar _180°" - -#: ../app/actions/image-actions.c:182 -msgctxt "image-action" -msgid "Turn the image upside-down" -msgstr "Pone la imagen cabeza abajo" - -#: ../app/actions/image-actions.c:187 -msgctxt "image-action" -msgid "Rotate 90° counter-clock_wise" -msgstr "Rotar 90° en sentido _antihorario" - -#: ../app/actions/image-actions.c:188 -msgctxt "image-action" -msgid "Rotate the image 90 degrees to the left" -msgstr "Rota la imagen 90 grados a la izquierda" - -#: ../app/actions/image-commands.c:237 -msgid "Set Image Canvas Size" -msgstr "Establece el tamaño del lienzo de la imagen" - -#: ../app/actions/image-commands.c:266 ../app/actions/image-commands.c:290 -#: ../app/actions/image-commands.c:594 -msgid "Resizing" -msgstr "Redimensionando" - -#: ../app/actions/image-commands.c:317 -msgid "Set Image Print Resolution" -msgstr "Establecer la resolución de impresión de la imagen" - -#: ../app/actions/image-commands.c:379 -#: ../app/pdb/drawable-transform-cmds.c:159 -#: ../app/pdb/drawable-transform-cmds.c:247 -#: ../app/pdb/item-transform-cmds.c:162 -msgid "Flipping" -msgstr "Volteando" - -#: ../app/actions/image-commands.c:403 -#: ../app/pdb/drawable-transform-cmds.c:602 -#: ../app/pdb/drawable-transform-cmds.c:694 ../app/pdb/image-cmds.c:534 -#: ../app/pdb/item-transform-cmds.c:433 ../app/pdb/transform-tools-cmds.c:245 -#: ../app/tools/gimprotatetool.c:125 -msgid "Rotating" -msgstr "Rotando" - -#: ../app/actions/image-commands.c:429 ../app/actions/layers-commands.c:691 -msgid "Cannot crop because the current selection is empty." -msgstr "No se puede recortar porque la selección actual está vacía." - -#: ../app/actions/image-commands.c:641 -msgid "Change Print Size" -msgstr "Cambiar el tamaño de la impresión" - -#: ../app/actions/image-commands.c:682 -msgid "Scale Image" -msgstr "Escalar la imagen" - -#. Scaling -#: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 -#: ../app/dialogs/preferences-dialog.c:1906 -#: ../app/pdb/drawable-transform-cmds.c:783 -#: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 -#: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524 -#: ../app/pdb/layer-cmds.c:330 ../app/pdb/layer-cmds.c:375 -#: ../app/pdb/transform-tools-cmds.c:334 ../app/tools/gimpscaletool.c:118 -msgid "Scaling" -msgstr "Escalado" - -#: ../app/actions/images-actions.c:43 -msgctxt "images-action" -msgid "Images Menu" -msgstr "Menú de imágenes" - -#: ../app/actions/images-actions.c:47 -msgctxt "images-action" -msgid "_Raise Views" -msgstr "Eleva_r las vistas" - -#: ../app/actions/images-actions.c:48 -msgctxt "images-action" -msgid "Raise this image's displays" -msgstr "Elevar las vistas de esta imagen" - -#: ../app/actions/images-actions.c:53 -msgctxt "images-action" -msgid "_New View" -msgstr "Vista _nueva" - -#: ../app/actions/images-actions.c:54 -msgctxt "images-action" -msgid "Create a new display for this image" -msgstr "Crear una nueva vista para esta imagen" - -#: ../app/actions/images-actions.c:59 -msgctxt "images-action" -msgid "_Delete Image" -msgstr "Elimi_nar imagen" - -#: ../app/actions/images-actions.c:60 -msgctxt "images-action" -msgid "Delete this image" -msgstr "Eliminar esta imagen" - -#: ../app/actions/layers-actions.c:49 -msgctxt "layers-action" -msgid "Layers Menu" -msgstr "Menú de capas" - -#: ../app/actions/layers-actions.c:53 -msgctxt "layers-action" -msgid "_Layer" -msgstr "_Capa" - -#: ../app/actions/layers-actions.c:55 -msgctxt "layers-action" -msgid "Stac_k" -msgstr "_Pila" - -#: ../app/actions/layers-actions.c:57 -msgctxt "layers-action" -msgid "_Mask" -msgstr "_Máscara" - -#: ../app/actions/layers-actions.c:59 -msgctxt "layers-action" -msgid "Tr_ansparency" -msgstr "Tr_ansparencia" - -#: ../app/actions/layers-actions.c:61 -msgctxt "layers-action" -msgid "_Transform" -msgstr "_Transformar" - -#: ../app/actions/layers-actions.c:63 -msgctxt "layers-action" -msgid "_Properties" -msgstr "_Propiedades" - -#: ../app/actions/layers-actions.c:65 -msgctxt "layers-action" -msgid "_Opacity" -msgstr "_Opacidad" - -#: ../app/actions/layers-actions.c:67 -msgctxt "layers-action" -msgid "Layer _Mode" -msgstr "_Modo de capas" - -#: ../app/actions/layers-actions.c:70 -msgctxt "layers-action" -msgid "Te_xt Tool" -msgstr "Herramienta de te_xto" - -#: ../app/actions/layers-actions.c:71 -msgctxt "layers-action" -msgid "Activate the text tool on this text layer" -msgstr "Activar la herramienta de texto en esta capa de texto" - -#: ../app/actions/layers-actions.c:76 -msgctxt "layers-action" -msgid "_Edit Layer Attributes..." -msgstr "_Editar atributos de capa…" - -#: ../app/actions/layers-actions.c:77 -msgctxt "layers-action" -msgid "Edit the layer's name" -msgstr "Editar el nombre de la capa" - -#: ../app/actions/layers-actions.c:82 ../app/actions/layers-actions.c:610 -msgctxt "layers-action" -msgid "_New Layer..." -msgstr "Capa _nueva…" - -#: ../app/actions/layers-actions.c:83 -msgctxt "layers-action" -msgid "Create a new layer and add it to the image" -msgstr "Crear una capa nueva y la añade a la imagen" - -#: ../app/actions/layers-actions.c:88 ../app/actions/layers-actions.c:611 -msgctxt "layers-action" -msgid "_New Layer" -msgstr "Capa _nueva" - -#: ../app/actions/layers-actions.c:89 -msgctxt "layers-action" -msgid "Create a new layer with last used values" -msgstr "Crea una capa nueva con los últimos valores utilizados" - -#: ../app/actions/layers-actions.c:94 -msgctxt "layers-action" -msgid "New from _Visible" -msgstr "Nuevo a partir de lo _visible" - -#: ../app/actions/layers-actions.c:96 -msgctxt "layers-action" -msgid "Create a new layer from what is visible in this image" -msgstr "Crear una capa nueva a partir de lo que es visible en esta imagen" - -#: ../app/actions/layers-actions.c:101 -msgctxt "layers-action" -msgid "New Layer _Group..." -msgstr "_Grupo de capas nuevo…" - -#: ../app/actions/layers-actions.c:102 -msgctxt "layers-action" -msgid "Create a new layer group and add it to the image" -msgstr "Crear un grupo de capas nuevo y lo añade a la imagen" - -#: ../app/actions/layers-actions.c:107 -msgctxt "layers-action" -msgid "D_uplicate Layer" -msgstr "D_uplicar la capa" - -#: ../app/actions/layers-actions.c:109 -msgctxt "layers-action" -msgid "Create a duplicate of the layer and add it to the image" -msgstr "Crear un duplicado de la capa y la añade a la imagen" - -#: ../app/actions/layers-actions.c:114 -msgctxt "layers-action" -msgid "_Delete Layer" -msgstr "_Eliminar la capa" - -#: ../app/actions/layers-actions.c:115 -msgctxt "layers-action" -msgid "Delete this layer" -msgstr "Borra esta capa" - -#: ../app/actions/layers-actions.c:120 -msgctxt "layers-action" -msgid "_Raise Layer" -msgstr "_Elevar capa" - -#: ../app/actions/layers-actions.c:121 -msgctxt "layers-action" -msgid "Raise this layer one step in the layer stack" -msgstr "Elevar esta capa un nivel dentro de la pila de capas" - -#: ../app/actions/layers-actions.c:126 -msgctxt "layers-action" -msgid "Layer to _Top" -msgstr "Capa a la _cima" - -#: ../app/actions/layers-actions.c:127 -msgctxt "layers-action" -msgid "Move this layer to the top of the layer stack" -msgstr "Mover esta capa a la parte superior de la pila de capas" - -#: ../app/actions/layers-actions.c:132 -msgctxt "layers-action" -msgid "_Lower Layer" -msgstr "_Bajar capa" - -#: ../app/actions/layers-actions.c:133 -msgctxt "layers-action" -msgid "Lower this layer one step in the layer stack" -msgstr "Bajar esta capa un nivel dentro de la pila de capas" - -#: ../app/actions/layers-actions.c:138 -msgctxt "layers-action" -msgid "Layer to _Bottom" -msgstr "Capa al _fondo" - -#: ../app/actions/layers-actions.c:139 -msgctxt "layers-action" -msgid "Move this layer to the bottom of the layer stack" -msgstr "Mover esta capa a la parte inferior de la pila de capas" - -#: ../app/actions/layers-actions.c:144 -msgctxt "layers-action" -msgid "_Anchor Layer" -msgstr "_Anclar la capa" - -#: ../app/actions/layers-actions.c:145 -msgctxt "layers-action" -msgid "Anchor the floating layer" -msgstr "Anclar la capa flotante" - -#: ../app/actions/layers-actions.c:150 -msgctxt "layers-action" -msgid "Merge Do_wn" -msgstr "Combinar hacia abaj_o" - -#: ../app/actions/layers-actions.c:151 -msgctxt "layers-action" -msgid "Merge this layer with the first visible layer below it" -msgstr "" -"Combinar esta capa con la primera capa visible que está por debajo de ella" - -#: ../app/actions/layers-actions.c:156 -msgctxt "layers-action" -msgid "Merge Layer Group" -msgstr "Combinar grupo de capas" - -#: ../app/actions/layers-actions.c:157 -msgctxt "layers-action" -msgid "Merge the layer group's layers into one normal layer" -msgstr "Combinar todas las capas del grupo en una sola capa normal" - -#: ../app/actions/layers-actions.c:162 -msgctxt "layers-action" -msgid "Merge _Visible Layers..." -msgstr "Combinar las capas _visibles…" - -#: ../app/actions/layers-actions.c:163 -msgctxt "layers-action" -msgid "Merge all visible layers into one layer" -msgstr "Combinar todas las capas visibles en una sola capa" - -#: ../app/actions/layers-actions.c:168 -msgctxt "layers-action" -msgid "_Flatten Image" -msgstr "A_planar la imagen" - -#: ../app/actions/layers-actions.c:169 -msgctxt "layers-action" -msgid "Merge all layers into one and remove transparency" -msgstr "Combinar todas las capas en una y quita la transparencia" - -#: ../app/actions/layers-actions.c:174 -msgctxt "layers-action" -msgid "_Discard Text Information" -msgstr "_Descartar información de texto" - -#: ../app/actions/layers-actions.c:175 -msgctxt "layers-action" -msgid "Turn this text layer into a normal layer" -msgstr "Convertir esta capa de texto en una capa normal" - -#: ../app/actions/layers-actions.c:180 -msgctxt "layers-action" -msgid "Text to _Path" -msgstr "Texto a _ruta" - -#: ../app/actions/layers-actions.c:181 -msgctxt "layers-action" -msgid "Create a path from this text layer" -msgstr "Crear una ruta a partir de esta capa de texto" - -#: ../app/actions/layers-actions.c:186 -msgctxt "layers-action" -msgid "Text alon_g Path" -msgstr "Texto _siguiendo una ruta" - -#: ../app/actions/layers-actions.c:187 -msgctxt "layers-action" -msgid "Warp this layer's text along the current path" -msgstr "Hacer seguir el texto de esta capa a lo largo de la ruta" - -#: ../app/actions/layers-actions.c:192 -msgctxt "layers-action" -msgid "Layer B_oundary Size..." -msgstr "Tamaño de b_orde de capa…" - -#: ../app/actions/layers-actions.c:193 -msgctxt "layers-action" -msgid "Adjust the layer dimensions" -msgstr "Ajustar las dimensiones de la capa" - -#: ../app/actions/layers-actions.c:198 -msgctxt "layers-action" -msgid "Layer to _Image Size" -msgstr "Capa a tamaño de _imagen" - -#: ../app/actions/layers-actions.c:199 -msgctxt "layers-action" -msgid "Resize the layer to the size of the image" -msgstr "Redimensionar la capa al tamaño de la imagen" - -#: ../app/actions/layers-actions.c:204 -msgctxt "layers-action" -msgid "_Scale Layer..." -msgstr "E_scalar capa…" - -#: ../app/actions/layers-actions.c:205 -msgctxt "layers-action" -msgid "Change the size of the layer content" -msgstr "Cambiar el tamaño del contenido de la capa" - -#: ../app/actions/layers-actions.c:210 -msgctxt "layers-action" -msgid "_Crop to Selection" -msgstr "Re_cortar a la selección" - -#: ../app/actions/layers-actions.c:211 -msgctxt "layers-action" -msgid "Crop the layer to the extents of the selection" -msgstr "Recortar la capa a las dimensiones de la selección" - -#: ../app/actions/layers-actions.c:216 -msgctxt "layers-action" -msgid "Add La_yer Mask..." -msgstr "Añadir má_scara de capa…" - -#: ../app/actions/layers-actions.c:218 -msgctxt "layers-action" -msgid "Add a mask that allows non-destructive editing of transparency" -msgstr "" -"Añadir una máscara que permita la edición no destructiva de la transparencia" - -#: ../app/actions/layers-actions.c:223 -msgctxt "layers-action" -msgid "Add Alpha C_hannel" -msgstr "Añadir canal al_fa" - -#: ../app/actions/layers-actions.c:224 -msgctxt "layers-action" -msgid "Add transparency information to the layer" -msgstr "Añadir información de transparencia a la capa" - -#: ../app/actions/layers-actions.c:229 -msgctxt "layers-action" -msgid "_Remove Alpha Channel" -msgstr "Elimina_r el canal Alfa" - -#: ../app/actions/layers-actions.c:230 -msgctxt "layers-action" -msgid "Remove transparency information from the layer" -msgstr "Quitar la información de transparencia de la capa" - -#: ../app/actions/layers-actions.c:238 -msgctxt "layers-action" -msgid "Lock Alph_a Channel" -msgstr "Bloquear el canal alf_a" - -#: ../app/actions/layers-actions.c:240 -msgctxt "layers-action" -msgid "Keep transparency information on this layer from being modified" -msgstr "" -"Evitar que la información de transparencia de esta capa pueda ser modificada" - -#: ../app/actions/layers-actions.c:246 -msgctxt "layers-action" -msgid "_Edit Layer Mask" -msgstr "_Editar máscara de capa" - -#: ../app/actions/layers-actions.c:247 -msgctxt "layers-action" -msgid "Work on the layer mask" -msgstr "Trabajar sobre la máscara de capa" - -#: ../app/actions/layers-actions.c:253 -msgctxt "layers-action" -msgid "S_how Layer Mask" -msgstr "_Mostrar máscara de capa" - -#: ../app/actions/layers-actions.c:259 -msgctxt "layers-action" -msgid "_Disable Layer Mask" -msgstr "_Desactivar máscara de capa" - -#: ../app/actions/layers-actions.c:260 -msgctxt "layers-action" -msgid "Dismiss the effect of the layer mask" -msgstr "Ignorar el efecto de la máscara de capa" - -#: ../app/actions/layers-actions.c:269 -msgctxt "layers-action" -msgid "Apply Layer _Mask" -msgstr "Aplicar _máscara de capa" - -#: ../app/actions/layers-actions.c:270 -msgctxt "layers-action" -msgid "Apply the effect of the layer mask and remove it" -msgstr "Aplicar el efecto de la máscara de capa y quitarla" - -#: ../app/actions/layers-actions.c:275 -msgctxt "layers-action" -msgid "Delete Layer Mas_k" -msgstr "Eliminar másca_ra de capa" - -#: ../app/actions/layers-actions.c:276 -msgctxt "layers-action" -msgid "Remove the layer mask and its effect" -msgstr "Quitar la máscara de capa y su efecto" - -#: ../app/actions/layers-actions.c:284 -msgctxt "layers-action" -msgid "_Mask to Selection" -msgstr "_Máscara a selección" - -#: ../app/actions/layers-actions.c:285 -msgctxt "layers-action" -msgid "Replace the selection with the layer mask" -msgstr "Sustituir la selección con la máscara de capa" - -#: ../app/actions/layers-actions.c:290 -msgctxt "layers-action" -msgid "_Add to Selection" -msgstr "_Añadir a selección" - -#: ../app/actions/layers-actions.c:291 -msgctxt "layers-action" -msgid "Add the layer mask to the current selection" -msgstr "Añadir la máscara de capa a la selección actual" - -#: ../app/actions/layers-actions.c:296 ../app/actions/layers-actions.c:325 -msgctxt "layers-action" -msgid "_Subtract from Selection" -msgstr "_Sustraer de selección" - -#: ../app/actions/layers-actions.c:297 -msgctxt "layers-action" -msgid "Subtract the layer mask from the current selection" -msgstr "Sustraer la máscara de capa de la selección actual" - -#: ../app/actions/layers-actions.c:302 ../app/actions/layers-actions.c:332 -msgctxt "layers-action" -msgid "_Intersect with Selection" -msgstr "_Interseccionar con selección" - -#: ../app/actions/layers-actions.c:303 -msgctxt "layers-action" -msgid "Intersect the layer mask with the current selection" -msgstr "" -"Establecer la máscara de capa como su intersección con la selección actual" - -#: ../app/actions/layers-actions.c:311 -msgctxt "layers-action" -msgid "Al_pha to Selection" -msgstr "Alfa a _selección" - -#: ../app/actions/layers-actions.c:313 -msgctxt "layers-action" -msgid "Replace the selection with the layer's alpha channel" -msgstr "Sustituir la selección con el canal alfa de la capa" - -#: ../app/actions/layers-actions.c:318 -msgctxt "layers-action" -msgid "A_dd to Selection" -msgstr "_Añadir a selección" - -#: ../app/actions/layers-actions.c:320 -msgctxt "layers-action" -msgid "Add the layer's alpha channel to the current selection" -msgstr "Añadir el canal alfa de la capa a la selección actual" - -#: ../app/actions/layers-actions.c:327 -msgctxt "layers-action" -msgid "Subtract the layer's alpha channel from the current selection" -msgstr "Sustraer el canal alfa de la capa de la selección actual" - -#: ../app/actions/layers-actions.c:334 -msgctxt "layers-action" -msgid "Intersect the layer's alpha channel with the current selection" -msgstr "" -"Establecer la selección actual como su intersección con el canal alfa de la " -"capa" - -#: ../app/actions/layers-actions.c:342 -msgctxt "layers-action" -msgid "Select _Top Layer" -msgstr "Seleccionar la capa _superior" - -#: ../app/actions/layers-actions.c:343 -msgctxt "layers-action" -msgid "Select the topmost layer" -msgstr "Seleccionar la capa más alta" - -#: ../app/actions/layers-actions.c:348 -msgctxt "layers-action" -msgid "Select _Bottom Layer" -msgstr "Seleccionar la capa i_nferior" - -#: ../app/actions/layers-actions.c:349 -msgctxt "layers-action" -msgid "Select the bottommost layer" -msgstr "Seleccionar la capa más baja" - -#: ../app/actions/layers-actions.c:354 -msgctxt "layers-action" -msgid "Select _Previous Layer" -msgstr "Seleccionar la _capa anterior" - -#: ../app/actions/layers-actions.c:355 -msgctxt "layers-action" -msgid "Select the layer above the current layer" -msgstr "Seleccionar la capa por encima de la actual" - -#: ../app/actions/layers-actions.c:360 -msgctxt "layers-action" -msgid "Select _Next Layer" -msgstr "Seleccionar la capa siguie_nte" - -#: ../app/actions/layers-actions.c:361 -msgctxt "layers-action" -msgid "Select the layer below the current layer" -msgstr "Seleccionar la capa por debajo de la actual" - -#. Will be followed with e.g. "Shift-Click -#. on thumbnail" -#. -#: ../app/actions/layers-actions.c:442 -msgid "Shortcut: " -msgstr "Combinación de teclas: " - -#. Will be prepended with a modifier key -#. string, e.g. "Shift" -#. -#: ../app/actions/layers-actions.c:447 -msgid "-Click on thumbnail in Layers dockable" -msgstr "-Pulse sobre la miniatura del empotrable de capas" - -#: ../app/actions/layers-actions.c:605 ../app/actions/layers-actions.c:606 -msgctxt "layers-action" -msgid "To _New Layer" -msgstr "A una capa _nueva" - -#: ../app/actions/layers-commands.c:203 -msgid "Layer Attributes" -msgstr "Atributos de la capa" - -#: ../app/actions/layers-commands.c:206 -msgid "Edit Layer Attributes" -msgstr "Editar atributos de capa" - -#: ../app/actions/layers-commands.c:250 ../app/core/gimplayer.c:267 -msgid "Layer" -msgstr "Capa" - -#: ../app/actions/layers-commands.c:252 ../app/actions/layers-commands.c:320 -#: ../app/widgets/gimpdrawabletreeview.c:326 -#: ../app/widgets/gimplayertreeview.c:837 -msgid "New Layer" -msgstr "Capa nueva" - -#: ../app/actions/layers-commands.c:255 -msgid "Create a New Layer" -msgstr "Crear una capa nueva" - -#: ../app/actions/layers-commands.c:356 -msgid "Visible" -msgstr "Visible" - -#: ../app/actions/layers-commands.c:618 -msgid "Set Layer Boundary Size" -msgstr "Establecer el tamaño de borde de capa" - -#: ../app/actions/layers-commands.c:663 -msgid "Scale Layer" -msgstr "Escalar la capa" - -#: ../app/actions/layers-commands.c:701 -msgid "Crop Layer" -msgstr "Recortar la capa" - -#: ../app/actions/layers-commands.c:1080 -msgid "Please select a channel first" -msgstr "Seleccione un canal primero" - -#: ../app/actions/layers-commands.c:1088 -#: ../app/dialogs/layer-add-mask-dialog.c:82 -msgid "Add Layer Mask" -msgstr "Añadir máscara de capa" - -#: ../app/actions/palette-editor-actions.c:43 -msgctxt "palette-editor-action" -msgid "Palette Editor Menu" -msgstr "Menú del editor de paleta" - -#: ../app/actions/palette-editor-actions.c:47 -msgctxt "palette-editor-action" -msgid "_Edit Color..." -msgstr "_Editar color…" - -#: ../app/actions/palette-editor-actions.c:48 -msgctxt "palette-editor-action" -msgid "Edit this entry" -msgstr "Edita esta entrada" - -#: ../app/actions/palette-editor-actions.c:53 -msgctxt "palette-editor-action" -msgid "_Delete Color" -msgstr "_Eliminar color" - -#: ../app/actions/palette-editor-actions.c:54 -msgctxt "palette-editor-action" -msgid "Delete this entry" -msgstr "Borra esta entrada" - -#: ../app/actions/palette-editor-actions.c:62 -msgctxt "palette-editor-action" -msgid "Edit Active Palette" -msgstr "Editar paleta activa" - -#: ../app/actions/palette-editor-actions.c:71 -msgctxt "palette-editor-action" -msgid "New Color from _FG" -msgstr "Color nuevo desde el _frente" - -#: ../app/actions/palette-editor-actions.c:73 -msgctxt "palette-editor-action" -msgid "Create a new entry from the foreground color" -msgstr "Crear una entrada nueva a partir del color del frente" - -#: ../app/actions/palette-editor-actions.c:78 -msgctxt "palette-editor-action" -msgid "New Color from _BG" -msgstr "Color nuevo desde el f_ondo" - -#: ../app/actions/palette-editor-actions.c:80 -msgctxt "palette-editor-action" -msgid "Create a new entry from the background color" -msgstr "Crear una entrada nueva a partir del color del fondo" - -#: ../app/actions/palette-editor-actions.c:88 -msgid "Zoom _In" -msgstr "_Ampliar" - -#: ../app/actions/palette-editor-actions.c:94 -msgid "Zoom _Out" -msgstr "Re_ducir" - -#: ../app/actions/palette-editor-actions.c:100 -msgid "Zoom _All" -msgstr "Ampliar _todo" - -#: ../app/actions/palette-editor-commands.c:68 -msgid "Edit Palette Color" -msgstr "Editar el color de la paleta" - -#: ../app/actions/palette-editor-commands.c:70 -msgid "Edit Color Palette Entry" -msgstr "Editar la entrada de la paleta de colores" - -#: ../app/actions/palettes-actions.c:43 -msgctxt "palettes-action" -msgid "Palettes Menu" -msgstr "Menú de paletas" - -#: ../app/actions/palettes-actions.c:47 -msgctxt "palettes-action" -msgid "_New Palette" -msgstr "Paleta _nueva" - -#: ../app/actions/palettes-actions.c:48 -msgctxt "palettes-action" -msgid "Create a new palette" -msgstr "Crear una paleta nueva" - -#: ../app/actions/palettes-actions.c:53 -msgctxt "palettes-action" -msgid "_Import Palette..." -msgstr "_Importar paleta…" - -#: ../app/actions/palettes-actions.c:54 -msgctxt "palettes-action" -msgid "Import palette" -msgstr "Importar paleta" - -#: ../app/actions/palettes-actions.c:59 -msgctxt "palettes-action" -msgid "D_uplicate Palette" -msgstr "D_uplicar paleta" - -#: ../app/actions/palettes-actions.c:60 -msgctxt "palettes-action" -msgid "Duplicate this palette" -msgstr "Duplicar esta paleta" - -#: ../app/actions/palettes-actions.c:65 -msgctxt "palettes-action" -msgid "_Merge Palettes..." -msgstr "Co_mbinar paletas…" - -#: ../app/actions/palettes-actions.c:66 -msgctxt "palettes-action" -msgid "Merge palettes" -msgstr "Combinar paletas" - -#: ../app/actions/palettes-actions.c:71 -msgctxt "palettes-action" -msgid "Copy Palette _Location" -msgstr "Copiar la _localización de la paleta" - -#: ../app/actions/palettes-actions.c:72 -msgctxt "palettes-action" -msgid "Copy palette file location to clipboard" -msgstr "Copiar al portapapeles la localización del archivo de la paleta" - -#: ../app/actions/palettes-actions.c:77 -msgctxt "palettes-action" -msgid "_Delete Palette" -msgstr "Elimi_nar paleta" - -#: ../app/actions/palettes-actions.c:78 -msgctxt "palettes-action" -msgid "Delete this palette" -msgstr "Eliminar esta paleta" - -#: ../app/actions/palettes-actions.c:83 -msgctxt "palettes-action" -msgid "_Refresh Palettes" -msgstr "_Refrescar paletas" - -#: ../app/actions/palettes-actions.c:84 -msgctxt "palettes-action" -msgid "Refresh palettes" -msgstr "Refrescar paletas" - -#: ../app/actions/palettes-actions.c:92 -msgctxt "palettes-action" -msgid "_Edit Palette..." -msgstr "_Editar paleta…" - -#: ../app/actions/palettes-actions.c:93 -msgctxt "palettes-action" -msgid "Edit palette" -msgstr "Editar la paleta" - -#: ../app/actions/palettes-commands.c:72 -msgid "Merge Palette" -msgstr "Combinar la paleta" - -#: ../app/actions/palettes-commands.c:76 -msgid "Enter a name for the merged palette" -msgstr "Introduzca un nombre para la paleta combinada" - -#: ../app/actions/patterns-actions.c:42 -msgctxt "patterns-action" -msgid "Patterns Menu" -msgstr "Menú de patrones" - -#: ../app/actions/patterns-actions.c:46 -msgctxt "patterns-action" -msgid "_Open Pattern as Image" -msgstr "_Abrir el patrón como una imagen" - -#: ../app/actions/patterns-actions.c:47 -msgctxt "patterns-action" -msgid "Open this pattern as an image" -msgstr "Abre este patrón como una imagen" - -#: ../app/actions/patterns-actions.c:52 -msgctxt "patterns-action" -msgid "_New Pattern" -msgstr "Patrón _nuevo" - -#: ../app/actions/patterns-actions.c:53 -msgctxt "patterns-action" -msgid "Create a new pattern" -msgstr "Crear un patrón nuevo" - -#: ../app/actions/patterns-actions.c:58 -msgctxt "patterns-action" -msgid "D_uplicate Pattern" -msgstr "D_uplicar patrón" - -#: ../app/actions/patterns-actions.c:59 -msgctxt "patterns-action" -msgid "Duplicate this pattern" -msgstr "Duplicar este patrón" - -#: ../app/actions/patterns-actions.c:64 -msgctxt "patterns-action" -msgid "Copy Pattern _Location" -msgstr "Copiar la _localización del patrón" - -#: ../app/actions/patterns-actions.c:65 -msgctxt "patterns-action" -msgid "Copy pattern file location to clipboard" -msgstr "Copiar al portapapeles la localización del archivo de patrón" - -#: ../app/actions/patterns-actions.c:70 -msgctxt "patterns-action" -msgid "_Delete Pattern" -msgstr "_Eliminar patrón" - -#: ../app/actions/patterns-actions.c:71 -msgctxt "patterns-action" -msgid "Delete this pattern" -msgstr "Eliminar este patrón" - -#: ../app/actions/patterns-actions.c:76 -msgctxt "patterns-action" -msgid "_Refresh Patterns" -msgstr "_Refrescar patrones" - -#: ../app/actions/patterns-actions.c:77 -msgctxt "patterns-action" -msgid "Refresh patterns" -msgstr "Refrescar patrones" - -#: ../app/actions/patterns-actions.c:85 -msgctxt "patterns-action" -msgid "_Edit Pattern..." -msgstr "_Editar patrón…" - -#: ../app/actions/patterns-actions.c:86 -msgctxt "patterns-action" -msgid "Edit pattern" -msgstr "Editar patrón" - -#: ../app/actions/plug-in-actions.c:85 -msgctxt "plug-in-action" -msgid "Filte_rs" -msgstr "_Filtros" - -#: ../app/actions/plug-in-actions.c:87 -msgctxt "plug-in-action" -msgid "Recently Used" -msgstr "Usados recientemente" - +#: ../app/actions/gradient-editor-actions.c:781 +msgid "_Flip Segment" +msgstr "_Voltear segmento" + +#: ../app/actions/gradient-editor-actions.c:783 +msgid "_Replicate Segment..." +msgstr "_Replicar segmento…" + +#: ../app/actions/gradient-editor-actions.c:785 +msgid "Split Segment at _Midpoint" +msgstr "Partir segmento por la _mitad" + +#: ../app/actions/gradient-editor-actions.c:787 +msgid "Split Segment _Uniformly..." +msgstr "Partir segmento _uniformemente…" + +#: ../app/actions/gradient-editor-actions.c:789 +msgid "_Delete Segment" +msgstr "Elimi_nar segmento" + +#: ../app/actions/gradient-editor-actions.c:791 +msgid "Re-_center Segment's Midpoint" +msgstr "Re_centrar punto medio del segmento" + +#: ../app/actions/gradient-editor-actions.c:793 +msgid "Re-distribute _Handles in Segment" +msgstr "Redistribuir los _tiradores en el segmento" + +#: ../app/actions/gradient-editor-actions.c:798 +msgid "_Blending Function for Selection" +msgstr "Función de m_ezcla para la selección" + +#: ../app/actions/gradient-editor-actions.c:800 +msgid "Coloring _Type for Selection" +msgstr "_Tipo de coloreado para la selección" + +#: ../app/actions/gradient-editor-actions.c:803 +msgid "_Flip Selection" +msgstr "_Invertir selección simétricamente" + +#: ../app/actions/gradient-editor-actions.c:805 +msgid "_Replicate Selection..." +msgstr "_Replicar selección…" + +#: ../app/actions/gradient-editor-actions.c:807 +msgid "Split Segments at _Midpoints" +msgstr "Partir segmentos por la _mitad" + +#: ../app/actions/gradient-editor-actions.c:809 +msgid "Split Segments _Uniformly..." +msgstr "Partir segmentos _uniformemente…" + +#: ../app/actions/gradient-editor-actions.c:811 +msgid "_Delete Selection" +msgstr "Elimi_nar selección" + +#: ../app/actions/gradient-editor-actions.c:813 +msgid "Re-_center Midpoints in Selection" +msgstr "Re_centrar puntos medios en la selección" + +#: ../app/actions/gradient-editor-actions.c:815 +msgid "Re-distribute _Handles in Selection" +msgstr "Redistribuir los _tiradores en la selección" + +#: ../app/actions/gradient-editor-commands.c:84 +msgid "Left Endpoint Color" +msgstr "Color del punto final izquierdo" + +#: ../app/actions/gradient-editor-commands.c:86 +msgid "Gradient Segment's Left Endpoint Color" +msgstr "Color del punto final izquierdo del segmento del degradado" + +#: ../app/actions/gradient-editor-commands.c:235 +msgid "Right Endpoint Color" +msgstr "Color del punto final derecho" + +#: ../app/actions/gradient-editor-commands.c:237 +msgid "Gradient Segment's Right Endpoint Color" +msgstr "Color del punto final derecho del segmento del degradado" + +#: ../app/actions/gradient-editor-commands.c:451 +msgid "Replicate Segment" +msgstr "Replicar segmento" + +#: ../app/actions/gradient-editor-commands.c:452 +msgid "Replicate Gradient Segment" +msgstr "Replicar segmento del degradado" + +#: ../app/actions/gradient-editor-commands.c:456 +msgid "Replicate Selection" +msgstr "Replicar selección" + +#: ../app/actions/gradient-editor-commands.c:457 +msgid "Replicate Gradient Selection" +msgstr "Replicar selección del degradado" + +#: ../app/actions/gradient-editor-commands.c:470 +msgid "Replicate" +msgstr "Replicar" + +#: ../app/actions/gradient-editor-commands.c:491 +msgid "" +"Select the number of times\n" +"to replicate the selected segment." +msgstr "" +"Seleccione la cantidad de veces\n" +"a replicar el segmento seleccionado." + +#: ../app/actions/gradient-editor-commands.c:494 +msgid "" +"Select the number of times\n" +"to replicate the selection." +msgstr "" +"Seleccione la cantidad de veces\n" +"a replicar la selección." + +#: ../app/actions/gradient-editor-commands.c:553 +msgid "Split Segment Uniformly" +msgstr "Partir el segmento uniformemente" + +#: ../app/actions/gradient-editor-commands.c:554 +msgid "Split Gradient Segment Uniformly" +msgstr "Partir el segmento de degradado uniformemente" + +#: ../app/actions/gradient-editor-commands.c:558 +msgid "Split Segments Uniformly" +msgstr "Partir los segmentos uniformemente" + +#: ../app/actions/gradient-editor-commands.c:559 +msgid "Split Gradient Segments Uniformly" +msgstr "Partir los segmentos de degradado uniformemente" + +#: ../app/actions/gradient-editor-commands.c:572 +msgid "Split" +msgstr "Partir" + +#: ../app/actions/gradient-editor-commands.c:594 +msgid "" +"Select the number of uniform parts\n" +"in which to split the selected segment." +msgstr "" +"Seleccione la cantidad de partes uniformes \n" +"en que quiere partir el segmento seleccionado." + +#: ../app/actions/gradient-editor-commands.c:597 +msgid "" +"Select the number of uniform parts\n" +"in which to split the segments in the selection." +msgstr "" +"Seleccione la cantidad de partes uniformes \n" +"en que quiere partir los segmentos en la selección." + +#: ../app/actions/gradients-actions.c:43 +msgctxt "gradients-action" +msgid "Gradients Menu" +msgstr "Menú de degradados" + +#: ../app/actions/gradients-actions.c:47 +msgctxt "gradients-action" +msgid "_New Gradient" +msgstr "Degradado _nuevo" + +#: ../app/actions/gradients-actions.c:48 +msgctxt "gradients-action" +msgid "Create a new gradient" +msgstr "Crea un degradado nuevo" + +#: ../app/actions/gradients-actions.c:53 +msgctxt "gradients-action" +msgid "D_uplicate Gradient" +msgstr "D_uplicar degradado" + +#: ../app/actions/gradients-actions.c:54 +msgctxt "gradients-action" +msgid "Duplicate this gradient" +msgstr "Duplicar este degradado" + +#: ../app/actions/gradients-actions.c:59 +msgctxt "gradients-action" +msgid "Copy Gradient _Location" +msgstr "Copiar la _localización del degradado" + +#: ../app/actions/gradients-actions.c:60 +msgctxt "gradients-action" +msgid "Copy gradient file location to clipboard" +msgstr "Copiar al portapapeles la localización del archivo de degradado" + +#: ../app/actions/gradients-actions.c:65 +msgctxt "gradients-action" +msgid "Save as _POV-Ray..." +msgstr "Guardar como _POV-Ray…" + +#: ../app/actions/gradients-actions.c:66 +msgctxt "gradients-action" +msgid "Save gradient as POV-Ray" +msgstr "Guardar degradado como POV-Ray" + +#: ../app/actions/gradients-actions.c:71 +msgctxt "gradients-action" +msgid "_Delete Gradient" +msgstr "_Eliminar degradado" + +#: ../app/actions/gradients-actions.c:72 +msgctxt "gradients-action" +msgid "Delete this gradient" +msgstr "Borra este degradado" + +#: ../app/actions/gradients-actions.c:77 +msgctxt "gradients-action" +msgid "_Refresh Gradients" +msgstr "_Refrescar degradados" + +#: ../app/actions/gradients-actions.c:78 +msgctxt "gradients-action" +msgid "Refresh gradients" +msgstr "Refresca los degradados" + +#: ../app/actions/gradients-actions.c:86 +msgctxt "gradients-action" +msgid "_Edit Gradient..." +msgstr "_Editar degradado…" + +#: ../app/actions/gradients-actions.c:87 +msgctxt "gradients-action" +msgid "Edit gradient" +msgstr "Edita el degradado" + +#: ../app/actions/gradients-commands.c:65 +#, c-format +msgid "Save '%s' as POV-Ray" +msgstr "Guardar «%s» como POV-Ray" + +#: ../app/actions/help-actions.c:37 ../app/actions/help-actions.c:40 +msgctxt "help-action" +msgid "_Help" +msgstr "Ay_uda" + +#: ../app/actions/help-actions.c:41 +msgctxt "help-action" +msgid "Open the GIMP user manual" +msgstr "Abrir el manual del usuario de GIMP" + +#: ../app/actions/help-actions.c:46 +msgctxt "help-action" +msgid "_Context Help" +msgstr "Ayuda _contextual" + +#: ../app/actions/help-actions.c:47 +msgctxt "help-action" +msgid "Show the help for a specific user interface item" +msgstr "Mostrar la ayuda para un elemento específico del interfaz de usuario" + +#: ../app/actions/image-actions.c:48 ../app/actions/image-actions.c:52 +msgctxt "image-action" +msgid "Image Menu" +msgstr "Menú de imagen" + +#: ../app/actions/image-actions.c:55 +msgctxt "image-action" +msgid "_Image" +msgstr "_Imagen" + +#: ../app/actions/image-actions.c:56 +msgctxt "image-action" +msgid "_Mode" +msgstr "_Modo" + +#: ../app/actions/image-actions.c:57 +msgctxt "image-action" +msgid "_Transform" +msgstr "_Transformar" + +#: ../app/actions/image-actions.c:58 +msgctxt "image-action" +msgid "_Guides" +msgstr "Líneas g_uía" + +#: ../app/actions/image-actions.c:60 +msgctxt "image-action" +msgid "_Colors" +msgstr "_Colores" + +#: ../app/actions/image-actions.c:61 +msgctxt "image-action" +msgid "I_nfo" +msgstr "In_fo" + +#: ../app/actions/image-actions.c:62 +msgctxt "image-action" +msgid "_Auto" +msgstr "_Auto" + +#: ../app/actions/image-actions.c:63 +msgctxt "image-action" +msgid "_Map" +msgstr "_Mapa" + +#: ../app/actions/image-actions.c:64 +msgctxt "image-action" +msgid "C_omponents" +msgstr "_Componentes" + +#: ../app/actions/image-actions.c:67 +msgctxt "image-action" +msgid "_New..." +msgstr "_Nuevo…" + +#: ../app/actions/image-actions.c:68 +msgctxt "image-action" +msgid "Create a new image" +msgstr "Crea una imagen nueva" + +#: ../app/actions/image-actions.c:73 +msgctxt "image-action" +msgid "Can_vas Size..." +msgstr "Tamaño del _lienzo…" + +#: ../app/actions/image-actions.c:74 +msgctxt "image-action" +msgid "Adjust the image dimensions" +msgstr "Ajustar las dimensiones de la imagen" + +#: ../app/actions/image-actions.c:79 +msgctxt "image-action" +msgid "Fit Canvas to L_ayers" +msgstr "_Ajustar lienzo a las capas" + +#: ../app/actions/image-actions.c:80 +msgctxt "image-action" +msgid "Resize the image to enclose all layers" +msgstr "Redimensionar la imagen para cubrir todas las capas" + +#: ../app/actions/image-actions.c:85 +msgctxt "image-action" +msgid "F_it Canvas to Selection" +msgstr "L_ienzo al tamaño de la selección" + +#: ../app/actions/image-actions.c:86 +msgctxt "image-action" +msgid "Resize the image to the extents of the selection" +msgstr "Cambia el tamaño de la imagen a las dimensiones de la selección" + +#: ../app/actions/image-actions.c:91 +msgctxt "image-action" +msgid "_Print Size..." +msgstr "Tamaño de la im_presión…" + +#: ../app/actions/image-actions.c:92 +msgctxt "image-action" +msgid "Adjust the print resolution" +msgstr "Ajustar la resolución de impresión" + +#: ../app/actions/image-actions.c:97 +msgctxt "image-action" +msgid "_Scale Image..." +msgstr "E_scalar la imagen…" + +#: ../app/actions/image-actions.c:98 +msgctxt "image-action" +msgid "Change the size of the image content" +msgstr "Cambia el tamaño del contenido de la imagen" + +#: ../app/actions/image-actions.c:103 +msgctxt "image-action" +msgid "_Crop to Selection" +msgstr "Re_cortar a la selección" + +#: ../app/actions/image-actions.c:104 +msgctxt "image-action" +msgid "Crop the image to the extents of the selection" +msgstr "Recorta la imagen a las dimensiones de la selección" + +#: ../app/actions/image-actions.c:109 +msgctxt "image-action" +msgid "_Duplicate" +msgstr "_Duplicar" + +#: ../app/actions/image-actions.c:110 +msgctxt "image-action" +msgid "Create a duplicate of this image" +msgstr "Crea un duplicado de esta imagen" + +#: ../app/actions/image-actions.c:115 +msgctxt "image-action" +msgid "Merge Visible _Layers..." +msgstr "Combinar las capas _visibles…" + +#: ../app/actions/image-actions.c:116 +msgctxt "image-action" +msgid "Merge all visible layers into one layer" +msgstr "Combina todas las capas visibles en una sola capa" + +#: ../app/actions/image-actions.c:121 +msgctxt "image-action" +msgid "_Flatten Image" +msgstr "A_planar la imagen" + +#: ../app/actions/image-actions.c:122 +msgctxt "image-action" +msgid "Merge all layers into one and remove transparency" +msgstr "Combina todas las capas en una y quita la transparencia" + +#: ../app/actions/image-actions.c:127 +msgctxt "image-action" +msgid "Configure G_rid..." +msgstr "Configurar la _rejilla…" + +#: ../app/actions/image-actions.c:128 +msgctxt "image-action" +msgid "Configure the grid for this image" +msgstr "Configura la rejilla para esta imagen" + +#: ../app/actions/image-actions.c:133 +msgctxt "image-action" +msgid "Image Pr_operties" +msgstr "_Propiedades de la imagen" + +#: ../app/actions/image-actions.c:134 +msgctxt "image-action" +msgid "Display information about this image" +msgstr "Muestra información sobre esta imagen" + +#: ../app/actions/image-actions.c:142 +msgctxt "image-convert-action" +msgid "_RGB" +msgstr "_RGB" + +#: ../app/actions/image-actions.c:143 +msgctxt "image-convert-action" +msgid "Convert the image to the RGB colorspace" +msgstr "Convierte la imagen al espacio de colores RGB" + +#: ../app/actions/image-actions.c:147 +msgctxt "image-convert-action" +msgid "_Grayscale" +msgstr "Escala de gr_ises" + +#: ../app/actions/image-actions.c:148 +msgctxt "image-convert-action" +msgid "Convert the image to grayscale" +msgstr "Convierte la imagen a tonos de grises" + +#: ../app/actions/image-actions.c:152 +msgctxt "image-convert-action" +msgid "_Indexed..." +msgstr "_Indexado…" + +#: ../app/actions/image-actions.c:153 +msgctxt "image-convert-action" +msgid "Convert the image to indexed colors" +msgstr "Convierte la imagen a colores indexados" + +#: ../app/actions/image-actions.c:160 +msgctxt "image-action" +msgid "Flip _Horizontally" +msgstr "Voltear _horizontalmente" + +#: ../app/actions/image-actions.c:161 +msgctxt "image-action" +msgid "Flip image horizontally" +msgstr "Voltea la imagen horizontalmente" + +#: ../app/actions/image-actions.c:166 +msgctxt "image-action" +msgid "Flip _Vertically" +msgstr "Voltear _verticalmente" + +#: ../app/actions/image-actions.c:167 +msgctxt "image-action" +msgid "Flip image vertically" +msgstr "Voltea la imagen verticalmente" + +#: ../app/actions/image-actions.c:175 +msgctxt "image-action" +msgid "Rotate 90° _clockwise" +msgstr "Rotar 90° en sentido _horario" + +#: ../app/actions/image-actions.c:176 +msgctxt "image-action" +msgid "Rotate the image 90 degrees to the right" +msgstr "Rota la imagen 90 grados a la derecha" + +#: ../app/actions/image-actions.c:181 +msgctxt "image-action" +msgid "Rotate _180°" +msgstr "Rotar _180°" + +#: ../app/actions/image-actions.c:182 +msgctxt "image-action" +msgid "Turn the image upside-down" +msgstr "Pone la imagen cabeza abajo" + +#: ../app/actions/image-actions.c:187 +msgctxt "image-action" +msgid "Rotate 90° counter-clock_wise" +msgstr "Rotar 90° en sentido _antihorario" + +#: ../app/actions/image-actions.c:188 +msgctxt "image-action" +msgid "Rotate the image 90 degrees to the left" +msgstr "Rota la imagen 90 grados a la izquierda" + +#: ../app/actions/image-commands.c:237 +msgid "Set Image Canvas Size" +msgstr "Establece el tamaño del lienzo de la imagen" + +#: ../app/actions/image-commands.c:266 ../app/actions/image-commands.c:290 +#: ../app/actions/image-commands.c:594 +msgid "Resizing" +msgstr "Redimensionando" + +#: ../app/actions/image-commands.c:317 +msgid "Set Image Print Resolution" +msgstr "Establecer la resolución de impresión de la imagen" + +#: ../app/actions/image-commands.c:379 +#: ../app/pdb/drawable-transform-cmds.c:159 +#: ../app/pdb/drawable-transform-cmds.c:247 +#: ../app/pdb/item-transform-cmds.c:162 +msgid "Flipping" +msgstr "Volteando" + +#: ../app/actions/image-commands.c:403 +#: ../app/pdb/drawable-transform-cmds.c:602 +#: ../app/pdb/drawable-transform-cmds.c:694 ../app/pdb/image-cmds.c:534 +#: ../app/pdb/item-transform-cmds.c:433 ../app/pdb/transform-tools-cmds.c:245 +#: ../app/tools/gimprotatetool.c:125 +msgid "Rotating" +msgstr "Rotando" + +#: ../app/actions/image-commands.c:429 ../app/actions/layers-commands.c:691 +msgid "Cannot crop because the current selection is empty." +msgstr "No se puede recortar porque la selección actual está vacía." + +#: ../app/actions/image-commands.c:641 +msgid "Change Print Size" +msgstr "Cambiar el tamaño de la impresión" + +#: ../app/actions/image-commands.c:682 +msgid "Scale Image" +msgstr "Escalar la imagen" + +#. Scaling +#: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 +#: ../app/dialogs/preferences-dialog.c:1943 +#: ../app/pdb/drawable-transform-cmds.c:783 +#: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 +#: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524 +#: ../app/pdb/layer-cmds.c:330 ../app/pdb/layer-cmds.c:375 +#: ../app/pdb/transform-tools-cmds.c:334 ../app/tools/gimpscaletool.c:118 +msgid "Scaling" +msgstr "Escalado" + +#: ../app/actions/images-actions.c:43 +msgctxt "images-action" +msgid "Images Menu" +msgstr "Menú de imágenes" + +#: ../app/actions/images-actions.c:47 +msgctxt "images-action" +msgid "_Raise Views" +msgstr "Eleva_r las vistas" + +#: ../app/actions/images-actions.c:48 +msgctxt "images-action" +msgid "Raise this image's displays" +msgstr "Elevar las vistas de esta imagen" + +#: ../app/actions/images-actions.c:53 +msgctxt "images-action" +msgid "_New View" +msgstr "Vista _nueva" + +#: ../app/actions/images-actions.c:54 +msgctxt "images-action" +msgid "Create a new display for this image" +msgstr "Crear una nueva vista para esta imagen" + +#: ../app/actions/images-actions.c:59 +msgctxt "images-action" +msgid "_Delete Image" +msgstr "Elimi_nar imagen" + +#: ../app/actions/images-actions.c:60 +msgctxt "images-action" +msgid "Delete this image" +msgstr "Eliminar esta imagen" + +#: ../app/actions/layers-actions.c:49 +msgctxt "layers-action" +msgid "Layers Menu" +msgstr "Menú de capas" + +#: ../app/actions/layers-actions.c:53 +msgctxt "layers-action" +msgid "_Layer" +msgstr "_Capa" + +#: ../app/actions/layers-actions.c:55 +msgctxt "layers-action" +msgid "Stac_k" +msgstr "_Pila" + +#: ../app/actions/layers-actions.c:57 +msgctxt "layers-action" +msgid "_Mask" +msgstr "_Máscara" + +#: ../app/actions/layers-actions.c:59 +msgctxt "layers-action" +msgid "Tr_ansparency" +msgstr "Tr_ansparencia" + +#: ../app/actions/layers-actions.c:61 +msgctxt "layers-action" +msgid "_Transform" +msgstr "_Transformar" + +#: ../app/actions/layers-actions.c:63 +msgctxt "layers-action" +msgid "_Properties" +msgstr "_Propiedades" + +#: ../app/actions/layers-actions.c:65 +msgctxt "layers-action" +msgid "_Opacity" +msgstr "_Opacidad" + +#: ../app/actions/layers-actions.c:67 +msgctxt "layers-action" +msgid "Layer _Mode" +msgstr "_Modo de capas" + +#: ../app/actions/layers-actions.c:70 +msgctxt "layers-action" +msgid "Te_xt Tool" +msgstr "Herramienta de te_xto" + +#: ../app/actions/layers-actions.c:71 +msgctxt "layers-action" +msgid "Activate the text tool on this text layer" +msgstr "Activar la herramienta de texto en esta capa de texto" + +#: ../app/actions/layers-actions.c:76 +msgctxt "layers-action" +msgid "_Edit Layer Attributes..." +msgstr "_Editar atributos de capa…" + +#: ../app/actions/layers-actions.c:77 +msgctxt "layers-action" +msgid "Edit the layer's name" +msgstr "Editar el nombre de la capa" + +#: ../app/actions/layers-actions.c:82 ../app/actions/layers-actions.c:610 +msgctxt "layers-action" +msgid "_New Layer..." +msgstr "Capa _nueva…" + +#: ../app/actions/layers-actions.c:83 +msgctxt "layers-action" +msgid "Create a new layer and add it to the image" +msgstr "Crear una capa nueva y la añade a la imagen" + +#: ../app/actions/layers-actions.c:88 ../app/actions/layers-actions.c:611 +msgctxt "layers-action" +msgid "_New Layer" +msgstr "Capa _nueva" + +#: ../app/actions/layers-actions.c:89 +msgctxt "layers-action" +msgid "Create a new layer with last used values" +msgstr "Crea una capa nueva con los últimos valores utilizados" + +#: ../app/actions/layers-actions.c:94 +msgctxt "layers-action" +msgid "New from _Visible" +msgstr "Nuevo a partir de lo _visible" + +#: ../app/actions/layers-actions.c:96 +msgctxt "layers-action" +msgid "Create a new layer from what is visible in this image" +msgstr "Crear una capa nueva a partir de lo que es visible en esta imagen" + +#: ../app/actions/layers-actions.c:101 +msgctxt "layers-action" +msgid "New Layer _Group..." +msgstr "_Grupo de capas nuevo…" + +#: ../app/actions/layers-actions.c:102 +msgctxt "layers-action" +msgid "Create a new layer group and add it to the image" +msgstr "Crear un grupo de capas nuevo y lo añade a la imagen" + +#: ../app/actions/layers-actions.c:107 +msgctxt "layers-action" +msgid "D_uplicate Layer" +msgstr "D_uplicar la capa" + +#: ../app/actions/layers-actions.c:109 +msgctxt "layers-action" +msgid "Create a duplicate of the layer and add it to the image" +msgstr "Crear un duplicado de la capa y la añade a la imagen" + +#: ../app/actions/layers-actions.c:114 +msgctxt "layers-action" +msgid "_Delete Layer" +msgstr "_Eliminar la capa" + +#: ../app/actions/layers-actions.c:115 +msgctxt "layers-action" +msgid "Delete this layer" +msgstr "Borra esta capa" + +#: ../app/actions/layers-actions.c:120 +msgctxt "layers-action" +msgid "_Raise Layer" +msgstr "_Elevar capa" + +#: ../app/actions/layers-actions.c:121 +msgctxt "layers-action" +msgid "Raise this layer one step in the layer stack" +msgstr "Elevar esta capa un nivel dentro de la pila de capas" + +#: ../app/actions/layers-actions.c:126 +msgctxt "layers-action" +msgid "Layer to _Top" +msgstr "Capa a la _cima" + +#: ../app/actions/layers-actions.c:127 +msgctxt "layers-action" +msgid "Move this layer to the top of the layer stack" +msgstr "Mover esta capa a la parte superior de la pila de capas" + +#: ../app/actions/layers-actions.c:132 +msgctxt "layers-action" +msgid "_Lower Layer" +msgstr "_Bajar capa" + +#: ../app/actions/layers-actions.c:133 +msgctxt "layers-action" +msgid "Lower this layer one step in the layer stack" +msgstr "Bajar esta capa un nivel dentro de la pila de capas" + +#: ../app/actions/layers-actions.c:138 +msgctxt "layers-action" +msgid "Layer to _Bottom" +msgstr "Capa al _fondo" + +#: ../app/actions/layers-actions.c:139 +msgctxt "layers-action" +msgid "Move this layer to the bottom of the layer stack" +msgstr "Mover esta capa a la parte inferior de la pila de capas" + +#: ../app/actions/layers-actions.c:144 +msgctxt "layers-action" +msgid "_Anchor Layer" +msgstr "_Anclar la capa" + +#: ../app/actions/layers-actions.c:145 +msgctxt "layers-action" +msgid "Anchor the floating layer" +msgstr "Anclar la capa flotante" + +#: ../app/actions/layers-actions.c:150 +msgctxt "layers-action" +msgid "Merge Do_wn" +msgstr "Combinar hacia abaj_o" + +#: ../app/actions/layers-actions.c:151 +msgctxt "layers-action" +msgid "Merge this layer with the first visible layer below it" +msgstr "" +"Combinar esta capa con la primera capa visible que está por debajo de ella" + +#: ../app/actions/layers-actions.c:156 +msgctxt "layers-action" +msgid "Merge Layer Group" +msgstr "Combinar grupo de capas" + +#: ../app/actions/layers-actions.c:157 +msgctxt "layers-action" +msgid "Merge the layer group's layers into one normal layer" +msgstr "Combinar todas las capas del grupo en una sola capa normal" + +#: ../app/actions/layers-actions.c:162 +msgctxt "layers-action" +msgid "Merge _Visible Layers..." +msgstr "Combinar las capas _visibles…" + +#: ../app/actions/layers-actions.c:163 +msgctxt "layers-action" +msgid "Merge all visible layers into one layer" +msgstr "Combinar todas las capas visibles en una sola capa" + +#: ../app/actions/layers-actions.c:168 +msgctxt "layers-action" +msgid "_Flatten Image" +msgstr "A_planar la imagen" + +#: ../app/actions/layers-actions.c:169 +msgctxt "layers-action" +msgid "Merge all layers into one and remove transparency" +msgstr "Combinar todas las capas en una y quita la transparencia" + +#: ../app/actions/layers-actions.c:174 +msgctxt "layers-action" +msgid "_Discard Text Information" +msgstr "_Descartar información de texto" + +#: ../app/actions/layers-actions.c:175 +msgctxt "layers-action" +msgid "Turn this text layer into a normal layer" +msgstr "Convertir esta capa de texto en una capa normal" + +#: ../app/actions/layers-actions.c:180 +msgctxt "layers-action" +msgid "Text to _Path" +msgstr "Texto a _ruta" + +#: ../app/actions/layers-actions.c:181 +msgctxt "layers-action" +msgid "Create a path from this text layer" +msgstr "Crear una ruta a partir de esta capa de texto" + +#: ../app/actions/layers-actions.c:186 +msgctxt "layers-action" +msgid "Text alon_g Path" +msgstr "Texto _siguiendo una ruta" + +#: ../app/actions/layers-actions.c:187 +msgctxt "layers-action" +msgid "Warp this layer's text along the current path" +msgstr "Hacer seguir el texto de esta capa a lo largo de la ruta" + +#: ../app/actions/layers-actions.c:192 +msgctxt "layers-action" +msgid "Layer B_oundary Size..." +msgstr "Tamaño de b_orde de capa…" + +#: ../app/actions/layers-actions.c:193 +msgctxt "layers-action" +msgid "Adjust the layer dimensions" +msgstr "Ajustar las dimensiones de la capa" + +#: ../app/actions/layers-actions.c:198 +msgctxt "layers-action" +msgid "Layer to _Image Size" +msgstr "Capa a tamaño de _imagen" + +#: ../app/actions/layers-actions.c:199 +msgctxt "layers-action" +msgid "Resize the layer to the size of the image" +msgstr "Redimensionar la capa al tamaño de la imagen" + +#: ../app/actions/layers-actions.c:204 +msgctxt "layers-action" +msgid "_Scale Layer..." +msgstr "E_scalar capa…" + +#: ../app/actions/layers-actions.c:205 +msgctxt "layers-action" +msgid "Change the size of the layer content" +msgstr "Cambiar el tamaño del contenido de la capa" + +#: ../app/actions/layers-actions.c:210 +msgctxt "layers-action" +msgid "_Crop to Selection" +msgstr "Re_cortar a la selección" + +#: ../app/actions/layers-actions.c:211 +msgctxt "layers-action" +msgid "Crop the layer to the extents of the selection" +msgstr "Recortar la capa a las dimensiones de la selección" + +#: ../app/actions/layers-actions.c:216 +msgctxt "layers-action" +msgid "Add La_yer Mask..." +msgstr "Añadir má_scara de capa…" + +#: ../app/actions/layers-actions.c:218 +msgctxt "layers-action" +msgid "Add a mask that allows non-destructive editing of transparency" +msgstr "" +"Añadir una máscara que permita la edición no destructiva de la transparencia" + +#: ../app/actions/layers-actions.c:223 +msgctxt "layers-action" +msgid "Add Alpha C_hannel" +msgstr "Añadir canal al_fa" + +#: ../app/actions/layers-actions.c:224 +msgctxt "layers-action" +msgid "Add transparency information to the layer" +msgstr "Añadir información de transparencia a la capa" + +#: ../app/actions/layers-actions.c:229 +msgctxt "layers-action" +msgid "_Remove Alpha Channel" +msgstr "Elimina_r el canal Alfa" + +#: ../app/actions/layers-actions.c:230 +msgctxt "layers-action" +msgid "Remove transparency information from the layer" +msgstr "Quitar la información de transparencia de la capa" + +#: ../app/actions/layers-actions.c:238 +msgctxt "layers-action" +msgid "Lock Alph_a Channel" +msgstr "Bloquear el canal alf_a" + +#: ../app/actions/layers-actions.c:240 +msgctxt "layers-action" +msgid "Keep transparency information on this layer from being modified" +msgstr "" +"Evitar que la información de transparencia de esta capa pueda ser modificada" + +#: ../app/actions/layers-actions.c:246 +msgctxt "layers-action" +msgid "_Edit Layer Mask" +msgstr "_Editar máscara de capa" + +#: ../app/actions/layers-actions.c:247 +msgctxt "layers-action" +msgid "Work on the layer mask" +msgstr "Trabajar sobre la máscara de capa" + +#: ../app/actions/layers-actions.c:253 +msgctxt "layers-action" +msgid "S_how Layer Mask" +msgstr "_Mostrar máscara de capa" + +#: ../app/actions/layers-actions.c:259 +msgctxt "layers-action" +msgid "_Disable Layer Mask" +msgstr "_Desactivar máscara de capa" + +#: ../app/actions/layers-actions.c:260 +msgctxt "layers-action" +msgid "Dismiss the effect of the layer mask" +msgstr "Ignorar el efecto de la máscara de capa" + +#: ../app/actions/layers-actions.c:269 +msgctxt "layers-action" +msgid "Apply Layer _Mask" +msgstr "Aplicar _máscara de capa" + +#: ../app/actions/layers-actions.c:270 +msgctxt "layers-action" +msgid "Apply the effect of the layer mask and remove it" +msgstr "Aplicar el efecto de la máscara de capa y quitarla" + +#: ../app/actions/layers-actions.c:275 +msgctxt "layers-action" +msgid "Delete Layer Mas_k" +msgstr "Eliminar másca_ra de capa" + +#: ../app/actions/layers-actions.c:276 +msgctxt "layers-action" +msgid "Remove the layer mask and its effect" +msgstr "Quitar la máscara de capa y su efecto" + +#: ../app/actions/layers-actions.c:284 +msgctxt "layers-action" +msgid "_Mask to Selection" +msgstr "_Máscara a selección" + +#: ../app/actions/layers-actions.c:285 +msgctxt "layers-action" +msgid "Replace the selection with the layer mask" +msgstr "Sustituir la selección con la máscara de capa" + +#: ../app/actions/layers-actions.c:290 +msgctxt "layers-action" +msgid "_Add to Selection" +msgstr "_Añadir a selección" + +#: ../app/actions/layers-actions.c:291 +msgctxt "layers-action" +msgid "Add the layer mask to the current selection" +msgstr "Añadir la máscara de capa a la selección actual" + +#: ../app/actions/layers-actions.c:296 ../app/actions/layers-actions.c:325 +msgctxt "layers-action" +msgid "_Subtract from Selection" +msgstr "_Sustraer de selección" + +#: ../app/actions/layers-actions.c:297 +msgctxt "layers-action" +msgid "Subtract the layer mask from the current selection" +msgstr "Sustraer la máscara de capa de la selección actual" + +#: ../app/actions/layers-actions.c:302 ../app/actions/layers-actions.c:332 +msgctxt "layers-action" +msgid "_Intersect with Selection" +msgstr "_Interseccionar con selección" + +#: ../app/actions/layers-actions.c:303 +msgctxt "layers-action" +msgid "Intersect the layer mask with the current selection" +msgstr "" +"Establecer la máscara de capa como su intersección con la selección actual" + +#: ../app/actions/layers-actions.c:311 +msgctxt "layers-action" +msgid "Al_pha to Selection" +msgstr "Alfa a _selección" + +#: ../app/actions/layers-actions.c:313 +msgctxt "layers-action" +msgid "Replace the selection with the layer's alpha channel" +msgstr "Sustituir la selección con el canal alfa de la capa" + +#: ../app/actions/layers-actions.c:318 +msgctxt "layers-action" +msgid "A_dd to Selection" +msgstr "_Añadir a selección" + +#: ../app/actions/layers-actions.c:320 +msgctxt "layers-action" +msgid "Add the layer's alpha channel to the current selection" +msgstr "Añadir el canal alfa de la capa a la selección actual" + +#: ../app/actions/layers-actions.c:327 +msgctxt "layers-action" +msgid "Subtract the layer's alpha channel from the current selection" +msgstr "Sustraer el canal alfa de la capa de la selección actual" + +#: ../app/actions/layers-actions.c:334 +msgctxt "layers-action" +msgid "Intersect the layer's alpha channel with the current selection" +msgstr "" +"Establecer la selección actual como su intersección con el canal alfa de la " +"capa" + +#: ../app/actions/layers-actions.c:342 +msgctxt "layers-action" +msgid "Select _Top Layer" +msgstr "Seleccionar la capa _superior" + +#: ../app/actions/layers-actions.c:343 +msgctxt "layers-action" +msgid "Select the topmost layer" +msgstr "Seleccionar la capa más alta" + +#: ../app/actions/layers-actions.c:348 +msgctxt "layers-action" +msgid "Select _Bottom Layer" +msgstr "Seleccionar la capa i_nferior" + +#: ../app/actions/layers-actions.c:349 +msgctxt "layers-action" +msgid "Select the bottommost layer" +msgstr "Seleccionar la capa más baja" + +#: ../app/actions/layers-actions.c:354 +msgctxt "layers-action" +msgid "Select _Previous Layer" +msgstr "Seleccionar la _capa anterior" + +#: ../app/actions/layers-actions.c:355 +msgctxt "layers-action" +msgid "Select the layer above the current layer" +msgstr "Seleccionar la capa por encima de la actual" + +#: ../app/actions/layers-actions.c:360 +msgctxt "layers-action" +msgid "Select _Next Layer" +msgstr "Seleccionar la capa siguie_nte" + +#: ../app/actions/layers-actions.c:361 +msgctxt "layers-action" +msgid "Select the layer below the current layer" +msgstr "Seleccionar la capa por debajo de la actual" + +#. Will be followed with e.g. "Shift-Click +#. on thumbnail" +#. +#: ../app/actions/layers-actions.c:442 +msgid "Shortcut: " +msgstr "Combinación de teclas: " + +#. Will be prepended with a modifier key +#. string, e.g. "Shift" +#. +#: ../app/actions/layers-actions.c:447 +msgid "-Click on thumbnail in Layers dockable" +msgstr "-Pulse sobre la miniatura del empotrable de capas" + +#: ../app/actions/layers-actions.c:605 ../app/actions/layers-actions.c:606 +msgctxt "layers-action" +msgid "To _New Layer" +msgstr "A una capa _nueva" + +#: ../app/actions/layers-commands.c:203 +msgid "Layer Attributes" +msgstr "Atributos de la capa" + +#: ../app/actions/layers-commands.c:206 +msgid "Edit Layer Attributes" +msgstr "Editar atributos de capa" + +#: ../app/actions/layers-commands.c:250 ../app/core/gimplayer.c:267 +msgid "Layer" +msgstr "Capa" + +#: ../app/actions/layers-commands.c:252 ../app/actions/layers-commands.c:320 +#: ../app/widgets/gimpdrawabletreeview.c:326 +#: ../app/widgets/gimplayertreeview.c:837 +msgid "New Layer" +msgstr "Capa nueva" + +#: ../app/actions/layers-commands.c:255 +msgid "Create a New Layer" +msgstr "Crear una capa nueva" + +#: ../app/actions/layers-commands.c:356 +msgid "Visible" +msgstr "Visible" + +#: ../app/actions/layers-commands.c:618 +msgid "Set Layer Boundary Size" +msgstr "Establecer el tamaño de borde de capa" + +#: ../app/actions/layers-commands.c:663 +msgid "Scale Layer" +msgstr "Escalar la capa" + +#: ../app/actions/layers-commands.c:701 +msgid "Crop Layer" +msgstr "Recortar la capa" + +#: ../app/actions/layers-commands.c:1080 +msgid "Please select a channel first" +msgstr "Seleccione un canal primero" + +#: ../app/actions/layers-commands.c:1088 +#: ../app/dialogs/layer-add-mask-dialog.c:82 +msgid "Add Layer Mask" +msgstr "Añadir máscara de capa" + +#: ../app/actions/palette-editor-actions.c:43 +msgctxt "palette-editor-action" +msgid "Palette Editor Menu" +msgstr "Menú del editor de paleta" + +#: ../app/actions/palette-editor-actions.c:47 +msgctxt "palette-editor-action" +msgid "_Edit Color..." +msgstr "_Editar color…" + +#: ../app/actions/palette-editor-actions.c:48 +msgctxt "palette-editor-action" +msgid "Edit this entry" +msgstr "Edita esta entrada" + +#: ../app/actions/palette-editor-actions.c:53 +msgctxt "palette-editor-action" +msgid "_Delete Color" +msgstr "_Eliminar color" + +#: ../app/actions/palette-editor-actions.c:54 +msgctxt "palette-editor-action" +msgid "Delete this entry" +msgstr "Borra esta entrada" + +#: ../app/actions/palette-editor-actions.c:62 +msgctxt "palette-editor-action" +msgid "Edit Active Palette" +msgstr "Editar paleta activa" + +#: ../app/actions/palette-editor-actions.c:71 +msgctxt "palette-editor-action" +msgid "New Color from _FG" +msgstr "Color nuevo desde el _frente" + +#: ../app/actions/palette-editor-actions.c:73 +msgctxt "palette-editor-action" +msgid "Create a new entry from the foreground color" +msgstr "Crear una entrada nueva a partir del color del frente" + +#: ../app/actions/palette-editor-actions.c:78 +msgctxt "palette-editor-action" +msgid "New Color from _BG" +msgstr "Color nuevo desde el f_ondo" + +#: ../app/actions/palette-editor-actions.c:80 +msgctxt "palette-editor-action" +msgid "Create a new entry from the background color" +msgstr "Crear una entrada nueva a partir del color del fondo" + +#: ../app/actions/palette-editor-actions.c:88 +msgid "Zoom _In" +msgstr "_Ampliar" + +#: ../app/actions/palette-editor-actions.c:94 +msgid "Zoom _Out" +msgstr "Re_ducir" + +#: ../app/actions/palette-editor-actions.c:100 +msgid "Zoom _All" +msgstr "Ampliar _todo" + +#: ../app/actions/palette-editor-commands.c:68 +msgid "Edit Palette Color" +msgstr "Editar el color de la paleta" + +#: ../app/actions/palette-editor-commands.c:70 +msgid "Edit Color Palette Entry" +msgstr "Editar la entrada de la paleta de colores" + +#: ../app/actions/palettes-actions.c:43 +msgctxt "palettes-action" +msgid "Palettes Menu" +msgstr "Menú de paletas" + +#: ../app/actions/palettes-actions.c:47 +msgctxt "palettes-action" +msgid "_New Palette" +msgstr "Paleta _nueva" + +#: ../app/actions/palettes-actions.c:48 +msgctxt "palettes-action" +msgid "Create a new palette" +msgstr "Crear una paleta nueva" + +#: ../app/actions/palettes-actions.c:53 +msgctxt "palettes-action" +msgid "_Import Palette..." +msgstr "_Importar paleta…" + +#: ../app/actions/palettes-actions.c:54 +msgctxt "palettes-action" +msgid "Import palette" +msgstr "Importar paleta" + +#: ../app/actions/palettes-actions.c:59 +msgctxt "palettes-action" +msgid "D_uplicate Palette" +msgstr "D_uplicar paleta" + +#: ../app/actions/palettes-actions.c:60 +msgctxt "palettes-action" +msgid "Duplicate this palette" +msgstr "Duplicar esta paleta" + +#: ../app/actions/palettes-actions.c:65 +msgctxt "palettes-action" +msgid "_Merge Palettes..." +msgstr "Co_mbinar paletas…" + +#: ../app/actions/palettes-actions.c:66 +msgctxt "palettes-action" +msgid "Merge palettes" +msgstr "Combinar paletas" + +#: ../app/actions/palettes-actions.c:71 +msgctxt "palettes-action" +msgid "Copy Palette _Location" +msgstr "Copiar la _localización de la paleta" + +#: ../app/actions/palettes-actions.c:72 +msgctxt "palettes-action" +msgid "Copy palette file location to clipboard" +msgstr "Copiar al portapapeles la localización del archivo de la paleta" + +#: ../app/actions/palettes-actions.c:77 +msgctxt "palettes-action" +msgid "_Delete Palette" +msgstr "Elimi_nar paleta" + +#: ../app/actions/palettes-actions.c:78 +msgctxt "palettes-action" +msgid "Delete this palette" +msgstr "Eliminar esta paleta" + +#: ../app/actions/palettes-actions.c:83 +msgctxt "palettes-action" +msgid "_Refresh Palettes" +msgstr "_Refrescar paletas" + +#: ../app/actions/palettes-actions.c:84 +msgctxt "palettes-action" +msgid "Refresh palettes" +msgstr "Refrescar paletas" + +#: ../app/actions/palettes-actions.c:92 +msgctxt "palettes-action" +msgid "_Edit Palette..." +msgstr "_Editar paleta…" + +#: ../app/actions/palettes-actions.c:93 +msgctxt "palettes-action" +msgid "Edit palette" +msgstr "Editar la paleta" + +#: ../app/actions/palettes-commands.c:72 +msgid "Merge Palette" +msgstr "Combinar la paleta" + +#: ../app/actions/palettes-commands.c:76 +msgid "Enter a name for the merged palette" +msgstr "Introduzca un nombre para la paleta combinada" + +#: ../app/actions/patterns-actions.c:42 +msgctxt "patterns-action" +msgid "Patterns Menu" +msgstr "Menú de patrones" + +#: ../app/actions/patterns-actions.c:46 +msgctxt "patterns-action" +msgid "_Open Pattern as Image" +msgstr "_Abrir el patrón como una imagen" + +#: ../app/actions/patterns-actions.c:47 +msgctxt "patterns-action" +msgid "Open this pattern as an image" +msgstr "Abre este patrón como una imagen" + +#: ../app/actions/patterns-actions.c:52 +msgctxt "patterns-action" +msgid "_New Pattern" +msgstr "Patrón _nuevo" + +#: ../app/actions/patterns-actions.c:53 +msgctxt "patterns-action" +msgid "Create a new pattern" +msgstr "Crear un patrón nuevo" + +#: ../app/actions/patterns-actions.c:58 +msgctxt "patterns-action" +msgid "D_uplicate Pattern" +msgstr "D_uplicar patrón" + +#: ../app/actions/patterns-actions.c:59 +msgctxt "patterns-action" +msgid "Duplicate this pattern" +msgstr "Duplicar este patrón" + +#: ../app/actions/patterns-actions.c:64 +msgctxt "patterns-action" +msgid "Copy Pattern _Location" +msgstr "Copiar la _localización del patrón" + +#: ../app/actions/patterns-actions.c:65 +msgctxt "patterns-action" +msgid "Copy pattern file location to clipboard" +msgstr "Copiar al portapapeles la localización del archivo de patrón" + +#: ../app/actions/patterns-actions.c:70 +msgctxt "patterns-action" +msgid "_Delete Pattern" +msgstr "_Eliminar patrón" + +#: ../app/actions/patterns-actions.c:71 +msgctxt "patterns-action" +msgid "Delete this pattern" +msgstr "Eliminar este patrón" + +#: ../app/actions/patterns-actions.c:76 +msgctxt "patterns-action" +msgid "_Refresh Patterns" +msgstr "_Refrescar patrones" + +#: ../app/actions/patterns-actions.c:77 +msgctxt "patterns-action" +msgid "Refresh patterns" +msgstr "Refrescar patrones" + +#: ../app/actions/patterns-actions.c:85 +msgctxt "patterns-action" +msgid "_Edit Pattern..." +msgstr "_Editar patrón…" + +#: ../app/actions/patterns-actions.c:86 +msgctxt "patterns-action" +msgid "Edit pattern" +msgstr "Editar patrón" + +#: ../app/actions/plug-in-actions.c:85 +msgctxt "plug-in-action" +msgid "Filte_rs" +msgstr "_Filtros" + +#: ../app/actions/plug-in-actions.c:87 +msgctxt "plug-in-action" +msgid "Recently Used" +msgstr "Usados recientemente" + # Difuminar -#: ../app/actions/plug-in-actions.c:89 -msgctxt "plug-in-action" -msgid "_Blur" -msgstr "_Difuminar" - -#: ../app/actions/plug-in-actions.c:91 -msgctxt "plug-in-action" -msgid "_Noise" -msgstr "_Ruido" - -#: ../app/actions/plug-in-actions.c:93 -msgctxt "plug-in-action" -msgid "Edge-De_tect" -msgstr "De_tectar bordes" - -#: ../app/actions/plug-in-actions.c:95 -msgctxt "plug-in-action" -msgid "En_hance" -msgstr "Rea_lzar [Enhance]" - -#: ../app/actions/plug-in-actions.c:97 -msgctxt "plug-in-action" -msgid "C_ombine" -msgstr "C_ombinar" - -#: ../app/actions/plug-in-actions.c:99 -msgctxt "plug-in-action" -msgid "_Generic" -msgstr "_Genérico" - -#: ../app/actions/plug-in-actions.c:101 -msgctxt "plug-in-action" -msgid "_Light and Shadow" -msgstr "_Luces y sombras" - -#: ../app/actions/plug-in-actions.c:103 -msgctxt "plug-in-action" -msgid "_Distorts" -msgstr "_Distorsiones" - -#: ../app/actions/plug-in-actions.c:105 -msgctxt "plug-in-action" -msgid "_Artistic" -msgstr "_Artísticos" - -#: ../app/actions/plug-in-actions.c:107 -msgctxt "plug-in-action" -msgid "_Decor" -msgstr "_Decorativos" - -#: ../app/actions/plug-in-actions.c:109 -msgctxt "plug-in-action" -msgid "_Map" -msgstr "_Mapa" - -#: ../app/actions/plug-in-actions.c:111 -msgctxt "plug-in-action" -msgid "_Render" -msgstr "_Renderizado" - -#: ../app/actions/plug-in-actions.c:113 -msgctxt "plug-in-action" -msgid "_Clouds" -msgstr "_Nubes" - -#: ../app/actions/plug-in-actions.c:115 -msgctxt "plug-in-action" -msgid "_Nature" -msgstr "_Naturaleza" - -#: ../app/actions/plug-in-actions.c:117 -msgctxt "plug-in-action" -msgid "_Pattern" -msgstr "_Patrón" - -#: ../app/actions/plug-in-actions.c:119 -msgctxt "plug-in-action" -msgid "_Web" -msgstr "_Web" - -#: ../app/actions/plug-in-actions.c:121 -msgctxt "plug-in-action" -msgid "An_imation" -msgstr "An_imación" - -#: ../app/actions/plug-in-actions.c:124 -msgctxt "plug-in-action" -msgid "Reset all _Filters" -msgstr "Restablecer todos los _filtros" - -#: ../app/actions/plug-in-actions.c:125 -msgctxt "plug-in-action" -msgid "Reset all plug-ins to their default settings" -msgstr "Poner todos los complementos a su configuración predeterminada" - -#: ../app/actions/plug-in-actions.c:133 -msgctxt "plug-in-action" -msgid "Re_peat Last" -msgstr "Re_petir el último" - -#: ../app/actions/plug-in-actions.c:135 -msgctxt "plug-in-action" -msgid "Rerun the last used plug-in using the same settings" -msgstr "Ejecutar el último complemento usado con los mismos ajustes" - -#: ../app/actions/plug-in-actions.c:140 -msgctxt "plug-in-action" -msgid "R_e-Show Last" -msgstr "_Volver a mostrar el último" - -#: ../app/actions/plug-in-actions.c:141 -msgctxt "plug-in-action" -msgid "Show the last used plug-in dialog again" -msgstr "Muestra otra vez el diálogo del último complemento utilizado" - -#: ../app/actions/plug-in-actions.c:551 -#, c-format -msgid "Re_peat \"%s\"" -msgstr "Re_petir «%s»" - -#: ../app/actions/plug-in-actions.c:552 -#, c-format -msgid "R_e-Show \"%s\"" -msgstr "Volv_er a mostrar «%s»" - -#: ../app/actions/plug-in-actions.c:568 -msgid "Repeat Last" -msgstr "Repetir el último" - -#: ../app/actions/plug-in-actions.c:570 -msgid "Re-Show Last" -msgstr "Volver a mostrar el último" - -#: ../app/actions/plug-in-commands.c:262 -msgid "Reset all Filters" -msgstr "Restablecer todos los filtros" - -#: ../app/actions/plug-in-commands.c:281 -msgid "Do you really want to reset all filters to default values?" -msgstr "" -"¿Realmente desea reiniciar todos los filtros con sus valores predeterminados?" - -#: ../app/actions/quick-mask-actions.c:43 -msgctxt "quick-mask-action" -msgid "Quick Mask Menu" -msgstr "Menú de la máscara rápida" - -#: ../app/actions/quick-mask-actions.c:47 -msgctxt "quick-mask-action" -msgid "_Configure Color and Opacity..." -msgstr "_Configurar el color y la opacidad…" - -#: ../app/actions/quick-mask-actions.c:55 -msgctxt "quick-mask-action" -msgid "Toggle _Quick Mask" -msgstr "Activar máscara _rápida" - -#: ../app/actions/quick-mask-actions.c:56 -msgctxt "quick-mask-action" -msgid "Toggle Quick Mask on/off" -msgstr "Activar o desactiva la máscara rápida" - -#: ../app/actions/quick-mask-actions.c:65 -msgctxt "quick-mask-action" -msgid "Mask _Selected Areas" -msgstr "Enmascarar las áreas _seleccionadas" - -#: ../app/actions/quick-mask-actions.c:70 -msgctxt "quick-mask-action" -msgid "Mask _Unselected Areas" -msgstr "Enmascarar las áreas _no seleccionadas" - -#: ../app/actions/quick-mask-commands.c:105 -msgid "Quick Mask Attributes" -msgstr "Atributos de la máscara rápida" - -#: ../app/actions/quick-mask-commands.c:108 -msgid "Edit Quick Mask Attributes" -msgstr "Editar los atributos de la máscara rápida" - -#: ../app/actions/quick-mask-commands.c:110 -msgid "Edit Quick Mask Color" -msgstr "Editar el color de la máscara rápida" - -#: ../app/actions/quick-mask-commands.c:111 -msgid "_Mask opacity:" -msgstr "Opacidad de la _máscara:" - -#: ../app/actions/sample-points-actions.c:39 -msgctxt "sample-points-action" -msgid "Sample Point Menu" -msgstr "Menú del punto de muestra" - -#: ../app/actions/sample-points-actions.c:46 -msgctxt "sample-points-action" -msgid "_Sample Merged" -msgstr "_Muestra combinada" - -#: ../app/actions/sample-points-actions.c:48 -msgctxt "sample-points-action" -msgid "Use the composite color of all visible layers" -msgstr "Usar el color combinado de todas las capas visibles" - -#: ../app/actions/select-actions.c:44 -msgctxt "select-action" -msgid "Selection Editor Menu" -msgstr "Menú del editor de selección" - -#: ../app/actions/select-actions.c:47 -msgctxt "select-action" -msgid "_Select" -msgstr "_Seleccionar" - -#: ../app/actions/select-actions.c:50 -msgctxt "select-action" -msgid "_All" -msgstr "_Todo" - -#: ../app/actions/select-actions.c:51 -msgctxt "select-action" -msgid "Select everything" -msgstr "Seleccionar todo" - -#: ../app/actions/select-actions.c:56 -msgctxt "select-action" -msgid "_None" -msgstr "_Nada" - -#: ../app/actions/select-actions.c:57 -msgctxt "select-action" -msgid "Dismiss the selection" -msgstr "Descartar la selección" - -#: ../app/actions/select-actions.c:62 -msgctxt "select-action" -msgid "_Invert" -msgstr "_Invertir" - -#: ../app/actions/select-actions.c:63 -msgctxt "select-action" -msgid "Invert the selection" -msgstr "Invertir la selección" - -#: ../app/actions/select-actions.c:68 -msgctxt "select-action" -msgid "_Float" -msgstr "_Flotante" - -#: ../app/actions/select-actions.c:69 -msgctxt "select-action" -msgid "Create a floating selection" -msgstr "Crear una selección flotante" - -#: ../app/actions/select-actions.c:74 -msgctxt "select-action" -msgid "Fea_ther..." -msgstr "Di_fuminar [Feather]…" - +#: ../app/actions/plug-in-actions.c:89 +msgctxt "plug-in-action" +msgid "_Blur" +msgstr "_Difuminar" + +#: ../app/actions/plug-in-actions.c:91 +msgctxt "plug-in-action" +msgid "_Noise" +msgstr "_Ruido" + +#: ../app/actions/plug-in-actions.c:93 +msgctxt "plug-in-action" +msgid "Edge-De_tect" +msgstr "De_tectar bordes" + +#: ../app/actions/plug-in-actions.c:95 +msgctxt "plug-in-action" +msgid "En_hance" +msgstr "Rea_lzar [Enhance]" + +#: ../app/actions/plug-in-actions.c:97 +msgctxt "plug-in-action" +msgid "C_ombine" +msgstr "C_ombinar" + +#: ../app/actions/plug-in-actions.c:99 +msgctxt "plug-in-action" +msgid "_Generic" +msgstr "_Genérico" + +#: ../app/actions/plug-in-actions.c:101 +msgctxt "plug-in-action" +msgid "_Light and Shadow" +msgstr "_Luces y sombras" + +#: ../app/actions/plug-in-actions.c:103 +msgctxt "plug-in-action" +msgid "_Distorts" +msgstr "_Distorsiones" + +#: ../app/actions/plug-in-actions.c:105 +msgctxt "plug-in-action" +msgid "_Artistic" +msgstr "_Artísticos" + +#: ../app/actions/plug-in-actions.c:107 +msgctxt "plug-in-action" +msgid "_Decor" +msgstr "_Decorativos" + +#: ../app/actions/plug-in-actions.c:109 +msgctxt "plug-in-action" +msgid "_Map" +msgstr "_Mapa" + +#: ../app/actions/plug-in-actions.c:111 +msgctxt "plug-in-action" +msgid "_Render" +msgstr "_Renderizado" + +#: ../app/actions/plug-in-actions.c:113 +msgctxt "plug-in-action" +msgid "_Clouds" +msgstr "_Nubes" + +#: ../app/actions/plug-in-actions.c:115 +msgctxt "plug-in-action" +msgid "_Nature" +msgstr "_Naturaleza" + +#: ../app/actions/plug-in-actions.c:117 +msgctxt "plug-in-action" +msgid "_Pattern" +msgstr "_Patrón" + +#: ../app/actions/plug-in-actions.c:119 +msgctxt "plug-in-action" +msgid "_Web" +msgstr "_Web" + +#: ../app/actions/plug-in-actions.c:121 +msgctxt "plug-in-action" +msgid "An_imation" +msgstr "An_imación" + +#: ../app/actions/plug-in-actions.c:124 +msgctxt "plug-in-action" +msgid "Reset all _Filters" +msgstr "Restablecer todos los _filtros" + +#: ../app/actions/plug-in-actions.c:125 +msgctxt "plug-in-action" +msgid "Reset all plug-ins to their default settings" +msgstr "Poner todos los complementos a su configuración predeterminada" + +#: ../app/actions/plug-in-actions.c:133 +msgctxt "plug-in-action" +msgid "Re_peat Last" +msgstr "Re_petir el último" + +#: ../app/actions/plug-in-actions.c:135 +msgctxt "plug-in-action" +msgid "Rerun the last used plug-in using the same settings" +msgstr "Ejecutar el último complemento usado con los mismos ajustes" + +#: ../app/actions/plug-in-actions.c:140 +msgctxt "plug-in-action" +msgid "R_e-Show Last" +msgstr "_Volver a mostrar el último" + +#: ../app/actions/plug-in-actions.c:141 +msgctxt "plug-in-action" +msgid "Show the last used plug-in dialog again" +msgstr "Muestra otra vez el diálogo del último complemento utilizado" + +#: ../app/actions/plug-in-actions.c:551 +#, c-format +msgid "Re_peat \"%s\"" +msgstr "Re_petir «%s»" + +#: ../app/actions/plug-in-actions.c:552 +#, c-format +msgid "R_e-Show \"%s\"" +msgstr "Volv_er a mostrar «%s»" + +#: ../app/actions/plug-in-actions.c:568 +msgid "Repeat Last" +msgstr "Repetir el último" + +#: ../app/actions/plug-in-actions.c:570 +msgid "Re-Show Last" +msgstr "Volver a mostrar el último" + +#: ../app/actions/plug-in-commands.c:262 +msgid "Reset all Filters" +msgstr "Restablecer todos los filtros" + +#: ../app/actions/plug-in-commands.c:281 +msgid "Do you really want to reset all filters to default values?" +msgstr "" +"¿Realmente desea reiniciar todos los filtros con sus valores predeterminados?" + +#: ../app/actions/quick-mask-actions.c:43 +msgctxt "quick-mask-action" +msgid "Quick Mask Menu" +msgstr "Menú de la máscara rápida" + +#: ../app/actions/quick-mask-actions.c:47 +msgctxt "quick-mask-action" +msgid "_Configure Color and Opacity..." +msgstr "_Configurar el color y la opacidad…" + +#: ../app/actions/quick-mask-actions.c:55 +msgctxt "quick-mask-action" +msgid "Toggle _Quick Mask" +msgstr "Activar máscara _rápida" + +#: ../app/actions/quick-mask-actions.c:56 +msgctxt "quick-mask-action" +msgid "Toggle Quick Mask on/off" +msgstr "Activar o desactiva la máscara rápida" + +#: ../app/actions/quick-mask-actions.c:65 +msgctxt "quick-mask-action" +msgid "Mask _Selected Areas" +msgstr "Enmascarar las áreas _seleccionadas" + +#: ../app/actions/quick-mask-actions.c:70 +msgctxt "quick-mask-action" +msgid "Mask _Unselected Areas" +msgstr "Enmascarar las áreas _no seleccionadas" + +#: ../app/actions/quick-mask-commands.c:105 +msgid "Quick Mask Attributes" +msgstr "Atributos de la máscara rápida" + +#: ../app/actions/quick-mask-commands.c:108 +msgid "Edit Quick Mask Attributes" +msgstr "Editar los atributos de la máscara rápida" + +#: ../app/actions/quick-mask-commands.c:110 +msgid "Edit Quick Mask Color" +msgstr "Editar el color de la máscara rápida" + +#: ../app/actions/quick-mask-commands.c:111 +msgid "_Mask opacity:" +msgstr "Opacidad de la _máscara:" + +#: ../app/actions/sample-points-actions.c:39 +msgctxt "sample-points-action" +msgid "Sample Point Menu" +msgstr "Menú del punto de muestra" + +#: ../app/actions/sample-points-actions.c:46 +msgctxt "sample-points-action" +msgid "_Sample Merged" +msgstr "_Muestra combinada" + +#: ../app/actions/sample-points-actions.c:48 +msgctxt "sample-points-action" +msgid "Use the composite color of all visible layers" +msgstr "Usar el color combinado de todas las capas visibles" + +#: ../app/actions/select-actions.c:44 +msgctxt "select-action" +msgid "Selection Editor Menu" +msgstr "Menú del editor de selección" + +#: ../app/actions/select-actions.c:47 +msgctxt "select-action" +msgid "_Select" +msgstr "_Seleccionar" + +#: ../app/actions/select-actions.c:50 +msgctxt "select-action" +msgid "_All" +msgstr "_Todo" + +#: ../app/actions/select-actions.c:51 +msgctxt "select-action" +msgid "Select everything" +msgstr "Seleccionar todo" + +#: ../app/actions/select-actions.c:56 +msgctxt "select-action" +msgid "_None" +msgstr "_Nada" + +#: ../app/actions/select-actions.c:57 +msgctxt "select-action" +msgid "Dismiss the selection" +msgstr "Descartar la selección" + +#: ../app/actions/select-actions.c:62 +msgctxt "select-action" +msgid "_Invert" +msgstr "_Invertir" + +#: ../app/actions/select-actions.c:63 +msgctxt "select-action" +msgid "Invert the selection" +msgstr "Invertir la selección" + +#: ../app/actions/select-actions.c:68 +msgctxt "select-action" +msgid "_Float" +msgstr "_Flotante" + +#: ../app/actions/select-actions.c:69 +msgctxt "select-action" +msgid "Create a floating selection" +msgstr "Crear una selección flotante" + +#: ../app/actions/select-actions.c:74 +msgctxt "select-action" +msgid "Fea_ther..." +msgstr "Di_fuminar [Feather]…" + # Blur == Difuminar -#: ../app/actions/select-actions.c:76 -msgctxt "select-action" -msgid "Blur the selection border so that it fades out smoothly" -msgstr "Difuminar el borde de selección para que se desvanezca suavemente" - -#: ../app/actions/select-actions.c:81 -msgctxt "select-action" -msgid "_Sharpen" -msgstr "_Perfilar" - -#: ../app/actions/select-actions.c:82 -msgctxt "select-action" -msgid "Remove fuzziness from the selection" -msgstr "Eliminar la borrosidad de la selección" - -#: ../app/actions/select-actions.c:87 -msgctxt "select-action" -msgid "S_hrink..." -msgstr "_Encoger [Shrink]…" - -#: ../app/actions/select-actions.c:88 -msgctxt "select-action" -msgid "Contract the selection" -msgstr "Contraer la selección" - -#: ../app/actions/select-actions.c:93 -msgctxt "select-action" -msgid "_Grow..." -msgstr "Agran_dar [Grow]…" - -#: ../app/actions/select-actions.c:94 -msgctxt "select-action" -msgid "Enlarge the selection" -msgstr "Aumentar el tamaño de la selección" - -#: ../app/actions/select-actions.c:99 -msgctxt "select-action" -msgid "Bo_rder..." -msgstr "Bor_de…" - -#: ../app/actions/select-actions.c:100 -msgctxt "select-action" -msgid "Replace the selection by its border" -msgstr "Reemplazar la selección por su borde" - -#: ../app/actions/select-actions.c:105 -msgctxt "select-action" -msgid "Save to _Channel" -msgstr "Guardar en _canal" - -#: ../app/actions/select-actions.c:106 -msgctxt "select-action" -msgid "Save the selection to a channel" -msgstr "Guarda la selección en un canal" - -#: ../app/actions/select-actions.c:111 -msgctxt "select-action" -msgid "_Stroke Selection..." -msgstr "_Trazar selección [Stroke]…" - -#: ../app/actions/select-actions.c:112 -msgctxt "select-action" -msgid "Paint along the selection outline" -msgstr "Pintar a lo largo del contorno de la selección" - -#: ../app/actions/select-actions.c:117 -msgctxt "select-action" -msgid "_Stroke Selection" -msgstr "_Trazar selección [Stroke]" - -#: ../app/actions/select-actions.c:118 -msgctxt "select-action" -msgid "Stroke the selection with last used values" -msgstr "Trazar la selección con los últimos valores usados" - -#: ../app/actions/select-commands.c:156 -msgid "Feather Selection" -msgstr "Difuminar selección [Feather]" - -#: ../app/actions/select-commands.c:160 -msgid "Feather selection by" -msgstr "Difuminar selección en" - -#: ../app/actions/select-commands.c:197 -msgid "Shrink Selection" -msgstr "Encoger selección" - -#: ../app/actions/select-commands.c:201 -msgid "Shrink selection by" -msgstr "Encoger selección en" - -#: ../app/actions/select-commands.c:209 -msgid "_Shrink from image border" -msgstr "_Encoger desde el borde de la imagen" - -#: ../app/actions/select-commands.c:237 -msgid "Grow Selection" -msgstr "Agrandar selección" - -#: ../app/actions/select-commands.c:241 -msgid "Grow selection by" -msgstr "Agrandar selección en" - -#: ../app/actions/select-commands.c:267 -msgid "Border Selection" -msgstr "Selección de borde" - +#: ../app/actions/select-actions.c:76 +msgctxt "select-action" +msgid "Blur the selection border so that it fades out smoothly" +msgstr "Difuminar el borde de selección para que se desvanezca suavemente" + +#: ../app/actions/select-actions.c:81 +msgctxt "select-action" +msgid "_Sharpen" +msgstr "_Perfilar" + +#: ../app/actions/select-actions.c:82 +msgctxt "select-action" +msgid "Remove fuzziness from the selection" +msgstr "Eliminar la borrosidad de la selección" + +#: ../app/actions/select-actions.c:87 +msgctxt "select-action" +msgid "S_hrink..." +msgstr "_Encoger [Shrink]…" + +#: ../app/actions/select-actions.c:88 +msgctxt "select-action" +msgid "Contract the selection" +msgstr "Contraer la selección" + +#: ../app/actions/select-actions.c:93 +msgctxt "select-action" +msgid "_Grow..." +msgstr "Agran_dar [Grow]…" + +#: ../app/actions/select-actions.c:94 +msgctxt "select-action" +msgid "Enlarge the selection" +msgstr "Aumentar el tamaño de la selección" + +#: ../app/actions/select-actions.c:99 +msgctxt "select-action" +msgid "Bo_rder..." +msgstr "Bor_de…" + +#: ../app/actions/select-actions.c:100 +msgctxt "select-action" +msgid "Replace the selection by its border" +msgstr "Reemplazar la selección por su borde" + +#: ../app/actions/select-actions.c:105 +msgctxt "select-action" +msgid "Save to _Channel" +msgstr "Guardar en _canal" + +#: ../app/actions/select-actions.c:106 +msgctxt "select-action" +msgid "Save the selection to a channel" +msgstr "Guarda la selección en un canal" + +#: ../app/actions/select-actions.c:111 +msgctxt "select-action" +msgid "_Stroke Selection..." +msgstr "_Trazar selección [Stroke]…" + +#: ../app/actions/select-actions.c:112 +msgctxt "select-action" +msgid "Paint along the selection outline" +msgstr "Pintar a lo largo del contorno de la selección" + +#: ../app/actions/select-actions.c:117 +msgctxt "select-action" +msgid "_Stroke Selection" +msgstr "_Trazar selección [Stroke]" + +#: ../app/actions/select-actions.c:118 +msgctxt "select-action" +msgid "Stroke the selection with last used values" +msgstr "Trazar la selección con los últimos valores usados" + +#: ../app/actions/select-commands.c:156 +msgid "Feather Selection" +msgstr "Difuminar selección [Feather]" + +#: ../app/actions/select-commands.c:160 +msgid "Feather selection by" +msgstr "Difuminar selección en" + +#: ../app/actions/select-commands.c:197 +msgid "Shrink Selection" +msgstr "Encoger selección" + +#: ../app/actions/select-commands.c:201 +msgid "Shrink selection by" +msgstr "Encoger selección en" + +#: ../app/actions/select-commands.c:209 +msgid "_Shrink from image border" +msgstr "_Encoger desde el borde de la imagen" + +#: ../app/actions/select-commands.c:237 +msgid "Grow Selection" +msgstr "Agrandar selección" + +#: ../app/actions/select-commands.c:241 +msgid "Grow selection by" +msgstr "Agrandar selección en" + +#: ../app/actions/select-commands.c:267 +msgid "Border Selection" +msgstr "Selección de borde" + # ¿Bordear selección por (serrador) -#: ../app/actions/select-commands.c:271 -msgid "Border selection by" -msgstr "Selección de borde en" - -#. Feather button -#: ../app/actions/select-commands.c:280 -msgid "_Feather border" -msgstr "_Difuminar los bordes" - -#. Edge lock button -#: ../app/actions/select-commands.c:293 -msgid "_Lock selection to image edges" -msgstr "Fijar _la selección a los bordes de la imagen" - -#: ../app/actions/select-commands.c:345 ../app/actions/select-commands.c:378 -#: ../app/actions/vectors-commands.c:386 ../app/actions/vectors-commands.c:420 -#: ../app/dialogs/stroke-dialog.c:281 -msgid "There is no active layer or channel to stroke to." -msgstr "No hay una capa o canal activo adonde se pueda trazar." - -#: ../app/actions/select-commands.c:351 -msgid "Stroke Selection" -msgstr "Trazar selección" - -#: ../app/actions/templates-actions.c:41 -msgctxt "templates-action" -msgid "Templates Menu" -msgstr "Menú de plantillas" - -#: ../app/actions/templates-actions.c:45 -msgctxt "templates-action" -msgid "_Create Image from Template" -msgstr "_Crear una imagen a partir de la plantilla" - -#: ../app/actions/templates-actions.c:46 -msgctxt "templates-action" -msgid "Create a new image from the selected template" -msgstr "Crear una imagen nueva a partir de la plantilla seleccionada" - -#: ../app/actions/templates-actions.c:51 -msgctxt "templates-action" -msgid "_New Template..." -msgstr "Plantilla _nueva…" - -#: ../app/actions/templates-actions.c:52 -msgctxt "templates-action" -msgid "Create a new template" -msgstr "Crear una plantilla nueva" - -#: ../app/actions/templates-actions.c:57 -msgctxt "templates-action" -msgid "D_uplicate Template..." -msgstr "D_uplicar plantilla…" - -#: ../app/actions/templates-actions.c:58 -msgctxt "templates-action" -msgid "Duplicate this template" -msgstr "Duplicar la plantilla seleccionada" - -#: ../app/actions/templates-actions.c:63 -msgctxt "templates-action" -msgid "_Edit Template..." -msgstr "_Editar la plantilla…" - -#: ../app/actions/templates-actions.c:64 -msgctxt "templates-action" -msgid "Edit this template" -msgstr "Editar esta plantilla" - -#: ../app/actions/templates-actions.c:69 -msgctxt "templates-action" -msgid "_Delete Template" -msgstr "_Eliminar la plantilla" - -#: ../app/actions/templates-actions.c:70 -msgctxt "templates-action" -msgid "Delete this template" -msgstr "Eliminar esta plantilla" - -#: ../app/actions/templates-commands.c:110 -msgid "New Template" -msgstr "Plantilla nueva" - -#: ../app/actions/templates-commands.c:113 -msgid "Create a New Template" -msgstr "Crear una plantilla nueva" - -#: ../app/actions/templates-commands.c:173 -#: ../app/actions/templates-commands.c:176 -msgid "Edit Template" -msgstr "Editar plantilla" - -#: ../app/actions/templates-commands.c:211 -msgid "Delete Template" -msgstr "Eliminar la plantilla" - -#: ../app/actions/templates-commands.c:237 -#, c-format -msgid "" -"Are you sure you want to delete template '%s' from the list and from disk?" -msgstr "¿Está seguro de que quiere eliminar «%s» de la lista y del disco?" - -#: ../app/actions/text-editor-actions.c:43 -msgctxt "text-editor-action" -msgid "Open" -msgstr "Abrir" - -#: ../app/actions/text-editor-actions.c:44 -msgctxt "text-editor-action" -msgid "Load text from file" -msgstr "Cargar texto desde un archivo" - -#: ../app/actions/text-editor-actions.c:49 -msgctxt "text-editor-action" -msgid "Clear" -msgstr "Limpiar" - -#: ../app/actions/text-editor-actions.c:50 -msgctxt "text-editor-action" -msgid "Clear all text" -msgstr "Borrar todo el texto" - -#: ../app/actions/text-editor-actions.c:58 -msgctxt "text-editor-action" -msgid "LTR" -msgstr "I->D" - -#: ../app/actions/text-editor-actions.c:59 -msgctxt "text-editor-action" -msgid "From left to right" -msgstr "De izquierda a derecha" - -#: ../app/actions/text-editor-actions.c:64 -msgctxt "text-editor-action" -msgid "RTL" -msgstr "D->I" - -#: ../app/actions/text-editor-actions.c:65 -msgctxt "text-editor-action" -msgid "From right to left" -msgstr "De derecha a izquierda" - -#: ../app/actions/text-editor-commands.c:62 -#: ../app/actions/text-tool-commands.c:117 -msgid "Open Text File (UTF-8)" -msgstr "Abrir archivo de texto (UTF-8)" - -#: ../app/actions/text-editor-commands.c:143 -#: ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58 -#: ../app/core/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:443 -#: ../app/core/gimpbrushgenerated-load.c:73 -#: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54 -#: ../app/core/gimpgradient-load.c:63 ../app/core/gimppalette-load.c:77 -#: ../app/core/gimppalette-load.c:274 ../app/core/gimppalette-load.c:320 -#: ../app/core/gimppalette-load.c:377 ../app/core/gimppalette-load.c:467 -#: ../app/core/gimppalette-load.c:634 ../app/core/gimppattern-load.c:76 -#: ../app/tools/gimpcurvestool.c:642 ../app/tools/gimplevelstool.c:747 -#: ../app/xcf/xcf.c:359 -#, c-format -msgid "Could not open '%s' for reading: %s" -msgstr "No se ha podido abrir «%s» para lectura: %s" - -#: ../app/actions/text-tool-actions.c:50 -msgctxt "text-tool-action" -msgid "Text Tool Menu" -msgstr "Menú de la herramienta de texto" - -#: ../app/actions/text-tool-actions.c:54 -msgctxt "text-tool-action" -msgid "Input _Methods" -msgstr "_Métodos de entrada" - -#: ../app/actions/text-tool-actions.c:58 -msgctxt "text-tool-action" -msgid "Cu_t" -msgstr "Cor_tar" - -#: ../app/actions/text-tool-actions.c:63 -msgctxt "text-tool-action" -msgid "_Copy" -msgstr "_Copiar" - -#: ../app/actions/text-tool-actions.c:68 -msgctxt "text-tool-action" -msgid "_Paste" -msgstr "_Pegar" - -#: ../app/actions/text-tool-actions.c:73 -msgctxt "text-tool-action" -msgid "_Delete" -msgstr "_Eliminar" - -#: ../app/actions/text-tool-actions.c:78 -msgctxt "text-tool-action" -msgid "_Open text file..." -msgstr "_Abrir archivo de texto…" - -#: ../app/actions/text-tool-actions.c:83 -msgctxt "text-tool-action" -msgid "Cl_ear" -msgstr "_Limpiar" - -#: ../app/actions/text-tool-actions.c:84 -msgctxt "text-tool-action" -msgid "Clear all text" -msgstr "Borrar todo el texto" - -#: ../app/actions/text-tool-actions.c:89 -msgctxt "text-tool-action" -msgid "_Path from Text" -msgstr "Ruta a partir del texto" - -#: ../app/actions/text-tool-actions.c:91 -msgctxt "text-tool-action" -msgid "Create a path from the outlines of the current text" -msgstr "Crea una ruta a partir del contorno del texto actual" - -#: ../app/actions/text-tool-actions.c:96 -msgctxt "text-tool-action" -msgid "Text _along Path" -msgstr "Texto siguiendo una rut_a" - -#: ../app/actions/text-tool-actions.c:98 -msgctxt "text-tool-action" -msgid "Bend the text along the currently active path" -msgstr "Hacer seguir el texto de esta capa a lo largo de la ruta" - -#: ../app/actions/text-tool-actions.c:106 -msgctxt "text-tool-action" -msgid "From left to right" -msgstr "De izquierda a derecha" - -#: ../app/actions/text-tool-actions.c:111 -msgctxt "text-tool-action" -msgid "From right to left" -msgstr "De derecha a izquierda" - -#: ../app/actions/tool-options-actions.c:56 -msgctxt "tool-options-action" -msgid "Tool Options Menu" -msgstr "Menú de opciones de herramienta" - -#: ../app/actions/tool-options-actions.c:60 -msgctxt "tool-options-action" -msgid "_Save Tool Preset" -msgstr "_Guardar ajuste prefijado de herramienta" - -#: ../app/actions/tool-options-actions.c:64 -msgctxt "tool-options-action" -msgid "_Restore Tool Preset" -msgstr "_Restaurar los ajustes prefijados de herramienta" - -#: ../app/actions/tool-options-actions.c:68 -msgctxt "tool-options-action" -msgid "E_dit Tool Preset" -msgstr "_Editar ajuste prefijado de herramienta" - -#: ../app/actions/tool-options-actions.c:72 -msgctxt "tool-options-action" -msgid "_Delete Tool Preset" -msgstr "_Eliminar ajuste prefijado de herramienta" - -#: ../app/actions/tool-options-actions.c:76 -msgctxt "tool-options-action" -msgid "_New Tool Preset..." -msgstr "_Nuevo ajuste prefijado de herramienta…" - -#: ../app/actions/tool-options-actions.c:81 -msgctxt "tool-options-action" -msgid "R_eset Tool Options" -msgstr "R_einiciar las opciones de las herramientas" - -#: ../app/actions/tool-options-actions.c:82 -msgctxt "tool-options-action" -msgid "Reset to default values" -msgstr "Reiniciar con los valores predeterminados" - -#: ../app/actions/tool-options-actions.c:87 -msgctxt "tool-options-action" -msgid "Reset _all Tool Options" -msgstr "Reiniciar _todas las opciones de herramientas" - -#: ../app/actions/tool-options-actions.c:88 -msgctxt "tool-options-action" -msgid "Reset all tool options" -msgstr "Reiniciar todas las opciones de herramientas" - -#: ../app/actions/tool-options-commands.c:186 -msgid "Reset All Tool Options" -msgstr "Reiniciar todas las opciones de las herramientas" - -#: ../app/actions/tool-options-commands.c:209 -msgid "Do you really want to reset all tool options to default values?" -msgstr "" -"¿Realmente desea reiniciar todas las opciones de herramientas con sus " -"valores predeterminados?" - -#: ../app/actions/tool-presets-actions.c:44 -msgctxt "tool-presets-action" -msgid "Tool Presets Menu" -msgstr "Menú de ajustes prefijados de herramienta" - -#: ../app/actions/tool-presets-actions.c:48 -msgctxt "tool-presets-action" -msgid "_New Tool Preset" -msgstr "_Nuevo ajuste prefijado de herramienta" - -#: ../app/actions/tool-presets-actions.c:49 -msgctxt "tool-presets-action" -msgid "Create a new tool preset" -msgstr "Crear un ajuste prefijado de herramienta" - -#: ../app/actions/tool-presets-actions.c:54 -msgctxt "tool-presets-action" -msgid "D_uplicate Tool Preset" -msgstr "D_uplicar ajuste prefijado de herramienta" - -#: ../app/actions/tool-presets-actions.c:55 -msgctxt "tool-presets-action" -msgid "Duplicate this tool preset" -msgstr "Duplicar este ajuste prefijado de herramienta" - -#: ../app/actions/tool-presets-actions.c:60 -msgctxt "tool-presets-action" -msgid "Copy Tool Preset _Location" -msgstr "Copiar la _ruta del ajuste prefijado de herramienta" - -#: ../app/actions/tool-presets-actions.c:61 -msgctxt "tool-presets-action" -msgid "Copy tool preset file location to clipboard" -msgstr "" -"Copiar la ruta del archivo de ajustes prefijados de herramienta al " -"portapapeles" - -#: ../app/actions/tool-presets-actions.c:66 -msgctxt "tool-presets-action" -msgid "_Delete Tool Preset" -msgstr "_Eliminar ajuste prefijado de herramienta" - -#: ../app/actions/tool-presets-actions.c:67 -msgctxt "tool-presets-action" -msgid "Delete this tool preset" -msgstr "Eliminar este ajuste prefijado de herramienta" - -#: ../app/actions/tool-presets-actions.c:72 -msgctxt "tool-presets-action" -msgid "_Refresh Tool Presets" -msgstr "_Refrescar los ajustes prefijados de herramienta" - -#: ../app/actions/tool-presets-actions.c:73 -msgctxt "tool-presets-action" -msgid "Refresh tool presets" -msgstr "Refrescar los ajustes prefijados de herramienta" - -#: ../app/actions/tool-presets-actions.c:81 -msgctxt "tool-presets-action" -msgid "_Edit Tool Preset..." -msgstr "_Editar ajuste prefijado de herramienta…" - -#: ../app/actions/tool-presets-actions.c:82 -msgctxt "tool-presets-action" -msgid "Edit this tool preset" -msgstr "Editar este ajuste prefijado de herramienta" - -#: ../app/actions/tool-preset-editor-actions.c:42 -msgctxt "tool-preset-editor-action" -msgid "Tool Preset Editor Menu" -msgstr "Menú del editor de ajustes prefijados de herramienta" - -#: ../app/actions/tool-preset-editor-actions.c:50 -msgctxt "tool-preset-editor-action" -msgid "Edit Active Tool Preset" -msgstr "Editar el ajuste prefijado de la herramienta activa" - -#: ../app/actions/tools-actions.c:45 -msgctxt "tools-action" -msgid "_Tools" -msgstr "_Herramientas" - -#: ../app/actions/tools-actions.c:46 -msgctxt "tools-action" -msgid "_Selection Tools" -msgstr "Herramientas de _selección" - -#: ../app/actions/tools-actions.c:47 -msgctxt "tools-action" -msgid "_Paint Tools" -msgstr "Herramienta de _pintura" - -#: ../app/actions/tools-actions.c:48 -msgctxt "tools-action" -msgid "_Transform Tools" -msgstr "Herramientas de _transformación" - -#: ../app/actions/tools-actions.c:49 -msgctxt "tools-action" -msgid "_Color Tools" -msgstr "Herramientas de _color" - -#: ../app/actions/tools-actions.c:55 -msgctxt "tools-action" -msgid "_By Color" -msgstr "_Por color" - -#: ../app/actions/tools-actions.c:56 -msgctxt "tools-action" -msgid "Select regions with similar colors" -msgstr "Seleccionar regiones con colores similares" - -#: ../app/actions/tools-actions.c:61 -msgctxt "tools-action" -msgid "_Arbitrary Rotation..." -msgstr "Rotación _arbitraria…" - -#: ../app/actions/tools-actions.c:62 -msgctxt "tools-action" -msgid "Rotate by an arbitrary angle" -msgstr "Rotar un ángulo arbitrario" - -#: ../app/actions/vectors-actions.c:44 -msgctxt "vectors-action" -msgid "Paths Menu" -msgstr "Menú de rutas" - -#: ../app/actions/vectors-actions.c:48 -msgctxt "vectors-action" -msgid "Path _Tool" -msgstr "_Herramienta de rutas" - -#: ../app/actions/vectors-actions.c:53 -msgctxt "vectors-action" -msgid "_Edit Path Attributes..." -msgstr "_Editar atributos de ruta…" - -#: ../app/actions/vectors-actions.c:54 -msgctxt "vectors-action" -msgid "Edit path attributes" -msgstr "Editar los atributos de la ruta" - -#: ../app/actions/vectors-actions.c:59 -msgctxt "vectors-action" -msgid "_New Path..." -msgstr "_Ruta nueva…" - -#: ../app/actions/vectors-actions.c:60 -msgctxt "vectors-action" -msgid "Create a new path..." -msgstr "Crear una ruta nueva…" - -#: ../app/actions/vectors-actions.c:65 -msgctxt "vectors-action" -msgid "_New Path with last values" -msgstr "Ruta _nueva con los últimos valores" - -#: ../app/actions/vectors-actions.c:66 -msgctxt "vectors-action" -msgid "Create a new path with last used values" -msgstr "Crea una ruta nueva con los últimos valores utilizados" - -#: ../app/actions/vectors-actions.c:71 -msgctxt "vectors-action" -msgid "D_uplicate Path" -msgstr "D_uplicar ruta" - -#: ../app/actions/vectors-actions.c:72 -msgctxt "vectors-action" -msgid "Duplicate this path" -msgstr "Duplicar esta ruta" - -#: ../app/actions/vectors-actions.c:77 -msgctxt "vectors-action" -msgid "_Delete Path" -msgstr "_Eliminar ruta" - -#: ../app/actions/vectors-actions.c:78 -msgctxt "vectors-action" -msgid "Delete this path" -msgstr "Eliminar esta ruta" - -#: ../app/actions/vectors-actions.c:83 -msgctxt "vectors-action" -msgid "Merge _Visible Paths" -msgstr "Combinar las capas _visibles" - -#: ../app/actions/vectors-actions.c:88 -msgctxt "vectors-action" -msgid "_Raise Path" -msgstr "Eleva_r la ruta" - -#: ../app/actions/vectors-actions.c:89 -msgctxt "vectors-action" -msgid "Raise this path" -msgstr "Elevar esta ruta" - -#: ../app/actions/vectors-actions.c:94 -msgctxt "vectors-action" -msgid "Raise Path to _Top" -msgstr "Elevar la ruta hasta la parte más _alta" - -#: ../app/actions/vectors-actions.c:95 -msgctxt "vectors-action" -msgid "Raise this path to the top" -msgstr "Elevar esta ruta hasta arriba del todo" - -#: ../app/actions/vectors-actions.c:100 -msgctxt "vectors-action" -msgid "_Lower Path" -msgstr "Bajar _la ruta" - -#: ../app/actions/vectors-actions.c:101 -msgctxt "vectors-action" -msgid "Lower this path" -msgstr "Bajar esta ruta" - -#: ../app/actions/vectors-actions.c:106 -msgctxt "vectors-action" -msgid "Lower Path to _Bottom" -msgstr "Bajar la ruta hasta la parte más _baja" - -#: ../app/actions/vectors-actions.c:107 -msgctxt "vectors-action" -msgid "Lower this path to the bottom" -msgstr "Bajar esta ruta hasta abajo del todo" - -#: ../app/actions/vectors-actions.c:112 -msgctxt "vectors-action" -msgid "Stro_ke Path..." -msgstr "Tra_zar ruta…" - -#: ../app/actions/vectors-actions.c:113 -msgctxt "vectors-action" -msgid "Paint along the path" -msgstr "Pintar a lo largo de la ruta" - -#: ../app/actions/vectors-actions.c:118 -msgctxt "vectors-action" -msgid "Stro_ke Path" -msgstr "_Trazar ruta [Stroke]" - -#: ../app/actions/vectors-actions.c:119 -msgctxt "vectors-action" -msgid "Paint along the path with last values" -msgstr "Trazar la ruta con los últimos valores" - -#: ../app/actions/vectors-actions.c:124 -msgctxt "vectors-action" -msgid "Co_py Path" -msgstr "Co_piar ruta" - -#: ../app/actions/vectors-actions.c:129 -msgctxt "vectors-action" -msgid "Paste Pat_h" -msgstr "Pegar ru_ta" - -#: ../app/actions/vectors-actions.c:134 -msgctxt "vectors-action" -msgid "E_xport Path..." -msgstr "E_xportar ruta…" - -#: ../app/actions/vectors-actions.c:139 -msgctxt "vectors-action" -msgid "I_mport Path..." -msgstr "I_mportar ruta…" - -#: ../app/actions/vectors-actions.c:147 -msgctxt "vectors-action" -msgid "_Visible" -msgstr "_Visible" - -#: ../app/actions/vectors-actions.c:153 -msgctxt "vectors-action" -msgid "_Linked" -msgstr "_Enlazado" - -#. GIMP_STOCK_LOCK -#: ../app/actions/vectors-actions.c:159 -msgctxt "vectors-action" -msgid "L_ock strokes" -msgstr "B_loquear los trazos" - -#: ../app/actions/vectors-actions.c:168 -msgctxt "vectors-action" -msgid "Path to Sele_ction" -msgstr "Ruta a sele_cción" - -#: ../app/actions/vectors-actions.c:169 -msgctxt "vectors-action" -msgid "Path to selection" -msgstr "Ruta a selección" - -#: ../app/actions/vectors-actions.c:174 -msgctxt "vectors-action" -msgid "Fr_om Path" -msgstr "A partir de una _ruta" - -#: ../app/actions/vectors-actions.c:175 -msgctxt "vectors-action" -msgid "Replace selection with path" -msgstr "Sustituir la selección con la ruta" - -#: ../app/actions/vectors-actions.c:180 -msgctxt "vectors-action" -msgid "_Add to Selection" -msgstr "_Añadir a selección" - -#: ../app/actions/vectors-actions.c:181 -msgctxt "vectors-action" -msgid "Add path to selection" -msgstr "Añadir ruta a selección" - -#: ../app/actions/vectors-actions.c:186 -msgctxt "vectors-action" -msgid "_Subtract from Selection" -msgstr "_Sustraer de selección" - -#: ../app/actions/vectors-actions.c:187 -msgctxt "vectors-action" -msgid "Subtract path from selection" -msgstr "Sustraer la ruta de la selección" - -#: ../app/actions/vectors-actions.c:192 -msgctxt "vectors-action" -msgid "_Intersect with Selection" -msgstr "_Intersectar con selección" - -#: ../app/actions/vectors-actions.c:193 -msgctxt "vectors-action" -msgid "Intersect path with selection" -msgstr "Establecer la ruta como su intersección con la selección" - -#: ../app/actions/vectors-actions.c:201 -msgctxt "vectors-action" -msgid "Selecti_on to Path" -msgstr "Se_lección a ruta" - -#: ../app/actions/vectors-actions.c:202 ../app/actions/vectors-actions.c:208 -msgctxt "vectors-action" -msgid "Selection to path" -msgstr "Selección a ruta" - -#: ../app/actions/vectors-actions.c:207 -msgctxt "vectors-action" -msgid "To _Path" -msgstr "A _ruta" - -#: ../app/actions/vectors-actions.c:213 -msgctxt "vectors-action" -msgid "Selection to Path (_Advanced)" -msgstr "Selección a ruta (_avanzado)" - -#: ../app/actions/vectors-actions.c:214 -msgctxt "vectors-action" -msgid "Advanced options" -msgstr "Opciones avanzadas" - -#: ../app/actions/vectors-commands.c:137 -msgid "Path Attributes" -msgstr "Atributos de la ruta" - -#: ../app/actions/vectors-commands.c:140 -msgid "Edit Path Attributes" -msgstr "Editar atributos de la ruta" - -#: ../app/actions/vectors-commands.c:164 ../app/vectors/gimpvectors.c:207 -#: ../app/widgets/gimpvectorstreeview.c:250 -msgid "Path" -msgstr "Ruta" - -#: ../app/actions/vectors-commands.c:165 -msgid "New Path" -msgstr "Nueva ruta" - -#: ../app/actions/vectors-commands.c:168 -msgid "New Path Options" -msgstr "Opciones de ruta nueva" - -#: ../app/actions/vectors-commands.c:392 ../app/tools/gimpvectoroptions.c:199 -#: ../app/tools/gimpvectortool.c:1975 -msgid "Stroke Path" -msgstr "Trazar ruta" - -#: ../app/actions/view-actions.c:68 -msgctxt "view-action" -msgid "_View" -msgstr "_Vista" - -#: ../app/actions/view-actions.c:69 -msgctxt "view-action" -msgid "_Zoom" -msgstr "_Ampliación" - -#: ../app/actions/view-actions.c:70 -msgctxt "view-action" -msgid "_Padding Color" -msgstr "Color de _relleno" - -#: ../app/actions/view-actions.c:72 -msgctxt "view-action" -msgid "Move to Screen" -msgstr "Mover a la pantalla" - -#: ../app/actions/view-actions.c:76 -msgctxt "view-action" -msgid "_New View" -msgstr "Vista _nueva" - -#: ../app/actions/view-actions.c:77 -msgctxt "view-action" -msgid "Create another view on this image" -msgstr "Crea otra vista en esta imagen" - -#: ../app/actions/view-actions.c:82 -msgctxt "view-action" -msgid "_Close View" -msgstr "_Cerrar vista" - -#: ../app/actions/view-actions.c:83 -msgctxt "view-action" -msgid "Close the active image view" -msgstr "Cerrar la vista de la imagen activa" - -#: ../app/actions/view-actions.c:88 -msgctxt "view-action" -msgid "_Fit Image in Window" -msgstr "_Ajustar imagen a la ventana" - -#: ../app/actions/view-actions.c:89 -msgctxt "view-action" -msgid "Adjust the zoom ratio so that the image becomes fully visible" -msgstr "Ajusta la ampliación para que la imagen se vea completamente" - +#: ../app/actions/select-commands.c:271 +msgid "Border selection by" +msgstr "Selección de borde en" + +#. Feather button +#: ../app/actions/select-commands.c:280 +msgid "_Feather border" +msgstr "_Difuminar los bordes" + +#. Edge lock button +#: ../app/actions/select-commands.c:293 +msgid "_Lock selection to image edges" +msgstr "Fijar _la selección a los bordes de la imagen" + +#: ../app/actions/select-commands.c:345 ../app/actions/select-commands.c:378 +#: ../app/actions/vectors-commands.c:386 ../app/actions/vectors-commands.c:420 +#: ../app/dialogs/stroke-dialog.c:281 +msgid "There is no active layer or channel to stroke to." +msgstr "No hay una capa o canal activo adonde se pueda trazar." + +#: ../app/actions/select-commands.c:351 +msgid "Stroke Selection" +msgstr "Trazar selección" + +#: ../app/actions/templates-actions.c:41 +msgctxt "templates-action" +msgid "Templates Menu" +msgstr "Menú de plantillas" + +#: ../app/actions/templates-actions.c:45 +msgctxt "templates-action" +msgid "_Create Image from Template" +msgstr "_Crear una imagen a partir de la plantilla" + +#: ../app/actions/templates-actions.c:46 +msgctxt "templates-action" +msgid "Create a new image from the selected template" +msgstr "Crear una imagen nueva a partir de la plantilla seleccionada" + +#: ../app/actions/templates-actions.c:51 +msgctxt "templates-action" +msgid "_New Template..." +msgstr "Plantilla _nueva…" + +#: ../app/actions/templates-actions.c:52 +msgctxt "templates-action" +msgid "Create a new template" +msgstr "Crear una plantilla nueva" + +#: ../app/actions/templates-actions.c:57 +msgctxt "templates-action" +msgid "D_uplicate Template..." +msgstr "D_uplicar plantilla…" + +#: ../app/actions/templates-actions.c:58 +msgctxt "templates-action" +msgid "Duplicate this template" +msgstr "Duplicar la plantilla seleccionada" + +#: ../app/actions/templates-actions.c:63 +msgctxt "templates-action" +msgid "_Edit Template..." +msgstr "_Editar la plantilla…" + +#: ../app/actions/templates-actions.c:64 +msgctxt "templates-action" +msgid "Edit this template" +msgstr "Editar esta plantilla" + +#: ../app/actions/templates-actions.c:69 +msgctxt "templates-action" +msgid "_Delete Template" +msgstr "_Eliminar la plantilla" + +#: ../app/actions/templates-actions.c:70 +msgctxt "templates-action" +msgid "Delete this template" +msgstr "Eliminar esta plantilla" + +#: ../app/actions/templates-commands.c:110 +msgid "New Template" +msgstr "Plantilla nueva" + +#: ../app/actions/templates-commands.c:113 +msgid "Create a New Template" +msgstr "Crear una plantilla nueva" + +#: ../app/actions/templates-commands.c:173 +#: ../app/actions/templates-commands.c:176 +msgid "Edit Template" +msgstr "Editar plantilla" + +#: ../app/actions/templates-commands.c:211 +msgid "Delete Template" +msgstr "Eliminar la plantilla" + +#: ../app/actions/templates-commands.c:237 +#, c-format +msgid "" +"Are you sure you want to delete template '%s' from the list and from disk?" +msgstr "¿Está seguro de que quiere eliminar «%s» de la lista y del disco?" + +#: ../app/actions/text-editor-actions.c:43 +msgctxt "text-editor-action" +msgid "Open" +msgstr "Abrir" + +#: ../app/actions/text-editor-actions.c:44 +msgctxt "text-editor-action" +msgid "Load text from file" +msgstr "Cargar texto desde un archivo" + +#: ../app/actions/text-editor-actions.c:49 +msgctxt "text-editor-action" +msgid "Clear" +msgstr "Limpiar" + +#: ../app/actions/text-editor-actions.c:50 +msgctxt "text-editor-action" +msgid "Clear all text" +msgstr "Borrar todo el texto" + +#: ../app/actions/text-editor-actions.c:58 +msgctxt "text-editor-action" +msgid "LTR" +msgstr "I->D" + +#: ../app/actions/text-editor-actions.c:59 +msgctxt "text-editor-action" +msgid "From left to right" +msgstr "De izquierda a derecha" + +#: ../app/actions/text-editor-actions.c:64 +msgctxt "text-editor-action" +msgid "RTL" +msgstr "D->I" + +#: ../app/actions/text-editor-actions.c:65 +msgctxt "text-editor-action" +msgid "From right to left" +msgstr "De derecha a izquierda" + +#: ../app/actions/text-editor-commands.c:62 +#: ../app/actions/text-tool-commands.c:117 +msgid "Open Text File (UTF-8)" +msgstr "Abrir archivo de texto (UTF-8)" + +#: ../app/actions/text-editor-commands.c:143 +#: ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58 +#: ../app/core/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:443 +#: ../app/core/gimpbrushgenerated-load.c:73 +#: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54 +#: ../app/core/gimpgradient-load.c:63 ../app/core/gimppalette-load.c:77 +#: ../app/core/gimppalette-load.c:274 ../app/core/gimppalette-load.c:320 +#: ../app/core/gimppalette-load.c:377 ../app/core/gimppalette-load.c:467 +#: ../app/core/gimppalette-load.c:634 ../app/core/gimppattern-load.c:76 +#: ../app/tools/gimpcurvestool.c:658 ../app/tools/gimplevelstool.c:747 +#: ../app/xcf/xcf.c:359 +#, c-format +msgid "Could not open '%s' for reading: %s" +msgstr "No se ha podido abrir «%s» para lectura: %s" + +#: ../app/actions/text-tool-actions.c:50 +msgctxt "text-tool-action" +msgid "Text Tool Menu" +msgstr "Menú de la herramienta de texto" + +#: ../app/actions/text-tool-actions.c:54 +msgctxt "text-tool-action" +msgid "Input _Methods" +msgstr "_Métodos de entrada" + +#: ../app/actions/text-tool-actions.c:58 +msgctxt "text-tool-action" +msgid "Cu_t" +msgstr "Cor_tar" + +#: ../app/actions/text-tool-actions.c:63 +msgctxt "text-tool-action" +msgid "_Copy" +msgstr "_Copiar" + +#: ../app/actions/text-tool-actions.c:68 +msgctxt "text-tool-action" +msgid "_Paste" +msgstr "_Pegar" + +#: ../app/actions/text-tool-actions.c:73 +msgctxt "text-tool-action" +msgid "_Delete" +msgstr "_Eliminar" + +#: ../app/actions/text-tool-actions.c:78 +msgctxt "text-tool-action" +msgid "_Open text file..." +msgstr "_Abrir archivo de texto…" + +#: ../app/actions/text-tool-actions.c:83 +msgctxt "text-tool-action" +msgid "Cl_ear" +msgstr "_Limpiar" + +#: ../app/actions/text-tool-actions.c:84 +msgctxt "text-tool-action" +msgid "Clear all text" +msgstr "Borrar todo el texto" + +#: ../app/actions/text-tool-actions.c:89 +msgctxt "text-tool-action" +msgid "_Path from Text" +msgstr "Ruta a partir del texto" + +#: ../app/actions/text-tool-actions.c:91 +msgctxt "text-tool-action" +msgid "Create a path from the outlines of the current text" +msgstr "Crea una ruta a partir del contorno del texto actual" + +#: ../app/actions/text-tool-actions.c:96 +msgctxt "text-tool-action" +msgid "Text _along Path" +msgstr "Texto siguiendo una rut_a" + +#: ../app/actions/text-tool-actions.c:98 +msgctxt "text-tool-action" +msgid "Bend the text along the currently active path" +msgstr "Hacer seguir el texto de esta capa a lo largo de la ruta" + +#: ../app/actions/text-tool-actions.c:106 +msgctxt "text-tool-action" +msgid "From left to right" +msgstr "De izquierda a derecha" + +#: ../app/actions/text-tool-actions.c:111 +msgctxt "text-tool-action" +msgid "From right to left" +msgstr "De derecha a izquierda" + +#: ../app/actions/tool-options-actions.c:56 +msgctxt "tool-options-action" +msgid "Tool Options Menu" +msgstr "Menú de opciones de herramienta" + +#: ../app/actions/tool-options-actions.c:60 +msgctxt "tool-options-action" +msgid "_Save Tool Preset" +msgstr "_Guardar ajuste prefijado de herramienta" + +#: ../app/actions/tool-options-actions.c:64 +msgctxt "tool-options-action" +msgid "_Restore Tool Preset" +msgstr "_Restaurar los ajustes prefijados de herramienta" + +#: ../app/actions/tool-options-actions.c:68 +msgctxt "tool-options-action" +msgid "E_dit Tool Preset" +msgstr "_Editar ajuste prefijado de herramienta" + +#: ../app/actions/tool-options-actions.c:72 +msgctxt "tool-options-action" +msgid "_Delete Tool Preset" +msgstr "_Eliminar ajuste prefijado de herramienta" + +#: ../app/actions/tool-options-actions.c:76 +msgctxt "tool-options-action" +msgid "_New Tool Preset..." +msgstr "_Nuevo ajuste prefijado de herramienta…" + +#: ../app/actions/tool-options-actions.c:81 +msgctxt "tool-options-action" +msgid "R_eset Tool Options" +msgstr "R_einiciar las opciones de las herramientas" + +#: ../app/actions/tool-options-actions.c:82 +msgctxt "tool-options-action" +msgid "Reset to default values" +msgstr "Reiniciar con los valores predeterminados" + +#: ../app/actions/tool-options-actions.c:87 +msgctxt "tool-options-action" +msgid "Reset _all Tool Options" +msgstr "Reiniciar _todas las opciones de herramientas" + +#: ../app/actions/tool-options-actions.c:88 +msgctxt "tool-options-action" +msgid "Reset all tool options" +msgstr "Reiniciar todas las opciones de herramientas" + +#: ../app/actions/tool-options-commands.c:186 +msgid "Reset All Tool Options" +msgstr "Reiniciar todas las opciones de las herramientas" + +#: ../app/actions/tool-options-commands.c:209 +msgid "Do you really want to reset all tool options to default values?" +msgstr "" +"¿Realmente desea reiniciar todas las opciones de herramientas con sus " +"valores predeterminados?" + +#: ../app/actions/tool-presets-actions.c:44 +msgctxt "tool-presets-action" +msgid "Tool Presets Menu" +msgstr "Menú de ajustes prefijados de herramienta" + +#: ../app/actions/tool-presets-actions.c:48 +msgctxt "tool-presets-action" +msgid "_New Tool Preset" +msgstr "_Nuevo ajuste prefijado de herramienta" + +#: ../app/actions/tool-presets-actions.c:49 +msgctxt "tool-presets-action" +msgid "Create a new tool preset" +msgstr "Crear un ajuste prefijado de herramienta" + +#: ../app/actions/tool-presets-actions.c:54 +msgctxt "tool-presets-action" +msgid "D_uplicate Tool Preset" +msgstr "D_uplicar ajuste prefijado de herramienta" + +#: ../app/actions/tool-presets-actions.c:55 +msgctxt "tool-presets-action" +msgid "Duplicate this tool preset" +msgstr "Duplicar este ajuste prefijado de herramienta" + +#: ../app/actions/tool-presets-actions.c:60 +msgctxt "tool-presets-action" +msgid "Copy Tool Preset _Location" +msgstr "Copiar la _ruta del ajuste prefijado de herramienta" + +#: ../app/actions/tool-presets-actions.c:61 +msgctxt "tool-presets-action" +msgid "Copy tool preset file location to clipboard" +msgstr "" +"Copiar la ruta del archivo de ajustes prefijados de herramienta al " +"portapapeles" + +#: ../app/actions/tool-presets-actions.c:66 +msgctxt "tool-presets-action" +msgid "_Delete Tool Preset" +msgstr "_Eliminar ajuste prefijado de herramienta" + +#: ../app/actions/tool-presets-actions.c:67 +msgctxt "tool-presets-action" +msgid "Delete this tool preset" +msgstr "Eliminar este ajuste prefijado de herramienta" + +#: ../app/actions/tool-presets-actions.c:72 +msgctxt "tool-presets-action" +msgid "_Refresh Tool Presets" +msgstr "_Refrescar los ajustes prefijados de herramienta" + +#: ../app/actions/tool-presets-actions.c:73 +msgctxt "tool-presets-action" +msgid "Refresh tool presets" +msgstr "Refrescar los ajustes prefijados de herramienta" + +#: ../app/actions/tool-presets-actions.c:81 +msgctxt "tool-presets-action" +msgid "_Edit Tool Preset..." +msgstr "_Editar ajuste prefijado de herramienta…" + +#: ../app/actions/tool-presets-actions.c:82 +msgctxt "tool-presets-action" +msgid "Edit this tool preset" +msgstr "Editar este ajuste prefijado de herramienta" + +#: ../app/actions/tool-preset-editor-actions.c:42 +msgctxt "tool-preset-editor-action" +msgid "Tool Preset Editor Menu" +msgstr "Menú del editor de ajustes prefijados de herramienta" + +#: ../app/actions/tool-preset-editor-actions.c:50 +msgctxt "tool-preset-editor-action" +msgid "Edit Active Tool Preset" +msgstr "Editar el ajuste prefijado de la herramienta activa" + +#: ../app/actions/tools-actions.c:45 +msgctxt "tools-action" +msgid "_Tools" +msgstr "_Herramientas" + +#: ../app/actions/tools-actions.c:46 +msgctxt "tools-action" +msgid "_Selection Tools" +msgstr "Herramientas de _selección" + +#: ../app/actions/tools-actions.c:47 +msgctxt "tools-action" +msgid "_Paint Tools" +msgstr "Herramienta de _pintura" + +#: ../app/actions/tools-actions.c:48 +msgctxt "tools-action" +msgid "_Transform Tools" +msgstr "Herramientas de _transformación" + +#: ../app/actions/tools-actions.c:49 +msgctxt "tools-action" +msgid "_Color Tools" +msgstr "Herramientas de _color" + +#: ../app/actions/tools-actions.c:55 +msgctxt "tools-action" +msgid "_By Color" +msgstr "_Por color" + +#: ../app/actions/tools-actions.c:56 +msgctxt "tools-action" +msgid "Select regions with similar colors" +msgstr "Seleccionar regiones con colores similares" + +#: ../app/actions/tools-actions.c:61 +msgctxt "tools-action" +msgid "_Arbitrary Rotation..." +msgstr "Rotación _arbitraria…" + +#: ../app/actions/tools-actions.c:62 +msgctxt "tools-action" +msgid "Rotate by an arbitrary angle" +msgstr "Rotar un ángulo arbitrario" + +#: ../app/actions/vectors-actions.c:44 +msgctxt "vectors-action" +msgid "Paths Menu" +msgstr "Menú de rutas" + +#: ../app/actions/vectors-actions.c:48 +msgctxt "vectors-action" +msgid "Path _Tool" +msgstr "_Herramienta de rutas" + +#: ../app/actions/vectors-actions.c:53 +msgctxt "vectors-action" +msgid "_Edit Path Attributes..." +msgstr "_Editar atributos de ruta…" + +#: ../app/actions/vectors-actions.c:54 +msgctxt "vectors-action" +msgid "Edit path attributes" +msgstr "Editar los atributos de la ruta" + +#: ../app/actions/vectors-actions.c:59 +msgctxt "vectors-action" +msgid "_New Path..." +msgstr "_Ruta nueva…" + +#: ../app/actions/vectors-actions.c:60 +msgctxt "vectors-action" +msgid "Create a new path..." +msgstr "Crear una ruta nueva…" + +#: ../app/actions/vectors-actions.c:65 +msgctxt "vectors-action" +msgid "_New Path with last values" +msgstr "Ruta _nueva con los últimos valores" + +#: ../app/actions/vectors-actions.c:66 +msgctxt "vectors-action" +msgid "Create a new path with last used values" +msgstr "Crea una ruta nueva con los últimos valores utilizados" + +#: ../app/actions/vectors-actions.c:71 +msgctxt "vectors-action" +msgid "D_uplicate Path" +msgstr "D_uplicar ruta" + +#: ../app/actions/vectors-actions.c:72 +msgctxt "vectors-action" +msgid "Duplicate this path" +msgstr "Duplicar esta ruta" + +#: ../app/actions/vectors-actions.c:77 +msgctxt "vectors-action" +msgid "_Delete Path" +msgstr "_Eliminar ruta" + +#: ../app/actions/vectors-actions.c:78 +msgctxt "vectors-action" +msgid "Delete this path" +msgstr "Eliminar esta ruta" + +#: ../app/actions/vectors-actions.c:83 +msgctxt "vectors-action" +msgid "Merge _Visible Paths" +msgstr "Combinar las capas _visibles" + +#: ../app/actions/vectors-actions.c:88 +msgctxt "vectors-action" +msgid "_Raise Path" +msgstr "Eleva_r la ruta" + +#: ../app/actions/vectors-actions.c:89 +msgctxt "vectors-action" +msgid "Raise this path" +msgstr "Elevar esta ruta" + +#: ../app/actions/vectors-actions.c:94 +msgctxt "vectors-action" +msgid "Raise Path to _Top" +msgstr "Elevar la ruta hasta la parte más _alta" + +#: ../app/actions/vectors-actions.c:95 +msgctxt "vectors-action" +msgid "Raise this path to the top" +msgstr "Elevar esta ruta hasta arriba del todo" + +#: ../app/actions/vectors-actions.c:100 +msgctxt "vectors-action" +msgid "_Lower Path" +msgstr "Bajar _la ruta" + +#: ../app/actions/vectors-actions.c:101 +msgctxt "vectors-action" +msgid "Lower this path" +msgstr "Bajar esta ruta" + +#: ../app/actions/vectors-actions.c:106 +msgctxt "vectors-action" +msgid "Lower Path to _Bottom" +msgstr "Bajar la ruta hasta la parte más _baja" + +#: ../app/actions/vectors-actions.c:107 +msgctxt "vectors-action" +msgid "Lower this path to the bottom" +msgstr "Bajar esta ruta hasta abajo del todo" + +#: ../app/actions/vectors-actions.c:112 +msgctxt "vectors-action" +msgid "Stro_ke Path..." +msgstr "Tra_zar ruta…" + +#: ../app/actions/vectors-actions.c:113 +msgctxt "vectors-action" +msgid "Paint along the path" +msgstr "Pintar a lo largo de la ruta" + +#: ../app/actions/vectors-actions.c:118 +msgctxt "vectors-action" +msgid "Stro_ke Path" +msgstr "_Trazar ruta [Stroke]" + +#: ../app/actions/vectors-actions.c:119 +msgctxt "vectors-action" +msgid "Paint along the path with last values" +msgstr "Trazar la ruta con los últimos valores" + +#: ../app/actions/vectors-actions.c:124 +msgctxt "vectors-action" +msgid "Co_py Path" +msgstr "Co_piar ruta" + +#: ../app/actions/vectors-actions.c:129 +msgctxt "vectors-action" +msgid "Paste Pat_h" +msgstr "Pegar ru_ta" + +#: ../app/actions/vectors-actions.c:134 +msgctxt "vectors-action" +msgid "E_xport Path..." +msgstr "E_xportar ruta…" + +#: ../app/actions/vectors-actions.c:139 +msgctxt "vectors-action" +msgid "I_mport Path..." +msgstr "I_mportar ruta…" + +#: ../app/actions/vectors-actions.c:147 +msgctxt "vectors-action" +msgid "_Visible" +msgstr "_Visible" + +#: ../app/actions/vectors-actions.c:153 +msgctxt "vectors-action" +msgid "_Linked" +msgstr "_Enlazado" + +#. GIMP_STOCK_LOCK +#: ../app/actions/vectors-actions.c:159 +msgctxt "vectors-action" +msgid "L_ock strokes" +msgstr "B_loquear los trazos" + +#: ../app/actions/vectors-actions.c:168 +msgctxt "vectors-action" +msgid "Path to Sele_ction" +msgstr "Ruta a sele_cción" + +#: ../app/actions/vectors-actions.c:169 +msgctxt "vectors-action" +msgid "Path to selection" +msgstr "Ruta a selección" + +#: ../app/actions/vectors-actions.c:174 +msgctxt "vectors-action" +msgid "Fr_om Path" +msgstr "A partir de una _ruta" + +#: ../app/actions/vectors-actions.c:175 +msgctxt "vectors-action" +msgid "Replace selection with path" +msgstr "Sustituir la selección con la ruta" + +#: ../app/actions/vectors-actions.c:180 +msgctxt "vectors-action" +msgid "_Add to Selection" +msgstr "_Añadir a selección" + +#: ../app/actions/vectors-actions.c:181 +msgctxt "vectors-action" +msgid "Add path to selection" +msgstr "Añadir ruta a selección" + +#: ../app/actions/vectors-actions.c:186 +msgctxt "vectors-action" +msgid "_Subtract from Selection" +msgstr "_Sustraer de selección" + +#: ../app/actions/vectors-actions.c:187 +msgctxt "vectors-action" +msgid "Subtract path from selection" +msgstr "Sustraer la ruta de la selección" + +#: ../app/actions/vectors-actions.c:192 +msgctxt "vectors-action" +msgid "_Intersect with Selection" +msgstr "_Intersectar con selección" + +#: ../app/actions/vectors-actions.c:193 +msgctxt "vectors-action" +msgid "Intersect path with selection" +msgstr "Establecer la ruta como su intersección con la selección" + +#: ../app/actions/vectors-actions.c:201 +msgctxt "vectors-action" +msgid "Selecti_on to Path" +msgstr "Se_lección a ruta" + +#: ../app/actions/vectors-actions.c:202 ../app/actions/vectors-actions.c:208 +msgctxt "vectors-action" +msgid "Selection to path" +msgstr "Selección a ruta" + +#: ../app/actions/vectors-actions.c:207 +msgctxt "vectors-action" +msgid "To _Path" +msgstr "A _ruta" + +#: ../app/actions/vectors-actions.c:213 +msgctxt "vectors-action" +msgid "Selection to Path (_Advanced)" +msgstr "Selección a ruta (_avanzado)" + +#: ../app/actions/vectors-actions.c:214 +msgctxt "vectors-action" +msgid "Advanced options" +msgstr "Opciones avanzadas" + +#: ../app/actions/vectors-commands.c:137 +msgid "Path Attributes" +msgstr "Atributos de la ruta" + +#: ../app/actions/vectors-commands.c:140 +msgid "Edit Path Attributes" +msgstr "Editar atributos de la ruta" + +#: ../app/actions/vectors-commands.c:164 ../app/vectors/gimpvectors.c:207 +#: ../app/widgets/gimpvectorstreeview.c:250 +msgid "Path" +msgstr "Ruta" + +#: ../app/actions/vectors-commands.c:165 +msgid "New Path" +msgstr "Nueva ruta" + +#: ../app/actions/vectors-commands.c:168 +msgid "New Path Options" +msgstr "Opciones de ruta nueva" + +#: ../app/actions/vectors-commands.c:392 ../app/tools/gimpvectoroptions.c:199 +#: ../app/tools/gimpvectortool.c:1975 +msgid "Stroke Path" +msgstr "Trazar ruta" + +#: ../app/actions/view-actions.c:68 +msgctxt "view-action" +msgid "_View" +msgstr "_Vista" + +#: ../app/actions/view-actions.c:69 +msgctxt "view-action" +msgid "_Zoom" +msgstr "_Ampliación" + +#: ../app/actions/view-actions.c:70 +msgctxt "view-action" +msgid "_Padding Color" +msgstr "Color de _relleno" + +#: ../app/actions/view-actions.c:72 +msgctxt "view-action" +msgid "Move to Screen" +msgstr "Mover a la pantalla" + +#: ../app/actions/view-actions.c:76 +msgctxt "view-action" +msgid "_New View" +msgstr "Vista _nueva" + +#: ../app/actions/view-actions.c:77 +msgctxt "view-action" +msgid "Create another view on this image" +msgstr "Crea otra vista en esta imagen" + +#: ../app/actions/view-actions.c:82 +msgctxt "view-action" +msgid "_Close View" +msgstr "_Cerrar vista" + +#: ../app/actions/view-actions.c:83 +msgctxt "view-action" +msgid "Close the active image view" +msgstr "Cerrar la vista de la imagen activa" + +#: ../app/actions/view-actions.c:88 +msgctxt "view-action" +msgid "_Fit Image in Window" +msgstr "_Ajustar imagen a la ventana" + +#: ../app/actions/view-actions.c:89 +msgctxt "view-action" +msgid "Adjust the zoom ratio so that the image becomes fully visible" +msgstr "Ajusta la ampliación para que la imagen se vea completamente" + # fuzzy -#: ../app/actions/view-actions.c:94 -msgctxt "view-action" -msgid "Fi_ll Window" -msgstr "Ocupar toda _la ventana" - -#: ../app/actions/view-actions.c:95 -msgctxt "view-action" -msgid "Adjust the zoom ratio so that the entire window is used" -msgstr "Ajusta la ampliación para que la ventana se use por completo" - -#: ../app/actions/view-actions.c:100 -msgctxt "view-action" -msgid "Re_vert Zoom" -msgstr "Re_vertir la ampliación" - -#: ../app/actions/view-actions.c:101 -msgctxt "view-action" -msgid "Restore the previous zoom level" -msgstr "Recuperar el nivel de ampliación previo" - -#: ../app/actions/view-actions.c:106 -msgctxt "view-action" -msgid "Na_vigation Window" -msgstr "Ventana de na_vegación" - -#: ../app/actions/view-actions.c:107 -msgctxt "view-action" -msgid "Show an overview window for this image" -msgstr "Muestra una venta de vista general para esta imagen" - -#: ../app/actions/view-actions.c:112 -msgctxt "view-action" -msgid "Display _Filters..." -msgstr "Mostrar _filtros…" - -#: ../app/actions/view-actions.c:113 -msgctxt "view-action" -msgid "Configure filters applied to this view" -msgstr "Configurar filtros aplicados a esta vista" - +#: ../app/actions/view-actions.c:94 +msgctxt "view-action" +msgid "Fi_ll Window" +msgstr "Ocupar toda _la ventana" + +#: ../app/actions/view-actions.c:95 +msgctxt "view-action" +msgid "Adjust the zoom ratio so that the entire window is used" +msgstr "Ajusta la ampliación para que la ventana se use por completo" + +#: ../app/actions/view-actions.c:100 +msgctxt "view-action" +msgid "Re_vert Zoom" +msgstr "Re_vertir la ampliación" + +#: ../app/actions/view-actions.c:101 +msgctxt "view-action" +msgid "Restore the previous zoom level" +msgstr "Recuperar el nivel de ampliación previo" + +#: ../app/actions/view-actions.c:106 +msgctxt "view-action" +msgid "Na_vigation Window" +msgstr "Ventana de na_vegación" + +#: ../app/actions/view-actions.c:107 +msgctxt "view-action" +msgid "Show an overview window for this image" +msgstr "Muestra una venta de vista general para esta imagen" + +#: ../app/actions/view-actions.c:112 +msgctxt "view-action" +msgid "Display _Filters..." +msgstr "Mostrar _filtros…" + +#: ../app/actions/view-actions.c:113 +msgctxt "view-action" +msgid "Configure filters applied to this view" +msgstr "Configurar filtros aplicados a esta vista" + # //R Creo que hace esto -#: ../app/actions/view-actions.c:118 -msgctxt "view-action" -msgid "Shrink _Wrap" -msgstr "_Ajustar encogiendo" - -#: ../app/actions/view-actions.c:119 -msgctxt "view-action" -msgid "Reduce the image window to the size of the image display" -msgstr "Ajustar la ventana al tamaño con que se muestra la imagen" - -#: ../app/actions/view-actions.c:124 -msgctxt "view-action" -msgid "_Open Display..." -msgstr "_Abrir pantalla…" - -#: ../app/actions/view-actions.c:125 -msgctxt "view-action" -msgid "Connect to another display" -msgstr "Conectar a otra pantalla" - -#: ../app/actions/view-actions.c:133 -msgctxt "view-action" -msgid "_Dot for Dot" -msgstr "P_unto por punto" - -#: ../app/actions/view-actions.c:134 -msgctxt "view-action" -msgid "A pixel on the screen represents an image pixel" -msgstr "Un píxel en la pantalla representa un píxel de la imagen" - -#: ../app/actions/view-actions.c:140 -msgctxt "view-action" -msgid "Show _Selection" -msgstr "Mostrar la s_elección" - -#: ../app/actions/view-actions.c:141 -msgctxt "view-action" -msgid "Display the selection outline" -msgstr "Muestra el contorno de la selección" - -#: ../app/actions/view-actions.c:147 -msgctxt "view-action" -msgid "Show _Layer Boundary" -msgstr "Mostrar el _límite de la capa" - -#: ../app/actions/view-actions.c:148 -msgctxt "view-action" -msgid "Draw a border around the active layer" -msgstr "Dibuja un borde alrededor de la capa activa" - -#: ../app/actions/view-actions.c:154 -msgctxt "view-action" -msgid "Show _Guides" -msgstr "Mostrar g_uías" - -#: ../app/actions/view-actions.c:155 -msgctxt "view-action" -msgid "Display the image's guides" -msgstr "Muestra las líneas guía de la imagen" - -#: ../app/actions/view-actions.c:161 -msgctxt "view-action" -msgid "S_how Grid" -msgstr "Mostrar _rejilla" - -#: ../app/actions/view-actions.c:162 -msgctxt "view-action" -msgid "Display the image's grid" -msgstr "Muestra la rejilla de la imagen" - -#: ../app/actions/view-actions.c:168 -msgctxt "view-action" -msgid "Show Sample Points" -msgstr "Mostrar puntos de muestra" - -#: ../app/actions/view-actions.c:169 -msgctxt "view-action" -msgid "Display the image's color sample points" -msgstr "Muestra los puntos de muestreo de color de la imagen" - -#: ../app/actions/view-actions.c:175 -msgctxt "view-action" -msgid "Sn_ap to Guides" -msgstr "Ajust_ar a las guías" - -#: ../app/actions/view-actions.c:176 -msgctxt "view-action" -msgid "Tool operations snap to guides" -msgstr "Las operaciones de las herramientas se ajustan a las líneas guía" - -#: ../app/actions/view-actions.c:182 -msgctxt "view-action" -msgid "Sna_p to Grid" -msgstr "Ajustar a la rej_illa" - -#: ../app/actions/view-actions.c:183 -msgctxt "view-action" -msgid "Tool operations snap to the grid" -msgstr "Las operaciones de las herramientas se ajustan a la rejilla" - -#: ../app/actions/view-actions.c:189 -msgctxt "view-action" -msgid "Snap to _Canvas Edges" -msgstr "Ajustar a los bordes del _lienzo" - -#: ../app/actions/view-actions.c:190 -msgctxt "view-action" -msgid "Tool operations snap to the canvas edges" -msgstr "Las operaciones de las herramientas se ajustan a los bordes del lienzo" - -#: ../app/actions/view-actions.c:196 -msgctxt "view-action" -msgid "Snap t_o Active Path" -msgstr "Ajustar a la _ruta activa" - -#: ../app/actions/view-actions.c:197 -msgctxt "view-action" -msgid "Tool operations snap to the active path" -msgstr "Las operaciones de las herramientas se ajustan a la ruta activa" - -#: ../app/actions/view-actions.c:203 -msgctxt "view-action" -msgid "Show _Menubar" -msgstr "_Mostrar la barra de menú" - -#: ../app/actions/view-actions.c:204 -msgctxt "view-action" -msgid "Show this window's menubar" -msgstr "Muestra la barra de menús de esta ventana" - -#: ../app/actions/view-actions.c:210 -msgctxt "view-action" -msgid "Show R_ulers" -msgstr "Mostrar las _reglas" - -#: ../app/actions/view-actions.c:211 -msgctxt "view-action" -msgid "Show this window's rulers" -msgstr "Muestra las reglas de medición de esta ventana" - -#: ../app/actions/view-actions.c:217 -msgctxt "view-action" -msgid "Show Scroll_bars" -msgstr "Mostrar las _barras de desplazamiento" - -#: ../app/actions/view-actions.c:218 -msgctxt "view-action" -msgid "Show this window's scrollbars" -msgstr "Muestra las barras de desplazamiento de esta ventana" - -#: ../app/actions/view-actions.c:224 -msgctxt "view-action" -msgid "Show S_tatusbar" -msgstr "Mostrar la barra de es_tado" - -#: ../app/actions/view-actions.c:225 -msgctxt "view-action" -msgid "Show this window's statusbar" -msgstr "Muestra la barra de estado de esta ventana" - -#: ../app/actions/view-actions.c:231 -msgctxt "view-action" -msgid "Fullscr_een" -msgstr "Pantalla compl_eta" - -#: ../app/actions/view-actions.c:232 -msgctxt "view-action" -msgid "Toggle fullscreen view" -msgstr "Activa o desactiva la vista de pantalla completa" - -#: ../app/actions/view-actions.c:238 -msgctxt "view-action" -msgid "Use GEGL" -msgstr "Usar GEGL" - -#: ../app/actions/view-actions.c:239 -msgctxt "view-action" -msgid "Use GEGL to create this window's projection" -msgstr "Usar GEGL para crear la proyección de esta ventana" - -#: ../app/actions/view-actions.c:263 -msgctxt "view-zoom-action" -msgid "Zoom _Out" -msgstr "Re_ducir" - -#: ../app/actions/view-actions.c:264 ../app/actions/view-actions.c:276 -msgctxt "view-zoom-action" -msgid "Zoom out" -msgstr "Reducir" - -#: ../app/actions/view-actions.c:269 -msgctxt "view-zoom-action" -msgid "Zoom _In" -msgstr "_Ampliar" - -#: ../app/actions/view-actions.c:270 ../app/actions/view-actions.c:282 -msgctxt "view-zoom-action" -msgid "Zoom in" -msgstr "Ampliar" - -#: ../app/actions/view-actions.c:275 -msgctxt "view-zoom-action" -msgid "Zoom Out" -msgstr "Reducir" - -#: ../app/actions/view-actions.c:281 -msgctxt "view-zoom-action" -msgid "Zoom In" -msgstr "Ampliar" - -#: ../app/actions/view-actions.c:300 ../app/actions/view-actions.c:306 -msgctxt "view-zoom-action" -msgid "1_6:1 (1600%)" -msgstr "1_6:1 (1600%)" - -#: ../app/actions/view-actions.c:301 ../app/actions/view-actions.c:307 -msgctxt "view-zoom-action" -msgid "Zoom 16:1" -msgstr "Ampliación 16:1" - -#: ../app/actions/view-actions.c:312 ../app/actions/view-actions.c:318 -msgctxt "view-zoom-action" -msgid "_8:1 (800%)" -msgstr "_8:1 (800%)" - -#: ../app/actions/view-actions.c:313 ../app/actions/view-actions.c:319 -msgctxt "view-zoom-action" -msgid "Zoom 8:1" -msgstr "Ampliación 8:1" - -#: ../app/actions/view-actions.c:324 ../app/actions/view-actions.c:330 -msgctxt "view-zoom-action" -msgid "_4:1 (400%)" -msgstr "_4:1 (400%)" - -#: ../app/actions/view-actions.c:325 ../app/actions/view-actions.c:331 -msgctxt "view-zoom-action" -msgid "Zoom 4:1" -msgstr "Ampliación 4:1" - -#: ../app/actions/view-actions.c:336 ../app/actions/view-actions.c:342 -msgctxt "view-zoom-action" -msgid "_2:1 (200%)" -msgstr "_2:1 (200%)" - -#: ../app/actions/view-actions.c:337 ../app/actions/view-actions.c:343 -msgctxt "view-zoom-action" -msgid "Zoom 2:1" -msgstr "Ampliación 2:1" - -#: ../app/actions/view-actions.c:348 ../app/actions/view-actions.c:354 -msgctxt "view-zoom-action" -msgid "_1:1 (100%)" -msgstr "_1:1 (100%)" - -#: ../app/actions/view-actions.c:349 ../app/actions/view-actions.c:355 -msgctxt "view-zoom-action" -msgid "Zoom 1:1" -msgstr "Ampliación 1:1" - -#: ../app/actions/view-actions.c:360 -msgctxt "view-zoom-action" -msgid "1:_2 (50%)" -msgstr "1:_2 (50%)" - -#: ../app/actions/view-actions.c:361 -msgctxt "view-zoom-action" -msgid "Zoom 1:2" -msgstr "Ampliación 1:2" - -#: ../app/actions/view-actions.c:366 -msgctxt "view-zoom-action" -msgid "1:_4 (25%)" -msgstr "1:_4 (25%)" - -#: ../app/actions/view-actions.c:367 -msgctxt "view-zoom-action" -msgid "Zoom 1:4" -msgstr "Ampliación 1:4" - -#: ../app/actions/view-actions.c:372 -msgctxt "view-zoom-action" -msgid "1:_8 (12.5%)" -msgstr "1:_8 (12.5%)" - -#: ../app/actions/view-actions.c:373 -msgctxt "view-zoom-action" -msgid "Zoom 1:8" -msgstr "Ampliación 1:8" - -#: ../app/actions/view-actions.c:378 -msgctxt "view-zoom-action" -msgid "1:1_6 (6.25%)" -msgstr "1:1_6 (6.25%)" - -#: ../app/actions/view-actions.c:379 -msgctxt "view-zoom-action" -msgid "Zoom 1:16" -msgstr "Ampliación 1:16" - -#: ../app/actions/view-actions.c:384 -msgctxt "view-zoom-action" -msgid "Othe_r..." -msgstr "Ot_ros…" - -#: ../app/actions/view-actions.c:385 -msgctxt "view-zoom-action" -msgid "Set a custom zoom factor" -msgstr "Establece un factor de ampliación personalizado" - -#: ../app/actions/view-actions.c:393 -msgctxt "view-padding-color" -msgid "From _Theme" -msgstr "Del _tema" - -#: ../app/actions/view-actions.c:394 -msgctxt "view-padding-color" -msgid "Use the current theme's background color" -msgstr "Usar el color de fondo del tema actual" - -#: ../app/actions/view-actions.c:399 -msgctxt "view-padding-color" -msgid "_Light Check Color" -msgstr "Color de los cuadros c_laros" - -#: ../app/actions/view-actions.c:400 -msgctxt "view-padding-color" -msgid "Use the light check color" -msgstr "Usar el color de los cuadrados claros" - -#: ../app/actions/view-actions.c:405 -msgctxt "view-padding-color" -msgid "_Dark Check Color" -msgstr "Color de los cuadros o_scuros" - -#: ../app/actions/view-actions.c:406 -msgctxt "view-padding-color" -msgid "Use the dark check color" -msgstr "Usar el color de los cuadrados oscuros" - -#: ../app/actions/view-actions.c:411 -msgctxt "view-padding-color" -msgid "Select _Custom Color..." -msgstr "Seleccionar color _personalizado…" - -#: ../app/actions/view-actions.c:412 -msgctxt "view-padding-color" -msgid "Use an arbitrary color" -msgstr "Usar un color arbitrario" - -#: ../app/actions/view-actions.c:417 -msgctxt "view-padding-color" -msgid "As in _Preferences" -msgstr "Como en las _preferencias" - -#: ../app/actions/view-actions.c:419 -msgctxt "view-padding-color" -msgid "Reset padding color to what's configured in preferences" -msgstr "Reiniciar el color de relleno a lo establecido en las preferencias" - -#: ../app/actions/view-actions.c:618 -#, c-format -msgid "Re_vert Zoom (%d%%)" -msgstr "Re_vertir la ampliación (%d%%)" - -#: ../app/actions/view-actions.c:626 -msgid "Re_vert Zoom" -msgstr "Re_vertir la ampliación" - -#: ../app/actions/view-actions.c:761 -#, c-format -msgid "Othe_r (%s)..." -msgstr "Ot_ro (%s)…" - -#: ../app/actions/view-actions.c:770 -#, c-format -msgid "_Zoom (%s)" -msgstr "A_mpliación (%s)" - -#: ../app/actions/view-commands.c:603 -msgid "Set Canvas Padding Color" -msgstr "Establecer el color de relleno del lienzo" - -#: ../app/actions/view-commands.c:605 -msgid "Set Custom Canvas Padding Color" -msgstr "Establecer el color personalizado de relleno del lienzo" - -#: ../app/actions/window-actions.c:170 -#, c-format -msgid "Screen %s" -msgstr "Pantalla %s" - -#: ../app/actions/window-actions.c:172 -#, c-format -msgid "Move this window to screen %s" -msgstr "Mover esta ventana a la pantalla %s" - -#: ../app/actions/windows-actions.c:93 -msgctxt "windows-action" -msgid "_Windows" -msgstr "Ve_ntanas" - -#: ../app/actions/windows-actions.c:95 -msgctxt "windows-action" -msgid "_Recently Closed Docks" -msgstr "Empotrables cerrados _recientemente" - -#: ../app/actions/windows-actions.c:97 -msgctxt "windows-action" -msgid "_Dockable Dialogs" -msgstr "_Diálogos empotrables" - -#: ../app/actions/windows-actions.c:100 -msgctxt "windows-action" -msgid "Next Image" -msgstr "Imagen siguiente" - -#: ../app/actions/windows-actions.c:101 -msgctxt "windows-action" -msgid "Switch to the next image" -msgstr "Cambiar a la imagen siguiente" - -#: ../app/actions/windows-actions.c:106 -msgctxt "windows-action" -msgid "Previous Image" -msgstr "Imagen anterior" - -#: ../app/actions/windows-actions.c:107 -msgctxt "windows-action" -msgid "Switch to the previous image" -msgstr "Cambiar a la imagen anterior" - -#: ../app/actions/windows-actions.c:115 -msgctxt "windows-action" -msgid "Hide Docks" -msgstr "Ocultar los empotrables" - -#: ../app/actions/windows-actions.c:116 -msgctxt "windows-action" -msgid "" -"When enabled docks and other dialogs are hidden, leaving only image windows." -msgstr "" -"Ocultar los empotrables activos y otros diálogos, dejando sólo las ventanas " -"de imagen." - -#: ../app/actions/windows-actions.c:122 -msgctxt "windows-action" -msgid "Single-Window Mode" -msgstr "Modo de ventana única" - -#: ../app/actions/windows-actions.c:123 -msgctxt "windows-action" -msgid "When enabled GIMP is in a single-window mode." -msgstr "Cuando GIMP está en modo de ventana única." - -#: ../app/base/base-enums.c:23 -msgctxt "curve-type" -msgid "Smooth" -msgstr "Suave" - -#: ../app/base/base-enums.c:24 -msgctxt "curve-type" -msgid "Freehand" -msgstr "Mano alzada" - -#: ../app/base/base-enums.c:56 -msgctxt "histogram-channel" -msgid "Value" -msgstr "Valor" - -#: ../app/base/base-enums.c:57 -msgctxt "histogram-channel" -msgid "Red" -msgstr "Rojo" - -#: ../app/base/base-enums.c:58 -msgctxt "histogram-channel" -msgid "Green" -msgstr "Verde" - -#: ../app/base/base-enums.c:59 -msgctxt "histogram-channel" -msgid "Blue" -msgstr "Azul" - -#: ../app/base/base-enums.c:60 -msgctxt "histogram-channel" -msgid "Alpha" -msgstr "Alfa" - -#: ../app/base/base-enums.c:61 -msgctxt "histogram-channel" -msgid "RGB" -msgstr "RGB" - -#: ../app/base/base-enums.c:113 -msgctxt "layer-mode-effects" -msgid "Normal" -msgstr "Normal" - -#: ../app/base/base-enums.c:114 -msgctxt "layer-mode-effects" -msgid "Dissolve" -msgstr "Disolver" - -#: ../app/base/base-enums.c:115 -msgctxt "layer-mode-effects" -msgid "Behind" -msgstr "Detrás" - -#: ../app/base/base-enums.c:116 -msgctxt "layer-mode-effects" -msgid "Multiply" -msgstr "Multiplicar" - -#: ../app/base/base-enums.c:117 -msgctxt "layer-mode-effects" -msgid "Screen" -msgstr "Pantalla" - -#: ../app/base/base-enums.c:118 -msgctxt "layer-mode-effects" -msgid "Overlay" -msgstr "Solapar" - -#: ../app/base/base-enums.c:119 -msgctxt "layer-mode-effects" -msgid "Difference" -msgstr "Diferencia" - -#: ../app/base/base-enums.c:120 -msgctxt "layer-mode-effects" -msgid "Addition" -msgstr "Suma" - -#: ../app/base/base-enums.c:121 -msgctxt "layer-mode-effects" -msgid "Subtract" -msgstr "Sustraer" - -#: ../app/base/base-enums.c:122 -msgctxt "layer-mode-effects" -msgid "Darken only" -msgstr "Oscurecer sólo" - -#: ../app/base/base-enums.c:123 -msgctxt "layer-mode-effects" -msgid "Lighten only" -msgstr "Clarear sólo" - -#: ../app/base/base-enums.c:124 -msgctxt "layer-mode-effects" -msgid "Hue" -msgstr "Tono" - -#: ../app/base/base-enums.c:125 -msgctxt "layer-mode-effects" -msgid "Saturation" -msgstr "Saturación" - -#: ../app/base/base-enums.c:126 -msgctxt "layer-mode-effects" -msgid "Color" -msgstr "Color" - -#: ../app/base/base-enums.c:127 -msgctxt "layer-mode-effects" -msgid "Value" -msgstr "Valor" - -#: ../app/base/base-enums.c:128 -msgctxt "layer-mode-effects" -msgid "Divide" -msgstr "Dividir" - -#: ../app/base/base-enums.c:129 -msgctxt "layer-mode-effects" -msgid "Dodge" -msgstr "Blanquear" - -#: ../app/base/base-enums.c:130 -msgctxt "layer-mode-effects" -msgid "Burn" -msgstr "Ennegrecer" - -#: ../app/base/base-enums.c:131 -msgctxt "layer-mode-effects" -msgid "Hard light" -msgstr "Claridad fuerte" - -#: ../app/base/base-enums.c:132 -msgctxt "layer-mode-effects" -msgid "Soft light" -msgstr "Claridad suave" - -#: ../app/base/base-enums.c:133 -msgctxt "layer-mode-effects" -msgid "Grain extract" -msgstr "Extraer granulado" - -#: ../app/base/base-enums.c:134 -msgctxt "layer-mode-effects" -msgid "Grain merge" -msgstr "Combinar granulado" - -#: ../app/base/base-enums.c:135 -msgctxt "layer-mode-effects" -msgid "Color erase" -msgstr "Borrar color" - -#: ../app/base/base-enums.c:136 -msgctxt "layer-mode-effects" -msgid "Erase" -msgstr "Borrar" - -#: ../app/base/base-enums.c:137 -msgctxt "layer-mode-effects" -msgid "Replace" -msgstr "Reemplazar" - -#: ../app/base/base-enums.c:138 -msgctxt "layer-mode-effects" -msgid "Anti erase" -msgstr "Anti-borrado" - -#: ../app/base/tile-swap.c:710 -msgid "" -"Unable to open swap file. GIMP has run out of memory and cannot use the swap " -"file. Some parts of your images may be corrupted. Try to save your work " -"using different filenames, restart GIMP and check the location of the swap " -"directory in your Preferences." -msgstr "" -"Imposible abrir el archivo de intercambio. GIMP ha agotado toda la memoria y " -"no puede usar el archivo de intercambio. Algunas partes de sus imágenes " -"pueden estar corrompidas. Intente guardar su trabajo usando nombres de " -"archivo diferentes, reinicie GIMP y compruebe la ubicación de la carpeta de " -"intercambio en sus Preferencias." - -#: ../app/base/tile-swap.c:725 -#, c-format -msgid "Failed to resize swap file: %s" -msgstr "Falló al cambiar el tamaño del archivo de intercambio: %s" - -#: ../app/config/config-enums.c:24 -msgctxt "cursor-mode" -msgid "Tool icon" -msgstr "Icono de herramienta" - -#: ../app/config/config-enums.c:25 -msgctxt "cursor-mode" -msgid "Tool icon with crosshair" -msgstr "Icono de herramienta con cruz" - -#: ../app/config/config-enums.c:26 -msgctxt "cursor-mode" -msgid "Crosshair only" -msgstr "Sólo cruz" - -#: ../app/config/config-enums.c:56 -msgctxt "canvas-padding-mode" -msgid "From theme" -msgstr "Del tema" - -#: ../app/config/config-enums.c:57 -msgctxt "canvas-padding-mode" -msgid "Light check color" -msgstr "Color de los cuadros claros" - -#: ../app/config/config-enums.c:58 -msgctxt "canvas-padding-mode" -msgid "Dark check color" -msgstr "Color de los cuadros oscuros" - -#: ../app/config/config-enums.c:59 -msgctxt "canvas-padding-mode" -msgid "Custom color" -msgstr "Color personalizado" - -#: ../app/config/config-enums.c:88 -msgctxt "space-bar-action" -msgid "No action" -msgstr "Sin acción" - -#: ../app/config/config-enums.c:89 -msgctxt "space-bar-action" -msgid "Pan view" -msgstr "Vista panorámica" - -#: ../app/config/config-enums.c:90 -msgctxt "space-bar-action" -msgid "Switch to Move tool" -msgstr "Cambiar a la herramienta Mover" - -#: ../app/config/config-enums.c:118 -msgctxt "zoom-quality" -msgid "Low" -msgstr "Baja" - -#: ../app/config/config-enums.c:119 -msgctxt "zoom-quality" -msgid "High" -msgstr "Alta" - -#: ../app/config/config-enums.c:147 -msgctxt "help-browser-type" -msgid "GIMP help browser" -msgstr "Visor de ayuda de GIMP" - -#: ../app/config/config-enums.c:148 -msgctxt "help-browser-type" -msgid "Web browser" -msgstr "Navegador web" - -#: ../app/config/config-enums.c:177 -msgctxt "window-hint" -msgid "Normal window" -msgstr "Ventana normal" - -#: ../app/config/config-enums.c:178 -msgctxt "window-hint" -msgid "Utility window" -msgstr "Ventana de utilidades" - -#: ../app/config/config-enums.c:179 -msgctxt "window-hint" -msgid "Keep above" -msgstr "Mantener por encima" - -#: ../app/config/config-enums.c:207 -msgctxt "cursor-format" -msgid "Black & white" -msgstr "Blanco y negro" - -#: ../app/config/config-enums.c:208 -msgctxt "cursor-format" -msgid "Fancy" -msgstr "Fantasía" - -#: ../app/config/config-enums.c:236 -msgctxt "handedness" -msgid "Left-handed" -msgstr "Zurdo" - -#: ../app/config/config-enums.c:237 -msgctxt "handedness" -msgid "Right-handed" -msgstr "Diestro" - -#: ../app/config/gimpconfig-file.c:67 ../app/core/gimpbrushgenerated-save.c:62 -#: ../app/core/gimpcurve-save.c:52 ../app/core/gimpgradient-save.c:50 -#: ../app/core/gimpgradient-save.c:144 ../app/core/gimppalette-save.c:56 -#: ../app/gui/themes.c:248 ../app/tools/gimpcurvestool.c:695 -#: ../app/tools/gimplevelstool.c:800 ../app/vectors/gimpvectors-export.c:81 -#: ../app/xcf/xcf.c:452 -#, c-format -msgid "Could not open '%s' for writing: %s" -msgstr "No se ha podido abrir «%s» para escritura: %s" - -#: ../app/config/gimpconfig-file.c:78 ../app/config/gimpconfig-file.c:101 -#, c-format -msgid "Error writing '%s': %s" -msgstr "Ocurrió un error al escribir «%s»: %s" - -#: ../app/config/gimpconfig-file.c:89 -#, c-format -msgid "Error reading '%s': %s" -msgstr "Ocurrió un error al leer «%s»: %s" - -#: ../app/config/gimpconfig-file.c:131 -#, c-format -msgid "" -"There was an error parsing your '%s' file. Default values will be used. A " -"backup of your configuration has been created at '%s'." -msgstr "" -"Ha ocurrido un error analizando su archivo «%s». Se usarán los valores " -"predeterminados. Se ha creado un resguardo de su configuración en «%s»." - -#. Not all strings defined here are used in the user interface -#. * (the preferences dialog mainly) and only those that are should -#. * be marked for translation. -#. -#: ../app/config/gimprc-blurbs.h:13 -msgid "" -"When enabled, an image will become the active image when its image window " -"receives the focus. This is useful for window managers using \"click to focus" -"\"." -msgstr "" -"Cuando está activado, una imagen se convertirá en activa al recibir el foco " -"la ventana de su imagen. Esto es muy útil para los gestores de ventanas que " -"estén utilizando «pulsar para obtener el foco»." - -#: ../app/config/gimprc-blurbs.h:23 ../app/config/gimprc-blurbs.h:28 -msgid "Sets the dynamics search path." -msgstr "Establece la ruta de búsqueda de dinámicas." - -#: ../app/config/gimprc-blurbs.h:33 -msgid "" -"Sets the canvas padding color used if the padding mode is set to custom " -"color." -msgstr "" -"Establece el color de relleno del lienzo usado si el modo de relleno está " -"definido como color personalizado." - -#: ../app/config/gimprc-blurbs.h:37 -msgid "Specifies how the area around the image should be drawn." -msgstr "Especifica cómo debe dibujarse el área alrededor de la imagen." - -#: ../app/config/gimprc-blurbs.h:43 -msgid "How to handle embedded color profiles when opening a file." -msgstr "Cómo tratar los perfiles de color incrustados al abrir un archivo." - -#: ../app/config/gimprc-blurbs.h:46 -msgid "Sets the pixel format to use for mouse pointers." -msgstr "Establece el formato de píxel para los cursores del ratón." - -#: ../app/config/gimprc-blurbs.h:49 -msgid "Sets the type of mouse pointers to use." -msgstr "Establece el tipo de punteros del ratón que usar." - -#: ../app/config/gimprc-blurbs.h:52 -msgid "Sets the handedness for cursor positioning." -msgstr "Fijar el posicionamiento del cursor en modo diestro o zurdo." - -#: ../app/config/gimprc-blurbs.h:55 -msgid "" -"Context-dependent mouse pointers are helpful. They are enabled by default. " -"However, they require overhead that you may want to do without." -msgstr "" -"Los cursores dependientes del contexto son de gran ayuda. Están activados de " -"forma predeterminada. Sin embargo requieren procesamiento extra que quizá " -"usted podría necesitar si no los utiliza." - -#: ../app/config/gimprc-blurbs.h:71 -msgid "" -"When enabled, this will ensure that each pixel of an image gets mapped to a " -"pixel on the screen." -msgstr "" -"Cuando se encuentre activado esto asegurará que cada píxel de una imagen se " -"asigne a un píxel de la pantalla." - -#: ../app/config/gimprc-blurbs.h:93 -msgid "This is the distance in pixels where Guide and Grid snapping activates." -msgstr "" -"Esto es la distancia en píxeles a partir del cual se activa el ajuste a la " -"rejilla y la guía." - -#: ../app/config/gimprc-blurbs.h:109 -msgid "" -"Tools such as fuzzy-select and bucket fill find regions based on a seed-fill " -"algorithm. The seed fill starts at the initially selected pixel and " -"progresses in all directions until the difference of pixel intensity from " -"the original is greater than a specified threshold. This value represents " -"the default threshold." -msgstr "" -"Las herramientas como «Selección difusa» y «Relleno» buscan regiones basándose " -"en un algoritmo de búsqueda de semilla. El relleno de semilla arranca en el " -"píxel seleccionado inicialmente y avanza en todas direcciones hasta que la " -"diferencia de la intensidad del píxel del original es más grande que el " -"umbral especificado. Este valor representa el umbral predeterminado." - -#: ../app/config/gimprc-blurbs.h:122 -msgid "" -"The window type hint that is set on dock windows and the toolbox window. " -"This may affect the way your window manager decorates and handles these " -"windows." -msgstr "" -"La opción de tipo de ventana que se utiliza en las ventanas empotrables y en " -"la ventana de la caja de herramientas. Esto podría afectar la forma en que " -"su gestor de ventanas decora y maneja estas ventanas." - -#: ../app/config/gimprc-blurbs.h:154 -msgid "When enabled, the selected brush will be used for all tools." -msgstr "" -"Cuando esté activado, el pincel seleccionado se usará para todas las " -"herramientas." - -#: ../app/config/gimprc-blurbs.h:157 -msgid "When enabled, the selected dynamics will be used for all tools." -msgstr "" -"Cuando esté activado, se usará la dinámica seleccionada para todas las " -"herramientas." - -#: ../app/config/gimprc-blurbs.h:163 -msgid "When enabled, the selected gradient will be used for all tools." -msgstr "" -"Cuando esté activado, el degradado seleccionado se usará para todas las " -"herramientas." - -#: ../app/config/gimprc-blurbs.h:166 -msgid "When enabled, the selected pattern will be used for all tools." -msgstr "" -"Cuando esté activado, el patrón seleccionado será usado para todas las " -"herramientas." - -#: ../app/config/gimprc-blurbs.h:180 -msgid "Sets the browser used by the help system." -msgstr "Establece el visor que usará el sistema de ayuda." - -#: ../app/config/gimprc-blurbs.h:191 -msgid "Sets the text to appear in image window status bars." -msgstr "" -"Establece el texto que aparecerá en las barras de estado de las ventanas de " -"imágenes." - -#: ../app/config/gimprc-blurbs.h:194 -msgid "Sets the text to appear in image window titles." -msgstr "" -"Establece el texto que aparecerá en los títulos de las ventanas de imágenes." - -#: ../app/config/gimprc-blurbs.h:197 -msgid "" -"When enabled, this will ensure that the full image is visible after a file " -"is opened, otherwise it will be displayed with a scale of 1:1." -msgstr "" -"Cuando se encuentre activado esto asegurará que la imagen se vea completa " -"después de abrirse, de otro modo será mostrada con una escala de 1:1." - -#: ../app/config/gimprc-blurbs.h:201 -msgid "" -"Sets the level of interpolation used for scaling and other transformations." -msgstr "" -"Establece el nivel de interpolación utilizado para el redimensionado y otras " -"transformaciones." - -#: ../app/config/gimprc-blurbs.h:208 -msgid "Specifies the language to use for the user interface." -msgstr "Establecer el idioma de la interfaz de usuario." - -#: ../app/config/gimprc-blurbs.h:211 -msgid "How many recently opened image filenames to keep on the File menu." -msgstr "" -"Cuántos nombres de archivos de imágenes abiertas recientemente se deben " -"mantener en el menú Archivo." - -#: ../app/config/gimprc-blurbs.h:214 -msgid "" -"Speed of marching ants in the selection outline. This value is in " -"milliseconds (less time indicates faster marching)." -msgstr "" -"Velocidad de las hormigas marchantes en el contorno de la selección. Este " -"valor está en milisegundos (menos tiempo indica una marcha mas rápida)." - -#: ../app/config/gimprc-blurbs.h:218 -msgid "" -"GIMP will warn the user if an attempt is made to create an image that would " -"take more memory than the size specified here." -msgstr "" -"GIMP advertirá al usuario si realiza un intento de crear una imagen que " -"podría requerir más memoria que el tamaño especificado aquí." - -#: ../app/config/gimprc-blurbs.h:228 -msgid "" -"Sets the monitor's horizontal resolution, in dots per inch. If set to 0, " -"forces the X server to be queried for both horizontal and vertical " -"resolution information." -msgstr "" -"Establece la resolución horizontal del monitor, en puntos por pulgada. Si se " -"establece a 0, se fuerza una consulta al servidor X para obtener la " -"resolución horizontal y vertical." - -#: ../app/config/gimprc-blurbs.h:233 -msgid "" -"Sets the monitor's vertical resolution, in dots per inch. If set to 0, " -"forces the X server to be queried for both horizontal and vertical " -"resolution information." -msgstr "" -"Establece la resolución vertical del monitor, en puntos por pulgada. Si se " -"establece a 0, se fuerza una consulta al servidor X para obtener la " -"resolución horizontal y vertical." - -#: ../app/config/gimprc-blurbs.h:238 -msgid "" -"If enabled, the move tool sets the edited layer or path as active. This " -"used to be the default behaviour in older versions." -msgstr "" -"Si está activado, la herramienta de movimiento cambia la capa editada o ruta " -"como activa. Esto solía ser el comportamiento predeterminado en las " -"versiones más antiguas." - -#: ../app/config/gimprc-blurbs.h:242 -msgid "" -"Sets the size of the navigation preview available in the lower right corner " -"of the image window." -msgstr "" -"Establece el tamaño de la vista previa de la navegación disponible en la " -"esquina inferior derecha de la ventana de la imagen." - -#: ../app/config/gimprc-blurbs.h:246 -msgid "Sets how many processors GIMP should try to use simultaneously." -msgstr "" -"Establece cuántos procesadores debe intentar usar simultáneamente GIMP." - -#: ../app/config/gimprc-blurbs.h:259 -msgid "" -"When enabled, the X server is queried for the mouse's current position on " -"each motion event, rather than relying on the position hint. This means " -"painting with large brushes should be more accurate, but it may be slower. " -"Conversely, on some X servers enabling this option results in faster " -"painting." -msgstr "" -"Cuando se encuentre activado, se consultará al servidor X por la posición " -"actual del ratón con cada evento de movimiento, en vez de confiar en la " -"pista de posición. Esto significa que pintar con pinceles grandes debería " -"ser más preciso, pero podría ser más lento. Perversamente en algunos " -"servidores X al activarse esta opción se obtiene un pintado más rápido." - -#: ../app/config/gimprc-blurbs.h:275 -msgid "" -"Sets whether GIMP should create previews of layers and channels. Previews in " -"the layers and channels dialog are nice to have but they can slow things " -"down when working with large images." -msgstr "" -"Establece si GIMP debería crear vistas previas de las capas y los canales. " -"Disponer de las vistas previas en el diálogo de capas y canales queda bien, " -"pero puede ralentizar las cosas al trabajar con imágenes grandes." - -#: ../app/config/gimprc-blurbs.h:280 -msgid "" -"Sets the preview size used for layers and channel previews in newly created " -"dialogs." -msgstr "" -"Establece el tamaño de la vista previa usado para las vistas preliminares de " -"las capas y los canales en los diálogos nuevos creados." - -#: ../app/config/gimprc-blurbs.h:284 -msgid "Sets the default quick mask color." -msgstr "Establece el color predeterminado de la máscara rápida." - -#: ../app/config/gimprc-blurbs.h:287 -msgid "" -"When enabled, the image window will automatically resize itself whenever the " -"physical image size changes." -msgstr "" -"Cuando se encuentre activado, la ventana de la imagen se redimensionará " -"automáticamente cuando cambie el tamaño físico de la imagen." - -#: ../app/config/gimprc-blurbs.h:291 -msgid "" -"When enabled, the image window will automatically resize itself when zooming " -"into and out of images." -msgstr "" -"Cuando se encuentre activado, la ventana de la imagen se redimensionará " -"automáticamente al ampliar o reducir las imágenes." - -#: ../app/config/gimprc-blurbs.h:295 -msgid "Let GIMP try to restore your last saved session on each startup." -msgstr "" -"Permitir a GIMP intentar restaurar la última sesión guardada en cada inicio." - -#: ../app/config/gimprc-blurbs.h:298 -msgid "" -"Remember the current tool, pattern, color, and brush across GIMP sessions." -msgstr "" -"Recordar la herramienta, el patrón, el color y los pinceles actuales entre " -"distintas sesiones de GIMP." - -#: ../app/config/gimprc-blurbs.h:302 -msgid "" -"Keep a permanent record of all opened and saved files in the Recent " -"Documents list." -msgstr "" -"Mantener un registro permanente de todos los archivos abiertos y guardados " -"en la lista de documentos recientes." - -#: ../app/config/gimprc-blurbs.h:306 -msgid "Save the positions and sizes of the main dialogs when GIMP exits." -msgstr "" -"Guardar las posiciones y tamaños de los diálogos principales al salir de " -"GIMP." - -#: ../app/config/gimprc-blurbs.h:309 -msgid "Save the tool options when GIMP exits." -msgstr "Guardar las opciones de herramientas al salir de GIMP." - -#: ../app/config/gimprc-blurbs.h:315 -msgid "" -"When enabled, all paint tools will show a preview of the current brush's " -"outline." -msgstr "" -"Cuando está habilitado todas la herramientas de pintura mostrarán una vista " -"previa del contorno de el pincel actual." - -#: ../app/config/gimprc-blurbs.h:319 -msgid "" -"When enabled, dialogs will show a help button that gives access to the " -"related help page. Without this button, the help page can still be reached " -"by pressing F1." -msgstr "" -"Cuando está activado, los diálogos mostrarán un botón de ayuda que da acceso " -"a la página de ayuda relacionada. Sin ese botón, la página de ayuda puede " -"verse al pulsar F1." - -#: ../app/config/gimprc-blurbs.h:324 -msgid "" -"When enabled, the mouse pointer will be shown over the image while using a " -"paint tool." -msgstr "" -"Cuando se encuentre activado, el cursor se mostrará sobre la imagen cuando " -"se use una herramienta de pintura." - -#: ../app/config/gimprc-blurbs.h:328 -msgid "" -"When enabled, the menubar is visible by default. This can also be toggled " -"with the \"View->Show Menubar\" command." -msgstr "" -"Cuando está activado la barra de estado es visible de forma predeterminada. " -"Esto también se puede activar con la instrucción «Ver->Mostrar la barra de " -"estado»." - -#: ../app/config/gimprc-blurbs.h:332 -msgid "" -"When enabled, the rulers are visible by default. This can also be toggled " -"with the \"View->Show Rulers\" command." -msgstr "" -"Cuando está activado las reglas están visibles de forma predeterminada. Esto " -"también se puede activar con la instrucción «Ver->Mostrar las reglas»." - -#: ../app/config/gimprc-blurbs.h:336 -msgid "" -"When enabled, the scrollbars are visible by default. This can also be " -"toggled with the \"View->Show Scrollbars\" command." -msgstr "" -"Cuando está activado las barras de desplazamiento están visibles de forma " -"predeterminada. Esto también se puede activar con la instrucción «Ver-" -">Mostrar las barras de desplazamiento»." - -#: ../app/config/gimprc-blurbs.h:340 -msgid "" -"When enabled, the statusbar is visible by default. This can also be toggled " -"with the \"View->Show Statusbar\" command." -msgstr "" -"Cuando está activado la barra de estado es visible de forma predeterminada. " -"Esto también puede puede activarse con la instrucción «Ver->Mostrar la barra " -"de estado»." - -#: ../app/config/gimprc-blurbs.h:344 -msgid "" -"When enabled, the selection is visible by default. This can also be toggled " -"with the \"View->Show Selection\" command." -msgstr "" -"Cuando está activado la selección es visible de forma predeterminada. Esto " -"también puede activarse con la instrucción «Ver->Mostrar la selección»." - -#: ../app/config/gimprc-blurbs.h:348 -msgid "" -"When enabled, the layer boundary is visible by default. This can also be " -"toggled with the \"View->Show Layer Boundary\" command." -msgstr "" -"Cuando está activado el límite de la capa es visible de forma " -"predeterminada. Esto también puede activarse con la instrucción «Ver->Mostrar " -"el límite de la capa»." - -#: ../app/config/gimprc-blurbs.h:352 -msgid "" -"When enabled, the guides are visible by default. This can also be toggled " -"with the \"View->Show Guides\" command." -msgstr "" -"Cuando está activado las reglas están visibles de forma predeterminada. Esto " -"también puede activarse con la instrucción «Ver->Mostrar las reglas»." - -#: ../app/config/gimprc-blurbs.h:356 -msgid "" -"When enabled, the grid is visible by default. This can also be toggled with " -"the \"View->Show Grid\" command." -msgstr "" -"Cuando está activado la rejilla es visible de forma predeterminada. Esto " -"también puede activarse con la instrucción «Ver->Mostrar la rejilla»." - -#: ../app/config/gimprc-blurbs.h:360 -msgid "" -"When enabled, the sample points are visible by default. This can also be " -"toggled with the \"View->Show Sample Points\" command." -msgstr "" -"Cuando está activado los puntos de muestra están visibles de forma " -"predeterminada. Esto también puede activarse con la instrucción «Ver->Mostrar " -"puntos de muestra»." - -#: ../app/config/gimprc-blurbs.h:364 -msgid "Show a tooltip when the pointer hovers over an item." -msgstr "Presentar una ayuda cuando el puntero pasa por encima de un elemento." - -#: ../app/config/gimprc-blurbs.h:367 -msgid "Use GIMP in a single-window mode." -msgstr "Usar GIMP en modo de ventana única." - -#: ../app/config/gimprc-blurbs.h:370 -msgid "Hide docks and other windows, leaving only image windows." -msgstr "" -"Ocultar empotrables y otras ventanas, dejando únicamente las ventanas de " -"imagen." - -#: ../app/config/gimprc-blurbs.h:373 -msgid "What to do when the space bar is pressed in the image window." -msgstr "" -"Qué hacer cuando la barra espaciadora se pulsa en la ventana de imagen." - -#: ../app/config/gimprc-blurbs.h:376 -msgid "" -"Sets the swap file location. GIMP uses a tile based memory allocation " -"scheme. The swap file is used to quickly and easily swap tiles out to disk " -"and back in. Be aware that the swap file can easily get very large if GIMP " -"is used with large images. Also, things can get horribly slow if the swap " -"file is created on a folder that is mounted over NFS. For these reasons, it " -"may be desirable to put your swap file in \"/tmp\"." -msgstr "" -"Establece la localización del archivo de intercambio. GIMP utiliza un " -"esquema de reserva de memoria basado en mosaicos. El archivo de intercambio " -"se utiliza para intercambiar mosaicos rápida y fácilmente hacia y desde el " -"disco. Tenga en cuenta que el archivo de intercambio puede volverse muy " -"grande fácilmente si GIMP se utiliza con imágenes grandes. Las cosas pueden " -"también ponerse horriblemente lentas si el archivo de intercambio se crea en " -"una carpeta montada sobre NFS. Por estas razones quizá sea conveniente " -"colocar su archivo de intercambio en «/tmp»." - -#: ../app/config/gimprc-blurbs.h:385 -msgid "When enabled, menus can be torn off." -msgstr "Cuando se encuentre activado, los menús podrán ser separados." - -#: ../app/config/gimprc-blurbs.h:388 -msgid "" -"When enabled, you can change keyboard shortcuts for menu items by hitting a " -"key combination while the menu item is highlighted." -msgstr "" -"Cuando está activado puede cambiar las combinaciones de teclas de los " -"elementos del menú presionando una combinación de teclas mientras el " -"elemento del menú está resaltado." - -#: ../app/config/gimprc-blurbs.h:392 -msgid "Save changed keyboard shortcuts when GIMP exits." -msgstr "Guardar las combinaciones de teclas modificadas al salir de GIMP." - -#: ../app/config/gimprc-blurbs.h:395 -msgid "Restore saved keyboard shortcuts on each GIMP startup." -msgstr "" -"Restaurar las combinaciones de teclas guardadas en cada inicio de GIMP." - -#: ../app/config/gimprc-blurbs.h:398 -msgid "" -"Sets the folder for temporary storage. Files will appear here during the " -"course of running GIMP. Most files will disappear when GIMP exits, but some " -"files are likely to remain, so it is best if this folder not be one that is " -"shared by other users." -msgstr "" -"Establece la carpeta de almacenamiento temporal. Los archivos aparecerán " -"aquí durante el curso de ejecución de GIMP. La mayoría de los archivos " -"desaparecerán cuando se salga de GIMP, pero algunos archivos podrían " -"permanecer, por lo tanto es mejor si esta carpeta no está compartida con " -"otros usuarios." - -#: ../app/config/gimprc-blurbs.h:410 -msgid "Sets the size of the thumbnail shown in the Open dialog." -msgstr "" -"Establece el tamaño de la miniatura que se muestra en el diálogo Abrir." - -#: ../app/config/gimprc-blurbs.h:413 -msgid "" -"The thumbnail in the Open dialog will be automatically updated if the file " -"being previewed is smaller than the size set here." -msgstr "" -"La miniatura en el diálogo Abrir será actualizada automáticamente si el " -"archivo que se está previsualizando es más pequeño que el tamaño establecido " -"aquí." - -#: ../app/config/gimprc-blurbs.h:417 -msgid "" -"When the amount of pixel data exceeds this limit, GIMP will start to swap " -"tiles to disk. This is a lot slower but it makes it possible to work on " -"images that wouldn't fit into memory otherwise. If you have a lot of RAM, " -"you may want to set this to a higher value." -msgstr "" -"Cuando la cantidad de datos del píxel excede este límite, GIMP empezará a " -"intercambiar tiles al disco. Esto es muy lento pero hace posible trabajar " -"con imágenes que no cabrían en la memoria de otra forma. Si tiene mucha RAM, " -"quizá quiera poner esto a un valor más alto." - -#: ../app/config/gimprc-blurbs.h:423 -msgid "Show the current foreground and background colors in the toolbox." -msgstr "" -"Mostrar los colores de frente y fondo actuales en la caja de herramientas." - -#: ../app/config/gimprc-blurbs.h:426 -msgid "Show the currently selected brush, pattern and gradient in the toolbox." -msgstr "" -"Mostrar los pinceles, patrones y degradados activos en la caja de " -"herramientas" - -#: ../app/config/gimprc-blurbs.h:429 -msgid "Show the currently active image in the toolbox." -msgstr "Mostrar la imagen activa en la caja de herramientas." - -#: ../app/config/gimprc-blurbs.h:435 -msgid "Sets the manner in which transparency is displayed in images." -msgstr "Establece la forma en que se muestra la transparencia en las imágenes." - -#: ../app/config/gimprc-blurbs.h:438 -msgid "Sets the size of the checkerboard used to display transparency." -msgstr "" -"Establece el tamaño del cuadriculado utilizado para mostrar la transparencia." - -#: ../app/config/gimprc-blurbs.h:441 -msgid "" -"When enabled, GIMP will not save an image if it has not been changed since " -"it was opened." -msgstr "" -"Cuando se encuentre activado GIMP no guardará una imagen si no se ha " -"modificado desde que se abrió." - -#: ../app/config/gimprc-blurbs.h:445 -msgid "" -"Sets the minimal number of operations that can be undone. More undo levels " -"are kept available until the undo-size limit is reached." -msgstr "" -"Establece la cantidad mínima de operaciones que pueden ser desechas. Más " -"niveles de deshacer se mantienen disponibles hasta que se alcanza el límite " -"de niveles de deshacer." - -#: ../app/config/gimprc-blurbs.h:449 -msgid "" -"Sets an upper limit to the memory that is used per image to keep operations " -"on the undo stack. Regardless of this setting, at least as many undo-levels " -"as configured can be undone." -msgstr "" -"Establece el límite superior de la memoria que cada imagen utiliza para " -"guardar las operaciones en la pila de deshacer. Independientemente de esta " -"configuración sólo pueden deshacerse tantos niveles deshacer como este " -"configurado." - -#: ../app/config/gimprc-blurbs.h:454 -msgid "Sets the size of the previews in the Undo History." -msgstr "Obtiene el tamaño de las vistas previas en el Histórico de deshacer." - -#: ../app/config/gimprc-blurbs.h:457 -msgid "When enabled, pressing F1 will open the help browser." -msgstr "Cuando se encuentre activado, pulsando F1 se abrirá el visor de ayuda." - -#: ../app/config/gimprc-deserialize.c:135 ../app/core/gimp-modules.c:136 -#: ../app/core/gimp-units.c:167 ../app/gui/session.c:286 -#: ../app/plug-in/plug-in-rc.c:212 -msgid "fatal parse error" -msgstr "Error fatal de análisis" - -#: ../app/config/gimprc-deserialize.c:163 -#, c-format -msgid "value for token %s is not a valid UTF-8 string" -msgstr "el valor para la señal %s no es una cadena UTF-8 válida" - -#: ../app/core/core-enums.c:54 -msgctxt "convert-dither-type" -msgid "None" -msgstr "Ninguno" - -#: ../app/core/core-enums.c:55 -msgctxt "convert-dither-type" -msgid "Floyd-Steinberg (normal)" -msgstr "Floyd-Steinberg (normal)" - -#: ../app/core/core-enums.c:56 -msgctxt "convert-dither-type" -msgid "Floyd-Steinberg (reduced color bleeding)" -msgstr "Floyd-Steinberg (sangrado de color reducido)" - -#: ../app/core/core-enums.c:57 -msgctxt "convert-dither-type" -msgid "Positioned" -msgstr "Posicionado" - -#: ../app/core/core-enums.c:87 -msgctxt "convert-palette-type" -msgid "Generate optimum palette" -msgstr "Generar paleta óptima" - -#: ../app/core/core-enums.c:88 -msgctxt "convert-palette-type" -msgid "Use web-optimized palette" -msgstr "Usar paleta optimizada para web" - -#: ../app/core/core-enums.c:89 -msgctxt "convert-palette-type" -msgid "Use black and white (1-bit) palette" -msgstr "Usar paleta en blanco y negro (1-bit)" - -#: ../app/core/core-enums.c:90 -msgctxt "convert-palette-type" -msgid "Use custom palette" -msgstr "Usar paleta personal" - -#: ../app/core/core-enums.c:216 -msgctxt "align-reference-type" -msgid "First item" -msgstr "Primer elemento" - -#: ../app/core/core-enums.c:217 -msgctxt "align-reference-type" -msgid "Image" -msgstr "Imagen" - -#: ../app/core/core-enums.c:218 -msgctxt "align-reference-type" -msgid "Selection" -msgstr "Selección" - -#: ../app/core/core-enums.c:219 -msgctxt "align-reference-type" -msgid "Active layer" -msgstr "Capa activa" - -#: ../app/core/core-enums.c:220 -msgctxt "align-reference-type" -msgid "Active channel" -msgstr "Canal activo" - -#: ../app/core/core-enums.c:221 -msgctxt "align-reference-type" -msgid "Active path" -msgstr "Ruta activa" - -#: ../app/core/core-enums.c:253 -msgctxt "fill-type" -msgid "Foreground color" -msgstr "Color de frente" - -#: ../app/core/core-enums.c:254 -msgctxt "fill-type" -msgid "Background color" -msgstr "Color de fondo" - -#: ../app/core/core-enums.c:255 -msgctxt "fill-type" -msgid "White" -msgstr "Blanco" - -#: ../app/core/core-enums.c:256 -msgctxt "fill-type" -msgid "Transparency" -msgstr "Transparencia" - -#: ../app/core/core-enums.c:257 -msgctxt "fill-type" -msgid "Pattern" -msgstr "Patrón" - -#: ../app/core/core-enums.c:258 -msgctxt "fill-type" -msgid "None" -msgstr "Ninguno" - -#: ../app/core/core-enums.c:286 -msgctxt "fill-style" -msgid "Solid color" -msgstr "Color sólido" - -#: ../app/core/core-enums.c:287 -msgctxt "fill-style" -msgid "Pattern" -msgstr "Patrón" - -#: ../app/core/core-enums.c:315 -msgctxt "stroke-method" -msgid "Stroke line" -msgstr "Trazar línea" - -#: ../app/core/core-enums.c:316 -msgctxt "stroke-method" -msgid "Stroke with a paint tool" -msgstr "Trazar utilizando una herramienta de pintura" - -#: ../app/core/core-enums.c:345 -msgctxt "join-style" -msgid "Miter" -msgstr "Mitra" - -#: ../app/core/core-enums.c:346 -msgctxt "join-style" -msgid "Round" -msgstr "Circular" - -#: ../app/core/core-enums.c:347 -msgctxt "join-style" -msgid "Bevel" -msgstr "Biselado" - -#: ../app/core/core-enums.c:376 -msgctxt "cap-style" -msgid "Butt" -msgstr "Cabo" - -#: ../app/core/core-enums.c:377 -msgctxt "cap-style" -msgid "Round" -msgstr "Redondeado" - -#: ../app/core/core-enums.c:378 -msgctxt "cap-style" -msgid "Square" -msgstr "Cuadrado" - -#: ../app/core/core-enums.c:415 -msgctxt "dash-preset" -msgid "Custom" -msgstr "Personalizada" - -#: ../app/core/core-enums.c:416 -msgctxt "dash-preset" -msgid "Line" -msgstr "Línea" - -#: ../app/core/core-enums.c:417 -msgctxt "dash-preset" -msgid "Long dashes" -msgstr "Guiones largos" - -#: ../app/core/core-enums.c:418 -msgctxt "dash-preset" -msgid "Medium dashes" -msgstr "Guiones medianos" - -#: ../app/core/core-enums.c:419 -msgctxt "dash-preset" -msgid "Short dashes" -msgstr "Guiones cortos" - -#: ../app/core/core-enums.c:420 -msgctxt "dash-preset" -msgid "Sparse dots" -msgstr "Puntos espaciados" - -#: ../app/core/core-enums.c:421 -msgctxt "dash-preset" -msgid "Normal dots" -msgstr "Puntos normales" - -#: ../app/core/core-enums.c:422 -msgctxt "dash-preset" -msgid "Dense dots" -msgstr "Puntos densos" - -#: ../app/core/core-enums.c:423 -msgctxt "dash-preset" -msgid "Stipples" -msgstr "Punteados" - -#: ../app/core/core-enums.c:424 -msgctxt "dash-preset" -msgid "Dash, dot" -msgstr "Raya - punto" - -#: ../app/core/core-enums.c:425 -msgctxt "dash-preset" -msgid "Dash, dot, dot" -msgstr "Raya - punto - punto" - -#: ../app/core/core-enums.c:454 -msgctxt "brush-generated-shape" -msgid "Circle" -msgstr "Círculo" - -#: ../app/core/core-enums.c:455 -msgctxt "brush-generated-shape" -msgid "Square" -msgstr "Cuadrado" - -#: ../app/core/core-enums.c:456 -msgctxt "brush-generated-shape" -msgid "Diamond" -msgstr "Rombo" - -#: ../app/core/core-enums.c:485 -msgctxt "orientation-type" -msgid "Horizontal" -msgstr "Horizontal" - -#: ../app/core/core-enums.c:486 -msgctxt "orientation-type" -msgid "Vertical" -msgstr "Vertical" - -#: ../app/core/core-enums.c:487 -msgctxt "orientation-type" -msgid "Unknown" -msgstr "Desconocido" - -#: ../app/core/core-enums.c:518 -msgctxt "item-set" -msgid "None" -msgstr "Ninguno" - -#: ../app/core/core-enums.c:519 -msgctxt "item-set" -msgid "All layers" -msgstr "Todas las capas" - -#: ../app/core/core-enums.c:520 -msgctxt "item-set" -msgid "Image-sized layers" -msgstr "Capas del tamaño de la imagen" - -#: ../app/core/core-enums.c:521 -msgctxt "item-set" -msgid "All visible layers" -msgstr "Todas las capas visibles" - -#: ../app/core/core-enums.c:522 -msgctxt "item-set" -msgid "All linked layers" -msgstr "Todas las capas enlazadas" - -#: ../app/core/core-enums.c:588 -msgctxt "view-size" -msgid "Tiny" -msgstr "Diminuto" - -#: ../app/core/core-enums.c:589 -msgctxt "view-size" -msgid "Very small" -msgstr "Muy pequeño" - -#: ../app/core/core-enums.c:590 -msgctxt "view-size" -msgid "Small" -msgstr "Pequeño" - -#: ../app/core/core-enums.c:591 -msgctxt "view-size" -msgid "Medium" -msgstr "Mediano" - -#: ../app/core/core-enums.c:592 -msgctxt "view-size" -msgid "Large" -msgstr "Grande" - -#: ../app/core/core-enums.c:593 -msgctxt "view-size" -msgid "Very large" -msgstr "Muy grande" - -#: ../app/core/core-enums.c:594 -msgctxt "view-size" -msgid "Huge" -msgstr "Enorme" - -#: ../app/core/core-enums.c:595 -msgctxt "view-size" -msgid "Enormous" -msgstr "Monumental" - -#: ../app/core/core-enums.c:596 -msgctxt "view-size" -msgid "Gigantic" -msgstr "Gigantesco" - -#: ../app/core/core-enums.c:624 -msgctxt "view-type" -msgid "View as list" -msgstr "Ver como lista" - -#: ../app/core/core-enums.c:625 -msgctxt "view-type" -msgid "View as grid" -msgstr "Ver como rejilla" - -#: ../app/core/core-enums.c:654 -msgctxt "thumbnail-size" -msgid "No thumbnails" -msgstr "Sin miniaturas" - -#: ../app/core/core-enums.c:655 -msgctxt "thumbnail-size" -msgid "Normal (128x128)" -msgstr "Normal (128x128)" - -#: ../app/core/core-enums.c:656 -msgctxt "thumbnail-size" -msgid "Large (256x256)" -msgstr "Grande (256x256)" - -#: ../app/core/core-enums.c:833 -msgctxt "undo-type" -msgid "<>" -msgstr "<>" - -#: ../app/core/core-enums.c:834 -msgctxt "undo-type" -msgid "Scale image" -msgstr "Escalar la imagen" - -#: ../app/core/core-enums.c:835 -msgctxt "undo-type" -msgid "Resize image" -msgstr "Redimensionar imagen" - -#: ../app/core/core-enums.c:836 -msgctxt "undo-type" -msgid "Flip image" -msgstr "Voltear la imagen" - -#: ../app/core/core-enums.c:837 -msgctxt "undo-type" -msgid "Rotate image" -msgstr "Rotar la imagen" - -#: ../app/core/core-enums.c:838 -msgctxt "undo-type" -msgid "Crop image" -msgstr "Recortar la imagen" - -#: ../app/core/core-enums.c:839 -msgctxt "undo-type" -msgid "Convert image" -msgstr "Convertir la imagen" - -#: ../app/core/core-enums.c:840 -msgctxt "undo-type" -msgid "Remove item" -msgstr "Eliminar el elemento" - -#: ../app/core/core-enums.c:841 -msgctxt "undo-type" -msgid "Merge layers" -msgstr "Combinar capas" - -#: ../app/core/core-enums.c:842 -msgctxt "undo-type" -msgid "Merge paths" -msgstr "Combinar rutas" - -#: ../app/core/core-enums.c:843 -msgctxt "undo-type" -msgid "Quick Mask" -msgstr "Máscara rápida" - -#: ../app/core/core-enums.c:844 ../app/core/core-enums.c:874 -#: ../app/core/gimpimage-grid.c:63 -msgctxt "undo-type" -msgid "Grid" -msgstr "Rejilla" - -#: ../app/core/core-enums.c:845 ../app/core/core-enums.c:876 -msgctxt "undo-type" -msgid "Guide" -msgstr "Guía" - -#: ../app/core/core-enums.c:846 ../app/core/core-enums.c:877 -msgctxt "undo-type" -msgid "Sample Point" -msgstr "Punto de muestra" - -#: ../app/core/core-enums.c:847 ../app/core/core-enums.c:878 -msgctxt "undo-type" -msgid "Layer/Channel" -msgstr "Capa/canal" - -#: ../app/core/core-enums.c:848 ../app/core/core-enums.c:879 -msgctxt "undo-type" -msgid "Layer/Channel modification" -msgstr "Modificación de capa o canal" - -#: ../app/core/core-enums.c:849 ../app/core/core-enums.c:880 -msgctxt "undo-type" -msgid "Selection mask" -msgstr "Máscara de selección" - -#: ../app/core/core-enums.c:850 ../app/core/core-enums.c:884 -msgctxt "undo-type" -msgid "Item visibility" -msgstr "Visibilidad del elemento" - -#: ../app/core/core-enums.c:851 ../app/core/core-enums.c:885 -msgctxt "undo-type" -msgid "Link/Unlink item" -msgstr "Enlazar o desenlazar elemento" - -#: ../app/core/core-enums.c:852 -msgctxt "undo-type" -msgid "Item properties" -msgstr "Propiedades del elemento" - -#: ../app/core/core-enums.c:853 ../app/core/core-enums.c:883 -msgctxt "undo-type" -msgid "Move item" -msgstr "Mover el elemento" - -#: ../app/core/core-enums.c:854 -msgctxt "undo-type" -msgid "Scale item" -msgstr "Escalar elemento" - -#: ../app/core/core-enums.c:855 -msgctxt "undo-type" -msgid "Resize item" -msgstr "Redimensionar elemento" - -#: ../app/core/core-enums.c:856 -msgctxt "undo-type" -msgid "Add layer" -msgstr "Añadir capa" - -#: ../app/core/core-enums.c:857 ../app/core/core-enums.c:896 -msgctxt "undo-type" -msgid "Add layer mask" -msgstr "Añadir máscara de capa" - -#: ../app/core/core-enums.c:858 ../app/core/core-enums.c:898 -msgctxt "undo-type" -msgid "Apply layer mask" -msgstr "Aplicar máscara de capa" - -#: ../app/core/core-enums.c:859 ../app/core/core-enums.c:906 -msgctxt "undo-type" -msgid "Floating selection to layer" -msgstr "Selección flotante a capa" - -#: ../app/core/core-enums.c:860 -msgctxt "undo-type" -msgid "Float selection" -msgstr "Selección flotante" - -#: ../app/core/core-enums.c:861 -msgctxt "undo-type" -msgid "Anchor floating selection" -msgstr "Anclar la selección flotante" - -#: ../app/core/core-enums.c:862 ../app/core/gimp-edit.c:293 -msgctxt "undo-type" -msgid "Paste" -msgstr "Pegar" - -#: ../app/core/core-enums.c:863 ../app/core/gimp-edit.c:534 -msgctxt "undo-type" -msgid "Cut" -msgstr "Cortar" - -#: ../app/core/core-enums.c:864 -msgctxt "undo-type" -msgid "Text" -msgstr "Texto" - -#: ../app/core/core-enums.c:865 ../app/core/core-enums.c:907 -#: ../app/core/gimpdrawable-transform.c:589 -msgctxt "undo-type" -msgid "Transform" -msgstr "Transformar" - -#: ../app/core/core-enums.c:866 ../app/core/core-enums.c:908 -msgctxt "undo-type" -msgid "Paint" -msgstr "Pintar" - -#: ../app/core/core-enums.c:867 ../app/core/core-enums.c:911 -msgctxt "undo-type" -msgid "Attach parasite" -msgstr "Adjuntar parásito" - -#: ../app/core/core-enums.c:868 ../app/core/core-enums.c:912 -msgctxt "undo-type" -msgid "Remove parasite" -msgstr "Eliminar parásito" - -#: ../app/core/core-enums.c:869 -msgctxt "undo-type" -msgid "Import paths" -msgstr "Importar rutas" - -#: ../app/core/core-enums.c:870 -msgctxt "undo-type" -msgid "Plug-In" -msgstr "Complemento" - -#: ../app/core/core-enums.c:871 -msgctxt "undo-type" -msgid "Image type" -msgstr "Tipo de imagen" - -#: ../app/core/core-enums.c:872 -msgctxt "undo-type" -msgid "Image size" -msgstr "Tamaño de la imagen" - -#: ../app/core/core-enums.c:873 -msgctxt "undo-type" -msgid "Image resolution change" -msgstr "Cambio de resolución de la imagen" - -#: ../app/core/core-enums.c:875 -msgctxt "undo-type" -msgid "Change indexed palette" -msgstr "Cambiar la paleta indexada" - -#: ../app/core/core-enums.c:881 -msgctxt "undo-type" -msgid "Reorder item" -msgstr "Reordenar elemento" - -#: ../app/core/core-enums.c:882 -msgctxt "undo-type" -msgid "Rename item" -msgstr "Renombrar elemento" - -#: ../app/core/core-enums.c:886 -msgctxt "undo-type" -msgid "New layer" -msgstr "Capa nueva" - -#: ../app/core/core-enums.c:887 -msgctxt "undo-type" -msgid "Delete layer" -msgstr "Borra la capa" - -#: ../app/core/core-enums.c:888 -msgctxt "undo-type" -msgid "Set layer mode" -msgstr "Definir el modo de la capa" - -#: ../app/core/core-enums.c:889 -msgctxt "undo-type" -msgid "Set layer opacity" -msgstr "Definir la opacidad de la capa" - -#: ../app/core/core-enums.c:890 -msgctxt "undo-type" -msgid "Lock/Unlock alpha channel" -msgstr "Bloquear o desbloquear el canal Alfa" - -#: ../app/core/core-enums.c:891 -msgctxt "undo-type" -msgid "Suspend group layer resize" -msgstr "Suspender el redimensionamiento del grupo de capas" - -#: ../app/core/core-enums.c:892 -msgctxt "undo-type" -msgid "Resume group layer resize" -msgstr "Reanudar el redimensionamiento del gurpo de capas" - -#: ../app/core/core-enums.c:893 -msgctxt "undo-type" -msgid "Convert group layer" -msgstr "Convertir el grupo de capas" - -#: ../app/core/core-enums.c:894 -msgctxt "undo-type" -msgid "Text layer" -msgstr "Capa de texto" - -#: ../app/core/core-enums.c:895 -msgctxt "undo-type" -msgid "Text layer modification" -msgstr "Modificación de la capa de texto" - -#: ../app/core/core-enums.c:897 -msgctxt "undo-type" -msgid "Delete layer mask" -msgstr "Eliminar máscara de capa" - -#: ../app/core/core-enums.c:899 -msgctxt "undo-type" -msgid "Show layer mask" -msgstr "Mostrar máscara de capa" - -#: ../app/core/core-enums.c:900 -msgctxt "undo-type" -msgid "New channel" -msgstr "Nuevo canal" - -#: ../app/core/core-enums.c:901 -msgctxt "undo-type" -msgid "Delete channel" -msgstr "Borra el canal" - -#: ../app/core/core-enums.c:902 -msgctxt "undo-type" -msgid "Channel color" -msgstr "Color del canal" - -#: ../app/core/core-enums.c:903 -msgctxt "undo-type" -msgid "New path" -msgstr "Nueva ruta" - -#: ../app/core/core-enums.c:904 -msgctxt "undo-type" -msgid "Delete path" -msgstr "Eliminar ruta" - -#: ../app/core/core-enums.c:905 -msgctxt "undo-type" -msgid "Path modification" -msgstr "Modificación de la ruta" - -#: ../app/core/core-enums.c:909 -msgctxt "undo-type" -msgid "Ink" -msgstr "Tinta" - -#: ../app/core/core-enums.c:910 -msgctxt "undo-type" -msgid "Select foreground" -msgstr "Seleccionar primer plano" - -#: ../app/core/core-enums.c:913 -msgctxt "undo-type" -msgid "Not undoable" -msgstr "No se puede deshacer" - -#: ../app/core/core-enums.c:1187 -msgctxt "select-criterion" -msgid "Composite" -msgstr "Compuesto" - -#: ../app/core/core-enums.c:1188 -msgctxt "select-criterion" -msgid "Red" -msgstr "Rojo" - -#: ../app/core/core-enums.c:1189 -msgctxt "select-criterion" -msgid "Green" -msgstr "Verde" - -#: ../app/core/core-enums.c:1190 -msgctxt "select-criterion" -msgid "Blue" -msgstr "Azul" - -#: ../app/core/core-enums.c:1191 -msgctxt "select-criterion" -msgid "Hue" -msgstr "Tono" - -#: ../app/core/core-enums.c:1192 -msgctxt "select-criterion" -msgid "Saturation" -msgstr "Saturación" - -#: ../app/core/core-enums.c:1193 -msgctxt "select-criterion" -msgid "Value" -msgstr "Valor" - -#: ../app/core/core-enums.c:1222 -msgctxt "message-severity" -msgid "Message" -msgstr "Mensaje" - -#: ../app/core/core-enums.c:1223 -msgctxt "message-severity" -msgid "Warning" -msgstr "Advertencia" - -#: ../app/core/core-enums.c:1224 -msgctxt "message-severity" -msgid "Error" -msgstr "Error" - -#: ../app/core/core-enums.c:1253 -msgctxt "color-profile-policy" -msgid "Ask what to do" -msgstr "Preguntar qué hacer" - -#: ../app/core/core-enums.c:1254 -msgctxt "color-profile-policy" -msgid "Keep embedded profile" -msgstr "Conservar perfil incrustado" - -#: ../app/core/core-enums.c:1255 -msgctxt "color-profile-policy" -msgid "Convert to RGB workspace" -msgstr "Convertir al espacio de colores RGB" - -#: ../app/core/core-enums.c:1292 -msgctxt "dynamics-output-type" -msgid "Opacity" -msgstr "Opacidad" - -#: ../app/core/core-enums.c:1293 -msgctxt "dynamics-output-type" -msgid "Size" -msgstr "Tamaño" - -#: ../app/core/core-enums.c:1294 -msgctxt "dynamics-output-type" -msgid "Angle" -msgstr "Ángulo" - -#: ../app/core/core-enums.c:1295 -msgctxt "dynamics-output-type" -msgid "Color" -msgstr "Color" - -#: ../app/core/core-enums.c:1296 -msgctxt "dynamics-output-type" -msgid "Hardness" -msgstr "Dureza" - -#: ../app/core/core-enums.c:1297 -msgctxt "dynamics-output-type" -msgid "Force" -msgstr "Fuerza" - -#: ../app/core/core-enums.c:1298 -msgctxt "dynamics-output-type" -msgid "Aspect ratio" -msgstr "Proporción de aspecto" - -#: ../app/core/core-enums.c:1299 -msgctxt "dynamics-output-type" -msgid "Spacing" -msgstr "Espaciado" - -#: ../app/core/core-enums.c:1300 -msgctxt "dynamics-output-type" -msgid "Rate" -msgstr "Tasa" - -#: ../app/core/core-enums.c:1301 -msgctxt "dynamics-output-type" -msgid "Flow" -msgstr "Flujo" - -#: ../app/core/core-enums.c:1302 -msgctxt "dynamics-output-type" -msgid "Jitter" -msgstr "Vibración" - -#: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:375 -#: ../app/gui/session.c:408 ../app/menus/menus.c:466 -#: ../app/widgets/gimpdevices.c:208 -#, c-format -msgid "Deleting \"%s\" failed: %s" -msgstr "El borrado de «%s» ha fallado: %s" - -#: ../app/core/gimp-edit.c:190 ../app/core/gimpimage-new.c:309 -msgid "Pasted Layer" -msgstr "Capa pegada" - -#: ../app/core/gimp-edit.c:420 -msgctxt "undo-type" -msgid "Clear" -msgstr "Limpiar" - -#: ../app/core/gimp-edit.c:439 -msgctxt "undo-type" -msgid "Fill with Foreground Color" -msgstr "Rellenar con el color del frente" - -#: ../app/core/gimp-edit.c:443 -msgctxt "undo-type" -msgid "Fill with Background Color" -msgstr "Rellenar con el color del fondo" - -#: ../app/core/gimp-edit.c:447 -msgctxt "undo-type" -msgid "Fill with White" -msgstr "Rellenar con blanco" - -#: ../app/core/gimp-edit.c:451 -msgctxt "undo-type" -msgid "Fill with Transparency" -msgstr "Rellenar con transparencia" - -#: ../app/core/gimp-edit.c:455 -msgctxt "undo-type" -msgid "Fill with Pattern" -msgstr "Rellenar con un patrón" - -#: ../app/core/gimp-edit.c:547 -msgid "Global Buffer" -msgstr "Búfer global" - -#: ../app/core/gimp-gradients.c:62 -msgid "FG to BG (RGB)" -msgstr "Frente a fondo (RGB)" - -#: ../app/core/gimp-gradients.c:70 -msgid "FG to BG (Hardedge)" -msgstr "Frente a fondo (bordes duros)" - -#: ../app/core/gimp-gradients.c:87 -msgid "FG to BG (HSV counter-clockwise)" -msgstr "Frente a fondo (HSV en sentido antihorario)" - -#: ../app/core/gimp-gradients.c:95 -msgid "FG to BG (HSV clockwise hue)" -msgstr "Frente a fondo (HSV tono en sentido horario)" - -#: ../app/core/gimp-gradients.c:103 -msgid "FG to Transparent" -msgstr "Frente a transparente" - -#. This is a special string to specify the language identifier to -#. * look for in the gimp-tags-default.xml file. Please translate the -#. * C in it according to the name of the po file used for -#. * gimp-tags-default.xml. E.g. lithuanian for the translation, -#. * that would be "tags-locale:lt". -#. -#: ../app/core/gimp-tags.c:88 -msgid "tags-locale:C" -msgstr "tags-locale:es" - -#: ../app/core/gimp-user-install.c:203 -#, c-format -msgid "" -"It seems you have used GIMP %s before. GIMP will now migrate your user " -"settings to '%s'." -msgstr "" -"Parece que ha usado GIMP %s antes. GIMP migrará sus ajustes de usuario a «%" -"s»." - -#: ../app/core/gimp-user-install.c:208 -#, c-format -msgid "" -"It appears that you are using GIMP for the first time. GIMP will now create " -"a folder named '%s' and copy some files to it." -msgstr "" -"Parece que está usando GIMP por primera vez. GIMP creará ahora una carpeta " -"llamada «%s» y copiará algunos archivos en ella." - -#: ../app/core/gimp-user-install.c:359 -#, c-format -msgid "Copying file '%s' from '%s'..." -msgstr "Copiando el archivo «%s» desde «%s»…" - -#: ../app/core/gimp-user-install.c:374 ../app/core/gimp-user-install.c:400 -#, c-format -msgid "Creating folder '%s'..." -msgstr "Creando la carpeta «%s»…" - -#: ../app/core/gimp-user-install.c:385 ../app/core/gimp-user-install.c:411 -#, c-format -msgid "Cannot create folder '%s': %s" -msgstr "No se puede crear la carpeta «%s»: %s" - -#: ../app/core/gimp.c:595 -msgid "Initialization" -msgstr "Inicialización" - -#. register all internal procedures -#: ../app/core/gimp.c:696 -msgid "Internal Procedures" -msgstr "Procedimientos internos" - -#. initialize the global parasite table -#: ../app/core/gimp.c:947 -msgid "Looking for data files" -msgstr "Buscando archivos de datos" - -#: ../app/core/gimp.c:947 -msgid "Parasites" -msgstr "Parásitos" - -#. initialize the list of gimp dynamics -#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2750 -#: ../app/tools/gimppaintoptions-gui.c:201 -msgid "Dynamics" -msgstr "Dinámica" - -#. initialize the list of fonts -#: ../app/core/gimp.c:976 -msgid "Fonts (this may take a while)" -msgstr "Tipografías (esto puede tardar un rato)" - -#. initialize the module list -#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2782 -msgid "Modules" -msgstr "Módulos" - -#. update tag cache -#: ../app/core/gimp.c:997 -msgid "Updating tag cache" -msgstr "Actualizar la caché de etiquetas" - -#: ../app/core/gimpbrush-load.c:180 -#, c-format -msgid "Could not read %d byte from '%s': %s" -msgid_plural "Could not read %d bytes from '%s': %s" -msgstr[0] "No se pudo leer %d byte de «%s»: %s" -msgstr[1] "No se pudieron leer %d byte de «%s»: %s" - -#: ../app/core/gimpbrush-load.c:202 -#, c-format -msgid "Fatal parse error in brush file '%s': Width = 0." -msgstr "Error fatal de análisis en el archivo de pincel «%s»: anchura = 0." - -#: ../app/core/gimpbrush-load.c:211 -#, c-format -msgid "Fatal parse error in brush file '%s': Height = 0." -msgstr "Error fatal de análisis en el archivo de pincel «%s»: altura = 0." - -#: ../app/core/gimpbrush-load.c:220 -#, c-format -msgid "Fatal parse error in brush file '%s': Bytes = 0." -msgstr "Error fatal de análisis en el archivo de pincel «%s»: bytes = 0." - -#: ../app/core/gimpbrush-load.c:244 -#, c-format -msgid "Fatal parse error in brush file '%s': Unknown depth %d." -msgstr "" -"Error fatal de análisis en el archivo de pincel «%s»: profundidad desconocida " -"%d." - -#: ../app/core/gimpbrush-load.c:257 -#, c-format -msgid "Fatal parse error in brush file '%s': Unknown version %d." -msgstr "" -"Error fatal de análisis en el archivo de pincel «%s»: versión desconocida %d." - -#: ../app/core/gimpbrush-load.c:273 ../app/core/gimpbrush-load.c:410 -#: ../app/core/gimpbrush-load.c:626 ../app/core/gimpbrush-load.c:700 -#: ../app/core/gimpbrush-load.c:763 ../app/core/gimpbrush-load.c:779 -#: ../app/core/gimpbrush-load.c:822 -#, c-format -msgid "Fatal parse error in brush file '%s': File appears truncated." -msgstr "" -"Error fatal de análisis en el archivo de pincel «%s»: el archivo parece estar " -"truncado." - -#: ../app/core/gimpbrush-load.c:281 ../app/core/gimpbrushgenerated-load.c:128 -#: ../app/core/gimpbrushpipe-load.c:97 -#, c-format -msgid "Invalid UTF-8 string in brush file '%s'." -msgstr "Cadena UTF-8 no válida en el archivo de pincel «%s»." - -#: ../app/core/gimpbrush-load.c:288 ../app/core/gimppattern-load.c:146 -#: ../app/dialogs/template-options-dialog.c:83 -#: ../app/tools/gimpvectortool.c:317 -msgid "Unnamed" -msgstr "Sin nombre" - -#: ../app/core/gimpbrush-load.c:354 -#, c-format -msgid "" -"Fatal parse error in brush file '%s': Unsupported brush depth %d\n" -"GIMP brushes must be GRAY or RGBA.\n" -"This might be an obsolete GIMP brush file, try loading it as image and save " -"it again." -msgstr "" -"Error fatal de análisis en el archivo de pincel «%s»: profundidad de pincel " -"no soportada %d\n" -"Los pinceles de GIMP deben ser GRAY o RGBA.\n" -"Es posible que sea un archivo de pincel de GIMP obsoleto; pruebe a cargarlo " -"como imagen y a guardarlo otra vez." - -#: ../app/core/gimpbrush-load.c:399 -#, c-format -msgid "" -"Fatal parse error in brush file '%s': Unsupported brush depth %d\n" -"GIMP brushes must be GRAY or RGBA." -msgstr "" -"Error fatal de análisis en el archivo de pincel «%s»: profundidad de pincel " -"no soportado %d\n" -"Los pinceles de GIMP deben ser GRAY (GRISES) o RGBA." - -#: ../app/core/gimpbrush-load.c:471 ../app/core/gimpbrush-load.c:909 -#, c-format -msgid "" -"Fatal parse error in brush file '%s': unable to decode abr format version %d." -msgstr "" -"Error fatal de análisis en el archivo de pincel «%s»: imposible decodificar " -"el formato abr versión %d." - -#: ../app/core/gimpbrush-load.c:647 -#, c-format -msgid "Fatal parse error in brush file '%s': Wide brushes are not supported." -msgstr "" -"Error fatal de análisis en el archivo de pincel «%s»: no están soportados los " -"pinceles anchos." - -#: ../app/core/gimpbrush.c:148 -msgid "Brush Spacing" -msgstr "Espaciado del pincel" - -#: ../app/core/gimpbrushgenerated-load.c:87 -#, c-format -msgid "Fatal parse error in brush file '%s': Not a GIMP brush file." -msgstr "" -"Error fatal de análisis: en el archivo de pincel «%s»: no es un archivo de " -"pincel de GIMP." - -#: ../app/core/gimpbrushgenerated-load.c:104 -#, c-format -msgid "" -"Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d." -msgstr "" -"Error fatal de análisis en el archivo de pincel «%s»: versión de pincel de " -"GIMP desconocida en la línea %d." - -#: ../app/core/gimpbrushgenerated-load.c:150 -#, c-format -msgid "" -"Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d." -msgstr "" -"Error fatal de análisis en el archivo de pincel «%s»: forma de pincel de GIMP " -"desconocida en la línea %d." - -#: ../app/core/gimpbrushgenerated-load.c:226 -#, c-format -msgid "Line %d: %s" -msgstr "Línea %d: %s" - -#: ../app/core/gimpbrushgenerated-load.c:228 -#, c-format -msgid "File is truncated in line %d" -msgstr "El archivo está truncado en la línea %d" - -#: ../app/core/gimpbrushgenerated-load.c:231 -#, c-format -msgid "Error while reading brush file '%s': %s" -msgstr "Ocurrió un error al leer el archivo de pincel «%s»: %s" - -#: ../app/core/gimpbrushgenerated.c:129 -msgid "Brush Shape" -msgstr "Forma del pincel" - -#: ../app/core/gimpbrushgenerated.c:137 -msgid "Brush Radius" -msgstr "Radio del pincel" - -#: ../app/core/gimpbrushgenerated.c:144 -msgid "Brush Spikes" -msgstr "Puntas del pincel" - -#: ../app/core/gimpbrushgenerated.c:151 -msgid "Brush Hardness" -msgstr "Dureza del pincel" - -#: ../app/core/gimpbrushgenerated.c:159 ../app/paint/gimppaintoptions.c:151 -msgid "Brush Aspect Ratio" -msgstr "Proporción de aspecto del pincel" - -#: ../app/core/gimpbrushgenerated.c:166 ../app/paint/gimppaintoptions.c:155 -msgid "Brush Angle" -msgstr "Ángulo del pincel" - -#: ../app/core/gimpbrushpipe-load.c:113 ../app/core/gimpbrushpipe-load.c:133 -#, c-format -msgid "Fatal parse error in brush file '%s': File is corrupt." -msgstr "" -"Error fatal de análisis en el archivo de pincel «%s»: el archivo está " -"corrupto." - -#: ../app/core/gimpchannel-select.c:60 -msgctxt "undo-type" -msgid "Rectangle Select" -msgstr "Selección rectangular" - -#: ../app/core/gimpchannel-select.c:111 -msgctxt "undo-type" -msgid "Ellipse Select" -msgstr "Selección elíptica" - -#: ../app/core/gimpchannel-select.c:165 -msgctxt "undo-type" -msgid "Rounded Rectangle Select" -msgstr "Selección rectangular redondeada" - -#: ../app/core/gimpchannel-select.c:407 ../app/core/gimplayer.c:275 -msgctxt "undo-type" -msgid "Alpha to Selection" -msgstr "Alfa a selección" - -#: ../app/core/gimpchannel-select.c:445 -#, c-format -msgctxt "undo-type" -msgid "%s Channel to Selection" -msgstr "Canal %s a selección" - -#: ../app/core/gimpchannel-select.c:493 -msgctxt "undo-type" -msgid "Fuzzy Select" -msgstr "Selección difusa" - -#: ../app/core/gimpchannel-select.c:540 -msgctxt "undo-type" -msgid "Select by Color" -msgstr "Seleccionar por color" - -#: ../app/core/gimpchannel.c:273 -msgctxt "undo-type" -msgid "Rename Channel" -msgstr "Renombrar el canal" - -#: ../app/core/gimpchannel.c:274 -msgctxt "undo-type" -msgid "Move Channel" -msgstr "Mover el canal" - -#: ../app/core/gimpchannel.c:275 -msgctxt "undo-type" -msgid "Scale Channel" -msgstr "Escalar el canal" - -#: ../app/core/gimpchannel.c:276 -msgctxt "undo-type" -msgid "Resize Channel" -msgstr "Redimensionar el canal" - -#: ../app/core/gimpchannel.c:277 -msgctxt "undo-type" -msgid "Flip Channel" -msgstr "Voltear el canal" - -#: ../app/core/gimpchannel.c:278 -msgctxt "undo-type" -msgid "Rotate Channel" -msgstr "Rotar el canal" - -#: ../app/core/gimpchannel.c:279 ../app/core/gimpdrawable-transform.c:904 -msgctxt "undo-type" -msgid "Transform Channel" -msgstr "Transformar el canal" - -#: ../app/core/gimpchannel.c:280 -msgctxt "undo-type" -msgid "Stroke Channel" -msgstr "Impresionar el canal" - -#: ../app/core/gimpchannel.c:281 ../app/core/gimpselection.c:582 -msgctxt "undo-type" -msgid "Channel to Selection" -msgstr "Canal a selección" - -#: ../app/core/gimpchannel.c:282 -msgctxt "undo-type" -msgid "Reorder Channel" -msgstr "Reordenar el canal" - -#: ../app/core/gimpchannel.c:283 -msgctxt "undo-type" -msgid "Raise Channel" -msgstr "Elevar el canal" - -#: ../app/core/gimpchannel.c:284 -msgctxt "undo-type" -msgid "Raise Channel to Top" -msgstr "Elevar el canal hasta lo alto" - -#: ../app/core/gimpchannel.c:285 -msgctxt "undo-type" -msgid "Lower Channel" -msgstr "Bajar el canal" - -#: ../app/core/gimpchannel.c:286 -msgctxt "undo-type" -msgid "Lower Channel to Bottom" -msgstr "Bajar el canal hasta lo más bajo" - -#: ../app/core/gimpchannel.c:287 -msgid "Channel cannot be raised higher." -msgstr "El canal no puede ser elevado más alto." - -#: ../app/core/gimpchannel.c:288 -msgid "Channel cannot be lowered more." -msgstr "El canal no puede descender más." - -#: ../app/core/gimpchannel.c:310 -msgctxt "undo-type" -msgid "Feather Channel" -msgstr "Difuminar el canal" - -#: ../app/core/gimpchannel.c:311 -msgctxt "undo-type" -msgid "Sharpen Channel" -msgstr "Canal de perfilado" - -#: ../app/core/gimpchannel.c:312 -msgctxt "undo-type" -msgid "Clear Channel" -msgstr "Limpiar el canal" - -#: ../app/core/gimpchannel.c:313 -msgctxt "undo-type" -msgid "Fill Channel" -msgstr "Rellenar el canal" - -#: ../app/core/gimpchannel.c:314 -msgctxt "undo-type" -msgid "Invert Channel" -msgstr "Invertir el canal" - -#: ../app/core/gimpchannel.c:315 -msgctxt "undo-type" -msgid "Border Channel" -msgstr "Bordear el canal" - -#: ../app/core/gimpchannel.c:316 -msgctxt "undo-type" -msgid "Grow Channel" -msgstr "Agrandar el canal" - -#: ../app/core/gimpchannel.c:317 -msgctxt "undo-type" -msgid "Shrink Channel" -msgstr "Achicar el canal" - -#: ../app/core/gimpchannel.c:731 -msgid "Cannot stroke empty channel." -msgstr "No se puede trazar un canal vacío." - -#: ../app/core/gimpchannel.c:1763 -msgctxt "undo-type" -msgid "Set Channel Color" -msgstr "Definir el color del canal" - -#: ../app/core/gimpchannel.c:1829 -msgctxt "undo-type" -msgid "Set Channel Opacity" -msgstr "Definir la opacidad del canal" - -#: ../app/core/gimpchannel.c:1937 ../app/core/gimpselection.c:154 -msgid "Selection Mask" -msgstr "Máscara de selección" - -#: ../app/core/gimpcontext.c:639 ../app/tools/gimppaintoptions-gui.c:109 -#: ../app/widgets/gimpbrushselect.c:177 ../app/widgets/gimplayertreeview.c:284 -msgid "Opacity" -msgstr "Opacidad" - -#: ../app/core/gimpcontext.c:647 -msgid "Paint Mode" -msgstr "Modo de pintura" - -#: ../app/core/gimpdata.c:690 -#, c-format -msgid "Could not delete '%s': %s" -msgstr "No se ha podido eliminar «%s»: %s" - -#: ../app/core/gimpdatafactory.c:428 ../app/core/gimpdatafactory.c:457 -#: ../app/core/gimpdatafactory.c:623 ../app/core/gimpdatafactory.c:645 -#, c-format -msgid "" -"Failed to save data:\n" -"\n" -"%s" -msgstr "" -"Falló al guardar los datos:\n" -"\n" -"%s" - -#: ../app/core/gimpdatafactory.c:537 ../app/core/gimpdatafactory.c:540 -#: ../app/core/gimpitem.c:495 ../app/core/gimpitem.c:498 -msgid "copy" -msgstr "copiar" - -#: ../app/core/gimpdatafactory.c:549 ../app/core/gimpitem.c:507 -#, c-format -msgid "%s copy" -msgstr "Copia de %s" - -#: ../app/core/gimpdatafactory.c:742 -#, c-format -msgid "" -"You have a writable data folder configured (%s), but this folder does not " -"exist. Please create the folder or fix your configuation in the Preferences " -"dialog's 'Folders' section." -msgstr "" -"Tiene configurada una carpeta escribible de datos (%s), pero esta carpeta no " -"existe. Cree la carpeta o arregle su configuración en la sección «Carpetas» " -"del diálogo Preferencias." - -#: ../app/core/gimpdatafactory.c:763 -#, c-format -msgid "" -"You have a writable data folder configured, but this folder is not part of " -"your data search path. You probably edited the gimprc file manually, please " -"fix it in the Preferences dialog's 'Folders' section." -msgstr "" -"Tiene configurada una carpeta escribible de datos, pero esta carpeta no " -"forma parte de su ruta de búsqueda. Probablemente ha editado manualmente el " -"archivo gimprc, arréglelo en la sección «Carpetas» del diálogo Preferencias. " - -#: ../app/core/gimpdatafactory.c:773 -#, c-format -msgid "You don't have any writable data folder configured." -msgstr "No tiene configurada una carpeta escribible de datos." - -#: ../app/core/gimpdatafactory.c:941 -#, c-format -msgid "" -"Failed to load data:\n" -"\n" -"%s" -msgstr "" -"Falló al cargar datos:\n" -"\n" -"%s" - -#: ../app/core/gimpdrawable-blend.c:245 -msgctxt "undo-type" -msgid "Blend" -msgstr "Mezclar" - -#: ../app/core/gimpdrawable-brightness-contrast.c:70 -#: ../app/core/gimpdrawable-brightness-contrast.c:83 -msgctxt "undo-type" -msgid "Brightness-Contrast" -msgstr "Brillo-Contraste" - -#: ../app/core/gimpdrawable-bucket-fill.c:89 -msgid "No patterns available for this operation." -msgstr "No hay patrones disponibles para esta operación." - -#: ../app/core/gimpdrawable-bucket-fill.c:284 -msgctxt "undo-type" -msgid "Bucket Fill" -msgstr "Relleno de cubeta" - -#: ../app/core/gimpdrawable-color-balance.c:79 -#: ../app/core/gimpdrawable-color-balance.c:89 -msgctxt "undo-type" -msgid "Color Balance" -msgstr "Balance de color" - -#: ../app/core/gimpdrawable-colorize.c:72 -#: ../app/core/gimpdrawable-colorize.c:84 -msgctxt "undo-type" -msgid "Colorize" -msgstr "Colorear" - -#: ../app/core/gimpdrawable-curves.c:162 ../app/core/gimpdrawable-curves.c:179 -msgctxt "undo-type" -msgid "Curves" -msgstr "Curvas" - -#: ../app/core/gimpdrawable-desaturate.c:70 -#: ../app/core/gimpdrawable-desaturate.c:76 -#: ../app/tools/gimpdesaturatetool.c:77 -msgid "Desaturate" -msgstr "Desaturar" - -#: ../app/core/gimpdrawable-equalize.c:52 -msgctxt "undo-type" -msgid "Equalize" -msgstr "Ecualizar" - -#: ../app/core/gimpdrawable-foreground-extract.c:133 -msgid "Foreground Extraction" -msgstr "Extracción del primer plano" - -#: ../app/core/gimpdrawable-hue-saturation.c:77 -#: ../app/tools/gimphuesaturationtool.c:102 -msgid "Hue-Saturation" -msgstr "Tono y saturación" - -#: ../app/core/gimpdrawable-hue-saturation.c:87 -msgid "Hue_Saturation" -msgstr "Tono y _saturación" - -#: ../app/core/gimpdrawable-invert.c:54 ../app/core/gimpdrawable-invert.c:62 -msgid "Invert" -msgstr "Invertir" - -#: ../app/core/gimpdrawable-levels.c:153 ../app/core/gimpdrawable-levels.c:169 -#: ../app/tools/gimplevelstool.c:150 -msgid "Levels" -msgstr "Niveles" - -#: ../app/core/gimpdrawable-offset.c:316 -msgctxt "undo-type" -msgid "Offset Drawable" -msgstr "Desplazar el dibujable" - -#: ../app/core/gimpdrawable-posterize.c:69 -#: ../app/core/gimpdrawable-posterize.c:79 ../app/tools/gimpposterizetool.c:84 -msgid "Posterize" -msgstr "Posterizar" - -#: ../app/core/gimpdrawable-stroke.c:272 -#: ../app/paint/gimppaintcore-stroke.c:330 ../app/vectors/gimpvectors.c:556 -msgid "Not enough points to stroke" -msgstr "No hay suficientes puntos para trazar" - -#: ../app/core/gimpdrawable-stroke.c:273 -msgid "Not enough points to fill" -msgstr "No hay suficientes puntos que rellenar" - -#: ../app/core/gimpdrawable-stroke.c:404 -msgctxt "undo-type" -msgid "Render Stroke" -msgstr "Renderizar el trazo" - -#: ../app/core/gimpdrawable-threshold.c:70 -#: ../app/core/gimpdrawable-threshold.c:81 ../app/tools/gimpblendoptions.c:275 -#: ../app/tools/gimpbucketfilloptions.c:285 -#: ../app/tools/gimpregionselectoptions.c:216 -#: ../app/tools/gimpthresholdtool.c:90 -msgid "Threshold" -msgstr "Umbral B/N" - -#: ../app/core/gimpdrawable-transform.c:677 -msgctxt "undo-type" -msgid "Flip" -msgstr "Voltear" - -#: ../app/core/gimpdrawable-transform.c:762 -msgctxt "undo-type" -msgid "Rotate" -msgstr "Rotar" - -#: ../app/core/gimpdrawable-transform.c:902 ../app/core/gimplayer.c:274 -msgctxt "undo-type" -msgid "Transform Layer" -msgstr "Transformar la capa" - -#: ../app/core/gimpdrawable-transform.c:915 -msgid "Transformation" -msgstr "Transformación" - -#: ../app/core/gimpdrawable.c:494 -msgctxt "undo-type" -msgid "Scale" -msgstr "Redimensionar" - -#: ../app/core/gimpdynamicsoutput.c:135 -msgid "Output type" -msgstr "Tipo de salida" - -#: ../app/core/gimpgradient-load.c:72 ../app/core/gimpgradient-load.c:97 -#: ../app/core/gimpgradient-load.c:118 ../app/core/gimpgradient-load.c:169 -#, c-format -msgid "Fatal parse error in gradient file '%s': Read error in line %d." -msgstr "" -"Error fatal de análisis en el archivo de degradado «%s»: error de lectura en " -"la línea %d." - -#: ../app/core/gimpgradient-load.c:82 -#, c-format -msgid "Fatal parse error in gradient file '%s': Not a GIMP gradient file." -msgstr "" -"Error fatal de análisis: en el archivo de degradados «%s»: no es un archivo " -"de degradados de GIMP." - -#: ../app/core/gimpgradient-load.c:110 -#, c-format -msgid "Invalid UTF-8 string in gradient file '%s'." -msgstr "Cadena UTF-8 no válida en el archivo de degradado «%s»." - -#: ../app/core/gimpgradient-load.c:137 -#, c-format -msgid "Fatal parse error in gradient file '%s': File is corrupt in line %d." -msgstr "" -"Error fatal de análisis en el archivo de degradados «%s»: el archivo está " -"corrupto en la línea %d." - -#: ../app/core/gimpgradient-load.c:219 ../app/core/gimpgradient-load.c:230 -#, c-format -msgid "Fatal parse error in gradient file '%s': Corrupt segment %d in line %d." -msgstr "" -"Error fatal de análisis en el archivo de degradados «%s»: segmento %d " -"corrupto en la línea %d." - -#: ../app/core/gimpgradient-load.c:242 ../app/core/gimpgradient-load.c:256 -#, c-format -msgid "Gradient file '%s' is corrupt: Segments do not span the range 0-1." -msgstr "" -"El archivo de degradado «%s» está corrompido. Los segmentos no se expanden a " -"través del rango 0-1." - -#: ../app/core/gimpgradient-load.c:336 -#, c-format -msgid "No linear gradients found in '%s'" -msgstr "No se encontraron degradados lineales en «%s»" - -#: ../app/core/gimpgradient-load.c:346 -#, c-format -msgid "Failed to import gradients from '%s': %s" -msgstr "Fallo al importar degradados desde «%s»: %s" - -#: ../app/core/gimpgrid.c:85 -msgid "Line style used for the grid." -msgstr "Estilo de línea utilizado por la rejilla." - -#: ../app/core/gimpgrid.c:91 -msgid "The foreground color of the grid." -msgstr "El color de frente de la rejilla." - -#: ../app/core/gimpgrid.c:96 -msgid "" -"The background color of the grid; only used in double dashed line style." -msgstr "" -"El color de fondo de la rejilla, sólo se utiliza en el estilo de línea de " -"guiones dobles." - -#: ../app/core/gimpgrid.c:102 -msgid "Horizontal spacing of grid lines." -msgstr "Espacio horizontal de la líneas de la rejilla." - -#: ../app/core/gimpgrid.c:107 -msgid "Vertical spacing of grid lines." -msgstr "Espacio vertical de las líneas de la rejilla." - -#: ../app/core/gimpgrid.c:116 -msgid "" -"Horizontal offset of the first grid line; this may be a negative number." -msgstr "" -"Desplazamiento horizontal de la primera línea de la rejilla, puede ser un " -"número negativo." - -#: ../app/core/gimpgrid.c:123 -msgid "Vertical offset of the first grid line; this may be a negative number." -msgstr "" -"Desplazamiento vertical de la primera línea de la rejilla, puede ser un " -"número negativo." - -#: ../app/core/gimpgrouplayer.c:219 -msgid "Layer Group" -msgstr "Grupo de capas" - -#: ../app/core/gimpgrouplayer.c:220 -msgctxt "undo-type" -msgid "Rename Layer Group" -msgstr "Renombrar el grupo de capas" - -#: ../app/core/gimpgrouplayer.c:221 -msgctxt "undo-type" -msgid "Move Layer Group" -msgstr "Mover el grupo de capas" - -#: ../app/core/gimpgrouplayer.c:222 -msgctxt "undo-type" -msgid "Scale Layer Group" -msgstr "Escalar el grupo de capas" - -#: ../app/core/gimpgrouplayer.c:223 -msgctxt "undo-type" -msgid "Resize Layer Group" -msgstr "Redimensionar el grupo de capas" - -#: ../app/core/gimpgrouplayer.c:224 -msgctxt "undo-type" -msgid "Flip Layer Group" -msgstr "Voltear el grupo de capas" - -#: ../app/core/gimpgrouplayer.c:225 -msgctxt "undo-type" -msgid "Rotate Layer Group" -msgstr "Rotar el grupo de capas" - -#: ../app/core/gimpgrouplayer.c:226 -msgctxt "undo-type" -msgid "Transform Layer Group" -msgstr "Transformar el grupo de capas" - -#: ../app/core/gimpimage-arrange.c:142 -msgctxt "undo-type" -msgid "Arrange Objects" -msgstr "Disponer objetos" - -#: ../app/core/gimpimage-colormap.c:64 -#, c-format -msgid "Colormap of Image #%d (%s)" -msgstr "Mapa de colores de la imagen nº %d (%s)" - -#: ../app/core/gimpimage-colormap.c:162 -msgctxt "undo-type" -msgid "Set Colormap" -msgstr "Establecer mapa de colores" - -#: ../app/core/gimpimage-colormap.c:210 -msgctxt "undo-type" -msgid "Unset Colormap" -msgstr "Quitar el mapa de colores" - -#: ../app/core/gimpimage-colormap.c:263 -msgctxt "undo-type" -msgid "Change Colormap entry" -msgstr "Cambiar entrada del mapa de colores" - -#: ../app/core/gimpimage-colormap.c:291 -msgctxt "undo-type" -msgid "Add Color to Colormap" -msgstr "Añadir color al mapa de colores" - -#: ../app/core/gimpimage-convert.c:793 -msgid "Cannot convert image: palette is empty." -msgstr "No se puede convertir la imagen, la paleta está vacía." - -#: ../app/core/gimpimage-convert.c:809 -msgctxt "undo-type" -msgid "Convert Image to RGB" -msgstr "Convertir la imagen a RGB" - -#: ../app/core/gimpimage-convert.c:813 -msgctxt "undo-type" -msgid "Convert Image to Grayscale" -msgstr "Convertir la imagen a escala de grises" - -#: ../app/core/gimpimage-convert.c:817 -msgctxt "undo-type" -msgid "Convert Image to Indexed" -msgstr "Convertir la imagen a colores indexados" - -#: ../app/core/gimpimage-convert.c:896 -msgid "Converting to indexed colors (stage 2)" -msgstr "Convirtiendo a colores indexados (paso 2)" - -#: ../app/core/gimpimage-convert.c:941 -msgid "Converting to indexed colors (stage 3)" -msgstr "Convirtiendo a colores indexados (paso 3)" - -#: ../app/core/gimpimage-crop.c:129 -msgctxt "undo-type" -msgid "Crop Image" -msgstr "Recortar la imagen" - -#: ../app/core/gimpimage-crop.c:132 ../app/core/gimpimage-resize.c:86 -msgctxt "undo-type" -msgid "Resize Image" -msgstr "Redimensionar la imagen" - -#: ../app/core/gimpimage-guides.c:52 -msgctxt "undo-type" -msgid "Add Horizontal Guide" -msgstr "Añadir una guía horizontal" - -#: ../app/core/gimpimage-guides.c:76 -msgctxt "undo-type" -msgid "Add Vertical Guide" -msgstr "Añadir una guía vertical" - -#: ../app/core/gimpimage-guides.c:117 -msgctxt "undo-type" -msgid "Remove Guide" -msgstr "Eliminar la guía" - -#: ../app/core/gimpimage-guides.c:144 -msgctxt "undo-type" -msgid "Move Guide" -msgstr "Mover la guía" - -#: ../app/core/gimpimage-item-list.c:51 -msgctxt "undo-type" -msgid "Translate Items" -msgstr "Trasladar elementos" - -#: ../app/core/gimpimage-item-list.c:78 -msgctxt "undo-type" -msgid "Flip Items" -msgstr "Voltear elementos" - -#: ../app/core/gimpimage-item-list.c:105 -msgctxt "undo-type" -msgid "Rotate Items" -msgstr "Rotar elementos" - -#: ../app/core/gimpimage-item-list.c:135 -msgctxt "undo-type" -msgid "Transform Items" -msgstr "Transformar elementos" - -#: ../app/core/gimpimage-merge.c:132 -msgctxt "undo-type" -msgid "Merge Visible Layers" -msgstr "Combinar las capas visibles" - -#: ../app/core/gimpimage-merge.c:195 -msgctxt "undo-type" -msgid "Flatten Image" -msgstr "Aplanar la imagen" - -#: ../app/core/gimpimage-merge.c:217 -msgid "Cannot flatten an image without any visible layer." -msgstr "No se puede aplanar una imagen sin una capa visible." - -#: ../app/core/gimpimage-merge.c:260 -msgid "Cannot merge down to a layer group." -msgstr "No se puede hacer una combinación a un grupo de capas." - -#: ../app/core/gimpimage-merge.c:267 -msgid "The layer to merge down to is locked." -msgstr "La capa a la que se pretende combinar está bloqueada." - -#: ../app/core/gimpimage-merge.c:279 -msgid "There is no visible layer to merge down to." -msgstr "No hay ninguna capa visible a la que hacer la combinación." - -#: ../app/core/gimpimage-merge.c:289 -msgctxt "undo-type" -msgid "Merge Down" -msgstr "Combinar hacia abajo" - -#: ../app/core/gimpimage-merge.c:317 -msgctxt "undo-type" -msgid "Merge Layer Group" -msgstr "Combinar el grupo de capas" - -#: ../app/core/gimpimage-merge.c:370 -msgctxt "undo-type" -msgid "Merge Visible Paths" -msgstr "Combinar las rutas visibles" - -#: ../app/core/gimpimage-merge.c:406 -msgid "Not enough visible paths for a merge. There must be at least two." -msgstr "" -"No hay suficientes capas visibles para hacer una combinación. Deben haber " -"por lo menos dos." - -#: ../app/core/gimpimage-new.c:140 -msgid "Background" -msgstr "Fondo" - -#: ../app/core/gimpimage-quick-mask.c:86 -msgctxt "undo-type" -msgid "Enable Quick Mask" -msgstr "Activar la máscara rápida" - -#: ../app/core/gimpimage-quick-mask.c:136 -msgctxt "undo-type" -msgid "Disable Quick Mask" -msgstr "Desactivar la máscara rápida" - -#: ../app/core/gimpimage-sample-points.c:53 -msgctxt "undo-type" -msgid "Add Sample Point" -msgstr "Añadir punto de muestra" - -#: ../app/core/gimpimage-sample-points.c:98 -msgctxt "undo-type" -msgid "Remove Sample Point" -msgstr "Quitar punto de muestra" - -#: ../app/core/gimpimage-sample-points.c:126 -msgctxt "undo-type" -msgid "Move Sample Point" -msgstr "Mover punto de muestra" - -#: ../app/core/gimpimage-scale.c:88 -msgctxt "undo-type" -msgid "Scale Image" -msgstr "Escalar la imagen" - -#: ../app/core/gimpimage-undo-push.c:862 -#, c-format -msgid "Can't undo %s" -msgstr "No se puede deshacer %s" - -#: ../app/core/gimpimage.c:1784 -msgid " (exported)" -msgstr " (exportada)" - -#: ../app/core/gimpimage.c:1788 -msgid " (overwritten)" -msgstr " (sobreescrita)" - -#: ../app/core/gimpimage.c:1797 -msgid " (imported)" -msgstr " (importada)" - -#: ../app/core/gimpimage.c:1939 -msgctxt "undo-type" -msgid "Change Image Resolution" -msgstr "Cambiar la resolución de la imagen" - -#: ../app/core/gimpimage.c:1991 -msgctxt "undo-type" -msgid "Change Image Unit" -msgstr "Cambiar la unidad de medida" - -#: ../app/core/gimpimage.c:3004 -msgctxt "undo-type" -msgid "Attach Parasite to Image" -msgstr "Adjuntar parásito a la imagen" - -#: ../app/core/gimpimage.c:3045 -msgctxt "undo-type" -msgid "Remove Parasite from Image" -msgstr "Eliminar el parásito de la imagen" - -#: ../app/core/gimpimage.c:3754 -msgctxt "undo-type" -msgid "Add Layer" -msgstr "Añadir una capa" - -#: ../app/core/gimpimage.c:3804 ../app/core/gimpimage.c:3824 -msgctxt "undo-type" -msgid "Remove Layer" -msgstr "Eliminar una capa" - -#: ../app/core/gimpimage.c:3818 -msgctxt "undo-type" -msgid "Remove Floating Selection" -msgstr "Eliminar la selección flotante" - -#: ../app/core/gimpimage.c:3983 -msgctxt "undo-type" -msgid "Add Channel" -msgstr "Añadir un canal" - -#: ../app/core/gimpimage.c:4021 ../app/core/gimpimage.c:4034 -msgctxt "undo-type" -msgid "Remove Channel" -msgstr "Eliminar un canal" - -#: ../app/core/gimpimage.c:4088 -msgctxt "undo-type" -msgid "Add Path" -msgstr "Añadir una ruta" - -#: ../app/core/gimpimage.c:4119 -msgctxt "undo-type" -msgid "Remove Path" -msgstr "Eliminar una ruta" - -#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1715 -msgid "Folder" -msgstr "Carpeta" - -#: ../app/core/gimpimagefile.c:724 -msgid "Special File" -msgstr "Archivo especial" - -#: ../app/core/gimpimagefile.c:740 -msgid "Remote File" -msgstr "Archivo remoto" - -#: ../app/core/gimpimagefile.c:759 -msgid "Click to create preview" -msgstr "Pulsar para crear la vista previa" - -#: ../app/core/gimpimagefile.c:765 -msgid "Loading preview..." -msgstr "Cargando la vista previa…" - -#: ../app/core/gimpimagefile.c:771 -msgid "Preview is out of date" -msgstr "La vista previa está desactualizada" - -#: ../app/core/gimpimagefile.c:777 -msgid "Cannot create preview" -msgstr "No se puede crear la vista previa" - -#: ../app/core/gimpimagefile.c:787 -msgid "(Preview may be out of date)" -msgstr "(La vista previa podría estar desactualizada)" - -#. pixel size -#: ../app/core/gimpimagefile.c:796 ../app/widgets/gimpimagepropview.c:440 -#: ../app/widgets/gimpsizebox.c:432 ../app/widgets/gimptemplateeditor.c:581 -#, c-format -msgid "%d × %d pixel" -msgid_plural "%d × %d pixels" -msgstr[0] "%d x %d píxel" -msgstr[1] "%d x %d píxeles" - -#: ../app/core/gimpimagefile.c:819 ../app/display/gimpdisplayshell-title.c:317 -#, c-format -msgid "%d layer" -msgid_plural "%d layers" -msgstr[0] "%d capa" -msgstr[1] "%d capas" - -#: ../app/core/gimpimagefile.c:867 -#, c-format -msgid "Could not open thumbnail '%s': %s" -msgstr "No se ha podido abrir la miniatura «%s»: %s" - -#: ../app/core/gimpitem.c:1819 -msgctxt "undo-type" -msgid "Attach Parasite" -msgstr "Adjuntar parásito" - -#: ../app/core/gimpitem.c:1829 -msgctxt "undo-type" -msgid "Attach Parasite to Item" -msgstr "Adjuntar una parásito al elemento" - -#: ../app/core/gimpitem.c:1880 ../app/core/gimpitem.c:1887 -msgctxt "undo-type" -msgid "Remove Parasite from Item" -msgstr "Eliminar un parásito del elemento" - -#: ../app/core/gimpitem-exclusive.c:81 -msgid "Set Item Exclusive Visible" -msgstr "Define al elemento como exclusivo visible" - -#: ../app/core/gimpitem-exclusive.c:172 -msgid "Set Item Exclusive Linked" -msgstr "Definir al elemento como exclusivo enlazado" - -#: ../app/core/gimplayer-floating-sel.c:95 -msgctxt "undo-type" -msgid "Anchor Floating Selection" -msgstr "Anclar una selección flotante" - -#: ../app/core/gimplayer-floating-sel.c:126 ../app/core/gimplayer.c:620 -msgid "" -"Cannot create a new layer from the floating selection because it belongs to " -"a layer mask or channel." -msgstr "" -"No se puede crear una capa nueva a partir de la selección flotante porque " -"ésta pertenece a una máscara de capa o canal." - -#: ../app/core/gimplayer-floating-sel.c:133 -msgctxt "undo-type" -msgid "Floating Selection to Layer" -msgstr "Selección flotante a capa" - -#: ../app/core/gimplayer.c:268 -msgctxt "undo-type" -msgid "Rename Layer" -msgstr "Renombrar una capa" - -#: ../app/core/gimplayer.c:269 -msgctxt "undo-type" -msgid "Move Layer" -msgstr "Mover una capa" - -#: ../app/core/gimplayer.c:270 -msgctxt "undo-type" -msgid "Scale Layer" -msgstr "Escalar una capa" - -#: ../app/core/gimplayer.c:271 -msgctxt "undo-type" -msgid "Resize Layer" -msgstr "Redimensionar una capa" - -#: ../app/core/gimplayer.c:272 -msgctxt "undo-type" -msgid "Flip Layer" -msgstr "Voltear una capa" - -#: ../app/core/gimplayer.c:273 -msgctxt "undo-type" -msgid "Rotate Layer" -msgstr "Rotar una capa" - -#: ../app/core/gimplayer.c:276 -msgctxt "undo-type" -msgid "Reorder Layer" -msgstr "Reordenar una capa" - -#: ../app/core/gimplayer.c:277 -msgctxt "undo-type" -msgid "Raise Layer" -msgstr "Elevar una capa" - -#: ../app/core/gimplayer.c:278 -msgctxt "undo-type" -msgid "Raise Layer to Top" -msgstr "Elevar una capa hasta lo más alto" - -#: ../app/core/gimplayer.c:279 -msgctxt "undo-type" -msgid "Lower Layer" -msgstr "Bajar una capa" - -#: ../app/core/gimplayer.c:280 -msgctxt "undo-type" -msgid "Lower Layer to Bottom" -msgstr "Bajar una capa hasta la parte más baja" - -#: ../app/core/gimplayer.c:281 -msgid "Layer cannot be raised higher." -msgstr "La capa no puede ser elevada más alto." - -#: ../app/core/gimplayer.c:282 -msgid "Layer cannot be lowered more." -msgstr "La capa no puede bajarse más." - -#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1529 -#: ../app/core/gimplayermask.c:236 -#, c-format -msgid "%s mask" -msgstr "máscara %s" - -#: ../app/core/gimplayer.c:489 -#, c-format -msgid "" -"Floating Selection\n" -"(%s)" -msgstr "" -"Selección flotante\n" -"(%s)" - -#: ../app/core/gimplayer.c:1449 -msgid "Unable to add a layer mask since the layer already has one." -msgstr "No se puede añadir una máscara de capa dado que la capa ya posee una." - -#: ../app/core/gimplayer.c:1460 -msgid "Cannot add layer mask of different dimensions than specified layer." -msgstr "" -"No se puede añadir una máscara de capa de dimensiones distintas a la capa " -"especificada." - -#: ../app/core/gimplayer.c:1466 -msgctxt "undo-type" -msgid "Add Layer Mask" -msgstr "Añadir máscara de capa" - -#: ../app/core/gimplayer.c:1584 -msgctxt "undo-type" -msgid "Transfer Alpha to Mask" -msgstr "Transferir alfa a la máscara" - -#: ../app/core/gimplayer.c:1754 -msgctxt "undo-type" -msgid "Apply Layer Mask" -msgstr "Aplicar máscara de capa" - -#: ../app/core/gimplayer.c:1755 -msgctxt "undo-type" -msgid "Delete Layer Mask" -msgstr "Eliminar máscara de capa" - -#: ../app/core/gimplayer.c:1874 -msgctxt "undo-type" -msgid "Add Alpha Channel" -msgstr "Añadir un canal alfa" - -#: ../app/core/gimplayer.c:1928 -msgctxt "undo-type" -msgid "Remove Alpha Channel" -msgstr "Eliminar el canal alfa" - -#: ../app/core/gimplayer.c:1948 -msgctxt "undo-type" -msgid "Layer to Image Size" -msgstr "Capa a tamaño de imagen" - -#: ../app/core/gimplayermask.c:108 -msgctxt "undo-type" -msgid "Move Layer Mask" -msgstr "Mover la máscara de la capa" - -#: ../app/core/gimplayermask.c:109 -msgctxt "undo-type" -msgid "Layer Mask to Selection" -msgstr "Máscara de capa a selección" - -#: ../app/core/gimplayermask.c:183 -#, c-format -msgid "Cannot rename layer masks." -msgstr "No se pueden renombrar las máscaras de capa." - -#: ../app/core/gimplayermask.c:264 -msgctxt "undo-type" -msgid "Enable Layer Mask" -msgstr "Activar máscara de capa" - -#: ../app/core/gimplayermask.c:265 -msgctxt "undo-type" -msgid "Disable Layer Mask" -msgstr "Desactivar máscara de capa" - -#: ../app/core/gimplayermask.c:327 -msgctxt "undo-type" -msgid "Show Layer Mask" -msgstr "Mostrar la máscara de la capa" - -#: ../app/core/gimppalette-import.c:439 -#, c-format -msgid "Index %d" -msgstr "Índice: %d" - -#: ../app/core/gimppalette-import.c:549 -#, c-format -msgid "Unknown type of palette file: %s" -msgstr "Tipo de archivo de paleta desconocido: %s" - -#: ../app/core/gimppalette-load.c:86 ../app/core/gimppalette-load.c:112 -#: ../app/core/gimppalette-load.c:133 ../app/core/gimppalette-load.c:162 -#: ../app/core/gimppalette-load.c:238 -#, c-format -msgid "Fatal parse error in palette file '%s': Read error in line %d." -msgstr "" -"Error fatal de análisis en el archivo de paleta «%s»: error de lectura en la " -"línea %d." - -#: ../app/core/gimppalette-load.c:96 -#, c-format -msgid "Fatal parse error in palette file '%s': Missing magic header." -msgstr "" -"Error fatal de análisis en el archivo de paleta «%s»: cabecera mágica perdida." - -#: ../app/core/gimppalette-load.c:125 -#, c-format -msgid "Invalid UTF-8 string in palette file '%s'" -msgstr "Cadena UTF-8 no válida en el archivo de paleta «%s»" - -#: ../app/core/gimppalette-load.c:149 -#, c-format -msgid "" -"Reading palette file '%s': Invalid number of columns in line %d. Using " -"default value." -msgstr "" -"Leyendo el archivo de paleta «%s»: número no válido de columnas en la línea %" -"d. Usando el valor predeterminado." - -#: ../app/core/gimppalette-load.c:185 -#, c-format -msgid "Reading palette file '%s': Missing RED component in line %d." -msgstr "" -"Leyendo el archivo de paleta «%s»: falta la componente ROJO en la línea %d." - -#: ../app/core/gimppalette-load.c:193 -#, c-format -msgid "Reading palette file '%s': Missing GREEN component in line %d." -msgstr "" -"Leyendo el archivo de paleta «%s»: falta la componente VERDE en la línea %d." - -#: ../app/core/gimppalette-load.c:201 -#, c-format -msgid "Reading palette file '%s': Missing BLUE component in line %d." -msgstr "" -"Leyendo el archivo de paleta «%s»: falta la componente AZUL en la línea %d." - -#: ../app/core/gimppalette-load.c:211 -#, c-format -msgid "Reading palette file '%s': RGB value out of range in line %d." -msgstr "" -"Leyendo el archivo de paleta «%s»: valor RGB fuera de rango en la línea %d." - -#: ../app/core/gimppalette-load.c:478 -#, c-format -msgid "Could not read header from palette file '%s'" -msgstr "No se ha podido leer la cabecera del archivo de paleta «%s»" - -#: ../app/core/gimppalette-load.c:501 ../app/core/gimppalette-load.c:589 -#, c-format -msgid "Fatal parse error in palette file '%s'" -msgstr "Error fatal de análisis en el archivo de paleta «%s»" - -#: ../app/core/gimppattern-load.c:85 ../app/core/gimppattern-load.c:131 -#: ../app/core/gimppattern-load.c:162 -#, c-format -msgid "Fatal parse error in pattern file '%s': File appears truncated." -msgstr "" -"Error fatal de análisis en el archivo de patrón «%s»: el archivo parece estar " -"truncado." - -#: ../app/core/gimppattern-load.c:104 -#, c-format -msgid "" -"Fatal parse error in pattern file '%s': Unknown pattern format version %d." -msgstr "" -"Error de análisis fatal en el archivo de patrón «%s»: versión del formato de " -"patrón desconocida %d." - -#: ../app/core/gimppattern-load.c:114 -#, c-format -msgid "" -"Fatal parse error in pattern file '%s: Unsupported pattern depth %d.\n" -"GIMP Patterns must be GRAY or RGB." -msgstr "" -"Error de análisis fatal en el archivo de patrón «%s»: profundidad del patrón " -"no soportada %d.\n" -"Los patrones de GIMP deben ser GRAY o RGB." - -#: ../app/core/gimppattern-load.c:139 -#, c-format -msgid "Invalid UTF-8 string in pattern file '%s'." -msgstr "Cadena UTF-8 no válida en el archivo de patrón «%s»." - -#: ../app/core/gimppdbprogress.c:279 ../app/widgets/gimppdbdialog.c:331 -#, c-format -msgid "Unable to run %s callback. The corresponding plug-in may have crashed." -msgstr "" -"No se puede ejecutar la retrollamada %s. El complemento correspondiente debe " -"haber fallado." - -#: ../app/core/gimpprogress.c:106 ../app/core/gimpprogress.c:153 -msgid "Please wait" -msgstr "Por favor, espere" - -#: ../app/core/gimpselection.c:155 -msgctxt "undo-type" -msgid "Move Selection" -msgstr "Mover la selección" - -#: ../app/core/gimpselection.c:156 -msgctxt "undo-type" -msgid "Stroke Selection" -msgstr "Trazar la selección" - -#: ../app/core/gimpselection.c:172 -msgctxt "undo-type" -msgid "Feather Selection" -msgstr "Difuminar la selección" - -#: ../app/core/gimpselection.c:173 -msgctxt "undo-type" -msgid "Sharpen Selection" -msgstr "Perfilar la selección" - -#: ../app/core/gimpselection.c:174 -msgctxt "undo-type" -msgid "Select None" -msgstr "Seleccionar nada" - -#: ../app/core/gimpselection.c:175 -msgctxt "undo-type" -msgid "Select All" -msgstr "Seleccionar todo" - -#: ../app/core/gimpselection.c:176 -msgctxt "undo-type" -msgid "Invert Selection" -msgstr "Invertir la selección" - -#: ../app/core/gimpselection.c:177 -msgctxt "undo-type" -msgid "Border Selection" -msgstr "Selección de borde" - -#: ../app/core/gimpselection.c:178 -msgctxt "undo-type" -msgid "Grow Selection" -msgstr "Agrandar selección" - -#: ../app/core/gimpselection.c:179 -msgctxt "undo-type" -msgid "Shrink Selection" -msgstr "Encoger selección" - -#: ../app/core/gimpselection.c:286 -msgid "There is no selection to stroke." -msgstr "No hay ninguna selección que trazar." - -#: ../app/core/gimpselection.c:670 -msgid "Unable to cut or copy because the selected region is empty." -msgstr "No se puede cortar o copiar porque la región seleccionada está vacía." - -#: ../app/core/gimpselection.c:847 -msgid "Cannot float selection because the selected region is empty." -msgstr "" -"No se puede hacer flotar la selección porque la región seleccionada está " -"vacía." - -#: ../app/core/gimpselection.c:854 -msgctxt "undo-type" -msgid "Float Selection" -msgstr "Flotar la selección" - -#: ../app/core/gimpselection.c:870 -msgid "Floated Layer" -msgstr "Capa flotante" - -#: ../app/core/gimpstrokeoptions.c:180 -msgid "" -"Convert a mitered join to a bevelled join if the miter would extend to a " -"distance of more than miter-limit * line-width from the actual join point." -msgstr "" -"Convertir una unión mediana en una unión en bisel si la mediana se " -"extendiese hasta una distancia mayor que el límite de mediana multiplicado " -"por el grosor de la línea a partir del punto real de unión." - -#: ../app/core/gimptoolpreset-load.c:61 -#, c-format -msgid "Error while parsing '%s'" -msgstr "Error al analizar «%s»" - -#: ../app/core/gimptemplate.c:129 -msgid "The unit used for coordinate display when not in dot-for-dot mode." -msgstr "" -"La unidad utilizada para las coordenadas de visualización cuando no se " -"encuentra en modo de punto por punto." - -#: ../app/core/gimptemplate.c:136 -msgid "The horizontal image resolution." -msgstr "La resolución horizontal de la imagen." - -#: ../app/core/gimptemplate.c:142 -msgid "The vertical image resolution." -msgstr "La resolución vertical de la imagen." - -#: ../app/core/gimpunit.c:60 -msgctxt "unit-singular" -msgid "pixel" -msgstr "píxel" - -#: ../app/core/gimpunit.c:60 -msgctxt "unit-plural" -msgid "pixels" -msgstr "píxeles" - -#: ../app/core/gimpunit.c:64 -msgctxt "unit-singular" -msgid "inch" -msgstr "pulgada" - -#: ../app/core/gimpunit.c:64 -msgctxt "unit-plural" -msgid "inches" -msgstr "pulgadas" - -#: ../app/core/gimpunit.c:67 -msgctxt "unit-singular" -msgid "millimeter" -msgstr "milímetro" - -#: ../app/core/gimpunit.c:67 -msgctxt "unit-plural" -msgid "millimeters" -msgstr "milímetros" - -#: ../app/core/gimpunit.c:71 -msgctxt "unit-singular" -msgid "point" -msgstr "punto" - -#: ../app/core/gimpunit.c:71 -msgctxt "unit-plural" -msgid "points" -msgstr "puntos" - -#: ../app/core/gimpunit.c:74 -msgctxt "unit-singular" -msgid "pica" -msgstr "pica" - -#: ../app/core/gimpunit.c:74 -msgctxt "unit-plural" -msgid "picas" -msgstr "picas" - -#: ../app/core/gimpunit.c:82 -msgctxt "singular" -msgid "percent" -msgstr "porcentaje" - -#: ../app/core/gimpunit.c:82 -msgctxt "plural" -msgid "percent" -msgstr "porcentaje" - -#: ../app/dialogs/about-dialog.c:114 -msgid "About GIMP" -msgstr "Acerca de GIMP" - -#: ../app/dialogs/about-dialog.c:123 -msgid "Visit the GIMP website" -msgstr "Visite el sitio web de GIMP" - -#. Translators: insert your names here, -#. separated by newline -#: ../app/dialogs/about-dialog.c:129 -msgid "translator-credits" -msgstr "" -"Alonso Lara\n" -"Francisco Javier F. Serrador\n" -"Pablo G. del Campo\n" -"Francisco Vila" - -#: ../app/dialogs/about-dialog.c:521 -msgid "GIMP is brought to you by" -msgstr "GIMP se ha realizado para usted por" - -#: ../app/dialogs/about-dialog.c:596 -msgid "This is an unstable development release." -msgstr "Esta es una versión de desarrollo inestable." - -#: ../app/dialogs/channel-options-dialog.c:146 -msgid "Channel _name:" -msgstr "_Nombre del canal:" - -#: ../app/dialogs/channel-options-dialog.c:175 -msgid "Initialize from _selection" -msgstr "Iniciar a partir de la _selección" - -#: ../app/dialogs/convert-dialog.c:125 -msgid "Indexed Color Conversion" -msgstr "Conversión de color indexado" - -#: ../app/dialogs/convert-dialog.c:128 -msgid "Convert Image to Indexed Colors" -msgstr "Convertir la imagen a colores indexados" - -#: ../app/dialogs/convert-dialog.c:138 -msgid "C_onvert" -msgstr "C_onvertir" - -#: ../app/dialogs/convert-dialog.c:190 -msgid "_Maximum number of colors:" -msgstr "Número _máximo de colores:" - -#: ../app/dialogs/convert-dialog.c:217 -msgid "_Remove unused colors from colormap" -msgstr "_Eliminar los colores sin usar de la paleta final" - -#. dithering -#: ../app/dialogs/convert-dialog.c:234 ../app/tools/gimpblendoptions.c:254 -msgid "Dithering" -msgstr "Difuminado" - -#: ../app/dialogs/convert-dialog.c:246 -msgid "Color _dithering:" -msgstr "_Difuminar el color:" - -#: ../app/dialogs/convert-dialog.c:261 -msgid "Enable dithering of _transparency" -msgstr "Activar difuminado de _transparencia" - -#: ../app/dialogs/convert-dialog.c:288 -msgid "Converting to indexed colors" -msgstr "Convirtiendo a colores indexados" - -#: ../app/dialogs/convert-dialog.c:416 ../app/pdb/convert-cmds.c:153 -msgid "Cannot convert to a palette with more than 256 colors." -msgstr "No se puede convertir a una paleta con más de 256 colores." - -#: ../app/dialogs/data-delete-dialog.c:81 -msgid "Delete Object" -msgstr "Eliminar objeto" - -#: ../app/dialogs/data-delete-dialog.c:104 -#, c-format -msgid "Delete '%s'?" -msgstr "¿Eliminar «%s»?" - -#: ../app/dialogs/data-delete-dialog.c:107 -#, c-format -msgid "" -"Are you sure you want to remove '%s' from the list and delete it on disk?" -msgstr "" -"¿Está seguro de que quiere eliminar «%s» de la lista y eliminarlo del disco?" - -#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:162 -#: ../app/gui/gui-message.c:149 -msgid "GIMP Message" -msgstr "Mensaje de GIMP" - -#: ../app/dialogs/dialogs.c:302 -msgid "Devices" -msgstr "Dispositivos" - -#: ../app/dialogs/dialogs.c:302 -msgid "Device Status" -msgstr "Estado del dispositivo" - -#: ../app/dialogs/dialogs.c:306 -msgid "Errors" -msgstr "Errores" - -#: ../app/dialogs/dialogs.c:310 -msgid "Pointer" -msgstr "Puntero" - -#: ../app/dialogs/dialogs.c:329 -msgid "History" -msgstr "Historial" - -#: ../app/dialogs/dialogs.c:331 -msgid "Image Templates" -msgstr "Plantillas de imágenes" - -#: ../app/dialogs/dialogs.c:358 -msgid "Histogram" -msgstr "Histograma" - -#: ../app/dialogs/dialogs.c:362 -msgid "Selection" -msgstr "Selección" - -#: ../app/dialogs/dialogs.c:362 -msgid "Selection Editor" -msgstr "Editor de selección" - -#: ../app/dialogs/dialogs.c:366 -msgid "Undo" -msgstr "Deshacer" - -#: ../app/dialogs/dialogs.c:366 -msgid "Undo History" -msgstr "Historial de deshacer" - -#: ../app/dialogs/dialogs.c:376 -msgid "Navigation" -msgstr "Navegación" - -#: ../app/dialogs/dialogs.c:376 -msgid "Display Navigation" -msgstr "Navegación de la vista" - -#: ../app/dialogs/dialogs.c:382 -msgid "FG/BG" -msgstr "PP/SP" - -#: ../app/dialogs/dialogs.c:382 -msgid "FG/BG Color" -msgstr "Color PP/SP" - -#: ../app/dialogs/fade-dialog.c:109 -#, c-format -msgid "Fade %s" -msgstr "Desvanecer %s" - -#: ../app/dialogs/fade-dialog.c:121 -msgid "_Fade" -msgstr "_Desvanecer" - -#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:346 -msgid "_Mode:" -msgstr "_Modo:" - -#: ../app/dialogs/fade-dialog.c:162 -msgid "_Opacity:" -msgstr "_Opacidad:" - +#: ../app/actions/view-actions.c:118 +msgctxt "view-action" +msgid "Shrink _Wrap" +msgstr "_Ajustar encogiendo" + +#: ../app/actions/view-actions.c:119 +msgctxt "view-action" +msgid "Reduce the image window to the size of the image display" +msgstr "Ajustar la ventana al tamaño con que se muestra la imagen" + +#: ../app/actions/view-actions.c:124 +msgctxt "view-action" +msgid "_Open Display..." +msgstr "_Abrir pantalla…" + +#: ../app/actions/view-actions.c:125 +msgctxt "view-action" +msgid "Connect to another display" +msgstr "Conectar a otra pantalla" + +#: ../app/actions/view-actions.c:133 +msgctxt "view-action" +msgid "_Dot for Dot" +msgstr "P_unto por punto" + +#: ../app/actions/view-actions.c:134 +msgctxt "view-action" +msgid "A pixel on the screen represents an image pixel" +msgstr "Un píxel en la pantalla representa un píxel de la imagen" + +#: ../app/actions/view-actions.c:140 +msgctxt "view-action" +msgid "Show _Selection" +msgstr "Mostrar la s_elección" + +#: ../app/actions/view-actions.c:141 +msgctxt "view-action" +msgid "Display the selection outline" +msgstr "Muestra el contorno de la selección" + +#: ../app/actions/view-actions.c:147 +msgctxt "view-action" +msgid "Show _Layer Boundary" +msgstr "Mostrar el _límite de la capa" + +#: ../app/actions/view-actions.c:148 +msgctxt "view-action" +msgid "Draw a border around the active layer" +msgstr "Dibuja un borde alrededor de la capa activa" + +#: ../app/actions/view-actions.c:154 +msgctxt "view-action" +msgid "Show _Guides" +msgstr "Mostrar g_uías" + +#: ../app/actions/view-actions.c:155 +msgctxt "view-action" +msgid "Display the image's guides" +msgstr "Muestra las líneas guía de la imagen" + +#: ../app/actions/view-actions.c:161 +msgctxt "view-action" +msgid "S_how Grid" +msgstr "Mostrar _rejilla" + +#: ../app/actions/view-actions.c:162 +msgctxt "view-action" +msgid "Display the image's grid" +msgstr "Muestra la rejilla de la imagen" + +#: ../app/actions/view-actions.c:168 +msgctxt "view-action" +msgid "Show Sample Points" +msgstr "Mostrar puntos de muestra" + +#: ../app/actions/view-actions.c:169 +msgctxt "view-action" +msgid "Display the image's color sample points" +msgstr "Muestra los puntos de muestreo de color de la imagen" + +#: ../app/actions/view-actions.c:175 +msgctxt "view-action" +msgid "Sn_ap to Guides" +msgstr "Ajust_ar a las guías" + +#: ../app/actions/view-actions.c:176 +msgctxt "view-action" +msgid "Tool operations snap to guides" +msgstr "Las operaciones de las herramientas se ajustan a las líneas guía" + +#: ../app/actions/view-actions.c:182 +msgctxt "view-action" +msgid "Sna_p to Grid" +msgstr "Ajustar a la rej_illa" + +#: ../app/actions/view-actions.c:183 +msgctxt "view-action" +msgid "Tool operations snap to the grid" +msgstr "Las operaciones de las herramientas se ajustan a la rejilla" + +#: ../app/actions/view-actions.c:189 +msgctxt "view-action" +msgid "Snap to _Canvas Edges" +msgstr "Ajustar a los bordes del _lienzo" + +#: ../app/actions/view-actions.c:190 +msgctxt "view-action" +msgid "Tool operations snap to the canvas edges" +msgstr "Las operaciones de las herramientas se ajustan a los bordes del lienzo" + +#: ../app/actions/view-actions.c:196 +msgctxt "view-action" +msgid "Snap t_o Active Path" +msgstr "Ajustar a la _ruta activa" + +#: ../app/actions/view-actions.c:197 +msgctxt "view-action" +msgid "Tool operations snap to the active path" +msgstr "Las operaciones de las herramientas se ajustan a la ruta activa" + +#: ../app/actions/view-actions.c:203 +msgctxt "view-action" +msgid "Show _Menubar" +msgstr "_Mostrar la barra de menú" + +#: ../app/actions/view-actions.c:204 +msgctxt "view-action" +msgid "Show this window's menubar" +msgstr "Muestra la barra de menús de esta ventana" + +#: ../app/actions/view-actions.c:210 +msgctxt "view-action" +msgid "Show R_ulers" +msgstr "Mostrar las _reglas" + +#: ../app/actions/view-actions.c:211 +msgctxt "view-action" +msgid "Show this window's rulers" +msgstr "Muestra las reglas de medición de esta ventana" + +#: ../app/actions/view-actions.c:217 +msgctxt "view-action" +msgid "Show Scroll_bars" +msgstr "Mostrar las _barras de desplazamiento" + +#: ../app/actions/view-actions.c:218 +msgctxt "view-action" +msgid "Show this window's scrollbars" +msgstr "Muestra las barras de desplazamiento de esta ventana" + +#: ../app/actions/view-actions.c:224 +msgctxt "view-action" +msgid "Show S_tatusbar" +msgstr "Mostrar la barra de es_tado" + +#: ../app/actions/view-actions.c:225 +msgctxt "view-action" +msgid "Show this window's statusbar" +msgstr "Muestra la barra de estado de esta ventana" + +#: ../app/actions/view-actions.c:231 +msgctxt "view-action" +msgid "Fullscr_een" +msgstr "Pantalla compl_eta" + +#: ../app/actions/view-actions.c:232 +msgctxt "view-action" +msgid "Toggle fullscreen view" +msgstr "Activa o desactiva la vista de pantalla completa" + +#: ../app/actions/view-actions.c:238 +msgctxt "view-action" +msgid "Use GEGL" +msgstr "Usar GEGL" + +#: ../app/actions/view-actions.c:239 +msgctxt "view-action" +msgid "Use GEGL to create this window's projection" +msgstr "Usar GEGL para crear la proyección de esta ventana" + +#: ../app/actions/view-actions.c:263 +msgctxt "view-zoom-action" +msgid "Zoom _Out" +msgstr "Re_ducir" + +#: ../app/actions/view-actions.c:264 ../app/actions/view-actions.c:276 +msgctxt "view-zoom-action" +msgid "Zoom out" +msgstr "Reducir" + +#: ../app/actions/view-actions.c:269 +msgctxt "view-zoom-action" +msgid "Zoom _In" +msgstr "_Ampliar" + +#: ../app/actions/view-actions.c:270 ../app/actions/view-actions.c:282 +msgctxt "view-zoom-action" +msgid "Zoom in" +msgstr "Ampliar" + +#: ../app/actions/view-actions.c:275 +msgctxt "view-zoom-action" +msgid "Zoom Out" +msgstr "Reducir" + +#: ../app/actions/view-actions.c:281 +msgctxt "view-zoom-action" +msgid "Zoom In" +msgstr "Ampliar" + +#: ../app/actions/view-actions.c:300 ../app/actions/view-actions.c:306 +msgctxt "view-zoom-action" +msgid "1_6:1 (1600%)" +msgstr "1_6:1 (1600%)" + +#: ../app/actions/view-actions.c:301 ../app/actions/view-actions.c:307 +msgctxt "view-zoom-action" +msgid "Zoom 16:1" +msgstr "Ampliación 16:1" + +#: ../app/actions/view-actions.c:312 ../app/actions/view-actions.c:318 +msgctxt "view-zoom-action" +msgid "_8:1 (800%)" +msgstr "_8:1 (800%)" + +#: ../app/actions/view-actions.c:313 ../app/actions/view-actions.c:319 +msgctxt "view-zoom-action" +msgid "Zoom 8:1" +msgstr "Ampliación 8:1" + +#: ../app/actions/view-actions.c:324 ../app/actions/view-actions.c:330 +msgctxt "view-zoom-action" +msgid "_4:1 (400%)" +msgstr "_4:1 (400%)" + +#: ../app/actions/view-actions.c:325 ../app/actions/view-actions.c:331 +msgctxt "view-zoom-action" +msgid "Zoom 4:1" +msgstr "Ampliación 4:1" + +#: ../app/actions/view-actions.c:336 ../app/actions/view-actions.c:342 +msgctxt "view-zoom-action" +msgid "_2:1 (200%)" +msgstr "_2:1 (200%)" + +#: ../app/actions/view-actions.c:337 ../app/actions/view-actions.c:343 +msgctxt "view-zoom-action" +msgid "Zoom 2:1" +msgstr "Ampliación 2:1" + +#: ../app/actions/view-actions.c:348 ../app/actions/view-actions.c:354 +msgctxt "view-zoom-action" +msgid "_1:1 (100%)" +msgstr "_1:1 (100%)" + +#: ../app/actions/view-actions.c:349 ../app/actions/view-actions.c:355 +msgctxt "view-zoom-action" +msgid "Zoom 1:1" +msgstr "Ampliación 1:1" + +#: ../app/actions/view-actions.c:360 +msgctxt "view-zoom-action" +msgid "1:_2 (50%)" +msgstr "1:_2 (50%)" + +#: ../app/actions/view-actions.c:361 +msgctxt "view-zoom-action" +msgid "Zoom 1:2" +msgstr "Ampliación 1:2" + +#: ../app/actions/view-actions.c:366 +msgctxt "view-zoom-action" +msgid "1:_4 (25%)" +msgstr "1:_4 (25%)" + +#: ../app/actions/view-actions.c:367 +msgctxt "view-zoom-action" +msgid "Zoom 1:4" +msgstr "Ampliación 1:4" + +#: ../app/actions/view-actions.c:372 +msgctxt "view-zoom-action" +msgid "1:_8 (12.5%)" +msgstr "1:_8 (12.5%)" + +#: ../app/actions/view-actions.c:373 +msgctxt "view-zoom-action" +msgid "Zoom 1:8" +msgstr "Ampliación 1:8" + +#: ../app/actions/view-actions.c:378 +msgctxt "view-zoom-action" +msgid "1:1_6 (6.25%)" +msgstr "1:1_6 (6.25%)" + +#: ../app/actions/view-actions.c:379 +msgctxt "view-zoom-action" +msgid "Zoom 1:16" +msgstr "Ampliación 1:16" + +#: ../app/actions/view-actions.c:384 +msgctxt "view-zoom-action" +msgid "Othe_r..." +msgstr "Ot_ros…" + +#: ../app/actions/view-actions.c:385 +msgctxt "view-zoom-action" +msgid "Set a custom zoom factor" +msgstr "Establece un factor de ampliación personalizado" + +#: ../app/actions/view-actions.c:393 +msgctxt "view-padding-color" +msgid "From _Theme" +msgstr "Del _tema" + +#: ../app/actions/view-actions.c:394 +msgctxt "view-padding-color" +msgid "Use the current theme's background color" +msgstr "Usar el color de fondo del tema actual" + +#: ../app/actions/view-actions.c:399 +msgctxt "view-padding-color" +msgid "_Light Check Color" +msgstr "Color de los cuadros c_laros" + +#: ../app/actions/view-actions.c:400 +msgctxt "view-padding-color" +msgid "Use the light check color" +msgstr "Usar el color de los cuadrados claros" + +#: ../app/actions/view-actions.c:405 +msgctxt "view-padding-color" +msgid "_Dark Check Color" +msgstr "Color de los cuadros o_scuros" + +#: ../app/actions/view-actions.c:406 +msgctxt "view-padding-color" +msgid "Use the dark check color" +msgstr "Usar el color de los cuadrados oscuros" + +#: ../app/actions/view-actions.c:411 +msgctxt "view-padding-color" +msgid "Select _Custom Color..." +msgstr "Seleccionar color _personalizado…" + +#: ../app/actions/view-actions.c:412 +msgctxt "view-padding-color" +msgid "Use an arbitrary color" +msgstr "Usar un color arbitrario" + +#: ../app/actions/view-actions.c:417 +msgctxt "view-padding-color" +msgid "As in _Preferences" +msgstr "Como en las _preferencias" + +#: ../app/actions/view-actions.c:419 +msgctxt "view-padding-color" +msgid "Reset padding color to what's configured in preferences" +msgstr "Reiniciar el color de relleno a lo establecido en las preferencias" + +#: ../app/actions/view-actions.c:618 +#, c-format +msgid "Re_vert Zoom (%d%%)" +msgstr "Re_vertir la ampliación (%d%%)" + +#: ../app/actions/view-actions.c:626 +msgid "Re_vert Zoom" +msgstr "Re_vertir la ampliación" + +#: ../app/actions/view-actions.c:761 +#, c-format +msgid "Othe_r (%s)..." +msgstr "Ot_ro (%s)…" + +#: ../app/actions/view-actions.c:770 +#, c-format +msgid "_Zoom (%s)" +msgstr "A_mpliación (%s)" + +#: ../app/actions/view-commands.c:603 +msgid "Set Canvas Padding Color" +msgstr "Establecer el color de relleno del lienzo" + +#: ../app/actions/view-commands.c:605 +msgid "Set Custom Canvas Padding Color" +msgstr "Establecer el color personalizado de relleno del lienzo" + +#: ../app/actions/window-actions.c:170 +#, c-format +msgid "Screen %s" +msgstr "Pantalla %s" + +#: ../app/actions/window-actions.c:172 +#, c-format +msgid "Move this window to screen %s" +msgstr "Mover esta ventana a la pantalla %s" + +#: ../app/actions/windows-actions.c:93 +msgctxt "windows-action" +msgid "_Windows" +msgstr "Ve_ntanas" + +#: ../app/actions/windows-actions.c:95 +msgctxt "windows-action" +msgid "_Recently Closed Docks" +msgstr "Empotrables cerrados _recientemente" + +#: ../app/actions/windows-actions.c:97 +msgctxt "windows-action" +msgid "_Dockable Dialogs" +msgstr "_Diálogos empotrables" + +#: ../app/actions/windows-actions.c:100 +msgctxt "windows-action" +msgid "Next Image" +msgstr "Imagen siguiente" + +#: ../app/actions/windows-actions.c:101 +msgctxt "windows-action" +msgid "Switch to the next image" +msgstr "Cambiar a la imagen siguiente" + +#: ../app/actions/windows-actions.c:106 +msgctxt "windows-action" +msgid "Previous Image" +msgstr "Imagen anterior" + +#: ../app/actions/windows-actions.c:107 +msgctxt "windows-action" +msgid "Switch to the previous image" +msgstr "Cambiar a la imagen anterior" + +#: ../app/actions/windows-actions.c:115 +msgctxt "windows-action" +msgid "Hide Docks" +msgstr "Ocultar los empotrables" + +#: ../app/actions/windows-actions.c:116 +msgctxt "windows-action" +msgid "" +"When enabled docks and other dialogs are hidden, leaving only image windows." +msgstr "" +"Ocultar los empotrables activos y otros diálogos, dejando sólo las ventanas " +"de imagen." + +#: ../app/actions/windows-actions.c:122 +msgctxt "windows-action" +msgid "Single-Window Mode" +msgstr "Modo de ventana única" + +#: ../app/actions/windows-actions.c:123 +msgctxt "windows-action" +msgid "When enabled GIMP is in a single-window mode." +msgstr "Cuando GIMP está en modo de ventana única." + +#: ../app/base/base-enums.c:23 +msgctxt "curve-type" +msgid "Smooth" +msgstr "Suave" + +#: ../app/base/base-enums.c:24 +msgctxt "curve-type" +msgid "Freehand" +msgstr "Mano alzada" + +#: ../app/base/base-enums.c:56 +msgctxt "histogram-channel" +msgid "Value" +msgstr "Valor" + +#: ../app/base/base-enums.c:57 +msgctxt "histogram-channel" +msgid "Red" +msgstr "Rojo" + +#: ../app/base/base-enums.c:58 +msgctxt "histogram-channel" +msgid "Green" +msgstr "Verde" + +#: ../app/base/base-enums.c:59 +msgctxt "histogram-channel" +msgid "Blue" +msgstr "Azul" + +#: ../app/base/base-enums.c:60 +msgctxt "histogram-channel" +msgid "Alpha" +msgstr "Alfa" + +#: ../app/base/base-enums.c:61 +msgctxt "histogram-channel" +msgid "RGB" +msgstr "RGB" + +#: ../app/base/base-enums.c:113 +msgctxt "layer-mode-effects" +msgid "Normal" +msgstr "Normal" + +#: ../app/base/base-enums.c:114 +msgctxt "layer-mode-effects" +msgid "Dissolve" +msgstr "Disolver" + +#: ../app/base/base-enums.c:115 +msgctxt "layer-mode-effects" +msgid "Behind" +msgstr "Detrás" + +#: ../app/base/base-enums.c:116 +msgctxt "layer-mode-effects" +msgid "Multiply" +msgstr "Multiplicar" + +#: ../app/base/base-enums.c:117 +msgctxt "layer-mode-effects" +msgid "Screen" +msgstr "Pantalla" + +#: ../app/base/base-enums.c:118 +msgctxt "layer-mode-effects" +msgid "Overlay" +msgstr "Solapar" + +#: ../app/base/base-enums.c:119 +msgctxt "layer-mode-effects" +msgid "Difference" +msgstr "Diferencia" + +#: ../app/base/base-enums.c:120 +msgctxt "layer-mode-effects" +msgid "Addition" +msgstr "Suma" + +#: ../app/base/base-enums.c:121 +msgctxt "layer-mode-effects" +msgid "Subtract" +msgstr "Sustraer" + +#: ../app/base/base-enums.c:122 +msgctxt "layer-mode-effects" +msgid "Darken only" +msgstr "Oscurecer sólo" + +#: ../app/base/base-enums.c:123 +msgctxt "layer-mode-effects" +msgid "Lighten only" +msgstr "Clarear sólo" + +#: ../app/base/base-enums.c:124 +msgctxt "layer-mode-effects" +msgid "Hue" +msgstr "Tono" + +#: ../app/base/base-enums.c:125 +msgctxt "layer-mode-effects" +msgid "Saturation" +msgstr "Saturación" + +#: ../app/base/base-enums.c:126 +msgctxt "layer-mode-effects" +msgid "Color" +msgstr "Color" + +#: ../app/base/base-enums.c:127 +msgctxt "layer-mode-effects" +msgid "Value" +msgstr "Valor" + +#: ../app/base/base-enums.c:128 +msgctxt "layer-mode-effects" +msgid "Divide" +msgstr "Dividir" + +#: ../app/base/base-enums.c:129 +msgctxt "layer-mode-effects" +msgid "Dodge" +msgstr "Blanquear" + +#: ../app/base/base-enums.c:130 +msgctxt "layer-mode-effects" +msgid "Burn" +msgstr "Ennegrecer" + +#: ../app/base/base-enums.c:131 +msgctxt "layer-mode-effects" +msgid "Hard light" +msgstr "Claridad fuerte" + +#: ../app/base/base-enums.c:132 +msgctxt "layer-mode-effects" +msgid "Soft light" +msgstr "Claridad suave" + +#: ../app/base/base-enums.c:133 +msgctxt "layer-mode-effects" +msgid "Grain extract" +msgstr "Extraer granulado" + +#: ../app/base/base-enums.c:134 +msgctxt "layer-mode-effects" +msgid "Grain merge" +msgstr "Combinar granulado" + +#: ../app/base/base-enums.c:135 +msgctxt "layer-mode-effects" +msgid "Color erase" +msgstr "Borrar color" + +#: ../app/base/base-enums.c:136 +msgctxt "layer-mode-effects" +msgid "Erase" +msgstr "Borrar" + +#: ../app/base/base-enums.c:137 +msgctxt "layer-mode-effects" +msgid "Replace" +msgstr "Reemplazar" + +#: ../app/base/base-enums.c:138 +msgctxt "layer-mode-effects" +msgid "Anti erase" +msgstr "Anti-borrado" + +#: ../app/base/tile-swap.c:710 +msgid "" +"Unable to open swap file. GIMP has run out of memory and cannot use the swap " +"file. Some parts of your images may be corrupted. Try to save your work " +"using different filenames, restart GIMP and check the location of the swap " +"directory in your Preferences." +msgstr "" +"Imposible abrir el archivo de intercambio. GIMP ha agotado toda la memoria y " +"no puede usar el archivo de intercambio. Algunas partes de sus imágenes " +"pueden estar corrompidas. Intente guardar su trabajo usando nombres de " +"archivo diferentes, reinicie GIMP y compruebe la ubicación de la carpeta de " +"intercambio en sus Preferencias." + +#: ../app/base/tile-swap.c:725 +#, c-format +msgid "Failed to resize swap file: %s" +msgstr "Falló al cambiar el tamaño del archivo de intercambio: %s" + +#: ../app/config/config-enums.c:24 +msgctxt "cursor-mode" +msgid "Tool icon" +msgstr "Icono de herramienta" + +#: ../app/config/config-enums.c:25 +msgctxt "cursor-mode" +msgid "Tool icon with crosshair" +msgstr "Icono de herramienta con cruz" + +#: ../app/config/config-enums.c:26 +msgctxt "cursor-mode" +msgid "Crosshair only" +msgstr "Sólo cruz" + +#: ../app/config/config-enums.c:56 +msgctxt "canvas-padding-mode" +msgid "From theme" +msgstr "Del tema" + +#: ../app/config/config-enums.c:57 +msgctxt "canvas-padding-mode" +msgid "Light check color" +msgstr "Color de los cuadros claros" + +#: ../app/config/config-enums.c:58 +msgctxt "canvas-padding-mode" +msgid "Dark check color" +msgstr "Color de los cuadros oscuros" + +#: ../app/config/config-enums.c:59 +msgctxt "canvas-padding-mode" +msgid "Custom color" +msgstr "Color personalizado" + +#: ../app/config/config-enums.c:88 +msgctxt "space-bar-action" +msgid "No action" +msgstr "Sin acción" + +#: ../app/config/config-enums.c:89 +msgctxt "space-bar-action" +msgid "Pan view" +msgstr "Vista panorámica" + +#: ../app/config/config-enums.c:90 +msgctxt "space-bar-action" +msgid "Switch to Move tool" +msgstr "Cambiar a la herramienta Mover" + +#: ../app/config/config-enums.c:118 +msgctxt "zoom-quality" +msgid "Low" +msgstr "Baja" + +#: ../app/config/config-enums.c:119 +msgctxt "zoom-quality" +msgid "High" +msgstr "Alta" + +#: ../app/config/config-enums.c:147 +msgctxt "help-browser-type" +msgid "GIMP help browser" +msgstr "Visor de ayuda de GIMP" + +#: ../app/config/config-enums.c:148 +msgctxt "help-browser-type" +msgid "Web browser" +msgstr "Navegador web" + +#: ../app/config/config-enums.c:177 +msgctxt "window-hint" +msgid "Normal window" +msgstr "Ventana normal" + +#: ../app/config/config-enums.c:178 +msgctxt "window-hint" +msgid "Utility window" +msgstr "Ventana de utilidades" + +#: ../app/config/config-enums.c:179 +msgctxt "window-hint" +msgid "Keep above" +msgstr "Mantener por encima" + +#: ../app/config/config-enums.c:207 +msgctxt "cursor-format" +msgid "Black & white" +msgstr "Blanco y negro" + +#: ../app/config/config-enums.c:208 +msgctxt "cursor-format" +msgid "Fancy" +msgstr "Fantasía" + +#: ../app/config/config-enums.c:236 +msgctxt "handedness" +msgid "Left-handed" +msgstr "Zurdo" + +#: ../app/config/config-enums.c:237 +msgctxt "handedness" +msgid "Right-handed" +msgstr "Diestro" + +#: ../app/config/gimpconfig-file.c:67 ../app/core/gimpbrushgenerated-save.c:62 +#: ../app/core/gimpcurve-save.c:52 ../app/core/gimpgradient-save.c:50 +#: ../app/core/gimpgradient-save.c:144 ../app/core/gimppalette-save.c:56 +#: ../app/gui/themes.c:248 ../app/tools/gimpcurvestool.c:711 +#: ../app/tools/gimplevelstool.c:800 ../app/vectors/gimpvectors-export.c:81 +#: ../app/xcf/xcf.c:452 +#, c-format +msgid "Could not open '%s' for writing: %s" +msgstr "No se ha podido abrir «%s» para escritura: %s" + +#: ../app/config/gimpconfig-file.c:78 ../app/config/gimpconfig-file.c:101 +#, c-format +msgid "Error writing '%s': %s" +msgstr "Ocurrió un error al escribir «%s»: %s" + +#: ../app/config/gimpconfig-file.c:89 +#, c-format +msgid "Error reading '%s': %s" +msgstr "Ocurrió un error al leer «%s»: %s" + +#: ../app/config/gimpconfig-file.c:131 +#, c-format +msgid "" +"There was an error parsing your '%s' file. Default values will be used. A " +"backup of your configuration has been created at '%s'." +msgstr "" +"Ha ocurrido un error analizando su archivo «%s». Se usarán los valores " +"predeterminados. Se ha creado un resguardo de su configuración en «%s»." + +#. Not all strings defined here are used in the user interface +#. * (the preferences dialog mainly) and only those that are should +#. * be marked for translation. +#. +#: ../app/config/gimprc-blurbs.h:13 +msgid "" +"When enabled, an image will become the active image when its image window " +"receives the focus. This is useful for window managers using \"click to focus" +"\"." +msgstr "" +"Cuando está activado, una imagen se convertirá en activa al recibir el foco " +"la ventana de su imagen. Esto es muy útil para los gestores de ventanas que " +"estén utilizando «pulsar para obtener el foco»." + +#: ../app/config/gimprc-blurbs.h:23 ../app/config/gimprc-blurbs.h:28 +msgid "Sets the dynamics search path." +msgstr "Establece la ruta de búsqueda de dinámicas." + +#: ../app/config/gimprc-blurbs.h:33 +msgid "" +"Sets the canvas padding color used if the padding mode is set to custom " +"color." +msgstr "" +"Establece el color de relleno del lienzo usado si el modo de relleno está " +"definido como color personalizado." + +#: ../app/config/gimprc-blurbs.h:37 +msgid "Specifies how the area around the image should be drawn." +msgstr "Especifica cómo debe dibujarse el área alrededor de la imagen." + +#: ../app/config/gimprc-blurbs.h:43 +msgid "How to handle embedded color profiles when opening a file." +msgstr "Cómo tratar los perfiles de color incrustados al abrir un archivo." + +#: ../app/config/gimprc-blurbs.h:46 +msgid "Sets the pixel format to use for mouse pointers." +msgstr "Establece el formato de píxel para los cursores del ratón." + +#: ../app/config/gimprc-blurbs.h:49 +msgid "Sets the type of mouse pointers to use." +msgstr "Establece el tipo de punteros del ratón que usar." + +#: ../app/config/gimprc-blurbs.h:52 +msgid "Sets the handedness for cursor positioning." +msgstr "Fijar el posicionamiento del cursor en modo diestro o zurdo." + +#: ../app/config/gimprc-blurbs.h:55 +msgid "" +"Context-dependent mouse pointers are helpful. They are enabled by default. " +"However, they require overhead that you may want to do without." +msgstr "" +"Los cursores dependientes del contexto son de gran ayuda. Están activados de " +"forma predeterminada. Sin embargo requieren procesamiento extra que quizá " +"usted podría necesitar si no los utiliza." + +#: ../app/config/gimprc-blurbs.h:71 +msgid "" +"When enabled, this will ensure that each pixel of an image gets mapped to a " +"pixel on the screen." +msgstr "" +"Cuando se encuentre activado esto asegurará que cada píxel de una imagen se " +"asigne a un píxel de la pantalla." + +#: ../app/config/gimprc-blurbs.h:93 +msgid "This is the distance in pixels where Guide and Grid snapping activates." +msgstr "" +"Esto es la distancia en píxeles a partir del cual se activa el ajuste a la " +"rejilla y la guía." + +#: ../app/config/gimprc-blurbs.h:109 +msgid "" +"Tools such as fuzzy-select and bucket fill find regions based on a seed-fill " +"algorithm. The seed fill starts at the initially selected pixel and " +"progresses in all directions until the difference of pixel intensity from " +"the original is greater than a specified threshold. This value represents " +"the default threshold." +msgstr "" +"Las herramientas como «Selección difusa» y «Relleno» buscan regiones " +"basándose en un algoritmo de búsqueda de semilla. El relleno de semilla " +"arranca en el píxel seleccionado inicialmente y avanza en todas direcciones " +"hasta que la diferencia de la intensidad del píxel del original es más " +"grande que el umbral especificado. Este valor representa el umbral " +"predeterminado." + +#: ../app/config/gimprc-blurbs.h:122 +msgid "" +"The window type hint that is set on dock windows and the toolbox window. " +"This may affect the way your window manager decorates and handles these " +"windows." +msgstr "" +"La opción de tipo de ventana que se utiliza en las ventanas empotrables y en " +"la ventana de la caja de herramientas. Esto podría afectar la forma en que " +"su gestor de ventanas decora y maneja estas ventanas." + +#: ../app/config/gimprc-blurbs.h:154 +msgid "When enabled, the selected brush will be used for all tools." +msgstr "" +"Cuando esté activado, el pincel seleccionado se usará para todas las " +"herramientas." + +#: ../app/config/gimprc-blurbs.h:157 +msgid "When enabled, the selected dynamics will be used for all tools." +msgstr "" +"Cuando esté activado, se usará la dinámica seleccionada para todas las " +"herramientas." + +#: ../app/config/gimprc-blurbs.h:163 +msgid "When enabled, the selected gradient will be used for all tools." +msgstr "" +"Cuando esté activado, el degradado seleccionado se usará para todas las " +"herramientas." + +#: ../app/config/gimprc-blurbs.h:166 +msgid "When enabled, the selected pattern will be used for all tools." +msgstr "" +"Cuando esté activado, el patrón seleccionado será usado para todas las " +"herramientas." + +#: ../app/config/gimprc-blurbs.h:180 +msgid "Sets the browser used by the help system." +msgstr "Establece el visor que usará el sistema de ayuda." + +#: ../app/config/gimprc-blurbs.h:191 +msgid "Sets the text to appear in image window status bars." +msgstr "" +"Establece el texto que aparecerá en las barras de estado de las ventanas de " +"imágenes." + +#: ../app/config/gimprc-blurbs.h:194 +msgid "Sets the text to appear in image window titles." +msgstr "" +"Establece el texto que aparecerá en los títulos de las ventanas de imágenes." + +#: ../app/config/gimprc-blurbs.h:197 +msgid "" +"When enabled, this will ensure that the full image is visible after a file " +"is opened, otherwise it will be displayed with a scale of 1:1." +msgstr "" +"Cuando se encuentre activado esto asegurará que la imagen se vea completa " +"después de abrirse, de otro modo será mostrada con una escala de 1:1." + +#: ../app/config/gimprc-blurbs.h:201 +msgid "" +"Sets the level of interpolation used for scaling and other transformations." +msgstr "" +"Establece el nivel de interpolación utilizado para el redimensionado y otras " +"transformaciones." + +#: ../app/config/gimprc-blurbs.h:208 +msgid "Specifies the language to use for the user interface." +msgstr "Establecer el idioma de la interfaz de usuario." + +#: ../app/config/gimprc-blurbs.h:211 +msgid "How many recently opened image filenames to keep on the File menu." +msgstr "" +"Cuántos nombres de archivos de imágenes abiertas recientemente se deben " +"mantener en el menú Archivo." + +#: ../app/config/gimprc-blurbs.h:214 +msgid "" +"Speed of marching ants in the selection outline. This value is in " +"milliseconds (less time indicates faster marching)." +msgstr "" +"Velocidad de las hormigas marchantes en el contorno de la selección. Este " +"valor está en milisegundos (menos tiempo indica una marcha mas rápida)." + +#: ../app/config/gimprc-blurbs.h:218 +msgid "" +"GIMP will warn the user if an attempt is made to create an image that would " +"take more memory than the size specified here." +msgstr "" +"GIMP advertirá al usuario si realiza un intento de crear una imagen que " +"podría requerir más memoria que el tamaño especificado aquí." + +#: ../app/config/gimprc-blurbs.h:228 +msgid "" +"Sets the monitor's horizontal resolution, in dots per inch. If set to 0, " +"forces the X server to be queried for both horizontal and vertical " +"resolution information." +msgstr "" +"Establece la resolución horizontal del monitor, en puntos por pulgada. Si se " +"establece a 0, se fuerza una consulta al servidor X para obtener la " +"resolución horizontal y vertical." + +#: ../app/config/gimprc-blurbs.h:233 +msgid "" +"Sets the monitor's vertical resolution, in dots per inch. If set to 0, " +"forces the X server to be queried for both horizontal and vertical " +"resolution information." +msgstr "" +"Establece la resolución vertical del monitor, en puntos por pulgada. Si se " +"establece a 0, se fuerza una consulta al servidor X para obtener la " +"resolución horizontal y vertical." + +#: ../app/config/gimprc-blurbs.h:238 +msgid "" +"If enabled, the move tool sets the edited layer or path as active. This " +"used to be the default behaviour in older versions." +msgstr "" +"Si está activado, la herramienta de movimiento cambia la capa editada o ruta " +"como activa. Esto solía ser el comportamiento predeterminado en las " +"versiones más antiguas." + +#: ../app/config/gimprc-blurbs.h:242 +msgid "" +"Sets the size of the navigation preview available in the lower right corner " +"of the image window." +msgstr "" +"Establece el tamaño de la vista previa de la navegación disponible en la " +"esquina inferior derecha de la ventana de la imagen." + +#: ../app/config/gimprc-blurbs.h:246 +msgid "Sets how many processors GIMP should try to use simultaneously." +msgstr "" +"Establece cuántos procesadores debe intentar usar simultáneamente GIMP." + +#: ../app/config/gimprc-blurbs.h:259 +msgid "" +"When enabled, the X server is queried for the mouse's current position on " +"each motion event, rather than relying on the position hint. This means " +"painting with large brushes should be more accurate, but it may be slower. " +"Conversely, on some X servers enabling this option results in faster " +"painting." +msgstr "" +"Cuando se encuentre activado, se consultará al servidor X por la posición " +"actual del ratón con cada evento de movimiento, en vez de confiar en la " +"pista de posición. Esto significa que pintar con pinceles grandes debería " +"ser más preciso, pero podría ser más lento. Perversamente en algunos " +"servidores X al activarse esta opción se obtiene un pintado más rápido." + +#: ../app/config/gimprc-blurbs.h:275 +msgid "" +"Sets whether GIMP should create previews of layers and channels. Previews in " +"the layers and channels dialog are nice to have but they can slow things " +"down when working with large images." +msgstr "" +"Establece si GIMP debería crear vistas previas de las capas y los canales. " +"Disponer de las vistas previas en el diálogo de capas y canales queda bien, " +"pero puede ralentizar las cosas al trabajar con imágenes grandes." + +#: ../app/config/gimprc-blurbs.h:280 +msgid "" +"Sets the preview size used for layers and channel previews in newly created " +"dialogs." +msgstr "" +"Establece el tamaño de la vista previa usado para las vistas preliminares de " +"las capas y los canales en los diálogos nuevos creados." + +#: ../app/config/gimprc-blurbs.h:284 +msgid "Sets the default quick mask color." +msgstr "Establece el color predeterminado de la máscara rápida." + +#: ../app/config/gimprc-blurbs.h:287 +msgid "" +"When enabled, the image window will automatically resize itself whenever the " +"physical image size changes." +msgstr "" +"Cuando se encuentre activado, la ventana de la imagen se redimensionará " +"automáticamente cuando cambie el tamaño físico de la imagen." + +#: ../app/config/gimprc-blurbs.h:291 +msgid "" +"When enabled, the image window will automatically resize itself when zooming " +"into and out of images." +msgstr "" +"Cuando se encuentre activado, la ventana de la imagen se redimensionará " +"automáticamente al ampliar o reducir las imágenes." + +#: ../app/config/gimprc-blurbs.h:295 +msgid "Let GIMP try to restore your last saved session on each startup." +msgstr "" +"Permitir a GIMP intentar restaurar la última sesión guardada en cada inicio." + +#: ../app/config/gimprc-blurbs.h:298 +msgid "" +"Remember the current tool, pattern, color, and brush across GIMP sessions." +msgstr "" +"Recordar la herramienta, el patrón, el color y los pinceles actuales entre " +"distintas sesiones de GIMP." + +#: ../app/config/gimprc-blurbs.h:302 +msgid "" +"Keep a permanent record of all opened and saved files in the Recent " +"Documents list." +msgstr "" +"Mantener un registro permanente de todos los archivos abiertos y guardados " +"en la lista de documentos recientes." + +#: ../app/config/gimprc-blurbs.h:306 +msgid "Save the positions and sizes of the main dialogs when GIMP exits." +msgstr "" +"Guardar las posiciones y tamaños de los diálogos principales al salir de " +"GIMP." + +#: ../app/config/gimprc-blurbs.h:309 +msgid "Save the tool options when GIMP exits." +msgstr "Guardar las opciones de herramientas al salir de GIMP." + +#: ../app/config/gimprc-blurbs.h:315 +msgid "" +"When enabled, all paint tools will show a preview of the current brush's " +"outline." +msgstr "" +"Cuando está habilitado todas la herramientas de pintura mostrarán una vista " +"previa del contorno de el pincel actual." + +#: ../app/config/gimprc-blurbs.h:319 +msgid "" +"When enabled, dialogs will show a help button that gives access to the " +"related help page. Without this button, the help page can still be reached " +"by pressing F1." +msgstr "" +"Cuando está activado, los diálogos mostrarán un botón de ayuda que da acceso " +"a la página de ayuda relacionada. Sin ese botón, la página de ayuda puede " +"verse al pulsar F1." + +#: ../app/config/gimprc-blurbs.h:324 +msgid "" +"When enabled, the mouse pointer will be shown over the image while using a " +"paint tool." +msgstr "" +"Cuando se encuentre activado, el cursor se mostrará sobre la imagen cuando " +"se use una herramienta de pintura." + +#: ../app/config/gimprc-blurbs.h:328 +msgid "" +"When enabled, the menubar is visible by default. This can also be toggled " +"with the \"View->Show Menubar\" command." +msgstr "" +"Cuando está activado la barra de estado es visible de forma predeterminada. " +"Esto también se puede activar con la instrucción «Ver->Mostrar la barra de " +"estado»." + +#: ../app/config/gimprc-blurbs.h:332 +msgid "" +"When enabled, the rulers are visible by default. This can also be toggled " +"with the \"View->Show Rulers\" command." +msgstr "" +"Cuando está activado las reglas están visibles de forma predeterminada. Esto " +"también se puede activar con la instrucción «Ver->Mostrar las reglas»." + +#: ../app/config/gimprc-blurbs.h:336 +msgid "" +"When enabled, the scrollbars are visible by default. This can also be " +"toggled with the \"View->Show Scrollbars\" command." +msgstr "" +"Cuando está activado las barras de desplazamiento están visibles de forma " +"predeterminada. Esto también se puede activar con la instrucción «Ver-" +">Mostrar las barras de desplazamiento»." + +#: ../app/config/gimprc-blurbs.h:340 +msgid "" +"When enabled, the statusbar is visible by default. This can also be toggled " +"with the \"View->Show Statusbar\" command." +msgstr "" +"Cuando está activado la barra de estado es visible de forma predeterminada. " +"Esto también puede puede activarse con la instrucción «Ver->Mostrar la barra " +"de estado»." + +#: ../app/config/gimprc-blurbs.h:344 +msgid "" +"When enabled, the selection is visible by default. This can also be toggled " +"with the \"View->Show Selection\" command." +msgstr "" +"Cuando está activado la selección es visible de forma predeterminada. Esto " +"también puede activarse con la instrucción «Ver->Mostrar la selección»." + +#: ../app/config/gimprc-blurbs.h:348 +msgid "" +"When enabled, the layer boundary is visible by default. This can also be " +"toggled with the \"View->Show Layer Boundary\" command." +msgstr "" +"Cuando está activado el límite de la capa es visible de forma " +"predeterminada. Esto también puede activarse con la instrucción «Ver-" +">Mostrar el límite de la capa»." + +#: ../app/config/gimprc-blurbs.h:352 +msgid "" +"When enabled, the guides are visible by default. This can also be toggled " +"with the \"View->Show Guides\" command." +msgstr "" +"Cuando está activado las reglas están visibles de forma predeterminada. Esto " +"también puede activarse con la instrucción «Ver->Mostrar las reglas»." + +#: ../app/config/gimprc-blurbs.h:356 +msgid "" +"When enabled, the grid is visible by default. This can also be toggled with " +"the \"View->Show Grid\" command." +msgstr "" +"Cuando está activado la rejilla es visible de forma predeterminada. Esto " +"también puede activarse con la instrucción «Ver->Mostrar la rejilla»." + +#: ../app/config/gimprc-blurbs.h:360 +msgid "" +"When enabled, the sample points are visible by default. This can also be " +"toggled with the \"View->Show Sample Points\" command." +msgstr "" +"Cuando está activado los puntos de muestra están visibles de forma " +"predeterminada. Esto también puede activarse con la instrucción «Ver-" +">Mostrar puntos de muestra»." + +#: ../app/config/gimprc-blurbs.h:364 +msgid "Show a tooltip when the pointer hovers over an item." +msgstr "Presentar una ayuda cuando el puntero pasa por encima de un elemento." + +#: ../app/config/gimprc-blurbs.h:367 +msgid "Use GIMP in a single-window mode." +msgstr "Usar GIMP en modo de ventana única." + +#: ../app/config/gimprc-blurbs.h:370 +msgid "Hide docks and other windows, leaving only image windows." +msgstr "" +"Ocultar empotrables y otras ventanas, dejando únicamente las ventanas de " +"imagen." + +#: ../app/config/gimprc-blurbs.h:373 +msgid "What to do when the space bar is pressed in the image window." +msgstr "" +"Qué hacer cuando la barra espaciadora se pulsa en la ventana de imagen." + +#: ../app/config/gimprc-blurbs.h:376 +msgid "" +"Sets the swap file location. GIMP uses a tile based memory allocation " +"scheme. The swap file is used to quickly and easily swap tiles out to disk " +"and back in. Be aware that the swap file can easily get very large if GIMP " +"is used with large images. Also, things can get horribly slow if the swap " +"file is created on a folder that is mounted over NFS. For these reasons, it " +"may be desirable to put your swap file in \"/tmp\"." +msgstr "" +"Establece la localización del archivo de intercambio. GIMP utiliza un " +"esquema de reserva de memoria basado en mosaicos. El archivo de intercambio " +"se utiliza para intercambiar mosaicos rápida y fácilmente hacia y desde el " +"disco. Tenga en cuenta que el archivo de intercambio puede volverse muy " +"grande fácilmente si GIMP se utiliza con imágenes grandes. Las cosas pueden " +"también ponerse horriblemente lentas si el archivo de intercambio se crea en " +"una carpeta montada sobre NFS. Por estas razones quizá sea conveniente " +"colocar su archivo de intercambio en «/tmp»." + +#: ../app/config/gimprc-blurbs.h:385 +msgid "When enabled, menus can be torn off." +msgstr "Cuando se encuentre activado, los menús podrán ser separados." + +#: ../app/config/gimprc-blurbs.h:388 +msgid "" +"When enabled, you can change keyboard shortcuts for menu items by hitting a " +"key combination while the menu item is highlighted." +msgstr "" +"Cuando está activado puede cambiar las combinaciones de teclas de los " +"elementos del menú presionando una combinación de teclas mientras el " +"elemento del menú está resaltado." + +#: ../app/config/gimprc-blurbs.h:392 +msgid "Save changed keyboard shortcuts when GIMP exits." +msgstr "Guardar las combinaciones de teclas modificadas al salir de GIMP." + +#: ../app/config/gimprc-blurbs.h:395 +msgid "Restore saved keyboard shortcuts on each GIMP startup." +msgstr "" +"Restaurar las combinaciones de teclas guardadas en cada inicio de GIMP." + +#: ../app/config/gimprc-blurbs.h:398 +msgid "" +"Sets the folder for temporary storage. Files will appear here during the " +"course of running GIMP. Most files will disappear when GIMP exits, but some " +"files are likely to remain, so it is best if this folder not be one that is " +"shared by other users." +msgstr "" +"Establece la carpeta de almacenamiento temporal. Los archivos aparecerán " +"aquí durante el curso de ejecución de GIMP. La mayoría de los archivos " +"desaparecerán cuando se salga de GIMP, pero algunos archivos podrían " +"permanecer, por lo tanto es mejor si esta carpeta no está compartida con " +"otros usuarios." + +#: ../app/config/gimprc-blurbs.h:410 +msgid "Sets the size of the thumbnail shown in the Open dialog." +msgstr "" +"Establece el tamaño de la miniatura que se muestra en el diálogo Abrir." + +#: ../app/config/gimprc-blurbs.h:413 +msgid "" +"The thumbnail in the Open dialog will be automatically updated if the file " +"being previewed is smaller than the size set here." +msgstr "" +"La miniatura en el diálogo Abrir será actualizada automáticamente si el " +"archivo que se está previsualizando es más pequeño que el tamaño establecido " +"aquí." + +#: ../app/config/gimprc-blurbs.h:417 +msgid "" +"When the amount of pixel data exceeds this limit, GIMP will start to swap " +"tiles to disk. This is a lot slower but it makes it possible to work on " +"images that wouldn't fit into memory otherwise. If you have a lot of RAM, " +"you may want to set this to a higher value." +msgstr "" +"Cuando la cantidad de datos del píxel excede este límite, GIMP empezará a " +"intercambiar tiles al disco. Esto es muy lento pero hace posible trabajar " +"con imágenes que no cabrían en la memoria de otra forma. Si tiene mucha RAM, " +"quizá quiera poner esto a un valor más alto." + +#: ../app/config/gimprc-blurbs.h:423 +msgid "Show the current foreground and background colors in the toolbox." +msgstr "" +"Mostrar los colores de frente y fondo actuales en la caja de herramientas." + +#: ../app/config/gimprc-blurbs.h:426 +msgid "Show the currently selected brush, pattern and gradient in the toolbox." +msgstr "" +"Mostrar los pinceles, patrones y degradados activos en la caja de " +"herramientas" + +#: ../app/config/gimprc-blurbs.h:429 +msgid "Show the currently active image in the toolbox." +msgstr "Mostrar la imagen activa en la caja de herramientas." + +#: ../app/config/gimprc-blurbs.h:435 +msgid "Sets the manner in which transparency is displayed in images." +msgstr "Establece la forma en que se muestra la transparencia en las imágenes." + +#: ../app/config/gimprc-blurbs.h:438 +msgid "Sets the size of the checkerboard used to display transparency." +msgstr "" +"Establece el tamaño del cuadriculado utilizado para mostrar la transparencia." + +#: ../app/config/gimprc-blurbs.h:441 +msgid "" +"When enabled, GIMP will not save an image if it has not been changed since " +"it was opened." +msgstr "" +"Cuando se encuentre activado GIMP no guardará una imagen si no se ha " +"modificado desde que se abrió." + +#: ../app/config/gimprc-blurbs.h:445 +msgid "" +"Sets the minimal number of operations that can be undone. More undo levels " +"are kept available until the undo-size limit is reached." +msgstr "" +"Establece la cantidad mínima de operaciones que pueden ser desechas. Más " +"niveles de deshacer se mantienen disponibles hasta que se alcanza el límite " +"de niveles de deshacer." + +#: ../app/config/gimprc-blurbs.h:449 +msgid "" +"Sets an upper limit to the memory that is used per image to keep operations " +"on the undo stack. Regardless of this setting, at least as many undo-levels " +"as configured can be undone." +msgstr "" +"Establece el límite superior de la memoria que cada imagen utiliza para " +"guardar las operaciones en la pila de deshacer. Independientemente de esta " +"configuración sólo pueden deshacerse tantos niveles deshacer como este " +"configurado." + +#: ../app/config/gimprc-blurbs.h:454 +msgid "Sets the size of the previews in the Undo History." +msgstr "Obtiene el tamaño de las vistas previas en el Histórico de deshacer." + +#: ../app/config/gimprc-blurbs.h:457 +msgid "When enabled, pressing F1 will open the help browser." +msgstr "Cuando se encuentre activado, pulsando F1 se abrirá el visor de ayuda." + +#: ../app/config/gimprc-deserialize.c:135 ../app/core/gimp-modules.c:136 +#: ../app/core/gimp-units.c:167 ../app/gui/session.c:286 +#: ../app/plug-in/plug-in-rc.c:212 +msgid "fatal parse error" +msgstr "Error fatal de análisis" + +#: ../app/config/gimprc-deserialize.c:163 +#, c-format +msgid "value for token %s is not a valid UTF-8 string" +msgstr "el valor para la señal %s no es una cadena UTF-8 válida" + +#: ../app/core/core-enums.c:54 +msgctxt "convert-dither-type" +msgid "None" +msgstr "Ninguno" + +#: ../app/core/core-enums.c:55 +msgctxt "convert-dither-type" +msgid "Floyd-Steinberg (normal)" +msgstr "Floyd-Steinberg (normal)" + +#: ../app/core/core-enums.c:56 +msgctxt "convert-dither-type" +msgid "Floyd-Steinberg (reduced color bleeding)" +msgstr "Floyd-Steinberg (sangrado de color reducido)" + +#: ../app/core/core-enums.c:57 +msgctxt "convert-dither-type" +msgid "Positioned" +msgstr "Posicionado" + +#: ../app/core/core-enums.c:87 +msgctxt "convert-palette-type" +msgid "Generate optimum palette" +msgstr "Generar paleta óptima" + +#: ../app/core/core-enums.c:88 +msgctxt "convert-palette-type" +msgid "Use web-optimized palette" +msgstr "Usar paleta optimizada para web" + +#: ../app/core/core-enums.c:89 +msgctxt "convert-palette-type" +msgid "Use black and white (1-bit) palette" +msgstr "Usar paleta en blanco y negro (1-bit)" + +#: ../app/core/core-enums.c:90 +msgctxt "convert-palette-type" +msgid "Use custom palette" +msgstr "Usar paleta personal" + +#: ../app/core/core-enums.c:216 +msgctxt "align-reference-type" +msgid "First item" +msgstr "Primer elemento" + +#: ../app/core/core-enums.c:217 +msgctxt "align-reference-type" +msgid "Image" +msgstr "Imagen" + +#: ../app/core/core-enums.c:218 +msgctxt "align-reference-type" +msgid "Selection" +msgstr "Selección" + +#: ../app/core/core-enums.c:219 +msgctxt "align-reference-type" +msgid "Active layer" +msgstr "Capa activa" + +#: ../app/core/core-enums.c:220 +msgctxt "align-reference-type" +msgid "Active channel" +msgstr "Canal activo" + +#: ../app/core/core-enums.c:221 +msgctxt "align-reference-type" +msgid "Active path" +msgstr "Ruta activa" + +#: ../app/core/core-enums.c:253 +msgctxt "fill-type" +msgid "Foreground color" +msgstr "Color de frente" + +#: ../app/core/core-enums.c:254 +msgctxt "fill-type" +msgid "Background color" +msgstr "Color de fondo" + +#: ../app/core/core-enums.c:255 +msgctxt "fill-type" +msgid "White" +msgstr "Blanco" + +#: ../app/core/core-enums.c:256 +msgctxt "fill-type" +msgid "Transparency" +msgstr "Transparencia" + +#: ../app/core/core-enums.c:257 +msgctxt "fill-type" +msgid "Pattern" +msgstr "Patrón" + +#: ../app/core/core-enums.c:258 +msgctxt "fill-type" +msgid "None" +msgstr "Ninguno" + +#: ../app/core/core-enums.c:286 +msgctxt "fill-style" +msgid "Solid color" +msgstr "Color sólido" + +#: ../app/core/core-enums.c:287 +msgctxt "fill-style" +msgid "Pattern" +msgstr "Patrón" + +#: ../app/core/core-enums.c:315 +msgctxt "stroke-method" +msgid "Stroke line" +msgstr "Trazar línea" + +#: ../app/core/core-enums.c:316 +msgctxt "stroke-method" +msgid "Stroke with a paint tool" +msgstr "Trazar utilizando una herramienta de pintura" + +#: ../app/core/core-enums.c:345 +msgctxt "join-style" +msgid "Miter" +msgstr "Mitra" + +#: ../app/core/core-enums.c:346 +msgctxt "join-style" +msgid "Round" +msgstr "Circular" + +#: ../app/core/core-enums.c:347 +msgctxt "join-style" +msgid "Bevel" +msgstr "Biselado" + +#: ../app/core/core-enums.c:376 +msgctxt "cap-style" +msgid "Butt" +msgstr "Cabo" + +#: ../app/core/core-enums.c:377 +msgctxt "cap-style" +msgid "Round" +msgstr "Redondeado" + +#: ../app/core/core-enums.c:378 +msgctxt "cap-style" +msgid "Square" +msgstr "Cuadrado" + +#: ../app/core/core-enums.c:415 +msgctxt "dash-preset" +msgid "Custom" +msgstr "Personalizada" + +#: ../app/core/core-enums.c:416 +msgctxt "dash-preset" +msgid "Line" +msgstr "Línea" + +#: ../app/core/core-enums.c:417 +msgctxt "dash-preset" +msgid "Long dashes" +msgstr "Guiones largos" + +#: ../app/core/core-enums.c:418 +msgctxt "dash-preset" +msgid "Medium dashes" +msgstr "Guiones medianos" + +#: ../app/core/core-enums.c:419 +msgctxt "dash-preset" +msgid "Short dashes" +msgstr "Guiones cortos" + +#: ../app/core/core-enums.c:420 +msgctxt "dash-preset" +msgid "Sparse dots" +msgstr "Puntos espaciados" + +#: ../app/core/core-enums.c:421 +msgctxt "dash-preset" +msgid "Normal dots" +msgstr "Puntos normales" + +#: ../app/core/core-enums.c:422 +msgctxt "dash-preset" +msgid "Dense dots" +msgstr "Puntos densos" + +#: ../app/core/core-enums.c:423 +msgctxt "dash-preset" +msgid "Stipples" +msgstr "Punteados" + +#: ../app/core/core-enums.c:424 +msgctxt "dash-preset" +msgid "Dash, dot" +msgstr "Raya - punto" + +#: ../app/core/core-enums.c:425 +msgctxt "dash-preset" +msgid "Dash, dot, dot" +msgstr "Raya - punto - punto" + +#: ../app/core/core-enums.c:454 +msgctxt "brush-generated-shape" +msgid "Circle" +msgstr "Círculo" + +#: ../app/core/core-enums.c:455 +msgctxt "brush-generated-shape" +msgid "Square" +msgstr "Cuadrado" + +#: ../app/core/core-enums.c:456 +msgctxt "brush-generated-shape" +msgid "Diamond" +msgstr "Rombo" + +#: ../app/core/core-enums.c:485 +msgctxt "orientation-type" +msgid "Horizontal" +msgstr "Horizontal" + +#: ../app/core/core-enums.c:486 +msgctxt "orientation-type" +msgid "Vertical" +msgstr "Vertical" + +#: ../app/core/core-enums.c:487 +msgctxt "orientation-type" +msgid "Unknown" +msgstr "Desconocido" + +#: ../app/core/core-enums.c:518 +msgctxt "item-set" +msgid "None" +msgstr "Ninguno" + +#: ../app/core/core-enums.c:519 +msgctxt "item-set" +msgid "All layers" +msgstr "Todas las capas" + +#: ../app/core/core-enums.c:520 +msgctxt "item-set" +msgid "Image-sized layers" +msgstr "Capas del tamaño de la imagen" + +#: ../app/core/core-enums.c:521 +msgctxt "item-set" +msgid "All visible layers" +msgstr "Todas las capas visibles" + +#: ../app/core/core-enums.c:522 +msgctxt "item-set" +msgid "All linked layers" +msgstr "Todas las capas enlazadas" + +#: ../app/core/core-enums.c:588 +msgctxt "view-size" +msgid "Tiny" +msgstr "Diminuto" + +#: ../app/core/core-enums.c:589 +msgctxt "view-size" +msgid "Very small" +msgstr "Muy pequeño" + +#: ../app/core/core-enums.c:590 +msgctxt "view-size" +msgid "Small" +msgstr "Pequeño" + +#: ../app/core/core-enums.c:591 +msgctxt "view-size" +msgid "Medium" +msgstr "Mediano" + +#: ../app/core/core-enums.c:592 +msgctxt "view-size" +msgid "Large" +msgstr "Grande" + +#: ../app/core/core-enums.c:593 +msgctxt "view-size" +msgid "Very large" +msgstr "Muy grande" + +#: ../app/core/core-enums.c:594 +msgctxt "view-size" +msgid "Huge" +msgstr "Enorme" + +#: ../app/core/core-enums.c:595 +msgctxt "view-size" +msgid "Enormous" +msgstr "Monumental" + +#: ../app/core/core-enums.c:596 +msgctxt "view-size" +msgid "Gigantic" +msgstr "Gigantesco" + +#: ../app/core/core-enums.c:624 +msgctxt "view-type" +msgid "View as list" +msgstr "Ver como lista" + +#: ../app/core/core-enums.c:625 +msgctxt "view-type" +msgid "View as grid" +msgstr "Ver como rejilla" + +#: ../app/core/core-enums.c:654 +msgctxt "thumbnail-size" +msgid "No thumbnails" +msgstr "Sin miniaturas" + +#: ../app/core/core-enums.c:655 +msgctxt "thumbnail-size" +msgid "Normal (128x128)" +msgstr "Normal (128x128)" + +#: ../app/core/core-enums.c:656 +msgctxt "thumbnail-size" +msgid "Large (256x256)" +msgstr "Grande (256x256)" + +#: ../app/core/core-enums.c:833 +msgctxt "undo-type" +msgid "<>" +msgstr "<>" + +#: ../app/core/core-enums.c:834 +msgctxt "undo-type" +msgid "Scale image" +msgstr "Escalar la imagen" + +#: ../app/core/core-enums.c:835 +msgctxt "undo-type" +msgid "Resize image" +msgstr "Redimensionar imagen" + +#: ../app/core/core-enums.c:836 +msgctxt "undo-type" +msgid "Flip image" +msgstr "Voltear la imagen" + +#: ../app/core/core-enums.c:837 +msgctxt "undo-type" +msgid "Rotate image" +msgstr "Rotar la imagen" + +#: ../app/core/core-enums.c:838 +msgctxt "undo-type" +msgid "Crop image" +msgstr "Recortar la imagen" + +#: ../app/core/core-enums.c:839 +msgctxt "undo-type" +msgid "Convert image" +msgstr "Convertir la imagen" + +#: ../app/core/core-enums.c:840 +msgctxt "undo-type" +msgid "Remove item" +msgstr "Eliminar el elemento" + +#: ../app/core/core-enums.c:841 +msgctxt "undo-type" +msgid "Merge layers" +msgstr "Combinar capas" + +#: ../app/core/core-enums.c:842 +msgctxt "undo-type" +msgid "Merge paths" +msgstr "Combinar rutas" + +#: ../app/core/core-enums.c:843 +msgctxt "undo-type" +msgid "Quick Mask" +msgstr "Máscara rápida" + +#: ../app/core/core-enums.c:844 ../app/core/core-enums.c:874 +#: ../app/core/gimpimage-grid.c:63 +msgctxt "undo-type" +msgid "Grid" +msgstr "Rejilla" + +#: ../app/core/core-enums.c:845 ../app/core/core-enums.c:876 +msgctxt "undo-type" +msgid "Guide" +msgstr "Guía" + +#: ../app/core/core-enums.c:846 ../app/core/core-enums.c:877 +msgctxt "undo-type" +msgid "Sample Point" +msgstr "Punto de muestra" + +#: ../app/core/core-enums.c:847 ../app/core/core-enums.c:878 +msgctxt "undo-type" +msgid "Layer/Channel" +msgstr "Capa/canal" + +#: ../app/core/core-enums.c:848 ../app/core/core-enums.c:879 +msgctxt "undo-type" +msgid "Layer/Channel modification" +msgstr "Modificación de capa o canal" + +#: ../app/core/core-enums.c:849 ../app/core/core-enums.c:880 +msgctxt "undo-type" +msgid "Selection mask" +msgstr "Máscara de selección" + +#: ../app/core/core-enums.c:850 ../app/core/core-enums.c:884 +msgctxt "undo-type" +msgid "Item visibility" +msgstr "Visibilidad del elemento" + +#: ../app/core/core-enums.c:851 ../app/core/core-enums.c:885 +msgctxt "undo-type" +msgid "Link/Unlink item" +msgstr "Enlazar o desenlazar elemento" + +#: ../app/core/core-enums.c:852 +msgctxt "undo-type" +msgid "Item properties" +msgstr "Propiedades del elemento" + +#: ../app/core/core-enums.c:853 ../app/core/core-enums.c:883 +msgctxt "undo-type" +msgid "Move item" +msgstr "Mover el elemento" + +#: ../app/core/core-enums.c:854 +msgctxt "undo-type" +msgid "Scale item" +msgstr "Escalar elemento" + +#: ../app/core/core-enums.c:855 +msgctxt "undo-type" +msgid "Resize item" +msgstr "Redimensionar elemento" + +#: ../app/core/core-enums.c:856 +msgctxt "undo-type" +msgid "Add layer" +msgstr "Añadir capa" + +#: ../app/core/core-enums.c:857 ../app/core/core-enums.c:896 +msgctxt "undo-type" +msgid "Add layer mask" +msgstr "Añadir máscara de capa" + +#: ../app/core/core-enums.c:858 ../app/core/core-enums.c:898 +msgctxt "undo-type" +msgid "Apply layer mask" +msgstr "Aplicar máscara de capa" + +#: ../app/core/core-enums.c:859 ../app/core/core-enums.c:906 +msgctxt "undo-type" +msgid "Floating selection to layer" +msgstr "Selección flotante a capa" + +#: ../app/core/core-enums.c:860 +msgctxt "undo-type" +msgid "Float selection" +msgstr "Selección flotante" + +#: ../app/core/core-enums.c:861 +msgctxt "undo-type" +msgid "Anchor floating selection" +msgstr "Anclar la selección flotante" + +#: ../app/core/core-enums.c:862 ../app/core/gimp-edit.c:293 +msgctxt "undo-type" +msgid "Paste" +msgstr "Pegar" + +#: ../app/core/core-enums.c:863 ../app/core/gimp-edit.c:534 +msgctxt "undo-type" +msgid "Cut" +msgstr "Cortar" + +#: ../app/core/core-enums.c:864 +msgctxt "undo-type" +msgid "Text" +msgstr "Texto" + +#: ../app/core/core-enums.c:865 ../app/core/core-enums.c:907 +#: ../app/core/gimpdrawable-transform.c:589 +msgctxt "undo-type" +msgid "Transform" +msgstr "Transformar" + +#: ../app/core/core-enums.c:866 ../app/core/core-enums.c:908 +msgctxt "undo-type" +msgid "Paint" +msgstr "Pintar" + +#: ../app/core/core-enums.c:867 ../app/core/core-enums.c:911 +msgctxt "undo-type" +msgid "Attach parasite" +msgstr "Adjuntar parásito" + +#: ../app/core/core-enums.c:868 ../app/core/core-enums.c:912 +msgctxt "undo-type" +msgid "Remove parasite" +msgstr "Eliminar parásito" + +#: ../app/core/core-enums.c:869 +msgctxt "undo-type" +msgid "Import paths" +msgstr "Importar rutas" + +#: ../app/core/core-enums.c:870 +msgctxt "undo-type" +msgid "Plug-In" +msgstr "Complemento" + +#: ../app/core/core-enums.c:871 +msgctxt "undo-type" +msgid "Image type" +msgstr "Tipo de imagen" + +#: ../app/core/core-enums.c:872 +msgctxt "undo-type" +msgid "Image size" +msgstr "Tamaño de la imagen" + +#: ../app/core/core-enums.c:873 +msgctxt "undo-type" +msgid "Image resolution change" +msgstr "Cambio de resolución de la imagen" + +#: ../app/core/core-enums.c:875 +msgctxt "undo-type" +msgid "Change indexed palette" +msgstr "Cambiar la paleta indexada" + +#: ../app/core/core-enums.c:881 +msgctxt "undo-type" +msgid "Reorder item" +msgstr "Reordenar elemento" + +#: ../app/core/core-enums.c:882 +msgctxt "undo-type" +msgid "Rename item" +msgstr "Renombrar elemento" + +#: ../app/core/core-enums.c:886 +msgctxt "undo-type" +msgid "New layer" +msgstr "Capa nueva" + +#: ../app/core/core-enums.c:887 +msgctxt "undo-type" +msgid "Delete layer" +msgstr "Borra la capa" + +#: ../app/core/core-enums.c:888 +msgctxt "undo-type" +msgid "Set layer mode" +msgstr "Definir el modo de la capa" + +#: ../app/core/core-enums.c:889 +msgctxt "undo-type" +msgid "Set layer opacity" +msgstr "Definir la opacidad de la capa" + +#: ../app/core/core-enums.c:890 +msgctxt "undo-type" +msgid "Lock/Unlock alpha channel" +msgstr "Bloquear o desbloquear el canal Alfa" + +#: ../app/core/core-enums.c:891 +msgctxt "undo-type" +msgid "Suspend group layer resize" +msgstr "Suspender el redimensionamiento del grupo de capas" + +#: ../app/core/core-enums.c:892 +msgctxt "undo-type" +msgid "Resume group layer resize" +msgstr "Reanudar el redimensionamiento del gurpo de capas" + +#: ../app/core/core-enums.c:893 +msgctxt "undo-type" +msgid "Convert group layer" +msgstr "Convertir el grupo de capas" + +#: ../app/core/core-enums.c:894 +msgctxt "undo-type" +msgid "Text layer" +msgstr "Capa de texto" + +#: ../app/core/core-enums.c:895 +msgctxt "undo-type" +msgid "Text layer modification" +msgstr "Modificación de la capa de texto" + +#: ../app/core/core-enums.c:897 +msgctxt "undo-type" +msgid "Delete layer mask" +msgstr "Eliminar máscara de capa" + +#: ../app/core/core-enums.c:899 +msgctxt "undo-type" +msgid "Show layer mask" +msgstr "Mostrar máscara de capa" + +#: ../app/core/core-enums.c:900 +msgctxt "undo-type" +msgid "New channel" +msgstr "Nuevo canal" + +#: ../app/core/core-enums.c:901 +msgctxt "undo-type" +msgid "Delete channel" +msgstr "Borra el canal" + +#: ../app/core/core-enums.c:902 +msgctxt "undo-type" +msgid "Channel color" +msgstr "Color del canal" + +#: ../app/core/core-enums.c:903 +msgctxt "undo-type" +msgid "New path" +msgstr "Nueva ruta" + +#: ../app/core/core-enums.c:904 +msgctxt "undo-type" +msgid "Delete path" +msgstr "Eliminar ruta" + +#: ../app/core/core-enums.c:905 +msgctxt "undo-type" +msgid "Path modification" +msgstr "Modificación de la ruta" + +#: ../app/core/core-enums.c:909 +msgctxt "undo-type" +msgid "Ink" +msgstr "Tinta" + +#: ../app/core/core-enums.c:910 +msgctxt "undo-type" +msgid "Select foreground" +msgstr "Seleccionar primer plano" + +#: ../app/core/core-enums.c:913 +msgctxt "undo-type" +msgid "Not undoable" +msgstr "No se puede deshacer" + +#: ../app/core/core-enums.c:1187 +msgctxt "select-criterion" +msgid "Composite" +msgstr "Compuesto" + +#: ../app/core/core-enums.c:1188 +msgctxt "select-criterion" +msgid "Red" +msgstr "Rojo" + +#: ../app/core/core-enums.c:1189 +msgctxt "select-criterion" +msgid "Green" +msgstr "Verde" + +#: ../app/core/core-enums.c:1190 +msgctxt "select-criterion" +msgid "Blue" +msgstr "Azul" + +#: ../app/core/core-enums.c:1191 +msgctxt "select-criterion" +msgid "Hue" +msgstr "Tono" + +#: ../app/core/core-enums.c:1192 +msgctxt "select-criterion" +msgid "Saturation" +msgstr "Saturación" + +#: ../app/core/core-enums.c:1193 +msgctxt "select-criterion" +msgid "Value" +msgstr "Valor" + +#: ../app/core/core-enums.c:1222 +msgctxt "message-severity" +msgid "Message" +msgstr "Mensaje" + +#: ../app/core/core-enums.c:1223 +msgctxt "message-severity" +msgid "Warning" +msgstr "Advertencia" + +#: ../app/core/core-enums.c:1224 +msgctxt "message-severity" +msgid "Error" +msgstr "Error" + +#: ../app/core/core-enums.c:1253 +msgctxt "color-profile-policy" +msgid "Ask what to do" +msgstr "Preguntar qué hacer" + +#: ../app/core/core-enums.c:1254 +msgctxt "color-profile-policy" +msgid "Keep embedded profile" +msgstr "Conservar perfil incrustado" + +#: ../app/core/core-enums.c:1255 +msgctxt "color-profile-policy" +msgid "Convert to RGB workspace" +msgstr "Convertir al espacio de colores RGB" + +#: ../app/core/core-enums.c:1292 +msgctxt "dynamics-output-type" +msgid "Opacity" +msgstr "Opacidad" + +#: ../app/core/core-enums.c:1293 +msgctxt "dynamics-output-type" +msgid "Size" +msgstr "Tamaño" + +#: ../app/core/core-enums.c:1294 +msgctxt "dynamics-output-type" +msgid "Angle" +msgstr "Ángulo" + +#: ../app/core/core-enums.c:1295 +msgctxt "dynamics-output-type" +msgid "Color" +msgstr "Color" + +#: ../app/core/core-enums.c:1296 +msgctxt "dynamics-output-type" +msgid "Hardness" +msgstr "Dureza" + +#: ../app/core/core-enums.c:1297 +msgctxt "dynamics-output-type" +msgid "Force" +msgstr "Fuerza" + +#: ../app/core/core-enums.c:1298 +msgctxt "dynamics-output-type" +msgid "Aspect ratio" +msgstr "Proporción de aspecto" + +#: ../app/core/core-enums.c:1299 +msgctxt "dynamics-output-type" +msgid "Spacing" +msgstr "Espaciado" + +#: ../app/core/core-enums.c:1300 +msgctxt "dynamics-output-type" +msgid "Rate" +msgstr "Tasa" + +#: ../app/core/core-enums.c:1301 +msgctxt "dynamics-output-type" +msgid "Flow" +msgstr "Flujo" + +#: ../app/core/core-enums.c:1302 +msgctxt "dynamics-output-type" +msgid "Jitter" +msgstr "Vibración" + +#: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:375 +#: ../app/gui/session.c:408 ../app/menus/menus.c:466 +#: ../app/widgets/gimpdevices.c:208 +#, c-format +msgid "Deleting \"%s\" failed: %s" +msgstr "El borrado de «%s» ha fallado: %s" + +#: ../app/core/gimp-edit.c:190 ../app/core/gimpimage-new.c:309 +msgid "Pasted Layer" +msgstr "Capa pegada" + +#: ../app/core/gimp-edit.c:420 +msgctxt "undo-type" +msgid "Clear" +msgstr "Limpiar" + +#: ../app/core/gimp-edit.c:439 +msgctxt "undo-type" +msgid "Fill with Foreground Color" +msgstr "Rellenar con el color del frente" + +#: ../app/core/gimp-edit.c:443 +msgctxt "undo-type" +msgid "Fill with Background Color" +msgstr "Rellenar con el color del fondo" + +#: ../app/core/gimp-edit.c:447 +msgctxt "undo-type" +msgid "Fill with White" +msgstr "Rellenar con blanco" + +#: ../app/core/gimp-edit.c:451 +msgctxt "undo-type" +msgid "Fill with Transparency" +msgstr "Rellenar con transparencia" + +#: ../app/core/gimp-edit.c:455 +msgctxt "undo-type" +msgid "Fill with Pattern" +msgstr "Rellenar con un patrón" + +#: ../app/core/gimp-edit.c:547 +msgid "Global Buffer" +msgstr "Búfer global" + +#: ../app/core/gimp-gradients.c:62 +msgid "FG to BG (RGB)" +msgstr "Frente a fondo (RGB)" + +#: ../app/core/gimp-gradients.c:70 +msgid "FG to BG (Hardedge)" +msgstr "Frente a fondo (bordes duros)" + +#: ../app/core/gimp-gradients.c:87 +msgid "FG to BG (HSV counter-clockwise)" +msgstr "Frente a fondo (HSV en sentido antihorario)" + +#: ../app/core/gimp-gradients.c:95 +msgid "FG to BG (HSV clockwise hue)" +msgstr "Frente a fondo (HSV tono en sentido horario)" + +#: ../app/core/gimp-gradients.c:103 +msgid "FG to Transparent" +msgstr "Frente a transparente" + +#. This is a special string to specify the language identifier to +#. * look for in the gimp-tags-default.xml file. Please translate the +#. * C in it according to the name of the po file used for +#. * gimp-tags-default.xml. E.g. lithuanian for the translation, +#. * that would be "tags-locale:lt". +#. +#: ../app/core/gimp-tags.c:88 +msgid "tags-locale:C" +msgstr "tags-locale:es" + +#: ../app/core/gimp-user-install.c:203 +#, c-format +msgid "" +"It seems you have used GIMP %s before. GIMP will now migrate your user " +"settings to '%s'." +msgstr "" +"Parece que ha usado GIMP %s antes. GIMP migrará sus ajustes de usuario a " +"«%s»." + +#: ../app/core/gimp-user-install.c:208 +#, c-format +msgid "" +"It appears that you are using GIMP for the first time. GIMP will now create " +"a folder named '%s' and copy some files to it." +msgstr "" +"Parece que está usando GIMP por primera vez. GIMP creará ahora una carpeta " +"llamada «%s» y copiará algunos archivos en ella." + +#: ../app/core/gimp-user-install.c:359 +#, c-format +msgid "Copying file '%s' from '%s'..." +msgstr "Copiando el archivo «%s» desde «%s»…" + +#: ../app/core/gimp-user-install.c:374 ../app/core/gimp-user-install.c:400 +#, c-format +msgid "Creating folder '%s'..." +msgstr "Creando la carpeta «%s»…" + +#: ../app/core/gimp-user-install.c:385 ../app/core/gimp-user-install.c:411 +#, c-format +msgid "Cannot create folder '%s': %s" +msgstr "No se puede crear la carpeta «%s»: %s" + +#: ../app/core/gimp.c:595 +msgid "Initialization" +msgstr "Inicialización" + +#. register all internal procedures +#: ../app/core/gimp.c:696 +msgid "Internal Procedures" +msgstr "Procedimientos internos" + +#. initialize the global parasite table +#: ../app/core/gimp.c:947 +msgid "Looking for data files" +msgstr "Buscando archivos de datos" + +#: ../app/core/gimp.c:947 +msgid "Parasites" +msgstr "Parásitos" + +#. initialize the list of gimp dynamics +#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2787 +#: ../app/tools/gimppaintoptions-gui.c:201 +msgid "Dynamics" +msgstr "Dinámica" + +#. initialize the list of fonts +#: ../app/core/gimp.c:976 +msgid "Fonts (this may take a while)" +msgstr "Tipografías (esto puede tardar un rato)" + +#. initialize the module list +#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2819 +msgid "Modules" +msgstr "Módulos" + +#. update tag cache +#: ../app/core/gimp.c:997 +msgid "Updating tag cache" +msgstr "Actualizar la caché de etiquetas" + +#: ../app/core/gimpbrush-load.c:180 +#, c-format +msgid "Could not read %d byte from '%s': %s" +msgid_plural "Could not read %d bytes from '%s': %s" +msgstr[0] "No se pudo leer %d byte de «%s»: %s" +msgstr[1] "No se pudieron leer %d byte de «%s»: %s" + +#: ../app/core/gimpbrush-load.c:202 +#, c-format +msgid "Fatal parse error in brush file '%s': Width = 0." +msgstr "Error fatal de análisis en el archivo de pincel «%s»: anchura = 0." + +#: ../app/core/gimpbrush-load.c:211 +#, c-format +msgid "Fatal parse error in brush file '%s': Height = 0." +msgstr "Error fatal de análisis en el archivo de pincel «%s»: altura = 0." + +#: ../app/core/gimpbrush-load.c:220 +#, c-format +msgid "Fatal parse error in brush file '%s': Bytes = 0." +msgstr "Error fatal de análisis en el archivo de pincel «%s»: bytes = 0." + +#: ../app/core/gimpbrush-load.c:244 +#, c-format +msgid "Fatal parse error in brush file '%s': Unknown depth %d." +msgstr "" +"Error fatal de análisis en el archivo de pincel «%s»: profundidad " +"desconocida %d." + +#: ../app/core/gimpbrush-load.c:257 +#, c-format +msgid "Fatal parse error in brush file '%s': Unknown version %d." +msgstr "" +"Error fatal de análisis en el archivo de pincel «%s»: versión desconocida %d." + +#: ../app/core/gimpbrush-load.c:273 ../app/core/gimpbrush-load.c:410 +#: ../app/core/gimpbrush-load.c:626 ../app/core/gimpbrush-load.c:700 +#: ../app/core/gimpbrush-load.c:763 ../app/core/gimpbrush-load.c:779 +#: ../app/core/gimpbrush-load.c:822 +#, c-format +msgid "Fatal parse error in brush file '%s': File appears truncated." +msgstr "" +"Error fatal de análisis en el archivo de pincel «%s»: el archivo parece " +"estar truncado." + +#: ../app/core/gimpbrush-load.c:281 ../app/core/gimpbrushgenerated-load.c:128 +#: ../app/core/gimpbrushpipe-load.c:97 +#, c-format +msgid "Invalid UTF-8 string in brush file '%s'." +msgstr "Cadena UTF-8 no válida en el archivo de pincel «%s»." + +#: ../app/core/gimpbrush-load.c:288 ../app/core/gimppattern-load.c:146 +#: ../app/dialogs/template-options-dialog.c:83 +#: ../app/tools/gimpvectortool.c:317 +msgid "Unnamed" +msgstr "Sin nombre" + +#: ../app/core/gimpbrush-load.c:354 +#, c-format +msgid "" +"Fatal parse error in brush file '%s': Unsupported brush depth %d\n" +"GIMP brushes must be GRAY or RGBA.\n" +"This might be an obsolete GIMP brush file, try loading it as image and save " +"it again." +msgstr "" +"Error fatal de análisis en el archivo de pincel «%s»: profundidad de pincel " +"no soportada %d\n" +"Los pinceles de GIMP deben ser GRAY o RGBA.\n" +"Es posible que sea un archivo de pincel de GIMP obsoleto; pruebe a cargarlo " +"como imagen y a guardarlo otra vez." + +#: ../app/core/gimpbrush-load.c:399 +#, c-format +msgid "" +"Fatal parse error in brush file '%s': Unsupported brush depth %d\n" +"GIMP brushes must be GRAY or RGBA." +msgstr "" +"Error fatal de análisis en el archivo de pincel «%s»: profundidad de pincel " +"no soportado %d\n" +"Los pinceles de GIMP deben ser GRAY (GRISES) o RGBA." + +#: ../app/core/gimpbrush-load.c:471 ../app/core/gimpbrush-load.c:909 +#, c-format +msgid "" +"Fatal parse error in brush file '%s': unable to decode abr format version %d." +msgstr "" +"Error fatal de análisis en el archivo de pincel «%s»: imposible decodificar " +"el formato abr versión %d." + +#: ../app/core/gimpbrush-load.c:647 +#, c-format +msgid "Fatal parse error in brush file '%s': Wide brushes are not supported." +msgstr "" +"Error fatal de análisis en el archivo de pincel «%s»: no están soportados " +"los pinceles anchos." + +#: ../app/core/gimpbrush.c:148 +msgid "Brush Spacing" +msgstr "Espaciado del pincel" + +#: ../app/core/gimpbrushgenerated-load.c:87 +#, c-format +msgid "Fatal parse error in brush file '%s': Not a GIMP brush file." +msgstr "" +"Error fatal de análisis: en el archivo de pincel «%s»: no es un archivo de " +"pincel de GIMP." + +#: ../app/core/gimpbrushgenerated-load.c:104 +#, c-format +msgid "" +"Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d." +msgstr "" +"Error fatal de análisis en el archivo de pincel «%s»: versión de pincel de " +"GIMP desconocida en la línea %d." + +#: ../app/core/gimpbrushgenerated-load.c:150 +#, c-format +msgid "" +"Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d." +msgstr "" +"Error fatal de análisis en el archivo de pincel «%s»: forma de pincel de " +"GIMP desconocida en la línea %d." + +#: ../app/core/gimpbrushgenerated-load.c:226 +#, c-format +msgid "Line %d: %s" +msgstr "Línea %d: %s" + +#: ../app/core/gimpbrushgenerated-load.c:228 +#, c-format +msgid "File is truncated in line %d" +msgstr "El archivo está truncado en la línea %d" + +#: ../app/core/gimpbrushgenerated-load.c:231 +#, c-format +msgid "Error while reading brush file '%s': %s" +msgstr "Ocurrió un error al leer el archivo de pincel «%s»: %s" + +#: ../app/core/gimpbrushgenerated.c:129 +msgid "Brush Shape" +msgstr "Forma del pincel" + +#: ../app/core/gimpbrushgenerated.c:137 +msgid "Brush Radius" +msgstr "Radio del pincel" + +#: ../app/core/gimpbrushgenerated.c:144 +msgid "Brush Spikes" +msgstr "Puntas del pincel" + +#: ../app/core/gimpbrushgenerated.c:151 +msgid "Brush Hardness" +msgstr "Dureza del pincel" + +#: ../app/core/gimpbrushgenerated.c:159 ../app/paint/gimppaintoptions.c:151 +msgid "Brush Aspect Ratio" +msgstr "Proporción de aspecto del pincel" + +#: ../app/core/gimpbrushgenerated.c:166 ../app/paint/gimppaintoptions.c:155 +msgid "Brush Angle" +msgstr "Ángulo del pincel" + +#: ../app/core/gimpbrushpipe-load.c:113 ../app/core/gimpbrushpipe-load.c:133 +#, c-format +msgid "Fatal parse error in brush file '%s': File is corrupt." +msgstr "" +"Error fatal de análisis en el archivo de pincel «%s»: el archivo está " +"corrupto." + +#: ../app/core/gimpchannel-select.c:60 +msgctxt "undo-type" +msgid "Rectangle Select" +msgstr "Selección rectangular" + +#: ../app/core/gimpchannel-select.c:111 +msgctxt "undo-type" +msgid "Ellipse Select" +msgstr "Selección elíptica" + +#: ../app/core/gimpchannel-select.c:165 +msgctxt "undo-type" +msgid "Rounded Rectangle Select" +msgstr "Selección rectangular redondeada" + +#: ../app/core/gimpchannel-select.c:407 ../app/core/gimplayer.c:275 +msgctxt "undo-type" +msgid "Alpha to Selection" +msgstr "Alfa a selección" + +#: ../app/core/gimpchannel-select.c:445 +#, c-format +msgctxt "undo-type" +msgid "%s Channel to Selection" +msgstr "Canal %s a selección" + +#: ../app/core/gimpchannel-select.c:493 +msgctxt "undo-type" +msgid "Fuzzy Select" +msgstr "Selección difusa" + +#: ../app/core/gimpchannel-select.c:540 +msgctxt "undo-type" +msgid "Select by Color" +msgstr "Seleccionar por color" + +#: ../app/core/gimpchannel.c:273 +msgctxt "undo-type" +msgid "Rename Channel" +msgstr "Renombrar el canal" + +#: ../app/core/gimpchannel.c:274 +msgctxt "undo-type" +msgid "Move Channel" +msgstr "Mover el canal" + +#: ../app/core/gimpchannel.c:275 +msgctxt "undo-type" +msgid "Scale Channel" +msgstr "Escalar el canal" + +#: ../app/core/gimpchannel.c:276 +msgctxt "undo-type" +msgid "Resize Channel" +msgstr "Redimensionar el canal" + +#: ../app/core/gimpchannel.c:277 +msgctxt "undo-type" +msgid "Flip Channel" +msgstr "Voltear el canal" + +#: ../app/core/gimpchannel.c:278 +msgctxt "undo-type" +msgid "Rotate Channel" +msgstr "Rotar el canal" + +#: ../app/core/gimpchannel.c:279 ../app/core/gimpdrawable-transform.c:904 +msgctxt "undo-type" +msgid "Transform Channel" +msgstr "Transformar el canal" + +#: ../app/core/gimpchannel.c:280 +msgctxt "undo-type" +msgid "Stroke Channel" +msgstr "Impresionar el canal" + +#: ../app/core/gimpchannel.c:281 ../app/core/gimpselection.c:582 +msgctxt "undo-type" +msgid "Channel to Selection" +msgstr "Canal a selección" + +#: ../app/core/gimpchannel.c:282 +msgctxt "undo-type" +msgid "Reorder Channel" +msgstr "Reordenar el canal" + +#: ../app/core/gimpchannel.c:283 +msgctxt "undo-type" +msgid "Raise Channel" +msgstr "Elevar el canal" + +#: ../app/core/gimpchannel.c:284 +msgctxt "undo-type" +msgid "Raise Channel to Top" +msgstr "Elevar el canal hasta lo alto" + +#: ../app/core/gimpchannel.c:285 +msgctxt "undo-type" +msgid "Lower Channel" +msgstr "Bajar el canal" + +#: ../app/core/gimpchannel.c:286 +msgctxt "undo-type" +msgid "Lower Channel to Bottom" +msgstr "Bajar el canal hasta lo más bajo" + +#: ../app/core/gimpchannel.c:287 +msgid "Channel cannot be raised higher." +msgstr "El canal no puede ser elevado más alto." + +#: ../app/core/gimpchannel.c:288 +msgid "Channel cannot be lowered more." +msgstr "El canal no puede descender más." + +#: ../app/core/gimpchannel.c:310 +msgctxt "undo-type" +msgid "Feather Channel" +msgstr "Difuminar el canal" + +#: ../app/core/gimpchannel.c:311 +msgctxt "undo-type" +msgid "Sharpen Channel" +msgstr "Canal de perfilado" + +#: ../app/core/gimpchannel.c:312 +msgctxt "undo-type" +msgid "Clear Channel" +msgstr "Limpiar el canal" + +#: ../app/core/gimpchannel.c:313 +msgctxt "undo-type" +msgid "Fill Channel" +msgstr "Rellenar el canal" + +#: ../app/core/gimpchannel.c:314 +msgctxt "undo-type" +msgid "Invert Channel" +msgstr "Invertir el canal" + +#: ../app/core/gimpchannel.c:315 +msgctxt "undo-type" +msgid "Border Channel" +msgstr "Bordear el canal" + +#: ../app/core/gimpchannel.c:316 +msgctxt "undo-type" +msgid "Grow Channel" +msgstr "Agrandar el canal" + +#: ../app/core/gimpchannel.c:317 +msgctxt "undo-type" +msgid "Shrink Channel" +msgstr "Achicar el canal" + +#: ../app/core/gimpchannel.c:731 +msgid "Cannot stroke empty channel." +msgstr "No se puede trazar un canal vacío." + +#: ../app/core/gimpchannel.c:1763 +msgctxt "undo-type" +msgid "Set Channel Color" +msgstr "Definir el color del canal" + +#: ../app/core/gimpchannel.c:1829 +msgctxt "undo-type" +msgid "Set Channel Opacity" +msgstr "Definir la opacidad del canal" + +#: ../app/core/gimpchannel.c:1937 ../app/core/gimpselection.c:154 +msgid "Selection Mask" +msgstr "Máscara de selección" + +#: ../app/core/gimpcontext.c:639 ../app/tools/gimppaintoptions-gui.c:109 +#: ../app/widgets/gimpbrushselect.c:177 ../app/widgets/gimplayertreeview.c:284 +msgid "Opacity" +msgstr "Opacidad" + +#: ../app/core/gimpcontext.c:647 +msgid "Paint Mode" +msgstr "Modo de pintura" + +#: ../app/core/gimpdata.c:690 +#, c-format +msgid "Could not delete '%s': %s" +msgstr "No se ha podido eliminar «%s»: %s" + +#: ../app/core/gimpdatafactory.c:445 ../app/core/gimpdatafactory.c:470 +#: ../app/core/gimpdatafactory.c:637 ../app/core/gimpdatafactory.c:659 +#, c-format +msgid "" +"Failed to save data:\n" +"\n" +"%s" +msgstr "" +"Falló al guardar los datos:\n" +"\n" +"%s" + +#: ../app/core/gimpdatafactory.c:551 ../app/core/gimpdatafactory.c:554 +#: ../app/core/gimpitem.c:495 ../app/core/gimpitem.c:498 +msgid "copy" +msgstr "copiar" + +#: ../app/core/gimpdatafactory.c:563 ../app/core/gimpitem.c:507 +#, c-format +msgid "%s copy" +msgstr "Copia de %s" + +#: ../app/core/gimpdatafactory.c:756 +#, c-format +msgid "" +"You have a writable data folder configured (%s), but this folder does not " +"exist. Please create the folder or fix your configuation in the Preferences " +"dialog's 'Folders' section." +msgstr "" +"Tiene configurada una carpeta escribible de datos (%s), pero esta carpeta no " +"existe. Cree la carpeta o arregle su configuración en la sección «Carpetas» " +"del diálogo Preferencias." + +#: ../app/core/gimpdatafactory.c:777 +#, c-format +msgid "" +"You have a writable data folder configured, but this folder is not part of " +"your data search path. You probably edited the gimprc file manually, please " +"fix it in the Preferences dialog's 'Folders' section." +msgstr "" +"Tiene configurada una carpeta escribible de datos, pero esta carpeta no " +"forma parte de su ruta de búsqueda. Probablemente ha editado manualmente el " +"archivo gimprc, arréglelo en la sección «Carpetas» del diálogo Preferencias. " + +#: ../app/core/gimpdatafactory.c:787 +#, c-format +msgid "You don't have any writable data folder configured." +msgstr "No tiene configurada una carpeta escribible de datos." + +#: ../app/core/gimpdatafactory.c:955 +#, c-format +msgid "" +"Failed to load data:\n" +"\n" +"%s" +msgstr "" +"Falló al cargar datos:\n" +"\n" +"%s" + +#: ../app/core/gimpdrawable-blend.c:245 +msgctxt "undo-type" +msgid "Blend" +msgstr "Mezclar" + +#: ../app/core/gimpdrawable-brightness-contrast.c:70 +#: ../app/core/gimpdrawable-brightness-contrast.c:83 +msgctxt "undo-type" +msgid "Brightness-Contrast" +msgstr "Brillo-Contraste" + +#: ../app/core/gimpdrawable-bucket-fill.c:89 +msgid "No patterns available for this operation." +msgstr "No hay patrones disponibles para esta operación." + +#: ../app/core/gimpdrawable-bucket-fill.c:284 +msgctxt "undo-type" +msgid "Bucket Fill" +msgstr "Relleno de cubeta" + +#: ../app/core/gimpdrawable-color-balance.c:79 +#: ../app/core/gimpdrawable-color-balance.c:89 +msgctxt "undo-type" +msgid "Color Balance" +msgstr "Balance de color" + +#: ../app/core/gimpdrawable-colorize.c:72 +#: ../app/core/gimpdrawable-colorize.c:84 +msgctxt "undo-type" +msgid "Colorize" +msgstr "Colorear" + +#: ../app/core/gimpdrawable-curves.c:162 ../app/core/gimpdrawable-curves.c:179 +msgctxt "undo-type" +msgid "Curves" +msgstr "Curvas" + +#: ../app/core/gimpdrawable-desaturate.c:70 +#: ../app/core/gimpdrawable-desaturate.c:76 +#: ../app/tools/gimpdesaturatetool.c:77 +msgid "Desaturate" +msgstr "Desaturar" + +#: ../app/core/gimpdrawable-equalize.c:52 +msgctxt "undo-type" +msgid "Equalize" +msgstr "Ecualizar" + +#: ../app/core/gimpdrawable-foreground-extract.c:133 +msgid "Foreground Extraction" +msgstr "Extracción del primer plano" + +#: ../app/core/gimpdrawable-hue-saturation.c:77 +#: ../app/tools/gimphuesaturationtool.c:102 +msgid "Hue-Saturation" +msgstr "Tono y saturación" + +#: ../app/core/gimpdrawable-hue-saturation.c:87 +msgid "Hue_Saturation" +msgstr "Tono y _saturación" + +#: ../app/core/gimpdrawable-invert.c:54 ../app/core/gimpdrawable-invert.c:62 +msgid "Invert" +msgstr "Invertir" + +#: ../app/core/gimpdrawable-levels.c:153 ../app/core/gimpdrawable-levels.c:169 +#: ../app/tools/gimplevelstool.c:150 +msgid "Levels" +msgstr "Niveles" + +#: ../app/core/gimpdrawable-offset.c:316 +msgctxt "undo-type" +msgid "Offset Drawable" +msgstr "Desplazar el dibujable" + +#: ../app/core/gimpdrawable-posterize.c:69 +#: ../app/core/gimpdrawable-posterize.c:79 ../app/tools/gimpposterizetool.c:84 +msgid "Posterize" +msgstr "Posterizar" + +#: ../app/core/gimpdrawable-stroke.c:272 +#: ../app/paint/gimppaintcore-stroke.c:330 ../app/vectors/gimpvectors.c:556 +msgid "Not enough points to stroke" +msgstr "No hay suficientes puntos para trazar" + +#: ../app/core/gimpdrawable-stroke.c:273 +msgid "Not enough points to fill" +msgstr "No hay suficientes puntos que rellenar" + +#: ../app/core/gimpdrawable-stroke.c:404 +msgctxt "undo-type" +msgid "Render Stroke" +msgstr "Renderizar el trazo" + +#: ../app/core/gimpdrawable-threshold.c:70 +#: ../app/core/gimpdrawable-threshold.c:81 ../app/tools/gimpblendoptions.c:275 +#: ../app/tools/gimpbucketfilloptions.c:285 +#: ../app/tools/gimpregionselectoptions.c:216 +#: ../app/tools/gimpthresholdtool.c:90 +msgid "Threshold" +msgstr "Umbral B/N" + +#: ../app/core/gimpdrawable-transform.c:677 +msgctxt "undo-type" +msgid "Flip" +msgstr "Voltear" + +#: ../app/core/gimpdrawable-transform.c:762 +msgctxt "undo-type" +msgid "Rotate" +msgstr "Rotar" + +#: ../app/core/gimpdrawable-transform.c:902 ../app/core/gimplayer.c:274 +msgctxt "undo-type" +msgid "Transform Layer" +msgstr "Transformar la capa" + +#: ../app/core/gimpdrawable-transform.c:915 +msgid "Transformation" +msgstr "Transformación" + +#: ../app/core/gimpdrawable.c:494 +msgctxt "undo-type" +msgid "Scale" +msgstr "Redimensionar" + +#: ../app/core/gimpdynamicsoutput.c:135 +msgid "Output type" +msgstr "Tipo de salida" + +#: ../app/core/gimpgradient-load.c:72 ../app/core/gimpgradient-load.c:97 +#: ../app/core/gimpgradient-load.c:118 ../app/core/gimpgradient-load.c:169 +#, c-format +msgid "Fatal parse error in gradient file '%s': Read error in line %d." +msgstr "" +"Error fatal de análisis en el archivo de degradado «%s»: error de lectura en " +"la línea %d." + +#: ../app/core/gimpgradient-load.c:82 +#, c-format +msgid "Fatal parse error in gradient file '%s': Not a GIMP gradient file." +msgstr "" +"Error fatal de análisis: en el archivo de degradados «%s»: no es un archivo " +"de degradados de GIMP." + +#: ../app/core/gimpgradient-load.c:110 +#, c-format +msgid "Invalid UTF-8 string in gradient file '%s'." +msgstr "Cadena UTF-8 no válida en el archivo de degradado «%s»." + +#: ../app/core/gimpgradient-load.c:137 +#, c-format +msgid "Fatal parse error in gradient file '%s': File is corrupt in line %d." +msgstr "" +"Error fatal de análisis en el archivo de degradados «%s»: el archivo está " +"corrupto en la línea %d." + +#: ../app/core/gimpgradient-load.c:219 ../app/core/gimpgradient-load.c:230 +#, c-format +msgid "Fatal parse error in gradient file '%s': Corrupt segment %d in line %d." +msgstr "" +"Error fatal de análisis en el archivo de degradados «%s»: segmento %d " +"corrupto en la línea %d." + +#: ../app/core/gimpgradient-load.c:242 ../app/core/gimpgradient-load.c:256 +#, c-format +msgid "Gradient file '%s' is corrupt: Segments do not span the range 0-1." +msgstr "" +"El archivo de degradado «%s» está corrompido. Los segmentos no se expanden a " +"través del rango 0-1." + +#: ../app/core/gimpgradient-load.c:336 +#, c-format +msgid "No linear gradients found in '%s'" +msgstr "No se encontraron degradados lineales en «%s»" + +#: ../app/core/gimpgradient-load.c:346 +#, c-format +msgid "Failed to import gradients from '%s': %s" +msgstr "Fallo al importar degradados desde «%s»: %s" + +#: ../app/core/gimpgrid.c:85 +msgid "Line style used for the grid." +msgstr "Estilo de línea utilizado por la rejilla." + +#: ../app/core/gimpgrid.c:91 +msgid "The foreground color of the grid." +msgstr "El color de frente de la rejilla." + +#: ../app/core/gimpgrid.c:96 +msgid "" +"The background color of the grid; only used in double dashed line style." +msgstr "" +"El color de fondo de la rejilla, sólo se utiliza en el estilo de línea de " +"guiones dobles." + +#: ../app/core/gimpgrid.c:102 +msgid "Horizontal spacing of grid lines." +msgstr "Espacio horizontal de la líneas de la rejilla." + +#: ../app/core/gimpgrid.c:107 +msgid "Vertical spacing of grid lines." +msgstr "Espacio vertical de las líneas de la rejilla." + +#: ../app/core/gimpgrid.c:116 +msgid "" +"Horizontal offset of the first grid line; this may be a negative number." +msgstr "" +"Desplazamiento horizontal de la primera línea de la rejilla, puede ser un " +"número negativo." + +#: ../app/core/gimpgrid.c:123 +msgid "Vertical offset of the first grid line; this may be a negative number." +msgstr "" +"Desplazamiento vertical de la primera línea de la rejilla, puede ser un " +"número negativo." + +#: ../app/core/gimpgrouplayer.c:219 +msgid "Layer Group" +msgstr "Grupo de capas" + +#: ../app/core/gimpgrouplayer.c:220 +msgctxt "undo-type" +msgid "Rename Layer Group" +msgstr "Renombrar el grupo de capas" + +#: ../app/core/gimpgrouplayer.c:221 +msgctxt "undo-type" +msgid "Move Layer Group" +msgstr "Mover el grupo de capas" + +#: ../app/core/gimpgrouplayer.c:222 +msgctxt "undo-type" +msgid "Scale Layer Group" +msgstr "Escalar el grupo de capas" + +#: ../app/core/gimpgrouplayer.c:223 +msgctxt "undo-type" +msgid "Resize Layer Group" +msgstr "Redimensionar el grupo de capas" + +#: ../app/core/gimpgrouplayer.c:224 +msgctxt "undo-type" +msgid "Flip Layer Group" +msgstr "Voltear el grupo de capas" + +#: ../app/core/gimpgrouplayer.c:225 +msgctxt "undo-type" +msgid "Rotate Layer Group" +msgstr "Rotar el grupo de capas" + +#: ../app/core/gimpgrouplayer.c:226 +msgctxt "undo-type" +msgid "Transform Layer Group" +msgstr "Transformar el grupo de capas" + +#: ../app/core/gimpimage-arrange.c:142 +msgctxt "undo-type" +msgid "Arrange Objects" +msgstr "Disponer objetos" + +#: ../app/core/gimpimage-colormap.c:64 +#, c-format +msgid "Colormap of Image #%d (%s)" +msgstr "Mapa de colores de la imagen nº %d (%s)" + +#: ../app/core/gimpimage-colormap.c:162 +msgctxt "undo-type" +msgid "Set Colormap" +msgstr "Establecer mapa de colores" + +#: ../app/core/gimpimage-colormap.c:210 +msgctxt "undo-type" +msgid "Unset Colormap" +msgstr "Quitar el mapa de colores" + +#: ../app/core/gimpimage-colormap.c:263 +msgctxt "undo-type" +msgid "Change Colormap entry" +msgstr "Cambiar entrada del mapa de colores" + +#: ../app/core/gimpimage-colormap.c:291 +msgctxt "undo-type" +msgid "Add Color to Colormap" +msgstr "Añadir color al mapa de colores" + +#: ../app/core/gimpimage-convert.c:793 +msgid "Cannot convert image: palette is empty." +msgstr "No se puede convertir la imagen, la paleta está vacía." + +#: ../app/core/gimpimage-convert.c:809 +msgctxt "undo-type" +msgid "Convert Image to RGB" +msgstr "Convertir la imagen a RGB" + +#: ../app/core/gimpimage-convert.c:813 +msgctxt "undo-type" +msgid "Convert Image to Grayscale" +msgstr "Convertir la imagen a escala de grises" + +#: ../app/core/gimpimage-convert.c:817 +msgctxt "undo-type" +msgid "Convert Image to Indexed" +msgstr "Convertir la imagen a colores indexados" + +#: ../app/core/gimpimage-convert.c:896 +msgid "Converting to indexed colors (stage 2)" +msgstr "Convirtiendo a colores indexados (paso 2)" + +#: ../app/core/gimpimage-convert.c:941 +msgid "Converting to indexed colors (stage 3)" +msgstr "Convirtiendo a colores indexados (paso 3)" + +#: ../app/core/gimpimage-crop.c:129 +msgctxt "undo-type" +msgid "Crop Image" +msgstr "Recortar la imagen" + +#: ../app/core/gimpimage-crop.c:132 ../app/core/gimpimage-resize.c:86 +msgctxt "undo-type" +msgid "Resize Image" +msgstr "Redimensionar la imagen" + +#: ../app/core/gimpimage-guides.c:52 +msgctxt "undo-type" +msgid "Add Horizontal Guide" +msgstr "Añadir una guía horizontal" + +#: ../app/core/gimpimage-guides.c:76 +msgctxt "undo-type" +msgid "Add Vertical Guide" +msgstr "Añadir una guía vertical" + +#: ../app/core/gimpimage-guides.c:117 +msgctxt "undo-type" +msgid "Remove Guide" +msgstr "Eliminar la guía" + +#: ../app/core/gimpimage-guides.c:144 +msgctxt "undo-type" +msgid "Move Guide" +msgstr "Mover la guía" + +#: ../app/core/gimpimage-item-list.c:51 +msgctxt "undo-type" +msgid "Translate Items" +msgstr "Trasladar elementos" + +#: ../app/core/gimpimage-item-list.c:79 +msgctxt "undo-type" +msgid "Flip Items" +msgstr "Voltear elementos" + +#: ../app/core/gimpimage-item-list.c:108 ../app/core/gimpitem-linked.c:125 +msgctxt "undo-type" +msgid "Rotate Items" +msgstr "Rotar elementos" + +#: ../app/core/gimpimage-item-list.c:140 +msgctxt "undo-type" +msgid "Transform Items" +msgstr "Transformar elementos" + +#: ../app/core/gimpimage-merge.c:132 +msgctxt "undo-type" +msgid "Merge Visible Layers" +msgstr "Combinar las capas visibles" + +#: ../app/core/gimpimage-merge.c:195 +msgctxt "undo-type" +msgid "Flatten Image" +msgstr "Aplanar la imagen" + +#: ../app/core/gimpimage-merge.c:217 +msgid "Cannot flatten an image without any visible layer." +msgstr "No se puede aplanar una imagen sin una capa visible." + +#: ../app/core/gimpimage-merge.c:260 +msgid "Cannot merge down to a layer group." +msgstr "No se puede hacer una combinación a un grupo de capas." + +#: ../app/core/gimpimage-merge.c:267 +msgid "The layer to merge down to is locked." +msgstr "La capa a la que se pretende combinar está bloqueada." + +#: ../app/core/gimpimage-merge.c:279 +msgid "There is no visible layer to merge down to." +msgstr "No hay ninguna capa visible a la que hacer la combinación." + +#: ../app/core/gimpimage-merge.c:289 +msgctxt "undo-type" +msgid "Merge Down" +msgstr "Combinar hacia abajo" + +#: ../app/core/gimpimage-merge.c:317 +msgctxt "undo-type" +msgid "Merge Layer Group" +msgstr "Combinar el grupo de capas" + +#: ../app/core/gimpimage-merge.c:370 +msgctxt "undo-type" +msgid "Merge Visible Paths" +msgstr "Combinar las rutas visibles" + +#: ../app/core/gimpimage-merge.c:406 +msgid "Not enough visible paths for a merge. There must be at least two." +msgstr "" +"No hay suficientes capas visibles para hacer una combinación. Deben haber " +"por lo menos dos." + +#: ../app/core/gimpimage-new.c:140 +msgid "Background" +msgstr "Fondo" + +#: ../app/core/gimpimage-quick-mask.c:86 +msgctxt "undo-type" +msgid "Enable Quick Mask" +msgstr "Activar la máscara rápida" + +#: ../app/core/gimpimage-quick-mask.c:136 +msgctxt "undo-type" +msgid "Disable Quick Mask" +msgstr "Desactivar la máscara rápida" + +#: ../app/core/gimpimage-sample-points.c:53 +msgctxt "undo-type" +msgid "Add Sample Point" +msgstr "Añadir punto de muestra" + +#: ../app/core/gimpimage-sample-points.c:98 +msgctxt "undo-type" +msgid "Remove Sample Point" +msgstr "Quitar punto de muestra" + +#: ../app/core/gimpimage-sample-points.c:126 +msgctxt "undo-type" +msgid "Move Sample Point" +msgstr "Mover punto de muestra" + +#: ../app/core/gimpimage-scale.c:88 +msgctxt "undo-type" +msgid "Scale Image" +msgstr "Escalar la imagen" + +#: ../app/core/gimpimage-undo-push.c:862 +#, c-format +msgid "Can't undo %s" +msgstr "No se puede deshacer %s" + +#: ../app/core/gimpimage.c:1784 +msgid " (exported)" +msgstr " (exportada)" + +#: ../app/core/gimpimage.c:1788 +msgid " (overwritten)" +msgstr " (sobreescrita)" + +#: ../app/core/gimpimage.c:1797 +msgid " (imported)" +msgstr " (importada)" + +#: ../app/core/gimpimage.c:1939 +msgctxt "undo-type" +msgid "Change Image Resolution" +msgstr "Cambiar la resolución de la imagen" + +#: ../app/core/gimpimage.c:1991 +msgctxt "undo-type" +msgid "Change Image Unit" +msgstr "Cambiar la unidad de medida" + +#: ../app/core/gimpimage.c:3004 +msgctxt "undo-type" +msgid "Attach Parasite to Image" +msgstr "Adjuntar parásito a la imagen" + +#: ../app/core/gimpimage.c:3045 +msgctxt "undo-type" +msgid "Remove Parasite from Image" +msgstr "Eliminar el parásito de la imagen" + +#: ../app/core/gimpimage.c:3754 +msgctxt "undo-type" +msgid "Add Layer" +msgstr "Añadir una capa" + +#: ../app/core/gimpimage.c:3804 ../app/core/gimpimage.c:3824 +msgctxt "undo-type" +msgid "Remove Layer" +msgstr "Eliminar una capa" + +#: ../app/core/gimpimage.c:3818 +msgctxt "undo-type" +msgid "Remove Floating Selection" +msgstr "Eliminar la selección flotante" + +#: ../app/core/gimpimage.c:3983 +msgctxt "undo-type" +msgid "Add Channel" +msgstr "Añadir un canal" + +#: ../app/core/gimpimage.c:4021 ../app/core/gimpimage.c:4034 +msgctxt "undo-type" +msgid "Remove Channel" +msgstr "Eliminar un canal" + +#: ../app/core/gimpimage.c:4088 +msgctxt "undo-type" +msgid "Add Path" +msgstr "Añadir una ruta" + +#: ../app/core/gimpimage.c:4119 +msgctxt "undo-type" +msgid "Remove Path" +msgstr "Eliminar una ruta" + +#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1750 +msgid "Folder" +msgstr "Carpeta" + +#: ../app/core/gimpimagefile.c:724 +msgid "Special File" +msgstr "Archivo especial" + +#: ../app/core/gimpimagefile.c:740 +msgid "Remote File" +msgstr "Archivo remoto" + +#: ../app/core/gimpimagefile.c:759 +msgid "Click to create preview" +msgstr "Pulsar para crear la vista previa" + +#: ../app/core/gimpimagefile.c:765 +msgid "Loading preview..." +msgstr "Cargando la vista previa…" + +#: ../app/core/gimpimagefile.c:771 +msgid "Preview is out of date" +msgstr "La vista previa está desactualizada" + +#: ../app/core/gimpimagefile.c:777 +msgid "Cannot create preview" +msgstr "No se puede crear la vista previa" + +#: ../app/core/gimpimagefile.c:787 +msgid "(Preview may be out of date)" +msgstr "(La vista previa podría estar desactualizada)" + +#. pixel size +#: ../app/core/gimpimagefile.c:796 ../app/widgets/gimpimagepropview.c:440 +#: ../app/widgets/gimpsizebox.c:432 ../app/widgets/gimptemplateeditor.c:581 +#, c-format +msgid "%d × %d pixel" +msgid_plural "%d × %d pixels" +msgstr[0] "%d x %d píxel" +msgstr[1] "%d x %d píxeles" + +#: ../app/core/gimpimagefile.c:819 ../app/display/gimpdisplayshell-title.c:317 +#, c-format +msgid "%d layer" +msgid_plural "%d layers" +msgstr[0] "%d capa" +msgstr[1] "%d capas" + +#: ../app/core/gimpimagefile.c:867 +#, c-format +msgid "Could not open thumbnail '%s': %s" +msgstr "No se ha podido abrir la miniatura «%s»: %s" + +#: ../app/core/gimpitem.c:1819 +msgctxt "undo-type" +msgid "Attach Parasite" +msgstr "Adjuntar parásito" + +#: ../app/core/gimpitem.c:1829 +msgctxt "undo-type" +msgid "Attach Parasite to Item" +msgstr "Adjuntar una parásito al elemento" + +#: ../app/core/gimpitem.c:1880 ../app/core/gimpitem.c:1887 +msgctxt "undo-type" +msgid "Remove Parasite from Item" +msgstr "Eliminar un parásito del elemento" + +#: ../app/core/gimpitem-exclusive.c:81 +msgid "Set Item Exclusive Visible" +msgstr "Define al elemento como exclusivo visible" + +#: ../app/core/gimpitem-exclusive.c:172 +msgid "Set Item Exclusive Linked" +msgstr "Definir al elemento como exclusivo enlazado" + +#: ../app/core/gimplayer-floating-sel.c:95 +msgctxt "undo-type" +msgid "Anchor Floating Selection" +msgstr "Anclar una selección flotante" + +#: ../app/core/gimplayer-floating-sel.c:126 ../app/core/gimplayer.c:620 +msgid "" +"Cannot create a new layer from the floating selection because it belongs to " +"a layer mask or channel." +msgstr "" +"No se puede crear una capa nueva a partir de la selección flotante porque " +"ésta pertenece a una máscara de capa o canal." + +#: ../app/core/gimplayer-floating-sel.c:133 +msgctxt "undo-type" +msgid "Floating Selection to Layer" +msgstr "Selección flotante a capa" + +#: ../app/core/gimplayer.c:268 +msgctxt "undo-type" +msgid "Rename Layer" +msgstr "Renombrar una capa" + +#: ../app/core/gimplayer.c:269 +msgctxt "undo-type" +msgid "Move Layer" +msgstr "Mover una capa" + +#: ../app/core/gimplayer.c:270 +msgctxt "undo-type" +msgid "Scale Layer" +msgstr "Escalar una capa" + +#: ../app/core/gimplayer.c:271 +msgctxt "undo-type" +msgid "Resize Layer" +msgstr "Redimensionar una capa" + +#: ../app/core/gimplayer.c:272 +msgctxt "undo-type" +msgid "Flip Layer" +msgstr "Voltear una capa" + +#: ../app/core/gimplayer.c:273 +msgctxt "undo-type" +msgid "Rotate Layer" +msgstr "Rotar una capa" + +#: ../app/core/gimplayer.c:276 +msgctxt "undo-type" +msgid "Reorder Layer" +msgstr "Reordenar una capa" + +#: ../app/core/gimplayer.c:277 +msgctxt "undo-type" +msgid "Raise Layer" +msgstr "Elevar una capa" + +#: ../app/core/gimplayer.c:278 +msgctxt "undo-type" +msgid "Raise Layer to Top" +msgstr "Elevar una capa hasta lo más alto" + +#: ../app/core/gimplayer.c:279 +msgctxt "undo-type" +msgid "Lower Layer" +msgstr "Bajar una capa" + +#: ../app/core/gimplayer.c:280 +msgctxt "undo-type" +msgid "Lower Layer to Bottom" +msgstr "Bajar una capa hasta la parte más baja" + +#: ../app/core/gimplayer.c:281 +msgid "Layer cannot be raised higher." +msgstr "La capa no puede ser elevada más alto." + +#: ../app/core/gimplayer.c:282 +msgid "Layer cannot be lowered more." +msgstr "La capa no puede bajarse más." + +#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1532 +#: ../app/core/gimplayermask.c:236 +#, c-format +msgid "%s mask" +msgstr "máscara %s" + +#: ../app/core/gimplayer.c:489 +#, c-format +msgid "" +"Floating Selection\n" +"(%s)" +msgstr "" +"Selección flotante\n" +"(%s)" + +#: ../app/core/gimplayer.c:1452 +msgid "Unable to add a layer mask since the layer already has one." +msgstr "No se puede añadir una máscara de capa dado que la capa ya posee una." + +#: ../app/core/gimplayer.c:1463 +msgid "Cannot add layer mask of different dimensions than specified layer." +msgstr "" +"No se puede añadir una máscara de capa de dimensiones distintas a la capa " +"especificada." + +#: ../app/core/gimplayer.c:1469 +msgctxt "undo-type" +msgid "Add Layer Mask" +msgstr "Añadir máscara de capa" + +#: ../app/core/gimplayer.c:1587 +msgctxt "undo-type" +msgid "Transfer Alpha to Mask" +msgstr "Transferir alfa a la máscara" + +#: ../app/core/gimplayer.c:1757 +msgctxt "undo-type" +msgid "Apply Layer Mask" +msgstr "Aplicar máscara de capa" + +#: ../app/core/gimplayer.c:1758 +msgctxt "undo-type" +msgid "Delete Layer Mask" +msgstr "Eliminar máscara de capa" + +#: ../app/core/gimplayer.c:1877 +msgctxt "undo-type" +msgid "Add Alpha Channel" +msgstr "Añadir un canal alfa" + +#: ../app/core/gimplayer.c:1931 +msgctxt "undo-type" +msgid "Remove Alpha Channel" +msgstr "Eliminar el canal alfa" + +#: ../app/core/gimplayer.c:1951 +msgctxt "undo-type" +msgid "Layer to Image Size" +msgstr "Capa a tamaño de imagen" + +#: ../app/core/gimplayermask.c:108 +msgctxt "undo-type" +msgid "Move Layer Mask" +msgstr "Mover la máscara de la capa" + +#: ../app/core/gimplayermask.c:109 +msgctxt "undo-type" +msgid "Layer Mask to Selection" +msgstr "Máscara de capa a selección" + +#: ../app/core/gimplayermask.c:183 +#, c-format +msgid "Cannot rename layer masks." +msgstr "No se pueden renombrar las máscaras de capa." + +#: ../app/core/gimplayermask.c:264 +msgctxt "undo-type" +msgid "Enable Layer Mask" +msgstr "Activar máscara de capa" + +#: ../app/core/gimplayermask.c:265 +msgctxt "undo-type" +msgid "Disable Layer Mask" +msgstr "Desactivar máscara de capa" + +#: ../app/core/gimplayermask.c:327 +msgctxt "undo-type" +msgid "Show Layer Mask" +msgstr "Mostrar la máscara de la capa" + +#: ../app/core/gimppalette-import.c:439 +#, c-format +msgid "Index %d" +msgstr "Índice: %d" + +#: ../app/core/gimppalette-import.c:549 +#, c-format +msgid "Unknown type of palette file: %s" +msgstr "Tipo de archivo de paleta desconocido: %s" + +#: ../app/core/gimppalette-load.c:86 ../app/core/gimppalette-load.c:112 +#: ../app/core/gimppalette-load.c:133 ../app/core/gimppalette-load.c:162 +#: ../app/core/gimppalette-load.c:238 +#, c-format +msgid "Fatal parse error in palette file '%s': Read error in line %d." +msgstr "" +"Error fatal de análisis en el archivo de paleta «%s»: error de lectura en la " +"línea %d." + +#: ../app/core/gimppalette-load.c:96 +#, c-format +msgid "Fatal parse error in palette file '%s': Missing magic header." +msgstr "" +"Error fatal de análisis en el archivo de paleta «%s»: cabecera mágica " +"perdida." + +#: ../app/core/gimppalette-load.c:125 +#, c-format +msgid "Invalid UTF-8 string in palette file '%s'" +msgstr "Cadena UTF-8 no válida en el archivo de paleta «%s»" + +#: ../app/core/gimppalette-load.c:149 +#, c-format +msgid "" +"Reading palette file '%s': Invalid number of columns in line %d. Using " +"default value." +msgstr "" +"Leyendo el archivo de paleta «%s»: número no válido de columnas en la línea " +"%d. Usando el valor predeterminado." + +#: ../app/core/gimppalette-load.c:185 +#, c-format +msgid "Reading palette file '%s': Missing RED component in line %d." +msgstr "" +"Leyendo el archivo de paleta «%s»: falta la componente ROJO en la línea %d." + +#: ../app/core/gimppalette-load.c:193 +#, c-format +msgid "Reading palette file '%s': Missing GREEN component in line %d." +msgstr "" +"Leyendo el archivo de paleta «%s»: falta la componente VERDE en la línea %d." + +#: ../app/core/gimppalette-load.c:201 +#, c-format +msgid "Reading palette file '%s': Missing BLUE component in line %d." +msgstr "" +"Leyendo el archivo de paleta «%s»: falta la componente AZUL en la línea %d." + +#: ../app/core/gimppalette-load.c:211 +#, c-format +msgid "Reading palette file '%s': RGB value out of range in line %d." +msgstr "" +"Leyendo el archivo de paleta «%s»: valor RGB fuera de rango en la línea %d." + +#: ../app/core/gimppalette-load.c:478 +#, c-format +msgid "Could not read header from palette file '%s'" +msgstr "No se ha podido leer la cabecera del archivo de paleta «%s»" + +#: ../app/core/gimppalette-load.c:501 ../app/core/gimppalette-load.c:589 +#, c-format +msgid "Fatal parse error in palette file '%s'" +msgstr "Error fatal de análisis en el archivo de paleta «%s»" + +#: ../app/core/gimppattern-load.c:85 ../app/core/gimppattern-load.c:131 +#: ../app/core/gimppattern-load.c:162 +#, c-format +msgid "Fatal parse error in pattern file '%s': File appears truncated." +msgstr "" +"Error fatal de análisis en el archivo de patrón «%s»: el archivo parece " +"estar truncado." + +#: ../app/core/gimppattern-load.c:104 +#, c-format +msgid "" +"Fatal parse error in pattern file '%s': Unknown pattern format version %d." +msgstr "" +"Error de análisis fatal en el archivo de patrón «%s»: versión del formato de " +"patrón desconocida %d." + +#: ../app/core/gimppattern-load.c:114 +#, c-format +msgid "" +"Fatal parse error in pattern file '%s: Unsupported pattern depth %d.\n" +"GIMP Patterns must be GRAY or RGB." +msgstr "" +"Error de análisis fatal en el archivo de patrón «%s»: profundidad del patrón " +"no soportada %d.\n" +"Los patrones de GIMP deben ser GRAY o RGB." + +#: ../app/core/gimppattern-load.c:139 +#, c-format +msgid "Invalid UTF-8 string in pattern file '%s'." +msgstr "Cadena UTF-8 no válida en el archivo de patrón «%s»." + +#: ../app/core/gimppdbprogress.c:279 ../app/widgets/gimppdbdialog.c:331 +#, c-format +msgid "Unable to run %s callback. The corresponding plug-in may have crashed." +msgstr "" +"No se puede ejecutar la retrollamada %s. El complemento correspondiente debe " +"haber fallado." + +#: ../app/core/gimpprogress.c:106 ../app/core/gimpprogress.c:153 +msgid "Please wait" +msgstr "Por favor, espere" + +#: ../app/core/gimpselection.c:155 +msgctxt "undo-type" +msgid "Move Selection" +msgstr "Mover la selección" + +#: ../app/core/gimpselection.c:156 +msgctxt "undo-type" +msgid "Stroke Selection" +msgstr "Trazar la selección" + +#: ../app/core/gimpselection.c:172 +msgctxt "undo-type" +msgid "Feather Selection" +msgstr "Difuminar la selección" + +#: ../app/core/gimpselection.c:173 +msgctxt "undo-type" +msgid "Sharpen Selection" +msgstr "Perfilar la selección" + +#: ../app/core/gimpselection.c:174 +msgctxt "undo-type" +msgid "Select None" +msgstr "Seleccionar nada" + +#: ../app/core/gimpselection.c:175 +msgctxt "undo-type" +msgid "Select All" +msgstr "Seleccionar todo" + +#: ../app/core/gimpselection.c:176 +msgctxt "undo-type" +msgid "Invert Selection" +msgstr "Invertir la selección" + +#: ../app/core/gimpselection.c:177 +msgctxt "undo-type" +msgid "Border Selection" +msgstr "Selección de borde" + +#: ../app/core/gimpselection.c:178 +msgctxt "undo-type" +msgid "Grow Selection" +msgstr "Agrandar selección" + +#: ../app/core/gimpselection.c:179 +msgctxt "undo-type" +msgid "Shrink Selection" +msgstr "Encoger selección" + +#: ../app/core/gimpselection.c:286 +msgid "There is no selection to stroke." +msgstr "No hay ninguna selección que trazar." + +#: ../app/core/gimpselection.c:670 +msgid "Unable to cut or copy because the selected region is empty." +msgstr "No se puede cortar o copiar porque la región seleccionada está vacía." + +#: ../app/core/gimpselection.c:847 +msgid "Cannot float selection because the selected region is empty." +msgstr "" +"No se puede hacer flotar la selección porque la región seleccionada está " +"vacía." + +#: ../app/core/gimpselection.c:854 +msgctxt "undo-type" +msgid "Float Selection" +msgstr "Flotar la selección" + +#: ../app/core/gimpselection.c:870 +msgid "Floated Layer" +msgstr "Capa flotante" + +#: ../app/core/gimpstrokeoptions.c:180 +msgid "" +"Convert a mitered join to a bevelled join if the miter would extend to a " +"distance of more than miter-limit * line-width from the actual join point." +msgstr "" +"Convertir una unión mediana en una unión en bisel si la mediana se " +"extendiese hasta una distancia mayor que el límite de mediana multiplicado " +"por el grosor de la línea a partir del punto real de unión." + +#: ../app/core/gimptoolpreset-load.c:61 +#, c-format +msgid "Error while parsing '%s'" +msgstr "Error al analizar «%s»" + +#: ../app/core/gimptemplate.c:129 +msgid "The unit used for coordinate display when not in dot-for-dot mode." +msgstr "" +"La unidad utilizada para las coordenadas de visualización cuando no se " +"encuentra en modo de punto por punto." + +#: ../app/core/gimptemplate.c:136 +msgid "The horizontal image resolution." +msgstr "La resolución horizontal de la imagen." + +#: ../app/core/gimptemplate.c:142 +msgid "The vertical image resolution." +msgstr "La resolución vertical de la imagen." + +#: ../app/core/gimpunit.c:60 +msgctxt "unit-singular" +msgid "pixel" +msgstr "píxel" + +#: ../app/core/gimpunit.c:60 +msgctxt "unit-plural" +msgid "pixels" +msgstr "píxeles" + +#: ../app/core/gimpunit.c:64 +msgctxt "unit-singular" +msgid "inch" +msgstr "pulgada" + +#: ../app/core/gimpunit.c:64 +msgctxt "unit-plural" +msgid "inches" +msgstr "pulgadas" + +#: ../app/core/gimpunit.c:67 +msgctxt "unit-singular" +msgid "millimeter" +msgstr "milímetro" + +#: ../app/core/gimpunit.c:67 +msgctxt "unit-plural" +msgid "millimeters" +msgstr "milímetros" + +#: ../app/core/gimpunit.c:71 +msgctxt "unit-singular" +msgid "point" +msgstr "punto" + +#: ../app/core/gimpunit.c:71 +msgctxt "unit-plural" +msgid "points" +msgstr "puntos" + +#: ../app/core/gimpunit.c:74 +msgctxt "unit-singular" +msgid "pica" +msgstr "pica" + +#: ../app/core/gimpunit.c:74 +msgctxt "unit-plural" +msgid "picas" +msgstr "picas" + +#: ../app/core/gimpunit.c:82 +msgctxt "singular" +msgid "percent" +msgstr "porcentaje" + +#: ../app/core/gimpunit.c:82 +msgctxt "plural" +msgid "percent" +msgstr "porcentaje" + +#: ../app/dialogs/about-dialog.c:114 +msgid "About GIMP" +msgstr "Acerca de GIMP" + +#: ../app/dialogs/about-dialog.c:123 +msgid "Visit the GIMP website" +msgstr "Visite el sitio web de GIMP" + +#. Translators: insert your names here, +#. separated by newline +#: ../app/dialogs/about-dialog.c:129 +msgid "translator-credits" +msgstr "" +"Alonso Lara\n" +"Francisco Javier F. Serrador\n" +"Pablo G. del Campo\n" +"Francisco Vila" + +#: ../app/dialogs/about-dialog.c:521 +msgid "GIMP is brought to you by" +msgstr "GIMP se ha realizado para usted por" + +#: ../app/dialogs/about-dialog.c:596 +msgid "This is an unstable development release." +msgstr "Esta es una versión de desarrollo inestable." + +#: ../app/dialogs/channel-options-dialog.c:146 +msgid "Channel _name:" +msgstr "_Nombre del canal:" + +#: ../app/dialogs/channel-options-dialog.c:175 +msgid "Initialize from _selection" +msgstr "Iniciar a partir de la _selección" + +#: ../app/dialogs/convert-dialog.c:125 +msgid "Indexed Color Conversion" +msgstr "Conversión de color indexado" + +#: ../app/dialogs/convert-dialog.c:128 +msgid "Convert Image to Indexed Colors" +msgstr "Convertir la imagen a colores indexados" + +#: ../app/dialogs/convert-dialog.c:138 +msgid "C_onvert" +msgstr "C_onvertir" + +#: ../app/dialogs/convert-dialog.c:190 +msgid "_Maximum number of colors:" +msgstr "Número _máximo de colores:" + +#: ../app/dialogs/convert-dialog.c:217 +msgid "_Remove unused colors from colormap" +msgstr "_Eliminar los colores sin usar de la paleta final" + +#. dithering +#: ../app/dialogs/convert-dialog.c:234 ../app/tools/gimpblendoptions.c:254 +msgid "Dithering" +msgstr "Difuminado" + +#: ../app/dialogs/convert-dialog.c:246 +msgid "Color _dithering:" +msgstr "_Difuminar el color:" + +#: ../app/dialogs/convert-dialog.c:261 +msgid "Enable dithering of _transparency" +msgstr "Activar difuminado de _transparencia" + +#: ../app/dialogs/convert-dialog.c:288 +msgid "Converting to indexed colors" +msgstr "Convirtiendo a colores indexados" + +#: ../app/dialogs/convert-dialog.c:416 ../app/pdb/convert-cmds.c:153 +msgid "Cannot convert to a palette with more than 256 colors." +msgstr "No se puede convertir a una paleta con más de 256 colores." + +#: ../app/dialogs/data-delete-dialog.c:81 +msgid "Delete Object" +msgstr "Eliminar objeto" + +#: ../app/dialogs/data-delete-dialog.c:104 +#, c-format +msgid "Delete '%s'?" +msgstr "¿Eliminar «%s»?" + +#: ../app/dialogs/data-delete-dialog.c:107 +#, c-format +msgid "" +"Are you sure you want to remove '%s' from the list and delete it on disk?" +msgstr "" +"¿Está seguro de que quiere eliminar «%s» de la lista y eliminarlo del disco?" + +#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:162 +#: ../app/gui/gui-message.c:149 +msgid "GIMP Message" +msgstr "Mensaje de GIMP" + +#: ../app/dialogs/dialogs.c:302 +msgid "Devices" +msgstr "Dispositivos" + +#: ../app/dialogs/dialogs.c:302 +msgid "Device Status" +msgstr "Estado del dispositivo" + +#: ../app/dialogs/dialogs.c:306 +msgid "Errors" +msgstr "Errores" + +#: ../app/dialogs/dialogs.c:310 +msgid "Pointer" +msgstr "Puntero" + +#: ../app/dialogs/dialogs.c:329 +msgid "History" +msgstr "Historial" + +#: ../app/dialogs/dialogs.c:331 +msgid "Image Templates" +msgstr "Plantillas de imágenes" + +#: ../app/dialogs/dialogs.c:358 +msgid "Histogram" +msgstr "Histograma" + +#: ../app/dialogs/dialogs.c:362 +msgid "Selection" +msgstr "Selección" + +#: ../app/dialogs/dialogs.c:362 +msgid "Selection Editor" +msgstr "Editor de selección" + +#: ../app/dialogs/dialogs.c:366 +msgid "Undo" +msgstr "Deshacer" + +#: ../app/dialogs/dialogs.c:366 +msgid "Undo History" +msgstr "Historial de deshacer" + +#: ../app/dialogs/dialogs.c:376 +msgid "Navigation" +msgstr "Navegación" + +#: ../app/dialogs/dialogs.c:376 +msgid "Display Navigation" +msgstr "Navegación de la vista" + +#: ../app/dialogs/dialogs.c:382 +msgid "FG/BG" +msgstr "PP/SP" + +#: ../app/dialogs/dialogs.c:382 +msgid "FG/BG Color" +msgstr "Color PP/SP" + +#: ../app/dialogs/fade-dialog.c:109 +#, c-format +msgid "Fade %s" +msgstr "Desvanecer %s" + +#: ../app/dialogs/fade-dialog.c:121 +msgid "_Fade" +msgstr "_Desvanecer" + +#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:346 +msgid "_Mode:" +msgstr "_Modo:" + +#: ../app/dialogs/fade-dialog.c:162 +msgid "_Opacity:" +msgstr "_Opacidad:" + # ¿O es abrir capas? depende del contexto. FVD -#: ../app/dialogs/file-open-dialog.c:254 -msgid "Open layers" -msgstr "Abrir capas" - -#: ../app/dialogs/file-open-location-dialog.c:71 -msgid "Open Location" -msgstr "Abrir dirección" - -#: ../app/dialogs/file-open-location-dialog.c:109 -msgid "Enter location (URI):" -msgstr "Introduzca dirección (URI):" - -#: ../app/dialogs/file-save-dialog.c:113 -msgid "Export Image" -msgstr "Exportar la imagen" - -#: ../app/dialogs/file-save-dialog.c:114 -msgid "_Export" -msgstr "_Exportar" - -#: ../app/dialogs/file-save-dialog.c:458 -msgid "" -"Saving remote files needs to determine the file format from the file " -"extension. Please enter a file extension that matches the selected file " -"format or enter no file extension at all." -msgstr "" -"Guardar los archivos remotos necesita determinar el formato del archivo " -"desde la extensión del archivo. Introduzca una extensión que coincida con el " -"formato de archivo seleccionado o no introduzca ninguna extensión de archivo." - -#: ../app/dialogs/file-save-dialog.c:605 -msgid "The given filename cannot be used for exporting" -msgstr "El nombre de archivo dado no se puede usar para exportar" - -#: ../app/dialogs/file-save-dialog.c:606 -msgid "" -"You can use this dialog to export to various file formats. If you want to " -"save the image to the GIMP XCF format, use File→Save instead." -msgstr "" -"Puede usar este diálogo para exportar a diversos formatos de archivo. Si " -"quiere guardar la imagen en el formato XCF de GIMP, use Archivo→Guardar en " -"su lugar." - -#: ../app/dialogs/file-save-dialog.c:609 -msgid "Take me to the Save dialog" -msgstr "Ir al diálogo de guardar" - -#: ../app/dialogs/file-save-dialog.c:613 -msgid "The given filename cannot be used for saving" -msgstr "El nombre de archivo dado no se puede usar para guardar" - -#: ../app/dialogs/file-save-dialog.c:614 -msgid "" -"You can use this dialog to save to the GIMP XCF format. Use File→Export to " -"export to other file formats." -msgstr "" -"Puede usar este diálogo para guardar en el formato XCF de GIMP. Use " -"Archivo→Exportar para exportar a otros formatos de archivo." - -#: ../app/dialogs/file-save-dialog.c:616 -msgid "Take me to the Export dialog" -msgstr "Ir al diálogo de exportar" - -#: ../app/dialogs/file-save-dialog.c:619 ../app/dialogs/file-save-dialog.c:694 -msgid "Extension Mismatch" -msgstr "Incongruencia de la extensión" - -#: ../app/dialogs/file-save-dialog.c:678 -msgid "" -"The given filename does not have any known file extension. Please enter a " -"known file extension or select a file format from the file format list." -msgstr "" -"El nombre de archivo dado no tiene ninguna extensión de archivo. Por favor, " -"introduzca una extensión de archivo conocida o seleccione un formato de " -"archivo de la lista de formatos de archivo." - -#: ../app/dialogs/file-save-dialog.c:710 -msgid "The given file extension does not match the chosen file type." -msgstr "" -"La extensión de archivo dada no concuerda con el tipo de archivo elegido." - -#: ../app/dialogs/file-save-dialog.c:714 -msgid "Do you want to save the image using this name anyway?" -msgstr "¿Seguro que quiere guardar la imagen con este nombre?" - -#: ../app/dialogs/file-save-dialog.c:776 -msgid "Saving canceled" -msgstr "Guardado cancelado" - -#: ../app/dialogs/file-save-dialog.c:784 ../app/widgets/gimpdnd-xds.c:186 -#, c-format -msgid "" -"Saving '%s' failed:\n" -"\n" -"%s" -msgstr "" -"Ha fallado el guardado de «%s»\n" -"\n" -"%s" - -#: ../app/dialogs/grid-dialog.c:85 -msgid "Configure Grid" -msgstr "Configurar la rejilla" - -#: ../app/dialogs/grid-dialog.c:86 -msgid "Configure Image Grid" -msgstr "Configurar la rejilla de la imagen" - -#: ../app/dialogs/grid-dialog.c:152 -msgid "Grid" -msgstr "Rejilla" - -#: ../app/dialogs/image-merge-layers-dialog.c:68 -msgid "Merge Layers" -msgstr "Combinar capas" - -#: ../app/dialogs/image-merge-layers-dialog.c:70 -msgid "Layers Merge Options" -msgstr "Opciones de combinación de capas" - -#: ../app/dialogs/image-merge-layers-dialog.c:76 -msgid "_Merge" -msgstr "Co_mbinar" - -#: ../app/dialogs/image-merge-layers-dialog.c:96 -msgid "Final, Merged Layer should be:" -msgstr "La capa final combinada debería ser:" - -#: ../app/dialogs/image-merge-layers-dialog.c:100 -msgid "Expanded as necessary" -msgstr "Expandida lo necesario" - -#: ../app/dialogs/image-merge-layers-dialog.c:103 -msgid "Clipped to image" -msgstr "Recortada según la imagen" - -#: ../app/dialogs/image-merge-layers-dialog.c:106 -msgid "Clipped to bottom layer" -msgstr "Recortada hasta la capa más baja" - -#: ../app/dialogs/image-merge-layers-dialog.c:114 -msgid "Merge within active _group only" -msgstr "Mezclar solamente dentro del grupo acti_vo" - -#: ../app/dialogs/image-merge-layers-dialog.c:127 -msgid "_Discard invisible layers" -msgstr "_Descartar las capas invisibles" - -#: ../app/dialogs/image-new-dialog.c:97 -msgid "Create a New Image" -msgstr "Crear una imagen nueva" - -#: ../app/dialogs/image-new-dialog.c:135 -#: ../app/dialogs/preferences-dialog.c:2016 -msgid "_Template:" -msgstr "Plan_tilla:" - -#: ../app/dialogs/image-new-dialog.c:316 -msgid "Confirm Image Size" -msgstr "Confirmar el tamaño de la imagen" - -#: ../app/dialogs/image-new-dialog.c:338 -#: ../app/dialogs/image-scale-dialog.c:239 -#, c-format -msgid "You are trying to create an image with a size of %s." -msgstr "Está intentando crear una imagen con un tamaño de %s." - -#: ../app/dialogs/image-new-dialog.c:345 -#, c-format -msgid "" -"An image of the chosen size will use more memory than what is configured as " -"\"Maximum Image Size\" in the Preferences dialog (currently %s)." -msgstr "" -"Una imagen del tamaño elegido usará más memoria de la que está configurada " -"como «Tamaño máximo de la imagen» en el diálogo Preferencias (actualmente %s)." - -#: ../app/dialogs/image-properties-dialog.c:60 -#: ../app/dialogs/image-properties-dialog.c:63 -msgid "Image Properties" -msgstr "Propiedades de la imagen" - -#: ../app/dialogs/image-properties-dialog.c:84 -msgid "Properties" -msgstr "Propiedades" - -#: ../app/dialogs/image-properties-dialog.c:89 -msgid "Color Profile" -msgstr "Perfil de color" - -#: ../app/dialogs/image-properties-dialog.c:94 -msgid "Comment" -msgstr "Comentario" - -#: ../app/dialogs/image-scale-dialog.c:111 -msgctxt "dialog-title" -msgid "Scale Image" -msgstr "Escalar la imagen" - -#: ../app/dialogs/image-scale-dialog.c:205 -msgid "Confirm Scaling" -msgstr "Confirmar escalado" - -#: ../app/dialogs/image-scale-dialog.c:245 -#, c-format -msgid "" -"Scaling the image to the chosen size will make it use more memory than what " -"is configured as \"Maximum Image Size\" in the Preferences dialog (currently " -"%s)." -msgstr "" -"Escalar la imagen al tamaño elegido hará que use más memoria de la que está " -"configurada como «Tamaño máximo de la imagen» en el diálogo Preferencias " -"(actualmente %s)." - -#: ../app/dialogs/image-scale-dialog.c:260 -msgid "" -"Scaling the image to the chosen size will shrink some layers completely away." -msgstr "" -"Escalar la imagen al tamaño elegido encogerá algunas capas hasta desaparecer " -"completamente." - -#: ../app/dialogs/image-scale-dialog.c:264 -msgid "Is this what you want to do?" -msgstr "¿Es eso lo que quiere hacer?" - -#: ../app/dialogs/input-devices-dialog.c:55 -msgid "Configure Input Devices" -msgstr "Configurar los dispositivos de entrada" - -#: ../app/dialogs/keyboard-shortcuts-dialog.c:48 -msgid "Configure Keyboard Shortcuts" -msgstr "Configurar combinaciones de teclas" - -#: ../app/dialogs/keyboard-shortcuts-dialog.c:73 -msgid "" -"To edit a shortcut key, click on the corresponding row and type a new " -"accelerator, or press backspace to clear." -msgstr "" -"Para editar una combinación de teclas, pulse en la fila correspondiente y " -"teclee un acelerador nuevo, o pulse la tecla de retroceso para borrar." - -#: ../app/dialogs/keyboard-shortcuts-dialog.c:81 -msgid "S_ave keyboard shortcuts on exit" -msgstr "_Guardar las combinaciones de teclas al salir" - -#: ../app/dialogs/layer-add-mask-dialog.c:84 -msgid "Add a Mask to the Layer" -msgstr "Añadir una máscara a la capa" - -#: ../app/dialogs/layer-add-mask-dialog.c:112 -msgid "Initialize Layer Mask to:" -msgstr "Iniciar máscara de capa a:" - -#: ../app/dialogs/layer-add-mask-dialog.c:143 -msgid "In_vert mask" -msgstr "In_vertir la máscara" - -#: ../app/dialogs/layer-options-dialog.c:125 -msgid "Layer _name:" -msgstr "_Nombre de la capa:" - -#. The size labels -#: ../app/dialogs/layer-options-dialog.c:139 -#: ../app/tools/gimpmeasuretool.c:1129 -msgid "Width:" -msgstr "Anchura:" - -#: ../app/dialogs/layer-options-dialog.c:145 -#: ../app/tools/gimpmeasuretool.c:1157 -msgid "Height:" -msgstr "Altura:" - -#: ../app/dialogs/layer-options-dialog.c:202 -msgid "Layer Fill Type" -msgstr "Tipo de relleno de la capa" - -#: ../app/dialogs/layer-options-dialog.c:217 -msgid "Set name from _text" -msgstr "Establecer el nombre a partir del _texto" - -#: ../app/dialogs/module-dialog.c:126 -msgid "Module Manager" -msgstr "Gestor de módulos" - -#: ../app/dialogs/module-dialog.c:150 -msgid "You will have to restart GIMP for the changes to take effect." -msgstr "Necesitará reiniciar GIMP para que los cambios tengan efecto." - -#: ../app/dialogs/module-dialog.c:191 -msgid "Module" -msgstr "Módulo" - -#: ../app/dialogs/module-dialog.c:468 -msgid "Only in memory" -msgstr "Sólo en memoria" - -#: ../app/dialogs/module-dialog.c:473 -msgid "No longer available" -msgstr "Ya no se encuentra disponible" - -#: ../app/dialogs/module-dialog.c:498 -msgid "Author:" -msgstr "Autor:" - -#: ../app/dialogs/module-dialog.c:499 -msgid "Version:" -msgstr "Versión:" - -#: ../app/dialogs/module-dialog.c:500 -msgid "Date:" -msgstr "Fecha:" - -#: ../app/dialogs/module-dialog.c:501 -msgid "Copyright:" -msgstr "Copyright:" - -#: ../app/dialogs/module-dialog.c:502 -msgid "Location:" -msgstr "Ubicación:" - -#: ../app/dialogs/offset-dialog.c:108 -msgid "Offset Layer" -msgstr "Desplazar capa" - -#: ../app/dialogs/offset-dialog.c:110 -msgid "Offset Layer Mask" -msgstr "Desplazar la máscara de capa" - -#: ../app/dialogs/offset-dialog.c:112 -msgid "Offset Channel" -msgstr "Desplazar canal" - -#. The offset frame -#: ../app/dialogs/offset-dialog.c:118 ../app/dialogs/offset-dialog.c:152 -#: ../app/dialogs/resize-dialog.c:198 ../app/tools/gimpblendoptions.c:247 -#: ../app/widgets/gimpgrideditor.c:206 -msgid "Offset" -msgstr "Desplazamiento" - -#. offset, used as a verb -#: ../app/dialogs/offset-dialog.c:127 -msgid "_Offset" -msgstr "Desplazamient_o" - -#: ../app/dialogs/offset-dialog.c:184 ../app/dialogs/resize-dialog.c:227 -msgid "_X:" -msgstr "_X:" - -#: ../app/dialogs/offset-dialog.c:186 ../app/dialogs/resize-dialog.c:228 -msgid "_Y:" -msgstr "_Y:" - -#: ../app/dialogs/offset-dialog.c:213 -msgid "Offset by x/_2, y/2" -msgstr "Desplazar en x/_2,y/2" - -#. The edge behavior frame -#: ../app/dialogs/offset-dialog.c:222 -msgid "Edge Behavior" -msgstr "Comportamiento de los bordes" - -#: ../app/dialogs/offset-dialog.c:226 -msgid "_Wrap around" -msgstr "_Volver al principio" - -#: ../app/dialogs/offset-dialog.c:229 -msgid "Fill with _background color" -msgstr "Rellenar con el color del _fondo" - -#: ../app/dialogs/offset-dialog.c:232 -msgid "Make _transparent" -msgstr "Hacer _transparente" - -#: ../app/dialogs/palette-import-dialog.c:154 -msgid "Import a New Palette" -msgstr "Importa una paleta nueva" - -#: ../app/dialogs/palette-import-dialog.c:164 -msgid "_Import" -msgstr "_Importar" - -#. The "Source" frame -#: ../app/dialogs/palette-import-dialog.c:203 -msgid "Select Source" -msgstr "Seleccionar origen" - +#: ../app/dialogs/file-open-dialog.c:254 +msgid "Open layers" +msgstr "Abrir capas" + +#: ../app/dialogs/file-open-location-dialog.c:71 +msgid "Open Location" +msgstr "Abrir dirección" + +#: ../app/dialogs/file-open-location-dialog.c:109 +msgid "Enter location (URI):" +msgstr "Introduzca dirección (URI):" + +#: ../app/dialogs/file-save-dialog.c:113 +msgid "Export Image" +msgstr "Exportar la imagen" + +#: ../app/dialogs/file-save-dialog.c:114 +msgid "_Export" +msgstr "_Exportar" + +#: ../app/dialogs/file-save-dialog.c:454 +msgid "" +"Saving remote files needs to determine the file format from the file " +"extension. Please enter a file extension that matches the selected file " +"format or enter no file extension at all." +msgstr "" +"Guardar los archivos remotos necesita determinar el formato del archivo " +"desde la extensión del archivo. Introduzca una extensión que coincida con el " +"formato de archivo seleccionado o no introduzca ninguna extensión de archivo." + +#: ../app/dialogs/file-save-dialog.c:601 +msgid "The given filename cannot be used for exporting" +msgstr "El nombre de archivo dado no se puede usar para exportar" + +#: ../app/dialogs/file-save-dialog.c:602 +msgid "" +"You can use this dialog to export to various file formats. If you want to " +"save the image to the GIMP XCF format, use File→Save instead." +msgstr "" +"Puede usar este diálogo para exportar a diversos formatos de archivo. Si " +"quiere guardar la imagen en el formato XCF de GIMP, use Archivo→Guardar en " +"su lugar." + +#: ../app/dialogs/file-save-dialog.c:605 +msgid "Take me to the Save dialog" +msgstr "Ir al diálogo de guardar" + +#: ../app/dialogs/file-save-dialog.c:609 +msgid "The given filename cannot be used for saving" +msgstr "El nombre de archivo dado no se puede usar para guardar" + +#: ../app/dialogs/file-save-dialog.c:610 +msgid "" +"You can use this dialog to save to the GIMP XCF format. Use File→Export to " +"export to other file formats." +msgstr "" +"Puede usar este diálogo para guardar en el formato XCF de GIMP. Use " +"Archivo→Exportar para exportar a otros formatos de archivo." + +#: ../app/dialogs/file-save-dialog.c:612 +msgid "Take me to the Export dialog" +msgstr "Ir al diálogo de exportar" + +#: ../app/dialogs/file-save-dialog.c:615 ../app/dialogs/file-save-dialog.c:690 +msgid "Extension Mismatch" +msgstr "Incongruencia de la extensión" + +#: ../app/dialogs/file-save-dialog.c:674 +msgid "" +"The given filename does not have any known file extension. Please enter a " +"known file extension or select a file format from the file format list." +msgstr "" +"El nombre de archivo dado no tiene ninguna extensión de archivo. Por favor, " +"introduzca una extensión de archivo conocida o seleccione un formato de " +"archivo de la lista de formatos de archivo." + +#: ../app/dialogs/file-save-dialog.c:706 +msgid "The given file extension does not match the chosen file type." +msgstr "" +"La extensión de archivo dada no concuerda con el tipo de archivo elegido." + +#: ../app/dialogs/file-save-dialog.c:710 +msgid "Do you want to save the image using this name anyway?" +msgstr "¿Seguro que quiere guardar la imagen con este nombre?" + +#: ../app/dialogs/file-save-dialog.c:772 +msgid "Saving canceled" +msgstr "Guardado cancelado" + +#: ../app/dialogs/file-save-dialog.c:780 ../app/widgets/gimpdnd-xds.c:186 +#, c-format +msgid "" +"Saving '%s' failed:\n" +"\n" +"%s" +msgstr "" +"Ha fallado el guardado de «%s»\n" +"\n" +"%s" + +#: ../app/dialogs/grid-dialog.c:85 +msgid "Configure Grid" +msgstr "Configurar la rejilla" + +#: ../app/dialogs/grid-dialog.c:86 +msgid "Configure Image Grid" +msgstr "Configurar la rejilla de la imagen" + +#: ../app/dialogs/grid-dialog.c:152 +msgid "Grid" +msgstr "Rejilla" + +#: ../app/dialogs/image-merge-layers-dialog.c:68 +msgid "Merge Layers" +msgstr "Combinar capas" + +#: ../app/dialogs/image-merge-layers-dialog.c:70 +msgid "Layers Merge Options" +msgstr "Opciones de combinación de capas" + +#: ../app/dialogs/image-merge-layers-dialog.c:76 +msgid "_Merge" +msgstr "Co_mbinar" + +#: ../app/dialogs/image-merge-layers-dialog.c:96 +msgid "Final, Merged Layer should be:" +msgstr "La capa final combinada debería ser:" + +#: ../app/dialogs/image-merge-layers-dialog.c:100 +msgid "Expanded as necessary" +msgstr "Expandida lo necesario" + +#: ../app/dialogs/image-merge-layers-dialog.c:103 +msgid "Clipped to image" +msgstr "Recortada según la imagen" + +#: ../app/dialogs/image-merge-layers-dialog.c:106 +msgid "Clipped to bottom layer" +msgstr "Recortada hasta la capa más baja" + +#: ../app/dialogs/image-merge-layers-dialog.c:114 +msgid "Merge within active _group only" +msgstr "Mezclar solamente dentro del grupo acti_vo" + +#: ../app/dialogs/image-merge-layers-dialog.c:127 +msgid "_Discard invisible layers" +msgstr "_Descartar las capas invisibles" + +#: ../app/dialogs/image-new-dialog.c:97 +msgid "Create a New Image" +msgstr "Crear una imagen nueva" + +#: ../app/dialogs/image-new-dialog.c:135 +#: ../app/dialogs/preferences-dialog.c:2053 +msgid "_Template:" +msgstr "Plan_tilla:" + +#: ../app/dialogs/image-new-dialog.c:316 +msgid "Confirm Image Size" +msgstr "Confirmar el tamaño de la imagen" + +#: ../app/dialogs/image-new-dialog.c:338 +#: ../app/dialogs/image-scale-dialog.c:239 +#, c-format +msgid "You are trying to create an image with a size of %s." +msgstr "Está intentando crear una imagen con un tamaño de %s." + +#: ../app/dialogs/image-new-dialog.c:345 +#, c-format +msgid "" +"An image of the chosen size will use more memory than what is configured as " +"\"Maximum Image Size\" in the Preferences dialog (currently %s)." +msgstr "" +"Una imagen del tamaño elegido usará más memoria de la que está configurada " +"como «Tamaño máximo de la imagen» en el diálogo Preferencias (actualmente " +"%s)." + +#: ../app/dialogs/image-properties-dialog.c:60 +#: ../app/dialogs/image-properties-dialog.c:63 +msgid "Image Properties" +msgstr "Propiedades de la imagen" + +#: ../app/dialogs/image-properties-dialog.c:84 +msgid "Properties" +msgstr "Propiedades" + +#: ../app/dialogs/image-properties-dialog.c:89 +msgid "Color Profile" +msgstr "Perfil de color" + +#: ../app/dialogs/image-properties-dialog.c:94 +msgid "Comment" +msgstr "Comentario" + +#: ../app/dialogs/image-scale-dialog.c:111 +msgctxt "dialog-title" +msgid "Scale Image" +msgstr "Escalar la imagen" + +#: ../app/dialogs/image-scale-dialog.c:205 +msgid "Confirm Scaling" +msgstr "Confirmar escalado" + +#: ../app/dialogs/image-scale-dialog.c:245 +#, c-format +msgid "" +"Scaling the image to the chosen size will make it use more memory than what " +"is configured as \"Maximum Image Size\" in the Preferences dialog (currently " +"%s)." +msgstr "" +"Escalar la imagen al tamaño elegido hará que use más memoria de la que está " +"configurada como «Tamaño máximo de la imagen» en el diálogo Preferencias " +"(actualmente %s)." + +#: ../app/dialogs/image-scale-dialog.c:260 +msgid "" +"Scaling the image to the chosen size will shrink some layers completely away." +msgstr "" +"Escalar la imagen al tamaño elegido encogerá algunas capas hasta desaparecer " +"completamente." + +#: ../app/dialogs/image-scale-dialog.c:264 +msgid "Is this what you want to do?" +msgstr "¿Es eso lo que quiere hacer?" + +#: ../app/dialogs/input-devices-dialog.c:55 +msgid "Configure Input Devices" +msgstr "Configurar los dispositivos de entrada" + +#: ../app/dialogs/keyboard-shortcuts-dialog.c:48 +msgid "Configure Keyboard Shortcuts" +msgstr "Configurar combinaciones de teclas" + +#: ../app/dialogs/keyboard-shortcuts-dialog.c:73 +msgid "" +"To edit a shortcut key, click on the corresponding row and type a new " +"accelerator, or press backspace to clear." +msgstr "" +"Para editar una combinación de teclas, pulse en la fila correspondiente y " +"teclee un acelerador nuevo, o pulse la tecla de retroceso para borrar." + +#: ../app/dialogs/keyboard-shortcuts-dialog.c:81 +msgid "S_ave keyboard shortcuts on exit" +msgstr "_Guardar las combinaciones de teclas al salir" + +#: ../app/dialogs/layer-add-mask-dialog.c:84 +msgid "Add a Mask to the Layer" +msgstr "Añadir una máscara a la capa" + +#: ../app/dialogs/layer-add-mask-dialog.c:112 +msgid "Initialize Layer Mask to:" +msgstr "Iniciar máscara de capa a:" + +#: ../app/dialogs/layer-add-mask-dialog.c:143 +msgid "In_vert mask" +msgstr "In_vertir la máscara" + +#: ../app/dialogs/layer-options-dialog.c:125 +msgid "Layer _name:" +msgstr "_Nombre de la capa:" + +#. The size labels +#: ../app/dialogs/layer-options-dialog.c:139 +#: ../app/tools/gimpmeasuretool.c:1129 +msgid "Width:" +msgstr "Anchura:" + +#: ../app/dialogs/layer-options-dialog.c:145 +#: ../app/tools/gimpmeasuretool.c:1157 +msgid "Height:" +msgstr "Altura:" + +#: ../app/dialogs/layer-options-dialog.c:202 +msgid "Layer Fill Type" +msgstr "Tipo de relleno de la capa" + +#: ../app/dialogs/layer-options-dialog.c:217 +msgid "Set name from _text" +msgstr "Establecer el nombre a partir del _texto" + +#: ../app/dialogs/module-dialog.c:126 +msgid "Module Manager" +msgstr "Gestor de módulos" + +#: ../app/dialogs/module-dialog.c:150 +msgid "You will have to restart GIMP for the changes to take effect." +msgstr "Necesitará reiniciar GIMP para que los cambios tengan efecto." + +#: ../app/dialogs/module-dialog.c:191 +msgid "Module" +msgstr "Módulo" + +#: ../app/dialogs/module-dialog.c:468 +msgid "Only in memory" +msgstr "Sólo en memoria" + +#: ../app/dialogs/module-dialog.c:473 +msgid "No longer available" +msgstr "Ya no se encuentra disponible" + +#: ../app/dialogs/module-dialog.c:498 +msgid "Author:" +msgstr "Autor:" + +#: ../app/dialogs/module-dialog.c:499 +msgid "Version:" +msgstr "Versión:" + +#: ../app/dialogs/module-dialog.c:500 +msgid "Date:" +msgstr "Fecha:" + +#: ../app/dialogs/module-dialog.c:501 +msgid "Copyright:" +msgstr "Copyright:" + +#: ../app/dialogs/module-dialog.c:502 +msgid "Location:" +msgstr "Ubicación:" + +#: ../app/dialogs/offset-dialog.c:108 +msgid "Offset Layer" +msgstr "Desplazar capa" + +#: ../app/dialogs/offset-dialog.c:110 +msgid "Offset Layer Mask" +msgstr "Desplazar la máscara de capa" + +#: ../app/dialogs/offset-dialog.c:112 +msgid "Offset Channel" +msgstr "Desplazar canal" + +#. The offset frame +#: ../app/dialogs/offset-dialog.c:118 ../app/dialogs/offset-dialog.c:152 +#: ../app/dialogs/resize-dialog.c:198 ../app/tools/gimpblendoptions.c:247 +#: ../app/widgets/gimpgrideditor.c:206 +msgid "Offset" +msgstr "Desplazamiento" + +#. offset, used as a verb +#: ../app/dialogs/offset-dialog.c:127 +msgid "_Offset" +msgstr "Desplazamient_o" + +#: ../app/dialogs/offset-dialog.c:184 ../app/dialogs/resize-dialog.c:227 +msgid "_X:" +msgstr "_X:" + +#: ../app/dialogs/offset-dialog.c:186 ../app/dialogs/resize-dialog.c:228 +msgid "_Y:" +msgstr "_Y:" + +#: ../app/dialogs/offset-dialog.c:213 +msgid "Offset by x/_2, y/2" +msgstr "Desplazar en x/_2,y/2" + +#. The edge behavior frame +#: ../app/dialogs/offset-dialog.c:222 +msgid "Edge Behavior" +msgstr "Comportamiento de los bordes" + +#: ../app/dialogs/offset-dialog.c:226 +msgid "_Wrap around" +msgstr "_Volver al principio" + +#: ../app/dialogs/offset-dialog.c:229 +msgid "Fill with _background color" +msgstr "Rellenar con el color del _fondo" + +#: ../app/dialogs/offset-dialog.c:232 +msgid "Make _transparent" +msgstr "Hacer _transparente" + +#: ../app/dialogs/palette-import-dialog.c:154 +msgid "Import a New Palette" +msgstr "Importa una paleta nueva" + +#: ../app/dialogs/palette-import-dialog.c:164 +msgid "_Import" +msgstr "_Importar" + +#. The "Source" frame +#: ../app/dialogs/palette-import-dialog.c:203 +msgid "Select Source" +msgstr "Seleccionar origen" + # Es Degradado -#: ../app/dialogs/palette-import-dialog.c:214 -#: ../app/dialogs/preferences-dialog.c:1930 -msgid "_Gradient" -msgstr "_Degradado" - -#: ../app/dialogs/palette-import-dialog.c:225 -msgid "I_mage" -msgstr "I_magen" - -#: ../app/dialogs/palette-import-dialog.c:239 -msgid "Sample _Merged" -msgstr "Muestra _combinada" - -#: ../app/dialogs/palette-import-dialog.c:251 -msgid "_Selected Pixels only" -msgstr "Sólo los píxeles _seleccionados" - -#: ../app/dialogs/palette-import-dialog.c:263 -msgid "Palette _file" -msgstr "_Archivo de la paleta" - -#. Palette file name entry -#: ../app/dialogs/palette-import-dialog.c:292 -msgid "Select Palette File" -msgstr "Seleccionar archivo de paletas" - -#. The "Import" frame -#: ../app/dialogs/palette-import-dialog.c:303 -msgid "Import Options" -msgstr "Opciones de importación" - -#: ../app/dialogs/palette-import-dialog.c:317 -msgid "New import" -msgstr "Importación nueva" - -#: ../app/dialogs/palette-import-dialog.c:319 -msgid "Palette _name:" -msgstr "_Nombre de la paleta:" - -#: ../app/dialogs/palette-import-dialog.c:325 -msgid "N_umber of colors:" -msgstr "_Número de colores:" - -#: ../app/dialogs/palette-import-dialog.c:338 -msgid "C_olumns:" -msgstr "_Columnas:" - -#: ../app/dialogs/palette-import-dialog.c:350 -msgid "I_nterval:" -msgstr "_Intervalo:" - -#. The "Preview" frame -#: ../app/dialogs/palette-import-dialog.c:361 -msgid "Preview" -msgstr "Vista previa" - -#: ../app/dialogs/palette-import-dialog.c:382 -msgid "The selected source contains no colors." -msgstr "La fuente seleccionada no contiene colores." - -#: ../app/dialogs/preferences-dialog.c:268 -msgid "Reset All Preferences" -msgstr "Restablecer todas las preferencias" - -#: ../app/dialogs/preferences-dialog.c:286 -msgid "Do you really want to reset all preferences to default values?" -msgstr "" -"¿Realmente desea reiniciar todas las preferencias a sus valores " -"predeterminados?" - -#: ../app/dialogs/preferences-dialog.c:356 -msgid "You will have to restart GIMP for the following changes to take effect:" -msgstr "" -"Necesitará reiniciar GIMP para que los siguientes cambios tengan efecto:" - -#: ../app/dialogs/preferences-dialog.c:538 -msgid "" -"Your keyboard shortcuts will be reset to default values the next time you " -"start GIMP." -msgstr "" -"Sus combinaciones de teclas se restablecerán a los valores de fábrica la " -"próxima vez que inicie GIMP." - -#: ../app/dialogs/preferences-dialog.c:549 -msgid "Remove all Keyboard Shortcuts" -msgstr "Eliminar todas las combinaciones de teclas" - -#: ../app/dialogs/preferences-dialog.c:571 -msgid "Do you really want to remove all keyboard shortcuts from all menus?" -msgstr "" -"¿Realmente desea eliminar todas las combinaciones de teclas de todos los " -"menús?" - -#: ../app/dialogs/preferences-dialog.c:612 -msgid "" -"Your window setup will be reset to default values the next time you start " -"GIMP." -msgstr "" -"Su configuración de ventanas se restablecerá al valor de fábrica la próxima " -"vez que inicie GIMP." - -#: ../app/dialogs/preferences-dialog.c:647 -msgid "" -"Your input device settings will be reset to default values the next time you " -"start GIMP." -msgstr "" -"Su configuración de dispositivos de entrada se restablecerá a los valores de " -"fábrica la siguiente vez que inicie GIMP." - -#: ../app/dialogs/preferences-dialog.c:682 -msgid "" -"Your tool options will be reset to default values the next time you start " -"GIMP." -msgstr "" -"Sus opciones de herramientas se restablecerán a los valores predeterminados " -"la próxima vez que inicie GIMP." - -#: ../app/dialogs/preferences-dialog.c:1268 -msgid "Show _menubar" -msgstr "Mostrar la barra de _menús" - -#: ../app/dialogs/preferences-dialog.c:1272 -msgid "Show _rulers" -msgstr "Mostrar las _reglas" - -#: ../app/dialogs/preferences-dialog.c:1275 -msgid "Show scroll_bars" -msgstr "Mostrar las _barras de desplazamiento" - -#: ../app/dialogs/preferences-dialog.c:1278 -msgid "Show s_tatusbar" -msgstr "Mostrar la barra de es_tado" - -#: ../app/dialogs/preferences-dialog.c:1286 -msgid "Show s_election" -msgstr "Mostrar la s_elección" - -#: ../app/dialogs/preferences-dialog.c:1289 -msgid "Show _layer boundary" -msgstr "Mostrar el _límite de la capa" - -#: ../app/dialogs/preferences-dialog.c:1292 -msgid "Show _guides" -msgstr "Mostra_r las guías" - -#: ../app/dialogs/preferences-dialog.c:1295 -msgid "Show gri_d" -msgstr "Mostrar la _rejilla" - -#: ../app/dialogs/preferences-dialog.c:1301 -msgid "Canvas _padding mode:" -msgstr "Modo de _relleno del lienzo:" - -#: ../app/dialogs/preferences-dialog.c:1306 -msgid "Custom p_adding color:" -msgstr "Color de _relleno del lienzo:" - -#: ../app/dialogs/preferences-dialog.c:1307 -msgid "Select Custom Canvas Padding Color" -msgstr "Establecer el color personalizado de relleno del lienzo" - -#: ../app/dialogs/preferences-dialog.c:1405 -msgid "Preferences" -msgstr "Preferencias" - -#: ../app/dialogs/preferences-dialog.c:1518 -#: ../app/dialogs/preferences-dialog.c:2790 -msgid "Environment" -msgstr "Entorno" - -#: ../app/dialogs/preferences-dialog.c:1532 -msgid "Resource Consumption" -msgstr "Consumo de recursos" - -#: ../app/dialogs/preferences-dialog.c:1542 -msgid "Minimal number of _undo levels:" -msgstr "Número mínimo de niveles de _deshacer:" - -#: ../app/dialogs/preferences-dialog.c:1545 -msgid "Maximum undo _memory:" -msgstr "_Memoria máxima para deshacer:" - -#: ../app/dialogs/preferences-dialog.c:1548 -msgid "Tile cache _size:" -msgstr "Tamaño del caché de _mosaico:" - -#: ../app/dialogs/preferences-dialog.c:1551 -msgid "Maximum _new image size:" -msgstr "Tamaño máximo de la imagen _nueva:" - -#: ../app/dialogs/preferences-dialog.c:1556 -msgid "Number of _processors to use:" -msgstr "Número de _procesadores que usar:" - -#. Image Thumbnails -#: ../app/dialogs/preferences-dialog.c:1561 -msgid "Image Thumbnails" -msgstr "Miniaturas de imágenes" - -#: ../app/dialogs/preferences-dialog.c:1566 -msgid "Size of _thumbnails:" -msgstr "Tamaño de las _miniaturas:" - -#: ../app/dialogs/preferences-dialog.c:1570 -msgid "Maximum _filesize for thumbnailing:" -msgstr "Tamaño _máximo del archivo para miniaturizar:" - -#: ../app/dialogs/preferences-dialog.c:1580 -msgid "Keep record of used files in the Recent Documents list" -msgstr "" -"Mantener un registro de los archivos utilizados en la lista de documentos " -"recientes" - -#: ../app/dialogs/preferences-dialog.c:1589 -msgid "User Interface" -msgstr "Interfaz de usuario" - -#: ../app/dialogs/preferences-dialog.c:1592 -msgid "Interface" -msgstr "Interfaz" - -#: ../app/dialogs/preferences-dialog.c:1602 -msgid "Language" -msgstr "Idioma" - -#. Previews -#: ../app/dialogs/preferences-dialog.c:1608 -msgid "Previews" -msgstr "Vistas previas" - -#: ../app/dialogs/preferences-dialog.c:1611 -msgid "_Enable layer & channel previews" -msgstr "_Activar las vistas previas de las capas y los canales" - -#: ../app/dialogs/preferences-dialog.c:1617 -msgid "_Default layer & channel preview size:" -msgstr "Tamaño predeterminado de las vistas previas de _capas y canales:" - -#: ../app/dialogs/preferences-dialog.c:1620 -msgid "Na_vigation preview size:" -msgstr "Tamaño de vistas previas de _navegación:" - -#. Keyboard Shortcuts -#: ../app/dialogs/preferences-dialog.c:1624 -msgid "Keyboard Shortcuts" -msgstr "Combinaciones de teclas" - -#: ../app/dialogs/preferences-dialog.c:1628 -msgid "_Use dynamic keyboard shortcuts" -msgstr "Usar combinaciones de teclas _dinámicas" - -#: ../app/dialogs/preferences-dialog.c:1632 -msgid "Configure _Keyboard Shortcuts..." -msgstr "Configurar las combinaciones de _teclas…" - -#: ../app/dialogs/preferences-dialog.c:1639 -msgid "_Save keyboard shortcuts on exit" -msgstr "_Guardar las combinaciones de teclas al salir" - -#: ../app/dialogs/preferences-dialog.c:1643 -msgid "Save Keyboard Shortcuts _Now" -msgstr "Guardar las combinaciones de teclas _ahora" - -#: ../app/dialogs/preferences-dialog.c:1650 -msgid "_Reset Keyboard Shortcuts to Default Values" -msgstr "_Restablecer las combinaciones de teclas a los valores predeterminados" - -#: ../app/dialogs/preferences-dialog.c:1659 -msgid "Remove _All Keyboard Shortcuts" -msgstr "Eliminar _todas las combinaciones de teclas" - -#: ../app/dialogs/preferences-dialog.c:1671 -#: ../app/dialogs/preferences-dialog.c:1710 -msgid "Theme" -msgstr "Tema" - -#: ../app/dialogs/preferences-dialog.c:1680 -msgid "Select Theme" -msgstr "Seleccionar un tema" - -#: ../app/dialogs/preferences-dialog.c:1762 -msgid "Reload C_urrent Theme" -msgstr "Recargar el tema act_ual" - -#: ../app/dialogs/preferences-dialog.c:1774 -msgid "Help System" -msgstr "Sistema de ayuda" - -#. General -#: ../app/dialogs/preferences-dialog.c:1786 -#: ../app/dialogs/preferences-dialog.c:1873 -#: ../app/dialogs/preferences-dialog.c:2086 -#: ../app/widgets/gimpcontrollereditor.c:185 -msgid "General" -msgstr "General" - -#: ../app/dialogs/preferences-dialog.c:1789 -msgid "Show _tooltips" -msgstr "Mostrar _consejos" - -#: ../app/dialogs/preferences-dialog.c:1792 -msgid "Show help _buttons" -msgstr "Mostrar _botones de ayuda" - -#: ../app/dialogs/preferences-dialog.c:1805 -msgid "Use the online version" -msgstr "Usar la versión en línea" - -#: ../app/dialogs/preferences-dialog.c:1806 -msgid "Use a locally installed copy" -msgstr "Usar una copia instalada localmente" - -#: ../app/dialogs/preferences-dialog.c:1807 -msgid "User manual:" -msgstr "Manual del usuario:" - -#: ../app/dialogs/preferences-dialog.c:1814 -msgid "There's a local installation of the user manual." -msgstr "Existe una instalación local del manual de usuario." - -#: ../app/dialogs/preferences-dialog.c:1819 -msgid "The user manual is not installed locally." -msgstr "El manual del usuario no está instalado localmente." - -#: ../app/dialogs/preferences-dialog.c:1844 -msgid "Help Browser" -msgstr "Visor de ayuda" - -#: ../app/dialogs/preferences-dialog.c:1848 -msgid "H_elp browser to use:" -msgstr "_Visor de ayuda:" - -#: ../app/dialogs/preferences-dialog.c:1876 -msgid "_Save tool options on exit" -msgstr "G_uardar las opciones de herramientas al salir" - -#: ../app/dialogs/preferences-dialog.c:1880 -msgid "Save Tool Options _Now" -msgstr "Guardar las opciones de herramientas _ahora" - -#: ../app/dialogs/preferences-dialog.c:1887 -msgid "_Reset Saved Tool Options to Default Values" -msgstr "" -"R_estaurar las opciones de herramientas guardadas a los valores " -"predeterminados" - -#. Snapping Distance -#: ../app/dialogs/preferences-dialog.c:1897 -msgid "Guide & Grid Snapping" -msgstr "Ajuste a la rejilla y la guía" - -#: ../app/dialogs/preferences-dialog.c:1902 -msgid "_Snap distance:" -msgstr "Distancia del ajus_te:" - -#: ../app/dialogs/preferences-dialog.c:1910 -msgid "Default _interpolation:" -msgstr "_Interpolación predeterminada:" - -#. Global Brush, Pattern, ... -#: ../app/dialogs/preferences-dialog.c:1917 -msgid "Paint Options Shared Between Tools" -msgstr "Opciones de pintado compartidas entre las herramientas" - -#: ../app/dialogs/preferences-dialog.c:1921 -msgid "_Brush" -msgstr "_Pincel" - -#: ../app/dialogs/preferences-dialog.c:1924 -msgid "_Dynamics" -msgstr "_Dinámica" - -#: ../app/dialogs/preferences-dialog.c:1927 -msgid "_Pattern" -msgstr "_Patrón" - -#. Move Tool -#: ../app/dialogs/preferences-dialog.c:1934 -msgid "Move Tool" -msgstr "Herramienta mover" - -#: ../app/dialogs/preferences-dialog.c:1938 -msgid "Set layer or path as active" -msgstr "Definir capa o ruta como activa" - -#. Appearance -#: ../app/dialogs/preferences-dialog.c:1963 -#: ../app/dialogs/preferences-dialog.c:2162 -#: ../app/widgets/gimpgrideditor.c:134 -msgid "Appearance" -msgstr "Apariencia" - -#: ../app/dialogs/preferences-dialog.c:1967 -msgid "Show _foreground & background color" -msgstr "Mostrar color de _fondo y frente" - -#: ../app/dialogs/preferences-dialog.c:1971 -msgid "Show active _brush, pattern & gradient" -msgstr "Mostrar _pinceles, patrones y degradados activos" - -#: ../app/dialogs/preferences-dialog.c:1975 -msgid "Show active _image" -msgstr "Mostrar imagen _activa" - -#. Tool Editor -#: ../app/dialogs/preferences-dialog.c:1983 -msgid "Tools configuration" -msgstr "Configuración de las herramientas" - -#: ../app/dialogs/preferences-dialog.c:1998 -msgid "Default New Image" -msgstr "Imagen nueva predeterminada" - -#: ../app/dialogs/preferences-dialog.c:2001 -msgid "Default Image" -msgstr "Imagen predeterminada" - -#: ../app/dialogs/preferences-dialog.c:2035 -msgid "Set the default Quick Mask color" -msgstr "Establecer el color predeterminado de la máscara rápida" - -#: ../app/dialogs/preferences-dialog.c:2041 -msgid "Quick Mask color:" -msgstr "Color de la máscara rápida:" - -#: ../app/dialogs/preferences-dialog.c:2051 -msgid "Default Image Grid" -msgstr "Rejilla de imagen predeterminada" - -#: ../app/dialogs/preferences-dialog.c:2054 -msgid "Default Grid" -msgstr "Rejilla predeterminada" - -#: ../app/dialogs/preferences-dialog.c:2074 -msgid "Image Windows" -msgstr "Ventanas de imagen" - -#: ../app/dialogs/preferences-dialog.c:2089 -msgid "Use \"_Dot for dot\" by default" -msgstr "Usar «p_unto por punto» de forma predeterminada" - -#: ../app/dialogs/preferences-dialog.c:2095 -msgid "Marching _ants speed:" -msgstr "Velocid_ad del «desfile de hormigas»:" - -#. Zoom & Resize Behavior -#: ../app/dialogs/preferences-dialog.c:2099 -msgid "Zoom & Resize Behavior" -msgstr "Comportamiento de la redimensión y la ampliación" - -#: ../app/dialogs/preferences-dialog.c:2103 -msgid "Resize window on _zoom" -msgstr "Redimensionar la ventana al a_mpliar" - -#: ../app/dialogs/preferences-dialog.c:2106 -msgid "Resize window on image _size change" -msgstr "Redimen_sionar la ventana al cambiar el tamaño de la imagen" - -#: ../app/dialogs/preferences-dialog.c:2112 -msgid "Fit to window" -msgstr "Ajustar a la ventana" - -#: ../app/dialogs/preferences-dialog.c:2114 -msgid "Initial zoom _ratio:" -msgstr "_Proporción de ampliación inicial:" - -#. Space Bar -#: ../app/dialogs/preferences-dialog.c:2118 -msgid "Space Bar" -msgstr "Barra espaciadora" - -#: ../app/dialogs/preferences-dialog.c:2124 -msgid "_While space bar is pressed:" -msgstr "_Mientras se pulsa la barra espaciadora:" - -#. Mouse Pointers -#: ../app/dialogs/preferences-dialog.c:2128 -msgid "Mouse Pointers" -msgstr "Punteros del ratón" - -#: ../app/dialogs/preferences-dialog.c:2132 -msgid "Show _brush outline" -msgstr "Mostrar el contorno del _pincel" - -#: ../app/dialogs/preferences-dialog.c:2135 -msgid "Show pointer for paint _tools" -msgstr "Mostrar el puntero de las herramientas de _pintura" - -#: ../app/dialogs/preferences-dialog.c:2141 -msgid "Pointer _mode:" -msgstr "_Modo del puntero:" - -#: ../app/dialogs/preferences-dialog.c:2144 -msgid "Pointer re_ndering:" -msgstr "Re_nderizado del puntero:" - -#: ../app/dialogs/preferences-dialog.c:2147 -msgid "Pointer _handedness:" -msgstr "Puntero diestro/_zurdo:" - -#: ../app/dialogs/preferences-dialog.c:2159 -msgid "Image Window Appearance" -msgstr "Apariencia de la ventana de la imagen" - -#: ../app/dialogs/preferences-dialog.c:2170 -msgid "Default Appearance in Normal Mode" -msgstr "Apariencia predeterminada en el modo normal" - -#: ../app/dialogs/preferences-dialog.c:2175 -msgid "Default Appearance in Fullscreen Mode" -msgstr "Apariencia predeterminada en el modo de pantalla completa" - -#: ../app/dialogs/preferences-dialog.c:2184 -msgid "Image Title & Statusbar Format" -msgstr "Formato del título de imagen y la barra de estado" - -#: ../app/dialogs/preferences-dialog.c:2187 -msgid "Title & Status" -msgstr "Título y estado" - -#: ../app/dialogs/preferences-dialog.c:2205 -msgid "Current format" -msgstr "Formato actual" - -#: ../app/dialogs/preferences-dialog.c:2206 -msgid "Default format" -msgstr "Formato predeterminado" - -#: ../app/dialogs/preferences-dialog.c:2207 -msgid "Show zoom percentage" -msgstr "Mostrar el porcentaje de ampliación" - -#: ../app/dialogs/preferences-dialog.c:2208 -msgid "Show zoom ratio" -msgstr "Mostrar la relación de ampliación" - -#: ../app/dialogs/preferences-dialog.c:2209 -msgid "Show image size" -msgstr "Mostrar el tamaño de imagen" - -#: ../app/dialogs/preferences-dialog.c:2222 -msgid "Image Title Format" -msgstr "Formato del título de imagen" - -#: ../app/dialogs/preferences-dialog.c:2224 -msgid "Image Statusbar Format" -msgstr "Formato de la barra de estado de la imagen" - -#: ../app/dialogs/preferences-dialog.c:2309 -msgid "Display" -msgstr "Pantalla" - -#. Transparency -#: ../app/dialogs/preferences-dialog.c:2321 -msgid "Transparency" -msgstr "Transparencia" - -#: ../app/dialogs/preferences-dialog.c:2325 -msgid "_Check style:" -msgstr "Estilo de la _cuadrícula:" - -#: ../app/dialogs/preferences-dialog.c:2328 -msgid "Check _size:" -msgstr "Ta_maño de la cuadrícula:" - -#: ../app/dialogs/preferences-dialog.c:2331 -msgid "Monitor Resolution" -msgstr "Resolución de monitor" - +#: ../app/dialogs/palette-import-dialog.c:214 +#: ../app/dialogs/preferences-dialog.c:1967 +msgid "_Gradient" +msgstr "_Degradado" + +#: ../app/dialogs/palette-import-dialog.c:225 +msgid "I_mage" +msgstr "I_magen" + +#: ../app/dialogs/palette-import-dialog.c:239 +msgid "Sample _Merged" +msgstr "Muestra _combinada" + +#: ../app/dialogs/palette-import-dialog.c:251 +msgid "_Selected Pixels only" +msgstr "Sólo los píxeles _seleccionados" + +#: ../app/dialogs/palette-import-dialog.c:263 +msgid "Palette _file" +msgstr "_Archivo de la paleta" + +#. Palette file name entry +#: ../app/dialogs/palette-import-dialog.c:292 +msgid "Select Palette File" +msgstr "Seleccionar archivo de paletas" + +#. The "Import" frame +#: ../app/dialogs/palette-import-dialog.c:303 +msgid "Import Options" +msgstr "Opciones de importación" + +#: ../app/dialogs/palette-import-dialog.c:317 +msgid "New import" +msgstr "Importación nueva" + +#: ../app/dialogs/palette-import-dialog.c:319 +msgid "Palette _name:" +msgstr "_Nombre de la paleta:" + +#: ../app/dialogs/palette-import-dialog.c:325 +msgid "N_umber of colors:" +msgstr "_Número de colores:" + +#: ../app/dialogs/palette-import-dialog.c:338 +msgid "C_olumns:" +msgstr "_Columnas:" + +#: ../app/dialogs/palette-import-dialog.c:350 +msgid "I_nterval:" +msgstr "_Intervalo:" + +#. The "Preview" frame +#: ../app/dialogs/palette-import-dialog.c:361 +msgid "Preview" +msgstr "Vista previa" + +#: ../app/dialogs/palette-import-dialog.c:382 +msgid "The selected source contains no colors." +msgstr "La fuente seleccionada no contiene colores." + +#: ../app/dialogs/preferences-dialog.c:266 +msgid "Reset All Preferences" +msgstr "Restablecer todas las preferencias" + +#: ../app/dialogs/preferences-dialog.c:284 +msgid "Do you really want to reset all preferences to default values?" +msgstr "" +"¿Realmente desea reiniciar todas las preferencias a sus valores " +"predeterminados?" + +#: ../app/dialogs/preferences-dialog.c:362 +msgid "You will have to restart GIMP for the following changes to take effect:" +msgstr "" +"Necesitará reiniciar GIMP para que los siguientes cambios tengan efecto:" + +#: ../app/dialogs/preferences-dialog.c:544 +msgid "" +"Your keyboard shortcuts will be reset to default values the next time you " +"start GIMP." +msgstr "" +"Sus combinaciones de teclas se restablecerán a los valores de fábrica la " +"próxima vez que inicie GIMP." + +#: ../app/dialogs/preferences-dialog.c:555 +msgid "Remove all Keyboard Shortcuts" +msgstr "Eliminar todas las combinaciones de teclas" + +#: ../app/dialogs/preferences-dialog.c:577 +msgid "Do you really want to remove all keyboard shortcuts from all menus?" +msgstr "" +"¿Realmente desea eliminar todas las combinaciones de teclas de todos los " +"menús?" + +#: ../app/dialogs/preferences-dialog.c:618 +msgid "" +"Your window setup will be reset to default values the next time you start " +"GIMP." +msgstr "" +"Su configuración de ventanas se restablecerá al valor de fábrica la próxima " +"vez que inicie GIMP." + +#: ../app/dialogs/preferences-dialog.c:653 +msgid "" +"Your input device settings will be reset to default values the next time you " +"start GIMP." +msgstr "" +"Su configuración de dispositivos de entrada se restablecerá a los valores de " +"fábrica la siguiente vez que inicie GIMP." + +#: ../app/dialogs/preferences-dialog.c:688 +msgid "" +"Your tool options will be reset to default values the next time you start " +"GIMP." +msgstr "" +"Sus opciones de herramientas se restablecerán a los valores predeterminados " +"la próxima vez que inicie GIMP." + +#: ../app/dialogs/preferences-dialog.c:1303 +msgid "Show _menubar" +msgstr "Mostrar la barra de _menús" + +#: ../app/dialogs/preferences-dialog.c:1307 +msgid "Show _rulers" +msgstr "Mostrar las _reglas" + +#: ../app/dialogs/preferences-dialog.c:1310 +msgid "Show scroll_bars" +msgstr "Mostrar las _barras de desplazamiento" + +#: ../app/dialogs/preferences-dialog.c:1313 +msgid "Show s_tatusbar" +msgstr "Mostrar la barra de es_tado" + +#: ../app/dialogs/preferences-dialog.c:1321 +msgid "Show s_election" +msgstr "Mostrar la s_elección" + +#: ../app/dialogs/preferences-dialog.c:1324 +msgid "Show _layer boundary" +msgstr "Mostrar el _límite de la capa" + +#: ../app/dialogs/preferences-dialog.c:1327 +msgid "Show _guides" +msgstr "Mostra_r las guías" + +#: ../app/dialogs/preferences-dialog.c:1330 +msgid "Show gri_d" +msgstr "Mostrar la _rejilla" + +#: ../app/dialogs/preferences-dialog.c:1336 +msgid "Canvas _padding mode:" +msgstr "Modo de _relleno del lienzo:" + +#: ../app/dialogs/preferences-dialog.c:1341 +msgid "Custom p_adding color:" +msgstr "Color de _relleno del lienzo:" + +#: ../app/dialogs/preferences-dialog.c:1342 +msgid "Select Custom Canvas Padding Color" +msgstr "Establecer el color personalizado de relleno del lienzo" + +#: ../app/dialogs/preferences-dialog.c:1440 +msgid "Preferences" +msgstr "Preferencias" + +#: ../app/dialogs/preferences-dialog.c:1553 +#: ../app/dialogs/preferences-dialog.c:2827 +msgid "Environment" +msgstr "Entorno" + +#: ../app/dialogs/preferences-dialog.c:1567 +msgid "Resource Consumption" +msgstr "Consumo de recursos" + +#: ../app/dialogs/preferences-dialog.c:1577 +msgid "Minimal number of _undo levels:" +msgstr "Número mínimo de niveles de _deshacer:" + +#: ../app/dialogs/preferences-dialog.c:1580 +msgid "Maximum undo _memory:" +msgstr "_Memoria máxima para deshacer:" + +#: ../app/dialogs/preferences-dialog.c:1583 +msgid "Tile cache _size:" +msgstr "Tamaño del caché de _mosaico:" + +#: ../app/dialogs/preferences-dialog.c:1586 +msgid "Maximum _new image size:" +msgstr "Tamaño máximo de la imagen _nueva:" + +#: ../app/dialogs/preferences-dialog.c:1591 +msgid "Number of _processors to use:" +msgstr "Número de _procesadores que usar:" + +#. Image Thumbnails +#: ../app/dialogs/preferences-dialog.c:1596 +msgid "Image Thumbnails" +msgstr "Miniaturas de imágenes" + +#: ../app/dialogs/preferences-dialog.c:1601 +msgid "Size of _thumbnails:" +msgstr "Tamaño de las _miniaturas:" + +#: ../app/dialogs/preferences-dialog.c:1605 +msgid "Maximum _filesize for thumbnailing:" +msgstr "Tamaño _máximo del archivo para miniaturizar:" + +#: ../app/dialogs/preferences-dialog.c:1615 +msgid "Keep record of used files in the Recent Documents list" +msgstr "" +"Mantener un registro de los archivos utilizados en la lista de documentos " +"recientes" + +#: ../app/dialogs/preferences-dialog.c:1624 +msgid "User Interface" +msgstr "Interfaz de usuario" + +#: ../app/dialogs/preferences-dialog.c:1627 +msgid "Interface" +msgstr "Interfaz" + +#: ../app/dialogs/preferences-dialog.c:1637 +msgid "Language" +msgstr "Idioma" + +#. Previews +#: ../app/dialogs/preferences-dialog.c:1643 +msgid "Previews" +msgstr "Vistas previas" + +#: ../app/dialogs/preferences-dialog.c:1646 +msgid "_Enable layer & channel previews" +msgstr "_Activar las vistas previas de las capas y los canales" + +#: ../app/dialogs/preferences-dialog.c:1652 +msgid "_Default layer & channel preview size:" +msgstr "Tamaño predeterminado de las vistas previas de _capas y canales:" + +#: ../app/dialogs/preferences-dialog.c:1655 +msgid "Na_vigation preview size:" +msgstr "Tamaño de vistas previas de _navegación:" + +#. Keyboard Shortcuts +#: ../app/dialogs/preferences-dialog.c:1659 +msgid "Keyboard Shortcuts" +msgstr "Combinaciones de teclas" + +#: ../app/dialogs/preferences-dialog.c:1663 +msgid "_Use dynamic keyboard shortcuts" +msgstr "Usar combinaciones de teclas _dinámicas" + +#: ../app/dialogs/preferences-dialog.c:1667 +msgid "Configure _Keyboard Shortcuts..." +msgstr "Configurar las combinaciones de _teclas…" + +#: ../app/dialogs/preferences-dialog.c:1674 +msgid "_Save keyboard shortcuts on exit" +msgstr "_Guardar las combinaciones de teclas al salir" + +#: ../app/dialogs/preferences-dialog.c:1678 +msgid "Save Keyboard Shortcuts _Now" +msgstr "Guardar las combinaciones de teclas _ahora" + +#: ../app/dialogs/preferences-dialog.c:1685 +msgid "_Reset Keyboard Shortcuts to Default Values" +msgstr "_Restablecer las combinaciones de teclas a los valores predeterminados" + +#: ../app/dialogs/preferences-dialog.c:1694 +msgid "Remove _All Keyboard Shortcuts" +msgstr "Eliminar _todas las combinaciones de teclas" + +#: ../app/dialogs/preferences-dialog.c:1706 +#: ../app/dialogs/preferences-dialog.c:1745 +msgid "Theme" +msgstr "Tema" + +#: ../app/dialogs/preferences-dialog.c:1715 +msgid "Select Theme" +msgstr "Seleccionar un tema" + +#: ../app/dialogs/preferences-dialog.c:1797 +msgid "Reload C_urrent Theme" +msgstr "Recargar el tema act_ual" + +#: ../app/dialogs/preferences-dialog.c:1809 +msgid "Help System" +msgstr "Sistema de ayuda" + +#. General +#: ../app/dialogs/preferences-dialog.c:1821 +#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:2123 +#: ../app/widgets/gimpcontrollereditor.c:185 +msgid "General" +msgstr "General" + +#: ../app/dialogs/preferences-dialog.c:1824 +msgid "Show _tooltips" +msgstr "Mostrar _consejos" + +#: ../app/dialogs/preferences-dialog.c:1827 +msgid "Show help _buttons" +msgstr "Mostrar _botones de ayuda" + +#: ../app/dialogs/preferences-dialog.c:1832 +msgid "Use the online version" +msgstr "Usar la versión en línea" + +#: ../app/dialogs/preferences-dialog.c:1833 +msgid "Use a locally installed copy" +msgstr "Usar una copia instalada localmente" + +#: ../app/dialogs/preferences-dialog.c:1834 +msgid "User manual:" +msgstr "Manual del usuario:" + +#: ../app/dialogs/preferences-dialog.c:1841 +msgid "There's a local installation of the user manual." +msgstr "Existe una instalación local del manual de usuario." + +#: ../app/dialogs/preferences-dialog.c:1847 +msgid "The user manual is not installed locally." +msgstr "El manual del usuario no está instalado localmente." + +#. If there is no webkit available, assume we are on a platform +#. * that doesn't use the help browser, so don't bother showing +#. * the combo. +#. +#: ../app/dialogs/preferences-dialog.c:1860 +msgid "Help Browser" +msgstr "Visor de ayuda" + +#: ../app/dialogs/preferences-dialog.c:1867 +msgid "H_elp browser to use:" +msgstr "_Visor de ayuda:" + +#: ../app/dialogs/preferences-dialog.c:1873 +msgid "" +"The GIMP help browser doesn't seem to be installed. Using the web browser " +"instead." +msgstr "" +"Parece que el explorador de ayuda de GIMP no está instalado. Use el " +"navegador web en su lugar." + +#: ../app/dialogs/preferences-dialog.c:1913 +msgid "_Save tool options on exit" +msgstr "G_uardar las opciones de herramientas al salir" + +#: ../app/dialogs/preferences-dialog.c:1917 +msgid "Save Tool Options _Now" +msgstr "Guardar las opciones de herramientas _ahora" + +#: ../app/dialogs/preferences-dialog.c:1924 +msgid "_Reset Saved Tool Options to Default Values" +msgstr "" +"R_estaurar las opciones de herramientas guardadas a los valores " +"predeterminados" + +#. Snapping Distance +#: ../app/dialogs/preferences-dialog.c:1934 +msgid "Guide & Grid Snapping" +msgstr "Ajuste a la rejilla y la guía" + +#: ../app/dialogs/preferences-dialog.c:1939 +msgid "_Snap distance:" +msgstr "Distancia del ajus_te:" + +#: ../app/dialogs/preferences-dialog.c:1947 +msgid "Default _interpolation:" +msgstr "_Interpolación predeterminada:" + +#. Global Brush, Pattern, ... +#: ../app/dialogs/preferences-dialog.c:1954 +msgid "Paint Options Shared Between Tools" +msgstr "Opciones de pintado compartidas entre las herramientas" + +#: ../app/dialogs/preferences-dialog.c:1958 +msgid "_Brush" +msgstr "_Pincel" + +#: ../app/dialogs/preferences-dialog.c:1961 +msgid "_Dynamics" +msgstr "_Dinámica" + +#: ../app/dialogs/preferences-dialog.c:1964 +msgid "_Pattern" +msgstr "_Patrón" + +#. Move Tool +#: ../app/dialogs/preferences-dialog.c:1971 +msgid "Move Tool" +msgstr "Herramienta mover" + +#: ../app/dialogs/preferences-dialog.c:1975 +msgid "Set layer or path as active" +msgstr "Definir capa o ruta como activa" + +#. Appearance +#: ../app/dialogs/preferences-dialog.c:2000 +#: ../app/dialogs/preferences-dialog.c:2199 +#: ../app/widgets/gimpgrideditor.c:134 +msgid "Appearance" +msgstr "Apariencia" + +#: ../app/dialogs/preferences-dialog.c:2004 +msgid "Show _foreground & background color" +msgstr "Mostrar color de _fondo y frente" + +#: ../app/dialogs/preferences-dialog.c:2008 +msgid "Show active _brush, pattern & gradient" +msgstr "Mostrar _pinceles, patrones y degradados activos" + +#: ../app/dialogs/preferences-dialog.c:2012 +msgid "Show active _image" +msgstr "Mostrar imagen _activa" + +#. Tool Editor +#: ../app/dialogs/preferences-dialog.c:2020 +msgid "Tools configuration" +msgstr "Configuración de las herramientas" + +#: ../app/dialogs/preferences-dialog.c:2035 +msgid "Default New Image" +msgstr "Imagen nueva predeterminada" + +#: ../app/dialogs/preferences-dialog.c:2038 +msgid "Default Image" +msgstr "Imagen predeterminada" + +#: ../app/dialogs/preferences-dialog.c:2072 +msgid "Set the default Quick Mask color" +msgstr "Establecer el color predeterminado de la máscara rápida" + +#: ../app/dialogs/preferences-dialog.c:2078 +msgid "Quick Mask color:" +msgstr "Color de la máscara rápida:" + +#: ../app/dialogs/preferences-dialog.c:2088 +msgid "Default Image Grid" +msgstr "Rejilla de imagen predeterminada" + +#: ../app/dialogs/preferences-dialog.c:2091 +msgid "Default Grid" +msgstr "Rejilla predeterminada" + +#: ../app/dialogs/preferences-dialog.c:2111 +msgid "Image Windows" +msgstr "Ventanas de imagen" + +#: ../app/dialogs/preferences-dialog.c:2126 +msgid "Use \"_Dot for dot\" by default" +msgstr "Usar «p_unto por punto» de forma predeterminada" + +#: ../app/dialogs/preferences-dialog.c:2132 +msgid "Marching _ants speed:" +msgstr "Velocid_ad del «desfile de hormigas»:" + +#. Zoom & Resize Behavior +#: ../app/dialogs/preferences-dialog.c:2136 +msgid "Zoom & Resize Behavior" +msgstr "Comportamiento de la redimensión y la ampliación" + +#: ../app/dialogs/preferences-dialog.c:2140 +msgid "Resize window on _zoom" +msgstr "Redimensionar la ventana al a_mpliar" + +#: ../app/dialogs/preferences-dialog.c:2143 +msgid "Resize window on image _size change" +msgstr "Redimen_sionar la ventana al cambiar el tamaño de la imagen" + +#: ../app/dialogs/preferences-dialog.c:2149 +msgid "Fit to window" +msgstr "Ajustar a la ventana" + +#: ../app/dialogs/preferences-dialog.c:2151 +msgid "Initial zoom _ratio:" +msgstr "_Proporción de ampliación inicial:" + +#. Space Bar +#: ../app/dialogs/preferences-dialog.c:2155 +msgid "Space Bar" +msgstr "Barra espaciadora" + +#: ../app/dialogs/preferences-dialog.c:2161 +msgid "_While space bar is pressed:" +msgstr "_Mientras se pulsa la barra espaciadora:" + +#. Mouse Pointers +#: ../app/dialogs/preferences-dialog.c:2165 +msgid "Mouse Pointers" +msgstr "Punteros del ratón" + +#: ../app/dialogs/preferences-dialog.c:2169 +msgid "Show _brush outline" +msgstr "Mostrar el contorno del _pincel" + +#: ../app/dialogs/preferences-dialog.c:2172 +msgid "Show pointer for paint _tools" +msgstr "Mostrar el puntero de las herramientas de _pintura" + +#: ../app/dialogs/preferences-dialog.c:2178 +msgid "Pointer _mode:" +msgstr "_Modo del puntero:" + +#: ../app/dialogs/preferences-dialog.c:2181 +msgid "Pointer re_ndering:" +msgstr "Re_nderizado del puntero:" + +#: ../app/dialogs/preferences-dialog.c:2184 +msgid "Pointer _handedness:" +msgstr "Puntero diestro/_zurdo:" + +#: ../app/dialogs/preferences-dialog.c:2196 +msgid "Image Window Appearance" +msgstr "Apariencia de la ventana de la imagen" + +#: ../app/dialogs/preferences-dialog.c:2207 +msgid "Default Appearance in Normal Mode" +msgstr "Apariencia predeterminada en el modo normal" + +#: ../app/dialogs/preferences-dialog.c:2212 +msgid "Default Appearance in Fullscreen Mode" +msgstr "Apariencia predeterminada en el modo de pantalla completa" + +#: ../app/dialogs/preferences-dialog.c:2221 +msgid "Image Title & Statusbar Format" +msgstr "Formato del título de imagen y la barra de estado" + +#: ../app/dialogs/preferences-dialog.c:2224 +msgid "Title & Status" +msgstr "Título y estado" + +#: ../app/dialogs/preferences-dialog.c:2242 +msgid "Current format" +msgstr "Formato actual" + +#: ../app/dialogs/preferences-dialog.c:2243 +msgid "Default format" +msgstr "Formato predeterminado" + +#: ../app/dialogs/preferences-dialog.c:2244 +msgid "Show zoom percentage" +msgstr "Mostrar el porcentaje de ampliación" + +#: ../app/dialogs/preferences-dialog.c:2245 +msgid "Show zoom ratio" +msgstr "Mostrar la relación de ampliación" + +#: ../app/dialogs/preferences-dialog.c:2246 +msgid "Show image size" +msgstr "Mostrar el tamaño de imagen" + +#: ../app/dialogs/preferences-dialog.c:2259 +msgid "Image Title Format" +msgstr "Formato del título de imagen" + +#: ../app/dialogs/preferences-dialog.c:2261 +msgid "Image Statusbar Format" +msgstr "Formato de la barra de estado de la imagen" + +#: ../app/dialogs/preferences-dialog.c:2346 +msgid "Display" +msgstr "Pantalla" + +#. Transparency +#: ../app/dialogs/preferences-dialog.c:2358 +msgid "Transparency" +msgstr "Transparencia" + +#: ../app/dialogs/preferences-dialog.c:2362 +msgid "_Check style:" +msgstr "Estilo de la _cuadrícula:" + +#: ../app/dialogs/preferences-dialog.c:2365 +msgid "Check _size:" +msgstr "Ta_maño de la cuadrícula:" + +#: ../app/dialogs/preferences-dialog.c:2368 +msgid "Monitor Resolution" +msgstr "Resolución de monitor" + # Debe ir en minúsculas por las reglas de estilo -#. Pixels -#: ../app/dialogs/preferences-dialog.c:2335 -#: ../app/display/gimpcursorview.c:206 ../app/widgets/gimpgrideditor.c:199 -#: ../app/widgets/gimpgrideditor.c:231 -msgid "Pixels" -msgstr "píxeles" - -#: ../app/dialogs/preferences-dialog.c:2353 -msgid "Horizontal" -msgstr "Horizontal" - -#: ../app/dialogs/preferences-dialog.c:2355 -msgid "Vertical" -msgstr "Vertical" - -#: ../app/dialogs/preferences-dialog.c:2357 -#: ../app/widgets/gimpimagepropview.c:469 -msgid "ppi" -msgstr "ppp" - -#: ../app/dialogs/preferences-dialog.c:2373 -#, c-format -msgid "_Detect automatically (currently %d × %d ppi)" -msgstr "_Detectar automáticamente (actualmente %d x %d ppp)" - -#: ../app/dialogs/preferences-dialog.c:2391 -msgid "_Enter manually" -msgstr "Introducir _manualmente" - -#: ../app/dialogs/preferences-dialog.c:2406 -msgid "C_alibrate..." -msgstr "C_alibrar…" - -#: ../app/dialogs/preferences-dialog.c:2434 -msgid "Color Management" -msgstr "Gestión del color" - -#: ../app/dialogs/preferences-dialog.c:2454 -msgid "_RGB profile:" -msgstr "Perfil _RGB:" - -#: ../app/dialogs/preferences-dialog.c:2455 -msgid "Select RGB Color Profile" -msgstr "Seleccionar el perfil de color RGB" - -#: ../app/dialogs/preferences-dialog.c:2456 -msgid "_CMYK profile:" -msgstr "Perfil _CMYK:" - -#: ../app/dialogs/preferences-dialog.c:2457 -msgid "Select CMYK Color Profile" -msgstr "Seleccionar el perfil de color CMYK" - -#: ../app/dialogs/preferences-dialog.c:2458 -msgid "_Monitor profile:" -msgstr "Perfil del _monitor:" - -#: ../app/dialogs/preferences-dialog.c:2459 -msgid "Select Monitor Color Profile" -msgstr "Seleccionar el perfil de color del monitor" - -#: ../app/dialogs/preferences-dialog.c:2460 -msgid "_Print simulation profile:" -msgstr "Perfil de simulación de _impresión:" - -#: ../app/dialogs/preferences-dialog.c:2461 -msgid "Select Printer Color Profile" -msgstr "Seleccionar el perfil de color de la impresora" - -#: ../app/dialogs/preferences-dialog.c:2472 -msgid "_Mode of operation:" -msgstr "_Modo de operación:" - -#: ../app/dialogs/preferences-dialog.c:2502 -msgid "_Try to use the system monitor profile" -msgstr "In_tentar utilizar el perfil de monitor del sistema" - -#: ../app/dialogs/preferences-dialog.c:2512 -msgid "_Display rendering intent:" -msgstr "Prueba de renderizado en _pantalla:" - -#: ../app/dialogs/preferences-dialog.c:2521 -msgid "_Softproof rendering intent:" -msgstr "_Pseudoprueba de renderizado:" - -#: ../app/dialogs/preferences-dialog.c:2534 -msgid "Mark out of gamut colors" -msgstr "Marcar a partir de los colores del gamut" - -#: ../app/dialogs/preferences-dialog.c:2539 -msgid "Select Warning Color" -msgstr "Seleccionar el color de las advertencias" - -#: ../app/dialogs/preferences-dialog.c:2552 -msgid "File Open behaviour:" -msgstr "Comportamiento de apertura de archivos:" - -#: ../app/dialogs/preferences-dialog.c:2564 -msgid "Input Devices" -msgstr "Dispositivos de entrada" - -#. Extended Input Devices -#: ../app/dialogs/preferences-dialog.c:2574 -msgid "Extended Input Devices" -msgstr "Dispositivos de entrada extendidos" - -#: ../app/dialogs/preferences-dialog.c:2578 -msgid "Configure E_xtended Input Devices..." -msgstr "Configurar los dispositivos de entrada e_xtendidos…" - -#: ../app/dialogs/preferences-dialog.c:2585 -msgid "_Save input device settings on exit" -msgstr "Guardar la configuración del dispositivo de entrada al _salir" - -#: ../app/dialogs/preferences-dialog.c:2589 -msgid "Save Input Device Settings _Now" -msgstr "Guardar la configuración del dispositivo de entrada _ahora" - -#: ../app/dialogs/preferences-dialog.c:2596 -msgid "_Reset Saved Input Device Settings to Default Values" -msgstr "" -"_Restablecer la configuración guardada del dispositivo de entrada a los " -"valores predeterminados" - -#: ../app/dialogs/preferences-dialog.c:2611 -msgid "Additional Input Controllers" -msgstr "Controles adicionales de entrada" - -#: ../app/dialogs/preferences-dialog.c:2614 -msgid "Input Controllers" -msgstr "Controladores de entrada" - -#: ../app/dialogs/preferences-dialog.c:2630 -msgid "Window Management" -msgstr "Gestión de la ventana" - -#: ../app/dialogs/preferences-dialog.c:2639 -msgid "Window Manager Hints" -msgstr "Hints del gestor de ventanas" - -#: ../app/dialogs/preferences-dialog.c:2645 -msgid "Hint for _docks and toolbox:" -msgstr "Pista para los emprotables y la caja de herramien_tas:" - -#: ../app/dialogs/preferences-dialog.c:2648 -msgid "Focus" -msgstr "Foco" - -#: ../app/dialogs/preferences-dialog.c:2652 -msgid "Activate the _focused image" -msgstr "Activar la imagen con el _foco" - -#. Window Positions -#: ../app/dialogs/preferences-dialog.c:2656 -msgid "Window Positions" -msgstr "Posiciones de las ventanas" - -#: ../app/dialogs/preferences-dialog.c:2659 -msgid "_Save window positions on exit" -msgstr "G_uardar posiciones de ventanas al salir" - -#: ../app/dialogs/preferences-dialog.c:2663 -msgid "Save Window Positions _Now" -msgstr "Guardar las posiciones de las ventanas _ahora" - -#: ../app/dialogs/preferences-dialog.c:2670 -msgid "_Reset Saved Window Positions to Default Values" -msgstr "" -"R_estaurar las posiciones de ventana guardadas a los valores predeterminados" - -#: ../app/dialogs/preferences-dialog.c:2685 -msgid "Folders" -msgstr "Carpetas" - -#: ../app/dialogs/preferences-dialog.c:2705 -msgid "Temporary folder:" -msgstr "Carpeta temporal:" - -#: ../app/dialogs/preferences-dialog.c:2706 -msgid "Select Folder for Temporary Files" -msgstr "Seleccione la carpeta para los archivos temporales" - -#: ../app/dialogs/preferences-dialog.c:2710 -msgid "Swap folder:" -msgstr "Carpeta de intercambio:" - -#: ../app/dialogs/preferences-dialog.c:2711 -msgid "Select Swap Folder" -msgstr "Seleccionar la carpeta de intercambio" - -#: ../app/dialogs/preferences-dialog.c:2746 -msgid "Brush Folders" -msgstr "Carpetas de pinceles" - -#: ../app/dialogs/preferences-dialog.c:2748 -msgid "Select Brush Folders" -msgstr "Seleccionar la carpeta de pinceles" - -#: ../app/dialogs/preferences-dialog.c:2750 -msgid "Dynamics Folders" -msgstr "Carpetas de dinámicas" - -#: ../app/dialogs/preferences-dialog.c:2752 -msgid "Select Dynamics Folders" -msgstr "Selecciona las carpetas de dinámicas" - -#: ../app/dialogs/preferences-dialog.c:2754 -msgid "Pattern Folders" -msgstr "Carpetas de patrones" - -#: ../app/dialogs/preferences-dialog.c:2756 -msgid "Select Pattern Folders" -msgstr "Seleccionar la carpeta de patrones" - -#: ../app/dialogs/preferences-dialog.c:2758 -msgid "Palette Folders" -msgstr "Carpetas de paletas" - -#: ../app/dialogs/preferences-dialog.c:2760 -msgid "Select Palette Folders" -msgstr "Seleccionar las carpetas de paletas" - -#: ../app/dialogs/preferences-dialog.c:2762 -msgid "Gradient Folders" -msgstr "Carpetas de degradados" - -#: ../app/dialogs/preferences-dialog.c:2764 -msgid "Select Gradient Folders" -msgstr "Seleccionar las carpetas de degradados" - -#: ../app/dialogs/preferences-dialog.c:2766 -msgid "Font Folders" -msgstr "Carpetas de tipografías" - -#: ../app/dialogs/preferences-dialog.c:2768 -msgid "Select Font Folders" -msgstr "Seleccionar las carpetas de tipografías" - -#: ../app/dialogs/preferences-dialog.c:2770 -msgid "Tool Preset Folders" -msgstr "Carpetas de preajustes de las herramientas" - -#: ../app/dialogs/preferences-dialog.c:2772 -msgid "Select Tool Preset Folders" -msgstr "Seleccionar las carpetas de preajustes" - -#: ../app/dialogs/preferences-dialog.c:2774 -msgid "Plug-In Folders" -msgstr "Carpetas de complementos" - -#: ../app/dialogs/preferences-dialog.c:2776 -msgid "Select Plug-In Folders" -msgstr "Seleccionar las carpetas de complementos" - -#: ../app/dialogs/preferences-dialog.c:2778 -msgid "Scripts" -msgstr "Guiones" - -#: ../app/dialogs/preferences-dialog.c:2778 -msgid "Script-Fu Folders" -msgstr "Carpetas de scripts-fu" - -#: ../app/dialogs/preferences-dialog.c:2780 -msgid "Select Script-Fu Folders" -msgstr "Seleccionar la carpeta de script-fu" - -#: ../app/dialogs/preferences-dialog.c:2782 -msgid "Module Folders" -msgstr "Carpetas de módulos" - -#: ../app/dialogs/preferences-dialog.c:2784 -msgid "Select Module Folders" -msgstr "Seleccionar las carpetas de módulos" - -#: ../app/dialogs/preferences-dialog.c:2786 -msgid "Interpreters" -msgstr "Intérpretes" - -#: ../app/dialogs/preferences-dialog.c:2786 -msgid "Interpreter Folders" -msgstr "Carpetas del intérprete" - -#: ../app/dialogs/preferences-dialog.c:2788 -msgid "Select Interpreter Folders" -msgstr "Seleccionar las carpetas de los intérpretes" - -#: ../app/dialogs/preferences-dialog.c:2790 -msgid "Environment Folders" -msgstr "Carpetas de entorno" - -#: ../app/dialogs/preferences-dialog.c:2792 -msgid "Select Environment Folders" -msgstr "Seleccionar las carpetas de entorno" - -#: ../app/dialogs/preferences-dialog.c:2794 -msgid "Themes" -msgstr "Temas" - -#: ../app/dialogs/preferences-dialog.c:2794 -msgid "Theme Folders" -msgstr "Carpetas de temas" - -#: ../app/dialogs/preferences-dialog.c:2796 -msgid "Select Theme Folders" -msgstr "Seleccionar las carpetas de temas" - -#: ../app/dialogs/print-size-dialog.c:138 -msgid "Print Size" -msgstr "Tamaño de la impresión" - -#. the image size labels -#: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:193 -#: ../app/widgets/gimptemplateeditor.c:180 -msgid "_Width:" -msgstr "Anc_hura:" - -#: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:197 -#: ../app/widgets/gimptemplateeditor.c:187 -msgid "H_eight:" -msgstr "A_ltura:" - -#. the resolution labels -#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:260 -#: ../app/widgets/gimptemplateeditor.c:309 -msgid "_X resolution:" -msgstr "Resolución _X:" - -#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:263 -#: ../app/widgets/gimptemplateeditor.c:316 -msgid "_Y resolution:" -msgstr "Resolución _Y:" - -#: ../app/dialogs/print-size-dialog.c:240 ../app/widgets/gimpsizebox.c:256 -#, c-format -msgid "pixels/%a" -msgstr "píxeles/%a" - -#: ../app/dialogs/quit-dialog.c:144 -msgid "Quit GIMP" -msgstr "Salir de GIMP" - -#: ../app/dialogs/quit-dialog.c:144 -msgid "Close All Images" -msgstr "Cerrar todas las imágenes" - -#: ../app/dialogs/quit-dialog.c:212 -msgid "If you quit GIMP now, these changes will be lost." -msgstr "Si sale de GIMP ahora, estos cambios se perderán." - -#: ../app/dialogs/quit-dialog.c:215 -msgid "If you close these images now, changes will be lost." -msgstr "Si cierra ahora estas imágenes, se perderán los cambios." - -#: ../app/dialogs/quit-dialog.c:300 -#, c-format -msgid "There is one image with unsaved changes:" -msgid_plural "There are %d images with unsaved changes:" -msgstr[0] "Hay una imagen con cambios no guardados:" -msgstr[1] "Hay %d imágenes con cambios no guardados:" - -#: ../app/dialogs/quit-dialog.c:311 -#, c-format -msgid "Press %s to quit." -msgstr "Pulse %s para salir." - -#: ../app/dialogs/quit-dialog.c:314 -#, c-format -msgid "Press %s to close all images." -msgstr "Pulse %s para cerrar todas las imágenes." - -#: ../app/dialogs/quit-dialog.c:330 -#, c-format -msgid "Press %s to discard all changes and quit." -msgstr "Pulse %s para descartar todos los cambios y salir." - -#: ../app/dialogs/quit-dialog.c:333 -#, c-format -msgid "Press %s to discard all changes and close all images." -msgstr "Pulse %s para descartar todos los cambios y cerrar todas las imágenes." - -#: ../app/dialogs/quit-dialog.c:341 -#: ../app/display/gimpdisplayshell-close.c:180 -msgid "_Discard Changes" -msgstr "_Descartar cambios" - -#: ../app/dialogs/quit-dialog.c:423 -#, c-format -msgid "Exported to %s" -msgstr "Exportado a %s" - -#: ../app/dialogs/resize-dialog.c:119 -msgid "Canvas Size" -msgstr "Tamaño del lienzo" - -#: ../app/dialogs/resize-dialog.c:130 ../app/dialogs/scale-dialog.c:109 -msgid "Layer Size" -msgstr "Tamaño de capas" - -#: ../app/dialogs/resize-dialog.c:295 -msgid "Resize _layers:" -msgstr "Redimensionar _capas:" - -#: ../app/dialogs/resolution-calibrate-dialog.c:69 -msgid "Calibrate Monitor Resolution" -msgstr "Calibrar resolución del monitor" - -#: ../app/dialogs/resolution-calibrate-dialog.c:128 -msgid "Measure the rulers and enter their lengths:" -msgstr "Mida las reglas e introduzca sus longitudes debajo:" - -#: ../app/dialogs/resolution-calibrate-dialog.c:153 -msgid "_Horizontal:" -msgstr "_Horizontal:" - -#: ../app/dialogs/resolution-calibrate-dialog.c:158 -msgid "_Vertical:" -msgstr "_Vertical:" - -#. Image size frame -#: ../app/dialogs/scale-dialog.c:98 ../app/widgets/gimptemplateeditor.c:158 -msgid "Image Size" -msgstr "Tamaño de la imagen" - -#: ../app/dialogs/scale-dialog.c:176 ../app/tools/gimppaintoptions-gui.c:391 -msgid "Quality" -msgstr "Calidad" - -#: ../app/dialogs/scale-dialog.c:188 -msgid "I_nterpolation:" -msgstr "I_nterpolación:" - -#: ../app/dialogs/scale-dialog.c:207 -msgid "" -"Indexed color layers are always scaled without interpolation. The chosen " -"interpolation type will affect channels and layer masks only." -msgstr "" -"Las capas de color indexado se escalan siempre sin interpolación. El tipo de " -"interpolación elegido sólo afectará a las máscaras y canales." - -#: ../app/dialogs/stroke-dialog.c:97 -msgid "Choose Stroke Style" -msgstr "Seleccionar el estilo de trazo" - -#: ../app/dialogs/stroke-dialog.c:214 -msgid "Paint tool:" -msgstr "Herramienta de pintura:" - -#: ../app/dialogs/stroke-dialog.c:228 -msgid "_Emulate brush dynamics" -msgstr "_Emular la dinámica del pincel" - -#: ../app/dialogs/tips-dialog.c:88 -msgid "The GIMP tips file is empty!" -msgstr "¡El archivo de consejos de GIMP está vacío!" - -#: ../app/dialogs/tips-dialog.c:92 -msgid "The GIMP tips file appears to be missing!" -msgstr "¡Parece que falta el archivo de consejos de GIMP!" - -#: ../app/dialogs/tips-dialog.c:94 -#, c-format -msgid "There should be a file called '%s'. Please check your installation." -msgstr "Debería haber un archivo llamado «%s». Compruebe su instalación." - -#: ../app/dialogs/tips-dialog.c:100 -msgid "The GIMP tips file could not be parsed!" -msgstr "¡El archivo de consejos de GIMP no se ha podido analizar!" - -#: ../app/dialogs/tips-dialog.c:128 -msgid "GIMP Tip of the Day" -msgstr "Consejo del día de GIMP" - -#: ../app/dialogs/tips-dialog.c:134 -msgid "_Previous Tip" -msgstr "Consejo _anterior" - -#: ../app/dialogs/tips-dialog.c:140 -msgid "_Next Tip" -msgstr "Consejo _siguiente" - -#. a link to the related section in the user manual -#: ../app/dialogs/tips-dialog.c:193 -msgid "Learn more" -msgstr "Aprender más" - -#. This is a special string to specify the language identifier to -#. look for in the gimp-tips.xml file. Please translate the C in it -#. according to the name of the po file used for gimp-tips.xml. -#. E.g. for the german translation, that would be "tips-locale:de". -#. -#: ../app/dialogs/tips-parser.c:187 -msgid "tips-locale:C" -msgstr "tips-locale:es" - -#: ../app/dialogs/user-install-dialog.c:84 -msgid "GIMP User Installation" -msgstr "Instalación de usuario de GIMP" - -#: ../app/dialogs/user-install-dialog.c:93 -msgid "User installation failed!" -msgstr "¡La instalación de usuario ha fallado!" - -#: ../app/dialogs/user-install-dialog.c:95 -msgid "The GIMP user installation failed; see the log for details." -msgstr "" -"La instalación de usuario de GIMP ha fallado, vea el informe para obtener " -"más detalles." - -#: ../app/dialogs/user-install-dialog.c:98 -msgid "Installation Log" -msgstr "Informe de la instalación" - -#: ../app/dialogs/vectors-export-dialog.c:55 -msgid "Export Path to SVG" -msgstr "Exportar ruta a un SVG" - -#: ../app/dialogs/vectors-export-dialog.c:90 -msgid "Export the active path" -msgstr "Exportar la ruta activa" - -#: ../app/dialogs/vectors-export-dialog.c:91 -msgid "Export all paths from this image" -msgstr "Exportar todas las rutas desde esta imagen" - -#: ../app/dialogs/vectors-import-dialog.c:58 -msgid "Import Paths from SVG" -msgstr "Importar rutas desde SVG" - -#: ../app/dialogs/vectors-import-dialog.c:92 -#: ../app/widgets/gimpprofilechooserdialog.c:122 -msgid "All files (*.*)" -msgstr "Todos los archivos (*.*)" - -#: ../app/dialogs/vectors-import-dialog.c:97 -msgid "Scalable SVG image (*.svg)" -msgstr "Imagen escalable SVG (*.svg)" - -#: ../app/dialogs/vectors-import-dialog.c:108 -msgid "_Merge imported paths" -msgstr "_Combinar rutas importadas" - -#: ../app/dialogs/vectors-import-dialog.c:118 -msgid "_Scale imported paths to fit image" -msgstr "_Escalar las rutas importadas para ajustar la imagen" - -#: ../app/dialogs/vectors-options-dialog.c:122 -msgid "Path name:" -msgstr "Nombre de la ruta:" - -#: ../app/display/display-enums.c:60 -msgctxt "guides-type" -msgid "No guides" -msgstr "Sin guías" - -#: ../app/display/display-enums.c:61 -msgctxt "guides-type" -msgid "Center lines" -msgstr "Líneas medias" - -#: ../app/display/display-enums.c:62 -msgctxt "guides-type" -msgid "Rule of thirds" -msgstr "Regla de los tercios" - -#: ../app/display/display-enums.c:63 -msgctxt "guides-type" -msgid "Rule of fifths" -msgstr "Regla de los quintos" - -#: ../app/display/display-enums.c:64 -msgctxt "guides-type" -msgid "Golden sections" -msgstr "Secciones áureas" - -#: ../app/display/display-enums.c:65 -msgctxt "guides-type" -msgid "Diagonal lines" -msgstr "Líneas diagonales" - -#: ../app/display/display-enums.c:66 -msgctxt "guides-type" -msgid "Number of lines" -msgstr "Número de líneas" - -#: ../app/display/display-enums.c:67 -msgctxt "guides-type" -msgid "Line spacing" -msgstr "Espaciado de las líneas" - -#: ../app/display/gimpcursorview.c:216 ../app/display/gimpcursorview.c:222 -#: ../app/display/gimpcursorview.c:241 ../app/display/gimpcursorview.c:247 -#: ../app/display/gimpcursorview.c:266 ../app/display/gimpcursorview.c:272 -#: ../app/display/gimpcursorview.c:288 ../app/display/gimpcursorview.c:295 -#: ../app/display/gimpcursorview.c:672 ../app/display/gimpcursorview.c:673 -#: ../app/display/gimpcursorview.c:674 ../app/display/gimpcursorview.c:675 -#: ../app/display/gimpcursorview.c:788 ../app/display/gimpcursorview.c:789 -#: ../app/display/gimpcursorview.c:790 ../app/display/gimpcursorview.c:791 -#: ../app/widgets/gimpcolorframe.c:633 -msgid "n/a" -msgstr "n/d" - -#: ../app/display/gimpcursorview.c:219 ../app/display/gimpcursorview.c:244 -#: ../app/display/gimpcursorview.c:269 -#: ../app/widgets/gimpdeviceinfoeditor.c:138 -msgid "X" -msgstr "X" - -#: ../app/display/gimpcursorview.c:225 ../app/display/gimpcursorview.c:250 -#: ../app/display/gimpcursorview.c:275 -#: ../app/widgets/gimpdeviceinfoeditor.c:139 -msgid "Y" -msgstr "Y" - -#. Units -#: ../app/display/gimpcursorview.c:231 -msgid "Units" -msgstr "Unidades" - -#. Selection Bounding Box -#: ../app/display/gimpcursorview.c:256 -msgid "Selection Bounding Box" -msgstr "Caja circundante de la selección" - -#. Width -#: ../app/display/gimpcursorview.c:292 -msgid "W" -msgstr "An" - -#. Height -#: ../app/display/gimpcursorview.c:299 -msgid "H" -msgstr "Al" - -#: ../app/display/gimpcursorview.c:328 -msgid "_Sample Merged" -msgstr "_Muestra combinada" - -#: ../app/display/gimpdisplayshell.c:508 -msgid "Access the image menu" -msgstr "Ir al menú de imagen" - -#: ../app/display/gimpdisplayshell.c:622 -msgid "Zoom image when window size changes" -msgstr "Ampliar imagen cuando cambia el tamaño de ventana" - -#: ../app/display/gimpdisplayshell.c:651 -msgid "Toggle Quick Mask" -msgstr "Activar máscara rápida" - -#: ../app/display/gimpdisplayshell.c:674 -msgid "Navigate the image display" -msgstr "Navegar por la imagen" - -#: ../app/display/gimpdisplayshell.c:746 -#: ../app/display/gimpdisplayshell.c:1331 ../app/widgets/gimptoolbox.c:253 -msgid "Drop image files here to open them" -msgstr "Arrastre hasta aquí los archivos de imagen para abrirlos" - -#: ../app/display/gimpdisplayshell-close.c:169 -#: ../app/display/gimpdisplayshell-close.c:269 -#, c-format -msgid "Close %s" -msgstr "Cerrar %s" - -#: ../app/display/gimpdisplayshell-close.c:217 -#, c-format -msgid "Press %s to discard all changes and close the image." -msgstr "Pulse %s para descartar todos los cambios y cerrar la imagen." - -#: ../app/display/gimpdisplayshell-close.c:277 -#, c-format -msgid "Save the changes to image '%s' before closing?" -msgstr "¿Desea guardar los cambios a la imagen «%s» antes de cerrar?" - -#: ../app/display/gimpdisplayshell-close.c:310 -#, c-format -msgid "If you don't save the image, changes from the last hour will be lost." -msgid_plural "" -"If you don't save the image, changes from the last %d hours will be lost." -msgstr[0] "" -"Si no guarda la imagen, los cambios desde la última hora se perderán." -msgstr[1] "" -"Si no guarda la imagen, los cambios desde las últimas %d horas se perderán." - -#: ../app/display/gimpdisplayshell-close.c:321 -#, c-format -msgid "" -"If you don't save the image, changes from the last hour and %d minute will " -"be lost." -msgid_plural "" -"If you don't save the image, changes from the last hour and %d minutes will " -"be lost." -msgstr[0] "" -"Si no guarda la imagen, los cambios desde la última hora y %d minuto se " -"perderán." -msgstr[1] "" -"Si no guarda la imagen, los cambios desde la última hora y %d minutos se " -"perderán." - -#: ../app/display/gimpdisplayshell-close.c:333 -#, c-format -msgid "If you don't save the image, changes from the last minute will be lost." -msgid_plural "" -"If you don't save the image, changes from the last %d minutes will be lost." -msgstr[0] "" -"Si no guarda la imagen, los cambios desde el último minuto se perderán." -msgstr[1] "" -"Si no guarda la imagen, los cambios desde los últimos %d minutos se perderán." - -#: ../app/display/gimpdisplayshell-close.c:354 -#, c-format -msgid "The image has been exported to '%s'." -msgstr "La imagen se ha exportado a «%s»." - -#: ../app/display/gimpdisplayshell-dnd.c:246 -#: ../app/display/gimpdisplayshell-dnd.c:649 -#: ../app/display/gimpdisplayshell-dnd.c:707 -msgid "Drop New Layer" -msgstr "Soltar la capa nueva" - -#: ../app/display/gimpdisplayshell-dnd.c:289 -msgid "Drop New Path" -msgstr "Descartar la ruta nueva" - -#: ../app/display/gimpdisplayshell-dnd.c:361 -#: ../app/display/gimpdisplayshell-dnd.c:463 ../app/tools/gimpblendtool.c:173 -#: ../app/tools/gimpbucketfilltool.c:136 ../app/tools/gimpimagemaptool.c:280 -#: ../app/tools/gimpselectiontool.c:427 -msgid "Cannot modify the pixels of layer groups." -msgstr "No se pueden modificar píxeles de los grupos de capas." - -#: ../app/display/gimpdisplayshell-dnd.c:369 -#: ../app/display/gimpdisplayshell-dnd.c:471 ../app/tools/gimpblendtool.c:180 -#: ../app/tools/gimpbucketfilltool.c:143 ../app/tools/gimpcroptool.c:325 -#: ../app/tools/gimpimagemaptool.c:287 ../app/tools/gimppainttool.c:266 -#: ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:1477 -msgid "The active layer's pixels are locked." -msgstr "Los píxeles de la capa activa están bloqueados." - -#: ../app/display/gimpdisplayshell-dnd.c:549 -#: ../app/widgets/gimplayertreeview.c:725 -msgid "Drop layers" -msgstr "Descartar las capas" - -#: ../app/display/gimpdisplayshell-dnd.c:682 -#: ../app/display/gimpdisplayshell-dnd.c:699 -#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:264 -msgid "Dropped Buffer" -msgstr "Búfer descartado" - -#: ../app/display/gimpdisplayshell-filter-dialog.c:83 -msgid "Color Display Filters" -msgstr "Filtros de pantalla de color" - -#: ../app/display/gimpdisplayshell-filter-dialog.c:86 -msgid "Configure Color Display Filters" -msgstr "Configuración de los filtros de colores de la pantalla" - -#: ../app/display/gimpdisplayshell-handlers.c:796 -#, c-format -msgid "Image saved to '%s'" -msgstr "Imagen guardada en «%s»" - -#: ../app/display/gimpdisplayshell-handlers.c:810 -#, c-format -msgid "Image exported to '%s'" -msgstr "Imagen exportada en «%s»" - -#: ../app/display/gimpdisplayshell-layer-select.c:122 -msgid "Layer Select" -msgstr "Selección de capas" - -#: ../app/display/gimpdisplayshell-scale-dialog.c:114 -msgid "Zoom Ratio" -msgstr "Relación de aumento" - -#: ../app/display/gimpdisplayshell-scale-dialog.c:116 -msgid "Select Zoom Ratio" -msgstr "Seleccione la relación de aumento" - -#: ../app/display/gimpdisplayshell-scale-dialog.c:161 -msgid "Zoom ratio:" -msgstr "Relación de aumento:" - -#: ../app/display/gimpdisplayshell-scale-dialog.c:186 -msgid "Zoom:" -msgstr "Aumento:" - -#: ../app/display/gimpdisplayshell-title.c:282 -msgid "(modified)" -msgstr "(modificada)" - -#: ../app/display/gimpdisplayshell-title.c:287 -msgid "(clean)" -msgstr "(limpia)" - -#: ../app/display/gimpdisplayshell-title.c:338 -#: ../app/display/gimpdisplayshell-title.c:351 -#: ../app/widgets/gimpactiongroup.c:884 -msgid "(none)" -msgstr "(ninguna)" - -#: ../app/display/gimpstatusbar.c:356 -#, c-format -msgid "Cancel %s" -msgstr "Cancelar %s" - -#: ../app/file/file-open.c:129 ../app/file/file-save.c:115 -msgid "Not a regular file" -msgstr "No es un archivo regular" - -#: ../app/file/file-open.c:191 -#, c-format -msgid "%s plug-in returned SUCCESS but did not return an image" -msgstr "" -"El complemento %s finalizó correctamente pero no ha devuelto una imagen" - -#: ../app/file/file-open.c:202 -#, c-format -msgid "%s plug-In could not open image" -msgstr "El complemento %s no ha podido abrir la imagen" - -#: ../app/file/file-open.c:533 -msgid "Image doesn't contain any layers" -msgstr "La imagen no contiene ninguna capa" - -#: ../app/file/file-open.c:593 -#, c-format -msgid "Opening '%s' failed: %s" -msgstr "La apertura de «%s» ha fallado: %s" - -#: ../app/file/file-open.c:703 -msgid "" -"Color management has been disabled. It can be enabled again in the " -"Preferences dialog." -msgstr "" -"La gestión del color se ha desactivado. Puede volverse a activar en el " -"diálogo de Preferencias." - -#: ../app/file/file-procedure.c:195 -msgid "Unknown file type" -msgstr "Tipo de archivo desconocido" - -#: ../app/file/file-save.c:222 -#, c-format -msgid "%s plug-in could not save image" -msgstr "El complemento %s no ha podido guardar la imagen" - -#: ../app/file/file-utils.c:72 -#, c-format -msgid "'%s:' is not a valid URI scheme" -msgstr "«%s:» no es un esquema de URI válido" - -#: ../app/file/file-utils.c:88 ../app/file/file-utils.c:124 -msgid "Invalid character sequence in URI" -msgstr "Secuencia de caracteres no válida en el URI" - -#: ../app/gegl/gimp-gegl-enums.c:24 -msgctxt "cage-mode" -msgid "Create or adjust the cage" -msgstr "Crear o ajustar la rejilla" - -#: ../app/gegl/gimp-gegl-enums.c:25 -msgctxt "cage-mode" -msgid "Deform the cage to deform the image" -msgstr "Deformar la rejilla para deformar la imagen" - -#: ../app/gegl/gimpcurvesconfig.c:395 -msgid "not a GIMP Curves file" -msgstr "no es un archivo de curvas de GIMP" - -#: ../app/gegl/gimpcurvesconfig.c:410 ../app/gegl/gimplevelsconfig.c:811 -msgid "parse error" -msgstr "Error de análisis" - -#: ../app/gegl/gimplevelsconfig.c:764 -msgid "not a GIMP Levels file" -msgstr "no es un archivo de niveles GIMP" - -#: ../app/gegl/gimpoperationcagecoefcalc.c:67 -msgid "Compute a set of coefficient buffer for the GIMP cage tool" -msgstr "" -"Calcular un conjunto de búfer de coeficientes para la herramienta «jaula» de " -"GIMP" - -#: ../app/gegl/gimpoperationcagetransform.c:106 -msgid "" -"Convert a set of coefficient buffer to a coordinate buffer for the GIMP cage " -"tool" -msgstr "" -"Convertir un conjunto de búfer de coeficientes a un búfer de coordenadas " -"para la herramienta «jaula» de GIMP" - -#: ../app/gegl/gimpoperationcagetransform.c:128 -msgid "Fill with plain color" -msgstr "Rellenar con color sencillo" - -#: ../app/gegl/gimpoperationcagetransform.c:129 -#: ../app/tools/gimpcageoptions.c:144 -msgid "Fill the original position of the cage with a plain color" -msgstr "Rellenar la posición original de la jaula con un color sencillo" - -#. TRANSLATORS: there is no need to translate this in GIMP. This uses -#. * "gtk20" domain as a special trick to determine language direction, -#. * but xgettext extracts it anyway mistakenly into GIMP po files. -#. * Leave an empty string as translation. It does not matter. -#. -#: ../app/gui/gui.c:207 -msgid "default:LTR" -msgstr "default:LTR" - -#. initialize the document history -#: ../app/gui/gui.c:438 -msgid "Documents" -msgstr "Documentos" - -#: ../app/gui/splash.c:115 -msgid "GIMP Startup" -msgstr "Inicio de GIMP" - -#: ../app/paint/gimpairbrush.c:73 ../app/tools/gimpairbrushtool.c:54 -msgid "Airbrush" -msgstr "Aerógrafo" - -#: ../app/paint/gimpbrushcore.c:387 -msgid "No brushes available for use with this tool." -msgstr "No hay pinceles disponibles para usar con esta herramienta." - -#: ../app/paint/gimpbrushcore.c:394 -msgid "No paint dynamics available for use with this tool." -msgstr "" -"No hay dinámicas de pintura disponibles para su uso con esta herramienta." - -#: ../app/paint/gimpclone.c:102 ../app/tools/gimpclonetool.c:60 -msgid "Clone" -msgstr "Clonar" - -#: ../app/paint/gimpclone.c:143 -msgid "No patterns available for use with this tool." -msgstr "No hay patrones disponibles para usar con esta herramienta." - -#: ../app/paint/gimpconvolve.c:80 -msgid "Convolve" -msgstr "Convolución" - +#. Pixels +#: ../app/dialogs/preferences-dialog.c:2372 +#: ../app/display/gimpcursorview.c:208 ../app/widgets/gimpgrideditor.c:199 +#: ../app/widgets/gimpgrideditor.c:231 +msgid "Pixels" +msgstr "píxeles" + +#: ../app/dialogs/preferences-dialog.c:2390 +msgid "Horizontal" +msgstr "Horizontal" + +#: ../app/dialogs/preferences-dialog.c:2392 +msgid "Vertical" +msgstr "Vertical" + +#: ../app/dialogs/preferences-dialog.c:2394 +#: ../app/widgets/gimpimagepropview.c:469 +msgid "ppi" +msgstr "ppp" + +#: ../app/dialogs/preferences-dialog.c:2410 +#, c-format +msgid "_Detect automatically (currently %d × %d ppi)" +msgstr "_Detectar automáticamente (actualmente %d x %d ppp)" + +#: ../app/dialogs/preferences-dialog.c:2428 +msgid "_Enter manually" +msgstr "Introducir _manualmente" + +#: ../app/dialogs/preferences-dialog.c:2443 +msgid "C_alibrate..." +msgstr "C_alibrar…" + +#: ../app/dialogs/preferences-dialog.c:2471 +msgid "Color Management" +msgstr "Gestión del color" + +#: ../app/dialogs/preferences-dialog.c:2491 +msgid "_RGB profile:" +msgstr "Perfil _RGB:" + +#: ../app/dialogs/preferences-dialog.c:2492 +msgid "Select RGB Color Profile" +msgstr "Seleccionar el perfil de color RGB" + +#: ../app/dialogs/preferences-dialog.c:2493 +msgid "_CMYK profile:" +msgstr "Perfil _CMYK:" + +#: ../app/dialogs/preferences-dialog.c:2494 +msgid "Select CMYK Color Profile" +msgstr "Seleccionar el perfil de color CMYK" + +#: ../app/dialogs/preferences-dialog.c:2495 +msgid "_Monitor profile:" +msgstr "Perfil del _monitor:" + +#: ../app/dialogs/preferences-dialog.c:2496 +msgid "Select Monitor Color Profile" +msgstr "Seleccionar el perfil de color del monitor" + +#: ../app/dialogs/preferences-dialog.c:2497 +msgid "_Print simulation profile:" +msgstr "Perfil de simulación de _impresión:" + +#: ../app/dialogs/preferences-dialog.c:2498 +msgid "Select Printer Color Profile" +msgstr "Seleccionar el perfil de color de la impresora" + +#: ../app/dialogs/preferences-dialog.c:2509 +msgid "_Mode of operation:" +msgstr "_Modo de operación:" + +#: ../app/dialogs/preferences-dialog.c:2539 +msgid "_Try to use the system monitor profile" +msgstr "In_tentar utilizar el perfil de monitor del sistema" + +#: ../app/dialogs/preferences-dialog.c:2549 +msgid "_Display rendering intent:" +msgstr "Prueba de renderizado en _pantalla:" + +#: ../app/dialogs/preferences-dialog.c:2558 +msgid "_Softproof rendering intent:" +msgstr "_Pseudoprueba de renderizado:" + +#: ../app/dialogs/preferences-dialog.c:2571 +msgid "Mark out of gamut colors" +msgstr "Marcar a partir de los colores del gamut" + +#: ../app/dialogs/preferences-dialog.c:2576 +msgid "Select Warning Color" +msgstr "Seleccionar el color de las advertencias" + +#: ../app/dialogs/preferences-dialog.c:2589 +msgid "File Open behaviour:" +msgstr "Comportamiento de apertura de archivos:" + +#: ../app/dialogs/preferences-dialog.c:2601 +msgid "Input Devices" +msgstr "Dispositivos de entrada" + +#. Extended Input Devices +#: ../app/dialogs/preferences-dialog.c:2611 +msgid "Extended Input Devices" +msgstr "Dispositivos de entrada extendidos" + +#: ../app/dialogs/preferences-dialog.c:2615 +msgid "Configure E_xtended Input Devices..." +msgstr "Configurar los dispositivos de entrada e_xtendidos…" + +#: ../app/dialogs/preferences-dialog.c:2622 +msgid "_Save input device settings on exit" +msgstr "Guardar la configuración del dispositivo de entrada al _salir" + +#: ../app/dialogs/preferences-dialog.c:2626 +msgid "Save Input Device Settings _Now" +msgstr "Guardar la configuración del dispositivo de entrada _ahora" + +#: ../app/dialogs/preferences-dialog.c:2633 +msgid "_Reset Saved Input Device Settings to Default Values" +msgstr "" +"_Restablecer la configuración guardada del dispositivo de entrada a los " +"valores predeterminados" + +#: ../app/dialogs/preferences-dialog.c:2648 +msgid "Additional Input Controllers" +msgstr "Controles adicionales de entrada" + +#: ../app/dialogs/preferences-dialog.c:2651 +msgid "Input Controllers" +msgstr "Controladores de entrada" + +#: ../app/dialogs/preferences-dialog.c:2667 +msgid "Window Management" +msgstr "Gestión de la ventana" + +#: ../app/dialogs/preferences-dialog.c:2676 +msgid "Window Manager Hints" +msgstr "Hints del gestor de ventanas" + +#: ../app/dialogs/preferences-dialog.c:2682 +msgid "Hint for _docks and toolbox:" +msgstr "Pista para los emprotables y la caja de herramien_tas:" + +#: ../app/dialogs/preferences-dialog.c:2685 +msgid "Focus" +msgstr "Foco" + +#: ../app/dialogs/preferences-dialog.c:2689 +msgid "Activate the _focused image" +msgstr "Activar la imagen con el _foco" + +#. Window Positions +#: ../app/dialogs/preferences-dialog.c:2693 +msgid "Window Positions" +msgstr "Posiciones de las ventanas" + +#: ../app/dialogs/preferences-dialog.c:2696 +msgid "_Save window positions on exit" +msgstr "G_uardar posiciones de ventanas al salir" + +#: ../app/dialogs/preferences-dialog.c:2700 +msgid "Save Window Positions _Now" +msgstr "Guardar las posiciones de las ventanas _ahora" + +#: ../app/dialogs/preferences-dialog.c:2707 +msgid "_Reset Saved Window Positions to Default Values" +msgstr "" +"R_estaurar las posiciones de ventana guardadas a los valores predeterminados" + +#: ../app/dialogs/preferences-dialog.c:2722 +msgid "Folders" +msgstr "Carpetas" + +#: ../app/dialogs/preferences-dialog.c:2742 +msgid "Temporary folder:" +msgstr "Carpeta temporal:" + +#: ../app/dialogs/preferences-dialog.c:2743 +msgid "Select Folder for Temporary Files" +msgstr "Seleccione la carpeta para los archivos temporales" + +#: ../app/dialogs/preferences-dialog.c:2747 +msgid "Swap folder:" +msgstr "Carpeta de intercambio:" + +#: ../app/dialogs/preferences-dialog.c:2748 +msgid "Select Swap Folder" +msgstr "Seleccionar la carpeta de intercambio" + +#: ../app/dialogs/preferences-dialog.c:2783 +msgid "Brush Folders" +msgstr "Carpetas de pinceles" + +#: ../app/dialogs/preferences-dialog.c:2785 +msgid "Select Brush Folders" +msgstr "Seleccionar la carpeta de pinceles" + +#: ../app/dialogs/preferences-dialog.c:2787 +msgid "Dynamics Folders" +msgstr "Carpetas de dinámicas" + +#: ../app/dialogs/preferences-dialog.c:2789 +msgid "Select Dynamics Folders" +msgstr "Selecciona las carpetas de dinámicas" + +#: ../app/dialogs/preferences-dialog.c:2791 +msgid "Pattern Folders" +msgstr "Carpetas de patrones" + +#: ../app/dialogs/preferences-dialog.c:2793 +msgid "Select Pattern Folders" +msgstr "Seleccionar la carpeta de patrones" + +#: ../app/dialogs/preferences-dialog.c:2795 +msgid "Palette Folders" +msgstr "Carpetas de paletas" + +#: ../app/dialogs/preferences-dialog.c:2797 +msgid "Select Palette Folders" +msgstr "Seleccionar las carpetas de paletas" + +#: ../app/dialogs/preferences-dialog.c:2799 +msgid "Gradient Folders" +msgstr "Carpetas de degradados" + +#: ../app/dialogs/preferences-dialog.c:2801 +msgid "Select Gradient Folders" +msgstr "Seleccionar las carpetas de degradados" + +#: ../app/dialogs/preferences-dialog.c:2803 +msgid "Font Folders" +msgstr "Carpetas de tipografías" + +#: ../app/dialogs/preferences-dialog.c:2805 +msgid "Select Font Folders" +msgstr "Seleccionar las carpetas de tipografías" + +#: ../app/dialogs/preferences-dialog.c:2807 +msgid "Tool Preset Folders" +msgstr "Carpetas de preajustes de las herramientas" + +#: ../app/dialogs/preferences-dialog.c:2809 +msgid "Select Tool Preset Folders" +msgstr "Seleccionar las carpetas de preajustes" + +#: ../app/dialogs/preferences-dialog.c:2811 +msgid "Plug-In Folders" +msgstr "Carpetas de complementos" + +#: ../app/dialogs/preferences-dialog.c:2813 +msgid "Select Plug-In Folders" +msgstr "Seleccionar las carpetas de complementos" + +#: ../app/dialogs/preferences-dialog.c:2815 +msgid "Scripts" +msgstr "Guiones" + +#: ../app/dialogs/preferences-dialog.c:2815 +msgid "Script-Fu Folders" +msgstr "Carpetas de scripts-fu" + +#: ../app/dialogs/preferences-dialog.c:2817 +msgid "Select Script-Fu Folders" +msgstr "Seleccionar la carpeta de script-fu" + +#: ../app/dialogs/preferences-dialog.c:2819 +msgid "Module Folders" +msgstr "Carpetas de módulos" + +#: ../app/dialogs/preferences-dialog.c:2821 +msgid "Select Module Folders" +msgstr "Seleccionar las carpetas de módulos" + +#: ../app/dialogs/preferences-dialog.c:2823 +msgid "Interpreters" +msgstr "Intérpretes" + +#: ../app/dialogs/preferences-dialog.c:2823 +msgid "Interpreter Folders" +msgstr "Carpetas del intérprete" + +#: ../app/dialogs/preferences-dialog.c:2825 +msgid "Select Interpreter Folders" +msgstr "Seleccionar las carpetas de los intérpretes" + +#: ../app/dialogs/preferences-dialog.c:2827 +msgid "Environment Folders" +msgstr "Carpetas de entorno" + +#: ../app/dialogs/preferences-dialog.c:2829 +msgid "Select Environment Folders" +msgstr "Seleccionar las carpetas de entorno" + +#: ../app/dialogs/preferences-dialog.c:2831 +msgid "Themes" +msgstr "Temas" + +#: ../app/dialogs/preferences-dialog.c:2831 +msgid "Theme Folders" +msgstr "Carpetas de temas" + +#: ../app/dialogs/preferences-dialog.c:2833 +msgid "Select Theme Folders" +msgstr "Seleccionar las carpetas de temas" + +#: ../app/dialogs/print-size-dialog.c:138 +msgid "Print Size" +msgstr "Tamaño de la impresión" + +#. the image size labels +#: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:193 +#: ../app/widgets/gimptemplateeditor.c:180 +msgid "_Width:" +msgstr "Anc_hura:" + +#: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:197 +#: ../app/widgets/gimptemplateeditor.c:187 +msgid "H_eight:" +msgstr "A_ltura:" + +#. the resolution labels +#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:260 +#: ../app/widgets/gimptemplateeditor.c:309 +msgid "_X resolution:" +msgstr "Resolución _X:" + +#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:263 +#: ../app/widgets/gimptemplateeditor.c:316 +msgid "_Y resolution:" +msgstr "Resolución _Y:" + +#: ../app/dialogs/print-size-dialog.c:240 ../app/widgets/gimpsizebox.c:256 +#, c-format +msgid "pixels/%a" +msgstr "píxeles/%a" + +#: ../app/dialogs/quit-dialog.c:144 +msgid "Quit GIMP" +msgstr "Salir de GIMP" + +#: ../app/dialogs/quit-dialog.c:144 +msgid "Close All Images" +msgstr "Cerrar todas las imágenes" + +#: ../app/dialogs/quit-dialog.c:212 +msgid "If you quit GIMP now, these changes will be lost." +msgstr "Si sale de GIMP ahora, estos cambios se perderán." + +#: ../app/dialogs/quit-dialog.c:215 +msgid "If you close these images now, changes will be lost." +msgstr "Si cierra ahora estas imágenes, se perderán los cambios." + +#: ../app/dialogs/quit-dialog.c:300 +#, c-format +msgid "There is one image with unsaved changes:" +msgid_plural "There are %d images with unsaved changes:" +msgstr[0] "Hay una imagen con cambios no guardados:" +msgstr[1] "Hay %d imágenes con cambios no guardados:" + +#: ../app/dialogs/quit-dialog.c:311 +#, c-format +msgid "Press %s to quit." +msgstr "Pulse %s para salir." + +#: ../app/dialogs/quit-dialog.c:314 +#, c-format +msgid "Press %s to close all images." +msgstr "Pulse %s para cerrar todas las imágenes." + +#: ../app/dialogs/quit-dialog.c:330 +#, c-format +msgid "Press %s to discard all changes and quit." +msgstr "Pulse %s para descartar todos los cambios y salir." + +#: ../app/dialogs/quit-dialog.c:333 +#, c-format +msgid "Press %s to discard all changes and close all images." +msgstr "Pulse %s para descartar todos los cambios y cerrar todas las imágenes." + +#: ../app/dialogs/quit-dialog.c:341 +#: ../app/display/gimpdisplayshell-close.c:180 +msgid "_Discard Changes" +msgstr "_Descartar cambios" + +#: ../app/dialogs/quit-dialog.c:423 +#, c-format +msgid "Exported to %s" +msgstr "Exportado a %s" + +#: ../app/dialogs/resize-dialog.c:119 +msgid "Canvas Size" +msgstr "Tamaño del lienzo" + +#: ../app/dialogs/resize-dialog.c:130 ../app/dialogs/scale-dialog.c:109 +msgid "Layer Size" +msgstr "Tamaño de capas" + +#: ../app/dialogs/resize-dialog.c:295 +msgid "Resize _layers:" +msgstr "Redimensionar _capas:" + +#: ../app/dialogs/resolution-calibrate-dialog.c:69 +msgid "Calibrate Monitor Resolution" +msgstr "Calibrar resolución del monitor" + +#: ../app/dialogs/resolution-calibrate-dialog.c:128 +msgid "Measure the rulers and enter their lengths:" +msgstr "Mida las reglas e introduzca sus longitudes debajo:" + +#: ../app/dialogs/resolution-calibrate-dialog.c:153 +msgid "_Horizontal:" +msgstr "_Horizontal:" + +#: ../app/dialogs/resolution-calibrate-dialog.c:158 +msgid "_Vertical:" +msgstr "_Vertical:" + +#. Image size frame +#: ../app/dialogs/scale-dialog.c:98 ../app/widgets/gimptemplateeditor.c:158 +msgid "Image Size" +msgstr "Tamaño de la imagen" + +#: ../app/dialogs/scale-dialog.c:176 ../app/tools/gimppaintoptions-gui.c:391 +msgid "Quality" +msgstr "Calidad" + +#: ../app/dialogs/scale-dialog.c:188 +msgid "I_nterpolation:" +msgstr "I_nterpolación:" + +#: ../app/dialogs/scale-dialog.c:207 +msgid "" +"Indexed color layers are always scaled without interpolation. The chosen " +"interpolation type will affect channels and layer masks only." +msgstr "" +"Las capas de color indexado se escalan siempre sin interpolación. El tipo de " +"interpolación elegido sólo afectará a las máscaras y canales." + +#: ../app/dialogs/stroke-dialog.c:97 +msgid "Choose Stroke Style" +msgstr "Seleccionar el estilo de trazo" + +#: ../app/dialogs/stroke-dialog.c:214 +msgid "Paint tool:" +msgstr "Herramienta de pintura:" + +#: ../app/dialogs/stroke-dialog.c:228 +msgid "_Emulate brush dynamics" +msgstr "_Emular la dinámica del pincel" + +#: ../app/dialogs/tips-dialog.c:88 +msgid "The GIMP tips file is empty!" +msgstr "¡El archivo de consejos de GIMP está vacío!" + +#: ../app/dialogs/tips-dialog.c:92 +msgid "The GIMP tips file appears to be missing!" +msgstr "¡Parece que falta el archivo de consejos de GIMP!" + +#: ../app/dialogs/tips-dialog.c:94 +#, c-format +msgid "There should be a file called '%s'. Please check your installation." +msgstr "Debería haber un archivo llamado «%s». Compruebe su instalación." + +#: ../app/dialogs/tips-dialog.c:100 +msgid "The GIMP tips file could not be parsed!" +msgstr "¡El archivo de consejos de GIMP no se ha podido analizar!" + +#: ../app/dialogs/tips-dialog.c:128 +msgid "GIMP Tip of the Day" +msgstr "Consejo del día de GIMP" + +#: ../app/dialogs/tips-dialog.c:134 +msgid "_Previous Tip" +msgstr "Consejo _anterior" + +#: ../app/dialogs/tips-dialog.c:140 +msgid "_Next Tip" +msgstr "Consejo _siguiente" + +#. a link to the related section in the user manual +#: ../app/dialogs/tips-dialog.c:193 +msgid "Learn more" +msgstr "Aprender más" + +#. This is a special string to specify the language identifier to +#. look for in the gimp-tips.xml file. Please translate the C in it +#. according to the name of the po file used for gimp-tips.xml. +#. E.g. for the german translation, that would be "tips-locale:de". +#. +#: ../app/dialogs/tips-parser.c:187 +msgid "tips-locale:C" +msgstr "tips-locale:es" + +#: ../app/dialogs/user-install-dialog.c:84 +msgid "GIMP User Installation" +msgstr "Instalación de usuario de GIMP" + +#: ../app/dialogs/user-install-dialog.c:93 +msgid "User installation failed!" +msgstr "¡La instalación de usuario ha fallado!" + +#: ../app/dialogs/user-install-dialog.c:95 +msgid "The GIMP user installation failed; see the log for details." +msgstr "" +"La instalación de usuario de GIMP ha fallado, vea el informe para obtener " +"más detalles." + +#: ../app/dialogs/user-install-dialog.c:98 +msgid "Installation Log" +msgstr "Informe de la instalación" + +#: ../app/dialogs/vectors-export-dialog.c:55 +msgid "Export Path to SVG" +msgstr "Exportar ruta a un SVG" + +#: ../app/dialogs/vectors-export-dialog.c:90 +msgid "Export the active path" +msgstr "Exportar la ruta activa" + +#: ../app/dialogs/vectors-export-dialog.c:91 +msgid "Export all paths from this image" +msgstr "Exportar todas las rutas desde esta imagen" + +#: ../app/dialogs/vectors-import-dialog.c:58 +msgid "Import Paths from SVG" +msgstr "Importar rutas desde SVG" + +#: ../app/dialogs/vectors-import-dialog.c:92 +#: ../app/widgets/gimpprofilechooserdialog.c:122 +msgid "All files (*.*)" +msgstr "Todos los archivos (*.*)" + +#: ../app/dialogs/vectors-import-dialog.c:97 +msgid "Scalable SVG image (*.svg)" +msgstr "Imagen escalable SVG (*.svg)" + +#: ../app/dialogs/vectors-import-dialog.c:108 +msgid "_Merge imported paths" +msgstr "_Combinar rutas importadas" + +#: ../app/dialogs/vectors-import-dialog.c:118 +msgid "_Scale imported paths to fit image" +msgstr "_Escalar las rutas importadas para ajustar la imagen" + +#: ../app/dialogs/vectors-options-dialog.c:122 +msgid "Path name:" +msgstr "Nombre de la ruta:" + +#: ../app/display/display-enums.c:60 +msgctxt "guides-type" +msgid "No guides" +msgstr "Sin guías" + +#: ../app/display/display-enums.c:61 +msgctxt "guides-type" +msgid "Center lines" +msgstr "Líneas medias" + +#: ../app/display/display-enums.c:62 +msgctxt "guides-type" +msgid "Rule of thirds" +msgstr "Regla de los tercios" + +#: ../app/display/display-enums.c:63 +msgctxt "guides-type" +msgid "Rule of fifths" +msgstr "Regla de los quintos" + +#: ../app/display/display-enums.c:64 +msgctxt "guides-type" +msgid "Golden sections" +msgstr "Secciones áureas" + +#: ../app/display/display-enums.c:65 +msgctxt "guides-type" +msgid "Diagonal lines" +msgstr "Líneas diagonales" + +#: ../app/display/display-enums.c:66 +msgctxt "guides-type" +msgid "Number of lines" +msgstr "Número de líneas" + +#: ../app/display/display-enums.c:67 +msgctxt "guides-type" +msgid "Line spacing" +msgstr "Espaciado de las líneas" + +#: ../app/display/gimpcursorview.c:218 ../app/display/gimpcursorview.c:224 +#: ../app/display/gimpcursorview.c:243 ../app/display/gimpcursorview.c:249 +#: ../app/display/gimpcursorview.c:268 ../app/display/gimpcursorview.c:274 +#: ../app/display/gimpcursorview.c:290 ../app/display/gimpcursorview.c:297 +#: ../app/display/gimpcursorview.c:688 ../app/display/gimpcursorview.c:689 +#: ../app/display/gimpcursorview.c:690 ../app/display/gimpcursorview.c:691 +#: ../app/display/gimpcursorview.c:804 ../app/display/gimpcursorview.c:805 +#: ../app/display/gimpcursorview.c:806 ../app/display/gimpcursorview.c:807 +#: ../app/widgets/gimpcolorframe.c:633 +msgid "n/a" +msgstr "n/d" + +#: ../app/display/gimpcursorview.c:221 ../app/display/gimpcursorview.c:246 +#: ../app/display/gimpcursorview.c:271 +#: ../app/widgets/gimpdeviceinfoeditor.c:138 +msgid "X" +msgstr "X" + +#: ../app/display/gimpcursorview.c:227 ../app/display/gimpcursorview.c:252 +#: ../app/display/gimpcursorview.c:277 +#: ../app/widgets/gimpdeviceinfoeditor.c:139 +msgid "Y" +msgstr "Y" + +#. Units +#: ../app/display/gimpcursorview.c:233 +msgid "Units" +msgstr "Unidades" + +#. Selection Bounding Box +#: ../app/display/gimpcursorview.c:258 +msgid "Selection Bounding Box" +msgstr "Caja circundante de la selección" + +#. Width +#: ../app/display/gimpcursorview.c:294 +msgid "W" +msgstr "An" + +#. Height +#: ../app/display/gimpcursorview.c:301 +msgid "H" +msgstr "Al" + +#: ../app/display/gimpcursorview.c:330 +msgid "_Sample Merged" +msgstr "_Muestra combinada" + +#: ../app/display/gimpdisplayshell.c:508 +msgid "Access the image menu" +msgstr "Ir al menú de imagen" + +#: ../app/display/gimpdisplayshell.c:622 +msgid "Zoom image when window size changes" +msgstr "Ampliar imagen cuando cambia el tamaño de ventana" + +#: ../app/display/gimpdisplayshell.c:651 +msgid "Toggle Quick Mask" +msgstr "Activar máscara rápida" + +#: ../app/display/gimpdisplayshell.c:674 +msgid "Navigate the image display" +msgstr "Navegar por la imagen" + +#: ../app/display/gimpdisplayshell.c:746 +#: ../app/display/gimpdisplayshell.c:1331 ../app/widgets/gimptoolbox.c:253 +msgid "Drop image files here to open them" +msgstr "Arrastre hasta aquí los archivos de imagen para abrirlos" + +#: ../app/display/gimpdisplayshell-close.c:169 +#: ../app/display/gimpdisplayshell-close.c:269 +#, c-format +msgid "Close %s" +msgstr "Cerrar %s" + +#: ../app/display/gimpdisplayshell-close.c:217 +#, c-format +msgid "Press %s to discard all changes and close the image." +msgstr "Pulse %s para descartar todos los cambios y cerrar la imagen." + +#: ../app/display/gimpdisplayshell-close.c:277 +#, c-format +msgid "Save the changes to image '%s' before closing?" +msgstr "¿Desea guardar los cambios a la imagen «%s» antes de cerrar?" + +#: ../app/display/gimpdisplayshell-close.c:310 +#, c-format +msgid "If you don't save the image, changes from the last hour will be lost." +msgid_plural "" +"If you don't save the image, changes from the last %d hours will be lost." +msgstr[0] "" +"Si no guarda la imagen, los cambios desde la última hora se perderán." +msgstr[1] "" +"Si no guarda la imagen, los cambios desde las últimas %d horas se perderán." + +#: ../app/display/gimpdisplayshell-close.c:321 +#, c-format +msgid "" +"If you don't save the image, changes from the last hour and %d minute will " +"be lost." +msgid_plural "" +"If you don't save the image, changes from the last hour and %d minutes will " +"be lost." +msgstr[0] "" +"Si no guarda la imagen, los cambios desde la última hora y %d minuto se " +"perderán." +msgstr[1] "" +"Si no guarda la imagen, los cambios desde la última hora y %d minutos se " +"perderán." + +#: ../app/display/gimpdisplayshell-close.c:333 +#, c-format +msgid "If you don't save the image, changes from the last minute will be lost." +msgid_plural "" +"If you don't save the image, changes from the last %d minutes will be lost." +msgstr[0] "" +"Si no guarda la imagen, los cambios desde el último minuto se perderán." +msgstr[1] "" +"Si no guarda la imagen, los cambios desde los últimos %d minutos se perderán." + +#: ../app/display/gimpdisplayshell-close.c:354 +#, c-format +msgid "The image has been exported to '%s'." +msgstr "La imagen se ha exportado a «%s»." + +#: ../app/display/gimpdisplayshell-dnd.c:246 +#: ../app/display/gimpdisplayshell-dnd.c:649 +#: ../app/display/gimpdisplayshell-dnd.c:707 +msgid "Drop New Layer" +msgstr "Soltar la capa nueva" + +#: ../app/display/gimpdisplayshell-dnd.c:289 +msgid "Drop New Path" +msgstr "Descartar la ruta nueva" + +#: ../app/display/gimpdisplayshell-dnd.c:361 +#: ../app/display/gimpdisplayshell-dnd.c:463 ../app/tools/gimpblendtool.c:173 +#: ../app/tools/gimpbucketfilltool.c:136 ../app/tools/gimpimagemaptool.c:280 +#: ../app/tools/gimpselectiontool.c:427 +msgid "Cannot modify the pixels of layer groups." +msgstr "No se pueden modificar píxeles de los grupos de capas." + +#: ../app/display/gimpdisplayshell-dnd.c:369 +#: ../app/display/gimpdisplayshell-dnd.c:471 ../app/tools/gimpblendtool.c:180 +#: ../app/tools/gimpbucketfilltool.c:143 ../app/tools/gimpcroptool.c:325 +#: ../app/tools/gimpimagemaptool.c:287 ../app/tools/gimppainttool.c:266 +#: ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:1481 +msgid "The active layer's pixels are locked." +msgstr "Los píxeles de la capa activa están bloqueados." + +#: ../app/display/gimpdisplayshell-dnd.c:549 +#: ../app/widgets/gimplayertreeview.c:725 +msgid "Drop layers" +msgstr "Descartar las capas" + +#: ../app/display/gimpdisplayshell-dnd.c:682 +#: ../app/display/gimpdisplayshell-dnd.c:699 +#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:264 +msgid "Dropped Buffer" +msgstr "Búfer descartado" + +#: ../app/display/gimpdisplayshell-filter-dialog.c:83 +msgid "Color Display Filters" +msgstr "Filtros de pantalla de color" + +#: ../app/display/gimpdisplayshell-filter-dialog.c:86 +msgid "Configure Color Display Filters" +msgstr "Configuración de los filtros de colores de la pantalla" + +#: ../app/display/gimpdisplayshell-handlers.c:796 +#, c-format +msgid "Image saved to '%s'" +msgstr "Imagen guardada en «%s»" + +#: ../app/display/gimpdisplayshell-handlers.c:810 +#, c-format +msgid "Image exported to '%s'" +msgstr "Imagen exportada en «%s»" + +#: ../app/display/gimpdisplayshell-layer-select.c:122 +msgid "Layer Select" +msgstr "Selección de capas" + +#: ../app/display/gimpdisplayshell-scale-dialog.c:114 +msgid "Zoom Ratio" +msgstr "Relación de aumento" + +#: ../app/display/gimpdisplayshell-scale-dialog.c:116 +msgid "Select Zoom Ratio" +msgstr "Seleccione la relación de aumento" + +#: ../app/display/gimpdisplayshell-scale-dialog.c:161 +msgid "Zoom ratio:" +msgstr "Relación de aumento:" + +#: ../app/display/gimpdisplayshell-scale-dialog.c:186 +msgid "Zoom:" +msgstr "Aumento:" + +#: ../app/display/gimpdisplayshell-title.c:282 +msgid "(modified)" +msgstr "(modificada)" + +#: ../app/display/gimpdisplayshell-title.c:287 +msgid "(clean)" +msgstr "(limpia)" + +#: ../app/display/gimpdisplayshell-title.c:338 +#: ../app/display/gimpdisplayshell-title.c:351 +#: ../app/widgets/gimpactiongroup.c:884 +msgid "(none)" +msgstr "(ninguna)" + +#: ../app/display/gimpstatusbar.c:356 +#, c-format +msgid "Cancel %s" +msgstr "Cancelar %s" + +#: ../app/file/file-open.c:129 ../app/file/file-save.c:115 +msgid "Not a regular file" +msgstr "No es un archivo regular" + +#: ../app/file/file-open.c:197 +#, c-format +msgid "%s plug-in returned SUCCESS but did not return an image" +msgstr "" +"El complemento %s finalizó correctamente pero no ha devuelto una imagen" + +#: ../app/file/file-open.c:208 +#, c-format +msgid "%s plug-In could not open image" +msgstr "El complemento %s no ha podido abrir la imagen" + +#: ../app/file/file-open.c:539 +msgid "Image doesn't contain any layers" +msgstr "La imagen no contiene ninguna capa" + +#: ../app/file/file-open.c:599 +#, c-format +msgid "Opening '%s' failed: %s" +msgstr "La apertura de «%s» ha fallado: %s" + +#: ../app/file/file-open.c:709 +msgid "" +"Color management has been disabled. It can be enabled again in the " +"Preferences dialog." +msgstr "" +"La gestión del color se ha desactivado. Puede volverse a activar en el " +"diálogo de Preferencias." + +#: ../app/file/file-procedure.c:195 +msgid "Unknown file type" +msgstr "Tipo de archivo desconocido" + +#: ../app/file/file-save.c:222 +#, c-format +msgid "%s plug-in could not save image" +msgstr "El complemento %s no ha podido guardar la imagen" + +#: ../app/file/file-utils.c:72 +#, c-format +msgid "'%s:' is not a valid URI scheme" +msgstr "«%s:» no es un esquema de URI válido" + +#: ../app/file/file-utils.c:88 ../app/file/file-utils.c:124 +msgid "Invalid character sequence in URI" +msgstr "Secuencia de caracteres no válida en el URI" + +#: ../app/gegl/gimp-gegl-enums.c:24 +msgctxt "cage-mode" +msgid "Create or adjust the cage" +msgstr "Crear o ajustar la rejilla" + +#: ../app/gegl/gimp-gegl-enums.c:25 +msgctxt "cage-mode" +msgid "Deform the cage to deform the image" +msgstr "Deformar la rejilla para deformar la imagen" + +#: ../app/gegl/gimpcurvesconfig.c:395 +msgid "not a GIMP Curves file" +msgstr "no es un archivo de curvas de GIMP" + +#: ../app/gegl/gimpcurvesconfig.c:410 ../app/gegl/gimplevelsconfig.c:811 +msgid "parse error" +msgstr "Error de análisis" + +#: ../app/gegl/gimplevelsconfig.c:764 +msgid "not a GIMP Levels file" +msgstr "no es un archivo de niveles GIMP" + +#: ../app/gegl/gimpoperationcagecoefcalc.c:67 +msgid "Compute a set of coefficient buffer for the GIMP cage tool" +msgstr "" +"Calcular un conjunto de búfer de coeficientes para la herramienta «jaula» de " +"GIMP" + +#: ../app/gegl/gimpoperationcagetransform.c:106 +msgid "" +"Convert a set of coefficient buffer to a coordinate buffer for the GIMP cage " +"tool" +msgstr "" +"Convertir un conjunto de búfer de coeficientes a un búfer de coordenadas " +"para la herramienta «jaula» de GIMP" + +#: ../app/gegl/gimpoperationcagetransform.c:128 +msgid "Fill with plain color" +msgstr "Rellenar con color sencillo" + +#: ../app/gegl/gimpoperationcagetransform.c:129 +#: ../app/tools/gimpcageoptions.c:144 +msgid "Fill the original position of the cage with a plain color" +msgstr "Rellenar la posición original de la jaula con un color sencillo" + +#. TRANSLATORS: there is no need to translate this in GIMP. This uses +#. * "gtk20" domain as a special trick to determine language direction, +#. * but xgettext extracts it anyway mistakenly into GIMP po files. +#. * Leave an empty string as translation. It does not matter. +#. +#: ../app/gui/gui.c:207 +msgid "default:LTR" +msgstr "default:LTR" + +#. initialize the document history +#: ../app/gui/gui.c:438 +msgid "Documents" +msgstr "Documentos" + +#: ../app/gui/splash.c:112 +msgid "GIMP Startup" +msgstr "Inicio de GIMP" + +#: ../app/paint/gimpairbrush.c:73 ../app/tools/gimpairbrushtool.c:54 +msgid "Airbrush" +msgstr "Aerógrafo" + +#: ../app/paint/gimpbrushcore.c:387 +msgid "No brushes available for use with this tool." +msgstr "No hay pinceles disponibles para usar con esta herramienta." + +#: ../app/paint/gimpbrushcore.c:394 +msgid "No paint dynamics available for use with this tool." +msgstr "" +"No hay dinámicas de pintura disponibles para su uso con esta herramienta." + +#: ../app/paint/gimpclone.c:102 ../app/tools/gimpclonetool.c:60 +msgid "Clone" +msgstr "Clonar" + +#: ../app/paint/gimpclone.c:143 +msgid "No patterns available for use with this tool." +msgstr "No hay patrones disponibles para usar con esta herramienta." + +#: ../app/paint/gimpconvolve.c:80 +msgid "Convolve" +msgstr "Convolución" + # //R ???? -#: ../app/paint/gimpdodgeburn.c:91 -msgid "Dodge/Burn" -msgstr "blanquear/ennegrecer" - -#: ../app/paint/gimperaser.c:63 ../app/tools/gimperasertool.c:65 -msgid "Eraser" -msgstr "Goma de borrar" - -#: ../app/paint/gimpheal.c:131 ../app/tools/gimphealtool.c:52 -msgid "Heal" -msgstr "Sanear" - -#: ../app/paint/gimpheal.c:170 -msgid "Healing does not operate on indexed layers." -msgstr "El saneado no funciona en capas indexadas." - -#: ../app/paint/gimpink.c:97 ../app/tools/gimpinktool.c:54 -msgid "Ink" -msgstr "Tinta" - -#: ../app/paint/gimpinkoptions.c:72 -msgid "Ink Blob Size" -msgstr "Tamaño de la gota de tinta" - -#: ../app/paint/gimpinkoptions.c:99 -msgid "Ink Blob Aspect Ratio" -msgstr "Proporción de aspecto de la gota de tinta" - -#: ../app/paint/gimpinkoptions.c:103 -msgid "Ink Blob Angle" -msgstr "Ángulo de la gota de tinta" - -#: ../app/paint/gimppaintbrush.c:66 ../app/tools/gimppaintbrushtool.c:50 -msgid "Paintbrush" -msgstr "Pincel" - -#: ../app/paint/gimppaintcore.c:141 -msgid "Paint" -msgstr "Pintar" - -#: ../app/paint/gimppaintoptions.c:146 -msgid "Brush Size" -msgstr "Tamaño del pincel" - -#: ../app/paint/gimppaintoptions.c:160 -msgid "Every stamp has its own opacity" -msgstr "Cada sello tiene su propia opacidad" - -#: ../app/paint/gimppaintoptions.c:166 -msgid "Ignore fuzziness of the current brush" -msgstr "Ignorar la borrosidad del pincel actual" - -#: ../app/paint/gimppaintoptions.c:171 -msgid "Scatter brush as you paint" -msgstr "Hacer pinceladas dispersas con el pincel mientras pinta" - -#: ../app/paint/gimppaintoptions.c:175 -msgid "Distance of scattering" -msgstr "Distancia de la dispersión" - -#: ../app/paint/gimppaintoptions.c:185 -msgid "Distance over which strokes fade out" -msgstr "Distancia sobre la que se desvanecen las pinceladas" - -#: ../app/paint/gimppaintoptions.c:193 -msgid "Reverse direction of fading" -msgstr "Dirección invertida del desvanecimiento" - -#: ../app/paint/gimppaintoptions.c:197 -msgid "How fade is repeated as you paint" -msgstr "Cómo se repite el desvanecimiento mientras pinta" - -#: ../app/paint/gimppaintoptions.c:256 -msgid "Paint smoother strokes" -msgstr "Hacer pinceladas más suaves" - -#: ../app/paint/gimppaintoptions.c:260 -msgid "Depth of smoothing" -msgstr "Profundidad del suavizado" - -#: ../app/paint/gimppaintoptions.c:264 -msgid "Gravity of the pen" -msgstr "Gravedad de la pluma" - -#: ../app/paint/gimppencil.c:41 ../app/tools/gimppenciltool.c:50 -msgid "Pencil" -msgstr "Lápiz" - -#: ../app/paint/gimpperspectiveclone.c:95 -#: ../app/tools/gimpperspectiveclonetool.c:133 -msgid "Perspective Clone" -msgstr "Clonar con perspectiva" - -#: ../app/paint/gimpperspectiveclone.c:160 -msgid "Perspective Clone does not operate on indexed layers." -msgstr "La clonación de perspectiva no funciona sobre capas indexadas." - -#: ../app/paint/gimpsmudge.c:84 ../app/tools/gimpsmudgetool.c:53 -msgid "Smudge" -msgstr "Borronear" - -#: ../app/paint/gimpsourcecore.c:232 -msgid "Set a source image first." -msgstr "Establezca una imagen de origen primero." - -#: ../app/paint/paint-enums.c:52 -msgctxt "perspective-clone-mode" -msgid "Modify Perspective" -msgstr "Modificar la perspectiva" - -#: ../app/paint/paint-enums.c:53 -msgctxt "perspective-clone-mode" -msgid "Perspective Clone" -msgstr "Clonar con perspectiva" - -#: ../app/paint/paint-enums.c:83 -msgctxt "source-align-mode" -msgid "None" -msgstr "Ninguno" - -#: ../app/paint/paint-enums.c:84 -msgctxt "source-align-mode" -msgid "Aligned" -msgstr "Alineado" - -#: ../app/paint/paint-enums.c:85 -msgctxt "source-align-mode" -msgid "Registered" -msgstr "Registrado" - -#: ../app/paint/paint-enums.c:86 -msgctxt "source-align-mode" -msgid "Fixed" -msgstr "Fijo" - +#: ../app/paint/gimpdodgeburn.c:91 +msgid "Dodge/Burn" +msgstr "blanquear/ennegrecer" + +#: ../app/paint/gimperaser.c:63 ../app/tools/gimperasertool.c:65 +msgid "Eraser" +msgstr "Goma de borrar" + +#: ../app/paint/gimpheal.c:131 ../app/tools/gimphealtool.c:52 +msgid "Heal" +msgstr "Sanear" + +#: ../app/paint/gimpheal.c:170 +msgid "Healing does not operate on indexed layers." +msgstr "El saneado no funciona en capas indexadas." + +#: ../app/paint/gimpink.c:97 ../app/tools/gimpinktool.c:54 +msgid "Ink" +msgstr "Tinta" + +#: ../app/paint/gimpinkoptions.c:72 +msgid "Ink Blob Size" +msgstr "Tamaño de la gota de tinta" + +#: ../app/paint/gimpinkoptions.c:99 +msgid "Ink Blob Aspect Ratio" +msgstr "Proporción de aspecto de la gota de tinta" + +#: ../app/paint/gimpinkoptions.c:103 +msgid "Ink Blob Angle" +msgstr "Ángulo de la gota de tinta" + +#: ../app/paint/gimppaintbrush.c:66 ../app/tools/gimppaintbrushtool.c:50 +msgid "Paintbrush" +msgstr "Pincel" + +#: ../app/paint/gimppaintcore.c:141 +msgid "Paint" +msgstr "Pintar" + +#: ../app/paint/gimppaintoptions.c:146 +msgid "Brush Size" +msgstr "Tamaño del pincel" + +#: ../app/paint/gimppaintoptions.c:160 +msgid "Every stamp has its own opacity" +msgstr "Cada sello tiene su propia opacidad" + +#: ../app/paint/gimppaintoptions.c:166 +msgid "Ignore fuzziness of the current brush" +msgstr "Ignorar la borrosidad del pincel actual" + +#: ../app/paint/gimppaintoptions.c:171 +msgid "Scatter brush as you paint" +msgstr "Hacer pinceladas dispersas con el pincel mientras pinta" + +#: ../app/paint/gimppaintoptions.c:175 +msgid "Distance of scattering" +msgstr "Distancia de la dispersión" + +#: ../app/paint/gimppaintoptions.c:185 +msgid "Distance over which strokes fade out" +msgstr "Distancia sobre la que se desvanecen las pinceladas" + +#: ../app/paint/gimppaintoptions.c:193 +msgid "Reverse direction of fading" +msgstr "Dirección invertida del desvanecimiento" + +#: ../app/paint/gimppaintoptions.c:197 +msgid "How fade is repeated as you paint" +msgstr "Cómo se repite el desvanecimiento mientras pinta" + +#: ../app/paint/gimppaintoptions.c:256 +msgid "Paint smoother strokes" +msgstr "Hacer pinceladas más suaves" + +#: ../app/paint/gimppaintoptions.c:260 +msgid "Depth of smoothing" +msgstr "Profundidad del suavizado" + +#: ../app/paint/gimppaintoptions.c:264 +msgid "Gravity of the pen" +msgstr "Gravedad de la pluma" + +#: ../app/paint/gimppencil.c:41 ../app/tools/gimppenciltool.c:50 +msgid "Pencil" +msgstr "Lápiz" + +#: ../app/paint/gimpperspectiveclone.c:95 +#: ../app/tools/gimpperspectiveclonetool.c:133 +msgid "Perspective Clone" +msgstr "Clonar con perspectiva" + +#: ../app/paint/gimpperspectiveclone.c:160 +msgid "Perspective Clone does not operate on indexed layers." +msgstr "La clonación de perspectiva no funciona sobre capas indexadas." + +#: ../app/paint/gimpsmudge.c:84 ../app/tools/gimpsmudgetool.c:53 +msgid "Smudge" +msgstr "Borronear" + +#: ../app/paint/gimpsourcecore.c:232 +msgid "Set a source image first." +msgstr "Establezca una imagen de origen primero." + +#: ../app/paint/paint-enums.c:52 +msgctxt "perspective-clone-mode" +msgid "Modify Perspective" +msgstr "Modificar la perspectiva" + +#: ../app/paint/paint-enums.c:53 +msgctxt "perspective-clone-mode" +msgid "Perspective Clone" +msgstr "Clonar con perspectiva" + +#: ../app/paint/paint-enums.c:83 +msgctxt "source-align-mode" +msgid "None" +msgstr "Ninguno" + +#: ../app/paint/paint-enums.c:84 +msgctxt "source-align-mode" +msgid "Aligned" +msgstr "Alineado" + +#: ../app/paint/paint-enums.c:85 +msgctxt "source-align-mode" +msgid "Registered" +msgstr "Registrado" + +#: ../app/paint/paint-enums.c:86 +msgctxt "source-align-mode" +msgid "Fixed" +msgstr "Fijo" + # Difuminar -#: ../app/paint/paint-enums.c:114 -msgctxt "convolve-type" -msgid "Blur" -msgstr "Difuminar" - -#: ../app/paint/paint-enums.c:115 -msgctxt "convolve-type" -msgid "Sharpen" -msgstr "Perfilar" - -#: ../app/paint/paint-enums.c:144 -msgctxt "ink-blob-type" -msgid "Circle" -msgstr "Círculo" - -#: ../app/paint/paint-enums.c:145 -msgctxt "ink-blob-type" -msgid "Square" -msgstr "Cuadrado" - -#: ../app/paint/paint-enums.c:146 -msgctxt "ink-blob-type" -msgid "Diamond" -msgstr "Rombo" - -#: ../app/pdb/channel-cmds.c:194 -msgid "Combine Masks" -msgstr "Combinar máscaras" - -#: ../app/pdb/drawable-cmds.c:474 -msgid "Plug-In" -msgstr "Complemento" - -#: ../app/pdb/drawable-transform-cmds.c:345 -#: ../app/pdb/drawable-transform-cmds.c:443 -#: ../app/pdb/item-transform-cmds.c:262 ../app/pdb/transform-tools-cmds.c:163 -#: ../app/tools/gimpperspectivetool.c:82 -msgid "Perspective" -msgstr "Perspectiva" - -#: ../app/pdb/drawable-transform-cmds.c:957 -#: ../app/pdb/drawable-transform-cmds.c:1042 -#: ../app/pdb/item-transform-cmds.c:611 ../app/pdb/transform-tools-cmds.c:418 -#: ../app/tools/gimpsheartool.c:112 -msgid "Shearing" -msgstr "Inclinando" - -#: ../app/pdb/drawable-transform-cmds.c:1138 -#: ../app/pdb/item-transform-cmds.c:709 ../app/pdb/transform-tools-cmds.c:507 -msgid "2D Transform" -msgstr "Transformación 2D" - -#: ../app/pdb/drawable-transform-cmds.c:1234 -#: ../app/pdb/drawable-transform-cmds.c:1338 -#: ../app/pdb/drawable-transform-cmds.c:1442 -#: ../app/pdb/item-transform-cmds.c:815 -msgid "2D Transforming" -msgstr "Aplicando transformación 2D" - -#: ../app/pdb/edit-cmds.c:728 ../app/tools/gimpblendtool.c:249 -msgid "Blending" -msgstr "Mezclando" - -#: ../app/pdb/floating-sel-cmds.c:65 -msgid "Cannot remove this layer because it is not a floating selection." -msgstr "No se puede eliminar esta capa porque no es una selección flotante." - -#: ../app/pdb/floating-sel-cmds.c:98 -msgid "Cannot anchor this layer because it is not a floating selection." -msgstr "No se puede fijar esta capa porque no es una selección flotante." - -#: ../app/pdb/floating-sel-cmds.c:131 -msgid "" -"Cannot convert this layer to a normal layer because it is not a floating " -"selection." -msgstr "" -"No se puede convertir esta capa en una capa normal porque no es una " -"selección flotante." - -#: ../app/pdb/gimppdb-query.c:299 ../app/pdb/gimppdb.c:315 -#: ../app/pdb/gimppdb.c:385 -#, c-format -msgid "Procedure '%s' not found" -msgstr "No se encuentra el procedimiento «%s»" - -#: ../app/pdb/gimppdb-utils.c:73 -msgid "Invalid empty brush name" -msgstr "Nombre vacío del pincel no válido" - -#: ../app/pdb/gimppdb-utils.c:82 -#, c-format -msgid "Brush '%s' not found" -msgstr "No se encuentra el pincel «%s»" - -#: ../app/pdb/gimppdb-utils.c:87 -#, c-format -msgid "Brush '%s' is not editable" -msgstr "El pincel «%s» no es editable" - -#: ../app/pdb/gimppdb-utils.c:113 -#, c-format -msgid "Brush '%s' is not a generated brush" -msgstr "El pincel «%s» no es un pincel generado" - -#: ../app/pdb/gimppdb-utils.c:134 -msgid "Invalid empty paint dynamics name" -msgstr "Nombre vacío de dinámica de pintura no válido" - -#: ../app/pdb/gimppdb-utils.c:143 -#, c-format -msgid "Paint dynamics '%s' not found" -msgstr "No se encuentra la dinámica de pintura «%s»" - -#: ../app/pdb/gimppdb-utils.c:148 -#, c-format -msgid "Paint dynamics '%s' is not editable" -msgstr "La dinámica de pintura «%s» no es editable" - -#: ../app/pdb/gimppdb-utils.c:168 -msgid "Invalid empty pattern name" -msgstr "Nombre vacío del patrón no válido" - -#: ../app/pdb/gimppdb-utils.c:177 -#, c-format -msgid "Pattern '%s' not found" -msgstr "No se encuentra el patrón «%s»" - -#: ../app/pdb/gimppdb-utils.c:197 -msgid "Invalid empty gradient name" -msgstr "Nombre vacío del degradado no válido" - -#: ../app/pdb/gimppdb-utils.c:206 -#, c-format -msgid "Gradient '%s' not found" -msgstr "No se encuentra el degradado «%s»" - -#: ../app/pdb/gimppdb-utils.c:211 -#, c-format -msgid "Gradient '%s' is not editable" -msgstr "El degradado «%s» no es editable" - -#: ../app/pdb/gimppdb-utils.c:232 -msgid "Invalid empty palette name" -msgstr "Nombre vacío de paleta no válido" - -#: ../app/pdb/gimppdb-utils.c:241 -#, c-format -msgid "Palette '%s' not found" -msgstr "No se encuentra la paleta «%s»" - -#: ../app/pdb/gimppdb-utils.c:246 -#, c-format -msgid "Palette '%s' is not editable" -msgstr "La paleta «%s» no es editable" - -#: ../app/pdb/gimppdb-utils.c:266 -msgid "Invalid empty font name" -msgstr "Nombre vacío de tipografía no válido" - -#: ../app/pdb/gimppdb-utils.c:276 -#, c-format -msgid "Font '%s' not found" -msgstr "No se encuentra la tipografía «%s»" - -#: ../app/pdb/gimppdb-utils.c:295 -msgid "Invalid empty buffer name" -msgstr "Nombre vacío de búfer no válido" - -#: ../app/pdb/gimppdb-utils.c:305 -#, c-format -msgid "Named buffer '%s' not found" -msgstr "No se encuentra el búfer con nombre «%s»" - -#: ../app/pdb/gimppdb-utils.c:324 -msgid "Invalid empty paint method name" -msgstr "Nombre vacío de método de pintura no válido" - -#: ../app/pdb/gimppdb-utils.c:334 -#, c-format -msgid "Paint method '%s' does not exist" -msgstr "No existe el método de pintura «%s»" - -#: ../app/pdb/gimppdb-utils.c:353 -#, c-format -msgid "Item '%s' (%d) cannot be used because it has not been added to an image" -msgstr "" -"No se puede usar el elemento «%s» (%d) porque no se ha añadido a una imagen" - -#: ../app/pdb/gimppdb-utils.c:363 -#, c-format -msgid "Item '%s' (%d) cannot be used because it is attached to another image" -msgstr "" -"No se puede usar el elemento «%s» (%d) porque está asignado a otra imagen" - -#: ../app/pdb/gimppdb-utils.c:392 -#, c-format -msgid "" -"Item '%s' (%d) cannot be used because it is not a direct child of an item " -"tree" -msgstr "" -"No se puede usar el elemento «%s» (%d) porque no es un descendiente directo " -"de un árbol de elementos" - -#: ../app/pdb/gimppdb-utils.c:420 -#, c-format -msgid "" -"Items '%s' (%d) and '%s' (%d) cannot be used because they are not part of " -"the same item tree" -msgstr "" -"No se pueden usar los elementos «%s» (%d) y «%s» (%d) porque no forman parte " -"del mismo árbol de elementos" - -#: ../app/pdb/gimppdb-utils.c:445 -#, c-format -msgid "Item '%s' (%d) must not be an ancestor of '%s' (%d)" -msgstr "El elemento «%s» (%d) no debe ser un ancestro de «%s» (%d)" - -#: ../app/pdb/gimppdb-utils.c:469 -#, c-format -msgid "Item '%s' (%d) has already been added to an image" -msgstr "El elemento «%s» (%d) ya se ha añadido a una imagen" - -#: ../app/pdb/gimppdb-utils.c:477 -#, c-format -msgid "Trying to add item '%s' (%d) to wrong image" -msgstr "Intentando añadir el elemento «%s» (%d) a la imagen equivocada" - -#: ../app/pdb/gimppdb-utils.c:496 -#, c-format -msgid "Item '%s' (%d) cannot be modified because its contents are locked" -msgstr "" -"No se puede modificar el elemento «%s» (%d) porque su contenido está bloqueado" - -#: ../app/pdb/gimppdb-utils.c:516 -#, c-format -msgid "Item '%s' (%d) cannot be used because it is not a group item" -msgstr "" -"No se puede usar el elemento «%s» (%d) porque no es un elemento de grupo" - -#: ../app/pdb/gimppdb-utils.c:536 -#, c-format -msgid "Item '%s' (%d) cannot be modified because it is a group item" -msgstr "" -"No se puede modificar el elemento «%s» (%d) porque es un elemento de grupo" - -#: ../app/pdb/gimppdb-utils.c:557 -#, c-format -msgid "Layer '%s' (%d) cannot be used because it is not a text layer" -msgstr "No se puede usar la capa «%s» (%d) porque no es una capa de texto" - -#: ../app/pdb/gimppdb-utils.c:598 -#, c-format -msgid "Image '%s' (%d) is of type '%s', but an image of type '%s' is expected" -msgstr "" -"La imagen «%s» (%d) es del tipo «%s», pero se esperaba una imagen del tipo «%s»" - -#: ../app/pdb/gimppdb-utils.c:621 -#, c-format -msgid "Image '%s' (%d) is already of type '%s'" -msgstr "La imagen «%s» (%d) ya es del tipo «%s»" - -#: ../app/pdb/gimppdb-utils.c:649 -#, c-format -msgid "Vectors object %d does not contain stroke with ID %d" -msgstr "El objeto de vectores %d no contiene un trazo con el ID %d" - -#: ../app/pdb/gimppdb.c:420 -#, c-format -msgid "" -"Procedure '%s' has been called with a wrong type for argument #%d. Expected %" -"s, got %s." -msgstr "" -"Se ha llamado al procedimiento «%s» con un valor con un tipo erróneo para el " -"argumento #%d. Se esperaba %s pero se obtuvo %s." - +#: ../app/paint/paint-enums.c:114 +msgctxt "convolve-type" +msgid "Blur" +msgstr "Difuminar" + +#: ../app/paint/paint-enums.c:115 +msgctxt "convolve-type" +msgid "Sharpen" +msgstr "Perfilar" + +#: ../app/paint/paint-enums.c:144 +msgctxt "ink-blob-type" +msgid "Circle" +msgstr "Círculo" + +#: ../app/paint/paint-enums.c:145 +msgctxt "ink-blob-type" +msgid "Square" +msgstr "Cuadrado" + +#: ../app/paint/paint-enums.c:146 +msgctxt "ink-blob-type" +msgid "Diamond" +msgstr "Rombo" + +#: ../app/pdb/channel-cmds.c:194 +msgid "Combine Masks" +msgstr "Combinar máscaras" + +#: ../app/pdb/drawable-cmds.c:474 +msgid "Plug-In" +msgstr "Complemento" + +#: ../app/pdb/drawable-transform-cmds.c:345 +#: ../app/pdb/drawable-transform-cmds.c:443 +#: ../app/pdb/item-transform-cmds.c:262 ../app/pdb/transform-tools-cmds.c:163 +#: ../app/tools/gimpperspectivetool.c:82 +msgid "Perspective" +msgstr "Perspectiva" + +#: ../app/pdb/drawable-transform-cmds.c:957 +#: ../app/pdb/drawable-transform-cmds.c:1042 +#: ../app/pdb/item-transform-cmds.c:611 ../app/pdb/transform-tools-cmds.c:418 +#: ../app/tools/gimpsheartool.c:112 +msgid "Shearing" +msgstr "Inclinando" + +#: ../app/pdb/drawable-transform-cmds.c:1138 +#: ../app/pdb/item-transform-cmds.c:709 ../app/pdb/transform-tools-cmds.c:507 +msgid "2D Transform" +msgstr "Transformación 2D" + +#: ../app/pdb/drawable-transform-cmds.c:1234 +#: ../app/pdb/drawable-transform-cmds.c:1338 +#: ../app/pdb/drawable-transform-cmds.c:1442 +#: ../app/pdb/item-transform-cmds.c:815 +msgid "2D Transforming" +msgstr "Aplicando transformación 2D" + +#: ../app/pdb/edit-cmds.c:728 ../app/tools/gimpblendtool.c:249 +msgid "Blending" +msgstr "Mezclando" + +#: ../app/pdb/floating-sel-cmds.c:65 +msgid "Cannot remove this layer because it is not a floating selection." +msgstr "No se puede eliminar esta capa porque no es una selección flotante." + +#: ../app/pdb/floating-sel-cmds.c:98 +msgid "Cannot anchor this layer because it is not a floating selection." +msgstr "No se puede fijar esta capa porque no es una selección flotante." + +#: ../app/pdb/floating-sel-cmds.c:131 +msgid "" +"Cannot convert this layer to a normal layer because it is not a floating " +"selection." +msgstr "" +"No se puede convertir esta capa en una capa normal porque no es una " +"selección flotante." + +#: ../app/pdb/gimppdb-query.c:299 ../app/pdb/gimppdb.c:315 +#: ../app/pdb/gimppdb.c:385 +#, c-format +msgid "Procedure '%s' not found" +msgstr "No se encuentra el procedimiento «%s»" + +#: ../app/pdb/gimppdb-utils.c:73 +msgid "Invalid empty brush name" +msgstr "Nombre vacío del pincel no válido" + +#: ../app/pdb/gimppdb-utils.c:82 +#, c-format +msgid "Brush '%s' not found" +msgstr "No se encuentra el pincel «%s»" + +#: ../app/pdb/gimppdb-utils.c:87 +#, c-format +msgid "Brush '%s' is not editable" +msgstr "El pincel «%s» no es editable" + +#: ../app/pdb/gimppdb-utils.c:113 +#, c-format +msgid "Brush '%s' is not a generated brush" +msgstr "El pincel «%s» no es un pincel generado" + +#: ../app/pdb/gimppdb-utils.c:134 +msgid "Invalid empty paint dynamics name" +msgstr "Nombre vacío de dinámica de pintura no válido" + +#: ../app/pdb/gimppdb-utils.c:143 +#, c-format +msgid "Paint dynamics '%s' not found" +msgstr "No se encuentra la dinámica de pintura «%s»" + +#: ../app/pdb/gimppdb-utils.c:148 +#, c-format +msgid "Paint dynamics '%s' is not editable" +msgstr "La dinámica de pintura «%s» no es editable" + +#: ../app/pdb/gimppdb-utils.c:168 +msgid "Invalid empty pattern name" +msgstr "Nombre vacío del patrón no válido" + +#: ../app/pdb/gimppdb-utils.c:177 +#, c-format +msgid "Pattern '%s' not found" +msgstr "No se encuentra el patrón «%s»" + +#: ../app/pdb/gimppdb-utils.c:197 +msgid "Invalid empty gradient name" +msgstr "Nombre vacío del degradado no válido" + +#: ../app/pdb/gimppdb-utils.c:206 +#, c-format +msgid "Gradient '%s' not found" +msgstr "No se encuentra el degradado «%s»" + +#: ../app/pdb/gimppdb-utils.c:211 +#, c-format +msgid "Gradient '%s' is not editable" +msgstr "El degradado «%s» no es editable" + +#: ../app/pdb/gimppdb-utils.c:232 +msgid "Invalid empty palette name" +msgstr "Nombre vacío de paleta no válido" + +#: ../app/pdb/gimppdb-utils.c:241 +#, c-format +msgid "Palette '%s' not found" +msgstr "No se encuentra la paleta «%s»" + +#: ../app/pdb/gimppdb-utils.c:246 +#, c-format +msgid "Palette '%s' is not editable" +msgstr "La paleta «%s» no es editable" + +#: ../app/pdb/gimppdb-utils.c:266 +msgid "Invalid empty font name" +msgstr "Nombre vacío de tipografía no válido" + +#: ../app/pdb/gimppdb-utils.c:276 +#, c-format +msgid "Font '%s' not found" +msgstr "No se encuentra la tipografía «%s»" + +#: ../app/pdb/gimppdb-utils.c:295 +msgid "Invalid empty buffer name" +msgstr "Nombre vacío de búfer no válido" + +#: ../app/pdb/gimppdb-utils.c:305 +#, c-format +msgid "Named buffer '%s' not found" +msgstr "No se encuentra el búfer con nombre «%s»" + +#: ../app/pdb/gimppdb-utils.c:324 +msgid "Invalid empty paint method name" +msgstr "Nombre vacío de método de pintura no válido" + +#: ../app/pdb/gimppdb-utils.c:334 +#, c-format +msgid "Paint method '%s' does not exist" +msgstr "No existe el método de pintura «%s»" + +#: ../app/pdb/gimppdb-utils.c:353 +#, c-format +msgid "Item '%s' (%d) cannot be used because it has not been added to an image" +msgstr "" +"No se puede usar el elemento «%s» (%d) porque no se ha añadido a una imagen" + +#: ../app/pdb/gimppdb-utils.c:363 +#, c-format +msgid "Item '%s' (%d) cannot be used because it is attached to another image" +msgstr "" +"No se puede usar el elemento «%s» (%d) porque está asignado a otra imagen" + +#: ../app/pdb/gimppdb-utils.c:392 +#, c-format +msgid "" +"Item '%s' (%d) cannot be used because it is not a direct child of an item " +"tree" +msgstr "" +"No se puede usar el elemento «%s» (%d) porque no es un descendiente directo " +"de un árbol de elementos" + +#: ../app/pdb/gimppdb-utils.c:420 +#, c-format +msgid "" +"Items '%s' (%d) and '%s' (%d) cannot be used because they are not part of " +"the same item tree" +msgstr "" +"No se pueden usar los elementos «%s» (%d) y «%s» (%d) porque no forman parte " +"del mismo árbol de elementos" + +#: ../app/pdb/gimppdb-utils.c:445 +#, c-format +msgid "Item '%s' (%d) must not be an ancestor of '%s' (%d)" +msgstr "El elemento «%s» (%d) no debe ser un ancestro de «%s» (%d)" + +#: ../app/pdb/gimppdb-utils.c:469 +#, c-format +msgid "Item '%s' (%d) has already been added to an image" +msgstr "El elemento «%s» (%d) ya se ha añadido a una imagen" + +#: ../app/pdb/gimppdb-utils.c:477 +#, c-format +msgid "Trying to add item '%s' (%d) to wrong image" +msgstr "Intentando añadir el elemento «%s» (%d) a la imagen equivocada" + +#: ../app/pdb/gimppdb-utils.c:496 +#, c-format +msgid "Item '%s' (%d) cannot be modified because its contents are locked" +msgstr "" +"No se puede modificar el elemento «%s» (%d) porque su contenido está " +"bloqueado" + +#: ../app/pdb/gimppdb-utils.c:516 +#, c-format +msgid "Item '%s' (%d) cannot be used because it is not a group item" +msgstr "" +"No se puede usar el elemento «%s» (%d) porque no es un elemento de grupo" + +#: ../app/pdb/gimppdb-utils.c:536 +#, c-format +msgid "Item '%s' (%d) cannot be modified because it is a group item" +msgstr "" +"No se puede modificar el elemento «%s» (%d) porque es un elemento de grupo" + +#: ../app/pdb/gimppdb-utils.c:557 +#, c-format +msgid "Layer '%s' (%d) cannot be used because it is not a text layer" +msgstr "No se puede usar la capa «%s» (%d) porque no es una capa de texto" + +#: ../app/pdb/gimppdb-utils.c:598 +#, c-format +msgid "Image '%s' (%d) is of type '%s', but an image of type '%s' is expected" +msgstr "" +"La imagen «%s» (%d) es del tipo «%s», pero se esperaba una imagen del tipo " +"«%s»" + +#: ../app/pdb/gimppdb-utils.c:621 +#, c-format +msgid "Image '%s' (%d) is already of type '%s'" +msgstr "La imagen «%s» (%d) ya es del tipo «%s»" + +#: ../app/pdb/gimppdb-utils.c:649 +#, c-format +msgid "Vectors object %d does not contain stroke with ID %d" +msgstr "El objeto de vectores %d no contiene un trazo con el ID %d" + +#: ../app/pdb/gimppdb.c:420 +#, c-format +msgid "" +"Procedure '%s' has been called with a wrong type for argument #%d. Expected " +"%s, got %s." +msgstr "" +"Se ha llamado al procedimiento «%s» con un valor con un tipo erróneo para el " +"argumento #%d. Se esperaba %s pero se obtuvo %s." + # //R Ojito -#: ../app/pdb/gimppdbcontext.c:89 -#: ../app/tools/gimpforegroundselectoptions.c:79 -#: ../app/tools/gimpselectionoptions.c:78 -msgid "Smooth edges" -msgstr "Bordes suavizados" - -#: ../app/pdb/gimpprocedure.c:374 ../app/plug-in/gimppluginprocframe.c:208 -#, c-format -msgid "Procedure '%s' returned no return values" -msgstr "El procedimiento «%s» no ha devuelto ningún valor de retorno" - -#: ../app/pdb/gimpprocedure.c:644 -#, c-format -msgid "" -"Procedure '%s' returned a wrong value type for return value '%s' (#%d). " -"Expected %s, got %s." -msgstr "" -"El procedimiento «%s» ha devuelto un valor con tipo erróneo para el valor " -"devuelto «%s» (#%d). Se esperaba %s pero se obtuvo %s." - -#: ../app/pdb/gimpprocedure.c:656 -#, c-format -msgid "" -"Procedure '%s' has been called with a wrong value type for argument '%s' (#%" -"d). Expected %s, got %s." -msgstr "" -"El procedimiento «%s» se ha llamado con un valor con un tipo erróneo para el " -"argumento «%s» (#%d). Se esperaba %s pero se obtuvo %s." - -#: ../app/pdb/gimpprocedure.c:689 -#, c-format -msgid "" -"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-" -"in is trying to work on a layer that doesn't exist any longer." -msgstr "" -"El procedimiento «%s» ha devuelto un ID no válido para el argumento «%s». Con " -"toda probabilidad un complemento está tratando de operar sobre una capa que " -"ya no existe." - -#: ../app/pdb/gimpprocedure.c:702 -#, c-format -msgid "" -"Procedure '%s' has been called with an invalid ID for argument '%s'. Most " -"likely a plug-in is trying to work on a layer that doesn't exist any longer." -msgstr "" -"El procedimiento «%s» se ha llamado con un ID incorrecto para el argumento «%" -"s». Con toda probabilidad un complemento está tratando de operar sobre una " -"capa que ya no existe." - -#: ../app/pdb/gimpprocedure.c:719 -#, c-format -msgid "" -"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-" -"in is trying to work on an image that doesn't exist any longer." -msgstr "" -"El procedimiento «%s» ha devuelto un ID no válido para el argumento «%s». Con " -"toda probabilidad un complemento está tratando de operar sobre una capa que " -"ya no existe." - -#: ../app/pdb/gimpprocedure.c:732 -#, c-format -msgid "" -"Procedure '%s' has been called with an invalid ID for argument '%s'. Most " -"likely a plug-in is trying to work on an image that doesn't exist any longer." -msgstr "" -"El procedimiento «%s» se ha llamado con un ID no válido para el argumento «%" -"s». Con toda probabilidad un complemento está tratando de operar sobre una " -"capa que ya no existe." - -#: ../app/pdb/gimpprocedure.c:753 -#, c-format -msgid "" -"Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value " -"is out of range." -msgstr "" -"El procedimiento «%s» ha devuelto «%s» como valor de retorno «%s» (#%d, tipo %" -"s). Este valor está fuera de los límites." - -#: ../app/pdb/gimpprocedure.c:767 -#, c-format -msgid "" -"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type %" -"s). This value is out of range." -msgstr "" -"El procedimiento «%s» se ha llamado con un valor «%s» para el argumento «%s» (#%" -"d, tipo %s). Este valor está fuera de los límites." - -#: ../app/pdb/image-cmds.c:2361 -msgid "" -"Image resolution is out of bounds, using the default resolution instead." -msgstr "" -"La resolución de la Imagen se sale de los límites; usando la resolución " -"predeterminada en su lugar." - -#: ../app/pdb/image-select-cmds.c:297 ../app/pdb/selection-tools-cmds.c:219 -#: ../app/tools/gimpfreeselecttool.c:196 -msgid "Free Select" -msgstr "Selección libre" - -#: ../app/pdb/layer-cmds.c:475 ../app/pdb/layer-cmds.c:513 -msgid "Move Layer" -msgstr "Mover la capa" - -#: ../app/pdb/text-layer-cmds.c:91 -#, c-format -msgid "Failed to create text layer" -msgstr "No se ha podido crear la capa de texto" - -#: ../app/pdb/text-layer-cmds.c:164 ../app/pdb/text-layer-cmds.c:274 -#: ../app/pdb/text-layer-cmds.c:353 ../app/pdb/text-layer-cmds.c:426 -#: ../app/pdb/text-layer-cmds.c:498 ../app/pdb/text-layer-cmds.c:570 -#: ../app/pdb/text-layer-cmds.c:642 ../app/pdb/text-layer-cmds.c:714 -#: ../app/pdb/text-layer-cmds.c:786 ../app/pdb/text-layer-cmds.c:856 -#: ../app/pdb/text-layer-cmds.c:928 ../app/pdb/text-layer-cmds.c:1000 -#: ../app/pdb/text-layer-cmds.c:1072 ../app/pdb/text-layer-cmds.c:1114 -#: ../app/pdb/text-layer-cmds.c:1196 -msgid "Set text layer attribute" -msgstr "Establecer el atributo de la capa de texto" - -#: ../app/pdb/vectors-cmds.c:323 -msgid "Remove path stroke" -msgstr "Eliminar trazado de ruta" - -#: ../app/pdb/vectors-cmds.c:359 -msgid "Close path stroke" -msgstr "Cerrar trazado de ruta" - -#: ../app/pdb/vectors-cmds.c:401 -msgid "Translate path stroke" -msgstr "Trasladar trazado de ruta" - -#: ../app/pdb/vectors-cmds.c:443 -msgid "Scale path stroke" -msgstr "Escalar trazado de ruta" - -#: ../app/pdb/vectors-cmds.c:487 -msgid "Rotate path stroke" -msgstr "Rotar trazado de ruta" - -#: ../app/pdb/vectors-cmds.c:529 ../app/pdb/vectors-cmds.c:575 -msgid "Flip path stroke" -msgstr "Voltear trazado de ruta" - -#: ../app/pdb/vectors-cmds.c:706 ../app/pdb/vectors-cmds.c:829 -#: ../app/pdb/vectors-cmds.c:1055 -msgid "Add path stroke" -msgstr "Añadir un trazado de ruta" - -#: ../app/pdb/vectors-cmds.c:882 ../app/pdb/vectors-cmds.c:937 -#: ../app/pdb/vectors-cmds.c:1000 -msgid "Extend path stroke" -msgstr "Extender trazado de ruta" - -#: ../app/plug-in/gimpenvirontable.c:281 -#, c-format -msgid "Empty variable name in environment file %s" -msgstr "Nombre de variable vacío en el archivo de entorno %s" - -#: ../app/plug-in/gimpenvirontable.c:299 -#, c-format -msgid "Illegal variable name in environment file %s: %s" -msgstr "Nombre de variable ilegal en el archivo de ambiente %s: %s" - -#: ../app/plug-in/gimpinterpreterdb.c:263 -#, c-format -msgid "Bad interpreter referenced in interpreter file %s: %s" -msgstr "Intérprete erróneo referenciado en el archivo del intérprete %s: %s" - -#: ../app/plug-in/gimpinterpreterdb.c:322 -#, c-format -msgid "Bad binary format string in interpreter file %s" -msgstr "Cadena de formato binario errónea en el archivo del intérprete %s" - -#: ../app/plug-in/gimpplugin-message.c:450 -#, c-format -msgid "" -"Calling error for procedure '%s':\n" -"%s" -msgstr "" -"Error de llamada para el procedimiento «%s»:\n" -"%s" - -#: ../app/plug-in/gimpplugin-message.c:459 -#, c-format -msgid "" -"Execution error for procedure '%s':\n" -"%s" -msgstr "" -"Error de ejecución para el procedimiento «%s»:\n" -"%s" - -#: ../app/plug-in/gimpplugin-progress.c:331 -msgid "Cancelled" -msgstr "Cancelado" - -#: ../app/plug-in/gimpplugin.c:643 -#, c-format -msgid "" -"Plug-in crashed: \"%s\"\n" -"(%s)\n" -"\n" -"The dying plug-in may have messed up GIMP's internal state. You may want to " -"save your images and restart GIMP to be on the safe side." -msgstr "" -"El complemento ha fallado: «%s»\n" -"(%s)\n" -"\n" -"El complemento que ha fallado puede haber estropeado el estado interno de " -"GIMP. Sería conveniente que guardase todas sus imágenes y reiniciase GIMP, " -"para no arriesgarse." - -#: ../app/plug-in/gimppluginmanager-call.c:173 -#: ../app/plug-in/gimppluginmanager-call.c:223 -#: ../app/plug-in/gimppluginmanager-call.c:321 -#, c-format -msgid "Failed to run plug-in \"%s\"" -msgstr "Se produjo un fallo alejecutar el complemento «%s»" - -#: ../app/plug-in/gimppluginmanager-restore.c:229 -msgid "Searching Plug-Ins" -msgstr "Buscando complementos" - -#: ../app/plug-in/gimppluginmanager-restore.c:284 -msgid "Resource configuration" -msgstr "Configuración de recursos" - -#: ../app/plug-in/gimppluginmanager-restore.c:320 -msgid "Querying new Plug-ins" -msgstr "Verificando si hay complementos nuevos" - -#: ../app/plug-in/gimppluginmanager-restore.c:370 -msgid "Initializing Plug-ins" -msgstr "Inicializando los complementos" - -#: ../app/plug-in/gimppluginmanager-restore.c:442 -msgid "Starting Extensions" -msgstr "Inicializando los añadidos" - -#: ../app/plug-in/gimppluginmanager.c:296 -msgid "Plug-In Interpreters" -msgstr "Intérpretes de complementos" - -#: ../app/plug-in/gimppluginmanager.c:303 -msgid "Plug-In Environment" -msgstr "Entorno de complementos" - -#: ../app/plug-in/gimppluginprocedure.c:978 -#, c-format -msgid "" -"Calling error for '%s':\n" -"%s" -msgstr "" -"Error de llamada para «%s»:\n" -"%s" - -#: ../app/plug-in/gimppluginprocedure.c:990 -#, c-format -msgid "" -"Execution error for '%s':\n" -"%s" -msgstr "" -"Error de ejecución para «%s»:\n" -"%s" - -#: ../app/plug-in/plug-in-icc-profile.c:74 -#, c-format -msgid "Can't apply color profile to grayscale image (%s)" -msgstr "" -"No se puede aplicar el perfil de color a imágenes en escala de grises (%s)" - -#: ../app/plug-in/plug-in-icc-profile.c:117 -#: ../app/plug-in/plug-in-icc-profile.c:192 -#: ../app/plug-in/plug-in-icc-profile.c:251 -#, c-format -msgid "Error running '%s'" -msgstr "Ocurrió un error al ejecutar «%s»" - -#: ../app/plug-in/plug-in-icc-profile.c:141 -#: ../app/plug-in/plug-in-icc-profile.c:202 -#: ../app/plug-in/plug-in-icc-profile.c:261 -#, c-format -msgid "Plug-In missing (%s)" -msgstr "Falta el complemento (%s)" - -#: ../app/plug-in/plug-in-rc.c:205 -#, c-format -msgid "Skipping '%s': wrong GIMP protocol version." -msgstr "Ignorando «%s»: versión de protocolo de GIMP incorrecta." - -#: ../app/plug-in/plug-in-rc.c:477 -#, c-format -msgid "invalid value '%s' for icon type" -msgstr "valor no válido «%s» para el tipo de icono" - -#: ../app/plug-in/plug-in-rc.c:492 -#, c-format -msgid "invalid value '%ld' for icon type" -msgstr "valor no válido «%ld» para el tipo de icono" - -#. This is a so-called pangram; it's supposed to -#. contain all characters found in the alphabet. -#: ../app/text/gimpfont.c:45 -msgid "" -"Pack my box with\n" -"five dozen liquor jugs." -msgstr "" -"El veloz murciélago hindú comía feliz cardillo y kiwi. La cigüeña tocaba el " -"saxofón detrás del palenque de paja." - -#: ../app/text/gimptext-compat.c:105 ../app/tools/gimptexttool.c:1415 -msgid "Add Text Layer" -msgstr "Añadir una capa de texto" - -#: ../app/text/gimptextlayer.c:143 -msgid "Text Layer" -msgstr "Capa de texto" - -#: ../app/text/gimptextlayer.c:144 -msgid "Rename Text Layer" -msgstr "Renombrar la capa de texto" - -#: ../app/text/gimptextlayer.c:145 -msgid "Move Text Layer" -msgstr "Mover la capa de texto" - -#: ../app/text/gimptextlayer.c:146 -msgid "Scale Text Layer" -msgstr "Escalar la capa de texto" - -#: ../app/text/gimptextlayer.c:147 -msgid "Resize Text Layer" -msgstr "Redimensionar la capa de texto" - -#: ../app/text/gimptextlayer.c:148 -msgid "Flip Text Layer" -msgstr "Voltear la capa de texto" - -#: ../app/text/gimptextlayer.c:149 -msgid "Rotate Text Layer" -msgstr "Rotar la capa de texto" - -#: ../app/text/gimptextlayer.c:150 -msgid "Transform Text Layer" -msgstr "Transformar la capa de texto" - -#: ../app/text/gimptextlayer.c:523 -msgid "Discard Text Information" -msgstr "Eliminar la información de texto" - -#: ../app/text/gimptextlayer.c:582 -msgid "Due to lack of any fonts, text functionality is not available." -msgstr "" -"Debido a la falta de tipografías la funcionalidad de texto no está " -"disponible." - +#: ../app/pdb/gimppdbcontext.c:89 +#: ../app/tools/gimpforegroundselectoptions.c:79 +#: ../app/tools/gimpselectionoptions.c:78 +msgid "Smooth edges" +msgstr "Bordes suavizados" + +#: ../app/pdb/gimpprocedure.c:374 ../app/plug-in/gimppluginprocframe.c:208 +#, c-format +msgid "Procedure '%s' returned no return values" +msgstr "El procedimiento «%s» no ha devuelto ningún valor de retorno" + +#: ../app/pdb/gimpprocedure.c:644 +#, c-format +msgid "" +"Procedure '%s' returned a wrong value type for return value '%s' (#%d). " +"Expected %s, got %s." +msgstr "" +"El procedimiento «%s» ha devuelto un valor con tipo erróneo para el valor " +"devuelto «%s» (#%d). Se esperaba %s pero se obtuvo %s." + +#: ../app/pdb/gimpprocedure.c:656 +#, c-format +msgid "" +"Procedure '%s' has been called with a wrong value type for argument '%s' (#" +"%d). Expected %s, got %s." +msgstr "" +"El procedimiento «%s» se ha llamado con un valor con un tipo erróneo para el " +"argumento «%s» (#%d). Se esperaba %s pero se obtuvo %s." + +#: ../app/pdb/gimpprocedure.c:689 +#, c-format +msgid "" +"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-" +"in is trying to work on a layer that doesn't exist any longer." +msgstr "" +"El procedimiento «%s» ha devuelto un ID no válido para el argumento «%s». " +"Con toda probabilidad un complemento está tratando de operar sobre una capa " +"que ya no existe." + +#: ../app/pdb/gimpprocedure.c:702 +#, c-format +msgid "" +"Procedure '%s' has been called with an invalid ID for argument '%s'. Most " +"likely a plug-in is trying to work on a layer that doesn't exist any longer." +msgstr "" +"El procedimiento «%s» se ha llamado con un ID incorrecto para el argumento " +"«%s». Con toda probabilidad un complemento está tratando de operar sobre una " +"capa que ya no existe." + +#: ../app/pdb/gimpprocedure.c:719 +#, c-format +msgid "" +"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-" +"in is trying to work on an image that doesn't exist any longer." +msgstr "" +"El procedimiento «%s» ha devuelto un ID no válido para el argumento «%s». " +"Con toda probabilidad un complemento está tratando de operar sobre una capa " +"que ya no existe." + +#: ../app/pdb/gimpprocedure.c:732 +#, c-format +msgid "" +"Procedure '%s' has been called with an invalid ID for argument '%s'. Most " +"likely a plug-in is trying to work on an image that doesn't exist any longer." +msgstr "" +"El procedimiento «%s» se ha llamado con un ID no válido para el argumento " +"«%s». Con toda probabilidad un complemento está tratando de operar sobre una " +"capa que ya no existe." + +#: ../app/pdb/gimpprocedure.c:753 +#, c-format +msgid "" +"Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value " +"is out of range." +msgstr "" +"El procedimiento «%s» ha devuelto «%s» como valor de retorno «%s» (#%d, tipo " +"%s). Este valor está fuera de los límites." + +#: ../app/pdb/gimpprocedure.c:767 +#, c-format +msgid "" +"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type " +"%s). This value is out of range." +msgstr "" +"El procedimiento «%s» se ha llamado con un valor «%s» para el argumento " +"«%s» (#%d, tipo %s). Este valor está fuera de los límites." + +#: ../app/pdb/image-cmds.c:2361 +msgid "" +"Image resolution is out of bounds, using the default resolution instead." +msgstr "" +"La resolución de la Imagen se sale de los límites; usando la resolución " +"predeterminada en su lugar." + +#: ../app/pdb/image-select-cmds.c:297 ../app/pdb/selection-tools-cmds.c:219 +#: ../app/tools/gimpfreeselecttool.c:196 +msgid "Free Select" +msgstr "Selección libre" + +#: ../app/pdb/text-layer-cmds.c:91 +#, c-format +msgid "Failed to create text layer" +msgstr "No se ha podido crear la capa de texto" + +#: ../app/pdb/text-layer-cmds.c:164 ../app/pdb/text-layer-cmds.c:274 +#: ../app/pdb/text-layer-cmds.c:353 ../app/pdb/text-layer-cmds.c:426 +#: ../app/pdb/text-layer-cmds.c:498 ../app/pdb/text-layer-cmds.c:570 +#: ../app/pdb/text-layer-cmds.c:642 ../app/pdb/text-layer-cmds.c:714 +#: ../app/pdb/text-layer-cmds.c:786 ../app/pdb/text-layer-cmds.c:856 +#: ../app/pdb/text-layer-cmds.c:928 ../app/pdb/text-layer-cmds.c:1000 +#: ../app/pdb/text-layer-cmds.c:1072 ../app/pdb/text-layer-cmds.c:1114 +#: ../app/pdb/text-layer-cmds.c:1196 +msgid "Set text layer attribute" +msgstr "Establecer el atributo de la capa de texto" + +#: ../app/pdb/vectors-cmds.c:323 +msgid "Remove path stroke" +msgstr "Eliminar trazado de ruta" + +#: ../app/pdb/vectors-cmds.c:359 +msgid "Close path stroke" +msgstr "Cerrar trazado de ruta" + +#: ../app/pdb/vectors-cmds.c:401 +msgid "Translate path stroke" +msgstr "Trasladar trazado de ruta" + +#: ../app/pdb/vectors-cmds.c:443 +msgid "Scale path stroke" +msgstr "Escalar trazado de ruta" + +#: ../app/pdb/vectors-cmds.c:487 +msgid "Rotate path stroke" +msgstr "Rotar trazado de ruta" + +#: ../app/pdb/vectors-cmds.c:529 ../app/pdb/vectors-cmds.c:575 +msgid "Flip path stroke" +msgstr "Voltear trazado de ruta" + +#: ../app/pdb/vectors-cmds.c:706 ../app/pdb/vectors-cmds.c:829 +#: ../app/pdb/vectors-cmds.c:1055 +msgid "Add path stroke" +msgstr "Añadir un trazado de ruta" + +#: ../app/pdb/vectors-cmds.c:882 ../app/pdb/vectors-cmds.c:937 +#: ../app/pdb/vectors-cmds.c:1000 +msgid "Extend path stroke" +msgstr "Extender trazado de ruta" + +#: ../app/plug-in/gimpenvirontable.c:281 +#, c-format +msgid "Empty variable name in environment file %s" +msgstr "Nombre de variable vacío en el archivo de entorno %s" + +#: ../app/plug-in/gimpenvirontable.c:299 +#, c-format +msgid "Illegal variable name in environment file %s: %s" +msgstr "Nombre de variable ilegal en el archivo de ambiente %s: %s" + +#: ../app/plug-in/gimpinterpreterdb.c:263 +#, c-format +msgid "Bad interpreter referenced in interpreter file %s: %s" +msgstr "Intérprete erróneo referenciado en el archivo del intérprete %s: %s" + +#: ../app/plug-in/gimpinterpreterdb.c:322 +#, c-format +msgid "Bad binary format string in interpreter file %s" +msgstr "Cadena de formato binario errónea en el archivo del intérprete %s" + +#: ../app/plug-in/gimpplugin-message.c:450 +#, c-format +msgid "" +"Calling error for procedure '%s':\n" +"%s" +msgstr "" +"Error de llamada para el procedimiento «%s»:\n" +"%s" + +#: ../app/plug-in/gimpplugin-message.c:459 +#, c-format +msgid "" +"Execution error for procedure '%s':\n" +"%s" +msgstr "" +"Error de ejecución para el procedimiento «%s»:\n" +"%s" + +#: ../app/plug-in/gimpplugin-progress.c:339 +msgid "Cancelled" +msgstr "Cancelado" + +#: ../app/plug-in/gimpplugin.c:648 +#, c-format +msgid "" +"Plug-in crashed: \"%s\"\n" +"(%s)\n" +"\n" +"The dying plug-in may have messed up GIMP's internal state. You may want to " +"save your images and restart GIMP to be on the safe side." +msgstr "" +"El complemento ha fallado: «%s»\n" +"(%s)\n" +"\n" +"El complemento que ha fallado puede haber estropeado el estado interno de " +"GIMP. Sería conveniente que guardase todas sus imágenes y reiniciase GIMP, " +"para no arriesgarse." + +#: ../app/plug-in/gimppluginmanager-call.c:185 +#: ../app/plug-in/gimppluginmanager-call.c:235 +#: ../app/plug-in/gimppluginmanager-call.c:333 +#, c-format +msgid "Failed to run plug-in \"%s\"" +msgstr "Se produjo un fallo alejecutar el complemento «%s»" + +#: ../app/plug-in/gimppluginmanager-restore.c:229 +msgid "Searching Plug-Ins" +msgstr "Buscando complementos" + +#: ../app/plug-in/gimppluginmanager-restore.c:284 +msgid "Resource configuration" +msgstr "Configuración de recursos" + +#: ../app/plug-in/gimppluginmanager-restore.c:320 +msgid "Querying new Plug-ins" +msgstr "Verificando si hay complementos nuevos" + +#: ../app/plug-in/gimppluginmanager-restore.c:370 +msgid "Initializing Plug-ins" +msgstr "Inicializando los complementos" + +#: ../app/plug-in/gimppluginmanager-restore.c:442 +msgid "Starting Extensions" +msgstr "Inicializando los añadidos" + +#: ../app/plug-in/gimppluginmanager.c:296 +msgid "Plug-In Interpreters" +msgstr "Intérpretes de complementos" + +#: ../app/plug-in/gimppluginmanager.c:303 +msgid "Plug-In Environment" +msgstr "Entorno de complementos" + +#: ../app/plug-in/gimppluginprocedure.c:978 +#, c-format +msgid "" +"Calling error for '%s':\n" +"%s" +msgstr "" +"Error de llamada para «%s»:\n" +"%s" + +#: ../app/plug-in/gimppluginprocedure.c:990 +#, c-format +msgid "" +"Execution error for '%s':\n" +"%s" +msgstr "" +"Error de ejecución para «%s»:\n" +"%s" + +#: ../app/plug-in/plug-in-icc-profile.c:74 +#, c-format +msgid "Can't apply color profile to grayscale image (%s)" +msgstr "" +"No se puede aplicar el perfil de color a imágenes en escala de grises (%s)" + +#: ../app/plug-in/plug-in-icc-profile.c:117 +#: ../app/plug-in/plug-in-icc-profile.c:192 +#: ../app/plug-in/plug-in-icc-profile.c:251 +#, c-format +msgid "Error running '%s'" +msgstr "Ocurrió un error al ejecutar «%s»" + +#: ../app/plug-in/plug-in-icc-profile.c:141 +#: ../app/plug-in/plug-in-icc-profile.c:202 +#: ../app/plug-in/plug-in-icc-profile.c:261 +#, c-format +msgid "Plug-In missing (%s)" +msgstr "Falta el complemento (%s)" + +#: ../app/plug-in/plug-in-rc.c:205 +#, c-format +msgid "Skipping '%s': wrong GIMP protocol version." +msgstr "Ignorando «%s»: versión de protocolo de GIMP incorrecta." + +#: ../app/plug-in/plug-in-rc.c:477 +#, c-format +msgid "invalid value '%s' for icon type" +msgstr "valor no válido «%s» para el tipo de icono" + +#: ../app/plug-in/plug-in-rc.c:492 +#, c-format +msgid "invalid value '%ld' for icon type" +msgstr "valor no válido «%ld» para el tipo de icono" + +#. This is a so-called pangram; it's supposed to +#. contain all characters found in the alphabet. +#: ../app/text/gimpfont.c:45 +msgid "" +"Pack my box with\n" +"five dozen liquor jugs." +msgstr "" +"El veloz murciélago hindú comía feliz cardillo y kiwi. La cigüeña tocaba el " +"saxofón detrás del palenque de paja." + +#: ../app/text/gimptext-compat.c:105 ../app/tools/gimptexttool.c:1415 +msgid "Add Text Layer" +msgstr "Añadir una capa de texto" + +#: ../app/text/gimptextlayer.c:143 +msgid "Text Layer" +msgstr "Capa de texto" + +#: ../app/text/gimptextlayer.c:144 +msgid "Rename Text Layer" +msgstr "Renombrar la capa de texto" + +#: ../app/text/gimptextlayer.c:145 +msgid "Move Text Layer" +msgstr "Mover la capa de texto" + +#: ../app/text/gimptextlayer.c:146 +msgid "Scale Text Layer" +msgstr "Escalar la capa de texto" + +#: ../app/text/gimptextlayer.c:147 +msgid "Resize Text Layer" +msgstr "Redimensionar la capa de texto" + +#: ../app/text/gimptextlayer.c:148 +msgid "Flip Text Layer" +msgstr "Voltear la capa de texto" + +#: ../app/text/gimptextlayer.c:149 +msgid "Rotate Text Layer" +msgstr "Rotar la capa de texto" + +#: ../app/text/gimptextlayer.c:150 +msgid "Transform Text Layer" +msgstr "Transformar la capa de texto" + +#: ../app/text/gimptextlayer.c:523 +msgid "Discard Text Information" +msgstr "Eliminar la información de texto" + +#: ../app/text/gimptextlayer.c:582 +msgid "Due to lack of any fonts, text functionality is not available." +msgstr "" +"Debido a la falta de tipografías la funcionalidad de texto no está " +"disponible." + # Aquí creo que Empty es adjetivo también -#: ../app/text/gimptextlayer.c:640 -msgid "Empty Text Layer" -msgstr "Capa de texto vacía" - -#: ../app/text/gimptextlayer.c:696 -msgid "" -"Your text cannot be rendered. It is likely too big. Please make it shorter " -"or use a smaller font." -msgstr "" -"No se puede renderizar el texto. Parece ser que es muy grande. Hágalo más " -"corto o use una tipografía más pequeña." - -#: ../app/text/gimptextlayer-xcf.c:76 -#, c-format -msgid "" -"Problems parsing the text parasite for layer '%s':\n" -"%s\n" -"\n" -"Some text properties may be wrong. Unless you want to edit the text layer, " -"you don't need to worry about this." -msgstr "" -"Han ocurrido problemas analizando el parásito de texto para la capa %s:\n" -"%s\n" -"\n" -"Algunas propiedades del texto podrían estar incorrectas. Al menos que quiera " -"editar la capa de texto no necesitará preocuparse por esto." - -#: ../app/text/gimptextlayout.c:577 -msgid "" -"The new text layout cannot be generated. Most likely the font size is too " -"big." -msgstr "" -"No se puede generar el texto nuevo. Es muy probable que el tamaño del texto " -"sea muy grande." - -#: ../app/text/text-enums.c:23 -msgctxt "text-box-mode" -msgid "Dynamic" -msgstr "Dinámico" - -#: ../app/text/text-enums.c:24 -msgctxt "text-box-mode" -msgid "Fixed" -msgstr "Fijo" - -#: ../app/tools/gimp-tools.c:351 -msgid "" -"This tool has\n" -"no options." -msgstr "" -"Esta herramienta\n" -"no tiene opciones." - -#: ../app/tools/gimpairbrushtool.c:55 -msgid "Airbrush Tool: Paint using a brush, with variable pressure" -msgstr "Herramienta aerógrafo: pintar con presión variable mediante un pincel" - -#: ../app/tools/gimpairbrushtool.c:56 -msgid "_Airbrush" -msgstr "_Aerógrafo" - -#: ../app/tools/gimpairbrushtool.c:86 -msgid "Motion only" -msgstr "Sólo movimiento" - -#: ../app/tools/gimpairbrushtool.c:91 ../app/tools/gimpconvolvetool.c:228 -#: ../app/tools/gimpsmudgetool.c:91 -msgid "Rate" -msgstr "Tasa" - -#: ../app/tools/gimpairbrushtool.c:97 -msgid "Flow" -msgstr "Flujo" - -#: ../app/tools/gimpalignoptions.c:91 -msgid "Reference image object a layer will be aligned on" -msgstr "Referenciar el objeto de imagen sobre el que se alineará la capa" - -#: ../app/tools/gimpalignoptions.c:98 -msgid "Horizontal offset for distribution" -msgstr "Desplazamiento horizontal para la distribución" - -#: ../app/tools/gimpalignoptions.c:104 -msgid "Vertical offset for distribution" -msgstr "Desplazamiento vertical para la distribución" - -#: ../app/tools/gimpalignoptions.c:272 ../app/tools/gimpaligntool.c:124 -msgid "Align" -msgstr "Alineado" - -#: ../app/tools/gimpalignoptions.c:284 -msgid "Relative to:" -msgstr "Relativo a:" - -#: ../app/tools/gimpalignoptions.c:298 -msgid "Align left edge of target" -msgstr "Alinear al borde izquierdo del objetivo" - -#: ../app/tools/gimpalignoptions.c:302 -msgid "Align center of target" -msgstr "Alinear al centro del objetivo" - -#: ../app/tools/gimpalignoptions.c:306 -msgid "Align right edge of target" -msgstr "Alinear al borde derecho del objetivo" - -#: ../app/tools/gimpalignoptions.c:314 -msgid "Align top edge of target" -msgstr "Alinear al borde superior del objetivo" - -#: ../app/tools/gimpalignoptions.c:318 -msgid "Align middle of target" -msgstr "Alinear a la mitad del objetivo" - -#: ../app/tools/gimpalignoptions.c:322 -msgid "Align bottom of target" -msgstr "Alinear a la parte inferior del objetivo" - -#: ../app/tools/gimpalignoptions.c:324 -msgid "Distribute" -msgstr "Distribuir" - -#: ../app/tools/gimpalignoptions.c:338 -msgid "Distribute left edges of targets" -msgstr "Distribuir los bordes izquierdos de los objetivos" - -#: ../app/tools/gimpalignoptions.c:342 -msgid "Distribute horizontal centers of targets" -msgstr "Distribuir horizontalmente los centros de los objetivos" - -#: ../app/tools/gimpalignoptions.c:346 -msgid "Distribute right edges of targets" -msgstr "Distribuir los bordes derechos de los objetivos" - -#: ../app/tools/gimpalignoptions.c:354 -msgid "Distribute top edges of targets" -msgstr "Distribuir los bordes superiores de los objetivos" - -#: ../app/tools/gimpalignoptions.c:358 -msgid "Distribute vertical centers of targets" -msgstr "Distribuir los centros verticales de los objetivos" - -#: ../app/tools/gimpalignoptions.c:362 -msgid "Distribute bottoms of targets" -msgstr "Distribuir las partes inferiores de los objetivos" - -#: ../app/tools/gimpalignoptions.c:368 -msgid "Offset:" -msgstr "Desplazamiento:" - -#: ../app/tools/gimpaligntool.c:125 -msgid "Alignment Tool: Align or arrange layers and other objects" -msgstr "Herramienta de alineación:Alinee o coloque capas y otros objetos" - -#: ../app/tools/gimpaligntool.c:126 -msgid "_Align" -msgstr "_Alineado" - -#: ../app/tools/gimpaligntool.c:549 -msgid "Click on a layer, path or guide, or Click-Drag to pick several layers" -msgstr "Pulse sobre una capa, ruta o guía, o arrastre para elegir varias capas" - -#: ../app/tools/gimpaligntool.c:557 -msgid "Click to pick this layer as first item" -msgstr "Pulse para elegir esta capa como primer elemento" - -#: ../app/tools/gimpaligntool.c:564 -msgid "Click to add this layer to the list" -msgstr "Pulse para añadir esta capa a la lista" - -#: ../app/tools/gimpaligntool.c:568 -msgid "Click to pick this guide as first item" -msgstr "Pulse para elegir esta guía como primer elemento" - -#: ../app/tools/gimpaligntool.c:575 -msgid "Click to add this guide to the list" -msgstr "Pulse para añadir esta guía a la lista" - -#: ../app/tools/gimpaligntool.c:579 -msgid "Click to pick this path as first item" -msgstr "Pulse para elegir esta ruta como primer elemento" - -#: ../app/tools/gimpaligntool.c:586 -msgid "Click to add this path to the list" -msgstr "Pulse para añadir esta ruta a la lista" - -#: ../app/tools/gimpblendoptions.c:211 ../app/tools/gimppaintoptions-gui.c:344 -msgid "Gradient" -msgstr "Degradado" - -#: ../app/tools/gimpblendoptions.c:231 ../app/widgets/gimpbrusheditor.c:139 -msgid "Shape:" -msgstr "Forma:" - -#: ../app/tools/gimpblendoptions.c:238 ../app/tools/gimppaintoptions-gui.c:323 -msgid "Repeat:" -msgstr "Repetir:" - -#: ../app/tools/gimpblendoptions.c:261 -msgid "Adaptive supersampling" -msgstr "Sobremuestreo adaptativo" - -#: ../app/tools/gimpblendoptions.c:268 -msgid "Max depth" -msgstr "Profundidad máxima" - -#: ../app/tools/gimpblendtool.c:109 -msgid "Blend" -msgstr "Mezcla" - -#: ../app/tools/gimpblendtool.c:110 -msgid "Blend Tool: Fill selected area with a color gradient" -msgstr "" -"Herramienta de mezcla: rellenar el área seleccionada con un degradado de " -"colores" - -#: ../app/tools/gimpblendtool.c:111 -msgid "Blen_d" -msgstr "_Mezcla [Blend]" - -#: ../app/tools/gimpblendtool.c:166 -msgid "Blend does not operate on indexed layers." -msgstr "La mezcla no funciona sobre capas indexadas." - -#: ../app/tools/gimpblendtool.c:187 -msgid "No gradient available for use with this tool." -msgstr "No hay degradados disponibles para usar con esta herramienta." - -#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:624 -#, c-format -msgid "%s for constrained angles" -msgstr "%s para ángulos restringidos" - -#: ../app/tools/gimpblendtool.c:453 -#, c-format -msgid "%s to move the whole line" -msgstr "%s para mover toda la línea" - -#: ../app/tools/gimpblendtool.c:457 -msgid "Blend: " -msgstr "Mezcla: " - -#: ../app/tools/gimpbrightnesscontrasttool.c:111 -msgid "Brightness-Contrast" -msgstr "Brillo-Contraste" - -#: ../app/tools/gimpbrightnesscontrasttool.c:112 -msgid "Brightness/Contrast Tool: Adjust brightness and contrast" -msgstr "Herramienta de brillo/contraste: ajustar el brillo y el contraste" - -#: ../app/tools/gimpbrightnesscontrasttool.c:113 -msgid "B_rightness-Contrast..." -msgstr "_Brillo y contraste…" - -#: ../app/tools/gimpbrightnesscontrasttool.c:133 -msgid "Adjust Brightness and Contrast" -msgstr "Ajustar el brillo y el contraste" - -#: ../app/tools/gimpbrightnesscontrasttool.c:135 -msgid "Import Brightness-Contrast settings" -msgstr "Importar los ajustes de Brillo y contraste" - -#: ../app/tools/gimpbrightnesscontrasttool.c:136 -msgid "Export Brightness-Contrast settings" -msgstr "Exportar los ajustes de Brillo y contraste" - -#: ../app/tools/gimpbrightnesscontrasttool.c:183 -msgid "Brightness-Contrast does not operate on indexed layers." -msgstr "Brillo-Contraste no funciona sobre capas indexadas." - -#: ../app/tools/gimpbrightnesscontrasttool.c:318 -msgid "_Brightness:" -msgstr "_Brillo:" - -#: ../app/tools/gimpbrightnesscontrasttool.c:331 -msgid "Con_trast:" -msgstr "Con_traste:" - -#: ../app/tools/gimpbrightnesscontrasttool.c:343 -msgid "Edit these Settings as Levels" -msgstr "Editar estos ajustes como niveles" - -#: ../app/tools/gimpbucketfilloptions.c:93 -msgid "Which area will be filled" -msgstr "El área que se rellenará" - -#: ../app/tools/gimpbucketfilloptions.c:98 -msgid "Allow completely transparent regions to be filled" -msgstr "Permitir a las regiones completamente transparentes ser rellenadas" - -#: ../app/tools/gimpbucketfilloptions.c:104 -msgid "Base filled area on all visible layers" -msgstr "Área base rellenada en todas las capas visibles" - -#: ../app/tools/gimpbucketfilloptions.c:110 -#: ../app/tools/gimpregionselectoptions.c:95 -msgid "Maximum color difference" -msgstr "Máxima diferencia de color" - -#: ../app/tools/gimpbucketfilloptions.c:115 -msgid "Criterion used for determining color similarity" -msgstr "Criterio utilizado para determinar la similitud de colores" - -#. fill type -#: ../app/tools/gimpbucketfilloptions.c:229 -#, c-format -msgid "Fill Type (%s)" -msgstr "Tipo de relleno (%s)" - -#. fill selection -#: ../app/tools/gimpbucketfilloptions.c:244 -#, c-format -msgid "Affected Area (%s)" -msgstr "Área afectada (%s)" - -#: ../app/tools/gimpbucketfilloptions.c:248 -msgid "Fill whole selection" -msgstr "Rellenar la selección completamente" - -#: ../app/tools/gimpbucketfilloptions.c:249 -msgid "Fill similar colors" -msgstr "Rellenar colores similares" - -#: ../app/tools/gimpbucketfilloptions.c:258 -msgid "Finding Similar Colors" -msgstr "Buscando colores similares" - -#: ../app/tools/gimpbucketfilloptions.c:273 -msgid "Fill transparent areas" -msgstr "Rellenar áreas transparentes" - -#: ../app/tools/gimpbucketfilloptions.c:279 ../app/tools/gimpclonetool.c:114 -#: ../app/tools/gimpcolorpickeroptions.c:158 ../app/tools/gimphealtool.c:100 -#: ../app/tools/gimpperspectiveclonetool.c:904 -#: ../app/tools/gimpregionselectoptions.c:210 -msgid "Sample merged" -msgstr "Muestra combinada" - -#: ../app/tools/gimpbucketfilloptions.c:298 -msgid "Fill by:" -msgstr "Rellenar con:" - -#: ../app/tools/gimpbucketfilltool.c:86 -msgid "Bucket Fill" -msgstr "Relleno de cubeta" - -#: ../app/tools/gimpbucketfilltool.c:87 -msgid "Bucket Fill Tool: Fill selected area with a color or pattern" -msgstr "" -"Herramienta de relleno: rellenar con un color o patrón el área seleccionada" - -#: ../app/tools/gimpbucketfilltool.c:88 -msgid "_Bucket Fill" -msgstr "_Relleno" - -#: ../app/tools/gimpbycolorselecttool.c:67 -msgid "Select by Color" -msgstr "Seleccionar por color" - -#: ../app/tools/gimpbycolorselecttool.c:68 -msgid "Select by Color Tool: Select regions with similar colors" -msgstr "" -"Herramienta de seleccionar por color: seleccionar regiones con colores " -"similares" - -#: ../app/tools/gimpbycolorselecttool.c:69 -msgid "_By Color Select" -msgstr "Selección por c_olor" - -#: ../app/tools/gimpbycolorselecttool.c:82 -msgctxt "command" -msgid "Select by Color" -msgstr "Seleccionar por color" - -#: ../app/tools/gimpcagetool.c:158 ../app/tools/gimpcagetool.c:1128 -msgid "Cage Transform" -msgstr "Transformar rejilla" - -#: ../app/tools/gimpcagetool.c:159 -msgid "Cage Transform: Deform a selection with a cage" -msgstr "Transformar rejilla: deformar una selección con una rejilla" - -#: ../app/tools/gimpcagetool.c:160 -msgid "_Cage Transform" -msgstr "_Transformar rejilla" - -#: ../app/tools/gimpcagetool.c:357 -msgid "Press ENTER to commit the transform" -msgstr "Pulse INTRO para realizar la transformación" - -#: ../app/tools/gimpcagetool.c:1069 -msgid "Computing Cage Coefficients" -msgstr "Calculando coeficientes de Cage" - -#: ../app/tools/gimpcagetool.c:1246 -msgid "Cage transform" -msgstr "Transformar rejilla" - -#: ../app/tools/gimpclonetool.c:61 -msgid "Clone Tool: Selectively copy from an image or pattern, using a brush" -msgstr "" -"Herramienta de clonado: copiar selectivamente a partir de una imagen o " -"diseño, utilizando un pincel" - -#: ../app/tools/gimpclonetool.c:62 -msgid "_Clone" -msgstr "_Clonar" - -#: ../app/tools/gimpclonetool.c:85 ../app/tools/gimpclonetool.c:88 -msgid "Click to clone" -msgstr "Pulse para clonar" - -#: ../app/tools/gimpclonetool.c:86 ../app/tools/gimpclonetool.c:91 -#, c-format -msgid "%s to set a new clone source" -msgstr "%s para fijar un origen de clonado nuevo" - -#. Translators: the translation of "Click" must be the first word -#: ../app/tools/gimpclonetool.c:90 -msgid "Click to set a new clone source" -msgstr "Pulse para fijar un origen de clonado" - -#: ../app/tools/gimpclonetool.c:109 -#: ../app/tools/gimpperspectiveclonetool.c:899 -msgid "Source" -msgstr "Origen" - -#: ../app/tools/gimpclonetool.c:128 ../app/tools/gimphealtool.c:109 -#: ../app/tools/gimpperspectiveclonetool.c:918 -msgid "Alignment:" -msgstr "Alineación:" - -#: ../app/tools/gimpcolorbalancetool.c:94 -msgid "Color Balance" -msgstr "Balance de color" - -#: ../app/tools/gimpcolorbalancetool.c:95 -msgid "Color Balance Tool: Adjust color distribution" -msgstr "Herramienta de balance de color: ajustar la distribución del color" - -#: ../app/tools/gimpcolorbalancetool.c:96 -msgid "Color _Balance..." -msgstr "_Balance de color…" - -#: ../app/tools/gimpcolorbalancetool.c:113 -msgid "Adjust Color Balance" -msgstr "Ajustar el balance de colores" - -#: ../app/tools/gimpcolorbalancetool.c:115 -msgid "Import Color Balance Settings" -msgstr "Importar ajustes de balance de color" - -#: ../app/tools/gimpcolorbalancetool.c:116 -msgid "Export Color Balance Settings" -msgstr "Exportar los ajustes de balance de color" - -#: ../app/tools/gimpcolorbalancetool.c:162 -msgid "Color Balance operates only on RGB color layers." -msgstr "El balance de color sólo funciona sobre capas de color RGB." - -#: ../app/tools/gimpcolorbalancetool.c:266 -msgid "Select Range to Adjust" -msgstr "Seleccione el rango para ajustar" - -#: ../app/tools/gimpcolorbalancetool.c:275 ../app/tools/gimplevelstool.c:172 -msgid "Adjust Color Levels" -msgstr "Ajustar los niveles de color" - -#: ../app/tools/gimpcolorbalancetool.c:292 -#: ../app/tools/gimphuesaturationtool.c:251 -msgid "Cyan" -msgstr "Cian" - -#: ../app/tools/gimpcolorbalancetool.c:292 -#: ../app/tools/gimphuesaturationtool.c:248 -msgid "Red" -msgstr "Rojo" - -#: ../app/tools/gimpcolorbalancetool.c:301 -#: ../app/tools/gimphuesaturationtool.c:253 -msgid "Magenta" -msgstr "Magenta" - -#: ../app/tools/gimpcolorbalancetool.c:301 -#: ../app/tools/gimphuesaturationtool.c:250 -msgid "Green" -msgstr "Verde" - -#: ../app/tools/gimpcolorbalancetool.c:310 -#: ../app/tools/gimphuesaturationtool.c:249 -msgid "Yellow" -msgstr "Amarillo" - -#: ../app/tools/gimpcolorbalancetool.c:310 -#: ../app/tools/gimphuesaturationtool.c:252 -msgid "Blue" -msgstr "Azul" - -#: ../app/tools/gimpcolorbalancetool.c:321 -msgid "R_eset Range" -msgstr "R_einiciar el rango" - -#: ../app/tools/gimpcolorbalancetool.c:330 -msgid "Preserve _luminosity" -msgstr "Conservar la _luminosidad" - -#: ../app/tools/gimpcolorizetool.c:90 -msgid "Colorize" -msgstr "Colorear" - -#: ../app/tools/gimpcolorizetool.c:91 -msgid "Colorize Tool: Colorize the image" -msgstr "Herramienta de coloreo: colorear la imagen" - -#: ../app/tools/gimpcolorizetool.c:92 -msgid "Colori_ze..." -msgstr "_Colorear…" - -#: ../app/tools/gimpcolorizetool.c:109 -msgid "Colorize the Image" -msgstr "Colorear la imagen" - -#: ../app/tools/gimpcolorizetool.c:111 -msgid "Import Colorize Settings" -msgstr "Importar los ajustes de Colorear" - -#: ../app/tools/gimpcolorizetool.c:112 -msgid "Export Colorize Settings" -msgstr "Exportar los ajustes de Colorear" - -#: ../app/tools/gimpcolorizetool.c:157 -msgid "Colorize operates only on RGB color layers." -msgstr "Colorear sólo funciona sobre capas de color RGB." - -#: ../app/tools/gimpcolorizetool.c:224 -msgid "Select Color" -msgstr "Seleccionar el color" - -#: ../app/tools/gimpcolorizetool.c:241 -#: ../app/tools/gimphuesaturationtool.c:381 -msgid "_Hue:" -msgstr "_Tono:" - -#: ../app/tools/gimpcolorizetool.c:254 -#: ../app/tools/gimphuesaturationtool.c:413 -msgid "_Saturation:" -msgstr "_Saturación:" - -#: ../app/tools/gimpcolorizetool.c:267 -#: ../app/tools/gimphuesaturationtool.c:397 -msgid "_Lightness:" -msgstr "_Luminosidad:" - -#: ../app/tools/gimpcoloroptions.c:77 -msgid "Color Picker Average Radius" -msgstr "Radio promedio del recoge-color" - -#: ../app/tools/gimpcoloroptions.c:157 -#: ../app/tools/gimprectangleselectoptions.c:163 -#: ../app/tools/gimpselectionoptions.c:277 -#: ../app/widgets/gimpbrusheditor.c:155 -msgid "Radius" -msgstr "Radio" - -#: ../app/tools/gimpcoloroptions.c:163 -msgid "Sample average" -msgstr "Muestra ponderada" - -#: ../app/tools/gimpcolorpickeroptions.c:68 -msgid "Use accumulated color value from all composited visible layers" -msgstr "" -"Usar el valor acumulado de colores a partir de la combinación de todas las " -"capas visibles" - -#: ../app/tools/gimpcolorpickeroptions.c:74 -msgid "Choose what color picker will do" -msgstr "Elegir qué color hará el cuentagotas" - -#: ../app/tools/gimpcolorpickeroptions.c:80 -msgid "" -"Open a floating dialog to view picked color values in various color models" -msgstr "" -"Abrir un diálogo flotante para ver los valores de color captados por el " -"cuentagotas en distintos modelos de color" - -#. the pick FG/BG frame -#: ../app/tools/gimpcolorpickeroptions.c:163 -#, c-format -msgid "Pick Mode (%s)" -msgstr "Modo de selección (%s)" - -#. the use_info_window toggle button -#: ../app/tools/gimpcolorpickeroptions.c:172 -#, c-format -msgid "Use info window (%s)" -msgstr "Usar la ventana de información (%s)" - -#: ../app/tools/gimpcolorpickertool.c:93 -msgid "Color Picker" -msgstr "Recoge-color" - -#: ../app/tools/gimpcolorpickertool.c:94 -msgid "Color Picker Tool: Set colors from image pixels" -msgstr "" -"Herramienta recoge-color: establecer colores a partir de píxeles de la imagen" - -#: ../app/tools/gimpcolorpickertool.c:95 -msgid "C_olor Picker" -msgstr "_Recoge-color" - -#: ../app/tools/gimpcolorpickertool.c:231 -msgid "Click in any image to view its color" -msgstr "Pulse sobre cualquier imagen para ver su color" - -#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:478 -msgid "Click in any image to pick the foreground color" -msgstr "Pulse sobre cualquier imagen para recoger el color de frente" - -#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:484 -msgid "Click in any image to pick the background color" -msgstr "Pulse sobre cualquier imagen para recoger el color de fondo" - -#: ../app/tools/gimpcolorpickertool.c:254 -msgid "Click in any image to add the color to the palette" -msgstr "Pulse sobre cualquier imagen para añadir el color a la paleta" - -#: ../app/tools/gimpcolorpickertool.c:309 -msgid "Color Picker Information" -msgstr "Información del recoge-color" - -#: ../app/tools/gimpcolortool.c:230 ../app/tools/gimpcolortool.c:403 -msgid "Move Sample Point: " -msgstr "Mover punto de muestra: " - -#: ../app/tools/gimpcolortool.c:395 -msgid "Remove Sample Point" -msgstr "Eliminar punto de muestra" - -#: ../app/tools/gimpcolortool.c:396 -msgid "Cancel Sample Point" -msgstr "Cancelar punto de muestra" - -#: ../app/tools/gimpcolortool.c:404 -msgid "Add Sample Point: " -msgstr "Añadir punto de muestra: " - +#: ../app/text/gimptextlayer.c:640 +msgid "Empty Text Layer" +msgstr "Capa de texto vacía" + +#: ../app/text/gimptextlayer.c:696 +msgid "" +"Your text cannot be rendered. It is likely too big. Please make it shorter " +"or use a smaller font." +msgstr "" +"No se puede renderizar el texto. Parece ser que es muy grande. Hágalo más " +"corto o use una tipografía más pequeña." + +#: ../app/text/gimptextlayer-xcf.c:76 +#, c-format +msgid "" +"Problems parsing the text parasite for layer '%s':\n" +"%s\n" +"\n" +"Some text properties may be wrong. Unless you want to edit the text layer, " +"you don't need to worry about this." +msgstr "" +"Han ocurrido problemas analizando el parásito de texto para la capa %s:\n" +"%s\n" +"\n" +"Algunas propiedades del texto podrían estar incorrectas. Al menos que quiera " +"editar la capa de texto no necesitará preocuparse por esto." + +#: ../app/text/gimptextlayout.c:577 +msgid "" +"The new text layout cannot be generated. Most likely the font size is too " +"big." +msgstr "" +"No se puede generar el texto nuevo. Es muy probable que el tamaño del texto " +"sea muy grande." + +#: ../app/text/text-enums.c:23 +msgctxt "text-box-mode" +msgid "Dynamic" +msgstr "Dinámico" + +#: ../app/text/text-enums.c:24 +msgctxt "text-box-mode" +msgid "Fixed" +msgstr "Fijo" + +#: ../app/tools/gimp-tools.c:351 +msgid "" +"This tool has\n" +"no options." +msgstr "" +"Esta herramienta\n" +"no tiene opciones." + +#: ../app/tools/gimpairbrushtool.c:55 +msgid "Airbrush Tool: Paint using a brush, with variable pressure" +msgstr "Herramienta aerógrafo: pintar con presión variable mediante un pincel" + +#: ../app/tools/gimpairbrushtool.c:56 +msgid "_Airbrush" +msgstr "_Aerógrafo" + +#: ../app/tools/gimpairbrushtool.c:86 +msgid "Motion only" +msgstr "Sólo movimiento" + +#: ../app/tools/gimpairbrushtool.c:91 ../app/tools/gimpconvolvetool.c:228 +#: ../app/tools/gimpsmudgetool.c:91 +msgid "Rate" +msgstr "Tasa" + +#: ../app/tools/gimpairbrushtool.c:97 +msgid "Flow" +msgstr "Flujo" + +#: ../app/tools/gimpalignoptions.c:91 +msgid "Reference image object a layer will be aligned on" +msgstr "Referenciar el objeto de imagen sobre el que se alineará la capa" + +#: ../app/tools/gimpalignoptions.c:98 +msgid "Horizontal offset for distribution" +msgstr "Desplazamiento horizontal para la distribución" + +#: ../app/tools/gimpalignoptions.c:104 +msgid "Vertical offset for distribution" +msgstr "Desplazamiento vertical para la distribución" + +#: ../app/tools/gimpalignoptions.c:272 ../app/tools/gimpaligntool.c:124 +msgid "Align" +msgstr "Alineado" + +#: ../app/tools/gimpalignoptions.c:284 +msgid "Relative to:" +msgstr "Relativo a:" + +#: ../app/tools/gimpalignoptions.c:298 +msgid "Align left edge of target" +msgstr "Alinear al borde izquierdo del objetivo" + +#: ../app/tools/gimpalignoptions.c:302 +msgid "Align center of target" +msgstr "Alinear al centro del objetivo" + +#: ../app/tools/gimpalignoptions.c:306 +msgid "Align right edge of target" +msgstr "Alinear al borde derecho del objetivo" + +#: ../app/tools/gimpalignoptions.c:314 +msgid "Align top edge of target" +msgstr "Alinear al borde superior del objetivo" + +#: ../app/tools/gimpalignoptions.c:318 +msgid "Align middle of target" +msgstr "Alinear a la mitad del objetivo" + +#: ../app/tools/gimpalignoptions.c:322 +msgid "Align bottom of target" +msgstr "Alinear a la parte inferior del objetivo" + +#: ../app/tools/gimpalignoptions.c:324 +msgid "Distribute" +msgstr "Distribuir" + +#: ../app/tools/gimpalignoptions.c:338 +msgid "Distribute left edges of targets" +msgstr "Distribuir los bordes izquierdos de los objetivos" + +#: ../app/tools/gimpalignoptions.c:342 +msgid "Distribute horizontal centers of targets" +msgstr "Distribuir horizontalmente los centros de los objetivos" + +#: ../app/tools/gimpalignoptions.c:346 +msgid "Distribute right edges of targets" +msgstr "Distribuir los bordes derechos de los objetivos" + +#: ../app/tools/gimpalignoptions.c:354 +msgid "Distribute top edges of targets" +msgstr "Distribuir los bordes superiores de los objetivos" + +#: ../app/tools/gimpalignoptions.c:358 +msgid "Distribute vertical centers of targets" +msgstr "Distribuir los centros verticales de los objetivos" + +#: ../app/tools/gimpalignoptions.c:362 +msgid "Distribute bottoms of targets" +msgstr "Distribuir las partes inferiores de los objetivos" + +#: ../app/tools/gimpalignoptions.c:368 +msgid "Offset:" +msgstr "Desplazamiento:" + +#: ../app/tools/gimpaligntool.c:125 +msgid "Alignment Tool: Align or arrange layers and other objects" +msgstr "Herramienta de alineación:Alinee o coloque capas y otros objetos" + +#: ../app/tools/gimpaligntool.c:126 +msgid "_Align" +msgstr "_Alineado" + +#: ../app/tools/gimpaligntool.c:549 +msgid "Click on a layer, path or guide, or Click-Drag to pick several layers" +msgstr "Pulse sobre una capa, ruta o guía, o arrastre para elegir varias capas" + +#: ../app/tools/gimpaligntool.c:557 +msgid "Click to pick this layer as first item" +msgstr "Pulse para elegir esta capa como primer elemento" + +#: ../app/tools/gimpaligntool.c:564 +msgid "Click to add this layer to the list" +msgstr "Pulse para añadir esta capa a la lista" + +#: ../app/tools/gimpaligntool.c:568 +msgid "Click to pick this guide as first item" +msgstr "Pulse para elegir esta guía como primer elemento" + +#: ../app/tools/gimpaligntool.c:575 +msgid "Click to add this guide to the list" +msgstr "Pulse para añadir esta guía a la lista" + +#: ../app/tools/gimpaligntool.c:579 +msgid "Click to pick this path as first item" +msgstr "Pulse para elegir esta ruta como primer elemento" + +#: ../app/tools/gimpaligntool.c:586 +msgid "Click to add this path to the list" +msgstr "Pulse para añadir esta ruta a la lista" + +#: ../app/tools/gimpblendoptions.c:211 ../app/tools/gimppaintoptions-gui.c:344 +msgid "Gradient" +msgstr "Degradado" + +#: ../app/tools/gimpblendoptions.c:231 ../app/widgets/gimpbrusheditor.c:139 +msgid "Shape:" +msgstr "Forma:" + +#: ../app/tools/gimpblendoptions.c:238 ../app/tools/gimppaintoptions-gui.c:323 +msgid "Repeat:" +msgstr "Repetir:" + +#: ../app/tools/gimpblendoptions.c:261 +msgid "Adaptive supersampling" +msgstr "Sobremuestreo adaptativo" + +#: ../app/tools/gimpblendoptions.c:268 +msgid "Max depth" +msgstr "Profundidad máxima" + +#: ../app/tools/gimpblendtool.c:109 +msgid "Blend" +msgstr "Mezcla" + +#: ../app/tools/gimpblendtool.c:110 +msgid "Blend Tool: Fill selected area with a color gradient" +msgstr "" +"Herramienta de mezcla: rellenar el área seleccionada con un degradado de " +"colores" + +#: ../app/tools/gimpblendtool.c:111 +msgid "Blen_d" +msgstr "_Mezcla [Blend]" + +#: ../app/tools/gimpblendtool.c:166 +msgid "Blend does not operate on indexed layers." +msgstr "La mezcla no funciona sobre capas indexadas." + +#: ../app/tools/gimpblendtool.c:187 +msgid "No gradient available for use with this tool." +msgstr "No hay degradados disponibles para usar con esta herramienta." + +#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:624 +#, c-format +msgid "%s for constrained angles" +msgstr "%s para ángulos restringidos" + +#: ../app/tools/gimpblendtool.c:453 +#, c-format +msgid "%s to move the whole line" +msgstr "%s para mover toda la línea" + +#: ../app/tools/gimpblendtool.c:457 +msgid "Blend: " +msgstr "Mezcla: " + +#: ../app/tools/gimpbrightnesscontrasttool.c:111 +msgid "Brightness-Contrast" +msgstr "Brillo-Contraste" + +#: ../app/tools/gimpbrightnesscontrasttool.c:112 +msgid "Brightness/Contrast Tool: Adjust brightness and contrast" +msgstr "Herramienta de brillo/contraste: ajustar el brillo y el contraste" + +#: ../app/tools/gimpbrightnesscontrasttool.c:113 +msgid "B_rightness-Contrast..." +msgstr "_Brillo y contraste…" + +#: ../app/tools/gimpbrightnesscontrasttool.c:133 +msgid "Adjust Brightness and Contrast" +msgstr "Ajustar el brillo y el contraste" + +#: ../app/tools/gimpbrightnesscontrasttool.c:135 +msgid "Import Brightness-Contrast settings" +msgstr "Importar los ajustes de Brillo y contraste" + +#: ../app/tools/gimpbrightnesscontrasttool.c:136 +msgid "Export Brightness-Contrast settings" +msgstr "Exportar los ajustes de Brillo y contraste" + +#: ../app/tools/gimpbrightnesscontrasttool.c:183 +msgid "Brightness-Contrast does not operate on indexed layers." +msgstr "Brillo-Contraste no funciona sobre capas indexadas." + +#: ../app/tools/gimpbrightnesscontrasttool.c:318 +msgid "_Brightness:" +msgstr "_Brillo:" + +#: ../app/tools/gimpbrightnesscontrasttool.c:331 +msgid "Con_trast:" +msgstr "Con_traste:" + +#: ../app/tools/gimpbrightnesscontrasttool.c:343 +msgid "Edit these Settings as Levels" +msgstr "Editar estos ajustes como niveles" + +#: ../app/tools/gimpbucketfilloptions.c:93 +msgid "Which area will be filled" +msgstr "El área que se rellenará" + +#: ../app/tools/gimpbucketfilloptions.c:98 +msgid "Allow completely transparent regions to be filled" +msgstr "Permitir a las regiones completamente transparentes ser rellenadas" + +#: ../app/tools/gimpbucketfilloptions.c:104 +msgid "Base filled area on all visible layers" +msgstr "Área base rellenada en todas las capas visibles" + +#: ../app/tools/gimpbucketfilloptions.c:110 +#: ../app/tools/gimpregionselectoptions.c:95 +msgid "Maximum color difference" +msgstr "Máxima diferencia de color" + +#: ../app/tools/gimpbucketfilloptions.c:115 +msgid "Criterion used for determining color similarity" +msgstr "Criterio utilizado para determinar la similitud de colores" + +#. fill type +#: ../app/tools/gimpbucketfilloptions.c:229 +#, c-format +msgid "Fill Type (%s)" +msgstr "Tipo de relleno (%s)" + +#. fill selection +#: ../app/tools/gimpbucketfilloptions.c:244 +#, c-format +msgid "Affected Area (%s)" +msgstr "Área afectada (%s)" + +#: ../app/tools/gimpbucketfilloptions.c:248 +msgid "Fill whole selection" +msgstr "Rellenar la selección completamente" + +#: ../app/tools/gimpbucketfilloptions.c:249 +msgid "Fill similar colors" +msgstr "Rellenar colores similares" + +#: ../app/tools/gimpbucketfilloptions.c:258 +msgid "Finding Similar Colors" +msgstr "Buscando colores similares" + +#: ../app/tools/gimpbucketfilloptions.c:273 +msgid "Fill transparent areas" +msgstr "Rellenar áreas transparentes" + +#: ../app/tools/gimpbucketfilloptions.c:279 ../app/tools/gimpclonetool.c:114 +#: ../app/tools/gimpcolorpickeroptions.c:158 ../app/tools/gimphealtool.c:100 +#: ../app/tools/gimpperspectiveclonetool.c:904 +#: ../app/tools/gimpregionselectoptions.c:210 +msgid "Sample merged" +msgstr "Muestra combinada" + +#: ../app/tools/gimpbucketfilloptions.c:298 +msgid "Fill by:" +msgstr "Rellenar con:" + +#: ../app/tools/gimpbucketfilltool.c:86 +msgid "Bucket Fill" +msgstr "Relleno de cubeta" + +#: ../app/tools/gimpbucketfilltool.c:87 +msgid "Bucket Fill Tool: Fill selected area with a color or pattern" +msgstr "" +"Herramienta de relleno: rellenar con un color o patrón el área seleccionada" + +#: ../app/tools/gimpbucketfilltool.c:88 +msgid "_Bucket Fill" +msgstr "_Relleno" + +#: ../app/tools/gimpbycolorselecttool.c:67 +msgid "Select by Color" +msgstr "Seleccionar por color" + +#: ../app/tools/gimpbycolorselecttool.c:68 +msgid "Select by Color Tool: Select regions with similar colors" +msgstr "" +"Herramienta de seleccionar por color: seleccionar regiones con colores " +"similares" + +#: ../app/tools/gimpbycolorselecttool.c:69 +msgid "_By Color Select" +msgstr "Selección por c_olor" + +#: ../app/tools/gimpbycolorselecttool.c:82 +msgctxt "command" +msgid "Select by Color" +msgstr "Seleccionar por color" + +#: ../app/tools/gimpcagetool.c:158 ../app/tools/gimpcagetool.c:1128 +msgid "Cage Transform" +msgstr "Transformar rejilla" + +#: ../app/tools/gimpcagetool.c:159 +msgid "Cage Transform: Deform a selection with a cage" +msgstr "Transformar rejilla: deformar una selección con una rejilla" + +#: ../app/tools/gimpcagetool.c:160 +msgid "_Cage Transform" +msgstr "_Transformar rejilla" + +#: ../app/tools/gimpcagetool.c:357 +msgid "Press ENTER to commit the transform" +msgstr "Pulse INTRO para realizar la transformación" + +#: ../app/tools/gimpcagetool.c:1069 +msgid "Computing Cage Coefficients" +msgstr "Calculando coeficientes de Cage" + +#: ../app/tools/gimpcagetool.c:1246 +msgid "Cage transform" +msgstr "Transformar rejilla" + +#: ../app/tools/gimpclonetool.c:61 +msgid "Clone Tool: Selectively copy from an image or pattern, using a brush" +msgstr "" +"Herramienta de clonado: copiar selectivamente a partir de una imagen o " +"diseño, utilizando un pincel" + +#: ../app/tools/gimpclonetool.c:62 +msgid "_Clone" +msgstr "_Clonar" + +#: ../app/tools/gimpclonetool.c:85 ../app/tools/gimpclonetool.c:88 +msgid "Click to clone" +msgstr "Pulse para clonar" + +#: ../app/tools/gimpclonetool.c:86 ../app/tools/gimpclonetool.c:91 +#, c-format +msgid "%s to set a new clone source" +msgstr "%s para fijar un origen de clonado nuevo" + +#. Translators: the translation of "Click" must be the first word +#: ../app/tools/gimpclonetool.c:90 +msgid "Click to set a new clone source" +msgstr "Pulse para fijar un origen de clonado" + +#: ../app/tools/gimpclonetool.c:109 +#: ../app/tools/gimpperspectiveclonetool.c:899 +msgid "Source" +msgstr "Origen" + +#: ../app/tools/gimpclonetool.c:128 ../app/tools/gimphealtool.c:109 +#: ../app/tools/gimpperspectiveclonetool.c:918 +msgid "Alignment:" +msgstr "Alineación:" + +#: ../app/tools/gimpcolorbalancetool.c:94 +msgid "Color Balance" +msgstr "Balance de color" + +#: ../app/tools/gimpcolorbalancetool.c:95 +msgid "Color Balance Tool: Adjust color distribution" +msgstr "Herramienta de balance de color: ajustar la distribución del color" + +#: ../app/tools/gimpcolorbalancetool.c:96 +msgid "Color _Balance..." +msgstr "_Balance de color…" + +#: ../app/tools/gimpcolorbalancetool.c:113 +msgid "Adjust Color Balance" +msgstr "Ajustar el balance de colores" + +#: ../app/tools/gimpcolorbalancetool.c:115 +msgid "Import Color Balance Settings" +msgstr "Importar ajustes de balance de color" + +#: ../app/tools/gimpcolorbalancetool.c:116 +msgid "Export Color Balance Settings" +msgstr "Exportar los ajustes de balance de color" + +#: ../app/tools/gimpcolorbalancetool.c:162 +msgid "Color Balance operates only on RGB color layers." +msgstr "El balance de color sólo funciona sobre capas de color RGB." + +#: ../app/tools/gimpcolorbalancetool.c:266 +msgid "Select Range to Adjust" +msgstr "Seleccione el rango para ajustar" + +#: ../app/tools/gimpcolorbalancetool.c:275 ../app/tools/gimplevelstool.c:172 +msgid "Adjust Color Levels" +msgstr "Ajustar los niveles de color" + +#: ../app/tools/gimpcolorbalancetool.c:292 +#: ../app/tools/gimphuesaturationtool.c:251 +msgid "Cyan" +msgstr "Cian" + +#: ../app/tools/gimpcolorbalancetool.c:292 +#: ../app/tools/gimphuesaturationtool.c:248 +msgid "Red" +msgstr "Rojo" + +#: ../app/tools/gimpcolorbalancetool.c:301 +#: ../app/tools/gimphuesaturationtool.c:253 +msgid "Magenta" +msgstr "Magenta" + +#: ../app/tools/gimpcolorbalancetool.c:301 +#: ../app/tools/gimphuesaturationtool.c:250 +msgid "Green" +msgstr "Verde" + +#: ../app/tools/gimpcolorbalancetool.c:310 +#: ../app/tools/gimphuesaturationtool.c:249 +msgid "Yellow" +msgstr "Amarillo" + +#: ../app/tools/gimpcolorbalancetool.c:310 +#: ../app/tools/gimphuesaturationtool.c:252 +msgid "Blue" +msgstr "Azul" + +#: ../app/tools/gimpcolorbalancetool.c:321 +msgid "R_eset Range" +msgstr "R_einiciar el rango" + +#: ../app/tools/gimpcolorbalancetool.c:330 +msgid "Preserve _luminosity" +msgstr "Conservar la _luminosidad" + +#: ../app/tools/gimpcolorizetool.c:90 +msgid "Colorize" +msgstr "Colorear" + +#: ../app/tools/gimpcolorizetool.c:91 +msgid "Colorize Tool: Colorize the image" +msgstr "Herramienta de coloreo: colorear la imagen" + +#: ../app/tools/gimpcolorizetool.c:92 +msgid "Colori_ze..." +msgstr "_Colorear…" + +#: ../app/tools/gimpcolorizetool.c:109 +msgid "Colorize the Image" +msgstr "Colorear la imagen" + +#: ../app/tools/gimpcolorizetool.c:111 +msgid "Import Colorize Settings" +msgstr "Importar los ajustes de Colorear" + +#: ../app/tools/gimpcolorizetool.c:112 +msgid "Export Colorize Settings" +msgstr "Exportar los ajustes de Colorear" + +#: ../app/tools/gimpcolorizetool.c:157 +msgid "Colorize operates only on RGB color layers." +msgstr "Colorear sólo funciona sobre capas de color RGB." + +#: ../app/tools/gimpcolorizetool.c:224 +msgid "Select Color" +msgstr "Seleccionar el color" + +#: ../app/tools/gimpcolorizetool.c:241 +#: ../app/tools/gimphuesaturationtool.c:381 +msgid "_Hue:" +msgstr "_Tono:" + +#: ../app/tools/gimpcolorizetool.c:254 +#: ../app/tools/gimphuesaturationtool.c:413 +msgid "_Saturation:" +msgstr "_Saturación:" + +#: ../app/tools/gimpcolorizetool.c:267 +#: ../app/tools/gimphuesaturationtool.c:397 +msgid "_Lightness:" +msgstr "_Luminosidad:" + +#: ../app/tools/gimpcoloroptions.c:77 +msgid "Color Picker Average Radius" +msgstr "Radio promedio del recoge-color" + +#: ../app/tools/gimpcoloroptions.c:157 +#: ../app/tools/gimprectangleselectoptions.c:163 +#: ../app/tools/gimpselectionoptions.c:277 +#: ../app/widgets/gimpbrusheditor.c:155 +msgid "Radius" +msgstr "Radio" + +#: ../app/tools/gimpcoloroptions.c:163 +msgid "Sample average" +msgstr "Muestra ponderada" + +#: ../app/tools/gimpcolorpickeroptions.c:68 +msgid "Use accumulated color value from all composited visible layers" +msgstr "" +"Usar el valor acumulado de colores a partir de la combinación de todas las " +"capas visibles" + +#: ../app/tools/gimpcolorpickeroptions.c:74 +msgid "Choose what color picker will do" +msgstr "Elegir qué color hará el cuentagotas" + +#: ../app/tools/gimpcolorpickeroptions.c:80 +msgid "" +"Open a floating dialog to view picked color values in various color models" +msgstr "" +"Abrir un diálogo flotante para ver los valores de color captados por el " +"cuentagotas en distintos modelos de color" + +#. the pick FG/BG frame +#: ../app/tools/gimpcolorpickeroptions.c:163 +#, c-format +msgid "Pick Mode (%s)" +msgstr "Modo de selección (%s)" + +#. the use_info_window toggle button +#: ../app/tools/gimpcolorpickeroptions.c:172 +#, c-format +msgid "Use info window (%s)" +msgstr "Usar la ventana de información (%s)" + +#: ../app/tools/gimpcolorpickertool.c:93 +msgid "Color Picker" +msgstr "Recoge-color" + +#: ../app/tools/gimpcolorpickertool.c:94 +msgid "Color Picker Tool: Set colors from image pixels" +msgstr "" +"Herramienta recoge-color: establecer colores a partir de píxeles de la imagen" + +#: ../app/tools/gimpcolorpickertool.c:95 +msgid "C_olor Picker" +msgstr "_Recoge-color" + +#: ../app/tools/gimpcolorpickertool.c:231 +msgid "Click in any image to view its color" +msgstr "Pulse sobre cualquier imagen para ver su color" + +#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:478 +msgid "Click in any image to pick the foreground color" +msgstr "Pulse sobre cualquier imagen para recoger el color de frente" + +#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:484 +msgid "Click in any image to pick the background color" +msgstr "Pulse sobre cualquier imagen para recoger el color de fondo" + +#: ../app/tools/gimpcolorpickertool.c:254 +msgid "Click in any image to add the color to the palette" +msgstr "Pulse sobre cualquier imagen para añadir el color a la paleta" + +#: ../app/tools/gimpcolorpickertool.c:309 +msgid "Color Picker Information" +msgstr "Información del recoge-color" + +#: ../app/tools/gimpcolortool.c:230 ../app/tools/gimpcolortool.c:403 +msgid "Move Sample Point: " +msgstr "Mover punto de muestra: " + +#: ../app/tools/gimpcolortool.c:395 +msgid "Remove Sample Point" +msgstr "Eliminar punto de muestra" + +#: ../app/tools/gimpcolortool.c:396 +msgid "Cancel Sample Point" +msgstr "Cancelar punto de muestra" + +#: ../app/tools/gimpcolortool.c:404 +msgid "Add Sample Point: " +msgstr "Añadir punto de muestra: " + # Difuminar -#: ../app/tools/gimpconvolvetool.c:73 -msgid "Blur / Sharpen" -msgstr "Difuminar / Perfilar" - +#: ../app/tools/gimpconvolvetool.c:73 +msgid "Blur / Sharpen" +msgstr "Difuminar / Perfilar" + # Sharpen: Perfilar -#: ../app/tools/gimpconvolvetool.c:74 -msgid "Blur / Sharpen Tool: Selective blurring or unblurring using a brush" -msgstr "" -"Herramientas para Difuminar / Perfilar: difuminado o perfilado selectivo " -"usando un pincel" - -#: ../app/tools/gimpconvolvetool.c:75 -msgid "Bl_ur / Sharpen" -msgstr "Dif_uminar / Perfilar" - -#: ../app/tools/gimpconvolvetool.c:184 -msgid "Click to blur" -msgstr "Pulse para difuminar" - -#: ../app/tools/gimpconvolvetool.c:185 -msgid "Click to blur the line" -msgstr "Pulse para difuminar la línea" - -#: ../app/tools/gimpconvolvetool.c:186 -#, c-format -msgid "%s to sharpen" -msgstr "%s para perfilar" - -#: ../app/tools/gimpconvolvetool.c:190 -msgid "Click to sharpen" -msgstr "Pulse para perfilar" - -#: ../app/tools/gimpconvolvetool.c:191 -msgid "Click to sharpen the line" -msgstr "Pulse para perfilar la línea" - -#: ../app/tools/gimpconvolvetool.c:192 -#, c-format -msgid "%s to blur" -msgstr "%s para difuminar" - -#. the type radio box -#: ../app/tools/gimpconvolvetool.c:216 -#, c-format -msgid "Convolve Type (%s)" -msgstr "Tipo de convolución (%s)" - -#: ../app/tools/gimpcropoptions.c:76 -#: ../app/tools/gimprectangleselectoptions.c:77 -msgid "Dim everything outside selection" -msgstr "Atenuar todo por fuera de la selección" - -#: ../app/tools/gimpcropoptions.c:82 -msgid "Crop only currently selected layer" -msgstr "Recortar solo la capa actualmente seleccionada" - -#: ../app/tools/gimpcropoptions.c:88 -msgid "Allow resizing canvas by dragging cropping frame beyond image boundary" -msgstr "" -"Permitir cambiar tamaño del lienzo arrastrando el marco de recorte más allá " -"de los límites de la imagen" - -#: ../app/tools/gimpcropoptions.c:164 -msgid "Current layer only" -msgstr "Sólo la capa actual" - -#: ../app/tools/gimpcropoptions.c:170 -msgid "Allow growing" -msgstr "Permitir agrandar" - -#: ../app/tools/gimpcroptool.c:117 -msgid "Crop" -msgstr "Recortar" - -#: ../app/tools/gimpcroptool.c:118 -msgid "Crop Tool: Remove edge areas from image or layer" -msgstr "Herramienta de recorte: quitar zonas del borde de la capa o imagen" - -#: ../app/tools/gimpcroptool.c:119 -msgid "_Crop" -msgstr "_Recortar" - -#: ../app/tools/gimpcroptool.c:253 -msgid "Click or press Enter to crop" -msgstr "Pulse o presione «Retorno» para recortar" - -#: ../app/tools/gimpcroptool.c:318 -msgid "There is no active layer to crop." -msgstr "No hay una capa activa que cortar." - -#: ../app/tools/gimpcurvestool.c:143 -msgid "Curves" -msgstr "Curvas" - -#: ../app/tools/gimpcurvestool.c:144 -msgid "Curves Tool: Adjust color curves" -msgstr "Herramienta de curvas: ajustar las curvas de color" - -#: ../app/tools/gimpcurvestool.c:145 -msgid "_Curves..." -msgstr "_Curvas…" - -#: ../app/tools/gimpcurvestool.c:171 -msgid "Adjust Color Curves" -msgstr "Ajustar las curvas de color" - -#: ../app/tools/gimpcurvestool.c:173 -msgid "Import Curves" -msgstr "Importar curvas" - -#: ../app/tools/gimpcurvestool.c:174 -msgid "Export Curves" -msgstr "Exportar curvas" - -#: ../app/tools/gimpcurvestool.c:225 -msgid "Curves does not operate on indexed layers." -msgstr "Las curvas no funcionan sobre capas indexadas." - -#: ../app/tools/gimpcurvestool.c:333 -msgid "Click to add a control point" -msgstr "Pulse para añadir un punto de control" - -#: ../app/tools/gimpcurvestool.c:338 -msgid "Click to add control points to all channels" -msgstr "Pulse para añadir puntos de control a todos los canales" - -#: ../app/tools/gimpcurvestool.c:343 -msgid "Click to locate on curve (try Shift, Ctrl)" -msgstr "Pulse para situar sobre la curva (pruebe Mayús o Ctrl)" - -#: ../app/tools/gimpcurvestool.c:456 ../app/tools/gimplevelstool.c:384 -msgid "Cha_nnel:" -msgstr "Ca_nal:" - -#: ../app/tools/gimpcurvestool.c:482 ../app/tools/gimplevelstool.c:408 -msgid "R_eset Channel" -msgstr "R_einiciar el canal" - -#: ../app/tools/gimpcurvestool.c:576 ../app/widgets/gimpdeviceinfoeditor.c:461 -msgid "Curve _type:" -msgstr "_Tipo de curva:" - -#: ../app/tools/gimpcurvestool.c:651 ../app/tools/gimplevelstool.c:756 -#, c-format -msgid "Could not read header from '%s': %s" -msgstr "No se ha podido leer la cabecera de «%s»: %s" - -#: ../app/tools/gimpcurvestool.c:724 -msgid "Use _old curves file format" -msgstr "Usar el formato antigu_o de archivo de curvas" - -#: ../app/tools/gimpdesaturatetool.c:78 -msgid "Desaturate Tool: Turn colors into shades of gray" -msgstr "Herramienta desaturar: convertir colores en niveles de gris" - -#: ../app/tools/gimpdesaturatetool.c:79 -msgid "_Desaturate..." -msgstr "_Desaturar…" - -#: ../app/tools/gimpdesaturatetool.c:93 -msgid "Desaturate (Remove Colors)" -msgstr "Desaturar (eliminar colores)" - -#: ../app/tools/gimpdesaturatetool.c:124 -msgid "Desaturate only operates on RGB layers." -msgstr "La desaturación sólo funciona sobre capas RGB." - -#: ../app/tools/gimpdesaturatetool.c:193 -msgid "Choose shade of gray based on:" -msgstr "Seleccionar un poco de gris basado en:" - +#: ../app/tools/gimpconvolvetool.c:74 +msgid "Blur / Sharpen Tool: Selective blurring or unblurring using a brush" +msgstr "" +"Herramientas para Difuminar / Perfilar: difuminado o perfilado selectivo " +"usando un pincel" + +#: ../app/tools/gimpconvolvetool.c:75 +msgid "Bl_ur / Sharpen" +msgstr "Dif_uminar / Perfilar" + +#: ../app/tools/gimpconvolvetool.c:184 +msgid "Click to blur" +msgstr "Pulse para difuminar" + +#: ../app/tools/gimpconvolvetool.c:185 +msgid "Click to blur the line" +msgstr "Pulse para difuminar la línea" + +#: ../app/tools/gimpconvolvetool.c:186 +#, c-format +msgid "%s to sharpen" +msgstr "%s para perfilar" + +#: ../app/tools/gimpconvolvetool.c:190 +msgid "Click to sharpen" +msgstr "Pulse para perfilar" + +#: ../app/tools/gimpconvolvetool.c:191 +msgid "Click to sharpen the line" +msgstr "Pulse para perfilar la línea" + +#: ../app/tools/gimpconvolvetool.c:192 +#, c-format +msgid "%s to blur" +msgstr "%s para difuminar" + +#. the type radio box +#: ../app/tools/gimpconvolvetool.c:216 +#, c-format +msgid "Convolve Type (%s)" +msgstr "Tipo de convolución (%s)" + +#: ../app/tools/gimpcropoptions.c:76 +#: ../app/tools/gimprectangleselectoptions.c:77 +msgid "Dim everything outside selection" +msgstr "Atenuar todo por fuera de la selección" + +#: ../app/tools/gimpcropoptions.c:82 +msgid "Crop only currently selected layer" +msgstr "Recortar solo la capa actualmente seleccionada" + +#: ../app/tools/gimpcropoptions.c:88 +msgid "Allow resizing canvas by dragging cropping frame beyond image boundary" +msgstr "" +"Permitir cambiar tamaño del lienzo arrastrando el marco de recorte más allá " +"de los límites de la imagen" + +#: ../app/tools/gimpcropoptions.c:164 +msgid "Current layer only" +msgstr "Sólo la capa actual" + +#: ../app/tools/gimpcropoptions.c:170 +msgid "Allow growing" +msgstr "Permitir agrandar" + +#: ../app/tools/gimpcroptool.c:117 +msgid "Crop" +msgstr "Recortar" + +#: ../app/tools/gimpcroptool.c:118 +msgid "Crop Tool: Remove edge areas from image or layer" +msgstr "Herramienta de recorte: quitar zonas del borde de la capa o imagen" + +#: ../app/tools/gimpcroptool.c:119 +msgid "_Crop" +msgstr "_Recortar" + +#: ../app/tools/gimpcroptool.c:253 +msgid "Click or press Enter to crop" +msgstr "Pulse o presione «Retorno» para recortar" + +#: ../app/tools/gimpcroptool.c:318 +msgid "There is no active layer to crop." +msgstr "No hay una capa activa que cortar." + +#: ../app/tools/gimpcurvestool.c:145 +msgid "Curves" +msgstr "Curvas" + +#: ../app/tools/gimpcurvestool.c:146 +msgid "Curves Tool: Adjust color curves" +msgstr "Herramienta de curvas: ajustar las curvas de color" + +#: ../app/tools/gimpcurvestool.c:147 +msgid "_Curves..." +msgstr "_Curvas…" + +#: ../app/tools/gimpcurvestool.c:174 +msgid "Adjust Color Curves" +msgstr "Ajustar las curvas de color" + +#: ../app/tools/gimpcurvestool.c:176 +msgid "Import Curves" +msgstr "Importar curvas" + +#: ../app/tools/gimpcurvestool.c:177 +msgid "Export Curves" +msgstr "Exportar curvas" + +#: ../app/tools/gimpcurvestool.c:239 +msgid "Curves does not operate on indexed layers." +msgstr "Las curvas no funcionan sobre capas indexadas." + +#: ../app/tools/gimpcurvestool.c:348 +msgid "Click to add a control point" +msgstr "Pulse para añadir un punto de control" + +#: ../app/tools/gimpcurvestool.c:353 +msgid "Click to add control points to all channels" +msgstr "Pulse para añadir puntos de control a todos los canales" + +#: ../app/tools/gimpcurvestool.c:358 +msgid "Click to locate on curve (try Shift, Ctrl)" +msgstr "Pulse para situar sobre la curva (pruebe Mayús o Ctrl)" + +#: ../app/tools/gimpcurvestool.c:473 ../app/tools/gimplevelstool.c:384 +msgid "Cha_nnel:" +msgstr "Ca_nal:" + +#: ../app/tools/gimpcurvestool.c:499 ../app/tools/gimplevelstool.c:408 +msgid "R_eset Channel" +msgstr "R_einiciar el canal" + +#: ../app/tools/gimpcurvestool.c:590 ../app/widgets/gimpdeviceinfoeditor.c:461 +msgid "Curve _type:" +msgstr "_Tipo de curva:" + +#: ../app/tools/gimpcurvestool.c:667 ../app/tools/gimplevelstool.c:756 +#, c-format +msgid "Could not read header from '%s': %s" +msgstr "No se ha podido leer la cabecera de «%s»: %s" + +#: ../app/tools/gimpcurvestool.c:740 +msgid "Use _old curves file format" +msgstr "Usar el formato antigu_o de archivo de curvas" + +#: ../app/tools/gimpdesaturatetool.c:78 +msgid "Desaturate Tool: Turn colors into shades of gray" +msgstr "Herramienta desaturar: convertir colores en niveles de gris" + +#: ../app/tools/gimpdesaturatetool.c:79 +msgid "_Desaturate..." +msgstr "_Desaturar…" + +#: ../app/tools/gimpdesaturatetool.c:93 +msgid "Desaturate (Remove Colors)" +msgstr "Desaturar (eliminar colores)" + +#: ../app/tools/gimpdesaturatetool.c:124 +msgid "Desaturate only operates on RGB layers." +msgstr "La desaturación sólo funciona sobre capas RGB." + +#: ../app/tools/gimpdesaturatetool.c:193 +msgid "Choose shade of gray based on:" +msgstr "Seleccionar un poco de gris basado en:" + # //R ???? -#: ../app/tools/gimpdodgeburntool.c:73 -msgid "Dodge / Burn" -msgstr "Marcar a fuego / Quemar" - -#: ../app/tools/gimpdodgeburntool.c:74 -msgid "Dodge / Burn Tool: Selectively lighten or darken using a brush" -msgstr "" -"Herramienta de marcado a fuego/ quemar: iluminar u oscurecer selectivamente " -"usando un pincel" - +#: ../app/tools/gimpdodgeburntool.c:73 +msgid "Dodge / Burn" +msgstr "Marcar a fuego / Quemar" + +#: ../app/tools/gimpdodgeburntool.c:74 +msgid "Dodge / Burn Tool: Selectively lighten or darken using a brush" +msgstr "" +"Herramienta de marcado a fuego/ quemar: iluminar u oscurecer selectivamente " +"usando un pincel" + # //R ???? -#: ../app/tools/gimpdodgeburntool.c:75 -msgid "Dod_ge / Burn" -msgstr "_Marcar a fuego/Quemar" - -#: ../app/tools/gimpdodgeburntool.c:187 -msgid "Click to dodge" -msgstr "Pulse para marcar a fuego" - -#: ../app/tools/gimpdodgeburntool.c:188 -msgid "Click to dodge the line" -msgstr "Pulse para marcar a fuego la línea" - -#: ../app/tools/gimpdodgeburntool.c:189 -#, c-format -msgid "%s to burn" -msgstr "%s para quemar" - -#: ../app/tools/gimpdodgeburntool.c:193 -msgid "Click to burn" -msgstr "Pulse para quemar" - -#: ../app/tools/gimpdodgeburntool.c:194 -msgid "Click to burn the line" -msgstr "Pulse para quemar la línea" - -#: ../app/tools/gimpdodgeburntool.c:195 -#, c-format -msgid "%s to dodge" -msgstr "%s para marcar a fuego" - -#. the type (dodge or burn) -#: ../app/tools/gimpdodgeburntool.c:219 -#, c-format -msgid "Type (%s)" -msgstr "Tipo (%s)" - -#. mode (highlights, midtones, or shadows) -#: ../app/tools/gimpdodgeburntool.c:230 -msgid "Range" -msgstr "Rango" - -#: ../app/tools/gimpdodgeburntool.c:236 -msgid "Exposure" -msgstr "Exposición" - -#: ../app/tools/gimpeditselectiontool.c:242 -msgid "Move Selection" -msgstr "Mover la selección" - -#: ../app/tools/gimpeditselectiontool.c:246 -#: ../app/tools/gimpeditselectiontool.c:1241 -msgid "Move Floating Selection" -msgstr "Mover la selección flotante" - -#: ../app/tools/gimpeditselectiontool.c:455 -#: ../app/tools/gimpeditselectiontool.c:732 -msgid "Move: " -msgstr "Mover: " - -#: ../app/tools/gimpellipseselecttool.c:66 -msgid "Ellipse Select" -msgstr "Selección elíptica" - -#: ../app/tools/gimpellipseselecttool.c:67 -msgid "Ellipse Select Tool: Select an elliptical region" -msgstr "Herramienta de selección elíptica: seleccionar una zona elíptica" - -#: ../app/tools/gimpellipseselecttool.c:68 -msgid "_Ellipse Select" -msgstr "Selección _elíptica" - -#: ../app/tools/gimperasertool.c:66 -msgid "Eraser Tool: Erase to background or transparency using a brush" -msgstr "" -"Herramienta borrador: borrar el color de fondo o a transparencia, mediante " -"un pincel" - -#: ../app/tools/gimperasertool.c:67 -msgid "_Eraser" -msgstr "_Goma de borrar" - -#: ../app/tools/gimperasertool.c:96 -msgid "Click to erase" -msgstr "Pulse para borrar" - -#: ../app/tools/gimperasertool.c:97 -msgid "Click to erase the line" -msgstr "Pulsar para borrar la línea" - -#: ../app/tools/gimperasertool.c:98 -#, c-format -msgid "%s to pick a background color" -msgstr "%s para recoger un color de fondo" - -#. the anti_erase toggle -#: ../app/tools/gimperasertool.c:145 -#, c-format -msgid "Anti erase (%s)" -msgstr "Antiborrado (%s)" - -#: ../app/tools/gimpflipoptions.c:66 -msgid "Direction of flipping" -msgstr "Dirección del volteado" - -#: ../app/tools/gimpflipoptions.c:133 -msgid "Affect:" -msgstr "Afectar:" - -#. tool toggle -#: ../app/tools/gimpflipoptions.c:142 -#, c-format -msgid "Flip Type (%s)" -msgstr "Tipo de volteo (%s)" - -#: ../app/tools/gimpfliptool.c:84 -msgid "Flip" -msgstr "Voltear" - -#: ../app/tools/gimpfliptool.c:85 -msgid "" -"Flip Tool: Reverse the layer, selection or path horizontally or vertically" -msgstr "" -"Herramienta de volteo: voltear la capa, selección o ruta horizontalmente o " -"verticalmente" - -#: ../app/tools/gimpfliptool.c:87 -msgid "_Flip" -msgstr "_Voltear" - -#: ../app/tools/gimpfliptool.c:187 -msgctxt "undo-type" -msgid "Flip horizontally" -msgstr "Voltear horizontalmente" - -#: ../app/tools/gimpfliptool.c:190 -msgctxt "undo-type" -msgid "Flip vertically" -msgstr "Voltear verticalmente" - -#. probably this is not actually reached today, but -#. * could be if someone defined FLIP_DIAGONAL, say... -#. -#: ../app/tools/gimpfliptool.c:196 -msgctxt "undo-desc" -msgid "Flip" -msgstr "Voltear" - -#: ../app/tools/gimpforegroundselectoptions.c:85 -msgid "Select a single contiguous area" -msgstr "Seleccionar un área contigua simple" - -#: ../app/tools/gimpforegroundselectoptions.c:91 -msgid "" -"Paint over areas to mark color values for inclusion or exclusion from " -"selection" -msgstr "" -"Pintar sobre zonas para marcar valores de color para su inclusión o " -"exclusión de la selección" - -#: ../app/tools/gimpforegroundselectoptions.c:98 -msgid "Size of the brush used for refinements" -msgstr "Tamaño del pincel que se utiliza para retoques" - -#: ../app/tools/gimpforegroundselectoptions.c:104 -msgid "" -"Smaller values give a more accurate selection border but may introduce holes " -"in the selection" -msgstr "" -"Unos valores más pequeños posibilitan un borde de selección más preciso, " -"pero podrían introducir agujeros en la selección" - -#: ../app/tools/gimpforegroundselectoptions.c:112 -msgid "Color of selection preview mask" -msgstr "Color de la máscara de vista previa de la selección" - -#: ../app/tools/gimpforegroundselectoptions.c:124 -msgid "Sensitivity for brightness component" -msgstr "Sensibilidad para la componente de brillo" - -#: ../app/tools/gimpforegroundselectoptions.c:130 -msgid "Sensitivity for red/green component" -msgstr "Sensibilidad para la componente roja/verde" - -#: ../app/tools/gimpforegroundselectoptions.c:136 -msgid "Sensitivity for yellow/blue component" -msgstr "Sensibilidad para la componente amarilla/azul" - -#. single / multiple objects -#: ../app/tools/gimpforegroundselectoptions.c:281 -msgid "Contiguous" -msgstr "Contigua" - -#. foreground / background -#: ../app/tools/gimpforegroundselectoptions.c:286 -#, c-format -msgid "Interactive refinement (%s)" -msgstr "Retoque interactivo (%s)" - -#: ../app/tools/gimpforegroundselectoptions.c:290 -msgid "Mark background" -msgstr "Marcar el fondo" - -#: ../app/tools/gimpforegroundselectoptions.c:291 -msgid "Mark foreground" -msgstr "Marcar el frente" - -#: ../app/tools/gimpforegroundselectoptions.c:307 -msgid "Small brush" -msgstr "Pincel pequeño" - -#: ../app/tools/gimpforegroundselectoptions.c:315 -msgid "Large brush" -msgstr "Pincel grande" - -#: ../app/tools/gimpforegroundselectoptions.c:338 -msgid "Smoothing:" -msgstr "Suavizado:" - -#: ../app/tools/gimpforegroundselectoptions.c:344 -msgid "Preview color:" -msgstr "Vista previa del color:" - -#. granularity -#: ../app/tools/gimpforegroundselectoptions.c:347 -msgid "Color Sensitivity" -msgstr "Sensibilidad de color" - -#: ../app/tools/gimpforegroundselecttool.c:144 -msgid "Foreground Select" -msgstr "Selección del frente" - -#: ../app/tools/gimpforegroundselecttool.c:145 -msgid "Foreground Select Tool: Select a region containing foreground objects" -msgstr "" -"Herramienta de selección del primer plano: seleccionar una zona que contiene " -"objetos en el frente" - -#: ../app/tools/gimpforegroundselecttool.c:146 -msgid "F_oreground Select" -msgstr "Selección del _frente" - -#: ../app/tools/gimpforegroundselecttool.c:304 -msgid "Add more strokes or press Enter to accept the selection" -msgstr "" -"Añada más pulsaciones de tecla o presione «Retorno» para aceptar la selección" - -#: ../app/tools/gimpforegroundselecttool.c:306 -msgid "Mark foreground by painting on the object to extract" -msgstr "Marque el frente pintando sobre el objeto que quiere extraer" - -#: ../app/tools/gimpforegroundselecttool.c:311 -msgid "Roughly outline the object to extract" -msgstr "Dibuje un círculo aproximado alrededor del objeto que quiere extraer" - -#: ../app/tools/gimpforegroundselecttool.c:753 -msgctxt "command" -msgid "Foreground Select" -msgstr "Selección del frente" - -#: ../app/tools/gimpfreeselecttool.c:197 -msgid "" -"Free Select Tool: Select a hand-drawn region with free and polygonal segments" -msgstr "" -"Herramienta de selección libre: seleccionar una región dibujada a mano con " -"segmentos libres y poligonales" - -#: ../app/tools/gimpfreeselecttool.c:198 -msgid "_Free Select" -msgstr "Selección _libre" - -#: ../app/tools/gimpfreeselecttool.c:1030 -msgid "Click to complete selection" -msgstr "Pulse para completar la selección" - -#: ../app/tools/gimpfreeselecttool.c:1034 -msgid "Click-Drag to move segment vertex" -msgstr "Pulse y arrastre para mover el vértice del segmento" - -#: ../app/tools/gimpfreeselecttool.c:1039 -msgid "Return commits, Escape cancels, Backspace removes last segment" -msgstr "" -"Retorno realiza la acción, Escape cancela, Retroceso quita el último segmento" - -#: ../app/tools/gimpfreeselecttool.c:1043 -msgid "Click-Drag adds a free segment, Click adds a polygonal segment" -msgstr "" -"Pulse y arrastre para añadir un segmento libre, pulse para añadir un " -"segmento poligonal" - -#: ../app/tools/gimpfreeselecttool.c:1562 -msgctxt "command" -msgid "Free Select" -msgstr "Selección libre" - -#: ../app/tools/gimpfuzzyselecttool.c:65 -msgid "Fuzzy Select" -msgstr "Selección difusa" - -#: ../app/tools/gimpfuzzyselecttool.c:66 -msgid "Fuzzy Select Tool: Select a contiguous region on the basis of color" -msgstr "" -"Selección difusa: seleccionar una región contigua basándose en el color" - -#: ../app/tools/gimpfuzzyselecttool.c:67 -msgid "Fu_zzy Select" -msgstr "Selección _difusa" - -#: ../app/tools/gimpfuzzyselecttool.c:80 -msgctxt "command" -msgid "Fuzzy Select" -msgstr "Selección difusa" - -#: ../app/tools/gimpgegltool.c:93 ../app/tools/gimpgegltool.c:112 -msgid "GEGL Operation" -msgstr "Operación de GEGL" - -#: ../app/tools/gimpgegltool.c:94 -msgid "GEGL Tool: Use an arbitrary GEGL operation" -msgstr "Herramienta GEGL: utilice una operación GEGL arbitraria" - +#: ../app/tools/gimpdodgeburntool.c:75 +msgid "Dod_ge / Burn" +msgstr "_Marcar a fuego/Quemar" + +#: ../app/tools/gimpdodgeburntool.c:187 +msgid "Click to dodge" +msgstr "Pulse para marcar a fuego" + +#: ../app/tools/gimpdodgeburntool.c:188 +msgid "Click to dodge the line" +msgstr "Pulse para marcar a fuego la línea" + +#: ../app/tools/gimpdodgeburntool.c:189 +#, c-format +msgid "%s to burn" +msgstr "%s para quemar" + +#: ../app/tools/gimpdodgeburntool.c:193 +msgid "Click to burn" +msgstr "Pulse para quemar" + +#: ../app/tools/gimpdodgeburntool.c:194 +msgid "Click to burn the line" +msgstr "Pulse para quemar la línea" + +#: ../app/tools/gimpdodgeburntool.c:195 +#, c-format +msgid "%s to dodge" +msgstr "%s para marcar a fuego" + +#. the type (dodge or burn) +#: ../app/tools/gimpdodgeburntool.c:219 +#, c-format +msgid "Type (%s)" +msgstr "Tipo (%s)" + +#. mode (highlights, midtones, or shadows) +#: ../app/tools/gimpdodgeburntool.c:230 +msgid "Range" +msgstr "Rango" + +#: ../app/tools/gimpdodgeburntool.c:236 +msgid "Exposure" +msgstr "Exposición" + +#: ../app/tools/gimpeditselectiontool.c:484 +#: ../app/tools/gimpeditselectiontool.c:670 +msgid "Move: " +msgstr "Mover: " + +#: ../app/tools/gimpeditselectiontool.c:982 +#: ../app/tools/gimpeditselectiontool.c:1234 +msgid "Move Floating Selection" +msgstr "Mover la selección flotante" + +#: ../app/tools/gimpellipseselecttool.c:66 +msgid "Ellipse Select" +msgstr "Selección elíptica" + +#: ../app/tools/gimpellipseselecttool.c:67 +msgid "Ellipse Select Tool: Select an elliptical region" +msgstr "Herramienta de selección elíptica: seleccionar una zona elíptica" + +#: ../app/tools/gimpellipseselecttool.c:68 +msgid "_Ellipse Select" +msgstr "Selección _elíptica" + +#: ../app/tools/gimperasertool.c:66 +msgid "Eraser Tool: Erase to background or transparency using a brush" +msgstr "" +"Herramienta borrador: borrar el color de fondo o a transparencia, mediante " +"un pincel" + +#: ../app/tools/gimperasertool.c:67 +msgid "_Eraser" +msgstr "_Goma de borrar" + +#: ../app/tools/gimperasertool.c:96 +msgid "Click to erase" +msgstr "Pulse para borrar" + +#: ../app/tools/gimperasertool.c:97 +msgid "Click to erase the line" +msgstr "Pulsar para borrar la línea" + +#: ../app/tools/gimperasertool.c:98 +#, c-format +msgid "%s to pick a background color" +msgstr "%s para recoger un color de fondo" + +#. the anti_erase toggle +#: ../app/tools/gimperasertool.c:145 +#, c-format +msgid "Anti erase (%s)" +msgstr "Antiborrado (%s)" + +#: ../app/tools/gimpflipoptions.c:66 +msgid "Direction of flipping" +msgstr "Dirección del volteado" + +#: ../app/tools/gimpflipoptions.c:133 +msgid "Affect:" +msgstr "Afectar:" + +#. tool toggle +#: ../app/tools/gimpflipoptions.c:142 +#, c-format +msgid "Flip Type (%s)" +msgstr "Tipo de volteo (%s)" + +#: ../app/tools/gimpfliptool.c:84 +msgid "Flip" +msgstr "Voltear" + +#: ../app/tools/gimpfliptool.c:85 +msgid "" +"Flip Tool: Reverse the layer, selection or path horizontally or vertically" +msgstr "" +"Herramienta de volteo: voltear la capa, selección o ruta horizontalmente o " +"verticalmente" + +#: ../app/tools/gimpfliptool.c:87 +msgid "_Flip" +msgstr "_Voltear" + +#: ../app/tools/gimpfliptool.c:187 +msgctxt "undo-type" +msgid "Flip horizontally" +msgstr "Voltear horizontalmente" + +#: ../app/tools/gimpfliptool.c:190 +msgctxt "undo-type" +msgid "Flip vertically" +msgstr "Voltear verticalmente" + +#. probably this is not actually reached today, but +#. * could be if someone defined FLIP_DIAGONAL, say... +#. +#: ../app/tools/gimpfliptool.c:196 +msgctxt "undo-desc" +msgid "Flip" +msgstr "Voltear" + +#: ../app/tools/gimpforegroundselectoptions.c:85 +msgid "Select a single contiguous area" +msgstr "Seleccionar un área contigua simple" + +#: ../app/tools/gimpforegroundselectoptions.c:91 +msgid "" +"Paint over areas to mark color values for inclusion or exclusion from " +"selection" +msgstr "" +"Pintar sobre zonas para marcar valores de color para su inclusión o " +"exclusión de la selección" + +#: ../app/tools/gimpforegroundselectoptions.c:98 +msgid "Size of the brush used for refinements" +msgstr "Tamaño del pincel que se utiliza para retoques" + +#: ../app/tools/gimpforegroundselectoptions.c:104 +msgid "" +"Smaller values give a more accurate selection border but may introduce holes " +"in the selection" +msgstr "" +"Unos valores más pequeños posibilitan un borde de selección más preciso, " +"pero podrían introducir agujeros en la selección" + +#: ../app/tools/gimpforegroundselectoptions.c:112 +msgid "Color of selection preview mask" +msgstr "Color de la máscara de vista previa de la selección" + +#: ../app/tools/gimpforegroundselectoptions.c:124 +msgid "Sensitivity for brightness component" +msgstr "Sensibilidad para la componente de brillo" + +#: ../app/tools/gimpforegroundselectoptions.c:130 +msgid "Sensitivity for red/green component" +msgstr "Sensibilidad para la componente roja/verde" + +#: ../app/tools/gimpforegroundselectoptions.c:136 +msgid "Sensitivity for yellow/blue component" +msgstr "Sensibilidad para la componente amarilla/azul" + +#. single / multiple objects +#: ../app/tools/gimpforegroundselectoptions.c:281 +msgid "Contiguous" +msgstr "Contigua" + +#. foreground / background +#: ../app/tools/gimpforegroundselectoptions.c:286 +#, c-format +msgid "Interactive refinement (%s)" +msgstr "Retoque interactivo (%s)" + +#: ../app/tools/gimpforegroundselectoptions.c:290 +msgid "Mark background" +msgstr "Marcar el fondo" + +#: ../app/tools/gimpforegroundselectoptions.c:291 +msgid "Mark foreground" +msgstr "Marcar el frente" + +#: ../app/tools/gimpforegroundselectoptions.c:307 +msgid "Small brush" +msgstr "Pincel pequeño" + +#: ../app/tools/gimpforegroundselectoptions.c:315 +msgid "Large brush" +msgstr "Pincel grande" + +#: ../app/tools/gimpforegroundselectoptions.c:338 +msgid "Smoothing:" +msgstr "Suavizado:" + +#: ../app/tools/gimpforegroundselectoptions.c:344 +msgid "Preview color:" +msgstr "Vista previa del color:" + +#. granularity +#: ../app/tools/gimpforegroundselectoptions.c:347 +msgid "Color Sensitivity" +msgstr "Sensibilidad de color" + +#: ../app/tools/gimpforegroundselecttool.c:144 +msgid "Foreground Select" +msgstr "Selección del frente" + +#: ../app/tools/gimpforegroundselecttool.c:145 +msgid "Foreground Select Tool: Select a region containing foreground objects" +msgstr "" +"Herramienta de selección del primer plano: seleccionar una zona que contiene " +"objetos en el frente" + +#: ../app/tools/gimpforegroundselecttool.c:146 +msgid "F_oreground Select" +msgstr "Selección del _frente" + +#: ../app/tools/gimpforegroundselecttool.c:304 +msgid "Add more strokes or press Enter to accept the selection" +msgstr "" +"Añada más pulsaciones de tecla o presione «Retorno» para aceptar la selección" + +#: ../app/tools/gimpforegroundselecttool.c:306 +msgid "Mark foreground by painting on the object to extract" +msgstr "Marque el frente pintando sobre el objeto que quiere extraer" + +#: ../app/tools/gimpforegroundselecttool.c:311 +msgid "Roughly outline the object to extract" +msgstr "Dibuje un círculo aproximado alrededor del objeto que quiere extraer" + +#: ../app/tools/gimpforegroundselecttool.c:753 +msgctxt "command" +msgid "Foreground Select" +msgstr "Selección del frente" + +#: ../app/tools/gimpfreeselecttool.c:197 +msgid "" +"Free Select Tool: Select a hand-drawn region with free and polygonal segments" +msgstr "" +"Herramienta de selección libre: seleccionar una región dibujada a mano con " +"segmentos libres y poligonales" + +#: ../app/tools/gimpfreeselecttool.c:198 +msgid "_Free Select" +msgstr "Selección _libre" + +#: ../app/tools/gimpfreeselecttool.c:1030 +msgid "Click to complete selection" +msgstr "Pulse para completar la selección" + +#: ../app/tools/gimpfreeselecttool.c:1034 +msgid "Click-Drag to move segment vertex" +msgstr "Pulse y arrastre para mover el vértice del segmento" + +#: ../app/tools/gimpfreeselecttool.c:1039 +msgid "Return commits, Escape cancels, Backspace removes last segment" +msgstr "" +"Retorno realiza la acción, Escape cancela, Retroceso quita el último segmento" + +#: ../app/tools/gimpfreeselecttool.c:1043 +msgid "Click-Drag adds a free segment, Click adds a polygonal segment" +msgstr "" +"Pulse y arrastre para añadir un segmento libre, pulse para añadir un " +"segmento poligonal" + +#: ../app/tools/gimpfreeselecttool.c:1562 +msgctxt "command" +msgid "Free Select" +msgstr "Selección libre" + +#: ../app/tools/gimpfuzzyselecttool.c:65 +msgid "Fuzzy Select" +msgstr "Selección difusa" + +#: ../app/tools/gimpfuzzyselecttool.c:66 +msgid "Fuzzy Select Tool: Select a contiguous region on the basis of color" +msgstr "" +"Selección difusa: seleccionar una región contigua basándose en el color" + +#: ../app/tools/gimpfuzzyselecttool.c:67 +msgid "Fu_zzy Select" +msgstr "Selección _difusa" + +#: ../app/tools/gimpfuzzyselecttool.c:80 +msgctxt "command" +msgid "Fuzzy Select" +msgstr "Selección difusa" + +#: ../app/tools/gimpgegltool.c:93 ../app/tools/gimpgegltool.c:112 +msgid "GEGL Operation" +msgstr "Operación de GEGL" + +#: ../app/tools/gimpgegltool.c:94 +msgid "GEGL Tool: Use an arbitrary GEGL operation" +msgstr "Herramienta GEGL: utilice una operación GEGL arbitraria" + # Location lo traducimos por lugar (Serrador) -#: ../app/tools/gimpgegltool.c:95 -msgid "_GEGL Operation..." -msgstr "Operación _GEGL…" - -#: ../app/tools/gimpgegltool.c:160 -msgid "GEGL operations do not operate on indexed layers." -msgstr "Las operaciones de GEGL no funcionan sobre capas indexadas." - -#: ../app/tools/gimpgegltool.c:378 -msgid "_Operation:" -msgstr "_Operación:" - -#. The options vbox -#: ../app/tools/gimpgegltool.c:437 -msgid "Operation Settings" -msgstr "Ajustes de la operación" - -#: ../app/tools/gimpgegltool.c:442 -msgid "Select an operation from the list above" -msgstr "Seleccionar una operación de la lista de arriba" - -#: ../app/tools/gimphealtool.c:53 -msgid "Healing Tool: Heal image irregularities" -msgstr "Herramienta de saneado: sanear irregularidades de la imagen" - -#: ../app/tools/gimphealtool.c:54 -msgid "_Heal" -msgstr "_Sanear" - -#: ../app/tools/gimphealtool.c:76 ../app/tools/gimphealtool.c:79 -msgid "Click to heal" -msgstr "Pulsar para sanear" - -#: ../app/tools/gimphealtool.c:77 ../app/tools/gimphealtool.c:82 -#, c-format -msgid "%s to set a new heal source" -msgstr "%s para fijar un nuevo origen de saneado" - -#. Translators: the translation of "Click" must be the first word -#: ../app/tools/gimphealtool.c:81 -msgid "Click to set a new heal source" -msgstr "Pulsar para establecer un nuevo origen de saneado" - -#: ../app/tools/gimphistogramoptions.c:126 -msgid "Histogram Scale" -msgstr "Escala del histograma" - -#: ../app/tools/gimphuesaturationtool.c:103 -msgid "Hue-Saturation Tool: Adjust hue, saturation, and lightness" -msgstr "" -"Herramienta de tono y saturación: ajustar el tono, la saturación y la " -"luminosidad" - -#: ../app/tools/gimphuesaturationtool.c:104 -msgid "Hue-_Saturation..." -msgstr "Tono y _saturación…" - -#: ../app/tools/gimphuesaturationtool.c:121 -msgid "Adjust Hue / Lightness / Saturation" -msgstr "Ajustar el tono / luminosidad / saturación" - -#: ../app/tools/gimphuesaturationtool.c:123 -msgid "Import Hue-Saturation Settings" -msgstr "Importar los ajustes de tono y saturación" - -#: ../app/tools/gimphuesaturationtool.c:124 -msgid "Export Hue-Saturation Settings" -msgstr "Exportar los ajustes de tono y saturación" - -#: ../app/tools/gimphuesaturationtool.c:170 -msgid "Hue-Saturation operates only on RGB color layers." -msgstr "Tono-saturación sólo funciona sobre capas de color RGB." - -#: ../app/tools/gimphuesaturationtool.c:247 -msgid "M_aster" -msgstr "P_rincipal" - -#: ../app/tools/gimphuesaturationtool.c:247 -msgid "Adjust all colors" -msgstr "Ajustar todos los colores" - -#: ../app/tools/gimphuesaturationtool.c:248 -msgid "_R" -msgstr "_R" - -#: ../app/tools/gimphuesaturationtool.c:249 -msgid "_Y" -msgstr "_Y" - -#: ../app/tools/gimphuesaturationtool.c:250 -msgid "_G" -msgstr "_G" - -#: ../app/tools/gimphuesaturationtool.c:251 -msgid "_C" -msgstr "_C" - -#: ../app/tools/gimphuesaturationtool.c:252 -msgid "_B" -msgstr "_B" - -#: ../app/tools/gimphuesaturationtool.c:253 -msgid "_M" -msgstr "_M" - -#: ../app/tools/gimphuesaturationtool.c:258 -msgid "Select Primary Color to Adjust" -msgstr "Seleccione el color primario para modificar" - -#: ../app/tools/gimphuesaturationtool.c:348 -msgid "_Overlap:" -msgstr "S_olapar:" - -#: ../app/tools/gimphuesaturationtool.c:364 -msgid "Adjust Selected Color" -msgstr "Modificar el color seleccionado" - -#: ../app/tools/gimphuesaturationtool.c:431 -msgid "R_eset Color" -msgstr "R_establecer el color" - -#: ../app/tools/gimpimagemaptool-settings.c:81 -msgid "Pre_sets:" -msgstr "Aju_stes prefijados:" - -#: ../app/tools/gimpimagemaptool-settings.c:223 -#, c-format -msgid "Settings saved to '%s'" -msgstr "Preferencias guardadas «%s»" - -#: ../app/tools/gimpimagemaptool.c:363 -msgid "_Preview" -msgstr "Vista _previa" - -#. adjust sliders -#: ../app/tools/gimpinkoptions-gui.c:54 -msgid "Adjustment" -msgstr "Ajuste" - -#: ../app/tools/gimpinkoptions-gui.c:64 ../app/tools/gimpinkoptions-gui.c:87 -#: ../app/tools/gimppaintoptions-gui.c:132 -msgid "Size" -msgstr "Tamaño" - -#: ../app/tools/gimpinkoptions-gui.c:71 -#: ../app/tools/gimppaintoptions-gui.c:181 -#: ../app/widgets/gimpbrusheditor.c:199 -msgid "Angle" -msgstr "Ángulo" - -#. sens sliders -#: ../app/tools/gimpinkoptions-gui.c:77 -msgid "Sensitivity" -msgstr "Sensibilidad" - -#: ../app/tools/gimpinkoptions-gui.c:94 -#: ../app/widgets/gimpdynamicseditor.c:144 -#: ../app/widgets/gimpdynamicsoutputeditor.c:72 -msgid "Tilt" -msgstr "Inclinación" - -#: ../app/tools/gimpinkoptions-gui.c:101 -msgid "Speed" -msgstr "Velocidad" - -#. Blob shape widgets -#: ../app/tools/gimpinkoptions-gui.c:107 -msgid "Shape" -msgstr "Forma" - -#: ../app/tools/gimpinktool.c:55 -msgid "Ink Tool: Calligraphy-style painting" -msgstr "Herramienta de tinta: escritura tipo caligrafía" - -#: ../app/tools/gimpinktool.c:56 -msgid "In_k" -msgstr "_Tinta" - -#: ../app/tools/gimpiscissorsoptions.c:68 -msgid "Display future selection segment as you drag a control node" -msgstr "" -"Mostrar el segmento de selección futuro al arrastrar un nodo de control" - -#: ../app/tools/gimpiscissorsoptions.c:127 -msgid "Interactive boundary" -msgstr "Límites interactivos" - -#: ../app/tools/gimpiscissorstool.c:275 -msgid "Scissors" -msgstr "Tijeras" - -#: ../app/tools/gimpiscissorstool.c:276 -msgid "Scissors Select Tool: Select shapes using intelligent edge-fitting" -msgstr "" -"Herramienta de tijeras de selección: seleccionar formas utilizando una " -"ajuste inteligente de los bordes" - -#: ../app/tools/gimpiscissorstool.c:277 -msgid "Intelligent _Scissors" -msgstr "Tijeras _inteligentes" - -#: ../app/tools/gimpiscissorstool.c:902 ../app/tools/gimpmeasuretool.c:605 -msgid "Click-Drag to move this point" -msgstr "Pulse y arrastre para mover este punto" - -#: ../app/tools/gimpiscissorstool.c:904 ../app/tools/gimpiscissorstool.c:969 -#, c-format -msgid "%s: disable auto-snap" -msgstr "%s: desactivar el autoajuste" - -#: ../app/tools/gimpiscissorstool.c:921 -msgid "Click to close the curve" -msgstr "Pulse para cerrar la curva" - -#: ../app/tools/gimpiscissorstool.c:927 -msgid "Click to add a point on this segment" -msgstr "Pulse para añadir un punto sobre este segmento" - -#: ../app/tools/gimpiscissorstool.c:941 -msgid "Click or press Enter to convert to a selection" -msgstr "Pulse con el ratón o presione «Retorno» para convertir a una selección" - -#: ../app/tools/gimpiscissorstool.c:951 -msgid "Press Enter to convert to a selection" -msgstr "Presione «Retorno» para convertir a una selección" - -#: ../app/tools/gimpiscissorstool.c:966 -msgid "Click or Click-Drag to add a point" -msgstr "Pulse o arrastre para añadir un punto" - -#: ../app/tools/gimplevelstool.c:151 -msgid "Levels Tool: Adjust color levels" -msgstr "Herramienta de niveles: ajustar los niveles de color" - -#: ../app/tools/gimplevelstool.c:152 -msgid "_Levels..." -msgstr "_Niveles…" - -#: ../app/tools/gimplevelstool.c:174 -msgid "Import Levels" -msgstr "Importar niveles" - -#: ../app/tools/gimplevelstool.c:175 -msgid "Export Levels" -msgstr "Exportar niveles" - -#: ../app/tools/gimplevelstool.c:229 -msgid "Levels does not operate on indexed layers." -msgstr "Los niveles no funcionan sobre capas indexadas." - -#: ../app/tools/gimplevelstool.c:314 -msgid "Pick black point" -msgstr "Seleccionar un punto negro" - -#: ../app/tools/gimplevelstool.c:318 -msgid "Pick gray point" -msgstr "Seleccionar un punto gris" - -#: ../app/tools/gimplevelstool.c:322 -msgid "Pick white point" -msgstr "Seleccionar un punto blanco" - -#. Input levels frame -#: ../app/tools/gimplevelstool.c:423 -msgid "Input Levels" -msgstr "Niveles de entrada" - -#: ../app/tools/gimplevelstool.c:526 -msgid "Gamma" -msgstr "Gamma" - -#. Output levels frame -#: ../app/tools/gimplevelstool.c:568 -msgid "Output Levels" -msgstr "Niveles de salida" - -#. all channels frame -#: ../app/tools/gimplevelstool.c:645 -msgid "All Channels" -msgstr "Todos los canales" - -#: ../app/tools/gimplevelstool.c:657 ../app/tools/gimpthresholdtool.c:268 -msgid "_Auto" -msgstr "_Auto" - -#: ../app/tools/gimplevelstool.c:659 -msgid "Adjust levels automatically" -msgstr "Ajustar los niveles automáticamente" - -#: ../app/tools/gimplevelstool.c:686 -msgid "Edit these Settings as Curves" -msgstr "Editar estos ajustes como curvas" - -#: ../app/tools/gimplevelstool.c:829 -msgid "Use _old levels file format" -msgstr "Usar el formato antigu_o de archivo de niveles" - -#: ../app/tools/gimpmagnifyoptions.c:79 -msgid "Resize image window to accommodate new zoom level" -msgstr "" -"Redimensionar la ventana de imagen para ajustarse nuevo nivel de ampliación" - -#: ../app/tools/gimpmagnifyoptions.c:86 -msgid "Direction of magnification" -msgstr "Dirección de la ampliación" - -#: ../app/tools/gimpmagnifyoptions.c:172 -msgid "Auto-resize window" -msgstr "Auto-redimensionar ventana" - -#. tool toggle -#: ../app/tools/gimpmagnifyoptions.c:177 -#, c-format -msgid "Direction (%s)" -msgstr "Dirección (%s)" - -#: ../app/tools/gimpmagnifytool.c:91 -msgid "Zoom" -msgstr "Ampliación" - -#: ../app/tools/gimpmagnifytool.c:92 -msgid "Zoom Tool: Adjust the zoom level" -msgstr "Herramienta de ampliación: ajustar el nivel de ampliación" - -#: ../app/tools/gimpmagnifytool.c:93 -msgid "_Zoom" -msgstr "_Ampliación" - -#: ../app/tools/gimpmeasureoptions.c:67 -msgid "Open a floating dialog to view details about measurements" -msgstr "Abrir un diálogo flotante para ver detalles acerca de las medidas" - -#: ../app/tools/gimpmeasureoptions.c:125 -msgid "Use info window" -msgstr "Usar la ventana de información" - -#: ../app/tools/gimpmeasuretool.c:127 -msgid "Measure" -msgstr "Medir" - -#: ../app/tools/gimpmeasuretool.c:128 -msgid "Measure Tool: Measure distances and angles" -msgstr "Herramienta de medida: medir distancias y ángulos" - -#: ../app/tools/gimpmeasuretool.c:129 -msgid "_Measure" -msgstr "_Medir" - -#: ../app/tools/gimpmeasuretool.c:247 -msgid "Add Guides" -msgstr "Añadir guías" - -#: ../app/tools/gimpmeasuretool.c:313 -msgid "Drag to create a line" -msgstr "Arrastre para crear una línea" - -#: ../app/tools/gimpmeasuretool.c:560 -msgid "Click to place vertical and horizontal guides" -msgstr "Pulse para colocar guías verticales y horizontales" - -#: ../app/tools/gimpmeasuretool.c:568 -msgid "Click to place a horizontal guide" -msgstr "Pulse para colocar una guía horizontal" - -#: ../app/tools/gimpmeasuretool.c:582 -msgid "Click to place a vertical guide" -msgstr "Pulse para colocar una guía vertical" - -#: ../app/tools/gimpmeasuretool.c:595 -msgid "Click-Drag to add a new point" -msgstr "Pulse y arrastre para añadir un punto nuevo" - -#: ../app/tools/gimpmeasuretool.c:624 -msgid "Click-Drag to move all points" -msgstr "Pulse y arrastre para mover todos los puntos" - -#: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084 -#: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168 -#: ../app/tools/gimppainttool.c:633 -msgid "pixels" -msgstr "píxeles" - -#: ../app/tools/gimpmeasuretool.c:1052 -msgid "Measure Distances and Angles" -msgstr "Medida de distancias y ángulos" - -#: ../app/tools/gimpmeasuretool.c:1073 -msgid "Distance:" -msgstr "Distancia:" - -#: ../app/tools/gimpmeasuretool.c:1101 -msgid "Angle:" -msgstr "Ángulo:" - -#: ../app/tools/gimpmoveoptions.c:139 -msgid "Pick a layer or guide" -msgstr "Escoger una capa o guía" - -#: ../app/tools/gimpmoveoptions.c:140 -msgid "Move the active layer" -msgstr "Mover la capa activa" - -#: ../app/tools/gimpmoveoptions.c:144 -msgid "Move selection" -msgstr "Mover la selección" - -#: ../app/tools/gimpmoveoptions.c:148 -msgid "Pick a path" -msgstr "Escoger una ruta" - -#: ../app/tools/gimpmoveoptions.c:149 -msgid "Move the active path" -msgstr "Mover la ruta activa" - -#: ../app/tools/gimpmoveoptions.c:178 -msgid "Move:" -msgstr "Mover:" - -#. tool toggle -#: ../app/tools/gimpmoveoptions.c:187 -#, c-format -msgid "Tool Toggle (%s)" -msgstr "Activar herramienta (%s)" - -#: ../app/tools/gimpmovetool.c:127 -msgctxt "tool" -msgid "Move" -msgstr "Mover" - -#: ../app/tools/gimpmovetool.c:128 -msgid "Move Tool: Move layers, selections, and other objects" -msgstr "Herramienta mover: mover capas, selecciones y otros objetos" - -#: ../app/tools/gimpmovetool.c:129 -msgid "_Move" -msgstr "_Mover" - -#: ../app/tools/gimpmovetool.c:249 ../app/tools/gimpmovetool.c:554 -msgid "Move Guide: " -msgstr "Mover la guía: " - -#: ../app/tools/gimpmovetool.c:548 -msgid "Remove Guide" -msgstr "Eliminar la guía" - -#: ../app/tools/gimpmovetool.c:548 -msgid "Cancel Guide" -msgstr "Cancelar la guía" - -#: ../app/tools/gimpmovetool.c:554 -msgid "Add Guide: " -msgstr "Añadir guía: " - -#: ../app/tools/gimppaintbrushtool.c:51 -msgid "Paintbrush Tool: Paint smooth strokes using a brush" -msgstr "Herramienta pincel: pintar trazos de bordes suaves mediante un pincel" - -#: ../app/tools/gimppaintbrushtool.c:52 -msgid "_Paintbrush" -msgstr "_Pincel" - -#: ../app/tools/gimppaintoptions-gui.c:89 -#: ../app/tools/gimpselectionoptions.c:217 -#: ../app/widgets/gimpbrushselect.c:190 ../app/widgets/gimplayertreeview.c:268 -msgid "Mode:" -msgstr "Modo:" - -#: ../app/tools/gimppaintoptions-gui.c:121 -msgid "Brush" -msgstr "Pincel" - -#: ../app/tools/gimppaintoptions-gui.c:150 -msgid "Reset size to brush's native size" -msgstr "Reiniciar tamaño al tamaño nativo del pincel" - -#: ../app/tools/gimppaintoptions-gui.c:157 -msgid "Aspect Ratio" -msgstr "Proporción de aspecto" - -#: ../app/tools/gimppaintoptions-gui.c:174 -msgid "Reset aspect ratio to brush's native" -msgstr "Reiniciar la proporción de aspecto a la nativa del pincel" - -#: ../app/tools/gimppaintoptions-gui.c:198 -msgid "Reset angle to zero" -msgstr "Restablecer el ángulo a cero" - -#: ../app/tools/gimppaintoptions-gui.c:236 -msgid "Incremental" -msgstr "Incremental" - -#: ../app/tools/gimppaintoptions-gui.c:254 -msgid "Hard edge" -msgstr "Bordes duros" - -#: ../app/tools/gimppaintoptions-gui.c:283 -msgid "Dynamics Options" -msgstr "Opciones de dinámica" - -#: ../app/tools/gimppaintoptions-gui.c:289 -msgid "Fade Options" -msgstr "Opciones de desvanecimiento" - -#: ../app/tools/gimppaintoptions-gui.c:303 -msgid "Fade length" -msgstr "Longitud de desvanecimiento" - -#: ../app/tools/gimppaintoptions-gui.c:332 -#: ../app/widgets/gimpviewablebox.c:311 -msgid "Reverse" -msgstr "Invertido" - -#: ../app/tools/gimppaintoptions-gui.c:339 -msgid "Color Options" -msgstr "Opciones de color" - -#: ../app/tools/gimppaintoptions-gui.c:365 -msgid "Amount" -msgstr "Cantidad" - -#: ../app/tools/gimppaintoptions-gui.c:369 -msgid "Apply Jitter" -msgstr "Aplicar «jitter»" - -#: ../app/tools/gimppaintoptions-gui.c:387 -msgid "Smooth stroke" -msgstr "Trazado suave" - -#: ../app/tools/gimppaintoptions-gui.c:397 -msgid "Weight" -msgstr "Peso" - -#: ../app/tools/gimppainttool.c:138 -msgid "Click to paint" -msgstr "Pulse para pintar" - -#: ../app/tools/gimppainttool.c:139 -msgid "Click to draw the line" -msgstr "Pulse para trazar la línea" - -#: ../app/tools/gimppainttool.c:140 -#, c-format -msgid "%s to pick a color" -msgstr "%s para recoger un color" - -#: ../app/tools/gimppainttool.c:259 -msgid "Cannot paint on layer groups." -msgstr "No se puede pintar sobre un grupo de capas." - -#: ../app/tools/gimppainttool.c:679 -#, c-format -msgid "%s for a straight line" -msgstr "%s para una línea recta" - -#: ../app/tools/gimppenciltool.c:51 -msgid "Pencil Tool: Hard edge painting using a brush" -msgstr "Herramienta lápiz: dibujo de bordes duros mediante un pincel" - -#: ../app/tools/gimppenciltool.c:52 -msgid "Pe_ncil" -msgstr "_Lápiz" - -#: ../app/tools/gimpperspectiveclonetool.c:134 -msgid "" -"Perspective Clone Tool: Clone from an image source after applying a " -"perspective transformation" -msgstr "" -"Herramienta de clonación de perspectiva: clona desde una imagen de origen " -"tras aplicar una transformación de perspectiva" - -#: ../app/tools/gimpperspectiveclonetool.c:136 -msgid "_Perspective Clone" -msgstr "Clonar con _perspectiva" - -#: ../app/tools/gimpperspectiveclonetool.c:675 -msgid "Ctrl-Click to set a clone source" -msgstr "Ctrl-pulsación para fijar un origen de clonado" - -#: ../app/tools/gimpperspectivetool.c:83 -msgid "Perspective Tool: Change perspective of the layer, selection or path" -msgstr "" -"Herramienta de perspectiva: cambia la perspectiva de la capa, selección o " -"ruta" - -#: ../app/tools/gimpperspectivetool.c:85 -msgid "_Perspective" -msgstr "_Perspectiva" - -#: ../app/tools/gimpperspectivetool.c:113 -msgid "Perspective transformation" -msgstr "Transformación de perspectiva" - -#: ../app/tools/gimpperspectivetool.c:131 -msgid "Transformation Matrix" -msgstr "Matriz de transformación" - -#: ../app/tools/gimpperspectivetool.c:256 -msgctxt "undo-type" -msgid "Perspective" -msgstr "Perspectiva" - -#: ../app/tools/gimpposterizetool.c:85 -msgid "Posterize Tool: Reduce to a limited set of colors" -msgstr "Herramienta de posterizar: reducir los colores a un conjunto limitado" - -#: ../app/tools/gimpposterizetool.c:86 -msgid "_Posterize..." -msgstr "_Posterizar…" - -#: ../app/tools/gimpposterizetool.c:103 -msgid "Posterize (Reduce Number of Colors)" -msgstr "Posterizar (reducir el número de colores)" - -#: ../app/tools/gimpposterizetool.c:152 -msgid "Posterize does not operate on indexed layers." -msgstr "Posterizar no funciona sobre capas indexadas." - -#: ../app/tools/gimpposterizetool.c:229 -msgid "Posterize _levels:" -msgstr "Nive_les de posterización:" - -#: ../app/tools/gimprectangleoptions.c:104 -msgid "Automatically shrink to the nearest rectangular shape in a layer" -msgstr "" -"Reducir automáticamente a la forma rectangular más cercana dentro de una capa" - -#: ../app/tools/gimprectangleoptions.c:113 -msgid "Use all visible layers when shrinking the selection" -msgstr "" -"Utilizar todas las capas visibles cuando se está encogiendo la selección" - -#: ../app/tools/gimprectangleoptions.c:122 -#: ../app/tools/gimptransformoptions.c:127 -msgid "Composition guides such as rule of thirds" -msgstr "Guías de composición tales como la regla de los tercios" - -#: ../app/tools/gimprectangleoptions.c:131 -msgid "X coordinate of top left corner" -msgstr "Coordenada X de la esquina superior izquierda" - -#: ../app/tools/gimprectangleoptions.c:141 -msgid "Y coordinate of top left corner" -msgstr "Coordenada Y de la esquina superior izquierda" - -#: ../app/tools/gimprectangleoptions.c:151 -msgid "Width of selection" -msgstr "Anchura de la selección" - -#: ../app/tools/gimprectangleoptions.c:160 -msgid "Height of selection" -msgstr "Altura de la selección" - -#: ../app/tools/gimprectangleoptions.c:169 -msgid "Unit of top left corner coordinate" -msgstr "Unidades de la coordenada de la esquina superior izquierda" - -#: ../app/tools/gimprectangleoptions.c:178 -msgid "Unit of selection size" -msgstr "Unidades del tamaño de la selección" - -#: ../app/tools/gimprectangleoptions.c:187 -msgid "Enable lock of aspect ratio, width, height or size" -msgstr "Permitir bloquear la proporción de aspecto, anchura, altura o tamaño" - -#: ../app/tools/gimprectangleoptions.c:196 -msgid "Choose what has to be locked" -msgstr "Elegir qué se debe bloquear" - -#: ../app/tools/gimprectangleoptions.c:205 -msgid "Custom fixed width" -msgstr "Anchura fija personalizada" - -#: ../app/tools/gimprectangleoptions.c:214 -msgid "Custom fixed height" -msgstr "Altura fija personalizada" - -#: ../app/tools/gimprectangleoptions.c:308 -msgid "Unit of fixed width, height or size" -msgstr "Unidades de anchura, altura o tamaño fijos" - -#: ../app/tools/gimprectangleoptions.c:317 -msgid "Expand selection from center outwards" -msgstr "Expandir la selección desde el centro hacia fuera" - -#. Current, as in what is currently in use. -#: ../app/tools/gimprectangleoptions.c:761 -msgid "Current" -msgstr "Actual" - -#: ../app/tools/gimprectangleoptions.c:839 -msgid "Expand from center" -msgstr "Expandir desde el centro" - -#: ../app/tools/gimprectangleoptions.c:862 -msgid "Fixed:" -msgstr "Fijo:" - -#: ../app/tools/gimprectangleoptions.c:1010 -msgid "Position:" -msgstr "Posicionar:" - -#: ../app/tools/gimprectangleoptions.c:1020 ../app/tools/gimptextoptions.c:526 -msgid "Size:" -msgstr "Tamaño:" - -#: ../app/tools/gimprectangleoptions.c:1028 -msgid "Highlight" -msgstr "Resaltado" - -#. Auto Shrink -#: ../app/tools/gimprectangleoptions.c:1040 -msgid "Auto Shrink" -msgstr "Encoger automáticamente" - -#: ../app/tools/gimprectangleoptions.c:1050 -msgid "Shrink merged" -msgstr "Encoger combinado" - -#: ../app/tools/gimprectangleselectoptions.c:83 -msgid "Round corners of selection" -msgstr "Redondear las esquinas de la selección" - -#: ../app/tools/gimprectangleselectoptions.c:89 -msgid "Radius of rounding in pixels" -msgstr "Radio del redondeado en píxeles" - -#: ../app/tools/gimprectangleselectoptions.c:167 -msgid "Rounded corners" -msgstr "Esquinas redondeadas" - -#: ../app/tools/gimprectangleselecttool.c:168 -msgid "Rectangle Select" -msgstr "Selección rectangular" - -#: ../app/tools/gimprectangleselecttool.c:169 -msgid "Rectangle Select Tool: Select a rectangular region" -msgstr "" -"Herramienta de selección de rectángulos: seleccionar una zona rectangular" - -#: ../app/tools/gimprectangleselecttool.c:170 -msgid "_Rectangle Select" -msgstr "Selección _rectangular" - -#: ../app/tools/gimprectangletool.c:1146 ../app/tools/gimprectangletool.c:2016 -msgid "Rectangle: " -msgstr "Rectángulo: " - -#: ../app/tools/gimpregionselectoptions.c:82 -msgid "Allow completely transparent regions to be selected" -msgstr "Permitir seleccionar las regiones completamente transparentes" - -#: ../app/tools/gimpregionselectoptions.c:89 -msgid "Base selection on all visible layers" -msgstr "Selección base en todas las capas visibles" - -#: ../app/tools/gimpregionselectoptions.c:101 -msgid "Selection criterion" -msgstr "Criterio de selección" - -#: ../app/tools/gimpregionselectoptions.c:204 -msgid "Select transparent areas" -msgstr "Seleccionar las áreas transparentes" - -#: ../app/tools/gimpregionselectoptions.c:226 -msgid "Select by:" -msgstr "Seleccionar por:" - -#: ../app/tools/gimpregionselecttool.c:165 -msgid "Move the mouse to change threshold" -msgstr "Mueva el ratón para cambiar el umbral" - -#: ../app/tools/gimprotatetool.c:93 -msgid "Rotate" -msgstr "Rotar" - -#: ../app/tools/gimprotatetool.c:94 -msgid "Rotate Tool: Rotate the layer, selection or path" -msgstr "Herramienta de rotación: rotar la capa, selección o ruta" - -#: ../app/tools/gimprotatetool.c:95 -msgid "_Rotate" -msgstr "_Rotar" - -#: ../app/tools/gimprotatetool.c:191 -msgid "_Angle:" -msgstr "Á_ngulo:" - -#: ../app/tools/gimprotatetool.c:207 -msgid "Center _X:" -msgstr "Centro _X:" - -#: ../app/tools/gimprotatetool.c:216 -msgid "Center _Y:" -msgstr "Centro _Y:" - -#: ../app/tools/gimprotatetool.c:373 -#, c-format -msgctxt "undo-type" -msgid "Rotate by %-3.3g° around (%g, %g)" -msgstr "Rotar %-3.3g° alrededor de (%g, %g)" - -#: ../app/tools/gimpscaletool.c:89 -msgid "Scale" -msgstr "Redimensionar" - -#: ../app/tools/gimpscaletool.c:90 -msgid "Scale Tool: Scale the layer, selection or path" -msgstr "Herramienta de escalado: escalar la capa, selección o ruta" - -#: ../app/tools/gimpscaletool.c:91 -msgid "_Scale" -msgstr "E_scalar" - -#: ../app/tools/gimpscaletool.c:338 -#, c-format -msgctxt "undo-type" -msgid "Scale to %d x %d" -msgstr "Escalar a %d x %d" - -#: ../app/tools/gimpselectionoptions.c:84 -msgid "Enable feathering of selection edges" -msgstr "Permitir el difuminado de los límites de la selección" - -#: ../app/tools/gimpselectionoptions.c:90 -msgid "Radius of feathering" -msgstr "Radio del difuminado" - -#: ../app/tools/gimpselectionoptions.c:264 ../app/tools/gimptextoptions.c:539 -msgid "Antialiasing" -msgstr "Alisado" - -#: ../app/tools/gimpselectionoptions.c:281 -msgid "Feather edges" -msgstr "Difuminar los bordes" - -#: ../app/tools/gimpselectiontool.c:255 -msgid "Click-Drag to replace the current selection" -msgstr "Pulse y arrastre para sustituir la selección actual" - -#: ../app/tools/gimpselectiontool.c:263 -msgid "Click-Drag to create a new selection" -msgstr "Pulse y arrastre para crear una nueva selección" - -#: ../app/tools/gimpselectiontool.c:268 -msgid "Click-Drag to add to the current selection" -msgstr "Pulse y arrastre para añadir a la selección actual" - -#: ../app/tools/gimpselectiontool.c:277 -msgid "Click-Drag to subtract from the current selection" -msgstr "Pulse y arrastre para sustraer de la selección actual" - -#: ../app/tools/gimpselectiontool.c:286 -msgid "Click-Drag to intersect with the current selection" -msgstr "Pulse y arrastre para intersectar con la selección actual" - -#: ../app/tools/gimpselectiontool.c:296 -msgid "Click-Drag to move the selection mask" -msgstr "Pulse y arrastre para mover la máscara de selección" - -#: ../app/tools/gimpselectiontool.c:304 -msgid "Click-Drag to move the selected pixels" -msgstr "Pulse y arrastre para mover los píxeles seleccionados" - -#: ../app/tools/gimpselectiontool.c:308 -msgid "Click-Drag to move a copy of the selected pixels" -msgstr "Pulse y arrastre para mover una copia de los píxeles seleccionados" - -#: ../app/tools/gimpselectiontool.c:312 -msgid "Click to anchor the floating selection" -msgstr "Pulse para anclar la selección flotante" - +#: ../app/tools/gimpgegltool.c:95 +msgid "_GEGL Operation..." +msgstr "Operación _GEGL…" + +#: ../app/tools/gimpgegltool.c:160 +msgid "GEGL operations do not operate on indexed layers." +msgstr "Las operaciones de GEGL no funcionan sobre capas indexadas." + +#: ../app/tools/gimpgegltool.c:378 +msgid "_Operation:" +msgstr "_Operación:" + +#. The options vbox +#: ../app/tools/gimpgegltool.c:437 +msgid "Operation Settings" +msgstr "Ajustes de la operación" + +#: ../app/tools/gimpgegltool.c:442 +msgid "Select an operation from the list above" +msgstr "Seleccionar una operación de la lista de arriba" + +#: ../app/tools/gimphealtool.c:53 +msgid "Healing Tool: Heal image irregularities" +msgstr "Herramienta de saneado: sanear irregularidades de la imagen" + +#: ../app/tools/gimphealtool.c:54 +msgid "_Heal" +msgstr "_Sanear" + +#: ../app/tools/gimphealtool.c:76 ../app/tools/gimphealtool.c:79 +msgid "Click to heal" +msgstr "Pulsar para sanear" + +#: ../app/tools/gimphealtool.c:77 ../app/tools/gimphealtool.c:82 +#, c-format +msgid "%s to set a new heal source" +msgstr "%s para fijar un nuevo origen de saneado" + +#. Translators: the translation of "Click" must be the first word +#: ../app/tools/gimphealtool.c:81 +msgid "Click to set a new heal source" +msgstr "Pulsar para establecer un nuevo origen de saneado" + +#: ../app/tools/gimphistogramoptions.c:126 +msgid "Histogram Scale" +msgstr "Escala del histograma" + +#: ../app/tools/gimphuesaturationtool.c:103 +msgid "Hue-Saturation Tool: Adjust hue, saturation, and lightness" +msgstr "" +"Herramienta de tono y saturación: ajustar el tono, la saturación y la " +"luminosidad" + +#: ../app/tools/gimphuesaturationtool.c:104 +msgid "Hue-_Saturation..." +msgstr "Tono y _saturación…" + +#: ../app/tools/gimphuesaturationtool.c:121 +msgid "Adjust Hue / Lightness / Saturation" +msgstr "Ajustar el tono / luminosidad / saturación" + +#: ../app/tools/gimphuesaturationtool.c:123 +msgid "Import Hue-Saturation Settings" +msgstr "Importar los ajustes de tono y saturación" + +#: ../app/tools/gimphuesaturationtool.c:124 +msgid "Export Hue-Saturation Settings" +msgstr "Exportar los ajustes de tono y saturación" + +#: ../app/tools/gimphuesaturationtool.c:170 +msgid "Hue-Saturation operates only on RGB color layers." +msgstr "Tono-saturación sólo funciona sobre capas de color RGB." + +#: ../app/tools/gimphuesaturationtool.c:247 +msgid "M_aster" +msgstr "P_rincipal" + +#: ../app/tools/gimphuesaturationtool.c:247 +msgid "Adjust all colors" +msgstr "Ajustar todos los colores" + +#: ../app/tools/gimphuesaturationtool.c:248 +msgid "_R" +msgstr "_R" + +#: ../app/tools/gimphuesaturationtool.c:249 +msgid "_Y" +msgstr "_Y" + +#: ../app/tools/gimphuesaturationtool.c:250 +msgid "_G" +msgstr "_G" + +#: ../app/tools/gimphuesaturationtool.c:251 +msgid "_C" +msgstr "_C" + +#: ../app/tools/gimphuesaturationtool.c:252 +msgid "_B" +msgstr "_B" + +#: ../app/tools/gimphuesaturationtool.c:253 +msgid "_M" +msgstr "_M" + +#: ../app/tools/gimphuesaturationtool.c:258 +msgid "Select Primary Color to Adjust" +msgstr "Seleccione el color primario para modificar" + +#: ../app/tools/gimphuesaturationtool.c:348 +msgid "_Overlap:" +msgstr "S_olapar:" + +#: ../app/tools/gimphuesaturationtool.c:364 +msgid "Adjust Selected Color" +msgstr "Modificar el color seleccionado" + +#: ../app/tools/gimphuesaturationtool.c:431 +msgid "R_eset Color" +msgstr "R_establecer el color" + +#: ../app/tools/gimpimagemaptool-settings.c:81 +msgid "Pre_sets:" +msgstr "Aju_stes prefijados:" + +#: ../app/tools/gimpimagemaptool-settings.c:223 +#, c-format +msgid "Settings saved to '%s'" +msgstr "Preferencias guardadas «%s»" + +#: ../app/tools/gimpimagemaptool.c:363 +msgid "_Preview" +msgstr "Vista _previa" + +#. adjust sliders +#: ../app/tools/gimpinkoptions-gui.c:54 +msgid "Adjustment" +msgstr "Ajuste" + +#: ../app/tools/gimpinkoptions-gui.c:64 ../app/tools/gimpinkoptions-gui.c:87 +#: ../app/tools/gimppaintoptions-gui.c:132 +msgid "Size" +msgstr "Tamaño" + +#: ../app/tools/gimpinkoptions-gui.c:71 +#: ../app/tools/gimppaintoptions-gui.c:181 +#: ../app/widgets/gimpbrusheditor.c:199 +msgid "Angle" +msgstr "Ángulo" + +#. sens sliders +#: ../app/tools/gimpinkoptions-gui.c:77 +msgid "Sensitivity" +msgstr "Sensibilidad" + +#: ../app/tools/gimpinkoptions-gui.c:94 +#: ../app/widgets/gimpdynamicseditor.c:144 +#: ../app/widgets/gimpdynamicsoutputeditor.c:72 +msgid "Tilt" +msgstr "Inclinación" + +#: ../app/tools/gimpinkoptions-gui.c:101 +msgid "Speed" +msgstr "Velocidad" + +#. Blob shape widgets +#: ../app/tools/gimpinkoptions-gui.c:107 +msgid "Shape" +msgstr "Forma" + +#: ../app/tools/gimpinktool.c:55 +msgid "Ink Tool: Calligraphy-style painting" +msgstr "Herramienta de tinta: escritura tipo caligrafía" + +#: ../app/tools/gimpinktool.c:56 +msgid "In_k" +msgstr "_Tinta" + +#: ../app/tools/gimpiscissorsoptions.c:68 +msgid "Display future selection segment as you drag a control node" +msgstr "" +"Mostrar el segmento de selección futuro al arrastrar un nodo de control" + +#: ../app/tools/gimpiscissorsoptions.c:127 +msgid "Interactive boundary" +msgstr "Límites interactivos" + +#: ../app/tools/gimpiscissorstool.c:275 +msgid "Scissors" +msgstr "Tijeras" + +#: ../app/tools/gimpiscissorstool.c:276 +msgid "Scissors Select Tool: Select shapes using intelligent edge-fitting" +msgstr "" +"Herramienta de tijeras de selección: seleccionar formas utilizando una " +"ajuste inteligente de los bordes" + +#: ../app/tools/gimpiscissorstool.c:277 +msgid "Intelligent _Scissors" +msgstr "Tijeras _inteligentes" + +#: ../app/tools/gimpiscissorstool.c:902 ../app/tools/gimpmeasuretool.c:605 +msgid "Click-Drag to move this point" +msgstr "Pulse y arrastre para mover este punto" + +#: ../app/tools/gimpiscissorstool.c:904 ../app/tools/gimpiscissorstool.c:969 +#, c-format +msgid "%s: disable auto-snap" +msgstr "%s: desactivar el autoajuste" + +#: ../app/tools/gimpiscissorstool.c:921 +msgid "Click to close the curve" +msgstr "Pulse para cerrar la curva" + +#: ../app/tools/gimpiscissorstool.c:927 +msgid "Click to add a point on this segment" +msgstr "Pulse para añadir un punto sobre este segmento" + +#: ../app/tools/gimpiscissorstool.c:941 +msgid "Click or press Enter to convert to a selection" +msgstr "Pulse con el ratón o presione «Retorno» para convertir a una selección" + +#: ../app/tools/gimpiscissorstool.c:951 +msgid "Press Enter to convert to a selection" +msgstr "Presione «Retorno» para convertir a una selección" + +#: ../app/tools/gimpiscissorstool.c:966 +msgid "Click or Click-Drag to add a point" +msgstr "Pulse o arrastre para añadir un punto" + +#: ../app/tools/gimplevelstool.c:151 +msgid "Levels Tool: Adjust color levels" +msgstr "Herramienta de niveles: ajustar los niveles de color" + +#: ../app/tools/gimplevelstool.c:152 +msgid "_Levels..." +msgstr "_Niveles…" + +#: ../app/tools/gimplevelstool.c:174 +msgid "Import Levels" +msgstr "Importar niveles" + +#: ../app/tools/gimplevelstool.c:175 +msgid "Export Levels" +msgstr "Exportar niveles" + +#: ../app/tools/gimplevelstool.c:229 +msgid "Levels does not operate on indexed layers." +msgstr "Los niveles no funcionan sobre capas indexadas." + +#: ../app/tools/gimplevelstool.c:314 +msgid "Pick black point" +msgstr "Seleccionar un punto negro" + +#: ../app/tools/gimplevelstool.c:318 +msgid "Pick gray point" +msgstr "Seleccionar un punto gris" + +#: ../app/tools/gimplevelstool.c:322 +msgid "Pick white point" +msgstr "Seleccionar un punto blanco" + +#. Input levels frame +#: ../app/tools/gimplevelstool.c:423 +msgid "Input Levels" +msgstr "Niveles de entrada" + +#: ../app/tools/gimplevelstool.c:526 +msgid "Gamma" +msgstr "Gamma" + +#. Output levels frame +#: ../app/tools/gimplevelstool.c:568 +msgid "Output Levels" +msgstr "Niveles de salida" + +#. all channels frame +#: ../app/tools/gimplevelstool.c:645 +msgid "All Channels" +msgstr "Todos los canales" + +#: ../app/tools/gimplevelstool.c:657 ../app/tools/gimpthresholdtool.c:268 +msgid "_Auto" +msgstr "_Auto" + +#: ../app/tools/gimplevelstool.c:659 +msgid "Adjust levels automatically" +msgstr "Ajustar los niveles automáticamente" + +#: ../app/tools/gimplevelstool.c:686 +msgid "Edit these Settings as Curves" +msgstr "Editar estos ajustes como curvas" + +#: ../app/tools/gimplevelstool.c:829 +msgid "Use _old levels file format" +msgstr "Usar el formato antigu_o de archivo de niveles" + +#: ../app/tools/gimpmagnifyoptions.c:79 +msgid "Resize image window to accommodate new zoom level" +msgstr "" +"Redimensionar la ventana de imagen para ajustarse nuevo nivel de ampliación" + +#: ../app/tools/gimpmagnifyoptions.c:86 +msgid "Direction of magnification" +msgstr "Dirección de la ampliación" + +#: ../app/tools/gimpmagnifyoptions.c:172 +msgid "Auto-resize window" +msgstr "Auto-redimensionar ventana" + +#. tool toggle +#: ../app/tools/gimpmagnifyoptions.c:177 +#, c-format +msgid "Direction (%s)" +msgstr "Dirección (%s)" + +#: ../app/tools/gimpmagnifytool.c:91 +msgid "Zoom" +msgstr "Ampliación" + +#: ../app/tools/gimpmagnifytool.c:92 +msgid "Zoom Tool: Adjust the zoom level" +msgstr "Herramienta de ampliación: ajustar el nivel de ampliación" + +#: ../app/tools/gimpmagnifytool.c:93 +msgid "_Zoom" +msgstr "_Ampliación" + +#: ../app/tools/gimpmeasureoptions.c:67 +msgid "Open a floating dialog to view details about measurements" +msgstr "Abrir un diálogo flotante para ver detalles acerca de las medidas" + +#: ../app/tools/gimpmeasureoptions.c:125 +msgid "Use info window" +msgstr "Usar la ventana de información" + +#: ../app/tools/gimpmeasuretool.c:127 +msgid "Measure" +msgstr "Medir" + +#: ../app/tools/gimpmeasuretool.c:128 +msgid "Measure Tool: Measure distances and angles" +msgstr "Herramienta de medida: medir distancias y ángulos" + +#: ../app/tools/gimpmeasuretool.c:129 +msgid "_Measure" +msgstr "_Medir" + +#: ../app/tools/gimpmeasuretool.c:247 +msgid "Add Guides" +msgstr "Añadir guías" + +#: ../app/tools/gimpmeasuretool.c:313 +msgid "Drag to create a line" +msgstr "Arrastre para crear una línea" + +#: ../app/tools/gimpmeasuretool.c:560 +msgid "Click to place vertical and horizontal guides" +msgstr "Pulse para colocar guías verticales y horizontales" + +#: ../app/tools/gimpmeasuretool.c:568 +msgid "Click to place a horizontal guide" +msgstr "Pulse para colocar una guía horizontal" + +#: ../app/tools/gimpmeasuretool.c:582 +msgid "Click to place a vertical guide" +msgstr "Pulse para colocar una guía vertical" + +#: ../app/tools/gimpmeasuretool.c:595 +msgid "Click-Drag to add a new point" +msgstr "Pulse y arrastre para añadir un punto nuevo" + +#: ../app/tools/gimpmeasuretool.c:624 +msgid "Click-Drag to move all points" +msgstr "Pulse y arrastre para mover todos los puntos" + +#: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084 +#: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168 +#: ../app/tools/gimppainttool.c:633 +msgid "pixels" +msgstr "píxeles" + +#: ../app/tools/gimpmeasuretool.c:1052 +msgid "Measure Distances and Angles" +msgstr "Medida de distancias y ángulos" + +#: ../app/tools/gimpmeasuretool.c:1073 +msgid "Distance:" +msgstr "Distancia:" + +#: ../app/tools/gimpmeasuretool.c:1101 +msgid "Angle:" +msgstr "Ángulo:" + +#: ../app/tools/gimpmoveoptions.c:139 +msgid "Pick a layer or guide" +msgstr "Escoger una capa o guía" + +#: ../app/tools/gimpmoveoptions.c:140 +msgid "Move the active layer" +msgstr "Mover la capa activa" + +#: ../app/tools/gimpmoveoptions.c:144 +msgid "Move selection" +msgstr "Mover la selección" + +#: ../app/tools/gimpmoveoptions.c:148 +msgid "Pick a path" +msgstr "Escoger una ruta" + +#: ../app/tools/gimpmoveoptions.c:149 +msgid "Move the active path" +msgstr "Mover la ruta activa" + +#: ../app/tools/gimpmoveoptions.c:178 +msgid "Move:" +msgstr "Mover:" + +#. tool toggle +#: ../app/tools/gimpmoveoptions.c:187 +#, c-format +msgid "Tool Toggle (%s)" +msgstr "Activar herramienta (%s)" + +#: ../app/tools/gimpmovetool.c:127 +msgctxt "tool" +msgid "Move" +msgstr "Mover" + +#: ../app/tools/gimpmovetool.c:128 +msgid "Move Tool: Move layers, selections, and other objects" +msgstr "Herramienta mover: mover capas, selecciones y otros objetos" + +#: ../app/tools/gimpmovetool.c:129 +msgid "_Move" +msgstr "_Mover" + +#: ../app/tools/gimpmovetool.c:249 ../app/tools/gimpmovetool.c:554 +msgid "Move Guide: " +msgstr "Mover la guía: " + +#: ../app/tools/gimpmovetool.c:548 +msgid "Remove Guide" +msgstr "Eliminar la guía" + +#: ../app/tools/gimpmovetool.c:548 +msgid "Cancel Guide" +msgstr "Cancelar la guía" + +#: ../app/tools/gimpmovetool.c:554 +msgid "Add Guide: " +msgstr "Añadir guía: " + +#: ../app/tools/gimppaintbrushtool.c:51 +msgid "Paintbrush Tool: Paint smooth strokes using a brush" +msgstr "Herramienta pincel: pintar trazos de bordes suaves mediante un pincel" + +#: ../app/tools/gimppaintbrushtool.c:52 +msgid "_Paintbrush" +msgstr "_Pincel" + +#: ../app/tools/gimppaintoptions-gui.c:89 +#: ../app/tools/gimpselectionoptions.c:217 +#: ../app/widgets/gimpbrushselect.c:190 ../app/widgets/gimplayertreeview.c:268 +msgid "Mode:" +msgstr "Modo:" + +#: ../app/tools/gimppaintoptions-gui.c:121 +msgid "Brush" +msgstr "Pincel" + +#: ../app/tools/gimppaintoptions-gui.c:150 +msgid "Reset size to brush's native size" +msgstr "Reiniciar tamaño al tamaño nativo del pincel" + +#: ../app/tools/gimppaintoptions-gui.c:157 +msgid "Aspect Ratio" +msgstr "Proporción de aspecto" + +#: ../app/tools/gimppaintoptions-gui.c:174 +msgid "Reset aspect ratio to brush's native" +msgstr "Reiniciar la proporción de aspecto a la nativa del pincel" + +#: ../app/tools/gimppaintoptions-gui.c:198 +msgid "Reset angle to zero" +msgstr "Restablecer el ángulo a cero" + +#: ../app/tools/gimppaintoptions-gui.c:236 +msgid "Incremental" +msgstr "Incremental" + +#: ../app/tools/gimppaintoptions-gui.c:254 +msgid "Hard edge" +msgstr "Bordes duros" + +#: ../app/tools/gimppaintoptions-gui.c:283 +msgid "Dynamics Options" +msgstr "Opciones de dinámica" + +#: ../app/tools/gimppaintoptions-gui.c:289 +msgid "Fade Options" +msgstr "Opciones de desvanecimiento" + +#: ../app/tools/gimppaintoptions-gui.c:303 +msgid "Fade length" +msgstr "Longitud de desvanecimiento" + +#: ../app/tools/gimppaintoptions-gui.c:332 +#: ../app/widgets/gimpviewablebox.c:311 +msgid "Reverse" +msgstr "Invertido" + +#: ../app/tools/gimppaintoptions-gui.c:339 +msgid "Color Options" +msgstr "Opciones de color" + +#: ../app/tools/gimppaintoptions-gui.c:365 +msgid "Amount" +msgstr "Cantidad" + +#: ../app/tools/gimppaintoptions-gui.c:369 +msgid "Apply Jitter" +msgstr "Aplicar «jitter»" + +#: ../app/tools/gimppaintoptions-gui.c:387 +msgid "Smooth stroke" +msgstr "Trazado suave" + +#: ../app/tools/gimppaintoptions-gui.c:397 +msgid "Weight" +msgstr "Peso" + +#: ../app/tools/gimppainttool.c:138 +msgid "Click to paint" +msgstr "Pulse para pintar" + +#: ../app/tools/gimppainttool.c:139 +msgid "Click to draw the line" +msgstr "Pulse para trazar la línea" + +#: ../app/tools/gimppainttool.c:140 +#, c-format +msgid "%s to pick a color" +msgstr "%s para recoger un color" + +#: ../app/tools/gimppainttool.c:259 +msgid "Cannot paint on layer groups." +msgstr "No se puede pintar sobre un grupo de capas." + +#: ../app/tools/gimppainttool.c:679 +#, c-format +msgid "%s for a straight line" +msgstr "%s para una línea recta" + +#: ../app/tools/gimppenciltool.c:51 +msgid "Pencil Tool: Hard edge painting using a brush" +msgstr "Herramienta lápiz: dibujo de bordes duros mediante un pincel" + +#: ../app/tools/gimppenciltool.c:52 +msgid "Pe_ncil" +msgstr "_Lápiz" + +#: ../app/tools/gimpperspectiveclonetool.c:134 +msgid "" +"Perspective Clone Tool: Clone from an image source after applying a " +"perspective transformation" +msgstr "" +"Herramienta de clonación de perspectiva: clona desde una imagen de origen " +"tras aplicar una transformación de perspectiva" + +#: ../app/tools/gimpperspectiveclonetool.c:136 +msgid "_Perspective Clone" +msgstr "Clonar con _perspectiva" + +#: ../app/tools/gimpperspectiveclonetool.c:675 +msgid "Ctrl-Click to set a clone source" +msgstr "Ctrl-pulsación para fijar un origen de clonado" + +#: ../app/tools/gimpperspectivetool.c:83 +msgid "Perspective Tool: Change perspective of the layer, selection or path" +msgstr "" +"Herramienta de perspectiva: cambia la perspectiva de la capa, selección o " +"ruta" + +#: ../app/tools/gimpperspectivetool.c:85 +msgid "_Perspective" +msgstr "_Perspectiva" + +#: ../app/tools/gimpperspectivetool.c:113 +msgid "Perspective transformation" +msgstr "Transformación de perspectiva" + +#: ../app/tools/gimpperspectivetool.c:131 +msgid "Transformation Matrix" +msgstr "Matriz de transformación" + +#: ../app/tools/gimpperspectivetool.c:256 +msgctxt "undo-type" +msgid "Perspective" +msgstr "Perspectiva" + +#: ../app/tools/gimpposterizetool.c:85 +msgid "Posterize Tool: Reduce to a limited set of colors" +msgstr "Herramienta de posterizar: reducir los colores a un conjunto limitado" + +#: ../app/tools/gimpposterizetool.c:86 +msgid "_Posterize..." +msgstr "_Posterizar…" + +#: ../app/tools/gimpposterizetool.c:103 +msgid "Posterize (Reduce Number of Colors)" +msgstr "Posterizar (reducir el número de colores)" + +#: ../app/tools/gimpposterizetool.c:152 +msgid "Posterize does not operate on indexed layers." +msgstr "Posterizar no funciona sobre capas indexadas." + +#: ../app/tools/gimpposterizetool.c:229 +msgid "Posterize _levels:" +msgstr "Nive_les de posterización:" + +#: ../app/tools/gimprectangleoptions.c:104 +msgid "Automatically shrink to the nearest rectangular shape in a layer" +msgstr "" +"Reducir automáticamente a la forma rectangular más cercana dentro de una capa" + +#: ../app/tools/gimprectangleoptions.c:113 +msgid "Use all visible layers when shrinking the selection" +msgstr "" +"Utilizar todas las capas visibles cuando se está encogiendo la selección" + +#: ../app/tools/gimprectangleoptions.c:122 +#: ../app/tools/gimptransformoptions.c:127 +msgid "Composition guides such as rule of thirds" +msgstr "Guías de composición tales como la regla de los tercios" + +#: ../app/tools/gimprectangleoptions.c:131 +msgid "X coordinate of top left corner" +msgstr "Coordenada X de la esquina superior izquierda" + +#: ../app/tools/gimprectangleoptions.c:141 +msgid "Y coordinate of top left corner" +msgstr "Coordenada Y de la esquina superior izquierda" + +#: ../app/tools/gimprectangleoptions.c:151 +msgid "Width of selection" +msgstr "Anchura de la selección" + +#: ../app/tools/gimprectangleoptions.c:160 +msgid "Height of selection" +msgstr "Altura de la selección" + +#: ../app/tools/gimprectangleoptions.c:169 +msgid "Unit of top left corner coordinate" +msgstr "Unidades de la coordenada de la esquina superior izquierda" + +#: ../app/tools/gimprectangleoptions.c:178 +msgid "Unit of selection size" +msgstr "Unidades del tamaño de la selección" + +#: ../app/tools/gimprectangleoptions.c:187 +msgid "Enable lock of aspect ratio, width, height or size" +msgstr "Permitir bloquear la proporción de aspecto, anchura, altura o tamaño" + +#: ../app/tools/gimprectangleoptions.c:196 +msgid "Choose what has to be locked" +msgstr "Elegir qué se debe bloquear" + +#: ../app/tools/gimprectangleoptions.c:205 +msgid "Custom fixed width" +msgstr "Anchura fija personalizada" + +#: ../app/tools/gimprectangleoptions.c:214 +msgid "Custom fixed height" +msgstr "Altura fija personalizada" + +#: ../app/tools/gimprectangleoptions.c:308 +msgid "Unit of fixed width, height or size" +msgstr "Unidades de anchura, altura o tamaño fijos" + +#: ../app/tools/gimprectangleoptions.c:317 +msgid "Expand selection from center outwards" +msgstr "Expandir la selección desde el centro hacia fuera" + +#. Current, as in what is currently in use. +#: ../app/tools/gimprectangleoptions.c:761 +msgid "Current" +msgstr "Actual" + +#: ../app/tools/gimprectangleoptions.c:839 +msgid "Expand from center" +msgstr "Expandir desde el centro" + +#: ../app/tools/gimprectangleoptions.c:862 +msgid "Fixed:" +msgstr "Fijo:" + +#: ../app/tools/gimprectangleoptions.c:1010 +msgid "Position:" +msgstr "Posicionar:" + +#: ../app/tools/gimprectangleoptions.c:1020 ../app/tools/gimptextoptions.c:526 +msgid "Size:" +msgstr "Tamaño:" + +#: ../app/tools/gimprectangleoptions.c:1028 +msgid "Highlight" +msgstr "Resaltado" + +#. Auto Shrink +#: ../app/tools/gimprectangleoptions.c:1040 +msgid "Auto Shrink" +msgstr "Encoger automáticamente" + +#: ../app/tools/gimprectangleoptions.c:1050 +msgid "Shrink merged" +msgstr "Encoger combinado" + +#: ../app/tools/gimprectangleselectoptions.c:83 +msgid "Round corners of selection" +msgstr "Redondear las esquinas de la selección" + +#: ../app/tools/gimprectangleselectoptions.c:89 +msgid "Radius of rounding in pixels" +msgstr "Radio del redondeado en píxeles" + +#: ../app/tools/gimprectangleselectoptions.c:167 +msgid "Rounded corners" +msgstr "Esquinas redondeadas" + +#: ../app/tools/gimprectangleselecttool.c:168 +msgid "Rectangle Select" +msgstr "Selección rectangular" + +#: ../app/tools/gimprectangleselecttool.c:169 +msgid "Rectangle Select Tool: Select a rectangular region" +msgstr "" +"Herramienta de selección de rectángulos: seleccionar una zona rectangular" + +#: ../app/tools/gimprectangleselecttool.c:170 +msgid "_Rectangle Select" +msgstr "Selección _rectangular" + +#: ../app/tools/gimprectangletool.c:1146 ../app/tools/gimprectangletool.c:2016 +msgid "Rectangle: " +msgstr "Rectángulo: " + +#: ../app/tools/gimpregionselectoptions.c:82 +msgid "Allow completely transparent regions to be selected" +msgstr "Permitir seleccionar las regiones completamente transparentes" + +#: ../app/tools/gimpregionselectoptions.c:89 +msgid "Base selection on all visible layers" +msgstr "Selección base en todas las capas visibles" + +#: ../app/tools/gimpregionselectoptions.c:101 +msgid "Selection criterion" +msgstr "Criterio de selección" + +#: ../app/tools/gimpregionselectoptions.c:204 +msgid "Select transparent areas" +msgstr "Seleccionar las áreas transparentes" + +#: ../app/tools/gimpregionselectoptions.c:226 +msgid "Select by:" +msgstr "Seleccionar por:" + +#: ../app/tools/gimpregionselecttool.c:165 +msgid "Move the mouse to change threshold" +msgstr "Mueva el ratón para cambiar el umbral" + +#: ../app/tools/gimprotatetool.c:93 +msgid "Rotate" +msgstr "Rotar" + +#: ../app/tools/gimprotatetool.c:94 +msgid "Rotate Tool: Rotate the layer, selection or path" +msgstr "Herramienta de rotación: rotar la capa, selección o ruta" + +#: ../app/tools/gimprotatetool.c:95 +msgid "_Rotate" +msgstr "_Rotar" + +#: ../app/tools/gimprotatetool.c:191 +msgid "_Angle:" +msgstr "Á_ngulo:" + +#: ../app/tools/gimprotatetool.c:207 +msgid "Center _X:" +msgstr "Centro _X:" + +#: ../app/tools/gimprotatetool.c:216 +msgid "Center _Y:" +msgstr "Centro _Y:" + +#: ../app/tools/gimprotatetool.c:373 +#, c-format +msgctxt "undo-type" +msgid "Rotate by %-3.3g° around (%g, %g)" +msgstr "Rotar %-3.3g° alrededor de (%g, %g)" + +#: ../app/tools/gimpscaletool.c:89 +msgid "Scale" +msgstr "Redimensionar" + +#: ../app/tools/gimpscaletool.c:90 +msgid "Scale Tool: Scale the layer, selection or path" +msgstr "Herramienta de escalado: escalar la capa, selección o ruta" + +#: ../app/tools/gimpscaletool.c:91 +msgid "_Scale" +msgstr "E_scalar" + +#: ../app/tools/gimpscaletool.c:338 +#, c-format +msgctxt "undo-type" +msgid "Scale to %d x %d" +msgstr "Escalar a %d x %d" + +#: ../app/tools/gimpselectionoptions.c:84 +msgid "Enable feathering of selection edges" +msgstr "Permitir el difuminado de los límites de la selección" + +#: ../app/tools/gimpselectionoptions.c:90 +msgid "Radius of feathering" +msgstr "Radio del difuminado" + +#: ../app/tools/gimpselectionoptions.c:264 ../app/tools/gimptextoptions.c:539 +msgid "Antialiasing" +msgstr "Alisado" + +#: ../app/tools/gimpselectionoptions.c:281 +msgid "Feather edges" +msgstr "Difuminar los bordes" + +#: ../app/tools/gimpselectiontool.c:255 +msgid "Click-Drag to replace the current selection" +msgstr "Pulse y arrastre para sustituir la selección actual" + +#: ../app/tools/gimpselectiontool.c:263 +msgid "Click-Drag to create a new selection" +msgstr "Pulse y arrastre para crear una nueva selección" + +#: ../app/tools/gimpselectiontool.c:268 +msgid "Click-Drag to add to the current selection" +msgstr "Pulse y arrastre para añadir a la selección actual" + +#: ../app/tools/gimpselectiontool.c:277 +msgid "Click-Drag to subtract from the current selection" +msgstr "Pulse y arrastre para sustraer de la selección actual" + +#: ../app/tools/gimpselectiontool.c:286 +msgid "Click-Drag to intersect with the current selection" +msgstr "Pulse y arrastre para intersectar con la selección actual" + +#: ../app/tools/gimpselectiontool.c:296 +msgid "Click-Drag to move the selection mask" +msgstr "Pulse y arrastre para mover la máscara de selección" + +#: ../app/tools/gimpselectiontool.c:304 +msgid "Click-Drag to move the selected pixels" +msgstr "Pulse y arrastre para mover los píxeles seleccionados" + +#: ../app/tools/gimpselectiontool.c:308 +msgid "Click-Drag to move a copy of the selected pixels" +msgstr "Pulse y arrastre para mover una copia de los píxeles seleccionados" + +#: ../app/tools/gimpselectiontool.c:312 +msgid "Click to anchor the floating selection" +msgstr "Pulse para anclar la selección flotante" + # Viendo el programa, parece más bien "cizalla". FVD -#: ../app/tools/gimpsheartool.c:83 -msgid "Shear" -msgstr "Inclinar" - -#: ../app/tools/gimpsheartool.c:84 -msgid "Shear Tool: Shear the layer, selection or path" -msgstr "Herramienta de inclinación: inclinar la capa, selección o ruta" - +#: ../app/tools/gimpsheartool.c:83 +msgid "Shear" +msgstr "Inclinar" + +#: ../app/tools/gimpsheartool.c:84 +msgid "Shear Tool: Shear the layer, selection or path" +msgstr "Herramienta de inclinación: inclinar la capa, selección o ruta" + # Viendo el programa, parece más bien "cizalla". FVD -#: ../app/tools/gimpsheartool.c:85 -msgid "S_hear" -msgstr "_Inclinar [Shear]" - -#: ../app/tools/gimpsheartool.c:135 -msgid "Shear magnitude _X:" -msgstr "Magnitud _X de la inclinación:" - -#: ../app/tools/gimpsheartool.c:145 -msgid "Shear magnitude _Y:" -msgstr "Magnitud _Y de la inclinación:" - -#: ../app/tools/gimpsheartool.c:255 -#, c-format -msgctxt "undo-type" -msgid "Shear horizontally by %-3.3g" -msgstr "Inclinar horizontalmente %-3.3g" - -#: ../app/tools/gimpsheartool.c:259 -#, c-format -msgctxt "undo-type" -msgid "Shear vertically by %-3.3g" -msgstr "Inclinar verticalmente %-3.3g" - -#. e.g. user entered numbers but no notification callback -#: ../app/tools/gimpsheartool.c:264 -#, c-format -msgctxt "undo-type" -msgid "Shear horizontally by %-3.3g, vertically by %-3.3g" -msgstr "Inclinar horizontalmente %-3.3g y verticalmente %-3.3g" - -#: ../app/tools/gimpsmudgetool.c:54 -msgid "Smudge Tool: Smudge selectively using a brush" -msgstr "Herramienta de emborronado: emborrona selectivamente usando un pincel" - -#: ../app/tools/gimpsmudgetool.c:55 -msgid "_Smudge" -msgstr "_Emborronar [Smudge]" - -#: ../app/tools/gimpsmudgetool.c:74 -msgid "Click to smudge" -msgstr "Pulse para emborronar" - -#: ../app/tools/gimpsmudgetool.c:75 -msgid "Click to smudge the line" -msgstr "Pulse para emborronar la línea" - -#: ../app/tools/gimptextoptions.c:131 -msgid "Font size unit" -msgstr "Unidades del tamaño de la tipografía" - -#: ../app/tools/gimptextoptions.c:136 -msgid "Font size" -msgstr "Tamaño de la tipografía" - -#: ../app/tools/gimptextoptions.c:145 -msgid "" -"Hinting alters the font outline to produce a crisp bitmap at small sizes" -msgstr "" -"El «hinting» altera el contorno de la tipografía para producir un mapa de " -"bits preciso en tamaños pequeños" - -#: ../app/tools/gimptextoptions.c:153 -msgid "The text language may have an effect on the way the text is rendered." -msgstr "" -"El idioma del texto puede afectar a la forma en que el texto se renderiza." - -#: ../app/tools/gimptextoptions.c:164 -msgid "Text alignment" -msgstr "Alineación del texto" - -#: ../app/tools/gimptextoptions.c:170 -msgid "Indentation of the first line" -msgstr "Sangrado de la primera línea" - -#: ../app/tools/gimptextoptions.c:176 -msgid "Adjust line spacing" -msgstr "Modificar el espaciado de las líneas" - -#: ../app/tools/gimptextoptions.c:182 -msgid "Adjust letter spacing" -msgstr "Modificar el espaciado de las letras" - -#: ../app/tools/gimptextoptions.c:188 -msgid "" -"Whether text flows into rectangular shape or moves into a new line when you " -"press Enter" -msgstr "" -"Si el texto fluye dentro de una forma rectangular o salta a una línea nueva " -"al pulsar Intro" - -#: ../app/tools/gimptextoptions.c:196 -msgid "Use an external editor window for text entry" -msgstr "Usar una ventana de edición externa para la introducción del texto" - -#: ../app/tools/gimptextoptions.c:511 -msgid "Font" -msgstr "Tipografía" - -#: ../app/tools/gimptextoptions.c:535 -msgid "Use editor" -msgstr "Usar editor" - -#: ../app/tools/gimptextoptions.c:555 -msgid "Hinting:" -msgstr "Hinting:" - -#: ../app/tools/gimptextoptions.c:559 -msgid "Text Color" -msgstr "Color del texto" - -#: ../app/tools/gimptextoptions.c:564 -msgid "Color:" -msgstr "Color:" - -#: ../app/tools/gimptextoptions.c:570 -msgid "Justify:" -msgstr "Justificar:" - -#: ../app/tools/gimptextoptions.c:593 -msgid "Box:" -msgstr "Caja:" - -#: ../app/tools/gimptextoptions.c:610 -msgid "Language:" -msgstr "Idioma:" - -#: ../app/tools/gimptexttool.c:191 -msgid "Text" -msgstr "Texto" - -#: ../app/tools/gimptexttool.c:192 -msgid "Text Tool: Create or edit text layers" -msgstr "Herramienta de texto: crear o editar capas de texto" - -#: ../app/tools/gimptexttool.c:193 -msgid "Te_xt" -msgstr "Te_xto" - -#: ../app/tools/gimptexttool.c:972 -msgid "Reshape Text Layer" -msgstr "Cambiar forma de la capa de texto" - -#: ../app/tools/gimptexttool.c:1526 ../app/tools/gimptexttool.c:1529 -msgid "Confirm Text Editing" -msgstr "Confirmar la edición del texto" - -#: ../app/tools/gimptexttool.c:1533 -msgid "Create _New Layer" -msgstr "Crear una capa _nueva" - -#: ../app/tools/gimptexttool.c:1557 -msgid "" -"The layer you selected is a text layer but it has been modified using other " -"tools. Editing the layer with the text tool will discard these " -"modifications.\n" -"\n" -"You can edit the layer or create a new text layer from its text attributes." -msgstr "" -"La capa que ha seleccionado es una capa de texto pero ha sido modificada " -"utilizando otras herramientas. Al editar la capa con la herramienta de texto " -"se perderán estas modificaciones.\n" -"\n" -"Puede editar la capa o crear una capa de texto nueva desde sus atributos de " -"texto." - -#: ../app/tools/gimptexttool-editor.c:1236 -msgid "GIMP Text Editor" -msgstr "Editor de textos de GIMP" - -#: ../app/tools/gimpthresholdtool.c:91 -msgid "Threshold Tool: Reduce image to two colors using a threshold" -msgstr "" -"Herramienta de umbral: reducir la imagen a dos colores usando un umbral" - -#: ../app/tools/gimpthresholdtool.c:92 -msgid "_Threshold..." -msgstr "_Umbral…" - -#: ../app/tools/gimpthresholdtool.c:109 -msgid "Apply Threshold" -msgstr "Aplicar umbral" - -#: ../app/tools/gimpthresholdtool.c:111 -msgid "Import Threshold Settings" -msgstr "Importar los ajustes de umbral" - -#: ../app/tools/gimpthresholdtool.c:112 -msgid "Export Threshold Settings" -msgstr "Exportar los ajustes de umbral" - -#: ../app/tools/gimpthresholdtool.c:162 -msgid "Threshold does not operate on indexed layers." -msgstr "El umbral no funciona sobre capas indexadas." - -#: ../app/tools/gimpthresholdtool.c:270 -msgid "Automatically adjust to optimal binarization threshold" -msgstr "Autoajustar al umbral óptimo de binarización" - -#: ../app/tools/gimptool.c:978 -msgid "Can't work on an empty image, add a layer first" -msgstr "No se puede trabajar sobre una imagen vacía, añada una capa primero" - -#: ../app/tools/gimptransformoptions.c:99 -msgid "Direction of transformation" -msgstr "Dirección de la transformación" - -#: ../app/tools/gimptransformoptions.c:105 -msgid "Interpolation method" -msgstr "Método de interpolación" - -#: ../app/tools/gimptransformoptions.c:111 -msgid "How to clip" -msgstr "Cómo recortar" - -#: ../app/tools/gimptransformoptions.c:117 -msgid "Show a preview of the transformed image" -msgstr "Muestra una vista previa de la imagen transformada" - -#: ../app/tools/gimptransformoptions.c:122 -msgid "Opacity of the preview image" -msgstr "Opacidad de la imagen de vista previa" - -#: ../app/tools/gimptransformoptions.c:133 -msgid "Size of a grid cell for variable number of composition guides" -msgstr "Tamaño de una celda para un número variable de guías de composición" - -#: ../app/tools/gimptransformoptions.c:277 -msgid "Transform:" -msgstr "Transformar:" - -#: ../app/tools/gimptransformoptions.c:286 -#: ../app/widgets/gimpdynamicseditor.c:143 -#: ../app/widgets/gimpdynamicsoutputeditor.c:71 -msgid "Direction" -msgstr "Dirección" - -#. the interpolation menu -#: ../app/tools/gimptransformoptions.c:291 -msgid "Interpolation:" -msgstr "Interpolación:" - -#. the clipping menu -#: ../app/tools/gimptransformoptions.c:300 -msgid "Clipping:" -msgstr "Recortado:" - -#: ../app/tools/gimptransformoptions.c:310 -msgid "Image opacity" -msgstr "Opacidad de la imagen" - -#: ../app/tools/gimptransformoptions.c:312 -msgid "Show image preview" -msgstr "Mostrar vista previa de la imagen" - -#. the guides frame -#: ../app/tools/gimptransformoptions.c:318 -msgid "Guides" -msgstr "Guías" - -#: ../app/tools/gimptransformoptions.c:346 -#, c-format -msgid "15 degrees (%s)" -msgstr "15 grados (%s)" - -#: ../app/tools/gimptransformoptions.c:347 -msgid "Limit rotation steps to 15 degrees" -msgstr "Limitar los pasos de rotación a 15 grados" - -#: ../app/tools/gimptransformoptions.c:351 -#, c-format -msgid "Keep aspect (%s)" -msgstr "Mantener proporción (%s)" - -#: ../app/tools/gimptransformoptions.c:352 -msgid "Keep the original aspect ratio" -msgstr "Mantener la relación de aspecto original" - -#: ../app/tools/gimptransformtool.c:220 -msgid "Transforming" -msgstr "Transformando" - -#: ../app/tools/gimptransformtool.c:269 -#, c-format -#| msgid "The given file extension does not match the chosen file type." -msgid "The selection does not intersect with the layer." -msgstr "La selección no tiene intersección con la capa." - -#: ../app/tools/gimptransformtool.c:1476 -msgid "There is no layer to transform." -msgstr "No hay ninguna capa que transformar." - -#: ../app/tools/gimptransformtool.c:1487 -msgid "There is no path to transform." -msgstr "No hay ninguna ruta que transformar." - -#: ../app/tools/gimptransformtool.c:1488 -msgid "The active path's strokes are locked." -msgstr "Los trazos de la ruta activa están bloqueados" - -#: ../app/tools/gimpvectoroptions.c:76 -msgid "Restrict editing to polygons" -msgstr "Restringir la edición a poligonales" - -#: ../app/tools/gimpvectoroptions.c:155 -msgid "Edit Mode" -msgstr "Modo edición" - -#: ../app/tools/gimpvectoroptions.c:174 -msgid "Polygonal" -msgstr "Poligonal" - -#: ../app/tools/gimpvectoroptions.c:178 -#, c-format -msgid "" -"Path to Selection\n" -"%s Add\n" -"%s Subtract\n" -"%s Intersect" -msgstr "" -"Ruta a selección\n" -"%s Añadir\n" -"%s Extraer\n" -"%s Intersectar" - -#. Create a selection from the current path -#: ../app/tools/gimpvectoroptions.c:189 -msgid "Selection from Path" -msgstr "Crear selección a partir de una ruta" - -#: ../app/tools/gimpvectortool.c:161 -msgid "Paths Tool: Create and edit paths" -msgstr "Herramienta de rutas: crear y editar rutas" - -#: ../app/tools/gimpvectortool.c:162 -msgid "Pat_hs" -msgstr "_Rutas" - -#: ../app/tools/gimpvectortool.c:250 -msgid "The active path is locked." -msgstr "La ruta activa está bloqueada." - -#: ../app/tools/gimpvectortool.c:340 -msgid "Add Stroke" -msgstr "Añadir un trazo" - -#: ../app/tools/gimpvectortool.c:365 -msgid "Add Anchor" -msgstr "Añadir un ancla" - -#: ../app/tools/gimpvectortool.c:391 -msgid "Insert Anchor" -msgstr "Insertar un ancla" - -#: ../app/tools/gimpvectortool.c:422 -msgid "Drag Handle" -msgstr "Arrastrar el tirador" - -#: ../app/tools/gimpvectortool.c:453 -msgid "Drag Anchor" -msgstr "Arrastrar el ancla" - -#: ../app/tools/gimpvectortool.c:471 -msgid "Drag Anchors" -msgstr "Arrastrar las anclas" - -#: ../app/tools/gimpvectortool.c:494 -msgid "Drag Curve" -msgstr "Arrastrar la curva" - -#: ../app/tools/gimpvectortool.c:523 -msgid "Connect Strokes" -msgstr "Conectar los trazos" - -#: ../app/tools/gimpvectortool.c:555 -msgid "Drag Path" -msgstr "Arrastrar la ruta" - -#: ../app/tools/gimpvectortool.c:566 -msgid "Convert Edge" -msgstr "Convertir el borde" - -#: ../app/tools/gimpvectortool.c:597 -msgid "Delete Anchor" -msgstr "Eliminar el ancla" - -#: ../app/tools/gimpvectortool.c:620 -msgid "Delete Segment" -msgstr "Eliminar el segmento" - -#: ../app/tools/gimpvectortool.c:842 -msgid "Move Anchors" -msgstr "Mover las anclas" - -#: ../app/tools/gimpvectortool.c:1205 -msgid "Click to pick path to edit" -msgstr "Pulse para elegir la ruta que desea editar" - -#: ../app/tools/gimpvectortool.c:1209 -msgid "Click to create a new path" -msgstr "Pulse para crear una ruta nueva" - -#: ../app/tools/gimpvectortool.c:1213 -msgid "Click to create a new component of the path" -msgstr "Pulse para crear un componente nuevo de la ruta" - -#: ../app/tools/gimpvectortool.c:1217 -msgid "Click or Click-Drag to create a new anchor" -msgstr "Pulse o arrastre para crear un ancla nueva" - -#: ../app/tools/gimpvectortool.c:1229 ../app/tools/gimpvectortool.c:1236 -msgid "Click-Drag to move the anchor around" -msgstr "Pulse y arrastre para mover el ancla" - -#: ../app/tools/gimpvectortool.c:1240 ../app/tools/gimpvectortool.c:1263 -msgid "Click-Drag to move the anchors around" -msgstr "Pulse y arrastre para mover las anclas" - -#: ../app/tools/gimpvectortool.c:1246 -msgid "Click-Drag to move the handle around" -msgstr "Pulse y arrastre para mover el tirador" - -#: ../app/tools/gimpvectortool.c:1253 -msgid "Click-Drag to move the handles around symmetrically" -msgstr "Pulse y arrastre para mover los tiradores de forma simétrica" - -#: ../app/tools/gimpvectortool.c:1268 -msgid "Click-Drag to change the shape of the curve" -msgstr "Pulse y arrastre para cambiar la forma de la curva" - -#: ../app/tools/gimpvectortool.c:1271 -#, c-format -msgid "%s: symmetrical" -msgstr "%s: simétrico" - -#: ../app/tools/gimpvectortool.c:1276 -msgid "Click-Drag to move the component around" -msgstr "Pulse y arrastre para mover el componente alrededor" - -#: ../app/tools/gimpvectortool.c:1284 -msgid "Click-Drag to move the path around" -msgstr "Pulse y arrastre para mover la ruta alrededor" - -#: ../app/tools/gimpvectortool.c:1288 -msgid "Click-Drag to insert an anchor on the path" -msgstr "Pulsar-arrastrar para insertar un ancla en la ruta" - -#: ../app/tools/gimpvectortool.c:1296 -msgid "Click to delete this anchor" -msgstr "Pulse para eliminar este ancla" - -#: ../app/tools/gimpvectortool.c:1300 -msgid "Click to connect this anchor with the selected endpoint" -msgstr "Pulse para conectar este ancla con el extremo seleccionado" - -#: ../app/tools/gimpvectortool.c:1305 -msgid "Click to open up the path" -msgstr "Pulse para abrir la ruta" - -#: ../app/tools/gimpvectortool.c:1309 -msgid "Click to make this node angular" -msgstr "Pulse para convertir este nodo en angular" - -#: ../app/tools/gimpvectortool.c:1810 -msgid "Delete Anchors" -msgstr "Eliminar anclas" - -#: ../app/tools/gimpvectortool.c:1969 -msgid "There is no active layer or channel to stroke to" -msgstr "No hay una capa o canal activo donde se pueda trazar" - -#: ../app/tools/tools-enums.c:150 -msgctxt "rectangle-tool-fixed-rule" -msgid "Aspect ratio" -msgstr "Proporción de aspecto" - -#: ../app/tools/tools-enums.c:151 -msgctxt "rectangle-tool-fixed-rule" -msgid "Width" -msgstr "Anchura" - -#: ../app/tools/tools-enums.c:152 -msgctxt "rectangle-tool-fixed-rule" -msgid "Height" -msgstr "Altura" - -#: ../app/tools/tools-enums.c:153 -msgctxt "rectangle-tool-fixed-rule" -msgid "Size" -msgstr "Tamaño" - -#: ../app/tools/tools-enums.c:182 -msgctxt "rect-select-mode" -msgid "Free select" -msgstr "Selección libre" - -#: ../app/tools/tools-enums.c:183 -msgctxt "rect-select-mode" -msgid "Fixed size" -msgstr "Tamaño fijo" - -#: ../app/tools/tools-enums.c:184 -msgctxt "rect-select-mode" -msgid "Fixed aspect ratio" -msgstr "Proporción fija" - -#: ../app/tools/tools-enums.c:213 -msgctxt "transform-type" -msgid "Layer" -msgstr "Capa" - -#: ../app/tools/tools-enums.c:214 -msgctxt "transform-type" -msgid "Selection" -msgstr "Selección" - -#: ../app/tools/tools-enums.c:215 -msgctxt "transform-type" -msgid "Path" -msgstr "Ruta" - -#: ../app/tools/tools-enums.c:244 -msgctxt "vector-mode" -msgid "Design" -msgstr "Diseño" - -#: ../app/tools/tools-enums.c:245 -msgctxt "vector-mode" -msgid "Edit" -msgstr "Editar" - -#: ../app/tools/tools-enums.c:246 -msgctxt "vector-mode" -msgid "Move" -msgstr "Mover" - -#: ../app/vectors/gimpvectors.c:208 -msgctxt "undo-type" -msgid "Rename Path" -msgstr "Renombrar la ruta" - -#: ../app/vectors/gimpvectors.c:209 -msgctxt "undo-type" -msgid "Move Path" -msgstr "Mover la ruta" - -#: ../app/vectors/gimpvectors.c:210 -msgctxt "undo-type" -msgid "Scale Path" -msgstr "Escalar la ruta" - -#: ../app/vectors/gimpvectors.c:211 -msgctxt "undo-type" -msgid "Resize Path" -msgstr "Redimensionar la ruta" - -#: ../app/vectors/gimpvectors.c:212 -msgctxt "undo-type" -msgid "Flip Path" -msgstr "Voltear la ruta" - -#: ../app/vectors/gimpvectors.c:213 -msgctxt "undo-type" -msgid "Rotate Path" -msgstr "Rotar la ruta" - -#: ../app/vectors/gimpvectors.c:214 -msgctxt "undo-type" -msgid "Transform Path" -msgstr "Transformar la ruta" - -#: ../app/vectors/gimpvectors.c:215 -msgctxt "undo-type" -msgid "Stroke Path" -msgstr "Trazar ruta" - -#: ../app/vectors/gimpvectors.c:216 -msgctxt "undo-type" -msgid "Path to Selection" -msgstr "Ruta a selección" - -#: ../app/vectors/gimpvectors.c:217 -msgctxt "undo-type" -msgid "Reorder Path" -msgstr "Reordenar la ruta" - -#: ../app/vectors/gimpvectors.c:218 -msgctxt "undo-type" -msgid "Raise Path" -msgstr "Elevar la ruta" - -#: ../app/vectors/gimpvectors.c:219 -msgctxt "undo-type" -msgid "Raise Path to Top" -msgstr "Subir la ruta al lugar más alto" - -#: ../app/vectors/gimpvectors.c:220 -msgctxt "undo-type" -msgid "Lower Path" -msgstr "Bajar la ruta" - -#: ../app/vectors/gimpvectors.c:221 -msgctxt "undo-type" -msgid "Lower Path to Bottom" -msgstr "Bajar la ruta al lugar más bajo" - -#: ../app/vectors/gimpvectors.c:222 -msgid "Path cannot be raised higher." -msgstr "La ruta no puede ser elevada más alto." - -#: ../app/vectors/gimpvectors.c:223 -msgid "Path cannot be lowered more." -msgstr "La ruta no puede descender más." - -#: ../app/vectors/gimpvectors.c:364 -msgid "Move Path" -msgstr "Mover la ruta" - -#: ../app/vectors/gimpvectors.c:463 -msgid "Flip Path" -msgstr "Voltear la ruta" - -#: ../app/vectors/gimpvectors.c:494 -msgid "Rotate Path" -msgstr "Rotar la ruta" - -#: ../app/vectors/gimpvectors.c:524 -msgid "Transform Path" -msgstr "Transformar la ruta" - -#: ../app/vectors/gimpvectors-export.c:95 -#, c-format -msgid "Error while writing '%s': %s" -msgstr "Ocurrió un error al escribir «%s»: %s" - -#: ../app/vectors/gimpvectors-import.c:330 -msgid "Import Paths" -msgstr "Importar rutas" - -#: ../app/vectors/gimpvectors-import.c:341 -msgid "Imported Path" -msgstr "Ruta importada" - -#: ../app/vectors/gimpvectors-import.c:372 -#, c-format -msgid "No paths found in '%s'" -msgstr "No se encontraron rutas en «%s»" - -#: ../app/vectors/gimpvectors-import.c:376 -msgid "No paths found in the buffer" -msgstr "No se encontraron rutas en el búfer" - -#: ../app/vectors/gimpvectors-import.c:386 -#, c-format -msgid "Failed to import paths from '%s': %s" -msgstr "Fallo al importar rutas desde «%s»: %s" - +#: ../app/tools/gimpsheartool.c:85 +msgid "S_hear" +msgstr "_Inclinar [Shear]" + +#: ../app/tools/gimpsheartool.c:135 +msgid "Shear magnitude _X:" +msgstr "Magnitud _X de la inclinación:" + +#: ../app/tools/gimpsheartool.c:145 +msgid "Shear magnitude _Y:" +msgstr "Magnitud _Y de la inclinación:" + +#: ../app/tools/gimpsheartool.c:255 +#, c-format +msgctxt "undo-type" +msgid "Shear horizontally by %-3.3g" +msgstr "Inclinar horizontalmente %-3.3g" + +#: ../app/tools/gimpsheartool.c:259 +#, c-format +msgctxt "undo-type" +msgid "Shear vertically by %-3.3g" +msgstr "Inclinar verticalmente %-3.3g" + +#. e.g. user entered numbers but no notification callback +#: ../app/tools/gimpsheartool.c:264 +#, c-format +msgctxt "undo-type" +msgid "Shear horizontally by %-3.3g, vertically by %-3.3g" +msgstr "Inclinar horizontalmente %-3.3g y verticalmente %-3.3g" + +#: ../app/tools/gimpsmudgetool.c:54 +msgid "Smudge Tool: Smudge selectively using a brush" +msgstr "Herramienta de emborronado: emborrona selectivamente usando un pincel" + +#: ../app/tools/gimpsmudgetool.c:55 +msgid "_Smudge" +msgstr "_Emborronar [Smudge]" + +#: ../app/tools/gimpsmudgetool.c:74 +msgid "Click to smudge" +msgstr "Pulse para emborronar" + +#: ../app/tools/gimpsmudgetool.c:75 +msgid "Click to smudge the line" +msgstr "Pulse para emborronar la línea" + +#: ../app/tools/gimptextoptions.c:131 +msgid "Font size unit" +msgstr "Unidades del tamaño de la tipografía" + +#: ../app/tools/gimptextoptions.c:136 +msgid "Font size" +msgstr "Tamaño de la tipografía" + +#: ../app/tools/gimptextoptions.c:145 +msgid "" +"Hinting alters the font outline to produce a crisp bitmap at small sizes" +msgstr "" +"El «hinting» altera el contorno de la tipografía para producir un mapa de " +"bits preciso en tamaños pequeños" + +#: ../app/tools/gimptextoptions.c:153 +msgid "The text language may have an effect on the way the text is rendered." +msgstr "" +"El idioma del texto puede afectar a la forma en que el texto se renderiza." + +#: ../app/tools/gimptextoptions.c:164 +msgid "Text alignment" +msgstr "Alineación del texto" + +#: ../app/tools/gimptextoptions.c:170 +msgid "Indentation of the first line" +msgstr "Sangrado de la primera línea" + +#: ../app/tools/gimptextoptions.c:176 +msgid "Adjust line spacing" +msgstr "Modificar el espaciado de las líneas" + +#: ../app/tools/gimptextoptions.c:182 +msgid "Adjust letter spacing" +msgstr "Modificar el espaciado de las letras" + +#: ../app/tools/gimptextoptions.c:188 +msgid "" +"Whether text flows into rectangular shape or moves into a new line when you " +"press Enter" +msgstr "" +"Si el texto fluye dentro de una forma rectangular o salta a una línea nueva " +"al pulsar Intro" + +#: ../app/tools/gimptextoptions.c:196 +msgid "Use an external editor window for text entry" +msgstr "Usar una ventana de edición externa para la introducción del texto" + +#: ../app/tools/gimptextoptions.c:511 +msgid "Font" +msgstr "Tipografía" + +#: ../app/tools/gimptextoptions.c:535 +msgid "Use editor" +msgstr "Usar editor" + +#: ../app/tools/gimptextoptions.c:555 +msgid "Hinting:" +msgstr "Hinting:" + +#: ../app/tools/gimptextoptions.c:559 +msgid "Text Color" +msgstr "Color del texto" + +#: ../app/tools/gimptextoptions.c:564 +msgid "Color:" +msgstr "Color:" + +#: ../app/tools/gimptextoptions.c:570 +msgid "Justify:" +msgstr "Justificar:" + +#: ../app/tools/gimptextoptions.c:593 +msgid "Box:" +msgstr "Caja:" + +#: ../app/tools/gimptextoptions.c:610 +msgid "Language:" +msgstr "Idioma:" + +#: ../app/tools/gimptexttool.c:191 +msgid "Text" +msgstr "Texto" + +#: ../app/tools/gimptexttool.c:192 +msgid "Text Tool: Create or edit text layers" +msgstr "Herramienta de texto: crear o editar capas de texto" + +#: ../app/tools/gimptexttool.c:193 +msgid "Te_xt" +msgstr "Te_xto" + +#: ../app/tools/gimptexttool.c:972 +msgid "Reshape Text Layer" +msgstr "Cambiar forma de la capa de texto" + +#: ../app/tools/gimptexttool.c:1526 ../app/tools/gimptexttool.c:1529 +msgid "Confirm Text Editing" +msgstr "Confirmar la edición del texto" + +#: ../app/tools/gimptexttool.c:1533 +msgid "Create _New Layer" +msgstr "Crear una capa _nueva" + +#: ../app/tools/gimptexttool.c:1557 +msgid "" +"The layer you selected is a text layer but it has been modified using other " +"tools. Editing the layer with the text tool will discard these " +"modifications.\n" +"\n" +"You can edit the layer or create a new text layer from its text attributes." +msgstr "" +"La capa que ha seleccionado es una capa de texto pero ha sido modificada " +"utilizando otras herramientas. Al editar la capa con la herramienta de texto " +"se perderán estas modificaciones.\n" +"\n" +"Puede editar la capa o crear una capa de texto nueva desde sus atributos de " +"texto." + +#: ../app/tools/gimptexttool-editor.c:1236 +msgid "GIMP Text Editor" +msgstr "Editor de textos de GIMP" + +#: ../app/tools/gimpthresholdtool.c:91 +msgid "Threshold Tool: Reduce image to two colors using a threshold" +msgstr "" +"Herramienta de umbral: reducir la imagen a dos colores usando un umbral" + +#: ../app/tools/gimpthresholdtool.c:92 +msgid "_Threshold..." +msgstr "_Umbral…" + +#: ../app/tools/gimpthresholdtool.c:109 +msgid "Apply Threshold" +msgstr "Aplicar umbral" + +#: ../app/tools/gimpthresholdtool.c:111 +msgid "Import Threshold Settings" +msgstr "Importar los ajustes de umbral" + +#: ../app/tools/gimpthresholdtool.c:112 +msgid "Export Threshold Settings" +msgstr "Exportar los ajustes de umbral" + +#: ../app/tools/gimpthresholdtool.c:162 +msgid "Threshold does not operate on indexed layers." +msgstr "El umbral no funciona sobre capas indexadas." + +#: ../app/tools/gimpthresholdtool.c:270 +msgid "Automatically adjust to optimal binarization threshold" +msgstr "Autoajustar al umbral óptimo de binarización" + +#: ../app/tools/gimptool.c:978 +msgid "Can't work on an empty image, add a layer first" +msgstr "No se puede trabajar sobre una imagen vacía, añada una capa primero" + +#: ../app/tools/gimptransformoptions.c:99 +msgid "Direction of transformation" +msgstr "Dirección de la transformación" + +#: ../app/tools/gimptransformoptions.c:105 +msgid "Interpolation method" +msgstr "Método de interpolación" + +#: ../app/tools/gimptransformoptions.c:111 +msgid "How to clip" +msgstr "Cómo recortar" + +#: ../app/tools/gimptransformoptions.c:117 +msgid "Show a preview of the transformed image" +msgstr "Muestra una vista previa de la imagen transformada" + +#: ../app/tools/gimptransformoptions.c:122 +msgid "Opacity of the preview image" +msgstr "Opacidad de la imagen de vista previa" + +#: ../app/tools/gimptransformoptions.c:133 +msgid "Size of a grid cell for variable number of composition guides" +msgstr "Tamaño de una celda para un número variable de guías de composición" + +#: ../app/tools/gimptransformoptions.c:277 +msgid "Transform:" +msgstr "Transformar:" + +#: ../app/tools/gimptransformoptions.c:286 +#: ../app/widgets/gimpdynamicseditor.c:143 +#: ../app/widgets/gimpdynamicsoutputeditor.c:71 +msgid "Direction" +msgstr "Dirección" + +#. the interpolation menu +#: ../app/tools/gimptransformoptions.c:291 +msgid "Interpolation:" +msgstr "Interpolación:" + +#. the clipping menu +#: ../app/tools/gimptransformoptions.c:300 +msgid "Clipping:" +msgstr "Recortado:" + +#: ../app/tools/gimptransformoptions.c:310 +msgid "Image opacity" +msgstr "Opacidad de la imagen" + +#: ../app/tools/gimptransformoptions.c:312 +msgid "Show image preview" +msgstr "Mostrar vista previa de la imagen" + +#. the guides frame +#: ../app/tools/gimptransformoptions.c:318 +msgid "Guides" +msgstr "Guías" + +#: ../app/tools/gimptransformoptions.c:346 +#, c-format +msgid "15 degrees (%s)" +msgstr "15 grados (%s)" + +#: ../app/tools/gimptransformoptions.c:347 +msgid "Limit rotation steps to 15 degrees" +msgstr "Limitar los pasos de rotación a 15 grados" + +#: ../app/tools/gimptransformoptions.c:351 +#, c-format +msgid "Keep aspect (%s)" +msgstr "Mantener proporción (%s)" + +#: ../app/tools/gimptransformoptions.c:352 +msgid "Keep the original aspect ratio" +msgstr "Mantener la relación de aspecto original" + +#: ../app/tools/gimptransformtool.c:220 +msgid "Transforming" +msgstr "Transformando" + +#: ../app/tools/gimptransformtool.c:269 +#, c-format +msgid "The selection does not intersect with the layer." +msgstr "La selección no tiene intersección con la capa." + +#: ../app/tools/gimptransformtool.c:1480 +msgid "There is no layer to transform." +msgstr "No hay ninguna capa que transformar." + +#: ../app/tools/gimptransformtool.c:1491 +msgid "There is no path to transform." +msgstr "No hay ninguna ruta que transformar." + +#: ../app/tools/gimptransformtool.c:1492 +msgid "The active path's strokes are locked." +msgstr "Los trazos de la ruta activa están bloqueados" + +#: ../app/tools/gimpvectoroptions.c:76 +msgid "Restrict editing to polygons" +msgstr "Restringir la edición a poligonales" + +#: ../app/tools/gimpvectoroptions.c:155 +msgid "Edit Mode" +msgstr "Modo edición" + +#: ../app/tools/gimpvectoroptions.c:174 +msgid "Polygonal" +msgstr "Poligonal" + +#: ../app/tools/gimpvectoroptions.c:178 +#, c-format +msgid "" +"Path to Selection\n" +"%s Add\n" +"%s Subtract\n" +"%s Intersect" +msgstr "" +"Ruta a selección\n" +"%s Añadir\n" +"%s Extraer\n" +"%s Intersectar" + +#. Create a selection from the current path +#: ../app/tools/gimpvectoroptions.c:189 +msgid "Selection from Path" +msgstr "Crear selección a partir de una ruta" + +#: ../app/tools/gimpvectortool.c:161 +msgid "Paths Tool: Create and edit paths" +msgstr "Herramienta de rutas: crear y editar rutas" + +#: ../app/tools/gimpvectortool.c:162 +msgid "Pat_hs" +msgstr "_Rutas" + +#: ../app/tools/gimpvectortool.c:250 +msgid "The active path is locked." +msgstr "La ruta activa está bloqueada." + +#: ../app/tools/gimpvectortool.c:340 +msgid "Add Stroke" +msgstr "Añadir un trazo" + +#: ../app/tools/gimpvectortool.c:365 +msgid "Add Anchor" +msgstr "Añadir un ancla" + +#: ../app/tools/gimpvectortool.c:391 +msgid "Insert Anchor" +msgstr "Insertar un ancla" + +#: ../app/tools/gimpvectortool.c:422 +msgid "Drag Handle" +msgstr "Arrastrar el tirador" + +#: ../app/tools/gimpvectortool.c:453 +msgid "Drag Anchor" +msgstr "Arrastrar el ancla" + +#: ../app/tools/gimpvectortool.c:471 +msgid "Drag Anchors" +msgstr "Arrastrar las anclas" + +#: ../app/tools/gimpvectortool.c:494 +msgid "Drag Curve" +msgstr "Arrastrar la curva" + +#: ../app/tools/gimpvectortool.c:523 +msgid "Connect Strokes" +msgstr "Conectar los trazos" + +#: ../app/tools/gimpvectortool.c:555 +msgid "Drag Path" +msgstr "Arrastrar la ruta" + +#: ../app/tools/gimpvectortool.c:566 +msgid "Convert Edge" +msgstr "Convertir el borde" + +#: ../app/tools/gimpvectortool.c:597 +msgid "Delete Anchor" +msgstr "Eliminar el ancla" + +#: ../app/tools/gimpvectortool.c:620 +msgid "Delete Segment" +msgstr "Eliminar el segmento" + +#: ../app/tools/gimpvectortool.c:842 +msgid "Move Anchors" +msgstr "Mover las anclas" + +#: ../app/tools/gimpvectortool.c:1205 +msgid "Click to pick path to edit" +msgstr "Pulse para elegir la ruta que desea editar" + +#: ../app/tools/gimpvectortool.c:1209 +msgid "Click to create a new path" +msgstr "Pulse para crear una ruta nueva" + +#: ../app/tools/gimpvectortool.c:1213 +msgid "Click to create a new component of the path" +msgstr "Pulse para crear un componente nuevo de la ruta" + +#: ../app/tools/gimpvectortool.c:1217 +msgid "Click or Click-Drag to create a new anchor" +msgstr "Pulse o arrastre para crear un ancla nueva" + +#: ../app/tools/gimpvectortool.c:1229 ../app/tools/gimpvectortool.c:1236 +msgid "Click-Drag to move the anchor around" +msgstr "Pulse y arrastre para mover el ancla" + +#: ../app/tools/gimpvectortool.c:1240 ../app/tools/gimpvectortool.c:1263 +msgid "Click-Drag to move the anchors around" +msgstr "Pulse y arrastre para mover las anclas" + +#: ../app/tools/gimpvectortool.c:1246 +msgid "Click-Drag to move the handle around" +msgstr "Pulse y arrastre para mover el tirador" + +#: ../app/tools/gimpvectortool.c:1253 +msgid "Click-Drag to move the handles around symmetrically" +msgstr "Pulse y arrastre para mover los tiradores de forma simétrica" + +#: ../app/tools/gimpvectortool.c:1268 +msgid "Click-Drag to change the shape of the curve" +msgstr "Pulse y arrastre para cambiar la forma de la curva" + +#: ../app/tools/gimpvectortool.c:1271 +#, c-format +msgid "%s: symmetrical" +msgstr "%s: simétrico" + +#: ../app/tools/gimpvectortool.c:1276 +msgid "Click-Drag to move the component around" +msgstr "Pulse y arrastre para mover el componente alrededor" + +#: ../app/tools/gimpvectortool.c:1284 +msgid "Click-Drag to move the path around" +msgstr "Pulse y arrastre para mover la ruta alrededor" + +#: ../app/tools/gimpvectortool.c:1288 +msgid "Click-Drag to insert an anchor on the path" +msgstr "Pulsar-arrastrar para insertar un ancla en la ruta" + +#: ../app/tools/gimpvectortool.c:1296 +msgid "Click to delete this anchor" +msgstr "Pulse para eliminar este ancla" + +#: ../app/tools/gimpvectortool.c:1300 +msgid "Click to connect this anchor with the selected endpoint" +msgstr "Pulse para conectar este ancla con el extremo seleccionado" + +#: ../app/tools/gimpvectortool.c:1305 +msgid "Click to open up the path" +msgstr "Pulse para abrir la ruta" + +#: ../app/tools/gimpvectortool.c:1309 +msgid "Click to make this node angular" +msgstr "Pulse para convertir este nodo en angular" + +#: ../app/tools/gimpvectortool.c:1810 +msgid "Delete Anchors" +msgstr "Eliminar anclas" + +#: ../app/tools/gimpvectortool.c:1969 +msgid "There is no active layer or channel to stroke to" +msgstr "No hay una capa o canal activo donde se pueda trazar" + +#: ../app/tools/tools-enums.c:150 +msgctxt "rectangle-tool-fixed-rule" +msgid "Aspect ratio" +msgstr "Proporción de aspecto" + +#: ../app/tools/tools-enums.c:151 +msgctxt "rectangle-tool-fixed-rule" +msgid "Width" +msgstr "Anchura" + +#: ../app/tools/tools-enums.c:152 +msgctxt "rectangle-tool-fixed-rule" +msgid "Height" +msgstr "Altura" + +#: ../app/tools/tools-enums.c:153 +msgctxt "rectangle-tool-fixed-rule" +msgid "Size" +msgstr "Tamaño" + +#: ../app/tools/tools-enums.c:182 +msgctxt "rect-select-mode" +msgid "Free select" +msgstr "Selección libre" + +#: ../app/tools/tools-enums.c:183 +msgctxt "rect-select-mode" +msgid "Fixed size" +msgstr "Tamaño fijo" + +#: ../app/tools/tools-enums.c:184 +msgctxt "rect-select-mode" +msgid "Fixed aspect ratio" +msgstr "Proporción fija" + +#: ../app/tools/tools-enums.c:213 +msgctxt "transform-type" +msgid "Layer" +msgstr "Capa" + +#: ../app/tools/tools-enums.c:214 +msgctxt "transform-type" +msgid "Selection" +msgstr "Selección" + +#: ../app/tools/tools-enums.c:215 +msgctxt "transform-type" +msgid "Path" +msgstr "Ruta" + +#: ../app/tools/tools-enums.c:244 +msgctxt "vector-mode" +msgid "Design" +msgstr "Diseño" + +#: ../app/tools/tools-enums.c:245 +msgctxt "vector-mode" +msgid "Edit" +msgstr "Editar" + +#: ../app/tools/tools-enums.c:246 +msgctxt "vector-mode" +msgid "Move" +msgstr "Mover" + +#: ../app/vectors/gimpvectors.c:208 +msgctxt "undo-type" +msgid "Rename Path" +msgstr "Renombrar la ruta" + +#: ../app/vectors/gimpvectors.c:209 +msgctxt "undo-type" +msgid "Move Path" +msgstr "Mover la ruta" + +#: ../app/vectors/gimpvectors.c:210 +msgctxt "undo-type" +msgid "Scale Path" +msgstr "Escalar la ruta" + +#: ../app/vectors/gimpvectors.c:211 +msgctxt "undo-type" +msgid "Resize Path" +msgstr "Redimensionar la ruta" + +#: ../app/vectors/gimpvectors.c:212 +msgctxt "undo-type" +msgid "Flip Path" +msgstr "Voltear la ruta" + +#: ../app/vectors/gimpvectors.c:213 +msgctxt "undo-type" +msgid "Rotate Path" +msgstr "Rotar la ruta" + +#: ../app/vectors/gimpvectors.c:214 +msgctxt "undo-type" +msgid "Transform Path" +msgstr "Transformar la ruta" + +#: ../app/vectors/gimpvectors.c:215 +msgctxt "undo-type" +msgid "Stroke Path" +msgstr "Trazar ruta" + +#: ../app/vectors/gimpvectors.c:216 +msgctxt "undo-type" +msgid "Path to Selection" +msgstr "Ruta a selección" + +#: ../app/vectors/gimpvectors.c:217 +msgctxt "undo-type" +msgid "Reorder Path" +msgstr "Reordenar la ruta" + +#: ../app/vectors/gimpvectors.c:218 +msgctxt "undo-type" +msgid "Raise Path" +msgstr "Elevar la ruta" + +#: ../app/vectors/gimpvectors.c:219 +msgctxt "undo-type" +msgid "Raise Path to Top" +msgstr "Subir la ruta al lugar más alto" + +#: ../app/vectors/gimpvectors.c:220 +msgctxt "undo-type" +msgid "Lower Path" +msgstr "Bajar la ruta" + +#: ../app/vectors/gimpvectors.c:221 +msgctxt "undo-type" +msgid "Lower Path to Bottom" +msgstr "Bajar la ruta al lugar más bajo" + +#: ../app/vectors/gimpvectors.c:222 +msgid "Path cannot be raised higher." +msgstr "La ruta no puede ser elevada más alto." + +#: ../app/vectors/gimpvectors.c:223 +msgid "Path cannot be lowered more." +msgstr "La ruta no puede descender más." + +#: ../app/vectors/gimpvectors.c:364 +msgid "Move Path" +msgstr "Mover la ruta" + +#: ../app/vectors/gimpvectors.c:463 +msgid "Flip Path" +msgstr "Voltear la ruta" + +#: ../app/vectors/gimpvectors.c:494 +msgid "Rotate Path" +msgstr "Rotar la ruta" + +#: ../app/vectors/gimpvectors.c:524 +msgid "Transform Path" +msgstr "Transformar la ruta" + +#: ../app/vectors/gimpvectors-export.c:95 +#, c-format +msgid "Error while writing '%s': %s" +msgstr "Ocurrió un error al escribir «%s»: %s" + +#: ../app/vectors/gimpvectors-import.c:330 +msgid "Import Paths" +msgstr "Importar rutas" + +#: ../app/vectors/gimpvectors-import.c:341 +msgid "Imported Path" +msgstr "Ruta importada" + +#: ../app/vectors/gimpvectors-import.c:372 +#, c-format +msgid "No paths found in '%s'" +msgstr "No se encontraron rutas en «%s»" + +#: ../app/vectors/gimpvectors-import.c:376 +msgid "No paths found in the buffer" +msgstr "No se encontraron rutas en el búfer" + +#: ../app/vectors/gimpvectors-import.c:386 +#, c-format +msgid "Failed to import paths from '%s': %s" +msgstr "Fallo al importar rutas desde «%s»: %s" + # Viendo el programa, parece más bien "cizalla". FVD -#: ../app/widgets/gimpactioneditor.c:69 -msgid "_Search:" -msgstr "Bu_scar:" - -#: ../app/widgets/gimpactiongroup.c:881 -#, c-format -msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" -msgstr "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" - -#: ../app/widgets/gimpactionview.c:338 -#: ../app/widgets/gimpcontrollereditor.c:341 -msgid "Action" -msgstr "Acción" - -#: ../app/widgets/gimpactionview.c:367 -msgid "Shortcut" -msgstr "Combinación de teclas" - -#: ../app/widgets/gimpactionview.c:393 -msgid "Name" -msgstr "Nombre" - -#: ../app/widgets/gimpactionview.c:633 ../app/widgets/gimpactionview.c:843 -msgid "Changing shortcut failed." -msgstr "Ha fallado el cambio de la combinación de teclas." - -#: ../app/widgets/gimpactionview.c:670 -msgid "Conflicting Shortcuts" -msgstr "Combinaciones de teclas en conflicto" - -#: ../app/widgets/gimpactionview.c:676 -msgid "_Reassign shortcut" -msgstr "_Reasignar combinación de teclas" - -#: ../app/widgets/gimpactionview.c:691 -#, c-format -msgid "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group." -msgstr "La combinación de teclas «%s» ya la usa «%s» del grupo «%s»." - -#: ../app/widgets/gimpactionview.c:695 -#, c-format -msgid "Reassigning the shortcut will cause it to be removed from \"%s\"." -msgstr "Reasignar la combinación de teclas hará que se elimine de «%s»." - -#: ../app/widgets/gimpactionview.c:778 -msgid "Invalid shortcut." -msgstr "Combinación de teclas no válida." - -#: ../app/widgets/gimpactionview.c:867 -msgid "Removing shortcut failed." -msgstr "Ha fallado la eliminación de la combinación de teclas." - -#: ../app/widgets/gimpbrusheditor.c:166 -msgid "Spikes" -msgstr "Púas" - -#: ../app/widgets/gimpbrusheditor.c:177 -msgid "Hardness" -msgstr "Dureza" - -#: ../app/widgets/gimpbrusheditor.c:188 -msgid "Aspect ratio" -msgstr "Proporción de aspecto" - -#: ../app/widgets/gimpbrusheditor.c:210 -#: ../app/widgets/gimpbrushfactoryview.c:80 -#: ../app/widgets/gimpgrideditor.c:174 -msgid "Spacing" -msgstr "Espaciado" - -#: ../app/widgets/gimpbrusheditor.c:215 -#: ../app/widgets/gimpbrushfactoryview.c:84 -msgid "Percentage of width of brush" -msgstr "Porcentaje del ancho del pincel" - -#: ../app/widgets/gimpbufferview.c:179 ../app/widgets/gimpbufferview.c:264 -#: ../app/widgets/gimpeditor.c:747 -msgid "(None)" -msgstr "(Ninguno)" - -#: ../app/widgets/gimpcolordialog.c:149 -msgid "Add the current color to the color history" -msgstr "Añadir el color actual al historial de colores" - -#: ../app/widgets/gimpcolordisplayeditor.c:157 -msgid "Available Filters" -msgstr "Filtros disponibles" - -#: ../app/widgets/gimpcolordisplayeditor.c:219 -msgid "Move the selected filter up" -msgstr "Mover el filtro seleccionado hacia arriba" - -#: ../app/widgets/gimpcolordisplayeditor.c:228 -msgid "Move the selected filter down" -msgstr "Mover el filtro seleccionado hacia abajo" - -#: ../app/widgets/gimpcolordisplayeditor.c:274 -msgid "Active Filters" -msgstr "Filtros activos" - -#: ../app/widgets/gimpcolordisplayeditor.c:325 -msgid "Reset the selected filter to default values" -msgstr "Reiniciar el filtro seleccionado con los valores predeterminados" - -#: ../app/widgets/gimpcolordisplayeditor.c:527 -#, c-format -msgid "Add '%s' to the list of active filters" -msgstr "Añadir «%s» a la lista de filtros activos" - -#: ../app/widgets/gimpcolordisplayeditor.c:564 -#, c-format -msgid "Remove '%s' from the list of active filters" -msgstr "Quitar «%s» de la lista de filtros activos" - -#: ../app/widgets/gimpcolordisplayeditor.c:595 -msgid "No filter selected" -msgstr "No hay ningún filtro seleccionado" - -#: ../app/widgets/gimpcoloreditor.c:260 -msgid "" -"Hexadecimal color notation as used in HTML and CSS. This entry also accepts " -"CSS color names." -msgstr "" -"Notación hexadecimal del color como la que se utiliza en el HTML y CSS. Esta " -"entrada acepta también nombres de color CSS." - -#: ../app/widgets/gimpcolorframe.c:511 -msgid "Index:" -msgstr "Índice:" - -#: ../app/widgets/gimpcolorframe.c:524 ../app/widgets/gimpcolorframe.c:550 -msgid "Red:" -msgstr "Rojo:" - -#: ../app/widgets/gimpcolorframe.c:525 ../app/widgets/gimpcolorframe.c:551 -msgid "Green:" -msgstr "Verde:" - -#: ../app/widgets/gimpcolorframe.c:526 ../app/widgets/gimpcolorframe.c:552 -msgid "Blue:" -msgstr "Azul:" - -#: ../app/widgets/gimpcolorframe.c:539 ../app/widgets/gimpcolorframe.c:572 -msgid "Value:" -msgstr "Valor:" - -#: ../app/widgets/gimpcolorframe.c:563 -msgid "Hex:" -msgstr "Hex:" - -#: ../app/widgets/gimpcolorframe.c:570 -msgid "Hue:" -msgstr "Tono:" - -#: ../app/widgets/gimpcolorframe.c:571 -msgid "Sat.:" -msgstr "Sat.:" - +#: ../app/widgets/gimpactioneditor.c:69 +msgid "_Search:" +msgstr "Bu_scar:" + +#: ../app/widgets/gimpactiongroup.c:881 +#, c-format +msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" +msgstr "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" + +#: ../app/widgets/gimpactionview.c:338 +#: ../app/widgets/gimpcontrollereditor.c:341 +msgid "Action" +msgstr "Acción" + +#: ../app/widgets/gimpactionview.c:367 +msgid "Shortcut" +msgstr "Combinación de teclas" + +#: ../app/widgets/gimpactionview.c:393 +msgid "Name" +msgstr "Nombre" + +#: ../app/widgets/gimpactionview.c:633 ../app/widgets/gimpactionview.c:843 +msgid "Changing shortcut failed." +msgstr "Ha fallado el cambio de la combinación de teclas." + +#: ../app/widgets/gimpactionview.c:670 +msgid "Conflicting Shortcuts" +msgstr "Combinaciones de teclas en conflicto" + +#: ../app/widgets/gimpactionview.c:676 +msgid "_Reassign shortcut" +msgstr "_Reasignar combinación de teclas" + +#: ../app/widgets/gimpactionview.c:691 +#, c-format +msgid "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group." +msgstr "La combinación de teclas «%s» ya la usa «%s» del grupo «%s»." + +#: ../app/widgets/gimpactionview.c:695 +#, c-format +msgid "Reassigning the shortcut will cause it to be removed from \"%s\"." +msgstr "Reasignar la combinación de teclas hará que se elimine de «%s»." + +#: ../app/widgets/gimpactionview.c:778 +msgid "Invalid shortcut." +msgstr "Combinación de teclas no válida." + +#: ../app/widgets/gimpactionview.c:867 +msgid "Removing shortcut failed." +msgstr "Ha fallado la eliminación de la combinación de teclas." + +#: ../app/widgets/gimpbrusheditor.c:166 +msgid "Spikes" +msgstr "Púas" + +#: ../app/widgets/gimpbrusheditor.c:177 +msgid "Hardness" +msgstr "Dureza" + +#: ../app/widgets/gimpbrusheditor.c:188 +msgid "Aspect ratio" +msgstr "Proporción de aspecto" + +#: ../app/widgets/gimpbrusheditor.c:210 +#: ../app/widgets/gimpbrushfactoryview.c:80 +#: ../app/widgets/gimpgrideditor.c:174 +msgid "Spacing" +msgstr "Espaciado" + +#: ../app/widgets/gimpbrusheditor.c:215 +#: ../app/widgets/gimpbrushfactoryview.c:84 +msgid "Percentage of width of brush" +msgstr "Porcentaje del ancho del pincel" + +#: ../app/widgets/gimpbufferview.c:179 ../app/widgets/gimpbufferview.c:264 +#: ../app/widgets/gimpeditor.c:747 +msgid "(None)" +msgstr "(Ninguno)" + +#: ../app/widgets/gimpcolordialog.c:149 +msgid "Add the current color to the color history" +msgstr "Añadir el color actual al historial de colores" + +#: ../app/widgets/gimpcolordisplayeditor.c:157 +msgid "Available Filters" +msgstr "Filtros disponibles" + +#: ../app/widgets/gimpcolordisplayeditor.c:219 +msgid "Move the selected filter up" +msgstr "Mover el filtro seleccionado hacia arriba" + +#: ../app/widgets/gimpcolordisplayeditor.c:228 +msgid "Move the selected filter down" +msgstr "Mover el filtro seleccionado hacia abajo" + +#: ../app/widgets/gimpcolordisplayeditor.c:274 +msgid "Active Filters" +msgstr "Filtros activos" + +#: ../app/widgets/gimpcolordisplayeditor.c:325 +msgid "Reset the selected filter to default values" +msgstr "Reiniciar el filtro seleccionado con los valores predeterminados" + +#: ../app/widgets/gimpcolordisplayeditor.c:527 +#, c-format +msgid "Add '%s' to the list of active filters" +msgstr "Añadir «%s» a la lista de filtros activos" + +#: ../app/widgets/gimpcolordisplayeditor.c:564 +#, c-format +msgid "Remove '%s' from the list of active filters" +msgstr "Quitar «%s» de la lista de filtros activos" + +#: ../app/widgets/gimpcolordisplayeditor.c:595 +msgid "No filter selected" +msgstr "No hay ningún filtro seleccionado" + +#: ../app/widgets/gimpcoloreditor.c:264 +msgid "" +"Hexadecimal color notation as used in HTML and CSS. This entry also accepts " +"CSS color names." +msgstr "" +"Notación hexadecimal del color como la que se utiliza en el HTML y CSS. Esta " +"entrada acepta también nombres de color CSS." + +#: ../app/widgets/gimpcolorframe.c:511 +msgid "Index:" +msgstr "Índice:" + +#: ../app/widgets/gimpcolorframe.c:524 ../app/widgets/gimpcolorframe.c:550 +msgid "Red:" +msgstr "Rojo:" + +#: ../app/widgets/gimpcolorframe.c:525 ../app/widgets/gimpcolorframe.c:551 +msgid "Green:" +msgstr "Verde:" + +#: ../app/widgets/gimpcolorframe.c:526 ../app/widgets/gimpcolorframe.c:552 +msgid "Blue:" +msgstr "Azul:" + +#: ../app/widgets/gimpcolorframe.c:539 ../app/widgets/gimpcolorframe.c:572 +msgid "Value:" +msgstr "Valor:" + +#: ../app/widgets/gimpcolorframe.c:563 +msgid "Hex:" +msgstr "Hex:" + +#: ../app/widgets/gimpcolorframe.c:570 +msgid "Hue:" +msgstr "Tono:" + +#: ../app/widgets/gimpcolorframe.c:571 +msgid "Sat.:" +msgstr "Sat.:" + # A ver si de una vez dejamos tranqilito el Cian sin acento. -#: ../app/widgets/gimpcolorframe.c:589 -msgid "Cyan:" -msgstr "Cian:" - -#: ../app/widgets/gimpcolorframe.c:590 -msgid "Magenta:" -msgstr "Magenta:" - -#: ../app/widgets/gimpcolorframe.c:591 -msgid "Yellow:" -msgstr "Amarillo:" - -#: ../app/widgets/gimpcolorframe.c:592 -msgid "Black:" -msgstr "Negro:" - -#: ../app/widgets/gimpcolorframe.c:612 -msgid "Alpha:" -msgstr "Alfa:" - -#: ../app/widgets/gimpcolormapeditor.c:200 -msgid "Color index:" -msgstr "Índice de colores:" - -#: ../app/widgets/gimpcolormapeditor.c:210 -msgid "HTML notation:" -msgstr "Notación HTML:" - -#: ../app/widgets/gimpcolormapeditor.c:466 -msgid "Only indexed images have a colormap." -msgstr "Solamente las imágenes indexadas tienen un mapa de colores." - -#: ../app/widgets/gimpcolorselectorpalette.c:58 -msgid "Palette" -msgstr "Paleta" - -#: ../app/widgets/gimpcontainerpopup.c:595 -msgid "Smaller Previews" -msgstr "Vistas previas diminutas" - -#: ../app/widgets/gimpcontainerpopup.c:600 -msgid "Larger Previews" -msgstr "Vistas previas enormes" - -#: ../app/widgets/gimpcontrollereditor.c:198 -msgid "_Dump events from this controller" -msgstr "_Volcar los eventos desde este controlador" - -#: ../app/widgets/gimpcontrollereditor.c:203 -msgid "_Enable this controller" -msgstr "_Activar este controlador" - -#: ../app/widgets/gimpcontrollereditor.c:224 -msgid "Name:" -msgstr "Nombre:" - -#: ../app/widgets/gimpcontrollereditor.c:230 -msgid "State:" -msgstr "Estado:" - -#: ../app/widgets/gimpcontrollereditor.c:335 -msgid "Event" -msgstr "Evento" - -#: ../app/widgets/gimpcontrollereditor.c:360 -msgid "_Grab event" -msgstr "_Capturar un evento" - -#: ../app/widgets/gimpcontrollereditor.c:369 -msgid "Select the next event arriving from the controller" -msgstr "Seleccionar el siguiente evento que llega desde el controlador" - -#: ../app/widgets/gimpcontrollereditor.c:525 -#, c-format -msgid "Remove the action assigned to '%s'" -msgstr "Eliminar la acción asignada a «%s»" - -#: ../app/widgets/gimpcontrollereditor.c:530 -#, c-format -msgid "Assign an action to '%s'" -msgstr "Asignar una acción «%s»" - -#: ../app/widgets/gimpcontrollereditor.c:651 -#, c-format -msgid "Select Action for Event '%s'" -msgstr "Seleccionar la acción para el evento «%s»" - -#: ../app/widgets/gimpcontrollereditor.c:656 -msgid "Select Controller Event Action" -msgstr "Seleccionar un controlador de acción de evento" - -#: ../app/widgets/gimpcontrollerkeyboard.c:67 -#: ../app/widgets/gimpcontrollerkeyboard.c:70 -#: ../app/widgets/gimpcontrollerkeyboard.c:73 -#: ../app/widgets/gimpcontrollerkeyboard.c:76 -#: ../app/widgets/gimpcontrollerkeyboard.c:79 -#: ../app/widgets/gimpcontrollerkeyboard.c:82 -#: ../app/widgets/gimpcontrollerkeyboard.c:85 -#: ../app/widgets/gimpcontrollerkeyboard.c:88 -msgid "Cursor Up" -msgstr "Subir cursor" - -#: ../app/widgets/gimpcontrollerkeyboard.c:92 -#: ../app/widgets/gimpcontrollerkeyboard.c:95 -#: ../app/widgets/gimpcontrollerkeyboard.c:98 -#: ../app/widgets/gimpcontrollerkeyboard.c:101 -#: ../app/widgets/gimpcontrollerkeyboard.c:104 -#: ../app/widgets/gimpcontrollerkeyboard.c:107 -#: ../app/widgets/gimpcontrollerkeyboard.c:110 -#: ../app/widgets/gimpcontrollerkeyboard.c:113 -msgid "Cursor Down" -msgstr "Bajar cursor" - -#: ../app/widgets/gimpcontrollerkeyboard.c:117 -#: ../app/widgets/gimpcontrollerkeyboard.c:120 -#: ../app/widgets/gimpcontrollerkeyboard.c:123 -#: ../app/widgets/gimpcontrollerkeyboard.c:126 -#: ../app/widgets/gimpcontrollerkeyboard.c:129 -#: ../app/widgets/gimpcontrollerkeyboard.c:132 -#: ../app/widgets/gimpcontrollerkeyboard.c:135 -#: ../app/widgets/gimpcontrollerkeyboard.c:138 -msgid "Cursor Left" -msgstr "Cursor a la izquierda" - -#: ../app/widgets/gimpcontrollerkeyboard.c:142 -#: ../app/widgets/gimpcontrollerkeyboard.c:145 -#: ../app/widgets/gimpcontrollerkeyboard.c:148 -#: ../app/widgets/gimpcontrollerkeyboard.c:151 -#: ../app/widgets/gimpcontrollerkeyboard.c:154 -#: ../app/widgets/gimpcontrollerkeyboard.c:157 -#: ../app/widgets/gimpcontrollerkeyboard.c:160 -#: ../app/widgets/gimpcontrollerkeyboard.c:163 -msgid "Cursor Right" -msgstr "Cursor a la derecha" - -#: ../app/widgets/gimpcontrollerkeyboard.c:175 -msgid "Keyboard" -msgstr "Teclado" - -#: ../app/widgets/gimpcontrollerkeyboard.c:216 -msgid "Keyboard Events" -msgstr "Eventos del teclado" - -#: ../app/widgets/gimpcontrollerkeyboard.c:217 -#: ../app/widgets/gimpcontrollermouse.c:245 -#: ../app/widgets/gimpcontrollerwheel.c:219 -msgid "Ready" -msgstr "Preparado" - -#: ../app/widgets/gimpcontrollerlist.c:182 -msgid "Available Controllers" -msgstr "Controladores disponibles" - -#: ../app/widgets/gimpcontrollerlist.c:277 -msgid "Active Controllers" -msgstr "Controladores activos" - -#: ../app/widgets/gimpcontrollerlist.c:293 -msgid "Configure the selected controller" -msgstr "Configurar el controlador seleccionado" - -#: ../app/widgets/gimpcontrollerlist.c:301 -msgid "Move the selected controller up" -msgstr "Mover el controlador seleccionado hacia arriba" - -#: ../app/widgets/gimpcontrollerlist.c:309 -msgid "Move the selected controller down" -msgstr "Mover el controlador seleccionado hacia abajo" - -#: ../app/widgets/gimpcontrollerlist.c:427 -#, c-format -msgid "Add '%s' to the list of active controllers" -msgstr "Añadir «%s» a la lista de controladores activos" - -#: ../app/widgets/gimpcontrollerlist.c:478 -#, c-format -msgid "Remove '%s' from the list of active controllers" -msgstr "Quitar «%s» de la lista de controladores activos" - -#: ../app/widgets/gimpcontrollerlist.c:512 -msgid "" -"There can only be one active keyboard controller.\n" -"\n" -"You already have a keyboard controller in your list of active controllers." -msgstr "" -"Sólo puede haber un controlador activo de teclado.\n" -"\n" -"Ya tiene un controlador de teclado en su lista de controladores activos." - -#: ../app/widgets/gimpcontrollerlist.c:523 -msgid "" -"There can only be one active wheel controller.\n" -"\n" -"You already have a wheel controller in your list of active controllers." -msgstr "" -"Sólo puede haber un controlador activo de rueda.\n" -"\n" -"Ya tiene un controlador de rueda en su lista de controladores activos." - -#: ../app/widgets/gimpcontrollerlist.c:534 -msgid "" -"There can only be one active mouse controller.\n" -"\n" -"You already have a mouse controller in your list of active controllers." -msgstr "" -"Sólo puede haber un controlador activo de ratón.\n" -"\n" -"Ya tiene un controlador de ratón en su lista de controladores activos." - -#: ../app/widgets/gimpcontrollerlist.c:560 -msgid "Remove Controller?" -msgstr "¿Quitar el controlador?" - -#: ../app/widgets/gimpcontrollerlist.c:565 -msgid "Disable Controller" -msgstr "Desactivar el controlador" - -#: ../app/widgets/gimpcontrollerlist.c:567 -msgid "Remove Controller" -msgstr "Quitar el controlador" - -#: ../app/widgets/gimpcontrollerlist.c:579 -#, c-format -msgid "Remove Controller '%s'?" -msgstr "¿Quitar el controlador «%s»?" - -#: ../app/widgets/gimpcontrollerlist.c:583 -msgid "" -"Removing this controller from the list of active controllers will " -"permanently delete all event mappings you have configured.\n" -"\n" -"Selecting \"Disable Controller\" will disable the controller without " -"removing it." -msgstr "" -"La eliminación de este controlador de la lista de controladores activos " -"eliminará permanentemente todas las asignaciones de eventos que haya " -"configurado.\n" -"\n" -"Al seleccionar «Desactivar el controlador» se desactivará el controlador sin " -"quitarlo." - -#: ../app/widgets/gimpcontrollerlist.c:635 -msgid "Configure Input Controller" -msgstr "Configurar el controlador de entrada" - -#: ../app/widgets/gimpcontrollermouse.c:70 -#: ../app/widgets/gimpcontrollermouse.c:73 -#: ../app/widgets/gimpcontrollermouse.c:76 -#: ../app/widgets/gimpcontrollermouse.c:79 -#: ../app/widgets/gimpcontrollermouse.c:82 -#: ../app/widgets/gimpcontrollermouse.c:85 -#: ../app/widgets/gimpcontrollermouse.c:88 -#: ../app/widgets/gimpcontrollermouse.c:91 -msgid "Button 8" -msgstr "Botón 8" - -#: ../app/widgets/gimpcontrollermouse.c:95 -#: ../app/widgets/gimpcontrollermouse.c:98 -#: ../app/widgets/gimpcontrollermouse.c:101 -#: ../app/widgets/gimpcontrollermouse.c:104 -#: ../app/widgets/gimpcontrollermouse.c:107 -#: ../app/widgets/gimpcontrollermouse.c:110 -#: ../app/widgets/gimpcontrollermouse.c:113 -#: ../app/widgets/gimpcontrollermouse.c:116 -msgid "Button 9" -msgstr "Botón 9" - -#: ../app/widgets/gimpcontrollermouse.c:120 -#: ../app/widgets/gimpcontrollermouse.c:123 -#: ../app/widgets/gimpcontrollermouse.c:126 -#: ../app/widgets/gimpcontrollermouse.c:129 -#: ../app/widgets/gimpcontrollermouse.c:132 -#: ../app/widgets/gimpcontrollermouse.c:135 -#: ../app/widgets/gimpcontrollermouse.c:138 -#: ../app/widgets/gimpcontrollermouse.c:141 -msgid "Button 10" -msgstr "Botón 10" - -#: ../app/widgets/gimpcontrollermouse.c:145 -#: ../app/widgets/gimpcontrollermouse.c:148 -#: ../app/widgets/gimpcontrollermouse.c:151 -#: ../app/widgets/gimpcontrollermouse.c:154 -#: ../app/widgets/gimpcontrollermouse.c:157 -#: ../app/widgets/gimpcontrollermouse.c:160 -#: ../app/widgets/gimpcontrollermouse.c:163 -#: ../app/widgets/gimpcontrollermouse.c:166 -msgid "Button 11" -msgstr "Botón 11" - -#: ../app/widgets/gimpcontrollermouse.c:170 -#: ../app/widgets/gimpcontrollermouse.c:173 -#: ../app/widgets/gimpcontrollermouse.c:176 -#: ../app/widgets/gimpcontrollermouse.c:179 -#: ../app/widgets/gimpcontrollermouse.c:182 -#: ../app/widgets/gimpcontrollermouse.c:185 -#: ../app/widgets/gimpcontrollermouse.c:188 -#: ../app/widgets/gimpcontrollermouse.c:191 -msgid "Button 12" -msgstr "Botón 12" - -#: ../app/widgets/gimpcontrollermouse.c:203 -msgid "Mouse Buttons" -msgstr "Botones del ratón" - -#: ../app/widgets/gimpcontrollermouse.c:244 -msgid "Mouse Button Events" -msgstr "Eventos de los botones del ratón" - -#: ../app/widgets/gimpcontrollerwheel.c:69 -#: ../app/widgets/gimpcontrollerwheel.c:72 -#: ../app/widgets/gimpcontrollerwheel.c:75 -#: ../app/widgets/gimpcontrollerwheel.c:78 -#: ../app/widgets/gimpcontrollerwheel.c:81 -#: ../app/widgets/gimpcontrollerwheel.c:84 -#: ../app/widgets/gimpcontrollerwheel.c:87 -#: ../app/widgets/gimpcontrollerwheel.c:90 -msgid "Scroll Up" -msgstr "Desplazar arriba" - -#: ../app/widgets/gimpcontrollerwheel.c:94 -#: ../app/widgets/gimpcontrollerwheel.c:97 -#: ../app/widgets/gimpcontrollerwheel.c:100 -#: ../app/widgets/gimpcontrollerwheel.c:103 -#: ../app/widgets/gimpcontrollerwheel.c:106 -#: ../app/widgets/gimpcontrollerwheel.c:109 -#: ../app/widgets/gimpcontrollerwheel.c:112 -#: ../app/widgets/gimpcontrollerwheel.c:115 -msgid "Scroll Down" -msgstr "Desplazar abajo" - -#: ../app/widgets/gimpcontrollerwheel.c:119 -#: ../app/widgets/gimpcontrollerwheel.c:122 -#: ../app/widgets/gimpcontrollerwheel.c:125 -#: ../app/widgets/gimpcontrollerwheel.c:128 -#: ../app/widgets/gimpcontrollerwheel.c:131 -#: ../app/widgets/gimpcontrollerwheel.c:134 -#: ../app/widgets/gimpcontrollerwheel.c:137 -#: ../app/widgets/gimpcontrollerwheel.c:140 -msgid "Scroll Left" -msgstr "Desplazar a la izquierda" - -#: ../app/widgets/gimpcontrollerwheel.c:144 -#: ../app/widgets/gimpcontrollerwheel.c:147 -#: ../app/widgets/gimpcontrollerwheel.c:150 -#: ../app/widgets/gimpcontrollerwheel.c:153 -#: ../app/widgets/gimpcontrollerwheel.c:156 -#: ../app/widgets/gimpcontrollerwheel.c:159 -#: ../app/widgets/gimpcontrollerwheel.c:162 -#: ../app/widgets/gimpcontrollerwheel.c:165 -msgid "Scroll Right" -msgstr "Desplazar a la derecha" - -#: ../app/widgets/gimpcontrollerwheel.c:177 -msgid "Mouse Wheel" -msgstr "Rueda del ratón" - -#: ../app/widgets/gimpcontrollerwheel.c:218 -msgid "Mouse Wheel Events" -msgstr "Eventos de la rueda del ratón" - -#: ../app/widgets/gimpdataeditor.c:215 -msgid "Save" -msgstr "Guardar" - -#: ../app/widgets/gimpdataeditor.c:223 -msgid "Revert" -msgstr "Revertir" - -#: ../app/widgets/gimpdataeditor.c:435 -#, c-format -msgid "%s (read only)" -msgstr "%s (sólo lectura)" - -#: ../app/widgets/gimpdeviceeditor.c:165 -msgid "Delete the selected device" -msgstr "Eliminar el dispositivo seleccionado" - -#: ../app/widgets/gimpdeviceeditor.c:502 -msgid "Delete Device Settings" -msgstr "Eliminar los ajustes del dispositivo" - -#: ../app/widgets/gimpdeviceeditor.c:523 -#, c-format -msgid "Delete \"%s\"?" -msgstr "¿Eliminar «%s»?" - -#: ../app/widgets/gimpdeviceeditor.c:526 -msgid "" -"You are about to delete this device's stored settings.\n" -"The next time this device is plugged, default settings will be used." -msgstr "" -"Va a eliminar los ajustes almacenados de este dispositivo.\n" -"La próxima vez que se conecte este dispositivo, se utilizarán los ajustes " -"predeterminados." - -#: ../app/widgets/gimpdeviceinfoeditor.c:140 -#: ../app/widgets/gimpdynamicseditor.c:141 -#: ../app/widgets/gimpdynamicsoutputeditor.c:69 -msgid "Pressure" -msgstr "Presión" - -#: ../app/widgets/gimpdeviceinfoeditor.c:141 -msgid "X tilt" -msgstr "Inclinación X" - -#: ../app/widgets/gimpdeviceinfoeditor.c:142 -msgid "Y tilt" -msgstr "Inclinación Y" - -#. Wheel as in mouse or input device wheel -#: ../app/widgets/gimpdeviceinfoeditor.c:144 -#: ../app/widgets/gimpdynamicseditor.c:145 -#: ../app/widgets/gimpdynamicsoutputeditor.c:73 -msgid "Wheel" -msgstr "Rueda" - +#: ../app/widgets/gimpcolorframe.c:589 +msgid "Cyan:" +msgstr "Cian:" + +#: ../app/widgets/gimpcolorframe.c:590 +msgid "Magenta:" +msgstr "Magenta:" + +#: ../app/widgets/gimpcolorframe.c:591 +msgid "Yellow:" +msgstr "Amarillo:" + +#: ../app/widgets/gimpcolorframe.c:592 +msgid "Black:" +msgstr "Negro:" + +#: ../app/widgets/gimpcolorframe.c:612 +msgid "Alpha:" +msgstr "Alfa:" + +#: ../app/widgets/gimpcolormapeditor.c:200 +msgid "Color index:" +msgstr "Índice de colores:" + +#: ../app/widgets/gimpcolormapeditor.c:210 +msgid "HTML notation:" +msgstr "Notación HTML:" + +#: ../app/widgets/gimpcolormapeditor.c:466 +msgid "Only indexed images have a colormap." +msgstr "Solamente las imágenes indexadas tienen un mapa de colores." + +#: ../app/widgets/gimpcolorselectorpalette.c:58 +msgid "Palette" +msgstr "Paleta" + +#: ../app/widgets/gimpcontainerpopup.c:595 +msgid "Smaller Previews" +msgstr "Vistas previas diminutas" + +#: ../app/widgets/gimpcontainerpopup.c:600 +msgid "Larger Previews" +msgstr "Vistas previas enormes" + +#: ../app/widgets/gimpcontrollereditor.c:198 +msgid "_Dump events from this controller" +msgstr "_Volcar los eventos desde este controlador" + +#: ../app/widgets/gimpcontrollereditor.c:203 +msgid "_Enable this controller" +msgstr "_Activar este controlador" + +#: ../app/widgets/gimpcontrollereditor.c:224 +msgid "Name:" +msgstr "Nombre:" + +#: ../app/widgets/gimpcontrollereditor.c:230 +msgid "State:" +msgstr "Estado:" + +#: ../app/widgets/gimpcontrollereditor.c:335 +msgid "Event" +msgstr "Evento" + +#: ../app/widgets/gimpcontrollereditor.c:360 +msgid "_Grab event" +msgstr "_Capturar un evento" + +#: ../app/widgets/gimpcontrollereditor.c:369 +msgid "Select the next event arriving from the controller" +msgstr "Seleccionar el siguiente evento que llega desde el controlador" + +#: ../app/widgets/gimpcontrollereditor.c:525 +#, c-format +msgid "Remove the action assigned to '%s'" +msgstr "Eliminar la acción asignada a «%s»" + +#: ../app/widgets/gimpcontrollereditor.c:530 +#, c-format +msgid "Assign an action to '%s'" +msgstr "Asignar una acción «%s»" + +#: ../app/widgets/gimpcontrollereditor.c:651 +#, c-format +msgid "Select Action for Event '%s'" +msgstr "Seleccionar la acción para el evento «%s»" + +#: ../app/widgets/gimpcontrollereditor.c:656 +msgid "Select Controller Event Action" +msgstr "Seleccionar un controlador de acción de evento" + +#: ../app/widgets/gimpcontrollerkeyboard.c:67 +#: ../app/widgets/gimpcontrollerkeyboard.c:70 +#: ../app/widgets/gimpcontrollerkeyboard.c:73 +#: ../app/widgets/gimpcontrollerkeyboard.c:76 +#: ../app/widgets/gimpcontrollerkeyboard.c:79 +#: ../app/widgets/gimpcontrollerkeyboard.c:82 +#: ../app/widgets/gimpcontrollerkeyboard.c:85 +#: ../app/widgets/gimpcontrollerkeyboard.c:88 +msgid "Cursor Up" +msgstr "Subir cursor" + +#: ../app/widgets/gimpcontrollerkeyboard.c:92 +#: ../app/widgets/gimpcontrollerkeyboard.c:95 +#: ../app/widgets/gimpcontrollerkeyboard.c:98 +#: ../app/widgets/gimpcontrollerkeyboard.c:101 +#: ../app/widgets/gimpcontrollerkeyboard.c:104 +#: ../app/widgets/gimpcontrollerkeyboard.c:107 +#: ../app/widgets/gimpcontrollerkeyboard.c:110 +#: ../app/widgets/gimpcontrollerkeyboard.c:113 +msgid "Cursor Down" +msgstr "Bajar cursor" + +#: ../app/widgets/gimpcontrollerkeyboard.c:117 +#: ../app/widgets/gimpcontrollerkeyboard.c:120 +#: ../app/widgets/gimpcontrollerkeyboard.c:123 +#: ../app/widgets/gimpcontrollerkeyboard.c:126 +#: ../app/widgets/gimpcontrollerkeyboard.c:129 +#: ../app/widgets/gimpcontrollerkeyboard.c:132 +#: ../app/widgets/gimpcontrollerkeyboard.c:135 +#: ../app/widgets/gimpcontrollerkeyboard.c:138 +msgid "Cursor Left" +msgstr "Cursor a la izquierda" + +#: ../app/widgets/gimpcontrollerkeyboard.c:142 +#: ../app/widgets/gimpcontrollerkeyboard.c:145 +#: ../app/widgets/gimpcontrollerkeyboard.c:148 +#: ../app/widgets/gimpcontrollerkeyboard.c:151 +#: ../app/widgets/gimpcontrollerkeyboard.c:154 +#: ../app/widgets/gimpcontrollerkeyboard.c:157 +#: ../app/widgets/gimpcontrollerkeyboard.c:160 +#: ../app/widgets/gimpcontrollerkeyboard.c:163 +msgid "Cursor Right" +msgstr "Cursor a la derecha" + +#: ../app/widgets/gimpcontrollerkeyboard.c:175 +msgid "Keyboard" +msgstr "Teclado" + +#: ../app/widgets/gimpcontrollerkeyboard.c:216 +msgid "Keyboard Events" +msgstr "Eventos del teclado" + +#: ../app/widgets/gimpcontrollerkeyboard.c:217 +#: ../app/widgets/gimpcontrollermouse.c:245 +#: ../app/widgets/gimpcontrollerwheel.c:219 +msgid "Ready" +msgstr "Preparado" + +#: ../app/widgets/gimpcontrollerlist.c:182 +msgid "Available Controllers" +msgstr "Controladores disponibles" + +#: ../app/widgets/gimpcontrollerlist.c:277 +msgid "Active Controllers" +msgstr "Controladores activos" + +#: ../app/widgets/gimpcontrollerlist.c:293 +msgid "Configure the selected controller" +msgstr "Configurar el controlador seleccionado" + +#: ../app/widgets/gimpcontrollerlist.c:301 +msgid "Move the selected controller up" +msgstr "Mover el controlador seleccionado hacia arriba" + +#: ../app/widgets/gimpcontrollerlist.c:309 +msgid "Move the selected controller down" +msgstr "Mover el controlador seleccionado hacia abajo" + +#: ../app/widgets/gimpcontrollerlist.c:427 +#, c-format +msgid "Add '%s' to the list of active controllers" +msgstr "Añadir «%s» a la lista de controladores activos" + +#: ../app/widgets/gimpcontrollerlist.c:478 +#, c-format +msgid "Remove '%s' from the list of active controllers" +msgstr "Quitar «%s» de la lista de controladores activos" + +#: ../app/widgets/gimpcontrollerlist.c:512 +msgid "" +"There can only be one active keyboard controller.\n" +"\n" +"You already have a keyboard controller in your list of active controllers." +msgstr "" +"Sólo puede haber un controlador activo de teclado.\n" +"\n" +"Ya tiene un controlador de teclado en su lista de controladores activos." + +#: ../app/widgets/gimpcontrollerlist.c:523 +msgid "" +"There can only be one active wheel controller.\n" +"\n" +"You already have a wheel controller in your list of active controllers." +msgstr "" +"Sólo puede haber un controlador activo de rueda.\n" +"\n" +"Ya tiene un controlador de rueda en su lista de controladores activos." + +#: ../app/widgets/gimpcontrollerlist.c:534 +msgid "" +"There can only be one active mouse controller.\n" +"\n" +"You already have a mouse controller in your list of active controllers." +msgstr "" +"Sólo puede haber un controlador activo de ratón.\n" +"\n" +"Ya tiene un controlador de ratón en su lista de controladores activos." + +#: ../app/widgets/gimpcontrollerlist.c:560 +msgid "Remove Controller?" +msgstr "¿Quitar el controlador?" + +#: ../app/widgets/gimpcontrollerlist.c:565 +msgid "Disable Controller" +msgstr "Desactivar el controlador" + +#: ../app/widgets/gimpcontrollerlist.c:567 +msgid "Remove Controller" +msgstr "Quitar el controlador" + +#: ../app/widgets/gimpcontrollerlist.c:579 +#, c-format +msgid "Remove Controller '%s'?" +msgstr "¿Quitar el controlador «%s»?" + +#: ../app/widgets/gimpcontrollerlist.c:583 +msgid "" +"Removing this controller from the list of active controllers will " +"permanently delete all event mappings you have configured.\n" +"\n" +"Selecting \"Disable Controller\" will disable the controller without " +"removing it." +msgstr "" +"La eliminación de este controlador de la lista de controladores activos " +"eliminará permanentemente todas las asignaciones de eventos que haya " +"configurado.\n" +"\n" +"Al seleccionar «Desactivar el controlador» se desactivará el controlador sin " +"quitarlo." + +#: ../app/widgets/gimpcontrollerlist.c:635 +msgid "Configure Input Controller" +msgstr "Configurar el controlador de entrada" + +#: ../app/widgets/gimpcontrollermouse.c:70 +#: ../app/widgets/gimpcontrollermouse.c:73 +#: ../app/widgets/gimpcontrollermouse.c:76 +#: ../app/widgets/gimpcontrollermouse.c:79 +#: ../app/widgets/gimpcontrollermouse.c:82 +#: ../app/widgets/gimpcontrollermouse.c:85 +#: ../app/widgets/gimpcontrollermouse.c:88 +#: ../app/widgets/gimpcontrollermouse.c:91 +msgid "Button 8" +msgstr "Botón 8" + +#: ../app/widgets/gimpcontrollermouse.c:95 +#: ../app/widgets/gimpcontrollermouse.c:98 +#: ../app/widgets/gimpcontrollermouse.c:101 +#: ../app/widgets/gimpcontrollermouse.c:104 +#: ../app/widgets/gimpcontrollermouse.c:107 +#: ../app/widgets/gimpcontrollermouse.c:110 +#: ../app/widgets/gimpcontrollermouse.c:113 +#: ../app/widgets/gimpcontrollermouse.c:116 +msgid "Button 9" +msgstr "Botón 9" + +#: ../app/widgets/gimpcontrollermouse.c:120 +#: ../app/widgets/gimpcontrollermouse.c:123 +#: ../app/widgets/gimpcontrollermouse.c:126 +#: ../app/widgets/gimpcontrollermouse.c:129 +#: ../app/widgets/gimpcontrollermouse.c:132 +#: ../app/widgets/gimpcontrollermouse.c:135 +#: ../app/widgets/gimpcontrollermouse.c:138 +#: ../app/widgets/gimpcontrollermouse.c:141 +msgid "Button 10" +msgstr "Botón 10" + +#: ../app/widgets/gimpcontrollermouse.c:145 +#: ../app/widgets/gimpcontrollermouse.c:148 +#: ../app/widgets/gimpcontrollermouse.c:151 +#: ../app/widgets/gimpcontrollermouse.c:154 +#: ../app/widgets/gimpcontrollermouse.c:157 +#: ../app/widgets/gimpcontrollermouse.c:160 +#: ../app/widgets/gimpcontrollermouse.c:163 +#: ../app/widgets/gimpcontrollermouse.c:166 +msgid "Button 11" +msgstr "Botón 11" + +#: ../app/widgets/gimpcontrollermouse.c:170 +#: ../app/widgets/gimpcontrollermouse.c:173 +#: ../app/widgets/gimpcontrollermouse.c:176 +#: ../app/widgets/gimpcontrollermouse.c:179 +#: ../app/widgets/gimpcontrollermouse.c:182 +#: ../app/widgets/gimpcontrollermouse.c:185 +#: ../app/widgets/gimpcontrollermouse.c:188 +#: ../app/widgets/gimpcontrollermouse.c:191 +msgid "Button 12" +msgstr "Botón 12" + +#: ../app/widgets/gimpcontrollermouse.c:203 +msgid "Mouse Buttons" +msgstr "Botones del ratón" + +#: ../app/widgets/gimpcontrollermouse.c:244 +msgid "Mouse Button Events" +msgstr "Eventos de los botones del ratón" + +#: ../app/widgets/gimpcontrollerwheel.c:69 +#: ../app/widgets/gimpcontrollerwheel.c:72 +#: ../app/widgets/gimpcontrollerwheel.c:75 +#: ../app/widgets/gimpcontrollerwheel.c:78 +#: ../app/widgets/gimpcontrollerwheel.c:81 +#: ../app/widgets/gimpcontrollerwheel.c:84 +#: ../app/widgets/gimpcontrollerwheel.c:87 +#: ../app/widgets/gimpcontrollerwheel.c:90 +msgid "Scroll Up" +msgstr "Desplazar arriba" + +#: ../app/widgets/gimpcontrollerwheel.c:94 +#: ../app/widgets/gimpcontrollerwheel.c:97 +#: ../app/widgets/gimpcontrollerwheel.c:100 +#: ../app/widgets/gimpcontrollerwheel.c:103 +#: ../app/widgets/gimpcontrollerwheel.c:106 +#: ../app/widgets/gimpcontrollerwheel.c:109 +#: ../app/widgets/gimpcontrollerwheel.c:112 +#: ../app/widgets/gimpcontrollerwheel.c:115 +msgid "Scroll Down" +msgstr "Desplazar abajo" + +#: ../app/widgets/gimpcontrollerwheel.c:119 +#: ../app/widgets/gimpcontrollerwheel.c:122 +#: ../app/widgets/gimpcontrollerwheel.c:125 +#: ../app/widgets/gimpcontrollerwheel.c:128 +#: ../app/widgets/gimpcontrollerwheel.c:131 +#: ../app/widgets/gimpcontrollerwheel.c:134 +#: ../app/widgets/gimpcontrollerwheel.c:137 +#: ../app/widgets/gimpcontrollerwheel.c:140 +msgid "Scroll Left" +msgstr "Desplazar a la izquierda" + +#: ../app/widgets/gimpcontrollerwheel.c:144 +#: ../app/widgets/gimpcontrollerwheel.c:147 +#: ../app/widgets/gimpcontrollerwheel.c:150 +#: ../app/widgets/gimpcontrollerwheel.c:153 +#: ../app/widgets/gimpcontrollerwheel.c:156 +#: ../app/widgets/gimpcontrollerwheel.c:159 +#: ../app/widgets/gimpcontrollerwheel.c:162 +#: ../app/widgets/gimpcontrollerwheel.c:165 +msgid "Scroll Right" +msgstr "Desplazar a la derecha" + +#: ../app/widgets/gimpcontrollerwheel.c:177 +msgid "Mouse Wheel" +msgstr "Rueda del ratón" + +#: ../app/widgets/gimpcontrollerwheel.c:218 +msgid "Mouse Wheel Events" +msgstr "Eventos de la rueda del ratón" + +#: ../app/widgets/gimpdataeditor.c:215 +msgid "Save" +msgstr "Guardar" + +#: ../app/widgets/gimpdataeditor.c:223 +msgid "Revert" +msgstr "Revertir" + +#: ../app/widgets/gimpdataeditor.c:435 +#, c-format +msgid "%s (read only)" +msgstr "%s (sólo lectura)" + +#: ../app/widgets/gimpdeviceeditor.c:165 +msgid "Delete the selected device" +msgstr "Eliminar el dispositivo seleccionado" + +#: ../app/widgets/gimpdeviceeditor.c:502 +msgid "Delete Device Settings" +msgstr "Eliminar los ajustes del dispositivo" + +#: ../app/widgets/gimpdeviceeditor.c:523 +#, c-format +msgid "Delete \"%s\"?" +msgstr "¿Eliminar «%s»?" + +#: ../app/widgets/gimpdeviceeditor.c:526 +msgid "" +"You are about to delete this device's stored settings.\n" +"The next time this device is plugged, default settings will be used." +msgstr "" +"Va a eliminar los ajustes almacenados de este dispositivo.\n" +"La próxima vez que se conecte este dispositivo, se utilizarán los ajustes " +"predeterminados." + +#: ../app/widgets/gimpdeviceinfoeditor.c:140 +#: ../app/widgets/gimpdynamicseditor.c:141 +#: ../app/widgets/gimpdynamicsoutputeditor.c:69 +msgid "Pressure" +msgstr "Presión" + +#: ../app/widgets/gimpdeviceinfoeditor.c:141 +msgid "X tilt" +msgstr "Inclinación X" + +#: ../app/widgets/gimpdeviceinfoeditor.c:142 +msgid "Y tilt" +msgstr "Inclinación Y" + +#. Wheel as in mouse or input device wheel +#: ../app/widgets/gimpdeviceinfoeditor.c:144 +#: ../app/widgets/gimpdynamicseditor.c:145 +#: ../app/widgets/gimpdynamicsoutputeditor.c:73 +msgid "Wheel" +msgstr "Rueda" + # Debe ir en minúsculas por las reglas de estilo -#. the axes -#. The axes of an input device -#: ../app/widgets/gimpdeviceinfoeditor.c:195 -msgid "Axes" -msgstr "Ejes" - -#. the keys -#: ../app/widgets/gimpdeviceinfoeditor.c:269 -msgid "Keys" -msgstr "Teclas" - -#: ../app/widgets/gimpdeviceinfoeditor.c:366 -#: ../app/widgets/gimpdeviceinfoeditor.c:585 -#, c-format -msgid "none" -msgstr "ninguna" - -#. e.g. "Pressure Curve" for mapping input device axes -#: ../app/widgets/gimpdeviceinfoeditor.c:415 -#, c-format -msgid "%s Curve" -msgstr "Curva %s" - -#: ../app/widgets/gimpdeviceinfoeditor.c:474 -#: ../app/widgets/gimpdynamicsoutputeditor.c:209 -msgid "_Reset Curve" -msgstr "R_establecer la curva" - -#: ../app/widgets/gimpdeviceinfoeditor.c:487 -#, c-format -msgid "The axis '%s' has no curve" -msgstr "El eje «%s» no tiene ninguna curva" - -#: ../app/widgets/gimpdevicestatus.c:137 -msgid "Save device status" -msgstr "Guardar estado del dispositivo" - -#: ../app/widgets/gimpdevicestatus.c:433 -#, c-format -msgid "Foreground: %d, %d, %d" -msgstr "Frente: %d, %d, %d" - -#: ../app/widgets/gimpdevicestatus.c:438 -#, c-format -msgid "Background: %d, %d, %d" -msgstr "Fondo: %d, %d, %d" - -#: ../app/widgets/gimpdnd-xds.c:204 -msgid "The given filename does not have any known file extension." -msgstr "El archivo dado no tiene una extensión conocida." - -#: ../app/widgets/gimpdnd-xds.c:222 -msgid "File Exists" -msgstr "El archivo ya existe" - -#: ../app/widgets/gimpdnd-xds.c:227 -msgid "_Replace" -msgstr "_Reemplazar" - -#: ../app/widgets/gimpdnd-xds.c:238 -#, c-format -msgid "A file named '%s' already exists." -msgstr "Ya existe un archivo llamado «%s»." - -#: ../app/widgets/gimpdnd-xds.c:243 -msgid "Do you want to replace it with the image you are saving?" -msgstr "¿Quiere reemplazarlo por la imagen que está guardando?" - -#. String used to separate dockables, e.g. "Tool Options, Layers" -#: ../app/widgets/gimpdock.h:34 -msgctxt "dock" -msgid ", " -msgstr ", " - -#. String used to separate books (GtkNotebooks) within a dock, -#. e.g. "Tool Options, Layers - Brushes" -#. -#: ../app/widgets/gimpdock.h:39 -msgctxt "dock" -msgid " - " -msgstr " - " - -#. String used to separate dock columns, -#. e.g. "Tool Options, Layers - Brushes | Gradients" -#. -#: ../app/widgets/gimpdock.h:44 -msgctxt "dock" -msgid " | " -msgstr " | " - -#: ../app/widgets/gimpdockbook.c:291 -msgid "Configure this tab" -msgstr "Configurar esta pestaña" - -#. Auto button -#: ../app/widgets/gimpdockwindow.c:384 -msgid "Auto" -msgstr "Auto" - -#: ../app/widgets/gimpdockwindow.c:395 -msgid "" -"When enabled the dialog automatically follows the image you are working on." -msgstr "" -"Cuando está activado el diálogo automáticamente sigue a la imagen en la que " -"está trabajando." - -#: ../app/widgets/gimpdrawabletreeview.c:122 -msgid "Lock pixels" -msgstr "Bloquear píxeles" - -#: ../app/widgets/gimpdynamicseditor.c:135 -msgid "Mapping matrix" -msgstr "Matriz de mapeado" - -#: ../app/widgets/gimpdynamicseditor.c:142 -#: ../app/widgets/gimpdynamicsoutputeditor.c:70 -msgid "Velocity" -msgstr "Velocidad" - -#: ../app/widgets/gimpdynamicseditor.c:146 -#: ../app/widgets/gimpdynamicsoutputeditor.c:74 -msgid "Random" -msgstr "Aleatorio" - -#: ../app/widgets/gimpdynamicseditor.c:147 -#: ../app/widgets/gimpdynamicsoutputeditor.c:75 -msgid "Fade" -msgstr "Desvanecer" - -#: ../app/widgets/gimperrordialog.c:150 -msgid "Too many error messages!" -msgstr "¡Demasiados mensajes de error!" - -#: ../app/widgets/gimperrordialog.c:151 -msgid "Messages are redirected to stderr." -msgstr "Los mensajes se redirigen a stderr." - -#. %s is a message domain, -#. * like "GIMP Message" or -#. * "PNG Message" -#. -#: ../app/widgets/gimperrordialog.c:174 -#, c-format -msgid "%s Message" -msgstr "Mensaje de %s" - -#: ../app/widgets/gimpfiledialog.c:330 -msgid "Automatically Detected" -msgstr "Detectado automáticamente" - -#: ../app/widgets/gimpfiledialog.c:347 -msgid "By Extension" -msgstr "Por extensión" - -#: ../app/widgets/gimpfiledialog.c:801 -msgid "All files" -msgstr "Todos los archivos" - -#: ../app/widgets/gimpfiledialog.c:806 -msgid "All images" -msgstr "Todas las imágenes" - -#: ../app/widgets/gimpfiledialog.c:813 -msgid "All XCF images" -msgstr "Todas las imágenes XCF" - -#: ../app/widgets/gimpfiledialog.c:815 -msgid "All export images" -msgstr "Todas las imágenes exportadas" - -#: ../app/widgets/gimpfiledialog.c:999 -#, c-format -msgid "Select File _Type (%s)" -msgstr "Seleccione el _tipo de archivo (%s)" - -#: ../app/widgets/gimpfileprocview.c:185 -msgid "File Type" -msgstr "Tipo de archivo" - -#: ../app/widgets/gimpfileprocview.c:197 -msgid "Extensions" -msgstr "Extensiones" - -#: ../app/widgets/gimpfilleditor.c:124 -msgid "Fill Color" -msgstr "Rellenar con color" - -#: ../app/widgets/gimpfilleditor.c:143 -msgid "_Antialiasing" -msgstr "_Anti-alias" - -#: ../app/widgets/gimpgradienteditor.c:753 -#, c-format -msgid "Zoom factor: %d:1" -msgstr "Factor de aumento: %d:1" - -#: ../app/widgets/gimpgradienteditor.c:756 -#, c-format -msgid "Displaying [%0.4f, %0.4f]" -msgstr "Mostrando [%0.4f, %0.4f]" - -#: ../app/widgets/gimpgradienteditor.c:953 -#, c-format -msgid "Position: %0.4f" -msgstr "Posición: %0.4f" - -#: ../app/widgets/gimpgradienteditor.c:954 -#, c-format -msgid "RGB (%0.3f, %0.3f, %0.3f)" -msgstr "RGB (%0.3f, %0.3f, %0.3f)" - -#: ../app/widgets/gimpgradienteditor.c:956 -#, c-format -msgid "HSV (%0.1f, %0.1f, %0.1f)" -msgstr "HSV (%0.1f, %0.1f, %0.1f)" - -#: ../app/widgets/gimpgradienteditor.c:958 -#, c-format -msgid "Luminance: %0.1f Opacity: %0.1f" -msgstr "Luminancia: %0.1f Opacidad: %0.1f" - -#: ../app/widgets/gimpgradienteditor.c:989 -#, c-format -msgid "RGB (%d, %d, %d)" -msgstr "RGB (%d, %d, %d)" - -#: ../app/widgets/gimpgradienteditor.c:1000 -msgid "Foreground color set to:" -msgstr "Color de frente establecido a:" - -#: ../app/widgets/gimpgradienteditor.c:1007 -msgid "Background color set to:" -msgstr "Color de fondo establecido a:" - -#: ../app/widgets/gimpgradienteditor.c:1235 -#: ../app/widgets/gimpgradienteditor.c:1296 -#, c-format -msgid "%s-Drag: move & compress" -msgstr "%s+arrastrar: mover y comprimir" - -#: ../app/widgets/gimpgradienteditor.c:1240 -msgid "Drag: move" -msgstr "Arrastrar: mover" - -#: ../app/widgets/gimpgradienteditor.c:1247 -#: ../app/widgets/gimpgradienteditor.c:1260 -#: ../app/widgets/gimpgradienteditor.c:1273 -#: ../app/widgets/gimpgradienteditor.c:1294 -#, c-format -msgid "%s-Click: extend selection" -msgstr "%s+pulsación: extender selección" - -#: ../app/widgets/gimpgradienteditor.c:1252 -#: ../app/widgets/gimpgradienteditor.c:1265 -msgid "Click: select" -msgstr "Pulsar: seleccionar" - -#: ../app/widgets/gimpgradienteditor.c:1278 -#: ../app/widgets/gimpgradienteditor.c:1300 -msgid "Click: select Drag: move" -msgstr "Pulsar: seleccionar Arrastrar: mover" - -#: ../app/widgets/gimpgradienteditor.c:1515 -#: ../app/widgets/gimpgradienteditor.c:1523 -#, c-format -msgid "Handle position: %0.4f" -msgstr "Posición del tirador: %0.4f" - -#: ../app/widgets/gimpgradienteditor.c:1540 -#, c-format -msgid "Distance: %0.4f" -msgstr "Distancia: %0.4f" - -#: ../app/widgets/gimpgrideditor.c:147 -msgid "Line _style:" -msgstr "E_stilo de la línea:" - -#: ../app/widgets/gimpgrideditor.c:151 -msgid "Change grid foreground color" -msgstr "Cambiar el color de frente de la rejilla" - -#: ../app/widgets/gimpgrideditor.c:158 -msgid "_Foreground color:" -msgstr "Color de _frente:" - -#: ../app/widgets/gimpgrideditor.c:162 -msgid "Change grid background color" -msgstr "Cambiar el color de fondo de la rejilla" - -#: ../app/widgets/gimpgrideditor.c:169 -msgid "_Background color:" -msgstr "Color del _fondo:" - -#: ../app/widgets/gimpgrideditor.c:195 ../app/widgets/gimpgrideditor.c:227 -msgid "Width" -msgstr "Anchura" - -#: ../app/widgets/gimpgrideditor.c:197 ../app/widgets/gimpgrideditor.c:229 -msgid "Height" -msgstr "Altura" - -#: ../app/widgets/gimphelp.c:297 -msgid "Help browser is missing" -msgstr "Falta el visor de ayuda" - -#: ../app/widgets/gimphelp.c:298 -msgid "The GIMP help browser is not available." -msgstr "No está disponible el visor de ayuda de GIMP" - -#: ../app/widgets/gimphelp.c:299 -msgid "" -"The GIMP help browser plug-in appears to be missing from your installation. " -"You may instead use the web browser for reading the help pages." -msgstr "" -"Parece que falta el complemento del visor de ayuda de GIMP en su " -"instalación. En su lugar, puede usar el navegador web para leer las páginas " -"de ayuda." - -#: ../app/widgets/gimphelp.c:340 -msgid "Help browser doesn't start" -msgstr "El visor de ayuda no se inicia" - -#: ../app/widgets/gimphelp.c:341 -msgid "Could not start the GIMP help browser plug-in." -msgstr "No se ha podido iniciar el complemento del visor de ayuda de GIMP." - -#: ../app/widgets/gimphelp.c:368 -msgid "Use _Web Browser" -msgstr "Usar el navegador _web" - -#: ../app/widgets/gimphelp.c:712 -msgid "GIMP user manual is missing" -msgstr "Falta el manual de usuario de GIMP" - -#: ../app/widgets/gimphelp.c:719 -msgid "_Read Online" -msgstr "_Leer en línea" - -#: ../app/widgets/gimphelp.c:743 -msgid "The GIMP user manual is not installed on your computer." -msgstr "El manual de usuario de GIMP no está instalado en su equipo." - -#: ../app/widgets/gimphelp.c:746 -msgid "" -"You may either install the additional help package or change your " -"preferences to use the online version." -msgstr "" -"Puede elegir entre instalar el paquete adicional de ayuda o cambiar las " -"preferencias para usar la versión en línea." - -#: ../app/widgets/gimphistogrameditor.c:99 -msgid "Mean:" -msgstr "Media:" - -#: ../app/widgets/gimphistogrameditor.c:100 -msgid "Std dev:" -msgstr "Desv. est.:" - -#: ../app/widgets/gimphistogrameditor.c:101 -msgid "Median:" -msgstr "Mediana:" - -#: ../app/widgets/gimphistogrameditor.c:102 -msgid "Pixels:" -msgstr "Píxeles:" - -#: ../app/widgets/gimphistogrameditor.c:103 -msgid "Count:" -msgstr "Cuenta:" - -#: ../app/widgets/gimphistogrameditor.c:104 -msgid "Percentile:" -msgstr "Percentil:" - -#: ../app/widgets/gimphistogrameditor.c:122 -msgid "Channel:" -msgstr "Canal:" - -#. Button -#: ../app/widgets/gimpimagecommenteditor.c:107 -msgid "Use default comment" -msgstr "Usar comentario predeterminado" - -#: ../app/widgets/gimpimagecommenteditor.c:109 -msgid "" -"Replace the current image comment with the default comment set in " -"Edit→Preferences→Default Image." -msgstr "" -"Sustituir el comentario actual de la imagen por el comentario predeterminado " -"establecido en Editar→Preferencias→Imagen predeterminada." - -#: ../app/widgets/gimpimageprofileview.c:202 -msgid "Querying..." -msgstr "Consultando…" - -#: ../app/widgets/gimpimagepropview.c:113 -msgid "Size in pixels:" -msgstr "Tamaño en píxeles:" - -#: ../app/widgets/gimpimagepropview.c:116 -msgid "Print size:" -msgstr "Tamaño de la impresión:" - -#: ../app/widgets/gimpimagepropview.c:119 -msgid "Resolution:" -msgstr "Resolución:" - -#: ../app/widgets/gimpimagepropview.c:122 -msgid "Color space:" -msgstr "Espacio de color:" - -#: ../app/widgets/gimpimagepropview.c:127 -msgid "File Name:" -msgstr "Nombre de archivo:" - -#: ../app/widgets/gimpimagepropview.c:133 -msgid "File Size:" -msgstr "Tamaño del archivo:" - -#: ../app/widgets/gimpimagepropview.c:136 -msgid "File Type:" -msgstr "Tipo de archivo:" - -#: ../app/widgets/gimpimagepropview.c:141 -msgid "Size in memory:" -msgstr "Tamaño en la memoria:" - -#: ../app/widgets/gimpimagepropview.c:144 -msgid "Undo steps:" -msgstr "Pasos de deshacer:" - -#: ../app/widgets/gimpimagepropview.c:147 -msgid "Redo steps:" -msgstr "Pasos de rehacer:" - -#: ../app/widgets/gimpimagepropview.c:152 -msgid "Number of pixels:" -msgstr "Número de píxeles:" - -#: ../app/widgets/gimpimagepropview.c:155 -msgid "Number of layers:" -msgstr "Número de capas:" - -#: ../app/widgets/gimpimagepropview.c:158 -msgid "Number of channels:" -msgstr "Número de canales:" - -#: ../app/widgets/gimpimagepropview.c:161 -msgid "Number of paths:" -msgstr "Número de rutas:" - -#. no undo (or redo) steps available -#: ../app/widgets/gimpimagepropview.c:410 -msgid "None" -msgstr "Ninguno" - -#: ../app/widgets/gimpimagepropview.c:464 -#: ../app/widgets/gimptemplateeditor.c:331 -#, c-format -msgid "pixels/%s" -msgstr "píxeles/%s" - -#: ../app/widgets/gimpimagepropview.c:466 -#, c-format -msgid "%g × %g %s" -msgstr "%g x %g %s" - -#: ../app/widgets/gimpimagepropview.c:487 -msgid "colors" -msgstr "colores" - -#: ../app/widgets/gimpitemtreeview.c:716 -msgid "Lock:" -msgstr "Bloquear:" - -#: ../app/widgets/gimplayertreeview.c:307 -msgid "Lock alpha channel" -msgstr "Bloquear el canal alfa" - -#: ../app/widgets/gimpmessagebox.c:433 -#, c-format -msgid "Message repeated once." -msgid_plural "Message repeated %d times." -msgstr[0] "Mensaje repetido una vez." -msgstr[1] "Mensaje repetido %d veces." - -#: ../app/widgets/gimppaletteeditor.c:240 -#: ../app/widgets/gimppaletteeditor.c:715 -msgid "Undefined" -msgstr "Indefinido" - -#: ../app/widgets/gimppaletteeditor.c:248 -msgid "Columns:" -msgstr "Columnas:" - -#: ../app/widgets/gimppanedbox.c:58 -msgid "You can drop dockable dialogs here" -msgstr "Puede soltar aquí los cuadros de diálogo empotrables" - -#: ../app/widgets/gimpprofilechooserdialog.c:127 -msgid "ICC color profile (*.icc, *.icm)" -msgstr "Perfil de color ICC (*.icc, *.icm)" - -#: ../app/widgets/gimpprogressdialog.c:221 -msgid "Progress" -msgstr "Progreso" - -#: ../app/widgets/gimpselectiondata.c:249 -#, c-format -msgid "" -"The filename '%s' couldn't be converted to a valid URI:\n" -"\n" -"%s" -msgstr "" -"El nombre de archivo «%s» no ha podido convertirse en una URI válida:\n" -"\n" -"%s" - -#: ../app/widgets/gimpselectiondata.c:253 -msgid "Invalid UTF-8" -msgstr "UTF-8 no válido" - -#: ../app/widgets/gimpsettingsbox.c:269 -msgid "Pick a setting from the list" -msgstr "Seleccione un ajuste de la lista" - -#: ../app/widgets/gimpsettingsbox.c:291 -msgid "Add settings to favorites" -msgstr "Añadir los ajustes a los favoritos" - -#: ../app/widgets/gimpsettingsbox.c:319 -msgid "_Import Settings from File..." -msgstr "_Importar ajustes desde un archivo…" - -#: ../app/widgets/gimpsettingsbox.c:325 -msgid "_Export Settings to File..." -msgstr "_Exportar ajustes a un archivo…" - -#: ../app/widgets/gimpsettingsbox.c:332 -msgid "_Manage Settings..." -msgstr "_Gestionar ajustes…" - -#: ../app/widgets/gimpsettingsbox.c:636 -msgid "Add Settings to Favorites" -msgstr "Añadir ajustes a los favoritos" - -#: ../app/widgets/gimpsettingsbox.c:639 -msgid "Enter a name for the settings" -msgstr "Introduzca un nombre para las opciones guardadas" - -#: ../app/widgets/gimpsettingsbox.c:640 -msgid "Saved Settings" -msgstr "Opciones guardadas" - -#: ../app/widgets/gimpsettingsbox.c:681 -msgid "Manage Saved Settings" -msgstr "Gestionar las opciones guardadas" - -#: ../app/widgets/gimpsettingseditor.c:194 -msgid "Import settings from a file" -msgstr "Importar ajustes desde un archivo" - -#: ../app/widgets/gimpsettingseditor.c:203 -msgid "Export the selected settings to a file" -msgstr "Exportar los ajustes seleccionados a un archivo" - -#: ../app/widgets/gimpsettingseditor.c:212 -msgid "Delete the selected settings" -msgstr "Eliminar los ajustes seleccionados" - -#: ../app/widgets/gimpsizebox.c:458 -#, c-format -msgid "%d × %d ppi" -msgstr "%d x %d ppp" - -#: ../app/widgets/gimpsizebox.c:460 -#, c-format -msgid "%d ppi" -msgstr "%d ppp" - -#: ../app/widgets/gimpstrokeeditor.c:129 -msgid "Line width:" -msgstr "Anchura de la línea:" - -#: ../app/widgets/gimpstrokeeditor.c:141 -msgid "_Line Style" -msgstr "E_stilo de la línea" - -#: ../app/widgets/gimpstrokeeditor.c:160 -msgid "_Cap style:" -msgstr "Estilo del extrem_o:" - -#: ../app/widgets/gimpstrokeeditor.c:166 -msgid "_Join style:" -msgstr "E_stilo de la unión:" - -#: ../app/widgets/gimpstrokeeditor.c:171 -msgid "_Miter limit:" -msgstr "Límite del pico [_miter]:" - -#: ../app/widgets/gimpstrokeeditor.c:178 -msgid "Dash pattern:" -msgstr "Patrón de punteado:" - -#: ../app/widgets/gimpstrokeeditor.c:241 -msgid "Dash _preset:" -msgstr "Ajuste _prefijado del punteado:" - -#: ../app/widgets/gimptagentry.c:45 -msgid "filter" -msgstr "filtro" - -#: ../app/widgets/gimptagentry.c:46 -msgid "enter tags" -msgstr "introducir etiquetas" - -#. Seperator for tags -#. * IMPORTANT: use only one of Unicode terminal punctuation chars. -#. * http://unicode.org/review/pr-23.html -#. -#: ../app/widgets/gimptagentry.c:1750 -msgid "," -msgstr "," - -#: ../app/widgets/gimptemplateeditor.c:201 -#, c-format -msgid "%p" -msgstr "%p" - -#: ../app/widgets/gimptemplateeditor.c:276 -msgid "_Advanced Options" -msgstr "_Opciones avanzadas" - -#: ../app/widgets/gimptemplateeditor.c:387 -msgid "Color _space:" -msgstr "E_spacio de color:" - -#: ../app/widgets/gimptemplateeditor.c:395 -msgid "_Fill with:" -msgstr "R_ellenar con:" - -#: ../app/widgets/gimptemplateeditor.c:405 -msgid "Comme_nt:" -msgstr "Come_ntario:" - -#: ../app/widgets/gimptemplateeditor.c:512 -msgid "_Name:" -msgstr "_Nombre:" - -#: ../app/widgets/gimptemplateeditor.c:519 -msgid "_Icon:" -msgstr "_Icono:" - -#: ../app/widgets/gimptemplateeditor.c:699 -#, c-format -msgid "%d × %d ppi, %s" -msgstr "%d x %d ppp, %s" - -#: ../app/widgets/gimptemplateeditor.c:701 -#, c-format -msgid "%d ppi, %s" -msgstr "%d ppp, %s" - -#: ../app/widgets/gimptextbuffer-serialize.c:344 -#, c-format -msgid "Attribute \"%s\" is invalid on <%s> element in this context" -msgstr "El atributo «%s» no es válido sobre el elemento <%s> en este contexto" - -#: ../app/widgets/gimptextbuffer-serialize.c:416 -#, c-format -msgid "Outermost element in text must be not <%s>" -msgstr "El elemento más externo dentro del texto debe ser , no <%s>" - -#: ../app/widgets/gimptextbuffer.c:1459 -#, c-format -msgid "Invalid UTF-8 data in file '%s'." -msgstr "Datos UTF-8 no válidos en el archivo «%s»." - -#: ../app/widgets/gimptexteditor.c:222 -msgid "_Use selected font" -msgstr "_Utilizar la tipografía seleccionada" - -#: ../app/widgets/gimptextstyleeditor.c:206 -msgid "Change font of selected text" -msgstr "Cambiar la tipografía del texto seleccionado" - -#: ../app/widgets/gimptextstyleeditor.c:217 -msgid "Change size of selected text" -msgstr "Cambiar el tamaño del texto seleccionado" - -#: ../app/widgets/gimptextstyleeditor.c:236 -msgid "Clear style of selected text" -msgstr "Borrar el estilo del texto seleccionado" - -#: ../app/widgets/gimptextstyleeditor.c:247 -#: ../app/widgets/gimptextstyleeditor.c:256 -msgid "Change color of selected text" -msgstr "Cambiar el color del texto seleccionado" - -#: ../app/widgets/gimptextstyleeditor.c:272 -msgid "Change kerning of selected text" -msgstr "Cambiar el kerning del texto seleccionado" - -#: ../app/widgets/gimptextstyleeditor.c:288 -msgid "Change baseline of selected text" -msgstr "Cambiar la línea de base del texto seleccionado" - -#: ../app/widgets/gimptextstyleeditor.c:328 -msgid "Bold" -msgstr "Negrita" - -#: ../app/widgets/gimptextstyleeditor.c:331 -msgid "Italic" -msgstr "Cursiva" - -#: ../app/widgets/gimptextstyleeditor.c:334 -msgid "Underline" -msgstr "Subrayado" - -#: ../app/widgets/gimptextstyleeditor.c:337 -msgid "Strikethrough" -msgstr "Tachado" - -#: ../app/widgets/gimpthumbbox.c:330 -#, c-format -msgid "" -"Click to update preview\n" -"%s-Click to force update even if preview is up-to-date" -msgstr "" -"Pulse para actualizar la vista previa\n" -"Haga %s+pulsación para forzar la actualización aún si la vista previa está " -"actualizada" - -#: ../app/widgets/gimpthumbbox.c:347 -msgid "Pr_eview" -msgstr "_Vista previa" - -#: ../app/widgets/gimpthumbbox.c:404 ../app/widgets/gimpthumbbox.c:468 -msgid "No selection" -msgstr "No hay selección" - -#: ../app/widgets/gimpthumbbox.c:596 ../app/widgets/gimpthumbbox.c:617 -#, c-format -msgid "Thumbnail %d of %d" -msgstr "Miniatura %d de %d" - -#: ../app/widgets/gimpthumbbox.c:730 ../app/widgets/gimpthumbbox.c:740 -msgid "Creating preview..." -msgstr "Creando la vista previa…" - -#: ../app/widgets/gimptoolbox-color-area.c:79 -msgid "" -"Foreground & background colors.\n" -"The black and white squares reset colors.\n" -"The arrows swap colors.\n" -"Click to open the color selection dialog." -msgstr "" -"Colores de frente y fondo.\n" -"Los cuadrados blancos y negros reinician los colores.\n" -"Las flechas intercambian los colores.\n" -"Pulse para abrir el diálogo de selección de colores." - -#: ../app/widgets/gimptoolbox-color-area.c:140 -msgid "Change Foreground Color" -msgstr "Cambiar el color de frente" - -#: ../app/widgets/gimptoolbox-color-area.c:145 -msgid "Change Background Color" -msgstr "Cambiar el color de fondo" - -#: ../app/widgets/gimptoolbox-image-area.c:118 -#: ../app/widgets/gimptoolbox-image-area.c:123 -msgid "" -"The active image.\n" -"Click to open the Image Dialog." -msgstr "" -"La imagen activa.\n" -"Pulse para abrir el diálogo de imagen." - -#: ../app/widgets/gimptoolbox-image-area.c:120 -msgid "Drag to an XDS enabled file-manager to save the image." -msgstr "Arrastre sobre un gestor de archivos con XDS para guardar la imagen." - -#: ../app/widgets/gimptoolbox-indicator-area.c:163 -msgid "" -"The active brush.\n" -"Click to open the Brush Dialog." -msgstr "" -"El pincel activo.\n" -"Pulse para abrir el diálogo de pinceles." - -#: ../app/widgets/gimptoolbox-indicator-area.c:195 -msgid "" -"The active pattern.\n" -"Click to open the Pattern Dialog." -msgstr "" -"El patrón activo.\n" -"Pulse para abrir el diálogo de patrones." - -#: ../app/widgets/gimptoolbox-indicator-area.c:227 -msgid "" -"The active gradient.\n" -"Click to open the Gradient Dialog." -msgstr "" -"El degradado activo.\n" -"Pulse para abrir el diálogo de degradados." - -#: ../app/widgets/gimptooleditor.c:294 -msgid "Raise this tool" -msgstr "Eleva esta herramienta" - -#: ../app/widgets/gimptooleditor.c:295 -msgid "Raise this tool to the top" -msgstr "Elevar esta herramienta hasta el lugar más alto" - -#: ../app/widgets/gimptooleditor.c:302 -msgid "Lower this tool" -msgstr "Bajar esta herramienta" - -#: ../app/widgets/gimptooleditor.c:303 -msgid "Lower this tool to the bottom" -msgstr "Bajar esta herramienta hasta el lugar más bajo" - -#: ../app/widgets/gimptooleditor.c:310 -msgid "Reset tool order and visibility" -msgstr "Reiniciar el orden y la visibilidad de las herramientas" - -#: ../app/widgets/gimptooloptionseditor.c:202 -msgid "Save Tool Preset..." -msgstr "Guardar ajuste prefijado de herramienta…" - -#: ../app/widgets/gimptooloptionseditor.c:210 -msgid "Restore Tool Preset..." -msgstr "Restaurar los ajustes prefijados de herramienta…" - -#: ../app/widgets/gimptooloptionseditor.c:218 -msgid "Delete Tool Preset..." -msgstr "Eliminar ajuste prefijado de herramienta…" - -#: ../app/widgets/gimptoolpreseteditor.c:148 -msgid "Icon:" -msgstr "Icono:" - -#: ../app/widgets/gimptoolpreseteditor.c:159 -msgid "Apply stored FG/BG" -msgstr "Aplicar el primer plano y el fondo almacenados" - -#: ../app/widgets/gimptoolpreseteditor.c:165 -msgid "Apply stored brush" -msgstr "Aplicar el pincel almacenado" - -#: ../app/widgets/gimptoolpreseteditor.c:171 -msgid "Apply stored dynamics" -msgstr "Aplicar la dinámica almacenada" - -#: ../app/widgets/gimptoolpreseteditor.c:177 -msgid "Apply stored gradient" -msgstr "Aplicar el degradado almacenado" - -#: ../app/widgets/gimptoolpreseteditor.c:183 -msgid "Apply stored pattern" -msgstr "Aplicar el patrón almacenado" - -#: ../app/widgets/gimptoolpreseteditor.c:189 -msgid "Apply stored palette" -msgstr "Aplicar la paleta almacenada" - -#: ../app/widgets/gimptoolpreseteditor.c:195 -msgid "Apply stored font" -msgstr "Aplicar la tipografía almacenada" - -#: ../app/widgets/gimptoolpreseteditor.c:292 -#, c-format -msgid "%s Preset" -msgstr "Ajuste prefijado %s" - -#: ../app/widgets/gimptranslationstore.c:100 -msgid "System Language" -msgstr "Idioma del sistema" - -#: ../app/widgets/gimptranslationstore.c:102 -msgid "English" -msgstr "Inglés" - -#: ../app/widgets/gimpuimanager.c:742 -msgid "Your GIMP installation is incomplete:" -msgstr "Su instalación de GIMP está incompleta:" - -#: ../app/widgets/gimpuimanager.c:744 -msgid "Please make sure the menu XML files are correctly installed." -msgstr "" -"Asegúrese de que los archivos XML del menú están instalados correctamente." - -#: ../app/widgets/gimpuimanager.c:750 -#, c-format -msgid "There was an error parsing the menu definition from %s: %s" -msgstr "Hubo un error al analizar la definición de menú a partir de %s: %s" - -#: ../app/widgets/gimpundoeditor.c:262 -msgid "[ Base Image ]" -msgstr "[ Imagen Base ]" - -#: ../app/widgets/gimpvectorstreeview.c:111 -msgid "Lock path strokes" -msgstr "Bloquear los trazos de ruta" - -#: ../app/widgets/gimpviewablebox.c:87 -msgid "Open the brush selection dialog" -msgstr "Abrir el diálogo de selección de pincel" - -#: ../app/widgets/gimpviewablebox.c:151 -msgid "Open the dynamics selection dialog" -msgstr "Abrir el diálogo de selección de dinámica" - -#: ../app/widgets/gimpviewablebox.c:216 -msgid "Open the pattern selection dialog" -msgstr "Abrir el diálogo de selección de patrón" - -#: ../app/widgets/gimpviewablebox.c:284 -msgid "Open the gradient selection dialog" -msgstr "Abrir el diálogo de selección de degradado" - -#: ../app/widgets/gimpviewablebox.c:401 -msgid "Open the palette selection dialog" -msgstr "Abrir el diálogo de selección de paleta" - -#: ../app/widgets/gimpviewablebox.c:466 -msgid "Open the font selection dialog" -msgstr "Abrir el diálogo de selección de tipografía" - -#: ../app/widgets/gimpwidgets-utils.c:595 -#, c-format -msgid "%s (try %s)" -msgstr "%s (intente %s)" - -#: ../app/widgets/gimpwidgets-utils.c:595 -#, c-format -msgid "%s (%s)" -msgstr "%s (%s)" - -#: ../app/widgets/gimpwidgets-utils.c:599 -#, c-format -msgid "%s (try %s, %s)" -msgstr "%s (intente %s, %s)" - -#: ../app/widgets/gimpwidgets-utils.c:603 -#, c-format -msgid "%s (try %s, %s, %s)" -msgstr "%s (intente %s, %s, %s)" - -#: ../app/widgets/widgets-enums.c:23 -msgctxt "active-color" -msgid "Foreground" -msgstr "Frente" - -#: ../app/widgets/widgets-enums.c:24 -msgctxt "active-color" -msgid "Background" -msgstr "Fondo" - +#. the axes +#. The axes of an input device +#: ../app/widgets/gimpdeviceinfoeditor.c:195 +msgid "Axes" +msgstr "Ejes" + +#. the keys +#: ../app/widgets/gimpdeviceinfoeditor.c:269 +msgid "Keys" +msgstr "Teclas" + +#: ../app/widgets/gimpdeviceinfoeditor.c:366 +#: ../app/widgets/gimpdeviceinfoeditor.c:585 +#, c-format +msgid "none" +msgstr "ninguna" + +#. e.g. "Pressure Curve" for mapping input device axes +#: ../app/widgets/gimpdeviceinfoeditor.c:415 +#, c-format +msgid "%s Curve" +msgstr "Curva %s" + +#: ../app/widgets/gimpdeviceinfoeditor.c:474 +#: ../app/widgets/gimpdynamicsoutputeditor.c:209 +msgid "_Reset Curve" +msgstr "R_establecer la curva" + +#: ../app/widgets/gimpdeviceinfoeditor.c:487 +#, c-format +msgid "The axis '%s' has no curve" +msgstr "El eje «%s» no tiene ninguna curva" + +#: ../app/widgets/gimpdevicestatus.c:137 +msgid "Save device status" +msgstr "Guardar estado del dispositivo" + +#: ../app/widgets/gimpdevicestatus.c:433 +#, c-format +msgid "Foreground: %d, %d, %d" +msgstr "Frente: %d, %d, %d" + +#: ../app/widgets/gimpdevicestatus.c:438 +#, c-format +msgid "Background: %d, %d, %d" +msgstr "Fondo: %d, %d, %d" + +#: ../app/widgets/gimpdnd-xds.c:204 +msgid "The given filename does not have any known file extension." +msgstr "El archivo dado no tiene una extensión conocida." + +#: ../app/widgets/gimpdnd-xds.c:222 +msgid "File Exists" +msgstr "El archivo ya existe" + +#: ../app/widgets/gimpdnd-xds.c:227 +msgid "_Replace" +msgstr "_Reemplazar" + +#: ../app/widgets/gimpdnd-xds.c:238 +#, c-format +msgid "A file named '%s' already exists." +msgstr "Ya existe un archivo llamado «%s»." + +#: ../app/widgets/gimpdnd-xds.c:243 +msgid "Do you want to replace it with the image you are saving?" +msgstr "¿Quiere reemplazarlo por la imagen que está guardando?" + +#. String used to separate dockables, e.g. "Tool Options, Layers" +#: ../app/widgets/gimpdock.h:34 +msgctxt "dock" +msgid ", " +msgstr ", " + +#. String used to separate books (GtkNotebooks) within a dock, +#. e.g. "Tool Options, Layers - Brushes" +#. +#: ../app/widgets/gimpdock.h:39 +msgctxt "dock" +msgid " - " +msgstr " - " + +#. String used to separate dock columns, +#. e.g. "Tool Options, Layers - Brushes | Gradients" +#. +#: ../app/widgets/gimpdock.h:44 +msgctxt "dock" +msgid " | " +msgstr " | " + +#: ../app/widgets/gimpdockbook.c:291 +msgid "Configure this tab" +msgstr "Configurar esta pestaña" + +#. Auto button +#: ../app/widgets/gimpdockwindow.c:384 +msgid "Auto" +msgstr "Auto" + +#: ../app/widgets/gimpdockwindow.c:395 +msgid "" +"When enabled the dialog automatically follows the image you are working on." +msgstr "" +"Cuando está activado el diálogo automáticamente sigue a la imagen en la que " +"está trabajando." + +#: ../app/widgets/gimpdrawabletreeview.c:122 +msgid "Lock pixels" +msgstr "Bloquear píxeles" + +#: ../app/widgets/gimpdynamicseditor.c:135 +msgid "Mapping matrix" +msgstr "Matriz de mapeado" + +#: ../app/widgets/gimpdynamicseditor.c:142 +#: ../app/widgets/gimpdynamicsoutputeditor.c:70 +msgid "Velocity" +msgstr "Velocidad" + +#: ../app/widgets/gimpdynamicseditor.c:146 +#: ../app/widgets/gimpdynamicsoutputeditor.c:74 +msgid "Random" +msgstr "Aleatorio" + +#: ../app/widgets/gimpdynamicseditor.c:147 +#: ../app/widgets/gimpdynamicsoutputeditor.c:75 +msgid "Fade" +msgstr "Desvanecer" + +#: ../app/widgets/gimperrordialog.c:150 +msgid "Too many error messages!" +msgstr "¡Demasiados mensajes de error!" + +#: ../app/widgets/gimperrordialog.c:151 +msgid "Messages are redirected to stderr." +msgstr "Los mensajes se redirigen a stderr." + +#. %s is a message domain, +#. * like "GIMP Message" or +#. * "PNG Message" +#. +#: ../app/widgets/gimperrordialog.c:174 +#, c-format +msgid "%s Message" +msgstr "Mensaje de %s" + +#: ../app/widgets/gimpfiledialog.c:330 +msgid "Automatically Detected" +msgstr "Detectado automáticamente" + +#: ../app/widgets/gimpfiledialog.c:347 +msgid "By Extension" +msgstr "Por extensión" + +#: ../app/widgets/gimpfiledialog.c:801 +msgid "All files" +msgstr "Todos los archivos" + +#: ../app/widgets/gimpfiledialog.c:806 +msgid "All images" +msgstr "Todas las imágenes" + +#: ../app/widgets/gimpfiledialog.c:813 +msgid "All XCF images" +msgstr "Todas las imágenes XCF" + +#: ../app/widgets/gimpfiledialog.c:815 +msgid "All export images" +msgstr "Todas las imágenes exportadas" + +#: ../app/widgets/gimpfiledialog.c:999 +#, c-format +msgid "Select File _Type (%s)" +msgstr "Seleccione el _tipo de archivo (%s)" + +#: ../app/widgets/gimpfileprocview.c:185 +msgid "File Type" +msgstr "Tipo de archivo" + +#: ../app/widgets/gimpfileprocview.c:197 +msgid "Extensions" +msgstr "Extensiones" + +#: ../app/widgets/gimpfilleditor.c:124 +msgid "Fill Color" +msgstr "Rellenar con color" + +#: ../app/widgets/gimpfilleditor.c:143 +msgid "_Antialiasing" +msgstr "_Anti-alias" + +#: ../app/widgets/gimpgradienteditor.c:753 +#, c-format +msgid "Zoom factor: %d:1" +msgstr "Factor de aumento: %d:1" + +#: ../app/widgets/gimpgradienteditor.c:756 +#, c-format +msgid "Displaying [%0.4f, %0.4f]" +msgstr "Mostrando [%0.4f, %0.4f]" + +#: ../app/widgets/gimpgradienteditor.c:953 +#, c-format +msgid "Position: %0.4f" +msgstr "Posición: %0.4f" + +#: ../app/widgets/gimpgradienteditor.c:954 +#, c-format +msgid "RGB (%0.3f, %0.3f, %0.3f)" +msgstr "RGB (%0.3f, %0.3f, %0.3f)" + +#: ../app/widgets/gimpgradienteditor.c:956 +#, c-format +msgid "HSV (%0.1f, %0.1f, %0.1f)" +msgstr "HSV (%0.1f, %0.1f, %0.1f)" + +#: ../app/widgets/gimpgradienteditor.c:958 +#, c-format +msgid "Luminance: %0.1f Opacity: %0.1f" +msgstr "Luminancia: %0.1f Opacidad: %0.1f" + +#: ../app/widgets/gimpgradienteditor.c:989 +#, c-format +msgid "RGB (%d, %d, %d)" +msgstr "RGB (%d, %d, %d)" + +#: ../app/widgets/gimpgradienteditor.c:1000 +msgid "Foreground color set to:" +msgstr "Color de frente establecido a:" + +#: ../app/widgets/gimpgradienteditor.c:1007 +msgid "Background color set to:" +msgstr "Color de fondo establecido a:" + +#: ../app/widgets/gimpgradienteditor.c:1235 +#: ../app/widgets/gimpgradienteditor.c:1296 +#, c-format +msgid "%s-Drag: move & compress" +msgstr "%s+arrastrar: mover y comprimir" + +#: ../app/widgets/gimpgradienteditor.c:1240 +msgid "Drag: move" +msgstr "Arrastrar: mover" + +#: ../app/widgets/gimpgradienteditor.c:1247 +#: ../app/widgets/gimpgradienteditor.c:1260 +#: ../app/widgets/gimpgradienteditor.c:1273 +#: ../app/widgets/gimpgradienteditor.c:1294 +#, c-format +msgid "%s-Click: extend selection" +msgstr "%s+pulsación: extender selección" + +#: ../app/widgets/gimpgradienteditor.c:1252 +#: ../app/widgets/gimpgradienteditor.c:1265 +msgid "Click: select" +msgstr "Pulsar: seleccionar" + +#: ../app/widgets/gimpgradienteditor.c:1278 +#: ../app/widgets/gimpgradienteditor.c:1300 +msgid "Click: select Drag: move" +msgstr "Pulsar: seleccionar Arrastrar: mover" + +#: ../app/widgets/gimpgradienteditor.c:1515 +#: ../app/widgets/gimpgradienteditor.c:1523 +#, c-format +msgid "Handle position: %0.4f" +msgstr "Posición del tirador: %0.4f" + +#: ../app/widgets/gimpgradienteditor.c:1540 +#, c-format +msgid "Distance: %0.4f" +msgstr "Distancia: %0.4f" + +#: ../app/widgets/gimpgrideditor.c:147 +msgid "Line _style:" +msgstr "E_stilo de la línea:" + +#: ../app/widgets/gimpgrideditor.c:151 +msgid "Change grid foreground color" +msgstr "Cambiar el color de frente de la rejilla" + +#: ../app/widgets/gimpgrideditor.c:158 +msgid "_Foreground color:" +msgstr "Color de _frente:" + +#: ../app/widgets/gimpgrideditor.c:162 +msgid "Change grid background color" +msgstr "Cambiar el color de fondo de la rejilla" + +#: ../app/widgets/gimpgrideditor.c:169 +msgid "_Background color:" +msgstr "Color del _fondo:" + +#: ../app/widgets/gimpgrideditor.c:195 ../app/widgets/gimpgrideditor.c:227 +msgid "Width" +msgstr "Anchura" + +#: ../app/widgets/gimpgrideditor.c:197 ../app/widgets/gimpgrideditor.c:229 +msgid "Height" +msgstr "Altura" + +#: ../app/widgets/gimphelp.c:308 +msgid "Help browser is missing" +msgstr "Falta el visor de ayuda" + +#: ../app/widgets/gimphelp.c:309 +msgid "The GIMP help browser is not available." +msgstr "No está disponible el visor de ayuda de GIMP" + +#: ../app/widgets/gimphelp.c:310 +msgid "" +"The GIMP help browser plug-in appears to be missing from your installation. " +"You may instead use the web browser for reading the help pages." +msgstr "" +"Parece que falta el complemento del visor de ayuda de GIMP en su " +"instalación. En su lugar, puede usar el navegador web para leer las páginas " +"de ayuda." + +#: ../app/widgets/gimphelp.c:351 +msgid "Help browser doesn't start" +msgstr "El visor de ayuda no se inicia" + +#: ../app/widgets/gimphelp.c:352 +msgid "Could not start the GIMP help browser plug-in." +msgstr "No se ha podido iniciar el complemento del visor de ayuda de GIMP." + +#: ../app/widgets/gimphelp.c:354 +#| msgid "" +#| "The GIMP help browser plug-in appears to be missing from your " +#| "installation. You may instead use the web browser for reading the help " +#| "pages." +msgid "You may instead use the web browser for reading the help pages." +msgstr "" +"En su lugar, puede usar el navegador web para leer las páginas de ayuda." + +#: ../app/widgets/gimphelp.c:380 +msgid "Use _Web Browser" +msgstr "Usar el navegador _web" + +#: ../app/widgets/gimphelp.c:724 +msgid "GIMP user manual is missing" +msgstr "Falta el manual de usuario de GIMP" + +#: ../app/widgets/gimphelp.c:731 +msgid "_Read Online" +msgstr "_Leer en línea" + +#: ../app/widgets/gimphelp.c:755 +msgid "The GIMP user manual is not installed on your computer." +msgstr "El manual de usuario de GIMP no está instalado en su equipo." + +#: ../app/widgets/gimphelp.c:758 +msgid "" +"You may either install the additional help package or change your " +"preferences to use the online version." +msgstr "" +"Puede elegir entre instalar el paquete adicional de ayuda o cambiar las " +"preferencias para usar la versión en línea." + +#: ../app/widgets/gimphistogrameditor.c:99 +msgid "Mean:" +msgstr "Media:" + +#: ../app/widgets/gimphistogrameditor.c:100 +msgid "Std dev:" +msgstr "Desv. est.:" + +#: ../app/widgets/gimphistogrameditor.c:101 +msgid "Median:" +msgstr "Mediana:" + +#: ../app/widgets/gimphistogrameditor.c:102 +msgid "Pixels:" +msgstr "Píxeles:" + +#: ../app/widgets/gimphistogrameditor.c:103 +msgid "Count:" +msgstr "Cuenta:" + +#: ../app/widgets/gimphistogrameditor.c:104 +msgid "Percentile:" +msgstr "Percentil:" + +#: ../app/widgets/gimphistogrameditor.c:122 +msgid "Channel:" +msgstr "Canal:" + +#. Button +#: ../app/widgets/gimpimagecommenteditor.c:107 +msgid "Use default comment" +msgstr "Usar comentario predeterminado" + +#: ../app/widgets/gimpimagecommenteditor.c:109 +msgid "" +"Replace the current image comment with the default comment set in " +"Edit→Preferences→Default Image." +msgstr "" +"Sustituir el comentario actual de la imagen por el comentario predeterminado " +"establecido en Editar→Preferencias→Imagen predeterminada." + +#: ../app/widgets/gimpimageprofileview.c:202 +msgid "Querying..." +msgstr "Consultando…" + +#: ../app/widgets/gimpimagepropview.c:113 +msgid "Size in pixels:" +msgstr "Tamaño en píxeles:" + +#: ../app/widgets/gimpimagepropview.c:116 +msgid "Print size:" +msgstr "Tamaño de la impresión:" + +#: ../app/widgets/gimpimagepropview.c:119 +msgid "Resolution:" +msgstr "Resolución:" + +#: ../app/widgets/gimpimagepropview.c:122 +msgid "Color space:" +msgstr "Espacio de color:" + +#: ../app/widgets/gimpimagepropview.c:127 +msgid "File Name:" +msgstr "Nombre de archivo:" + +#: ../app/widgets/gimpimagepropview.c:133 +msgid "File Size:" +msgstr "Tamaño del archivo:" + +#: ../app/widgets/gimpimagepropview.c:136 +msgid "File Type:" +msgstr "Tipo de archivo:" + +#: ../app/widgets/gimpimagepropview.c:141 +msgid "Size in memory:" +msgstr "Tamaño en la memoria:" + +#: ../app/widgets/gimpimagepropview.c:144 +msgid "Undo steps:" +msgstr "Pasos de deshacer:" + +#: ../app/widgets/gimpimagepropview.c:147 +msgid "Redo steps:" +msgstr "Pasos de rehacer:" + +#: ../app/widgets/gimpimagepropview.c:152 +msgid "Number of pixels:" +msgstr "Número de píxeles:" + +#: ../app/widgets/gimpimagepropview.c:155 +msgid "Number of layers:" +msgstr "Número de capas:" + +#: ../app/widgets/gimpimagepropview.c:158 +msgid "Number of channels:" +msgstr "Número de canales:" + +#: ../app/widgets/gimpimagepropview.c:161 +msgid "Number of paths:" +msgstr "Número de rutas:" + +#. no undo (or redo) steps available +#: ../app/widgets/gimpimagepropview.c:410 +msgid "None" +msgstr "Ninguno" + +#: ../app/widgets/gimpimagepropview.c:464 +#: ../app/widgets/gimptemplateeditor.c:331 +#, c-format +msgid "pixels/%s" +msgstr "píxeles/%s" + +#: ../app/widgets/gimpimagepropview.c:466 +#, c-format +msgid "%g × %g %s" +msgstr "%g x %g %s" + +#: ../app/widgets/gimpimagepropview.c:487 +msgid "colors" +msgstr "colores" + +#: ../app/widgets/gimpitemtreeview.c:716 +msgid "Lock:" +msgstr "Bloquear:" + +#: ../app/widgets/gimplayertreeview.c:307 +msgid "Lock alpha channel" +msgstr "Bloquear el canal alfa" + +#: ../app/widgets/gimpmessagebox.c:433 +#, c-format +msgid "Message repeated once." +msgid_plural "Message repeated %d times." +msgstr[0] "Mensaje repetido una vez." +msgstr[1] "Mensaje repetido %d veces." + +#: ../app/widgets/gimppaletteeditor.c:240 +#: ../app/widgets/gimppaletteeditor.c:715 +msgid "Undefined" +msgstr "Indefinido" + +#: ../app/widgets/gimppaletteeditor.c:248 +msgid "Columns:" +msgstr "Columnas:" + +#: ../app/widgets/gimppanedbox.c:58 +msgid "You can drop dockable dialogs here" +msgstr "Puede soltar aquí los cuadros de diálogo empotrables" + +#: ../app/widgets/gimpprofilechooserdialog.c:127 +msgid "ICC color profile (*.icc, *.icm)" +msgstr "Perfil de color ICC (*.icc, *.icm)" + +#: ../app/widgets/gimpprogressdialog.c:221 +msgid "Progress" +msgstr "Progreso" + +#: ../app/widgets/gimpselectiondata.c:249 +#, c-format +msgid "" +"The filename '%s' couldn't be converted to a valid URI:\n" +"\n" +"%s" +msgstr "" +"El nombre de archivo «%s» no ha podido convertirse en una URI válida:\n" +"\n" +"%s" + +#: ../app/widgets/gimpselectiondata.c:253 +msgid "Invalid UTF-8" +msgstr "UTF-8 no válido" + +#: ../app/widgets/gimpsettingsbox.c:269 +msgid "Pick a setting from the list" +msgstr "Seleccione un ajuste de la lista" + +#: ../app/widgets/gimpsettingsbox.c:291 +msgid "Add settings to favorites" +msgstr "Añadir los ajustes a los favoritos" + +#: ../app/widgets/gimpsettingsbox.c:319 +msgid "_Import Settings from File..." +msgstr "_Importar ajustes desde un archivo…" + +#: ../app/widgets/gimpsettingsbox.c:325 +msgid "_Export Settings to File..." +msgstr "_Exportar ajustes a un archivo…" + +#: ../app/widgets/gimpsettingsbox.c:332 +msgid "_Manage Settings..." +msgstr "_Gestionar ajustes…" + +#: ../app/widgets/gimpsettingsbox.c:636 +msgid "Add Settings to Favorites" +msgstr "Añadir ajustes a los favoritos" + +#: ../app/widgets/gimpsettingsbox.c:639 +msgid "Enter a name for the settings" +msgstr "Introduzca un nombre para las opciones guardadas" + +#: ../app/widgets/gimpsettingsbox.c:640 +msgid "Saved Settings" +msgstr "Opciones guardadas" + +#: ../app/widgets/gimpsettingsbox.c:681 +msgid "Manage Saved Settings" +msgstr "Gestionar las opciones guardadas" + +#: ../app/widgets/gimpsettingseditor.c:194 +msgid "Import settings from a file" +msgstr "Importar ajustes desde un archivo" + +#: ../app/widgets/gimpsettingseditor.c:203 +msgid "Export the selected settings to a file" +msgstr "Exportar los ajustes seleccionados a un archivo" + +#: ../app/widgets/gimpsettingseditor.c:212 +msgid "Delete the selected settings" +msgstr "Eliminar los ajustes seleccionados" + +#: ../app/widgets/gimpsizebox.c:458 +#, c-format +msgid "%d × %d ppi" +msgstr "%d x %d ppp" + +#: ../app/widgets/gimpsizebox.c:460 +#, c-format +msgid "%d ppi" +msgstr "%d ppp" + +#: ../app/widgets/gimpstrokeeditor.c:129 +msgid "Line width:" +msgstr "Anchura de la línea:" + +#: ../app/widgets/gimpstrokeeditor.c:141 +msgid "_Line Style" +msgstr "E_stilo de la línea" + +#: ../app/widgets/gimpstrokeeditor.c:160 +msgid "_Cap style:" +msgstr "Estilo del extrem_o:" + +#: ../app/widgets/gimpstrokeeditor.c:166 +msgid "_Join style:" +msgstr "E_stilo de la unión:" + +#: ../app/widgets/gimpstrokeeditor.c:171 +msgid "_Miter limit:" +msgstr "Límite del pico [_miter]:" + +#: ../app/widgets/gimpstrokeeditor.c:178 +msgid "Dash pattern:" +msgstr "Patrón de punteado:" + +#: ../app/widgets/gimpstrokeeditor.c:241 +msgid "Dash _preset:" +msgstr "Ajuste _prefijado del punteado:" + +#: ../app/widgets/gimptagentry.c:45 +msgid "filter" +msgstr "filtro" + +#: ../app/widgets/gimptagentry.c:46 +msgid "enter tags" +msgstr "introducir etiquetas" + +#. Seperator for tags +#. * IMPORTANT: use only one of Unicode terminal punctuation chars. +#. * http://unicode.org/review/pr-23.html +#. +#: ../app/widgets/gimptagentry.c:1750 +msgid "," +msgstr "," + +#: ../app/widgets/gimptemplateeditor.c:201 +#, c-format +msgid "%p" +msgstr "%p" + +#: ../app/widgets/gimptemplateeditor.c:276 +msgid "_Advanced Options" +msgstr "_Opciones avanzadas" + +#: ../app/widgets/gimptemplateeditor.c:387 +msgid "Color _space:" +msgstr "E_spacio de color:" + +#: ../app/widgets/gimptemplateeditor.c:395 +msgid "_Fill with:" +msgstr "R_ellenar con:" + +#: ../app/widgets/gimptemplateeditor.c:405 +msgid "Comme_nt:" +msgstr "Come_ntario:" + +#: ../app/widgets/gimptemplateeditor.c:512 +msgid "_Name:" +msgstr "_Nombre:" + +#: ../app/widgets/gimptemplateeditor.c:519 +msgid "_Icon:" +msgstr "_Icono:" + +#: ../app/widgets/gimptemplateeditor.c:699 +#, c-format +msgid "%d × %d ppi, %s" +msgstr "%d x %d ppp, %s" + +#: ../app/widgets/gimptemplateeditor.c:701 +#, c-format +msgid "%d ppi, %s" +msgstr "%d ppp, %s" + +#: ../app/widgets/gimptextbuffer-serialize.c:269 +#, c-format +msgid "Attribute \"%s\" is invalid on <%s> element in this context" +msgstr "El atributo «%s» no es válido sobre el elemento <%s> en este contexto" + +#: ../app/widgets/gimptextbuffer-serialize.c:341 +#, c-format +msgid "Outermost element in text must be not <%s>" +msgstr "El elemento más externo dentro del texto debe ser , no <%s>" + +#: ../app/widgets/gimptextbuffer.c:1460 +#, c-format +msgid "Invalid UTF-8 data in file '%s'." +msgstr "Datos UTF-8 no válidos en el archivo «%s»." + +#: ../app/widgets/gimptexteditor.c:222 +msgid "_Use selected font" +msgstr "_Utilizar la tipografía seleccionada" + +#: ../app/widgets/gimptextstyleeditor.c:206 +msgid "Change font of selected text" +msgstr "Cambiar la tipografía del texto seleccionado" + +#: ../app/widgets/gimptextstyleeditor.c:217 +msgid "Change size of selected text" +msgstr "Cambiar el tamaño del texto seleccionado" + +#: ../app/widgets/gimptextstyleeditor.c:236 +msgid "Clear style of selected text" +msgstr "Borrar el estilo del texto seleccionado" + +#: ../app/widgets/gimptextstyleeditor.c:247 +#: ../app/widgets/gimptextstyleeditor.c:256 +msgid "Change color of selected text" +msgstr "Cambiar el color del texto seleccionado" + +#: ../app/widgets/gimptextstyleeditor.c:272 +msgid "Change kerning of selected text" +msgstr "Cambiar el kerning del texto seleccionado" + +#: ../app/widgets/gimptextstyleeditor.c:288 +msgid "Change baseline of selected text" +msgstr "Cambiar la línea de base del texto seleccionado" + +#: ../app/widgets/gimptextstyleeditor.c:328 +msgid "Bold" +msgstr "Negrita" + +#: ../app/widgets/gimptextstyleeditor.c:331 +msgid "Italic" +msgstr "Cursiva" + +#: ../app/widgets/gimptextstyleeditor.c:334 +msgid "Underline" +msgstr "Subrayado" + +#: ../app/widgets/gimptextstyleeditor.c:337 +msgid "Strikethrough" +msgstr "Tachado" + +#: ../app/widgets/gimpthumbbox.c:330 +#, c-format +msgid "" +"Click to update preview\n" +"%s-Click to force update even if preview is up-to-date" +msgstr "" +"Pulse para actualizar la vista previa\n" +"Haga %s+pulsación para forzar la actualización aún si la vista previa está " +"actualizada" + +#: ../app/widgets/gimpthumbbox.c:347 +msgid "Pr_eview" +msgstr "_Vista previa" + +#: ../app/widgets/gimpthumbbox.c:404 ../app/widgets/gimpthumbbox.c:468 +msgid "No selection" +msgstr "No hay selección" + +#: ../app/widgets/gimpthumbbox.c:612 ../app/widgets/gimpthumbbox.c:633 +#, c-format +msgid "Thumbnail %d of %d" +msgstr "Miniatura %d de %d" + +#: ../app/widgets/gimpthumbbox.c:746 ../app/widgets/gimpthumbbox.c:756 +msgid "Creating preview..." +msgstr "Creando la vista previa…" + +#: ../app/widgets/gimptoolbox-color-area.c:79 +msgid "" +"Foreground & background colors.\n" +"The black and white squares reset colors.\n" +"The arrows swap colors.\n" +"Click to open the color selection dialog." +msgstr "" +"Colores de frente y fondo.\n" +"Los cuadrados blancos y negros reinician los colores.\n" +"Las flechas intercambian los colores.\n" +"Pulse para abrir el diálogo de selección de colores." + +#: ../app/widgets/gimptoolbox-color-area.c:140 +msgid "Change Foreground Color" +msgstr "Cambiar el color de frente" + +#: ../app/widgets/gimptoolbox-color-area.c:145 +msgid "Change Background Color" +msgstr "Cambiar el color de fondo" + +#: ../app/widgets/gimptoolbox-image-area.c:118 +#: ../app/widgets/gimptoolbox-image-area.c:123 +msgid "" +"The active image.\n" +"Click to open the Image Dialog." +msgstr "" +"La imagen activa.\n" +"Pulse para abrir el diálogo de imagen." + +#: ../app/widgets/gimptoolbox-image-area.c:120 +msgid "Drag to an XDS enabled file-manager to save the image." +msgstr "Arrastre sobre un gestor de archivos con XDS para guardar la imagen." + +#: ../app/widgets/gimptoolbox-indicator-area.c:163 +msgid "" +"The active brush.\n" +"Click to open the Brush Dialog." +msgstr "" +"El pincel activo.\n" +"Pulse para abrir el diálogo de pinceles." + +#: ../app/widgets/gimptoolbox-indicator-area.c:195 +msgid "" +"The active pattern.\n" +"Click to open the Pattern Dialog." +msgstr "" +"El patrón activo.\n" +"Pulse para abrir el diálogo de patrones." + +#: ../app/widgets/gimptoolbox-indicator-area.c:227 +msgid "" +"The active gradient.\n" +"Click to open the Gradient Dialog." +msgstr "" +"El degradado activo.\n" +"Pulse para abrir el diálogo de degradados." + +#: ../app/widgets/gimptooleditor.c:294 +msgid "Raise this tool" +msgstr "Eleva esta herramienta" + +#: ../app/widgets/gimptooleditor.c:295 +msgid "Raise this tool to the top" +msgstr "Elevar esta herramienta hasta el lugar más alto" + +#: ../app/widgets/gimptooleditor.c:302 +msgid "Lower this tool" +msgstr "Bajar esta herramienta" + +#: ../app/widgets/gimptooleditor.c:303 +msgid "Lower this tool to the bottom" +msgstr "Bajar esta herramienta hasta el lugar más bajo" + +#: ../app/widgets/gimptooleditor.c:310 +msgid "Reset tool order and visibility" +msgstr "Reiniciar el orden y la visibilidad de las herramientas" + +#: ../app/widgets/gimptooloptionseditor.c:202 +msgid "Save Tool Preset..." +msgstr "Guardar ajuste prefijado de herramienta…" + +#: ../app/widgets/gimptooloptionseditor.c:210 +msgid "Restore Tool Preset..." +msgstr "Restaurar los ajustes prefijados de herramienta…" + +#: ../app/widgets/gimptooloptionseditor.c:218 +msgid "Delete Tool Preset..." +msgstr "Eliminar ajuste prefijado de herramienta…" + +#: ../app/widgets/gimptoolpreseteditor.c:148 +msgid "Icon:" +msgstr "Icono:" + +#: ../app/widgets/gimptoolpreseteditor.c:159 +msgid "Apply stored FG/BG" +msgstr "Aplicar el primer plano y el fondo almacenados" + +#: ../app/widgets/gimptoolpreseteditor.c:165 +msgid "Apply stored brush" +msgstr "Aplicar el pincel almacenado" + +#: ../app/widgets/gimptoolpreseteditor.c:171 +msgid "Apply stored dynamics" +msgstr "Aplicar la dinámica almacenada" + +#: ../app/widgets/gimptoolpreseteditor.c:177 +msgid "Apply stored gradient" +msgstr "Aplicar el degradado almacenado" + +#: ../app/widgets/gimptoolpreseteditor.c:183 +msgid "Apply stored pattern" +msgstr "Aplicar el patrón almacenado" + +#: ../app/widgets/gimptoolpreseteditor.c:189 +msgid "Apply stored palette" +msgstr "Aplicar la paleta almacenada" + +#: ../app/widgets/gimptoolpreseteditor.c:195 +msgid "Apply stored font" +msgstr "Aplicar la tipografía almacenada" + +#: ../app/widgets/gimptoolpreseteditor.c:292 +#, c-format +msgid "%s Preset" +msgstr "Ajuste prefijado %s" + +#: ../app/widgets/gimptranslationstore.c:100 +msgid "System Language" +msgstr "Idioma del sistema" + +#: ../app/widgets/gimptranslationstore.c:102 +msgid "English" +msgstr "Inglés" + +#: ../app/widgets/gimpuimanager.c:742 +msgid "Your GIMP installation is incomplete:" +msgstr "Su instalación de GIMP está incompleta:" + +#: ../app/widgets/gimpuimanager.c:744 +msgid "Please make sure the menu XML files are correctly installed." +msgstr "" +"Asegúrese de que los archivos XML del menú están instalados correctamente." + +#: ../app/widgets/gimpuimanager.c:750 +#, c-format +msgid "There was an error parsing the menu definition from %s: %s" +msgstr "Hubo un error al analizar la definición de menú a partir de %s: %s" + +#: ../app/widgets/gimpundoeditor.c:262 +msgid "[ Base Image ]" +msgstr "[ Imagen Base ]" + +#: ../app/widgets/gimpvectorstreeview.c:111 +msgid "Lock path strokes" +msgstr "Bloquear los trazos de ruta" + +#: ../app/widgets/gimpviewablebox.c:87 +msgid "Open the brush selection dialog" +msgstr "Abrir el diálogo de selección de pincel" + +#: ../app/widgets/gimpviewablebox.c:151 +msgid "Open the dynamics selection dialog" +msgstr "Abrir el diálogo de selección de dinámica" + +#: ../app/widgets/gimpviewablebox.c:216 +msgid "Open the pattern selection dialog" +msgstr "Abrir el diálogo de selección de patrón" + +#: ../app/widgets/gimpviewablebox.c:284 +msgid "Open the gradient selection dialog" +msgstr "Abrir el diálogo de selección de degradado" + +#: ../app/widgets/gimpviewablebox.c:401 +msgid "Open the palette selection dialog" +msgstr "Abrir el diálogo de selección de paleta" + +#: ../app/widgets/gimpviewablebox.c:466 +msgid "Open the font selection dialog" +msgstr "Abrir el diálogo de selección de tipografía" + +#: ../app/widgets/gimpwidgets-utils.c:595 +#, c-format +msgid "%s (try %s)" +msgstr "%s (intente %s)" + +#: ../app/widgets/gimpwidgets-utils.c:595 +#, c-format +msgid "%s (%s)" +msgstr "%s (%s)" + +#: ../app/widgets/gimpwidgets-utils.c:599 +#, c-format +msgid "%s (try %s, %s)" +msgstr "%s (intente %s, %s)" + +#: ../app/widgets/gimpwidgets-utils.c:603 +#, c-format +msgid "%s (try %s, %s, %s)" +msgstr "%s (intente %s, %s, %s)" + +#: ../app/widgets/widgets-enums.c:23 +msgctxt "active-color" +msgid "Foreground" +msgstr "Frente" + +#: ../app/widgets/widgets-enums.c:24 +msgctxt "active-color" +msgid "Background" +msgstr "Fondo" + # Debe ir en minúsculas por las reglas de estilo -#: ../app/widgets/widgets-enums.c:85 -msgctxt "color-frame-mode" -msgid "Pixel" -msgstr "Píxel" - -#: ../app/widgets/widgets-enums.c:86 -msgctxt "color-frame-mode" -msgid "RGB" -msgstr "RGB" - -#: ../app/widgets/widgets-enums.c:87 -msgctxt "color-frame-mode" -msgid "HSV" -msgstr "HSV" - -#: ../app/widgets/widgets-enums.c:88 -msgctxt "color-frame-mode" -msgid "CMYK" -msgstr "CMYK" - -#: ../app/widgets/widgets-enums.c:118 -msgctxt "color-pick-mode" -msgid "Pick only" -msgstr "Sólo seleccionar" - -#: ../app/widgets/widgets-enums.c:119 -msgctxt "color-pick-mode" -msgid "Set foreground color" -msgstr "Definir el color de frente" - -#: ../app/widgets/widgets-enums.c:120 -msgctxt "color-pick-mode" -msgid "Set background color" -msgstr "Definir el color de fondo" - -#: ../app/widgets/widgets-enums.c:121 -msgctxt "color-pick-mode" -msgid "Add to palette" -msgstr "Añadir a la paleta" - -#: ../app/widgets/widgets-enums.c:178 -msgctxt "histogram-scale" -msgid "Linear histogram" -msgstr "Histograma lineal" - -#: ../app/widgets/widgets-enums.c:179 -msgctxt "histogram-scale" -msgid "Logarithmic histogram" -msgstr "Histograma logarítmico" - -#: ../app/widgets/widgets-enums.c:215 -msgctxt "tab-style" -msgid "Icon" -msgstr "Icono" - -#: ../app/widgets/widgets-enums.c:216 -msgctxt "tab-style" -msgid "Current status" -msgstr "Estado actual" - -#: ../app/widgets/widgets-enums.c:217 -msgctxt "tab-style" -msgid "Text" -msgstr "Texto" - -#: ../app/widgets/widgets-enums.c:218 -msgctxt "tab-style" -msgid "Description" -msgstr "Descripción" - -#: ../app/widgets/widgets-enums.c:219 -msgctxt "tab-style" -msgid "Icon & text" -msgstr "Icono y texto" - -#: ../app/widgets/widgets-enums.c:220 -msgctxt "tab-style" -msgid "Icon & desc" -msgstr "Icono y descr." - -#: ../app/widgets/widgets-enums.c:221 -msgctxt "tab-style" -msgid "Status & text" -msgstr "Estado y texto" - -#: ../app/widgets/widgets-enums.c:222 -msgctxt "tab-style" -msgid "Status & desc" -msgstr "Estado y descripción" - -#: ../app/widgets/widgets-enums.c:223 -msgctxt "tab-style" -msgid "Undefined" -msgstr "Indefinido" - -#: ../app/xcf/xcf-load.c:392 -msgid "" -"This XCF file is corrupt! I have loaded as much of it as I can, but it is " -"incomplete." -msgstr "" -"¡Este archivo XCF está corrupto! He cargado de él todo lo que he podido, " -"pero está incompleto." - -#: ../app/xcf/xcf-load.c:403 -msgid "" -"This XCF file is corrupt! I could not even salvage any partial image data " -"from it." -msgstr "" -"¡Este archivo XCF está corrupto! No he podido salvar de él ni siquiera una " -"imagen parcial." - -#: ../app/xcf/xcf-load.c:477 -msgid "" -"XCF warning: version 0 of XCF file format\n" -"did not save indexed colormaps correctly.\n" -"Substituting grayscale map." -msgstr "" -"Aviso XCF: la versión 0 del formato de archivo\n" -"XCF no guardaba mapas de colores indexados \n" -"correctamente. Sustituyendo mapa de grises." - -#: ../app/xcf/xcf-read.c:174 -msgid "Invalid UTF-8 string in XCF file" -msgstr "Cadena UTF-8 no válida en el archivo XCF" - -#: ../app/xcf/xcf-write.c:155 -#, c-format -msgid "Error writing XCF: %s" -msgstr "Ocurrió un error al escribir XCF: %s" - -#: ../app/xcf/xcf-seek.c:61 -#, c-format -msgid "Could not seek in XCF file: %s" -msgstr "No se ha podido desplazarse dentro del archivo XCF: %s" - -#: ../app/xcf/xcf.c:113 ../app/xcf/xcf.c:181 -msgid "GIMP XCF image" -msgstr "Imagen XCF de GIMP" - -#: ../app/xcf/xcf.c:301 -#, c-format -msgid "Opening '%s'" -msgstr "Abriendo «%s»" - -#: ../app/xcf/xcf.c:343 -#, c-format -msgid "XCF error: unsupported XCF file version %d encountered" -msgstr "" -"Error XCF: se encontró una versión %d de archivo de tipo XCF no soportada" - -#: ../app/xcf/xcf.c:413 -#, c-format -msgid "Saving '%s'" -msgstr "Guardando «%s»" - -#: ../app/xcf/xcf.c:433 -#, c-format -msgid "Error saving XCF file: %s" -msgstr "Ocurrió un error al guardar el archivo XCF: %s" - -#: ../data/tags/gimp-tags-default.xml.in.h:1 -msgid "round" -msgstr "redondo" - -#. fuzzy as in a feathered, blurred, unfocused, soft brush -#: ../data/tags/gimp-tags-default.xml.in.h:3 -msgid "fuzzy" -msgstr "borroso" - -#: ../desktop/gimp.appdata.xml.in.h:1 -msgid "" -"GIMP is an acronym for GNU Image Manipulation Program. It is a freely " -"distributed program for such tasks as photo retouching, image composition " -"and image authoring." -msgstr "" -"GIMP es el acrónimo de Programa de Manipulación de Imágenes de GNU. Se " -"distribuye libre y gratuitamente para tareas de retocado de fotos, " -"composición de imágenes y autoría de imágenes." - -#: ../desktop/gimp.appdata.xml.in.h:2 -msgid "" -"It has many capabilities. It can be used as a simple paint program, an " -"expert quality photo retouching program, an online batch processing system, " -"a mass production image renderer, an image format converter, etc." -msgstr "" -"Tiene muchas características. Se puede usar como un simple programa de " -"dibujo, un programa de retoque fotográfico profesional, un sistema de " -"procesado por lotes, un generador de imágenes renderizadas en masa, un " -"conversor de formato de imágenes, etc." - -#: ../desktop/gimp.appdata.xml.in.h:3 -msgid "" -"GIMP is expandable and extensible. It is designed to be augmented with plug-" -"ins and extensions to do just about anything. The advanced scripting " -"interface allows everything from the simplest task to the most complex image " -"manipulation procedures to be easily scripted. GIMP is available for Linux, " -"Microsoft Windows and OS X." -msgstr "" -"GIMP es ampliable y extensible. Está diseñado para poder mejorarlo con " -"complementos y extensiones para hacer casi cualquier cosa. La interfaz de " -"programación avanzada permite hacer un script para cualquier cosa, desde una " -"tarea sencilla hasta los procedimientos de manipulación de imágenes más " -"complejos. GIMP también está disponible para Microsoft Windows y OS X." - -#: ../desktop/gimp.desktop.in.in.h:2 -msgid "Image Editor" -msgstr "Editor de imagen" - -#: ../desktop/gimp.desktop.in.in.h:3 -msgid "Create images and edit photographs" -msgstr "Cree imágenes y edite fotografías" - -#~ msgid "Ask for confirmation before closing an image without saving." -#~ msgstr "" -#~ "Solicitar una confirmación antes de cerrar una imagen que no ha sido " -#~ "guardada." - -#~ msgid "Saving Images" -#~ msgstr "Guardando imágenes" - -#~ msgid "Confirm closing of unsa_ved images" -#~ msgstr "Confirmar el cierre de las _imágenes no guardadas" - -#~ msgctxt "file-action" -#~ msgid "Export to" -#~ msgstr "Exportar a" - -#~ msgid "Export to" -#~ msgstr "Exportar a" - -#~ msgid "Close _without Saving" -#~ msgstr "Cerrar si_n guardar" - -#~ msgctxt "undo-type" -#~ msgid "Brightness_Contrast" -#~ msgstr "Brillo-_Contraste" - -#~ msgctxt "windows-action" -#~ msgid "" -#~ "When enabled GIMP is in a single-window mode. Far from completely " -#~ "implemented!" -#~ msgstr "" -#~ "Cuando se activa, GIMP está en el modo de ventana única. Aún lejos de " -#~ "estar completamente implementado." - -#~ msgctxt "view-action" -#~ msgid "Zoom out" -#~ msgstr "Reducir" - -#~ msgctxt "view-action" -#~ msgid "Zoom in" -#~ msgstr "Ampliar" - -#~ msgctxt "tool" -#~ msgid "_Zoom" -#~ msgstr "_Ampliación" +#: ../app/widgets/widgets-enums.c:85 +msgctxt "color-frame-mode" +msgid "Pixel" +msgstr "Píxel" + +#: ../app/widgets/widgets-enums.c:86 +msgctxt "color-frame-mode" +msgid "RGB" +msgstr "RGB" + +#: ../app/widgets/widgets-enums.c:87 +msgctxt "color-frame-mode" +msgid "HSV" +msgstr "HSV" + +#: ../app/widgets/widgets-enums.c:88 +msgctxt "color-frame-mode" +msgid "CMYK" +msgstr "CMYK" + +#: ../app/widgets/widgets-enums.c:118 +msgctxt "color-pick-mode" +msgid "Pick only" +msgstr "Sólo seleccionar" + +#: ../app/widgets/widgets-enums.c:119 +msgctxt "color-pick-mode" +msgid "Set foreground color" +msgstr "Definir el color de frente" + +#: ../app/widgets/widgets-enums.c:120 +msgctxt "color-pick-mode" +msgid "Set background color" +msgstr "Definir el color de fondo" + +#: ../app/widgets/widgets-enums.c:121 +msgctxt "color-pick-mode" +msgid "Add to palette" +msgstr "Añadir a la paleta" + +#: ../app/widgets/widgets-enums.c:178 +msgctxt "histogram-scale" +msgid "Linear histogram" +msgstr "Histograma lineal" + +#: ../app/widgets/widgets-enums.c:179 +msgctxt "histogram-scale" +msgid "Logarithmic histogram" +msgstr "Histograma logarítmico" + +#: ../app/widgets/widgets-enums.c:215 +msgctxt "tab-style" +msgid "Icon" +msgstr "Icono" + +#: ../app/widgets/widgets-enums.c:216 +msgctxt "tab-style" +msgid "Current status" +msgstr "Estado actual" + +#: ../app/widgets/widgets-enums.c:217 +msgctxt "tab-style" +msgid "Text" +msgstr "Texto" + +#: ../app/widgets/widgets-enums.c:218 +msgctxt "tab-style" +msgid "Description" +msgstr "Descripción" + +#: ../app/widgets/widgets-enums.c:219 +msgctxt "tab-style" +msgid "Icon & text" +msgstr "Icono y texto" + +#: ../app/widgets/widgets-enums.c:220 +msgctxt "tab-style" +msgid "Icon & desc" +msgstr "Icono y descr." + +#: ../app/widgets/widgets-enums.c:221 +msgctxt "tab-style" +msgid "Status & text" +msgstr "Estado y texto" + +#: ../app/widgets/widgets-enums.c:222 +msgctxt "tab-style" +msgid "Status & desc" +msgstr "Estado y descripción" + +#: ../app/widgets/widgets-enums.c:223 +msgctxt "tab-style" +msgid "Undefined" +msgstr "Indefinido" + +#: ../app/xcf/xcf-load.c:392 +msgid "" +"This XCF file is corrupt! I have loaded as much of it as I can, but it is " +"incomplete." +msgstr "" +"¡Este archivo XCF está corrupto! He cargado de él todo lo que he podido, " +"pero está incompleto." + +#: ../app/xcf/xcf-load.c:403 +msgid "" +"This XCF file is corrupt! I could not even salvage any partial image data " +"from it." +msgstr "" +"¡Este archivo XCF está corrupto! No he podido salvar de él ni siquiera una " +"imagen parcial." + +#: ../app/xcf/xcf-load.c:477 +msgid "" +"XCF warning: version 0 of XCF file format\n" +"did not save indexed colormaps correctly.\n" +"Substituting grayscale map." +msgstr "" +"Aviso XCF: la versión 0 del formato de archivo\n" +"XCF no guardaba mapas de colores indexados \n" +"correctamente. Sustituyendo mapa de grises." + +#: ../app/xcf/xcf-read.c:174 +msgid "Invalid UTF-8 string in XCF file" +msgstr "Cadena UTF-8 no válida en el archivo XCF" + +#: ../app/xcf/xcf-write.c:155 +#, c-format +msgid "Error writing XCF: %s" +msgstr "Ocurrió un error al escribir XCF: %s" + +#: ../app/xcf/xcf-seek.c:61 +#, c-format +msgid "Could not seek in XCF file: %s" +msgstr "No se ha podido desplazarse dentro del archivo XCF: %s" + +#: ../app/xcf/xcf.c:113 ../app/xcf/xcf.c:181 +msgid "GIMP XCF image" +msgstr "Imagen XCF de GIMP" + +#: ../app/xcf/xcf.c:301 +#, c-format +msgid "Opening '%s'" +msgstr "Abriendo «%s»" + +#: ../app/xcf/xcf.c:343 +#, c-format +msgid "XCF error: unsupported XCF file version %d encountered" +msgstr "" +"Error XCF: se encontró una versión %d de archivo de tipo XCF no soportada" + +#: ../app/xcf/xcf.c:413 +#, c-format +msgid "Saving '%s'" +msgstr "Guardando «%s»" + +#: ../app/xcf/xcf.c:433 +#, c-format +msgid "Error saving XCF file: %s" +msgstr "Ocurrió un error al guardar el archivo XCF: %s" + +#: ../data/tags/gimp-tags-default.xml.in.h:1 +msgid "round" +msgstr "redondo" + +#. fuzzy as in a feathered, blurred, unfocused, soft brush +#: ../data/tags/gimp-tags-default.xml.in.h:3 +msgid "fuzzy" +msgstr "borroso" + +#: ../desktop/gimp.appdata.xml.in.h:1 +msgid "" +"GIMP is an acronym for GNU Image Manipulation Program. It is a freely " +"distributed program for such tasks as photo retouching, image composition " +"and image authoring." +msgstr "" +"GIMP es el acrónimo de Programa de Manipulación de Imágenes de GNU. Se " +"distribuye libre y gratuitamente para tareas de retocado de fotos, " +"composición de imágenes y autoría de imágenes." + +#: ../desktop/gimp.appdata.xml.in.h:2 +msgid "" +"It has many capabilities. It can be used as a simple paint program, an " +"expert quality photo retouching program, an online batch processing system, " +"a mass production image renderer, an image format converter, etc." +msgstr "" +"Tiene muchas características. Se puede usar como un simple programa de " +"dibujo, un programa de retoque fotográfico profesional, un sistema de " +"procesado por lotes, un generador de imágenes renderizadas en masa, un " +"conversor de formato de imágenes, etc." + +#: ../desktop/gimp.appdata.xml.in.h:3 +msgid "" +"GIMP is expandable and extensible. It is designed to be augmented with plug-" +"ins and extensions to do just about anything. The advanced scripting " +"interface allows everything from the simplest task to the most complex image " +"manipulation procedures to be easily scripted. GIMP is available for Linux, " +"Microsoft Windows and OS X." +msgstr "" +"GIMP es ampliable y extensible. Está diseñado para poder mejorarlo con " +"complementos y extensiones para hacer casi cualquier cosa. La interfaz de " +"programación avanzada permite hacer un script para cualquier cosa, desde una " +"tarea sencilla hasta los procedimientos de manipulación de imágenes más " +"complejos. GIMP también está disponible para Microsoft Windows y OS X." + +#: ../desktop/gimp.desktop.in.in.h:2 +msgid "Image Editor" +msgstr "Editor de imagen" + +#: ../desktop/gimp.desktop.in.in.h:3 +msgid "Create images and edit photographs" +msgstr "Cree imágenes y edite fotografías" + +#~ msgid "Move Layer" +#~ msgstr "Mover la capa" + +#~ msgid "Move Selection" +#~ msgstr "Mover la selección" + +#~ msgid "Ask for confirmation before closing an image without saving." +#~ msgstr "" +#~ "Solicitar una confirmación antes de cerrar una imagen que no ha sido " +#~ "guardada." + +#~ msgid "Saving Images" +#~ msgstr "Guardando imágenes" + +#~ msgid "Confirm closing of unsa_ved images" +#~ msgstr "Confirmar el cierre de las _imágenes no guardadas" + +#~ msgctxt "file-action" +#~ msgid "Export to" +#~ msgstr "Exportar a" + +#~ msgid "Export to" +#~ msgstr "Exportar a" + +#~ msgid "Close _without Saving" +#~ msgstr "Cerrar si_n guardar" + +#~ msgctxt "undo-type" +#~ msgid "Brightness_Contrast" +#~ msgstr "Brillo-_Contraste" + +#~ msgctxt "windows-action" +#~ msgid "" +#~ "When enabled GIMP is in a single-window mode. Far from completely " +#~ "implemented!" +#~ msgstr "" +#~ "Cuando se activa, GIMP está en el modo de ventana única. Aún lejos de " +#~ "estar completamente implementado." + +#~ msgctxt "view-action" +#~ msgid "Zoom out" +#~ msgstr "Reducir" + +#~ msgctxt "view-action" +#~ msgid "Zoom in" +#~ msgstr "Ampliar" + +#~ msgctxt "tool" +#~ msgid "_Zoom" +#~ msgstr "_Ampliación" diff -Nru gimp-2.8.18/po/fi.po gimp-2.8.20/po/fi.po --- gimp-2.8.18/po/fi.po 2015-11-01 01:20:52.000000000 +0000 +++ gimp-2.8.20/po/fi.po 2017-01-28 19:08:49.000000000 +0000 @@ -15,23 +15,23 @@ # Timo Jyrinki , 2008, 2012. # Janne Peltonen , 2012. # Lasse Liehu , 2014. -# Jiri Grönroos , 2014, 2015. +# Jiri Grönroos , 2014, 2015, 2016. # msgid "" msgstr "" "Project-Id-Version: gimp\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-10-11 05:51+0000\n" -"PO-Revision-Date: 2015-10-11 17:16+0300\n" +"product=gimp&keywords=I18N+L10N&component=Internationalisation\n" +"POT-Creation-Date: 2016-10-08 21:06+0000\n" +"PO-Revision-Date: 2016-10-09 10:37+0300\n" "Last-Translator: Jiri Grönroos \n" -"Language-Team: suomi \n" +"Language-Team: suomi \n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Gtranslator 2.91.6\n" +"X-Generator: Gtranslator 2.91.7\n" #: ../app/about.h:23 msgid "GIMP" @@ -51,7 +51,26 @@ "Tekijänoikeudet © 1995-%s\n" "Spencer Kimball, Peter Mattis ja GIMP-kehitystiimi" -#: ../app/about.h:34 +#. TRANSLATORS: do not end the license URL with a dot, because it would +#. * be in the link. Because of technical limitations, make sure the URL +#. * ends with a space, a newline or is end of text. +#. * Cf. bug 762282. +#. +#: ../app/about.h:39 +#, fuzzy +#| msgid "" +#| "GIMP 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.\n" +#| "\n" +#| "GIMP 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.\n" +#| "\n" +#| "You should have received a copy of the GNU General Public License along " +#| "with GIMP. If not, see http://www.gnu.org/licenses/." msgid "" "GIMP 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 " @@ -64,7 +83,7 @@ "details.\n" "\n" "You should have received a copy of the GNU General Public License along with " -"GIMP. If not, see http://www.gnu.org/licenses/." +"GIMP. If not, see: http://www.gnu.org/licenses/" msgstr "" "GIMP on vapaa ohjelma; tätä ohjelmaa on sallittu levittää edelleen ja " "muuttaa GNU yleisen lisenssin (GPL lisenssin) ehtojen mukaan sellaisina kuin " @@ -270,7 +289,7 @@ #. initialize the list of gimp brushes #: ../app/actions/actions.c:112 ../app/core/gimp.c:951 -#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2783 msgid "Brushes" msgstr "Siveltimet" @@ -317,7 +336,7 @@ #. Document History #: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:329 -#: ../app/dialogs/preferences-dialog.c:1577 +#: ../app/dialogs/preferences-dialog.c:1612 msgid "Document History" msgstr "Asiakirjahistoria" @@ -348,7 +367,7 @@ msgstr "Tiedosto" #: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:325 -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2803 msgid "Fonts" msgstr "Fontit" @@ -359,12 +378,12 @@ #. initialize the list of gimp gradients #: ../app/actions/actions.c:172 ../app/core/gimp.c:971 -#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2799 msgid "Gradients" msgstr "Liukuvärit" #: ../app/actions/actions.c:175 ../app/core/gimp.c:983 -#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2770 +#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2807 msgid "Tool Presets" msgstr "Työkalun esivalinnat" @@ -398,23 +417,23 @@ #. initialize the list of gimp palettes #: ../app/actions/actions.c:196 ../app/core/gimp.c:966 -#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2758 +#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2795 msgid "Palettes" msgstr "Paletit" #. initialize the list of gimp patterns #: ../app/actions/actions.c:199 ../app/core/gimp.c:961 -#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2791 msgid "Patterns" msgstr "Kuviot" -#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2774 +#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2811 msgid "Plug-Ins" msgstr "Liitännäiset" #. Quick Mask Color #: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:386 -#: ../app/dialogs/preferences-dialog.c:2032 +#: ../app/dialogs/preferences-dialog.c:2069 msgid "Quick Mask" msgstr "Pikamaski" @@ -441,7 +460,7 @@ msgstr "Tekstimuokkain" #: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:298 -#: ../app/dialogs/preferences-dialog.c:1861 ../app/gui/gui.c:441 +#: ../app/dialogs/preferences-dialog.c:1898 ../app/gui/gui.c:441 msgid "Tool Options" msgstr "Työkaluasetukset" @@ -739,8 +758,7 @@ msgid "Intersect this channel with the current selection" msgstr "Leikkaa tämä kanava nykyisen valinnan kanssa" -#: ../app/actions/channels-commands.c:85 -#: ../app/actions/channels-commands.c:402 +#: ../app/actions/channels-commands.c:85 ../app/actions/channels-commands.c:402 msgid "Channel Attributes" msgstr "Kanavan ominaisuudet" @@ -752,8 +770,7 @@ msgid "Edit Channel Color" msgstr "Muokkaa kanavan väriä" -#: ../app/actions/channels-commands.c:91 -#: ../app/actions/channels-commands.c:123 +#: ../app/actions/channels-commands.c:91 ../app/actions/channels-commands.c:123 msgid "_Fill opacity:" msgstr "_Täytön peittokyky:" @@ -991,8 +1008,7 @@ "\n" "%s" -#: ../app/actions/data-commands.c:118 -#: ../app/actions/tool-options-commands.c:72 +#: ../app/actions/data-commands.c:118 ../app/actions/tool-options-commands.c:72 #: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1529 #: ../app/core/gimppalette-import.c:211 ../app/core/gimppalette-load.c:224 #: ../app/core/gimppalette.c:399 ../app/dialogs/palette-import-dialog.c:771 @@ -1361,7 +1377,7 @@ msgstr "_Tietoja" #: ../app/actions/dialogs-actions.c:333 -#: ../app/dialogs/preferences-dialog.c:1951 ../app/widgets/gimptoolbox.c:539 +#: ../app/dialogs/preferences-dialog.c:1988 ../app/widgets/gimptoolbox.c:539 msgid "Toolbox" msgstr "Työkalupakki" @@ -2429,7 +2445,7 @@ msgid "No changes need to be saved" msgstr "Mitään muutoksia ei tarvitse tallentaa" -#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:701 +#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:703 #: ../app/dialogs/file-save-dialog.c:103 msgid "Save Image" msgstr "Tallenna kuva" @@ -2466,11 +2482,11 @@ msgstr "" "Palauttamalla kuvan levyltä menetät kaikki muutokset ja toimintohistorian." -#: ../app/actions/file-commands.c:731 +#: ../app/actions/file-commands.c:733 msgid "(Unnamed Template)" msgstr "(Nimeämätön malli)" -#: ../app/actions/file-commands.c:782 +#: ../app/actions/file-commands.c:784 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -3216,15 +3232,13 @@ msgid "Set Image Print Resolution" msgstr "Aseta kuvan tulostustarkkuus" -#: ../app/actions/image-commands.c:379 -#: ../app/pdb/drawable-transform-cmds.c:159 +#: ../app/actions/image-commands.c:379 ../app/pdb/drawable-transform-cmds.c:159 #: ../app/pdb/drawable-transform-cmds.c:247 #: ../app/pdb/item-transform-cmds.c:162 msgid "Flipping" msgstr "Peilataan" -#: ../app/actions/image-commands.c:403 -#: ../app/pdb/drawable-transform-cmds.c:602 +#: ../app/actions/image-commands.c:403 ../app/pdb/drawable-transform-cmds.c:602 #: ../app/pdb/drawable-transform-cmds.c:694 ../app/pdb/image-cmds.c:534 #: ../app/pdb/item-transform-cmds.c:433 ../app/pdb/transform-tools-cmds.c:245 #: ../app/tools/gimprotatetool.c:125 @@ -3245,7 +3259,7 @@ #. Scaling #: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 -#: ../app/dialogs/preferences-dialog.c:1906 +#: ../app/dialogs/preferences-dialog.c:1943 #: ../app/pdb/drawable-transform-cmds.c:783 #: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 #: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524 @@ -4597,14 +4611,13 @@ #: ../app/actions/text-editor-commands.c:143 #: ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58 #: ../app/core/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:443 -#: ../app/core/gimpbrushgenerated-load.c:73 -#: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54 -#: ../app/core/gimpgradient-load.c:63 ../app/core/gimppalette-load.c:77 -#: ../app/core/gimppalette-load.c:274 ../app/core/gimppalette-load.c:320 -#: ../app/core/gimppalette-load.c:377 ../app/core/gimppalette-load.c:467 -#: ../app/core/gimppalette-load.c:634 ../app/core/gimppattern-load.c:76 -#: ../app/tools/gimpcurvestool.c:642 ../app/tools/gimplevelstool.c:747 -#: ../app/xcf/xcf.c:359 +#: ../app/core/gimpbrushgenerated-load.c:73 ../app/core/gimpbrushpipe-load.c:81 +#: ../app/core/gimpcurve-load.c:54 ../app/core/gimpgradient-load.c:63 +#: ../app/core/gimppalette-load.c:77 ../app/core/gimppalette-load.c:274 +#: ../app/core/gimppalette-load.c:320 ../app/core/gimppalette-load.c:377 +#: ../app/core/gimppalette-load.c:467 ../app/core/gimppalette-load.c:634 +#: ../app/core/gimppattern-load.c:76 ../app/tools/gimpcurvestool.c:658 +#: ../app/tools/gimplevelstool.c:747 ../app/xcf/xcf.c:359 #, c-format msgid "Could not open '%s' for reading: %s" msgstr "Tiedoston '%s' avaaminen luettavaksi epäonnistui: %s" @@ -5964,7 +5977,7 @@ #: ../app/config/gimpconfig-file.c:67 ../app/core/gimpbrushgenerated-save.c:62 #: ../app/core/gimpcurve-save.c:52 ../app/core/gimpgradient-save.c:50 #: ../app/core/gimpgradient-save.c:144 ../app/core/gimppalette-save.c:56 -#: ../app/gui/themes.c:248 ../app/tools/gimpcurvestool.c:695 +#: ../app/gui/themes.c:248 ../app/tools/gimpcurvestool.c:711 #: ../app/tools/gimplevelstool.c:800 ../app/vectors/gimpvectors-export.c:81 #: ../app/xcf/xcf.c:452 #, c-format @@ -7416,7 +7429,7 @@ msgstr "Parasiitit" #. initialize the list of gimp dynamics -#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2750 +#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2787 #: ../app/tools/gimppaintoptions-gui.c:201 msgid "Dynamics" msgstr "Dynamiikka" @@ -7427,7 +7440,7 @@ msgstr "Fontit (tämä saattaa kestää hetken)" #. initialize the module list -#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2782 +#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2819 msgid "Modules" msgstr "Moduulit" @@ -8203,7 +8216,7 @@ #: ../app/core/gimpimage-merge.c:217 msgid "Cannot flatten an image without any visible layer." -msgstr "" +msgstr "Kuvan yhdistäminen ei onnistu ilman näkyviä tasoja." #: ../app/core/gimpimage-merge.c:260 msgid "Cannot merge down to a layer group." @@ -8342,7 +8355,7 @@ msgid "Remove Path" msgstr "Poista polku" -#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1715 +#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1750 msgid "Folder" msgstr "Kansio" @@ -8499,7 +8512,7 @@ msgid "Layer cannot be lowered more." msgstr "Tasoa ei voi laskea enempää." -#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1529 +#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1532 #: ../app/core/gimplayermask.c:236 #, c-format msgid "%s mask" @@ -8514,45 +8527,45 @@ "Kelluva valinta\n" "(%s)" -#: ../app/core/gimplayer.c:1449 +#: ../app/core/gimplayer.c:1452 msgid "Unable to add a layer mask since the layer already has one." msgstr "Maskin lisäys ei onnistu koska tasolla on jo maski." -#: ../app/core/gimplayer.c:1460 +#: ../app/core/gimplayer.c:1463 msgid "Cannot add layer mask of different dimensions than specified layer." msgstr "Maskin lisäys tasoon, joka on eri kokoinen ei onnistu." -#: ../app/core/gimplayer.c:1466 +#: ../app/core/gimplayer.c:1469 msgctxt "undo-type" msgid "Add Layer Mask" msgstr "Lisää tasomaski" -#: ../app/core/gimplayer.c:1584 +#: ../app/core/gimplayer.c:1587 msgctxt "undo-type" msgid "Transfer Alpha to Mask" msgstr "Siirrä alfa maskiin" -#: ../app/core/gimplayer.c:1754 +#: ../app/core/gimplayer.c:1757 msgctxt "undo-type" msgid "Apply Layer Mask" msgstr "Sovella tasomaskia" -#: ../app/core/gimplayer.c:1755 +#: ../app/core/gimplayer.c:1758 msgctxt "undo-type" msgid "Delete Layer Mask" msgstr "Poista tasomaski" -#: ../app/core/gimplayer.c:1874 +#: ../app/core/gimplayer.c:1877 msgctxt "undo-type" msgid "Add Alpha Channel" msgstr "Lisää alfakanava" -#: ../app/core/gimplayer.c:1928 +#: ../app/core/gimplayer.c:1931 msgctxt "undo-type" msgid "Remove Alpha Channel" msgstr "Poista alfakanava" -#: ../app/core/gimplayer.c:1948 +#: ../app/core/gimplayer.c:1951 msgctxt "undo-type" msgid "Layer to Image Size" msgstr "Taso kuvan kokoiseksi" @@ -9068,13 +9081,15 @@ "You can use this dialog to export to various file formats. If you want to " "save the image to the GIMP XCF format, use File→Save instead." msgstr "" +"Voit viedä tämän ikkunan avulla kuvan useisiin eri tiedostomuotoihin. Jos " +"haluat tallentaa kuvan GIMPin XCF-muodossa, käytä toimintoa " +"Tiedosto→Tallenna." #: ../app/dialogs/file-save-dialog.c:605 -#, fuzzy #| msgctxt "dialogs-action" #| msgid "Open the layers dialog" msgid "Take me to the Save dialog" -msgstr "Avaa tasoikkuna" +msgstr "Avaa tallennusikkuna" #: ../app/dialogs/file-save-dialog.c:609 #, fuzzy @@ -9087,13 +9102,14 @@ "You can use this dialog to save to the GIMP XCF format. Use File→Export to " "export to other file formats." msgstr "" +"Voit tallentaa tämän ikkunan avulla kuvan GIMPin XCF-tiedostomuotoon. Jos " +"haluat tallentaa jossain muussa muodossa, käytä toimintoa Tiedosto→Vie." #: ../app/dialogs/file-save-dialog.c:612 -#, fuzzy #| msgctxt "dialogs-action" #| msgid "Open the paths dialog" msgid "Take me to the Export dialog" -msgstr "Avaa polkuikkuna" +msgstr "Avaa vienti-ikkuna" #: ../app/dialogs/file-save-dialog.c:615 ../app/dialogs/file-save-dialog.c:690 msgid "Extension Mismatch" @@ -9183,7 +9199,7 @@ msgstr "Luo uusi kuva" #: ../app/dialogs/image-new-dialog.c:135 -#: ../app/dialogs/preferences-dialog.c:2016 +#: ../app/dialogs/preferences-dialog.c:2053 msgid "_Template:" msgstr "_Malli:" @@ -9413,7 +9429,7 @@ msgstr "Valitse lähde" #: ../app/dialogs/palette-import-dialog.c:214 -#: ../app/dialogs/preferences-dialog.c:1930 +#: ../app/dialogs/preferences-dialog.c:1967 msgid "_Gradient" msgstr "_Liukuväri" @@ -9472,20 +9488,20 @@ msgid "The selected source contains no colors." msgstr "Valittu lähde ei sisällä mitään värejä." -#: ../app/dialogs/preferences-dialog.c:268 +#: ../app/dialogs/preferences-dialog.c:266 msgid "Reset All Preferences" msgstr "Nollaa kaikki asetukset" -#: ../app/dialogs/preferences-dialog.c:286 +#: ../app/dialogs/preferences-dialog.c:284 msgid "Do you really want to reset all preferences to default values?" msgstr "Haluatko todella palauttaa kaikki asetukset oletusarvoihin?" -#: ../app/dialogs/preferences-dialog.c:356 +#: ../app/dialogs/preferences-dialog.c:362 msgid "You will have to restart GIMP for the following changes to take effect:" msgstr "" "GIMP täytyy käynnistää uudestaan jotta seuraavat muutokset tulisivat voimaan:" -#: ../app/dialogs/preferences-dialog.c:538 +#: ../app/dialogs/preferences-dialog.c:544 msgid "" "Your keyboard shortcuts will be reset to default values the next time you " "start GIMP." @@ -9493,17 +9509,17 @@ "Näppäimistön pikavalinnat palautetaan oletusarvoihin kun Gimp seuraavan " "kerran käynnistyy." -#: ../app/dialogs/preferences-dialog.c:549 +#: ../app/dialogs/preferences-dialog.c:555 msgid "Remove all Keyboard Shortcuts" msgstr "Poista kaikki näppäimistön pikavalinnat" -#: ../app/dialogs/preferences-dialog.c:571 +#: ../app/dialogs/preferences-dialog.c:577 msgid "Do you really want to remove all keyboard shortcuts from all menus?" msgstr "" "Haluatko todella poistaa kaikki näppäimistön pikavalinnat kaikista " "valikoista?" -#: ../app/dialogs/preferences-dialog.c:612 +#: ../app/dialogs/preferences-dialog.c:618 msgid "" "Your window setup will be reset to default values the next time you start " "GIMP." @@ -9511,7 +9527,7 @@ "Ikkunoiden paikat palautuvat perusasetuksiin seuraavan kerran kun Gimp " "käynnistyy." -#: ../app/dialogs/preferences-dialog.c:647 +#: ../app/dialogs/preferences-dialog.c:653 msgid "" "Your input device settings will be reset to default values the next time you " "start GIMP." @@ -9519,7 +9535,7 @@ "Syöttölaitteiden asetukset palautuvat perusasetuksiin seuraavan kerran kun " "Gimp käynnistyy." -#: ../app/dialogs/preferences-dialog.c:682 +#: ../app/dialogs/preferences-dialog.c:688 msgid "" "Your tool options will be reset to default values the next time you start " "GIMP." @@ -9527,758 +9543,768 @@ "Työkalujen asetukset palautuvat oletusasetuksiin kun Gimp käynnistyy " "seuraavan kerran." -#: ../app/dialogs/preferences-dialog.c:1268 +#: ../app/dialogs/preferences-dialog.c:1303 msgid "Show _menubar" msgstr "Näytä _valikkopalkki" -#: ../app/dialogs/preferences-dialog.c:1272 +#: ../app/dialogs/preferences-dialog.c:1307 msgid "Show _rulers" msgstr "Näytä _viivaimet" -#: ../app/dialogs/preferences-dialog.c:1275 +#: ../app/dialogs/preferences-dialog.c:1310 msgid "Show scroll_bars" msgstr "Näytä v_ierityspalkit" -#: ../app/dialogs/preferences-dialog.c:1278 +#: ../app/dialogs/preferences-dialog.c:1313 msgid "Show s_tatusbar" msgstr "Näytä _tilapalkki" -#: ../app/dialogs/preferences-dialog.c:1286 +#: ../app/dialogs/preferences-dialog.c:1321 msgid "Show s_election" msgstr "Näytä v_alinta" -#: ../app/dialogs/preferences-dialog.c:1289 +#: ../app/dialogs/preferences-dialog.c:1324 msgid "Show _layer boundary" msgstr "Näytä tason rajat" -#: ../app/dialogs/preferences-dialog.c:1292 +#: ../app/dialogs/preferences-dialog.c:1327 msgid "Show _guides" msgstr "Näytä apu_linjat" -#: ../app/dialogs/preferences-dialog.c:1295 +#: ../app/dialogs/preferences-dialog.c:1330 msgid "Show gri_d" msgstr "Näytä _ruudukko" -#: ../app/dialogs/preferences-dialog.c:1301 +#: ../app/dialogs/preferences-dialog.c:1336 msgid "Canvas _padding mode:" msgstr "Kankaan täyttömuoto:" -#: ../app/dialogs/preferences-dialog.c:1306 +#: ../app/dialogs/preferences-dialog.c:1341 msgid "Custom p_adding color:" msgstr "Oma täyttöväri:" -#: ../app/dialogs/preferences-dialog.c:1307 +#: ../app/dialogs/preferences-dialog.c:1342 msgid "Select Custom Canvas Padding Color" msgstr "Valitse oma kankaan täyttöväri" -#: ../app/dialogs/preferences-dialog.c:1405 +#: ../app/dialogs/preferences-dialog.c:1440 msgid "Preferences" msgstr "Asetukset" -#: ../app/dialogs/preferences-dialog.c:1518 -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:1553 +#: ../app/dialogs/preferences-dialog.c:2827 msgid "Environment" msgstr "Ympäristö" -#: ../app/dialogs/preferences-dialog.c:1532 +#: ../app/dialogs/preferences-dialog.c:1567 msgid "Resource Consumption" msgstr "Resurssikulutus" -#: ../app/dialogs/preferences-dialog.c:1542 +#: ../app/dialogs/preferences-dialog.c:1577 msgid "Minimal number of _undo levels:" msgstr "Kumoamistoiminnolle varatut säätöarvot:" -#: ../app/dialogs/preferences-dialog.c:1545 +#: ../app/dialogs/preferences-dialog.c:1580 msgid "Maximum undo _memory:" msgstr "Maksimi kumoamismuisti:" -#: ../app/dialogs/preferences-dialog.c:1548 +#: ../app/dialogs/preferences-dialog.c:1583 msgid "Tile cache _size:" msgstr "Kuvavälimuistin koko:" -#: ../app/dialogs/preferences-dialog.c:1551 +#: ../app/dialogs/preferences-dialog.c:1586 msgid "Maximum _new image size:" msgstr "Uuden kuvan enimmäiskoko:" -#: ../app/dialogs/preferences-dialog.c:1556 +#: ../app/dialogs/preferences-dialog.c:1591 msgid "Number of _processors to use:" msgstr "Käytettävien suorittimien lukumäärä:" #. Image Thumbnails -#: ../app/dialogs/preferences-dialog.c:1561 +#: ../app/dialogs/preferences-dialog.c:1596 msgid "Image Thumbnails" msgstr "Kuvien esikatselut" -#: ../app/dialogs/preferences-dialog.c:1566 +#: ../app/dialogs/preferences-dialog.c:1601 msgid "Size of _thumbnails:" msgstr "Esikatselukuvan koko:" -#: ../app/dialogs/preferences-dialog.c:1570 +#: ../app/dialogs/preferences-dialog.c:1605 msgid "Maximum _filesize for thumbnailing:" msgstr "Suurin tiedostokoko, josta tehdään esikatselu." -#: ../app/dialogs/preferences-dialog.c:1580 +#: ../app/dialogs/preferences-dialog.c:1615 msgid "Keep record of used files in the Recent Documents list" msgstr "" "Pidä kirjaa käytetyistä tiedostoista viimeisten asiakirjojen luettelossa" -#: ../app/dialogs/preferences-dialog.c:1589 +#: ../app/dialogs/preferences-dialog.c:1624 msgid "User Interface" msgstr "Käyttöliittymä" -#: ../app/dialogs/preferences-dialog.c:1592 +#: ../app/dialogs/preferences-dialog.c:1627 msgid "Interface" msgstr "Käyttöliittymä" -#: ../app/dialogs/preferences-dialog.c:1602 +#: ../app/dialogs/preferences-dialog.c:1637 msgid "Language" msgstr "Kieli" #. Previews -#: ../app/dialogs/preferences-dialog.c:1608 +#: ../app/dialogs/preferences-dialog.c:1643 msgid "Previews" msgstr "Esikatselut" -#: ../app/dialogs/preferences-dialog.c:1611 +#: ../app/dialogs/preferences-dialog.c:1646 msgid "_Enable layer & channel previews" msgstr "_Salli tasojen ja kanavien esikatselut" -#: ../app/dialogs/preferences-dialog.c:1617 +#: ../app/dialogs/preferences-dialog.c:1652 msgid "_Default layer & channel preview size:" msgstr "Tasojen ja kanavien esikatselun oletuskoko:" -#: ../app/dialogs/preferences-dialog.c:1620 +#: ../app/dialogs/preferences-dialog.c:1655 msgid "Na_vigation preview size:" msgstr "Navigointinäkymän koko:" #. Keyboard Shortcuts -#: ../app/dialogs/preferences-dialog.c:1624 +#: ../app/dialogs/preferences-dialog.c:1659 msgid "Keyboard Shortcuts" msgstr "Näppäimistön pikavalinnat" -#: ../app/dialogs/preferences-dialog.c:1628 +#: ../app/dialogs/preferences-dialog.c:1663 msgid "_Use dynamic keyboard shortcuts" msgstr "_Käytä dynaamisia näppäimistön pikavalintoja" -#: ../app/dialogs/preferences-dialog.c:1632 +#: ../app/dialogs/preferences-dialog.c:1667 msgid "Configure _Keyboard Shortcuts..." msgstr "Määritä näppäimistön pikavalinnat..." -#: ../app/dialogs/preferences-dialog.c:1639 +#: ../app/dialogs/preferences-dialog.c:1674 msgid "_Save keyboard shortcuts on exit" msgstr "_Tallenna näppäimistön pikavalinnat poistuttaessa" -#: ../app/dialogs/preferences-dialog.c:1643 +#: ../app/dialogs/preferences-dialog.c:1678 msgid "Save Keyboard Shortcuts _Now" msgstr "Tallenna näppäimistön pikavalinnat nyt" -#: ../app/dialogs/preferences-dialog.c:1650 +#: ../app/dialogs/preferences-dialog.c:1685 msgid "_Reset Keyboard Shortcuts to Default Values" msgstr "_Palauta näppäimistön pikavalinnat oletusarvoihin" -#: ../app/dialogs/preferences-dialog.c:1659 +#: ../app/dialogs/preferences-dialog.c:1694 msgid "Remove _All Keyboard Shortcuts" msgstr "Poista kaikki näppäimistön pikavalinnat" -#: ../app/dialogs/preferences-dialog.c:1671 -#: ../app/dialogs/preferences-dialog.c:1710 +#: ../app/dialogs/preferences-dialog.c:1706 +#: ../app/dialogs/preferences-dialog.c:1745 msgid "Theme" msgstr "Teema" -#: ../app/dialogs/preferences-dialog.c:1680 +#: ../app/dialogs/preferences-dialog.c:1715 msgid "Select Theme" msgstr "Valitse teema" -#: ../app/dialogs/preferences-dialog.c:1762 +#: ../app/dialogs/preferences-dialog.c:1797 msgid "Reload C_urrent Theme" msgstr "Lataa uudelleen nykyinen teema" -#: ../app/dialogs/preferences-dialog.c:1774 +#: ../app/dialogs/preferences-dialog.c:1809 msgid "Help System" msgstr "Avustukset" #. General -#: ../app/dialogs/preferences-dialog.c:1786 -#: ../app/dialogs/preferences-dialog.c:1873 -#: ../app/dialogs/preferences-dialog.c:2086 +#: ../app/dialogs/preferences-dialog.c:1821 +#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:2123 #: ../app/widgets/gimpcontrollereditor.c:185 msgid "General" msgstr "Yleistä" -#: ../app/dialogs/preferences-dialog.c:1789 +#: ../app/dialogs/preferences-dialog.c:1824 msgid "Show _tooltips" msgstr "Näytä työkaluvihjeet" -#: ../app/dialogs/preferences-dialog.c:1792 +#: ../app/dialogs/preferences-dialog.c:1827 msgid "Show help _buttons" msgstr "Näytä Apu-painikkeet" -#: ../app/dialogs/preferences-dialog.c:1805 +#: ../app/dialogs/preferences-dialog.c:1832 msgid "Use the online version" msgstr "Käytä verkkoversiota" -#: ../app/dialogs/preferences-dialog.c:1806 +#: ../app/dialogs/preferences-dialog.c:1833 msgid "Use a locally installed copy" msgstr "Käytä paikallisesti asennettua kopiota" -#: ../app/dialogs/preferences-dialog.c:1807 +#: ../app/dialogs/preferences-dialog.c:1834 msgid "User manual:" msgstr "Käyttöohje:" -#: ../app/dialogs/preferences-dialog.c:1814 +#: ../app/dialogs/preferences-dialog.c:1841 msgid "There's a local installation of the user manual." msgstr "Käyttöohje on asennettu paikallisesti." -#: ../app/dialogs/preferences-dialog.c:1819 +#: ../app/dialogs/preferences-dialog.c:1847 msgid "The user manual is not installed locally." msgstr "Käyttöohjetta ei ole asennettu paikallisesti." -#: ../app/dialogs/preferences-dialog.c:1844 +#. If there is no webkit available, assume we are on a platform +#. * that doesn't use the help browser, so don't bother showing +#. * the combo. +#. +#: ../app/dialogs/preferences-dialog.c:1860 msgid "Help Browser" msgstr "Ohjeselain" -#: ../app/dialogs/preferences-dialog.c:1848 +#: ../app/dialogs/preferences-dialog.c:1867 msgid "H_elp browser to use:" -msgstr "Käytettävä _selain avustuksille:" +msgstr "Käytettävä ohje_selain:" + +#: ../app/dialogs/preferences-dialog.c:1873 +msgid "" +"The GIMP help browser doesn't seem to be installed. Using the web browser " +"instead." +msgstr "" +"GIMP:in ohjeselain ei vaikuta olevan asennettu. Käytetään sen sijaan " +"verkkoselainta." -#: ../app/dialogs/preferences-dialog.c:1876 +#: ../app/dialogs/preferences-dialog.c:1913 msgid "_Save tool options on exit" msgstr "Tallenna työkaluasetukset poistuttaessa" -#: ../app/dialogs/preferences-dialog.c:1880 +#: ../app/dialogs/preferences-dialog.c:1917 msgid "Save Tool Options _Now" msgstr "Tallenna työkalujen asetukset nyt" -#: ../app/dialogs/preferences-dialog.c:1887 +#: ../app/dialogs/preferences-dialog.c:1924 msgid "_Reset Saved Tool Options to Default Values" msgstr "Palauta tallennetut työkaluasetukset oletusarvoihin" #. Snapping Distance -#: ../app/dialogs/preferences-dialog.c:1897 +#: ../app/dialogs/preferences-dialog.c:1934 msgid "Guide & Grid Snapping" msgstr "Apulinjoihin ja ruudukkoon kiinnittyminen" -#: ../app/dialogs/preferences-dialog.c:1902 +#: ../app/dialogs/preferences-dialog.c:1939 msgid "_Snap distance:" msgstr "_Kiinnittymisetäisyys:" -#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:1947 msgid "Default _interpolation:" msgstr "_Interpolaation oletusarvo:" #. Global Brush, Pattern, ... -#: ../app/dialogs/preferences-dialog.c:1917 +#: ../app/dialogs/preferences-dialog.c:1954 msgid "Paint Options Shared Between Tools" msgstr "Asetukset jaetaan maalaustyökalujen välillä" -#: ../app/dialogs/preferences-dialog.c:1921 +#: ../app/dialogs/preferences-dialog.c:1958 msgid "_Brush" msgstr "_Sivellin" -#: ../app/dialogs/preferences-dialog.c:1924 +#: ../app/dialogs/preferences-dialog.c:1961 msgid "_Dynamics" msgstr "_Dynamiikka" -#: ../app/dialogs/preferences-dialog.c:1927 +#: ../app/dialogs/preferences-dialog.c:1964 msgid "_Pattern" msgstr "_Kuvio" #. Move Tool -#: ../app/dialogs/preferences-dialog.c:1934 +#: ../app/dialogs/preferences-dialog.c:1971 msgid "Move Tool" msgstr "Siirtotyökalu" -#: ../app/dialogs/preferences-dialog.c:1938 +#: ../app/dialogs/preferences-dialog.c:1975 msgid "Set layer or path as active" msgstr "Aseta tason tai polku aktiiviseksi" #. Appearance -#: ../app/dialogs/preferences-dialog.c:1963 -#: ../app/dialogs/preferences-dialog.c:2162 -#: ../app/widgets/gimpgrideditor.c:134 +#: ../app/dialogs/preferences-dialog.c:2000 +#: ../app/dialogs/preferences-dialog.c:2199 ../app/widgets/gimpgrideditor.c:134 msgid "Appearance" msgstr "Ulkoasu" -#: ../app/dialogs/preferences-dialog.c:1967 +#: ../app/dialogs/preferences-dialog.c:2004 msgid "Show _foreground & background color" msgstr "Näytä edusta- ja taustaväri" -#: ../app/dialogs/preferences-dialog.c:1971 +#: ../app/dialogs/preferences-dialog.c:2008 msgid "Show active _brush, pattern & gradient" msgstr "Näytä aktiivinen sivellin, kuvio ja liukuväri" -#: ../app/dialogs/preferences-dialog.c:1975 +#: ../app/dialogs/preferences-dialog.c:2012 msgid "Show active _image" msgstr "Näytä aktiivinen kuva" #. Tool Editor -#: ../app/dialogs/preferences-dialog.c:1983 +#: ../app/dialogs/preferences-dialog.c:2020 msgid "Tools configuration" msgstr "Työkalujen asetukset" -#: ../app/dialogs/preferences-dialog.c:1998 +#: ../app/dialogs/preferences-dialog.c:2035 msgid "Default New Image" msgstr "Uusi oletuskuva" -#: ../app/dialogs/preferences-dialog.c:2001 +#: ../app/dialogs/preferences-dialog.c:2038 msgid "Default Image" msgstr "Oletuskuva" -#: ../app/dialogs/preferences-dialog.c:2035 +#: ../app/dialogs/preferences-dialog.c:2072 msgid "Set the default Quick Mask color" msgstr "Aseta pikamaskin oletusväri" -#: ../app/dialogs/preferences-dialog.c:2041 +#: ../app/dialogs/preferences-dialog.c:2078 msgid "Quick Mask color:" msgstr "Muokkaa pikamaskin väriä:" -#: ../app/dialogs/preferences-dialog.c:2051 +#: ../app/dialogs/preferences-dialog.c:2088 msgid "Default Image Grid" msgstr "Kuvan oletusruudukko" -#: ../app/dialogs/preferences-dialog.c:2054 +#: ../app/dialogs/preferences-dialog.c:2091 msgid "Default Grid" msgstr "Oletusruudukko" -#: ../app/dialogs/preferences-dialog.c:2074 +#: ../app/dialogs/preferences-dialog.c:2111 msgid "Image Windows" msgstr "Kuvaikkunat" -#: ../app/dialogs/preferences-dialog.c:2089 +#: ../app/dialogs/preferences-dialog.c:2126 msgid "Use \"_Dot for dot\" by default" msgstr "Käytä \"Piste pisteeltä\" oletuksena" -#: ../app/dialogs/preferences-dialog.c:2095 +#: ../app/dialogs/preferences-dialog.c:2132 msgid "Marching _ants speed:" msgstr "Valinta-animaation nopeus:" #. Zoom & Resize Behavior -#: ../app/dialogs/preferences-dialog.c:2099 +#: ../app/dialogs/preferences-dialog.c:2136 msgid "Zoom & Resize Behavior" msgstr "Suurennus- ja pienennyskäyttäytyminen" -#: ../app/dialogs/preferences-dialog.c:2103 +#: ../app/dialogs/preferences-dialog.c:2140 msgid "Resize window on _zoom" msgstr "Muuta ikkunan kokoa zoomattaessa" -#: ../app/dialogs/preferences-dialog.c:2106 +#: ../app/dialogs/preferences-dialog.c:2143 msgid "Resize window on image _size change" msgstr "Muuta ikkunan kokoa kun kuvan koko muuttuu" -#: ../app/dialogs/preferences-dialog.c:2112 +#: ../app/dialogs/preferences-dialog.c:2149 msgid "Fit to window" msgstr "Sovita ikkunaan" -#: ../app/dialogs/preferences-dialog.c:2114 +#: ../app/dialogs/preferences-dialog.c:2151 msgid "Initial zoom _ratio:" msgstr "Alkuperäinen zoomaussuhde:" #. Space Bar -#: ../app/dialogs/preferences-dialog.c:2118 +#: ../app/dialogs/preferences-dialog.c:2155 msgid "Space Bar" msgstr "Välilyönti" -#: ../app/dialogs/preferences-dialog.c:2124 +#: ../app/dialogs/preferences-dialog.c:2161 msgid "_While space bar is pressed:" msgstr "_Painettaessa välilyöntiä:" #. Mouse Pointers -#: ../app/dialogs/preferences-dialog.c:2128 +#: ../app/dialogs/preferences-dialog.c:2165 msgid "Mouse Pointers" msgstr "Hiiriosoittimet" -#: ../app/dialogs/preferences-dialog.c:2132 +#: ../app/dialogs/preferences-dialog.c:2169 msgid "Show _brush outline" msgstr "Näytä siveltimen ääriviiva" -#: ../app/dialogs/preferences-dialog.c:2135 +#: ../app/dialogs/preferences-dialog.c:2172 msgid "Show pointer for paint _tools" msgstr "Näytä maalaustyökalun osoitin" -#: ../app/dialogs/preferences-dialog.c:2141 +#: ../app/dialogs/preferences-dialog.c:2178 msgid "Pointer _mode:" msgstr "Osoittimen muoto:" -#: ../app/dialogs/preferences-dialog.c:2144 +#: ../app/dialogs/preferences-dialog.c:2181 msgid "Pointer re_ndering:" msgstr "Osoittimen piirto:" -#: ../app/dialogs/preferences-dialog.c:2147 +#: ../app/dialogs/preferences-dialog.c:2184 #, fuzzy msgid "Pointer _handedness:" msgstr "Osoittimen piirto:" -#: ../app/dialogs/preferences-dialog.c:2159 +#: ../app/dialogs/preferences-dialog.c:2196 msgid "Image Window Appearance" msgstr "Kuvaikkunan ulkoasu" -#: ../app/dialogs/preferences-dialog.c:2170 +#: ../app/dialogs/preferences-dialog.c:2207 msgid "Default Appearance in Normal Mode" msgstr "Normaalitilan oletusulkoasu" -#: ../app/dialogs/preferences-dialog.c:2175 +#: ../app/dialogs/preferences-dialog.c:2212 msgid "Default Appearance in Fullscreen Mode" msgstr "Kokoruututilan oletusulkoasu" -#: ../app/dialogs/preferences-dialog.c:2184 +#: ../app/dialogs/preferences-dialog.c:2221 msgid "Image Title & Statusbar Format" msgstr "Kuvan otsikon ja tilapalkin muoto" -#: ../app/dialogs/preferences-dialog.c:2187 +#: ../app/dialogs/preferences-dialog.c:2224 msgid "Title & Status" msgstr "Otsikko ja tila" -#: ../app/dialogs/preferences-dialog.c:2205 +#: ../app/dialogs/preferences-dialog.c:2242 msgid "Current format" msgstr "Nykyinen muoto" -#: ../app/dialogs/preferences-dialog.c:2206 +#: ../app/dialogs/preferences-dialog.c:2243 msgid "Default format" msgstr "Oletusmuoto" -#: ../app/dialogs/preferences-dialog.c:2207 +#: ../app/dialogs/preferences-dialog.c:2244 msgid "Show zoom percentage" msgstr "Näytä suurennosprosentti" -#: ../app/dialogs/preferences-dialog.c:2208 +#: ../app/dialogs/preferences-dialog.c:2245 msgid "Show zoom ratio" msgstr "Näytä suurennossuhde" -#: ../app/dialogs/preferences-dialog.c:2209 +#: ../app/dialogs/preferences-dialog.c:2246 msgid "Show image size" msgstr "Näytä kuvan koko" -#: ../app/dialogs/preferences-dialog.c:2222 +#: ../app/dialogs/preferences-dialog.c:2259 msgid "Image Title Format" msgstr "Kuvan otsikon muoto" -#: ../app/dialogs/preferences-dialog.c:2224 +#: ../app/dialogs/preferences-dialog.c:2261 msgid "Image Statusbar Format" msgstr "Kuvan tilapalkin muoto" -#: ../app/dialogs/preferences-dialog.c:2309 +#: ../app/dialogs/preferences-dialog.c:2346 msgid "Display" msgstr "Näyttö" #. Transparency -#: ../app/dialogs/preferences-dialog.c:2321 +#: ../app/dialogs/preferences-dialog.c:2358 msgid "Transparency" msgstr "Läpinäkyvä" -#: ../app/dialogs/preferences-dialog.c:2325 +#: ../app/dialogs/preferences-dialog.c:2362 msgid "_Check style:" msgstr "Tarkistustyyli:" -#: ../app/dialogs/preferences-dialog.c:2328 +#: ../app/dialogs/preferences-dialog.c:2365 msgid "Check _size:" msgstr "Tarkistus koko:" -#: ../app/dialogs/preferences-dialog.c:2331 +#: ../app/dialogs/preferences-dialog.c:2368 msgid "Monitor Resolution" msgstr "Näytön tarkkuus" #. Pixels -#: ../app/dialogs/preferences-dialog.c:2335 -#: ../app/display/gimpcursorview.c:206 ../app/widgets/gimpgrideditor.c:199 -#: ../app/widgets/gimpgrideditor.c:231 +#: ../app/dialogs/preferences-dialog.c:2372 ../app/display/gimpcursorview.c:208 +#: ../app/widgets/gimpgrideditor.c:199 ../app/widgets/gimpgrideditor.c:231 msgid "Pixels" msgstr "pikseliä" -#: ../app/dialogs/preferences-dialog.c:2353 +#: ../app/dialogs/preferences-dialog.c:2390 msgid "Horizontal" msgstr "Vaaka" -#: ../app/dialogs/preferences-dialog.c:2355 +#: ../app/dialogs/preferences-dialog.c:2392 msgid "Vertical" msgstr "Pysty" -#: ../app/dialogs/preferences-dialog.c:2357 +#: ../app/dialogs/preferences-dialog.c:2394 #: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "ppi" -#: ../app/dialogs/preferences-dialog.c:2373 +#: ../app/dialogs/preferences-dialog.c:2410 #, c-format msgid "_Detect automatically (currently %d × %d ppi)" msgstr "_Havaitse automaattisesti (nyt %d×%d ppi)" -#: ../app/dialogs/preferences-dialog.c:2391 +#: ../app/dialogs/preferences-dialog.c:2428 msgid "_Enter manually" msgstr "_Syötä käsin" -#: ../app/dialogs/preferences-dialog.c:2406 +#: ../app/dialogs/preferences-dialog.c:2443 msgid "C_alibrate..." msgstr "Kalibroi..." -#: ../app/dialogs/preferences-dialog.c:2434 +#: ../app/dialogs/preferences-dialog.c:2471 msgid "Color Management" msgstr "Värin hallinta" -#: ../app/dialogs/preferences-dialog.c:2454 +#: ../app/dialogs/preferences-dialog.c:2491 msgid "_RGB profile:" msgstr "_RGB profiili:" -#: ../app/dialogs/preferences-dialog.c:2455 +#: ../app/dialogs/preferences-dialog.c:2492 msgid "Select RGB Color Profile" msgstr "Valitse RGB väriprofiili" -#: ../app/dialogs/preferences-dialog.c:2456 +#: ../app/dialogs/preferences-dialog.c:2493 msgid "_CMYK profile:" msgstr "_CMYK profiili:" -#: ../app/dialogs/preferences-dialog.c:2457 +#: ../app/dialogs/preferences-dialog.c:2494 msgid "Select CMYK Color Profile" msgstr "Valitse CMYK väriprofiili" -#: ../app/dialogs/preferences-dialog.c:2458 +#: ../app/dialogs/preferences-dialog.c:2495 msgid "_Monitor profile:" msgstr "_Monitoriprofiili:" -#: ../app/dialogs/preferences-dialog.c:2459 +#: ../app/dialogs/preferences-dialog.c:2496 msgid "Select Monitor Color Profile" msgstr "Valitse näytön väriprofiili" -#: ../app/dialogs/preferences-dialog.c:2460 +#: ../app/dialogs/preferences-dialog.c:2497 msgid "_Print simulation profile:" msgstr "Tulostinsimulaatioprofiili:" -#: ../app/dialogs/preferences-dialog.c:2461 +#: ../app/dialogs/preferences-dialog.c:2498 msgid "Select Printer Color Profile" msgstr "Valitse tulostimen väriprofiili" -#: ../app/dialogs/preferences-dialog.c:2472 +#: ../app/dialogs/preferences-dialog.c:2509 msgid "_Mode of operation:" msgstr "_Toimintatapa:" -#: ../app/dialogs/preferences-dialog.c:2502 +#: ../app/dialogs/preferences-dialog.c:2539 msgid "_Try to use the system monitor profile" msgstr "_Yritä käyttää järjestelmän näyttöprofiilia" -#: ../app/dialogs/preferences-dialog.c:2512 +#: ../app/dialogs/preferences-dialog.c:2549 msgid "_Display rendering intent:" msgstr "_Näytä muunnosalgoritmi:" -#: ../app/dialogs/preferences-dialog.c:2521 +#: ../app/dialogs/preferences-dialog.c:2558 msgid "_Softproof rendering intent:" msgstr "_Softproof muunnosalgoritmi:" -#: ../app/dialogs/preferences-dialog.c:2534 +#: ../app/dialogs/preferences-dialog.c:2571 msgid "Mark out of gamut colors" msgstr "Merkitse kirjon ulkopuoliset sävyt" -#: ../app/dialogs/preferences-dialog.c:2539 +#: ../app/dialogs/preferences-dialog.c:2576 msgid "Select Warning Color" msgstr "Valitse varoitusväri" -#: ../app/dialogs/preferences-dialog.c:2552 +#: ../app/dialogs/preferences-dialog.c:2589 msgid "File Open behaviour:" msgstr "Tiedostojen avaustapa:" -#: ../app/dialogs/preferences-dialog.c:2564 +#: ../app/dialogs/preferences-dialog.c:2601 msgid "Input Devices" msgstr "Syöttölaitteet" #. Extended Input Devices -#: ../app/dialogs/preferences-dialog.c:2574 +#: ../app/dialogs/preferences-dialog.c:2611 msgid "Extended Input Devices" msgstr "Lisäsyöttölaitteet" -#: ../app/dialogs/preferences-dialog.c:2578 +#: ../app/dialogs/preferences-dialog.c:2615 msgid "Configure E_xtended Input Devices..." msgstr "Määritä lisäsyöttölaitteet..." -#: ../app/dialogs/preferences-dialog.c:2585 +#: ../app/dialogs/preferences-dialog.c:2622 msgid "_Save input device settings on exit" msgstr "Tallenna syöttölaitteiden asetukset poistuttaessa" -#: ../app/dialogs/preferences-dialog.c:2589 +#: ../app/dialogs/preferences-dialog.c:2626 msgid "Save Input Device Settings _Now" msgstr "Tallenna syöttölaitteiden asetukset _nyt" -#: ../app/dialogs/preferences-dialog.c:2596 +#: ../app/dialogs/preferences-dialog.c:2633 msgid "_Reset Saved Input Device Settings to Default Values" msgstr "_Palauta tallennetut syöttölaitteiden asetukset oletusarvoihin" -#: ../app/dialogs/preferences-dialog.c:2611 +#: ../app/dialogs/preferences-dialog.c:2648 msgid "Additional Input Controllers" msgstr "Lisäsyöttöohjaimet" -#: ../app/dialogs/preferences-dialog.c:2614 +#: ../app/dialogs/preferences-dialog.c:2651 msgid "Input Controllers" msgstr "Syöttöohjaimet" -#: ../app/dialogs/preferences-dialog.c:2630 +#: ../app/dialogs/preferences-dialog.c:2667 msgid "Window Management" msgstr "Ikkunanhallinta" -#: ../app/dialogs/preferences-dialog.c:2639 +#: ../app/dialogs/preferences-dialog.c:2676 msgid "Window Manager Hints" msgstr "Ikkunointiohjelman vihjeet" -#: ../app/dialogs/preferences-dialog.c:2645 +#: ../app/dialogs/preferences-dialog.c:2682 msgid "Hint for _docks and toolbox:" msgstr "Työkalulaatikon ja _telakan vihje:" -#: ../app/dialogs/preferences-dialog.c:2648 +#: ../app/dialogs/preferences-dialog.c:2685 msgid "Focus" msgstr "Kohdistus" -#: ../app/dialogs/preferences-dialog.c:2652 +#: ../app/dialogs/preferences-dialog.c:2689 msgid "Activate the _focused image" msgstr "Aktivoi kohdistettu kuva" #. Window Positions -#: ../app/dialogs/preferences-dialog.c:2656 +#: ../app/dialogs/preferences-dialog.c:2693 msgid "Window Positions" msgstr "Ikkunoiden sijainnit" -#: ../app/dialogs/preferences-dialog.c:2659 +#: ../app/dialogs/preferences-dialog.c:2696 msgid "_Save window positions on exit" msgstr "Tallenna ikkunoiden sijainnit poistuttaessa" -#: ../app/dialogs/preferences-dialog.c:2663 +#: ../app/dialogs/preferences-dialog.c:2700 msgid "Save Window Positions _Now" msgstr "Tallenna ikkunoiden sijainnit _nyt" -#: ../app/dialogs/preferences-dialog.c:2670 +#: ../app/dialogs/preferences-dialog.c:2707 msgid "_Reset Saved Window Positions to Default Values" msgstr "_Palauta ikkunoiden sijainnit poistuttaessa" -#: ../app/dialogs/preferences-dialog.c:2685 +#: ../app/dialogs/preferences-dialog.c:2722 msgid "Folders" msgstr "Kansiot" -#: ../app/dialogs/preferences-dialog.c:2705 +#: ../app/dialogs/preferences-dialog.c:2742 msgid "Temporary folder:" msgstr "Tilapäistiedostojen kansio:" -#: ../app/dialogs/preferences-dialog.c:2706 +#: ../app/dialogs/preferences-dialog.c:2743 msgid "Select Folder for Temporary Files" msgstr "Valitse kansio tilapäisille tiedostoille" -#: ../app/dialogs/preferences-dialog.c:2710 +#: ../app/dialogs/preferences-dialog.c:2747 msgid "Swap folder:" msgstr "Sivutuskansio:" -#: ../app/dialogs/preferences-dialog.c:2711 +#: ../app/dialogs/preferences-dialog.c:2748 msgid "Select Swap Folder" msgstr "Valitse sivutuskansio" -#: ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/preferences-dialog.c:2783 msgid "Brush Folders" msgstr "Sivellinkansiot" -#: ../app/dialogs/preferences-dialog.c:2748 +#: ../app/dialogs/preferences-dialog.c:2785 msgid "Select Brush Folders" msgstr "Valitse sivellinkansiot" -#: ../app/dialogs/preferences-dialog.c:2750 +#: ../app/dialogs/preferences-dialog.c:2787 msgid "Dynamics Folders" msgstr "Dynamiikkakansiot" -#: ../app/dialogs/preferences-dialog.c:2752 +#: ../app/dialogs/preferences-dialog.c:2789 msgid "Select Dynamics Folders" msgstr "Valitse dynamiikkakansiot" -#: ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/preferences-dialog.c:2791 msgid "Pattern Folders" msgstr "Kuviokansiot" -#: ../app/dialogs/preferences-dialog.c:2756 +#: ../app/dialogs/preferences-dialog.c:2793 msgid "Select Pattern Folders" msgstr "Valitse kuviokansiot" -#: ../app/dialogs/preferences-dialog.c:2758 +#: ../app/dialogs/preferences-dialog.c:2795 msgid "Palette Folders" msgstr "Palettikansiot" -#: ../app/dialogs/preferences-dialog.c:2760 +#: ../app/dialogs/preferences-dialog.c:2797 msgid "Select Palette Folders" msgstr "Valitse palettikansiot" -#: ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/preferences-dialog.c:2799 msgid "Gradient Folders" msgstr "Liukuvärikansiot" -#: ../app/dialogs/preferences-dialog.c:2764 +#: ../app/dialogs/preferences-dialog.c:2801 msgid "Select Gradient Folders" msgstr "Valitse liukuvärikansiot" -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2803 msgid "Font Folders" msgstr "Fonttikansiot" -#: ../app/dialogs/preferences-dialog.c:2768 +#: ../app/dialogs/preferences-dialog.c:2805 msgid "Select Font Folders" msgstr "Valitse fonttikansiot" -#: ../app/dialogs/preferences-dialog.c:2770 +#: ../app/dialogs/preferences-dialog.c:2807 #, fuzzy msgid "Tool Preset Folders" msgstr "Työkalun esivalinnat" -#: ../app/dialogs/preferences-dialog.c:2772 +#: ../app/dialogs/preferences-dialog.c:2809 #, fuzzy msgid "Select Tool Preset Folders" msgstr "Valitse teemakansiot" -#: ../app/dialogs/preferences-dialog.c:2774 +#: ../app/dialogs/preferences-dialog.c:2811 msgid "Plug-In Folders" msgstr "Liitännäiskansiot" -#: ../app/dialogs/preferences-dialog.c:2776 +#: ../app/dialogs/preferences-dialog.c:2813 msgid "Select Plug-In Folders" msgstr "Valitse liitännäiskansiot" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2815 msgid "Scripts" msgstr "Komentosarjat" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2815 msgid "Script-Fu Folders" msgstr "Script-Fu -kansiot" -#: ../app/dialogs/preferences-dialog.c:2780 +#: ../app/dialogs/preferences-dialog.c:2817 msgid "Select Script-Fu Folders" msgstr "Valitse Script-Fu -kansiot" -#: ../app/dialogs/preferences-dialog.c:2782 +#: ../app/dialogs/preferences-dialog.c:2819 msgid "Module Folders" msgstr "Moduulikansiot" -#: ../app/dialogs/preferences-dialog.c:2784 +#: ../app/dialogs/preferences-dialog.c:2821 msgid "Select Module Folders" msgstr "Valitse kansio moduuleille" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Interpreters" msgstr "Tulkit" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Interpreter Folders" msgstr "Tulkkikansiot" -#: ../app/dialogs/preferences-dialog.c:2788 +#: ../app/dialogs/preferences-dialog.c:2825 msgid "Select Interpreter Folders" msgstr "Valitse tulkkikansiot" -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:2827 msgid "Environment Folders" msgstr "Ympäristökansiot" -#: ../app/dialogs/preferences-dialog.c:2792 +#: ../app/dialogs/preferences-dialog.c:2829 msgid "Select Environment Folders" msgstr "Valitse ympäristökansiot" -#: ../app/dialogs/preferences-dialog.c:2794 +#: ../app/dialogs/preferences-dialog.c:2831 msgid "Themes" msgstr "Teemat" -#: ../app/dialogs/preferences-dialog.c:2794 +#: ../app/dialogs/preferences-dialog.c:2831 msgid "Theme Folders" msgstr "Teemakansiot" -#: ../app/dialogs/preferences-dialog.c:2796 +#: ../app/dialogs/preferences-dialog.c:2833 msgid "Select Theme Folders" msgstr "Valitse teemakansiot" @@ -10356,8 +10382,7 @@ msgid "Press %s to discard all changes and close all images." msgstr "Paina %s hylätäksesi kaikki muutokset ja sulkeaksesi kaikki kuvat." -#: ../app/dialogs/quit-dialog.c:341 -#: ../app/display/gimpdisplayshell-close.c:180 +#: ../app/dialogs/quit-dialog.c:341 ../app/display/gimpdisplayshell-close.c:180 msgid "_Discard Changes" msgstr "_Hylkää muutokset" @@ -10563,51 +10588,51 @@ msgid "Line spacing" msgstr "Linjojen väli" -#: ../app/display/gimpcursorview.c:216 ../app/display/gimpcursorview.c:222 -#: ../app/display/gimpcursorview.c:241 ../app/display/gimpcursorview.c:247 -#: ../app/display/gimpcursorview.c:266 ../app/display/gimpcursorview.c:272 -#: ../app/display/gimpcursorview.c:288 ../app/display/gimpcursorview.c:295 -#: ../app/display/gimpcursorview.c:672 ../app/display/gimpcursorview.c:673 -#: ../app/display/gimpcursorview.c:674 ../app/display/gimpcursorview.c:675 -#: ../app/display/gimpcursorview.c:788 ../app/display/gimpcursorview.c:789 -#: ../app/display/gimpcursorview.c:790 ../app/display/gimpcursorview.c:791 +#: ../app/display/gimpcursorview.c:218 ../app/display/gimpcursorview.c:224 +#: ../app/display/gimpcursorview.c:243 ../app/display/gimpcursorview.c:249 +#: ../app/display/gimpcursorview.c:268 ../app/display/gimpcursorview.c:274 +#: ../app/display/gimpcursorview.c:290 ../app/display/gimpcursorview.c:297 +#: ../app/display/gimpcursorview.c:688 ../app/display/gimpcursorview.c:689 +#: ../app/display/gimpcursorview.c:690 ../app/display/gimpcursorview.c:691 +#: ../app/display/gimpcursorview.c:804 ../app/display/gimpcursorview.c:805 +#: ../app/display/gimpcursorview.c:806 ../app/display/gimpcursorview.c:807 #: ../app/widgets/gimpcolorframe.c:633 msgid "n/a" msgstr "n/a" -#: ../app/display/gimpcursorview.c:219 ../app/display/gimpcursorview.c:244 -#: ../app/display/gimpcursorview.c:269 +#: ../app/display/gimpcursorview.c:221 ../app/display/gimpcursorview.c:246 +#: ../app/display/gimpcursorview.c:271 #: ../app/widgets/gimpdeviceinfoeditor.c:138 msgid "X" msgstr "X" -#: ../app/display/gimpcursorview.c:225 ../app/display/gimpcursorview.c:250 -#: ../app/display/gimpcursorview.c:275 +#: ../app/display/gimpcursorview.c:227 ../app/display/gimpcursorview.c:252 +#: ../app/display/gimpcursorview.c:277 #: ../app/widgets/gimpdeviceinfoeditor.c:139 msgid "Y" msgstr "Y" #. Units -#: ../app/display/gimpcursorview.c:231 +#: ../app/display/gimpcursorview.c:233 msgid "Units" msgstr "Yksiköt" #. Selection Bounding Box -#: ../app/display/gimpcursorview.c:256 +#: ../app/display/gimpcursorview.c:258 msgid "Selection Bounding Box" msgstr "Valintamuokkain" #. Width -#: ../app/display/gimpcursorview.c:292 +#: ../app/display/gimpcursorview.c:294 msgid "W" msgstr "L" #. Height -#: ../app/display/gimpcursorview.c:299 +#: ../app/display/gimpcursorview.c:301 msgid "H" msgstr "K" -#: ../app/display/gimpcursorview.c:328 +#: ../app/display/gimpcursorview.c:330 msgid "_Sample Merged" msgstr "_Yhdistetty valinta" @@ -10627,8 +10652,8 @@ msgid "Navigate the image display" msgstr "Selaa kuvanäkymää" -#: ../app/display/gimpdisplayshell.c:746 -#: ../app/display/gimpdisplayshell.c:1331 ../app/widgets/gimptoolbox.c:253 +#: ../app/display/gimpdisplayshell.c:746 ../app/display/gimpdisplayshell.c:1331 +#: ../app/widgets/gimptoolbox.c:253 msgid "Drop image files here to open them" msgstr "Avaa kuvatiedostot pudottamalla ne tähän" @@ -10678,9 +10703,9 @@ msgstr[1] "Jos et tallenna kuvaa, viimeisten %d minuutin muutokset menetetään." #: ../app/display/gimpdisplayshell-close.c:354 -#, fuzzy, c-format +#, c-format msgid "The image has been exported to '%s'." -msgstr "Kuva viety tiedostoon \"%s\"" +msgstr "Kuva on viety tiedostoon '%s'." #: ../app/display/gimpdisplayshell-dnd.c:246 #: ../app/display/gimpdisplayshell-dnd.c:649 @@ -10779,26 +10804,26 @@ msgid "Not a regular file" msgstr "Ei ole tavallinen tiedosto" -#: ../app/file/file-open.c:191 +#: ../app/file/file-open.c:197 #, c-format msgid "%s plug-in returned SUCCESS but did not return an image" msgstr "Liitännäinen %s palautti arvon SUCCESS, mutta ei kuvaa" -#: ../app/file/file-open.c:202 +#: ../app/file/file-open.c:208 #, c-format msgid "%s plug-In could not open image" msgstr "Liitännäinen %s ei voinut avata kuvaa" -#: ../app/file/file-open.c:533 +#: ../app/file/file-open.c:539 msgid "Image doesn't contain any layers" msgstr "Kuvassa ei ole yhtään tasoa" -#: ../app/file/file-open.c:593 +#: ../app/file/file-open.c:599 #, c-format msgid "Opening '%s' failed: %s" msgstr "Tiedoston '%s' avaaminen epäonnistui: %s" -#: ../app/file/file-open.c:703 +#: ../app/file/file-open.c:709 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -10879,7 +10904,7 @@ msgid "Documents" msgstr "Asiakirjat" -#: ../app/gui/splash.c:115 +#: ../app/gui/splash.c:112 msgid "GIMP Startup" msgstr "GIMP käynnistyy" @@ -11310,8 +11335,7 @@ "Proseduuria \"%s\" kutsuttiin väärällä tyypillä argumentille #%d. Oletettiin " "%s, saatiin %s." -#: ../app/pdb/gimppdbcontext.c:89 -#: ../app/tools/gimpforegroundselectoptions.c:79 +#: ../app/pdb/gimppdbcontext.c:89 ../app/tools/gimpforegroundselectoptions.c:79 #: ../app/tools/gimpselectionoptions.c:78 msgid "Smooth edges" msgstr "Pehmennä reunoja" @@ -11478,11 +11502,11 @@ "Proseduurin \"%s\" suoritusvirhe:\n" "%s" -#: ../app/plug-in/gimpplugin-progress.c:331 +#: ../app/plug-in/gimpplugin-progress.c:339 msgid "Cancelled" msgstr "Peruttu" -#: ../app/plug-in/gimpplugin.c:643 +#: ../app/plug-in/gimpplugin.c:648 #, c-format msgid "" "Plug-in crashed: \"%s\"\n" @@ -11497,9 +11521,9 @@ "Liitännäisen kaatuminen on voinut sekoittaa GIMP:in sisäistä tilaa. Tallenna " "kuvat ja käynnistä GIMP uudelleen varmuuden vuoksi." -#: ../app/plug-in/gimppluginmanager-call.c:173 -#: ../app/plug-in/gimppluginmanager-call.c:223 -#: ../app/plug-in/gimppluginmanager-call.c:321 +#: ../app/plug-in/gimppluginmanager-call.c:185 +#: ../app/plug-in/gimppluginmanager-call.c:235 +#: ../app/plug-in/gimppluginmanager-call.c:333 #, c-format msgid "Failed to run plug-in \"%s\"" msgstr "Liitännäistä \"%s\" ei voi suorittaa" @@ -11668,6 +11692,8 @@ "The new text layout cannot be generated. Most likely the font size is too " "big." msgstr "" +"Uutta tekstin asettelua ei voida luoda. Mitä luultavimmin fontti on liian " +"suuri." #: ../app/text/text-enums.c:23 msgctxt "text-box-mode" @@ -12051,8 +12077,7 @@ msgid "Click to set a new clone source" msgstr "Aseta uusi kloonauslähde napsauttamalla" -#: ../app/tools/gimpclonetool.c:109 -#: ../app/tools/gimpperspectiveclonetool.c:899 +#: ../app/tools/gimpclonetool.c:109 ../app/tools/gimpperspectiveclonetool.c:899 msgid "Source" msgstr "Lähde" @@ -12167,18 +12192,15 @@ msgid "Select Color" msgstr "Valitse väri" -#: ../app/tools/gimpcolorizetool.c:241 -#: ../app/tools/gimphuesaturationtool.c:381 +#: ../app/tools/gimpcolorizetool.c:241 ../app/tools/gimphuesaturationtool.c:381 msgid "_Hue:" msgstr "Sävy (H):" -#: ../app/tools/gimpcolorizetool.c:254 -#: ../app/tools/gimphuesaturationtool.c:413 +#: ../app/tools/gimpcolorizetool.c:254 ../app/tools/gimphuesaturationtool.c:413 msgid "_Saturation:" msgstr "Värikylläisyys (S):" -#: ../app/tools/gimpcolorizetool.c:267 -#: ../app/tools/gimphuesaturationtool.c:397 +#: ../app/tools/gimpcolorizetool.c:267 ../app/tools/gimphuesaturationtool.c:397 msgid "_Lightness:" msgstr "Valoisuus (L):" @@ -12188,8 +12210,7 @@ #: ../app/tools/gimpcoloroptions.c:157 #: ../app/tools/gimprectangleselectoptions.c:163 -#: ../app/tools/gimpselectionoptions.c:277 -#: ../app/widgets/gimpbrusheditor.c:155 +#: ../app/tools/gimpselectionoptions.c:277 ../app/widgets/gimpbrusheditor.c:155 msgid "Radius" msgstr "Säde" @@ -12357,66 +12378,66 @@ msgid "There is no active layer to crop." msgstr "Ei rajattavaa aktiivista tasoa." -#: ../app/tools/gimpcurvestool.c:144 +#: ../app/tools/gimpcurvestool.c:145 msgid "Curves" msgstr "Käyrät" -#: ../app/tools/gimpcurvestool.c:145 +#: ../app/tools/gimpcurvestool.c:146 msgid "Curves Tool: Adjust color curves" msgstr "Käyrätyökalu: Säädä värikäyriä" -#: ../app/tools/gimpcurvestool.c:146 +#: ../app/tools/gimpcurvestool.c:147 msgid "_Curves..." msgstr "_Käyrät..." -#: ../app/tools/gimpcurvestool.c:172 +#: ../app/tools/gimpcurvestool.c:174 msgid "Adjust Color Curves" msgstr "Säädä värikäyriä" -#: ../app/tools/gimpcurvestool.c:174 +#: ../app/tools/gimpcurvestool.c:176 msgid "Import Curves" msgstr "Tuo käyrät" -#: ../app/tools/gimpcurvestool.c:175 +#: ../app/tools/gimpcurvestool.c:177 msgid "Export Curves" msgstr "Vie käyrät" -#: ../app/tools/gimpcurvestool.c:226 +#: ../app/tools/gimpcurvestool.c:239 msgid "Curves does not operate on indexed layers." msgstr "Käyrät eivät toimi indeksoiduilla tasoilla." -#: ../app/tools/gimpcurvestool.c:334 +#: ../app/tools/gimpcurvestool.c:348 msgid "Click to add a control point" msgstr "Lisää ohjauspiste napsauttamalla" -#: ../app/tools/gimpcurvestool.c:339 +#: ../app/tools/gimpcurvestool.c:353 msgid "Click to add control points to all channels" msgstr "Lisää ohjauspiste kaikkiin kanaviin napsauttamalla" -#: ../app/tools/gimpcurvestool.c:344 +#: ../app/tools/gimpcurvestool.c:358 msgid "Click to locate on curve (try Shift, Ctrl)" msgstr "" "Napsauta asettaaksesi sijainnin käyrällä (kokeile myös vaihto- ja Ctrl-" "näppäimiä)" -#: ../app/tools/gimpcurvestool.c:457 ../app/tools/gimplevelstool.c:384 +#: ../app/tools/gimpcurvestool.c:473 ../app/tools/gimplevelstool.c:384 msgid "Cha_nnel:" msgstr "Ka_nava:" -#: ../app/tools/gimpcurvestool.c:483 ../app/tools/gimplevelstool.c:408 +#: ../app/tools/gimpcurvestool.c:499 ../app/tools/gimplevelstool.c:408 msgid "R_eset Channel" msgstr "N_ollaa kanava" -#: ../app/tools/gimpcurvestool.c:574 ../app/widgets/gimpdeviceinfoeditor.c:461 +#: ../app/tools/gimpcurvestool.c:590 ../app/widgets/gimpdeviceinfoeditor.c:461 msgid "Curve _type:" msgstr "Käyrän _tyyppi:" -#: ../app/tools/gimpcurvestool.c:651 ../app/tools/gimplevelstool.c:756 +#: ../app/tools/gimpcurvestool.c:667 ../app/tools/gimplevelstool.c:756 #, c-format msgid "Could not read header from '%s': %s" msgstr "Ei voitu lukea otsaketta tiedostosta \"%s\". %s" -#: ../app/tools/gimpcurvestool.c:724 +#: ../app/tools/gimpcurvestool.c:740 msgid "Use _old curves file format" msgstr "Käytä vanhaa käyrätied_ostomuotoa" @@ -12896,8 +12917,7 @@ msgid "Size" msgstr "Koko" -#: ../app/tools/gimpinkoptions-gui.c:71 -#: ../app/tools/gimppaintoptions-gui.c:181 +#: ../app/tools/gimpinkoptions-gui.c:71 ../app/tools/gimppaintoptions-gui.c:181 #: ../app/widgets/gimpbrusheditor.c:199 msgid "Angle" msgstr "Kulma" @@ -12907,8 +12927,7 @@ msgid "Sensitivity" msgstr "Herkkyys" -#: ../app/tools/gimpinkoptions-gui.c:94 -#: ../app/widgets/gimpdynamicseditor.c:144 +#: ../app/tools/gimpinkoptions-gui.c:94 ../app/widgets/gimpdynamicseditor.c:144 #: ../app/widgets/gimpdynamicsoutputeditor.c:72 msgid "Tilt" msgstr "Kallistus" @@ -13074,9 +13093,8 @@ msgstr "Zoomaus: Lähennä tai loitonna kuvaa" #: ../app/tools/gimpmagnifytool.c:93 -#, fuzzy msgid "_Zoom" -msgstr "_Suurenna" +msgstr "_Zoomaus" #: ../app/tools/gimpmeasureoptions.c:67 msgid "Open a floating dialog to view details about measurements" @@ -13212,8 +13230,8 @@ msgstr "_Sivellin" #: ../app/tools/gimppaintoptions-gui.c:89 -#: ../app/tools/gimpselectionoptions.c:217 -#: ../app/widgets/gimpbrushselect.c:190 ../app/widgets/gimplayertreeview.c:268 +#: ../app/tools/gimpselectionoptions.c:217 ../app/widgets/gimpbrushselect.c:190 +#: ../app/widgets/gimplayertreeview.c:268 msgid "Mode:" msgstr "Tila:" @@ -13257,8 +13275,7 @@ msgid "Fade length" msgstr "Häivytyksen pituus" -#: ../app/tools/gimppaintoptions-gui.c:332 -#: ../app/widgets/gimpviewablebox.c:311 +#: ../app/tools/gimppaintoptions-gui.c:332 ../app/widgets/gimpviewablebox.c:311 msgid "Reverse" msgstr "Käänteinen" @@ -14338,8 +14355,7 @@ msgstr "Näyttösuhde" #: ../app/widgets/gimpbrusheditor.c:210 -#: ../app/widgets/gimpbrushfactoryview.c:80 -#: ../app/widgets/gimpgrideditor.c:174 +#: ../app/widgets/gimpbrushfactoryview.c:80 ../app/widgets/gimpgrideditor.c:174 msgid "Spacing" msgstr "Välistys" @@ -14391,7 +14407,7 @@ msgid "No filter selected" msgstr "Ei valittua suodatinta" -#: ../app/widgets/gimpcoloreditor.c:260 +#: ../app/widgets/gimpcoloreditor.c:264 msgid "" "Hexadecimal color notation as used in HTML and CSS. This entry also accepts " "CSS color names." @@ -15143,15 +15159,15 @@ msgid "Height" msgstr "Korkeus" -#: ../app/widgets/gimphelp.c:297 +#: ../app/widgets/gimphelp.c:308 msgid "Help browser is missing" msgstr "Ohjeselain puuttuu" -#: ../app/widgets/gimphelp.c:298 +#: ../app/widgets/gimphelp.c:309 msgid "The GIMP help browser is not available." msgstr "GIMP-ohjeselainta ei ole saatavilla" -#: ../app/widgets/gimphelp.c:299 +#: ../app/widgets/gimphelp.c:310 msgid "" "The GIMP help browser plug-in appears to be missing from your installation. " "You may instead use the web browser for reading the help pages." @@ -15159,31 +15175,39 @@ "GIMP-ohjeselaimen liitännäinen näyttää puuttuvat asennuksestasi. Voit lukea " "ohjesivuja myös WWW-selaimellasi." -#: ../app/widgets/gimphelp.c:340 +#: ../app/widgets/gimphelp.c:351 msgid "Help browser doesn't start" msgstr "Ohjeselain ei käynnistynyt" -#: ../app/widgets/gimphelp.c:341 +#: ../app/widgets/gimphelp.c:352 msgid "Could not start the GIMP help browser plug-in." msgstr "GIMPin ohjeselainta ei voitu käynnistää." -#: ../app/widgets/gimphelp.c:368 +#: ../app/widgets/gimphelp.c:354 +#| msgid "" +#| "The GIMP help browser plug-in appears to be missing from your " +#| "installation. You may instead use the web browser for reading the help " +#| "pages." +msgid "You may instead use the web browser for reading the help pages." +msgstr "Voit sen sijaan käyttää verkkoselainta ohjesivujen lukemiseen." + +#: ../app/widgets/gimphelp.c:380 msgid "Use _Web Browser" -msgstr "Käytä _WWW-selainta" +msgstr "Käytä _verkkoselainta" -#: ../app/widgets/gimphelp.c:712 +#: ../app/widgets/gimphelp.c:724 msgid "GIMP user manual is missing" msgstr "GIMP-ohjekirja puuttuu" -#: ../app/widgets/gimphelp.c:719 +#: ../app/widgets/gimphelp.c:731 msgid "_Read Online" msgstr "_Lue verkossa" -#: ../app/widgets/gimphelp.c:743 +#: ../app/widgets/gimphelp.c:755 msgid "The GIMP user manual is not installed on your computer." msgstr "GIMP-ohjekirjaa ei ole asennettu tietokoneelle." -#: ../app/widgets/gimphelp.c:746 +#: ../app/widgets/gimphelp.c:758 msgid "" "You may either install the additional help package or change your " "preferences to use the online version." @@ -15321,11 +15345,11 @@ msgstr "Lukitse alfakanava" #: ../app/widgets/gimpmessagebox.c:433 -#, fuzzy, c-format +#, c-format msgid "Message repeated once." msgid_plural "Message repeated %d times." -msgstr[0] "Ilmoitus toistui kerran." -msgstr[1] "Ilmoitus toistui kerran." +msgstr[0] "Viesti toistettu kerran." +msgstr[1] "Viesti toistettu %d kertaa." #: ../app/widgets/gimppaletteeditor.c:240 #: ../app/widgets/gimppaletteeditor.c:715 @@ -15504,17 +15528,17 @@ msgid "%d ppi, %s" msgstr "%d ppi, %s" -#: ../app/widgets/gimptextbuffer-serialize.c:344 +#: ../app/widgets/gimptextbuffer-serialize.c:269 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "Attribuutti \"%s\" ei kelpaa <%s> elementtiin tässä kontekstissa" -#: ../app/widgets/gimptextbuffer-serialize.c:416 +#: ../app/widgets/gimptextbuffer-serialize.c:341 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "Tekstin uloimman elementin on oltava , ei <%s>" -#: ../app/widgets/gimptextbuffer.c:1459 +#: ../app/widgets/gimptextbuffer.c:1460 #, c-format msgid "Invalid UTF-8 data in file '%s'." msgstr "Virheellisiä UTF-8 merkkejä tiedostossa '%s'." @@ -15973,6 +15997,9 @@ "distributed program for such tasks as photo retouching, image composition " "and image authoring." msgstr "" +"GIMP on lyhenne englanninkielisistä sanoista GNU Image Manipulation Program. " +"Se on vapaa ohjelmisto, jonka avulla on mahdollista esimerkiksi muokata " +"valokuvia ja koostaa kuvia." #: ../desktop/gimp.appdata.xml.in.h:2 msgid "" @@ -15980,6 +16007,9 @@ "expert quality photo retouching program, an online batch processing system, " "a mass production image renderer, an image format converter, etc." msgstr "" +"GIMP sisältää useita erilaisia ominaisuuksia. Sitä voi käyttää " +"yksinkertaisena piirrosohjelmana, ammattilaisen valokuvakäsittelyn " +"työkaluna, muunnostyökaluna ja niin edelleen." #: ../desktop/gimp.appdata.xml.in.h:3 msgid "" @@ -15989,6 +16019,12 @@ "manipulation procedures to be easily scripted. GIMP is available for Linux, " "Microsoft Windows and OS X." msgstr "" +"GIMP on laajennettavissa. Ohjelman toiminnallisuuksia voi täydentää " +"liitännäisillä ja laajennuksilla, joiden avulla voi tehdä melkein mitä " +"tahansa. Edistynyt skriptausliittymä mahdollistaa niin yksinkertaisten " +"toimenpiteiden kuin monimutkaisten manipulointitoimintojenkin " +"automatisoinnin. GIMP on saatavilla Linuxille, Microsoft Windowsille ja OS X:" +"lle." #: ../desktop/gimp.desktop.in.in.h:2 msgid "Image Editor" diff -Nru gimp-2.8.18/po/fr.po gimp-2.8.20/po/fr.po --- gimp-2.8.18/po/fr.po 2015-08-20 22:57:42.000000000 +0000 +++ gimp-2.8.20/po/fr.po 2017-01-28 19:08:49.000000000 +0000 @@ -1,5 +1,5 @@ # French translation for The GIMP. -# Copyright (C) 1998-2011 Free Software Foundation, Inc. +# Copyright (C) 1998-2014 Free Software Foundation, Inc. # This file is distributed under the same license as the gimp package. # # Vincent Renardias , 1998-2000. @@ -15,28 +15,28 @@ # Yannick Tailliez , 2008. # Robert-André Mauchin , 2008. # Claude Paroz , 2009-2011. -# Julien Hardelin, , 2004, 2009-2011. +# Julien Hardelin , 2004, 2009-2011, 2014. # msgid "" msgstr "" "Project-Id-Version: The GIMP HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-12-05 14:02+0000\n" -"PO-Revision-Date: 2011-12-09 14:44+0100\n" -"Last-Translator: Claude Paroz \n" +"product=gimp&keywords=I18N+L10N&component=Internationalisation\n" +"POT-Creation-Date: 2016-09-06 19:13+0000\n" +"PO-Revision-Date: 2016-09-24 16:19+0200\n" +"Last-Translator: Julien Hardelin \n" "Language-Team: GNOME French Team \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n>1;\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../app/about.h:23 msgid "GIMP" msgstr "GIMP" -#: ../app/about.h:26 ../desktop/gimp.desktop.in.in.h:2 +#: ../app/about.h:26 ../desktop/gimp.desktop.in.in.h:1 msgid "GNU Image Manipulation Program" msgstr "Éditeur d'image GIMP" @@ -50,7 +50,12 @@ "Copyright © 1995-%s\n" "Spencer Kimball, Peter Mattis et l'équipe de développement de GIMP." -#: ../app/about.h:34 +#. TRANSLATORS: do not end the license URL with a dot, because it would +#. * be in the link. Because of technical limitations, make sure the URL +#. * ends with a space, a newline or is end of text. +#. * Cf. bug 762282. +#. +#: ../app/about.h:39 msgid "" "GIMP 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 " @@ -63,7 +68,7 @@ "details.\n" "\n" "You should have received a copy of the GNU General Public License along with " -"GIMP. If not, see http://www.gnu.org/licenses/." +"GIMP. If not, see: http://www.gnu.org/licenses/" msgstr "" "GIMP est un logiciel libre ; vous pouvez le diffuser et/ou le modifier " "suivant les termes de la Licence Publique Générale GNU telle que publiée par " @@ -76,9 +81,9 @@ "détails.\n" "\n" "Vous devriez avoir reçu une copie de la Licence Publique Générale GNU avec " -"GIMP. Sinon, consultez http://www.gnu.org/licenses/." +"GIMP. Sinon, consultez http://www.gnu.org/licenses/" -#: ../app/app.c:224 +#: ../app/app.c:225 #, c-format msgid "" "Unable to open a test swap file.\n" @@ -100,7 +105,8 @@ #, c-format msgid "The batch interpreter '%s' is not available. Batch mode disabled." msgstr "" -"L'interpréteur batch « %s » n'est pas disponible, le mode batch est désactivé." +"L'interpréteur batch « %s » n'est pas disponible, le mode batch est " +"désactivé." #: ../app/main.c:148 msgid "Show version information and exit" @@ -197,11 +203,11 @@ msgid "Output a sorted list of deprecated procedures in the PDB" msgstr "Sort une liste triée des procédures invalidées de la BDP" -#: ../app/main.c:389 +#: ../app/main.c:433 msgid "[FILE|URI...]" msgstr "[FICHIER|URI...]" -#: ../app/main.c:407 +#: ../app/main.c:455 msgid "" "GIMP could not initialize the graphical user interface.\n" "Make sure a proper setup for your display environment exists." @@ -210,21 +216,21 @@ "Assurez-vous qu'une configuration adaptée à l'environnement d'affichage " "existe." -#: ../app/main.c:426 +#: ../app/main.c:474 msgid "Another GIMP instance is already running." msgstr "Une autre instance de GIMP est déjà lancée." -#: ../app/main.c:496 +#: ../app/main.c:546 msgid "GIMP output. Type any character to close this window." msgstr "" "Sortie GIMP. Saisissez n'importe quel caractère pour fermer cette fenêtre." -#: ../app/main.c:497 +#: ../app/main.c:547 #, c-format msgid "(Type any character to close this window)\n" msgstr "(saisissez n'importe quel caractère pour fermer cette fenêtre)\n" -#: ../app/main.c:514 +#: ../app/main.c:564 msgid "GIMP output. You can minimize this window, but don't close it." msgstr "Sortie GIMP. Vous pouvez réduire cette fenêtre mais ne la fermez pas." @@ -275,7 +281,7 @@ #. initialize the list of gimp brushes #: ../app/actions/actions.c:112 ../app/core/gimp.c:951 -#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2725 +#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2783 msgid "Brushes" msgstr "Brosses" @@ -322,7 +328,7 @@ #. Document History #: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:329 -#: ../app/dialogs/preferences-dialog.c:1573 +#: ../app/dialogs/preferences-dialog.c:1612 msgid "Document History" msgstr "Historique des documents" @@ -353,7 +359,7 @@ msgstr "Fichier" #: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:325 -#: ../app/dialogs/preferences-dialog.c:2745 +#: ../app/dialogs/preferences-dialog.c:2803 msgid "Fonts" msgstr "Polices" @@ -364,17 +370,17 @@ #. initialize the list of gimp gradients #: ../app/actions/actions.c:172 ../app/core/gimp.c:971 -#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2741 +#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2799 msgid "Gradients" msgstr "Dégradés" #: ../app/actions/actions.c:175 ../app/core/gimp.c:983 -#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2749 +#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2807 msgid "Tool Presets" msgstr "Préréglages d'outils" #: ../app/actions/actions.c:178 ../app/dialogs/dialogs.c:404 -#: ../app/widgets/gimptoolpreseteditor.c:75 +#: ../app/widgets/gimptoolpreseteditor.c:92 msgid "Tool Preset Editor" msgstr "Éditeur de préréglages d'outils" @@ -397,27 +403,29 @@ msgstr "Calques" #: ../app/actions/actions.c:193 ../app/dialogs/dialogs.c:400 -#: ../app/widgets/gimppaletteeditor.c:143 +#: ../app/widgets/gimppaletteeditor.c:148 msgid "Palette Editor" msgstr "Éditeur de palette" #. initialize the list of gimp palettes #: ../app/actions/actions.c:196 ../app/core/gimp.c:966 -#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2737 +#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2795 msgid "Palettes" msgstr "Palettes" #. initialize the list of gimp patterns #: ../app/actions/actions.c:199 ../app/core/gimp.c:961 -#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2733 +#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2791 msgid "Patterns" msgstr "Motifs" -#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2753 +#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2811 msgid "Plug-Ins" msgstr "Greffons" +#. Quick Mask Color #: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:386 +#: ../app/dialogs/preferences-dialog.c:2069 msgid "Quick Mask" msgstr "Masque rapide" @@ -444,11 +452,11 @@ msgstr "Éditeur de texte" #: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:298 -#: ../app/dialogs/preferences-dialog.c:1854 ../app/gui/gui.c:424 +#: ../app/dialogs/preferences-dialog.c:1898 ../app/gui/gui.c:441 msgid "Tool Options" msgstr "Options des outils" -#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:385 +#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:391 msgid "Tools" msgstr "Outils" @@ -742,8 +750,7 @@ msgid "Intersect this channel with the current selection" msgstr "Intersection de ce canal avec la sélection actuelle" -#: ../app/actions/channels-commands.c:85 -#: ../app/actions/channels-commands.c:402 +#: ../app/actions/channels-commands.c:85 ../app/actions/channels-commands.c:402 msgid "Channel Attributes" msgstr "Attributs du canal" @@ -755,8 +762,7 @@ msgid "Edit Channel Color" msgstr "Modification du canal de couleur" -#: ../app/actions/channels-commands.c:91 -#: ../app/actions/channels-commands.c:123 +#: ../app/actions/channels-commands.c:91 ../app/actions/channels-commands.c:123 msgid "_Fill opacity:" msgstr "Opacité du _remplissage :" @@ -780,7 +786,7 @@ msgstr "Nouveau canal de couleur" #: ../app/actions/channels-commands.c:244 ../app/core/gimpimage-new.c:257 -#: ../app/display/gimpdisplayshell-dnd.c:632 +#: ../app/display/gimpdisplayshell-dnd.c:646 #: ../app/widgets/gimpchanneltreeview.c:258 #: ../app/widgets/gimplayertreeview.c:776 #, c-format @@ -978,14 +984,14 @@ msgid "Use the composite color of all visible layers" msgstr "Utiliser la couleur composée à partir de tous les calques visibles" -#: ../app/actions/data-commands.c:88 ../app/actions/documents-commands.c:344 -#: ../app/actions/file-commands.c:194 ../app/dialogs/file-open-dialog.c:232 -#: ../app/dialogs/file-open-dialog.c:277 +#: ../app/actions/data-commands.c:89 ../app/actions/documents-commands.c:344 +#: ../app/actions/file-commands.c:201 ../app/dialogs/file-open-dialog.c:220 +#: ../app/dialogs/file-open-dialog.c:265 #: ../app/dialogs/file-open-location-dialog.c:213 #: ../app/dialogs/file-open-location-dialog.c:225 -#: ../app/display/gimpdisplayshell-dnd.c:578 -#: ../app/widgets/gimplayertreeview.c:736 ../app/widgets/gimptoolbox-dnd.c:170 -#: ../app/widgets/gimptoolbox.c:833 +#: ../app/display/gimpdisplayshell-dnd.c:592 +#: ../app/widgets/gimplayertreeview.c:736 ../app/widgets/gimptoolbox-dnd.c:168 +#: ../app/widgets/gimptoolbox.c:817 #, c-format msgid "" "Opening '%s' failed:\n" @@ -996,9 +1002,8 @@ "\n" "%s" -#: ../app/actions/data-commands.c:117 -#: ../app/actions/tool-options-commands.c:69 -#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1521 +#: ../app/actions/data-commands.c:118 ../app/actions/tool-options-commands.c:72 +#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1529 #: ../app/core/gimppalette-import.c:211 ../app/core/gimppalette-load.c:224 #: ../app/core/gimppalette.c:399 ../app/dialogs/palette-import-dialog.c:771 #: ../app/widgets/gimpdnd-xds.c:94 @@ -1350,30 +1355,35 @@ msgid "Show some helpful tips on using GIMP" msgstr "Affiche des astuces sur l'utilisation de GIMP" -#: ../app/actions/dialogs-actions.c:264 -msgctxt "dialogs-action" -msgid "_About" -msgstr "À _propos" - -#: ../app/actions/dialogs-actions.c:265 +#: ../app/actions/dialogs-actions.c:265 ../app/actions/dialogs-actions.c:271 msgctxt "dialogs-action" msgid "About GIMP" msgstr "À propos de GIMP" -#: ../app/actions/dialogs-actions.c:329 -#: ../app/dialogs/preferences-dialog.c:1943 ../app/widgets/gimptoolbox.c:555 +#: ../app/actions/dialogs-actions.c:267 +msgctxt "dialogs-action" +msgid "About" +msgstr "À propos" + +#: ../app/actions/dialogs-actions.c:269 +msgctxt "dialogs-action" +msgid "_About" +msgstr "À _propos" + +#: ../app/actions/dialogs-actions.c:333 +#: ../app/dialogs/preferences-dialog.c:1988 ../app/widgets/gimptoolbox.c:539 msgid "Toolbox" msgstr "Boîte à outils" -#: ../app/actions/dialogs-actions.c:330 +#: ../app/actions/dialogs-actions.c:334 msgid "Raise the toolbox" msgstr "Affiche la boîte à outils" -#: ../app/actions/dialogs-actions.c:334 +#: ../app/actions/dialogs-actions.c:338 msgid "New Toolbox" msgstr "Nouvelle boîte à outils" -#: ../app/actions/dialogs-actions.c:335 +#: ../app/actions/dialogs-actions.c:339 msgid "Create a new toolbox" msgstr "Crée une nouvelle boîte à outils" @@ -2127,65 +2137,65 @@ msgid "_Fade..." msgstr "_Fondu..." -#: ../app/actions/edit-commands.c:136 +#: ../app/actions/edit-commands.c:137 msgid "Clear Undo History" msgstr "Vider l'historique d'annulation" -#: ../app/actions/edit-commands.c:162 +#: ../app/actions/edit-commands.c:163 msgid "Really clear image's undo history?" msgstr "Vraiment effacer les images de l'historique d'annulation ?" -#: ../app/actions/edit-commands.c:175 +#: ../app/actions/edit-commands.c:176 #, c-format msgid "Clearing the undo history of this image will gain %s of memory." msgstr "" "Vider l'historique d'annulation de cette image fera gagner %s de mémoire" -#: ../app/actions/edit-commands.c:205 +#: ../app/actions/edit-commands.c:206 msgid "Cut pixels to the clipboard" msgstr "Pixels coupés dans le presse-papiers" -#: ../app/actions/edit-commands.c:235 ../app/actions/edit-commands.c:264 +#: ../app/actions/edit-commands.c:236 ../app/actions/edit-commands.c:265 msgid "Copied pixels to the clipboard" msgstr "Pixels copiés dans le presse-papiers" -#: ../app/actions/edit-commands.c:324 ../app/actions/edit-commands.c:359 -#: ../app/actions/edit-commands.c:538 +#: ../app/actions/edit-commands.c:325 ../app/actions/edit-commands.c:360 +#: ../app/actions/edit-commands.c:543 msgid "There is no image data in the clipboard to paste." msgstr "Il n'y a pas de données d'image à coller depuis le presse-papiers" -#: ../app/actions/edit-commands.c:347 ../app/core/gimpbrushclipboard.c:172 +#: ../app/actions/edit-commands.c:348 ../app/core/gimpbrushclipboard.c:172 #: ../app/core/gimppatternclipboard.c:172 ../app/widgets/gimpclipboard.c:345 msgid "Clipboard" msgstr "Presse-papiers" -#: ../app/actions/edit-commands.c:373 +#: ../app/actions/edit-commands.c:374 msgid "Cut Named" msgstr "Couper (nommé)" -#: ../app/actions/edit-commands.c:376 ../app/actions/edit-commands.c:417 -#: ../app/actions/edit-commands.c:437 +#: ../app/actions/edit-commands.c:377 ../app/actions/edit-commands.c:418 +#: ../app/actions/edit-commands.c:438 msgid "Enter a name for this buffer" msgstr "Saisissez un nom pour ce tampon" -#: ../app/actions/edit-commands.c:414 +#: ../app/actions/edit-commands.c:415 msgid "Copy Named" msgstr "Copier (nommé)" -#: ../app/actions/edit-commands.c:434 +#: ../app/actions/edit-commands.c:435 msgid "Copy Visible Named " msgstr "Copier visible (nommé)" -#: ../app/actions/edit-commands.c:555 +#: ../app/actions/edit-commands.c:560 msgid "There is no active layer or channel to cut from." msgstr "Il n'y a pas de calque ou de canal actif depuis lequel couper." -#: ../app/actions/edit-commands.c:560 ../app/actions/edit-commands.c:592 -#: ../app/actions/edit-commands.c:616 +#: ../app/actions/edit-commands.c:565 ../app/actions/edit-commands.c:597 +#: ../app/actions/edit-commands.c:621 msgid "(Unnamed Buffer)" msgstr "(tampon sans nom)" -#: ../app/actions/edit-commands.c:587 +#: ../app/actions/edit-commands.c:592 msgid "There is no active layer or channel to copy from." msgstr "Il n'y a pas de calque ou de canal actif depuis lequel copier." @@ -2382,8 +2392,8 @@ #: ../app/actions/file-actions.c:146 msgctxt "file-action" -msgid "Export to" -msgstr "Exporter vers" +msgid "Export" +msgstr "_Exporter" #: ../app/actions/file-actions.c:147 msgctxt "file-action" @@ -2403,8 +2413,8 @@ #: ../app/actions/file-actions.c:158 msgctxt "file-action" -msgid "Export..." -msgstr "Exporter..." +msgid "Export As..." +msgstr "Exporter sous..." #: ../app/actions/file-actions.c:159 msgctxt "file-action" @@ -2422,53 +2432,54 @@ msgstr "É_craser %s" #: ../app/actions/file-actions.c:306 -msgid "Export to" -msgstr "Exporter vers" +msgid "Export" +msgstr "Exporter" -#: ../app/actions/file-commands.c:112 ../app/actions/file-commands.c:492 +#: ../app/actions/file-commands.c:119 ../app/actions/file-commands.c:497 #: ../app/dialogs/file-open-dialog.c:77 msgid "Open Image" msgstr "Ouvrir une image" -#: ../app/actions/file-commands.c:133 +#: ../app/actions/file-commands.c:140 msgid "Open Image as Layers" msgstr "Ouverture d'une image en tant que calques" -#: ../app/actions/file-commands.c:265 +#: ../app/actions/file-commands.c:272 msgid "No changes need to be saved" msgstr "Il n'y a pas de modification à enregistrer" -#: ../app/actions/file-commands.c:272 ../app/dialogs/file-save-dialog.c:95 +#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:703 +#: ../app/dialogs/file-save-dialog.c:103 msgid "Save Image" msgstr "Enregistrer l'image" -#: ../app/actions/file-commands.c:278 +#: ../app/actions/file-commands.c:285 msgid "Save a Copy of the Image" msgstr "Enregistrer une copie de l'image" -#: ../app/actions/file-commands.c:356 +#: ../app/actions/file-commands.c:371 msgid "Create New Template" msgstr "Créer un nouveau modèle" -#: ../app/actions/file-commands.c:360 +#: ../app/actions/file-commands.c:375 msgid "Enter a name for this template" msgstr "Saisissez un nom pour ce modèle" -#: ../app/actions/file-commands.c:394 +#: ../app/actions/file-commands.c:405 msgid "Revert failed. No file name associated with this image." msgstr "" "Le rétablissement a échoué. Aucun nom de fichier associé à cette image." -#: ../app/actions/file-commands.c:407 +#: ../app/actions/file-commands.c:417 msgid "Revert Image" msgstr "Rétablir l'image" -#: ../app/actions/file-commands.c:438 +#: ../app/actions/file-commands.c:443 #, c-format msgid "Revert '%s' to '%s'?" msgstr "Rétablir « %s » à « %s » ?" -#: ../app/actions/file-commands.c:444 +#: ../app/actions/file-commands.c:449 msgid "" "By reverting the image to the state saved on disk, you will lose all " "changes, including all undo information." @@ -2476,11 +2487,11 @@ "En rétablissant à l'état enregistré sur le disque, vous perdrez toutes vos " "modifications ainsi que les informations d'annulation." -#: ../app/actions/file-commands.c:655 +#: ../app/actions/file-commands.c:733 msgid "(Unnamed Template)" msgstr "(modèle sans nom)" -#: ../app/actions/file-commands.c:706 +#: ../app/actions/file-commands.c:784 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -3220,7 +3231,7 @@ msgstr "Définir la taille du canevas" #: ../app/actions/image-commands.c:266 ../app/actions/image-commands.c:290 -#: ../app/actions/image-commands.c:583 +#: ../app/actions/image-commands.c:594 msgid "Resizing" msgstr "Redimensionnement" @@ -3228,16 +3239,14 @@ msgid "Set Image Print Resolution" msgstr "Ajuster la définition d'impression de l'image" -#: ../app/actions/image-commands.c:379 -#: ../app/pdb/drawable-transform-cmds.c:159 +#: ../app/actions/image-commands.c:379 ../app/pdb/drawable-transform-cmds.c:159 #: ../app/pdb/drawable-transform-cmds.c:247 #: ../app/pdb/item-transform-cmds.c:162 msgid "Flipping" msgstr "Retournement" -#: ../app/actions/image-commands.c:403 -#: ../app/pdb/drawable-transform-cmds.c:602 -#: ../app/pdb/drawable-transform-cmds.c:694 ../app/pdb/image-cmds.c:533 +#: ../app/actions/image-commands.c:403 ../app/pdb/drawable-transform-cmds.c:602 +#: ../app/pdb/drawable-transform-cmds.c:694 ../app/pdb/image-cmds.c:534 #: ../app/pdb/item-transform-cmds.c:433 ../app/pdb/transform-tools-cmds.c:245 #: ../app/tools/gimprotatetool.c:125 msgid "Rotating" @@ -3247,21 +3256,21 @@ msgid "Cannot crop because the current selection is empty." msgstr "Impossible de rogner car la sélection actuelle est vide." -#: ../app/actions/image-commands.c:630 +#: ../app/actions/image-commands.c:641 msgid "Change Print Size" msgstr "Modifier la taille de l'impression" -#: ../app/actions/image-commands.c:671 +#: ../app/actions/image-commands.c:682 msgid "Scale Image" msgstr "Échelle et taille de l'image" #. Scaling -#: ../app/actions/image-commands.c:682 ../app/actions/layers-commands.c:1145 -#: ../app/dialogs/preferences-dialog.c:1899 +#: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 +#: ../app/dialogs/preferences-dialog.c:1943 #: ../app/pdb/drawable-transform-cmds.c:783 -#: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:405 -#: ../app/pdb/image-cmds.c:441 ../app/pdb/item-transform-cmds.c:524 -#: ../app/pdb/layer-cmds.c:333 ../app/pdb/layer-cmds.c:378 +#: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 +#: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524 +#: ../app/pdb/layer-cmds.c:330 ../app/pdb/layer-cmds.c:375 #: ../app/pdb/transform-tools-cmds.c:334 ../app/tools/gimpscaletool.c:118 msgid "Scaling" msgstr "Mise à l'échelle" @@ -4087,146 +4096,146 @@ msgid "Edit pattern" msgstr "Modifie le motif" -#: ../app/actions/plug-in-actions.c:84 +#: ../app/actions/plug-in-actions.c:85 msgctxt "plug-in-action" msgid "Filte_rs" msgstr "Filt_res" -#: ../app/actions/plug-in-actions.c:86 +#: ../app/actions/plug-in-actions.c:87 msgctxt "plug-in-action" msgid "Recently Used" msgstr "Récemment utilisés" -#: ../app/actions/plug-in-actions.c:88 +#: ../app/actions/plug-in-actions.c:89 msgctxt "plug-in-action" msgid "_Blur" msgstr "_Flou" -#: ../app/actions/plug-in-actions.c:90 +#: ../app/actions/plug-in-actions.c:91 msgctxt "plug-in-action" msgid "_Noise" msgstr "_Bruit" -#: ../app/actions/plug-in-actions.c:92 +#: ../app/actions/plug-in-actions.c:93 msgctxt "plug-in-action" msgid "Edge-De_tect" msgstr "Dé_tection de bord" -#: ../app/actions/plug-in-actions.c:94 +#: ../app/actions/plug-in-actions.c:95 msgctxt "plug-in-action" msgid "En_hance" msgstr "A_mélioration" -#: ../app/actions/plug-in-actions.c:96 +#: ../app/actions/plug-in-actions.c:97 msgctxt "plug-in-action" msgid "C_ombine" msgstr "Combi_ner" -#: ../app/actions/plug-in-actions.c:98 +#: ../app/actions/plug-in-actions.c:99 msgctxt "plug-in-action" msgid "_Generic" msgstr "_Génériques" -#: ../app/actions/plug-in-actions.c:100 +#: ../app/actions/plug-in-actions.c:101 msgctxt "plug-in-action" msgid "_Light and Shadow" msgstr "_Ombres et lumières" -#: ../app/actions/plug-in-actions.c:102 +#: ../app/actions/plug-in-actions.c:103 msgctxt "plug-in-action" msgid "_Distorts" msgstr "_Distorsions" -#: ../app/actions/plug-in-actions.c:104 +#: ../app/actions/plug-in-actions.c:105 msgctxt "plug-in-action" msgid "_Artistic" msgstr "_Artistiques" -#: ../app/actions/plug-in-actions.c:106 +#: ../app/actions/plug-in-actions.c:107 msgctxt "plug-in-action" msgid "_Decor" msgstr "_Décor" -#: ../app/actions/plug-in-actions.c:108 +#: ../app/actions/plug-in-actions.c:109 msgctxt "plug-in-action" msgid "_Map" msgstr "Mappag_e" -#: ../app/actions/plug-in-actions.c:110 +#: ../app/actions/plug-in-actions.c:111 msgctxt "plug-in-action" msgid "_Render" msgstr "_Rendu" -#: ../app/actions/plug-in-actions.c:112 +#: ../app/actions/plug-in-actions.c:113 msgctxt "plug-in-action" msgid "_Clouds" msgstr "N_uages" -#: ../app/actions/plug-in-actions.c:114 +#: ../app/actions/plug-in-actions.c:115 msgctxt "plug-in-action" msgid "_Nature" msgstr "_Nature" -#: ../app/actions/plug-in-actions.c:116 +#: ../app/actions/plug-in-actions.c:117 msgctxt "plug-in-action" msgid "_Pattern" msgstr "_Motif" -#: ../app/actions/plug-in-actions.c:118 +#: ../app/actions/plug-in-actions.c:119 msgctxt "plug-in-action" msgid "_Web" msgstr "_Web" -#: ../app/actions/plug-in-actions.c:120 +#: ../app/actions/plug-in-actions.c:121 msgctxt "plug-in-action" msgid "An_imation" msgstr "An_imation" -#: ../app/actions/plug-in-actions.c:123 +#: ../app/actions/plug-in-actions.c:124 msgctxt "plug-in-action" msgid "Reset all _Filters" msgstr "Réinitialiser to_us les filtres" -#: ../app/actions/plug-in-actions.c:124 +#: ../app/actions/plug-in-actions.c:125 msgctxt "plug-in-action" msgid "Reset all plug-ins to their default settings" msgstr "Réinitialise tous les greffons à leurs valeurs par défaut" -#: ../app/actions/plug-in-actions.c:132 +#: ../app/actions/plug-in-actions.c:133 msgctxt "plug-in-action" msgid "Re_peat Last" msgstr "Ré_péter le dernier" -#: ../app/actions/plug-in-actions.c:134 +#: ../app/actions/plug-in-actions.c:135 msgctxt "plug-in-action" msgid "Rerun the last used plug-in using the same settings" msgstr "Relance le dernier greffon utilisé avec les mêmes paramètres" -#: ../app/actions/plug-in-actions.c:139 +#: ../app/actions/plug-in-actions.c:140 msgctxt "plug-in-action" msgid "R_e-Show Last" msgstr "Ré_afficher le dernier" -#: ../app/actions/plug-in-actions.c:140 +#: ../app/actions/plug-in-actions.c:141 msgctxt "plug-in-action" msgid "Show the last used plug-in dialog again" msgstr "Affiche à nouveau la boîte de dialogue du dernier greffon utilisé" -#: ../app/actions/plug-in-actions.c:531 +#: ../app/actions/plug-in-actions.c:551 #, c-format msgid "Re_peat \"%s\"" msgstr "Ré_péter « %s »" -#: ../app/actions/plug-in-actions.c:532 +#: ../app/actions/plug-in-actions.c:552 #, c-format msgid "R_e-Show \"%s\"" msgstr "R_éafficher « %s »" -#: ../app/actions/plug-in-actions.c:548 +#: ../app/actions/plug-in-actions.c:568 msgid "Repeat Last" msgstr "Répéter le dernier" -#: ../app/actions/plug-in-actions.c:550 +#: ../app/actions/plug-in-actions.c:570 msgid "Re-Show Last" msgstr "Réafficher le dernier" @@ -4431,59 +4440,59 @@ msgid "Stroke the selection with last used values" msgstr "Trace la sélection avec les dernières valeurs utilisées" -#: ../app/actions/select-commands.c:155 +#: ../app/actions/select-commands.c:156 msgid "Feather Selection" msgstr "Adoucissement de la sélection" -#: ../app/actions/select-commands.c:159 +#: ../app/actions/select-commands.c:160 msgid "Feather selection by" msgstr "Adoucir la sélection de" -#: ../app/actions/select-commands.c:196 +#: ../app/actions/select-commands.c:197 msgid "Shrink Selection" msgstr "Réduction de la sélection" -#: ../app/actions/select-commands.c:200 +#: ../app/actions/select-commands.c:201 msgid "Shrink selection by" msgstr "Réduire la sélection de" -#: ../app/actions/select-commands.c:208 +#: ../app/actions/select-commands.c:209 msgid "_Shrink from image border" msgstr "_Réduire depuis le bord de l'image" -#: ../app/actions/select-commands.c:236 +#: ../app/actions/select-commands.c:237 msgid "Grow Selection" msgstr "Agrandissement de la sélection" -#: ../app/actions/select-commands.c:240 +#: ../app/actions/select-commands.c:241 msgid "Grow selection by" msgstr "Agrandir la sélection de" -#: ../app/actions/select-commands.c:266 +#: ../app/actions/select-commands.c:267 msgid "Border Selection" msgstr "Border la sélection" -#: ../app/actions/select-commands.c:270 +#: ../app/actions/select-commands.c:271 msgid "Border selection by" msgstr "Border la sélection de" #. Feather button -#: ../app/actions/select-commands.c:279 +#: ../app/actions/select-commands.c:280 msgid "_Feather border" msgstr "_Adoucir les bords" #. Edge lock button -#: ../app/actions/select-commands.c:292 +#: ../app/actions/select-commands.c:293 msgid "_Lock selection to image edges" msgstr "_Verrouiller la sélection aux bords de l'image" -#: ../app/actions/select-commands.c:342 ../app/actions/select-commands.c:375 +#: ../app/actions/select-commands.c:345 ../app/actions/select-commands.c:378 #: ../app/actions/vectors-commands.c:386 ../app/actions/vectors-commands.c:420 #: ../app/dialogs/stroke-dialog.c:281 msgid "There is no active layer or channel to stroke to." msgstr "Il n'y a pas de calque ou de canal actif sur lequel tracer." -#: ../app/actions/select-commands.c:348 +#: ../app/actions/select-commands.c:351 msgid "Stroke Selection" msgstr "Tracer la sélection" @@ -4613,15 +4622,14 @@ #: ../app/actions/text-editor-commands.c:143 #: ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58 -#: ../app/core/gimpbrush-load.c:140 ../app/core/gimpbrush-load.c:424 -#: ../app/core/gimpbrushgenerated-load.c:73 -#: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54 -#: ../app/core/gimpgradient-load.c:63 ../app/core/gimppalette-load.c:77 -#: ../app/core/gimppalette-load.c:274 ../app/core/gimppalette-load.c:320 -#: ../app/core/gimppalette-load.c:377 ../app/core/gimppalette-load.c:467 -#: ../app/core/gimppalette-load.c:634 ../app/core/gimppattern-load.c:76 -#: ../app/tools/gimpcurvestool.c:649 ../app/tools/gimplevelstool.c:747 -#: ../app/xcf/xcf.c:329 +#: ../app/core/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:443 +#: ../app/core/gimpbrushgenerated-load.c:73 ../app/core/gimpbrushpipe-load.c:81 +#: ../app/core/gimpcurve-load.c:54 ../app/core/gimpgradient-load.c:63 +#: ../app/core/gimppalette-load.c:77 ../app/core/gimppalette-load.c:274 +#: ../app/core/gimppalette-load.c:320 ../app/core/gimppalette-load.c:377 +#: ../app/core/gimppalette-load.c:467 ../app/core/gimppalette-load.c:634 +#: ../app/core/gimppattern-load.c:76 ../app/tools/gimpcurvestool.c:658 +#: ../app/tools/gimplevelstool.c:747 ../app/xcf/xcf.c:359 #, c-format msgid "Could not open '%s' for reading: %s" msgstr "Impossible d'ouvrir « %s » en lecture : %s" @@ -4701,61 +4709,61 @@ msgid "From right to left" msgstr "De droite à gauche" -#: ../app/actions/tool-options-actions.c:54 +#: ../app/actions/tool-options-actions.c:56 msgctxt "tool-options-action" msgid "Tool Options Menu" msgstr "Menu des options de l'outil" -#: ../app/actions/tool-options-actions.c:58 +#: ../app/actions/tool-options-actions.c:60 msgctxt "tool-options-action" msgid "_Save Tool Preset" msgstr "_Enregistrer le préréglage d'outil" -#: ../app/actions/tool-options-actions.c:62 +#: ../app/actions/tool-options-actions.c:64 msgctxt "tool-options-action" msgid "_Restore Tool Preset" msgstr "_Restaurer le préréglage d'outils" -#: ../app/actions/tool-options-actions.c:66 +#: ../app/actions/tool-options-actions.c:68 msgctxt "tool-options-action" msgid "E_dit Tool Preset" msgstr "Mo_difier le préréglage d'outil" -#: ../app/actions/tool-options-actions.c:70 +#: ../app/actions/tool-options-actions.c:72 msgctxt "tool-options-action" msgid "_Delete Tool Preset" msgstr "_Supprimer le préréglage d'outil" -#: ../app/actions/tool-options-actions.c:74 +#: ../app/actions/tool-options-actions.c:76 msgctxt "tool-options-action" msgid "_New Tool Preset..." msgstr "_Nouveau préréglage d'outil..." -#: ../app/actions/tool-options-actions.c:79 +#: ../app/actions/tool-options-actions.c:81 msgctxt "tool-options-action" msgid "R_eset Tool Options" msgstr "Ré_initialiser les options de l'outil" -#: ../app/actions/tool-options-actions.c:80 +#: ../app/actions/tool-options-actions.c:82 msgctxt "tool-options-action" msgid "Reset to default values" msgstr "Réinitialise aux valeurs par défaut" -#: ../app/actions/tool-options-actions.c:85 +#: ../app/actions/tool-options-actions.c:87 msgctxt "tool-options-action" msgid "Reset _all Tool Options" msgstr "Réinitialiser _toutes les options de l'outil" -#: ../app/actions/tool-options-actions.c:86 +#: ../app/actions/tool-options-actions.c:88 msgctxt "tool-options-action" msgid "Reset all tool options" msgstr "Réinitialise toutes les options de l'outil" -#: ../app/actions/tool-options-commands.c:180 +#: ../app/actions/tool-options-commands.c:186 msgid "Reset All Tool Options" msgstr "Réinitialiser toutes les options de l'outil" -#: ../app/actions/tool-options-commands.c:203 +#: ../app/actions/tool-options-commands.c:209 msgid "Do you really want to reset all tool options to default values?" msgstr "" "Voulez-vous vraiment réinitialiser toutes les options de l'outil à ses " @@ -5140,7 +5148,7 @@ msgstr "Options du nouveau chemin" #: ../app/actions/vectors-commands.c:392 ../app/tools/gimpvectoroptions.c:199 -#: ../app/tools/gimpvectortool.c:1970 +#: ../app/tools/gimpvectortool.c:1975 msgid "Stroke Path" msgstr "Tracer le chemin" @@ -5176,13 +5184,13 @@ #: ../app/actions/view-actions.c:82 msgctxt "view-action" -msgid "_Close" -msgstr "_Fermer" +msgid "_Close View" +msgstr "_Fermer la vue" #: ../app/actions/view-actions.c:83 msgctxt "view-action" -msgid "Close this image window" -msgstr "Ferme cette fenêtre d'image" +msgid "Close the active image view" +msgstr "Ferme la vue d'image active" #: ../app/actions/view-actions.c:88 msgctxt "view-action" @@ -5420,7 +5428,7 @@ msgstr "Zoom a_rrière" #: ../app/actions/view-actions.c:264 ../app/actions/view-actions.c:276 -msgctxt "view-action" +msgctxt "view-zoom-action" msgid "Zoom out" msgstr "Zoom arrière" @@ -5430,7 +5438,7 @@ msgstr "Zoom a_vant" #: ../app/actions/view-actions.c:270 ../app/actions/view-actions.c:282 -msgctxt "view-action" +msgctxt "view-zoom-action" msgid "Zoom in" msgstr "Zoom avant" @@ -5444,180 +5452,180 @@ msgid "Zoom In" msgstr "Zoom avant" -#: ../app/actions/view-actions.c:300 +#: ../app/actions/view-actions.c:300 ../app/actions/view-actions.c:306 msgctxt "view-zoom-action" msgid "1_6:1 (1600%)" msgstr "1_6:1 (1600 %)" -#: ../app/actions/view-actions.c:301 +#: ../app/actions/view-actions.c:301 ../app/actions/view-actions.c:307 msgctxt "view-zoom-action" msgid "Zoom 16:1" msgstr "Zoom 16:1" -#: ../app/actions/view-actions.c:306 +#: ../app/actions/view-actions.c:312 ../app/actions/view-actions.c:318 msgctxt "view-zoom-action" msgid "_8:1 (800%)" msgstr "_8:1 (800 %)" -#: ../app/actions/view-actions.c:307 +#: ../app/actions/view-actions.c:313 ../app/actions/view-actions.c:319 msgctxt "view-zoom-action" msgid "Zoom 8:1" msgstr "Zoom 8:1" -#: ../app/actions/view-actions.c:312 +#: ../app/actions/view-actions.c:324 ../app/actions/view-actions.c:330 msgctxt "view-zoom-action" msgid "_4:1 (400%)" msgstr "_4:1 (400 %)" -#: ../app/actions/view-actions.c:313 +#: ../app/actions/view-actions.c:325 ../app/actions/view-actions.c:331 msgctxt "view-zoom-action" msgid "Zoom 4:1" msgstr "Zoom 4:1" -#: ../app/actions/view-actions.c:318 +#: ../app/actions/view-actions.c:336 ../app/actions/view-actions.c:342 msgctxt "view-zoom-action" msgid "_2:1 (200%)" msgstr "_2:1 (200 %)" -#: ../app/actions/view-actions.c:319 +#: ../app/actions/view-actions.c:337 ../app/actions/view-actions.c:343 msgctxt "view-zoom-action" msgid "Zoom 2:1" msgstr "Zoom 2:1" -#: ../app/actions/view-actions.c:324 +#: ../app/actions/view-actions.c:348 ../app/actions/view-actions.c:354 msgctxt "view-zoom-action" msgid "_1:1 (100%)" msgstr "_1:1 (100 %)" -#: ../app/actions/view-actions.c:325 +#: ../app/actions/view-actions.c:349 ../app/actions/view-actions.c:355 msgctxt "view-zoom-action" msgid "Zoom 1:1" msgstr "Zoom 1:1" -#: ../app/actions/view-actions.c:330 +#: ../app/actions/view-actions.c:360 msgctxt "view-zoom-action" msgid "1:_2 (50%)" msgstr "1:_2 (50 %)" -#: ../app/actions/view-actions.c:331 +#: ../app/actions/view-actions.c:361 msgctxt "view-zoom-action" msgid "Zoom 1:2" msgstr "Zoom 1:2" -#: ../app/actions/view-actions.c:336 +#: ../app/actions/view-actions.c:366 msgctxt "view-zoom-action" msgid "1:_4 (25%)" msgstr "1:_4 (25 %)" -#: ../app/actions/view-actions.c:337 +#: ../app/actions/view-actions.c:367 msgctxt "view-zoom-action" msgid "Zoom 1:4" msgstr "Zoom 1:4" -#: ../app/actions/view-actions.c:342 +#: ../app/actions/view-actions.c:372 msgctxt "view-zoom-action" msgid "1:_8 (12.5%)" msgstr "1_:8 (12,5 %)" -#: ../app/actions/view-actions.c:343 +#: ../app/actions/view-actions.c:373 msgctxt "view-zoom-action" msgid "Zoom 1:8" msgstr "Zoom 1:8" -#: ../app/actions/view-actions.c:348 +#: ../app/actions/view-actions.c:378 msgctxt "view-zoom-action" msgid "1:1_6 (6.25%)" msgstr "1:1_6 (6,25 %)" -#: ../app/actions/view-actions.c:349 +#: ../app/actions/view-actions.c:379 msgctxt "view-zoom-action" msgid "Zoom 1:16" msgstr "Zoom 1:16" -#: ../app/actions/view-actions.c:354 +#: ../app/actions/view-actions.c:384 msgctxt "view-zoom-action" msgid "Othe_r..." msgstr "_Autres..." -#: ../app/actions/view-actions.c:355 +#: ../app/actions/view-actions.c:385 msgctxt "view-zoom-action" msgid "Set a custom zoom factor" msgstr "Définit un facteur de zoom personnalisé" -#: ../app/actions/view-actions.c:363 +#: ../app/actions/view-actions.c:393 msgctxt "view-padding-color" msgid "From _Theme" msgstr "Depuis le _thème" -#: ../app/actions/view-actions.c:364 +#: ../app/actions/view-actions.c:394 msgctxt "view-padding-color" msgid "Use the current theme's background color" msgstr "Utilise la couleur d'arrière-plan du thème actuel" -#: ../app/actions/view-actions.c:369 +#: ../app/actions/view-actions.c:399 msgctxt "view-padding-color" msgid "_Light Check Color" msgstr "Couleur _claire du damier" -#: ../app/actions/view-actions.c:370 +#: ../app/actions/view-actions.c:400 msgctxt "view-padding-color" msgid "Use the light check color" msgstr "Utilise la couleur claire du damier" -#: ../app/actions/view-actions.c:375 +#: ../app/actions/view-actions.c:405 msgctxt "view-padding-color" msgid "_Dark Check Color" msgstr "Couleur _sombre du damier" -#: ../app/actions/view-actions.c:376 +#: ../app/actions/view-actions.c:406 msgctxt "view-padding-color" msgid "Use the dark check color" msgstr "Utilise la couleur sombre du damier" -#: ../app/actions/view-actions.c:381 +#: ../app/actions/view-actions.c:411 msgctxt "view-padding-color" msgid "Select _Custom Color..." msgstr "Sélectionner une couleur _personnalisée..." -#: ../app/actions/view-actions.c:382 +#: ../app/actions/view-actions.c:412 msgctxt "view-padding-color" msgid "Use an arbitrary color" msgstr "Utilise une couleur arbitraire" -#: ../app/actions/view-actions.c:387 +#: ../app/actions/view-actions.c:417 msgctxt "view-padding-color" msgid "As in _Preferences" msgstr "Comme dans les pré_férences" -#: ../app/actions/view-actions.c:389 +#: ../app/actions/view-actions.c:419 msgctxt "view-padding-color" msgid "Reset padding color to what's configured in preferences" msgstr "Utilise la couleur de remplissage définie dans les préférences" -#: ../app/actions/view-actions.c:588 +#: ../app/actions/view-actions.c:618 #, c-format msgid "Re_vert Zoom (%d%%)" msgstr "Zoom _précédent (%d %%)" -#: ../app/actions/view-actions.c:596 +#: ../app/actions/view-actions.c:626 msgid "Re_vert Zoom" msgstr "Zoom _précédent" -#: ../app/actions/view-actions.c:732 +#: ../app/actions/view-actions.c:761 #, c-format msgid "Othe_r (%s)..." msgstr "A_utre (%s)..." -#: ../app/actions/view-actions.c:741 +#: ../app/actions/view-actions.c:770 #, c-format msgid "_Zoom (%s)" msgstr "_Zoom (%s)" -#: ../app/actions/view-commands.c:580 +#: ../app/actions/view-commands.c:603 msgid "Set Canvas Padding Color" msgstr "Définition des couleurs de remplissage du canevas" -#: ../app/actions/view-commands.c:582 +#: ../app/actions/view-commands.c:605 msgid "Set Custom Canvas Padding Color" msgstr "Définition des couleurs personnalisées de remplissage du canevas" @@ -5631,65 +5639,61 @@ msgid "Move this window to screen %s" msgstr "Déplace cette fenêtre vers l'écran %s" -#: ../app/actions/windows-actions.c:96 +#: ../app/actions/windows-actions.c:93 msgctxt "windows-action" msgid "_Windows" msgstr "Fe_nêtres" -#: ../app/actions/windows-actions.c:98 +#: ../app/actions/windows-actions.c:95 msgctxt "windows-action" msgid "_Recently Closed Docks" msgstr "Groupes de fenêtres _récemment fermés" -#: ../app/actions/windows-actions.c:100 +#: ../app/actions/windows-actions.c:97 msgctxt "windows-action" msgid "_Dockable Dialogs" msgstr "_Fenêtres ancrables" -#: ../app/actions/windows-actions.c:103 +#: ../app/actions/windows-actions.c:100 msgctxt "windows-action" msgid "Next Image" msgstr "Image suivante" -#: ../app/actions/windows-actions.c:104 +#: ../app/actions/windows-actions.c:101 msgctxt "windows-action" msgid "Switch to the next image" msgstr "Bascule vers l'image suivante" -#: ../app/actions/windows-actions.c:109 +#: ../app/actions/windows-actions.c:106 msgctxt "windows-action" msgid "Previous Image" msgstr "Image précédente " -#: ../app/actions/windows-actions.c:110 +#: ../app/actions/windows-actions.c:107 msgctxt "windows-action" msgid "Switch to the previous image" msgstr "Bascule vers l'image précédente" -#: ../app/actions/windows-actions.c:118 +#: ../app/actions/windows-actions.c:115 msgctxt "windows-action" msgid "Hide Docks" msgstr "Masquer les groupes de fenêtres" -#: ../app/actions/windows-actions.c:119 +#: ../app/actions/windows-actions.c:116 msgctxt "windows-action" msgid "" "When enabled docks and other dialogs are hidden, leaving only image windows." msgstr "Si activé, seules persisteront à l'écran les fenêtres d'image." -#: ../app/actions/windows-actions.c:125 +#: ../app/actions/windows-actions.c:122 msgctxt "windows-action" msgid "Single-Window Mode" msgstr "Mode fenêtre unique" -#: ../app/actions/windows-actions.c:126 +#: ../app/actions/windows-actions.c:123 msgctxt "windows-action" -msgid "" -"When enabled GIMP is in a single-window mode. Far from completely " -"implemented!" -msgstr "" -"Quand cette option est activée, GIMP est en mode fenêtre unique. Loin d'être " -"au point !" +msgid "When enabled GIMP is in a single-window mode." +msgstr "Si activé, GIMP est en mode fenêtre unique." #: ../app/base/base-enums.c:23 msgctxt "curve-type" @@ -5987,9 +5991,9 @@ #: ../app/config/gimpconfig-file.c:67 ../app/core/gimpbrushgenerated-save.c:62 #: ../app/core/gimpcurve-save.c:52 ../app/core/gimpgradient-save.c:50 #: ../app/core/gimpgradient-save.c:144 ../app/core/gimppalette-save.c:56 -#: ../app/gui/themes.c:243 ../app/tools/gimpcurvestool.c:702 +#: ../app/gui/themes.c:248 ../app/tools/gimpcurvestool.c:711 #: ../app/tools/gimplevelstool.c:800 ../app/vectors/gimpvectors-export.c:81 -#: ../app/xcf/xcf.c:422 +#: ../app/xcf/xcf.c:452 #, c-format msgid "Could not open '%s' for writing: %s" msgstr "Impossible d'ouvrir « %s » en écriture : %s" @@ -6010,8 +6014,9 @@ "There was an error parsing your '%s' file. Default values will be used. A " "backup of your configuration has been created at '%s'." msgstr "" -"Une erreur est survenue à l'analyse du fichier « %s ». Les valeurs par défaut " -"seront utilisées. Une sauvegarde de votre configuration a été créée à « %s »." +"Une erreur est survenue à l'analyse du fichier « %s ». Les valeurs par " +"défaut seront utilisées. Une sauvegarde de votre configuration a été créée à " +"« %s »." #. Not all strings defined here are used in the user interface #. * (the preferences dialog mainly) and only those that are should @@ -6048,24 +6053,18 @@ "fichier." #: ../app/config/gimprc-blurbs.h:46 -msgid "Ask for confirmation before closing an image without saving." -msgstr "" -"Demander confirmation avant de fermer une image non sauvegardée depuis sa " -"dernière modification." - -#: ../app/config/gimprc-blurbs.h:49 msgid "Sets the pixel format to use for mouse pointers." msgstr "Définit le format de pixel à utiliser pour les pointeurs de souris." -#: ../app/config/gimprc-blurbs.h:52 +#: ../app/config/gimprc-blurbs.h:49 msgid "Sets the type of mouse pointers to use." msgstr "Définit le type de pointeur de souris à utiliser." -#: ../app/config/gimprc-blurbs.h:55 +#: ../app/config/gimprc-blurbs.h:52 msgid "Sets the handedness for cursor positioning." msgstr "Règle la manualité de l'orientation du pointeur" -#: ../app/config/gimprc-blurbs.h:58 +#: ../app/config/gimprc-blurbs.h:55 msgid "" "Context-dependent mouse pointers are helpful. They are enabled by default. " "However, they require overhead that you may want to do without." @@ -6074,7 +6073,7 @@ "activés par défaut. Néanmoins, ils demandent des ressources supplémentaires " "que vous souhaiteriez peut-être économiser." -#: ../app/config/gimprc-blurbs.h:74 +#: ../app/config/gimprc-blurbs.h:71 msgid "" "When enabled, this will ensure that each pixel of an image gets mapped to a " "pixel on the screen." @@ -6082,13 +6081,13 @@ "Si cette option est activée, chaque pixel d'une image correspondra à un " "pixel de l'écran." -#: ../app/config/gimprc-blurbs.h:96 +#: ../app/config/gimprc-blurbs.h:93 msgid "This is the distance in pixels where Guide and Grid snapping activates." msgstr "" "C'est la distance d'activation en pixels de l'alignement sur un guide ou la " "grille." -#: ../app/config/gimprc-blurbs.h:112 +#: ../app/config/gimprc-blurbs.h:109 msgid "" "Tools such as fuzzy-select and bucket fill find regions based on a seed-fill " "algorithm. The seed fill starts at the initially selected pixel and " @@ -6102,7 +6101,7 @@ "différence de couleur avec le pixel initial dépasse un seuil déterminé. " "Cette option représente la valeur par défaut de ce seuil." -#: ../app/config/gimprc-blurbs.h:125 +#: ../app/config/gimprc-blurbs.h:122 msgid "" "The window type hint that is set on dock windows and the toolbox window. " "This may affect the way your window manager decorates and handles these " @@ -6112,45 +6111,45 @@ "outils. Cela peut affecter la façon dont le gestionnaire de fenêtres décore " "et manipule ces fenêtres." -#: ../app/config/gimprc-blurbs.h:157 +#: ../app/config/gimprc-blurbs.h:154 msgid "When enabled, the selected brush will be used for all tools." msgstr "" "Si cette option est activée, la brosse sélectionnée sera utilisée pour tous " "les outils." -#: ../app/config/gimprc-blurbs.h:160 +#: ../app/config/gimprc-blurbs.h:157 msgid "When enabled, the selected dynamics will be used for all tools." msgstr "" "Si cette option est activée, la dynamique sélectionnée sera utilisée pour " "tous les outils." -#: ../app/config/gimprc-blurbs.h:166 +#: ../app/config/gimprc-blurbs.h:163 msgid "When enabled, the selected gradient will be used for all tools." msgstr "" "Si cette option est activée, le dégradé sélectionné sera utilisé pour tous " "les outils." -#: ../app/config/gimprc-blurbs.h:169 +#: ../app/config/gimprc-blurbs.h:166 msgid "When enabled, the selected pattern will be used for all tools." msgstr "" "Si cette option est activée, le motif sélectionné sera utilisé pour tous les " "outils." -#: ../app/config/gimprc-blurbs.h:183 +#: ../app/config/gimprc-blurbs.h:180 msgid "Sets the browser used by the help system." msgstr "Définit le navigateur utilisé par le système d'aide." -#: ../app/config/gimprc-blurbs.h:194 +#: ../app/config/gimprc-blurbs.h:191 msgid "Sets the text to appear in image window status bars." msgstr "" "Définit le texte apparaissant dans la barre d'état des fenêtres d'image." -#: ../app/config/gimprc-blurbs.h:197 +#: ../app/config/gimprc-blurbs.h:194 msgid "Sets the text to appear in image window titles." msgstr "" "Définit le texte apparaissant dans la barre de titre des fenêtres d'image." -#: ../app/config/gimprc-blurbs.h:200 +#: ../app/config/gimprc-blurbs.h:197 msgid "" "When enabled, this will ensure that the full image is visible after a file " "is opened, otherwise it will be displayed with a scale of 1:1." @@ -6158,22 +6157,22 @@ "Si cette option est activée, les images seront intégralement visibles à leur " "ouverture, sinon elles seront affichées à l'échelle 1:1." -#: ../app/config/gimprc-blurbs.h:204 +#: ../app/config/gimprc-blurbs.h:201 msgid "" "Sets the level of interpolation used for scaling and other transformations." msgstr "" "Définit le niveau d'interpolation utilisé pour les changements d'échelle et " "autres transformations." -#: ../app/config/gimprc-blurbs.h:211 +#: ../app/config/gimprc-blurbs.h:208 msgid "Specifies the language to use for the user interface." msgstr "Définit la langue à utiliser pour l'interface utilisateur." -#: ../app/config/gimprc-blurbs.h:214 +#: ../app/config/gimprc-blurbs.h:211 msgid "How many recently opened image filenames to keep on the File menu." msgstr "Nombre de fichiers récemment ouverts à conserver dans le menu Fichier." -#: ../app/config/gimprc-blurbs.h:217 +#: ../app/config/gimprc-blurbs.h:214 msgid "" "Speed of marching ants in the selection outline. This value is in " "milliseconds (less time indicates faster marching)." @@ -6181,7 +6180,7 @@ "Vitesse de défilement des pointillés qui délimitent la sélection ; valeur en " "millisecondes (une durée plus courte correspond à un défilement plus rapide)." -#: ../app/config/gimprc-blurbs.h:221 +#: ../app/config/gimprc-blurbs.h:218 msgid "" "GIMP will warn the user if an attempt is made to create an image that would " "take more memory than the size specified here." @@ -6189,7 +6188,7 @@ "GIMP préviendra l'utilisateur si ce dernier tente de créer une image dont la " "taille mémoire dépasserait la taille indiquée ici." -#: ../app/config/gimprc-blurbs.h:231 +#: ../app/config/gimprc-blurbs.h:228 msgid "" "Sets the monitor's horizontal resolution, in dots per inch. If set to 0, " "forces the X server to be queried for both horizontal and vertical " @@ -6199,7 +6198,7 @@ "valeur est 0, force l'interrogation du serveur X pour les résolutions " "verticale et horizontale." -#: ../app/config/gimprc-blurbs.h:236 +#: ../app/config/gimprc-blurbs.h:233 msgid "" "Sets the monitor's vertical resolution, in dots per inch. If set to 0, " "forces the X server to be queried for both horizontal and vertical " @@ -6209,7 +6208,7 @@ "valeur est 0, force l'interrogation du serveur X pour les résolutions " "verticale et horizontale." -#: ../app/config/gimprc-blurbs.h:241 +#: ../app/config/gimprc-blurbs.h:238 msgid "" "If enabled, the move tool sets the edited layer or path as active. This " "used to be the default behaviour in older versions." @@ -6218,7 +6217,7 @@ "calque ou un chemin est cliqué. Ceci était le comportement par défaut des " "anciennes versions." -#: ../app/config/gimprc-blurbs.h:245 +#: ../app/config/gimprc-blurbs.h:242 msgid "" "Sets the size of the navigation preview available in the lower right corner " "of the image window." @@ -6226,12 +6225,12 @@ "Définit la taille de la vignette de navigation accessible dans le coin " "inférieur droit de la fenêtre d'image." -#: ../app/config/gimprc-blurbs.h:249 +#: ../app/config/gimprc-blurbs.h:246 msgid "Sets how many processors GIMP should try to use simultaneously." msgstr "" "Définit combien de processeurs GIMP doit essayer d'utiliser simultanément." -#: ../app/config/gimprc-blurbs.h:262 +#: ../app/config/gimprc-blurbs.h:259 msgid "" "When enabled, the X server is queried for the mouse's current position on " "each motion event, rather than relying on the position hint. This means " @@ -6246,7 +6245,7 @@ "certains serveurs X, activer cette option a comme résultat un dessin plus " "rapide." -#: ../app/config/gimprc-blurbs.h:278 +#: ../app/config/gimprc-blurbs.h:275 msgid "" "Sets whether GIMP should create previews of layers and channels. Previews in " "the layers and channels dialog are nice to have but they can slow things " @@ -6256,7 +6255,7 @@ "dernières sont pratiques mais elle peuvent ralentir l'utilisation de GIMP " "lorsque vous travaillez sur des images de grande taille." -#: ../app/config/gimprc-blurbs.h:283 +#: ../app/config/gimprc-blurbs.h:280 msgid "" "Sets the preview size used for layers and channel previews in newly created " "dialogs." @@ -6264,6 +6263,10 @@ "Définit la taille par défaut des aperçus des calques et des canaux dans les " "boîtes de dialogue récemment créées." +#: ../app/config/gimprc-blurbs.h:284 +msgid "Sets the default quick mask color." +msgstr "Définit la couleur par défaut du masque rapide." + #: ../app/config/gimprc-blurbs.h:287 msgid "" "When enabled, the image window will automatically resize itself whenever the " @@ -6352,8 +6355,8 @@ "with the \"View->Show Rulers\" command." msgstr "" "Si cette option est activée, par défaut, les règles seront visibles. " -"L'affichage de ces dernières peut aussi être contrôlé via le menu « Affichage " -"-> Afficher les règles »." +"L'affichage de ces dernières peut aussi être contrôlé via le menu " +"« Affichage -> Afficher les règles »." #: ../app/config/gimprc-blurbs.h:336 msgid "" @@ -6578,8 +6581,8 @@ "Si cette option est activée, l'appui sur la touche F1 ouvrira le navigateur " "d'aide." -#: ../app/config/gimprc-deserialize.c:135 ../app/core/gimp-modules.c:133 -#: ../app/core/gimp-units.c:167 ../app/gui/session.c:279 +#: ../app/config/gimprc-deserialize.c:135 ../app/core/gimp-modules.c:136 +#: ../app/core/gimp-units.c:167 ../app/gui/session.c:286 #: ../app/plug-in/plug-in-rc.c:212 msgid "fatal parse error" msgstr "erreur fatale à l'analyse" @@ -7066,12 +7069,12 @@ msgid "Anchor floating selection" msgstr "Ancrer la sélection flottante" -#: ../app/core/core-enums.c:862 ../app/core/gimp-edit.c:261 +#: ../app/core/core-enums.c:862 ../app/core/gimp-edit.c:293 msgctxt "undo-type" msgid "Paste" msgstr "Coller" -#: ../app/core/core-enums.c:863 ../app/core/gimp-edit.c:502 +#: ../app/core/core-enums.c:863 ../app/core/gimp-edit.c:534 msgctxt "undo-type" msgid "Cut" msgstr "Couper" @@ -7247,168 +7250,168 @@ msgid "Not undoable" msgstr "Non annulable" -#: ../app/core/core-enums.c:1185 +#: ../app/core/core-enums.c:1187 msgctxt "select-criterion" msgid "Composite" msgstr "Composite" -#: ../app/core/core-enums.c:1186 +#: ../app/core/core-enums.c:1188 msgctxt "select-criterion" msgid "Red" msgstr "Rouge" -#: ../app/core/core-enums.c:1187 +#: ../app/core/core-enums.c:1189 msgctxt "select-criterion" msgid "Green" msgstr "Vert" -#: ../app/core/core-enums.c:1188 +#: ../app/core/core-enums.c:1190 msgctxt "select-criterion" msgid "Blue" msgstr "Bleu" -#: ../app/core/core-enums.c:1189 +#: ../app/core/core-enums.c:1191 msgctxt "select-criterion" msgid "Hue" msgstr "Teinte" -#: ../app/core/core-enums.c:1190 +#: ../app/core/core-enums.c:1192 msgctxt "select-criterion" msgid "Saturation" msgstr "Saturation" -#: ../app/core/core-enums.c:1191 +#: ../app/core/core-enums.c:1193 msgctxt "select-criterion" msgid "Value" msgstr "Valeur" -#: ../app/core/core-enums.c:1220 +#: ../app/core/core-enums.c:1222 msgctxt "message-severity" msgid "Message" msgstr "Message" -#: ../app/core/core-enums.c:1221 +#: ../app/core/core-enums.c:1223 msgctxt "message-severity" msgid "Warning" msgstr "Avertissement" -#: ../app/core/core-enums.c:1222 +#: ../app/core/core-enums.c:1224 msgctxt "message-severity" msgid "Error" msgstr "Erreur" -#: ../app/core/core-enums.c:1251 +#: ../app/core/core-enums.c:1253 msgctxt "color-profile-policy" msgid "Ask what to do" msgstr "Demander quoi faire" -#: ../app/core/core-enums.c:1252 +#: ../app/core/core-enums.c:1254 msgctxt "color-profile-policy" msgid "Keep embedded profile" msgstr "Conserver le profil embarqué" -#: ../app/core/core-enums.c:1253 +#: ../app/core/core-enums.c:1255 msgctxt "color-profile-policy" msgid "Convert to RGB workspace" msgstr "Convertir vers l'espace RVB" -#: ../app/core/core-enums.c:1290 +#: ../app/core/core-enums.c:1292 msgctxt "dynamics-output-type" msgid "Opacity" msgstr "Opacité" -#: ../app/core/core-enums.c:1291 +#: ../app/core/core-enums.c:1293 msgctxt "dynamics-output-type" msgid "Size" msgstr "Taille" -#: ../app/core/core-enums.c:1292 +#: ../app/core/core-enums.c:1294 msgctxt "dynamics-output-type" msgid "Angle" msgstr "Angle" -#: ../app/core/core-enums.c:1293 +#: ../app/core/core-enums.c:1295 msgctxt "dynamics-output-type" msgid "Color" msgstr "Couleur" -#: ../app/core/core-enums.c:1294 +#: ../app/core/core-enums.c:1296 msgctxt "dynamics-output-type" msgid "Hardness" msgstr "Dureté" -#: ../app/core/core-enums.c:1295 +#: ../app/core/core-enums.c:1297 msgctxt "dynamics-output-type" msgid "Force" msgstr "Force" -#: ../app/core/core-enums.c:1296 +#: ../app/core/core-enums.c:1298 msgctxt "dynamics-output-type" msgid "Aspect ratio" msgstr "Proportions" -#: ../app/core/core-enums.c:1297 +#: ../app/core/core-enums.c:1299 msgctxt "dynamics-output-type" msgid "Spacing" msgstr "Espacement" -#: ../app/core/core-enums.c:1298 +#: ../app/core/core-enums.c:1300 msgctxt "dynamics-output-type" msgid "Rate" msgstr "Taux" -#: ../app/core/core-enums.c:1299 +#: ../app/core/core-enums.c:1301 msgctxt "dynamics-output-type" msgid "Flow" msgstr "Débit" -#: ../app/core/core-enums.c:1300 +#: ../app/core/core-enums.c:1302 msgctxt "dynamics-output-type" msgid "Jitter" msgstr "Fluctuation" -#: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:366 -#: ../app/gui/session.c:392 ../app/menus/menus.c:464 -#: ../app/widgets/gimpdevices.c:206 +#: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:375 +#: ../app/gui/session.c:408 ../app/menus/menus.c:466 +#: ../app/widgets/gimpdevices.c:208 #, c-format msgid "Deleting \"%s\" failed: %s" msgstr "La suppression de « %s » a échoué : %s" -#: ../app/core/gimp-edit.c:189 ../app/core/gimpimage-new.c:309 +#: ../app/core/gimp-edit.c:190 ../app/core/gimpimage-new.c:309 msgid "Pasted Layer" msgstr "Calque Copié" -#: ../app/core/gimp-edit.c:388 +#: ../app/core/gimp-edit.c:420 msgctxt "undo-type" msgid "Clear" msgstr "Effacer" -#: ../app/core/gimp-edit.c:407 +#: ../app/core/gimp-edit.c:439 msgctxt "undo-type" msgid "Fill with Foreground Color" msgstr "Remplir avec la couleur de premier plan" -#: ../app/core/gimp-edit.c:411 +#: ../app/core/gimp-edit.c:443 msgctxt "undo-type" msgid "Fill with Background Color" msgstr "Remplir avec la couleur d'arrière-plan" -#: ../app/core/gimp-edit.c:415 +#: ../app/core/gimp-edit.c:447 msgctxt "undo-type" msgid "Fill with White" msgstr "Remplir avec du blanc" -#: ../app/core/gimp-edit.c:419 +#: ../app/core/gimp-edit.c:451 msgctxt "undo-type" msgid "Fill with Transparency" msgstr "Remplir en transparent" -#: ../app/core/gimp-edit.c:423 +#: ../app/core/gimp-edit.c:455 msgctxt "undo-type" msgid "Fill with Pattern" msgstr "Remplir avec un motif" -#: ../app/core/gimp-edit.c:515 +#: ../app/core/gimp-edit.c:547 msgid "Global Buffer" msgstr "Presse-papiers global" @@ -7442,7 +7445,7 @@ msgid "tags-locale:C" msgstr "tags-locale:fr" -#: ../app/core/gimp-user-install.c:159 +#: ../app/core/gimp-user-install.c:203 #, c-format msgid "" "It seems you have used GIMP %s before. GIMP will now migrate your user " @@ -7451,7 +7454,7 @@ "Il semble que vous ayez utilisé GIMP-%s auparavant. GIMP va maintenant " "migrer vos paramètres utilisateur vers « %s »." -#: ../app/core/gimp-user-install.c:164 +#: ../app/core/gimp-user-install.c:208 #, c-format msgid "" "It appears that you are using GIMP for the first time. GIMP will now create " @@ -7460,17 +7463,17 @@ "Il apparaît que vous utilisez GIMP pour la première fois. GIMP va maintenant " "créer un dossier appelé « %s » et copier quelques fichiers dedans." -#: ../app/core/gimp-user-install.c:316 +#: ../app/core/gimp-user-install.c:359 #, c-format msgid "Copying file '%s' from '%s'..." msgstr "Copie du fichier « %s » depuis « %s »..." -#: ../app/core/gimp-user-install.c:331 ../app/core/gimp-user-install.c:357 +#: ../app/core/gimp-user-install.c:374 ../app/core/gimp-user-install.c:400 #, c-format msgid "Creating folder '%s'..." msgstr "Création du dossier « %s »..." -#: ../app/core/gimp-user-install.c:342 ../app/core/gimp-user-install.c:368 +#: ../app/core/gimp-user-install.c:385 ../app/core/gimp-user-install.c:411 #, c-format msgid "Cannot create folder '%s': %s" msgstr "Impossible de créer le dossier « %s » : %s" @@ -7494,8 +7497,8 @@ msgstr "Parasites" #. initialize the list of gimp dynamics -#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2729 -#: ../app/tools/gimppaintoptions-gui.c:203 +#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2787 +#: ../app/tools/gimppaintoptions-gui.c:201 msgid "Dynamics" msgstr "Dynamique de la brosse" @@ -7505,7 +7508,7 @@ msgstr "Polices (ceci peut prendre un moment)" #. initialize the module list -#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2761 +#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2819 msgid "Modules" msgstr "Modules" @@ -7514,62 +7517,79 @@ msgid "Updating tag cache" msgstr "Mise à jour du cache des mots-clés" -#: ../app/core/gimpbrush-load.c:178 +#: ../app/core/gimpbrush-load.c:180 #, c-format msgid "Could not read %d byte from '%s': %s" msgid_plural "Could not read %d bytes from '%s': %s" msgstr[0] "Impossible de lire %d octet depuis « %s » : %s" msgstr[1] "Impossible de lire %d octets depuis « %s » : %s" -#: ../app/core/gimpbrush-load.c:200 +#: ../app/core/gimpbrush-load.c:202 #, c-format msgid "Fatal parse error in brush file '%s': Width = 0." -msgstr "Erreur fatale à l'analyse du fichier de brosse « %s » : profondeur = 0." +msgstr "" +"Erreur fatale à l'analyse du fichier de brosse « %s » : profondeur = 0." -#: ../app/core/gimpbrush-load.c:209 +#: ../app/core/gimpbrush-load.c:211 #, c-format msgid "Fatal parse error in brush file '%s': Height = 0." msgstr "Erreur fatale à l'analyse du fichier de brosse « %s » : hauteur = 0." -#: ../app/core/gimpbrush-load.c:218 +#: ../app/core/gimpbrush-load.c:220 #, c-format msgid "Fatal parse error in brush file '%s': Bytes = 0." msgstr "Erreur fatale à l'analyse du fichier de brosse « %s » : octets = 0." -#: ../app/core/gimpbrush-load.c:242 +#: ../app/core/gimpbrush-load.c:244 #, c-format msgid "Fatal parse error in brush file '%s': Unknown depth %d." msgstr "" -"Erreur fatale à l'analyse du fichier de brosse « %s » : profondeur inconnue %" -"d." +"Erreur fatale à l'analyse du fichier de brosse « %s » : profondeur inconnue " +"%d." -#: ../app/core/gimpbrush-load.c:255 +#: ../app/core/gimpbrush-load.c:257 #, c-format msgid "Fatal parse error in brush file '%s': Unknown version %d." msgstr "" "Erreur fatale à l'analyse du fichier de brosse « %s » : version inconnue %d." -#: ../app/core/gimpbrush-load.c:271 ../app/core/gimpbrush-load.c:391 -#: ../app/core/gimpbrush-load.c:725 +#: ../app/core/gimpbrush-load.c:273 ../app/core/gimpbrush-load.c:410 +#: ../app/core/gimpbrush-load.c:626 ../app/core/gimpbrush-load.c:700 +#: ../app/core/gimpbrush-load.c:763 ../app/core/gimpbrush-load.c:779 +#: ../app/core/gimpbrush-load.c:822 #, c-format msgid "Fatal parse error in brush file '%s': File appears truncated." msgstr "" "Erreur fatale à l'analyse du fichier de brosse « %s » : le fichier semble " "tronqué." -#: ../app/core/gimpbrush-load.c:279 ../app/core/gimpbrushgenerated-load.c:128 +#: ../app/core/gimpbrush-load.c:281 ../app/core/gimpbrushgenerated-load.c:128 #: ../app/core/gimpbrushpipe-load.c:97 #, c-format msgid "Invalid UTF-8 string in brush file '%s'." msgstr "Chaîne de caractères UTF-8 non valide dans le fichier de brosse « %s »" -#: ../app/core/gimpbrush-load.c:286 ../app/core/gimppattern-load.c:146 +#: ../app/core/gimpbrush-load.c:288 ../app/core/gimppattern-load.c:146 #: ../app/dialogs/template-options-dialog.c:83 -#: ../app/tools/gimpvectortool.c:318 +#: ../app/tools/gimpvectortool.c:317 msgid "Unnamed" msgstr "Sans nom" -#: ../app/core/gimpbrush-load.c:380 +#: ../app/core/gimpbrush-load.c:354 +#, c-format +msgid "" +"Fatal parse error in brush file '%s': Unsupported brush depth %d\n" +"GIMP brushes must be GRAY or RGBA.\n" +"This might be an obsolete GIMP brush file, try loading it as image and save " +"it again." +msgstr "" +"Erreur fatale à l'analyse du fichier de brosse « %s » : profondeur %d non " +"prise en charge\n" +"Les brosses GIMP doivent être TONS DE GRIS ou RVBA.\n" +"Il peut s'agir d'un fichier de brosse GIMP dépassé ; essayez de le charger " +"comme image et de le réenregistrer." + +#: ../app/core/gimpbrush-load.c:399 #, c-format msgid "" "Fatal parse error in brush file '%s': Unsupported brush depth %d\n" @@ -7579,20 +7599,20 @@ "prise en charge\n" "Les brosses GIMP doivent être TONS DE GRIS ou RVBA." -#: ../app/core/gimpbrush-load.c:452 +#: ../app/core/gimpbrush-load.c:471 ../app/core/gimpbrush-load.c:909 #, c-format msgid "" "Fatal parse error in brush file '%s': unable to decode abr format version %d." msgstr "" -"Erreur fatale à l'analyse du fichier de brosse « %s » : impossible de décoder " -"le format abr de version %d." +"Erreur fatale à l'analyse du fichier de brosse « %s » : impossible de " +"décoder le format abr de version %d." -#: ../app/core/gimpbrush-load.c:619 +#: ../app/core/gimpbrush-load.c:647 #, c-format msgid "Fatal parse error in brush file '%s': Wide brushes are not supported." msgstr "" -"Erreur fatale à l'analyse du fichier de brosse « %s » : les brosses larges ne " -"sont pas prises en charge." +"Erreur fatale à l'analyse du fichier de brosse « %s » : les brosses larges " +"ne sont pas prises en charge." #: ../app/core/gimpbrush.c:148 msgid "Brush Spacing" @@ -7652,16 +7672,15 @@ msgid "Brush Hardness" msgstr "Dureté de la brosse" -#: ../app/core/gimpbrushgenerated.c:159 ../app/paint/gimppaintoptions.c:150 +#: ../app/core/gimpbrushgenerated.c:159 ../app/paint/gimppaintoptions.c:151 msgid "Brush Aspect Ratio" msgstr "Proportions de la brosse" -#: ../app/core/gimpbrushgenerated.c:166 ../app/paint/gimppaintoptions.c:154 +#: ../app/core/gimpbrushgenerated.c:166 ../app/paint/gimppaintoptions.c:155 msgid "Brush Angle" msgstr "Angle de la brosse" #: ../app/core/gimpbrushpipe-load.c:113 ../app/core/gimpbrushpipe-load.c:133 -#: ../app/core/gimpbrushpipe-load.c:224 #, c-format msgid "Fatal parse error in brush file '%s': File is corrupt." msgstr "" @@ -7827,21 +7846,21 @@ msgstr "Impossible de tracer un canal vide." # Annulation d'action -#: ../app/core/gimpchannel.c:1758 +#: ../app/core/gimpchannel.c:1763 msgctxt "undo-type" msgid "Set Channel Color" msgstr "Changement de la couleur du canal" -#: ../app/core/gimpchannel.c:1824 +#: ../app/core/gimpchannel.c:1829 msgctxt "undo-type" msgid "Set Channel Opacity" msgstr "Changement de l'opacité du canal" -#: ../app/core/gimpchannel.c:1932 ../app/core/gimpselection.c:154 +#: ../app/core/gimpchannel.c:1937 ../app/core/gimpselection.c:154 msgid "Selection Mask" msgstr "Masque de sélection" -#: ../app/core/gimpcontext.c:639 ../app/tools/gimppaintoptions-gui.c:113 +#: ../app/core/gimpcontext.c:639 ../app/tools/gimppaintoptions-gui.c:109 #: ../app/widgets/gimpbrushselect.c:177 ../app/widgets/gimplayertreeview.c:284 msgid "Opacity" msgstr "Opacité" @@ -7850,13 +7869,13 @@ msgid "Paint Mode" msgstr "Mode de peinture" -#: ../app/core/gimpdata.c:670 +#: ../app/core/gimpdata.c:690 #, c-format msgid "Could not delete '%s': %s" msgstr "Impossible de supprimer « %s » : %s" -#: ../app/core/gimpdatafactory.c:427 ../app/core/gimpdatafactory.c:456 -#: ../app/core/gimpdatafactory.c:622 ../app/core/gimpdatafactory.c:644 +#: ../app/core/gimpdatafactory.c:445 ../app/core/gimpdatafactory.c:470 +#: ../app/core/gimpdatafactory.c:637 ../app/core/gimpdatafactory.c:659 #, c-format msgid "" "Failed to save data:\n" @@ -7867,17 +7886,17 @@ "\n" "%s" -#: ../app/core/gimpdatafactory.c:536 ../app/core/gimpdatafactory.c:539 -#: ../app/core/gimpitem.c:493 ../app/core/gimpitem.c:496 +#: ../app/core/gimpdatafactory.c:551 ../app/core/gimpdatafactory.c:554 +#: ../app/core/gimpitem.c:495 ../app/core/gimpitem.c:498 msgid "copy" msgstr "copier" -#: ../app/core/gimpdatafactory.c:548 ../app/core/gimpitem.c:505 +#: ../app/core/gimpdatafactory.c:563 ../app/core/gimpitem.c:507 #, c-format msgid "%s copy" msgstr "Copie de %s" -#: ../app/core/gimpdatafactory.c:741 +#: ../app/core/gimpdatafactory.c:756 #, c-format msgid "" "You have a writable data folder configured (%s), but this folder does not " @@ -7888,7 +7907,7 @@ "n'existe pas. Créez le dossier ou adaptez la configuration dans la section " "« Dossiers » des Préférences." -#: ../app/core/gimpdatafactory.c:762 +#: ../app/core/gimpdatafactory.c:777 #, c-format msgid "" "You have a writable data folder configured, but this folder is not part of " @@ -7900,12 +7919,12 @@ "manuellement le fichier gimprc. Corrigez-le dans la section « Dossiers » des " "préférences." -#: ../app/core/gimpdatafactory.c:772 +#: ../app/core/gimpdatafactory.c:787 #, c-format msgid "You don't have any writable data folder configured." msgstr "Vous n'avez configuré aucun dossier de données accessible en écriture." -#: ../app/core/gimpdatafactory.c:889 +#: ../app/core/gimpdatafactory.c:955 #, c-format msgid "" "Failed to load data:\n" @@ -7922,11 +7941,7 @@ msgstr "Dégradé" #: ../app/core/gimpdrawable-brightness-contrast.c:70 -msgctxt "undo-type" -msgid "Brightness_Contrast" -msgstr "Luminosité_Contraste" - -#: ../app/core/gimpdrawable-brightness-contrast.c:81 +#: ../app/core/gimpdrawable-brightness-contrast.c:83 msgctxt "undo-type" msgid "Brightness-Contrast" msgstr "Luminosité-Contraste" @@ -8001,7 +8016,7 @@ msgstr "Postériser" #: ../app/core/gimpdrawable-stroke.c:272 -#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:556 +#: ../app/paint/gimppaintcore-stroke.c:330 ../app/vectors/gimpvectors.c:556 msgid "Not enough points to stroke" msgstr "Il n'y a pas assez de points pour le tracé" @@ -8017,7 +8032,7 @@ #: ../app/core/gimpdrawable-threshold.c:70 #: ../app/core/gimpdrawable-threshold.c:81 ../app/tools/gimpblendoptions.c:275 #: ../app/tools/gimpbucketfilloptions.c:285 -#: ../app/tools/gimpregionselectoptions.c:215 +#: ../app/tools/gimpregionselectoptions.c:216 #: ../app/tools/gimpthresholdtool.c:90 msgid "Threshold" msgstr "Seuil" @@ -8062,8 +8077,8 @@ #, c-format msgid "Fatal parse error in gradient file '%s': Not a GIMP gradient file." msgstr "" -"Erreur fatale à l'analyse du fichier de dégradé « %s » : n'est pas un fichier " -"de dégradé GIMP." +"Erreur fatale à l'analyse du fichier de dégradé « %s » : n'est pas un " +"fichier de dégradé GIMP." #: ../app/core/gimpgradient-load.c:110 #, c-format @@ -8075,8 +8090,8 @@ #, c-format msgid "Fatal parse error in gradient file '%s': File is corrupt in line %d." msgstr "" -"Erreur fatale à l'analyse du fichier de dégradé « %s ». Le fichier de dégradé " -"est endommagé à la ligne %d." +"Erreur fatale à l'analyse du fichier de dégradé « %s ». Le fichier de " +"dégradé est endommagé à la ligne %d." #: ../app/core/gimpgradient-load.c:219 ../app/core/gimpgradient-load.c:230 #, c-format @@ -8089,8 +8104,8 @@ #, c-format msgid "Gradient file '%s' is corrupt: Segments do not span the range 0-1." msgstr "" -"Le ficher de dégradé « %s » est endommagé : les segments ne rentrent pas dans " -"l'intervalle 0-1." +"Le ficher de dégradé « %s » est endommagé : les segments ne rentrent pas " +"dans l'intervalle 0-1." #: ../app/core/gimpgradient-load.c:336 #, c-format @@ -8102,37 +8117,37 @@ msgid "Failed to import gradients from '%s': %s" msgstr "L'importation des dégradés depuis « %s » a échoué : %s" -#: ../app/core/gimpgrid.c:84 +#: ../app/core/gimpgrid.c:85 msgid "Line style used for the grid." msgstr "Style de ligne utilisé pour la grille." -#: ../app/core/gimpgrid.c:90 +#: ../app/core/gimpgrid.c:91 msgid "The foreground color of the grid." msgstr "La couleur du premier plan de la grille." -#: ../app/core/gimpgrid.c:95 +#: ../app/core/gimpgrid.c:96 msgid "" "The background color of the grid; only used in double dashed line style." msgstr "" "La couleur de l'arrière-plan de la grille ; utilisée seulement pour le style " "de lignes en doubles tirets." -#: ../app/core/gimpgrid.c:101 +#: ../app/core/gimpgrid.c:102 msgid "Horizontal spacing of grid lines." msgstr "Espacement horizontal des lignes de la grille." -#: ../app/core/gimpgrid.c:106 +#: ../app/core/gimpgrid.c:107 msgid "Vertical spacing of grid lines." msgstr "Espacement vertical des lignes de la grille." -#: ../app/core/gimpgrid.c:115 +#: ../app/core/gimpgrid.c:116 msgid "" "Horizontal offset of the first grid line; this may be a negative number." msgstr "" "Décalage horizontal de la première ligne de la grille ; ça peut être un " "nombre négatif." -#: ../app/core/gimpgrid.c:122 +#: ../app/core/gimpgrid.c:123 msgid "Vertical offset of the first grid line; this may be a negative number." msgstr "" "Décalage vertical de la première ligne de la grille ; ça peut être un nombre " @@ -8192,12 +8207,17 @@ msgid "Set Colormap" msgstr "Définir la palette des couleurs" -#: ../app/core/gimpimage-colormap.c:243 +#: ../app/core/gimpimage-colormap.c:210 +msgctxt "undo-type" +msgid "Unset Colormap" +msgstr "Palette des couleurs non définie" + +#: ../app/core/gimpimage-colormap.c:263 msgctxt "undo-type" msgid "Change Colormap entry" msgstr "Modifier l'entrée de la palette des couleurs" -#: ../app/core/gimpimage-colormap.c:271 +#: ../app/core/gimpimage-colormap.c:291 msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "Ajouter la couleur à la palette de couleurs" @@ -8264,17 +8284,17 @@ msgid "Translate Items" msgstr "Déplacer l'élément" -#: ../app/core/gimpimage-item-list.c:78 +#: ../app/core/gimpimage-item-list.c:79 msgctxt "undo-type" msgid "Flip Items" msgstr "Retourner l'élément" -#: ../app/core/gimpimage-item-list.c:105 +#: ../app/core/gimpimage-item-list.c:108 ../app/core/gimpitem-linked.c:125 msgctxt "undo-type" msgid "Rotate Items" msgstr "Tourner l'élément" -#: ../app/core/gimpimage-item-list.c:135 +#: ../app/core/gimpimage-item-list.c:140 msgctxt "undo-type" msgid "Transform Items" msgstr "Transformer l'élément" @@ -8284,39 +8304,43 @@ msgid "Merge Visible Layers" msgstr "Fusionner les calques visibles" -#: ../app/core/gimpimage-merge.c:178 +#: ../app/core/gimpimage-merge.c:195 msgctxt "undo-type" msgid "Flatten Image" msgstr "Aplatir l'image" -#: ../app/core/gimpimage-merge.c:248 +#: ../app/core/gimpimage-merge.c:217 +msgid "Cannot flatten an image without any visible layer." +msgstr "Impossible d'aplatir une image sans aucun calque visible." + +#: ../app/core/gimpimage-merge.c:260 msgid "Cannot merge down to a layer group." msgstr "Impossible de fusionner vers un groupe de calques." -#: ../app/core/gimpimage-merge.c:255 +#: ../app/core/gimpimage-merge.c:267 msgid "The layer to merge down to is locked." msgstr "Le calque destinataire de la fusion est verrouillé." -#: ../app/core/gimpimage-merge.c:267 +#: ../app/core/gimpimage-merge.c:279 msgid "There is no visible layer to merge down to." msgstr "Il n'y a pas de calque visible à fusionner." -#: ../app/core/gimpimage-merge.c:277 +#: ../app/core/gimpimage-merge.c:289 msgctxt "undo-type" msgid "Merge Down" msgstr "Fusionner vers le bas" -#: ../app/core/gimpimage-merge.c:305 +#: ../app/core/gimpimage-merge.c:317 msgctxt "undo-type" msgid "Merge Layer Group" msgstr "Fusionner le groupe de calques" -#: ../app/core/gimpimage-merge.c:358 +#: ../app/core/gimpimage-merge.c:370 msgctxt "undo-type" msgid "Merge Visible Paths" msgstr "Fusionner les chemins visibles" -#: ../app/core/gimpimage-merge.c:394 +#: ../app/core/gimpimage-merge.c:406 msgid "Not enough visible paths for a merge. There must be at least two." msgstr "" "Il n'y a pas assez de chemins visibles pour une fusion. Il en faut au moins " @@ -8351,7 +8375,7 @@ msgid "Move Sample Point" msgstr "Déplacer le point d'échantillonnage" -#: ../app/core/gimpimage-scale.c:87 +#: ../app/core/gimpimage-scale.c:88 msgctxt "undo-type" msgid "Scale Image" msgstr "Échelle et taille de l'image" @@ -8361,125 +8385,137 @@ msgid "Can't undo %s" msgstr "Impossible d'annuler %s" -#: ../app/core/gimpimage.c:1806 +#: ../app/core/gimpimage.c:1784 +msgid " (exported)" +msgstr " (exportée)" + +#: ../app/core/gimpimage.c:1788 +msgid " (overwritten)" +msgstr " (écrasée)" + +#: ../app/core/gimpimage.c:1797 +msgid " (imported)" +msgstr " (importée)" + +#: ../app/core/gimpimage.c:1939 msgctxt "undo-type" msgid "Change Image Resolution" msgstr "Modifier la définition de l'image" -#: ../app/core/gimpimage.c:1858 +#: ../app/core/gimpimage.c:1991 msgctxt "undo-type" msgid "Change Image Unit" msgstr "Modifier l'unité de l'image" -#: ../app/core/gimpimage.c:2850 +#: ../app/core/gimpimage.c:3004 msgctxt "undo-type" msgid "Attach Parasite to Image" msgstr "Attacher un parasite à l'image" -#: ../app/core/gimpimage.c:2891 +#: ../app/core/gimpimage.c:3045 msgctxt "undo-type" msgid "Remove Parasite from Image" msgstr "Supprimer le parasite de l'image" -#: ../app/core/gimpimage.c:3600 +#: ../app/core/gimpimage.c:3754 msgctxt "undo-type" msgid "Add Layer" msgstr "Ajouter un calque" -#: ../app/core/gimpimage.c:3650 ../app/core/gimpimage.c:3670 +#: ../app/core/gimpimage.c:3804 ../app/core/gimpimage.c:3824 msgctxt "undo-type" msgid "Remove Layer" msgstr "Supprimer le calque" -#: ../app/core/gimpimage.c:3664 +#: ../app/core/gimpimage.c:3818 msgctxt "undo-type" msgid "Remove Floating Selection" msgstr "Supprimer la sélection flottante" -#: ../app/core/gimpimage.c:3832 +#: ../app/core/gimpimage.c:3983 msgctxt "undo-type" msgid "Add Channel" msgstr "Ajouter un canal" -#: ../app/core/gimpimage.c:3870 ../app/core/gimpimage.c:3883 +#: ../app/core/gimpimage.c:4021 ../app/core/gimpimage.c:4034 msgctxt "undo-type" msgid "Remove Channel" msgstr "Supprimer le canal" -#: ../app/core/gimpimage.c:3937 +#: ../app/core/gimpimage.c:4088 msgctxt "undo-type" msgid "Add Path" msgstr "Ajouter un chemin" -#: ../app/core/gimpimage.c:3968 +#: ../app/core/gimpimage.c:4119 msgctxt "undo-type" msgid "Remove Path" msgstr "Supprimer le chemin" -#: ../app/core/gimpimagefile.c:697 ../app/dialogs/preferences-dialog.c:1711 +#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1750 msgid "Folder" msgstr "Dossier" -#: ../app/core/gimpimagefile.c:702 +#: ../app/core/gimpimagefile.c:724 msgid "Special File" msgstr "Fichier spécial" -#: ../app/core/gimpimagefile.c:718 +#: ../app/core/gimpimagefile.c:740 msgid "Remote File" msgstr "Fichier distant" -#: ../app/core/gimpimagefile.c:737 +#: ../app/core/gimpimagefile.c:759 msgid "Click to create preview" msgstr "Cliquez pour créer l'aperçu" -#: ../app/core/gimpimagefile.c:743 +#: ../app/core/gimpimagefile.c:765 msgid "Loading preview..." msgstr "Chargement de l'aperçu..." -#: ../app/core/gimpimagefile.c:749 +#: ../app/core/gimpimagefile.c:771 msgid "Preview is out of date" msgstr "Prévisualisation périmée" -#: ../app/core/gimpimagefile.c:755 +#: ../app/core/gimpimagefile.c:777 msgid "Cannot create preview" msgstr "Impossible de créer l'aperçu." -#: ../app/core/gimpimagefile.c:765 +#: ../app/core/gimpimagefile.c:787 msgid "(Preview may be out of date)" msgstr "(L'aperçu est peut être périmé)" #. pixel size -#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:437 -#: ../app/widgets/gimpsizebox.c:427 ../app/widgets/gimptemplateeditor.c:565 +#: ../app/core/gimpimagefile.c:796 ../app/widgets/gimpimagepropview.c:440 +#: ../app/widgets/gimpsizebox.c:432 ../app/widgets/gimptemplateeditor.c:581 #, c-format msgid "%d × %d pixel" msgid_plural "%d × %d pixels" msgstr[0] "%d x %d pixel" msgstr[1] "%d x %d pixels" -#: ../app/core/gimpimagefile.c:797 ../app/display/gimpdisplayshell-title.c:336 +#: ../app/core/gimpimagefile.c:819 ../app/display/gimpdisplayshell-title.c:317 #, c-format msgid "%d layer" msgid_plural "%d layers" msgstr[0] "%d calque" msgstr[1] "%d calques" -#: ../app/core/gimpimagefile.c:845 +#: ../app/core/gimpimagefile.c:867 #, c-format msgid "Could not open thumbnail '%s': %s" msgstr "Impossible d'ouvrir la vignette « %s » : %s" -#: ../app/core/gimpitem.c:1815 +#: ../app/core/gimpitem.c:1819 msgctxt "undo-type" msgid "Attach Parasite" msgstr "Attacher un parasite" -#: ../app/core/gimpitem.c:1825 +#: ../app/core/gimpitem.c:1829 msgctxt "undo-type" msgid "Attach Parasite to Item" msgstr "Attacher un parasite à l'élément" -#: ../app/core/gimpitem.c:1876 ../app/core/gimpitem.c:1883 +#: ../app/core/gimpitem.c:1880 ../app/core/gimpitem.c:1887 msgctxt "undo-type" msgid "Remove Parasite from Item" msgstr "Supprimer un parasite de l'élément" @@ -8488,6 +8524,10 @@ msgid "Set Item Exclusive Visible" msgstr "Rendre l'élément exclusivement visible" +#: ../app/core/gimpitem-exclusive.c:172 +msgid "Set Item Exclusive Linked" +msgstr "Rendre l'élément exclusivement lié" + #: ../app/core/gimplayer-floating-sel.c:95 msgctxt "undo-type" msgid "Anchor Floating Selection" @@ -8569,7 +8609,7 @@ msgid "Layer cannot be lowered more." msgstr "Le calque ne peut pas être descendu plus bas." -#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1528 +#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1532 #: ../app/core/gimplayermask.c:236 #, c-format msgid "%s mask" @@ -8584,49 +8624,49 @@ "Sélection flottante\n" "(%s)" -#: ../app/core/gimplayer.c:1448 +#: ../app/core/gimplayer.c:1452 msgid "Unable to add a layer mask since the layer already has one." msgstr "" "Impossible d'ajouter un masque au\n" "calque car il en a déjà un." -#: ../app/core/gimplayer.c:1459 +#: ../app/core/gimplayer.c:1463 msgid "Cannot add layer mask of different dimensions than specified layer." msgstr "" "Impossible d'ajouter un masque de\n" "dimensions différentes de celles du calque." -#: ../app/core/gimplayer.c:1465 +#: ../app/core/gimplayer.c:1469 msgctxt "undo-type" msgid "Add Layer Mask" msgstr "Ajouter un masque de calque" -#: ../app/core/gimplayer.c:1583 +#: ../app/core/gimplayer.c:1587 msgctxt "undo-type" msgid "Transfer Alpha to Mask" msgstr "Transfert de l'alpha vers le masque" -#: ../app/core/gimplayer.c:1753 +#: ../app/core/gimplayer.c:1757 msgctxt "undo-type" msgid "Apply Layer Mask" msgstr "Appliquer le masque de calque" -#: ../app/core/gimplayer.c:1754 +#: ../app/core/gimplayer.c:1758 msgctxt "undo-type" msgid "Delete Layer Mask" msgstr "Supprimer le masque de calque" -#: ../app/core/gimplayer.c:1873 +#: ../app/core/gimplayer.c:1877 msgctxt "undo-type" msgid "Add Alpha Channel" msgstr "Ajouter un canal alpha" -#: ../app/core/gimplayer.c:1927 +#: ../app/core/gimplayer.c:1931 msgctxt "undo-type" msgid "Remove Alpha Channel" msgstr "Supprimer le canal alpha" -#: ../app/core/gimplayer.c:1947 +#: ../app/core/gimplayer.c:1951 msgctxt "undo-type" msgid "Layer to Image Size" msgstr "Mettre aux dimensions de l'image" @@ -8690,7 +8730,8 @@ #: ../app/core/gimppalette-load.c:125 #, c-format msgid "Invalid UTF-8 string in palette file '%s'" -msgstr "Chaîne de caractères UTF-8 non valide dans le fichier de palette « %s »" +msgstr "" +"Chaîne de caractères UTF-8 non valide dans le fichier de palette « %s »" #: ../app/core/gimppalette-load.c:149 #, c-format @@ -8698,8 +8739,8 @@ "Reading palette file '%s': Invalid number of columns in line %d. Using " "default value." msgstr "" -"Chargement de la palette « %s » : nombre de colonnes non valide à la ligne %" -"d. Utilisation de la valeur par défaut." +"Chargement de la palette « %s » : nombre de colonnes non valide à la ligne " +"%d. Utilisation de la valeur par défaut." #: ../app/core/gimppalette-load.c:185 #, c-format @@ -8723,8 +8764,8 @@ #, c-format msgid "Reading palette file '%s': RGB value out of range in line %d." msgstr "" -"Lors du chargement de la palette « %s » : valeur RVB hors limite à la ligne %" -"d." +"Lors du chargement de la palette « %s » : valeur RVB hors limite à la ligne " +"%d." #: ../app/core/gimppalette-load.c:478 #, c-format @@ -8758,8 +8799,8 @@ "Fatal parse error in pattern file '%s: Unsupported pattern depth %d.\n" "GIMP Patterns must be GRAY or RGB." msgstr "" -"Erreur fatale à l'analyse du fichier de motif « %s » : profondeur de motif %" -"dnon prise en charge.\n" +"Erreur fatale à l'analyse du fichier de motif « %s » : profondeur de " +"motif %dnon prise en charge.\n" "Les motifs GIMP doivent être TONS DE GRIS ou RVB." #: ../app/core/gimppattern-load.c:139 @@ -8852,7 +8893,7 @@ msgstr "Calque flottant" # Cette explication est confuse. J'en propose une autre. -#: ../app/core/gimpstrokeoptions.c:181 +#: ../app/core/gimpstrokeoptions.c:180 msgid "" "Convert a mitered join to a bevelled join if the miter would extend to a " "distance of more than miter-limit * line-width from the actual join point." @@ -8861,6 +8902,11 @@ "dépassant « miter-limit » * « line-width » à partir du point de jointure " "réel), cette pointe sera tronquée." +#: ../app/core/gimptoolpreset-load.c:61 +#, c-format +msgid "Error while parsing '%s'" +msgstr "Erreur lors de l'analyse de « %s »" + #: ../app/core/gimptemplate.c:129 msgid "The unit used for coordinate display when not in dot-for-dot mode." msgstr "" @@ -8935,17 +8981,17 @@ msgid "percent" msgstr "pour cent" -#: ../app/dialogs/about-dialog.c:113 ../app/gui/gui.c:478 +#: ../app/dialogs/about-dialog.c:114 msgid "About GIMP" msgstr "À propos de GIMP" -#: ../app/dialogs/about-dialog.c:122 +#: ../app/dialogs/about-dialog.c:123 msgid "Visit the GIMP website" msgstr "Visitez le site Web de GIMP" #. Translators: insert your names here, #. separated by newline -#: ../app/dialogs/about-dialog.c:128 +#: ../app/dialogs/about-dialog.c:129 msgid "translator-credits" msgstr "" "Christophe Merlet \n" @@ -8962,11 +9008,11 @@ "Laurent Monin \n" "Yannick Tailliez " -#: ../app/dialogs/about-dialog.c:518 +#: ../app/dialogs/about-dialog.c:521 msgid "GIMP is brought to you by" msgstr "GIMP vous est présenté par" -#: ../app/dialogs/about-dialog.c:592 +#: ../app/dialogs/about-dialog.c:596 msgid "This is an unstable development release." msgstr "Ceci est une version de développement instable." @@ -9015,7 +9061,7 @@ msgid "Converting to indexed colors" msgstr "Convertir en couleurs indexées" -#: ../app/dialogs/convert-dialog.c:416 ../app/pdb/convert-cmds.c:152 +#: ../app/dialogs/convert-dialog.c:416 ../app/pdb/convert-cmds.c:153 msgid "Cannot convert to a palette with more than 256 colors." msgstr "Impossible de convertir vers une palette ayant plus de 256 couleurs." @@ -9034,8 +9080,8 @@ "Are you sure you want to remove '%s' from the list and delete it on disk?" msgstr "Voulez-vous vraiment supprimer « %s » de la liste et du disque ?" -#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:161 -#: ../app/gui/gui-message.c:145 +#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:162 +#: ../app/gui/gui-message.c:149 msgid "GIMP Message" msgstr "Message de GIMP" @@ -9108,7 +9154,7 @@ msgid "_Fade" msgstr "_Fondu" -#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:344 +#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:346 msgid "_Mode:" msgstr "_Mode :" @@ -9116,7 +9162,7 @@ msgid "_Opacity:" msgstr "_Opacité :" -#: ../app/dialogs/file-open-dialog.c:266 +#: ../app/dialogs/file-open-dialog.c:254 msgid "Open layers" msgstr "Ouvrir les calques" @@ -9128,15 +9174,15 @@ msgid "Enter location (URI):" msgstr "Indiquer l'emplacement (URI) :" -#: ../app/dialogs/file-save-dialog.c:105 +#: ../app/dialogs/file-save-dialog.c:113 msgid "Export Image" msgstr "Exporter l'image" -#: ../app/dialogs/file-save-dialog.c:106 +#: ../app/dialogs/file-save-dialog.c:114 msgid "_Export" msgstr "_Exporter" -#: ../app/dialogs/file-save-dialog.c:430 +#: ../app/dialogs/file-save-dialog.c:454 msgid "" "Saving remote files needs to determine the file format from the file " "extension. Please enter a file extension that matches the selected file " @@ -9147,7 +9193,11 @@ "qui corresponde au format du fichier sélectionné ou n'entrez aucune " "extension de fichier." -#: ../app/dialogs/file-save-dialog.c:557 +#: ../app/dialogs/file-save-dialog.c:601 +msgid "The given filename cannot be used for exporting" +msgstr "Le nom de fichier donné ne peut pas servir à l'exportation" + +#: ../app/dialogs/file-save-dialog.c:602 msgid "" "You can use this dialog to export to various file formats. If you want to " "save the image to the GIMP XCF format, use File→Save instead." @@ -9156,7 +9206,15 @@ "formats de fichiers. Si vous voulez enregistrer dans le format XCF de GIMP, " "utilisez plutôt Fichier→Enregistrer." -#: ../app/dialogs/file-save-dialog.c:564 +#: ../app/dialogs/file-save-dialog.c:605 +msgid "Take me to the Save dialog" +msgstr "Ouvrir la boîte de dialogue Enregistrer" + +#: ../app/dialogs/file-save-dialog.c:609 +msgid "The given filename cannot be used for saving" +msgstr "Le nom de fichier donné ne peut pas servir à l'enregistrement" + +#: ../app/dialogs/file-save-dialog.c:610 msgid "" "You can use this dialog to save to the GIMP XCF format. Use File→Export to " "export to other file formats." @@ -9165,7 +9223,15 @@ "XCF de GIMP. Pour enregistrer dans d'autres formats, utilisez " "Fichier→Exporter." -#: ../app/dialogs/file-save-dialog.c:570 +#: ../app/dialogs/file-save-dialog.c:612 +msgid "Take me to the Export dialog" +msgstr "Ouvrir la boîte de dialogue Exporter" + +#: ../app/dialogs/file-save-dialog.c:615 ../app/dialogs/file-save-dialog.c:690 +msgid "Extension Mismatch" +msgstr "Disparité d'extension" + +#: ../app/dialogs/file-save-dialog.c:674 msgid "" "The given filename does not have any known file extension. Please enter a " "known file extension or select a file format from the file format list." @@ -9174,24 +9240,20 @@ "connue ou sélectionnez un format de fichier dans la liste des formats de " "fichier." -#: ../app/dialogs/file-save-dialog.c:584 -msgid "Extension Mismatch" -msgstr "Disparité d'extension" - -#: ../app/dialogs/file-save-dialog.c:600 +#: ../app/dialogs/file-save-dialog.c:706 msgid "The given file extension does not match the chosen file type." msgstr "" "L'extension de fichier donnée ne correspond pas au type de fichier choisi." -#: ../app/dialogs/file-save-dialog.c:604 +#: ../app/dialogs/file-save-dialog.c:710 msgid "Do you want to save the image using this name anyway?" msgstr "Souhaitez-vous quand même enregistrez l'image sous ce nom ?" -#: ../app/dialogs/file-save-dialog.c:659 +#: ../app/dialogs/file-save-dialog.c:772 msgid "Saving canceled" msgstr "Enregistrement annulé" -#: ../app/dialogs/file-save-dialog.c:667 ../app/widgets/gimpdnd-xds.c:185 +#: ../app/dialogs/file-save-dialog.c:780 ../app/widgets/gimpdnd-xds.c:186 #, c-format msgid "" "Saving '%s' failed:\n" @@ -9250,26 +9312,26 @@ msgid "_Discard invisible layers" msgstr "É_carter les calques invisibles" -#: ../app/dialogs/image-new-dialog.c:96 +#: ../app/dialogs/image-new-dialog.c:97 msgid "Create a New Image" msgstr "Créer une nouvelle image" -#: ../app/dialogs/image-new-dialog.c:144 -#: ../app/dialogs/preferences-dialog.c:2008 +#: ../app/dialogs/image-new-dialog.c:135 +#: ../app/dialogs/preferences-dialog.c:2053 msgid "_Template:" msgstr "_Modèle :" -#: ../app/dialogs/image-new-dialog.c:303 +#: ../app/dialogs/image-new-dialog.c:316 msgid "Confirm Image Size" msgstr "Confirmer la taille de l'image" -#: ../app/dialogs/image-new-dialog.c:325 +#: ../app/dialogs/image-new-dialog.c:338 #: ../app/dialogs/image-scale-dialog.c:239 #, c-format msgid "You are trying to create an image with a size of %s." msgstr "Vous essayez de créer une image avec une taille de %s" -#: ../app/dialogs/image-new-dialog.c:332 +#: ../app/dialogs/image-new-dialog.c:345 #, c-format msgid "" "An image of the chosen size will use more memory than what is configured as " @@ -9394,31 +9456,31 @@ msgid "Module" msgstr "Module" -#: ../app/dialogs/module-dialog.c:465 +#: ../app/dialogs/module-dialog.c:468 msgid "Only in memory" msgstr "Seulement en mémoire" -#: ../app/dialogs/module-dialog.c:470 +#: ../app/dialogs/module-dialog.c:473 msgid "No longer available" msgstr "N'est plus disponible" -#: ../app/dialogs/module-dialog.c:494 +#: ../app/dialogs/module-dialog.c:498 msgid "Author:" msgstr "Auteur :" -#: ../app/dialogs/module-dialog.c:495 +#: ../app/dialogs/module-dialog.c:499 msgid "Version:" msgstr "Version :" -#: ../app/dialogs/module-dialog.c:496 +#: ../app/dialogs/module-dialog.c:500 msgid "Date:" msgstr "Date :" -#: ../app/dialogs/module-dialog.c:497 +#: ../app/dialogs/module-dialog.c:501 msgid "Copyright:" msgstr "Copyright :" -#: ../app/dialogs/module-dialog.c:498 +#: ../app/dialogs/module-dialog.c:502 msgid "Location:" msgstr "Emplacement :" @@ -9489,7 +9551,7 @@ msgstr "Sélectionner la source" #: ../app/dialogs/palette-import-dialog.c:214 -#: ../app/dialogs/preferences-dialog.c:1923 +#: ../app/dialogs/preferences-dialog.c:1967 msgid "_Gradient" msgstr "_Dégradé" @@ -9558,11 +9620,11 @@ "Voulez-vous vraiment réinitialiser toutes les préférences à leurs valeurs " "par défaut ?" -#: ../app/dialogs/preferences-dialog.c:354 +#: ../app/dialogs/preferences-dialog.c:362 msgid "You will have to restart GIMP for the following changes to take effect:" msgstr "Vous devez relancer GIMP pour que ces changements prennent effet." -#: ../app/dialogs/preferences-dialog.c:536 +#: ../app/dialogs/preferences-dialog.c:544 msgid "" "Your keyboard shortcuts will be reset to default values the next time you " "start GIMP." @@ -9570,16 +9632,16 @@ "Vos raccourcis clavier seront réinitialisés aux valeurs par défaut la " "prochaine fois que vous démarrerez GIMP." -#: ../app/dialogs/preferences-dialog.c:547 +#: ../app/dialogs/preferences-dialog.c:555 msgid "Remove all Keyboard Shortcuts" msgstr "Enlever tous les raccourcis clavier" -#: ../app/dialogs/preferences-dialog.c:569 +#: ../app/dialogs/preferences-dialog.c:577 msgid "Do you really want to remove all keyboard shortcuts from all menus?" msgstr "" "Voulez-vous vraiment enlever tous les raccourcis clavier de tous les menus ?" -#: ../app/dialogs/preferences-dialog.c:610 +#: ../app/dialogs/preferences-dialog.c:618 msgid "" "Your window setup will be reset to default values the next time you start " "GIMP." @@ -9587,7 +9649,7 @@ "Vos paramètres des fenêtres seront réinitialisés, aux valeurs par défaut, la " "prochaine fois que vous démarrerez GIMP." -#: ../app/dialogs/preferences-dialog.c:645 +#: ../app/dialogs/preferences-dialog.c:653 msgid "" "Your input device settings will be reset to default values the next time you " "start GIMP." @@ -9595,7 +9657,7 @@ "Vos périphériques d'entrée seront réinitialisés aux valeurs par défaut la " "prochaine fois que vous démarrerez GIMP." -#: ../app/dialogs/preferences-dialog.c:680 +#: ../app/dialogs/preferences-dialog.c:688 msgid "" "Your tool options will be reset to default values the next time you start " "GIMP." @@ -9603,755 +9665,764 @@ "Vos options des outils seront réinitialisés aux valeurs par défaut la " "prochaine fois que vous démarrerez GIMP." -#: ../app/dialogs/preferences-dialog.c:1266 +#: ../app/dialogs/preferences-dialog.c:1303 msgid "Show _menubar" msgstr "Afficher la barre de _menu" -#: ../app/dialogs/preferences-dialog.c:1270 +#: ../app/dialogs/preferences-dialog.c:1307 msgid "Show _rulers" msgstr "Afficher les _règles" -#: ../app/dialogs/preferences-dialog.c:1273 +#: ../app/dialogs/preferences-dialog.c:1310 msgid "Show scroll_bars" msgstr "Afficher les barres de _défilement" -#: ../app/dialogs/preferences-dialog.c:1276 +#: ../app/dialogs/preferences-dialog.c:1313 msgid "Show s_tatusbar" msgstr "Afficher la barre d'é_tat" -#: ../app/dialogs/preferences-dialog.c:1284 +#: ../app/dialogs/preferences-dialog.c:1321 msgid "Show s_election" msgstr "Afficher la _sélection" -#: ../app/dialogs/preferences-dialog.c:1287 +#: ../app/dialogs/preferences-dialog.c:1324 msgid "Show _layer boundary" msgstr "Afficher les _bords du calque" -#: ../app/dialogs/preferences-dialog.c:1290 +#: ../app/dialogs/preferences-dialog.c:1327 msgid "Show _guides" msgstr "Afficher les g_uides" -#: ../app/dialogs/preferences-dialog.c:1293 +#: ../app/dialogs/preferences-dialog.c:1330 msgid "Show gri_d" msgstr "Afficher la g_rille" -#: ../app/dialogs/preferences-dialog.c:1299 +#: ../app/dialogs/preferences-dialog.c:1336 msgid "Canvas _padding mode:" msgstr "Mode de _remplissage du canevas :" -#: ../app/dialogs/preferences-dialog.c:1304 +#: ../app/dialogs/preferences-dialog.c:1341 msgid "Custom p_adding color:" msgstr "Couleur de remplissage _personnalisée :" -#: ../app/dialogs/preferences-dialog.c:1305 +#: ../app/dialogs/preferences-dialog.c:1342 msgid "Select Custom Canvas Padding Color" msgstr "Sélectionner des couleurs de remplissage personnalisés du canevas" -#: ../app/dialogs/preferences-dialog.c:1394 +#: ../app/dialogs/preferences-dialog.c:1440 msgid "Preferences" msgstr "Préférences" -#: ../app/dialogs/preferences-dialog.c:1507 -#: ../app/dialogs/preferences-dialog.c:2769 +#: ../app/dialogs/preferences-dialog.c:1553 +#: ../app/dialogs/preferences-dialog.c:2827 msgid "Environment" msgstr "Environnement" -#: ../app/dialogs/preferences-dialog.c:1521 +#: ../app/dialogs/preferences-dialog.c:1567 msgid "Resource Consumption" msgstr "Configuration des ressources" -#: ../app/dialogs/preferences-dialog.c:1531 +#: ../app/dialogs/preferences-dialog.c:1577 msgid "Minimal number of _undo levels:" msgstr "Nombre minimal de niveaux d'_annulation :" -#: ../app/dialogs/preferences-dialog.c:1534 +#: ../app/dialogs/preferences-dialog.c:1580 msgid "Maximum undo _memory:" msgstr "_Mémoire maximale pour l'annulation :" -#: ../app/dialogs/preferences-dialog.c:1537 +#: ../app/dialogs/preferences-dialog.c:1583 msgid "Tile cache _size:" msgstr "Taille du _cache d'image :" -#: ../app/dialogs/preferences-dialog.c:1540 +#: ../app/dialogs/preferences-dialog.c:1586 msgid "Maximum _new image size:" msgstr "Taille ma_ximale de la nouvelle image :" -#: ../app/dialogs/preferences-dialog.c:1545 +#: ../app/dialogs/preferences-dialog.c:1591 msgid "Number of _processors to use:" msgstr "Nombre de _processeurs à utiliser :" #. Image Thumbnails -#: ../app/dialogs/preferences-dialog.c:1550 +#: ../app/dialogs/preferences-dialog.c:1596 msgid "Image Thumbnails" msgstr "Vignettes d'image" -#: ../app/dialogs/preferences-dialog.c:1555 +#: ../app/dialogs/preferences-dialog.c:1601 msgid "Size of _thumbnails:" msgstr "_Taille des vignettes :" -#: ../app/dialogs/preferences-dialog.c:1559 +#: ../app/dialogs/preferences-dialog.c:1605 msgid "Maximum _filesize for thumbnailing:" msgstr "Taille max_imale pour les fichiers de vignettes :" -#. File Saving -#: ../app/dialogs/preferences-dialog.c:1563 -msgid "Saving Images" -msgstr "Enregistrer les images" - -#: ../app/dialogs/preferences-dialog.c:1566 -msgid "Confirm closing of unsa_ved images" -msgstr "C_onfirmer la fermeture des images non enregistrées" - -#: ../app/dialogs/preferences-dialog.c:1576 +#: ../app/dialogs/preferences-dialog.c:1615 msgid "Keep record of used files in the Recent Documents list" msgstr "Mémoriser les fichiers utilisés dans la liste des documents récents" -#: ../app/dialogs/preferences-dialog.c:1585 +#: ../app/dialogs/preferences-dialog.c:1624 msgid "User Interface" msgstr "Interface utilisateur" -#: ../app/dialogs/preferences-dialog.c:1588 +#: ../app/dialogs/preferences-dialog.c:1627 msgid "Interface" msgstr "Interface" -#: ../app/dialogs/preferences-dialog.c:1598 +#: ../app/dialogs/preferences-dialog.c:1637 msgid "Language" msgstr "Langue" #. Previews -#: ../app/dialogs/preferences-dialog.c:1604 +#: ../app/dialogs/preferences-dialog.c:1643 msgid "Previews" msgstr "Aperçus" -#: ../app/dialogs/preferences-dialog.c:1607 +#: ../app/dialogs/preferences-dialog.c:1646 msgid "_Enable layer & channel previews" msgstr "_Activer les aperçus de calque & canal" -#: ../app/dialogs/preferences-dialog.c:1613 +#: ../app/dialogs/preferences-dialog.c:1652 msgid "_Default layer & channel preview size:" msgstr "Taille par défaut de l'aperç_u de calque & canal :" -#: ../app/dialogs/preferences-dialog.c:1616 +#: ../app/dialogs/preferences-dialog.c:1655 msgid "Na_vigation preview size:" msgstr "Taille de l'aperçu de _navigation :" #. Keyboard Shortcuts -#: ../app/dialogs/preferences-dialog.c:1620 +#: ../app/dialogs/preferences-dialog.c:1659 msgid "Keyboard Shortcuts" msgstr "Raccourcis clavier" -#: ../app/dialogs/preferences-dialog.c:1624 +#: ../app/dialogs/preferences-dialog.c:1663 msgid "_Use dynamic keyboard shortcuts" msgstr "Utiliser les raccourcis clavier _dynamiques" -#: ../app/dialogs/preferences-dialog.c:1628 +#: ../app/dialogs/preferences-dialog.c:1667 msgid "Configure _Keyboard Shortcuts..." msgstr "C_onfigurer les raccourcis clavier..." -#: ../app/dialogs/preferences-dialog.c:1635 +#: ../app/dialogs/preferences-dialog.c:1674 msgid "_Save keyboard shortcuts on exit" msgstr "_Enregistrer à la sortie les raccourcis clavier" -#: ../app/dialogs/preferences-dialog.c:1639 +#: ../app/dialogs/preferences-dialog.c:1678 msgid "Save Keyboard Shortcuts _Now" msgstr "Enregistrer _maintenant les raccourcis" -#: ../app/dialogs/preferences-dialog.c:1646 +#: ../app/dialogs/preferences-dialog.c:1685 msgid "_Reset Keyboard Shortcuts to Default Values" msgstr "_Rétablir les raccourcis clavier aux valeurs par défaut" -#: ../app/dialogs/preferences-dialog.c:1655 +#: ../app/dialogs/preferences-dialog.c:1694 msgid "Remove _All Keyboard Shortcuts" msgstr "Supprimer _tous les raccourcis clavier" -#: ../app/dialogs/preferences-dialog.c:1667 #: ../app/dialogs/preferences-dialog.c:1706 +#: ../app/dialogs/preferences-dialog.c:1745 msgid "Theme" msgstr "Thème" -#: ../app/dialogs/preferences-dialog.c:1676 +#: ../app/dialogs/preferences-dialog.c:1715 msgid "Select Theme" msgstr "Sélectionner un thème" -#: ../app/dialogs/preferences-dialog.c:1758 +#: ../app/dialogs/preferences-dialog.c:1797 msgid "Reload C_urrent Theme" msgstr "Recharger le _thème actuel" -#: ../app/dialogs/preferences-dialog.c:1770 +#: ../app/dialogs/preferences-dialog.c:1809 msgid "Help System" msgstr "Système d'aide" #. General -#: ../app/dialogs/preferences-dialog.c:1782 -#: ../app/dialogs/preferences-dialog.c:1866 -#: ../app/dialogs/preferences-dialog.c:2065 +#: ../app/dialogs/preferences-dialog.c:1821 +#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:2123 #: ../app/widgets/gimpcontrollereditor.c:185 msgid "General" msgstr "Général" -#: ../app/dialogs/preferences-dialog.c:1785 +#: ../app/dialogs/preferences-dialog.c:1824 msgid "Show _tooltips" msgstr "Afficher les _bulles d'aide" -#: ../app/dialogs/preferences-dialog.c:1788 +#: ../app/dialogs/preferences-dialog.c:1827 msgid "Show help _buttons" msgstr "Afficher les boutons d'aid_e" -#: ../app/dialogs/preferences-dialog.c:1801 +#: ../app/dialogs/preferences-dialog.c:1832 msgid "Use the online version" msgstr "Utiliser la version en ligne" -#: ../app/dialogs/preferences-dialog.c:1802 +#: ../app/dialogs/preferences-dialog.c:1833 msgid "Use a locally installed copy" msgstr "Utiliser une copie locale" -#: ../app/dialogs/preferences-dialog.c:1803 +#: ../app/dialogs/preferences-dialog.c:1834 msgid "User manual:" msgstr "Manuel de l'utilisateur :" -#: ../app/dialogs/preferences-dialog.c:1810 +#: ../app/dialogs/preferences-dialog.c:1841 msgid "There's a local installation of the user manual." msgstr "Il y a une copie locale du manuel de l'utilisateur." -#: ../app/dialogs/preferences-dialog.c:1815 +#: ../app/dialogs/preferences-dialog.c:1847 msgid "The user manual is not installed locally." msgstr "Le manuel de l'utilisateur n'est pas installé localement." -#. Help Browser -#: ../app/dialogs/preferences-dialog.c:1838 +#. If there is no webkit available, assume we are on a platform +#. * that doesn't use the help browser, so don't bother showing +#. * the combo. +#. +#: ../app/dialogs/preferences-dialog.c:1860 msgid "Help Browser" msgstr "Navigateur d'aide" -#: ../app/dialogs/preferences-dialog.c:1842 +#: ../app/dialogs/preferences-dialog.c:1867 msgid "H_elp browser to use:" msgstr "_Navigateur d'aide à utiliser :" -#: ../app/dialogs/preferences-dialog.c:1869 +#: ../app/dialogs/preferences-dialog.c:1873 +msgid "" +"The GIMP help browser doesn't seem to be installed. Using the web browser " +"instead." +msgstr "" +"Le navigateur d'aide de GIMP semble manquer à votre installation. Un " +"navigateur Web sera utilisé à la place." + +#: ../app/dialogs/preferences-dialog.c:1913 msgid "_Save tool options on exit" msgstr "Enregistrer à la _sortie les options des outils" -#: ../app/dialogs/preferences-dialog.c:1873 +#: ../app/dialogs/preferences-dialog.c:1917 msgid "Save Tool Options _Now" msgstr "Enregistrer _maintenant les options des outils" -#: ../app/dialogs/preferences-dialog.c:1880 +#: ../app/dialogs/preferences-dialog.c:1924 msgid "_Reset Saved Tool Options to Default Values" msgstr "_Restaurer les options des outils aux valeurs par défaut" #. Snapping Distance -#: ../app/dialogs/preferences-dialog.c:1890 +#: ../app/dialogs/preferences-dialog.c:1934 msgid "Guide & Grid Snapping" msgstr "Alignement sur les guides et la grille" -#: ../app/dialogs/preferences-dialog.c:1895 +#: ../app/dialogs/preferences-dialog.c:1939 msgid "_Snap distance:" msgstr "Distance d'_alignement :" -#: ../app/dialogs/preferences-dialog.c:1903 +#: ../app/dialogs/preferences-dialog.c:1947 msgid "Default _interpolation:" msgstr "_Interpolation par défaut :" #. Global Brush, Pattern, ... -#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:1954 msgid "Paint Options Shared Between Tools" msgstr "Options de peinture partagées entre les outils" -#: ../app/dialogs/preferences-dialog.c:1914 +#: ../app/dialogs/preferences-dialog.c:1958 msgid "_Brush" msgstr "_Brosse" -#: ../app/dialogs/preferences-dialog.c:1917 +#: ../app/dialogs/preferences-dialog.c:1961 msgid "_Dynamics" msgstr "_Dynamique" -#: ../app/dialogs/preferences-dialog.c:1920 +#: ../app/dialogs/preferences-dialog.c:1964 msgid "_Pattern" msgstr "_Motif" -#: ../app/dialogs/preferences-dialog.c:1926 +#. Move Tool +#: ../app/dialogs/preferences-dialog.c:1971 msgid "Move Tool" msgstr "Outil de déplacement" -#: ../app/dialogs/preferences-dialog.c:1930 +#: ../app/dialogs/preferences-dialog.c:1975 msgid "Set layer or path as active" msgstr "Définir le calque ou le chemin comme actif" #. Appearance -#: ../app/dialogs/preferences-dialog.c:1955 -#: ../app/dialogs/preferences-dialog.c:2141 -#: ../app/widgets/gimpgrideditor.c:134 +#: ../app/dialogs/preferences-dialog.c:2000 +#: ../app/dialogs/preferences-dialog.c:2199 ../app/widgets/gimpgrideditor.c:134 msgid "Appearance" msgstr "Apparence" -#: ../app/dialogs/preferences-dialog.c:1959 +#: ../app/dialogs/preferences-dialog.c:2004 msgid "Show _foreground & background color" msgstr "Afficher la couleur de _premier et d'arrière-plan" -#: ../app/dialogs/preferences-dialog.c:1963 +#: ../app/dialogs/preferences-dialog.c:2008 msgid "Show active _brush, pattern & gradient" msgstr "Afficher les _brosses, motifs et dégradés actifs" -#: ../app/dialogs/preferences-dialog.c:1967 +#: ../app/dialogs/preferences-dialog.c:2012 msgid "Show active _image" msgstr "Afficher l'_image active" #. Tool Editor -#: ../app/dialogs/preferences-dialog.c:1975 +#: ../app/dialogs/preferences-dialog.c:2020 msgid "Tools configuration" msgstr "Configuration des outils" -#: ../app/dialogs/preferences-dialog.c:1990 +#: ../app/dialogs/preferences-dialog.c:2035 msgid "Default New Image" msgstr "Nouvelle image par défaut" -#: ../app/dialogs/preferences-dialog.c:1993 +#: ../app/dialogs/preferences-dialog.c:2038 msgid "Default Image" msgstr "Image par défaut" -#: ../app/dialogs/preferences-dialog.c:2030 +#: ../app/dialogs/preferences-dialog.c:2072 +msgid "Set the default Quick Mask color" +msgstr "Définir la couleur par défaut du masque rapide" + +#: ../app/dialogs/preferences-dialog.c:2078 +msgid "Quick Mask color:" +msgstr "Couleur du masque rapide :" + +#: ../app/dialogs/preferences-dialog.c:2088 msgid "Default Image Grid" msgstr "Grille d'image par défaut" -#: ../app/dialogs/preferences-dialog.c:2033 +#: ../app/dialogs/preferences-dialog.c:2091 msgid "Default Grid" msgstr "Grille par défaut" -#: ../app/dialogs/preferences-dialog.c:2053 +#: ../app/dialogs/preferences-dialog.c:2111 msgid "Image Windows" msgstr "Fenêtres d'images" -#: ../app/dialogs/preferences-dialog.c:2068 +#: ../app/dialogs/preferences-dialog.c:2126 msgid "Use \"_Dot for dot\" by default" msgstr "Utiliser « _point pour point » par défaut" -#: ../app/dialogs/preferences-dialog.c:2074 +#: ../app/dialogs/preferences-dialog.c:2132 msgid "Marching _ants speed:" msgstr "_Vitesse de défilement des pointillés :" #. Zoom & Resize Behavior -#: ../app/dialogs/preferences-dialog.c:2078 +#: ../app/dialogs/preferences-dialog.c:2136 msgid "Zoom & Resize Behavior" msgstr "Comportement du zoom et du redimensionnement" -#: ../app/dialogs/preferences-dialog.c:2082 +#: ../app/dialogs/preferences-dialog.c:2140 msgid "Resize window on _zoom" msgstr "Redimensionner la fenêtre après un _zoom" -#: ../app/dialogs/preferences-dialog.c:2085 +#: ../app/dialogs/preferences-dialog.c:2143 msgid "Resize window on image _size change" msgstr "Redimensionner la fenêtre après un changement de _taille d'image" -#: ../app/dialogs/preferences-dialog.c:2091 +#: ../app/dialogs/preferences-dialog.c:2149 msgid "Fit to window" msgstr "Ajuster à la fenêtre" -#: ../app/dialogs/preferences-dialog.c:2093 +#: ../app/dialogs/preferences-dialog.c:2151 msgid "Initial zoom _ratio:" msgstr "_Facteur de zoom initial :" #. Space Bar -#: ../app/dialogs/preferences-dialog.c:2097 +#: ../app/dialogs/preferences-dialog.c:2155 msgid "Space Bar" msgstr "Barre espace" -#: ../app/dialogs/preferences-dialog.c:2103 +#: ../app/dialogs/preferences-dialog.c:2161 msgid "_While space bar is pressed:" msgstr "T_ant que la barre espace est appuyée :" #. Mouse Pointers -#: ../app/dialogs/preferences-dialog.c:2107 +#: ../app/dialogs/preferences-dialog.c:2165 msgid "Mouse Pointers" msgstr "Pointeurs de souris" -#: ../app/dialogs/preferences-dialog.c:2111 +#: ../app/dialogs/preferences-dialog.c:2169 msgid "Show _brush outline" msgstr "Affi_cher le contour de la brosse" -#: ../app/dialogs/preferences-dialog.c:2114 +#: ../app/dialogs/preferences-dialog.c:2172 msgid "Show pointer for paint _tools" msgstr "Affic_her le pointeur pour les outils de peinture" -#: ../app/dialogs/preferences-dialog.c:2120 +#: ../app/dialogs/preferences-dialog.c:2178 msgid "Pointer _mode:" msgstr "Mod_e de pointage :" -#: ../app/dialogs/preferences-dialog.c:2123 +#: ../app/dialogs/preferences-dialog.c:2181 msgid "Pointer re_ndering:" msgstr "_Rendu du pointeur :" -#: ../app/dialogs/preferences-dialog.c:2126 +#: ../app/dialogs/preferences-dialog.c:2184 msgid "Pointer _handedness:" msgstr "_Manualité du pointeur :" -#: ../app/dialogs/preferences-dialog.c:2138 +#: ../app/dialogs/preferences-dialog.c:2196 msgid "Image Window Appearance" msgstr "Apparence de la fenêtre d'images" -#: ../app/dialogs/preferences-dialog.c:2149 +#: ../app/dialogs/preferences-dialog.c:2207 msgid "Default Appearance in Normal Mode" msgstr "Apparence par défaut en mode normal" -#: ../app/dialogs/preferences-dialog.c:2154 +#: ../app/dialogs/preferences-dialog.c:2212 msgid "Default Appearance in Fullscreen Mode" msgstr "Apparence par défaut en mode plein écran" -#: ../app/dialogs/preferences-dialog.c:2163 +#: ../app/dialogs/preferences-dialog.c:2221 msgid "Image Title & Statusbar Format" msgstr "Format du titre et de la barre d'état de l'image" -#: ../app/dialogs/preferences-dialog.c:2166 +#: ../app/dialogs/preferences-dialog.c:2224 msgid "Title & Status" msgstr "Titre et état" -#: ../app/dialogs/preferences-dialog.c:2184 +#: ../app/dialogs/preferences-dialog.c:2242 msgid "Current format" msgstr "Format actuel" -#: ../app/dialogs/preferences-dialog.c:2185 +#: ../app/dialogs/preferences-dialog.c:2243 msgid "Default format" msgstr "Format par défaut" -#: ../app/dialogs/preferences-dialog.c:2186 +#: ../app/dialogs/preferences-dialog.c:2244 msgid "Show zoom percentage" msgstr "Afficher le pourcentage de zoom" -#: ../app/dialogs/preferences-dialog.c:2187 +#: ../app/dialogs/preferences-dialog.c:2245 msgid "Show zoom ratio" msgstr "Afficher le facteur d'échelle" -#: ../app/dialogs/preferences-dialog.c:2188 +#: ../app/dialogs/preferences-dialog.c:2246 msgid "Show image size" msgstr "Afficher la taille de l'image" -#: ../app/dialogs/preferences-dialog.c:2201 +#: ../app/dialogs/preferences-dialog.c:2259 msgid "Image Title Format" msgstr "Format du titre de l'image" -#: ../app/dialogs/preferences-dialog.c:2203 +#: ../app/dialogs/preferences-dialog.c:2261 msgid "Image Statusbar Format" msgstr "Format de la barre d'état de l'image" -#: ../app/dialogs/preferences-dialog.c:2288 +#: ../app/dialogs/preferences-dialog.c:2346 msgid "Display" msgstr "Affichage" #. Transparency -#: ../app/dialogs/preferences-dialog.c:2300 +#: ../app/dialogs/preferences-dialog.c:2358 msgid "Transparency" msgstr "Transparence" -#: ../app/dialogs/preferences-dialog.c:2304 +#: ../app/dialogs/preferences-dialog.c:2362 msgid "_Check style:" msgstr "_Style de damier :" -#: ../app/dialogs/preferences-dialog.c:2307 +#: ../app/dialogs/preferences-dialog.c:2365 msgid "Check _size:" msgstr "_Taille du damier :" -#: ../app/dialogs/preferences-dialog.c:2310 +#: ../app/dialogs/preferences-dialog.c:2368 msgid "Monitor Resolution" msgstr "Définition du moniteur" #. Pixels -#: ../app/dialogs/preferences-dialog.c:2314 -#: ../app/display/gimpcursorview.c:206 ../app/widgets/gimpgrideditor.c:199 -#: ../app/widgets/gimpgrideditor.c:231 +#: ../app/dialogs/preferences-dialog.c:2372 ../app/display/gimpcursorview.c:208 +#: ../app/widgets/gimpgrideditor.c:199 ../app/widgets/gimpgrideditor.c:231 msgid "Pixels" msgstr "Pixels" -#: ../app/dialogs/preferences-dialog.c:2332 +#: ../app/dialogs/preferences-dialog.c:2390 msgid "Horizontal" msgstr "Horizontal" -#: ../app/dialogs/preferences-dialog.c:2334 +#: ../app/dialogs/preferences-dialog.c:2392 msgid "Vertical" msgstr "Vertical" -#: ../app/dialogs/preferences-dialog.c:2336 -#: ../app/widgets/gimpimagepropview.c:466 +#: ../app/dialogs/preferences-dialog.c:2394 +#: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "ppp" -#: ../app/dialogs/preferences-dialog.c:2352 +#: ../app/dialogs/preferences-dialog.c:2410 #, c-format msgid "_Detect automatically (currently %d × %d ppi)" msgstr "_Depuis le système (actuellement %d x %d ppp)" -#: ../app/dialogs/preferences-dialog.c:2370 +#: ../app/dialogs/preferences-dialog.c:2428 msgid "_Enter manually" msgstr "Saisir _manuellement" -#: ../app/dialogs/preferences-dialog.c:2385 +#: ../app/dialogs/preferences-dialog.c:2443 msgid "C_alibrate..." msgstr "_Calibrer..." -#: ../app/dialogs/preferences-dialog.c:2413 +#: ../app/dialogs/preferences-dialog.c:2471 msgid "Color Management" msgstr "Gestion des couleurs" -#: ../app/dialogs/preferences-dialog.c:2433 +#: ../app/dialogs/preferences-dialog.c:2491 msgid "_RGB profile:" msgstr "Profil _RVB :" -#: ../app/dialogs/preferences-dialog.c:2434 +#: ../app/dialogs/preferences-dialog.c:2492 msgid "Select RGB Color Profile" msgstr "Sélectionner un profil colorimétrique RVB" -#: ../app/dialogs/preferences-dialog.c:2435 +#: ../app/dialogs/preferences-dialog.c:2493 msgid "_CMYK profile:" msgstr "Profil _CMJN :" -#: ../app/dialogs/preferences-dialog.c:2436 +#: ../app/dialogs/preferences-dialog.c:2494 msgid "Select CMYK Color Profile" msgstr "Sélectionner un profil colorimétrique CMJN" -#: ../app/dialogs/preferences-dialog.c:2437 +#: ../app/dialogs/preferences-dialog.c:2495 msgid "_Monitor profile:" msgstr "Profil m_oniteur :" -#: ../app/dialogs/preferences-dialog.c:2438 +#: ../app/dialogs/preferences-dialog.c:2496 msgid "Select Monitor Color Profile" msgstr "Sélectionner le profil colorimétrique du moniteur" -#: ../app/dialogs/preferences-dialog.c:2439 +#: ../app/dialogs/preferences-dialog.c:2497 msgid "_Print simulation profile:" msgstr "Profil de _simulation d'impression :" -#: ../app/dialogs/preferences-dialog.c:2440 +#: ../app/dialogs/preferences-dialog.c:2498 msgid "Select Printer Color Profile" msgstr "Sélectionner le profil colorimétrique d'impression" -#: ../app/dialogs/preferences-dialog.c:2451 +#: ../app/dialogs/preferences-dialog.c:2509 msgid "_Mode of operation:" msgstr "_Mode opératoire :" -#: ../app/dialogs/preferences-dialog.c:2481 +#: ../app/dialogs/preferences-dialog.c:2539 msgid "_Try to use the system monitor profile" msgstr "Essayez d'utiliser le profil du moni_teur système" -#: ../app/dialogs/preferences-dialog.c:2491 +#: ../app/dialogs/preferences-dialog.c:2549 msgid "_Display rendering intent:" msgstr "Mo_de de rendu de l'affichage :" -#: ../app/dialogs/preferences-dialog.c:2500 +#: ../app/dialogs/preferences-dialog.c:2558 msgid "_Softproof rendering intent:" msgstr "Mode de rend_u de l'épreuve sur écran :" -#: ../app/dialogs/preferences-dialog.c:2513 +#: ../app/dialogs/preferences-dialog.c:2571 msgid "Mark out of gamut colors" msgstr "Indiquer les couleurs hors gamme" -#: ../app/dialogs/preferences-dialog.c:2518 +#: ../app/dialogs/preferences-dialog.c:2576 msgid "Select Warning Color" msgstr "Sélectionnez une couleur d'alerte" -#: ../app/dialogs/preferences-dialog.c:2531 +#: ../app/dialogs/preferences-dialog.c:2589 msgid "File Open behaviour:" msgstr "Comportement à l'ouverture d'un fichier :" -#: ../app/dialogs/preferences-dialog.c:2543 +#: ../app/dialogs/preferences-dialog.c:2601 msgid "Input Devices" msgstr "Périphériques d'entrée" #. Extended Input Devices -#: ../app/dialogs/preferences-dialog.c:2553 +#: ../app/dialogs/preferences-dialog.c:2611 msgid "Extended Input Devices" msgstr "Périphériques d'entrée étendus" -#: ../app/dialogs/preferences-dialog.c:2557 +#: ../app/dialogs/preferences-dialog.c:2615 msgid "Configure E_xtended Input Devices..." msgstr "_Configurer les périphériques d'entrée étendus" -#: ../app/dialogs/preferences-dialog.c:2564 +#: ../app/dialogs/preferences-dialog.c:2622 msgid "_Save input device settings on exit" msgstr "_Enregistrer l'état des périphériques en quittant" -#: ../app/dialogs/preferences-dialog.c:2568 +#: ../app/dialogs/preferences-dialog.c:2626 msgid "Save Input Device Settings _Now" msgstr "Enregistrer l'état des périphériques _maintenant" -#: ../app/dialogs/preferences-dialog.c:2575 +#: ../app/dialogs/preferences-dialog.c:2633 msgid "_Reset Saved Input Device Settings to Default Values" msgstr "_Restaurer l'état enregistré des périphériques aux valeurs par défaut" -#: ../app/dialogs/preferences-dialog.c:2590 +#: ../app/dialogs/preferences-dialog.c:2648 msgid "Additional Input Controllers" msgstr "Contrôleurs d'entrée additionnels" -#: ../app/dialogs/preferences-dialog.c:2593 +#: ../app/dialogs/preferences-dialog.c:2651 msgid "Input Controllers" msgstr "Contrôleurs d'entrée" -#: ../app/dialogs/preferences-dialog.c:2609 +#: ../app/dialogs/preferences-dialog.c:2667 msgid "Window Management" msgstr "Gestion des fenêtres" -#: ../app/dialogs/preferences-dialog.c:2618 +#: ../app/dialogs/preferences-dialog.c:2676 msgid "Window Manager Hints" msgstr "Préconisations au gestionnaire des fenêtres" -#: ../app/dialogs/preferences-dialog.c:2624 +#: ../app/dialogs/preferences-dialog.c:2682 msgid "Hint for _docks and toolbox:" msgstr "Préconisation pour les groupes de fenêtres et la _boîte à outils :" -#: ../app/dialogs/preferences-dialog.c:2627 +#: ../app/dialogs/preferences-dialog.c:2685 msgid "Focus" msgstr "Focus" -#: ../app/dialogs/preferences-dialog.c:2631 +#: ../app/dialogs/preferences-dialog.c:2689 msgid "Activate the _focused image" msgstr "Activer le _focus sur image" #. Window Positions -#: ../app/dialogs/preferences-dialog.c:2635 +#: ../app/dialogs/preferences-dialog.c:2693 msgid "Window Positions" msgstr "Emplacements des fenêtres" -#: ../app/dialogs/preferences-dialog.c:2638 +#: ../app/dialogs/preferences-dialog.c:2696 msgid "_Save window positions on exit" msgstr "_Enregistrer à la sortie la position des fenêtres" -#: ../app/dialogs/preferences-dialog.c:2642 +#: ../app/dialogs/preferences-dialog.c:2700 msgid "Save Window Positions _Now" msgstr "Enregistrer _maintenant la position des fenêtres" -#: ../app/dialogs/preferences-dialog.c:2649 +#: ../app/dialogs/preferences-dialog.c:2707 msgid "_Reset Saved Window Positions to Default Values" msgstr "_Restaurer les positions enregistrées aux valeurs par défaut" -#: ../app/dialogs/preferences-dialog.c:2664 +#: ../app/dialogs/preferences-dialog.c:2722 msgid "Folders" msgstr "Dossiers" -#: ../app/dialogs/preferences-dialog.c:2684 +#: ../app/dialogs/preferences-dialog.c:2742 msgid "Temporary folder:" msgstr "Dossier temporaire :" -#: ../app/dialogs/preferences-dialog.c:2685 +#: ../app/dialogs/preferences-dialog.c:2743 msgid "Select Folder for Temporary Files" msgstr "Sélectionner un dossier pour les fichiers temporaires" -#: ../app/dialogs/preferences-dialog.c:2689 +#: ../app/dialogs/preferences-dialog.c:2747 msgid "Swap folder:" msgstr "Dossier d'échange (swap) :" -#: ../app/dialogs/preferences-dialog.c:2690 +#: ../app/dialogs/preferences-dialog.c:2748 msgid "Select Swap Folder" msgstr "Sélectionnez un dossier d'échange (swap)" -#: ../app/dialogs/preferences-dialog.c:2725 +#: ../app/dialogs/preferences-dialog.c:2783 msgid "Brush Folders" msgstr "Dossiers des brosses" -#: ../app/dialogs/preferences-dialog.c:2727 +#: ../app/dialogs/preferences-dialog.c:2785 msgid "Select Brush Folders" msgstr "Sélectionner les dossiers de brosses" -#: ../app/dialogs/preferences-dialog.c:2729 +#: ../app/dialogs/preferences-dialog.c:2787 msgid "Dynamics Folders" msgstr "Dossiers des dynamiques de brosse" -#: ../app/dialogs/preferences-dialog.c:2731 +#: ../app/dialogs/preferences-dialog.c:2789 msgid "Select Dynamics Folders" msgstr "Sélectionner les dossiers des dynamiques" -#: ../app/dialogs/preferences-dialog.c:2733 +#: ../app/dialogs/preferences-dialog.c:2791 msgid "Pattern Folders" msgstr "Dossiers des motifs" -#: ../app/dialogs/preferences-dialog.c:2735 +#: ../app/dialogs/preferences-dialog.c:2793 msgid "Select Pattern Folders" msgstr "Sélectionner les dossiers de motifs" -#: ../app/dialogs/preferences-dialog.c:2737 +#: ../app/dialogs/preferences-dialog.c:2795 msgid "Palette Folders" msgstr "Dossiers des palettes" -#: ../app/dialogs/preferences-dialog.c:2739 +#: ../app/dialogs/preferences-dialog.c:2797 msgid "Select Palette Folders" msgstr "Sélectionner les dossiers de palettes" -#: ../app/dialogs/preferences-dialog.c:2741 +#: ../app/dialogs/preferences-dialog.c:2799 msgid "Gradient Folders" msgstr "Dossiers des dégradés" -#: ../app/dialogs/preferences-dialog.c:2743 +#: ../app/dialogs/preferences-dialog.c:2801 msgid "Select Gradient Folders" msgstr "Sélectionner les dossiers de dégradés" -#: ../app/dialogs/preferences-dialog.c:2745 +#: ../app/dialogs/preferences-dialog.c:2803 msgid "Font Folders" msgstr "Dossiers des polices" -#: ../app/dialogs/preferences-dialog.c:2747 +#: ../app/dialogs/preferences-dialog.c:2805 msgid "Select Font Folders" msgstr "Sélectionner les dossiers des polices" -#: ../app/dialogs/preferences-dialog.c:2749 +#: ../app/dialogs/preferences-dialog.c:2807 msgid "Tool Preset Folders" msgstr "Dossiers des préréglages d'outils" -#: ../app/dialogs/preferences-dialog.c:2751 +#: ../app/dialogs/preferences-dialog.c:2809 msgid "Select Tool Preset Folders" msgstr "Sélectionner les dossiers des préréglages d'outils" -#: ../app/dialogs/preferences-dialog.c:2753 +#: ../app/dialogs/preferences-dialog.c:2811 msgid "Plug-In Folders" msgstr "Dossiers des greffons" -#: ../app/dialogs/preferences-dialog.c:2755 +#: ../app/dialogs/preferences-dialog.c:2813 msgid "Select Plug-In Folders" msgstr "Sélectionner les dossiers de greffons" -#: ../app/dialogs/preferences-dialog.c:2757 +#: ../app/dialogs/preferences-dialog.c:2815 msgid "Scripts" msgstr "Scripts" -#: ../app/dialogs/preferences-dialog.c:2757 +#: ../app/dialogs/preferences-dialog.c:2815 msgid "Script-Fu Folders" msgstr "Dossiers des Script-Fu" -#: ../app/dialogs/preferences-dialog.c:2759 +#: ../app/dialogs/preferences-dialog.c:2817 msgid "Select Script-Fu Folders" msgstr "Sélectionner les dossiers de Script-Fu" -#: ../app/dialogs/preferences-dialog.c:2761 +#: ../app/dialogs/preferences-dialog.c:2819 msgid "Module Folders" msgstr "Dossiers des modules" -#: ../app/dialogs/preferences-dialog.c:2763 +#: ../app/dialogs/preferences-dialog.c:2821 msgid "Select Module Folders" msgstr "Sélectionner les dossiers de modules" -#: ../app/dialogs/preferences-dialog.c:2765 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Interpreters" msgstr "Interpréteurs" -#: ../app/dialogs/preferences-dialog.c:2765 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Interpreter Folders" msgstr "Dossiers d'interpréteur" -#: ../app/dialogs/preferences-dialog.c:2767 +#: ../app/dialogs/preferences-dialog.c:2825 msgid "Select Interpreter Folders" msgstr "Sélectionner les dossiers d'interpréteur" -#: ../app/dialogs/preferences-dialog.c:2769 +#: ../app/dialogs/preferences-dialog.c:2827 msgid "Environment Folders" msgstr "Dossiers d'environnement" -#: ../app/dialogs/preferences-dialog.c:2771 +#: ../app/dialogs/preferences-dialog.c:2829 msgid "Select Environment Folders" msgstr "Sélectionner les dossiers d'environnement" -#: ../app/dialogs/preferences-dialog.c:2773 +#: ../app/dialogs/preferences-dialog.c:2831 msgid "Themes" msgstr "Thèmes" -#: ../app/dialogs/preferences-dialog.c:2773 +#: ../app/dialogs/preferences-dialog.c:2831 msgid "Theme Folders" msgstr "Dossiers des thèmes" -#: ../app/dialogs/preferences-dialog.c:2775 +#: ../app/dialogs/preferences-dialog.c:2833 msgid "Select Theme Folders" msgstr "Sélectionner les dossiers de thèmes" @@ -10371,50 +10442,77 @@ msgstr "_Hauteur :" #. the resolution labels -#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:255 +#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:260 #: ../app/widgets/gimptemplateeditor.c:309 msgid "_X resolution:" msgstr "Résolution _X :" -#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:258 +#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:263 #: ../app/widgets/gimptemplateeditor.c:316 msgid "_Y resolution:" msgstr "Résolution _Y :" -#: ../app/dialogs/print-size-dialog.c:240 ../app/widgets/gimpsizebox.c:251 +#: ../app/dialogs/print-size-dialog.c:240 ../app/widgets/gimpsizebox.c:256 #, c-format msgid "pixels/%a" msgstr "pixels/%a" -#: ../app/dialogs/quit-dialog.c:104 +#: ../app/dialogs/quit-dialog.c:144 msgid "Quit GIMP" msgstr "Quitter GIMP" -#: ../app/dialogs/quit-dialog.c:104 +#: ../app/dialogs/quit-dialog.c:144 msgid "Close All Images" msgstr "Fermer toutes les images" -#: ../app/dialogs/quit-dialog.c:163 +#: ../app/dialogs/quit-dialog.c:212 msgid "If you quit GIMP now, these changes will be lost." msgstr "" "Si vous quittez GIMP maintenant, les modifications non enregistrées seront " "perdues." -#: ../app/dialogs/quit-dialog.c:166 +#: ../app/dialogs/quit-dialog.c:215 msgid "If you close these images now, changes will be lost." msgstr "Si vous fermez ces images maintenant, les changements seront perdus" -#: ../app/dialogs/quit-dialog.c:213 +#: ../app/dialogs/quit-dialog.c:300 #, c-format msgid "There is one image with unsaved changes:" msgid_plural "There are %d images with unsaved changes:" msgstr[0] "Il y a une image avec des modifications non enregistrées :" msgstr[1] "Il y a %d images avec des modifications non enregistrées :" -#: ../app/dialogs/quit-dialog.c:235 +#: ../app/dialogs/quit-dialog.c:311 +#, c-format +msgid "Press %s to quit." +msgstr "Appuyez sur %s pour quitter." + +#: ../app/dialogs/quit-dialog.c:314 +#, c-format +msgid "Press %s to close all images." +msgstr "Appuyez sur %s pour fermer toutes les images." + +#: ../app/dialogs/quit-dialog.c:330 +#, c-format +msgid "Press %s to discard all changes and quit." +msgstr "Appuyez sur %s pour abandonner toutes les modifications et quitter." + +#: ../app/dialogs/quit-dialog.c:333 +#, c-format +msgid "Press %s to discard all changes and close all images." +msgstr "" +"Appuyez sur %s pour abandonner toutes les modifications et fermer toutes les " +"images." + +#: ../app/dialogs/quit-dialog.c:341 ../app/display/gimpdisplayshell-close.c:180 msgid "_Discard Changes" msgstr "_Abandonner les modifications" +#: ../app/dialogs/quit-dialog.c:423 +#, c-format +msgid "Exported to %s" +msgstr "Exporté vers %s" + #: ../app/dialogs/resize-dialog.c:119 msgid "Canvas Size" msgstr "Taille du canevas" @@ -10448,7 +10546,7 @@ msgid "Image Size" msgstr "Taille d'image" -#: ../app/dialogs/scale-dialog.c:176 ../app/tools/gimppaintoptions-gui.c:386 +#: ../app/dialogs/scale-dialog.c:176 ../app/tools/gimppaintoptions-gui.c:391 msgid "Quality" msgstr "Qualité" @@ -10616,91 +10714,93 @@ msgid "Line spacing" msgstr "Espacement des lignes" -#: ../app/display/gimpcursorview.c:216 ../app/display/gimpcursorview.c:222 -#: ../app/display/gimpcursorview.c:241 ../app/display/gimpcursorview.c:247 -#: ../app/display/gimpcursorview.c:266 ../app/display/gimpcursorview.c:272 -#: ../app/display/gimpcursorview.c:288 ../app/display/gimpcursorview.c:295 -#: ../app/display/gimpcursorview.c:672 ../app/display/gimpcursorview.c:673 -#: ../app/display/gimpcursorview.c:674 ../app/display/gimpcursorview.c:675 -#: ../app/display/gimpcursorview.c:788 ../app/display/gimpcursorview.c:789 -#: ../app/display/gimpcursorview.c:790 ../app/display/gimpcursorview.c:791 -#: ../app/widgets/gimpcolorframe.c:634 +#: ../app/display/gimpcursorview.c:218 ../app/display/gimpcursorview.c:224 +#: ../app/display/gimpcursorview.c:243 ../app/display/gimpcursorview.c:249 +#: ../app/display/gimpcursorview.c:268 ../app/display/gimpcursorview.c:274 +#: ../app/display/gimpcursorview.c:290 ../app/display/gimpcursorview.c:297 +#: ../app/display/gimpcursorview.c:688 ../app/display/gimpcursorview.c:689 +#: ../app/display/gimpcursorview.c:690 ../app/display/gimpcursorview.c:691 +#: ../app/display/gimpcursorview.c:804 ../app/display/gimpcursorview.c:805 +#: ../app/display/gimpcursorview.c:806 ../app/display/gimpcursorview.c:807 +#: ../app/widgets/gimpcolorframe.c:633 msgid "n/a" msgstr "n/d" -#: ../app/display/gimpcursorview.c:219 ../app/display/gimpcursorview.c:244 -#: ../app/display/gimpcursorview.c:269 +#: ../app/display/gimpcursorview.c:221 ../app/display/gimpcursorview.c:246 +#: ../app/display/gimpcursorview.c:271 #: ../app/widgets/gimpdeviceinfoeditor.c:138 msgid "X" msgstr "X" -#: ../app/display/gimpcursorview.c:225 ../app/display/gimpcursorview.c:250 -#: ../app/display/gimpcursorview.c:275 +#: ../app/display/gimpcursorview.c:227 ../app/display/gimpcursorview.c:252 +#: ../app/display/gimpcursorview.c:277 #: ../app/widgets/gimpdeviceinfoeditor.c:139 msgid "Y" msgstr "Y" #. Units -#: ../app/display/gimpcursorview.c:231 +#: ../app/display/gimpcursorview.c:233 msgid "Units" msgstr "Unités" #. Selection Bounding Box -#: ../app/display/gimpcursorview.c:256 +#: ../app/display/gimpcursorview.c:258 msgid "Selection Bounding Box" msgstr "Éditeur de sélection" #. Width -#: ../app/display/gimpcursorview.c:292 +#: ../app/display/gimpcursorview.c:294 msgid "W" msgstr "L" #. Height -#: ../app/display/gimpcursorview.c:299 +#: ../app/display/gimpcursorview.c:301 msgid "H" msgstr "H" -#: ../app/display/gimpcursorview.c:328 +#: ../app/display/gimpcursorview.c:330 msgid "_Sample Merged" msgstr "_Échantillonner sur tous les calques" -#: ../app/display/gimpdisplayshell.c:509 +#: ../app/display/gimpdisplayshell.c:508 msgid "Access the image menu" msgstr "Accéder au menu d'image" -#: ../app/display/gimpdisplayshell.c:623 +#: ../app/display/gimpdisplayshell.c:622 msgid "Zoom image when window size changes" msgstr "Zoom l'image quand la fenêtre change de taille" -#: ../app/display/gimpdisplayshell.c:652 +#: ../app/display/gimpdisplayshell.c:651 msgid "Toggle Quick Mask" msgstr "(Dés)activer le masque rapide" -#: ../app/display/gimpdisplayshell.c:675 +#: ../app/display/gimpdisplayshell.c:674 msgid "Navigate the image display" msgstr "Naviguer dans l'affichage d'image" -#: ../app/display/gimpdisplayshell.c:743 -#: ../app/display/gimpdisplayshell.c:1321 ../app/widgets/gimptoolbox.c:256 +#: ../app/display/gimpdisplayshell.c:746 ../app/display/gimpdisplayshell.c:1331 +#: ../app/widgets/gimptoolbox.c:253 msgid "Drop image files here to open them" msgstr "Déposer les fichiers d'images ici pour les ouvrir" -#: ../app/display/gimpdisplayshell-close.c:153 -#: ../app/display/gimpdisplayshell-close.c:223 +#: ../app/display/gimpdisplayshell-close.c:169 +#: ../app/display/gimpdisplayshell-close.c:269 #, c-format msgid "Close %s" msgstr "Fermer %s" -#: ../app/display/gimpdisplayshell-close.c:164 -msgid "Close _without Saving" -msgstr "Fermer _sans enregistrer" +#: ../app/display/gimpdisplayshell-close.c:217 +#, c-format +msgid "Press %s to discard all changes and close the image." +msgstr "" +"Appuyez sur %s pour abandonner toutes les modifications et fermer l'image." -#: ../app/display/gimpdisplayshell-close.c:231 +#: ../app/display/gimpdisplayshell-close.c:277 #, c-format msgid "Save the changes to image '%s' before closing?" msgstr "Enregistrer les modifications de l'image « %s » avant de fermer ?" -#: ../app/display/gimpdisplayshell-close.c:254 +#: ../app/display/gimpdisplayshell-close.c:310 #, c-format msgid "If you don't save the image, changes from the last hour will be lost." msgid_plural "" @@ -10712,7 +10812,7 @@ "Si vous n'enregistrez pas l'image, les modifications depuis les %d dernières " "heures seront perdues." -#: ../app/display/gimpdisplayshell-close.c:264 +#: ../app/display/gimpdisplayshell-close.c:321 #, c-format msgid "" "If you don't save the image, changes from the last hour and %d minute will " @@ -10727,7 +10827,7 @@ "Si vous n'enregistrez pas l'image, les modifications depuis la dernière " "heure et %d minutes seront perdues." -#: ../app/display/gimpdisplayshell-close.c:275 +#: ../app/display/gimpdisplayshell-close.c:333 #, c-format msgid "If you don't save the image, changes from the last minute will be lost." msgid_plural "" @@ -10739,46 +10839,52 @@ "Si vous n'enregistrez pas l'image, les modifications depuis les dernières %d " "minutes seront perdues." -#: ../app/display/gimpdisplayshell-dnd.c:232 -#: ../app/display/gimpdisplayshell-dnd.c:635 -#: ../app/display/gimpdisplayshell-dnd.c:695 +#: ../app/display/gimpdisplayshell-close.c:354 +#, c-format +msgid "The image has been exported to '%s'." +msgstr "Image exportée en « %s »." + +#: ../app/display/gimpdisplayshell-dnd.c:246 +#: ../app/display/gimpdisplayshell-dnd.c:649 +#: ../app/display/gimpdisplayshell-dnd.c:707 msgid "Drop New Layer" msgstr "Déposer un nouveau calque" -#: ../app/display/gimpdisplayshell-dnd.c:275 +#: ../app/display/gimpdisplayshell-dnd.c:289 msgid "Drop New Path" msgstr "Déposer un nouveau chemin" -#: ../app/display/gimpdisplayshell-dnd.c:347 -#: ../app/display/gimpdisplayshell-dnd.c:449 ../app/tools/gimpblendtool.c:173 -#: ../app/tools/gimpbucketfilltool.c:136 ../app/tools/gimpimagemaptool.c:279 +#: ../app/display/gimpdisplayshell-dnd.c:361 +#: ../app/display/gimpdisplayshell-dnd.c:463 ../app/tools/gimpblendtool.c:173 +#: ../app/tools/gimpbucketfilltool.c:136 ../app/tools/gimpimagemaptool.c:280 +#: ../app/tools/gimpselectiontool.c:427 msgid "Cannot modify the pixels of layer groups." msgstr "Impossible de modifier les pixels des groupes de calques." -#: ../app/display/gimpdisplayshell-dnd.c:355 -#: ../app/display/gimpdisplayshell-dnd.c:457 ../app/tools/gimpblendtool.c:180 +#: ../app/display/gimpdisplayshell-dnd.c:369 +#: ../app/display/gimpdisplayshell-dnd.c:471 ../app/tools/gimpblendtool.c:180 #: ../app/tools/gimpbucketfilltool.c:143 ../app/tools/gimpcroptool.c:325 -#: ../app/tools/gimpimagemaptool.c:286 ../app/tools/gimppainttool.c:266 -#: ../app/tools/gimptransformtool.c:246 ../app/tools/gimptransformtool.c:1062 +#: ../app/tools/gimpimagemaptool.c:287 ../app/tools/gimppainttool.c:266 +#: ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:1481 msgid "The active layer's pixels are locked." msgstr "Les pixels du calque actif sont verrouillés." -#: ../app/display/gimpdisplayshell-dnd.c:535 +#: ../app/display/gimpdisplayshell-dnd.c:549 #: ../app/widgets/gimplayertreeview.c:725 msgid "Drop layers" msgstr "Déposer les calques" -#: ../app/display/gimpdisplayshell-dnd.c:668 -#: ../app/display/gimpdisplayshell-dnd.c:685 -#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:266 +#: ../app/display/gimpdisplayshell-dnd.c:682 +#: ../app/display/gimpdisplayshell-dnd.c:699 +#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:264 msgid "Dropped Buffer" msgstr "Presse-papiers déposé" -#: ../app/display/gimpdisplayshell-filter-dialog.c:78 +#: ../app/display/gimpdisplayshell-filter-dialog.c:83 msgid "Color Display Filters" msgstr "Filtres d'affichage couleur" -#: ../app/display/gimpdisplayshell-filter-dialog.c:81 +#: ../app/display/gimpdisplayshell-filter-dialog.c:86 msgid "Configure Color Display Filters" msgstr "Configurer les filtres d'affichage couleur" @@ -10812,63 +10918,51 @@ msgid "Zoom:" msgstr "Zoom :" -#: ../app/display/gimpdisplayshell-title.c:301 +#: ../app/display/gimpdisplayshell-title.c:282 msgid "(modified)" msgstr "(modifié)" -#: ../app/display/gimpdisplayshell-title.c:306 +#: ../app/display/gimpdisplayshell-title.c:287 msgid "(clean)" msgstr "(correct)" -#: ../app/display/gimpdisplayshell-title.c:357 -#: ../app/display/gimpdisplayshell-title.c:370 -#: ../app/widgets/gimpactiongroup.c:860 +#: ../app/display/gimpdisplayshell-title.c:338 +#: ../app/display/gimpdisplayshell-title.c:351 +#: ../app/widgets/gimpactiongroup.c:884 msgid "(none)" msgstr "(aucune)" -#: ../app/display/gimpdisplayshell-title.c:499 -msgid " (exported)" -msgstr " (exportée)" - -#: ../app/display/gimpdisplayshell-title.c:501 -msgid " (overwritten)" -msgstr " (écrasée)" - -#: ../app/display/gimpdisplayshell-title.c:507 -msgid " (imported)" -msgstr " (importée)" - #: ../app/display/gimpstatusbar.c:356 #, c-format msgid "Cancel %s" msgstr "Annule %s" -#: ../app/file/file-open.c:136 ../app/file/file-save.c:112 +#: ../app/file/file-open.c:129 ../app/file/file-save.c:115 msgid "Not a regular file" msgstr "Le fichier n'est pas un fichier ordinaire." -#: ../app/file/file-open.c:188 +#: ../app/file/file-open.c:197 #, c-format msgid "%s plug-in returned SUCCESS but did not return an image" msgstr "" "Le greffon %s a rapporté avoir terminé avec succès mais n'a pas renvoyé " "d'image." -#: ../app/file/file-open.c:199 +#: ../app/file/file-open.c:208 #, c-format msgid "%s plug-In could not open image" msgstr "Le greffon %s n'a pas pu ouvrir l'image" -#: ../app/file/file-open.c:526 +#: ../app/file/file-open.c:539 msgid "Image doesn't contain any layers" msgstr "L'image ne contient aucun calque" -#: ../app/file/file-open.c:579 +#: ../app/file/file-open.c:599 #, c-format msgid "Opening '%s' failed: %s" msgstr "L'ouverture de « %s » a échoué : %s" -#: ../app/file/file-open.c:686 +#: ../app/file/file-open.c:709 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -10880,17 +10974,17 @@ msgid "Unknown file type" msgstr "Type de fichier inconnu" -#: ../app/file/file-save.c:208 +#: ../app/file/file-save.c:222 #, c-format msgid "%s plug-in could not save image" msgstr "Le greffon %s n'a pas pu enregistrer l'image" -#: ../app/file/file-utils.c:74 +#: ../app/file/file-utils.c:72 #, c-format msgid "'%s:' is not a valid URI scheme" msgstr "« %s » n'est pas un schéma URI valide" -#: ../app/file/file-utils.c:90 ../app/file/file-utils.c:126 +#: ../app/file/file-utils.c:88 ../app/file/file-utils.c:124 msgid "Invalid character sequence in URI" msgstr "Séquence de caractères non valide dans l'URI" @@ -10904,23 +10998,23 @@ msgid "Deform the cage to deform the image" msgstr "Déformer la cage pour déformer l'image" -#: ../app/gegl/gimpcurvesconfig.c:385 +#: ../app/gegl/gimpcurvesconfig.c:395 msgid "not a GIMP Curves file" msgstr "ce n'est pas un fichier de courbes GIMP" -#: ../app/gegl/gimpcurvesconfig.c:400 ../app/gegl/gimplevelsconfig.c:786 +#: ../app/gegl/gimpcurvesconfig.c:410 ../app/gegl/gimplevelsconfig.c:811 msgid "parse error" msgstr "erreur d'analyse" -#: ../app/gegl/gimplevelsconfig.c:739 +#: ../app/gegl/gimplevelsconfig.c:764 msgid "not a GIMP Levels file" msgstr "ce n'est pas un fichier de niveaux GIMP" -#: ../app/gegl/gimpoperationcagecoefcalc.c:65 +#: ../app/gegl/gimpoperationcagecoefcalc.c:67 msgid "Compute a set of coefficient buffer for the GIMP cage tool" msgstr "Calcule un tampon de coefficients pour l'outil cage de GIMP" -#: ../app/gegl/gimpoperationcagetransform.c:104 +#: ../app/gegl/gimpoperationcagetransform.c:106 msgid "" "Convert a set of coefficient buffer to a coordinate buffer for the GIMP cage " "tool" @@ -10928,21 +11022,30 @@ "Convertit un tampon de coefficients en un tampon de coordonnées pour l'outil " "cage de GIMP" -#: ../app/gegl/gimpoperationcagetransform.c:125 +#: ../app/gegl/gimpoperationcagetransform.c:128 msgid "Fill with plain color" msgstr "Remplir avec une couleur unie" -#: ../app/gegl/gimpoperationcagetransform.c:126 +#: ../app/gegl/gimpoperationcagetransform.c:129 #: ../app/tools/gimpcageoptions.c:144 msgid "Fill the original position of the cage with a plain color" msgstr "Remplir la position initiale de la cage avec une couleur unie" +#. TRANSLATORS: there is no need to translate this in GIMP. This uses +#. * "gtk20" domain as a special trick to determine language direction, +#. * but xgettext extracts it anyway mistakenly into GIMP po files. +#. * Leave an empty string as translation. It does not matter. +#. +#: ../app/gui/gui.c:207 +msgid "default:LTR" +msgstr "default:LTR" + #. initialize the document history -#: ../app/gui/gui.c:421 +#: ../app/gui/gui.c:438 msgid "Documents" msgstr "Documents" -#: ../app/gui/splash.c:115 +#: ../app/gui/splash.c:112 msgid "GIMP Startup" msgstr "Lancement de GIMP" @@ -10978,11 +11081,11 @@ msgid "Eraser" msgstr "Gomme" -#: ../app/paint/gimpheal.c:128 ../app/tools/gimphealtool.c:52 +#: ../app/paint/gimpheal.c:131 ../app/tools/gimphealtool.c:52 msgid "Heal" msgstr "Correcteur" -#: ../app/paint/gimpheal.c:167 +#: ../app/paint/gimpheal.c:170 msgid "Healing does not operate on indexed layers." msgstr "Le correcteur ne fonctionne pas sur des calques en couleurs indexées." @@ -11010,47 +11113,47 @@ msgid "Paint" msgstr "Peindre" -#: ../app/paint/gimppaintoptions.c:145 +#: ../app/paint/gimppaintoptions.c:146 msgid "Brush Size" msgstr "Taille de la brosse" -#: ../app/paint/gimppaintoptions.c:159 +#: ../app/paint/gimppaintoptions.c:160 msgid "Every stamp has its own opacity" msgstr "Chaque coup de tampon a sa propre opacité" -#: ../app/paint/gimppaintoptions.c:165 +#: ../app/paint/gimppaintoptions.c:166 msgid "Ignore fuzziness of the current brush" msgstr "Ignore le flou de la brosse active" -#: ../app/paint/gimppaintoptions.c:170 +#: ../app/paint/gimppaintoptions.c:171 msgid "Scatter brush as you paint" msgstr "Disperse les coups de brosse pendant que vous peignez" -#: ../app/paint/gimppaintoptions.c:174 +#: ../app/paint/gimppaintoptions.c:175 msgid "Distance of scattering" msgstr "Distance de dispersion" -#: ../app/paint/gimppaintoptions.c:184 +#: ../app/paint/gimppaintoptions.c:185 msgid "Distance over which strokes fade out" msgstr "Distance d'estompement des coups de brosses" -#: ../app/paint/gimppaintoptions.c:192 +#: ../app/paint/gimppaintoptions.c:193 msgid "Reverse direction of fading" msgstr "Inverse le sens d'estompement" -#: ../app/paint/gimppaintoptions.c:196 +#: ../app/paint/gimppaintoptions.c:197 msgid "How fade is repeated as you paint" msgstr "Comment l'estompement se répète pendant que vous peignez" -#: ../app/paint/gimppaintoptions.c:255 +#: ../app/paint/gimppaintoptions.c:256 msgid "Paint smoother strokes" msgstr "Donne des coups de brosse plus lisses" -#: ../app/paint/gimppaintoptions.c:259 +#: ../app/paint/gimppaintoptions.c:260 msgid "Depth of smoothing" msgstr "Profondeur de lissage" -#: ../app/paint/gimppaintoptions.c:263 +#: ../app/paint/gimppaintoptions.c:264 msgid "Gravity of the pen" msgstr "Gravité de la plume" @@ -11069,7 +11172,7 @@ "Le clonage en perspective ne fonctionne pas sur les calques en couleurs " "indexées." -#: ../app/paint/gimpsmudge.c:83 ../app/tools/gimpsmudgetool.c:53 +#: ../app/paint/gimpsmudge.c:84 ../app/tools/gimpsmudgetool.c:53 msgid "Smudge" msgstr "Barbouillage" @@ -11117,7 +11220,22 @@ msgid "Sharpen" msgstr "Augmenter la netteté" -#: ../app/pdb/channel-cmds.c:184 +#: ../app/paint/paint-enums.c:144 +msgctxt "ink-blob-type" +msgid "Circle" +msgstr "Cercle" + +#: ../app/paint/paint-enums.c:145 +msgctxt "ink-blob-type" +msgid "Square" +msgstr "Carré" + +#: ../app/paint/paint-enums.c:146 +msgctxt "ink-blob-type" +msgid "Diamond" +msgstr "Losange" + +#: ../app/pdb/channel-cmds.c:194 msgid "Combine Masks" msgstr "Combiner les masques" @@ -11151,21 +11269,21 @@ msgid "2D Transforming" msgstr "Transformation 2D en cours" -#: ../app/pdb/edit-cmds.c:725 ../app/tools/gimpblendtool.c:249 +#: ../app/pdb/edit-cmds.c:728 ../app/tools/gimpblendtool.c:249 msgid "Blending" msgstr "Mélange en cours" -#: ../app/pdb/floating-sel-cmds.c:64 +#: ../app/pdb/floating-sel-cmds.c:65 msgid "Cannot remove this layer because it is not a floating selection." msgstr "" "Impossible de supprimer ce calque car ce n'est pas une sélection flottante." -#: ../app/pdb/floating-sel-cmds.c:96 +#: ../app/pdb/floating-sel-cmds.c:98 msgid "Cannot anchor this layer because it is not a floating selection." msgstr "" "Impossible d'ancrer ce calque car ce n'est pas une sélection flottante." -#: ../app/pdb/floating-sel-cmds.c:128 +#: ../app/pdb/floating-sel-cmds.c:131 msgid "" "Cannot convert this layer to a normal layer because it is not a floating " "selection." @@ -11173,8 +11291,8 @@ "Impossible de convertir ce calque en un calque normal car ce n'est pas une " "sélection flottante." -#: ../app/pdb/gimppdb-query.c:299 ../app/pdb/gimppdb.c:305 -#: ../app/pdb/gimppdb.c:375 +#: ../app/pdb/gimppdb-query.c:299 ../app/pdb/gimppdb.c:315 +#: ../app/pdb/gimppdb.c:385 #, c-format msgid "Procedure '%s' not found" msgstr "Procédure « %s » non trouvée" @@ -11332,8 +11450,8 @@ #, c-format msgid "Item '%s' (%d) cannot be used because it is not a group item" msgstr "" -"L'élément « %s » (%d) ne peut être utilisé, car il ne s'agit pas d'un élément " -"groupe" +"L'élément « %s » (%d) ne peut être utilisé, car il ne s'agit pas d'un " +"élément groupe" #: ../app/pdb/gimppdb-utils.c:536 #, c-format @@ -11365,45 +11483,44 @@ msgid "Vectors object %d does not contain stroke with ID %d" msgstr "L'objet vectoriel %d ne contient pas de tracé avec l'identificateur %d" -#: ../app/pdb/gimppdb.c:409 +#: ../app/pdb/gimppdb.c:420 #, c-format msgid "" -"Procedure '%s' has been called with a wrong type for argument #%d. Expected %" -"s, got %s." +"Procedure '%s' has been called with a wrong type for argument #%d. Expected " +"%s, got %s." msgstr "" -"La procédure « %s » a été appelée avec un type erroné pour le paramètre n°%d. " -"%s attendu, %s obtenu." +"La procédure « %s » a été appelée avec un type erroné pour le paramètre n°" +"%d. %s attendu, %s obtenu." -#: ../app/pdb/gimppdbcontext.c:88 -#: ../app/tools/gimpforegroundselectoptions.c:79 +#: ../app/pdb/gimppdbcontext.c:89 ../app/tools/gimpforegroundselectoptions.c:79 #: ../app/tools/gimpselectionoptions.c:78 msgid "Smooth edges" msgstr "Lisser les contours" -#: ../app/pdb/gimpprocedure.c:370 ../app/plug-in/gimppluginprocframe.c:208 +#: ../app/pdb/gimpprocedure.c:374 ../app/plug-in/gimppluginprocframe.c:208 #, c-format msgid "Procedure '%s' returned no return values" msgstr "La procédure « %s » n'a renvoyé aucune valeur" -#: ../app/pdb/gimpprocedure.c:639 +#: ../app/pdb/gimpprocedure.c:644 #, c-format msgid "" "Procedure '%s' returned a wrong value type for return value '%s' (#%d). " "Expected %s, got %s." msgstr "" -"La procédure « %s » a renvoyé un type erroné pour la valeur de retour « %s » (n" -"°%d). %s attendu, %s obtenu." +"La procédure « %s » a renvoyé un type erroné pour la valeur de retour " +"« %s » (n°%d). %s attendu, %s obtenu." -#: ../app/pdb/gimpprocedure.c:651 +#: ../app/pdb/gimpprocedure.c:656 #, c-format msgid "" -"Procedure '%s' has been called with a wrong value type for argument '%s' (#%" -"d). Expected %s, got %s." +"Procedure '%s' has been called with a wrong value type for argument '%s' (#" +"%d). Expected %s, got %s." msgstr "" "La procédure « %s » a été appelée avec un type de valeur erroné pour le " "paramètre « %s » (n°%d). %s attendu, %s obtenu." -#: ../app/pdb/gimpprocedure.c:683 +#: ../app/pdb/gimpprocedure.c:689 #, c-format msgid "" "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-" @@ -11413,17 +11530,17 @@ "probablement un greffon est en train d'essayer de travailler sur un calque " "qui n'existe plus." -#: ../app/pdb/gimpprocedure.c:695 +#: ../app/pdb/gimpprocedure.c:702 #, c-format msgid "" "Procedure '%s' has been called with an invalid ID for argument '%s'. Most " "likely a plug-in is trying to work on a layer that doesn't exist any longer." msgstr "" -"La procédure « %s » a été appelée avec un ID erroné pour le paramètre « %s ». " -"Très probablement un greffon est en train d'essayer de travailler sur un " -"calque qui n'existe plus." +"La procédure « %s » a été appelée avec un ID erroné pour le paramètre " +"« %s ». Très probablement un greffon est en train d'essayer de travailler " +"sur un calque qui n'existe plus." -#: ../app/pdb/gimpprocedure.c:711 +#: ../app/pdb/gimpprocedure.c:719 #, c-format msgid "" "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-" @@ -11433,17 +11550,17 @@ "probablement un greffon est en train d'essayer de travailler sur une image " "qui n'existe plus." -#: ../app/pdb/gimpprocedure.c:723 +#: ../app/pdb/gimpprocedure.c:732 #, c-format msgid "" "Procedure '%s' has been called with an invalid ID for argument '%s'. Most " "likely a plug-in is trying to work on an image that doesn't exist any longer." msgstr "" -"La procédure « %s » a été appelée avec un ID erroné pour le paramètre « %s ». " -"Très probablement un greffon est en train d'essayer de travailler sur une " -"image qui n'existe plus." +"La procédure « %s » a été appelée avec un ID erroné pour le paramètre " +"« %s ». Très probablement un greffon est en train d'essayer de travailler " +"sur une image qui n'existe plus." -#: ../app/pdb/gimpprocedure.c:743 +#: ../app/pdb/gimpprocedure.c:753 #, c-format msgid "" "Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value " @@ -11452,16 +11569,16 @@ "La procédure « %s » a renvoyé « %s » comme retour de la valeur « %s » (#%d, " "type %s). Cette valeur est hors-limite." -#: ../app/pdb/gimpprocedure.c:756 +#: ../app/pdb/gimpprocedure.c:767 #, c-format msgid "" -"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type %" -"s). This value is out of range." +"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type " +"%s). This value is out of range." msgstr "" -"La procédure « %s » a été appelée avec la valeur « %s » pour le paramètre « %" -"s » (#%d, type %s). Cette valeur est hors-limite." +"La procédure « %s » a été appelée avec la valeur « %s » pour le paramètre " +"« %s » (#%d, type %s). Cette valeur est hors-limite." -#: ../app/pdb/image-cmds.c:2359 +#: ../app/pdb/image-cmds.c:2361 msgid "" "Image resolution is out of bounds, using the default resolution instead." msgstr "" @@ -11473,10 +11590,6 @@ msgid "Free Select" msgstr "Sélection à main levée" -#: ../app/pdb/layer-cmds.c:478 ../app/pdb/layer-cmds.c:516 -msgid "Move Layer" -msgstr "Déplacer le calque" - #: ../app/pdb/text-layer-cmds.c:91 #, c-format msgid "Failed to create text layer" @@ -11501,29 +11614,29 @@ msgid "Close path stroke" msgstr "Fermer le tracé de chemin" -#: ../app/pdb/vectors-cmds.c:399 +#: ../app/pdb/vectors-cmds.c:401 msgid "Translate path stroke" msgstr "Transférer le tracé de chemin" -#: ../app/pdb/vectors-cmds.c:439 +#: ../app/pdb/vectors-cmds.c:443 msgid "Scale path stroke" msgstr "Modifier la taille du tracé de chemin" -#: ../app/pdb/vectors-cmds.c:481 +#: ../app/pdb/vectors-cmds.c:487 msgid "Rotate path stroke" msgstr "Faire pivoter le tracé du chemin" -#: ../app/pdb/vectors-cmds.c:521 ../app/pdb/vectors-cmds.c:565 +#: ../app/pdb/vectors-cmds.c:529 ../app/pdb/vectors-cmds.c:575 msgid "Flip path stroke" msgstr "Retourner le tracé du chemin" -#: ../app/pdb/vectors-cmds.c:694 ../app/pdb/vectors-cmds.c:816 -#: ../app/pdb/vectors-cmds.c:1035 +#: ../app/pdb/vectors-cmds.c:706 ../app/pdb/vectors-cmds.c:829 +#: ../app/pdb/vectors-cmds.c:1055 msgid "Add path stroke" msgstr "Ajouter un tracé de chemin" -#: ../app/pdb/vectors-cmds.c:868 ../app/pdb/vectors-cmds.c:921 -#: ../app/pdb/vectors-cmds.c:982 +#: ../app/pdb/vectors-cmds.c:882 ../app/pdb/vectors-cmds.c:937 +#: ../app/pdb/vectors-cmds.c:1000 msgid "Extend path stroke" msgstr "Étendre le tracé de chemin" @@ -11565,11 +11678,11 @@ "Erreur d'exécution pour la procédure « %s » :\n" "%s" -#: ../app/plug-in/gimpplugin-progress.c:331 +#: ../app/plug-in/gimpplugin-progress.c:339 msgid "Cancelled" msgstr "Annulé" -#: ../app/plug-in/gimpplugin.c:639 +#: ../app/plug-in/gimpplugin.c:648 #, c-format msgid "" "Plug-in crashed: \"%s\"\n" @@ -11584,9 +11697,9 @@ "Le greffon a peut-être endommagé l'état interne de GIMP. Vous devriez " "enregistrer vos images et redémarrer GIMP pour être certain de sa stabilité." -#: ../app/plug-in/gimppluginmanager-call.c:173 -#: ../app/plug-in/gimppluginmanager-call.c:223 -#: ../app/plug-in/gimppluginmanager-call.c:321 +#: ../app/plug-in/gimppluginmanager-call.c:185 +#: ../app/plug-in/gimppluginmanager-call.c:235 +#: ../app/plug-in/gimppluginmanager-call.c:333 #, c-format msgid "Failed to run plug-in \"%s\"" msgstr "Le lancement du greffon « %s » a échoué" @@ -11619,7 +11732,7 @@ msgid "Plug-In Environment" msgstr "Environnement du greffon" -#: ../app/plug-in/gimppluginprocedure.c:980 +#: ../app/plug-in/gimppluginprocedure.c:978 #, c-format msgid "" "Calling error for '%s':\n" @@ -11628,7 +11741,7 @@ "Erreur d'appel pour « %s » :\n" "%s" -#: ../app/plug-in/gimppluginprocedure.c:992 +#: ../app/plug-in/gimppluginprocedure.c:990 #, c-format msgid "" "Execution error for '%s':\n" @@ -11637,16 +11750,22 @@ "Erreur d'exécution « %s » :\n" "%s" -#: ../app/plug-in/plug-in-icc-profile.c:112 -#: ../app/plug-in/plug-in-icc-profile.c:187 -#: ../app/plug-in/plug-in-icc-profile.c:246 +#: ../app/plug-in/plug-in-icc-profile.c:74 +#, c-format +msgid "Can't apply color profile to grayscale image (%s)" +msgstr "" +"Impossible d'appliquer le profil de couleur à l'image en niveaux de gris (%s)" + +#: ../app/plug-in/plug-in-icc-profile.c:117 +#: ../app/plug-in/plug-in-icc-profile.c:192 +#: ../app/plug-in/plug-in-icc-profile.c:251 #, c-format msgid "Error running '%s'" msgstr "Erreur durant l'exécution de %s" -#: ../app/plug-in/plug-in-icc-profile.c:136 -#: ../app/plug-in/plug-in-icc-profile.c:197 -#: ../app/plug-in/plug-in-icc-profile.c:256 +#: ../app/plug-in/plug-in-icc-profile.c:141 +#: ../app/plug-in/plug-in-icc-profile.c:202 +#: ../app/plug-in/plug-in-icc-profile.c:261 #, c-format msgid "Plug-In missing (%s)" msgstr "Greffon manquant (%s)" @@ -11668,7 +11787,7 @@ #. This is a so-called pangram; it's supposed to #. contain all characters found in the alphabet. -#: ../app/text/gimpfont.c:43 +#: ../app/text/gimpfont.c:45 msgid "" "Pack my box with\n" "five dozen liquor jugs." @@ -11676,7 +11795,7 @@ "Portez ce vieux whisky\n" "au juge blond qui fume." -#: ../app/text/gimptext-compat.c:105 ../app/tools/gimptexttool.c:1367 +#: ../app/text/gimptext-compat.c:105 ../app/tools/gimptexttool.c:1415 msgid "Add Text Layer" msgstr "Ajouter un calque de texte" @@ -11716,17 +11835,25 @@ msgid "Discard Text Information" msgstr "Abandonner le texte d'information" -#: ../app/text/gimptextlayer.c:581 +#: ../app/text/gimptextlayer.c:582 msgid "Due to lack of any fonts, text functionality is not available." msgstr "" "À cause de l'absence de polices de caractères, la fonction texte n'est pas " "disponible." -#: ../app/text/gimptextlayer.c:634 +#: ../app/text/gimptextlayer.c:640 msgid "Empty Text Layer" msgstr "Calque de texte vide" -#: ../app/text/gimptextlayer-xcf.c:75 +#: ../app/text/gimptextlayer.c:696 +msgid "" +"Your text cannot be rendered. It is likely too big. Please make it shorter " +"or use a smaller font." +msgstr "" +"Impossible d'afficher le texte. Il est probablement trop grand. " +"Raccourcissez-le ou utilisez une police plus petite." + +#: ../app/text/gimptextlayer-xcf.c:76 #, c-format msgid "" "Problems parsing the text parasite for layer '%s':\n" @@ -11741,6 +11868,14 @@ "Quelques propriétés du texte sont peut être erronées. Tant que vous ne " "souhaitez pas éditer le texte, vous n'avez pas à vous en soucier." +#: ../app/text/gimptextlayout.c:577 +msgid "" +"The new text layout cannot be generated. Most likely the font size is too " +"big." +msgstr "" +"La nouvelle présentation du texte ne peut pas être générée. La taille de la " +"police est probablement trop grande." + #: ../app/text/text-enums.c:23 msgctxt "text-box-mode" msgid "Dynamic" @@ -11894,7 +12029,7 @@ msgid "Click to add this path to the list" msgstr "Cliquez pour ajouter ce chemin à la liste" -#: ../app/tools/gimpblendoptions.c:211 ../app/tools/gimppaintoptions-gui.c:339 +#: ../app/tools/gimpblendoptions.c:211 ../app/tools/gimppaintoptions-gui.c:344 msgid "Gradient" msgstr "Dégradé" @@ -11935,7 +12070,7 @@ msgid "No gradient available for use with this tool." msgstr "Aucun dégradé disponible pour être utilisé avec cet outil." -#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:623 +#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:624 #, c-format msgid "%s for constrained angles" msgstr "%s pour contraindre les angles" @@ -11979,15 +12114,15 @@ msgstr "" "Luminosité-Contraste ne fonctionne pas sur des calques en couleurs indexées." -#: ../app/tools/gimpbrightnesscontrasttool.c:314 +#: ../app/tools/gimpbrightnesscontrasttool.c:318 msgid "_Brightness:" msgstr "_Luminosité :" -#: ../app/tools/gimpbrightnesscontrasttool.c:327 +#: ../app/tools/gimpbrightnesscontrasttool.c:331 msgid "Con_trast:" msgstr "Con_traste :" -#: ../app/tools/gimpbrightnesscontrasttool.c:339 +#: ../app/tools/gimpbrightnesscontrasttool.c:343 msgid "Edit these Settings as Levels" msgstr "Changer ces paramètres en niveaux" @@ -12041,9 +12176,9 @@ msgstr "Remplir les régions transparentes" #: ../app/tools/gimpbucketfilloptions.c:279 ../app/tools/gimpclonetool.c:114 -#: ../app/tools/gimpcolorpickeroptions.c:158 ../app/tools/gimphealtool.c:99 +#: ../app/tools/gimpcolorpickeroptions.c:158 ../app/tools/gimphealtool.c:100 #: ../app/tools/gimpperspectiveclonetool.c:904 -#: ../app/tools/gimpregionselectoptions.c:209 +#: ../app/tools/gimpregionselectoptions.c:210 msgid "Sample merged" msgstr "Échantillonner sur tous les calques" @@ -12084,27 +12219,27 @@ msgid "Select by Color" msgstr "Sélection par couleur" -#: ../app/tools/gimpcagetool.c:152 ../app/tools/gimpcagetool.c:1154 +#: ../app/tools/gimpcagetool.c:158 ../app/tools/gimpcagetool.c:1128 msgid "Cage Transform" msgstr "Transformation par cage" -#: ../app/tools/gimpcagetool.c:153 +#: ../app/tools/gimpcagetool.c:159 msgid "Cage Transform: Deform a selection with a cage" msgstr "Transformation par cage : déformation d'une sélection avec une cage" -#: ../app/tools/gimpcagetool.c:154 +#: ../app/tools/gimpcagetool.c:160 msgid "_Cage Transform" msgstr "Transformation par ca_ge" -#: ../app/tools/gimpcagetool.c:351 +#: ../app/tools/gimpcagetool.c:357 msgid "Press ENTER to commit the transform" msgstr "Appuyez sur ENTRÉE pour réaliser la transformation" -#: ../app/tools/gimpcagetool.c:1095 +#: ../app/tools/gimpcagetool.c:1069 msgid "Computing Cage Coefficients" msgstr "Calcul des coefficients de la cage" -#: ../app/tools/gimpcagetool.c:1272 +#: ../app/tools/gimpcagetool.c:1246 msgid "Cage transform" msgstr "Transformation par cage" @@ -12132,13 +12267,12 @@ msgid "Click to set a new clone source" msgstr "Cliquez pour donner une nouvelle source au clonage" -#: ../app/tools/gimpclonetool.c:109 -#: ../app/tools/gimpperspectiveclonetool.c:899 +#: ../app/tools/gimpclonetool.c:109 ../app/tools/gimpperspectiveclonetool.c:899 msgid "Source" msgstr "Source" -#: ../app/tools/gimpclonetool.c:131 ../app/tools/gimphealtool.c:111 -#: ../app/tools/gimpperspectiveclonetool.c:921 +#: ../app/tools/gimpclonetool.c:128 ../app/tools/gimphealtool.c:109 +#: ../app/tools/gimpperspectiveclonetool.c:918 msgid "Alignment:" msgstr "Alignement :" @@ -12248,18 +12382,15 @@ msgid "Select Color" msgstr "Sélectionnez une couleur" -#: ../app/tools/gimpcolorizetool.c:241 -#: ../app/tools/gimphuesaturationtool.c:381 +#: ../app/tools/gimpcolorizetool.c:241 ../app/tools/gimphuesaturationtool.c:381 msgid "_Hue:" msgstr "_Teinte :" -#: ../app/tools/gimpcolorizetool.c:254 -#: ../app/tools/gimphuesaturationtool.c:413 +#: ../app/tools/gimpcolorizetool.c:254 ../app/tools/gimphuesaturationtool.c:413 msgid "_Saturation:" msgstr "_Saturation :" -#: ../app/tools/gimpcolorizetool.c:267 -#: ../app/tools/gimphuesaturationtool.c:397 +#: ../app/tools/gimpcolorizetool.c:267 ../app/tools/gimphuesaturationtool.c:397 msgid "_Lightness:" msgstr "_Luminosité :" @@ -12269,8 +12400,7 @@ #: ../app/tools/gimpcoloroptions.c:157 #: ../app/tools/gimprectangleselectoptions.c:163 -#: ../app/tools/gimpselectionoptions.c:277 -#: ../app/widgets/gimpbrusheditor.c:155 +#: ../app/tools/gimpselectionoptions.c:277 ../app/widgets/gimpbrusheditor.c:155 msgid "Radius" msgstr "Rayon" @@ -12318,43 +12448,43 @@ msgid "C_olor Picker" msgstr "P_ipette à couleurs" -#: ../app/tools/gimpcolorpickertool.c:228 +#: ../app/tools/gimpcolorpickertool.c:231 msgid "Click in any image to view its color" msgstr "Cliquez dans n'importe quelle image pour afficher sa couleur" -#: ../app/tools/gimpcolorpickertool.c:235 ../app/tools/gimppainttool.c:477 +#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:478 msgid "Click in any image to pick the foreground color" msgstr "" "Cliquez dans n'importe quelle image pour capturer la couleur de premier plan" -#: ../app/tools/gimpcolorpickertool.c:243 ../app/tools/gimppainttool.c:483 +#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:484 msgid "Click in any image to pick the background color" msgstr "" "Cliquez dans n'importe quelle image pour capturer la couleur de l'arrière-" "plan" -#: ../app/tools/gimpcolorpickertool.c:251 +#: ../app/tools/gimpcolorpickertool.c:254 msgid "Click in any image to add the color to the palette" msgstr "" "Cliquez dans n'importe quelle image pour ajouter la couleur à la palette" -#: ../app/tools/gimpcolorpickertool.c:306 +#: ../app/tools/gimpcolorpickertool.c:309 msgid "Color Picker Information" msgstr "Information de la Pipette à couleurs" -#: ../app/tools/gimpcolortool.c:229 ../app/tools/gimpcolortool.c:402 +#: ../app/tools/gimpcolortool.c:230 ../app/tools/gimpcolortool.c:403 msgid "Move Sample Point: " msgstr "Déplacer le point d'échantillonnage :" -#: ../app/tools/gimpcolortool.c:394 +#: ../app/tools/gimpcolortool.c:395 msgid "Remove Sample Point" msgstr "Supprimer le point d'échantillonnage" -#: ../app/tools/gimpcolortool.c:395 +#: ../app/tools/gimpcolortool.c:396 msgid "Cancel Sample Point" msgstr "Annuler le point d'échantillonnage" -#: ../app/tools/gimpcolortool.c:403 +#: ../app/tools/gimpcolortool.c:404 msgid "Add Sample Point: " msgstr "Ajouter un point d'échantillonnage :" @@ -12449,64 +12579,64 @@ msgid "There is no active layer to crop." msgstr "Il n'y a pas de calque actif à découper." -#: ../app/tools/gimpcurvestool.c:150 +#: ../app/tools/gimpcurvestool.c:145 msgid "Curves" msgstr "Courbes" -#: ../app/tools/gimpcurvestool.c:151 +#: ../app/tools/gimpcurvestool.c:146 msgid "Curves Tool: Adjust color curves" msgstr "Outils courbes : ajuste les courbes de couleur" -#: ../app/tools/gimpcurvestool.c:152 +#: ../app/tools/gimpcurvestool.c:147 msgid "_Curves..." msgstr "Co_urbes..." -#: ../app/tools/gimpcurvestool.c:178 +#: ../app/tools/gimpcurvestool.c:174 msgid "Adjust Color Curves" msgstr "Ajuster les courbes de couleur" -#: ../app/tools/gimpcurvestool.c:180 +#: ../app/tools/gimpcurvestool.c:176 msgid "Import Curves" msgstr "Importer des courbes" -#: ../app/tools/gimpcurvestool.c:181 +#: ../app/tools/gimpcurvestool.c:177 msgid "Export Curves" msgstr "Exporter des courbes" -#: ../app/tools/gimpcurvestool.c:232 +#: ../app/tools/gimpcurvestool.c:239 msgid "Curves does not operate on indexed layers." msgstr "Courbes ne fonctionne pas sur des calques en couleurs indexées." -#: ../app/tools/gimpcurvestool.c:340 +#: ../app/tools/gimpcurvestool.c:348 msgid "Click to add a control point" msgstr "Cliquez pour ajouter un point de contrôle." -#: ../app/tools/gimpcurvestool.c:345 +#: ../app/tools/gimpcurvestool.c:353 msgid "Click to add control points to all channels" msgstr "Cliquez pour ajouter des points de contrôle à tous les canaux." -#: ../app/tools/gimpcurvestool.c:350 +#: ../app/tools/gimpcurvestool.c:358 msgid "Click to locate on curve (try Shift, Ctrl)" msgstr "Cliquer pour se placer sur la courbe (essayez Maj, Ctrl)" -#: ../app/tools/gimpcurvestool.c:463 ../app/tools/gimplevelstool.c:384 +#: ../app/tools/gimpcurvestool.c:473 ../app/tools/gimplevelstool.c:384 msgid "Cha_nnel:" msgstr "Ca_nal :" -#: ../app/tools/gimpcurvestool.c:489 ../app/tools/gimplevelstool.c:408 +#: ../app/tools/gimpcurvestool.c:499 ../app/tools/gimplevelstool.c:408 msgid "R_eset Channel" msgstr "Ré_initialiser le canal" -#: ../app/tools/gimpcurvestool.c:583 ../app/widgets/gimpdeviceinfoeditor.c:458 +#: ../app/tools/gimpcurvestool.c:590 ../app/widgets/gimpdeviceinfoeditor.c:461 msgid "Curve _type:" msgstr "_Type de courbe :" -#: ../app/tools/gimpcurvestool.c:658 ../app/tools/gimplevelstool.c:756 +#: ../app/tools/gimpcurvestool.c:667 ../app/tools/gimplevelstool.c:756 #, c-format msgid "Could not read header from '%s': %s" msgstr "Impossible de lire l'en-tête de « %s » : %s" -#: ../app/tools/gimpcurvestool.c:731 +#: ../app/tools/gimpcurvestool.c:740 msgid "Use _old curves file format" msgstr "Utiliser le format de fichier avec _anciennes courbes" @@ -12585,20 +12715,16 @@ msgid "Exposure" msgstr "Exposition" -#: ../app/tools/gimpeditselectiontool.c:244 -msgid "Move Selection" -msgstr "Déplacer la sélection" +#: ../app/tools/gimpeditselectiontool.c:484 +#: ../app/tools/gimpeditselectiontool.c:670 +msgid "Move: " +msgstr "Déplacement : " -#: ../app/tools/gimpeditselectiontool.c:248 -#: ../app/tools/gimpeditselectiontool.c:1243 +#: ../app/tools/gimpeditselectiontool.c:982 +#: ../app/tools/gimpeditselectiontool.c:1234 msgid "Move Floating Selection" msgstr "Déplacer la sélection flottante" -#: ../app/tools/gimpeditselectiontool.c:457 -#: ../app/tools/gimpeditselectiontool.c:734 -msgid "Move: " -msgstr "Déplacement : " - #: ../app/tools/gimpellipseselecttool.c:66 msgid "Ellipse Select" msgstr "Sélection elliptique" @@ -12781,19 +12907,19 @@ msgid "F_oreground Select" msgstr "Extraction de _premier plan" -#: ../app/tools/gimpforegroundselecttool.c:302 +#: ../app/tools/gimpforegroundselecttool.c:304 msgid "Add more strokes or press Enter to accept the selection" msgstr "Ajoutez plus de tracés ou appuyez sur Entrée pour valider la sélection" -#: ../app/tools/gimpforegroundselecttool.c:304 +#: ../app/tools/gimpforegroundselecttool.c:306 msgid "Mark foreground by painting on the object to extract" msgstr "Marquer le premier plan en dessinant sur l'objet à extraire" -#: ../app/tools/gimpforegroundselecttool.c:309 +#: ../app/tools/gimpforegroundselecttool.c:311 msgid "Roughly outline the object to extract" msgstr "Tracer un contour grossier autour de l'objet à extraire" -#: ../app/tools/gimpforegroundselecttool.c:751 +#: ../app/tools/gimpforegroundselecttool.c:753 msgctxt "command" msgid "Foreground Select" msgstr "Sélectionner le premier plan" @@ -12809,27 +12935,27 @@ msgid "_Free Select" msgstr "Sélection à _main levée" -#: ../app/tools/gimpfreeselecttool.c:1031 +#: ../app/tools/gimpfreeselecttool.c:1030 msgid "Click to complete selection" msgstr "Cliquez pour terminer la sélection" -#: ../app/tools/gimpfreeselecttool.c:1035 +#: ../app/tools/gimpfreeselecttool.c:1034 msgid "Click-Drag to move segment vertex" msgstr "Cliquez-glissez pour déplacer le sommet du segment" -#: ../app/tools/gimpfreeselecttool.c:1040 +#: ../app/tools/gimpfreeselecttool.c:1039 msgid "Return commits, Escape cancels, Backspace removes last segment" msgstr "" "La touche Entrée valide, la touche d'échappement annule, la touche retour " "arrière supprime le dernier segment" -#: ../app/tools/gimpfreeselecttool.c:1044 +#: ../app/tools/gimpfreeselecttool.c:1043 msgid "Click-Drag adds a free segment, Click adds a polygonal segment" msgstr "" "Un cliquer-glisser ajoute un segment libre, un clic ajoute un segment qui " "complète la forme" -#: ../app/tools/gimpfreeselecttool.c:1563 +#: ../app/tools/gimpfreeselecttool.c:1562 msgctxt "command" msgid "Free Select" msgstr "Sélection à main levée" @@ -12870,16 +12996,16 @@ msgstr "" "Les actions GEGL ne fonctionnent pas sur des calques en couleurs indexées." -#: ../app/tools/gimpgegltool.c:377 +#: ../app/tools/gimpgegltool.c:378 msgid "_Operation:" msgstr "_Action :" #. The options vbox -#: ../app/tools/gimpgegltool.c:436 +#: ../app/tools/gimpgegltool.c:437 msgid "Operation Settings" msgstr "Paramètres de l'action" -#: ../app/tools/gimpgegltool.c:441 +#: ../app/tools/gimpgegltool.c:442 msgid "Select an operation from the list above" msgstr "Sélectionner une opération dans la liste ci-dessus" @@ -12992,7 +13118,7 @@ msgid "Settings saved to '%s'" msgstr "Paramètres enregistrés sous « %s »" -#: ../app/tools/gimpimagemaptool.c:362 +#: ../app/tools/gimpimagemaptool.c:363 msgid "_Preview" msgstr "A_perçu" @@ -13002,12 +13128,11 @@ msgstr "Ajustement" #: ../app/tools/gimpinkoptions-gui.c:64 ../app/tools/gimpinkoptions-gui.c:87 -#: ../app/tools/gimppaintoptions-gui.c:134 +#: ../app/tools/gimppaintoptions-gui.c:132 msgid "Size" msgstr "Taille" -#: ../app/tools/gimpinkoptions-gui.c:71 -#: ../app/tools/gimppaintoptions-gui.c:183 +#: ../app/tools/gimpinkoptions-gui.c:71 ../app/tools/gimppaintoptions-gui.c:181 #: ../app/widgets/gimpbrusheditor.c:199 msgid "Angle" msgstr "Angle" @@ -13017,9 +13142,8 @@ msgid "Sensitivity" msgstr "Sensibilité" -#: ../app/tools/gimpinkoptions-gui.c:94 -#: ../app/widgets/gimpdynamicseditor.c:144 -#: ../app/widgets/gimpdynamicsoutputeditor.c:71 +#: ../app/tools/gimpinkoptions-gui.c:94 ../app/widgets/gimpdynamicseditor.c:144 +#: ../app/widgets/gimpdynamicsoutputeditor.c:72 msgid "Tilt" msgstr "Inclinaison" @@ -13064,32 +13188,32 @@ msgid "Intelligent _Scissors" msgstr "Ciseaux _intelligents" -#: ../app/tools/gimpiscissorstool.c:900 ../app/tools/gimpmeasuretool.c:605 +#: ../app/tools/gimpiscissorstool.c:902 ../app/tools/gimpmeasuretool.c:605 msgid "Click-Drag to move this point" msgstr "Cliquez-glissez pour déplacer ce chemin" -#: ../app/tools/gimpiscissorstool.c:902 ../app/tools/gimpiscissorstool.c:967 +#: ../app/tools/gimpiscissorstool.c:904 ../app/tools/gimpiscissorstool.c:969 #, c-format msgid "%s: disable auto-snap" msgstr "%s : désactive l'accrochage automatique" -#: ../app/tools/gimpiscissorstool.c:919 +#: ../app/tools/gimpiscissorstool.c:921 msgid "Click to close the curve" msgstr "Cliquez pour fermer la courbe" -#: ../app/tools/gimpiscissorstool.c:925 +#: ../app/tools/gimpiscissorstool.c:927 msgid "Click to add a point on this segment" msgstr "Cliquez pour ajouter un point sur ce segment" -#: ../app/tools/gimpiscissorstool.c:939 +#: ../app/tools/gimpiscissorstool.c:941 msgid "Click or press Enter to convert to a selection" msgstr "Cliquez ou appuyez sur entrée pour convertir en une sélection" -#: ../app/tools/gimpiscissorstool.c:949 +#: ../app/tools/gimpiscissorstool.c:951 msgid "Press Enter to convert to a selection" msgstr "Appuyez sur Entrée pour convertir en sélection" -#: ../app/tools/gimpiscissorstool.c:964 +#: ../app/tools/gimpiscissorstool.c:966 msgid "Click or Click-Drag to add a point" msgstr "Cliquez-glissez pour ajouter un point" @@ -13188,7 +13312,6 @@ msgstr "Outil de zoom : ajuste le ratio de zoom" #: ../app/tools/gimpmagnifytool.c:93 -msgctxt "tool" msgid "_Zoom" msgstr "_Zoom" @@ -13242,7 +13365,7 @@ #: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084 #: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168 -#: ../app/tools/gimppainttool.c:632 +#: ../app/tools/gimppainttool.c:633 msgid "pixels" msgstr "pixels" @@ -13302,19 +13425,19 @@ msgid "_Move" msgstr "_Déplacement" -#: ../app/tools/gimpmovetool.c:247 ../app/tools/gimpmovetool.c:552 +#: ../app/tools/gimpmovetool.c:249 ../app/tools/gimpmovetool.c:554 msgid "Move Guide: " msgstr "Déplacer un guide :" -#: ../app/tools/gimpmovetool.c:546 +#: ../app/tools/gimpmovetool.c:548 msgid "Remove Guide" msgstr "Supprimer le guide" -#: ../app/tools/gimpmovetool.c:546 +#: ../app/tools/gimpmovetool.c:548 msgid "Cancel Guide" msgstr "Annuler le guide" -#: ../app/tools/gimpmovetool.c:552 +#: ../app/tools/gimpmovetool.c:554 msgid "Add Guide: " msgstr "Ajouter un guide :" @@ -13326,74 +13449,73 @@ msgid "_Paintbrush" msgstr "_Pinceau" -#: ../app/tools/gimppaintoptions-gui.c:99 -#: ../app/tools/gimpselectionoptions.c:217 -#: ../app/widgets/gimpbrushselect.c:190 ../app/widgets/gimplayertreeview.c:268 +#: ../app/tools/gimppaintoptions-gui.c:89 +#: ../app/tools/gimpselectionoptions.c:217 ../app/widgets/gimpbrushselect.c:190 +#: ../app/widgets/gimplayertreeview.c:268 msgid "Mode:" msgstr "Mode :" -#: ../app/tools/gimppaintoptions-gui.c:123 +#: ../app/tools/gimppaintoptions-gui.c:121 msgid "Brush" msgstr "Brosse" -#: ../app/tools/gimppaintoptions-gui.c:152 +#: ../app/tools/gimppaintoptions-gui.c:150 msgid "Reset size to brush's native size" msgstr "Rétablir la taille par défaut de la brosse" -#: ../app/tools/gimppaintoptions-gui.c:159 +#: ../app/tools/gimppaintoptions-gui.c:157 msgid "Aspect Ratio" msgstr "Proportions" -#: ../app/tools/gimppaintoptions-gui.c:176 +#: ../app/tools/gimppaintoptions-gui.c:174 msgid "Reset aspect ratio to brush's native" msgstr "Rétablir les proportions par défaut de la brosse" -#: ../app/tools/gimppaintoptions-gui.c:200 +#: ../app/tools/gimppaintoptions-gui.c:198 msgid "Reset angle to zero" msgstr "Remettre l'angle à zéro" -#: ../app/tools/gimppaintoptions-gui.c:235 +#: ../app/tools/gimppaintoptions-gui.c:236 msgid "Incremental" msgstr "Incrémentiel" -#: ../app/tools/gimppaintoptions-gui.c:251 +#: ../app/tools/gimppaintoptions-gui.c:254 msgid "Hard edge" msgstr "Contour dur" -#: ../app/tools/gimppaintoptions-gui.c:280 +#: ../app/tools/gimppaintoptions-gui.c:283 msgid "Dynamics Options" msgstr "Options de dynamique" -#: ../app/tools/gimppaintoptions-gui.c:286 +#: ../app/tools/gimppaintoptions-gui.c:289 msgid "Fade Options" msgstr "Options d'estompement" -#: ../app/tools/gimppaintoptions-gui.c:300 +#: ../app/tools/gimppaintoptions-gui.c:303 msgid "Fade length" msgstr "Longueur d'estompement" -#: ../app/tools/gimppaintoptions-gui.c:327 -#: ../app/widgets/gimpviewablebox.c:310 +#: ../app/tools/gimppaintoptions-gui.c:332 ../app/widgets/gimpviewablebox.c:311 msgid "Reverse" msgstr "Inverser" -#: ../app/tools/gimppaintoptions-gui.c:334 +#: ../app/tools/gimppaintoptions-gui.c:339 msgid "Color Options" msgstr "Options de couleur" -#: ../app/tools/gimppaintoptions-gui.c:360 +#: ../app/tools/gimppaintoptions-gui.c:365 msgid "Amount" msgstr "Quantité" -#: ../app/tools/gimppaintoptions-gui.c:364 +#: ../app/tools/gimppaintoptions-gui.c:369 msgid "Apply Jitter" msgstr "Appliquer fluctuation" -#: ../app/tools/gimppaintoptions-gui.c:382 +#: ../app/tools/gimppaintoptions-gui.c:387 msgid "Smooth stroke" msgstr "Lisser le tracé" -#: ../app/tools/gimppaintoptions-gui.c:392 +#: ../app/tools/gimppaintoptions-gui.c:397 msgid "Weight" msgstr "Poids" @@ -13414,7 +13536,7 @@ msgid "Cannot paint on layer groups." msgstr "Impossible de peindre sur des groupes de calques." -#: ../app/tools/gimppainttool.c:678 +#: ../app/tools/gimppainttool.c:679 #, c-format msgid "%s for a straight line" msgstr "%s pour une ligne droite" @@ -13567,7 +13689,7 @@ msgid "Position:" msgstr "Position :" -#: ../app/tools/gimprectangleoptions.c:1020 ../app/tools/gimptextoptions.c:525 +#: ../app/tools/gimprectangleoptions.c:1020 ../app/tools/gimptextoptions.c:526 msgid "Size:" msgstr "Taille :" @@ -13609,7 +13731,7 @@ msgid "_Rectangle Select" msgstr "Sélection _rectangulaire" -#: ../app/tools/gimprectangletool.c:1146 ../app/tools/gimprectangletool.c:2015 +#: ../app/tools/gimprectangletool.c:1146 ../app/tools/gimprectangletool.c:2016 msgid "Rectangle: " msgstr "Rectangle :" @@ -13625,11 +13747,11 @@ msgid "Selection criterion" msgstr "Critère de sélection" -#: ../app/tools/gimpregionselectoptions.c:203 +#: ../app/tools/gimpregionselectoptions.c:204 msgid "Select transparent areas" msgstr "Sélectionne des régions transparentes" -#: ../app/tools/gimpregionselectoptions.c:229 +#: ../app/tools/gimpregionselectoptions.c:226 msgid "Select by:" msgstr "Sélectionner par :" @@ -13695,7 +13817,7 @@ msgid "Radius of feathering" msgstr "Rayon d'adoucissement" -#: ../app/tools/gimpselectionoptions.c:264 ../app/tools/gimptextoptions.c:538 +#: ../app/tools/gimpselectionoptions.c:264 ../app/tools/gimptextoptions.c:539 msgid "Antialiasing" msgstr "Lissage" @@ -13703,39 +13825,39 @@ msgid "Feather edges" msgstr "Adoucir les bords" -#: ../app/tools/gimpselectiontool.c:250 +#: ../app/tools/gimpselectiontool.c:255 msgid "Click-Drag to replace the current selection" msgstr "Cliquez-glissez pour remplacer la sélection actuelle" -#: ../app/tools/gimpselectiontool.c:258 +#: ../app/tools/gimpselectiontool.c:263 msgid "Click-Drag to create a new selection" msgstr "Cliquez-glissez pour créer une nouvelle sélection" -#: ../app/tools/gimpselectiontool.c:263 +#: ../app/tools/gimpselectiontool.c:268 msgid "Click-Drag to add to the current selection" msgstr "Cliquez-glissez pour ajouter à la sélection actuelle" -#: ../app/tools/gimpselectiontool.c:272 +#: ../app/tools/gimpselectiontool.c:277 msgid "Click-Drag to subtract from the current selection" msgstr "Cliquez-glissez pour soustraire à la sélection actuelle" -#: ../app/tools/gimpselectiontool.c:281 +#: ../app/tools/gimpselectiontool.c:286 msgid "Click-Drag to intersect with the current selection" msgstr "Cliquez-glissez pour intersecter avec la sélection actuelle" -#: ../app/tools/gimpselectiontool.c:291 +#: ../app/tools/gimpselectiontool.c:296 msgid "Click-Drag to move the selection mask" msgstr "Cliquez-glissez pour déplacer le masque de sélection" -#: ../app/tools/gimpselectiontool.c:299 +#: ../app/tools/gimpselectiontool.c:304 msgid "Click-Drag to move the selected pixels" msgstr "Cliquez-glissez pour déplacer les pixels sélectionnés" -#: ../app/tools/gimpselectiontool.c:303 +#: ../app/tools/gimpselectiontool.c:308 msgid "Click-Drag to move a copy of the selected pixels" msgstr "Cliquez-glissez pour déplacer une copie des pixels sélectionnés" -#: ../app/tools/gimpselectiontool.c:307 +#: ../app/tools/gimpselectiontool.c:312 msgid "Click to anchor the floating selection" msgstr "Cliquez pour ancrer la sélection flottante" @@ -13844,63 +13966,63 @@ msgid "Use an external editor window for text entry" msgstr "Utiliser une fenêtre d'édition externe pour la saisie de texte" -#: ../app/tools/gimptextoptions.c:510 +#: ../app/tools/gimptextoptions.c:511 msgid "Font" msgstr "Police" -#: ../app/tools/gimptextoptions.c:534 +#: ../app/tools/gimptextoptions.c:535 msgid "Use editor" msgstr "Utiliser l'éditeur" -#: ../app/tools/gimptextoptions.c:554 +#: ../app/tools/gimptextoptions.c:555 msgid "Hinting:" msgstr "Ajustement :" -#: ../app/tools/gimptextoptions.c:558 +#: ../app/tools/gimptextoptions.c:559 msgid "Text Color" msgstr "Couleur du texte" -#: ../app/tools/gimptextoptions.c:563 +#: ../app/tools/gimptextoptions.c:564 msgid "Color:" msgstr "Couleur :" -#: ../app/tools/gimptextoptions.c:569 +#: ../app/tools/gimptextoptions.c:570 msgid "Justify:" msgstr "Justification :" -#: ../app/tools/gimptextoptions.c:592 +#: ../app/tools/gimptextoptions.c:593 msgid "Box:" msgstr "Boîte :" -#: ../app/tools/gimptextoptions.c:609 +#: ../app/tools/gimptextoptions.c:610 msgid "Language:" msgstr "Langue :" -#: ../app/tools/gimptexttool.c:189 +#: ../app/tools/gimptexttool.c:191 msgid "Text" msgstr "Texte" -#: ../app/tools/gimptexttool.c:190 +#: ../app/tools/gimptexttool.c:192 msgid "Text Tool: Create or edit text layers" msgstr "Outil texte : créé ou modifie des calques de texte" -#: ../app/tools/gimptexttool.c:191 +#: ../app/tools/gimptexttool.c:193 msgid "Te_xt" msgstr "Te_xte" -#: ../app/tools/gimptexttool.c:943 +#: ../app/tools/gimptexttool.c:972 msgid "Reshape Text Layer" msgstr "Redessine le calque de texte" -#: ../app/tools/gimptexttool.c:1478 ../app/tools/gimptexttool.c:1481 +#: ../app/tools/gimptexttool.c:1526 ../app/tools/gimptexttool.c:1529 msgid "Confirm Text Editing" msgstr "Confirmer l'édition du texte" -#: ../app/tools/gimptexttool.c:1485 +#: ../app/tools/gimptexttool.c:1533 msgid "Create _New Layer" msgstr "Créer un _nouveau calque" -#: ../app/tools/gimptexttool.c:1509 +#: ../app/tools/gimptexttool.c:1557 msgid "" "The layer you selected is a text layer but it has been modified using other " "tools. Editing the layer with the text tool will discard these " @@ -13915,7 +14037,7 @@ "Vous pouvez éditer le calque ou créer un nouveau calque de texte depuis ses " "attributs de texte." -#: ../app/tools/gimptexttool-editor.c:1159 +#: ../app/tools/gimptexttool-editor.c:1236 msgid "GIMP Text Editor" msgstr "Éditeur de texte GIMP" @@ -13977,66 +14099,74 @@ "Taille d'une cellule de la grille pour un nombre variable de guides de " "composition" -#: ../app/tools/gimptransformoptions.c:138 -msgid "Limit rotation steps to 15 degrees" -msgstr "Limite les pas de rotation à 15 degrés" - -#: ../app/tools/gimptransformoptions.c:276 +#: ../app/tools/gimptransformoptions.c:277 msgid "Transform:" msgstr "Transformer : " -#: ../app/tools/gimptransformoptions.c:285 +#: ../app/tools/gimptransformoptions.c:286 #: ../app/widgets/gimpdynamicseditor.c:143 -#: ../app/widgets/gimpdynamicsoutputeditor.c:70 +#: ../app/widgets/gimpdynamicsoutputeditor.c:71 msgid "Direction" msgstr "Direction" #. the interpolation menu -#: ../app/tools/gimptransformoptions.c:290 +#: ../app/tools/gimptransformoptions.c:291 msgid "Interpolation:" msgstr "Type d'interpolation :" #. the clipping menu -#: ../app/tools/gimptransformoptions.c:299 +#: ../app/tools/gimptransformoptions.c:300 msgid "Clipping:" msgstr "Rognage :" -#: ../app/tools/gimptransformoptions.c:309 +#: ../app/tools/gimptransformoptions.c:310 msgid "Image opacity" msgstr "Opacité de l'image" -#: ../app/tools/gimptransformoptions.c:311 +#: ../app/tools/gimptransformoptions.c:312 msgid "Show image preview" msgstr "Affiche un aperçu de l'image" #. the guides frame -#: ../app/tools/gimptransformoptions.c:317 +#: ../app/tools/gimptransformoptions.c:318 msgid "Guides" msgstr "Guides" -#: ../app/tools/gimptransformoptions.c:345 +#: ../app/tools/gimptransformoptions.c:346 #, c-format msgid "15 degrees (%s)" msgstr "15 degrés (%s)" -#: ../app/tools/gimptransformoptions.c:349 +#: ../app/tools/gimptransformoptions.c:347 +msgid "Limit rotation steps to 15 degrees" +msgstr "Limite les pas de rotation à 15 degrés" + +#: ../app/tools/gimptransformoptions.c:351 #, c-format msgid "Keep aspect (%s)" msgstr "Conserver le rapport (%s)" -#: ../app/tools/gimptransformtool.c:212 +#: ../app/tools/gimptransformoptions.c:352 +msgid "Keep the original aspect ratio" +msgstr "Conserver les proportions initiales" + +#: ../app/tools/gimptransformtool.c:220 msgid "Transforming" msgstr "Transformation" -#: ../app/tools/gimptransformtool.c:1061 +#: ../app/tools/gimptransformtool.c:269 +msgid "The selection does not intersect with the layer." +msgstr "La sélection n'a pas d'intersection avec la couche." + +#: ../app/tools/gimptransformtool.c:1480 msgid "There is no layer to transform." msgstr "Il n'y a pas de calque à transformer." -#: ../app/tools/gimptransformtool.c:1074 +#: ../app/tools/gimptransformtool.c:1491 msgid "There is no path to transform." msgstr "Il n'y a pas de chemin à transformer." -#: ../app/tools/gimptransformtool.c:1075 +#: ../app/tools/gimptransformtool.c:1492 msgid "The active path's strokes are locked." msgstr "Les tracés de chemin actifs sont verrouillés." @@ -14078,11 +14208,11 @@ msgid "Pat_hs" msgstr "C_hemins" -#: ../app/tools/gimpvectortool.c:251 +#: ../app/tools/gimpvectortool.c:250 msgid "The active path is locked." msgstr "Le chemin actif est verrouillé." -#: ../app/tools/gimpvectortool.c:341 +#: ../app/tools/gimpvectortool.c:340 msgid "Add Stroke" msgstr "Ajouter un tracé" @@ -14130,84 +14260,84 @@ msgid "Delete Segment" msgstr "Supprimer un segment" -#: ../app/tools/gimpvectortool.c:839 +#: ../app/tools/gimpvectortool.c:842 msgid "Move Anchors" msgstr "Déplacer des ancres" -#: ../app/tools/gimpvectortool.c:1202 +#: ../app/tools/gimpvectortool.c:1205 msgid "Click to pick path to edit" msgstr "Cliquez pour sélectionner le chemin à éditer" -#: ../app/tools/gimpvectortool.c:1206 +#: ../app/tools/gimpvectortool.c:1209 msgid "Click to create a new path" msgstr "Cliquez pour créer un nouveau chemin" -#: ../app/tools/gimpvectortool.c:1210 +#: ../app/tools/gimpvectortool.c:1213 msgid "Click to create a new component of the path" msgstr "Cliquez pour créer un nouveau composant au chemin" -#: ../app/tools/gimpvectortool.c:1214 +#: ../app/tools/gimpvectortool.c:1217 msgid "Click or Click-Drag to create a new anchor" msgstr "Cliquez ou cliquez-glissez pour créer un nouveau nœud" -#: ../app/tools/gimpvectortool.c:1226 ../app/tools/gimpvectortool.c:1233 +#: ../app/tools/gimpvectortool.c:1229 ../app/tools/gimpvectortool.c:1236 msgid "Click-Drag to move the anchor around" msgstr "Cliquez-glissez pour déplacer le nœud." -#: ../app/tools/gimpvectortool.c:1237 ../app/tools/gimpvectortool.c:1260 +#: ../app/tools/gimpvectortool.c:1240 ../app/tools/gimpvectortool.c:1263 msgid "Click-Drag to move the anchors around" msgstr "Cliquez-glissez pour déplacer tous les nœuds" -#: ../app/tools/gimpvectortool.c:1243 +#: ../app/tools/gimpvectortool.c:1246 msgid "Click-Drag to move the handle around" msgstr "Cliquez-glissez pour déplacer la poignée" -#: ../app/tools/gimpvectortool.c:1250 +#: ../app/tools/gimpvectortool.c:1253 msgid "Click-Drag to move the handles around symmetrically" msgstr "Cliquez-glissez pour déplacer la poignée symétriquement" -#: ../app/tools/gimpvectortool.c:1265 +#: ../app/tools/gimpvectortool.c:1268 msgid "Click-Drag to change the shape of the curve" msgstr "Cliquez-glissez pour changer la forme de la courbe" -#: ../app/tools/gimpvectortool.c:1268 +#: ../app/tools/gimpvectortool.c:1271 #, c-format msgid "%s: symmetrical" msgstr "%s symétrique" -#: ../app/tools/gimpvectortool.c:1273 +#: ../app/tools/gimpvectortool.c:1276 msgid "Click-Drag to move the component around" msgstr "Cliquez-glissez pour déplacer le composant" -#: ../app/tools/gimpvectortool.c:1281 +#: ../app/tools/gimpvectortool.c:1284 msgid "Click-Drag to move the path around" msgstr "Cliquez-glissez pour déplacer le chemin" -#: ../app/tools/gimpvectortool.c:1285 +#: ../app/tools/gimpvectortool.c:1288 msgid "Click-Drag to insert an anchor on the path" msgstr "Cliquez-glissez pour insérer un nœud sur le chemin" -#: ../app/tools/gimpvectortool.c:1293 +#: ../app/tools/gimpvectortool.c:1296 msgid "Click to delete this anchor" msgstr "Cliquez pour supprimer ce nœud" -#: ../app/tools/gimpvectortool.c:1297 +#: ../app/tools/gimpvectortool.c:1300 msgid "Click to connect this anchor with the selected endpoint" msgstr "Cliquez pour connecter ce nœud au point final choisi" -#: ../app/tools/gimpvectortool.c:1302 +#: ../app/tools/gimpvectortool.c:1305 msgid "Click to open up the path" msgstr "Cliquez pour ouvrir le chemin" -#: ../app/tools/gimpvectortool.c:1306 +#: ../app/tools/gimpvectortool.c:1309 msgid "Click to make this node angular" msgstr "Cliquez pour rendre ce nœud angulaire" -#: ../app/tools/gimpvectortool.c:1806 +#: ../app/tools/gimpvectortool.c:1810 msgid "Delete Anchors" msgstr "Supprimer les ancres" -#: ../app/tools/gimpvectortool.c:1964 +#: ../app/tools/gimpvectortool.c:1969 msgid "There is no active layer or channel to stroke to" msgstr "Il n'y a pas de calque ou de canal actif sur lequel tracer" @@ -14401,51 +14531,51 @@ msgid "_Search:" msgstr "_Rechercher :" -#: ../app/widgets/gimpactiongroup.c:857 +#: ../app/widgets/gimpactiongroup.c:881 #, c-format msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" msgstr "RVBA (%0.3f, %0.3f, %0.3f, %0.3f)" -#: ../app/widgets/gimpactionview.c:337 +#: ../app/widgets/gimpactionview.c:338 #: ../app/widgets/gimpcontrollereditor.c:341 msgid "Action" msgstr "Action" -#: ../app/widgets/gimpactionview.c:366 +#: ../app/widgets/gimpactionview.c:367 msgid "Shortcut" msgstr "Raccourci clavier" -#: ../app/widgets/gimpactionview.c:392 +#: ../app/widgets/gimpactionview.c:393 msgid "Name" msgstr "Nom" -#: ../app/widgets/gimpactionview.c:632 ../app/widgets/gimpactionview.c:832 +#: ../app/widgets/gimpactionview.c:633 ../app/widgets/gimpactionview.c:843 msgid "Changing shortcut failed." msgstr "Échec du changement de raccourci clavier." -#: ../app/widgets/gimpactionview.c:669 +#: ../app/widgets/gimpactionview.c:670 msgid "Conflicting Shortcuts" msgstr "Conflit entre raccourcis clavier" -#: ../app/widgets/gimpactionview.c:675 +#: ../app/widgets/gimpactionview.c:676 msgid "_Reassign shortcut" msgstr "_Réaffectation du raccourci clavier" -#: ../app/widgets/gimpactionview.c:690 +#: ../app/widgets/gimpactionview.c:691 #, c-format msgid "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group." msgstr "Le raccourci clavier « %s » est déjà pris par « %s » du groupe « %s »." -#: ../app/widgets/gimpactionview.c:694 +#: ../app/widgets/gimpactionview.c:695 #, c-format msgid "Reassigning the shortcut will cause it to be removed from \"%s\"." msgstr "Réaffecter le raccourci clavier causera sa suppression de « %s »." -#: ../app/widgets/gimpactionview.c:767 +#: ../app/widgets/gimpactionview.c:778 msgid "Invalid shortcut." msgstr "Raccourci clavier non valide." -#: ../app/widgets/gimpactionview.c:856 +#: ../app/widgets/gimpactionview.c:867 msgid "Removing shortcut failed." msgstr "Échec de la suppression du raccourci clavier." @@ -14462,8 +14592,7 @@ msgstr "Proportions" #: ../app/widgets/gimpbrusheditor.c:210 -#: ../app/widgets/gimpbrushfactoryview.c:80 -#: ../app/widgets/gimpgrideditor.c:174 +#: ../app/widgets/gimpbrushfactoryview.c:80 ../app/widgets/gimpgrideditor.c:174 msgid "Spacing" msgstr "Espacement" @@ -14473,7 +14602,7 @@ msgstr "Pourcentage de largeur de brosse" #: ../app/widgets/gimpbufferview.c:179 ../app/widgets/gimpbufferview.c:264 -#: ../app/widgets/gimpeditor.c:748 +#: ../app/widgets/gimpeditor.c:747 msgid "(None)" msgstr "(Aucun)" @@ -14481,41 +14610,41 @@ msgid "Add the current color to the color history" msgstr "Ajouter la couleur actuelle à l'historique de couleur" -#: ../app/widgets/gimpcolordisplayeditor.c:154 +#: ../app/widgets/gimpcolordisplayeditor.c:157 msgid "Available Filters" msgstr "Filtres disponibles" -#: ../app/widgets/gimpcolordisplayeditor.c:216 +#: ../app/widgets/gimpcolordisplayeditor.c:219 msgid "Move the selected filter up" msgstr "Déplacer vers le haut le filtre sélectionné" -#: ../app/widgets/gimpcolordisplayeditor.c:225 +#: ../app/widgets/gimpcolordisplayeditor.c:228 msgid "Move the selected filter down" msgstr "Déplacer vers le bas le filtre sélectionné" -#: ../app/widgets/gimpcolordisplayeditor.c:271 +#: ../app/widgets/gimpcolordisplayeditor.c:274 msgid "Active Filters" msgstr "Filtres actifs" -#: ../app/widgets/gimpcolordisplayeditor.c:322 +#: ../app/widgets/gimpcolordisplayeditor.c:325 msgid "Reset the selected filter to default values" msgstr "Remettre le filtre sélectionné aux valeurs par défaut" -#: ../app/widgets/gimpcolordisplayeditor.c:496 +#: ../app/widgets/gimpcolordisplayeditor.c:527 #, c-format msgid "Add '%s' to the list of active filters" msgstr "Ajouter « %s » à la liste des filtres actifs." -#: ../app/widgets/gimpcolordisplayeditor.c:533 +#: ../app/widgets/gimpcolordisplayeditor.c:564 #, c-format msgid "Remove '%s' from the list of active filters" msgstr "Enlever « %s » de la liste des filtres actifs." -#: ../app/widgets/gimpcolordisplayeditor.c:564 +#: ../app/widgets/gimpcolordisplayeditor.c:595 msgid "No filter selected" msgstr "Aucun filtre sélectionné" -#: ../app/widgets/gimpcoloreditor.c:260 +#: ../app/widgets/gimpcoloreditor.c:264 msgid "" "Hexadecimal color notation as used in HTML and CSS. This entry also accepts " "CSS color names." @@ -14523,55 +14652,55 @@ "Notation hexadécimale d'une couleur comme dans le HTML ou le CSS. Cette " "entrée accepte aussi les noms CSS de couleur." -#: ../app/widgets/gimpcolorframe.c:512 +#: ../app/widgets/gimpcolorframe.c:511 msgid "Index:" msgstr "Index :" -#: ../app/widgets/gimpcolorframe.c:525 ../app/widgets/gimpcolorframe.c:551 +#: ../app/widgets/gimpcolorframe.c:524 ../app/widgets/gimpcolorframe.c:550 msgid "Red:" msgstr "Rouge :" -#: ../app/widgets/gimpcolorframe.c:526 ../app/widgets/gimpcolorframe.c:552 +#: ../app/widgets/gimpcolorframe.c:525 ../app/widgets/gimpcolorframe.c:551 msgid "Green:" msgstr "Vert :" -#: ../app/widgets/gimpcolorframe.c:527 ../app/widgets/gimpcolorframe.c:553 +#: ../app/widgets/gimpcolorframe.c:526 ../app/widgets/gimpcolorframe.c:552 msgid "Blue:" msgstr "Bleu :" -#: ../app/widgets/gimpcolorframe.c:540 ../app/widgets/gimpcolorframe.c:573 +#: ../app/widgets/gimpcolorframe.c:539 ../app/widgets/gimpcolorframe.c:572 msgid "Value:" msgstr "Valeur :" -#: ../app/widgets/gimpcolorframe.c:564 +#: ../app/widgets/gimpcolorframe.c:563 msgid "Hex:" msgstr "Hexa :" -#: ../app/widgets/gimpcolorframe.c:571 +#: ../app/widgets/gimpcolorframe.c:570 msgid "Hue:" msgstr "Teinte :" -#: ../app/widgets/gimpcolorframe.c:572 +#: ../app/widgets/gimpcolorframe.c:571 msgid "Sat.:" msgstr "Sat. :" -#: ../app/widgets/gimpcolorframe.c:590 +#: ../app/widgets/gimpcolorframe.c:589 msgid "Cyan:" msgstr "Cyan :" -#: ../app/widgets/gimpcolorframe.c:591 +#: ../app/widgets/gimpcolorframe.c:590 msgid "Magenta:" msgstr "Magenta :" -#: ../app/widgets/gimpcolorframe.c:592 +#: ../app/widgets/gimpcolorframe.c:591 msgid "Yellow:" msgstr "Jaune :" -#: ../app/widgets/gimpcolorframe.c:593 +#: ../app/widgets/gimpcolorframe.c:592 msgid "Black:" msgstr "Noir :" -#: ../app/widgets/gimpcolorframe.c:613 +#: ../app/widgets/gimpcolorframe.c:612 msgid "Alpha:" msgstr "Alpha :" @@ -14591,11 +14720,11 @@ msgid "Palette" msgstr "Palette" -#: ../app/widgets/gimpcontainerpopup.c:590 +#: ../app/widgets/gimpcontainerpopup.c:595 msgid "Smaller Previews" msgstr "Aperçus plus petits" -#: ../app/widgets/gimpcontainerpopup.c:595 +#: ../app/widgets/gimpcontainerpopup.c:600 msgid "Larger Previews" msgstr "Aperçus plus grands" @@ -14708,33 +14837,33 @@ msgid "Available Controllers" msgstr "Contrôleurs disponibles" -#: ../app/widgets/gimpcontrollerlist.c:275 +#: ../app/widgets/gimpcontrollerlist.c:277 msgid "Active Controllers" msgstr "Contrôleurs actifs" -#: ../app/widgets/gimpcontrollerlist.c:291 +#: ../app/widgets/gimpcontrollerlist.c:293 msgid "Configure the selected controller" msgstr "Configurer le contrôleur sélectionné" -#: ../app/widgets/gimpcontrollerlist.c:299 +#: ../app/widgets/gimpcontrollerlist.c:301 msgid "Move the selected controller up" msgstr "Déplacer vers le haut le contrôleur sélectionné" -#: ../app/widgets/gimpcontrollerlist.c:307 +#: ../app/widgets/gimpcontrollerlist.c:309 msgid "Move the selected controller down" msgstr "Déplacer vers le bas le contrôleur sélectionné" -#: ../app/widgets/gimpcontrollerlist.c:425 +#: ../app/widgets/gimpcontrollerlist.c:427 #, c-format msgid "Add '%s' to the list of active controllers" msgstr "Ajouter « %s » à la liste des contrôleurs actifs" -#: ../app/widgets/gimpcontrollerlist.c:476 +#: ../app/widgets/gimpcontrollerlist.c:478 #, c-format msgid "Remove '%s' from the list of active controllers" msgstr "Enlever « %s » de la liste des contrôleurs actifs." -#: ../app/widgets/gimpcontrollerlist.c:510 +#: ../app/widgets/gimpcontrollerlist.c:512 msgid "" "There can only be one active keyboard controller.\n" "\n" @@ -14744,7 +14873,7 @@ "\n" "Vous avez déjà un contrôleur de clavier dans la liste de contrôleurs actifs." -#: ../app/widgets/gimpcontrollerlist.c:521 +#: ../app/widgets/gimpcontrollerlist.c:523 msgid "" "There can only be one active wheel controller.\n" "\n" @@ -14754,7 +14883,7 @@ "\n" "Vous avez déjà un contrôleur de roulette dans la liste de contrôleurs actifs." -#: ../app/widgets/gimpcontrollerlist.c:532 +#: ../app/widgets/gimpcontrollerlist.c:534 msgid "" "There can only be one active mouse controller.\n" "\n" @@ -14764,24 +14893,24 @@ "\n" "Vous avez déjà un contrôleur de souris dans la liste de contrôleurs actifs." -#: ../app/widgets/gimpcontrollerlist.c:558 +#: ../app/widgets/gimpcontrollerlist.c:560 msgid "Remove Controller?" msgstr "Enlever le contrôleur ?" -#: ../app/widgets/gimpcontrollerlist.c:563 +#: ../app/widgets/gimpcontrollerlist.c:565 msgid "Disable Controller" msgstr "Désactiver le contrôleur" -#: ../app/widgets/gimpcontrollerlist.c:565 +#: ../app/widgets/gimpcontrollerlist.c:567 msgid "Remove Controller" msgstr "Enlever le contrôleur" -#: ../app/widgets/gimpcontrollerlist.c:577 +#: ../app/widgets/gimpcontrollerlist.c:579 #, c-format msgid "Remove Controller '%s'?" msgstr "Enlever le contrôleur « %s » ?" -#: ../app/widgets/gimpcontrollerlist.c:581 +#: ../app/widgets/gimpcontrollerlist.c:583 msgid "" "Removing this controller from the list of active controllers will " "permanently delete all event mappings you have configured.\n" @@ -14792,10 +14921,10 @@ "Enlever ce contrôleur de la liste des contrôleurs actifs va définitivement " "supprimer tous les évènements que vous avez configuré.\n" "\n" -"La sélection de « Désactiver le contrôleur » va désactiver le contrôleur sans " -"l'enlever." +"La sélection de « Désactiver le contrôleur » va désactiver le contrôleur " +"sans l'enlever." -#: ../app/widgets/gimpcontrollerlist.c:633 +#: ../app/widgets/gimpcontrollerlist.c:635 msgid "Configure Input Controller" msgstr "Configurer le contrôleur d'entrée" @@ -14951,7 +15080,7 @@ #: ../app/widgets/gimpdeviceinfoeditor.c:140 #: ../app/widgets/gimpdynamicseditor.c:141 -#: ../app/widgets/gimpdynamicsoutputeditor.c:68 +#: ../app/widgets/gimpdynamicsoutputeditor.c:69 msgid "Pressure" msgstr "Pression" @@ -14963,75 +15092,78 @@ msgid "Y tilt" msgstr "Inclinaison Y" -#: ../app/widgets/gimpdeviceinfoeditor.c:143 +#. Wheel as in mouse or input device wheel +#: ../app/widgets/gimpdeviceinfoeditor.c:144 #: ../app/widgets/gimpdynamicseditor.c:145 -#: ../app/widgets/gimpdynamicsoutputeditor.c:72 +#: ../app/widgets/gimpdynamicsoutputeditor.c:73 msgid "Wheel" msgstr "Roulette" #. the axes -#: ../app/widgets/gimpdeviceinfoeditor.c:193 +#. The axes of an input device +#: ../app/widgets/gimpdeviceinfoeditor.c:195 msgid "Axes" msgstr "Axes" #. the keys -#: ../app/widgets/gimpdeviceinfoeditor.c:267 +#: ../app/widgets/gimpdeviceinfoeditor.c:269 msgid "Keys" msgstr "Touches" -#: ../app/widgets/gimpdeviceinfoeditor.c:364 -#: ../app/widgets/gimpdeviceinfoeditor.c:580 +#: ../app/widgets/gimpdeviceinfoeditor.c:366 +#: ../app/widgets/gimpdeviceinfoeditor.c:585 #, c-format msgid "none" msgstr "rien" -#: ../app/widgets/gimpdeviceinfoeditor.c:412 +#. e.g. "Pressure Curve" for mapping input device axes +#: ../app/widgets/gimpdeviceinfoeditor.c:415 #, c-format msgid "%s Curve" msgstr "Courbe %s" -#: ../app/widgets/gimpdeviceinfoeditor.c:471 -#: ../app/widgets/gimpdynamicsoutputeditor.c:195 +#: ../app/widgets/gimpdeviceinfoeditor.c:474 +#: ../app/widgets/gimpdynamicsoutputeditor.c:209 msgid "_Reset Curve" msgstr "_Réinitialiser la courbe" -#: ../app/widgets/gimpdeviceinfoeditor.c:484 +#: ../app/widgets/gimpdeviceinfoeditor.c:487 #, c-format msgid "The axis '%s' has no curve" msgstr "L'axe « %s » n'a pas de courbe" -#: ../app/widgets/gimpdevicestatus.c:136 +#: ../app/widgets/gimpdevicestatus.c:137 msgid "Save device status" msgstr "Enregistrer l'état du périphérique" -#: ../app/widgets/gimpdevicestatus.c:432 +#: ../app/widgets/gimpdevicestatus.c:433 #, c-format msgid "Foreground: %d, %d, %d" msgstr "Premier plan : %d, %d, %d" -#: ../app/widgets/gimpdevicestatus.c:437 +#: ../app/widgets/gimpdevicestatus.c:438 #, c-format msgid "Background: %d, %d, %d" msgstr "Arrière-plan : %d, %d, %d" -#: ../app/widgets/gimpdnd-xds.c:203 +#: ../app/widgets/gimpdnd-xds.c:204 msgid "The given filename does not have any known file extension." msgstr "Le nom de fichier donné n'a aucune extension de fichier connue." -#: ../app/widgets/gimpdnd-xds.c:221 +#: ../app/widgets/gimpdnd-xds.c:222 msgid "File Exists" msgstr "Le fichier existe" -#: ../app/widgets/gimpdnd-xds.c:226 +#: ../app/widgets/gimpdnd-xds.c:227 msgid "_Replace" msgstr "_Remplacer" -#: ../app/widgets/gimpdnd-xds.c:237 +#: ../app/widgets/gimpdnd-xds.c:238 #, c-format msgid "A file named '%s' already exists." msgstr "Un fichier appelé « %s » existe déjà." -#: ../app/widgets/gimpdnd-xds.c:242 +#: ../app/widgets/gimpdnd-xds.c:243 msgid "Do you want to replace it with the image you are saving?" msgstr "Voulez vous le remplacer avec l'image que vous enregistrez ?" @@ -15057,16 +15189,16 @@ msgid " | " msgstr " | " -#: ../app/widgets/gimpdockbook.c:295 +#: ../app/widgets/gimpdockbook.c:291 msgid "Configure this tab" msgstr "Configurer cet onglet" #. Auto button -#: ../app/widgets/gimpdockwindow.c:382 +#: ../app/widgets/gimpdockwindow.c:384 msgid "Auto" msgstr "Auto" -#: ../app/widgets/gimpdockwindow.c:393 +#: ../app/widgets/gimpdockwindow.c:395 msgid "" "When enabled the dialog automatically follows the image you are working on." msgstr "" @@ -15082,17 +15214,17 @@ msgstr "Matrice de mappage" #: ../app/widgets/gimpdynamicseditor.c:142 -#: ../app/widgets/gimpdynamicsoutputeditor.c:69 +#: ../app/widgets/gimpdynamicsoutputeditor.c:70 msgid "Velocity" msgstr "Vitesse" #: ../app/widgets/gimpdynamicseditor.c:146 -#: ../app/widgets/gimpdynamicsoutputeditor.c:73 +#: ../app/widgets/gimpdynamicsoutputeditor.c:74 msgid "Random" msgstr "Aléatoire" #: ../app/widgets/gimpdynamicseditor.c:147 -#: ../app/widgets/gimpdynamicsoutputeditor.c:74 +#: ../app/widgets/gimpdynamicsoutputeditor.c:75 msgid "Fade" msgstr "Fondu" @@ -15104,28 +15236,40 @@ msgid "Messages are redirected to stderr." msgstr "Les message sont redirigés vers stderr." -#: ../app/widgets/gimperrordialog.c:170 +#. %s is a message domain, +#. * like "GIMP Message" or +#. * "PNG Message" +#. +#: ../app/widgets/gimperrordialog.c:174 #, c-format msgid "%s Message" msgstr "Message %s" -#: ../app/widgets/gimpfiledialog.c:327 +#: ../app/widgets/gimpfiledialog.c:330 msgid "Automatically Detected" msgstr "Détecté automatiquement" -#: ../app/widgets/gimpfiledialog.c:344 +#: ../app/widgets/gimpfiledialog.c:347 msgid "By Extension" msgstr "Selon l'extension" -#: ../app/widgets/gimpfiledialog.c:790 +#: ../app/widgets/gimpfiledialog.c:801 msgid "All files" msgstr "Tous les fichiers" -#: ../app/widgets/gimpfiledialog.c:795 +#: ../app/widgets/gimpfiledialog.c:806 msgid "All images" msgstr "Toutes les images" -#: ../app/widgets/gimpfiledialog.c:971 +#: ../app/widgets/gimpfiledialog.c:813 +msgid "All XCF images" +msgstr "Toutes les images XCF" + +#: ../app/widgets/gimpfiledialog.c:815 +msgid "All export images" +msgstr "Toutes les images exportées" + +#: ../app/widgets/gimpfiledialog.c:999 #, c-format msgid "Select File _Type (%s)" msgstr "Sélectionner le _type de fichier (%s)" @@ -15256,15 +15400,15 @@ msgid "Height" msgstr "Hauteur" -#: ../app/widgets/gimphelp.c:293 +#: ../app/widgets/gimphelp.c:308 msgid "Help browser is missing" msgstr "Le navigateur d'aide est manquant." -#: ../app/widgets/gimphelp.c:294 +#: ../app/widgets/gimphelp.c:309 msgid "The GIMP help browser is not available." msgstr "Le navigateur d'aide GIMP n'est pas disponible." -#: ../app/widgets/gimphelp.c:295 +#: ../app/widgets/gimphelp.c:310 msgid "" "The GIMP help browser plug-in appears to be missing from your installation. " "You may instead use the web browser for reading the help pages." @@ -15273,32 +15417,38 @@ "Vous pouvez utiliser un navigateur Web à la place pour consulter l'aide en " "ligne." -#: ../app/widgets/gimphelp.c:336 +#: ../app/widgets/gimphelp.c:351 msgid "Help browser doesn't start" msgstr "Le navigateur d'aide ne démarre pas" -#: ../app/widgets/gimphelp.c:337 +#: ../app/widgets/gimphelp.c:352 msgid "Could not start the GIMP help browser plug-in." msgstr "Impossible de démarrer le greffon du navigateur d'aide de GIMP" -#: ../app/widgets/gimphelp.c:364 +#: ../app/widgets/gimphelp.c:354 +msgid "You may instead use the web browser for reading the help pages." +msgstr "" +"Vous pouvez utiliser un navigateur Web à la place pour consulter l'aide en " +"ligne." + +#: ../app/widgets/gimphelp.c:380 msgid "Use _Web Browser" msgstr "Utiliser un navigateur _Web" -#: ../app/widgets/gimphelp.c:610 +#: ../app/widgets/gimphelp.c:724 msgid "GIMP user manual is missing" msgstr "Le manuel de l'utilisateur de GIMP est manquant" -#: ../app/widgets/gimphelp.c:617 +#: ../app/widgets/gimphelp.c:731 msgid "_Read Online" msgstr "_Consulter en ligne" -#: ../app/widgets/gimphelp.c:641 +#: ../app/widgets/gimphelp.c:755 msgid "The GIMP user manual is not installed on your computer." msgstr "" "Le manuel de l'utilisateur de GIMP n'est pas installé sur votre ordinateur." -#: ../app/widgets/gimphelp.c:644 +#: ../app/widgets/gimphelp.c:758 msgid "" "You may either install the additional help package or change your " "preferences to use the online version." @@ -15347,83 +15497,83 @@ "Remplace le commentaire de l'image active par celui défini dans " "Édition→Préférences→Image par défaut." -#: ../app/widgets/gimpimageprofileview.c:200 +#: ../app/widgets/gimpimageprofileview.c:202 msgid "Querying..." msgstr "Interrogation..." -#: ../app/widgets/gimpimagepropview.c:120 +#: ../app/widgets/gimpimagepropview.c:113 msgid "Size in pixels:" msgstr "Taille en pixels :" -#: ../app/widgets/gimpimagepropview.c:123 +#: ../app/widgets/gimpimagepropview.c:116 msgid "Print size:" msgstr "Taille de l'impression :" -#: ../app/widgets/gimpimagepropview.c:126 +#: ../app/widgets/gimpimagepropview.c:119 msgid "Resolution:" msgstr "Résolution :" -#: ../app/widgets/gimpimagepropview.c:129 +#: ../app/widgets/gimpimagepropview.c:122 msgid "Color space:" msgstr "Espace de couleurs :" -#: ../app/widgets/gimpimagepropview.c:134 +#: ../app/widgets/gimpimagepropview.c:127 msgid "File Name:" msgstr "Nom de fichier :" -#: ../app/widgets/gimpimagepropview.c:140 +#: ../app/widgets/gimpimagepropview.c:133 msgid "File Size:" msgstr "Taille de fichier :" -#: ../app/widgets/gimpimagepropview.c:143 +#: ../app/widgets/gimpimagepropview.c:136 msgid "File Type:" msgstr "Type de fichier :" -#: ../app/widgets/gimpimagepropview.c:148 +#: ../app/widgets/gimpimagepropview.c:141 msgid "Size in memory:" msgstr "Taille en mémoire :" -#: ../app/widgets/gimpimagepropview.c:151 +#: ../app/widgets/gimpimagepropview.c:144 msgid "Undo steps:" msgstr "Étapes d'annulation :" -#: ../app/widgets/gimpimagepropview.c:154 +#: ../app/widgets/gimpimagepropview.c:147 msgid "Redo steps:" msgstr "Étapes à rétablir :" -#: ../app/widgets/gimpimagepropview.c:159 +#: ../app/widgets/gimpimagepropview.c:152 msgid "Number of pixels:" msgstr "Nombre de pixels :" -#: ../app/widgets/gimpimagepropview.c:162 +#: ../app/widgets/gimpimagepropview.c:155 msgid "Number of layers:" msgstr "Nombre de calques :" -#: ../app/widgets/gimpimagepropview.c:165 +#: ../app/widgets/gimpimagepropview.c:158 msgid "Number of channels:" msgstr "Nombre de canaux :" -#: ../app/widgets/gimpimagepropview.c:168 +#: ../app/widgets/gimpimagepropview.c:161 msgid "Number of paths:" msgstr "Nombre de chemins :" #. no undo (or redo) steps available -#: ../app/widgets/gimpimagepropview.c:407 +#: ../app/widgets/gimpimagepropview.c:410 msgid "None" msgstr "Aucun" -#: ../app/widgets/gimpimagepropview.c:461 +#: ../app/widgets/gimpimagepropview.c:464 #: ../app/widgets/gimptemplateeditor.c:331 #, c-format msgid "pixels/%s" msgstr "pixels/%s" -#: ../app/widgets/gimpimagepropview.c:463 +#: ../app/widgets/gimpimagepropview.c:466 #, c-format msgid "%g × %g %s" msgstr "%g x %g %s" -#: ../app/widgets/gimpimagepropview.c:484 +#: ../app/widgets/gimpimagepropview.c:487 msgid "colors" msgstr "couleurs" @@ -15442,15 +15592,19 @@ msgstr[0] "Message répété une fois." msgstr[1] "Message répété %d fois." -#: ../app/widgets/gimppaletteeditor.c:226 -#: ../app/widgets/gimppaletteeditor.c:682 +#: ../app/widgets/gimppaletteeditor.c:240 +#: ../app/widgets/gimppaletteeditor.c:715 msgid "Undefined" msgstr "Non définie" -#: ../app/widgets/gimppaletteeditor.c:234 +#: ../app/widgets/gimppaletteeditor.c:248 msgid "Columns:" msgstr "Colonnes :" +#: ../app/widgets/gimppanedbox.c:58 +msgid "You can drop dockable dialogs here" +msgstr "Vous pouvez déposer les fenêtres ancrables ici" + #: ../app/widgets/gimpprofilechooserdialog.c:127 msgid "ICC color profile (*.icc, *.icm)" msgstr "Profil de couleur ICC (*.icc, *.icm)" @@ -15494,19 +15648,19 @@ msgid "_Manage Settings..." msgstr "_Gestion des paramètres..." -#: ../app/widgets/gimpsettingsbox.c:625 +#: ../app/widgets/gimpsettingsbox.c:636 msgid "Add Settings to Favorites" msgstr "Ajouter les paramètres aux favoris" -#: ../app/widgets/gimpsettingsbox.c:628 +#: ../app/widgets/gimpsettingsbox.c:639 msgid "Enter a name for the settings" msgstr "Saisissez un nom pour les paramètres" -#: ../app/widgets/gimpsettingsbox.c:629 +#: ../app/widgets/gimpsettingsbox.c:640 msgid "Saved Settings" msgstr "Paramètres enregistrés" -#: ../app/widgets/gimpsettingsbox.c:670 +#: ../app/widgets/gimpsettingsbox.c:681 msgid "Manage Saved Settings" msgstr "Gestion des paramètres enregistrés" @@ -15522,12 +15676,12 @@ msgid "Delete the selected settings" msgstr "Supprimer les paramètres sélectionnés" -#: ../app/widgets/gimpsizebox.c:453 +#: ../app/widgets/gimpsizebox.c:458 #, c-format msgid "%d × %d ppi" msgstr "%d × %d ppp" -#: ../app/widgets/gimpsizebox.c:455 +#: ../app/widgets/gimpsizebox.c:460 #, c-format msgid "%d ppi" msgstr "%d ppp" @@ -15573,7 +15727,7 @@ #. * IMPORTANT: use only one of Unicode terminal punctuation chars. #. * http://unicode.org/review/pr-23.html #. -#: ../app/widgets/gimptagentry.c:1732 +#: ../app/widgets/gimptagentry.c:1750 msgid "," msgstr "," @@ -15606,27 +15760,27 @@ msgid "_Icon:" msgstr "_Icône :" -#: ../app/widgets/gimptemplateeditor.c:683 +#: ../app/widgets/gimptemplateeditor.c:699 #, c-format msgid "%d × %d ppi, %s" msgstr "%d × %d ppp, %s" -#: ../app/widgets/gimptemplateeditor.c:685 +#: ../app/widgets/gimptemplateeditor.c:701 #, c-format msgid "%d ppi, %s" msgstr "%d ppp, %s" -#: ../app/widgets/gimptextbuffer-serialize.c:338 +#: ../app/widgets/gimptextbuffer-serialize.c:269 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "L'attribut \"%s\" sur l'élément <%s> n'est pas valide dans ce contexte" -#: ../app/widgets/gimptextbuffer-serialize.c:410 +#: ../app/widgets/gimptextbuffer-serialize.c:341 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "L'élément le plus extérieur dans le texte doit être , pas <%s>" -#: ../app/widgets/gimptextbuffer.c:1454 +#: ../app/widgets/gimptextbuffer.c:1460 #, c-format msgid "Invalid UTF-8 data in file '%s'." msgstr "Chaîne de caractères UTF-8 non valide dans le fichier « %s »." @@ -15693,12 +15847,12 @@ msgid "No selection" msgstr "Aucune sélection" -#: ../app/widgets/gimpthumbbox.c:596 ../app/widgets/gimpthumbbox.c:617 +#: ../app/widgets/gimpthumbbox.c:612 ../app/widgets/gimpthumbbox.c:633 #, c-format msgid "Thumbnail %d of %d" msgstr "Vignette %d sur %d" -#: ../app/widgets/gimpthumbbox.c:730 ../app/widgets/gimpthumbbox.c:740 +#: ../app/widgets/gimpthumbbox.c:746 ../app/widgets/gimpthumbbox.c:756 msgid "Creating preview..." msgstr "Création de l'aperçu..." @@ -15722,8 +15876,8 @@ msgid "Change Background Color" msgstr "Modification de la couleur d'arrière-plan" -#: ../app/widgets/gimptoolbox-image-area.c:112 -#: ../app/widgets/gimptoolbox-image-area.c:117 +#: ../app/widgets/gimptoolbox-image-area.c:118 +#: ../app/widgets/gimptoolbox-image-area.c:123 msgid "" "The active image.\n" "Click to open the Image Dialog." @@ -15731,13 +15885,13 @@ "L'image active.\n" "Cliquez pour ouvrir la boîte de dialogue des images." -#: ../app/widgets/gimptoolbox-image-area.c:114 +#: ../app/widgets/gimptoolbox-image-area.c:120 msgid "Drag to an XDS enabled file-manager to save the image." msgstr "" "Glisser vers un gestionnaire de fichier compatible XDS pour enregistrer " "l'image" -#: ../app/widgets/gimptoolbox-indicator-area.c:149 +#: ../app/widgets/gimptoolbox-indicator-area.c:163 msgid "" "The active brush.\n" "Click to open the Brush Dialog." @@ -15745,7 +15899,7 @@ "La brosse active.\n" "Cliquez pour ouvrir la boîte de dialogue des brosses." -#: ../app/widgets/gimptoolbox-indicator-area.c:181 +#: ../app/widgets/gimptoolbox-indicator-area.c:195 msgid "" "The active pattern.\n" "Click to open the Pattern Dialog." @@ -15753,7 +15907,7 @@ "Le motif actif.\n" "Cliquez pour ouvrir la boîte de dialogue des motifs." -#: ../app/widgets/gimptoolbox-indicator-area.c:213 +#: ../app/widgets/gimptoolbox-indicator-area.c:227 msgid "" "The active gradient.\n" "Click to open the Gradient Dialog." @@ -15793,39 +15947,39 @@ msgid "Delete Tool Preset..." msgstr "Supprime le préréglage d'outil..." -#: ../app/widgets/gimptoolpreseteditor.c:126 +#: ../app/widgets/gimptoolpreseteditor.c:148 msgid "Icon:" msgstr "Icône :" -#: ../app/widgets/gimptoolpreseteditor.c:136 +#: ../app/widgets/gimptoolpreseteditor.c:159 msgid "Apply stored FG/BG" msgstr "Appliquer le PP/AP enregistré" -#: ../app/widgets/gimptoolpreseteditor.c:141 +#: ../app/widgets/gimptoolpreseteditor.c:165 msgid "Apply stored brush" msgstr "Appliquer la brosse enregistrée" -#: ../app/widgets/gimptoolpreseteditor.c:146 +#: ../app/widgets/gimptoolpreseteditor.c:171 msgid "Apply stored dynamics" msgstr "Appliquer la dynamique enregistrée" -#: ../app/widgets/gimptoolpreseteditor.c:151 +#: ../app/widgets/gimptoolpreseteditor.c:177 msgid "Apply stored gradient" msgstr "Appliquer le dégradé enregistré" -#: ../app/widgets/gimptoolpreseteditor.c:156 +#: ../app/widgets/gimptoolpreseteditor.c:183 msgid "Apply stored pattern" msgstr "Appliquer le motif enregistré" -#: ../app/widgets/gimptoolpreseteditor.c:161 +#: ../app/widgets/gimptoolpreseteditor.c:189 msgid "Apply stored palette" msgstr "Appliquer la palette enregistrée" -#: ../app/widgets/gimptoolpreseteditor.c:166 +#: ../app/widgets/gimptoolpreseteditor.c:195 msgid "Apply stored font" msgstr "Appliquer la police enregistrée" -#: ../app/widgets/gimptoolpreseteditor.c:258 +#: ../app/widgets/gimptoolpreseteditor.c:292 #, c-format msgid "%s Preset" msgstr "Préréglage %s" @@ -15861,27 +16015,27 @@ msgid "Lock path strokes" msgstr "Verrouiller les tracés de chemin" -#: ../app/widgets/gimpviewablebox.c:86 +#: ../app/widgets/gimpviewablebox.c:87 msgid "Open the brush selection dialog" msgstr "Ouvrir le sélecteur de brosse" -#: ../app/widgets/gimpviewablebox.c:150 +#: ../app/widgets/gimpviewablebox.c:151 msgid "Open the dynamics selection dialog" msgstr "Ouvrir le sélecteur de dynamique" -#: ../app/widgets/gimpviewablebox.c:215 +#: ../app/widgets/gimpviewablebox.c:216 msgid "Open the pattern selection dialog" msgstr "Ouvrir le sélecteur de motif" -#: ../app/widgets/gimpviewablebox.c:283 +#: ../app/widgets/gimpviewablebox.c:284 msgid "Open the gradient selection dialog" msgstr "Ouvrir le sélecteur de dégradé" -#: ../app/widgets/gimpviewablebox.c:400 +#: ../app/widgets/gimpviewablebox.c:401 msgid "Open the palette selection dialog" msgstr "Ouvrir le sélecteur de palette" -#: ../app/widgets/gimpviewablebox.c:465 +#: ../app/widgets/gimpviewablebox.c:466 msgid "Open the font selection dialog" msgstr "Ouvrir le sélecteur de polices" @@ -16010,7 +16164,7 @@ msgid "Undefined" msgstr "Non définie" -#: ../app/xcf/xcf-load.c:334 +#: ../app/xcf/xcf-load.c:392 msgid "" "This XCF file is corrupt! I have loaded as much of it as I can, but it is " "incomplete." @@ -16018,7 +16172,7 @@ "Le fichier XCF est endommagé ! Toutes les données valides ont été chargées " "mais le résultat reste incomplet." -#: ../app/xcf/xcf-load.c:345 +#: ../app/xcf/xcf-load.c:403 msgid "" "This XCF file is corrupt! I could not even salvage any partial image data " "from it." @@ -16026,7 +16180,7 @@ "Le fichier XCF est endommagé ! Aucune donnée exploitable n'a pu être " "extraite." -#: ../app/xcf/xcf-load.c:418 +#: ../app/xcf/xcf-load.c:477 msgid "" "XCF warning: version 0 of XCF file format\n" "did not save indexed colormaps correctly.\n" @@ -16037,60 +16191,93 @@ "les palettes indexées. Une palette en niveaux\n" "de gris a été utilisée en remplacement." -#: ../app/xcf/xcf-read.c:115 +#: ../app/xcf/xcf-read.c:174 msgid "Invalid UTF-8 string in XCF file" msgstr "Chaîne de caractères UTF-8 non valide dans le fichier XCF" -#: ../app/xcf/xcf-write.c:86 +#: ../app/xcf/xcf-write.c:155 #, c-format msgid "Error writing XCF: %s" msgstr "Erreur d'écriture XCF : %s" -#: ../app/xcf/xcf-seek.c:43 ../app/xcf/xcf-seek.c:60 ../app/xcf/xcf-seek.c:71 +#: ../app/xcf/xcf-seek.c:61 #, c-format msgid "Could not seek in XCF file: %s" msgstr "Impossible de pointer dans le fichier XCF : %s" -#: ../app/xcf/xcf.c:99 ../app/xcf/xcf.c:167 +#: ../app/xcf/xcf.c:113 ../app/xcf/xcf.c:181 msgid "GIMP XCF image" msgstr "Image GIMP XCF" -#: ../app/xcf/xcf.c:271 +#: ../app/xcf/xcf.c:301 #, c-format msgid "Opening '%s'" msgstr "Ouverture de « %s »" -#: ../app/xcf/xcf.c:313 +#: ../app/xcf/xcf.c:343 #, c-format msgid "XCF error: unsupported XCF file version %d encountered" msgstr "Erreur XCF : la version %d du format XCF non prise en charge" -#: ../app/xcf/xcf.c:383 +#: ../app/xcf/xcf.c:413 #, c-format msgid "Saving '%s'" msgstr "Enregistrement de « %s »" -#: ../app/xcf/xcf.c:403 +#: ../app/xcf/xcf.c:433 #, c-format msgid "Error saving XCF file: %s" msgstr "Erreur d'enregistrement du fichier XCF : %s" #: ../data/tags/gimp-tags-default.xml.in.h:1 -msgid "fuzzy" -msgstr "flou" - -#: ../data/tags/gimp-tags-default.xml.in.h:2 msgid "round" msgstr "arrondi" -# Utilisation de l'infinitif dans les infobulles du Bureau -#: ../desktop/gimp.desktop.in.in.h:1 -msgid "Create images and edit photographs" -msgstr "Créer des images et modifier des photographies" +#. fuzzy as in a feathered, blurred, unfocused, soft brush +#: ../data/tags/gimp-tags-default.xml.in.h:3 +msgid "fuzzy" +msgstr "flou" -#: ../desktop/gimp.desktop.in.in.h:3 +#: ../desktop/gimp.appdata.xml.in.h:1 +msgid "" +"GIMP is an acronym for GNU Image Manipulation Program. It is a freely " +"distributed program for such tasks as photo retouching, image composition " +"and image authoring." +msgstr "" +"GIMP est un acronyme pour GNU Image Manipulation Program. C'est un programme " +"libre destiné à des tâches comme la retouche de photographies, la " +"composition et la création d'images." + +#: ../desktop/gimp.appdata.xml.in.h:2 +msgid "" +"It has many capabilities. It can be used as a simple paint program, an " +"expert quality photo retouching program, an online batch processing system, " +"a mass production image renderer, an image format converter, etc." +msgstr "" +"Il offre de nombreuses possibilités. Il peut être utilisé comme un simple " +"programme de peinture, un programme de retouche de photographies de qualité " +"expert, un créateur d'images en masse, un convertisseur de format d'image, " +"etc." + +#: ../desktop/gimp.appdata.xml.in.h:3 +msgid "" +"GIMP is expandable and extensible. It is designed to be augmented with plug-" +"ins and extensions to do just about anything. The advanced scripting " +"interface allows everything from the simplest task to the most complex image " +"manipulation procedures to be easily scripted. GIMP is available for Linux, " +"Microsoft Windows and OS X." +msgstr "" +"GIMP est extensible. Il est prévu pour être complété par des greffons et des " +"extensions afin de faire à peu près tout. L'interface avancée de création de " +"scripts permet d'écrire des scripts pour la tâche la plus simple comme pour " +"les procédures de manipulation d'images les plus complexes. GIMP est " +"disponible pour Linux, Microsoft Windows et OS X." + +#: ../desktop/gimp.desktop.in.in.h:2 msgid "Image Editor" msgstr "Éditeur d'image" -#~ msgid "Opacity:" -#~ msgstr "Opacité :" +# Utilisation de l'infinitif dans les infobulles du Bureau +#: ../desktop/gimp.desktop.in.in.h:3 +msgid "Create images and edit photographs" +msgstr "Créer des images et modifier des photographies" diff -Nru gimp-2.8.18/po/hu.po gimp-2.8.20/po/hu.po --- gimp-2.8.18/po/hu.po 2016-05-25 22:26:48.000000000 +0000 +++ gimp-2.8.20/po/hu.po 2017-01-28 19:08:49.000000000 +0000 @@ -15,17 +15,17 @@ msgstr "" "Project-Id-Version: gimp.gimp-2-8\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-25 22:40+0000\n" -"PO-Revision-Date: 2016-03-26 00:40+0100\n" -"Last-Translator: Balázs Úr \n" +"product=gimp&keywords=I18N+L10N&component=Internationalisation\n" +"POT-Creation-Date: 2016-09-07 20:39+0000\n" +"PO-Revision-Date: 2016-09-08 07:31+0200\n" +"Last-Translator: Meskó Balázs \n" "Language-Team: Hungarian \n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.8.8\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../app/about.h:23 msgid "GIMP" @@ -51,19 +51,6 @@ #. * Cf. bug 762282. #. #: ../app/about.h:39 -#| msgid "" -#| "GIMP 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.\n" -#| "\n" -#| "GIMP 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.\n" -#| "\n" -#| "You should have received a copy of the GNU General Public License along " -#| "with GIMP. If not, see http://www.gnu.org/licenses/." msgid "" "GIMP 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 " @@ -88,8 +75,8 @@ "részleteket a GNU General Public License tartalmaz.\n" "\n" "A felhasználónak a GIMP-pel együtt meg kell kapnia a GNU General Public " -"License egy példányát; ha mégsem kapta meg, akkor tekintse meg a " -" oldalon." +"License egy példányát; ha mégsem kapta meg, akkor tekintse meg a oldalon." #: ../app/app.c:225 #, c-format @@ -287,7 +274,7 @@ #. initialize the list of gimp brushes #: ../app/actions/actions.c:112 ../app/core/gimp.c:951 -#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2783 msgid "Brushes" msgstr "Ecsetek" @@ -334,7 +321,7 @@ #. Document History #: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:329 -#: ../app/dialogs/preferences-dialog.c:1577 +#: ../app/dialogs/preferences-dialog.c:1612 msgid "Document History" msgstr "Dokumentumok előzménye" @@ -365,7 +352,7 @@ msgstr "Fájl" #: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:325 -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2803 msgid "Fonts" msgstr "Betűkészletek" @@ -376,12 +363,12 @@ #. initialize the list of gimp gradients #: ../app/actions/actions.c:172 ../app/core/gimp.c:971 -#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2799 msgid "Gradients" msgstr "Színátmenetek" #: ../app/actions/actions.c:175 ../app/core/gimp.c:983 -#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2770 +#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2807 msgid "Tool Presets" msgstr "Eszköz-előbeállítások" @@ -415,23 +402,23 @@ #. initialize the list of gimp palettes #: ../app/actions/actions.c:196 ../app/core/gimp.c:966 -#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2758 +#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2795 msgid "Palettes" msgstr "Paletták" #. initialize the list of gimp patterns #: ../app/actions/actions.c:199 ../app/core/gimp.c:961 -#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2791 msgid "Patterns" msgstr "Minták" -#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2774 +#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2811 msgid "Plug-Ins" msgstr "Bővítmények" #. Quick Mask Color #: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:386 -#: ../app/dialogs/preferences-dialog.c:2032 +#: ../app/dialogs/preferences-dialog.c:2069 msgid "Quick Mask" msgstr "Gyorsmaszk" @@ -458,7 +445,7 @@ msgstr "Szövegszerkesztő" #: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:298 -#: ../app/dialogs/preferences-dialog.c:1861 ../app/gui/gui.c:441 +#: ../app/dialogs/preferences-dialog.c:1898 ../app/gui/gui.c:441 msgid "Tool Options" msgstr "Eszközbeállítások" @@ -1378,7 +1365,7 @@ msgstr "_Névjegy" #: ../app/actions/dialogs-actions.c:333 -#: ../app/dialogs/preferences-dialog.c:1951 ../app/widgets/gimptoolbox.c:539 +#: ../app/dialogs/preferences-dialog.c:1988 ../app/widgets/gimptoolbox.c:539 msgid "Toolbox" msgstr "Eszköztár" @@ -3279,7 +3266,7 @@ #. Scaling #: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 -#: ../app/dialogs/preferences-dialog.c:1906 +#: ../app/dialogs/preferences-dialog.c:1943 #: ../app/pdb/drawable-transform-cmds.c:783 #: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 #: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524 @@ -7501,7 +7488,7 @@ msgstr "Élősködők" #. initialize the list of gimp dynamics -#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2750 +#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2787 #: ../app/tools/gimppaintoptions-gui.c:201 msgid "Dynamics" msgstr "Ecsetdinamika" @@ -7512,7 +7499,7 @@ msgstr "Betűkészletek (ez hosszabb ideig is tarthat)" #. initialize the module list -#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2782 +#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2819 msgid "Modules" msgstr "Modulok" @@ -8440,7 +8427,7 @@ msgid "Remove Path" msgstr "Útvonal eltávolítása" -#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1715 +#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1750 msgid "Folder" msgstr "Mappa" @@ -8597,7 +8584,7 @@ msgid "Layer cannot be lowered more." msgstr "A réteget nem lehet még lejjebb helyezni." -#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1529 +#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1532 #: ../app/core/gimplayermask.c:236 #, c-format msgid "%s mask" @@ -8612,46 +8599,46 @@ "Lebegő kijelölés\n" "(%s)" -#: ../app/core/gimplayer.c:1449 +#: ../app/core/gimplayer.c:1452 msgid "Unable to add a layer mask since the layer already has one." msgstr "Nem lehet rétegmaszkot hozzáadni, mert már van egy rétegmaszk." -#: ../app/core/gimplayer.c:1460 +#: ../app/core/gimplayer.c:1463 msgid "Cannot add layer mask of different dimensions than specified layer." msgstr "" "Nem lehet a megadott rétegtől eltérő dimenziójú rétegmaszkot hozzáadni." -#: ../app/core/gimplayer.c:1466 +#: ../app/core/gimplayer.c:1469 msgctxt "undo-type" msgid "Add Layer Mask" msgstr "Rétegmaszk hozzáadása" -#: ../app/core/gimplayer.c:1584 +#: ../app/core/gimplayer.c:1587 msgctxt "undo-type" msgid "Transfer Alpha to Mask" msgstr "Alfa átvitele a maszkra" -#: ../app/core/gimplayer.c:1754 +#: ../app/core/gimplayer.c:1757 msgctxt "undo-type" msgid "Apply Layer Mask" msgstr "Rétegmaszk alkalmazása" -#: ../app/core/gimplayer.c:1755 +#: ../app/core/gimplayer.c:1758 msgctxt "undo-type" msgid "Delete Layer Mask" msgstr "Rétegmaszk törlése" -#: ../app/core/gimplayer.c:1874 +#: ../app/core/gimplayer.c:1877 msgctxt "undo-type" msgid "Add Alpha Channel" msgstr "Alfa csatorna hozzáadása" -#: ../app/core/gimplayer.c:1928 +#: ../app/core/gimplayer.c:1931 msgctxt "undo-type" msgid "Remove Alpha Channel" msgstr "Alfa csatorna eltávolítása" -#: ../app/core/gimplayer.c:1948 +#: ../app/core/gimplayer.c:1951 msgctxt "undo-type" msgid "Layer to Image Size" msgstr "Réteg kép-méretűvé alakítása" @@ -9286,7 +9273,7 @@ msgstr "Új kép létrehozása" #: ../app/dialogs/image-new-dialog.c:135 -#: ../app/dialogs/preferences-dialog.c:2016 +#: ../app/dialogs/preferences-dialog.c:2053 msgid "_Template:" msgstr "Sa_blon:" @@ -9520,7 +9507,7 @@ msgstr "Forrás kiválasztása" #: ../app/dialogs/palette-import-dialog.c:214 -#: ../app/dialogs/preferences-dialog.c:1930 +#: ../app/dialogs/preferences-dialog.c:1967 msgid "_Gradient" msgstr "Szí_nátmenet" @@ -9579,23 +9566,23 @@ msgid "The selected source contains no colors." msgstr "A kijelölt forrásban nincsenek színek." -#: ../app/dialogs/preferences-dialog.c:268 +#: ../app/dialogs/preferences-dialog.c:266 msgid "Reset All Preferences" msgstr "Összes beállítás visszaállítása" -#: ../app/dialogs/preferences-dialog.c:286 +#: ../app/dialogs/preferences-dialog.c:284 msgid "Do you really want to reset all preferences to default values?" msgstr "" "Valóban vissza kívánja állítani az összes beállítást az alapértelmezett " "értékekre?" -#: ../app/dialogs/preferences-dialog.c:356 +#: ../app/dialogs/preferences-dialog.c:362 msgid "You will have to restart GIMP for the following changes to take effect:" msgstr "" "A következő változtatások érvénybe léptetéséhez újra kell indítania a GIMP-" "et:" -#: ../app/dialogs/preferences-dialog.c:538 +#: ../app/dialogs/preferences-dialog.c:544 msgid "" "Your keyboard shortcuts will be reset to default values the next time you " "start GIMP." @@ -9603,16 +9590,16 @@ "A gyorsbillentyűk vissza lesznek állítva az alapértelmezett értékekre a GIMP " "következő indításakor." -#: ../app/dialogs/preferences-dialog.c:549 +#: ../app/dialogs/preferences-dialog.c:555 msgid "Remove all Keyboard Shortcuts" msgstr "Összes gyorsbillentyű eltávolítása" -#: ../app/dialogs/preferences-dialog.c:571 +#: ../app/dialogs/preferences-dialog.c:577 msgid "Do you really want to remove all keyboard shortcuts from all menus?" msgstr "" "Valóban szeretné eltávolítani az összes gyorsbillentyűt az összes menüből?" -#: ../app/dialogs/preferences-dialog.c:612 +#: ../app/dialogs/preferences-dialog.c:618 msgid "" "Your window setup will be reset to default values the next time you start " "GIMP." @@ -9620,7 +9607,7 @@ "Az ablakbeállítások vissza lesznek állítva az alapértelmezett értékekre a " "GIMP következő indításakor." -#: ../app/dialogs/preferences-dialog.c:647 +#: ../app/dialogs/preferences-dialog.c:653 msgid "" "Your input device settings will be reset to default values the next time you " "start GIMP." @@ -9628,7 +9615,7 @@ "A beviteli eszközök beállításai vissza lesznek állítva az alapértelmezett " "értékekre a GIMP következő indításakor." -#: ../app/dialogs/preferences-dialog.c:682 +#: ../app/dialogs/preferences-dialog.c:688 msgid "" "Your tool options will be reset to default values the next time you start " "GIMP." @@ -9636,753 +9623,765 @@ "Az eszközbeállítások vissza lesznek állítva az alapértelmezett értékekre a " "GIMP következő indításakor." -#: ../app/dialogs/preferences-dialog.c:1268 +#: ../app/dialogs/preferences-dialog.c:1303 msgid "Show _menubar" msgstr "Me_nüsor megjelenítése" -#: ../app/dialogs/preferences-dialog.c:1272 +#: ../app/dialogs/preferences-dialog.c:1307 msgid "Show _rulers" msgstr "Vonal_zók megjelenítése" -#: ../app/dialogs/preferences-dialog.c:1275 +#: ../app/dialogs/preferences-dialog.c:1310 msgid "Show scroll_bars" msgstr "Gör_dítősávok megjelenítése" -#: ../app/dialogs/preferences-dialog.c:1278 +#: ../app/dialogs/preferences-dialog.c:1313 msgid "Show s_tatusbar" msgstr "Á_llapotsor megjelenítése" -#: ../app/dialogs/preferences-dialog.c:1286 +#: ../app/dialogs/preferences-dialog.c:1321 msgid "Show s_election" msgstr "_Kijelölés megjelenítése" -#: ../app/dialogs/preferences-dialog.c:1289 +#: ../app/dialogs/preferences-dialog.c:1324 msgid "Show _layer boundary" msgstr "Réteg-_határvonal megjelenítése" -#: ../app/dialogs/preferences-dialog.c:1292 +#: ../app/dialogs/preferences-dialog.c:1327 msgid "Show _guides" msgstr "Segédvon_alak megjelenítése" -#: ../app/dialogs/preferences-dialog.c:1295 +#: ../app/dialogs/preferences-dialog.c:1330 msgid "Show gri_d" msgstr "_Rács megjelenítése" -#: ../app/dialogs/preferences-dialog.c:1301 +#: ../app/dialogs/preferences-dialog.c:1336 msgid "Canvas _padding mode:" msgstr "Ra_jzvászon kitöltési módja:" -#: ../app/dialogs/preferences-dialog.c:1306 +#: ../app/dialogs/preferences-dialog.c:1341 msgid "Custom p_adding color:" msgstr "Egyén_i kitöltési szín:" -#: ../app/dialogs/preferences-dialog.c:1307 +#: ../app/dialogs/preferences-dialog.c:1342 msgid "Select Custom Canvas Padding Color" msgstr "Rajzvászon egyéni kitöltési színének kiválasztása" -#: ../app/dialogs/preferences-dialog.c:1405 +#: ../app/dialogs/preferences-dialog.c:1440 msgid "Preferences" msgstr "Beállítások" -#: ../app/dialogs/preferences-dialog.c:1518 -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:1553 +#: ../app/dialogs/preferences-dialog.c:2827 msgid "Environment" msgstr "Környezet" -#: ../app/dialogs/preferences-dialog.c:1532 +#: ../app/dialogs/preferences-dialog.c:1567 msgid "Resource Consumption" msgstr "Erőforrás-fogyasztás" -#: ../app/dialogs/preferences-dialog.c:1542 +#: ../app/dialogs/preferences-dialog.c:1577 msgid "Minimal number of _undo levels:" msgstr "Vissz_avonások minimális száma:" -#: ../app/dialogs/preferences-dialog.c:1545 +#: ../app/dialogs/preferences-dialog.c:1580 msgid "Maximum undo _memory:" msgstr "Ma_ximális visszavonási memória:" -#: ../app/dialogs/preferences-dialog.c:1548 +#: ../app/dialogs/preferences-dialog.c:1583 msgid "Tile cache _size:" msgstr "Ké_pgyorstár mérete:" -#: ../app/dialogs/preferences-dialog.c:1551 +#: ../app/dialogs/preferences-dialog.c:1586 msgid "Maximum _new image size:" msgstr "Ú_j kép maximális mérete:" -#: ../app/dialogs/preferences-dialog.c:1556 +#: ../app/dialogs/preferences-dialog.c:1591 msgid "Number of _processors to use:" msgstr "Használandó pro_cesszorok száma:" #. Image Thumbnails -#: ../app/dialogs/preferences-dialog.c:1561 +#: ../app/dialogs/preferences-dialog.c:1596 msgid "Image Thumbnails" msgstr "Bélyegképek" -#: ../app/dialogs/preferences-dialog.c:1566 +#: ../app/dialogs/preferences-dialog.c:1601 msgid "Size of _thumbnails:" msgstr "Bé_lyegképek mérete:" -#: ../app/dialogs/preferences-dialog.c:1570 +#: ../app/dialogs/preferences-dialog.c:1605 msgid "Maximum _filesize for thumbnailing:" msgstr "Maximális _fájlméret bélyegkép-készítéshez:" -#: ../app/dialogs/preferences-dialog.c:1580 +#: ../app/dialogs/preferences-dialog.c:1615 msgid "Keep record of used files in the Recent Documents list" msgstr "A használt fájlok bejegyzése a dokumentumelőzmények listájába" -#: ../app/dialogs/preferences-dialog.c:1589 +#: ../app/dialogs/preferences-dialog.c:1624 msgid "User Interface" msgstr "Felhasználói felület" -#: ../app/dialogs/preferences-dialog.c:1592 +#: ../app/dialogs/preferences-dialog.c:1627 msgid "Interface" msgstr "Felhasználói felület" -#: ../app/dialogs/preferences-dialog.c:1602 +#: ../app/dialogs/preferences-dialog.c:1637 msgid "Language" msgstr "Nyelv" #. Previews -#: ../app/dialogs/preferences-dialog.c:1608 +#: ../app/dialogs/preferences-dialog.c:1643 msgid "Previews" msgstr "Előnézetek" -#: ../app/dialogs/preferences-dialog.c:1611 +#: ../app/dialogs/preferences-dialog.c:1646 msgid "_Enable layer & channel previews" msgstr "_Réteg és csatorna előnézeteinek engedélyezése" -#: ../app/dialogs/preferences-dialog.c:1617 +#: ../app/dialogs/preferences-dialog.c:1652 msgid "_Default layer & channel preview size:" msgstr "Réteg- és _csatorna-előnézet alapértelmezett mérete:" -#: ../app/dialogs/preferences-dialog.c:1620 +#: ../app/dialogs/preferences-dialog.c:1655 msgid "Na_vigation preview size:" msgstr "_Navigációs előnézet mérete:" #. Keyboard Shortcuts -#: ../app/dialogs/preferences-dialog.c:1624 +#: ../app/dialogs/preferences-dialog.c:1659 msgid "Keyboard Shortcuts" msgstr "Gyorsbillentyűk" -#: ../app/dialogs/preferences-dialog.c:1628 +#: ../app/dialogs/preferences-dialog.c:1663 msgid "_Use dynamic keyboard shortcuts" msgstr "Dinami_kus gyorsbillentyűk használata" -#: ../app/dialogs/preferences-dialog.c:1632 +#: ../app/dialogs/preferences-dialog.c:1667 msgid "Configure _Keyboard Shortcuts..." msgstr "Gyors_billentyűk beállítása…" -#: ../app/dialogs/preferences-dialog.c:1639 +#: ../app/dialogs/preferences-dialog.c:1674 msgid "_Save keyboard shortcuts on exit" msgstr "Gyorsbillentyűk mentése ki_lépéskor" -#: ../app/dialogs/preferences-dialog.c:1643 +#: ../app/dialogs/preferences-dialog.c:1678 msgid "Save Keyboard Shortcuts _Now" msgstr "Gyorsbillentyűk m_entése most" -#: ../app/dialogs/preferences-dialog.c:1650 +#: ../app/dialogs/preferences-dialog.c:1685 msgid "_Reset Keyboard Shortcuts to Default Values" msgstr "Gyorsbillentyűk vissz_aállítása az alapértékekre" -#: ../app/dialogs/preferences-dialog.c:1659 +#: ../app/dialogs/preferences-dialog.c:1694 msgid "Remove _All Keyboard Shortcuts" msgstr "Öss_zes gyorsbillentyű törlése" -#: ../app/dialogs/preferences-dialog.c:1671 -#: ../app/dialogs/preferences-dialog.c:1710 +#: ../app/dialogs/preferences-dialog.c:1706 +#: ../app/dialogs/preferences-dialog.c:1745 msgid "Theme" msgstr "Téma" -#: ../app/dialogs/preferences-dialog.c:1680 +#: ../app/dialogs/preferences-dialog.c:1715 msgid "Select Theme" msgstr "Téma kiválasztása" -#: ../app/dialogs/preferences-dialog.c:1762 +#: ../app/dialogs/preferences-dialog.c:1797 msgid "Reload C_urrent Theme" msgstr "_Jelenlegi téma frissítése" -#: ../app/dialogs/preferences-dialog.c:1774 +#: ../app/dialogs/preferences-dialog.c:1809 msgid "Help System" msgstr "Súgórendszer" #. General -#: ../app/dialogs/preferences-dialog.c:1786 -#: ../app/dialogs/preferences-dialog.c:1873 -#: ../app/dialogs/preferences-dialog.c:2086 +#: ../app/dialogs/preferences-dialog.c:1821 +#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:2123 #: ../app/widgets/gimpcontrollereditor.c:185 msgid "General" msgstr "Általános" -#: ../app/dialogs/preferences-dialog.c:1789 +#: ../app/dialogs/preferences-dialog.c:1824 msgid "Show _tooltips" msgstr "_Buboréksúgó megjelenítése" -#: ../app/dialogs/preferences-dialog.c:1792 +#: ../app/dialogs/preferences-dialog.c:1827 msgid "Show help _buttons" msgstr "Súgógo_mbok megjelenítése" -#: ../app/dialogs/preferences-dialog.c:1805 +#: ../app/dialogs/preferences-dialog.c:1832 msgid "Use the online version" msgstr "Az online verzió használata" -#: ../app/dialogs/preferences-dialog.c:1806 +#: ../app/dialogs/preferences-dialog.c:1833 msgid "Use a locally installed copy" msgstr "Egy helyileg telepített példány használata" -#: ../app/dialogs/preferences-dialog.c:1807 +#: ../app/dialogs/preferences-dialog.c:1834 msgid "User manual:" msgstr "Felhasználói kézikönyv:" -#: ../app/dialogs/preferences-dialog.c:1814 +#: ../app/dialogs/preferences-dialog.c:1841 msgid "There's a local installation of the user manual." msgstr "A felhasználói kézikönyv helyileg telepítve van." -#: ../app/dialogs/preferences-dialog.c:1819 +#: ../app/dialogs/preferences-dialog.c:1847 msgid "The user manual is not installed locally." msgstr "A felhasználói kézikönyv nincs helyileg telepítve." -#: ../app/dialogs/preferences-dialog.c:1844 +#. If there is no webkit available, assume we are on a platform +#. * that doesn't use the help browser, so don't bother showing +#. * the combo. +#. +#: ../app/dialogs/preferences-dialog.c:1860 msgid "Help Browser" msgstr "Súgóböngésző" -#: ../app/dialogs/preferences-dialog.c:1848 +#: ../app/dialogs/preferences-dialog.c:1867 msgid "H_elp browser to use:" msgstr "Használandó súgóböngés_ző:" -#: ../app/dialogs/preferences-dialog.c:1876 +#: ../app/dialogs/preferences-dialog.c:1873 +msgid "" +"The GIMP help browser doesn't seem to be installed. Using the web browser " +"instead." +msgstr "" +"Úgy tűnik, hogy a GIMP súgóböngésző nincs telepítve. Használja helyette a " +"webböngészőt." + +#: ../app/dialogs/preferences-dialog.c:1913 msgid "_Save tool options on exit" msgstr "Eszközbeállítások mentése ki_lépéskor" -#: ../app/dialogs/preferences-dialog.c:1880 +#: ../app/dialogs/preferences-dialog.c:1917 msgid "Save Tool Options _Now" msgstr "Eszköz_beállítások mentése most" -#: ../app/dialogs/preferences-dialog.c:1887 +#: ../app/dialogs/preferences-dialog.c:1924 msgid "_Reset Saved Tool Options to Default Values" msgstr "Elmentett eszközbeállítások visszaállítása az _alapértékekre" #. Snapping Distance -#: ../app/dialogs/preferences-dialog.c:1897 +#: ../app/dialogs/preferences-dialog.c:1934 msgid "Guide & Grid Snapping" msgstr "Segédvonalhoz és rácshoz illesztés" -#: ../app/dialogs/preferences-dialog.c:1902 +#: ../app/dialogs/preferences-dialog.c:1939 msgid "_Snap distance:" msgstr "_Illesztési távolság:" -#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:1947 msgid "Default _interpolation:" msgstr "Alapértelmezett inter_poláció:" #. Global Brush, Pattern, ... -#: ../app/dialogs/preferences-dialog.c:1917 +#: ../app/dialogs/preferences-dialog.c:1954 msgid "Paint Options Shared Between Tools" msgstr "Az eszközök által közösen használt rajzbeállítások" -#: ../app/dialogs/preferences-dialog.c:1921 +#: ../app/dialogs/preferences-dialog.c:1958 msgid "_Brush" msgstr "_Ecset" -#: ../app/dialogs/preferences-dialog.c:1924 +#: ../app/dialogs/preferences-dialog.c:1961 msgid "_Dynamics" msgstr "Ecset_dinamika" -#: ../app/dialogs/preferences-dialog.c:1927 +#: ../app/dialogs/preferences-dialog.c:1964 msgid "_Pattern" msgstr "Min_ta" #. Move Tool -#: ../app/dialogs/preferences-dialog.c:1934 +#: ../app/dialogs/preferences-dialog.c:1971 msgid "Move Tool" msgstr "Áthelyezési eszköz" -#: ../app/dialogs/preferences-dialog.c:1938 +#: ../app/dialogs/preferences-dialog.c:1975 msgid "Set layer or path as active" msgstr "Réteg vagy útvonal beállítása aktívnak" #. Appearance -#: ../app/dialogs/preferences-dialog.c:1963 -#: ../app/dialogs/preferences-dialog.c:2162 ../app/widgets/gimpgrideditor.c:134 +#: ../app/dialogs/preferences-dialog.c:2000 +#: ../app/dialogs/preferences-dialog.c:2199 ../app/widgets/gimpgrideditor.c:134 msgid "Appearance" msgstr "Megjelenés" -#: ../app/dialogs/preferences-dialog.c:1967 +#: ../app/dialogs/preferences-dialog.c:2004 msgid "Show _foreground & background color" msgstr "_Előtér- és háttérszín megjelenítése" -#: ../app/dialogs/preferences-dialog.c:1971 +#: ../app/dialogs/preferences-dialog.c:2008 msgid "Show active _brush, pattern & gradient" msgstr "Aktív e_cset, minta és színátmenet megjelenítése" -#: ../app/dialogs/preferences-dialog.c:1975 +#: ../app/dialogs/preferences-dialog.c:2012 msgid "Show active _image" msgstr "Aktív ké_p megjelenítése" #. Tool Editor -#: ../app/dialogs/preferences-dialog.c:1983 +#: ../app/dialogs/preferences-dialog.c:2020 msgid "Tools configuration" msgstr "Eszköztár testreszabása" -#: ../app/dialogs/preferences-dialog.c:1998 +#: ../app/dialogs/preferences-dialog.c:2035 msgid "Default New Image" msgstr "Alapértelmezett új kép" -#: ../app/dialogs/preferences-dialog.c:2001 +#: ../app/dialogs/preferences-dialog.c:2038 msgid "Default Image" msgstr "Alapértelmezett kép" -#: ../app/dialogs/preferences-dialog.c:2035 +#: ../app/dialogs/preferences-dialog.c:2072 msgid "Set the default Quick Mask color" msgstr "Alapértelmezett gyorsmaszkszín beállítása" -#: ../app/dialogs/preferences-dialog.c:2041 +#: ../app/dialogs/preferences-dialog.c:2078 msgid "Quick Mask color:" msgstr "Gyorsmaszkszín:" -#: ../app/dialogs/preferences-dialog.c:2051 +#: ../app/dialogs/preferences-dialog.c:2088 msgid "Default Image Grid" msgstr "Alapértelmezett képrács" -#: ../app/dialogs/preferences-dialog.c:2054 +#: ../app/dialogs/preferences-dialog.c:2091 msgid "Default Grid" msgstr "Alapértelmezett rács" -#: ../app/dialogs/preferences-dialog.c:2074 +#: ../app/dialogs/preferences-dialog.c:2111 msgid "Image Windows" msgstr "Képet tartalmazó ablak" -#: ../app/dialogs/preferences-dialog.c:2089 +#: ../app/dialogs/preferences-dialog.c:2126 msgid "Use \"_Dot for dot\" by default" msgstr "A „_pontról pontra” beállítás használata alapértelmezettként" -#: ../app/dialogs/preferences-dialog.c:2095 +#: ../app/dialogs/preferences-dialog.c:2132 msgid "Marching _ants speed:" msgstr "Menetelő _hangyák sebessége:" #. Zoom & Resize Behavior -#: ../app/dialogs/preferences-dialog.c:2099 +#: ../app/dialogs/preferences-dialog.c:2136 msgid "Zoom & Resize Behavior" msgstr "Nagyítási és méretmódosítási viselkedés" -#: ../app/dialogs/preferences-dialog.c:2103 +#: ../app/dialogs/preferences-dialog.c:2140 msgid "Resize window on _zoom" msgstr "Ablak átméretezése _nagyításkor vagy kicsinyítéskor" -#: ../app/dialogs/preferences-dialog.c:2106 +#: ../app/dialogs/preferences-dialog.c:2143 msgid "Resize window on image _size change" msgstr "Ablak átméretezése a _képméret változásakor" -#: ../app/dialogs/preferences-dialog.c:2112 +#: ../app/dialogs/preferences-dialog.c:2149 msgid "Fit to window" msgstr "Az ablak méretére" -#: ../app/dialogs/preferences-dialog.c:2114 +#: ../app/dialogs/preferences-dialog.c:2151 msgid "Initial zoom _ratio:" msgstr "Kez_deti nagyítási arány:" #. Space Bar -#: ../app/dialogs/preferences-dialog.c:2118 +#: ../app/dialogs/preferences-dialog.c:2155 msgid "Space Bar" msgstr "Szóközbillentyű" -#: ../app/dialogs/preferences-dialog.c:2124 +#: ../app/dialogs/preferences-dialog.c:2161 msgid "_While space bar is pressed:" msgstr "A szóközb_illentyű lenyomásakor:" #. Mouse Pointers -#: ../app/dialogs/preferences-dialog.c:2128 +#: ../app/dialogs/preferences-dialog.c:2165 msgid "Mouse Pointers" msgstr "Egérmutatók" -#: ../app/dialogs/preferences-dialog.c:2132 +#: ../app/dialogs/preferences-dialog.c:2169 msgid "Show _brush outline" msgstr "_Ecset körvonalának megjelenítése" -#: ../app/dialogs/preferences-dialog.c:2135 +#: ../app/dialogs/preferences-dialog.c:2172 msgid "Show pointer for paint _tools" msgstr "_Festőeszköz mutatójának megjelenítése" -#: ../app/dialogs/preferences-dialog.c:2141 +#: ../app/dialogs/preferences-dialog.c:2178 msgid "Pointer _mode:" msgstr "M_utató-mód:" -#: ../app/dialogs/preferences-dialog.c:2144 +#: ../app/dialogs/preferences-dialog.c:2181 msgid "Pointer re_ndering:" msgstr "Mutató meg_jelenése:" -#: ../app/dialogs/preferences-dialog.c:2147 +#: ../app/dialogs/preferences-dialog.c:2184 msgid "Pointer _handedness:" msgstr "Mu_tató jobb-/balkezes:" -#: ../app/dialogs/preferences-dialog.c:2159 +#: ../app/dialogs/preferences-dialog.c:2196 msgid "Image Window Appearance" msgstr "Képet tartalmazó ablak megjelenése" -#: ../app/dialogs/preferences-dialog.c:2170 +#: ../app/dialogs/preferences-dialog.c:2207 msgid "Default Appearance in Normal Mode" msgstr "Alapértelmezett megjelenés normál módban" -#: ../app/dialogs/preferences-dialog.c:2175 +#: ../app/dialogs/preferences-dialog.c:2212 msgid "Default Appearance in Fullscreen Mode" msgstr "Alapértelmezett megjelenés teljes képernyős módban" -#: ../app/dialogs/preferences-dialog.c:2184 +#: ../app/dialogs/preferences-dialog.c:2221 msgid "Image Title & Statusbar Format" msgstr "Képcím és állapotsor formátuma" -#: ../app/dialogs/preferences-dialog.c:2187 +#: ../app/dialogs/preferences-dialog.c:2224 msgid "Title & Status" msgstr "Cím és állapot" -#: ../app/dialogs/preferences-dialog.c:2205 +#: ../app/dialogs/preferences-dialog.c:2242 msgid "Current format" msgstr "Jelenlegi formátum" -#: ../app/dialogs/preferences-dialog.c:2206 +#: ../app/dialogs/preferences-dialog.c:2243 msgid "Default format" msgstr "Alapértelmezett formátum" -#: ../app/dialogs/preferences-dialog.c:2207 +#: ../app/dialogs/preferences-dialog.c:2244 msgid "Show zoom percentage" msgstr "Nagyítás százalékos mértékének megjelenítése" -#: ../app/dialogs/preferences-dialog.c:2208 +#: ../app/dialogs/preferences-dialog.c:2245 msgid "Show zoom ratio" msgstr "Nagyítás arányának megjelenítése" -#: ../app/dialogs/preferences-dialog.c:2209 +#: ../app/dialogs/preferences-dialog.c:2246 msgid "Show image size" msgstr "Képméret megjelenítése" -#: ../app/dialogs/preferences-dialog.c:2222 +#: ../app/dialogs/preferences-dialog.c:2259 msgid "Image Title Format" msgstr "Kép címének formátuma" -#: ../app/dialogs/preferences-dialog.c:2224 +#: ../app/dialogs/preferences-dialog.c:2261 msgid "Image Statusbar Format" msgstr "Kép állapotsorának formátuma" -#: ../app/dialogs/preferences-dialog.c:2309 +#: ../app/dialogs/preferences-dialog.c:2346 msgid "Display" msgstr "Megjelenítés" #. Transparency -#: ../app/dialogs/preferences-dialog.c:2321 +#: ../app/dialogs/preferences-dialog.c:2358 msgid "Transparency" msgstr "Átlátszóság" -#: ../app/dialogs/preferences-dialog.c:2325 +#: ../app/dialogs/preferences-dialog.c:2362 msgid "_Check style:" msgstr "Négyzet_háló-stílus:" -#: ../app/dialogs/preferences-dialog.c:2328 +#: ../app/dialogs/preferences-dialog.c:2365 msgid "Check _size:" msgstr "_Négyzetek mérete:" -#: ../app/dialogs/preferences-dialog.c:2331 +#: ../app/dialogs/preferences-dialog.c:2368 msgid "Monitor Resolution" msgstr "Monitor felbontása" #. Pixels -#: ../app/dialogs/preferences-dialog.c:2335 ../app/display/gimpcursorview.c:208 +#: ../app/dialogs/preferences-dialog.c:2372 ../app/display/gimpcursorview.c:208 #: ../app/widgets/gimpgrideditor.c:199 ../app/widgets/gimpgrideditor.c:231 msgid "Pixels" msgstr "képpont" -#: ../app/dialogs/preferences-dialog.c:2353 +#: ../app/dialogs/preferences-dialog.c:2390 msgid "Horizontal" msgstr "Vízszintes" -#: ../app/dialogs/preferences-dialog.c:2355 +#: ../app/dialogs/preferences-dialog.c:2392 msgid "Vertical" msgstr "Függőleges" -#: ../app/dialogs/preferences-dialog.c:2357 +#: ../app/dialogs/preferences-dialog.c:2394 #: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "ppi" -#: ../app/dialogs/preferences-dialog.c:2373 +#: ../app/dialogs/preferences-dialog.c:2410 #, c-format msgid "_Detect automatically (currently %d × %d ppi)" msgstr "A_utomatikus meghatározás (jelenleg %d × %d ppi)" -#: ../app/dialogs/preferences-dialog.c:2391 +#: ../app/dialogs/preferences-dialog.c:2428 msgid "_Enter manually" msgstr "Adatok megadása _kézzel" -#: ../app/dialogs/preferences-dialog.c:2406 +#: ../app/dialogs/preferences-dialog.c:2443 msgid "C_alibrate..." msgstr "K_alibrálás…" -#: ../app/dialogs/preferences-dialog.c:2434 +#: ../app/dialogs/preferences-dialog.c:2471 msgid "Color Management" msgstr "Színkezelés" -#: ../app/dialogs/preferences-dialog.c:2454 +#: ../app/dialogs/preferences-dialog.c:2491 msgid "_RGB profile:" msgstr "_RGB profil:" -#: ../app/dialogs/preferences-dialog.c:2455 +#: ../app/dialogs/preferences-dialog.c:2492 msgid "Select RGB Color Profile" msgstr "RGB színprofil kiválasztása" -#: ../app/dialogs/preferences-dialog.c:2456 +#: ../app/dialogs/preferences-dialog.c:2493 msgid "_CMYK profile:" msgstr "_CMYK profil:" -#: ../app/dialogs/preferences-dialog.c:2457 +#: ../app/dialogs/preferences-dialog.c:2494 msgid "Select CMYK Color Profile" msgstr "CMYK színprofil kiválasztása" -#: ../app/dialogs/preferences-dialog.c:2458 +#: ../app/dialogs/preferences-dialog.c:2495 msgid "_Monitor profile:" msgstr "Mon_itorprofil:" -#: ../app/dialogs/preferences-dialog.c:2459 +#: ../app/dialogs/preferences-dialog.c:2496 msgid "Select Monitor Color Profile" msgstr "Monitor-színprofil kiválasztása" -#: ../app/dialogs/preferences-dialog.c:2460 +#: ../app/dialogs/preferences-dialog.c:2497 msgid "_Print simulation profile:" msgstr "Nyomt_atásszimulációs profil:" -#: ../app/dialogs/preferences-dialog.c:2461 +#: ../app/dialogs/preferences-dialog.c:2498 msgid "Select Printer Color Profile" msgstr "Nyomtató-színprofil kiválasztása" -#: ../app/dialogs/preferences-dialog.c:2472 +#: ../app/dialogs/preferences-dialog.c:2509 msgid "_Mode of operation:" msgstr "_Működési mód:" -#: ../app/dialogs/preferences-dialog.c:2502 +#: ../app/dialogs/preferences-dialog.c:2539 msgid "_Try to use the system monitor profile" msgstr "A ren_dszermonitor profiljának használata, ha lehetséges" -#: ../app/dialogs/preferences-dialog.c:2512 +#: ../app/dialogs/preferences-dialog.c:2549 msgid "_Display rendering intent:" msgstr "Ké_pernyős megjelenítési cél:" -#: ../app/dialogs/preferences-dialog.c:2521 +#: ../app/dialogs/preferences-dialog.c:2558 msgid "_Softproof rendering intent:" msgstr "Pró_banyomat-megjelenítési cél:" -#: ../app/dialogs/preferences-dialog.c:2534 +#: ../app/dialogs/preferences-dialog.c:2571 msgid "Mark out of gamut colors" msgstr "A színskálán kívüli színek megjelölése" -#: ../app/dialogs/preferences-dialog.c:2539 +#: ../app/dialogs/preferences-dialog.c:2576 msgid "Select Warning Color" msgstr "Figyelmeztetési szín kiválasztása" -#: ../app/dialogs/preferences-dialog.c:2552 +#: ../app/dialogs/preferences-dialog.c:2589 msgid "File Open behaviour:" msgstr "Fájlmegnyitási viselkedés:" -#: ../app/dialogs/preferences-dialog.c:2564 +#: ../app/dialogs/preferences-dialog.c:2601 msgid "Input Devices" msgstr "Bemeneti eszközök" #. Extended Input Devices -#: ../app/dialogs/preferences-dialog.c:2574 +#: ../app/dialogs/preferences-dialog.c:2611 msgid "Extended Input Devices" msgstr "Kiterjesztett bemeneti eszközök" -#: ../app/dialogs/preferences-dialog.c:2578 +#: ../app/dialogs/preferences-dialog.c:2615 msgid "Configure E_xtended Input Devices..." msgstr "Kiterjesztett bemeneti eszközök _beállítása…" -#: ../app/dialogs/preferences-dialog.c:2585 +#: ../app/dialogs/preferences-dialog.c:2622 msgid "_Save input device settings on exit" msgstr "Bemeneti eszközök beállításainak m_entése kilépéskor" -#: ../app/dialogs/preferences-dialog.c:2589 +#: ../app/dialogs/preferences-dialog.c:2626 msgid "Save Input Device Settings _Now" msgstr "Bemeneti eszközök beállításainak me_ntése most" -#: ../app/dialogs/preferences-dialog.c:2596 +#: ../app/dialogs/preferences-dialog.c:2633 msgid "_Reset Saved Input Device Settings to Default Values" msgstr "" "Bemeneti eszközök mentett beállításainak visszaállítása az _alapértékekre" -#: ../app/dialogs/preferences-dialog.c:2611 +#: ../app/dialogs/preferences-dialog.c:2648 msgid "Additional Input Controllers" msgstr "További bemeneti vezérlők" -#: ../app/dialogs/preferences-dialog.c:2614 +#: ../app/dialogs/preferences-dialog.c:2651 msgid "Input Controllers" msgstr "Bemeneti vezérlők" -#: ../app/dialogs/preferences-dialog.c:2630 +#: ../app/dialogs/preferences-dialog.c:2667 msgid "Window Management" msgstr "Ablakkezelés" -#: ../app/dialogs/preferences-dialog.c:2639 +#: ../app/dialogs/preferences-dialog.c:2676 msgid "Window Manager Hints" msgstr "Ablakkezelési információ" -#: ../app/dialogs/preferences-dialog.c:2645 +#: ../app/dialogs/preferences-dialog.c:2682 msgid "Hint for _docks and toolbox:" msgstr "_Dokkablakok és eszköztár ablaktípusa:" -#: ../app/dialogs/preferences-dialog.c:2648 +#: ../app/dialogs/preferences-dialog.c:2685 msgid "Focus" msgstr "Fókusz" -#: ../app/dialogs/preferences-dialog.c:2652 +#: ../app/dialogs/preferences-dialog.c:2689 msgid "Activate the _focused image" msgstr "A _fókusszal rendelkező kép aktiválása" #. Window Positions -#: ../app/dialogs/preferences-dialog.c:2656 +#: ../app/dialogs/preferences-dialog.c:2693 msgid "Window Positions" msgstr "Ablakok helyzete" -#: ../app/dialogs/preferences-dialog.c:2659 +#: ../app/dialogs/preferences-dialog.c:2696 msgid "_Save window positions on exit" msgstr "Ablakok helyzetének mentése ki_lépéskor" -#: ../app/dialogs/preferences-dialog.c:2663 +#: ../app/dialogs/preferences-dialog.c:2700 msgid "Save Window Positions _Now" msgstr "Ablakok helyzetének me_ntése most" -#: ../app/dialogs/preferences-dialog.c:2670 +#: ../app/dialogs/preferences-dialog.c:2707 msgid "_Reset Saved Window Positions to Default Values" msgstr "Ablakok elmentett helyzetének visszaállítása az _alapértékekre" -#: ../app/dialogs/preferences-dialog.c:2685 +#: ../app/dialogs/preferences-dialog.c:2722 msgid "Folders" msgstr "Mappák" -#: ../app/dialogs/preferences-dialog.c:2705 +#: ../app/dialogs/preferences-dialog.c:2742 msgid "Temporary folder:" msgstr "Ideiglenes könyvtár:" -#: ../app/dialogs/preferences-dialog.c:2706 +#: ../app/dialogs/preferences-dialog.c:2743 msgid "Select Folder for Temporary Files" msgstr "Jelölje ki az ideiglenes fájlok mappáját" -#: ../app/dialogs/preferences-dialog.c:2710 +#: ../app/dialogs/preferences-dialog.c:2747 msgid "Swap folder:" msgstr "Cseretár könyvtára:" -#: ../app/dialogs/preferences-dialog.c:2711 +#: ../app/dialogs/preferences-dialog.c:2748 msgid "Select Swap Folder" msgstr "Cseretár könyvtárának kiválasztása" -#: ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/preferences-dialog.c:2783 msgid "Brush Folders" msgstr "Ecsetek mappái" -#: ../app/dialogs/preferences-dialog.c:2748 +#: ../app/dialogs/preferences-dialog.c:2785 msgid "Select Brush Folders" msgstr "Ecsetek mappáinak kiválasztása" -#: ../app/dialogs/preferences-dialog.c:2750 +#: ../app/dialogs/preferences-dialog.c:2787 msgid "Dynamics Folders" msgstr "Ecsetdinamika mappái" -#: ../app/dialogs/preferences-dialog.c:2752 +#: ../app/dialogs/preferences-dialog.c:2789 msgid "Select Dynamics Folders" msgstr "Ecsetdinamika mappáinak kiválasztása" -#: ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/preferences-dialog.c:2791 msgid "Pattern Folders" msgstr "Minták mappái" -#: ../app/dialogs/preferences-dialog.c:2756 +#: ../app/dialogs/preferences-dialog.c:2793 msgid "Select Pattern Folders" msgstr "Minták mappáinak kiválasztása" -#: ../app/dialogs/preferences-dialog.c:2758 +#: ../app/dialogs/preferences-dialog.c:2795 msgid "Palette Folders" msgstr "Paletták mappái" -#: ../app/dialogs/preferences-dialog.c:2760 +#: ../app/dialogs/preferences-dialog.c:2797 msgid "Select Palette Folders" msgstr "Paletták mappáinak kiválasztása" -#: ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/preferences-dialog.c:2799 msgid "Gradient Folders" msgstr "Színátmenetek mappái" -#: ../app/dialogs/preferences-dialog.c:2764 +#: ../app/dialogs/preferences-dialog.c:2801 msgid "Select Gradient Folders" msgstr "Színátmenetek mappáinak kiválasztása" -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2803 msgid "Font Folders" msgstr "Betűkészletek mappái" -#: ../app/dialogs/preferences-dialog.c:2768 +#: ../app/dialogs/preferences-dialog.c:2805 msgid "Select Font Folders" msgstr "Betűkészletek mappáinak kiválasztása" -#: ../app/dialogs/preferences-dialog.c:2770 +#: ../app/dialogs/preferences-dialog.c:2807 msgid "Tool Preset Folders" msgstr "Elődefiniált eszközbeállítások mappái" -#: ../app/dialogs/preferences-dialog.c:2772 +#: ../app/dialogs/preferences-dialog.c:2809 msgid "Select Tool Preset Folders" msgstr "Válassza ki az elődefiniált eszközbeállítások mappáit" -#: ../app/dialogs/preferences-dialog.c:2774 +#: ../app/dialogs/preferences-dialog.c:2811 msgid "Plug-In Folders" msgstr "Bővítmények mappái" -#: ../app/dialogs/preferences-dialog.c:2776 +#: ../app/dialogs/preferences-dialog.c:2813 msgid "Select Plug-In Folders" msgstr "Bővítmények mappáinak kiválasztása" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2815 msgid "Scripts" msgstr "Parancsfájlok" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2815 msgid "Script-Fu Folders" msgstr "Script-Fu mappái" -#: ../app/dialogs/preferences-dialog.c:2780 +#: ../app/dialogs/preferences-dialog.c:2817 msgid "Select Script-Fu Folders" msgstr "Script-Fu mappáinak kiválasztása" -#: ../app/dialogs/preferences-dialog.c:2782 +#: ../app/dialogs/preferences-dialog.c:2819 msgid "Module Folders" msgstr "Modulok mappái" -#: ../app/dialogs/preferences-dialog.c:2784 +#: ../app/dialogs/preferences-dialog.c:2821 msgid "Select Module Folders" msgstr "Modulok mappáinak kiválasztása" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Interpreters" msgstr "Fordítók" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Interpreter Folders" msgstr "Fordítók mappái" -#: ../app/dialogs/preferences-dialog.c:2788 +#: ../app/dialogs/preferences-dialog.c:2825 msgid "Select Interpreter Folders" msgstr "Fordítók mappáinak kiválasztása" -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:2827 msgid "Environment Folders" msgstr "Környezet mappái" -#: ../app/dialogs/preferences-dialog.c:2792 +#: ../app/dialogs/preferences-dialog.c:2829 msgid "Select Environment Folders" msgstr "Környezet mappáinak kiválasztása" -#: ../app/dialogs/preferences-dialog.c:2794 +#: ../app/dialogs/preferences-dialog.c:2831 msgid "Themes" msgstr "Témák" -#: ../app/dialogs/preferences-dialog.c:2794 +#: ../app/dialogs/preferences-dialog.c:2831 msgid "Theme Folders" msgstr "Témák mappái" -#: ../app/dialogs/preferences-dialog.c:2796 +#: ../app/dialogs/preferences-dialog.c:2833 msgid "Select Theme Folders" msgstr "Témák mappáinak kiválasztása" @@ -10900,27 +10899,27 @@ msgid "Not a regular file" msgstr "Nem szabályos fájl" -#: ../app/file/file-open.c:191 +#: ../app/file/file-open.c:197 #, c-format msgid "%s plug-in returned SUCCESS but did not return an image" msgstr "" "A(z) %s bővítmény sikeres lefutást jelzett, viszont nem adott vissza képet" -#: ../app/file/file-open.c:202 +#: ../app/file/file-open.c:208 #, c-format msgid "%s plug-In could not open image" msgstr "A(z) %s bővítmény nem tudta megnyitni a képet" -#: ../app/file/file-open.c:533 +#: ../app/file/file-open.c:539 msgid "Image doesn't contain any layers" msgstr "A kép nem tartalmaz réteget" -#: ../app/file/file-open.c:593 +#: ../app/file/file-open.c:599 #, c-format msgid "Opening '%s' failed: %s" msgstr "„%s” megnyitása sikertelen: %s" -#: ../app/file/file-open.c:703 +#: ../app/file/file-open.c:709 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -11003,7 +11002,7 @@ msgid "Documents" msgstr "Dokumentumok" -#: ../app/gui/splash.c:115 +#: ../app/gui/splash.c:112 msgid "GIMP Startup" msgstr "A GIMP indítása" @@ -11620,11 +11619,11 @@ "Végrehajtási hiba a(z) „%s” eljárásnál:\n" "%s" -#: ../app/plug-in/gimpplugin-progress.c:331 +#: ../app/plug-in/gimpplugin-progress.c:339 msgid "Cancelled" msgstr "Megszakítva" -#: ../app/plug-in/gimpplugin.c:643 +#: ../app/plug-in/gimpplugin.c:648 #, c-format msgid "" "Plug-in crashed: \"%s\"\n" @@ -14569,7 +14568,7 @@ msgid "No filter selected" msgstr "Nincs kijelölve szűrő" -#: ../app/widgets/gimpcoloreditor.c:260 +#: ../app/widgets/gimpcoloreditor.c:264 msgid "" "Hexadecimal color notation as used in HTML and CSS. This entry also accepts " "CSS color names." @@ -15325,15 +15324,15 @@ msgid "Height" msgstr "Magasság" -#: ../app/widgets/gimphelp.c:297 +#: ../app/widgets/gimphelp.c:308 msgid "Help browser is missing" msgstr "Súgóböngésző nem található" -#: ../app/widgets/gimphelp.c:298 +#: ../app/widgets/gimphelp.c:309 msgid "The GIMP help browser is not available." msgstr "A GIMP Súgóböngésző nem elérhető." -#: ../app/widgets/gimphelp.c:299 +#: ../app/widgets/gimphelp.c:310 msgid "" "The GIMP help browser plug-in appears to be missing from your installation. " "You may instead use the web browser for reading the help pages." @@ -15341,31 +15340,35 @@ "Úgy tűnik, a GIMP Súgóböngésző nincs benne a telepítésben. Használhat " "helyette webböngészőt a súgó szövegeinek olvasására." -#: ../app/widgets/gimphelp.c:340 +#: ../app/widgets/gimphelp.c:351 msgid "Help browser doesn't start" msgstr "A Súgóböngésző nem indul" -#: ../app/widgets/gimphelp.c:341 +#: ../app/widgets/gimphelp.c:352 msgid "Could not start the GIMP help browser plug-in." msgstr "Nem lehet elindítani a GIMP Súgóböngészőt." -#: ../app/widgets/gimphelp.c:368 +#: ../app/widgets/gimphelp.c:354 +msgid "You may instead use the web browser for reading the help pages." +msgstr "Ehelyett használhatja a webböngészőt a súgóoldalak olvasásához." + +#: ../app/widgets/gimphelp.c:380 msgid "Use _Web Browser" msgstr "_Webböngésző használata" -#: ../app/widgets/gimphelp.c:712 +#: ../app/widgets/gimphelp.c:724 msgid "GIMP user manual is missing" msgstr "A GIMP felhasználói kézikönyve nem található" -#: ../app/widgets/gimphelp.c:719 +#: ../app/widgets/gimphelp.c:731 msgid "_Read Online" msgstr "_Online olvasás" -#: ../app/widgets/gimphelp.c:743 +#: ../app/widgets/gimphelp.c:755 msgid "The GIMP user manual is not installed on your computer." msgstr "A GIMP felhasználói kézikönyve nincs telepítve a számítógépen." -#: ../app/widgets/gimphelp.c:746 +#: ../app/widgets/gimphelp.c:758 msgid "" "You may either install the additional help package or change your " "preferences to use the online version." @@ -15686,17 +15689,17 @@ msgid "%d ppi, %s" msgstr "%d ppi, %s" -#: ../app/widgets/gimptextbuffer-serialize.c:344 +#: ../app/widgets/gimptextbuffer-serialize.c:269 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "„%s” attribútum <%s> elemen érvénytelen ebben a szövegkörnyezetben" -#: ../app/widgets/gimptextbuffer-serialize.c:416 +#: ../app/widgets/gimptextbuffer-serialize.c:341 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "A szöveg legkülső eleme kell legyen, nem pedig <%s>" -#: ../app/widgets/gimptextbuffer.c:1459 +#: ../app/widgets/gimptextbuffer.c:1460 #, c-format msgid "Invalid UTF-8 data in file '%s'." msgstr "Érvénytelen UTF-8 adat a(z) „%s” fájlban." diff -Nru gimp-2.8.18/po/is.po gimp-2.8.20/po/is.po --- gimp-2.8.18/po/is.po 2016-05-25 22:26:48.000000000 +0000 +++ gimp-2.8.20/po/is.po 2017-01-28 19:08:49.000000000 +0000 @@ -13,8 +13,8 @@ "Project-Id-Version: gimp.gimp-2-8.is\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-02-07 19:08+0000\n" -"PO-Revision-Date: 2016-02-08 12:46+0000\n" +"POT-Creation-Date: 2016-08-04 10:47+0000\n" +"PO-Revision-Date: 2016-08-22 21:29+0000\n" "Last-Translator: Sveinn í Felli \n" "Language-Team: Icelandic \n" "Language: is\n" @@ -42,7 +42,25 @@ "Höfundarréttur © 1995-%s\n" "Spencer Kimball, Peter Mattis og GIMP þróunarhópurinn" -#: ../app/about.h:34 +#. TRANSLATORS: do not end the license URL with a dot, because it would +#. * be in the link. Because of technical limitations, make sure the URL +#. * ends with a space, a newline or is end of text. +#. * Cf. bug 762282. +#. +#: ../app/about.h:39 +#| msgid "" +#| "GIMP 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.\n" +#| "\n" +#| "GIMP 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.\n" +#| "\n" +#| "You should have received a copy of the GNU General Public License along " +#| "with GIMP. If not, see http://www.gnu.org/licenses/." msgid "" "GIMP 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 " @@ -55,7 +73,7 @@ "details.\n" "\n" "You should have received a copy of the GNU General Public License along with " -"GIMP. If not, see http://www.gnu.org/licenses/." +"GIMP. If not, see: http://www.gnu.org/licenses/" msgstr "" "GIMP er frjáls hugbúnaður; þú getur dreift honum eða breytt að vild undir " "GNU General Public License eins og það er gefið út af Free Software " @@ -68,8 +86,7 @@ "upplýsingar má sjá GNU General Public License.\n" "\n" "Með GIMP hefði átt að fylgja eintak af GNU General Public License; en ef svo " -"er ekki þá er hægt að senda bréf til Free Software Foundation, Inc., 51 " -"Franklin Street, Fifth Floor, Boston, MA 02110-1301 Bandaríkjunum (USA)" +"er ekki þá skaltu skoða: http://www.gnu.org/licenses/" #: ../app/app.c:225 #, c-format @@ -8508,7 +8525,7 @@ msgid "Layer cannot be lowered more." msgstr "Ekki hægt að lækka lag frekar." -#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1529 +#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1532 #: ../app/core/gimplayermask.c:236 #, c-format msgid "%s mask" @@ -8523,47 +8540,47 @@ "Fljótandi val\n" "(%s)" -#: ../app/core/gimplayer.c:1449 +#: ../app/core/gimplayer.c:1452 msgid "Unable to add a layer mask since the layer already has one." msgstr "" "Get ekki sett hulu á lag\n" "þar sem lag er þegar með hulu." -#: ../app/core/gimplayer.c:1460 +#: ../app/core/gimplayer.c:1463 msgid "Cannot add layer mask of different dimensions than specified layer." msgstr "Get ekki bætt við hulu af annarri stærð en viðkomandi lag." -#: ../app/core/gimplayer.c:1466 +#: ../app/core/gimplayer.c:1469 msgctxt "undo-type" msgid "Add Layer Mask" msgstr "Bæta inn laghulu" -#: ../app/core/gimplayer.c:1584 +#: ../app/core/gimplayer.c:1587 msgctxt "undo-type" msgid "Transfer Alpha to Mask" msgstr "Færa alfalitrás í laghulu" -#: ../app/core/gimplayer.c:1754 +#: ../app/core/gimplayer.c:1757 msgctxt "undo-type" msgid "Apply Layer Mask" msgstr "Beita laghulu" -#: ../app/core/gimplayer.c:1755 +#: ../app/core/gimplayer.c:1758 msgctxt "undo-type" msgid "Delete Layer Mask" msgstr "Eyða laghulu" -#: ../app/core/gimplayer.c:1874 +#: ../app/core/gimplayer.c:1877 msgctxt "undo-type" msgid "Add Alpha Channel" msgstr "Bæta inn alfa-gegnsæislitrás" -#: ../app/core/gimplayer.c:1928 +#: ../app/core/gimplayer.c:1931 msgctxt "undo-type" msgid "Remove Alpha Channel" msgstr "Fjarlægja alfa-gegnsæislitrás" -#: ../app/core/gimplayer.c:1948 +#: ../app/core/gimplayer.c:1951 msgctxt "undo-type" msgid "Layer to Image Size" msgstr "Lag að myndstærð" @@ -10783,26 +10800,26 @@ msgid "Not a regular file" msgstr "Ekki venjuleg skrá" -#: ../app/file/file-open.c:191 +#: ../app/file/file-open.c:197 #, c-format msgid "%s plug-in returned SUCCESS but did not return an image" msgstr "%s hjálparforritið skilaði SUCCESS en opnaði enga mynd" -#: ../app/file/file-open.c:202 +#: ../app/file/file-open.c:208 #, c-format msgid "%s plug-In could not open image" msgstr "%s hjálparforritið gat ekki opnað myndina" -#: ../app/file/file-open.c:533 +#: ../app/file/file-open.c:539 msgid "Image doesn't contain any layers" msgstr "Myndin inniheldur engin lög" -#: ../app/file/file-open.c:593 +#: ../app/file/file-open.c:599 #, c-format msgid "Opening '%s' failed: %s" msgstr "Tókst ekki að opna '%s': %s" -#: ../app/file/file-open.c:703 +#: ../app/file/file-open.c:709 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -10887,7 +10904,7 @@ msgid "Documents" msgstr "Skjöl" -#: ../app/gui/splash.c:115 +#: ../app/gui/splash.c:112 msgid "GIMP Startup" msgstr "GIMP ræsing" @@ -11509,11 +11526,11 @@ "Keyrsluvilla í ferlinu '%s':\n" "%s" -#: ../app/plug-in/gimpplugin-progress.c:331 +#: ../app/plug-in/gimpplugin-progress.c:339 msgid "Cancelled" msgstr "Hætt við" -#: ../app/plug-in/gimpplugin.c:643 +#: ../app/plug-in/gimpplugin.c:648 #, c-format msgid "" "Plug-in crashed: \"%s\"\n" @@ -11528,9 +11545,9 @@ "Við hrun gæti hjálparforritið hafa ruglað innri stöðugleika GIMP. Þú gætir " "viljað vista myndirnar þínar og endurræsa GIMP til öryggis." -#: ../app/plug-in/gimppluginmanager-call.c:173 -#: ../app/plug-in/gimppluginmanager-call.c:223 -#: ../app/plug-in/gimppluginmanager-call.c:321 +#: ../app/plug-in/gimppluginmanager-call.c:185 +#: ../app/plug-in/gimppluginmanager-call.c:235 +#: ../app/plug-in/gimppluginmanager-call.c:333 #, c-format msgid "Failed to run plug-in \"%s\"" msgstr "Tókst ekki að keyra hjálparforritið \"%s\"" @@ -12588,7 +12605,7 @@ #: ../app/tools/gimpflipoptions.c:142 #, c-format msgid "Flip Type (%s)" -msgstr "Tegun flettingar (%s)" +msgstr "Tegund flettingar (%s)" #: ../app/tools/gimpfliptool.c:84 msgid "Flip" @@ -14426,7 +14443,7 @@ msgid "No filter selected" msgstr "Engin sía valin" -#: ../app/widgets/gimpcoloreditor.c:260 +#: ../app/widgets/gimpcoloreditor.c:264 msgid "" "Hexadecimal color notation as used in HTML and CSS. This entry also accepts " "CSS color names." @@ -15543,17 +15560,17 @@ msgid "%d ppi, %s" msgstr "%d pát, %s" -#: ../app/widgets/gimptextbuffer-serialize.c:344 +#: ../app/widgets/gimptextbuffer-serialize.c:269 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "Eigindið \"%s\" er ógilt á <%s> stakinu í þessu samhengi" -#: ../app/widgets/gimptextbuffer-serialize.c:416 +#: ../app/widgets/gimptextbuffer-serialize.c:341 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "Ysta stakið í textanum verður að vera og ekki <%s>" -#: ../app/widgets/gimptextbuffer.c:1459 +#: ../app/widgets/gimptextbuffer.c:1460 #, c-format msgid "Invalid UTF-8 data in file '%s'." msgstr "Ógild UTF-8 gögn í skrá '%s'." diff -Nru gimp-2.8.18/po/it.po gimp-2.8.20/po/it.po --- gimp-2.8.18/po/it.po 2016-05-25 22:26:48.000000000 +0000 +++ gimp-2.8.20/po/it.po 2017-01-28 19:08:49.000000000 +0000 @@ -30,8 +30,8 @@ msgstr "" "Project-Id-Version: gimp 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-29 08:49+0200\n" -"PO-Revision-Date: 2016-04-29 09:40+0200\n" +"POT-Creation-Date: 2016-09-30 07:55+0200\n" +"PO-Revision-Date: 2016-09-30 07:57+0200\n" "Last-Translator: Marco Ciampa \n" "Language-Team: gimp@erlug.linux.it\n" "Language: it\n" @@ -79,11 +79,16 @@ "You should have received a copy of the GNU General Public License along with " "GIMP. If not, see: http://www.gnu.org/licenses/" msgstr "" -"GIMP è software libero; puoi redistribuirlo e/o modificarlo nei termini della GNU General Public License come pubblicato dalla Free Software Foundation versione 3 o (a proprio giudizio) successive.\n" +"GIMP è software libero; puoi redistribuirlo e/o modificarlo nei termini " +"della GNU General Public License come pubblicato dalla Free Software " +"Foundation versione 3 o (a proprio giudizio) successive.\n" "\n" -"GIMP è distribuito sperando sia utile, ma SENZA ALCUNA GARANZIA espressa o implicita, di COMMERCIABILITÀ o di IDONEITÀ AD UNO SCOPO PARTICOLARE. Vedere la GNU General Public License per ulteriori dettagli.\n" +"GIMP è distribuito sperando sia utile, ma SENZA ALCUNA GARANZIA espressa o " +"implicita, di COMMERCIABILITÀ o di IDONEITÀ AD UNO SCOPO PARTICOLARE. Vedere " +"la GNU General Public License per ulteriori dettagli.\n" "\n" -"Dovresti aver ricevuto una copia della GNU General Public License con GIMP. Se così non fosse, vedere http://www.gnu.org/licenses/" +"Dovresti aver ricevuto una copia della GNU General Public License con GIMP. " +"Se così non fosse, vedere http://www.gnu.org/licenses/" #: ../app/app.c:225 #, c-format @@ -282,7 +287,7 @@ #. initialize the list of gimp brushes #: ../app/actions/actions.c:112 ../app/core/gimp.c:951 -#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2783 msgid "Brushes" msgstr "Pennelli" @@ -329,7 +334,7 @@ #. Document History #: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:329 -#: ../app/dialogs/preferences-dialog.c:1577 +#: ../app/dialogs/preferences-dialog.c:1612 msgid "Document History" msgstr "Cronologia documenti" @@ -360,7 +365,7 @@ msgstr "File" #: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:325 -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2803 msgid "Fonts" msgstr "Caratteri" @@ -371,12 +376,12 @@ #. initialize the list of gimp gradients #: ../app/actions/actions.c:172 ../app/core/gimp.c:971 -#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2799 msgid "Gradients" msgstr "Gradienti" #: ../app/actions/actions.c:175 ../app/core/gimp.c:983 -#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2770 +#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2807 msgid "Tool Presets" msgstr "Preimpostazioni strumento" @@ -410,23 +415,23 @@ #. initialize the list of gimp palettes #: ../app/actions/actions.c:196 ../app/core/gimp.c:966 -#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2758 +#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2795 msgid "Palettes" msgstr "Tavolozze" #. initialize the list of gimp patterns #: ../app/actions/actions.c:199 ../app/core/gimp.c:961 -#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2791 msgid "Patterns" msgstr "Motivi" -#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2774 +#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2811 msgid "Plug-Ins" msgstr "Plug-in" #. Quick Mask Color #: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:386 -#: ../app/dialogs/preferences-dialog.c:2032 +#: ../app/dialogs/preferences-dialog.c:2069 msgid "Quick Mask" msgstr "Maschera veloce" @@ -453,7 +458,7 @@ msgstr "Modifica del testo" #: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:298 -#: ../app/dialogs/preferences-dialog.c:1861 ../app/gui/gui.c:441 +#: ../app/dialogs/preferences-dialog.c:1898 ../app/gui/gui.c:441 msgid "Tool Options" msgstr "Opzioni strumento" @@ -751,8 +756,7 @@ msgid "Intersect this channel with the current selection" msgstr "Interseca questo canale con la selezione corrente" -#: ../app/actions/channels-commands.c:85 -#: ../app/actions/channels-commands.c:402 +#: ../app/actions/channels-commands.c:85 ../app/actions/channels-commands.c:402 msgid "Channel Attributes" msgstr "Attributi di canale" @@ -764,8 +768,7 @@ msgid "Edit Channel Color" msgstr "Modifica il colore del canale" -#: ../app/actions/channels-commands.c:91 -#: ../app/actions/channels-commands.c:123 +#: ../app/actions/channels-commands.c:91 ../app/actions/channels-commands.c:123 msgid "_Fill opacity:" msgstr "_Opacità riempimento:" @@ -1003,8 +1006,7 @@ "\n" "%s" -#: ../app/actions/data-commands.c:118 -#: ../app/actions/tool-options-commands.c:72 +#: ../app/actions/data-commands.c:118 ../app/actions/tool-options-commands.c:72 #: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1529 #: ../app/core/gimppalette-import.c:211 ../app/core/gimppalette-load.c:224 #: ../app/core/gimppalette.c:399 ../app/dialogs/palette-import-dialog.c:771 @@ -1373,7 +1375,7 @@ msgstr "_Informazioni" #: ../app/actions/dialogs-actions.c:333 -#: ../app/dialogs/preferences-dialog.c:1951 ../app/widgets/gimptoolbox.c:539 +#: ../app/dialogs/preferences-dialog.c:1988 ../app/widgets/gimptoolbox.c:539 msgid "Toolbox" msgstr "Pannello strumenti" @@ -3238,15 +3240,13 @@ msgid "Set Image Print Resolution" msgstr "Imposta risoluzione di stampa immagine" -#: ../app/actions/image-commands.c:379 -#: ../app/pdb/drawable-transform-cmds.c:159 +#: ../app/actions/image-commands.c:379 ../app/pdb/drawable-transform-cmds.c:159 #: ../app/pdb/drawable-transform-cmds.c:247 #: ../app/pdb/item-transform-cmds.c:162 msgid "Flipping" msgstr "Riflessione" -#: ../app/actions/image-commands.c:403 -#: ../app/pdb/drawable-transform-cmds.c:602 +#: ../app/actions/image-commands.c:403 ../app/pdb/drawable-transform-cmds.c:602 #: ../app/pdb/drawable-transform-cmds.c:694 ../app/pdb/image-cmds.c:534 #: ../app/pdb/item-transform-cmds.c:433 ../app/pdb/transform-tools-cmds.c:245 #: ../app/tools/gimprotatetool.c:125 @@ -3267,7 +3267,7 @@ #. Scaling #: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 -#: ../app/dialogs/preferences-dialog.c:1906 +#: ../app/dialogs/preferences-dialog.c:1943 #: ../app/pdb/drawable-transform-cmds.c:783 #: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 #: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524 @@ -4624,14 +4624,13 @@ #: ../app/actions/text-editor-commands.c:143 #: ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58 #: ../app/core/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:443 -#: ../app/core/gimpbrushgenerated-load.c:73 -#: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54 -#: ../app/core/gimpgradient-load.c:63 ../app/core/gimppalette-load.c:77 -#: ../app/core/gimppalette-load.c:274 ../app/core/gimppalette-load.c:320 -#: ../app/core/gimppalette-load.c:377 ../app/core/gimppalette-load.c:467 -#: ../app/core/gimppalette-load.c:634 ../app/core/gimppattern-load.c:76 -#: ../app/tools/gimpcurvestool.c:658 ../app/tools/gimplevelstool.c:747 -#: ../app/xcf/xcf.c:359 +#: ../app/core/gimpbrushgenerated-load.c:73 ../app/core/gimpbrushpipe-load.c:81 +#: ../app/core/gimpcurve-load.c:54 ../app/core/gimpgradient-load.c:63 +#: ../app/core/gimppalette-load.c:77 ../app/core/gimppalette-load.c:274 +#: ../app/core/gimppalette-load.c:320 ../app/core/gimppalette-load.c:377 +#: ../app/core/gimppalette-load.c:467 ../app/core/gimppalette-load.c:634 +#: ../app/core/gimppattern-load.c:76 ../app/tools/gimpcurvestool.c:658 +#: ../app/tools/gimplevelstool.c:747 ../app/xcf/xcf.c:359 #, c-format msgid "Could not open '%s' for reading: %s" msgstr "Impossibile aprire \"%s\" in lettura: %s" @@ -7480,7 +7479,7 @@ msgstr "Parasites" #. initialize the list of gimp dynamics -#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2750 +#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2787 #: ../app/tools/gimppaintoptions-gui.c:201 msgid "Dynamics" msgstr "Dinamiche" @@ -7491,7 +7490,7 @@ msgstr "Caratteri (può metterci parecchio tempo)" #. initialize the module list -#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2782 +#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2819 msgid "Modules" msgstr "Moduli" @@ -8427,7 +8426,7 @@ msgid "Remove Path" msgstr "Rimuovi tracciato" -#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1715 +#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1750 msgid "Folder" msgstr "Cartella" @@ -8584,7 +8583,7 @@ msgid "Layer cannot be lowered more." msgstr "Il livello non può essere abbassato ulteriormente." -#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1529 +#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1532 #: ../app/core/gimplayermask.c:236 #, c-format msgid "%s mask" @@ -8599,49 +8598,49 @@ "Selezione fluttuante\n" "(%s)" -#: ../app/core/gimplayer.c:1449 +#: ../app/core/gimplayer.c:1452 msgid "Unable to add a layer mask since the layer already has one." msgstr "" "Impossibile aggiungere una maschera di livello dato che il livello ne ha già " "una." -#: ../app/core/gimplayer.c:1460 +#: ../app/core/gimplayer.c:1463 msgid "Cannot add layer mask of different dimensions than specified layer." msgstr "" "Impossibile aggiungere maschera livello con dimensioni diverse dal livello " "specificato." -#: ../app/core/gimplayer.c:1466 +#: ../app/core/gimplayer.c:1469 msgctxt "undo-type" msgid "Add Layer Mask" msgstr "Aggiungi maschera di livello" -#: ../app/core/gimplayer.c:1584 +#: ../app/core/gimplayer.c:1587 msgctxt "undo-type" msgid "Transfer Alpha to Mask" msgstr "Trasferimento alfa su maschera" -#: ../app/core/gimplayer.c:1754 +#: ../app/core/gimplayer.c:1757 msgctxt "undo-type" msgid "Apply Layer Mask" msgstr "Applica maschera di livello" -#: ../app/core/gimplayer.c:1755 +#: ../app/core/gimplayer.c:1758 msgctxt "undo-type" msgid "Delete Layer Mask" msgstr "Elimina maschera di livello" -#: ../app/core/gimplayer.c:1874 +#: ../app/core/gimplayer.c:1877 msgctxt "undo-type" msgid "Add Alpha Channel" msgstr "Aggiungi canale alfa" -#: ../app/core/gimplayer.c:1928 +#: ../app/core/gimplayer.c:1931 msgctxt "undo-type" msgid "Remove Alpha Channel" msgstr "Rimuovi canale alfa" -#: ../app/core/gimplayer.c:1948 +#: ../app/core/gimplayer.c:1951 msgctxt "undo-type" msgid "Layer to Image Size" msgstr "Livello a dimensione immagine" @@ -9269,7 +9268,7 @@ msgstr "Crea una nuova immagine" #: ../app/dialogs/image-new-dialog.c:135 -#: ../app/dialogs/preferences-dialog.c:2016 +#: ../app/dialogs/preferences-dialog.c:2053 msgid "_Template:" msgstr "_Modelli:" @@ -9504,7 +9503,7 @@ msgstr "Seleziona sorgente" #: ../app/dialogs/palette-import-dialog.c:214 -#: ../app/dialogs/preferences-dialog.c:1930 +#: ../app/dialogs/preferences-dialog.c:1967 msgid "_Gradient" msgstr "_Gradiente" @@ -9563,20 +9562,20 @@ msgid "The selected source contains no colors." msgstr "La sorgente selezionata non contiene colori." -#: ../app/dialogs/preferences-dialog.c:268 +#: ../app/dialogs/preferences-dialog.c:266 msgid "Reset All Preferences" msgstr "Reimposta tutte le preferenze" -#: ../app/dialogs/preferences-dialog.c:286 +#: ../app/dialogs/preferences-dialog.c:284 msgid "Do you really want to reset all preferences to default values?" msgstr "Sicuri di voler reimpostare tutte le preferenze ai valori predefiniti?" -#: ../app/dialogs/preferences-dialog.c:356 +#: ../app/dialogs/preferences-dialog.c:362 msgid "You will have to restart GIMP for the following changes to take effect:" msgstr "" "È necessario riavviare GIMP affinché i seguenti cambiamenti abbiano effetto:" -#: ../app/dialogs/preferences-dialog.c:538 +#: ../app/dialogs/preferences-dialog.c:544 msgid "" "Your keyboard shortcuts will be reset to default values the next time you " "start GIMP." @@ -9584,15 +9583,15 @@ "I tasti scorciatoia saranno reimpostati ai valori predefiniti al prossimo " "riavvio di GIMP." -#: ../app/dialogs/preferences-dialog.c:549 +#: ../app/dialogs/preferences-dialog.c:555 msgid "Remove all Keyboard Shortcuts" msgstr "Rimuovere tutti i tasti scorciatoia" -#: ../app/dialogs/preferences-dialog.c:571 +#: ../app/dialogs/preferences-dialog.c:577 msgid "Do you really want to remove all keyboard shortcuts from all menus?" msgstr "Sicuri di voler rimuovere tutti i tasti scorciatoia da tutti i menu?" -#: ../app/dialogs/preferences-dialog.c:612 +#: ../app/dialogs/preferences-dialog.c:618 msgid "" "Your window setup will be reset to default values the next time you start " "GIMP." @@ -9600,7 +9599,7 @@ "Le impostazioni della finestra saranno reimpostate ai valori predefiniti al " "prossimo riavvio di GIMP." -#: ../app/dialogs/preferences-dialog.c:647 +#: ../app/dialogs/preferences-dialog.c:653 msgid "" "Your input device settings will be reset to default values the next time you " "start GIMP." @@ -9608,7 +9607,7 @@ "Le impostazioni dei dispositivi di ingresso saranno reimpostate ai valori " "predefiniti al prossimo riavvio di GIMP." -#: ../app/dialogs/preferences-dialog.c:682 +#: ../app/dialogs/preferences-dialog.c:688 msgid "" "Your tool options will be reset to default values the next time you start " "GIMP." @@ -9616,757 +9615,765 @@ "Le opzioni degli strumenti saranno reimpostate ai valori predefiniti al " "prossimo riavvio di GIMP." -#: ../app/dialogs/preferences-dialog.c:1268 +#: ../app/dialogs/preferences-dialog.c:1303 msgid "Show _menubar" msgstr "Mostra barra dei _menu" -#: ../app/dialogs/preferences-dialog.c:1272 +#: ../app/dialogs/preferences-dialog.c:1307 msgid "Show _rulers" msgstr "Mostra _righelli" -#: ../app/dialogs/preferences-dialog.c:1275 +#: ../app/dialogs/preferences-dialog.c:1310 msgid "Show scroll_bars" msgstr "Mostra _barre di scorrimento" -#: ../app/dialogs/preferences-dialog.c:1278 +#: ../app/dialogs/preferences-dialog.c:1313 msgid "Show s_tatusbar" msgstr "Mostra barra di s_tato" -#: ../app/dialogs/preferences-dialog.c:1286 +#: ../app/dialogs/preferences-dialog.c:1321 msgid "Show s_election" msgstr "Mostra s_elezione" -#: ../app/dialogs/preferences-dialog.c:1289 +#: ../app/dialogs/preferences-dialog.c:1324 msgid "Show _layer boundary" msgstr "Mostra il contorno del _livello" -#: ../app/dialogs/preferences-dialog.c:1292 +#: ../app/dialogs/preferences-dialog.c:1327 msgid "Show _guides" msgstr "Mostra le _guide" -#: ../app/dialogs/preferences-dialog.c:1295 +#: ../app/dialogs/preferences-dialog.c:1330 msgid "Show gri_d" msgstr "Mostra la grig_lia" -#: ../app/dialogs/preferences-dialog.c:1301 +#: ../app/dialogs/preferences-dialog.c:1336 msgid "Canvas _padding mode:" msgstr "Modalità riempimento su_perficie:" -#: ../app/dialogs/preferences-dialog.c:1306 +#: ../app/dialogs/preferences-dialog.c:1341 msgid "Custom p_adding color:" msgstr "Colore person_alizzato di riempimento:" -#: ../app/dialogs/preferences-dialog.c:1307 +#: ../app/dialogs/preferences-dialog.c:1342 msgid "Select Custom Canvas Padding Color" msgstr "Imposta colore personalizzato di riempimento superficie" -#: ../app/dialogs/preferences-dialog.c:1405 +#: ../app/dialogs/preferences-dialog.c:1440 msgid "Preferences" msgstr "Preferenze" -#: ../app/dialogs/preferences-dialog.c:1518 -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:1553 +#: ../app/dialogs/preferences-dialog.c:2827 msgid "Environment" msgstr "Ambiente" -#: ../app/dialogs/preferences-dialog.c:1532 +#: ../app/dialogs/preferences-dialog.c:1567 msgid "Resource Consumption" msgstr "Gestione risorse" -#: ../app/dialogs/preferences-dialog.c:1542 +#: ../app/dialogs/preferences-dialog.c:1577 msgid "Minimal number of _undo levels:" msgstr "Numero minimo di ann_ullamenti:" -#: ../app/dialogs/preferences-dialog.c:1545 +#: ../app/dialogs/preferences-dialog.c:1580 msgid "Maximum undo _memory:" msgstr "_Memoria massima annullamenti:" -#: ../app/dialogs/preferences-dialog.c:1548 +#: ../app/dialogs/preferences-dialog.c:1583 msgid "Tile cache _size:" msgstr "Dimen_sione cache riquadri:" -#: ../app/dialogs/preferences-dialog.c:1551 +#: ../app/dialogs/preferences-dialog.c:1586 msgid "Maximum _new image size:" msgstr "Dimensione massima _nuova immagine:" -#: ../app/dialogs/preferences-dialog.c:1556 +#: ../app/dialogs/preferences-dialog.c:1591 msgid "Number of _processors to use:" msgstr "Numero di _processori da usare:" #. Image Thumbnails -#: ../app/dialogs/preferences-dialog.c:1561 +#: ../app/dialogs/preferences-dialog.c:1596 msgid "Image Thumbnails" msgstr "Miniature immagini" -#: ../app/dialogs/preferences-dialog.c:1566 +#: ../app/dialogs/preferences-dialog.c:1601 msgid "Size of _thumbnails:" msgstr "Dimen_sione delle miniature:" -#: ../app/dialogs/preferences-dialog.c:1570 +#: ../app/dialogs/preferences-dialog.c:1605 msgid "Maximum _filesize for thumbnailing:" msgstr "Massima dimensione _file per le miniature:" -#: ../app/dialogs/preferences-dialog.c:1580 +#: ../app/dialogs/preferences-dialog.c:1615 msgid "Keep record of used files in the Recent Documents list" msgstr "" "Mantenere la registrazione dei file usati recentemente nella cronologia dei " "documenti" -#: ../app/dialogs/preferences-dialog.c:1589 +#: ../app/dialogs/preferences-dialog.c:1624 msgid "User Interface" msgstr "Interfaccia utente" -#: ../app/dialogs/preferences-dialog.c:1592 +#: ../app/dialogs/preferences-dialog.c:1627 msgid "Interface" msgstr "Interfaccia" -#: ../app/dialogs/preferences-dialog.c:1602 +#: ../app/dialogs/preferences-dialog.c:1637 msgid "Language" msgstr "Lingua" #. Previews -#: ../app/dialogs/preferences-dialog.c:1608 +#: ../app/dialogs/preferences-dialog.c:1643 msgid "Previews" msgstr "Anteprime" -#: ../app/dialogs/preferences-dialog.c:1611 +#: ../app/dialogs/preferences-dialog.c:1646 msgid "_Enable layer & channel previews" msgstr "_Abilita anteprime dei livelli e dei canali" -#: ../app/dialogs/preferences-dialog.c:1617 +#: ../app/dialogs/preferences-dialog.c:1652 msgid "_Default layer & channel preview size:" msgstr "_Dimensione predefinita anteprime dei livelli e dei canali:" -#: ../app/dialogs/preferences-dialog.c:1620 +#: ../app/dialogs/preferences-dialog.c:1655 msgid "Na_vigation preview size:" msgstr "Dimensione anteprima di na_vigazione:" #. Keyboard Shortcuts -#: ../app/dialogs/preferences-dialog.c:1624 +#: ../app/dialogs/preferences-dialog.c:1659 msgid "Keyboard Shortcuts" msgstr "Tasti scorciatoia" -#: ../app/dialogs/preferences-dialog.c:1628 +#: ../app/dialogs/preferences-dialog.c:1663 msgid "_Use dynamic keyboard shortcuts" msgstr "_Usa tasti scorciatoia dinamici" -#: ../app/dialogs/preferences-dialog.c:1632 +#: ../app/dialogs/preferences-dialog.c:1667 msgid "Configure _Keyboard Shortcuts..." msgstr "Configura _tasti scorciatoia..." -#: ../app/dialogs/preferences-dialog.c:1639 +#: ../app/dialogs/preferences-dialog.c:1674 msgid "_Save keyboard shortcuts on exit" msgstr "_Salva i tasti scorciatoia all'uscita" -#: ../app/dialogs/preferences-dialog.c:1643 +#: ../app/dialogs/preferences-dialog.c:1678 msgid "Save Keyboard Shortcuts _Now" msgstr "Salva _ora i tasti scorciatoia" -#: ../app/dialogs/preferences-dialog.c:1650 +#: ../app/dialogs/preferences-dialog.c:1685 msgid "_Reset Keyboard Shortcuts to Default Values" msgstr "_Ripristina i tasti scorciatoia ai valori predefiniti" -#: ../app/dialogs/preferences-dialog.c:1659 +#: ../app/dialogs/preferences-dialog.c:1694 msgid "Remove _All Keyboard Shortcuts" msgstr "Rimuovi _tutti i tasti scorciatoia" -#: ../app/dialogs/preferences-dialog.c:1671 -#: ../app/dialogs/preferences-dialog.c:1710 +#: ../app/dialogs/preferences-dialog.c:1706 +#: ../app/dialogs/preferences-dialog.c:1745 msgid "Theme" msgstr "Tema" -#: ../app/dialogs/preferences-dialog.c:1680 +#: ../app/dialogs/preferences-dialog.c:1715 msgid "Select Theme" msgstr "Seleziona tema" -#: ../app/dialogs/preferences-dialog.c:1762 +#: ../app/dialogs/preferences-dialog.c:1797 msgid "Reload C_urrent Theme" msgstr "Ricarica il tema c_orrente" -#: ../app/dialogs/preferences-dialog.c:1774 +#: ../app/dialogs/preferences-dialog.c:1809 msgid "Help System" msgstr "Aiuto" #. General -#: ../app/dialogs/preferences-dialog.c:1786 -#: ../app/dialogs/preferences-dialog.c:1873 -#: ../app/dialogs/preferences-dialog.c:2086 +#: ../app/dialogs/preferences-dialog.c:1821 +#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:2123 #: ../app/widgets/gimpcontrollereditor.c:185 msgid "General" msgstr "Generale" -#: ../app/dialogs/preferences-dialog.c:1789 +#: ../app/dialogs/preferences-dialog.c:1824 msgid "Show _tooltips" msgstr "Mostra i suggerimen_ti" -#: ../app/dialogs/preferences-dialog.c:1792 +#: ../app/dialogs/preferences-dialog.c:1827 msgid "Show help _buttons" msgstr "Mostra _tasti di aiuto" -#: ../app/dialogs/preferences-dialog.c:1805 +#: ../app/dialogs/preferences-dialog.c:1832 msgid "Use the online version" msgstr "Usa la versione online" -#: ../app/dialogs/preferences-dialog.c:1806 +#: ../app/dialogs/preferences-dialog.c:1833 msgid "Use a locally installed copy" msgstr "Usa la versione installata localmente" -#: ../app/dialogs/preferences-dialog.c:1807 +#: ../app/dialogs/preferences-dialog.c:1834 msgid "User manual:" msgstr "Manuale utente:" -#: ../app/dialogs/preferences-dialog.c:1814 +#: ../app/dialogs/preferences-dialog.c:1841 msgid "There's a local installation of the user manual." msgstr "Non c'è alcuna installazione locale del manuale utente." -#: ../app/dialogs/preferences-dialog.c:1819 +#: ../app/dialogs/preferences-dialog.c:1847 msgid "The user manual is not installed locally." msgstr "Il manuale utente non è stato installato localmente." -#: ../app/dialogs/preferences-dialog.c:1844 +#. If there is no webkit available, assume we are on a platform +#. * that doesn't use the help browser, so don't bother showing +#. * the combo. +#. +#: ../app/dialogs/preferences-dialog.c:1860 msgid "Help Browser" msgstr "Visualizzatore dell'aiuto" -#: ../app/dialogs/preferences-dialog.c:1848 +#: ../app/dialogs/preferences-dialog.c:1867 msgid "H_elp browser to use:" msgstr "Visualizzatore dell'aiuto da utilizzar_e:" -#: ../app/dialogs/preferences-dialog.c:1876 +#: ../app/dialogs/preferences-dialog.c:1873 +msgid "" +"The GIMP help browser doesn't seem to be installed. Using the web browser " +"instead." +msgstr "Manca il visualizzatore delle pagine dell'aiuto di GIMP. Uso del navigatore internet in sua vece." + +#: ../app/dialogs/preferences-dialog.c:1913 msgid "_Save tool options on exit" msgstr "_Salva le opzioni degli strumenti all'uscita" -#: ../app/dialogs/preferences-dialog.c:1880 +#: ../app/dialogs/preferences-dialog.c:1917 msgid "Save Tool Options _Now" msgstr "Salva ora le opzioni strume_nti" -#: ../app/dialogs/preferences-dialog.c:1887 +#: ../app/dialogs/preferences-dialog.c:1924 msgid "_Reset Saved Tool Options to Default Values" msgstr "_Reimposta le opzioni degli strumenti salvate ai valori predefiniti" #. Snapping Distance -#: ../app/dialogs/preferences-dialog.c:1897 +#: ../app/dialogs/preferences-dialog.c:1934 msgid "Guide & Grid Snapping" msgstr "Magnetismo guide e griglia" -#: ../app/dialogs/preferences-dialog.c:1902 +#: ../app/dialogs/preferences-dialog.c:1939 msgid "_Snap distance:" msgstr "Distanza magneti_smo:" -#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:1947 msgid "Default _interpolation:" msgstr "_Interpolazione predefinita:" #. Global Brush, Pattern, ... -#: ../app/dialogs/preferences-dialog.c:1917 +#: ../app/dialogs/preferences-dialog.c:1954 msgid "Paint Options Shared Between Tools" msgstr "Opzioni di disegno condivise tra gli strumenti" -#: ../app/dialogs/preferences-dialog.c:1921 +#: ../app/dialogs/preferences-dialog.c:1958 msgid "_Brush" msgstr "_Pennello" -#: ../app/dialogs/preferences-dialog.c:1924 +#: ../app/dialogs/preferences-dialog.c:1961 msgid "_Dynamics" msgstr "_Dinamiche" -#: ../app/dialogs/preferences-dialog.c:1927 +#: ../app/dialogs/preferences-dialog.c:1964 msgid "_Pattern" msgstr "_Motivo" #. Move Tool -#: ../app/dialogs/preferences-dialog.c:1934 +#: ../app/dialogs/preferences-dialog.c:1971 msgid "Move Tool" msgstr "Strumento sposta" -#: ../app/dialogs/preferences-dialog.c:1938 +#: ../app/dialogs/preferences-dialog.c:1975 msgid "Set layer or path as active" msgstr "Imposta il livello o il tracciato come attivo" #. Appearance -#: ../app/dialogs/preferences-dialog.c:1963 -#: ../app/dialogs/preferences-dialog.c:2162 -#: ../app/widgets/gimpgrideditor.c:134 +#: ../app/dialogs/preferences-dialog.c:2000 +#: ../app/dialogs/preferences-dialog.c:2199 ../app/widgets/gimpgrideditor.c:134 msgid "Appearance" msgstr "Aspetto" -#: ../app/dialogs/preferences-dialog.c:1967 +#: ../app/dialogs/preferences-dialog.c:2004 msgid "Show _foreground & background color" msgstr "Mostra i colori di primo piano e s_fondo" -#: ../app/dialogs/preferences-dialog.c:1971 +#: ../app/dialogs/preferences-dialog.c:2008 msgid "Show active _brush, pattern & gradient" msgstr "Mostra il _pennello, il motivo e il gradiente attivi" -#: ../app/dialogs/preferences-dialog.c:1975 +#: ../app/dialogs/preferences-dialog.c:2012 msgid "Show active _image" msgstr "Mostra _immagine attiva" #. Tool Editor -#: ../app/dialogs/preferences-dialog.c:1983 +#: ../app/dialogs/preferences-dialog.c:2020 msgid "Tools configuration" msgstr "Configurazione strumenti" -#: ../app/dialogs/preferences-dialog.c:1998 +#: ../app/dialogs/preferences-dialog.c:2035 msgid "Default New Image" msgstr "Nuova immagine predefinita" -#: ../app/dialogs/preferences-dialog.c:2001 +#: ../app/dialogs/preferences-dialog.c:2038 msgid "Default Image" msgstr "Immagine predefinita" -#: ../app/dialogs/preferences-dialog.c:2035 +#: ../app/dialogs/preferences-dialog.c:2072 msgid "Set the default Quick Mask color" msgstr "Imposta il colore predefinito della maschera veloce" -#: ../app/dialogs/preferences-dialog.c:2041 +#: ../app/dialogs/preferences-dialog.c:2078 msgid "Quick Mask color:" msgstr "Colore maschera veloce:" -#: ../app/dialogs/preferences-dialog.c:2051 +#: ../app/dialogs/preferences-dialog.c:2088 msgid "Default Image Grid" msgstr "Griglia immagine predefinita" -#: ../app/dialogs/preferences-dialog.c:2054 +#: ../app/dialogs/preferences-dialog.c:2091 msgid "Default Grid" msgstr "Griglia predefinita" -#: ../app/dialogs/preferences-dialog.c:2074 +#: ../app/dialogs/preferences-dialog.c:2111 msgid "Image Windows" msgstr "Finestre immagine" -#: ../app/dialogs/preferences-dialog.c:2089 +#: ../app/dialogs/preferences-dialog.c:2126 msgid "Use \"_Dot for dot\" by default" msgstr "Utilizza \"punto per punto\" come preimpostazione" -#: ../app/dialogs/preferences-dialog.c:2095 +#: ../app/dialogs/preferences-dialog.c:2132 msgid "Marching _ants speed:" msgstr "Velocità _animazione selezione:" #. Zoom & Resize Behavior -#: ../app/dialogs/preferences-dialog.c:2099 +#: ../app/dialogs/preferences-dialog.c:2136 msgid "Zoom & Resize Behavior" msgstr "Comportamento dello zoom e del ridimensionamento" -#: ../app/dialogs/preferences-dialog.c:2103 +#: ../app/dialogs/preferences-dialog.c:2140 msgid "Resize window on _zoom" msgstr "Ridimensiona finestra ad ogni _zoom" -#: ../app/dialogs/preferences-dialog.c:2106 +#: ../app/dialogs/preferences-dialog.c:2143 msgid "Resize window on image _size change" msgstr "Ridimensiona la finestra ad ogni modifica di _ampiezza" -#: ../app/dialogs/preferences-dialog.c:2112 +#: ../app/dialogs/preferences-dialog.c:2149 msgid "Fit to window" msgstr "Adatta alla finestra" -#: ../app/dialogs/preferences-dialog.c:2114 +#: ../app/dialogs/preferences-dialog.c:2151 msgid "Initial zoom _ratio:" msgstr "_Rapporto di zoom iniziale:" #. Space Bar -#: ../app/dialogs/preferences-dialog.c:2118 +#: ../app/dialogs/preferences-dialog.c:2155 msgid "Space Bar" msgstr "Barra spazio" -#: ../app/dialogs/preferences-dialog.c:2124 +#: ../app/dialogs/preferences-dialog.c:2161 msgid "_While space bar is pressed:" msgstr "_Mentre la barra spazio è premuta:" #. Mouse Pointers -#: ../app/dialogs/preferences-dialog.c:2128 +#: ../app/dialogs/preferences-dialog.c:2165 msgid "Mouse Pointers" msgstr "Puntatori del mouse" -#: ../app/dialogs/preferences-dialog.c:2132 +#: ../app/dialogs/preferences-dialog.c:2169 msgid "Show _brush outline" msgstr "Mostra il _bordo esterno del pennello" -#: ../app/dialogs/preferences-dialog.c:2135 +#: ../app/dialogs/preferences-dialog.c:2172 msgid "Show pointer for paint _tools" msgstr "Mostra il puntatore con gli s_trumenti di disegno" -#: ../app/dialogs/preferences-dialog.c:2141 +#: ../app/dialogs/preferences-dialog.c:2178 msgid "Pointer _mode:" msgstr "_Modalità puntatore:" -#: ../app/dialogs/preferences-dialog.c:2144 +#: ../app/dialogs/preferences-dialog.c:2181 msgid "Pointer re_ndering:" msgstr "Re_ndering puntatore:" -#: ../app/dialogs/preferences-dialog.c:2147 +#: ../app/dialogs/preferences-dialog.c:2184 msgid "Pointer _handedness:" msgstr "Durez_za del puntatore:" -#: ../app/dialogs/preferences-dialog.c:2159 +#: ../app/dialogs/preferences-dialog.c:2196 msgid "Image Window Appearance" msgstr "Aspetto finestre immagine" -#: ../app/dialogs/preferences-dialog.c:2170 +#: ../app/dialogs/preferences-dialog.c:2207 msgid "Default Appearance in Normal Mode" msgstr "Visualizzazione predefinita in modalità normale" -#: ../app/dialogs/preferences-dialog.c:2175 +#: ../app/dialogs/preferences-dialog.c:2212 msgid "Default Appearance in Fullscreen Mode" msgstr "Visualizzazione predefinita in modalità a schermo pieno" -#: ../app/dialogs/preferences-dialog.c:2184 +#: ../app/dialogs/preferences-dialog.c:2221 msgid "Image Title & Statusbar Format" msgstr "Formato del titolo immagine e della barra di stato" -#: ../app/dialogs/preferences-dialog.c:2187 +#: ../app/dialogs/preferences-dialog.c:2224 msgid "Title & Status" msgstr "Titolo e stato" -#: ../app/dialogs/preferences-dialog.c:2205 +#: ../app/dialogs/preferences-dialog.c:2242 msgid "Current format" msgstr "Formato corrente" -#: ../app/dialogs/preferences-dialog.c:2206 +#: ../app/dialogs/preferences-dialog.c:2243 msgid "Default format" msgstr "Formato predefinito" -#: ../app/dialogs/preferences-dialog.c:2207 +#: ../app/dialogs/preferences-dialog.c:2244 msgid "Show zoom percentage" msgstr "Mostra percentuale dello zoom" -#: ../app/dialogs/preferences-dialog.c:2208 +#: ../app/dialogs/preferences-dialog.c:2245 msgid "Show zoom ratio" msgstr "Mostra rapporto zoom" -#: ../app/dialogs/preferences-dialog.c:2209 +#: ../app/dialogs/preferences-dialog.c:2246 msgid "Show image size" msgstr "Mostra dimensione immagine" -#: ../app/dialogs/preferences-dialog.c:2222 +#: ../app/dialogs/preferences-dialog.c:2259 msgid "Image Title Format" msgstr "Formato del titolo immagine" -#: ../app/dialogs/preferences-dialog.c:2224 +#: ../app/dialogs/preferences-dialog.c:2261 msgid "Image Statusbar Format" msgstr "Formato della barra di stato dell'immagine" -#: ../app/dialogs/preferences-dialog.c:2309 +#: ../app/dialogs/preferences-dialog.c:2346 msgid "Display" msgstr "Visualizzazione" #. Transparency -#: ../app/dialogs/preferences-dialog.c:2321 +#: ../app/dialogs/preferences-dialog.c:2358 msgid "Transparency" msgstr "Trasparenza" -#: ../app/dialogs/preferences-dialog.c:2325 +#: ../app/dialogs/preferences-dialog.c:2362 msgid "_Check style:" msgstr "Stile s_cacchi:" -#: ../app/dialogs/preferences-dialog.c:2328 +#: ../app/dialogs/preferences-dialog.c:2365 msgid "Check _size:" msgstr "Dimen_sione scacchi:" -#: ../app/dialogs/preferences-dialog.c:2331 +#: ../app/dialogs/preferences-dialog.c:2368 msgid "Monitor Resolution" msgstr "Risoluzione monitor" #. Pixels -#: ../app/dialogs/preferences-dialog.c:2335 -#: ../app/display/gimpcursorview.c:208 ../app/widgets/gimpgrideditor.c:199 -#: ../app/widgets/gimpgrideditor.c:231 +#: ../app/dialogs/preferences-dialog.c:2372 ../app/display/gimpcursorview.c:208 +#: ../app/widgets/gimpgrideditor.c:199 ../app/widgets/gimpgrideditor.c:231 msgid "Pixels" msgstr "Pixel" -#: ../app/dialogs/preferences-dialog.c:2353 +#: ../app/dialogs/preferences-dialog.c:2390 msgid "Horizontal" msgstr "Orizzontale" -#: ../app/dialogs/preferences-dialog.c:2355 +#: ../app/dialogs/preferences-dialog.c:2392 msgid "Vertical" msgstr "Verticale" -#: ../app/dialogs/preferences-dialog.c:2357 +#: ../app/dialogs/preferences-dialog.c:2394 #: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "ppi" -#: ../app/dialogs/preferences-dialog.c:2373 +#: ../app/dialogs/preferences-dialog.c:2410 #, c-format msgid "_Detect automatically (currently %d × %d ppi)" msgstr "_Rileva automaticamente (attualmente %d × %d ppi)" -#: ../app/dialogs/preferences-dialog.c:2391 +#: ../app/dialogs/preferences-dialog.c:2428 msgid "_Enter manually" msgstr "_Inserisci manualmente" -#: ../app/dialogs/preferences-dialog.c:2406 +#: ../app/dialogs/preferences-dialog.c:2443 msgid "C_alibrate..." msgstr "C_alibratura..." -#: ../app/dialogs/preferences-dialog.c:2434 +#: ../app/dialogs/preferences-dialog.c:2471 msgid "Color Management" msgstr "Gestione del colore" -#: ../app/dialogs/preferences-dialog.c:2454 +#: ../app/dialogs/preferences-dialog.c:2491 msgid "_RGB profile:" msgstr "Profilo _RGB:" -#: ../app/dialogs/preferences-dialog.c:2455 +#: ../app/dialogs/preferences-dialog.c:2492 msgid "Select RGB Color Profile" msgstr "Seleziona il profilo colore RGB" -#: ../app/dialogs/preferences-dialog.c:2456 +#: ../app/dialogs/preferences-dialog.c:2493 msgid "_CMYK profile:" msgstr "Profilo _CMYK:" -#: ../app/dialogs/preferences-dialog.c:2457 +#: ../app/dialogs/preferences-dialog.c:2494 msgid "Select CMYK Color Profile" msgstr "Seleziona il profilo colore CMYK" -#: ../app/dialogs/preferences-dialog.c:2458 +#: ../app/dialogs/preferences-dialog.c:2495 msgid "_Monitor profile:" msgstr "Profilo _monitor:" -#: ../app/dialogs/preferences-dialog.c:2459 +#: ../app/dialogs/preferences-dialog.c:2496 msgid "Select Monitor Color Profile" msgstr "Seleziona il profilo colore del monitor" -#: ../app/dialogs/preferences-dialog.c:2460 +#: ../app/dialogs/preferences-dialog.c:2497 msgid "_Print simulation profile:" msgstr "_Profilo di simulazione della stampa:" -#: ../app/dialogs/preferences-dialog.c:2461 +#: ../app/dialogs/preferences-dialog.c:2498 msgid "Select Printer Color Profile" msgstr "Seleziona il profilo colore della stampante" -#: ../app/dialogs/preferences-dialog.c:2472 +#: ../app/dialogs/preferences-dialog.c:2509 msgid "_Mode of operation:" msgstr "_Modalità di operazione:" -#: ../app/dialogs/preferences-dialog.c:2502 +#: ../app/dialogs/preferences-dialog.c:2539 msgid "_Try to use the system monitor profile" msgstr "Prova ad usare il profilo del moni_tor di sistema" -#: ../app/dialogs/preferences-dialog.c:2512 +#: ../app/dialogs/preferences-dialog.c:2549 msgid "_Display rendering intent:" msgstr "Intento di rendering per il _display:" -#: ../app/dialogs/preferences-dialog.c:2521 +#: ../app/dialogs/preferences-dialog.c:2558 msgid "_Softproof rendering intent:" msgstr "Intento di rendering per la _simulazione a video:" -#: ../app/dialogs/preferences-dialog.c:2534 +#: ../app/dialogs/preferences-dialog.c:2571 msgid "Mark out of gamut colors" msgstr "Evidenzia i colori fuori gamut" -#: ../app/dialogs/preferences-dialog.c:2539 +#: ../app/dialogs/preferences-dialog.c:2576 msgid "Select Warning Color" msgstr "Selezione colore di avvertimento" -#: ../app/dialogs/preferences-dialog.c:2552 +#: ../app/dialogs/preferences-dialog.c:2589 msgid "File Open behaviour:" msgstr "Comportamento apertura file:" -#: ../app/dialogs/preferences-dialog.c:2564 +#: ../app/dialogs/preferences-dialog.c:2601 msgid "Input Devices" msgstr "Dispositivi di ingresso" #. Extended Input Devices -#: ../app/dialogs/preferences-dialog.c:2574 +#: ../app/dialogs/preferences-dialog.c:2611 msgid "Extended Input Devices" msgstr "Dispositivi di ingresso estesi" -#: ../app/dialogs/preferences-dialog.c:2578 +#: ../app/dialogs/preferences-dialog.c:2615 msgid "Configure E_xtended Input Devices..." msgstr "Configurazione dispositivi di ingresso _estesi..." -#: ../app/dialogs/preferences-dialog.c:2585 +#: ../app/dialogs/preferences-dialog.c:2622 msgid "_Save input device settings on exit" msgstr "All'uscita _salva lo stato dei dispositivi di ingresso" -#: ../app/dialogs/preferences-dialog.c:2589 +#: ../app/dialogs/preferences-dialog.c:2626 msgid "Save Input Device Settings _Now" msgstr "Salva _ora lo stato dei dispositivi di ingresso" -#: ../app/dialogs/preferences-dialog.c:2596 +#: ../app/dialogs/preferences-dialog.c:2633 msgid "_Reset Saved Input Device Settings to Default Values" msgstr "" "_Reimposta lo stato dei dispositivi di ingresso salvato ai valori predefiniti" -#: ../app/dialogs/preferences-dialog.c:2611 +#: ../app/dialogs/preferences-dialog.c:2648 msgid "Additional Input Controllers" msgstr "Controllori di ingresso aggiuntivi" -#: ../app/dialogs/preferences-dialog.c:2614 +#: ../app/dialogs/preferences-dialog.c:2651 msgid "Input Controllers" msgstr "Controllori di ingresso" -#: ../app/dialogs/preferences-dialog.c:2630 +#: ../app/dialogs/preferences-dialog.c:2667 msgid "Window Management" msgstr "Gestione finestre" -#: ../app/dialogs/preferences-dialog.c:2639 +#: ../app/dialogs/preferences-dialog.c:2676 msgid "Window Manager Hints" msgstr "Suggerimenti del gestore finestre" -#: ../app/dialogs/preferences-dialog.c:2645 +#: ../app/dialogs/preferences-dialog.c:2682 msgid "Hint for _docks and toolbox:" msgstr "Suggerimento per le finestre ag_ganciabili e per gli strumenti:" -#: ../app/dialogs/preferences-dialog.c:2648 +#: ../app/dialogs/preferences-dialog.c:2685 msgid "Focus" msgstr "Focus" -#: ../app/dialogs/preferences-dialog.c:2652 +#: ../app/dialogs/preferences-dialog.c:2689 msgid "Activate the _focused image" msgstr "Attiva l'immagine in _focus" #. Window Positions -#: ../app/dialogs/preferences-dialog.c:2656 +#: ../app/dialogs/preferences-dialog.c:2693 msgid "Window Positions" msgstr "Posizione finestra" -#: ../app/dialogs/preferences-dialog.c:2659 +#: ../app/dialogs/preferences-dialog.c:2696 msgid "_Save window positions on exit" msgstr "_Salva le posizioni delle finestre all'uscita" -#: ../app/dialogs/preferences-dialog.c:2663 +#: ../app/dialogs/preferences-dialog.c:2700 msgid "Save Window Positions _Now" msgstr "Salva _ora la posizione delle finestre" -#: ../app/dialogs/preferences-dialog.c:2670 +#: ../app/dialogs/preferences-dialog.c:2707 msgid "_Reset Saved Window Positions to Default Values" msgstr "_Reimposta la posizione delle finestre salvata ai valori predefiniti" -#: ../app/dialogs/preferences-dialog.c:2685 +#: ../app/dialogs/preferences-dialog.c:2722 msgid "Folders" msgstr "Cartelle" -#: ../app/dialogs/preferences-dialog.c:2705 +#: ../app/dialogs/preferences-dialog.c:2742 msgid "Temporary folder:" msgstr "Cartella file temporanei:" -#: ../app/dialogs/preferences-dialog.c:2706 +#: ../app/dialogs/preferences-dialog.c:2743 msgid "Select Folder for Temporary Files" msgstr "Selezionare la cartella per i file temporanei" -#: ../app/dialogs/preferences-dialog.c:2710 +#: ../app/dialogs/preferences-dialog.c:2747 msgid "Swap folder:" msgstr "Cartella di scambio:" -#: ../app/dialogs/preferences-dialog.c:2711 +#: ../app/dialogs/preferences-dialog.c:2748 msgid "Select Swap Folder" msgstr "Seleziona la cartella di scambio" -#: ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/preferences-dialog.c:2783 msgid "Brush Folders" msgstr "Cartelle pennelli" -#: ../app/dialogs/preferences-dialog.c:2748 +#: ../app/dialogs/preferences-dialog.c:2785 msgid "Select Brush Folders" msgstr "Seleziona le cartelle dei pennelli" -#: ../app/dialogs/preferences-dialog.c:2750 +#: ../app/dialogs/preferences-dialog.c:2787 msgid "Dynamics Folders" msgstr "Cartelle delle dinamiche" -#: ../app/dialogs/preferences-dialog.c:2752 +#: ../app/dialogs/preferences-dialog.c:2789 msgid "Select Dynamics Folders" msgstr "Seleziona le cartelle delle dinamiche" -#: ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/preferences-dialog.c:2791 msgid "Pattern Folders" msgstr "Cartelle motivi" -#: ../app/dialogs/preferences-dialog.c:2756 +#: ../app/dialogs/preferences-dialog.c:2793 msgid "Select Pattern Folders" msgstr "Seleziona le cartelle dei motivi" -#: ../app/dialogs/preferences-dialog.c:2758 +#: ../app/dialogs/preferences-dialog.c:2795 msgid "Palette Folders" msgstr "Cartelle delle tavolozze" -#: ../app/dialogs/preferences-dialog.c:2760 +#: ../app/dialogs/preferences-dialog.c:2797 msgid "Select Palette Folders" msgstr "Seleziona le cartelle delle tavolozze" -#: ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/preferences-dialog.c:2799 msgid "Gradient Folders" msgstr "Cartelle dei gradienti" -#: ../app/dialogs/preferences-dialog.c:2764 +#: ../app/dialogs/preferences-dialog.c:2801 msgid "Select Gradient Folders" msgstr "Seleziona le cartelle dei gradienti" -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2803 msgid "Font Folders" msgstr "Cartelle dei caratteri" -#: ../app/dialogs/preferences-dialog.c:2768 +#: ../app/dialogs/preferences-dialog.c:2805 msgid "Select Font Folders" msgstr "Seleziona le cartelle dei caratteri" -#: ../app/dialogs/preferences-dialog.c:2770 +#: ../app/dialogs/preferences-dialog.c:2807 msgid "Tool Preset Folders" msgstr "Cartelle preimpostazioni strumento" -#: ../app/dialogs/preferences-dialog.c:2772 +#: ../app/dialogs/preferences-dialog.c:2809 msgid "Select Tool Preset Folders" msgstr "Seleziona le cartelle delle preimpostazioni strumento" -#: ../app/dialogs/preferences-dialog.c:2774 +#: ../app/dialogs/preferences-dialog.c:2811 msgid "Plug-In Folders" msgstr "Cartelle dei plug-in" -#: ../app/dialogs/preferences-dialog.c:2776 +#: ../app/dialogs/preferences-dialog.c:2813 msgid "Select Plug-In Folders" msgstr "Seleziona le cartelle dei plug-in" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2815 msgid "Scripts" msgstr "Script" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2815 msgid "Script-Fu Folders" msgstr "Cartelle degli Script-Fu" -#: ../app/dialogs/preferences-dialog.c:2780 +#: ../app/dialogs/preferences-dialog.c:2817 msgid "Select Script-Fu Folders" msgstr "Seleziona le cartelle degli Script-Fu" -#: ../app/dialogs/preferences-dialog.c:2782 +#: ../app/dialogs/preferences-dialog.c:2819 msgid "Module Folders" msgstr "Cartelle dei moduli" -#: ../app/dialogs/preferences-dialog.c:2784 +#: ../app/dialogs/preferences-dialog.c:2821 msgid "Select Module Folders" msgstr "Seleziona le cartelle dei moduli" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Interpreters" msgstr "Interpreti" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Interpreter Folders" msgstr "Cartelle interpreti" -#: ../app/dialogs/preferences-dialog.c:2788 +#: ../app/dialogs/preferences-dialog.c:2825 msgid "Select Interpreter Folders" msgstr "Seleziona le cartelle interpreti" -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:2827 msgid "Environment Folders" msgstr "Cartelle di ambiente" -#: ../app/dialogs/preferences-dialog.c:2792 +#: ../app/dialogs/preferences-dialog.c:2829 msgid "Select Environment Folders" msgstr "Seleziona le cartelle di ambiente" -#: ../app/dialogs/preferences-dialog.c:2794 +#: ../app/dialogs/preferences-dialog.c:2831 msgid "Themes" msgstr "Temi" -#: ../app/dialogs/preferences-dialog.c:2794 +#: ../app/dialogs/preferences-dialog.c:2831 msgid "Theme Folders" msgstr "Cartelle dei temi" -#: ../app/dialogs/preferences-dialog.c:2796 +#: ../app/dialogs/preferences-dialog.c:2833 msgid "Select Theme Folders" msgstr "Seleziona le cartelle dei temi" @@ -10445,8 +10452,7 @@ msgstr "" "Premere %s per abbandonare tutti i cambiamenti e chiudere tutte le immagini." -#: ../app/dialogs/quit-dialog.c:341 -#: ../app/display/gimpdisplayshell-close.c:180 +#: ../app/dialogs/quit-dialog.c:341 ../app/display/gimpdisplayshell-close.c:180 msgid "_Discard Changes" msgstr "Abban_dona le modifiche" @@ -10717,8 +10723,8 @@ msgid "Navigate the image display" msgstr "Naviga nella finestra immagine" -#: ../app/display/gimpdisplayshell.c:746 -#: ../app/display/gimpdisplayshell.c:1331 ../app/widgets/gimptoolbox.c:253 +#: ../app/display/gimpdisplayshell.c:746 ../app/display/gimpdisplayshell.c:1331 +#: ../app/widgets/gimptoolbox.c:253 msgid "Drop image files here to open them" msgstr "Trascina e rilascia qui i file immagine per aprirli" @@ -10879,26 +10885,26 @@ msgid "Not a regular file" msgstr "Non è un file regolare" -#: ../app/file/file-open.c:191 +#: ../app/file/file-open.c:197 #, c-format msgid "%s plug-in returned SUCCESS but did not return an image" msgstr "Il plug-in %s ha risposto successo ma non ha restituito un'immagine" -#: ../app/file/file-open.c:202 +#: ../app/file/file-open.c:208 #, c-format msgid "%s plug-In could not open image" msgstr "Il plug-in %s non può aprire l'immagine" -#: ../app/file/file-open.c:533 +#: ../app/file/file-open.c:539 msgid "Image doesn't contain any layers" msgstr "L'immagine non contiene nessun livello" -#: ../app/file/file-open.c:593 +#: ../app/file/file-open.c:599 #, c-format msgid "Opening '%s' failed: %s" msgstr "L'apertura di \"%s\" è fallita: %s" -#: ../app/file/file-open.c:703 +#: ../app/file/file-open.c:709 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -11427,8 +11433,7 @@ "La procedura \"%s\" è stata chiamata con un argomento di tipo errato #%d. " "Era previsto %s, ottenuto invece %s. " -#: ../app/pdb/gimppdbcontext.c:89 -#: ../app/tools/gimpforegroundselectoptions.c:79 +#: ../app/pdb/gimppdbcontext.c:89 ../app/tools/gimpforegroundselectoptions.c:79 #: ../app/tools/gimpselectionoptions.c:78 msgid "Smooth edges" msgstr "Margini morbidi" @@ -11614,7 +11619,7 @@ "Errore di esecuzione per la procedura \"%s\":\n" "%s" -#: ../app/plug-in/gimpplugin-progress.c:331 +#: ../app/plug-in/gimpplugin-progress.c:339 msgid "Cancelled" msgstr "Annullato" @@ -12199,8 +12204,7 @@ msgid "Click to set a new clone source" msgstr "Fare clic per impostare una nuova sorgente per la duplicazione" -#: ../app/tools/gimpclonetool.c:109 -#: ../app/tools/gimpperspectiveclonetool.c:899 +#: ../app/tools/gimpclonetool.c:109 ../app/tools/gimpperspectiveclonetool.c:899 msgid "Source" msgstr "Sorgente" @@ -12315,18 +12319,15 @@ msgid "Select Color" msgstr "Selezione colore" -#: ../app/tools/gimpcolorizetool.c:241 -#: ../app/tools/gimphuesaturationtool.c:381 +#: ../app/tools/gimpcolorizetool.c:241 ../app/tools/gimphuesaturationtool.c:381 msgid "_Hue:" msgstr "_Tonalità:" -#: ../app/tools/gimpcolorizetool.c:254 -#: ../app/tools/gimphuesaturationtool.c:413 +#: ../app/tools/gimpcolorizetool.c:254 ../app/tools/gimphuesaturationtool.c:413 msgid "_Saturation:" msgstr "_Saturazione:" -#: ../app/tools/gimpcolorizetool.c:267 -#: ../app/tools/gimphuesaturationtool.c:397 +#: ../app/tools/gimpcolorizetool.c:267 ../app/tools/gimphuesaturationtool.c:397 msgid "_Lightness:" msgstr "_Luminosità:" @@ -12336,8 +12337,7 @@ #: ../app/tools/gimpcoloroptions.c:157 #: ../app/tools/gimprectangleselectoptions.c:163 -#: ../app/tools/gimpselectionoptions.c:277 -#: ../app/widgets/gimpbrusheditor.c:155 +#: ../app/tools/gimpselectionoptions.c:277 ../app/widgets/gimpbrusheditor.c:155 msgid "Radius" msgstr "Raggio" @@ -13058,8 +13058,7 @@ msgid "Size" msgstr "Dimensione" -#: ../app/tools/gimpinkoptions-gui.c:71 -#: ../app/tools/gimppaintoptions-gui.c:181 +#: ../app/tools/gimpinkoptions-gui.c:71 ../app/tools/gimppaintoptions-gui.c:181 #: ../app/widgets/gimpbrusheditor.c:199 msgid "Angle" msgstr "Angolo" @@ -13069,8 +13068,7 @@ msgid "Sensitivity" msgstr "Sensibilità" -#: ../app/tools/gimpinkoptions-gui.c:94 -#: ../app/widgets/gimpdynamicseditor.c:144 +#: ../app/tools/gimpinkoptions-gui.c:94 ../app/widgets/gimpdynamicseditor.c:144 #: ../app/widgets/gimpdynamicsoutputeditor.c:72 msgid "Tilt" msgstr "Inclinazione" @@ -13379,8 +13377,8 @@ msgstr "_Pennello" #: ../app/tools/gimppaintoptions-gui.c:89 -#: ../app/tools/gimpselectionoptions.c:217 -#: ../app/widgets/gimpbrushselect.c:190 ../app/widgets/gimplayertreeview.c:268 +#: ../app/tools/gimpselectionoptions.c:217 ../app/widgets/gimpbrushselect.c:190 +#: ../app/widgets/gimplayertreeview.c:268 msgid "Mode:" msgstr "Modalità:" @@ -13424,8 +13422,7 @@ msgid "Fade length" msgstr "Lunghezza dissolvenza " -#: ../app/tools/gimppaintoptions-gui.c:332 -#: ../app/widgets/gimpviewablebox.c:311 +#: ../app/tools/gimppaintoptions-gui.c:332 ../app/widgets/gimpviewablebox.c:311 msgid "Reverse" msgstr "Inverso" @@ -14521,8 +14518,7 @@ msgstr "Rapporto dimensioni" #: ../app/widgets/gimpbrusheditor.c:210 -#: ../app/widgets/gimpbrushfactoryview.c:80 -#: ../app/widgets/gimpgrideditor.c:174 +#: ../app/widgets/gimpbrushfactoryview.c:80 ../app/widgets/gimpgrideditor.c:174 msgid "Spacing" msgstr "Spaziatura" @@ -15331,15 +15327,15 @@ msgid "Height" msgstr "Altezza" -#: ../app/widgets/gimphelp.c:297 +#: ../app/widgets/gimphelp.c:308 msgid "Help browser is missing" msgstr "Manca il visualizzatore della guida" -#: ../app/widgets/gimphelp.c:298 +#: ../app/widgets/gimphelp.c:309 msgid "The GIMP help browser is not available." msgstr "Il visualizzatore dell'aiuto di GIMP non è disponibile." -#: ../app/widgets/gimphelp.c:299 +#: ../app/widgets/gimphelp.c:310 msgid "" "The GIMP help browser plug-in appears to be missing from your installation. " "You may instead use the web browser for reading the help pages." @@ -15348,31 +15344,35 @@ "comunque possibile usare un visualizzatore di pagine web per leggere le " "pagine dell'aiuto." -#: ../app/widgets/gimphelp.c:340 +#: ../app/widgets/gimphelp.c:351 msgid "Help browser doesn't start" msgstr "Visualizzatore dell'aiuto non parte" -#: ../app/widgets/gimphelp.c:341 +#: ../app/widgets/gimphelp.c:352 msgid "Could not start the GIMP help browser plug-in." msgstr "Impossibile eseguire il plug-in visualizzatore dell'aiuto di GIMP." -#: ../app/widgets/gimphelp.c:368 +#: ../app/widgets/gimphelp.c:354 +msgid "You may instead use the web browser for reading the help pages." +msgstr "È comunque possibile usare un visualizzatore di pagine web per leggere le pagine dell'aiuto." + +#: ../app/widgets/gimphelp.c:380 msgid "Use _Web Browser" msgstr "Usa un visualizzatore _web" -#: ../app/widgets/gimphelp.c:712 +#: ../app/widgets/gimphelp.c:724 msgid "GIMP user manual is missing" msgstr "Manca il manuale utente di GIMP" -#: ../app/widgets/gimphelp.c:719 +#: ../app/widgets/gimphelp.c:731 msgid "_Read Online" msgstr "Leg_gi online" -#: ../app/widgets/gimphelp.c:743 +#: ../app/widgets/gimphelp.c:755 msgid "The GIMP user manual is not installed on your computer." msgstr "Il manuale utente di GIMP non è installato sul computer." -#: ../app/widgets/gimphelp.c:746 +#: ../app/widgets/gimphelp.c:758 msgid "" "You may either install the additional help package or change your " "preferences to use the online version." @@ -15693,17 +15693,17 @@ msgid "%d ppi, %s" msgstr "%d ppi, %s" -#: ../app/widgets/gimptextbuffer-serialize.c:344 +#: ../app/widgets/gimptextbuffer-serialize.c:269 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "L'attributo \"%s\" non è valido sull'elemento <%s> in questo contesto" -#: ../app/widgets/gimptextbuffer-serialize.c:416 +#: ../app/widgets/gimptextbuffer-serialize.c:341 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "L'elemento più esterno nel testo deve essere un non <%s>" -#: ../app/widgets/gimptextbuffer.c:1459 +#: ../app/widgets/gimptextbuffer.c:1460 #, c-format msgid "Invalid UTF-8 data in file '%s'." msgstr "Dato UTF-8 non valido nel file '%s'" diff -Nru gimp-2.8.18/po/nb.po gimp-2.8.20/po/nb.po --- gimp-2.8.18/po/nb.po 2015-08-20 22:57:43.000000000 +0000 +++ gimp-2.8.20/po/nb.po 2017-01-28 19:08:49.000000000 +0000 @@ -12,7 +12,7 @@ "PO-Revision-Date: 2012-02-21 20:55+0100\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" -"Language: no\n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po/pl.po gimp-2.8.20/po/pl.po --- gimp-2.8.18/po/pl.po 2016-05-25 22:26:48.000000000 +0000 +++ gimp-2.8.20/po/pl.po 2017-01-28 19:08:49.000000000 +0000 @@ -1,15 +1,12 @@ -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Aviary.pl -# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz -# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: -# gnomepl@aviary.pl -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +# Polish translation for gimp. +# Copyright © 1999-2017 the gimp authors. +# This file is distributed under the same license as the gimp package. # Paweł Dziekoński, 1999-2000. # Bartosz Kosiorek , 2005-2011. # Piotr Zaryk , 2008. # Robert Gomulka , 2008. -# Piotr Drąg , 2011-2016. -# Aviary.pl , 2011-2016. +# Piotr Drąg , 2011-2017. +# Aviary.pl , 2011-2017. # # Terminy: # drawable - obszar rysowania (warstwa, kanał itp.) @@ -26,18 +23,16 @@ msgstr "" "Project-Id-Version: gimp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-11 18:28+0200\n" -"PO-Revision-Date: 2016-05-11 18:30+0200\n" +"POT-Creation-Date: 2017-01-10 16:33+0100\n" +"PO-Revision-Date: 2017-01-10 16:34+0100\n" "Last-Translator: Piotr Drąg \n" -"Language-Team: Polish \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Poedit-Language: Polish\n" -"X-Poedit-Country: Poland\n" #: ../app/about.h:23 msgid "GIMP" @@ -80,15 +75,15 @@ "Program GIMP jest wolnym oprogramowaniem; można go rozprowadzać dalej i/lub " "modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez " "Fundację Wolnego Oprogramowania — według wersji trzeciej tej Licencji lub " -"którejś z późniejszych wersji.\n" +"którejś z późniejszych wersji.\n" "\n" -" Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny " +" Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny " "— jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji PRZYDATNOŚCI " -"HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania " -"bliższych informacji należy zapoznać się z Powszechną Licencją Publiczną " +"HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania " +"bliższych informacji należy zapoznać się z Powszechną Licencją Publiczną " "GNU. \n" "\n" -"Z pewnością wraz z niniejszym programem dostarczono także egzemplarz " +"Z pewnością wraz z niniejszym programem dostarczono także egzemplarz " "Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie " "— proszę odwiedzić stronę internetową http://www.gnu.org/licenses/" @@ -103,7 +98,7 @@ "Nie można otworzyć testowego pliku wymiany.\n" "\n" "Aby zapobiec utracie danych, proszę zweryfikować położenie oraz uprawnienia " -"katalogu wymiany określonego w preferencjach programu (obecnie jest to „%s”)." +"katalogu wymiany określonego w preferencjach programu (obecnie jest to „%s”)." #: ../app/batch.c:75 #, c-format @@ -119,11 +114,11 @@ #: ../app/main.c:148 msgid "Show version information and exit" -msgstr "Wyświetla informację o wersji i kończy działanie" +msgstr "Wyświetla informację o wersji i kończy działanie" #: ../app/main.c:153 msgid "Show license information and exit" -msgstr "Wyświetla informację o licencji i kończy działanie" +msgstr "Wyświetla informację o licencji i kończy działanie" #: ../app/main.c:158 msgid "Be more verbose" @@ -131,7 +126,7 @@ #: ../app/main.c:163 msgid "Start a new GIMP instance" -msgstr "Uruchamia nową kopię programu GIMP" +msgstr "Uruchamia nowe wystąpienie programu GIMP" #: ../app/main.c:168 msgid "Open images as new" @@ -155,7 +150,7 @@ #: ../app/main.c:193 msgid "Do not use shared memory between GIMP and plugins" -msgstr "Nie wykorzystuje pamięci dzielonej pomiędzy programem GIMP a wtyczkami" +msgstr "Nie wykorzystuje pamięci dzielonej pomiędzy programem GIMP a wtyczkami" #: ../app/main.c:198 msgid "Do not use special CPU acceleration functions" @@ -184,7 +179,7 @@ #: ../app/main.c:228 msgid "Send messages to console instead of using a dialog" -msgstr "Wyświetla komunikaty w konsoli zamiast wyświetlać w oknie dialogowym" +msgstr "Wyświetla komunikaty w konsoli zamiast w oknie dialogowym" #. don't translate the mode names (off|on|warn) #: ../app/main.c:234 @@ -194,7 +189,7 @@ #. don't translate the mode names (never|query|always) #: ../app/main.c:240 msgid "Debug in case of a crash (never|query|always)" -msgstr "Debuguje w przypadku awarii programu (never|query|always)" +msgstr "Debuguje w przypadku awarii programu (never|query|always)" #: ../app/main.c:245 msgid "Enable non-fatal debugging signal handlers" @@ -206,11 +201,11 @@ #: ../app/main.c:255 msgid "Output a gimprc file with default settings" -msgstr "Wypisuje plik gimprc z domyślnymi ustawieniami" +msgstr "Wypisuje plik gimprc z domyślnymi ustawieniami" #: ../app/main.c:271 msgid "Output a sorted list of deprecated procedures in the PDB" -msgstr "Wypisuje uporządkowaną listę przestarzałych procedur w PDB" +msgstr "Wypisuje uporządkowaną listę przestarzałych procedur w PDB" #: ../app/main.c:433 msgid "[FILE|URI...]" @@ -226,7 +221,7 @@ #: ../app/main.c:474 msgid "Another GIMP instance is already running." -msgstr "Inna kopia programu GIMP jest już uruchomiona." +msgstr "Inne wystąpienie programu GIMP jest już uruchomione." #: ../app/main.c:546 msgid "GIMP output. Type any character to close this window." @@ -268,8 +263,8 @@ "Nie można konwertować nazwy katalogu przechowującego konfigurację " "użytkownika programu GIMP na kodowanie UTF-8: %s\n" "\n" -"Prawdopodobnie nazwy plików zapisane w systemie plików oparto na kodowaniu " -"innym niż UTF-8, a jednocześnie nie udostępniono informacji o tym programom " +"Prawdopodobnie nazwy plików zapisane w systemie plików oparto na kodowaniu " +"innym niż UTF-8, a jednocześnie nie udostępniono informacji o tym programom " "wykorzystującym bibliotekę GLib. Proszę ustawić zmienną środowiskową " "G_FILENAME_ENCODING." @@ -277,12 +272,12 @@ #: ../app/version.c:63 ../app/version.c:130 #, c-format msgid "using %s version %s (compiled against version %s)" -msgstr "%s używa wersji %s (skompilowano wersję %s)" +msgstr "Używa %s w wersji %s (skompilowano z wersją %s)" #: ../app/version.c:138 #, c-format msgid "%s version %s" -msgstr "%s wersja %s" +msgstr "%s w wersji %s" #: ../app/actions/actions.c:109 ../app/dialogs/dialogs.c:388 #: ../app/widgets/gimpbrusheditor.c:88 @@ -291,7 +286,7 @@ #. initialize the list of gimp brushes #: ../app/actions/actions.c:112 ../app/core/gimp.c:951 -#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2783 msgid "Brushes" msgstr "Pędzle" @@ -318,7 +313,7 @@ #: ../app/actions/actions.c:130 ../app/dialogs/dialogs.c:310 msgid "Pointer Information" -msgstr "Informacje o kursorze" +msgstr "Informacje o kursorze" #: ../app/actions/actions.c:133 msgid "Debug" @@ -338,7 +333,7 @@ #. Document History #: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:329 -#: ../app/dialogs/preferences-dialog.c:1577 +#: ../app/dialogs/preferences-dialog.c:1612 msgid "Document History" msgstr "Historia dokumentów" @@ -369,7 +364,7 @@ msgstr "Plik" #: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:325 -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2803 msgid "Fonts" msgstr "Czcionki" @@ -380,12 +375,12 @@ #. initialize the list of gimp gradients #: ../app/actions/actions.c:172 ../app/core/gimp.c:971 -#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2799 msgid "Gradients" msgstr "Gradienty" #: ../app/actions/actions.c:175 ../app/core/gimp.c:983 -#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2770 +#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2807 msgid "Tool Presets" msgstr "Ustawienia narzędzia" @@ -419,23 +414,23 @@ #. initialize the list of gimp palettes #: ../app/actions/actions.c:196 ../app/core/gimp.c:966 -#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2758 +#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2795 msgid "Palettes" msgstr "Palety" #. initialize the list of gimp patterns #: ../app/actions/actions.c:199 ../app/core/gimp.c:961 -#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2791 msgid "Patterns" msgstr "Desenie" -#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2774 +#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2811 msgid "Plug-Ins" msgstr "Wtyczki" #. Quick Mask Color #: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:386 -#: ../app/dialogs/preferences-dialog.c:2032 +#: ../app/dialogs/preferences-dialog.c:2069 msgid "Quick Mask" msgstr "Szybka maska" @@ -462,7 +457,7 @@ msgstr "Edytor tekstowy" #: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:298 -#: ../app/dialogs/preferences-dialog.c:1861 ../app/gui/gui.c:441 +#: ../app/dialogs/preferences-dialog.c:1898 ../app/gui/gui.c:464 msgid "Tool Options" msgstr "Opcje narzędzia" @@ -533,12 +528,12 @@ #: ../app/actions/brushes-actions.c:58 msgctxt "brushes-action" msgid "D_uplicate Brush" -msgstr "_Duplikuj pędzel" +msgstr "_Powiel pędzel" #: ../app/actions/brushes-actions.c:59 msgctxt "brushes-action" msgid "Duplicate this brush" -msgstr "Tworzy duplikat tego pędzla" +msgstr "Powiela ten pędzel" #: ../app/actions/brushes-actions.c:64 msgctxt "brushes-action" @@ -548,7 +543,7 @@ #: ../app/actions/brushes-actions.c:65 msgctxt "brushes-action" msgid "Copy brush file location to clipboard" -msgstr "Kopiuje położenie pliku z pędzlem do schowka" +msgstr "Kopiuje położenie pliku z pędzlem do schowka" #: ../app/actions/brushes-actions.c:70 msgctxt "brushes-action" @@ -638,7 +633,7 @@ #: ../app/actions/channels-actions.c:49 msgctxt "channels-action" msgid "Edit the channel's name, color and opacity" -msgstr "Modyfikuje nazwę, kolor i krycie kanału" +msgstr "Modyfikuje nazwę, kolor i krycie kanału" #: ../app/actions/channels-actions.c:54 msgctxt "channels-action" @@ -663,12 +658,12 @@ #: ../app/actions/channels-actions.c:66 msgctxt "channels-action" msgid "D_uplicate Channel" -msgstr "_Duplikuj kanał" +msgstr "_Powiel kanał" #: ../app/actions/channels-actions.c:68 msgctxt "channels-action" msgid "Create a duplicate of this channel and add it to the image" -msgstr "Tworzy duplikat tego kanału i dodaje go do obrazu" +msgstr "Tworzy kopię tego kanału i dodaje ją do obrazu" #: ../app/actions/channels-actions.c:73 msgctxt "channels-action" @@ -688,7 +683,7 @@ #: ../app/actions/channels-actions.c:80 msgctxt "channels-action" msgid "Raise this channel one step in the channel stack" -msgstr "Podwyższa ten kanał o jeden stopień w stosie kanałów" +msgstr "Podwyższa ten kanał o jeden stopień w stosie kanałów" #: ../app/actions/channels-actions.c:85 msgctxt "channels-action" @@ -708,7 +703,7 @@ #: ../app/actions/channels-actions.c:93 msgctxt "channels-action" msgid "Lower this channel one step in the channel stack" -msgstr "Obniża ten kanał o jeden stopień w stosie kanałów" +msgstr "Obniża ten kanał o jeden stopień w stosie kanałów" #: ../app/actions/channels-actions.c:98 msgctxt "channels-action" @@ -718,7 +713,7 @@ #: ../app/actions/channels-actions.c:100 msgctxt "channels-action" msgid "Lower this channel to the bottom of the channel stack" -msgstr "Przenosi ten kanał na dół w stosie kanałów" +msgstr "Przenosi ten kanał na dół w stosie kanałów" #: ../app/actions/channels-actions.c:108 msgctxt "channels-action" @@ -753,12 +748,12 @@ #: ../app/actions/channels-actions.c:126 msgctxt "channels-action" msgid "_Intersect with Selection" -msgstr "Prze_tnij z zaznaczeniem" +msgstr "Prze_tnij z zaznaczeniem" #: ../app/actions/channels-actions.c:127 msgctxt "channels-action" msgid "Intersect this channel with the current selection" -msgstr "Przecina ten kanał z bieżącym zaznaczeniem" +msgstr "Przecina ten kanał z bieżącym zaznaczeniem" #: ../app/actions/channels-commands.c:85 ../app/actions/channels-commands.c:402 msgid "Channel Attributes" @@ -821,7 +816,7 @@ #: ../app/actions/colormap-actions.c:57 msgctxt "colormap-action" msgid "_Add Color from FG" -msgstr "_Dodaj kolor z koloru pierwszoplanowego" +msgstr "_Dodaj kolor z koloru pierwszoplanowego" #: ../app/actions/colormap-actions.c:58 msgctxt "colormap-action" @@ -831,7 +826,7 @@ #: ../app/actions/colormap-actions.c:63 msgctxt "colormap-action" msgid "_Add Color from BG" -msgstr "_Dodaj kolor z koloru tła" +msgstr "_Dodaj kolor z koloru tła" #: ../app/actions/colormap-actions.c:64 msgctxt "colormap-action" @@ -945,7 +940,7 @@ #: ../app/actions/context-actions.c:82 msgctxt "context-action" msgid "Set foreground color to black, background color to white" -msgstr "Ustawia kolor pierwszoplanowy na czarny, a kolor tła na biały" +msgstr "Ustawia kolor pierwszoplanowy na czarny, a kolor tła na biały" #: ../app/actions/context-actions.c:87 msgctxt "context-action" @@ -955,7 +950,7 @@ #: ../app/actions/context-actions.c:88 msgctxt "context-action" msgid "Exchange foreground and background colors" -msgstr "Zamienia kolor pierwszoplanowy z kolorem tła" +msgstr "Zamienia kolor pierwszoplanowy z kolorem tła" #: ../app/actions/context-commands.c:426 #, c-format @@ -980,7 +975,7 @@ #: ../app/actions/cursor-info-actions.c:40 msgctxt "cursor-info-action" msgid "Pointer Information Menu" -msgstr "Menu informacji o kursorze" +msgstr "Menu informacji o kursorze" #: ../app/actions/cursor-info-actions.c:47 msgctxt "cursor-info-action" @@ -1031,7 +1026,7 @@ #: ../app/actions/dialogs-actions.c:56 msgctxt "dialogs-action" msgid "Open the tool options dialog" -msgstr "Otwiera okno z opcjami narzędzia" +msgstr "Otwiera okno z opcjami narzędzia" #: ../app/actions/dialogs-actions.c:61 msgctxt "dialogs-action" @@ -1131,7 +1126,7 @@ #: ../app/actions/dialogs-actions.c:116 msgctxt "dialogs-action" msgid "Open the pointer information dialog" -msgstr "Otwiera okno informacji o kursorze" +msgstr "Otwiera okno informacji o kursorze" #: ../app/actions/dialogs-actions.c:121 msgctxt "dialogs-action" @@ -1151,7 +1146,7 @@ #: ../app/actions/dialogs-actions.c:128 msgctxt "dialogs-action" msgid "Open the FG/BG color dialog" -msgstr "Otwiera okno koloru pierwszoplanowego i tła" +msgstr "Otwiera okno koloru pierwszoplanowego i tła" #: ../app/actions/dialogs-actions.c:133 msgctxt "dialogs-action" @@ -1366,20 +1361,20 @@ #: ../app/actions/dialogs-actions.c:265 ../app/actions/dialogs-actions.c:271 msgctxt "dialogs-action" msgid "About GIMP" -msgstr "Informacje o programie GIMP" +msgstr "O programie GIMP" #: ../app/actions/dialogs-actions.c:267 msgctxt "dialogs-action" msgid "About" -msgstr "O programie" +msgstr "O programie" #: ../app/actions/dialogs-actions.c:269 msgctxt "dialogs-action" msgid "_About" -msgstr "_O programie" +msgstr "_O programie" #: ../app/actions/dialogs-actions.c:333 -#: ../app/dialogs/preferences-dialog.c:1951 ../app/widgets/gimptoolbox.c:539 +#: ../app/dialogs/preferences-dialog.c:1988 ../app/widgets/gimptoolbox.c:539 msgid "Toolbox" msgstr "Przybornik" @@ -1413,7 +1408,7 @@ #: ../app/actions/dock-actions.c:55 msgctxt "dock-action" msgid "Connect to another display" -msgstr "Łączy z innym ekranem" +msgstr "Łączy z innym ekranem" #: ../app/actions/dock-actions.c:63 msgctxt "dock-action" @@ -1518,12 +1513,12 @@ #: ../app/actions/dockable-actions.c:112 msgctxt "tab-style" msgid "I_con & Text" -msgstr "I_kona i tekst" +msgstr "I_kona i tekst" #: ../app/actions/dockable-actions.c:114 msgctxt "tab-style" msgid "St_atus & Text" -msgstr "S_tan i tekst" +msgstr "S_tan i tekst" #: ../app/actions/dockable-actions.c:116 ../app/widgets/widgets-enums.c:224 msgctxt "tab-style" @@ -1663,7 +1658,7 @@ "Clearing the document history will permanently remove all images from the " "recent documents list." msgstr "" -"Czyszczenie historii dokumentów trwale usunie wszystkie obrazy z listy." +"Czyszczenie historii dokumentów trwale usunie wszystkie obrazy z listy." #: ../app/actions/drawable-actions.c:45 msgctxt "drawable-action" @@ -1759,17 +1754,17 @@ #: ../app/actions/drawable-actions.c:113 msgctxt "drawable-action" msgid "Rotate 90° _clockwise" -msgstr "Obróć o 90° w _prawo" +msgstr "Obróć o 90° w _prawo" #: ../app/actions/drawable-actions.c:114 msgctxt "drawable-action" msgid "Rotate 90 degrees to the right" -msgstr "Obraca o 90 stopni, zgodnie z ruchem wskazówek zegara" +msgstr "Obraca o 90 stopni, zgodnie z ruchem wskazówek zegara" #: ../app/actions/drawable-actions.c:119 msgctxt "drawable-action" msgid "Rotate _180°" -msgstr "Obróć o _180°" +msgstr "Obróć o _180°" #: ../app/actions/drawable-actions.c:120 msgctxt "drawable-action" @@ -1779,12 +1774,12 @@ #: ../app/actions/drawable-actions.c:125 msgctxt "drawable-action" msgid "Rotate 90° counter-clock_wise" -msgstr "Obróć o 90° w _lewo" +msgstr "Obróć o 90° w _lewo" #: ../app/actions/drawable-actions.c:126 msgctxt "drawable-action" msgid "Rotate 90 degrees to the left" -msgstr "Obraca o 90 stopni, przeciwnie do ruchu wskazówek zegara" +msgstr "Obraca o 90 stopni, przeciwnie do ruchu wskazówek zegara" #: ../app/actions/drawable-commands.c:63 msgid "Equalize does not operate on indexed layers." @@ -1816,12 +1811,12 @@ #: ../app/actions/dynamics-actions.c:52 msgctxt "dynamics-action" msgid "D_uplicate Dynamics" -msgstr "_Duplikuj dynamikę" +msgstr "_Powiel dynamikę" #: ../app/actions/dynamics-actions.c:53 msgctxt "dynamics-action" msgid "Duplicate this dynamics" -msgstr "Duplikuje tę dynamikę" +msgstr "Powiela tę dynamikę" #: ../app/actions/dynamics-actions.c:58 msgctxt "dynamics-action" @@ -1941,7 +1936,7 @@ #: ../app/actions/edit-actions.c:98 msgctxt "edit-action" msgid "Remove all operations from the undo history" -msgstr "Usuwa wszystkie pozycje z historii działań" +msgstr "Usuwa wszystkie pozycje z historii działań" #: ../app/actions/edit-actions.c:103 msgctxt "edit-action" @@ -1951,7 +1946,7 @@ #: ../app/actions/edit-actions.c:105 msgctxt "edit-action" msgid "Modify paint mode and opacity of the last pixel manipulation" -msgstr "Modyfikuje sposób rysowania i krycia ostatnich pikseli" +msgstr "Modyfikuje sposób rysowania i krycia ostatnich pikseli" #: ../app/actions/edit-actions.c:110 msgctxt "edit-action" @@ -1982,7 +1977,7 @@ #: ../app/actions/edit-actions.c:123 msgctxt "edit-action" msgid "Copy what is visible in the selected region" -msgstr "Kopiuje to, co jest widoczne w zaznaczonym obszarze" +msgstr "Kopiuje to, co jest widoczne w zaznaczonym obszarze" #: ../app/actions/edit-actions.c:128 msgctxt "edit-action" @@ -2012,7 +2007,7 @@ #: ../app/actions/edit-actions.c:142 ../app/actions/edit-actions.c:148 msgctxt "edit-action" msgid "Create a new image from the content of the clipboard" -msgstr "Tworzy nowy obraz z zawartości schowka" +msgstr "Tworzy nowy obraz z zawartości schowka" #: ../app/actions/edit-actions.c:147 msgctxt "edit-action" @@ -2027,7 +2022,7 @@ #: ../app/actions/edit-actions.c:154 msgctxt "edit-action" msgid "Create a new layer from the content of the clipboard" -msgstr "Tworzy nową warstwę z zawartości schowka" +msgstr "Tworzy nową warstwę z zawartości schowka" #: ../app/actions/edit-actions.c:159 msgctxt "edit-action" @@ -2059,7 +2054,7 @@ msgctxt "edit-action" msgid "Copy what is visible in the selected region to a named buffer" msgstr "" -"Kopiuje to, co jest widoczne w zaznaczonym obszarze do nazwanego bufora" +"Kopiuje to, co jest widoczne w zaznaczonym obszarze do nazwanego bufora" #: ../app/actions/edit-actions.c:178 msgctxt "edit-action" @@ -2099,7 +2094,7 @@ #: ../app/actions/edit-actions.c:200 msgctxt "edit-action" msgid "Fill the selection using the background color" -msgstr "Wypełnia zaznaczenie używając koloru tła" +msgstr "Wypełnia zaznaczenie za pomocą koloru tła" #: ../app/actions/edit-actions.c:205 msgctxt "edit-action" @@ -2162,7 +2157,7 @@ #: ../app/actions/edit-commands.c:325 ../app/actions/edit-commands.c:360 #: ../app/actions/edit-commands.c:543 msgid "There is no image data in the clipboard to paste." -msgstr "Brak danych obrazu w schowku do wklejenia." +msgstr "Brak danych obrazu w schowku do wklejenia." #: ../app/actions/edit-commands.c:348 ../app/core/gimpbrushclipboard.c:172 #: ../app/core/gimppatternclipboard.c:172 ../app/widgets/gimpclipboard.c:345 @@ -2176,7 +2171,7 @@ #: ../app/actions/edit-commands.c:377 ../app/actions/edit-commands.c:418 #: ../app/actions/edit-commands.c:438 msgid "Enter a name for this buffer" -msgstr "Proszę wprowadzić nazwę tego bufora" +msgstr "Nazwa tego bufora" #: ../app/actions/edit-commands.c:415 msgid "Copy Named" @@ -2188,7 +2183,7 @@ #: ../app/actions/edit-commands.c:560 msgid "There is no active layer or channel to cut from." -msgstr "Brak aktywnej warstwy lub kanału, z którego można wyciąć." +msgstr "Brak aktywnej warstwy lub kanału, z którego można wyciąć." #: ../app/actions/edit-commands.c:565 ../app/actions/edit-commands.c:597 #: ../app/actions/edit-commands.c:621 @@ -2197,7 +2192,7 @@ #: ../app/actions/edit-commands.c:592 msgid "There is no active layer or channel to copy from." -msgstr "Brak aktywnej warstwy lub kanału, z którego można skopiować." +msgstr "Brak aktywnej warstwy lub kanału, z którego można skopiować." #: ../app/actions/error-console-actions.c:39 msgctxt "error-console-action" @@ -2222,7 +2217,7 @@ #: ../app/actions/error-console-actions.c:50 msgctxt "error-console-action" msgid "Select all error messages" -msgstr "Zaznacza wszystkie komunikaty o błędach" +msgstr "Zaznacza wszystkie komunikaty o błędach" #: ../app/actions/error-console-actions.c:58 msgctxt "error-console-action" @@ -2232,7 +2227,7 @@ #: ../app/actions/error-console-actions.c:59 msgctxt "error-console-action" msgid "Write all error messages to a file" -msgstr "Zapisuje wszystkie komunikaty o błędach do pliku" +msgstr "Zapisuje wszystkie komunikaty o błędach do pliku" #: ../app/actions/error-console-actions.c:64 msgctxt "error-console-action" @@ -2242,7 +2237,7 @@ #: ../app/actions/error-console-actions.c:65 msgctxt "error-console-action" msgid "Write the selected error messages to a file" -msgstr "Zapisuje zaznaczone komunikaty o błędach do pliku" +msgstr "Zapisuje zaznaczone komunikaty o błędach do pliku" #: ../app/actions/error-console-commands.c:84 msgid "Cannot save. Nothing is selected." @@ -2304,7 +2299,7 @@ #: ../app/actions/file-actions.c:89 msgctxt "file-action" msgid "Open an image file from a specified location" -msgstr "Otwiera plik obrazu z określonego położenia" +msgstr "Otwiera plik obrazu z określonego położenia" #: ../app/actions/file-actions.c:94 msgctxt "file-action" @@ -2314,7 +2309,7 @@ #: ../app/actions/file-actions.c:95 msgctxt "file-action" msgid "Create a new template from this image" -msgstr "Tworzy nowy szablon z tego obrazu" +msgstr "Tworzy nowy szablon z tego obrazu" #: ../app/actions/file-actions.c:100 msgctxt "file-action" @@ -2324,7 +2319,7 @@ #: ../app/actions/file-actions.c:101 msgctxt "file-action" msgid "Reload the image file from disk" -msgstr "Wczytuje ponownie plik obrazu z dysku" +msgstr "Wczytuje ponownie plik obrazu z dysku" #: ../app/actions/file-actions.c:106 msgctxt "file-action" @@ -2383,12 +2378,12 @@ #: ../app/actions/file-actions.c:140 msgctxt "file-action" msgid "Save and Close..." -msgstr "Zapisz i zamknij…" +msgstr "Zapisz i zamknij…" #: ../app/actions/file-actions.c:141 msgctxt "file-action" msgid "Save this image and close its window" -msgstr "Zapisuje ten obraz i zamyka jego okno" +msgstr "Zapisuje ten obraz i zamyka jego okno" #: ../app/actions/file-actions.c:146 msgctxt "file-action" @@ -2409,7 +2404,7 @@ msgctxt "file-action" msgid "Export the image back to the imported file in the import format" msgstr "" -"Eksportuje obraz z powrotem do zaimportowanego pliku, w formacie z importu" +"Eksportuje obraz z powrotem do zaimportowanego pliku, w formacie z importu" #: ../app/actions/file-actions.c:158 msgctxt "file-action" @@ -2419,7 +2414,7 @@ #: ../app/actions/file-actions.c:159 msgctxt "file-action" msgid "Export the image to various file formats such as PNG or JPEG" -msgstr "Eksportuje obraz do różnych formatów plików, takich jak PNG i JPEG" +msgstr "Eksportuje obraz do różnych formatów plików, takich jak PNG i JPEG" #: ../app/actions/file-actions.c:292 #, c-format @@ -2483,8 +2478,8 @@ "By reverting the image to the state saved on disk, you will lose all " "changes, including all undo information." msgstr "" -"Przywrócenie obrazu do stanu zapisanego w pliku spowoduje utratę wszystkich " -"dokonanych w nim zmian, wraz z informacjami o historii działań." +"Przywrócenie obrazu do stanu zapisanego w pliku spowoduje utratę wszystkich " +"dokonanych w nim zmian, wraz z informacjami o historii działań." #: ../app/actions/file-commands.c:733 msgid "(Unnamed Template)" @@ -2498,7 +2493,7 @@ "%s" msgstr "" "Przywrócenie obrazu do stanu zapisanego\n" -"w pliku „%s” się nie powiodło:\n" +"w pliku „%s” się nie powiodło:\n" "\n" "%s" @@ -2734,7 +2729,7 @@ #: ../app/actions/gradient-editor-actions.c:785 msgid "Split Segment at _Midpoint" -msgstr "_Podziel segment w punkcie pośrednim" +msgstr "_Podziel segment w punkcie pośrednim" #: ../app/actions/gradient-editor-actions.c:787 msgid "Split Segment _Uniformly..." @@ -2750,7 +2745,7 @@ #: ../app/actions/gradient-editor-actions.c:793 msgid "Re-distribute _Handles in Segment" -msgstr "Rozłóż ponownie uc_hwyty w segmencie" +msgstr "Rozłóż ponownie uc_hwyty w segmencie" #: ../app/actions/gradient-editor-actions.c:798 msgid "_Blending Function for Selection" @@ -2770,7 +2765,7 @@ #: ../app/actions/gradient-editor-actions.c:807 msgid "Split Segments at _Midpoints" -msgstr "_Podziel segmenty w punktach pośrednich" +msgstr "_Podziel segmenty w punktach pośrednich" #: ../app/actions/gradient-editor-actions.c:809 msgid "Split Segments _Uniformly..." @@ -2782,11 +2777,11 @@ #: ../app/actions/gradient-editor-actions.c:813 msgid "Re-_center Midpoints in Selection" -msgstr "_Wyśrodkuj punkty pośrednie w zaznaczeniu" +msgstr "_Wyśrodkuj punkty pośrednie w zaznaczeniu" #: ../app/actions/gradient-editor-actions.c:815 msgid "Re-distribute _Handles in Selection" -msgstr "Rozłóż ponownie uc_hwyty w zaznaczeniu" +msgstr "Rozłóż ponownie uc_hwyty w zaznaczeniu" #: ../app/actions/gradient-editor-commands.c:84 msgid "Left Endpoint Color" @@ -2865,16 +2860,16 @@ "Select the number of uniform parts\n" "in which to split the selected segment." msgstr "" -"Proszę podać liczbę jednakowych części, na\n" -"jakie ma zostać podzielony zaznaczony segment." +"Proszę podać liczbę jednakowych części,\n" +"na jakie ma zostać podzielony zaznaczony segment." #: ../app/actions/gradient-editor-commands.c:597 msgid "" "Select the number of uniform parts\n" "in which to split the segments in the selection." msgstr "" -"Proszę podać liczbę jednakowych części, na\n" -"jakie ma zostać podzielone zaznaczenie." +"Proszę podać liczbę jednakowych części,\n" +"na jakie ma zostać podzielone zaznaczenie." #: ../app/actions/gradients-actions.c:43 msgctxt "gradients-action" @@ -2894,12 +2889,12 @@ #: ../app/actions/gradients-actions.c:53 msgctxt "gradients-action" msgid "D_uplicate Gradient" -msgstr "_Duplikuj gradient" +msgstr "_Powiel gradient" #: ../app/actions/gradients-actions.c:54 msgctxt "gradients-action" msgid "Duplicate this gradient" -msgstr "Duplikuje ten gradientu" +msgstr "Powiela ten gradient" #: ../app/actions/gradients-actions.c:59 msgctxt "gradients-action" @@ -2909,17 +2904,17 @@ #: ../app/actions/gradients-actions.c:60 msgctxt "gradients-action" msgid "Copy gradient file location to clipboard" -msgstr "Kopiuje położenie pliku z gradientem do schowka" +msgstr "Kopiuje położenie pliku z gradientem do schowka" #: ../app/actions/gradients-actions.c:65 msgctxt "gradients-action" msgid "Save as _POV-Ray..." -msgstr "Zapisz w formacie _POV-Ray…" +msgstr "Zapisz w formacie _POV-Ray…" #: ../app/actions/gradients-actions.c:66 msgctxt "gradients-action" msgid "Save gradient as POV-Ray" -msgstr "Zapisuje gradient w formacie POV-Ray" +msgstr "Zapisuje gradient w formacie POV-Ray" #: ../app/actions/gradients-actions.c:71 msgctxt "gradients-action" @@ -2954,7 +2949,7 @@ #: ../app/actions/gradients-commands.c:65 #, c-format msgid "Save '%s' as POV-Ray" -msgstr "Zapis „%s” w formacie POV-Ray" +msgstr "Zapis „%s” w formacie POV-Ray" #: ../app/actions/help-actions.c:37 ../app/actions/help-actions.c:40 msgctxt "help-action" @@ -3099,12 +3094,12 @@ #: ../app/actions/image-actions.c:109 msgctxt "image-action" msgid "_Duplicate" -msgstr "_Duplikuj" +msgstr "_Powiel" #: ../app/actions/image-actions.c:110 msgctxt "image-action" msgid "Create a duplicate of this image" -msgstr "Tworzy duplikat tego obrazu" +msgstr "Tworzy kopię tego obrazu" #: ../app/actions/image-actions.c:115 msgctxt "image-action" @@ -3114,7 +3109,7 @@ #: ../app/actions/image-actions.c:116 msgctxt "image-action" msgid "Merge all visible layers into one layer" -msgstr "Łączy wszystkie widoczne warstwy w jedną" +msgstr "Łączy wszystkie widoczne warstwy w jedną" #: ../app/actions/image-actions.c:121 msgctxt "image-action" @@ -3124,7 +3119,7 @@ #: ../app/actions/image-actions.c:122 msgctxt "image-action" msgid "Merge all layers into one and remove transparency" -msgstr "Łączy wszystkie widoczne warstwy w jedną i usuwa przezroczystość" +msgstr "Łączy wszystkie widoczne warstwy w jedną i usuwa przezroczystość" #: ../app/actions/image-actions.c:127 msgctxt "image-action" @@ -3144,7 +3139,7 @@ #: ../app/actions/image-actions.c:134 msgctxt "image-action" msgid "Display information about this image" -msgstr "Wyświetla informacje o tym obrazie" +msgstr "Wyświetla informacje o tym obrazie" #: ../app/actions/image-actions.c:142 msgctxt "image-convert-action" @@ -3199,17 +3194,17 @@ #: ../app/actions/image-actions.c:175 msgctxt "image-action" msgid "Rotate 90° _clockwise" -msgstr "Obróć o 90° w p_rawo" +msgstr "Obróć o 90° w p_rawo" #: ../app/actions/image-actions.c:176 msgctxt "image-action" msgid "Rotate the image 90 degrees to the right" -msgstr "Obraca obraz o 90 stopni w prawo" +msgstr "Obraca obraz o 90 stopni w prawo" #: ../app/actions/image-actions.c:181 msgctxt "image-action" msgid "Rotate _180°" -msgstr "Obróć o _180°" +msgstr "Obróć o _180°" #: ../app/actions/image-actions.c:182 msgctxt "image-action" @@ -3219,12 +3214,12 @@ #: ../app/actions/image-actions.c:187 msgctxt "image-action" msgid "Rotate 90° counter-clock_wise" -msgstr "Obróć o 90° w _lewo" +msgstr "Obróć o 90° w _lewo" #: ../app/actions/image-actions.c:188 msgctxt "image-action" msgid "Rotate the image 90 degrees to the left" -msgstr "Obraca obraz o 90 stopni w lewo" +msgstr "Obraca obraz o 90 stopni w lewo" #: ../app/actions/image-commands.c:237 msgid "Set Image Canvas Size" @@ -3266,7 +3261,7 @@ #. Scaling #: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 -#: ../app/dialogs/preferences-dialog.c:1906 +#: ../app/dialogs/preferences-dialog.c:1943 #: ../app/pdb/drawable-transform-cmds.c:783 #: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 #: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524 @@ -3383,7 +3378,7 @@ #: ../app/actions/layers-actions.c:83 msgctxt "layers-action" msgid "Create a new layer and add it to the image" -msgstr "Tworzy nową warstwę i dodaje ją do obrazu" +msgstr "Tworzy nową warstwę i dodaje ją do obrazu" #: ../app/actions/layers-actions.c:88 ../app/actions/layers-actions.c:611 msgctxt "layers-action" @@ -3398,12 +3393,12 @@ #: ../app/actions/layers-actions.c:94 msgctxt "layers-action" msgid "New from _Visible" -msgstr "Nowa z _widoku" +msgstr "Nowa z _widoku" #: ../app/actions/layers-actions.c:96 msgctxt "layers-action" msgid "Create a new layer from what is visible in this image" -msgstr "Tworzy nową warstwę z bieżącego widoku obrazu" +msgstr "Tworzy nową warstwę z bieżącego widoku obrazu" #: ../app/actions/layers-actions.c:101 msgctxt "layers-action" @@ -3413,17 +3408,17 @@ #: ../app/actions/layers-actions.c:102 msgctxt "layers-action" msgid "Create a new layer group and add it to the image" -msgstr "Tworzy nową grupę warstw i dodaje ją do obrazu" +msgstr "Tworzy nową grupę warstw i dodaje ją do obrazu" #: ../app/actions/layers-actions.c:107 msgctxt "layers-action" msgid "D_uplicate Layer" -msgstr "_Duplikuj warstwę" +msgstr "_Powiel warstwę" #: ../app/actions/layers-actions.c:109 msgctxt "layers-action" msgid "Create a duplicate of the layer and add it to the image" -msgstr "Tworzy duplikat warstwy i dodaje ją do obrazu" +msgstr "Tworzy kopię warstwy i dodaje ją do obrazu" #: ../app/actions/layers-actions.c:114 msgctxt "layers-action" @@ -3443,7 +3438,7 @@ #: ../app/actions/layers-actions.c:121 msgctxt "layers-action" msgid "Raise this layer one step in the layer stack" -msgstr "Podwyższa tę warstwę o jeden stopień na stosie warstw" +msgstr "Podwyższa tę warstwę o jeden stopień na stosie warstw" #: ../app/actions/layers-actions.c:126 msgctxt "layers-action" @@ -3463,7 +3458,7 @@ #: ../app/actions/layers-actions.c:133 msgctxt "layers-action" msgid "Lower this layer one step in the layer stack" -msgstr "Obniża tę warstwę o jeden stopień na stosie warstw" +msgstr "Obniża tę warstwę o jeden stopień na stosie warstw" #: ../app/actions/layers-actions.c:138 msgctxt "layers-action" @@ -3488,12 +3483,12 @@ #: ../app/actions/layers-actions.c:150 msgctxt "layers-action" msgid "Merge Do_wn" -msgstr "Połącz _w dół" +msgstr "Połącz _w dół" #: ../app/actions/layers-actions.c:151 msgctxt "layers-action" msgid "Merge this layer with the first visible layer below it" -msgstr "Łączy bieżącą warstwę z warstwą znajdującą się poniżej" +msgstr "Łączy bieżącą warstwę z warstwą znajdującą się poniżej" #: ../app/actions/layers-actions.c:156 msgctxt "layers-action" @@ -3503,7 +3498,7 @@ #: ../app/actions/layers-actions.c:157 msgctxt "layers-action" msgid "Merge the layer group's layers into one normal layer" -msgstr "Łączy grupę warstw w jedną zwykłą warstwę" +msgstr "Łączy grupę warstw w jedną zwykłą warstwę" #: ../app/actions/layers-actions.c:162 msgctxt "layers-action" @@ -3513,7 +3508,7 @@ #: ../app/actions/layers-actions.c:163 msgctxt "layers-action" msgid "Merge all visible layers into one layer" -msgstr "Łączy wszystkie widoczne warstwy w jedną" +msgstr "Łączy wszystkie widoczne warstwy w jedną" #: ../app/actions/layers-actions.c:168 msgctxt "layers-action" @@ -3523,17 +3518,17 @@ #: ../app/actions/layers-actions.c:169 msgctxt "layers-action" msgid "Merge all layers into one and remove transparency" -msgstr "Łączy wszystkie widoczne warstwy w jedną i usuwa przezroczystość" +msgstr "Łączy wszystkie widoczne warstwy w jedną i usuwa przezroczystość" #: ../app/actions/layers-actions.c:174 msgctxt "layers-action" msgid "_Discard Text Information" -msgstr "_Porzuć informacje o tekście" +msgstr "_Odrzuć informacje o tekście" #: ../app/actions/layers-actions.c:175 msgctxt "layers-action" msgid "Turn this text layer into a normal layer" -msgstr "Zamienia tę warstwę tekstową w zwykłą warstwę" +msgstr "Zamienia tę warstwę tekstową w zwykłą warstwę" #: ../app/actions/layers-actions.c:180 msgctxt "layers-action" @@ -3543,7 +3538,7 @@ #: ../app/actions/layers-actions.c:181 msgctxt "layers-action" msgid "Create a path from this text layer" -msgstr "Tworzy ścieżkę z tej warstwy tekstu" +msgstr "Tworzy ścieżkę z tej warstwy tekstu" #: ../app/actions/layers-actions.c:186 msgctxt "layers-action" @@ -3613,7 +3608,7 @@ #: ../app/actions/layers-actions.c:224 msgctxt "layers-action" msgid "Add transparency information to the layer" -msgstr "Dodaje informację o przezroczystości do warstwy" +msgstr "Dodaje informację o przezroczystości do warstwy" #: ../app/actions/layers-actions.c:229 msgctxt "layers-action" @@ -3623,7 +3618,7 @@ #: ../app/actions/layers-actions.c:230 msgctxt "layers-action" msgid "Remove transparency information from the layer" -msgstr "Usuwa informacje o przezroczystości z warstwy" +msgstr "Usuwa informacje o przezroczystości z warstwy" #: ../app/actions/layers-actions.c:238 msgctxt "layers-action" @@ -3668,7 +3663,7 @@ #: ../app/actions/layers-actions.c:270 msgctxt "layers-action" msgid "Apply the effect of the layer mask and remove it" -msgstr "Zastosowuje efekty działania maski warstwy i usuwa ją" +msgstr "Zastosowuje efekty działania maski warstwy i usuwa ją" #: ../app/actions/layers-actions.c:275 msgctxt "layers-action" @@ -3678,7 +3673,7 @@ #: ../app/actions/layers-actions.c:276 msgctxt "layers-action" msgid "Remove the layer mask and its effect" -msgstr "Usuwa maskę warstwy i jej efekty" +msgstr "Usuwa maskę warstwy i jej efekty" #: ../app/actions/layers-actions.c:284 msgctxt "layers-action" @@ -3688,7 +3683,7 @@ #: ../app/actions/layers-actions.c:285 msgctxt "layers-action" msgid "Replace the selection with the layer mask" -msgstr "Zamienia zaznaczenie na maska warstwy" +msgstr "Zamienia zaznaczenie na maskę warstwy" #: ../app/actions/layers-actions.c:290 msgctxt "layers-action" @@ -3713,7 +3708,7 @@ #: ../app/actions/layers-actions.c:302 ../app/actions/layers-actions.c:332 msgctxt "layers-action" msgid "_Intersect with Selection" -msgstr "Prze_tnij z zaznaczeniem" +msgstr "Prze_tnij z zaznaczeniem" #: ../app/actions/layers-actions.c:303 msgctxt "layers-action" @@ -3728,7 +3723,7 @@ #: ../app/actions/layers-actions.c:313 msgctxt "layers-action" msgid "Replace the selection with the layer's alpha channel" -msgstr "Zamienia zaznaczenie z kanałem alfa warstwy" +msgstr "Zamienia zaznaczenie z kanałem alfa warstwy" #: ../app/actions/layers-actions.c:318 msgctxt "layers-action" @@ -3802,7 +3797,7 @@ #. #: ../app/actions/layers-actions.c:447 msgid "-Click on thumbnail in Layers dockable" -msgstr "-Kliknięcie na miniaturę w dokowalnym oknie „Warstwy”" +msgstr "-Kliknięcie miniatury w dokowalnym oknie „Warstwy”" #: ../app/actions/layers-actions.c:605 ../app/actions/layers-actions.c:606 msgctxt "layers-action" @@ -3889,22 +3884,22 @@ #: ../app/actions/palette-editor-actions.c:71 msgctxt "palette-editor-action" msgid "New Color from _FG" -msgstr "Nowy kolor z koloru p_ierwszoplanowego" +msgstr "Nowy kolor z koloru p_ierwszoplanowego" #: ../app/actions/palette-editor-actions.c:73 msgctxt "palette-editor-action" msgid "Create a new entry from the foreground color" -msgstr "Tworzy nową pozycję z koloru pierwszoplanowego" +msgstr "Tworzy nową pozycję z koloru pierwszoplanowego" #: ../app/actions/palette-editor-actions.c:78 msgctxt "palette-editor-action" msgid "New Color from _BG" -msgstr "Nowy kolor z koloru _tła" +msgstr "Nowy kolor z koloru _tła" #: ../app/actions/palette-editor-actions.c:80 msgctxt "palette-editor-action" msgid "Create a new entry from the background color" -msgstr "Tworzy nową pozycję z koloru tła" +msgstr "Tworzy nową pozycję z koloru tła" #: ../app/actions/palette-editor-actions.c:88 msgid "Zoom _In" @@ -3920,7 +3915,7 @@ #: ../app/actions/palette-editor-commands.c:68 msgid "Edit Palette Color" -msgstr "Modyfikacja koloru z palety" +msgstr "Modyfikacja koloru z palety" #: ../app/actions/palette-editor-commands.c:70 msgid "Edit Color Palette Entry" @@ -3954,12 +3949,12 @@ #: ../app/actions/palettes-actions.c:59 msgctxt "palettes-action" msgid "D_uplicate Palette" -msgstr "_Duplikuj paletę" +msgstr "_Powiel paletę" #: ../app/actions/palettes-actions.c:60 msgctxt "palettes-action" msgid "Duplicate this palette" -msgstr "Duplikuje tę paletę" +msgstr "Powiela tę paletę" #: ../app/actions/palettes-actions.c:65 msgctxt "palettes-action" @@ -3979,7 +3974,7 @@ #: ../app/actions/palettes-actions.c:72 msgctxt "palettes-action" msgid "Copy palette file location to clipboard" -msgstr "Kopiuje położenie pliku z paletą do schowka" +msgstr "Kopiuje położenie pliku z paletą do schowka" #: ../app/actions/palettes-actions.c:77 msgctxt "palettes-action" @@ -4047,12 +4042,12 @@ #: ../app/actions/patterns-actions.c:58 msgctxt "patterns-action" msgid "D_uplicate Pattern" -msgstr "_Duplikuj deseń" +msgstr "_Powiel deseń" #: ../app/actions/patterns-actions.c:59 msgctxt "patterns-action" msgid "Duplicate this pattern" -msgstr "Duplikuje ten deseń" +msgstr "Powiela ten deseń" #: ../app/actions/patterns-actions.c:64 msgctxt "patterns-action" @@ -4062,7 +4057,7 @@ #: ../app/actions/patterns-actions.c:65 msgctxt "patterns-action" msgid "Copy pattern file location to clipboard" -msgstr "Kopiuje położenie pliku z deseniem do schowka" +msgstr "Kopiuje położenie pliku z deseniem do schowka" #: ../app/actions/patterns-actions.c:70 msgctxt "patterns-action" @@ -4137,7 +4132,7 @@ #: ../app/actions/plug-in-actions.c:101 msgctxt "plug-in-action" msgid "_Light and Shadow" -msgstr "_Światło i cień" +msgstr "_Światło i cień" #: ../app/actions/plug-in-actions.c:103 msgctxt "plug-in-action" @@ -4207,7 +4202,7 @@ #: ../app/actions/plug-in-actions.c:135 msgctxt "plug-in-action" msgid "Rerun the last used plug-in using the same settings" -msgstr "Uruchamia ponownie ostatnio używaną wtyczkę z tymi samymi ustawieniami" +msgstr "Uruchamia ponownie ostatnio używaną wtyczkę z tymi samymi ustawieniami" #: ../app/actions/plug-in-actions.c:140 msgctxt "plug-in-action" @@ -4253,7 +4248,7 @@ #: ../app/actions/quick-mask-actions.c:47 msgctxt "quick-mask-action" msgid "_Configure Color and Opacity..." -msgstr "S_konfiguruj kolor i krycie…" +msgstr "S_konfiguruj kolor i krycie…" #: ../app/actions/quick-mask-actions.c:55 msgctxt "quick-mask-action" @@ -4374,7 +4369,7 @@ #: ../app/actions/select-actions.c:82 msgctxt "select-action" msgid "Remove fuzziness from the selection" -msgstr "Usuwa rozmycie z zaznaczenia" +msgstr "Usuwa rozmycie z zaznaczenia" #: ../app/actions/select-actions.c:87 msgctxt "select-action" @@ -4438,11 +4433,11 @@ #: ../app/actions/select-commands.c:156 msgid "Feather Selection" -msgstr "Zmiękcza zaznaczenie" +msgstr "Zmiękczenie zaznaczenia" #: ../app/actions/select-commands.c:160 msgid "Feather selection by" -msgstr "Zmiękcza zaznaczenie o" +msgstr "Stopień zmiękczenia zaznaczenia" #: ../app/actions/select-commands.c:197 msgid "Shrink Selection" @@ -4454,7 +4449,7 @@ #: ../app/actions/select-commands.c:209 msgid "_Shrink from image border" -msgstr "_Zmniejsz od granic obrazu" +msgstr "_Zmniejszenie od granic obrazu" #: ../app/actions/select-commands.c:237 msgid "Grow Selection" @@ -4505,7 +4500,7 @@ #: ../app/actions/templates-actions.c:46 msgctxt "templates-action" msgid "Create a new image from the selected template" -msgstr "Tworzy nowy obraz w oparciu o wybrany szablon" +msgstr "Tworzy nowy obraz na podstawie wybranego szablonu" #: ../app/actions/templates-actions.c:51 msgctxt "templates-action" @@ -4520,12 +4515,12 @@ #: ../app/actions/templates-actions.c:57 msgctxt "templates-action" msgid "D_uplicate Template..." -msgstr "_Duplikuj szablon…" +msgstr "_Powiel szablon…" #: ../app/actions/templates-actions.c:58 msgctxt "templates-action" msgid "Duplicate this template" -msgstr "Duplikuje ten szablon" +msgstr "Powiela ten szablon" #: ../app/actions/templates-actions.c:63 msgctxt "templates-action" @@ -4568,7 +4563,7 @@ #, c-format msgid "" "Are you sure you want to delete template '%s' from the list and from disk?" -msgstr "Na pewno usunąć szablon „%s” z listy i z dysku?" +msgstr "Na pewno usunąć szablon „%s” z listy i z dysku?" #: ../app/actions/text-editor-actions.c:43 msgctxt "text-editor-action" @@ -4578,7 +4573,7 @@ #: ../app/actions/text-editor-actions.c:44 msgctxt "text-editor-action" msgid "Load text from file" -msgstr "Wczytuje tekst z pliku" +msgstr "Wczytuje tekst z pliku" #: ../app/actions/text-editor-actions.c:49 msgctxt "text-editor-action" @@ -4677,12 +4672,12 @@ #: ../app/actions/text-tool-actions.c:89 msgctxt "text-tool-action" msgid "_Path from Text" -msgstr "Ś_cieżka z tekstu" +msgstr "Ś_cieżka z tekstu" #: ../app/actions/text-tool-actions.c:91 msgctxt "text-tool-action" msgid "Create a path from the outlines of the current text" -msgstr "Tworzy ścieżkę z ramki tekstu" +msgstr "Tworzy ścieżkę z ramki tekstu" #: ../app/actions/text-tool-actions.c:96 msgctxt "text-tool-action" @@ -4780,12 +4775,12 @@ #: ../app/actions/tool-presets-actions.c:54 msgctxt "tool-presets-action" msgid "D_uplicate Tool Preset" -msgstr "D_uplikuj ustawienia narzędzia" +msgstr "_Powiel ustawienia narzędzia" #: ../app/actions/tool-presets-actions.c:55 msgctxt "tool-presets-action" msgid "Duplicate this tool preset" -msgstr "Duplikuje te ustawienia narzędzia" +msgstr "Powiela te ustawienia narzędzia" #: ../app/actions/tool-presets-actions.c:60 msgctxt "tool-presets-action" @@ -4795,7 +4790,7 @@ #: ../app/actions/tool-presets-actions.c:61 msgctxt "tool-presets-action" msgid "Copy tool preset file location to clipboard" -msgstr "Kopiuje położenie pliku z ustawieniami narzędzia do schowka" +msgstr "Kopiuje położenie pliku z ustawieniami narzędzia do schowka" #: ../app/actions/tool-presets-actions.c:66 msgctxt "tool-presets-action" @@ -4870,7 +4865,7 @@ #: ../app/actions/tools-actions.c:56 msgctxt "tools-action" msgid "Select regions with similar colors" -msgstr "Zaznacza obszary z podobnymi kolorami" +msgstr "Zaznacza obszary z podobnymi kolorami" #: ../app/actions/tools-actions.c:61 msgctxt "tools-action" @@ -4880,7 +4875,7 @@ #: ../app/actions/tools-actions.c:62 msgctxt "tools-action" msgid "Rotate by an arbitrary angle" -msgstr "Pozwala obracać o dowolny kąt" +msgstr "Pozwala obracać o dowolny kąt" #: ../app/actions/vectors-actions.c:44 msgctxt "vectors-action" @@ -4915,7 +4910,7 @@ #: ../app/actions/vectors-actions.c:65 msgctxt "vectors-action" msgid "_New Path with last values" -msgstr "_Nowa ścieżka z ostatnimi wartościami" +msgstr "_Nowa ścieżka z ostatnimi wartościami" #: ../app/actions/vectors-actions.c:66 msgctxt "vectors-action" @@ -4925,12 +4920,12 @@ #: ../app/actions/vectors-actions.c:71 msgctxt "vectors-action" msgid "D_uplicate Path" -msgstr "_Duplikuj ścieżkę" +msgstr "_Powiel ścieżkę" #: ../app/actions/vectors-actions.c:72 msgctxt "vectors-action" msgid "Duplicate this path" -msgstr "Duplikuje tę ścieżkę" +msgstr "Powiela tę ścieżkę" #: ../app/actions/vectors-actions.c:77 msgctxt "vectors-action" @@ -5086,12 +5081,12 @@ #: ../app/actions/vectors-actions.c:192 msgctxt "vectors-action" msgid "_Intersect with Selection" -msgstr "Prze_tnij z zaznaczeniem" +msgstr "Prze_tnij z zaznaczeniem" #: ../app/actions/vectors-actions.c:193 msgctxt "vectors-action" msgid "Intersect path with selection" -msgstr "Prze_tnij ścieżkę z zaznaczeniem" +msgstr "Przecina ścieżkę z zaznaczeniem" #: ../app/actions/vectors-actions.c:201 msgctxt "vectors-action" @@ -5111,7 +5106,7 @@ #: ../app/actions/vectors-actions.c:213 msgctxt "vectors-action" msgid "Selection to Path (_Advanced)" -msgstr "Zaznaczenie na ścieżkę (z_aawansowane)" +msgstr "Z_aznaczenie na ścieżkę (zaawansowane)" #: ../app/actions/vectors-actions.c:214 msgctxt "vectors-action" @@ -5187,12 +5182,12 @@ #: ../app/actions/view-actions.c:88 msgctxt "view-action" msgid "_Fit Image in Window" -msgstr "_Cały obraz w oknie" +msgstr "_Cały obraz w oknie" #: ../app/actions/view-actions.c:89 msgctxt "view-action" msgid "Adjust the zoom ratio so that the image becomes fully visible" -msgstr "Dopasowuje powiększenie tak, aby obraz był w pełni widoczny" +msgstr "Dopasowuje powiększenie tak, aby obraz był w pełni widoczny" #: ../app/actions/view-actions.c:94 msgctxt "view-action" @@ -5232,7 +5227,7 @@ #: ../app/actions/view-actions.c:113 msgctxt "view-action" msgid "Configure filters applied to this view" -msgstr "Konfiguruje filtry stosowane w tym widoku" +msgstr "Konfiguruje filtry stosowane w tym widoku" #: ../app/actions/view-actions.c:118 msgctxt "view-action" @@ -5252,7 +5247,7 @@ #: ../app/actions/view-actions.c:125 msgctxt "view-action" msgid "Connect to another display" -msgstr "Łączy z innym ekranem" +msgstr "Łączy z innym ekranem" #: ../app/actions/view-actions.c:133 msgctxt "view-action" @@ -5262,7 +5257,7 @@ #: ../app/actions/view-actions.c:134 msgctxt "view-action" msgid "A pixel on the screen represents an image pixel" -msgstr "Piksel na ekranie, reprezentuje piksel na obrazie" +msgstr "Piksel na ekranie reprezentuje piksel na obrazie" #: ../app/actions/view-actions.c:140 msgctxt "view-action" @@ -5547,12 +5542,12 @@ #: ../app/actions/view-actions.c:393 msgctxt "view-padding-color" msgid "From _Theme" -msgstr "Z _motywu" +msgstr "Z _motywu" #: ../app/actions/view-actions.c:394 msgctxt "view-padding-color" msgid "Use the current theme's background color" -msgstr "Używa koloru tła z bieżącego motywu" +msgstr "Używa koloru tła z bieżącego motywu" #: ../app/actions/view-actions.c:399 msgctxt "view-padding-color" @@ -5587,13 +5582,13 @@ #: ../app/actions/view-actions.c:417 msgctxt "view-padding-color" msgid "As in _Preferences" -msgstr "_Zgodnie z preferencjami" +msgstr "_Zgodnie z preferencjami" #: ../app/actions/view-actions.c:419 msgctxt "view-padding-color" msgid "Reset padding color to what's configured in preferences" msgstr "" -"Ustawia kolor wyściółki na taki, jaki był skonfigurowany w preferencjach" +"Ustawia kolor wyściółki na taki, jaki był skonfigurowany w preferencjach" #: ../app/actions/view-actions.c:618 #, c-format @@ -5677,7 +5672,7 @@ msgid "" "When enabled docks and other dialogs are hidden, leaving only image windows." msgstr "" -"Ukrywa doki oraz inne okna dialogowe, zostawiając tylko okna z obrazem." +"Ukrywa doki oraz inne okna dialogowe, zostawiając tylko okna z obrazem." #: ../app/actions/windows-actions.c:122 msgctxt "windows-action" @@ -5687,7 +5682,7 @@ #: ../app/actions/windows-actions.c:123 msgctxt "windows-action" msgid "When enabled GIMP is in a single-window mode." -msgstr "Kiedy jest włączone, program GIMP działa w trybie jednego okna." +msgstr "Kiedy jest włączone, program GIMP działa w trybie jednego okna." #: ../app/base/base-enums.c:23 msgctxt "curve-type" @@ -5742,7 +5737,7 @@ #: ../app/base/base-enums.c:115 msgctxt "layer-mode-effects" msgid "Behind" -msgstr "Z tyłu" +msgstr "Z tyłu" #: ../app/base/base-enums.c:116 msgctxt "layer-mode-effects" @@ -5866,10 +5861,10 @@ "using different filenames, restart GIMP and check the location of the swap " "directory in your Preferences." msgstr "" -"Nie można otworzyć pliku wymiany. Program GIMP wyczerpał dostępną pamięć i " -"nie może użyć pliku wymiany. Część elementów obrazów może ulec uszkodzeniu. " -"Proszę spróbować zapisać dane pod inną nazwą, ponownie uruchomić program i " -"sprawdzić położenie katalogu wymiany w „Preferencjach”." +"Nie można otworzyć pliku wymiany. Program GIMP wyczerpał dostępną pamięć " +"i nie może użyć pliku wymiany. Część elementów obrazów może ulec " +"uszkodzeniu. Proszę spróbować zapisać dane pod inną nazwą, ponownie " +"uruchomić program i sprawdzić położenie katalogu wymiany w „Preferencjach”." #: ../app/base/tile-swap.c:725 #, c-format @@ -5884,7 +5879,7 @@ #: ../app/config/config-enums.c:25 msgctxt "cursor-mode" msgid "Tool icon with crosshair" -msgstr "Ikona narzędzia z krzyżykiem" +msgstr "Ikona narzędzia z krzyżykiem" #: ../app/config/config-enums.c:26 msgctxt "cursor-mode" @@ -5894,7 +5889,7 @@ #: ../app/config/config-enums.c:56 msgctxt "canvas-padding-mode" msgid "From theme" -msgstr "Z motywu" +msgstr "Z motywu" #: ../app/config/config-enums.c:57 msgctxt "canvas-padding-mode" @@ -5964,7 +5959,7 @@ #: ../app/config/config-enums.c:207 msgctxt "cursor-format" msgid "Black & white" -msgstr "Czarny i biały" +msgstr "Czarny i biały" #: ../app/config/config-enums.c:208 msgctxt "cursor-format" @@ -6008,7 +6003,7 @@ "backup of your configuration has been created at '%s'." msgstr "" "Wystąpił błąd podczas przetwarzania pliku „%s”. Zostaną użyte wartości " -"domyślne. Utworzono kopię zapasową konfiguracji w pliku „%s”." +"domyślne. Utworzono kopię zapasową konfiguracji w pliku „%s”." #. Not all strings defined here are used in the user interface #. * (the preferences dialog mainly) and only those that are should @@ -6021,7 +6016,7 @@ "\"." msgstr "" "Włączenie tej opcji powoduje aktywację obrazu po aktywowaniu jego okna. " -"Opcja ta jest przydatna w przypadku, gdy używany menedżer okien aktywuje " +"Opcja ta jest przydatna w przypadku, gdy używany menedżer okien aktywuje " "okno po jego kliknięciu." #: ../app/config/gimprc-blurbs.h:23 ../app/config/gimprc-blurbs.h:28 @@ -6033,7 +6028,7 @@ "Sets the canvas padding color used if the padding mode is set to custom " "color." msgstr "" -"Ustawia kolor wyściółki płótna, używany jeśli wygląd wyściółki ustalony jest " +"Ustawia kolor wyściółki płótna używany, jeśli wygląd wyściółki ustalony jest " "na dowolny kolor." #: ../app/config/gimprc-blurbs.h:37 @@ -6062,7 +6057,7 @@ "Context-dependent mouse pointers are helpful. They are enabled by default. " "However, they require overhead that you may want to do without." msgstr "" -"Kursor myszy zmieniający swój kształt w zależności od treści znacznie " +"Kursor myszy zmieniający swój kształt w zależności od treści znacznie " "ułatwia pracę. Opcja ta jest domyślnie włączona, jednak powoduje dodatkowe " "zużycie zasobów." @@ -6076,8 +6071,8 @@ #: ../app/config/gimprc-blurbs.h:93 msgid "This is the distance in pixels where Guide and Grid snapping activates." msgstr "" -"Określa odległość w pikselach, przy której uaktywniają się prowadnice i " -"siatka." +"Określa odległość w pikselach, przy której uaktywniają się prowadnice " +"i siatka." #: ../app/config/gimprc-blurbs.h:109 msgid "" @@ -6088,10 +6083,10 @@ "the default threshold." msgstr "" "Narzędzia, takie jak różdżka, czy wypełnienie kubełkiem, identyfikują ciągłe " -"obszary w oparciu o algorytm wypełniania przez wysiewanie. Wysiewanie " -"rozpoczyna się we wskazanym punkcie początkowym i postępuje we wszystkich " -"kierunkach, aż do momentu, w którym różnica jasności pomiędzy punktem " -"bieżącym i początkowym jest większa od pewnego progu. Ustawienie " +"obszary na podstawie algorytmu wypełniania przez wysiewanie. Wysiewanie " +"rozpoczyna się we wskazanym punkcie początkowym i postępuje we wszystkich " +"kierunkach, aż do momentu, w którym różnica jasności pomiędzy punktem " +"bieżącym i początkowym jest większa od pewnego progu. Ustawienie " "reprezentuje domyślną wartość progu." #: ../app/config/gimprc-blurbs.h:122 @@ -6100,8 +6095,8 @@ "This may affect the way your window manager decorates and handles these " "windows." msgstr "" -"Typ podpowiedzi powiązanych z oknami doków i oknem przybornika. Ustawienie " -"to może wpłynąć na sposób, w jaki menedżer okien ozdabia i obsługuje te okna." +"Typ podpowiedzi powiązanych z oknami doków i oknem przybornika. Ustawienie " +"to może wpłynąć na sposób, w jaki menedżer okien ozdabia i obsługuje te okna." #: ../app/config/gimprc-blurbs.h:154 msgid "When enabled, the selected brush will be used for all tools." @@ -6125,18 +6120,18 @@ #: ../app/config/gimprc-blurbs.h:191 msgid "Sets the text to appear in image window status bars." -msgstr "Ustawia napis pojawiający się na pasku stanu okna z obrazem." +msgstr "Ustawia napis pojawiający się na pasku stanu okna z obrazem." #: ../app/config/gimprc-blurbs.h:194 msgid "Sets the text to appear in image window titles." -msgstr "Ustawia napis pojawiający się na pasku tytułowym okna z obrazem." +msgstr "Ustawia napis pojawiający się na pasku tytułowym okna z obrazem." #: ../app/config/gimprc-blurbs.h:197 msgid "" "When enabled, this will ensure that the full image is visible after a file " "is opened, otherwise it will be displayed with a scale of 1:1." msgstr "" -"Powoduje, że po wczytaniu obrazu skala jego widoku ustalana jest w taki " +"Powoduje, że po wczytaniu obrazu skala jego widoku ustalana jest w taki " "sposób, aby cały obraz był widoczny. Jeśli opcja nie jest włączona, skala " "ustawiana jest zawsze na 1∶1." @@ -6144,7 +6139,7 @@ msgid "" "Sets the level of interpolation used for scaling and other transformations." msgstr "" -"Poziom interpolacji wykorzystywany przy skalowaniu i innych " +"Poziom interpolacji wykorzystywany przy skalowaniu i innych " "przekształceniach." #: ../app/config/gimprc-blurbs.h:208 @@ -6153,7 +6148,7 @@ #: ../app/config/gimprc-blurbs.h:211 msgid "How many recently opened image filenames to keep on the File menu." -msgstr "Liczba wyświetlanych nazw ostatnio otwartych plików w menu „Plik”." +msgstr "Liczba wyświetlanych nazw ostatnio otwartych plików w menu „Plik”." #: ../app/config/gimprc-blurbs.h:214 msgid "" @@ -6161,7 +6156,7 @@ "milliseconds (less time indicates faster marching)." msgstr "" "Prędkość animacji obwódki widocznej wokół zaznaczonego obszaru. Wartość jest " -"podana w milisekundach (krótszy czas oznacza szybszą animację)." +"podana w milisekundach (krótszy czas oznacza szybszą animację)." #: ../app/config/gimprc-blurbs.h:218 msgid "" @@ -6177,8 +6172,8 @@ "forces the X server to be queried for both horizontal and vertical " "resolution information." msgstr "" -"Ustala rozdzielczość poziomą monitora w punktach na cal. Jeżeli ustawione " -"jest 0, wymusza zapytanie serwera X o rozdzielczość pionową i poziomą." +"Ustala rozdzielczość poziomą monitora w punktach na cal. Jeżeli ustawione " +"jest 0, wymusza zapytanie serwera X o rozdzielczość pionową i poziomą." #: ../app/config/gimprc-blurbs.h:233 msgid "" @@ -6186,8 +6181,8 @@ "forces the X server to be queried for both horizontal and vertical " "resolution information." msgstr "" -"Ustala rozdzielczość pionową monitora w punktach na cal. Jeżeli ustawione " -"jest 0, wymusza zapytanie serwera X o rozdzielczość pionową i poziomą." +"Ustala rozdzielczość pionową monitora w punktach na cal. Jeżeli ustawione " +"jest 0, wymusza zapytanie serwera X o rozdzielczość pionową i poziomą." #: ../app/config/gimprc-blurbs.h:238 msgid "" @@ -6195,7 +6190,7 @@ "used to be the default behaviour in older versions." msgstr "" "Powoduje, że narzędzie przesuwania ustawia modyfikowaną warstwę lub ścieżkę " -"jako aktywną. Zachowanie to występowało jako domyślne w starszych wersjach " +"jako aktywną. Zachowanie to występowało jako domyślne w starszych wersjach " "programu." #: ../app/config/gimprc-blurbs.h:242 @@ -6203,12 +6198,12 @@ "Sets the size of the navigation preview available in the lower right corner " "of the image window." msgstr "" -"Ustala rozmiar podglądu nawigacyjnego, widocznego w prawym dolnym rogu okna " +"Ustala rozmiar podglądu nawigacyjnego, widocznego w prawym dolnym rogu okna " "obrazu." #: ../app/config/gimprc-blurbs.h:246 msgid "Sets how many processors GIMP should try to use simultaneously." -msgstr "Określa ilość procesorów, jakie może równocześnie używać program GIMP." +msgstr "Określa liczbę procesorów, jaką program GIMP może używać równocześnie." #: ../app/config/gimprc-blurbs.h:259 msgid "" @@ -6218,11 +6213,11 @@ "Conversely, on some X servers enabling this option results in faster " "painting." msgstr "" -"Włączenie opcji powoduje, że serwer X odpytywany jest o współrzędne kursora " +"Włączenie opcji powoduje, że serwer X odpytywany jest o współrzędne kursora " "myszy przy każdym zdarzeniu opisującym zmianę jego położenia (zamiast użycia " "informacji przekazanych ze zdarzeniem). Powinno to zwiększyć precyzję " -"rysowania przy użyciu pędzli o dużych rozmiarach, jednak kosztem prędkości " -"działania. Co ciekawe, w przypadku niektórych serwerów X użycie tej opcji " +"rysowania przy użyciu pędzli o dużych rozmiarach, jednak kosztem prędkości " +"działania. Co ciekawe, w przypadku niektórych serwerów X użycie tej opcji " "powoduje, że program działa szybciej." #: ../app/config/gimprc-blurbs.h:275 @@ -6231,16 +6226,16 @@ "the layers and channels dialog are nice to have but they can slow things " "down when working with large images." msgstr "" -"Określa, czy program GIMP powinien tworzyć podglądy warstw i kanałów. " -"Podglądy w oknie warstw i kanałów ułatwiają pracę, jednak przy pracy z " -"dużymi obrazami mogą negatywnie wpłynąć na prędkość działania programu." +"Określa, czy program GIMP powinien tworzyć podglądy warstw i kanałów. " +"Podglądy w oknie warstw i kanałów ułatwiają pracę, jednak przy pracy " +"z dużymi obrazami mogą negatywnie wpłynąć na prędkość działania programu." #: ../app/config/gimprc-blurbs.h:280 msgid "" "Sets the preview size used for layers and channel previews in newly created " "dialogs." msgstr "" -"Ustawia rozmiar podglądu warstw i kanałów w nowo utworzonych oknach " +"Ustawia rozmiar podglądu warstw i kanałów w nowo utworzonych oknach " "dialogowych." #: ../app/config/gimprc-blurbs.h:284 @@ -6252,7 +6247,7 @@ "When enabled, the image window will automatically resize itself whenever the " "physical image size changes." msgstr "" -"Powoduje automatyczną zmianę rozmiaru okna z obrazem w przypadku zmiany " +"Powoduje automatyczną zmianę rozmiaru okna z obrazem w przypadku zmiany " "fizycznych wymiarów obrazu." #: ../app/config/gimprc-blurbs.h:291 @@ -6260,7 +6255,7 @@ "When enabled, the image window will automatically resize itself when zooming " "into and out of images." msgstr "" -"Powoduje automatyczną zmianę rozmiaru okna z obrazem w przypadku zmiany " +"Powoduje automatyczną zmianę rozmiaru okna z obrazem w przypadku zmiany " "powiększenia obrazu." #: ../app/config/gimprc-blurbs.h:295 @@ -6281,13 +6276,13 @@ "Keep a permanent record of all opened and saved files in the Recent " "Documents list." msgstr "" -"Zachowuje wszystkie wpisy otwartych i zapisanych plików na liście historii " +"Zachowuje wszystkie wpisy otwartych i zapisanych plików na liście historii " "dokumentów." #: ../app/config/gimprc-blurbs.h:306 msgid "Save the positions and sizes of the main dialogs when GIMP exits." msgstr "" -"Powoduje zapisywanie położeń i rozmiarów głównych okien dialogowych przed " +"Powoduje zapisywanie położeń i rozmiarów głównych okien dialogowych przed " "zakończeniem działania programu GIMP." #: ../app/config/gimprc-blurbs.h:309 @@ -6302,7 +6297,7 @@ "outline." msgstr "" "Powoduje wyświetlanie podglądu kształtu aktywnego pędzla podczas używania " -"któregokolwiek z narzędzi rysowania." +"któregokolwiek z narzędzi rysowania." #: ../app/config/gimprc-blurbs.h:319 msgid "" @@ -6310,8 +6305,8 @@ "related help page. Without this button, the help page can still be reached " "by pressing F1." msgstr "" -"Powoduje, że w oknach dialogowych dostępny będzie przycisk pomocy, dający " -"dostęp do strony pomocy powiązanej z oknem. Przy wyłączonej opcji pomoc " +"Powoduje, że w oknach dialogowych dostępny będzie przycisk pomocy, dający " +"dostęp do strony pomocy powiązanej z oknem. Przy wyłączonej opcji pomoc " "nadal będzie dostępna przez naciśnięcie klawisza F1." #: ../app/config/gimprc-blurbs.h:324 @@ -6319,23 +6314,23 @@ "When enabled, the mouse pointer will be shown over the image while using a " "paint tool." msgstr "" -"Powoduje, że w czasie rysowania nad obrazem wyświetlany jest kursor myszy." +"Powoduje, że w czasie rysowania nad obrazem wyświetlany jest kursor myszy." #: ../app/config/gimprc-blurbs.h:328 msgid "" "When enabled, the menubar is visible by default. This can also be toggled " "with the \"View->Show Menubar\" command." msgstr "" -"Powoduje, że domyślnie pasek menu jest widoczny. Ustawienie można zmienić w " -"dowolnej chwili za pomocą polecenia „Widok→Wyświetlanie paska menu”." +"Powoduje, że domyślnie pasek menu jest widoczny. Ustawienie można zmienić " +"w dowolnej chwili za pomocą polecenia „Widok→Wyświetlanie paska menu”." #: ../app/config/gimprc-blurbs.h:332 msgid "" "When enabled, the rulers are visible by default. This can also be toggled " "with the \"View->Show Rulers\" command." msgstr "" -"Powoduje, że domyślnie linijki są widoczne. Ustawienie można zmienić w " -"dowolnej chwili za pomocą polecenia „Widok→Wyświetlanie linijek”." +"Powoduje, że domyślnie linijki są widoczne. Ustawienie można zmienić " +"w dowolnej chwili za pomocą polecenia „Widok→Wyświetlanie linijek”." #: ../app/config/gimprc-blurbs.h:336 msgid "" @@ -6343,7 +6338,7 @@ "toggled with the \"View->Show Scrollbars\" command." msgstr "" "Powoduje, że domyślnie paski przewijania są widoczne. Ustawienie można " -"zmienić w dowolnej chwili za pomocą polecenia „Widok→Wyświetlanie pasków " +"zmienić w dowolnej chwili za pomocą polecenia „Widok→Wyświetlanie pasków " "przewijania”." #: ../app/config/gimprc-blurbs.h:340 @@ -6351,16 +6346,16 @@ "When enabled, the statusbar is visible by default. This can also be toggled " "with the \"View->Show Statusbar\" command." msgstr "" -"Powoduje, że domyślnie pasek stanu jest widoczny. Ustawienie można zmienić w " -"dowolnej chwili za pomocą polecenia „Widok→Wyświetlanie paska stanu”." +"Powoduje, że domyślnie pasek stanu jest widoczny. Ustawienie można zmienić " +"w dowolnej chwili za pomocą polecenia „Widok→Wyświetlanie paska stanu”." #: ../app/config/gimprc-blurbs.h:344 msgid "" "When enabled, the selection is visible by default. This can also be toggled " "with the \"View->Show Selection\" command." msgstr "" -"Powoduje, że domyślnie zaznaczenie jest widoczne. Ustawienie można zmienić w " -"dowolnej chwili za pomocą polecenia „Widok→Wyświetlanie zaznaczenia”." +"Powoduje, że domyślnie zaznaczenie jest widoczne. Ustawienie można zmienić " +"w dowolnej chwili za pomocą polecenia „Widok→Wyświetlanie zaznaczenia”." #: ../app/config/gimprc-blurbs.h:348 msgid "" @@ -6368,23 +6363,23 @@ "toggled with the \"View->Show Layer Boundary\" command." msgstr "" "Powoduje, że domyślnie granice warstwy są widoczne. Ustawienie można zmienić " -"w dowolnej chwili za pomocą polecenia „Widok→Wyświetlanie granic warstwy”." +"w dowolnej chwili za pomocą polecenia „Widok→Wyświetlanie granic warstwy”." #: ../app/config/gimprc-blurbs.h:352 msgid "" "When enabled, the guides are visible by default. This can also be toggled " "with the \"View->Show Guides\" command." msgstr "" -"Powoduje, że domyślnie prowadnice są widoczne. Ustawienie można zmienić w " -"dowolnej chwili za pomocą polecenia „Widok→Wyświetlanie prowadnic”." +"Powoduje, że domyślnie prowadnice są widoczne. Ustawienie można zmienić " +"w dowolnej chwili za pomocą polecenia „Widok→Wyświetlanie prowadnic”." #: ../app/config/gimprc-blurbs.h:356 msgid "" "When enabled, the grid is visible by default. This can also be toggled with " "the \"View->Show Grid\" command." msgstr "" -"Powoduje, że domyślnie siatka jest widoczna. Ustawienie można zmienić w " -"dowolnej chwili za pomocą polecenia „Widok→Wyświetlanie siatki”." +"Powoduje, że domyślnie siatka jest widoczna. Ustawienie można zmienić " +"w dowolnej chwili za pomocą polecenia „Widok→Wyświetlanie siatki”." #: ../app/config/gimprc-blurbs.h:360 msgid "" @@ -6392,7 +6387,7 @@ "toggled with the \"View->Show Sample Points\" command." msgstr "" "Powoduje, że domyślnie punkty wzorcowe są widoczne. Ustawienie można zmienić " -"w dowolnej chwili za pomocą polecenia „Widok→Wyświetlanie punktów " +"w dowolnej chwili za pomocą polecenia „Widok→Wyświetlanie punktów " "wzorcowych”." #: ../app/config/gimprc-blurbs.h:364 @@ -6401,15 +6396,15 @@ #: ../app/config/gimprc-blurbs.h:367 msgid "Use GIMP in a single-window mode." -msgstr "Uruchamia program GIMP w trybie jednego okna." +msgstr "Uruchamia program GIMP w trybie jednego okna." #: ../app/config/gimprc-blurbs.h:370 msgid "Hide docks and other windows, leaving only image windows." -msgstr "Ukrywa doki oraz inne okna, zostawiając jedynie okna z obrazem." +msgstr "Ukrywa doki oraz inne okna, zostawiając jedynie okna z obrazem." #: ../app/config/gimprc-blurbs.h:373 msgid "What to do when the space bar is pressed in the image window." -msgstr "Określa co zrobić, gdy została wciśnięta spacja w oknie obrazu." +msgstr "Określa co zrobić, gdy została wciśnięta spacja w oknie obrazu." #: ../app/config/gimprc-blurbs.h:376 msgid "" @@ -6421,11 +6416,11 @@ "may be desirable to put your swap file in \"/tmp\"." msgstr "" "Ustala położenie pliku wymiany. Program GIMP używa pamięci stronicowanej. " -"Plik wymiany służy do szybkiego zapisu pamięci stronicowej na dysk i z " -"powrotem. Należy pamiętać o tym, że przy pracy z dużymi obrazami, plik " +"Plik wymiany służy do szybkiego zapisu pamięci stronicowej na dysk " +"i z powrotem. Należy pamiętać o tym, że przy pracy z dużymi obrazami, plik " "wymiany może szybko osiągnąć ogromne rozmiary. Ze względu na prędkość " "działania, nie należy umieszczać pliku wymiany na dyskach sieciowych (np. " -"przez NFS). W większości przypadków zaleca się umiejscowienie go w katalogu " +"przez NFS). W większości przypadków zaleca się umiejscowienie go w katalogu " "„/tmp”." #: ../app/config/gimprc-blurbs.h:385 @@ -6437,7 +6432,7 @@ "When enabled, you can change keyboard shortcuts for menu items by hitting a " "key combination while the menu item is highlighted." msgstr "" -"Umożliwia modyfikowanie skrótów klawiszowych związanych z pozycjami menu " +"Umożliwia modyfikowanie skrótów klawiszowych związanych z pozycjami menu " "przez naciśnięcie wybranej kombinacji klawiszy, kiedy dana pozycja jest " "aktywna." @@ -6460,22 +6455,22 @@ "files are likely to remain, so it is best if this folder not be one that is " "shared by other users." msgstr "" -"Ustawia katalog przeznaczony na tymczasowe przechowywanie danych. Będą się w " -"nim pojawiały pliki tworzone w czasie działania programu GIMP. Większość z " -"plików zostanie usunięta przed zakończeniem działania programu, jednak " +"Ustawia katalog przeznaczony na tymczasowe przechowywanie danych. Będą się " +"w nim pojawiały pliki tworzone w czasie działania programu GIMP. Większość " +"z plików zostanie usunięta przed zakończeniem działania programu, jednak " "istnieje możliwość, że część plików pozostanie, więc zaleca się, aby katalog " -"ten nie był współdzielony z innymi użytkownikami." +"ten nie był współdzielony z innymi użytkownikami." #: ../app/config/gimprc-blurbs.h:410 msgid "Sets the size of the thumbnail shown in the Open dialog." -msgstr "Ustawia rozmiar miniatur w oknie wyboru pliku." +msgstr "Ustawia rozmiar miniatur w oknie wyboru pliku." #: ../app/config/gimprc-blurbs.h:413 msgid "" "The thumbnail in the Open dialog will be automatically updated if the file " "being previewed is smaller than the size set here." msgstr "" -"W przypadku, gdy rozmiar obrazu przeglądanego w oknie otwarcia obrazu będzie " +"W przypadku, gdy rozmiar obrazu przeglądanego w oknie otwarcia obrazu będzie " "mniejszy od podanej tutaj wartości, nastąpi automatyczne zaktualizowanie " "jego miniatury." @@ -6487,26 +6482,26 @@ "you may want to set this to a higher value." msgstr "" "Kiedy ilość danych pikseli przekroczy to ograniczenie, program GIMP uruchomi " -"pamięć wymiany. Jest ona o wiele wolniejsza, lecz pozwala pracować na " -"obrazach nie mieszczących się w pamięci. Jeżeli w komputerze jest dużą ilość " +"pamięć wymiany. Jest ona o wiele wolniejsza, lecz pozwala pracować na " +"obrazach niemieszczących się w pamięci. Jeżeli w komputerze jest dużą ilość " "pamięci RAM, to można zwiększyć tę wartość." #: ../app/config/gimprc-blurbs.h:423 msgid "Show the current foreground and background colors in the toolbox." msgstr "" -"Wyświetla bieżący kolor pierwszoplanowy oraz tła z kolorem tła w przyborniku." +"Wyświetla bieżący kolor pierwszoplanowy oraz tła z kolorem tła w przyborniku." #: ../app/config/gimprc-blurbs.h:426 msgid "Show the currently selected brush, pattern and gradient in the toolbox." -msgstr "Wyświetla obecnie zaznaczony pędzel, deseń i gradient w przyborniku." +msgstr "Wyświetla obecnie zaznaczony pędzel, deseń i gradient w przyborniku." #: ../app/config/gimprc-blurbs.h:429 msgid "Show the currently active image in the toolbox." -msgstr "Wyświetla obecnie aktywny obraz w przyborniku." +msgstr "Wyświetla obecnie aktywny obraz w przyborniku." #: ../app/config/gimprc-blurbs.h:435 msgid "Sets the manner in which transparency is displayed in images." -msgstr "Ustala sposób prezentowania przezroczystości w obrazie." +msgstr "Ustala sposób prezentowania przezroczystości w obrazie." #: ../app/config/gimprc-blurbs.h:438 msgid "Sets the size of the checkerboard used to display transparency." @@ -6526,7 +6521,7 @@ "Sets the minimal number of operations that can be undone. More undo levels " "are kept available until the undo-size limit is reached." msgstr "" -"Ustala minimalną liczbę działań w programie, które można cofnąć. Możliwość " +"Ustala minimalną liczbę działań w programie, które można cofnąć. Możliwość " "cofnięcia większej liczby działań istnieje do czasu osiągnięcia ograniczenia " "rozmiaru historii działań." @@ -6536,14 +6531,14 @@ "on the undo stack. Regardless of this setting, at least as many undo-levels " "as configured can be undone." msgstr "" -"Ustawia maksymalny rozmiar pamięci, jaki może zostać przydzielony każdemu z " -"obrazów na historię działań. Niezależnie od tego ustawienia program " +"Ustawia maksymalny rozmiar pamięci, jaki może zostać przydzielony każdemu " +"z obrazów na historię działań. Niezależnie od tego ustawienia program " "gwarantuje jednak możliwość cofnięcia przynajmniej takiej liczby działań, " "jaką skonfigurowano jako minimalną." #: ../app/config/gimprc-blurbs.h:454 msgid "Sets the size of the previews in the Undo History." -msgstr "Ustawia rozmiar podglądów w historii działań." +msgstr "Ustawia rozmiar podglądów w historii działań." #: ../app/config/gimprc-blurbs.h:457 msgid "When enabled, pressing F1 will open the help browser." @@ -6893,7 +6888,7 @@ #: ../app/core/core-enums.c:833 msgctxt "undo-type" msgid "<>" -msgstr "<>" +msgstr "«nieprawidłowe»" #: ../app/core/core-enums.c:834 msgctxt "undo-type" @@ -7428,12 +7423,12 @@ "a folder named '%s' and copy some files to it." msgstr "" "Uruchomiono program GIMP po raz pierwszy. Nastąpi teraz utworzenie katalogu " -"„%s” i zostaną do niego skopiowane pliki." +"„%s” i zostaną do niego skopiowane pliki." #: ../app/core/gimp-user-install.c:359 #, c-format msgid "Copying file '%s' from '%s'..." -msgstr "Kopiowanie pliku „%s” z „%s”…" +msgstr "Kopiowanie pliku „%s” z „%s”…" #: ../app/core/gimp-user-install.c:374 ../app/core/gimp-user-install.c:400 #, c-format @@ -7457,14 +7452,14 @@ #. initialize the global parasite table #: ../app/core/gimp.c:947 msgid "Looking for data files" -msgstr "Wyszukiwanie plików z danymi" +msgstr "Wyszukiwanie plików z danymi" #: ../app/core/gimp.c:947 msgid "Parasites" msgstr "Dane pasożytnicze" #. initialize the list of gimp dynamics -#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2750 +#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2787 #: ../app/tools/gimppaintoptions-gui.c:201 msgid "Dynamics" msgstr "Dynamika" @@ -7475,7 +7470,7 @@ msgstr "Czcionki (może to zająć kilka minut)" #. initialize the module list -#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2782 +#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2819 msgid "Modules" msgstr "Moduły" @@ -7488,41 +7483,41 @@ #, c-format msgid "Could not read %d byte from '%s': %s" msgid_plural "Could not read %d bytes from '%s': %s" -msgstr[0] "Nie można odczytać %d bajtu z pliku „%s”: %s" -msgstr[1] "Nie można odczytać %d bajty z pliku „%s”: %s" -msgstr[2] "Nie można odczytać %d bajtów z pliku „%s”: %s" +msgstr[0] "Nie można odczytać %d bajtu z pliku „%s”: %s" +msgstr[1] "Nie można odczytać %d bajtów z pliku „%s”: %s" +msgstr[2] "Nie można odczytać %d bajtów z pliku „%s”: %s" #: ../app/core/gimpbrush-load.c:202 #, c-format msgid "Fatal parse error in brush file '%s': Width = 0." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: Szerokość = 0." +"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: Szerokość = 0." #: ../app/core/gimpbrush-load.c:211 #, c-format msgid "Fatal parse error in brush file '%s': Height = 0." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: Wysokość = 0." +"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: Wysokość = 0." #: ../app/core/gimpbrush-load.c:220 #, c-format msgid "Fatal parse error in brush file '%s': Bytes = 0." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: Rozmiar pliku = " +"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: Rozmiar pliku = " "0 bajtów" #: ../app/core/gimpbrush-load.c:244 #, c-format msgid "Fatal parse error in brush file '%s': Unknown depth %d." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: nieznana głębia " +"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: nieznana głębia " "%d." #: ../app/core/gimpbrush-load.c:257 #, c-format msgid "Fatal parse error in brush file '%s': Unknown version %d." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: nieznana wersja " +"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: nieznana wersja " "%d." #: ../app/core/gimpbrush-load.c:273 ../app/core/gimpbrush-load.c:410 @@ -7532,14 +7527,14 @@ #, c-format msgid "Fatal parse error in brush file '%s': File appears truncated." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: plik wydaje się " +"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: plik wydaje się " "być obcięty." #: ../app/core/gimpbrush-load.c:281 ../app/core/gimpbrushgenerated-load.c:128 #: ../app/core/gimpbrushpipe-load.c:97 #, c-format msgid "Invalid UTF-8 string in brush file '%s'." -msgstr "Nieprawidłowy ciąg UTF-8 w pliku z pędzlami „%s”." +msgstr "Nieprawidłowy ciąg UTF-8 w pliku z pędzlami „%s”." #: ../app/core/gimpbrush-load.c:288 ../app/core/gimppattern-load.c:146 #: ../app/dialogs/template-options-dialog.c:83 @@ -7555,12 +7550,12 @@ "This might be an obsolete GIMP brush file, try loading it as image and save " "it again." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: nieobsługiwana " +"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: nieobsługiwana " "głębia pędzla %d\n" -"Pędzle programu GIMP muszą być zapisane albo w odcieniach szarości lub w " -"formacie RGBA.\n" -"Może to być przestarzały plik z pędzlami programu GIMP, proszę spróbować " -"wczytać go jako obraz i zapisać ponownie." +"Pędzle programu GIMP muszą być zapisane albo w odcieniach szarości lub " +"w formacie RGBA.\n" +"Może to być przestarzały plik z pędzlami programu GIMP, proszę spróbować " +"wczytać go jako obraz i zapisać ponownie." #: ../app/core/gimpbrush-load.c:399 #, c-format @@ -7568,24 +7563,24 @@ "Fatal parse error in brush file '%s': Unsupported brush depth %d\n" "GIMP brushes must be GRAY or RGBA." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: nieobsługiwana " +"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: nieobsługiwana " "głębia pędzla (%d).\n" -"Pędzle programu GIMP muszą być zapisane albo w odcieniach szarości lub w " -"formacie RGBA." +"Pędzle programu GIMP muszą być zapisane albo w odcieniach szarości lub " +"w formacie RGBA." #: ../app/core/gimpbrush-load.c:471 ../app/core/gimpbrush-load.c:909 #, c-format msgid "" "Fatal parse error in brush file '%s': unable to decode abr format version %d." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: nie można " +"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: nie można " "dekodować wersji formatu abr %d." #: ../app/core/gimpbrush-load.c:647 #, c-format msgid "Fatal parse error in brush file '%s': Wide brushes are not supported." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: duże pędzle nie " +"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: duże pędzle nie " "są obsługiwane." #: ../app/core/gimpbrush.c:148 @@ -7596,39 +7591,39 @@ #, c-format msgid "Fatal parse error in brush file '%s': Not a GIMP brush file." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: to nie jest plik " -"z pędzlami programu GIMP." +"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: to nie jest plik " +"z pędzlami programu GIMP." #: ../app/core/gimpbrushgenerated-load.c:104 #, c-format msgid "" "Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: nieznana wersja " -"pliku z pędzlami programu GIMP w wierszu %d." +"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: nieznana wersja " +"pliku z pędzlami programu GIMP w %d. wierszu." #: ../app/core/gimpbrushgenerated-load.c:150 #, c-format msgid "" "Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: nieznany kształt " -"pędzla programu GIMP w wierszu %d." +"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: nieznany kształt " +"pędzla programu GIMP w %d. wierszu." #: ../app/core/gimpbrushgenerated-load.c:226 #, c-format msgid "Line %d: %s" -msgstr "Wiersz %d: %s" +msgstr "%d. wiersz: %s" #: ../app/core/gimpbrushgenerated-load.c:228 #, c-format msgid "File is truncated in line %d" -msgstr "Plik jest obcięty w wierszu %d" +msgstr "Plik jest obcięty w %d. wierszu" #: ../app/core/gimpbrushgenerated-load.c:231 #, c-format msgid "Error while reading brush file '%s': %s" -msgstr "Błąd podczas odczytywania pliku „%s” z pędzlami: %s" +msgstr "Błąd podczas odczytywania pliku „%s” z pędzlami: %s" #: ../app/core/gimpbrushgenerated.c:129 msgid "Brush Shape" @@ -7658,7 +7653,7 @@ #, c-format msgid "Fatal parse error in brush file '%s': File is corrupt." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: plik jest " +"Krytyczny błąd podczas przetwarzania pliku „%s” z pędzlami: plik jest " "uszkodzony." #: ../app/core/gimpchannel-select.c:60 @@ -7679,7 +7674,7 @@ #: ../app/core/gimpchannel-select.c:407 ../app/core/gimplayer.c:275 msgctxt "undo-type" msgid "Alpha to Selection" -msgstr "Zaznaczenie z kanału alfa" +msgstr "Zaznaczenie z kanału alfa" #: ../app/core/gimpchannel-select.c:445 #, c-format @@ -7867,7 +7862,7 @@ #: ../app/core/gimpdatafactory.c:563 ../app/core/gimpitem.c:507 #, c-format msgid "%s copy" -msgstr "kopia: %s" +msgstr "%s. kopia" #: ../app/core/gimpdatafactory.c:756 #, c-format @@ -7877,7 +7872,7 @@ "dialog's 'Folders' section." msgstr "" "Skonfigurowano zapisywalny katalog danych (%s), ale on nie istnieje. Proszę " -"utworzyć katalog lub naprawić konfigurację w sekcji „Katalogi” okna " +"utworzyć katalog lub naprawić konfigurację w sekcji „Katalogi” okna " "„Preferencji”." #: ../app/core/gimpdatafactory.c:777 @@ -7889,7 +7884,7 @@ msgstr "" "Skonfigurowano zapisywalny katalog danych, ale nie jest on częścią ścieżki " "wyszukiwania. Prawdopodobnie ręcznie zmodyfikowano plik gimprc. Proszę " -"naprawić konfigurację w sekcji „Katalogi” okna „Preferencji”." +"naprawić konfigurację w sekcji „Katalogi” okna „Preferencji”." #: ../app/core/gimpdatafactory.c:787 #, c-format @@ -7962,7 +7957,7 @@ #: ../app/core/gimpdrawable-hue-saturation.c:77 #: ../app/tools/gimphuesaturationtool.c:102 msgid "Hue-Saturation" -msgstr "Barwa i nasycenie" +msgstr "Barwa i nasycenie" #: ../app/core/gimpdrawable-hue-saturation.c:87 msgid "Hue_Saturation" @@ -7990,11 +7985,11 @@ #: ../app/core/gimpdrawable-stroke.c:272 #: ../app/paint/gimppaintcore-stroke.c:330 ../app/vectors/gimpvectors.c:556 msgid "Not enough points to stroke" -msgstr "Niewystarczająca ilość punktów do narysowania" +msgstr "Niewystarczająca liczba punktów do narysowania" #: ../app/core/gimpdrawable-stroke.c:273 msgid "Not enough points to fill" -msgstr "Niewystarczająca ilość punktów do wypełnienia" +msgstr "Niewystarczająca liczba punktów do wypełnienia" #: ../app/core/gimpdrawable-stroke.c:404 msgctxt "undo-type" @@ -8042,51 +8037,51 @@ #, c-format msgid "Fatal parse error in gradient file '%s': Read error in line %d." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z gradientem: błąd podczas " -"odczytywania wiersza %d." +"Krytyczny błąd podczas przetwarzania pliku „%s” z gradientem: błąd podczas " +"odczytywania %d. wiersza." #: ../app/core/gimpgradient-load.c:82 #, c-format msgid "Fatal parse error in gradient file '%s': Not a GIMP gradient file." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z gradientem: to nie jest " -"plik z gradientem programu GIMP." +"Krytyczny błąd podczas przetwarzania pliku „%s” z gradientem: to nie jest " +"plik z gradientem programu GIMP." #: ../app/core/gimpgradient-load.c:110 #, c-format msgid "Invalid UTF-8 string in gradient file '%s'." -msgstr "Nieprawidłowy ciąg UTF-8 w pliku „%s” z gradientem." +msgstr "Nieprawidłowy ciąg UTF-8 w pliku „%s” z gradientem." #: ../app/core/gimpgradient-load.c:137 #, c-format msgid "Fatal parse error in gradient file '%s': File is corrupt in line %d." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z gradientem: plik jest " -"uszkodzony w wierszu %d." +"Krytyczny błąd podczas przetwarzania pliku „%s” z gradientem: plik jest " +"uszkodzony w %d. wierszu." #: ../app/core/gimpgradient-load.c:219 ../app/core/gimpgradient-load.c:230 #, c-format msgid "Fatal parse error in gradient file '%s': Corrupt segment %d in line %d." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z gradientem: uszkodzony " -"segment %d w wierszu %d." +"Krytyczny błąd podczas przetwarzania pliku „%s” z gradientem: uszkodzony " +"segment %d w %d. wierszu." #: ../app/core/gimpgradient-load.c:242 ../app/core/gimpgradient-load.c:256 #, c-format msgid "Gradient file '%s' is corrupt: Segments do not span the range 0-1." msgstr "" -"Plik „%s” z gradientem jest uszkodzony: segmenty nie zawierają się w " -"zakresie 0-1." +"Plik „%s” z gradientem jest uszkodzony: segmenty nie zawierają się " +"w zakresie 0-1." #: ../app/core/gimpgradient-load.c:336 #, c-format msgid "No linear gradients found in '%s'" -msgstr "Nie odnaleziono gradientów liniowych w pliku „%s”" +msgstr "Nie odnaleziono gradientów liniowych w pliku „%s”" #: ../app/core/gimpgradient-load.c:346 #, c-format msgid "Failed to import gradients from '%s': %s" -msgstr "Zaimportowanie gradientów z pliku „%s” się nie powiodło: %s" +msgstr "Zaimportowanie gradientów z pliku „%s” się nie powiodło: %s" #: ../app/core/gimpgrid.c:85 msgid "Line style used for the grid." @@ -8114,11 +8109,11 @@ #: ../app/core/gimpgrid.c:116 msgid "" "Horizontal offset of the first grid line; this may be a negative number." -msgstr "Poziome przesunięcie pierwszej linii siatki; może być liczbą ujemną." +msgstr "Poziome przesunięcie pierwszej linii siatki. Może być liczbą ujemną." #: ../app/core/gimpgrid.c:123 msgid "Vertical offset of the first grid line; this may be a negative number." -msgstr "Pionowe przesunięcie pierwszej linii siatki, może być liczbą ujemną." +msgstr "Pionowe przesunięcie pierwszej linii siatki. Może być liczbą ujemną." #: ../app/core/gimpgrouplayer.c:219 msgid "Layer Group" @@ -8283,20 +8278,20 @@ #: ../app/core/gimpimage-merge.c:260 msgid "Cannot merge down to a layer group." -msgstr "Nie można połączyć w dół do grupy warstw." +msgstr "Nie można połączyć w dół do grupy warstw." #: ../app/core/gimpimage-merge.c:267 msgid "The layer to merge down to is locked." -msgstr "Warstwa do połączenia w dół jest zablokowana." +msgstr "Warstwa do połączenia w dół jest zablokowana." #: ../app/core/gimpimage-merge.c:279 msgid "There is no visible layer to merge down to." -msgstr "Nie ma widocznych warstw do połączenia w dół." +msgstr "Nie ma widocznych warstw do połączenia w dół." #: ../app/core/gimpimage-merge.c:289 msgctxt "undo-type" msgid "Merge Down" -msgstr "Połączenie w dół" +msgstr "Połączenie w dół" #: ../app/core/gimpimage-merge.c:317 msgctxt "undo-type" @@ -8355,7 +8350,7 @@ #: ../app/core/gimpimage.c:1784 msgid " (exported)" -msgstr " (eksportowany)" +msgstr " (wyeksportowany)" #: ../app/core/gimpimage.c:1788 msgid " (overwritten)" @@ -8383,7 +8378,7 @@ #: ../app/core/gimpimage.c:3045 msgctxt "undo-type" msgid "Remove Parasite from Image" -msgstr "Usunięcie z obrazu danych pasożytniczych" +msgstr "Usunięcie z obrazu danych pasożytniczych" #: ../app/core/gimpimage.c:3754 msgctxt "undo-type" @@ -8420,7 +8415,7 @@ msgid "Remove Path" msgstr "Usunięcie ścieżki" -#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1715 +#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1750 msgid "Folder" msgstr "Katalog" @@ -8488,7 +8483,7 @@ #: ../app/core/gimpitem.c:1880 ../app/core/gimpitem.c:1887 msgctxt "undo-type" msgid "Remove Parasite from Item" -msgstr "Usunięcie z elementu danych pasożytniczych" +msgstr "Usunięcie z elementu danych pasożytniczych" #: ../app/core/gimpitem-exclusive.c:81 msgid "Set Item Exclusive Visible" @@ -8508,7 +8503,7 @@ "Cannot create a new layer from the floating selection because it belongs to " "a layer mask or channel." msgstr "" -"Nie można utworzyć nowej warstwy z oderwanego zaznaczenia, ponieważ należy " +"Nie można utworzyć nowej warstwy z oderwanego zaznaczenia, ponieważ należy " "ono do maski warstwy lub kanału." #: ../app/core/gimplayer-floating-sel.c:133 @@ -8579,7 +8574,7 @@ msgid "Layer cannot be lowered more." msgstr "Nie można bardziej obniżyć warstwy." -#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1529 +#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1532 #: ../app/core/gimplayermask.c:236 #, c-format msgid "%s mask" @@ -8594,45 +8589,45 @@ "Oderwane zaznaczenie\n" "(%s)" -#: ../app/core/gimplayer.c:1449 +#: ../app/core/gimplayer.c:1452 msgid "Unable to add a layer mask since the layer already has one." msgstr "Nie można dodać maski warstwy, ponieważ warstwa już ją ma." -#: ../app/core/gimplayer.c:1460 +#: ../app/core/gimplayer.c:1463 msgid "Cannot add layer mask of different dimensions than specified layer." -msgstr "Nie można dodać maski warstwy o wymiarach różnych od wymiarów warstwy." +msgstr "Nie można dodać maski warstwy o wymiarach różnych od wymiarów warstwy." -#: ../app/core/gimplayer.c:1466 +#: ../app/core/gimplayer.c:1469 msgctxt "undo-type" msgid "Add Layer Mask" msgstr "Dodanie maski warstwy" -#: ../app/core/gimplayer.c:1584 +#: ../app/core/gimplayer.c:1587 msgctxt "undo-type" msgid "Transfer Alpha to Mask" msgstr "Przeniesienie kanału alfa na maskę" -#: ../app/core/gimplayer.c:1754 +#: ../app/core/gimplayer.c:1757 msgctxt "undo-type" msgid "Apply Layer Mask" msgstr "Zastosowanie maski warstwy" -#: ../app/core/gimplayer.c:1755 +#: ../app/core/gimplayer.c:1758 msgctxt "undo-type" msgid "Delete Layer Mask" msgstr "Usunięcie maski warstwy" -#: ../app/core/gimplayer.c:1874 +#: ../app/core/gimplayer.c:1877 msgctxt "undo-type" msgid "Add Alpha Channel" msgstr "Dodanie kanału alfa" -#: ../app/core/gimplayer.c:1928 +#: ../app/core/gimplayer.c:1931 msgctxt "undo-type" msgid "Remove Alpha Channel" msgstr "Usunięcie kanału alfa" -#: ../app/core/gimplayer.c:1948 +#: ../app/core/gimplayer.c:1951 msgctxt "undo-type" msgid "Layer to Image Size" msgstr "Dopasowanie wymiarów warstwy do obrazu" @@ -8683,20 +8678,20 @@ #, c-format msgid "Fatal parse error in palette file '%s': Read error in line %d." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z paletą: błąd podczas " -"odczytywania wiersza %d." +"Krytyczny błąd podczas przetwarzania pliku „%s” z paletą: błąd podczas " +"odczytywania %d. wiersza." #: ../app/core/gimppalette-load.c:96 #, c-format msgid "Fatal parse error in palette file '%s': Missing magic header." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z paletą: brak nagłówka " +"Krytyczny błąd podczas przetwarzania pliku „%s” z paletą: brak nagłówka " "identyfikacyjnego." #: ../app/core/gimppalette-load.c:125 #, c-format msgid "Invalid UTF-8 string in palette file '%s'" -msgstr "Nieprawidłowy ciąg UTF-8 w pliku z paletą „%s”." +msgstr "Nieprawidłowy ciąg UTF-8 w pliku z paletą „%s”." #: ../app/core/gimppalette-load.c:149 #, c-format @@ -8704,41 +8699,41 @@ "Reading palette file '%s': Invalid number of columns in line %d. Using " "default value." msgstr "" -"Odczytywanie pliku „%s” z paletą: nieprawidłowa liczba kolumn w wierszu %d. " +"Odczytywanie pliku „%s” z paletą: nieprawidłowa liczba kolumn w %d. wierszu. " "Użyto domyślnej wartości." #: ../app/core/gimppalette-load.c:185 #, c-format msgid "Reading palette file '%s': Missing RED component in line %d." msgstr "" -"Odczytywanie pliku „%s” z paletą: brak czerwonej (RED) składowej w wierszu " -"%d." +"Odczytywanie pliku „%s” z paletą: brak czerwonej (RED) składowej w %d. " +"wierszu." #: ../app/core/gimppalette-load.c:193 #, c-format msgid "Reading palette file '%s': Missing GREEN component in line %d." msgstr "" -"Odczytywanie pliku „%s” z paletą: brak zielonej (GREEN) składowej w wierszu " -"%d." +"Odczytywanie pliku „%s” z paletą: brak zielonej (GREEN) składowej w %d. " +"wierszu." #: ../app/core/gimppalette-load.c:201 #, c-format msgid "Reading palette file '%s': Missing BLUE component in line %d." msgstr "" -"Odczytywanie pliku „%s” z paletą: brak niebieskiej (BLUE) składowej w " -"wierszu %d." +"Odczytywanie pliku „%s” z paletą: brak niebieskiej (BLUE) składowej w %d. " +"wierszu." #: ../app/core/gimppalette-load.c:211 #, c-format msgid "Reading palette file '%s': RGB value out of range in line %d." msgstr "" -"Odczytywanie pliku „%s” z paletą: wartość RGB w wierszu %d jest poza " +"Odczytywanie pliku „%s” z paletą: wartość RGB w %d. wierszu jest poza " "zakresem." #: ../app/core/gimppalette-load.c:478 #, c-format msgid "Could not read header from palette file '%s'" -msgstr "Nie można odczytać nagłówka z pliku nagłówka „%s”" +msgstr "Nie można odczytać nagłówka z pliku nagłówka „%s”" #: ../app/core/gimppalette-load.c:501 ../app/core/gimppalette-load.c:589 #, c-format @@ -8750,7 +8745,7 @@ #, c-format msgid "Fatal parse error in pattern file '%s': File appears truncated." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z deseniami: plik jest " +"Krytyczny błąd podczas przetwarzania pliku „%s” z deseniami: plik jest " "ucięty." #: ../app/core/gimppattern-load.c:104 @@ -8758,7 +8753,7 @@ msgid "" "Fatal parse error in pattern file '%s': Unknown pattern format version %d." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z deseniami: nieznana wersja " +"Krytyczny błąd podczas przetwarzania pliku „%s” z deseniami: nieznana wersja " "formatu desenia (%d)." #: ../app/core/gimppattern-load.c:114 @@ -8767,15 +8762,15 @@ "Fatal parse error in pattern file '%s: Unsupported pattern depth %d.\n" "GIMP Patterns must be GRAY or RGB." msgstr "" -"Krytyczny błąd podczas przetwarzania pliku „%s” z deseniami: nieobsługiwana " +"Krytyczny błąd podczas przetwarzania pliku „%s” z deseniami: nieobsługiwana " "głębia desenia (%d).\n" -"Desenie programu GIMP muszą być zapisane albo w odcieniach szarości lub w " -"formacie RGB." +"Desenie programu GIMP muszą być zapisane albo w odcieniach szarości lub " +"w formacie RGB." #: ../app/core/gimppattern-load.c:139 #, c-format msgid "Invalid UTF-8 string in pattern file '%s'." -msgstr "Nieprawidłowy ciąg UTF-8 w pliku z deseniami „%s”." +msgstr "Nieprawidłowy ciąg UTF-8 w pliku z deseniami „%s”." #: ../app/core/gimppdbprogress.c:279 ../app/widgets/gimppdbdialog.c:331 #, c-format @@ -8811,7 +8806,7 @@ #: ../app/core/gimpselection.c:174 msgctxt "undo-type" msgid "Select None" -msgstr "Rezygnacja z zaznaczenia" +msgstr "Rezygnacja z zaznaczenia" #: ../app/core/gimpselection.c:175 msgctxt "undo-type" @@ -8865,8 +8860,8 @@ "distance of more than miter-limit * line-width from the actual join point." msgstr "" "Konwertuje zaostrzone połączenie skośne, jeśli zaostrzenie rozszerzy się na " -"większy dystans niż wynosi ograniczenie zaostrzenia * szerokość linii z " -"właściwego punktu połączenia." +"większy dystans, niż wynosi ograniczenie zaostrzenia * szerokość linii " +"z właściwego punktu połączenia." #: ../app/core/gimptoolpreset-load.c:61 #, c-format @@ -8949,7 +8944,7 @@ #: ../app/dialogs/about-dialog.c:114 msgid "About GIMP" -msgstr "Informacje o programie GIMP" +msgstr "Informacje o programie GIMP" #: ../app/dialogs/about-dialog.c:123 msgid "Visit the GIMP website" @@ -8964,8 +8959,8 @@ "Bartosz Kosiorek , 2005-2011\n" "Piotr Zaryk , 2008\n" "Robert Gomulka , 2008\n" -"Piotr Drąg , 2011-2016\n" -"Aviary.pl , 2011-2016" +"Piotr Drąg , 2011-2017\n" +"Aviary.pl , 2011-2017" #: ../app/dialogs/about-dialog.c:521 msgid "GIMP is brought to you by" @@ -8981,7 +8976,7 @@ #: ../app/dialogs/channel-options-dialog.c:175 msgid "Initialize from _selection" -msgstr "Inicjowanie z _zaznaczenia" +msgstr "Inicjowanie z _zaznaczenia" #: ../app/dialogs/convert-dialog.c:125 msgid "Indexed Color Conversion" @@ -9001,7 +8996,7 @@ #: ../app/dialogs/convert-dialog.c:217 msgid "_Remove unused colors from colormap" -msgstr "_Usunięcie nieużywanych kolorów z palety kolorów" +msgstr "_Usunięcie nieużywanych kolorów z palety kolorów" #. dithering #: ../app/dialogs/convert-dialog.c:234 ../app/tools/gimpblendoptions.c:254 @@ -9022,7 +9017,7 @@ #: ../app/dialogs/convert-dialog.c:416 ../app/pdb/convert-cmds.c:153 msgid "Cannot convert to a palette with more than 256 colors." -msgstr "Nie można konwertować na paletę z więcej niż 256 kolorami." +msgstr "Nie można konwertować na paletę z więcej niż 256 kolorami." #: ../app/dialogs/data-delete-dialog.c:81 msgid "Delete Object" @@ -9037,9 +9032,9 @@ #, c-format msgid "" "Are you sure you want to remove '%s' from the list and delete it on disk?" -msgstr "Na pewno usunąć „%s” z listy i z dysku?" +msgstr "Na pewno usunąć „%s” z listy i z dysku?" -#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:162 +#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:174 #: ../app/gui/gui-message.c:149 msgid "GIMP Message" msgstr "Komunikat programu GIMP" @@ -9161,7 +9156,7 @@ "save the image to the GIMP XCF format, use File→Save instead." msgstr "" "Można użyć tego okna dialogowego do eksportu plików do wielu formatów. " -"Należy użyć polecenia „Plik→Zapisz”, aby zapisać plik w formacie XCF " +"Należy użyć polecenia „Plik→Zapisz”, aby zapisać plik w formacie XCF " "programu GIMP." #: ../app/dialogs/file-save-dialog.c:605 @@ -9177,7 +9172,7 @@ "You can use this dialog to save to the GIMP XCF format. Use File→Export to " "export to other file formats." msgstr "" -"Można użyć tego okna dialogowego do zapisu w formacie XCF programu GIMP. " +"Można użyć tego okna dialogowego do zapisu w formacie XCF programu GIMP. " "Należy użyć polecenia „Plik→Wyeksportuj”, aby wyeksportować obraz do innych " "formatów." @@ -9195,7 +9190,7 @@ "known file extension or select a file format from the file format list." msgstr "" "Podany plik nie ma żadnego znanego rozszerzenia. Proszę wpisać lub wybrać " -"rozszerzenie z listy." +"rozszerzenie z listy." #: ../app/dialogs/file-save-dialog.c:706 msgid "The given file extension does not match the chosen file type." @@ -9216,7 +9211,7 @@ "\n" "%s" msgstr "" -"Zapisywanie „%s” się nie powiodło:\n" +"Zapisanie „%s” się nie powiodło:\n" "\n" "%s" @@ -9250,7 +9245,7 @@ #: ../app/dialogs/image-merge-layers-dialog.c:100 msgid "Expanded as necessary" -msgstr "Rozszerzona w razie potrzeby" +msgstr "Rozszerzona w razie potrzeby" #: ../app/dialogs/image-merge-layers-dialog.c:103 msgid "Clipped to image" @@ -9262,7 +9257,7 @@ #: ../app/dialogs/image-merge-layers-dialog.c:114 msgid "Merge within active _group only" -msgstr "Łączenie tylko w o_brębie aktywnej grupy" +msgstr "Łączenie tylko w o_brębie aktywnej grupy" #: ../app/dialogs/image-merge-layers-dialog.c:127 msgid "_Discard invisible layers" @@ -9273,7 +9268,7 @@ msgstr "Utworzenie nowego obrazu" #: ../app/dialogs/image-new-dialog.c:135 -#: ../app/dialogs/preferences-dialog.c:2016 +#: ../app/dialogs/preferences-dialog.c:2053 msgid "_Template:" msgstr "Sza_blon:" @@ -9285,7 +9280,7 @@ #: ../app/dialogs/image-scale-dialog.c:239 #, c-format msgid "You are trying to create an image with a size of %s." -msgstr "Wystąpiła próba utworzenia obrazu o rozmiarze %s." +msgstr "Wystąpiła próba utworzenia obrazu o rozmiarze %s." #: ../app/dialogs/image-new-dialog.c:345 #, c-format @@ -9294,7 +9289,7 @@ "\"Maximum Image Size\" in the Preferences dialog (currently %s)." msgstr "" "Wybrany rozmiar obrazu wymaga pamięci przekraczającej wartość skonfigurowaną " -"w oknie „Preferencji” jako „Maksymalny rozmiar obrazu” (obecnie %s)." +"w oknie „Preferencji” jako „Maksymalny rozmiar obrazu” (obecnie %s)." #: ../app/dialogs/image-properties-dialog.c:60 #: ../app/dialogs/image-properties-dialog.c:63 @@ -9330,7 +9325,7 @@ "%s)." msgstr "" "Przeskalowanie obrazu do wybranego rozmiaru wymaga ilości pamięci " -"przekraczającej wartość ustaloną w oknie „Preferencji” jako „Maksymalny " +"przekraczającej wartość ustaloną w oknie „Preferencji” jako „Maksymalny " "rozmiar obrazu” (obecnie %s)." #: ../app/dialogs/image-scale-dialog.c:260 @@ -9357,8 +9352,8 @@ "To edit a shortcut key, click on the corresponding row and type a new " "accelerator, or press backspace to clear." msgstr "" -"Aby zmodyfikować klawisz skrótu, należy kliknąć na odpowiedni rząd i " -"wprowadzić nowy skrót lub wyczyść naciskając klawisz Backspace." +"Aby zmodyfikować klawisz skrótu, należy kliknąć odpowiedni rząd i wprowadzić " +"nowy skrót lub wyczyść naciskając klawisz Backspace." #: ../app/dialogs/keyboard-shortcuts-dialog.c:81 msgid "S_ave keyboard shortcuts on exit" @@ -9397,7 +9392,7 @@ #: ../app/dialogs/layer-options-dialog.c:217 msgid "Set name from _text" -msgstr "Ustawienie nazwy w oparciu o _tekst" +msgstr "Ustawienie nazwy na podstawie _tekstu" #: ../app/dialogs/module-dialog.c:126 msgid "Module Manager" @@ -9413,7 +9408,7 @@ #: ../app/dialogs/module-dialog.c:468 msgid "Only in memory" -msgstr "Tylko w pamięci" +msgstr "Tylko w pamięci" #: ../app/dialogs/module-dialog.c:473 msgid "No longer available" @@ -9473,7 +9468,7 @@ #: ../app/dialogs/offset-dialog.c:213 msgid "Offset by x/_2, y/2" -msgstr "Przesunięcie o (x/_2), (y/2)" +msgstr "Przesunięcie o (x/_2), (y/2)" #. The edge behavior frame #: ../app/dialogs/offset-dialog.c:222 @@ -9506,7 +9501,7 @@ msgstr "Wybór źródła" #: ../app/dialogs/palette-import-dialog.c:214 -#: ../app/dialogs/preferences-dialog.c:1930 +#: ../app/dialogs/preferences-dialog.c:1967 msgid "_Gradient" msgstr "_Gradient" @@ -9524,7 +9519,7 @@ #: ../app/dialogs/palette-import-dialog.c:263 msgid "Palette _file" -msgstr "_Plik z paletą" +msgstr "_Plik z paletą" #. Palette file name entry #: ../app/dialogs/palette-import-dialog.c:292 @@ -9565,20 +9560,20 @@ msgid "The selected source contains no colors." msgstr "Wybrane źródło nie zawiera kolorów." -#: ../app/dialogs/preferences-dialog.c:268 +#: ../app/dialogs/preferences-dialog.c:266 msgid "Reset All Preferences" msgstr "Przywraca wszystkie preferencje" -#: ../app/dialogs/preferences-dialog.c:286 +#: ../app/dialogs/preferences-dialog.c:284 msgid "Do you really want to reset all preferences to default values?" msgstr "Na pewno przywrócić domyślne wartości wszystkich preferencji?" -#: ../app/dialogs/preferences-dialog.c:356 +#: ../app/dialogs/preferences-dialog.c:362 msgid "You will have to restart GIMP for the following changes to take effect:" msgstr "" "Należy ponownie uruchomić program GIMP, aby uwzględnić poniższe zmiany:" -#: ../app/dialogs/preferences-dialog.c:538 +#: ../app/dialogs/preferences-dialog.c:544 msgid "" "Your keyboard shortcuts will be reset to default values the next time you " "start GIMP." @@ -9586,15 +9581,15 @@ "Skróty klawiszowe zostaną ustawione na wartości domyślne przy następnym " "uruchomieniu programu GIMP." -#: ../app/dialogs/preferences-dialog.c:549 +#: ../app/dialogs/preferences-dialog.c:555 msgid "Remove all Keyboard Shortcuts" msgstr "Usunięcie wszystkich skrótów klawiszowych" -#: ../app/dialogs/preferences-dialog.c:571 +#: ../app/dialogs/preferences-dialog.c:577 msgid "Do you really want to remove all keyboard shortcuts from all menus?" -msgstr "Na pewno usunąć wszystkie skróty klawiszowe z wszystkich menu?" +msgstr "Na pewno usunąć wszystkie skróty klawiszowe z wszystkich menu?" -#: ../app/dialogs/preferences-dialog.c:612 +#: ../app/dialogs/preferences-dialog.c:618 msgid "" "Your window setup will be reset to default values the next time you start " "GIMP." @@ -9602,7 +9597,7 @@ "Ustawienia okien zostaną ustawione na wartości domyślne przy następnym " "uruchomieniu programu GIMP." -#: ../app/dialogs/preferences-dialog.c:647 +#: ../app/dialogs/preferences-dialog.c:653 msgid "" "Your input device settings will be reset to default values the next time you " "start GIMP." @@ -9610,7 +9605,7 @@ "Ustawienia urządzenia wprowadzania zostaną ustawione na wartości domyślne " "przy następnym uruchomieniu programu GIMP." -#: ../app/dialogs/preferences-dialog.c:682 +#: ../app/dialogs/preferences-dialog.c:688 msgid "" "Your tool options will be reset to default values the next time you start " "GIMP." @@ -9618,754 +9613,766 @@ "Ustawienia narzędzi zostaną ustawione na wartości domyślne przy następnym " "uruchomieniu programu GIMP." -#: ../app/dialogs/preferences-dialog.c:1268 +#: ../app/dialogs/preferences-dialog.c:1303 msgid "Show _menubar" msgstr "Pasek _menu" -#: ../app/dialogs/preferences-dialog.c:1272 +#: ../app/dialogs/preferences-dialog.c:1307 msgid "Show _rulers" msgstr "_Linijki" -#: ../app/dialogs/preferences-dialog.c:1275 +#: ../app/dialogs/preferences-dialog.c:1310 msgid "Show scroll_bars" msgstr "Pas_ki przewijania" -#: ../app/dialogs/preferences-dialog.c:1278 +#: ../app/dialogs/preferences-dialog.c:1313 msgid "Show s_tatusbar" msgstr "Pasek _stanu" -#: ../app/dialogs/preferences-dialog.c:1286 +#: ../app/dialogs/preferences-dialog.c:1321 msgid "Show s_election" msgstr "_Zaznaczenie" -#: ../app/dialogs/preferences-dialog.c:1289 +#: ../app/dialogs/preferences-dialog.c:1324 msgid "Show _layer boundary" msgstr "G_ranice warstwy" -#: ../app/dialogs/preferences-dialog.c:1292 +#: ../app/dialogs/preferences-dialog.c:1327 msgid "Show _guides" msgstr "Pr_owadnice" -#: ../app/dialogs/preferences-dialog.c:1295 +#: ../app/dialogs/preferences-dialog.c:1330 msgid "Show gri_d" msgstr "Sia_tka" -#: ../app/dialogs/preferences-dialog.c:1301 +#: ../app/dialogs/preferences-dialog.c:1336 msgid "Canvas _padding mode:" msgstr "Wygląd wyściół_ki płótna:" -#: ../app/dialogs/preferences-dialog.c:1306 +#: ../app/dialogs/preferences-dialog.c:1341 msgid "Custom p_adding color:" msgstr "Wybrany k_olor wyściółki płótna:" -#: ../app/dialogs/preferences-dialog.c:1307 +#: ../app/dialogs/preferences-dialog.c:1342 msgid "Select Custom Canvas Padding Color" msgstr "Wybór koloru wyściółki płótna" -#: ../app/dialogs/preferences-dialog.c:1405 +#: ../app/dialogs/preferences-dialog.c:1440 msgid "Preferences" msgstr "Preferencje" -#: ../app/dialogs/preferences-dialog.c:1518 -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:1553 +#: ../app/dialogs/preferences-dialog.c:2827 msgid "Environment" msgstr "Środowisko" -#: ../app/dialogs/preferences-dialog.c:1532 +#: ../app/dialogs/preferences-dialog.c:1567 msgid "Resource Consumption" msgstr "Wykorzystywanie zasobów" -#: ../app/dialogs/preferences-dialog.c:1542 +#: ../app/dialogs/preferences-dialog.c:1577 msgid "Minimal number of _undo levels:" msgstr "Mi_nimalna liczba poziomów cofnięć:" -#: ../app/dialogs/preferences-dialog.c:1545 +#: ../app/dialogs/preferences-dialog.c:1580 msgid "Maximum undo _memory:" msgstr "_Maksymalna pamięć dla historii działań:" -#: ../app/dialogs/preferences-dialog.c:1548 +#: ../app/dialogs/preferences-dialog.c:1583 msgid "Tile cache _size:" msgstr "_Rozmiar pamięci podręcznej kafli:" -#: ../app/dialogs/preferences-dialog.c:1551 +#: ../app/dialogs/preferences-dialog.c:1586 msgid "Maximum _new image size:" msgstr "Maksymal_ny rozmiar nowego obrazu:" -#: ../app/dialogs/preferences-dialog.c:1556 +#: ../app/dialogs/preferences-dialog.c:1591 msgid "Number of _processors to use:" msgstr "_Liczba używanych procesorów:" #. Image Thumbnails -#: ../app/dialogs/preferences-dialog.c:1561 +#: ../app/dialogs/preferences-dialog.c:1596 msgid "Image Thumbnails" msgstr "Miniatury obrazów" -#: ../app/dialogs/preferences-dialog.c:1566 +#: ../app/dialogs/preferences-dialog.c:1601 msgid "Size of _thumbnails:" msgstr "Wymiary m_iniatur:" -#: ../app/dialogs/preferences-dialog.c:1570 +#: ../app/dialogs/preferences-dialog.c:1605 msgid "Maximum _filesize for thumbnailing:" msgstr "Ma_ksymalny rozmiar miniaturyzowanych plików:" -#: ../app/dialogs/preferences-dialog.c:1580 +#: ../app/dialogs/preferences-dialog.c:1615 msgid "Keep record of used files in the Recent Documents list" msgstr "Zachowywanie używanych plików na liście historii dokumentów" -#: ../app/dialogs/preferences-dialog.c:1589 +#: ../app/dialogs/preferences-dialog.c:1624 msgid "User Interface" msgstr "Interfejs użytkownika" -#: ../app/dialogs/preferences-dialog.c:1592 +#: ../app/dialogs/preferences-dialog.c:1627 msgid "Interface" msgstr "Interfejs" -#: ../app/dialogs/preferences-dialog.c:1602 +#: ../app/dialogs/preferences-dialog.c:1637 msgid "Language" msgstr "Język" #. Previews -#: ../app/dialogs/preferences-dialog.c:1608 +#: ../app/dialogs/preferences-dialog.c:1643 msgid "Previews" msgstr "Podglądy" -#: ../app/dialogs/preferences-dialog.c:1611 +#: ../app/dialogs/preferences-dialog.c:1646 msgid "_Enable layer & channel previews" -msgstr "_Podglądy kanałów i warstw" +msgstr "_Podglądy kanałów i warstw" -#: ../app/dialogs/preferences-dialog.c:1617 +#: ../app/dialogs/preferences-dialog.c:1652 msgid "_Default layer & channel preview size:" -msgstr "_Domyślny rozmiar podglądu warstwy i kanału:" +msgstr "_Domyślny rozmiar podglądu warstwy i kanału:" -#: ../app/dialogs/preferences-dialog.c:1620 +#: ../app/dialogs/preferences-dialog.c:1655 msgid "Na_vigation preview size:" msgstr "Rozmiar podglądu _nawigacyjnego:" #. Keyboard Shortcuts -#: ../app/dialogs/preferences-dialog.c:1624 +#: ../app/dialogs/preferences-dialog.c:1659 msgid "Keyboard Shortcuts" msgstr "Skróty klawiszowe" -#: ../app/dialogs/preferences-dialog.c:1628 +#: ../app/dialogs/preferences-dialog.c:1663 msgid "_Use dynamic keyboard shortcuts" msgstr "Dynamiczne skróty k_lawiszowe" -#: ../app/dialogs/preferences-dialog.c:1632 +#: ../app/dialogs/preferences-dialog.c:1667 msgid "Configure _Keyboard Shortcuts..." msgstr "_Konfiguruj skróty klawiszowe…" -#: ../app/dialogs/preferences-dialog.c:1639 +#: ../app/dialogs/preferences-dialog.c:1674 msgid "_Save keyboard shortcuts on exit" msgstr "Zap_isywanie skrótów klawiszowych przed zakończeniem" -#: ../app/dialogs/preferences-dialog.c:1643 +#: ../app/dialogs/preferences-dialog.c:1678 msgid "Save Keyboard Shortcuts _Now" msgstr "_Zapisz skróty klawiszowe" -#: ../app/dialogs/preferences-dialog.c:1650 +#: ../app/dialogs/preferences-dialog.c:1685 msgid "_Reset Keyboard Shortcuts to Default Values" msgstr "_Ustaw domyślne wartości skrótów klawiszowych" -#: ../app/dialogs/preferences-dialog.c:1659 +#: ../app/dialogs/preferences-dialog.c:1694 msgid "Remove _All Keyboard Shortcuts" msgstr "Usuń wszystkie skróty _klawiszowe" -#: ../app/dialogs/preferences-dialog.c:1671 -#: ../app/dialogs/preferences-dialog.c:1710 +#: ../app/dialogs/preferences-dialog.c:1706 +#: ../app/dialogs/preferences-dialog.c:1745 msgid "Theme" msgstr "Motyw" -#: ../app/dialogs/preferences-dialog.c:1680 +#: ../app/dialogs/preferences-dialog.c:1715 msgid "Select Theme" msgstr "Wybór motywu" -#: ../app/dialogs/preferences-dialog.c:1762 +#: ../app/dialogs/preferences-dialog.c:1797 msgid "Reload C_urrent Theme" msgstr "Odśwież _bieżący motyw" -#: ../app/dialogs/preferences-dialog.c:1774 +#: ../app/dialogs/preferences-dialog.c:1809 msgid "Help System" msgstr "System pomocy" #. General -#: ../app/dialogs/preferences-dialog.c:1786 -#: ../app/dialogs/preferences-dialog.c:1873 -#: ../app/dialogs/preferences-dialog.c:2086 +#: ../app/dialogs/preferences-dialog.c:1821 +#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:2123 #: ../app/widgets/gimpcontrollereditor.c:185 msgid "General" msgstr "Ogólne" -#: ../app/dialogs/preferences-dialog.c:1789 +#: ../app/dialogs/preferences-dialog.c:1824 msgid "Show _tooltips" msgstr "Po_dpowiedzi" -#: ../app/dialogs/preferences-dialog.c:1792 +#: ../app/dialogs/preferences-dialog.c:1827 msgid "Show help _buttons" msgstr "Przyciski po_mocy" -#: ../app/dialogs/preferences-dialog.c:1805 +#: ../app/dialogs/preferences-dialog.c:1832 msgid "Use the online version" msgstr "Wersja sieciowa" -#: ../app/dialogs/preferences-dialog.c:1806 +#: ../app/dialogs/preferences-dialog.c:1833 msgid "Use a locally installed copy" msgstr "Kopia zainstalowana na komputerze" -#: ../app/dialogs/preferences-dialog.c:1807 +#: ../app/dialogs/preferences-dialog.c:1834 msgid "User manual:" msgstr "Podręcznik użytkownika:" -#: ../app/dialogs/preferences-dialog.c:1814 +#: ../app/dialogs/preferences-dialog.c:1841 msgid "There's a local installation of the user manual." msgstr "Podręcznik użytkownika jest zainstalowany na komputerze." -#: ../app/dialogs/preferences-dialog.c:1819 +#: ../app/dialogs/preferences-dialog.c:1847 msgid "The user manual is not installed locally." msgstr "Podręcznik użytkownika nie jest zainstalowany na komputerze." -#: ../app/dialogs/preferences-dialog.c:1844 +#. If there is no webkit available, assume we are on a platform +#. * that doesn't use the help browser, so don't bother showing +#. * the combo. +#. +#: ../app/dialogs/preferences-dialog.c:1860 msgid "Help Browser" msgstr "Przeglądarka pomocy" -#: ../app/dialogs/preferences-dialog.c:1848 +#: ../app/dialogs/preferences-dialog.c:1867 msgid "H_elp browser to use:" msgstr "Prz_eglądarka pomocy:" -#: ../app/dialogs/preferences-dialog.c:1876 +#: ../app/dialogs/preferences-dialog.c:1873 +msgid "" +"The GIMP help browser doesn't seem to be installed. Using the web browser " +"instead." +msgstr "" +"Przeglądarka pomocy programu GIMP nie jest zainstalowana. Używanie " +"przeglądarki WWW zamiast niej." + +#: ../app/dialogs/preferences-dialog.c:1913 msgid "_Save tool options on exit" msgstr "_Zapisywanie ustawień narzędzi przy zakończeniu" -#: ../app/dialogs/preferences-dialog.c:1880 +#: ../app/dialogs/preferences-dialog.c:1917 msgid "Save Tool Options _Now" msgstr "Zapisz ustawienia _narzędzi" -#: ../app/dialogs/preferences-dialog.c:1887 +#: ../app/dialogs/preferences-dialog.c:1924 msgid "_Reset Saved Tool Options to Default Values" msgstr "_Ustaw zapisane opcje narzędzi na wartości domyślne" #. Snapping Distance -#: ../app/dialogs/preferences-dialog.c:1897 +#: ../app/dialogs/preferences-dialog.c:1934 msgid "Guide & Grid Snapping" -msgstr "Przyciąganie do prowadnic i siatki" +msgstr "Przyciąganie do prowadnic i siatki" -#: ../app/dialogs/preferences-dialog.c:1902 +#: ../app/dialogs/preferences-dialog.c:1939 msgid "_Snap distance:" msgstr "_Zasięg przyciągania:" -#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:1947 msgid "Default _interpolation:" msgstr "Domyślna _interpolacja:" #. Global Brush, Pattern, ... -#: ../app/dialogs/preferences-dialog.c:1917 +#: ../app/dialogs/preferences-dialog.c:1954 msgid "Paint Options Shared Between Tools" msgstr "Opcje rysowania współdzielone przez narzędzia" -#: ../app/dialogs/preferences-dialog.c:1921 +#: ../app/dialogs/preferences-dialog.c:1958 msgid "_Brush" msgstr "_Pędzel" -#: ../app/dialogs/preferences-dialog.c:1924 +#: ../app/dialogs/preferences-dialog.c:1961 msgid "_Dynamics" msgstr "_Dynamika" -#: ../app/dialogs/preferences-dialog.c:1927 +#: ../app/dialogs/preferences-dialog.c:1964 msgid "_Pattern" msgstr "_Deseń" #. Move Tool -#: ../app/dialogs/preferences-dialog.c:1934 +#: ../app/dialogs/preferences-dialog.c:1971 msgid "Move Tool" msgstr "Przesuwanie" -#: ../app/dialogs/preferences-dialog.c:1938 +#: ../app/dialogs/preferences-dialog.c:1975 msgid "Set layer or path as active" msgstr "Ustawianie warstwy lub ścieżki jako aktywną" #. Appearance -#: ../app/dialogs/preferences-dialog.c:1963 -#: ../app/dialogs/preferences-dialog.c:2162 ../app/widgets/gimpgrideditor.c:134 +#: ../app/dialogs/preferences-dialog.c:2000 +#: ../app/dialogs/preferences-dialog.c:2199 ../app/widgets/gimpgrideditor.c:134 msgid "Appearance" msgstr "Wygląd" -#: ../app/dialogs/preferences-dialog.c:1967 +#: ../app/dialogs/preferences-dialog.c:2004 msgid "Show _foreground & background color" -msgstr "Wyświetlanie _koloru pierwszoplanowego i tła" +msgstr "Wyświetlanie _koloru pierwszoplanowego i tła" -#: ../app/dialogs/preferences-dialog.c:1971 +#: ../app/dialogs/preferences-dialog.c:2008 msgid "Show active _brush, pattern & gradient" -msgstr "Wyświetlanie ak_tywnego pędzla, desenia i gradientu" +msgstr "Wyświetlanie ak_tywnego pędzla, desenia i gradientu" -#: ../app/dialogs/preferences-dialog.c:1975 +#: ../app/dialogs/preferences-dialog.c:2012 msgid "Show active _image" msgstr "Wyświetlanie aktywnego o_brazu" #. Tool Editor -#: ../app/dialogs/preferences-dialog.c:1983 +#: ../app/dialogs/preferences-dialog.c:2020 msgid "Tools configuration" msgstr "Konfiguracja narzędzi" -#: ../app/dialogs/preferences-dialog.c:1998 +#: ../app/dialogs/preferences-dialog.c:2035 msgid "Default New Image" msgstr "Domyślny nowy obraz" -#: ../app/dialogs/preferences-dialog.c:2001 +#: ../app/dialogs/preferences-dialog.c:2038 msgid "Default Image" msgstr "Domyślny obraz" -#: ../app/dialogs/preferences-dialog.c:2035 +#: ../app/dialogs/preferences-dialog.c:2072 msgid "Set the default Quick Mask color" msgstr "Ustawienie domyślnego koloru szybkiej maski" -#: ../app/dialogs/preferences-dialog.c:2041 +#: ../app/dialogs/preferences-dialog.c:2078 msgid "Quick Mask color:" msgstr "Kolor szybkiej maski:" -#: ../app/dialogs/preferences-dialog.c:2051 +#: ../app/dialogs/preferences-dialog.c:2088 msgid "Default Image Grid" msgstr "Domyślna siatka obrazu" -#: ../app/dialogs/preferences-dialog.c:2054 +#: ../app/dialogs/preferences-dialog.c:2091 msgid "Default Grid" msgstr "Domyślna siatka" -#: ../app/dialogs/preferences-dialog.c:2074 +#: ../app/dialogs/preferences-dialog.c:2111 msgid "Image Windows" -msgstr "Okna z obrazami" +msgstr "Okna z obrazami" -#: ../app/dialogs/preferences-dialog.c:2089 +#: ../app/dialogs/preferences-dialog.c:2126 msgid "Use \"_Dot for dot\" by default" msgstr "Domyślne ustawienie „_Punkt do punktu”" -#: ../app/dialogs/preferences-dialog.c:2095 +#: ../app/dialogs/preferences-dialog.c:2132 msgid "Marching _ants speed:" msgstr "Prędkość a_nimacji obwódki:" #. Zoom & Resize Behavior -#: ../app/dialogs/preferences-dialog.c:2099 +#: ../app/dialogs/preferences-dialog.c:2136 msgid "Zoom & Resize Behavior" -msgstr "Zachowanie przy powiększaniu i zmianie wymiarów" +msgstr "Zachowanie przy powiększaniu i zmianie wymiarów" -#: ../app/dialogs/preferences-dialog.c:2103 +#: ../app/dialogs/preferences-dialog.c:2140 msgid "Resize window on _zoom" msgstr "Zmienianie wymiarów okna przy po_większeniu" -#: ../app/dialogs/preferences-dialog.c:2106 +#: ../app/dialogs/preferences-dialog.c:2143 msgid "Resize window on image _size change" msgstr "Zmienianie wymiarów okna przy z_mianie wymiarów obrazu" -#: ../app/dialogs/preferences-dialog.c:2112 +#: ../app/dialogs/preferences-dialog.c:2149 msgid "Fit to window" msgstr "Dopasowanie do okna" -#: ../app/dialogs/preferences-dialog.c:2114 +#: ../app/dialogs/preferences-dialog.c:2151 msgid "Initial zoom _ratio:" msgstr "Począ_tkowy współczynnik powiększenia:" #. Space Bar -#: ../app/dialogs/preferences-dialog.c:2118 +#: ../app/dialogs/preferences-dialog.c:2155 msgid "Space Bar" msgstr "Spacja" -#: ../app/dialogs/preferences-dialog.c:2124 +#: ../app/dialogs/preferences-dialog.c:2161 msgid "_While space bar is pressed:" msgstr "_Po naciśnięciu klawisza spacji:" #. Mouse Pointers -#: ../app/dialogs/preferences-dialog.c:2128 +#: ../app/dialogs/preferences-dialog.c:2165 msgid "Mouse Pointers" msgstr "kursory myszy" -#: ../app/dialogs/preferences-dialog.c:2132 +#: ../app/dialogs/preferences-dialog.c:2169 msgid "Show _brush outline" msgstr "Wyświetlanie o_bwódki pędzla" -#: ../app/dialogs/preferences-dialog.c:2135 +#: ../app/dialogs/preferences-dialog.c:2172 msgid "Show pointer for paint _tools" msgstr "Wyświetlanie kursora dla narzędzi _rysowania" -#: ../app/dialogs/preferences-dialog.c:2141 +#: ../app/dialogs/preferences-dialog.c:2178 msgid "Pointer _mode:" msgstr "_Tryb rysowania:" -#: ../app/dialogs/preferences-dialog.c:2144 +#: ../app/dialogs/preferences-dialog.c:2181 msgid "Pointer re_ndering:" msgstr "Wyg_ląd kursora:" -#: ../app/dialogs/preferences-dialog.c:2147 +#: ../app/dialogs/preferences-dialog.c:2184 msgid "Pointer _handedness:" msgstr "P_rawo lub leworęczność kursora:" -#: ../app/dialogs/preferences-dialog.c:2159 +#: ../app/dialogs/preferences-dialog.c:2196 msgid "Image Window Appearance" -msgstr "Wygląd okna z obrazem" +msgstr "Wygląd okna z obrazem" -#: ../app/dialogs/preferences-dialog.c:2170 +#: ../app/dialogs/preferences-dialog.c:2207 msgid "Default Appearance in Normal Mode" -msgstr "Domyślny wygląd w trybie zwykłym" +msgstr "Domyślny wygląd w trybie zwykłym" -#: ../app/dialogs/preferences-dialog.c:2175 +#: ../app/dialogs/preferences-dialog.c:2212 msgid "Default Appearance in Fullscreen Mode" -msgstr "Domyślny wygląd w trybie pełnoekranowym" +msgstr "Domyślny wygląd w trybie pełnoekranowym" -#: ../app/dialogs/preferences-dialog.c:2184 +#: ../app/dialogs/preferences-dialog.c:2221 msgid "Image Title & Statusbar Format" -msgstr "Format tytułu obrazu i opisu na pasku stanu" +msgstr "Format tytułu obrazu i opisu na pasku stanu" -#: ../app/dialogs/preferences-dialog.c:2187 +#: ../app/dialogs/preferences-dialog.c:2224 msgid "Title & Status" -msgstr "Tytuł i stan" +msgstr "Tytuł i stan" -#: ../app/dialogs/preferences-dialog.c:2205 +#: ../app/dialogs/preferences-dialog.c:2242 msgid "Current format" msgstr "Bieżący format" -#: ../app/dialogs/preferences-dialog.c:2206 +#: ../app/dialogs/preferences-dialog.c:2243 msgid "Default format" msgstr "Domyślny format" -#: ../app/dialogs/preferences-dialog.c:2207 +#: ../app/dialogs/preferences-dialog.c:2244 msgid "Show zoom percentage" msgstr "Procentowe powiększenie" -#: ../app/dialogs/preferences-dialog.c:2208 +#: ../app/dialogs/preferences-dialog.c:2245 msgid "Show zoom ratio" msgstr "Współczynnik powiększenia" -#: ../app/dialogs/preferences-dialog.c:2209 +#: ../app/dialogs/preferences-dialog.c:2246 msgid "Show image size" msgstr "Rozmiar obrazu" -#: ../app/dialogs/preferences-dialog.c:2222 +#: ../app/dialogs/preferences-dialog.c:2259 msgid "Image Title Format" msgstr "Format tytułu obrazu" -#: ../app/dialogs/preferences-dialog.c:2224 +#: ../app/dialogs/preferences-dialog.c:2261 msgid "Image Statusbar Format" msgstr "Format opisu na pasku stanu obrazu" -#: ../app/dialogs/preferences-dialog.c:2309 +#: ../app/dialogs/preferences-dialog.c:2346 msgid "Display" msgstr "Wyświetlanie" #. Transparency -#: ../app/dialogs/preferences-dialog.c:2321 +#: ../app/dialogs/preferences-dialog.c:2358 msgid "Transparency" msgstr "Przezroczysta" -#: ../app/dialogs/preferences-dialog.c:2325 +#: ../app/dialogs/preferences-dialog.c:2362 msgid "_Check style:" msgstr "Wygląd pola sza_chownicy:" -#: ../app/dialogs/preferences-dialog.c:2328 +#: ../app/dialogs/preferences-dialog.c:2365 msgid "Check _size:" msgstr "_Rozmiar pola szachownicy:" -#: ../app/dialogs/preferences-dialog.c:2331 +#: ../app/dialogs/preferences-dialog.c:2368 msgid "Monitor Resolution" msgstr "Rozdzielczość monitora" #. Pixels -#: ../app/dialogs/preferences-dialog.c:2335 ../app/display/gimpcursorview.c:208 +#: ../app/dialogs/preferences-dialog.c:2372 ../app/display/gimpcursorview.c:208 #: ../app/widgets/gimpgrideditor.c:199 ../app/widgets/gimpgrideditor.c:231 msgid "Pixels" msgstr "Piksele" -#: ../app/dialogs/preferences-dialog.c:2353 +#: ../app/dialogs/preferences-dialog.c:2390 msgid "Horizontal" msgstr "Poziomo" -#: ../app/dialogs/preferences-dialog.c:2355 +#: ../app/dialogs/preferences-dialog.c:2392 msgid "Vertical" msgstr "Pionowo" -#: ../app/dialogs/preferences-dialog.c:2357 +#: ../app/dialogs/preferences-dialog.c:2394 #: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "ppi" -#: ../app/dialogs/preferences-dialog.c:2373 +#: ../app/dialogs/preferences-dialog.c:2410 #, c-format msgid "_Detect automatically (currently %d × %d ppi)" msgstr "_Wykrywanie automatycznie (obecnie %d×%d ppi)" -#: ../app/dialogs/preferences-dialog.c:2391 +#: ../app/dialogs/preferences-dialog.c:2428 msgid "_Enter manually" msgstr "_Wprowadzenie ręczne" -#: ../app/dialogs/preferences-dialog.c:2406 +#: ../app/dialogs/preferences-dialog.c:2443 msgid "C_alibrate..." msgstr "S_kalibruj…" -#: ../app/dialogs/preferences-dialog.c:2434 +#: ../app/dialogs/preferences-dialog.c:2471 msgid "Color Management" msgstr "Zarządzanie kolorami" -#: ../app/dialogs/preferences-dialog.c:2454 +#: ../app/dialogs/preferences-dialog.c:2491 msgid "_RGB profile:" msgstr "Profil _RGB:" -#: ../app/dialogs/preferences-dialog.c:2455 +#: ../app/dialogs/preferences-dialog.c:2492 msgid "Select RGB Color Profile" msgstr "Wybór profilu kolorów RGB" -#: ../app/dialogs/preferences-dialog.c:2456 +#: ../app/dialogs/preferences-dialog.c:2493 msgid "_CMYK profile:" msgstr "Profil _CMYK:" -#: ../app/dialogs/preferences-dialog.c:2457 +#: ../app/dialogs/preferences-dialog.c:2494 msgid "Select CMYK Color Profile" msgstr "Wybór profilu koloru CMYK" -#: ../app/dialogs/preferences-dialog.c:2458 +#: ../app/dialogs/preferences-dialog.c:2495 msgid "_Monitor profile:" msgstr "Profil _monitora:" -#: ../app/dialogs/preferences-dialog.c:2459 +#: ../app/dialogs/preferences-dialog.c:2496 msgid "Select Monitor Color Profile" msgstr "Wybór profilu kolorów monitora" -#: ../app/dialogs/preferences-dialog.c:2460 +#: ../app/dialogs/preferences-dialog.c:2497 msgid "_Print simulation profile:" msgstr "_Profil symulacji wydruku:" -#: ../app/dialogs/preferences-dialog.c:2461 +#: ../app/dialogs/preferences-dialog.c:2498 msgid "Select Printer Color Profile" msgstr "Wybór profilu kolorów drukarki" -#: ../app/dialogs/preferences-dialog.c:2472 +#: ../app/dialogs/preferences-dialog.c:2509 msgid "_Mode of operation:" msgstr "_Tryb działania:" -#: ../app/dialogs/preferences-dialog.c:2502 +#: ../app/dialogs/preferences-dialog.c:2539 msgid "_Try to use the system monitor profile" msgstr "_Używanie systemowego profilu monitora" -#: ../app/dialogs/preferences-dialog.c:2512 +#: ../app/dialogs/preferences-dialog.c:2549 msgid "_Display rendering intent:" msgstr "Sposób _odwzorowania barw ekranu:" -#: ../app/dialogs/preferences-dialog.c:2521 +#: ../app/dialogs/preferences-dialog.c:2558 msgid "_Softproof rendering intent:" msgstr "_Sposób odwzorowania barw wydruku:" -#: ../app/dialogs/preferences-dialog.c:2534 +#: ../app/dialogs/preferences-dialog.c:2571 msgid "Mark out of gamut colors" msgstr "Wyróżnienie gamy kolorów" -#: ../app/dialogs/preferences-dialog.c:2539 +#: ../app/dialogs/preferences-dialog.c:2576 msgid "Select Warning Color" msgstr "Wybór koloru ostrzeżeń" -#: ../app/dialogs/preferences-dialog.c:2552 +#: ../app/dialogs/preferences-dialog.c:2589 msgid "File Open behaviour:" msgstr "Zachowanie okna otwierania pliku:" -#: ../app/dialogs/preferences-dialog.c:2564 +#: ../app/dialogs/preferences-dialog.c:2601 msgid "Input Devices" msgstr "Urządzenia wejściowe" #. Extended Input Devices -#: ../app/dialogs/preferences-dialog.c:2574 +#: ../app/dialogs/preferences-dialog.c:2611 msgid "Extended Input Devices" msgstr "Dodatkowe urządzenia wejściowe" -#: ../app/dialogs/preferences-dialog.c:2578 +#: ../app/dialogs/preferences-dialog.c:2615 msgid "Configure E_xtended Input Devices..." msgstr "S_konfiguruj dodatkowe urządzenia wejściowe…" -#: ../app/dialogs/preferences-dialog.c:2585 +#: ../app/dialogs/preferences-dialog.c:2622 msgid "_Save input device settings on exit" msgstr "Zap_isywanie ustawień urządzeń wejściowych przed zakończeniem" -#: ../app/dialogs/preferences-dialog.c:2589 +#: ../app/dialogs/preferences-dialog.c:2626 msgid "Save Input Device Settings _Now" msgstr "_Zapisz ustawienia urządzeń wejściowych" -#: ../app/dialogs/preferences-dialog.c:2596 +#: ../app/dialogs/preferences-dialog.c:2633 msgid "_Reset Saved Input Device Settings to Default Values" msgstr "_Ustaw zapisane ustawienia urządzeń wejściowych na wartości domyślne" -#: ../app/dialogs/preferences-dialog.c:2611 +#: ../app/dialogs/preferences-dialog.c:2648 msgid "Additional Input Controllers" msgstr "Dodatkowe urządzenia sterujące" -#: ../app/dialogs/preferences-dialog.c:2614 +#: ../app/dialogs/preferences-dialog.c:2651 msgid "Input Controllers" msgstr "Urządzenia sterujące" -#: ../app/dialogs/preferences-dialog.c:2630 +#: ../app/dialogs/preferences-dialog.c:2667 msgid "Window Management" msgstr "Zarządzanie oknami" -#: ../app/dialogs/preferences-dialog.c:2639 +#: ../app/dialogs/preferences-dialog.c:2676 msgid "Window Manager Hints" msgstr "Podpowiedzi menedżera okien" -#: ../app/dialogs/preferences-dialog.c:2645 +#: ../app/dialogs/preferences-dialog.c:2682 msgid "Hint for _docks and toolbox:" -msgstr "Podpowiedź dla _doków i przybornika:" +msgstr "Podpowiedź dla _doków i przybornika:" -#: ../app/dialogs/preferences-dialog.c:2648 +#: ../app/dialogs/preferences-dialog.c:2685 msgid "Focus" msgstr "Aktywowanie okien" -#: ../app/dialogs/preferences-dialog.c:2652 +#: ../app/dialogs/preferences-dialog.c:2689 msgid "Activate the _focused image" -msgstr "A_ktywowanie obrazu z kursorem" +msgstr "A_ktywowanie obrazu z kursorem" #. Window Positions -#: ../app/dialogs/preferences-dialog.c:2656 +#: ../app/dialogs/preferences-dialog.c:2693 msgid "Window Positions" msgstr "Położenia okien" -#: ../app/dialogs/preferences-dialog.c:2659 +#: ../app/dialogs/preferences-dialog.c:2696 msgid "_Save window positions on exit" msgstr "Zapisywanie położeń okien przed za_kończeniem" -#: ../app/dialogs/preferences-dialog.c:2663 +#: ../app/dialogs/preferences-dialog.c:2700 msgid "Save Window Positions _Now" msgstr "_Zapisz położenia okien" -#: ../app/dialogs/preferences-dialog.c:2670 +#: ../app/dialogs/preferences-dialog.c:2707 msgid "_Reset Saved Window Positions to Default Values" msgstr "_Ustaw zapisane pozycje okien na wartości domyślne" -#: ../app/dialogs/preferences-dialog.c:2685 +#: ../app/dialogs/preferences-dialog.c:2722 msgid "Folders" msgstr "Katalogi" -#: ../app/dialogs/preferences-dialog.c:2705 +#: ../app/dialogs/preferences-dialog.c:2742 msgid "Temporary folder:" msgstr "Katalog tymczasowy:" -#: ../app/dialogs/preferences-dialog.c:2706 +#: ../app/dialogs/preferences-dialog.c:2743 msgid "Select Folder for Temporary Files" msgstr "Wybór katalogu dla plików tymczasowych" -#: ../app/dialogs/preferences-dialog.c:2710 +#: ../app/dialogs/preferences-dialog.c:2747 msgid "Swap folder:" msgstr "Katalog wymiany:" -#: ../app/dialogs/preferences-dialog.c:2711 +#: ../app/dialogs/preferences-dialog.c:2748 msgid "Select Swap Folder" msgstr "Wybór katalogu wymiany" -#: ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/preferences-dialog.c:2783 msgid "Brush Folders" -msgstr "Katalogi z pędzlami" +msgstr "Katalogi z pędzlami" -#: ../app/dialogs/preferences-dialog.c:2748 +#: ../app/dialogs/preferences-dialog.c:2785 msgid "Select Brush Folders" -msgstr "Wybór katalogów z pędzlami" +msgstr "Wybór katalogów z pędzlami" -#: ../app/dialogs/preferences-dialog.c:2750 +#: ../app/dialogs/preferences-dialog.c:2787 msgid "Dynamics Folders" -msgstr "Katalogi z dynamiką" +msgstr "Katalogi z dynamiką" -#: ../app/dialogs/preferences-dialog.c:2752 +#: ../app/dialogs/preferences-dialog.c:2789 msgid "Select Dynamics Folders" -msgstr "Wybór katalogów z dynamiką" +msgstr "Wybór katalogów z dynamiką" -#: ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/preferences-dialog.c:2791 msgid "Pattern Folders" -msgstr "Katalogi z deseniami" +msgstr "Katalogi z deseniami" -#: ../app/dialogs/preferences-dialog.c:2756 +#: ../app/dialogs/preferences-dialog.c:2793 msgid "Select Pattern Folders" -msgstr "Wybór katalogów z deseniami" +msgstr "Wybór katalogów z deseniami" -#: ../app/dialogs/preferences-dialog.c:2758 +#: ../app/dialogs/preferences-dialog.c:2795 msgid "Palette Folders" -msgstr "Katalogi z paletami" +msgstr "Katalogi z paletami" -#: ../app/dialogs/preferences-dialog.c:2760 +#: ../app/dialogs/preferences-dialog.c:2797 msgid "Select Palette Folders" -msgstr "Wybór katalogów z paletami" +msgstr "Wybór katalogów z paletami" -#: ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/preferences-dialog.c:2799 msgid "Gradient Folders" -msgstr "Katalogi z gradientami" +msgstr "Katalogi z gradientami" -#: ../app/dialogs/preferences-dialog.c:2764 +#: ../app/dialogs/preferences-dialog.c:2801 msgid "Select Gradient Folders" -msgstr "Wybór katalogów z gradientami" +msgstr "Wybór katalogów z gradientami" -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2803 msgid "Font Folders" -msgstr "Katalogi z czcionkami" +msgstr "Katalogi z czcionkami" -#: ../app/dialogs/preferences-dialog.c:2768 +#: ../app/dialogs/preferences-dialog.c:2805 msgid "Select Font Folders" -msgstr "Wybór katalogów z czcionkami" +msgstr "Wybór katalogów z czcionkami" -#: ../app/dialogs/preferences-dialog.c:2770 +#: ../app/dialogs/preferences-dialog.c:2807 msgid "Tool Preset Folders" -msgstr "Katalogi z ustawieniami narzędzi" +msgstr "Katalogi z ustawieniami narzędzi" -#: ../app/dialogs/preferences-dialog.c:2772 +#: ../app/dialogs/preferences-dialog.c:2809 msgid "Select Tool Preset Folders" -msgstr "Wybór katalogów z ustawieniami narzędzi" +msgstr "Wybór katalogów z ustawieniami narzędzi" -#: ../app/dialogs/preferences-dialog.c:2774 +#: ../app/dialogs/preferences-dialog.c:2811 msgid "Plug-In Folders" -msgstr "Katalogi z wtyczkami" +msgstr "Katalogi z wtyczkami" -#: ../app/dialogs/preferences-dialog.c:2776 +#: ../app/dialogs/preferences-dialog.c:2813 msgid "Select Plug-In Folders" -msgstr "Wybór katalogów z wtyczkami" +msgstr "Wybór katalogów z wtyczkami" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2815 msgid "Scripts" msgstr "Skrypty" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2815 msgid "Script-Fu Folders" msgstr "Katalogi ze Script-Fu" -#: ../app/dialogs/preferences-dialog.c:2780 +#: ../app/dialogs/preferences-dialog.c:2817 msgid "Select Script-Fu Folders" msgstr "Wybór katalogów ze Script-Fu" -#: ../app/dialogs/preferences-dialog.c:2782 +#: ../app/dialogs/preferences-dialog.c:2819 msgid "Module Folders" -msgstr "Katalogi z modułami" +msgstr "Katalogi z modułami" -#: ../app/dialogs/preferences-dialog.c:2784 +#: ../app/dialogs/preferences-dialog.c:2821 msgid "Select Module Folders" -msgstr "Wybór katalogów z modułami" +msgstr "Wybór katalogów z modułami" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Interpreters" msgstr "Interpretery" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Interpreter Folders" msgstr "Katalogi interpretera" -#: ../app/dialogs/preferences-dialog.c:2788 +#: ../app/dialogs/preferences-dialog.c:2825 msgid "Select Interpreter Folders" msgstr "Wybór katalogów interpretera" -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:2827 msgid "Environment Folders" msgstr "Katalogi ze zmiennymi środowiskowymi" -#: ../app/dialogs/preferences-dialog.c:2792 +#: ../app/dialogs/preferences-dialog.c:2829 msgid "Select Environment Folders" msgstr "Wybór katalogów ze zmiennymi środowiskowymi" -#: ../app/dialogs/preferences-dialog.c:2794 +#: ../app/dialogs/preferences-dialog.c:2831 msgid "Themes" msgstr "Motywy" -#: ../app/dialogs/preferences-dialog.c:2794 +#: ../app/dialogs/preferences-dialog.c:2831 msgid "Theme Folders" -msgstr "Katalogi z motywami" +msgstr "Katalogi z motywami" -#: ../app/dialogs/preferences-dialog.c:2796 +#: ../app/dialogs/preferences-dialog.c:2833 msgid "Select Theme Folders" -msgstr "Wybór katalogów z motywami" +msgstr "Wybór katalogów z motywami" #: ../app/dialogs/print-size-dialog.c:138 msgid "Print Size" @@ -10418,9 +10425,9 @@ #, c-format msgid "There is one image with unsaved changes:" msgid_plural "There are %d images with unsaved changes:" -msgstr[0] "Nie zapisano zmian w jednym obrazie:" -msgstr[1] "Nie zapisano zmian w %d obrazach:" -msgstr[2] "Nie zapisano zmian w %d obrazach:" +msgstr[0] "Nie zapisano zmian w jednym obrazie:" +msgstr[1] "Nie zapisano zmian w %d obrazach:" +msgstr[2] "Nie zapisano zmian w %d obrazach:" #: ../app/dialogs/quit-dialog.c:311 #, c-format @@ -10435,16 +10442,16 @@ #: ../app/dialogs/quit-dialog.c:330 #, c-format msgid "Press %s to discard all changes and quit." -msgstr "Naciśnięcie %s porzuci wszystkie zmiany i zakończy działanie." +msgstr "Naciśnięcie %s odrzuci wszystkie zmiany i zakończy działanie." #: ../app/dialogs/quit-dialog.c:333 #, c-format msgid "Press %s to discard all changes and close all images." -msgstr "Naciśnięcie %s porzuci wszystkie zmiany i zamknie wszystkie obrazy." +msgstr "Naciśnięcie %s odrzuci wszystkie zmiany i zamknie wszystkie obrazy." #: ../app/dialogs/quit-dialog.c:341 ../app/display/gimpdisplayshell-close.c:180 msgid "_Discard Changes" -msgstr "_Porzuć zmiany" +msgstr "_Odrzuć zmiany" #: ../app/dialogs/quit-dialog.c:423 #, c-format @@ -10469,7 +10476,7 @@ #: ../app/dialogs/resolution-calibrate-dialog.c:128 msgid "Measure the rulers and enter their lengths:" -msgstr "Proszę zmierzyć linijki i wprowadzić poniżej ich długości:" +msgstr "Proszę zmierzyć linijki i wprowadzić poniżej ich długości:" #: ../app/dialogs/resolution-calibrate-dialog.c:153 msgid "_Horizontal:" @@ -10497,8 +10504,8 @@ "Indexed color layers are always scaled without interpolation. The chosen " "interpolation type will affect channels and layer masks only." msgstr "" -"Warstwy w trybie indeksowanym są zawsze skalowane bez interpolacji. Wybrany " -"typ interpolacji wpłynie tylko na kanały i maski." +"Warstwy w trybie indeksowanym są zawsze skalowane bez interpolacji. Wybrany " +"typ interpolacji wpłynie tylko na kanały i maski." #: ../app/dialogs/stroke-dialog.c:97 msgid "Choose Stroke Style" @@ -10514,21 +10521,21 @@ #: ../app/dialogs/tips-dialog.c:88 msgid "The GIMP tips file is empty!" -msgstr "Plik z poradami programu GIMP jest pusty." +msgstr "Plik z poradami programu GIMP jest pusty." #: ../app/dialogs/tips-dialog.c:92 msgid "The GIMP tips file appears to be missing!" -msgstr "Nie można odnaleźć pliku z poradami programu GIMP." +msgstr "Nie można odnaleźć pliku z poradami programu GIMP." #: ../app/dialogs/tips-dialog.c:94 #, c-format msgid "There should be a file called '%s'. Please check your installation." msgstr "" -"Powinien istnieć plik o nazwie „%s”. Proszę sprawdzić instalację programu." +"Powinien istnieć plik o nazwie „%s”. Proszę sprawdzić instalację programu." #: ../app/dialogs/tips-dialog.c:100 msgid "The GIMP tips file could not be parsed!" -msgstr "Nie można przetworzyć pliku z poradami programu GIMP." +msgstr "Nie można przetworzyć pliku z poradami programu GIMP." #: ../app/dialogs/tips-dialog.c:128 msgid "GIMP Tip of the Day" @@ -10562,13 +10569,13 @@ #: ../app/dialogs/user-install-dialog.c:93 msgid "User installation failed!" -msgstr "Instalacja użytkownika się nie powiodła." +msgstr "Spersonalizowana instalacja się nie powiodła." #: ../app/dialogs/user-install-dialog.c:95 msgid "The GIMP user installation failed; see the log for details." msgstr "" -"Instalacja programu GIMP się nie powiodła. Należy sprawdzić plik dziennika, " -"aby dowiedzieć się więcej." +"Instalacja programu GIMP się nie powiodła. Dziennik zawiera więcej " +"informacji." #: ../app/dialogs/user-install-dialog.c:98 msgid "Installation Log" @@ -10584,11 +10591,11 @@ #: ../app/dialogs/vectors-export-dialog.c:91 msgid "Export all paths from this image" -msgstr "Eksport wszystkich ścieżek zawartych w obrazie" +msgstr "Eksport wszystkich ścieżek zawartych w obrazie" #: ../app/dialogs/vectors-import-dialog.c:58 msgid "Import Paths from SVG" -msgstr "Import ścieżek z pliku SVG" +msgstr "Import ścieżek z pliku SVG" #: ../app/dialogs/vectors-import-dialog.c:92 #: ../app/widgets/gimpprofilechooserdialog.c:122 @@ -10718,7 +10725,7 @@ #: ../app/display/gimpdisplayshell.c:746 ../app/display/gimpdisplayshell.c:1331 #: ../app/widgets/gimptoolbox.c:253 msgid "Drop image files here to open them" -msgstr "Upuszczenie plików obrazów w tym miejscu otworzy je" +msgstr "Upuszczenie plików obrazów w tym miejscu otworzy je" #: ../app/display/gimpdisplayshell-close.c:169 #: ../app/display/gimpdisplayshell-close.c:269 @@ -10729,12 +10736,12 @@ #: ../app/display/gimpdisplayshell-close.c:217 #, c-format msgid "Press %s to discard all changes and close the image." -msgstr "Naciśnięcie %s porzuci wszystkie zmiany i zamknie obraz." +msgstr "Naciśnięcie %s odrzuci wszystkie zmiany i zamknie obraz." #: ../app/display/gimpdisplayshell-close.c:277 #, c-format msgid "Save the changes to image '%s' before closing?" -msgstr "Zapisać zmiany w obrazie „%s” przed zamknięciem?" +msgstr "Zapisać zmiany w obrazie „%s” przed zamknięciem?" #: ../app/display/gimpdisplayshell-close.c:310 #, c-format @@ -10742,13 +10749,13 @@ msgid_plural "" "If you don't save the image, changes from the last %d hours will be lost." msgstr[0] "" -"Jeśli obraz nie zostanie zapisany, to zmiany z ostatniej godziny zostaną " +"Jeśli obraz nie zostanie zapisany, to zmiany z ostatniej godziny zostaną " "utracone." msgstr[1] "" -"Jeśli obraz nie zostanie zapisany, to zmiany z %d ostatnich godzin zostaną " +"Jeśli obraz nie zostanie zapisany, to zmiany z %d ostatnich godzin zostaną " "utracone." msgstr[2] "" -"Jeśli obraz nie zostanie zapisany, to zmiany z %d ostatnich godzin zostaną " +"Jeśli obraz nie zostanie zapisany, to zmiany z %d ostatnich godzin zostaną " "utracone." #: ../app/display/gimpdisplayshell-close.c:321 @@ -10760,13 +10767,13 @@ "If you don't save the image, changes from the last hour and %d minutes will " "be lost." msgstr[0] "" -"Jeśli obraz nie zostanie zapisany, to zmiany z ostatniej godziny i %d minuty " +"Jeśli obraz nie zostanie zapisany, to zmiany z ostatniej godziny i %d minuty " "zostaną utracone." msgstr[1] "" -"Jeśli obraz nie zostanie zapisany, to zmiany z ostatniej godziny i %d minut " +"Jeśli obraz nie zostanie zapisany, to zmiany z ostatniej godziny i %d minut " "zostaną utracone." msgstr[2] "" -"Jeśli obraz nie zostanie zapisany, to zmiany z ostatniej godziny i %d minut " +"Jeśli obraz nie zostanie zapisany, to zmiany z ostatniej godziny i %d minut " "zostaną utracone." #: ../app/display/gimpdisplayshell-close.c:333 @@ -10775,13 +10782,13 @@ msgid_plural "" "If you don't save the image, changes from the last %d minutes will be lost." msgstr[0] "" -"Jeśli obraz nie zostanie zapisany, to zmiany z ostatniej minuty zostaną " +"Jeśli obraz nie zostanie zapisany, to zmiany z ostatniej minuty zostaną " "utracone." msgstr[1] "" -"Jeśli obraz nie zostanie zapisany, to zmiany z ostatnich %d minut zostaną " +"Jeśli obraz nie zostanie zapisany, to zmiany z ostatnich %d minut zostaną " "utracone." msgstr[2] "" -"Jeśli obraz nie zostanie zapisany, to zmiany z ostatnich %d minut zostaną " +"Jeśli obraz nie zostanie zapisany, to zmiany z ostatnich %d minut zostaną " "utracone." #: ../app/display/gimpdisplayshell-close.c:354 @@ -10886,32 +10893,32 @@ msgid "Not a regular file" msgstr "To nie jest zwykły plik" -#: ../app/file/file-open.c:191 +#: ../app/file/file-open.c:197 #, c-format msgid "%s plug-in returned SUCCESS but did not return an image" msgstr "Wtyczka %s zwróciła kod powodzenia, lecz nie zwróciła obrazu" -#: ../app/file/file-open.c:202 +#: ../app/file/file-open.c:208 #, c-format msgid "%s plug-In could not open image" msgstr "Wtyczka %s nie może otworzyć obrazu" -#: ../app/file/file-open.c:533 +#: ../app/file/file-open.c:539 msgid "Image doesn't contain any layers" msgstr "Obraz nie zawiera żadnych warstw" -#: ../app/file/file-open.c:593 +#: ../app/file/file-open.c:599 #, c-format msgid "Opening '%s' failed: %s" msgstr "Otwarcie pliku „%s” się nie powiodło: %s" -#: ../app/file/file-open.c:703 +#: ../app/file/file-open.c:709 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." msgstr "" -"Zarządzanie kolorami zostało wyłączone. Może ono zostać włączono ponownie w " -"oknie „Preferencji”." +"Zarządzanie kolorami zostało wyłączone. Może ono zostać włączono ponownie " +"w oknie „Preferencji”." #: ../app/file/file-procedure.c:195 msgid "Unknown file type" @@ -10929,7 +10936,7 @@ #: ../app/file/file-utils.c:88 ../app/file/file-utils.c:124 msgid "Invalid character sequence in URI" -msgstr "Nieprawidłowa sekwencja znaków w adresie URI" +msgstr "Nieprawidłowa sekwencja znaków w adresie URI" #: ../app/gegl/gimp-gegl-enums.c:24 msgctxt "cage-mode" @@ -10979,12 +10986,12 @@ #. * but xgettext extracts it anyway mistakenly into GIMP po files. #. * Leave an empty string as translation. It does not matter. #. -#: ../app/gui/gui.c:207 +#: ../app/gui/gui.c:219 msgid "default:LTR" msgstr "default:LTR" #. initialize the document history -#: ../app/gui/gui.c:438 +#: ../app/gui/gui.c:461 msgid "Documents" msgstr "Dokumenty" @@ -11354,8 +11361,8 @@ "Item '%s' (%d) cannot be used because it is not a direct child of an item " "tree" msgstr "" -"Element „%s” (%d) nie może zostać użyty, ponieważ nie bezpośrednim potomkiem " -"drzewa elementów" +"Element „%s” (%d) nie może zostać użyty, ponieważ nie jest bezpośrednim " +"potomkiem drzewa elementów" #: ../app/pdb/gimppdb-utils.c:420 #, c-format @@ -11421,7 +11428,7 @@ #: ../app/pdb/gimppdb-utils.c:649 #, c-format msgid "Vectors object %d does not contain stroke with ID %d" -msgstr "Obiekt wektorowy %d nie zawiera krzywej o identyfikatorze %d" +msgstr "Obiekt wektorowy %d nie zawiera krzywej o identyfikatorze %d" #: ../app/pdb/gimppdb.c:420 #, c-format @@ -11429,7 +11436,7 @@ "Procedure '%s' has been called with a wrong type for argument #%d. Expected " "%s, got %s." msgstr "" -"Procedura „%s” została wywołana z błędnym typem parametru #%d. Oczekiwano " +"Procedura „%s” została wywołana z błędnym typem parametru #%d. Oczekiwano " "%s, otrzymano %s." #: ../app/pdb/gimppdbcontext.c:89 ../app/tools/gimpforegroundselectoptions.c:79 @@ -11457,7 +11464,7 @@ "Procedure '%s' has been called with a wrong value type for argument '%s' (#" "%d). Expected %s, got %s." msgstr "" -"Procedura „%s” została wywołana z błędnym parametrem „%s” (#%d). Oczekiwano " +"Procedura „%s” została wywołana z błędnym parametrem „%s” (#%d). Oczekiwano " "%s, otrzymano %s." #: ../app/pdb/gimpprocedure.c:689 @@ -11511,7 +11518,7 @@ "Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type " "%s). This value is out of range." msgstr "" -"Procedura „%s” została wywołana z wartością „%s”, jako parametr „%s” (#%d, " +"Procedura „%s” została wywołana z wartością „%s”, jako parametr „%s” (#%d, " "typ %s). Ta wartość jest poza zakresem." #: ../app/pdb/image-cmds.c:2361 @@ -11580,22 +11587,22 @@ #: ../app/plug-in/gimpenvirontable.c:281 #, c-format msgid "Empty variable name in environment file %s" -msgstr "Pusta nazwa zmiennej w pliku środowiska %s" +msgstr "Pusta nazwa zmiennej w pliku środowiska %s" #: ../app/plug-in/gimpenvirontable.c:299 #, c-format msgid "Illegal variable name in environment file %s: %s" -msgstr "Niedozwolona nazwa zmiennej w pliku środowiska %s: %s" +msgstr "Niedozwolona nazwa zmiennej w pliku środowiska %s: %s" #: ../app/plug-in/gimpinterpreterdb.c:263 #, c-format msgid "Bad interpreter referenced in interpreter file %s: %s" -msgstr "Błędny interpreter dowiązany w pliku do interpretowania %s: %s" +msgstr "Błędny interpreter dowiązany w pliku do interpretowania %s: %s" #: ../app/plug-in/gimpinterpreterdb.c:322 #, c-format msgid "Bad binary format string in interpreter file %s" -msgstr "Błędny format ciągu binarnego w pliku do interpretowania %s" +msgstr "Błędny format ciągu binarnego w pliku do interpretowania %s" #: ../app/plug-in/gimpplugin-message.c:450 #, c-format @@ -11615,7 +11622,7 @@ "Błąd wykonywania dla procedury „%s”:\n" "%s" -#: ../app/plug-in/gimpplugin-progress.c:331 +#: ../app/plug-in/gimpplugin-progress.c:339 msgid "Cancelled" msgstr "Anulowano" @@ -11631,9 +11638,9 @@ "We wtyczce wystąpił błąd: „%s”\n" "(%s)\n" "\n" -"Wtyczka przerywając działanie w wyniku błędu, mogła uszkodzić wewnętrzny " -"stan programu GIMP. Dla bezpieczeństwa zalecane jest zapisanie obrazów i " -"ponowne uruchomienie programu." +"Wtyczka, przerywając działanie w wyniku błędu, mogła uszkodzić wewnętrzny " +"stan programu GIMP. Dla bezpieczeństwa zalecane jest zapisanie obrazów " +"i ponowne uruchomienie programu." #: ../app/plug-in/gimppluginmanager-call.c:185 #: ../app/plug-in/gimppluginmanager-call.c:235 @@ -11692,7 +11699,7 @@ #, c-format msgid "Can't apply color profile to grayscale image (%s)" msgstr "" -"Nie można zastosować profilu kolorów do obrazu w odcieniach szarości (%s)" +"Nie można zastosować profilu kolorów do obrazu w odcieniach szarości (%s)" #: ../app/plug-in/plug-in-icc-profile.c:117 #: ../app/plug-in/plug-in-icc-profile.c:192 @@ -11730,7 +11737,7 @@ "Pack my box with\n" "five dozen liquor jugs." msgstr "" -"pchnąć w tę łódź jeża\n" +"pchnąć w tę łódź jeża\n" "lub ośm skrzyń fig." #: ../app/text/gimptext-compat.c:105 ../app/tools/gimptexttool.c:1415 @@ -11771,11 +11778,11 @@ #: ../app/text/gimptextlayer.c:523 msgid "Discard Text Information" -msgstr "Porzucenie informacji o tekście" +msgstr "Odrzucenie informacji o tekście" #: ../app/text/gimptextlayer.c:582 msgid "Due to lack of any fonts, text functionality is not available." -msgstr "Funkcje tekstowe nie są dostępne z powodu braku czcionek." +msgstr "Funkcje tekstowe nie są dostępne z powodu braku czcionek." #: ../app/text/gimptextlayer.c:640 msgid "Empty Text Layer" @@ -11805,7 +11812,7 @@ "Niektóre właściwości tekstu mogą być błędne. Jeśli tekst nie będzie " "modyfikowany, to nie ma to większego znaczenia." -#: ../app/text/gimptextlayout.c:577 +#: ../app/text/gimptextlayout.c:578 msgid "" "The new text layout cannot be generated. Most likely the font size is too " "big." @@ -11829,7 +11836,7 @@ "no options." msgstr "" "Brak opcji\n" -"powiązanych z narzędziem." +"powiązanych z narzędziem." #: ../app/tools/gimpairbrushtool.c:55 msgid "Airbrush Tool: Paint using a brush, with variable pressure" @@ -11930,7 +11937,7 @@ #: ../app/tools/gimpaligntool.c:125 msgid "Alignment Tool: Align or arrange layers and other objects" -msgstr "Wyrównanie: wyrównuje lub układa warstwy i inne obiekty" +msgstr "Wyrównanie: wyrównuje lub układa warstwy i inne obiekty" #: ../app/tools/gimpaligntool.c:126 msgid "_Align" @@ -11939,8 +11946,8 @@ #: ../app/tools/gimpaligntool.c:549 msgid "Click on a layer, path or guide, or Click-Drag to pick several layers" msgstr "" -"Kliknięcie na warstwie, ścieżce lub prowadnicy lub kliknięcie i " -"przeciągnięcie pobierze kilka warstw" +"Kliknięcie warstwy, ścieżki lub prowadnicy lub kliknięcie i przeciągnięcie " +"pobierze kilka warstw" #: ../app/tools/gimpaligntool.c:557 msgid "Click to pick this layer as first item" @@ -11980,7 +11987,7 @@ #: ../app/tools/gimpblendoptions.c:261 msgid "Adaptive supersampling" -msgstr "Nadpróbkowanie adaptywne" +msgstr "Nadpróbkowanie adaptatywne" #: ../app/tools/gimpblendoptions.c:268 msgid "Max depth" @@ -11992,7 +11999,7 @@ #: ../app/tools/gimpblendtool.c:110 msgid "Blend Tool: Fill selected area with a color gradient" -msgstr "Gradient: wypełnia zaznaczony obszar kolorem z gradientu" +msgstr "Gradient: wypełnia zaznaczony obszar kolorem z gradientu" #: ../app/tools/gimpblendtool.c:111 msgid "Blen_d" @@ -12006,7 +12013,7 @@ msgid "No gradient available for use with this tool." msgstr "Brak dostępnych gradientów dla tego narzędzia." -#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:624 +#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:625 #, c-format msgid "%s for constrained angles" msgstr "%s dla wymuszonych kątów" @@ -12014,7 +12021,7 @@ #: ../app/tools/gimpblendtool.c:453 #, c-format msgid "%s to move the whole line" -msgstr "%s przesunie całą linię" +msgstr "%s przesuwa całą linię" #: ../app/tools/gimpblendtool.c:457 msgid "Blend: " @@ -12022,31 +12029,31 @@ #: ../app/tools/gimpbrightnesscontrasttool.c:111 msgid "Brightness-Contrast" -msgstr "Jasność i kontrast" +msgstr "Jasność i kontrast" #: ../app/tools/gimpbrightnesscontrasttool.c:112 msgid "Brightness/Contrast Tool: Adjust brightness and contrast" -msgstr "Jasność i kontrast: umożliwia modyfikowanie jasności i kontrastu" +msgstr "Jasność i kontrast: umożliwia modyfikowanie jasności i kontrastu" #: ../app/tools/gimpbrightnesscontrasttool.c:113 msgid "B_rightness-Contrast..." -msgstr "Jas_ność i kontrast…" +msgstr "Jas_ność i kontrast…" #: ../app/tools/gimpbrightnesscontrasttool.c:133 msgid "Adjust Brightness and Contrast" -msgstr "Modyfikacja jasności i kontrastu" +msgstr "Modyfikacja jasności i kontrastu" #: ../app/tools/gimpbrightnesscontrasttool.c:135 msgid "Import Brightness-Contrast settings" -msgstr "Importowanie ustawień jasności i kontrastu" +msgstr "Importowanie ustawień jasności i kontrastu" #: ../app/tools/gimpbrightnesscontrasttool.c:136 msgid "Export Brightness-Contrast settings" -msgstr "Eksportowanie ustawień jasności i kontrastu" +msgstr "Eksportowanie ustawień jasności i kontrastu" #: ../app/tools/gimpbrightnesscontrasttool.c:183 msgid "Brightness-Contrast does not operate on indexed layers." -msgstr "Nie można modyfikować jasności i kontrastu na warstwach indeksowanych." +msgstr "Nie można modyfikować jasności i kontrastu na warstwach indeksowanych." #: ../app/tools/gimpbrightnesscontrasttool.c:318 msgid "_Brightness:" @@ -12058,7 +12065,7 @@ #: ../app/tools/gimpbrightnesscontrasttool.c:343 msgid "Edit these Settings as Levels" -msgstr "Modyfikuje te ustawienia jako poziomy" +msgstr "Modyfikacja tych ustawień jako poziomy" #: ../app/tools/gimpbucketfilloptions.c:93 msgid "Which area will be filled" @@ -12071,8 +12078,8 @@ #: ../app/tools/gimpbucketfilloptions.c:104 msgid "Base filled area on all visible layers" msgstr "" -"Powoduje ustalanie wypełnianego obszaru w oparciu o wszystkie widoczne " -"warstwy" +"Powoduje ustalanie wypełnianego obszaru na podstawie wszystkich widocznych " +"warstw" #: ../app/tools/gimpbucketfilloptions.c:110 #: ../app/tools/gimpregionselectoptions.c:95 @@ -12109,7 +12116,7 @@ #: ../app/tools/gimpbucketfilloptions.c:273 msgid "Fill transparent areas" -msgstr "Z obszarami przezroczystymi" +msgstr "Z obszarami przezroczystymi" #: ../app/tools/gimpbucketfilloptions.c:279 ../app/tools/gimpclonetool.c:114 #: ../app/tools/gimpcolorpickeroptions.c:158 ../app/tools/gimphealtool.c:100 @@ -12140,7 +12147,7 @@ #: ../app/tools/gimpbycolorselecttool.c:68 msgid "Select by Color Tool: Select regions with similar colors" -msgstr "Zaznaczenie według koloru: zaznacza obszary z podobnymi kolorami" +msgstr "Zaznaczenie według koloru: zaznacza obszary z podobnymi kolorami" #: ../app/tools/gimpbycolorselecttool.c:69 msgid "_By Color Select" @@ -12177,7 +12184,7 @@ #: ../app/tools/gimpclonetool.c:61 msgid "Clone Tool: Selectively copy from an image or pattern, using a brush" -msgstr "Klonowanie: wybiórczo kopiuje obraz lub deseń, używając pędzla" +msgstr "Klonowanie: wybiórczo kopiuje obraz lub deseń za pomocą pędzla" #: ../app/tools/gimpclonetool.c:62 msgid "_Clone" @@ -12190,12 +12197,12 @@ #: ../app/tools/gimpclonetool.c:86 ../app/tools/gimpclonetool.c:91 #, c-format msgid "%s to set a new clone source" -msgstr "%s ustawia nowe źródło klonowania" +msgstr "%s ustawi nowe źródło klonowania" #. Translators: the translation of "Click" must be the first word #: ../app/tools/gimpclonetool.c:90 msgid "Click to set a new clone source" -msgstr "Kliknięcie ustawia nowe źródło klonowania" +msgstr "Kliknięcie ustawi nowe źródło klonowania" #: ../app/tools/gimpclonetool.c:109 ../app/tools/gimpperspectiveclonetool.c:899 msgid "Source" @@ -12351,7 +12358,7 @@ msgid "" "Open a floating dialog to view picked color values in various color models" msgstr "" -"Otwiera oddzielne okno wyświetlające wybrane wartości kolorów w różnych " +"Otwiera oddzielne okno wyświetlające wybrane wartości kolorów w różnych " "modelach kolorów" #. the pick FG/BG frame @@ -12372,7 +12379,7 @@ #: ../app/tools/gimpcolorpickertool.c:94 msgid "Color Picker Tool: Set colors from image pixels" -msgstr "Pobranie koloru: ustawia kolor z punktów obrazu" +msgstr "Pobranie koloru: ustawia kolor z punktów obrazu" #: ../app/tools/gimpcolorpickertool.c:95 msgid "C_olor Picker" @@ -12380,23 +12387,23 @@ #: ../app/tools/gimpcolorpickertool.c:231 msgid "Click in any image to view its color" -msgstr "Kliknięcie na obraz wyświetli jego kolor" +msgstr "Kliknięcie obrazu wyświetli jego kolor" #: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:478 msgid "Click in any image to pick the foreground color" -msgstr "Kliknięcie na dowolny obraz pobierze jego kolor pierwszoplanowy" +msgstr "Kliknięcie dowolnego obrazu pobierze jego kolor pierwszoplanowy" #: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:484 msgid "Click in any image to pick the background color" -msgstr "Kliknięcie na dowolny obraz pobierze jego kolor tła" +msgstr "Kliknięcie dowolnego obrazu pobierze jego kolor tła" #: ../app/tools/gimpcolorpickertool.c:254 msgid "Click in any image to add the color to the palette" -msgstr "Kliknięcie na dowolny obraz doda kolor do palety" +msgstr "Kliknięcie dowolnego obrazu doda kolor do palety" #: ../app/tools/gimpcolorpickertool.c:309 msgid "Color Picker Information" -msgstr "Informacje o zakraplaczu" +msgstr "Informacje o zakraplaczu" #: ../app/tools/gimpcolortool.c:230 ../app/tools/gimpcolortool.c:403 msgid "Move Sample Point: " @@ -12420,7 +12427,8 @@ #: ../app/tools/gimpconvolvetool.c:74 msgid "Blur / Sharpen Tool: Selective blurring or unblurring using a brush" -msgstr "Rozmywanie/wyostrzanie: wybiórczo rozmywa lub wyostrza używając pędzla" +msgstr "" +"Rozmywanie/wyostrzanie: wybiórczo rozmywa lub wyostrza za pomocą pędzla" #: ../app/tools/gimpconvolvetool.c:75 msgid "Bl_ur / Sharpen" @@ -12487,7 +12495,7 @@ #: ../app/tools/gimpcroptool.c:118 msgid "Crop Tool: Remove edge areas from image or layer" -msgstr "Kadrowanie: usuwa brzegi z obrazu lub warstwy" +msgstr "Kadrowanie: usuwa brzegi z obrazu lub warstwy" #: ../app/tools/gimpcroptool.c:119 msgid "_Crop" @@ -12539,8 +12547,7 @@ #: ../app/tools/gimpcurvestool.c:358 msgid "Click to locate on curve (try Shift, Ctrl)" -msgstr "" -"Kliknięcie określi na krzywej (proszę spróbować użyć klawiszy Shift i Ctrl)" +msgstr "Kliknięcie określi na krzywej (klawisze Shift i Ctrl)" #: ../app/tools/gimpcurvestool.c:473 ../app/tools/gimplevelstool.c:384 msgid "Cha_nnel:" @@ -12557,11 +12564,11 @@ #: ../app/tools/gimpcurvestool.c:667 ../app/tools/gimplevelstool.c:756 #, c-format msgid "Could not read header from '%s': %s" -msgstr "Nie można odczytać nagłówka z „%s”: %s" +msgstr "Nie można odczytać nagłówka z „%s”: %s" #: ../app/tools/gimpcurvestool.c:740 msgid "Use _old curves file format" -msgstr "Użycie _starego formatu pliku krzywych" +msgstr "_Stary format pliku krzywych" #: ../app/tools/gimpdesaturatetool.c:78 msgid "Desaturate Tool: Turn colors into shades of gray" @@ -12590,7 +12597,7 @@ #: ../app/tools/gimpdodgeburntool.c:74 msgid "Dodge / Burn Tool: Selectively lighten or darken using a brush" msgstr "" -"Rozjaśnianie/przyciemnianie: wybiórczo rozjaśnia lub przyciemnia używając " +"Rozjaśnianie/przyciemnianie: wybiórczo rozjaśnia lub przyciemnia za pomocą " "pędzla" #: ../app/tools/gimpdodgeburntool.c:75 @@ -12608,7 +12615,7 @@ #: ../app/tools/gimpdodgeburntool.c:189 #, c-format msgid "%s to burn" -msgstr "%s rozjaśni" +msgstr "%s przyciemni" #: ../app/tools/gimpdodgeburntool.c:193 msgid "Click to burn" @@ -12662,7 +12669,7 @@ #: ../app/tools/gimperasertool.c:66 msgid "Eraser Tool: Erase to background or transparency using a brush" -msgstr "Gumka: ściera tło lub przezroczystość używając pędzla" +msgstr "Gumka: ściera tło lub przezroczystość za pomocą pędzla" #: ../app/tools/gimperasertool.c:67 msgid "_Eraser" @@ -12742,7 +12749,7 @@ "selection" msgstr "" "Rysowanie ponad obszarami do oznaczenia wartości kolorów włączonych lub " -"wyłączonych z zaznaczenia" +"wyłączonych z zaznaczenia" #: ../app/tools/gimpforegroundselectoptions.c:98 msgid "Size of the brush used for refinements" @@ -12754,7 +12761,7 @@ "in the selection" msgstr "" "Mniejsze wartości dają większą dokładność zaznaczenia, lecz mogą powodować " -"dziury w zaznaczeniu" +"dziury w zaznaczeniu" #: ../app/tools/gimpforegroundselectoptions.c:112 msgid "Color of selection preview mask" @@ -12819,8 +12826,8 @@ #: ../app/tools/gimpforegroundselecttool.c:145 msgid "Foreground Select Tool: Select a region containing foreground objects" msgstr "" -"Zaznaczenie pierwszego planu: zaznacza obszar zawierający obiekty z " -"pierwszego planu" +"Zaznaczenie pierwszego planu: zaznacza obszar zawierający obiekty " +"z pierwszego planu" #: ../app/tools/gimpforegroundselecttool.c:146 msgid "F_oreground Select" @@ -12862,7 +12869,7 @@ #: ../app/tools/gimpfreeselecttool.c:1034 msgid "Click-Drag to move segment vertex" -msgstr "Kliknięcie i przeciągnięcie przemieści segment wierzchołka" +msgstr "Kliknięcie i przeciągnięcie przemieści segment wierzchołka" #: ../app/tools/gimpfreeselecttool.c:1039 msgid "Return commits, Escape cancels, Backspace removes last segment" @@ -12872,7 +12879,7 @@ #: ../app/tools/gimpfreeselecttool.c:1043 msgid "Click-Drag adds a free segment, Click adds a polygonal segment" msgstr "" -"Kliknięcie i przeciągnięcie doda odręczny segment. Kliknięcie doda segment " +"Kliknięcie i przeciągnięcie doda odręczny segment, kliknięcie doda segment " "wielokątny" #: ../app/tools/gimpfreeselecttool.c:1562 @@ -12924,11 +12931,11 @@ #: ../app/tools/gimpgegltool.c:442 msgid "Select an operation from the list above" -msgstr "Proszę wybrać działanie z powyższej listy" +msgstr "Proszę wybrać działanie z powyższej listy" #: ../app/tools/gimphealtool.c:53 msgid "Healing Tool: Heal image irregularities" -msgstr "Łatka: usuwa nieregularności z obrazu" +msgstr "Łatka: usuwa nieregularności z obrazu" #: ../app/tools/gimphealtool.c:54 msgid "_Heal" @@ -12954,11 +12961,11 @@ #: ../app/tools/gimphuesaturationtool.c:103 msgid "Hue-Saturation Tool: Adjust hue, saturation, and lightness" -msgstr "Barwa i nasycenie: modyfikuje barwę, nasycenie i jasność" +msgstr "Barwa i nasycenie: modyfikuje barwę, nasycenie i jasność" #: ../app/tools/gimphuesaturationtool.c:104 msgid "Hue-_Saturation..." -msgstr "_Barwa i nasycenie…" +msgstr "_Barwa i nasycenie…" #: ../app/tools/gimphuesaturationtool.c:121 msgid "Adjust Hue / Lightness / Saturation" @@ -12966,15 +12973,15 @@ #: ../app/tools/gimphuesaturationtool.c:123 msgid "Import Hue-Saturation Settings" -msgstr "Importowanie ustawień barwy i nasycenia" +msgstr "Importowanie ustawień barwy i nasycenia" #: ../app/tools/gimphuesaturationtool.c:124 msgid "Export Hue-Saturation Settings" -msgstr "Eksportowanie ustawień barwy i nasycenia" +msgstr "Eksportowanie ustawień barwy i nasycenia" #: ../app/tools/gimphuesaturationtool.c:170 msgid "Hue-Saturation operates only on RGB color layers." -msgstr "Zmiany barwy i nasycenia kolorów są możliwe tylko na warstwach RGB." +msgstr "Zmiany barwy i nasycenia kolorów są możliwe tylko na warstwach RGB." #: ../app/tools/gimphuesaturationtool.c:247 msgid "M_aster" @@ -13096,7 +13103,7 @@ #: ../app/tools/gimpiscissorstool.c:276 msgid "Scissors Select Tool: Select shapes using intelligent edge-fitting" msgstr "" -"Inteligentne nożyce: zaznacza obszary, używając dopasowania do krawędzi" +"Inteligentne nożyce: zaznacza obszary za pomocą dopasowania do krawędzi" #: ../app/tools/gimpiscissorstool.c:277 msgid "Intelligent _Scissors" @@ -13104,7 +13111,7 @@ #: ../app/tools/gimpiscissorstool.c:902 ../app/tools/gimpmeasuretool.c:605 msgid "Click-Drag to move this point" -msgstr "Kliknięcie i przeciągnięcie przemieści ten punkt" +msgstr "Kliknięcie i przeciągnięcie przemieści ten punkt" #: ../app/tools/gimpiscissorstool.c:904 ../app/tools/gimpiscissorstool.c:969 #, c-format @@ -13117,7 +13124,7 @@ #: ../app/tools/gimpiscissorstool.c:927 msgid "Click to add a point on this segment" -msgstr "Kliknięcie doda punkt w tym segmencie" +msgstr "Kliknięcie doda punkt w tym segmencie" #: ../app/tools/gimpiscissorstool.c:941 msgid "Click or press Enter to convert to a selection" @@ -13129,7 +13136,7 @@ #: ../app/tools/gimpiscissorstool.c:966 msgid "Click or Click-Drag to add a point" -msgstr "Kliknięcie lub kliknięcie i przeciągnięcie doda punkt" +msgstr "Kliknięcie lub kliknięcie i przeciągnięcie doda punkt" #: ../app/tools/gimplevelstool.c:151 msgid "Levels Tool: Adjust color levels" @@ -13192,11 +13199,11 @@ #: ../app/tools/gimplevelstool.c:686 msgid "Edit these Settings as Curves" -msgstr "Modyfikuje te ustawienia jako krzywe" +msgstr "Modyfikacja tych ustawień jako krzywe" #: ../app/tools/gimplevelstool.c:829 msgid "Use _old levels file format" -msgstr "Użycie _starego formatu pliku poziomów" +msgstr "_Stary format pliku poziomów" #: ../app/tools/gimpmagnifyoptions.c:79 msgid "Resize image window to accommodate new zoom level" @@ -13230,7 +13237,7 @@ #: ../app/tools/gimpmeasureoptions.c:67 msgid "Open a floating dialog to view details about measurements" -msgstr "Otwiera oddzielne okno wyświetlające informacje o pomiarach" +msgstr "Otwiera oddzielne okno wyświetlające informacje o pomiarach" #: ../app/tools/gimpmeasureoptions.c:125 msgid "Use info window" @@ -13242,7 +13249,7 @@ #: ../app/tools/gimpmeasuretool.c:128 msgid "Measure Tool: Measure distances and angles" -msgstr "Miarka: umożliwia mierzenie odległości i kątów" +msgstr "Miarka: umożliwia mierzenie odległości i kątów" #: ../app/tools/gimpmeasuretool.c:129 msgid "_Measure" @@ -13270,21 +13277,21 @@ #: ../app/tools/gimpmeasuretool.c:595 msgid "Click-Drag to add a new point" -msgstr "Kliknięcie i przeciągnięcie doda nowy punkt" +msgstr "Kliknięcie i przeciągnięcie doda nowy punkt" #: ../app/tools/gimpmeasuretool.c:624 msgid "Click-Drag to move all points" -msgstr "Kliknięcie i przeciągnięcie przemieści wszystkie punkty" +msgstr "Kliknięcie i przeciągnięcie przemieści wszystkie punkty" #: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084 #: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168 -#: ../app/tools/gimppainttool.c:633 +#: ../app/tools/gimppainttool.c:634 msgid "pixels" msgstr "piksele" #: ../app/tools/gimpmeasuretool.c:1052 msgid "Measure Distances and Angles" -msgstr "Pomiary odległości i kątów" +msgstr "Pomiary odległości i kątów" #: ../app/tools/gimpmeasuretool.c:1073 msgid "Distance:" @@ -13331,7 +13338,7 @@ #: ../app/tools/gimpmovetool.c:128 msgid "Move Tool: Move layers, selections, and other objects" -msgstr "Przesunięcie: przesuwa warstwy, zaznaczenia i inne obiekty" +msgstr "Przesunięcie: przesuwa warstwy, zaznaczenia i inne obiekty" #: ../app/tools/gimpmovetool.c:129 msgid "_Move" @@ -13448,14 +13455,14 @@ msgid "Cannot paint on layer groups." msgstr "Nie można narysować grup warstw." -#: ../app/tools/gimppainttool.c:679 +#: ../app/tools/gimppainttool.c:680 #, c-format msgid "%s for a straight line" msgstr "%s rysuje prostą linię" #: ../app/tools/gimppenciltool.c:51 msgid "Pencil Tool: Hard edge painting using a brush" -msgstr "Ołówek: umożliwia malowanie pędzlem o twardej krawędzi" +msgstr "Ołówek: umożliwia malowanie pędzlem o twardej krawędzi" #: ../app/tools/gimppenciltool.c:52 msgid "Pe_ncil" @@ -13474,7 +13481,7 @@ #: ../app/tools/gimpperspectiveclonetool.c:675 msgid "Ctrl-Click to set a clone source" -msgstr "Ctrl i kliknięcie ustawi źródło klonowania" +msgstr "Ctrl i kliknięcie ustawi źródło klonowania" #: ../app/tools/gimpperspectivetool.c:83 msgid "Perspective Tool: Change perspective of the layer, selection or path" @@ -13507,7 +13514,7 @@ #: ../app/tools/gimpposterizetool.c:103 msgid "Posterize (Reduce Number of Colors)" -msgstr "Redukcja kolorów (zmniejszenie ilości kolorów)" +msgstr "Redukcja kolorów (zmniejszenie liczby kolorów)" #: ../app/tools/gimpposterizetool.c:152 msgid "Posterize does not operate on indexed layers." @@ -13619,7 +13626,7 @@ #: ../app/tools/gimprectangleselectoptions.c:89 msgid "Radius of rounding in pixels" -msgstr "Promień zaokrąglania w pikselach" +msgstr "Promień zaokrąglania w pikselach" #: ../app/tools/gimprectangleselectoptions.c:167 msgid "Rounded corners" @@ -13655,7 +13662,7 @@ #: ../app/tools/gimpregionselectoptions.c:204 msgid "Select transparent areas" -msgstr "Z obszarami przezroczystymi" +msgstr "Z obszarami przezroczystymi" #: ../app/tools/gimpregionselectoptions.c:226 msgid "Select by:" @@ -13693,7 +13700,7 @@ #, c-format msgctxt "undo-type" msgid "Rotate by %-3.3g° around (%g, %g)" -msgstr "Obrót o %-3.3g° wokół (%g, %g)" +msgstr "Obrót o %-3.3g° wokół (%g, %g)" #: ../app/tools/gimpscaletool.c:89 msgid "Scale" @@ -13731,35 +13738,35 @@ #: ../app/tools/gimpselectiontool.c:255 msgid "Click-Drag to replace the current selection" -msgstr "Kliknięcie i przeciągnięcie zastąpi bieżące zaznaczenie" +msgstr "Kliknięcie i przeciągnięcie zastąpi bieżące zaznaczenie" #: ../app/tools/gimpselectiontool.c:263 msgid "Click-Drag to create a new selection" -msgstr "Kliknięcie i przeciągnięcie utworzy nowe zaznaczenie" +msgstr "Kliknięcie i przeciągnięcie utworzy nowe zaznaczenie" #: ../app/tools/gimpselectiontool.c:268 msgid "Click-Drag to add to the current selection" -msgstr "Kliknięcie i przeciągnięcie doda bieżące zaznaczenie" +msgstr "Kliknięcie i przeciągnięcie doda bieżące zaznaczenie" #: ../app/tools/gimpselectiontool.c:277 msgid "Click-Drag to subtract from the current selection" -msgstr "Kliknięcie i przeciągnięcie odejmie od bieżącego zaznaczenia" +msgstr "Kliknięcie i przeciągnięcie odejmie od bieżącego zaznaczenia" #: ../app/tools/gimpselectiontool.c:286 msgid "Click-Drag to intersect with the current selection" -msgstr "Kliknięcie i przeciągnięcie przetnie z bieżącym zaznaczeniem" +msgstr "Kliknięcie i przeciągnięcie przetnie z bieżącym zaznaczeniem" #: ../app/tools/gimpselectiontool.c:296 msgid "Click-Drag to move the selection mask" -msgstr "Kliknięcie i przeciągnięcie przesunie zaznaczoną maskę" +msgstr "Kliknięcie i przeciągnięcie przesunie zaznaczoną maskę" #: ../app/tools/gimpselectiontool.c:304 msgid "Click-Drag to move the selected pixels" -msgstr "Kliknięcie i przeciągnięcie przesunie zaznaczone piksele" +msgstr "Kliknięcie i przeciągnięcie przesunie zaznaczone piksele" #: ../app/tools/gimpselectiontool.c:308 msgid "Click-Drag to move a copy of the selected pixels" -msgstr "Kliknięcie i przeciągnięcie przesunie kopię zaznaczonych pikseli" +msgstr "Kliknięcie i przeciągnięcie przesunie kopię zaznaczonych pikseli" #: ../app/tools/gimpselectiontool.c:312 msgid "Click to anchor the floating selection" @@ -13789,24 +13796,24 @@ #, c-format msgctxt "undo-type" msgid "Shear horizontally by %-3.3g" -msgstr "Nachylenie poziome o %-3.3g" +msgstr "Nachylenie poziome o %-3.3g" #: ../app/tools/gimpsheartool.c:259 #, c-format msgctxt "undo-type" msgid "Shear vertically by %-3.3g" -msgstr "Nachylenie pionowe o %-3.3g" +msgstr "Nachylenie pionowe o %-3.3g" #. e.g. user entered numbers but no notification callback #: ../app/tools/gimpsheartool.c:264 #, c-format msgctxt "undo-type" msgid "Shear horizontally by %-3.3g, vertically by %-3.3g" -msgstr "Nachylenie poziome o %-3.3g, pionowe o %-3.3g" +msgstr "Nachylenie poziome o %-3.3g, pionowe o %-3.3g" #: ../app/tools/gimpsmudgetool.c:54 msgid "Smudge Tool: Smudge selectively using a brush" -msgstr "Rozsmarowywanie: wybiórczo rozsmarowuje używając pędzla" +msgstr "Rozsmarowywanie: wybiórczo rozsmarowuje za pomocą pędzla" #: ../app/tools/gimpsmudgetool.c:55 msgid "_Smudge" @@ -13860,7 +13867,7 @@ "Whether text flows into rectangular shape or moves into a new line when you " "press Enter" msgstr "" -"Określa, czy tekst mieści się w prostokątnym kształcie, czy przesuwa się do " +"Określa, czy tekst mieści się w prostokątnym kształcie, czy przesuwa się do " "nowego wiersza po naciśnięciu klawisza Enter" #: ../app/tools/gimptextoptions.c:196 @@ -13905,7 +13912,7 @@ #: ../app/tools/gimptexttool.c:192 msgid "Text Tool: Create or edit text layers" -msgstr "Tekst: tworzy i modyfikuje warstwy tekstu" +msgstr "Tekst: tworzy i modyfikuje warstwy tekstu" #: ../app/tools/gimptexttool.c:193 msgid "Te_xt" @@ -13933,10 +13940,10 @@ msgstr "" "Zaznaczona warstwa jest warstwą tekstową, jednak została zmodyfikowana przy " "użyciu innych narzędzi. Wprowadzenie zmian przy użyciu narzędzia tekstowego " -"spowoduje porzucenie zmian wykonanych wcześniej innymi narzędziami.\n" +"spowoduje odrzucenie zmian wykonanych wcześniej innymi narzędziami.\n" "\n" -"Możliwe jest zmodyfikowanie warstwy lub utworzenie nowej warstwy tekstowej w " -"oparciu o atrybuty obecnej." +"Możliwe jest zmodyfikowanie warstwy lub utworzenie nowej warstwy tekstowej " +"na podstawie atrybutów obecnej." #: ../app/tools/gimptexttool-editor.c:1236 msgid "GIMP Text Editor" @@ -13945,7 +13952,7 @@ #: ../app/tools/gimpthresholdtool.c:91 msgid "Threshold Tool: Reduce image to two colors using a threshold" msgstr "" -"Progowanie: zmniejsza do dwóch liczbę kolorów w obrazie przy użyciu " +"Progowanie: zmniejsza do dwóch liczbę kolorów w obrazie przy użyciu " "progowania" #: ../app/tools/gimpthresholdtool.c:92 @@ -14058,7 +14065,7 @@ #: ../app/tools/gimptransformtool.c:269 #, c-format msgid "The selection does not intersect with the layer." -msgstr "Zaznaczenie nie przecina się z warstwą." +msgstr "Zaznaczenie nie przecina się z warstwą." #: ../app/tools/gimptransformtool.c:1480 msgid "There is no layer to transform." @@ -14074,7 +14081,7 @@ #: ../app/tools/gimpvectoroptions.c:76 msgid "Restrict editing to polygons" -msgstr "Wymuszenie ścieżki w kształcie wielokąta" +msgstr "Wymuszenie ścieżki w kształcie wielokąta" #: ../app/tools/gimpvectoroptions.c:155 msgid "Edit Mode" @@ -14104,7 +14111,7 @@ #: ../app/tools/gimpvectortool.c:161 msgid "Paths Tool: Create and edit paths" -msgstr "Ścieżki: umożliwia tworzenie i modyfikowanie ścieżek" +msgstr "Ścieżki: umożliwia tworzenie i modyfikowanie ścieżek" #: ../app/tools/gimpvectortool.c:162 msgid "Pat_hs" @@ -14180,27 +14187,27 @@ #: ../app/tools/gimpvectortool.c:1217 msgid "Click or Click-Drag to create a new anchor" -msgstr "Kliknięcie lub kliknięcie i przeciągnięcie utworzy nowe zakotwiczenie" +msgstr "Kliknięcie lub kliknięcie i przeciągnięcie utworzy nowe zakotwiczenie" #: ../app/tools/gimpvectortool.c:1229 ../app/tools/gimpvectortool.c:1236 msgid "Click-Drag to move the anchor around" -msgstr "Kliknięcie lub kliknięcie przemieści zakotwiczenie" +msgstr "Kliknięcie i przeciągnięcie przemieści zakotwiczenie" #: ../app/tools/gimpvectortool.c:1240 ../app/tools/gimpvectortool.c:1263 msgid "Click-Drag to move the anchors around" -msgstr "Kliknięcie lub kliknięcie przemieści zakotwiczenie" +msgstr "Kliknięcie i przeciągnięcie przemieści zakotwiczenie" #: ../app/tools/gimpvectortool.c:1246 msgid "Click-Drag to move the handle around" -msgstr "Kliknięcie lub kliknięcie przemieści zaczep" +msgstr "Kliknięcie i przeciągnięcie przemieści zaczep" #: ../app/tools/gimpvectortool.c:1253 msgid "Click-Drag to move the handles around symmetrically" -msgstr "Kliknięcie lub kliknięcie przemieści zaczep symetrycznie" +msgstr "Kliknięcie i przeciągnięcie przemieści zaczep symetrycznie" #: ../app/tools/gimpvectortool.c:1268 msgid "Click-Drag to change the shape of the curve" -msgstr "Kliknięcie lub kliknięcie zmieni kształt krzywej" +msgstr "Kliknięcie i przeciągnięcie zmieni kształt krzywej" #: ../app/tools/gimpvectortool.c:1271 #, c-format @@ -14209,15 +14216,15 @@ #: ../app/tools/gimpvectortool.c:1276 msgid "Click-Drag to move the component around" -msgstr "Kliknięcie lub kliknięcie przemieści składową" +msgstr "Kliknięcie i przeciągnięcie przemieści składową" #: ../app/tools/gimpvectortool.c:1284 msgid "Click-Drag to move the path around" -msgstr "Kliknięcie lub kliknięcie przemieści ścieżkę" +msgstr "Kliknięcie i przeciągnięcie przemieści ścieżkę" #: ../app/tools/gimpvectortool.c:1288 msgid "Click-Drag to insert an anchor on the path" -msgstr "Kliknięcie lub kliknięcie wstawi zakotwiczenie w ścieżkę" +msgstr "Kliknięcie i przeciągnięcie wstawi zakotwiczenie w ścieżkę" #: ../app/tools/gimpvectortool.c:1296 msgid "Click to delete this anchor" @@ -14225,7 +14232,7 @@ #: ../app/tools/gimpvectortool.c:1300 msgid "Click to connect this anchor with the selected endpoint" -msgstr "Kliknięcie połączy to zakotwiczenie z zaznaczonym punktem końcowym" +msgstr "Kliknięcie połączy to zakotwiczenie z zaznaczonym punktem końcowym" #: ../app/tools/gimpvectortool.c:1305 msgid "Click to open up the path" @@ -14418,16 +14425,16 @@ #: ../app/vectors/gimpvectors-import.c:372 #, c-format msgid "No paths found in '%s'" -msgstr "Nie odnaleziono ścieżek w „%s”" +msgstr "Nie odnaleziono ścieżek w „%s”" #: ../app/vectors/gimpvectors-import.c:376 msgid "No paths found in the buffer" -msgstr "Nie odnaleziono ścieżek w buforze" +msgstr "Nie odnaleziono ścieżek w buforze" #: ../app/vectors/gimpvectors-import.c:386 #, c-format msgid "Failed to import paths from '%s': %s" -msgstr "Zaimportowanie ścieżek z „%s” się nie powiodło: %s" +msgstr "Zaimportowanie ścieżek z „%s” się nie powiodło: %s" #: ../app/widgets/gimpactioneditor.c:69 msgid "_Search:" @@ -14467,13 +14474,13 @@ #, c-format msgid "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group." msgstr "" -"Skrót „%s” został już powiązany z czynnością „%s” z grupy o nazwie „%s”." +"Skrót „%s” został już powiązany z czynnością „%s” z grupy o nazwie „%s”." #: ../app/widgets/gimpactionview.c:695 #, c-format msgid "Reassigning the shortcut will cause it to be removed from \"%s\"." msgstr "" -"Zmiana przypisania skrótu spowoduje, że jego skojarzenie z czynnością „%s” " +"Zmiana przypisania skrótu spowoduje, że jego skojarzenie z czynnością „%s” " "zostanie usunięte." #: ../app/widgets/gimpactionview.c:778 @@ -14521,11 +14528,11 @@ #: ../app/widgets/gimpcolordisplayeditor.c:219 msgid "Move the selected filter up" -msgstr "Przesuwa zaznaczony filtr w górę" +msgstr "Przesuwa zaznaczony filtr w górę" #: ../app/widgets/gimpcolordisplayeditor.c:228 msgid "Move the selected filter down" -msgstr "Przesuwa zaznaczony filtr w dół" +msgstr "Przesuwa zaznaczony filtr w dół" #: ../app/widgets/gimpcolordisplayeditor.c:274 msgid "Active Filters" @@ -14543,7 +14550,7 @@ #: ../app/widgets/gimpcolordisplayeditor.c:564 #, c-format msgid "Remove '%s' from the list of active filters" -msgstr "Usuwa „%s” z listy aktywnych filtrów" +msgstr "Usuwa „%s” z listy aktywnych filtrów" #: ../app/widgets/gimpcolordisplayeditor.c:595 msgid "No filter selected" @@ -14554,7 +14561,7 @@ "Hexadecimal color notation as used in HTML and CSS. This entry also accepts " "CSS color names." msgstr "" -"Heksadecymalny zapis koloru jest używany w językach HTML i CSS. To pole " +"Heksadecymalny zapis koloru jest używany w językach HTML i CSS. To pole " "przyjmuje także nazwy kolorów języka CSS." #: ../app/widgets/gimpcolorframe.c:511 @@ -14619,7 +14626,7 @@ #: ../app/widgets/gimpcolormapeditor.c:466 msgid "Only indexed images have a colormap." -msgstr "Tylko indeksowane obrazy posiadają paletę kolorów." +msgstr "Tylko indeksowane obrazy mają paletę kolorów." #: ../app/widgets/gimpcolorselectorpalette.c:58 msgid "Palette" @@ -14635,7 +14642,7 @@ #: ../app/widgets/gimpcontrollereditor.c:198 msgid "_Dump events from this controller" -msgstr "_Blokowanie zdarzeń z tego urządzenia" +msgstr "_Blokowanie zdarzeń z tego urządzenia" #: ../app/widgets/gimpcontrollereditor.c:203 msgid "_Enable this controller" @@ -14678,7 +14685,7 @@ #: ../app/widgets/gimpcontrollereditor.c:656 msgid "Select Controller Event Action" -msgstr "Wybór czynności dla zdarzenia z urządzenia sterującego" +msgstr "Wybór czynności dla zdarzenia z urządzenia sterującego" #: ../app/widgets/gimpcontrollerkeyboard.c:67 #: ../app/widgets/gimpcontrollerkeyboard.c:70 @@ -14689,7 +14696,7 @@ #: ../app/widgets/gimpcontrollerkeyboard.c:85 #: ../app/widgets/gimpcontrollerkeyboard.c:88 msgid "Cursor Up" -msgstr "Strzałka w górę" +msgstr "Strzałka w górę" #: ../app/widgets/gimpcontrollerkeyboard.c:92 #: ../app/widgets/gimpcontrollerkeyboard.c:95 @@ -14700,7 +14707,7 @@ #: ../app/widgets/gimpcontrollerkeyboard.c:110 #: ../app/widgets/gimpcontrollerkeyboard.c:113 msgid "Cursor Down" -msgstr "Strzałka w dół" +msgstr "Strzałka w dół" #: ../app/widgets/gimpcontrollerkeyboard.c:117 #: ../app/widgets/gimpcontrollerkeyboard.c:120 @@ -14711,7 +14718,7 @@ #: ../app/widgets/gimpcontrollerkeyboard.c:135 #: ../app/widgets/gimpcontrollerkeyboard.c:138 msgid "Cursor Left" -msgstr "Strzałka w lewo" +msgstr "Strzałka w lewo" #: ../app/widgets/gimpcontrollerkeyboard.c:142 #: ../app/widgets/gimpcontrollerkeyboard.c:145 @@ -14722,7 +14729,7 @@ #: ../app/widgets/gimpcontrollerkeyboard.c:160 #: ../app/widgets/gimpcontrollerkeyboard.c:163 msgid "Cursor Right" -msgstr "Strzałka w prawo" +msgstr "Strzałka w prawo" #: ../app/widgets/gimpcontrollerkeyboard.c:175 msgid "Keyboard" @@ -14752,11 +14759,11 @@ #: ../app/widgets/gimpcontrollerlist.c:301 msgid "Move the selected controller up" -msgstr "Przesuwa zaznaczone urządzenie w górę" +msgstr "Przesuwa zaznaczone urządzenie w górę" #: ../app/widgets/gimpcontrollerlist.c:309 msgid "Move the selected controller down" -msgstr "Przesuwa zaznaczone urządzenie w dół" +msgstr "Przesuwa zaznaczone urządzenie w dół" #: ../app/widgets/gimpcontrollerlist.c:427 #, c-format @@ -14766,7 +14773,7 @@ #: ../app/widgets/gimpcontrollerlist.c:478 #, c-format msgid "Remove '%s' from the list of active controllers" -msgstr "Usuwa „%s” z listy aktywnych urządzeń" +msgstr "Usuwa „%s” z listy aktywnych urządzeń" #: ../app/widgets/gimpcontrollerlist.c:512 msgid "" @@ -14823,7 +14830,7 @@ "Selecting \"Disable Controller\" will disable the controller without " "removing it." msgstr "" -"Usunięcie tego urządzenia z listy aktywnych urządzeń usunie wszystkie " +"Usunięcie tego urządzenia z listy aktywnych urządzeń usunie wszystkie " "skonfigurowane mapowania zdarzeń.\n" "\n" "Polecenie „Wyłącz urządzenie” wyłączy urządzenie bez usuwania go." @@ -14841,7 +14848,7 @@ #: ../app/widgets/gimpcontrollermouse.c:88 #: ../app/widgets/gimpcontrollermouse.c:91 msgid "Button 8" -msgstr "Przycisk 8" +msgstr "8. przycisk" #: ../app/widgets/gimpcontrollermouse.c:95 #: ../app/widgets/gimpcontrollermouse.c:98 @@ -14852,7 +14859,7 @@ #: ../app/widgets/gimpcontrollermouse.c:113 #: ../app/widgets/gimpcontrollermouse.c:116 msgid "Button 9" -msgstr "Przycisk 9" +msgstr "9. przycisk" #: ../app/widgets/gimpcontrollermouse.c:120 #: ../app/widgets/gimpcontrollermouse.c:123 @@ -14863,7 +14870,7 @@ #: ../app/widgets/gimpcontrollermouse.c:138 #: ../app/widgets/gimpcontrollermouse.c:141 msgid "Button 10" -msgstr "Przycisk 10" +msgstr "10. przycisk" #: ../app/widgets/gimpcontrollermouse.c:145 #: ../app/widgets/gimpcontrollermouse.c:148 @@ -14874,7 +14881,7 @@ #: ../app/widgets/gimpcontrollermouse.c:163 #: ../app/widgets/gimpcontrollermouse.c:166 msgid "Button 11" -msgstr "Przycisk 11" +msgstr "11. przycisk" #: ../app/widgets/gimpcontrollermouse.c:170 #: ../app/widgets/gimpcontrollermouse.c:173 @@ -14885,7 +14892,7 @@ #: ../app/widgets/gimpcontrollermouse.c:188 #: ../app/widgets/gimpcontrollermouse.c:191 msgid "Button 12" -msgstr "Przycisk 12" +msgstr "12. przycisk" #: ../app/widgets/gimpcontrollermouse.c:203 msgid "Mouse Buttons" @@ -14904,7 +14911,7 @@ #: ../app/widgets/gimpcontrollerwheel.c:87 #: ../app/widgets/gimpcontrollerwheel.c:90 msgid "Scroll Up" -msgstr "Przewinięcie w górę" +msgstr "Przewinięcie w górę" #: ../app/widgets/gimpcontrollerwheel.c:94 #: ../app/widgets/gimpcontrollerwheel.c:97 @@ -14915,7 +14922,7 @@ #: ../app/widgets/gimpcontrollerwheel.c:112 #: ../app/widgets/gimpcontrollerwheel.c:115 msgid "Scroll Down" -msgstr "Przewinięcie w dół" +msgstr "Przewinięcie w dół" #: ../app/widgets/gimpcontrollerwheel.c:119 #: ../app/widgets/gimpcontrollerwheel.c:122 @@ -14926,7 +14933,7 @@ #: ../app/widgets/gimpcontrollerwheel.c:137 #: ../app/widgets/gimpcontrollerwheel.c:140 msgid "Scroll Left" -msgstr "Przewinięcie w lewo" +msgstr "Przewinięcie w lewo" #: ../app/widgets/gimpcontrollerwheel.c:144 #: ../app/widgets/gimpcontrollerwheel.c:147 @@ -14937,7 +14944,7 @@ #: ../app/widgets/gimpcontrollerwheel.c:162 #: ../app/widgets/gimpcontrollerwheel.c:165 msgid "Scroll Right" -msgstr "Przewinięcie w prawo" +msgstr "Przewinięcie w prawo" #: ../app/widgets/gimpcontrollerwheel.c:177 msgid "Mouse Wheel" @@ -15064,7 +15071,7 @@ #: ../app/widgets/gimpdnd-xds.c:238 #, c-format msgid "A file named '%s' already exists." -msgstr "Plik o nazwie „%s” już istnieje." +msgstr "Plik o nazwie „%s” już istnieje." #: ../app/widgets/gimpdnd-xds.c:243 msgid "Do you want to replace it with the image you are saving?" @@ -15132,7 +15139,7 @@ #: ../app/widgets/gimperrordialog.c:150 msgid "Too many error messages!" -msgstr "Za dużo komunikatów o błędach." +msgstr "Za dużo komunikatów o błędach." #: ../app/widgets/gimperrordialog.c:151 msgid "Messages are redirected to stderr." @@ -15195,7 +15202,7 @@ #: ../app/widgets/gimpgradienteditor.c:753 #, c-format msgid "Zoom factor: %d:1" -msgstr "Współczynnik powiększenia: %d:1" +msgstr "Współczynnik powiększenia: %d∶1" #: ../app/widgets/gimpgradienteditor.c:756 #, c-format @@ -15261,7 +15268,7 @@ #: ../app/widgets/gimpgradienteditor.c:1278 #: ../app/widgets/gimpgradienteditor.c:1300 msgid "Click: select Drag: move" -msgstr "Kliknięcie: zaznacza Przeciągnięcie: przesuwa" +msgstr "Kliknięcie: zaznacza Przeciągnięcie: przesuwa" #: ../app/widgets/gimpgradienteditor.c:1515 #: ../app/widgets/gimpgradienteditor.c:1523 @@ -15302,15 +15309,15 @@ msgid "Height" msgstr "Wysokość" -#: ../app/widgets/gimphelp.c:297 +#: ../app/widgets/gimphelp.c:308 msgid "Help browser is missing" msgstr "Brak przeglądarki pomocy" -#: ../app/widgets/gimphelp.c:298 +#: ../app/widgets/gimphelp.c:309 msgid "The GIMP help browser is not available." msgstr "Przeglądarka pomocy programu GIMP jest niedostępna." -#: ../app/widgets/gimphelp.c:299 +#: ../app/widgets/gimphelp.c:310 msgid "" "The GIMP help browser plug-in appears to be missing from your installation. " "You may instead use the web browser for reading the help pages." @@ -15318,33 +15325,37 @@ "Nie można odnaleźć wtyczki przeglądarki pomocy programu GIMP. Można użyć " "przeglądarki WWW do czytania stron pomocy." -#: ../app/widgets/gimphelp.c:340 +#: ../app/widgets/gimphelp.c:351 msgid "Help browser doesn't start" msgstr "Nie można uruchomić przeglądarki pomocy" -#: ../app/widgets/gimphelp.c:341 +#: ../app/widgets/gimphelp.c:352 msgid "Could not start the GIMP help browser plug-in." msgstr "Nie można uruchomić wtyczki przeglądarki pomocy programu GIMP." -#: ../app/widgets/gimphelp.c:368 +#: ../app/widgets/gimphelp.c:354 +msgid "You may instead use the web browser for reading the help pages." +msgstr "Można użyć przeglądarki WWW do czytania stron pomocy." + +#: ../app/widgets/gimphelp.c:380 msgid "Use _Web Browser" msgstr "Użycie przeglądarki _WWW" -#: ../app/widgets/gimphelp.c:712 +#: ../app/widgets/gimphelp.c:724 msgid "GIMP user manual is missing" msgstr "Brak podręcznika użytkownika programu GIMP" -#: ../app/widgets/gimphelp.c:719 +#: ../app/widgets/gimphelp.c:731 msgid "_Read Online" -msgstr "Pod_ręcznik w sieci" +msgstr "Pod_ręcznik w sieci" -#: ../app/widgets/gimphelp.c:743 +#: ../app/widgets/gimphelp.c:755 msgid "The GIMP user manual is not installed on your computer." msgstr "" "Podręcznik użytkownika programu GIMP nie został zainstalowany na tym " "komputerze." -#: ../app/widgets/gimphelp.c:746 +#: ../app/widgets/gimphelp.c:758 msgid "" "You may either install the additional help package or change your " "preferences to use the online version." @@ -15358,7 +15369,7 @@ #: ../app/widgets/gimphistogrameditor.c:100 msgid "Std dev:" -msgstr "Std dev:" +msgstr "Odchylenie standardowe:" #: ../app/widgets/gimphistogrameditor.c:101 msgid "Median:" @@ -15390,8 +15401,8 @@ "Replace the current image comment with the default comment set in " "Edit→Preferences→Default Image." msgstr "" -"Zamienia bieżący komentarz obrazu na domyślny komentarz ustawiony w " -"Edycja→Preferencje→Domyślny obraz." +"Zamienia bieżący komentarz obrazu na domyślny komentarz ustawiony " +"w Edycja→Preferencje→Domyślny obraz." #: ../app/widgets/gimpimageprofileview.c:202 msgid "Querying..." @@ -15399,7 +15410,7 @@ #: ../app/widgets/gimpimagepropview.c:113 msgid "Size in pixels:" -msgstr "Rozmiar w pikselach:" +msgstr "Rozmiar w pikselach:" #: ../app/widgets/gimpimagepropview.c:116 msgid "Print size:" @@ -15427,7 +15438,7 @@ #: ../app/widgets/gimpimagepropview.c:141 msgid "Size in memory:" -msgstr "Rozmiar w pamięci:" +msgstr "Rozmiar w pamięci:" #: ../app/widgets/gimpimagepropview.c:144 msgid "Undo steps:" @@ -15527,7 +15538,7 @@ #: ../app/widgets/gimpsettingsbox.c:269 msgid "Pick a setting from the list" -msgstr "Pobierz ustawienia z listy" +msgstr "Pobierz ustawienia z listy" #: ../app/widgets/gimpsettingsbox.c:291 msgid "Add settings to favorites" @@ -15535,7 +15546,7 @@ #: ../app/widgets/gimpsettingsbox.c:319 msgid "_Import Settings from File..." -msgstr "Za_importuj ustawienia z pliku…" +msgstr "Za_importuj ustawienia z pliku…" #: ../app/widgets/gimpsettingsbox.c:325 msgid "_Export Settings to File..." @@ -15563,7 +15574,7 @@ #: ../app/widgets/gimpsettingseditor.c:194 msgid "Import settings from a file" -msgstr "Importowanie ustawień z pliku" +msgstr "Importowanie ustawień z pliku" #: ../app/widgets/gimpsettingseditor.c:203 msgid "Export the selected settings to a file" @@ -15666,20 +15677,20 @@ msgid "%d ppi, %s" msgstr "%d ppi, %s" -#: ../app/widgets/gimptextbuffer-serialize.c:344 +#: ../app/widgets/gimptextbuffer-serialize.c:269 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" -msgstr "Atrybut „%s” jest nieprawidłowy dla elementu <%s> w tym kontekście" +msgstr "Atrybut „%s” jest nieprawidłowy dla elementu <%s> w tym kontekście" -#: ../app/widgets/gimptextbuffer-serialize.c:416 +#: ../app/widgets/gimptextbuffer-serialize.c:341 #, c-format msgid "Outermost element in text must be not <%s>" -msgstr "Zewnętrzny element w tekście musi być , a nie <%s>" +msgstr "Zewnętrzny element w tekście musi być , a nie <%s>" -#: ../app/widgets/gimptextbuffer.c:1459 +#: ../app/widgets/gimptextbuffer.c:1460 #, c-format msgid "Invalid UTF-8 data in file '%s'." -msgstr "Nieprawidłowe dane UTF-8 w pliku „%s”." +msgstr "Nieprawidłowe dane UTF-8 w pliku „%s”." #: ../app/widgets/gimptexteditor.c:222 msgid "_Use selected font" @@ -15746,7 +15757,7 @@ #: ../app/widgets/gimpthumbbox.c:612 ../app/widgets/gimpthumbbox.c:633 #, c-format msgid "Thumbnail %d of %d" -msgstr "Miniatura %d z %d" +msgstr "Miniatura %d z %d" #: ../app/widgets/gimpthumbbox.c:746 ../app/widgets/gimpthumbbox.c:756 msgid "Creating preview..." @@ -15760,7 +15771,7 @@ "Click to open the color selection dialog." msgstr "" "Kolor pierwszoplanowy oraz tła.\n" -"Czarny i biały kwadrat przywraca kolory.\n" +"Czarny i biały kwadrat przywraca kolory.\n" "Strzałki zamieniają kolory.\n" "Kliknięcie otworzy okno wyboru koloru." @@ -15783,7 +15794,8 @@ #: ../app/widgets/gimptoolbox-image-area.c:120 msgid "Drag to an XDS enabled file-manager to save the image." -msgstr "Przeciągnięcie na menedżer plików obsługujący XDS zapisze obraz." +msgstr "" +"Przeciągnięcie na menedżer plików obsługujący standard XDS zapisze obraz." #: ../app/widgets/gimptoolbox-indicator-area.c:163 msgid "" @@ -15827,7 +15839,7 @@ #: ../app/widgets/gimptooleditor.c:310 msgid "Reset tool order and visibility" -msgstr "Przywraca domyślny porządek i widoczność narzędzi" +msgstr "Przywraca domyślny porządek i widoczność narzędzi" #: ../app/widgets/gimptooloptionseditor.c:202 msgid "Save Tool Preset..." @@ -15888,7 +15900,7 @@ #: ../app/widgets/gimpuimanager.c:742 msgid "Your GIMP installation is incomplete:" -msgstr "Instalacja programu GIMP jest niekompletna:" +msgstr "Instalacja programu GIMP jest niepełna:" #: ../app/widgets/gimpuimanager.c:744 msgid "Please make sure the menu XML files are correctly installed." @@ -15934,7 +15946,7 @@ #: ../app/widgets/gimpwidgets-utils.c:595 #, c-format msgid "%s (try %s)" -msgstr "%s (próba %s)" +msgstr "%s (%s)" #: ../app/widgets/gimpwidgets-utils.c:595 #, c-format @@ -15944,12 +15956,12 @@ #: ../app/widgets/gimpwidgets-utils.c:599 #, c-format msgid "%s (try %s, %s)" -msgstr "%s (próba %s, %s)" +msgstr "%s (%s, %s)" #: ../app/widgets/gimpwidgets-utils.c:603 #, c-format msgid "%s (try %s, %s, %s)" -msgstr "%s (próba %s, %s, %s)" +msgstr "%s (%s, %s, %s)" #: ../app/widgets/widgets-enums.c:23 msgctxt "active-color" @@ -16034,22 +16046,22 @@ #: ../app/widgets/widgets-enums.c:219 msgctxt "tab-style" msgid "Icon & text" -msgstr "Ikona i tekst" +msgstr "Ikona i tekst" #: ../app/widgets/widgets-enums.c:220 msgctxt "tab-style" msgid "Icon & desc" -msgstr "Ikona i opis" +msgstr "Ikona i opis" #: ../app/widgets/widgets-enums.c:221 msgctxt "tab-style" msgid "Status & text" -msgstr "Stan i tekst" +msgstr "Stan i tekst" #: ../app/widgets/widgets-enums.c:222 msgctxt "tab-style" msgid "Status & desc" -msgstr "Stan i opis" +msgstr "Stan i opis" #: ../app/widgets/widgets-enums.c:223 msgctxt "tab-style" @@ -16083,7 +16095,7 @@ #: ../app/xcf/xcf-read.c:174 msgid "Invalid UTF-8 string in XCF file" -msgstr "Nieprawidłowy ciąg UTF-8 w pliku XCF" +msgstr "Nieprawidłowy ciąg UTF-8 w pliku XCF" #: ../app/xcf/xcf-write.c:155 #, c-format @@ -16135,7 +16147,7 @@ "and image authoring." msgstr "" "GIMP to program do manipulowania obrazami projektu GNU. Jest on wolnym " -"oprogramowaniem służącym do retuszowania zdjęć i tworzenia obrazów." +"oprogramowaniem służącym do retuszowania zdjęć i tworzenia obrazów." #: ../desktop/gimp.appdata.xml.in.h:2 msgid "" @@ -16156,7 +16168,7 @@ "manipulation procedures to be easily scripted. GIMP is available for Linux, " "Microsoft Windows and OS X." msgstr "" -"Program GIMP jest wysoce rozszerzalny. Za pomocą wtyczek i rozszerzeń można " +"Program GIMP jest wysoce rozszerzalny. Za pomocą wtyczek i rozszerzeń można " "osiągnąć niemalże wszystko. Zaawansowany interfejs skryptów umożliwia łatwe " "automatyzowanie wszystkich działań, od najprostszych zadań do złożonych " "procedur manipulacji obrazami. Program GIMP jest dostępny dla systemów " @@ -16168,4 +16180,4 @@ #: ../desktop/gimp.desktop.in.in.h:3 msgid "Create images and edit photographs" -msgstr "Tworzenie oraz obróbka obrazów i fotografii" +msgstr "Tworzenie oraz obróbka obrazów i fotografii" diff -Nru gimp-2.8.18/po/pt.po gimp-2.8.20/po/pt.po --- gimp-2.8.18/po/pt.po 2016-05-25 22:26:48.000000000 +0000 +++ gimp-2.8.20/po/pt.po 2017-01-28 19:08:49.000000000 +0000 @@ -11,18 +11,18 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-05-01 06:19+0000\n" -"PO-Revision-Date: 2016-05-01 16:58+0100\n" +"product=gimp&keywords=I18N+L10N&component=Internationalisation\n" +"POT-Creation-Date: 2016-09-06 19:13+0000\n" +"PO-Revision-Date: 2016-09-07 07:10+0100\n" "Last-Translator: Tiago Santos \n" "Language-Team: Português \n" -"Language: Portuguese\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.7.1\n" "X-Language: pt_PT\n" "X-Source-Language: C\n" @@ -50,19 +50,6 @@ #. * Cf. bug 762282. #. #: ../app/about.h:39 -#| msgid "" -#| "GIMP 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.\n" -#| "\n" -#| "GIMP 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.\n" -#| "\n" -#| "You should have received a copy of the GNU General Public License along " -#| "with GIMP. If not, see http://www.gnu.org/licenses/." msgid "" "GIMP 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 " @@ -284,7 +271,7 @@ #. initialize the list of gimp brushes #: ../app/actions/actions.c:112 ../app/core/gimp.c:951 -#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2783 msgid "Brushes" msgstr "Pincéis" @@ -331,7 +318,7 @@ #. Document History #: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:329 -#: ../app/dialogs/preferences-dialog.c:1577 +#: ../app/dialogs/preferences-dialog.c:1612 msgid "Document History" msgstr "Histórico de documentos" @@ -362,7 +349,7 @@ msgstr "Ficheiro" #: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:325 -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2803 msgid "Fonts" msgstr "Letras" @@ -373,12 +360,12 @@ #. initialize the list of gimp gradients #: ../app/actions/actions.c:172 ../app/core/gimp.c:971 -#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2799 msgid "Gradients" msgstr "Gradientes" #: ../app/actions/actions.c:175 ../app/core/gimp.c:983 -#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2770 +#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2807 msgid "Tool Presets" msgstr "Predefinições da ferramenta" @@ -412,23 +399,23 @@ #. initialize the list of gimp palettes #: ../app/actions/actions.c:196 ../app/core/gimp.c:966 -#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2758 +#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2795 msgid "Palettes" msgstr "Paletas" #. initialize the list of gimp patterns #: ../app/actions/actions.c:199 ../app/core/gimp.c:961 -#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2791 msgid "Patterns" msgstr "Texturas" -#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2774 +#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2811 msgid "Plug-Ins" msgstr "Extensões" #. Quick Mask Color #: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:386 -#: ../app/dialogs/preferences-dialog.c:2032 +#: ../app/dialogs/preferences-dialog.c:2069 msgid "Quick Mask" msgstr "Máscara rápida" @@ -455,7 +442,7 @@ msgstr "Editor de texto" #: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:298 -#: ../app/dialogs/preferences-dialog.c:1861 ../app/gui/gui.c:441 +#: ../app/dialogs/preferences-dialog.c:1898 ../app/gui/gui.c:441 msgid "Tool Options" msgstr "Opções de ferramentas" @@ -754,8 +741,7 @@ msgid "Intersect this channel with the current selection" msgstr "Intersetar este canal com a seleção atual" -#: ../app/actions/channels-commands.c:85 -#: ../app/actions/channels-commands.c:402 +#: ../app/actions/channels-commands.c:85 ../app/actions/channels-commands.c:402 msgid "Channel Attributes" msgstr "Atributos do canal" @@ -767,8 +753,7 @@ msgid "Edit Channel Color" msgstr "Editar cor do canal" -#: ../app/actions/channels-commands.c:91 -#: ../app/actions/channels-commands.c:123 +#: ../app/actions/channels-commands.c:91 ../app/actions/channels-commands.c:123 msgid "_Fill opacity:" msgstr "_Opacidade do preenchimento:" @@ -1006,8 +991,7 @@ "\n" "%s" -#: ../app/actions/data-commands.c:118 -#: ../app/actions/tool-options-commands.c:72 +#: ../app/actions/data-commands.c:118 ../app/actions/tool-options-commands.c:72 #: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1529 #: ../app/core/gimppalette-import.c:211 ../app/core/gimppalette-load.c:224 #: ../app/core/gimppalette.c:399 ../app/dialogs/palette-import-dialog.c:771 @@ -1376,7 +1360,7 @@ msgstr "_Sobre" #: ../app/actions/dialogs-actions.c:333 -#: ../app/dialogs/preferences-dialog.c:1951 ../app/widgets/gimptoolbox.c:539 +#: ../app/dialogs/preferences-dialog.c:1988 ../app/widgets/gimptoolbox.c:539 msgid "Toolbox" msgstr "Caixa de ferramentas" @@ -3243,15 +3227,13 @@ msgid "Set Image Print Resolution" msgstr "Definir resolução de impressão da imagem" -#: ../app/actions/image-commands.c:379 -#: ../app/pdb/drawable-transform-cmds.c:159 +#: ../app/actions/image-commands.c:379 ../app/pdb/drawable-transform-cmds.c:159 #: ../app/pdb/drawable-transform-cmds.c:247 #: ../app/pdb/item-transform-cmds.c:162 msgid "Flipping" msgstr "A inverter" -#: ../app/actions/image-commands.c:403 -#: ../app/pdb/drawable-transform-cmds.c:602 +#: ../app/actions/image-commands.c:403 ../app/pdb/drawable-transform-cmds.c:602 #: ../app/pdb/drawable-transform-cmds.c:694 ../app/pdb/image-cmds.c:534 #: ../app/pdb/item-transform-cmds.c:433 ../app/pdb/transform-tools-cmds.c:245 #: ../app/tools/gimprotatetool.c:125 @@ -3272,7 +3254,7 @@ #. Scaling #: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 -#: ../app/dialogs/preferences-dialog.c:1906 +#: ../app/dialogs/preferences-dialog.c:1943 #: ../app/pdb/drawable-transform-cmds.c:783 #: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 #: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524 @@ -4627,14 +4609,13 @@ #: ../app/actions/text-editor-commands.c:143 #: ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58 #: ../app/core/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:443 -#: ../app/core/gimpbrushgenerated-load.c:73 -#: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54 -#: ../app/core/gimpgradient-load.c:63 ../app/core/gimppalette-load.c:77 -#: ../app/core/gimppalette-load.c:274 ../app/core/gimppalette-load.c:320 -#: ../app/core/gimppalette-load.c:377 ../app/core/gimppalette-load.c:467 -#: ../app/core/gimppalette-load.c:634 ../app/core/gimppattern-load.c:76 -#: ../app/tools/gimpcurvestool.c:658 ../app/tools/gimplevelstool.c:747 -#: ../app/xcf/xcf.c:359 +#: ../app/core/gimpbrushgenerated-load.c:73 ../app/core/gimpbrushpipe-load.c:81 +#: ../app/core/gimpcurve-load.c:54 ../app/core/gimpgradient-load.c:63 +#: ../app/core/gimppalette-load.c:77 ../app/core/gimppalette-load.c:274 +#: ../app/core/gimppalette-load.c:320 ../app/core/gimppalette-load.c:377 +#: ../app/core/gimppalette-load.c:467 ../app/core/gimppalette-load.c:634 +#: ../app/core/gimppattern-load.c:76 ../app/tools/gimpcurvestool.c:658 +#: ../app/tools/gimplevelstool.c:747 ../app/xcf/xcf.c:359 #, c-format msgid "Could not open '%s' for reading: %s" msgstr "Impossível abrir \"%s\" para leitura: %s" @@ -7469,7 +7450,7 @@ msgstr "Parasitas" #. initialize the list of gimp dynamics -#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2750 +#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2787 #: ../app/tools/gimppaintoptions-gui.c:201 msgid "Dynamics" msgstr "Dinâmicas" @@ -7480,7 +7461,7 @@ msgstr "Letras (isto pode demorar um bocado)" #. initialize the module list -#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2782 +#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2819 msgid "Modules" msgstr "Módulos" @@ -8419,7 +8400,7 @@ msgid "Remove Path" msgstr "Remover caminho" -#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1715 +#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1750 msgid "Folder" msgstr "Pasta" @@ -8576,7 +8557,7 @@ msgid "Layer cannot be lowered more." msgstr "A camada não pode ser mais baixa." -#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1529 +#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1532 #: ../app/core/gimplayermask.c:236 #, c-format msgid "%s mask" @@ -8591,47 +8572,47 @@ "Seleção flutuante\n" "(%s)" -#: ../app/core/gimplayer.c:1449 +#: ../app/core/gimplayer.c:1452 msgid "Unable to add a layer mask since the layer already has one." msgstr "Impossível adicionar máscara de camada pois a camada já possui uma." -#: ../app/core/gimplayer.c:1460 +#: ../app/core/gimplayer.c:1463 msgid "Cannot add layer mask of different dimensions than specified layer." msgstr "" "Impossível adicionar máscara de camada de dimensões diferentes da camada " "especificada." -#: ../app/core/gimplayer.c:1466 +#: ../app/core/gimplayer.c:1469 msgctxt "undo-type" msgid "Add Layer Mask" msgstr "Adicionar máscara de camada" -#: ../app/core/gimplayer.c:1584 +#: ../app/core/gimplayer.c:1587 msgctxt "undo-type" msgid "Transfer Alpha to Mask" msgstr "Transferir alfa para máscara" -#: ../app/core/gimplayer.c:1754 +#: ../app/core/gimplayer.c:1757 msgctxt "undo-type" msgid "Apply Layer Mask" msgstr "Aplicar máscara de camada" -#: ../app/core/gimplayer.c:1755 +#: ../app/core/gimplayer.c:1758 msgctxt "undo-type" msgid "Delete Layer Mask" msgstr "Eliminar máscara de camada" -#: ../app/core/gimplayer.c:1874 +#: ../app/core/gimplayer.c:1877 msgctxt "undo-type" msgid "Add Alpha Channel" msgstr "Adicionar canal alfa" -#: ../app/core/gimplayer.c:1928 +#: ../app/core/gimplayer.c:1931 msgctxt "undo-type" msgid "Remove Alpha Channel" msgstr "Remover canal alfa" -#: ../app/core/gimplayer.c:1948 +#: ../app/core/gimplayer.c:1951 msgctxt "undo-type" msgid "Layer to Image Size" msgstr "Camada em tamanho de imagem" @@ -9288,7 +9269,7 @@ msgstr "Criar nova imagem" #: ../app/dialogs/image-new-dialog.c:135 -#: ../app/dialogs/preferences-dialog.c:2016 +#: ../app/dialogs/preferences-dialog.c:2053 msgid "_Template:" msgstr "_Modelo:" @@ -9522,7 +9503,7 @@ msgstr "Selecionar origem" #: ../app/dialogs/palette-import-dialog.c:214 -#: ../app/dialogs/preferences-dialog.c:1930 +#: ../app/dialogs/preferences-dialog.c:1967 msgid "_Gradient" msgstr "_Gradiente" @@ -9581,20 +9562,20 @@ msgid "The selected source contains no colors." msgstr "A origem selecionada não contém cores." -#: ../app/dialogs/preferences-dialog.c:268 +#: ../app/dialogs/preferences-dialog.c:266 msgid "Reset All Preferences" msgstr "Repor todas as preferências" -#: ../app/dialogs/preferences-dialog.c:286 +#: ../app/dialogs/preferences-dialog.c:284 msgid "Do you really want to reset all preferences to default values?" msgstr "Quer mesmo repor todas as preferências nos valores predefinidos?" -#: ../app/dialogs/preferences-dialog.c:356 +#: ../app/dialogs/preferences-dialog.c:362 msgid "You will have to restart GIMP for the following changes to take effect:" msgstr "" "Terá de reinicializar o GIMP para que as seguintes alterações tenham efeito:" -#: ../app/dialogs/preferences-dialog.c:538 +#: ../app/dialogs/preferences-dialog.c:544 msgid "" "Your keyboard shortcuts will be reset to default values the next time you " "start GIMP." @@ -9602,15 +9583,15 @@ "Os seus atalhos de teclado serão repostos nos valores predefinidos no " "próximo arranque do GIMP." -#: ../app/dialogs/preferences-dialog.c:549 +#: ../app/dialogs/preferences-dialog.c:555 msgid "Remove all Keyboard Shortcuts" msgstr "Remover todos os atalhos de teclado" -#: ../app/dialogs/preferences-dialog.c:571 +#: ../app/dialogs/preferences-dialog.c:577 msgid "Do you really want to remove all keyboard shortcuts from all menus?" msgstr "Quer mesmo remover todos os atalhos de teclado de todos os menus?" -#: ../app/dialogs/preferences-dialog.c:612 +#: ../app/dialogs/preferences-dialog.c:618 msgid "" "Your window setup will be reset to default values the next time you start " "GIMP." @@ -9618,7 +9599,7 @@ "A sua configuração de janela será reposta nos valores predefinidos no " "próximo arranque do GIMP." -#: ../app/dialogs/preferences-dialog.c:647 +#: ../app/dialogs/preferences-dialog.c:653 msgid "" "Your input device settings will be reset to default values the next time you " "start GIMP." @@ -9626,7 +9607,7 @@ "A sua configuração de dispositivos de entrada será reposta nos valores " "predefinidos no próximo arranque do GIMP." -#: ../app/dialogs/preferences-dialog.c:682 +#: ../app/dialogs/preferences-dialog.c:688 msgid "" "Your tool options will be reset to default values the next time you start " "GIMP." @@ -9634,754 +9615,764 @@ "As suas opções de ferramentas serão repostas nos valores predefinidos no " "próximo arranque do GIMP." -#: ../app/dialogs/preferences-dialog.c:1268 +#: ../app/dialogs/preferences-dialog.c:1303 msgid "Show _menubar" msgstr "_Mostrar barra de menu" -#: ../app/dialogs/preferences-dialog.c:1272 +#: ../app/dialogs/preferences-dialog.c:1307 msgid "Show _rulers" msgstr "Mostrar _réguas" -#: ../app/dialogs/preferences-dialog.c:1275 +#: ../app/dialogs/preferences-dialog.c:1310 msgid "Show scroll_bars" msgstr "Mostrar _barras de rolamento" -#: ../app/dialogs/preferences-dialog.c:1278 +#: ../app/dialogs/preferences-dialog.c:1313 msgid "Show s_tatusbar" msgstr "Mostrar barra de _estado" -#: ../app/dialogs/preferences-dialog.c:1286 +#: ../app/dialogs/preferences-dialog.c:1321 msgid "Show s_election" msgstr "Mostrar _seleção" -#: ../app/dialogs/preferences-dialog.c:1289 +#: ../app/dialogs/preferences-dialog.c:1324 msgid "Show _layer boundary" msgstr "Mostrar _limites de camada" -#: ../app/dialogs/preferences-dialog.c:1292 +#: ../app/dialogs/preferences-dialog.c:1327 msgid "Show _guides" msgstr "Mostrar _guias" -#: ../app/dialogs/preferences-dialog.c:1295 +#: ../app/dialogs/preferences-dialog.c:1330 msgid "Show gri_d" msgstr "Mostrar grel_ha" -#: ../app/dialogs/preferences-dialog.c:1301 +#: ../app/dialogs/preferences-dialog.c:1336 msgid "Canvas _padding mode:" msgstr "_Modo de espaço da tela:" -#: ../app/dialogs/preferences-dialog.c:1306 +#: ../app/dialogs/preferences-dialog.c:1341 msgid "Custom p_adding color:" msgstr "Cor de espaço personalizad_a:" -#: ../app/dialogs/preferences-dialog.c:1307 +#: ../app/dialogs/preferences-dialog.c:1342 msgid "Select Custom Canvas Padding Color" msgstr "Definir cor personalizada de espaço da tela" -#: ../app/dialogs/preferences-dialog.c:1405 +#: ../app/dialogs/preferences-dialog.c:1440 msgid "Preferences" msgstr "Preferências" -#: ../app/dialogs/preferences-dialog.c:1518 -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:1553 +#: ../app/dialogs/preferences-dialog.c:2827 msgid "Environment" msgstr "Ambiente" -#: ../app/dialogs/preferences-dialog.c:1532 +#: ../app/dialogs/preferences-dialog.c:1567 msgid "Resource Consumption" msgstr "Consumo de recursos" -#: ../app/dialogs/preferences-dialog.c:1542 +#: ../app/dialogs/preferences-dialog.c:1577 msgid "Minimal number of _undo levels:" msgstr "Número mínimo de níveis de _desfazer:" -#: ../app/dialogs/preferences-dialog.c:1545 +#: ../app/dialogs/preferences-dialog.c:1580 msgid "Maximum undo _memory:" msgstr "_Memória máxima de desfazer:" -#: ../app/dialogs/preferences-dialog.c:1548 +#: ../app/dialogs/preferences-dialog.c:1583 msgid "Tile cache _size:" msgstr "Tamanho da cache de bloco_s:" -#: ../app/dialogs/preferences-dialog.c:1551 +#: ../app/dialogs/preferences-dialog.c:1586 msgid "Maximum _new image size:" msgstr "Tamanho máximo para _novas imagens:" -#: ../app/dialogs/preferences-dialog.c:1556 +#: ../app/dialogs/preferences-dialog.c:1591 msgid "Number of _processors to use:" msgstr "Número de _processadores a usar:" #. Image Thumbnails -#: ../app/dialogs/preferences-dialog.c:1561 +#: ../app/dialogs/preferences-dialog.c:1596 msgid "Image Thumbnails" msgstr "Miniaturas de imagens" -#: ../app/dialogs/preferences-dialog.c:1566 +#: ../app/dialogs/preferences-dialog.c:1601 msgid "Size of _thumbnails:" msgstr "Tamanho das miniaturas:" -#: ../app/dialogs/preferences-dialog.c:1570 +#: ../app/dialogs/preferences-dialog.c:1605 msgid "Maximum _filesize for thumbnailing:" msgstr "Tamanho máximo do _ficheiro com miniaturas:" -#: ../app/dialogs/preferences-dialog.c:1580 +#: ../app/dialogs/preferences-dialog.c:1615 msgid "Keep record of used files in the Recent Documents list" msgstr "Manter registo dos ficheiros usados na lista de documentos recentes" -#: ../app/dialogs/preferences-dialog.c:1589 +#: ../app/dialogs/preferences-dialog.c:1624 msgid "User Interface" msgstr "Ambiente do utilizador" -#: ../app/dialogs/preferences-dialog.c:1592 +#: ../app/dialogs/preferences-dialog.c:1627 msgid "Interface" msgstr "Ambiente" -#: ../app/dialogs/preferences-dialog.c:1602 +#: ../app/dialogs/preferences-dialog.c:1637 msgid "Language" msgstr "Idioma" #. Previews -#: ../app/dialogs/preferences-dialog.c:1608 +#: ../app/dialogs/preferences-dialog.c:1643 msgid "Previews" msgstr "Antevisões" -#: ../app/dialogs/preferences-dialog.c:1611 +#: ../app/dialogs/preferences-dialog.c:1646 msgid "_Enable layer & channel previews" msgstr "_Ativar antevisões de camadas & canais" -#: ../app/dialogs/preferences-dialog.c:1617 +#: ../app/dialogs/preferences-dialog.c:1652 msgid "_Default layer & channel preview size:" msgstr "_Tamanho predefinido da antevisão de camadas e canais:" -#: ../app/dialogs/preferences-dialog.c:1620 +#: ../app/dialogs/preferences-dialog.c:1655 msgid "Na_vigation preview size:" msgstr "Tamanho da antevisão de na_vegação:" #. Keyboard Shortcuts -#: ../app/dialogs/preferences-dialog.c:1624 +#: ../app/dialogs/preferences-dialog.c:1659 msgid "Keyboard Shortcuts" msgstr "Atalhos de teclado" -#: ../app/dialogs/preferences-dialog.c:1628 +#: ../app/dialogs/preferences-dialog.c:1663 msgid "_Use dynamic keyboard shortcuts" msgstr "_Usar atalhos de teclado dinâmicos" -#: ../app/dialogs/preferences-dialog.c:1632 +#: ../app/dialogs/preferences-dialog.c:1667 msgid "Configure _Keyboard Shortcuts..." msgstr "Configurar _atalhos de teclado..." -#: ../app/dialogs/preferences-dialog.c:1639 +#: ../app/dialogs/preferences-dialog.c:1674 msgid "_Save keyboard shortcuts on exit" msgstr "Gravar atalhos de teclado ao _sair" -#: ../app/dialogs/preferences-dialog.c:1643 +#: ../app/dialogs/preferences-dialog.c:1678 msgid "Save Keyboard Shortcuts _Now" msgstr "Gravar atalhos de _teclado agora" -#: ../app/dialogs/preferences-dialog.c:1650 +#: ../app/dialogs/preferences-dialog.c:1685 msgid "_Reset Keyboard Shortcuts to Default Values" msgstr "_Repor predefinições dos atalhos de teclado" -#: ../app/dialogs/preferences-dialog.c:1659 +#: ../app/dialogs/preferences-dialog.c:1694 msgid "Remove _All Keyboard Shortcuts" msgstr "Remover todos os _atalhos de teclado" -#: ../app/dialogs/preferences-dialog.c:1671 -#: ../app/dialogs/preferences-dialog.c:1710 +#: ../app/dialogs/preferences-dialog.c:1706 +#: ../app/dialogs/preferences-dialog.c:1745 msgid "Theme" msgstr "Tema" -#: ../app/dialogs/preferences-dialog.c:1680 +#: ../app/dialogs/preferences-dialog.c:1715 msgid "Select Theme" msgstr "Selecionar tema" -#: ../app/dialogs/preferences-dialog.c:1762 +#: ../app/dialogs/preferences-dialog.c:1797 msgid "Reload C_urrent Theme" msgstr "Recarregar tema at_ual" -#: ../app/dialogs/preferences-dialog.c:1774 +#: ../app/dialogs/preferences-dialog.c:1809 msgid "Help System" msgstr "Sistema de ajuda" #. General -#: ../app/dialogs/preferences-dialog.c:1786 -#: ../app/dialogs/preferences-dialog.c:1873 -#: ../app/dialogs/preferences-dialog.c:2086 +#: ../app/dialogs/preferences-dialog.c:1821 +#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:2123 #: ../app/widgets/gimpcontrollereditor.c:185 msgid "General" msgstr "Geral" -#: ../app/dialogs/preferences-dialog.c:1789 +#: ../app/dialogs/preferences-dialog.c:1824 msgid "Show _tooltips" msgstr "Mostrar dicas das ferramen_tas" -#: ../app/dialogs/preferences-dialog.c:1792 +#: ../app/dialogs/preferences-dialog.c:1827 msgid "Show help _buttons" msgstr "Mostrar _botões de ajuda" -#: ../app/dialogs/preferences-dialog.c:1805 +#: ../app/dialogs/preferences-dialog.c:1832 msgid "Use the online version" msgstr "Usar a versão online" -#: ../app/dialogs/preferences-dialog.c:1806 +#: ../app/dialogs/preferences-dialog.c:1833 msgid "Use a locally installed copy" msgstr "Usar a cópia local instalada" -#: ../app/dialogs/preferences-dialog.c:1807 +#: ../app/dialogs/preferences-dialog.c:1834 msgid "User manual:" msgstr "Manual do utilizador:" -#: ../app/dialogs/preferences-dialog.c:1814 +#: ../app/dialogs/preferences-dialog.c:1841 msgid "There's a local installation of the user manual." msgstr "Existe uma instalação local do manual do utilizador." -#: ../app/dialogs/preferences-dialog.c:1819 +#: ../app/dialogs/preferences-dialog.c:1847 msgid "The user manual is not installed locally." msgstr "O manual do utilizador não está instalado neste computador." -#: ../app/dialogs/preferences-dialog.c:1844 +#. If there is no webkit available, assume we are on a platform +#. * that doesn't use the help browser, so don't bother showing +#. * the combo. +#. +#: ../app/dialogs/preferences-dialog.c:1860 msgid "Help Browser" msgstr "Navegador da ajuda" -#: ../app/dialogs/preferences-dialog.c:1848 +#: ../app/dialogs/preferences-dialog.c:1867 msgid "H_elp browser to use:" msgstr "Usar este navegador para a a_juda:" -#: ../app/dialogs/preferences-dialog.c:1876 +#: ../app/dialogs/preferences-dialog.c:1873 +msgid "" +"The GIMP help browser doesn't seem to be installed. Using the web browser " +"instead." +msgstr "" +"O navegador de ajuda o GIMP não parece estar instalado. Em alternativa, " +"utilize o navegador da Internet." + +#: ../app/dialogs/preferences-dialog.c:1913 msgid "_Save tool options on exit" msgstr "Gravar opções de ferramentas ao _sair" -#: ../app/dialogs/preferences-dialog.c:1880 +#: ../app/dialogs/preferences-dialog.c:1917 msgid "Save Tool Options _Now" msgstr "Gravar opções de ferrame_ntas agora" -#: ../app/dialogs/preferences-dialog.c:1887 +#: ../app/dialogs/preferences-dialog.c:1924 msgid "_Reset Saved Tool Options to Default Values" msgstr "_Repor predefinições das opções das ferramentas" #. Snapping Distance -#: ../app/dialogs/preferences-dialog.c:1897 +#: ../app/dialogs/preferences-dialog.c:1934 msgid "Guide & Grid Snapping" msgstr "Atrair às guias e à grelha" -#: ../app/dialogs/preferences-dialog.c:1902 +#: ../app/dialogs/preferences-dialog.c:1939 msgid "_Snap distance:" msgstr "_Distância de atração:" -#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:1947 msgid "Default _interpolation:" msgstr "_Interpolação predefinida:" #. Global Brush, Pattern, ... -#: ../app/dialogs/preferences-dialog.c:1917 +#: ../app/dialogs/preferences-dialog.c:1954 msgid "Paint Options Shared Between Tools" msgstr "Opções de pintura partilhadas entre ferramentas" -#: ../app/dialogs/preferences-dialog.c:1921 +#: ../app/dialogs/preferences-dialog.c:1958 msgid "_Brush" msgstr "_Pincel" -#: ../app/dialogs/preferences-dialog.c:1924 +#: ../app/dialogs/preferences-dialog.c:1961 msgid "_Dynamics" msgstr "_Dinâmicas" -#: ../app/dialogs/preferences-dialog.c:1927 +#: ../app/dialogs/preferences-dialog.c:1964 msgid "_Pattern" msgstr "_Textura" #. Move Tool -#: ../app/dialogs/preferences-dialog.c:1934 +#: ../app/dialogs/preferences-dialog.c:1971 msgid "Move Tool" msgstr "Ferramenta Mover" -#: ../app/dialogs/preferences-dialog.c:1938 +#: ../app/dialogs/preferences-dialog.c:1975 msgid "Set layer or path as active" msgstr "Tornar ativa a camada ou caminho" #. Appearance -#: ../app/dialogs/preferences-dialog.c:1963 -#: ../app/dialogs/preferences-dialog.c:2162 -#: ../app/widgets/gimpgrideditor.c:134 +#: ../app/dialogs/preferences-dialog.c:2000 +#: ../app/dialogs/preferences-dialog.c:2199 ../app/widgets/gimpgrideditor.c:134 msgid "Appearance" msgstr "Aparência" -#: ../app/dialogs/preferences-dialog.c:1967 +#: ../app/dialogs/preferences-dialog.c:2004 msgid "Show _foreground & background color" msgstr "Mostrar cores de 1º plano e de _fundo" -#: ../app/dialogs/preferences-dialog.c:1971 +#: ../app/dialogs/preferences-dialog.c:2008 msgid "Show active _brush, pattern & gradient" msgstr "Mostrar _pincel, textura & gradiente ativos" -#: ../app/dialogs/preferences-dialog.c:1975 +#: ../app/dialogs/preferences-dialog.c:2012 msgid "Show active _image" msgstr "Mostrar _imagem ativa" #. Tool Editor -#: ../app/dialogs/preferences-dialog.c:1983 +#: ../app/dialogs/preferences-dialog.c:2020 msgid "Tools configuration" msgstr "Configuração de ferramentas" -#: ../app/dialogs/preferences-dialog.c:1998 +#: ../app/dialogs/preferences-dialog.c:2035 msgid "Default New Image" msgstr "Nova imagem predefinida" -#: ../app/dialogs/preferences-dialog.c:2001 +#: ../app/dialogs/preferences-dialog.c:2038 msgid "Default Image" msgstr "Imagem predefinida" -#: ../app/dialogs/preferences-dialog.c:2035 +#: ../app/dialogs/preferences-dialog.c:2072 msgid "Set the default Quick Mask color" msgstr "Predefinir cor da máscara rápida" -#: ../app/dialogs/preferences-dialog.c:2041 +#: ../app/dialogs/preferences-dialog.c:2078 msgid "Quick Mask color:" msgstr "Cor da máscara rápida:" -#: ../app/dialogs/preferences-dialog.c:2051 +#: ../app/dialogs/preferences-dialog.c:2088 msgid "Default Image Grid" msgstr "Grelha de imagem predefinida" -#: ../app/dialogs/preferences-dialog.c:2054 +#: ../app/dialogs/preferences-dialog.c:2091 msgid "Default Grid" msgstr "Grelha predefinida" -#: ../app/dialogs/preferences-dialog.c:2074 +#: ../app/dialogs/preferences-dialog.c:2111 msgid "Image Windows" msgstr "Janelas de imagens" -#: ../app/dialogs/preferences-dialog.c:2089 +#: ../app/dialogs/preferences-dialog.c:2126 msgid "Use \"_Dot for dot\" by default" msgstr "Usar \"_Ponto por ponto\" por predefinição" -#: ../app/dialogs/preferences-dialog.c:2095 +#: ../app/dialogs/preferences-dialog.c:2132 msgid "Marching _ants speed:" msgstr "Velocidade das _formigas marchantes:" #. Zoom & Resize Behavior -#: ../app/dialogs/preferences-dialog.c:2099 +#: ../app/dialogs/preferences-dialog.c:2136 msgid "Zoom & Resize Behavior" msgstr "Comportamento de Ampliar & Redimensionar" -#: ../app/dialogs/preferences-dialog.c:2103 +#: ../app/dialogs/preferences-dialog.c:2140 msgid "Resize window on _zoom" msgstr "Redimensionar a janela ao _ampliar" -#: ../app/dialogs/preferences-dialog.c:2106 +#: ../app/dialogs/preferences-dialog.c:2143 msgid "Resize window on image _size change" msgstr "Redimensionar janela ao mudar o _tamanho da imagem" -#: ../app/dialogs/preferences-dialog.c:2112 +#: ../app/dialogs/preferences-dialog.c:2149 msgid "Fit to window" msgstr "Ajustar ao tamanho da janela" -#: ../app/dialogs/preferences-dialog.c:2114 +#: ../app/dialogs/preferences-dialog.c:2151 msgid "Initial zoom _ratio:" msgstr "_Fator de ampliação inicial:" #. Space Bar -#: ../app/dialogs/preferences-dialog.c:2118 +#: ../app/dialogs/preferences-dialog.c:2155 msgid "Space Bar" msgstr "Barra de espaço" -#: ../app/dialogs/preferences-dialog.c:2124 +#: ../app/dialogs/preferences-dialog.c:2161 msgid "_While space bar is pressed:" msgstr "_Enquanto a barra de espaço estiver premida:" #. Mouse Pointers -#: ../app/dialogs/preferences-dialog.c:2128 +#: ../app/dialogs/preferences-dialog.c:2165 msgid "Mouse Pointers" msgstr "Ponteiros do rato" -#: ../app/dialogs/preferences-dialog.c:2132 +#: ../app/dialogs/preferences-dialog.c:2169 msgid "Show _brush outline" msgstr "Mostrar contorno do _pincel" -#: ../app/dialogs/preferences-dialog.c:2135 +#: ../app/dialogs/preferences-dialog.c:2172 msgid "Show pointer for paint _tools" msgstr "Mostrar ponteiro para _ferramentas de pintura" -#: ../app/dialogs/preferences-dialog.c:2141 +#: ../app/dialogs/preferences-dialog.c:2178 msgid "Pointer _mode:" msgstr "Modo do _ponteiro:" -#: ../app/dialogs/preferences-dialog.c:2144 +#: ../app/dialogs/preferences-dialog.c:2181 msgid "Pointer re_ndering:" msgstr "_Desenho do ponteiro:" -#: ../app/dialogs/preferences-dialog.c:2147 +#: ../app/dialogs/preferences-dialog.c:2184 msgid "Pointer _handedness:" msgstr "_Arbitrariedade do ponteiro:" -#: ../app/dialogs/preferences-dialog.c:2159 +#: ../app/dialogs/preferences-dialog.c:2196 msgid "Image Window Appearance" msgstr "Aparência da janela de imagem" -#: ../app/dialogs/preferences-dialog.c:2170 +#: ../app/dialogs/preferences-dialog.c:2207 msgid "Default Appearance in Normal Mode" msgstr "Aparência predefinida em modo normal" -#: ../app/dialogs/preferences-dialog.c:2175 +#: ../app/dialogs/preferences-dialog.c:2212 msgid "Default Appearance in Fullscreen Mode" msgstr "Aparência predefinida em modo de ecrã completo" -#: ../app/dialogs/preferences-dialog.c:2184 +#: ../app/dialogs/preferences-dialog.c:2221 msgid "Image Title & Statusbar Format" msgstr "Formato do título da imagem e da barra de estado" -#: ../app/dialogs/preferences-dialog.c:2187 +#: ../app/dialogs/preferences-dialog.c:2224 msgid "Title & Status" msgstr "Título & Estado" -#: ../app/dialogs/preferences-dialog.c:2205 +#: ../app/dialogs/preferences-dialog.c:2242 msgid "Current format" msgstr "Formato atual" -#: ../app/dialogs/preferences-dialog.c:2206 +#: ../app/dialogs/preferences-dialog.c:2243 msgid "Default format" msgstr "Formato predefinido" -#: ../app/dialogs/preferences-dialog.c:2207 +#: ../app/dialogs/preferences-dialog.c:2244 msgid "Show zoom percentage" msgstr "Mostrar percentagem de ampliação" -#: ../app/dialogs/preferences-dialog.c:2208 +#: ../app/dialogs/preferences-dialog.c:2245 msgid "Show zoom ratio" msgstr "Mostrar fator de ampliação" -#: ../app/dialogs/preferences-dialog.c:2209 +#: ../app/dialogs/preferences-dialog.c:2246 msgid "Show image size" msgstr "Mostrar tamanho da imagem" -#: ../app/dialogs/preferences-dialog.c:2222 +#: ../app/dialogs/preferences-dialog.c:2259 msgid "Image Title Format" msgstr "Formato do título da imagem" -#: ../app/dialogs/preferences-dialog.c:2224 +#: ../app/dialogs/preferences-dialog.c:2261 msgid "Image Statusbar Format" msgstr "Formato da barra de estado da imagem" -#: ../app/dialogs/preferences-dialog.c:2309 +#: ../app/dialogs/preferences-dialog.c:2346 msgid "Display" msgstr "Ecrã" #. Transparency -#: ../app/dialogs/preferences-dialog.c:2321 +#: ../app/dialogs/preferences-dialog.c:2358 msgid "Transparency" msgstr "Transparência" -#: ../app/dialogs/preferences-dialog.c:2325 +#: ../app/dialogs/preferences-dialog.c:2362 msgid "_Check style:" msgstr "_Estilo do xadrez:" -#: ../app/dialogs/preferences-dialog.c:2328 +#: ../app/dialogs/preferences-dialog.c:2365 msgid "Check _size:" msgstr "_Tamanho do xadrez:" -#: ../app/dialogs/preferences-dialog.c:2331 +#: ../app/dialogs/preferences-dialog.c:2368 msgid "Monitor Resolution" msgstr "Resolução do monitor" #. Pixels -#: ../app/dialogs/preferences-dialog.c:2335 -#: ../app/display/gimpcursorview.c:208 ../app/widgets/gimpgrideditor.c:199 -#: ../app/widgets/gimpgrideditor.c:231 +#: ../app/dialogs/preferences-dialog.c:2372 ../app/display/gimpcursorview.c:208 +#: ../app/widgets/gimpgrideditor.c:199 ../app/widgets/gimpgrideditor.c:231 msgid "Pixels" msgstr "Pixels" -#: ../app/dialogs/preferences-dialog.c:2353 +#: ../app/dialogs/preferences-dialog.c:2390 msgid "Horizontal" msgstr "Horizontal" -#: ../app/dialogs/preferences-dialog.c:2355 +#: ../app/dialogs/preferences-dialog.c:2392 msgid "Vertical" msgstr "Vertical" -#: ../app/dialogs/preferences-dialog.c:2357 +#: ../app/dialogs/preferences-dialog.c:2394 #: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "PPP" -#: ../app/dialogs/preferences-dialog.c:2373 +#: ../app/dialogs/preferences-dialog.c:2410 #, c-format msgid "_Detect automatically (currently %d × %d ppi)" msgstr "_Detetar automaticamente (atualmente %d x %d PPP)" -#: ../app/dialogs/preferences-dialog.c:2391 +#: ../app/dialogs/preferences-dialog.c:2428 msgid "_Enter manually" msgstr "_Manualmente" -#: ../app/dialogs/preferences-dialog.c:2406 +#: ../app/dialogs/preferences-dialog.c:2443 msgid "C_alibrate..." msgstr "C_alibrar..." -#: ../app/dialogs/preferences-dialog.c:2434 +#: ../app/dialogs/preferences-dialog.c:2471 msgid "Color Management" msgstr "Gestão de cores" -#: ../app/dialogs/preferences-dialog.c:2454 +#: ../app/dialogs/preferences-dialog.c:2491 msgid "_RGB profile:" msgstr "Perfil de cor _RGB:" -#: ../app/dialogs/preferences-dialog.c:2455 +#: ../app/dialogs/preferences-dialog.c:2492 msgid "Select RGB Color Profile" msgstr "Selecionar o perfil de cor RGB" -#: ../app/dialogs/preferences-dialog.c:2456 +#: ../app/dialogs/preferences-dialog.c:2493 msgid "_CMYK profile:" msgstr "Perfil de cor _CMYK:" -#: ../app/dialogs/preferences-dialog.c:2457 +#: ../app/dialogs/preferences-dialog.c:2494 msgid "Select CMYK Color Profile" msgstr "Selecionar o perfil de cor CMYK" -#: ../app/dialogs/preferences-dialog.c:2458 +#: ../app/dialogs/preferences-dialog.c:2495 msgid "_Monitor profile:" msgstr "Perfil de cor do _monitor:" -#: ../app/dialogs/preferences-dialog.c:2459 +#: ../app/dialogs/preferences-dialog.c:2496 msgid "Select Monitor Color Profile" msgstr "Selecionar o perfil de cor para este monitor" -#: ../app/dialogs/preferences-dialog.c:2460 +#: ../app/dialogs/preferences-dialog.c:2497 msgid "_Print simulation profile:" msgstr "_Perfil de simulação de impressão:" -#: ../app/dialogs/preferences-dialog.c:2461 +#: ../app/dialogs/preferences-dialog.c:2498 msgid "Select Printer Color Profile" msgstr "Selecionar o perfil de cor para a impressora" -#: ../app/dialogs/preferences-dialog.c:2472 +#: ../app/dialogs/preferences-dialog.c:2509 msgid "_Mode of operation:" msgstr "_Modo de operação:" -#: ../app/dialogs/preferences-dialog.c:2502 +#: ../app/dialogs/preferences-dialog.c:2539 msgid "_Try to use the system monitor profile" msgstr "_Tentar usar o perfil do monitor de sistema" -#: ../app/dialogs/preferences-dialog.c:2512 +#: ../app/dialogs/preferences-dialog.c:2549 msgid "_Display rendering intent:" msgstr "_Finalidade de desenho do monitor:" -#: ../app/dialogs/preferences-dialog.c:2521 +#: ../app/dialogs/preferences-dialog.c:2558 msgid "_Softproof rendering intent:" msgstr "Finalidade do _desenho da prova:" -#: ../app/dialogs/preferences-dialog.c:2534 +#: ../app/dialogs/preferences-dialog.c:2571 msgid "Mark out of gamut colors" msgstr "Desmarcação de cores da gama" -#: ../app/dialogs/preferences-dialog.c:2539 +#: ../app/dialogs/preferences-dialog.c:2576 msgid "Select Warning Color" msgstr "Selecionar a cor de aviso" -#: ../app/dialogs/preferences-dialog.c:2552 +#: ../app/dialogs/preferences-dialog.c:2589 msgid "File Open behaviour:" msgstr "Comportamento ao abrir ficheiros:" -#: ../app/dialogs/preferences-dialog.c:2564 +#: ../app/dialogs/preferences-dialog.c:2601 msgid "Input Devices" msgstr "Dispositivos de entrada:" #. Extended Input Devices -#: ../app/dialogs/preferences-dialog.c:2574 +#: ../app/dialogs/preferences-dialog.c:2611 msgid "Extended Input Devices" msgstr "Dispositivos de entrada extendidos:" -#: ../app/dialogs/preferences-dialog.c:2578 +#: ../app/dialogs/preferences-dialog.c:2615 msgid "Configure E_xtended Input Devices..." msgstr "_Configurar dispositivos de entrada estendidos..." -#: ../app/dialogs/preferences-dialog.c:2585 +#: ../app/dialogs/preferences-dialog.c:2622 msgid "_Save input device settings on exit" msgstr "_Gravar definições do dispositivo de entrada ao sair" -#: ../app/dialogs/preferences-dialog.c:2589 +#: ../app/dialogs/preferences-dialog.c:2626 msgid "Save Input Device Settings _Now" msgstr "Gravar definições do dispositivo de entrada _agora" -#: ../app/dialogs/preferences-dialog.c:2596 +#: ../app/dialogs/preferences-dialog.c:2633 msgid "_Reset Saved Input Device Settings to Default Values" msgstr "_Repor as predefinições do dispositivo de entrada" -#: ../app/dialogs/preferences-dialog.c:2611 +#: ../app/dialogs/preferences-dialog.c:2648 msgid "Additional Input Controllers" msgstr "Controladores de entrada adicionais" -#: ../app/dialogs/preferences-dialog.c:2614 +#: ../app/dialogs/preferences-dialog.c:2651 msgid "Input Controllers" msgstr "Controladores de entrada" -#: ../app/dialogs/preferences-dialog.c:2630 +#: ../app/dialogs/preferences-dialog.c:2667 msgid "Window Management" msgstr "Gestão de janelas" -#: ../app/dialogs/preferences-dialog.c:2639 +#: ../app/dialogs/preferences-dialog.c:2676 msgid "Window Manager Hints" msgstr "Dicas para gestão de janelas" -#: ../app/dialogs/preferences-dialog.c:2645 +#: ../app/dialogs/preferences-dialog.c:2682 msgid "Hint for _docks and toolbox:" msgstr "Dica para _docas e caixa de ferramentas:" -#: ../app/dialogs/preferences-dialog.c:2648 +#: ../app/dialogs/preferences-dialog.c:2685 msgid "Focus" msgstr "Foco" -#: ../app/dialogs/preferences-dialog.c:2652 +#: ../app/dialogs/preferences-dialog.c:2689 msgid "Activate the _focused image" msgstr "Ativar a imagem em _foco" #. Window Positions -#: ../app/dialogs/preferences-dialog.c:2656 +#: ../app/dialogs/preferences-dialog.c:2693 msgid "Window Positions" msgstr "Posições das janelas" -#: ../app/dialogs/preferences-dialog.c:2659 +#: ../app/dialogs/preferences-dialog.c:2696 msgid "_Save window positions on exit" msgstr "_Gravar as posições das janelas ao sair" -#: ../app/dialogs/preferences-dialog.c:2663 +#: ../app/dialogs/preferences-dialog.c:2700 msgid "Save Window Positions _Now" msgstr "Gravar as _posições das janelas agora" -#: ../app/dialogs/preferences-dialog.c:2670 +#: ../app/dialogs/preferences-dialog.c:2707 msgid "_Reset Saved Window Positions to Default Values" msgstr "_Repor predefinições das posições das janelas" -#: ../app/dialogs/preferences-dialog.c:2685 +#: ../app/dialogs/preferences-dialog.c:2722 msgid "Folders" msgstr "Pastas" -#: ../app/dialogs/preferences-dialog.c:2705 +#: ../app/dialogs/preferences-dialog.c:2742 msgid "Temporary folder:" msgstr "Pasta temporária:" -#: ../app/dialogs/preferences-dialog.c:2706 +#: ../app/dialogs/preferences-dialog.c:2743 msgid "Select Folder for Temporary Files" msgstr "Selecionar pasta de ficheiros temporários" -#: ../app/dialogs/preferences-dialog.c:2710 +#: ../app/dialogs/preferences-dialog.c:2747 msgid "Swap folder:" msgstr "Pasta de troca:" -#: ../app/dialogs/preferences-dialog.c:2711 +#: ../app/dialogs/preferences-dialog.c:2748 msgid "Select Swap Folder" msgstr "Selecionar pasta de troca" -#: ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/preferences-dialog.c:2783 msgid "Brush Folders" msgstr "Pastas dos pincéis" -#: ../app/dialogs/preferences-dialog.c:2748 +#: ../app/dialogs/preferences-dialog.c:2785 msgid "Select Brush Folders" msgstr "Selecionar pastas dos pincéis" -#: ../app/dialogs/preferences-dialog.c:2750 +#: ../app/dialogs/preferences-dialog.c:2787 msgid "Dynamics Folders" msgstr "Pastas das dinâmicas" -#: ../app/dialogs/preferences-dialog.c:2752 +#: ../app/dialogs/preferences-dialog.c:2789 msgid "Select Dynamics Folders" msgstr "Selecionar pastas das dinâmicas" -#: ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/preferences-dialog.c:2791 msgid "Pattern Folders" msgstr "Pastas das texturas" -#: ../app/dialogs/preferences-dialog.c:2756 +#: ../app/dialogs/preferences-dialog.c:2793 msgid "Select Pattern Folders" msgstr "Selecionar pastas das texturas" -#: ../app/dialogs/preferences-dialog.c:2758 +#: ../app/dialogs/preferences-dialog.c:2795 msgid "Palette Folders" msgstr "Pastas das paletas" -#: ../app/dialogs/preferences-dialog.c:2760 +#: ../app/dialogs/preferences-dialog.c:2797 msgid "Select Palette Folders" msgstr "Selecionar pastas das paletas" -#: ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/preferences-dialog.c:2799 msgid "Gradient Folders" msgstr "Pastas dos gradientes" -#: ../app/dialogs/preferences-dialog.c:2764 +#: ../app/dialogs/preferences-dialog.c:2801 msgid "Select Gradient Folders" msgstr "Selecionar pastas dos gradientes" -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2803 msgid "Font Folders" msgstr "Pastas dos tipos de letra" -#: ../app/dialogs/preferences-dialog.c:2768 +#: ../app/dialogs/preferences-dialog.c:2805 msgid "Select Font Folders" msgstr "Selecionar pastas dos tipos de letra" -#: ../app/dialogs/preferences-dialog.c:2770 +#: ../app/dialogs/preferences-dialog.c:2807 msgid "Tool Preset Folders" msgstr "Pastas de predefinções de ferramenta" -#: ../app/dialogs/preferences-dialog.c:2772 +#: ../app/dialogs/preferences-dialog.c:2809 msgid "Select Tool Preset Folders" msgstr "Selecionar pastas de predefinições de ferramentas" -#: ../app/dialogs/preferences-dialog.c:2774 +#: ../app/dialogs/preferences-dialog.c:2811 msgid "Plug-In Folders" msgstr "Pastas de extensões" -#: ../app/dialogs/preferences-dialog.c:2776 +#: ../app/dialogs/preferences-dialog.c:2813 msgid "Select Plug-In Folders" msgstr "Selecionar pastas de extensões" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2815 msgid "Scripts" msgstr "Scripts" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2815 msgid "Script-Fu Folders" msgstr "Pastas de Script-Fu" -#: ../app/dialogs/preferences-dialog.c:2780 +#: ../app/dialogs/preferences-dialog.c:2817 msgid "Select Script-Fu Folders" msgstr "Selecionar pastas de Script-Fu" -#: ../app/dialogs/preferences-dialog.c:2782 +#: ../app/dialogs/preferences-dialog.c:2819 msgid "Module Folders" msgstr "Pastas de módulos" -#: ../app/dialogs/preferences-dialog.c:2784 +#: ../app/dialogs/preferences-dialog.c:2821 msgid "Select Module Folders" msgstr "Selecionar pastas de módulos" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Interpreters" msgstr "Interpretadores" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Interpreter Folders" msgstr "Pastas dos interpretadores" -#: ../app/dialogs/preferences-dialog.c:2788 +#: ../app/dialogs/preferences-dialog.c:2825 msgid "Select Interpreter Folders" msgstr "Selecionar pastas dos interpretadores" -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:2827 msgid "Environment Folders" msgstr "Pastas do ambiente" -#: ../app/dialogs/preferences-dialog.c:2792 +#: ../app/dialogs/preferences-dialog.c:2829 msgid "Select Environment Folders" msgstr "Selecionar pastas do ambiente" -#: ../app/dialogs/preferences-dialog.c:2794 +#: ../app/dialogs/preferences-dialog.c:2831 msgid "Themes" msgstr "Temas" -#: ../app/dialogs/preferences-dialog.c:2794 +#: ../app/dialogs/preferences-dialog.c:2831 msgid "Theme Folders" msgstr "Pastas dos temas" -#: ../app/dialogs/preferences-dialog.c:2796 +#: ../app/dialogs/preferences-dialog.c:2833 msgid "Select Theme Folders" msgstr "Selecionar pastas dos temas" @@ -10459,8 +10450,7 @@ msgid "Press %s to discard all changes and close all images." msgstr "Clique em %s para descartar as alterações e fechar as imagens." -#: ../app/dialogs/quit-dialog.c:341 -#: ../app/display/gimpdisplayshell-close.c:180 +#: ../app/dialogs/quit-dialog.c:341 ../app/display/gimpdisplayshell-close.c:180 msgid "_Discard Changes" msgstr "_Descartar alterações" @@ -10734,8 +10724,8 @@ msgid "Navigate the image display" msgstr "Navegar pela visualização da imagem" -#: ../app/display/gimpdisplayshell.c:746 -#: ../app/display/gimpdisplayshell.c:1331 ../app/widgets/gimptoolbox.c:253 +#: ../app/display/gimpdisplayshell.c:746 ../app/display/gimpdisplayshell.c:1331 +#: ../app/widgets/gimptoolbox.c:253 msgid "Drop image files here to open them" msgstr "Largue aqui os ficheiros para abri-los" @@ -10892,26 +10882,26 @@ msgid "Not a regular file" msgstr "Não é um ficheiro normal" -#: ../app/file/file-open.c:191 +#: ../app/file/file-open.c:197 #, c-format msgid "%s plug-in returned SUCCESS but did not return an image" msgstr "A extensão %s devolveu \"SUCESSO\", mas não devolveu uma imagem" -#: ../app/file/file-open.c:202 +#: ../app/file/file-open.c:208 #, c-format msgid "%s plug-In could not open image" msgstr "A extensão %s não pôde abrir a imagem" -#: ../app/file/file-open.c:533 +#: ../app/file/file-open.c:539 msgid "Image doesn't contain any layers" msgstr "A imagem não contém nenhuma camada" -#: ../app/file/file-open.c:593 +#: ../app/file/file-open.c:599 #, c-format msgid "Opening '%s' failed: %s" msgstr "Falha ao abrir \"%s\": %s" -#: ../app/file/file-open.c:703 +#: ../app/file/file-open.c:709 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -11434,8 +11424,7 @@ "O procedimento \"%s\" foi chamado com um valor de tipo incorreto para o " "argumento nº %d. Esperado \"%s\", obtido \"%s\"." -#: ../app/pdb/gimppdbcontext.c:89 -#: ../app/tools/gimpforegroundselectoptions.c:79 +#: ../app/pdb/gimppdbcontext.c:89 ../app/tools/gimpforegroundselectoptions.c:79 #: ../app/tools/gimpselectionoptions.c:78 msgid "Smooth edges" msgstr "Margens suaves" @@ -11621,7 +11610,7 @@ "Erro de execução no procedimento \"%s\" :\n" "%s" -#: ../app/plug-in/gimpplugin-progress.c:331 +#: ../app/plug-in/gimpplugin-progress.c:339 msgid "Cancelled" msgstr "Cancelada" @@ -12206,8 +12195,7 @@ msgid "Click to set a new clone source" msgstr "Clique para definir uma nova origem da clonagem" -#: ../app/tools/gimpclonetool.c:109 -#: ../app/tools/gimpperspectiveclonetool.c:899 +#: ../app/tools/gimpclonetool.c:109 ../app/tools/gimpperspectiveclonetool.c:899 msgid "Source" msgstr "Origem" @@ -12322,18 +12310,15 @@ msgid "Select Color" msgstr "Selecionar cor" -#: ../app/tools/gimpcolorizetool.c:241 -#: ../app/tools/gimphuesaturationtool.c:381 +#: ../app/tools/gimpcolorizetool.c:241 ../app/tools/gimphuesaturationtool.c:381 msgid "_Hue:" msgstr "_Matiz:" -#: ../app/tools/gimpcolorizetool.c:254 -#: ../app/tools/gimphuesaturationtool.c:413 +#: ../app/tools/gimpcolorizetool.c:254 ../app/tools/gimphuesaturationtool.c:413 msgid "_Saturation:" msgstr "_Saturação:" -#: ../app/tools/gimpcolorizetool.c:267 -#: ../app/tools/gimphuesaturationtool.c:397 +#: ../app/tools/gimpcolorizetool.c:267 ../app/tools/gimphuesaturationtool.c:397 msgid "_Lightness:" msgstr "_Luminosidade:" @@ -12343,8 +12328,7 @@ #: ../app/tools/gimpcoloroptions.c:157 #: ../app/tools/gimprectangleselectoptions.c:163 -#: ../app/tools/gimpselectionoptions.c:277 -#: ../app/widgets/gimpbrusheditor.c:155 +#: ../app/tools/gimpselectionoptions.c:277 ../app/widgets/gimpbrusheditor.c:155 msgid "Radius" msgstr "Raio" @@ -13062,8 +13046,7 @@ msgid "Size" msgstr "Tamanho" -#: ../app/tools/gimpinkoptions-gui.c:71 -#: ../app/tools/gimppaintoptions-gui.c:181 +#: ../app/tools/gimpinkoptions-gui.c:71 ../app/tools/gimppaintoptions-gui.c:181 #: ../app/widgets/gimpbrusheditor.c:199 msgid "Angle" msgstr "Ângulo" @@ -13073,8 +13056,7 @@ msgid "Sensitivity" msgstr "Sensibilidade" -#: ../app/tools/gimpinkoptions-gui.c:94 -#: ../app/widgets/gimpdynamicseditor.c:144 +#: ../app/tools/gimpinkoptions-gui.c:94 ../app/widgets/gimpdynamicseditor.c:144 #: ../app/widgets/gimpdynamicsoutputeditor.c:72 msgid "Tilt" msgstr "Inclinação" @@ -13378,8 +13360,8 @@ msgstr "_Pintor" #: ../app/tools/gimppaintoptions-gui.c:89 -#: ../app/tools/gimpselectionoptions.c:217 -#: ../app/widgets/gimpbrushselect.c:190 ../app/widgets/gimplayertreeview.c:268 +#: ../app/tools/gimpselectionoptions.c:217 ../app/widgets/gimpbrushselect.c:190 +#: ../app/widgets/gimplayertreeview.c:268 msgid "Mode:" msgstr "Modo:" @@ -13423,8 +13405,7 @@ msgid "Fade length" msgstr "Duração do desvanecimento" -#: ../app/tools/gimppaintoptions-gui.c:332 -#: ../app/widgets/gimpviewablebox.c:311 +#: ../app/tools/gimppaintoptions-gui.c:332 ../app/widgets/gimpviewablebox.c:311 msgid "Reverse" msgstr "Reverso" @@ -14513,8 +14494,7 @@ msgstr "Proporção" #: ../app/widgets/gimpbrusheditor.c:210 -#: ../app/widgets/gimpbrushfactoryview.c:80 -#: ../app/widgets/gimpgrideditor.c:174 +#: ../app/widgets/gimpbrushfactoryview.c:80 ../app/widgets/gimpgrideditor.c:174 msgid "Spacing" msgstr "Espaçamento" @@ -15320,15 +15300,15 @@ msgid "Height" msgstr "Altura" -#: ../app/widgets/gimphelp.c:297 +#: ../app/widgets/gimphelp.c:308 msgid "Help browser is missing" msgstr "Navegador de ajuda em falta" -#: ../app/widgets/gimphelp.c:298 +#: ../app/widgets/gimphelp.c:309 msgid "The GIMP help browser is not available." msgstr "O navegador de ajuda do GIMP não está disponível." -#: ../app/widgets/gimphelp.c:299 +#: ../app/widgets/gimphelp.c:310 msgid "" "The GIMP help browser plug-in appears to be missing from your installation. " "You may instead use the web browser for reading the help pages." @@ -15336,31 +15316,36 @@ "Parece que a extensão do navegador de ajuda do GIMP não está instalada. Em " "alternativa, pode usar o navegador web para consultar as páginas de ajuda." -#: ../app/widgets/gimphelp.c:340 +#: ../app/widgets/gimphelp.c:351 msgid "Help browser doesn't start" msgstr "O navegador de ajuda não inicia" -#: ../app/widgets/gimphelp.c:341 +#: ../app/widgets/gimphelp.c:352 msgid "Could not start the GIMP help browser plug-in." msgstr "Impossível iniciar a extensão Navegador de ajuda GIMP." -#: ../app/widgets/gimphelp.c:368 +#: ../app/widgets/gimphelp.c:354 +msgid "You may instead use the web browser for reading the help pages." +msgstr "" +"Em alternativa, pode usar o navegador web para consultar as páginas de ajuda." + +#: ../app/widgets/gimphelp.c:380 msgid "Use _Web Browser" msgstr "Use o _navegador web" -#: ../app/widgets/gimphelp.c:712 +#: ../app/widgets/gimphelp.c:724 msgid "GIMP user manual is missing" msgstr "O manual de utilizador do GIMP está em falta." -#: ../app/widgets/gimphelp.c:719 +#: ../app/widgets/gimphelp.c:731 msgid "_Read Online" msgstr "_Ler online" -#: ../app/widgets/gimphelp.c:743 +#: ../app/widgets/gimphelp.c:755 msgid "The GIMP user manual is not installed on your computer." msgstr "O manual de utilizador do GIMP não está instalado no seu computador." -#: ../app/widgets/gimphelp.c:746 +#: ../app/widgets/gimphelp.c:758 msgid "" "You may either install the additional help package or change your " "preferences to use the online version." @@ -15681,17 +15666,17 @@ msgid "%d ppi, %s" msgstr "%d ppi, %s" -#: ../app/widgets/gimptextbuffer-serialize.c:344 +#: ../app/widgets/gimptextbuffer-serialize.c:269 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "Atributo \"%s\" é inválido no elemento <%s> deste contexto" -#: ../app/widgets/gimptextbuffer-serialize.c:416 +#: ../app/widgets/gimptextbuffer-serialize.c:341 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "O elemento mais extremo no texto deve ser e não <%s> " -#: ../app/widgets/gimptextbuffer.c:1459 +#: ../app/widgets/gimptextbuffer.c:1460 #, c-format msgid "Invalid UTF-8 data in file '%s'." msgstr "Dados UTF-8 inválidos no ficheiro \"%s\"." diff -Nru gimp-2.8.18/po/rw.po gimp-2.8.20/po/rw.po --- gimp-2.8.18/po/rw.po 2015-08-20 22:57:43.000000000 +0000 +++ gimp-2.8.20/po/rw.po 2017-01-28 19:08:49.000000000 +0000 @@ -23,7 +23,6 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"ULL NAME \n" #: ../app/about.h:23 msgid "GIMP" diff -Nru gimp-2.8.18/po/sk.po gimp-2.8.20/po/sk.po --- gimp-2.8.18/po/sk.po 2015-08-20 22:57:44.000000000 +0000 +++ gimp-2.8.20/po/sk.po 2017-01-28 19:08:49.000000000 +0000 @@ -9,9 +9,10 @@ msgid "" msgstr "" "Project-Id-Version: gimp\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-05-12 05:27+0000\n" -"PO-Revision-Date: 2015-05-12 09:47+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=gimp&keywords=I18N+L10N&component=Internationalisation\n" +"POT-Creation-Date: 2017-01-15 17:07+0000\n" +"PO-Revision-Date: 2017-01-18 19:28+0100\n" "Last-Translator: Dušan Kazik \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -19,7 +20,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -"X-Generator: Poedit 1.7.5\n" +"X-Generator: Poedit 1.8.11\n" #: ../app/about.h:23 msgid "GIMP" @@ -39,30 +40,50 @@ "Autorské práva © 1995-%s\n" "Spencer Kimball, Peter Mattis a vývojársky tím GIMPu." -#: ../app/about.h:34 +#. TRANSLATORS: do not end the license URL with a dot, because it would +#. * be in the link. Because of technical limitations, make sure the URL +#. * ends with a space, a newline or is end of text. +#. * Cf. bug 762282. +#. +#: ../app/about.h:39 msgid "" -"GIMP 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.\n" +"GIMP 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.\n" "\n" -"GIMP 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.\n" +"GIMP 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.\n" "\n" -"You should have received a copy of the GNU General Public License along with GIMP. If not, see http://www.gnu.org/licenses/." +"You should have received a copy of the GNU General Public License along with " +"GIMP. If not, see: http://www.gnu.org/licenses/" msgstr "" -"GIMP je slobodný softvér; môžete ho šíriť a/alebo meniť za podmienok licencie GNU General Public License ako ju publikovala Free Software Foundation; a to buď verzie 2 alebo (podľa vášho uváženia) hociktorej neskoršej verzie.\n" +"GIMP je slobodný softvér; môžete ho šíriť a/alebo meniť za podmienok " +"licencie GNU General Public License ako ju publikovala Free Software " +"Foundation; a to buď verzie 2 alebo (podľa vášho uváženia) hociktorej " +"neskoršej verzie.\n" "\n" -"GIMP je šírený vo viere, že bude užitočný, ale BEZ AKEJKOĽVEK ZÁRUKY; dokonca aj bez implicitnej záruky OBCHODOVATEĽNOSTI či VHODNOSTI NA URČITÝ ÚČEL. Podrobnosti nájdete v GNU General Public License.\n" +"GIMP je šírený vo viere, že bude užitočný, ale BEZ AKEJKOĽVEK ZÁRUKY; " +"dokonca aj bez implicitnej záruky OBCHODOVATEĽNOSTI či VHODNOSTI NA URČITÝ " +"ÚČEL. Podrobnosti nájdete v GNU General Public License.\n" "\n" -"Spolu s programom GIMP by ste mali dostať kópiu GNU General Public License. Ak sa tak nestalo, nájdete ju na adrese http://www.gnu.org/licenses/." +"Spolu s programom GIMP by ste mali dostať kópiu GNU General Public License. " +"Ak sa tak nestalo, nájdete ju na adrese http://www.gnu.org/licenses/" #: ../app/app.c:225 #, c-format msgid "" "Unable to open a test swap file.\n" "\n" -"To avoid data loss, please check the location and permissions of the swap directory defined in your Preferences (currently \"%s\")." +"To avoid data loss, please check the location and permissions of the swap " +"directory defined in your Preferences (currently \"%s\")." msgstr "" "Nie je možné otvoriť testovací odkladací súbor.\n" "\n" -"Aby sa predišlo strate dát, skontrolujte prosím umiestnenie a oprávnenie odkladacieho priečinku definovaného vo vašich Nastaveniach (aktuálne „%s“)." +"Aby sa predišlo strate dát, skontrolujte prosím umiestnenie a oprávnenie " +"odkladacieho priečinku definovaného vo vašich Nastaveniach (aktuálne „%s“)." #: ../app/batch.c:75 #, c-format @@ -168,7 +189,9 @@ #. don't translate the mode names (never|query|always) #: ../app/main.c:240 msgid "Debug in case of a crash (never|query|always)" -msgstr "Ladenie v prípade pádu programu: never (nikdy), query (opýtať sa), always (vždy)" +msgstr "" +"Ladenie v prípade pádu programu: never (nikdy), query (opýtať sa), always " +"(vždy)" # popis voľby príkazového riadka #: ../app/main.c:245 @@ -241,13 +264,19 @@ #: ../app/sanity.c:452 #, c-format msgid "" -"The name of the directory holding the GIMP user configuration cannot be converted to UTF-8: %s\n" +"The name of the directory holding the GIMP user configuration cannot be " +"converted to UTF-8: %s\n" "\n" -"Your filesystem probably stores files in an encoding other than UTF-8 and you didn't tell GLib about this. Please set the environment variable G_FILENAME_ENCODING." +"Your filesystem probably stores files in an encoding other than UTF-8 and " +"you didn't tell GLib about this. Please set the environment variable " +"G_FILENAME_ENCODING." msgstr "" -"Názov priečinka s používateľským nastavením GIMP nie je možné previesť do kódovania UTF-8: %s\n" +"Názov priečinka s používateľským nastavením GIMP nie je možné previesť do " +"kódovania UTF-8: %s\n" "\n" -"Váš systém pravdepodobne ukladá súbory v inom kódovaní ako je UTF-8 a nepovedali ste o tom GLib. Nastavte hodnotu premenej prostredia G_FILENAME_ENCODING." +"Váš systém pravdepodobne ukladá súbory v inom kódovaní ako je UTF-8 a " +"nepovedali ste o tom GLib. Nastavte hodnotu premenej prostredia " +"G_FILENAME_ENCODING." #. show versions of libraries used by GIMP #: ../app/version.c:63 ../app/version.c:130 @@ -260,12 +289,14 @@ msgid "%s version %s" msgstr "%s verzie %s" -#: ../app/actions/actions.c:109 ../app/dialogs/dialogs.c:388 ../app/widgets/gimpbrusheditor.c:88 +#: ../app/actions/actions.c:109 ../app/dialogs/dialogs.c:388 +#: ../app/widgets/gimpbrusheditor.c:88 msgid "Brush Editor" msgstr "Editor štetcov" #. initialize the list of gimp brushes -#: ../app/actions/actions.c:112 ../app/core/gimp.c:951 ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2746 +#: ../app/actions/actions.c:112 ../app/core/gimp.c:951 +#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2783 msgid "Brushes" msgstr "Štetce" @@ -277,7 +308,8 @@ msgid "Channels" msgstr "Kanály" -#: ../app/actions/actions.c:121 ../app/dialogs/convert-dialog.c:174 ../app/dialogs/dialogs.c:354 +#: ../app/actions/actions.c:121 ../app/dialogs/convert-dialog.c:174 +#: ../app/dialogs/dialogs.c:354 msgid "Colormap" msgstr "Mapa farieb" @@ -310,7 +342,8 @@ msgstr "Dokovateľný" #. Document History -#: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:329 ../app/dialogs/preferences-dialog.c:1577 +#: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:329 +#: ../app/dialogs/preferences-dialog.c:1612 msgid "Document History" msgstr "História dokumentov" @@ -323,7 +356,8 @@ msgid "Paint Dynamics" msgstr "Dynamika maľby" -#: ../app/actions/actions.c:154 ../app/dialogs/dialogs.c:392 ../app/widgets/gimpdynamicseditor.c:92 +#: ../app/actions/actions.c:154 ../app/dialogs/dialogs.c:392 +#: ../app/widgets/gimpdynamicseditor.c:92 msgid "Paint Dynamics Editor" msgstr "Editor dynamiky maľby" @@ -339,24 +373,29 @@ msgid "File" msgstr "Súbor" -#: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:325 ../app/dialogs/preferences-dialog.c:2766 +#: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:325 +#: ../app/dialogs/preferences-dialog.c:2803 msgid "Fonts" msgstr "Písma" -#: ../app/actions/actions.c:169 ../app/dialogs/dialogs.c:396 ../app/widgets/gimpgradienteditor.c:269 +#: ../app/actions/actions.c:169 ../app/dialogs/dialogs.c:396 +#: ../app/widgets/gimpgradienteditor.c:269 msgid "Gradient Editor" msgstr "Editor prechodu" #. initialize the list of gimp gradients -#: ../app/actions/actions.c:172 ../app/core/gimp.c:971 ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2762 +#: ../app/actions/actions.c:172 ../app/core/gimp.c:971 +#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2799 msgid "Gradients" msgstr "Prechody" -#: ../app/actions/actions.c:175 ../app/core/gimp.c:983 ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2770 +#: ../app/actions/actions.c:175 ../app/core/gimp.c:983 +#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2807 msgid "Tool Presets" msgstr "Predvoľby nástroja" -#: ../app/actions/actions.c:178 ../app/dialogs/dialogs.c:404 ../app/widgets/gimptoolpreseteditor.c:92 +#: ../app/actions/actions.c:178 ../app/dialogs/dialogs.c:404 +#: ../app/widgets/gimptoolpreseteditor.c:92 msgid "Tool Preset Editor" msgstr "Editor predvolieb nástroja" @@ -373,30 +412,35 @@ msgid "Images" msgstr "Obrázky" -#: ../app/actions/actions.c:190 ../app/dialogs/dialogs.c:342 ../app/dialogs/resize-dialog.c:287 +#: ../app/actions/actions.c:190 ../app/dialogs/dialogs.c:342 +#: ../app/dialogs/resize-dialog.c:287 msgid "Layers" msgstr "Vrstvy" -#: ../app/actions/actions.c:193 ../app/dialogs/dialogs.c:400 ../app/widgets/gimppaletteeditor.c:148 +#: ../app/actions/actions.c:193 ../app/dialogs/dialogs.c:400 +#: ../app/widgets/gimppaletteeditor.c:148 msgid "Palette Editor" msgstr "Editor palety" #. initialize the list of gimp palettes -#: ../app/actions/actions.c:196 ../app/core/gimp.c:966 ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2758 +#: ../app/actions/actions.c:196 ../app/core/gimp.c:966 +#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2795 msgid "Palettes" msgstr "Palety" #. initialize the list of gimp patterns -#: ../app/actions/actions.c:199 ../app/core/gimp.c:961 ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2754 +#: ../app/actions/actions.c:199 ../app/core/gimp.c:961 +#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2791 msgid "Patterns" msgstr "Vzory" -#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2774 +#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2811 msgid "Plug-Ins" msgstr "Zásuvné moduly" #. Quick Mask Color -#: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:386 ../app/dialogs/preferences-dialog.c:2032 +#: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:386 +#: ../app/dialogs/preferences-dialog.c:2069 msgid "Quick Mask" msgstr "Rýchla maska" @@ -409,7 +453,8 @@ msgstr "Výber" #. initialize the template list -#: ../app/actions/actions.c:214 ../app/core/gimp.c:989 ../app/dialogs/dialogs.c:331 +#: ../app/actions/actions.c:214 ../app/core/gimp.c:989 +#: ../app/dialogs/dialogs.c:331 msgid "Templates" msgstr "Šablóny" @@ -421,7 +466,8 @@ msgid "Text Editor" msgstr "Editor textu" -#: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:298 ../app/dialogs/preferences-dialog.c:1861 ../app/gui/gui.c:436 +#: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:298 +#: ../app/dialogs/preferences-dialog.c:1898 ../app/gui/gui.c:464 msgid "Tool Options" msgstr "Nastavenia nástrojov" @@ -429,7 +475,8 @@ msgid "Tools" msgstr "Nástroje" -#: ../app/actions/actions.c:229 ../app/dialogs/dialogs.c:350 ../app/tools/gimpvectortool.c:160 +#: ../app/actions/actions.c:229 ../app/dialogs/dialogs.c:350 +#: ../app/tools/gimpvectortool.c:160 msgid "Paths" msgstr "Cesty" @@ -764,11 +811,14 @@ msgid "_Fill opacity:" msgstr "Krytie _výplne:" -#: ../app/actions/channels-commands.c:116 ../app/core/gimpchannel.c:272 ../app/widgets/gimpchanneltreeview.c:331 +#: ../app/actions/channels-commands.c:116 ../app/core/gimpchannel.c:272 +#: ../app/widgets/gimpchanneltreeview.c:331 msgid "Channel" msgstr "Kanál" -#: ../app/actions/channels-commands.c:117 ../app/actions/channels-commands.c:159 ../app/widgets/gimpchanneltreeview.c:326 +#: ../app/actions/channels-commands.c:117 +#: ../app/actions/channels-commands.c:159 +#: ../app/widgets/gimpchanneltreeview.c:326 msgid "New Channel" msgstr "Nový kanál" @@ -780,7 +830,10 @@ msgid "New Channel Color" msgstr "Nový kanál farieb" -#: ../app/actions/channels-commands.c:244 ../app/core/gimpimage-new.c:257 ../app/display/gimpdisplayshell-dnd.c:646 ../app/widgets/gimpchanneltreeview.c:258 ../app/widgets/gimplayertreeview.c:776 +#: ../app/actions/channels-commands.c:244 ../app/core/gimpimage-new.c:257 +#: ../app/display/gimpdisplayshell-dnd.c:646 +#: ../app/widgets/gimpchanneltreeview.c:258 +#: ../app/widgets/gimplayertreeview.c:776 #, c-format msgid "%s Channel Copy" msgstr "Kópia kanálu %s" @@ -986,8 +1039,14 @@ msgid "Use the composite color of all visible layers" msgstr "Použije farbu zmiešanú zo vzoriek všetkých viditeľných vrstiev" -#: ../app/actions/data-commands.c:89 ../app/actions/documents-commands.c:344 ../app/actions/file-commands.c:201 ../app/dialogs/file-open-dialog.c:220 ../app/dialogs/file-open-dialog.c:265 ../app/dialogs/file-open-location-dialog.c:213 -#: ../app/dialogs/file-open-location-dialog.c:225 ../app/display/gimpdisplayshell-dnd.c:592 ../app/widgets/gimplayertreeview.c:736 ../app/widgets/gimptoolbox-dnd.c:168 ../app/widgets/gimptoolbox.c:817 +#: ../app/actions/data-commands.c:89 ../app/actions/documents-commands.c:344 +#: ../app/actions/file-commands.c:201 ../app/dialogs/file-open-dialog.c:220 +#: ../app/dialogs/file-open-dialog.c:265 +#: ../app/dialogs/file-open-location-dialog.c:213 +#: ../app/dialogs/file-open-location-dialog.c:225 +#: ../app/display/gimpdisplayshell-dnd.c:592 +#: ../app/widgets/gimplayertreeview.c:736 ../app/widgets/gimptoolbox-dnd.c:168 +#: ../app/widgets/gimptoolbox.c:817 #, c-format msgid "" "Opening '%s' failed:\n" @@ -998,8 +1057,11 @@ "\n" "%s" -#: ../app/actions/data-commands.c:118 ../app/actions/tool-options-commands.c:72 ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1529 ../app/core/gimppalette-import.c:211 ../app/core/gimppalette-load.c:224 ../app/core/gimppalette.c:399 -#: ../app/dialogs/palette-import-dialog.c:771 ../app/widgets/gimpdnd-xds.c:94 +#: ../app/actions/data-commands.c:118 ../app/actions/tool-options-commands.c:72 +#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1529 +#: ../app/core/gimppalette-import.c:211 ../app/core/gimppalette-load.c:224 +#: ../app/core/gimppalette.c:399 ../app/dialogs/palette-import-dialog.c:771 +#: ../app/widgets/gimpdnd-xds.c:94 msgid "Untitled" msgstr "Bez názvu" @@ -1394,7 +1456,8 @@ msgid "_About" msgstr "_O programe" -#: ../app/actions/dialogs-actions.c:333 ../app/dialogs/preferences-dialog.c:1951 ../app/widgets/gimptoolbox.c:539 +#: ../app/actions/dialogs-actions.c:333 +#: ../app/dialogs/preferences-dialog.c:1988 ../app/widgets/gimptoolbox.c:539 msgid "Toolbox" msgstr "Sada nástrojov" @@ -1725,8 +1788,12 @@ msgstr "Vymazať celú históriu dokumentov?" #: ../app/actions/documents-commands.c:218 -msgid "Clearing the document history will permanently remove all images from the recent documents list." -msgstr "Vymazanie histórie dokumentov, navždy odstráni všetky položky zo zoznamu nedávnych dokumentov." +msgid "" +"Clearing the document history will permanently remove all images from the " +"recent documents list." +msgstr "" +"Vymazanie histórie dokumentov, navždy odstráni všetky položky zo zoznamu " +"nedávnych dokumentov." # PM: pôvodne som chcel vyrovnanie kontrastu ale vraj to nie je dobre #: ../app/actions/drawable-actions.c:45 @@ -2166,7 +2233,8 @@ #: ../app/actions/edit-actions.c:173 msgctxt "edit-action" msgid "Copy what is visible in the selected region to a named buffer" -msgstr "Skopíruje to, čo je viditeľné vo vybranej oblasti, do pomenovanej schránky" +msgstr "" +"Skopíruje to, čo je viditeľné vo vybranej oblasti, do pomenovanej schránky" #: ../app/actions/edit-actions.c:178 msgctxt "edit-action" @@ -2277,11 +2345,13 @@ msgstr "Pixely kopírované do schránky" # upozornenie -#: ../app/actions/edit-commands.c:325 ../app/actions/edit-commands.c:360 ../app/actions/edit-commands.c:543 +#: ../app/actions/edit-commands.c:325 ../app/actions/edit-commands.c:360 +#: ../app/actions/edit-commands.c:543 msgid "There is no image data in the clipboard to paste." msgstr "V schránke nie je žiadny obrázok, ktorý by sa dal vložiť." -#: ../app/actions/edit-commands.c:348 ../app/core/gimpbrushclipboard.c:172 ../app/core/gimppatternclipboard.c:172 ../app/widgets/gimpclipboard.c:345 +#: ../app/actions/edit-commands.c:348 ../app/core/gimpbrushclipboard.c:172 +#: ../app/core/gimppatternclipboard.c:172 ../app/widgets/gimpclipboard.c:345 msgid "Clipboard" msgstr "Schránka" @@ -2290,7 +2360,8 @@ msgid "Cut Named" msgstr "Vystrihnúť do pomenovanej schránky" -#: ../app/actions/edit-commands.c:377 ../app/actions/edit-commands.c:418 ../app/actions/edit-commands.c:438 +#: ../app/actions/edit-commands.c:377 ../app/actions/edit-commands.c:418 +#: ../app/actions/edit-commands.c:438 msgid "Enter a name for this buffer" msgstr "Zadajte názov tejto schránky" @@ -2309,7 +2380,8 @@ msgid "There is no active layer or channel to cut from." msgstr "Nie je aktívna vrstva ani kanál na vystrihnutie." -#: ../app/actions/edit-commands.c:565 ../app/actions/edit-commands.c:597 ../app/actions/edit-commands.c:621 +#: ../app/actions/edit-commands.c:565 ../app/actions/edit-commands.c:597 +#: ../app/actions/edit-commands.c:621 msgid "(Unnamed Buffer)" msgstr "(Schránka bez názvu)" @@ -2507,8 +2579,12 @@ # tooltip #: ../app/actions/file-actions.c:135 msgctxt "file-action" -msgid "Save a copy of this image, without affecting the source file (if any) or the current state of the image" -msgstr "Uloží kópiu tohto obrázka bez ovplyvnenia pôvodného súboru (ak existuje) alebo aktuálneho stavu obrázka" +msgid "" +"Save a copy of this image, without affecting the source file (if any) or the " +"current state of the image" +msgstr "" +"Uloží kópiu tohto obrázka bez ovplyvnenia pôvodného súboru (ak existuje) " +"alebo aktuálneho stavu obrázka" #: ../app/actions/file-actions.c:140 msgctxt "file-action" @@ -2570,7 +2646,8 @@ msgstr "Exportovať" # titulok dialógového okna -#: ../app/actions/file-commands.c:119 ../app/actions/file-commands.c:497 ../app/dialogs/file-open-dialog.c:77 +#: ../app/actions/file-commands.c:119 ../app/actions/file-commands.c:497 +#: ../app/dialogs/file-open-dialog.c:77 msgid "Open Image" msgstr "Otvoriť obrázok" @@ -2585,7 +2662,8 @@ msgstr "Žiadne zmeny na uloženie" # titulok dialógového okna -#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:701 ../app/dialogs/file-save-dialog.c:103 +#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:703 +#: ../app/dialogs/file-save-dialog.c:103 msgid "Save Image" msgstr "Uloženie obrázka" @@ -2605,7 +2683,8 @@ #: ../app/actions/file-commands.c:405 msgid "Revert failed. No file name associated with this image." -msgstr "Vrátenie zlyhalo. K tomuto obrázku nie je priradený žiadny názov súboru." +msgstr "" +"Vrátenie zlyhalo. K tomuto obrázku nie je priradený žiadny názov súboru." # titulok dialógového okna #: ../app/actions/file-commands.c:417 @@ -2618,14 +2697,18 @@ msgstr "Vrátiť „%s“ na „%s“?" #: ../app/actions/file-commands.c:449 -msgid "By reverting the image to the state saved on disk, you will lose all changes, including all undo information." -msgstr "Vrátením obrázka na stav uložený na disku stratíte všetky zmeny, vrátane všetkých informácií pre vrátenie operácií." +msgid "" +"By reverting the image to the state saved on disk, you will lose all " +"changes, including all undo information." +msgstr "" +"Vrátením obrázka na stav uložený na disku stratíte všetky zmeny, vrátane " +"všetkých informácií pre vrátenie operácií." -#: ../app/actions/file-commands.c:731 +#: ../app/actions/file-commands.c:733 msgid "(Unnamed Template)" msgstr "(Šablóna bez názvu)" -#: ../app/actions/file-commands.c:782 +#: ../app/actions/file-commands.c:784 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -2723,12 +2806,14 @@ msgid "_Right Endpoint" msgstr "P_ravý koncový bod" -#: ../app/actions/gradient-editor-actions.c:165 ../app/actions/gradient-editor-actions.c:213 +#: ../app/actions/gradient-editor-actions.c:165 +#: ../app/actions/gradient-editor-actions.c:213 msgctxt "gradient-editor-action" msgid "_Foreground Color" msgstr "Farba po_predia" -#: ../app/actions/gradient-editor-actions.c:170 ../app/actions/gradient-editor-actions.c:218 +#: ../app/actions/gradient-editor-actions.c:170 +#: ../app/actions/gradient-editor-actions.c:218 msgctxt "gradient-editor-action" msgid "_Background Color" msgstr "Farba po_zadia" @@ -2744,31 +2829,36 @@ msgstr "Ľ_avý koncový bod" # Typ farby strany prechodu -#: ../app/actions/gradient-editor-actions.c:257 ../app/actions/gradient-editor-actions.c:287 +#: ../app/actions/gradient-editor-actions.c:257 +#: ../app/actions/gradient-editor-actions.c:287 msgctxt "gradient-editor-color-type" msgid "_Fixed" msgstr "_Nemenný" # Typ farby strany prechodu -#: ../app/actions/gradient-editor-actions.c:262 ../app/actions/gradient-editor-actions.c:292 +#: ../app/actions/gradient-editor-actions.c:262 +#: ../app/actions/gradient-editor-actions.c:292 msgctxt "gradient-editor-color-type" msgid "F_oreground Color" msgstr "Farba _popredia" # Typ farby strany prechodu -#: ../app/actions/gradient-editor-actions.c:268 ../app/actions/gradient-editor-actions.c:298 +#: ../app/actions/gradient-editor-actions.c:268 +#: ../app/actions/gradient-editor-actions.c:298 msgctxt "gradient-editor-color-type" msgid "Fo_reground Color (Transparent)" msgstr "Farba pop_redia (priehľadná)" # Typ farby strany prechodu -#: ../app/actions/gradient-editor-actions.c:273 ../app/actions/gradient-editor-actions.c:303 +#: ../app/actions/gradient-editor-actions.c:273 +#: ../app/actions/gradient-editor-actions.c:303 msgctxt "gradient-editor-color-type" msgid "_Background Color" msgstr "Farba po_zadia" # Typ farby strany prechodu -#: ../app/actions/gradient-editor-actions.c:279 ../app/actions/gradient-editor-actions.c:309 +#: ../app/actions/gradient-editor-actions.c:279 +#: ../app/actions/gradient-editor-actions.c:309 msgctxt "gradient-editor-color-type" msgid "B_ackground Color (Transparent)" msgstr "Farba poz_adia (priehľadná)" @@ -2842,7 +2932,8 @@ msgstr "Zväčšiť" # tooltip -#: ../app/actions/gradient-editor-actions.c:374 ../app/actions/palette-editor-actions.c:89 +#: ../app/actions/gradient-editor-actions.c:374 +#: ../app/actions/palette-editor-actions.c:89 msgid "Zoom in" msgstr "Zväčší" @@ -2851,7 +2942,8 @@ msgstr "Zmenšiť" # tooltip -#: ../app/actions/gradient-editor-actions.c:380 ../app/actions/palette-editor-actions.c:95 +#: ../app/actions/gradient-editor-actions.c:380 +#: ../app/actions/palette-editor-actions.c:95 msgid "Zoom out" msgstr "Zmenší" @@ -2859,7 +2951,8 @@ msgid "Zoom All" msgstr "Zobraziť všetko" -#: ../app/actions/gradient-editor-actions.c:386 ../app/actions/palette-editor-actions.c:101 +#: ../app/actions/gradient-editor-actions.c:386 +#: ../app/actions/palette-editor-actions.c:101 msgid "Zoom all" msgstr "Zobrazí všetko" @@ -3417,7 +3510,8 @@ msgid "Set Image Canvas Size" msgstr "Nastaviť veľkosť plátna obrázka" -#: ../app/actions/image-commands.c:266 ../app/actions/image-commands.c:290 ../app/actions/image-commands.c:594 +#: ../app/actions/image-commands.c:266 ../app/actions/image-commands.c:290 +#: ../app/actions/image-commands.c:594 msgid "Resizing" msgstr "Zmena veľkosti" @@ -3427,12 +3521,16 @@ msgstr "Nastaviť rozlíšenie tlače obrázka" # indikátor priebehu -#: ../app/actions/image-commands.c:379 ../app/pdb/drawable-transform-cmds.c:159 ../app/pdb/drawable-transform-cmds.c:247 ../app/pdb/item-transform-cmds.c:162 +#: ../app/actions/image-commands.c:379 ../app/pdb/drawable-transform-cmds.c:159 +#: ../app/pdb/drawable-transform-cmds.c:247 +#: ../app/pdb/item-transform-cmds.c:162 msgid "Flipping" msgstr "Preklápa sa" # indikátor priebehu -#: ../app/actions/image-commands.c:403 ../app/pdb/drawable-transform-cmds.c:602 ../app/pdb/drawable-transform-cmds.c:694 ../app/pdb/image-cmds.c:534 ../app/pdb/item-transform-cmds.c:433 ../app/pdb/transform-tools-cmds.c:245 +#: ../app/actions/image-commands.c:403 ../app/pdb/drawable-transform-cmds.c:602 +#: ../app/pdb/drawable-transform-cmds.c:694 ../app/pdb/image-cmds.c:534 +#: ../app/pdb/item-transform-cmds.c:433 ../app/pdb/transform-tools-cmds.c:245 #: ../app/tools/gimprotatetool.c:125 msgid "Rotating" msgstr "Otáča sa" @@ -3452,8 +3550,13 @@ # indikátor priebehu #. Scaling -#: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 ../app/dialogs/preferences-dialog.c:1906 ../app/pdb/drawable-transform-cmds.c:783 ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 -#: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524 ../app/pdb/layer-cmds.c:330 ../app/pdb/layer-cmds.c:375 ../app/pdb/transform-tools-cmds.c:334 ../app/tools/gimpscaletool.c:118 +#: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 +#: ../app/dialogs/preferences-dialog.c:1943 +#: ../app/pdb/drawable-transform-cmds.c:783 +#: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 +#: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524 +#: ../app/pdb/layer-cmds.c:330 ../app/pdb/layer-cmds.c:375 +#: ../app/pdb/transform-tools-cmds.c:334 ../app/tools/gimpscaletool.c:118 msgid "Scaling" msgstr "Mení sa mierka" @@ -4051,7 +4154,9 @@ msgstr "Vrstva" # titulok dialógového okna (okrem iného) -#: ../app/actions/layers-commands.c:252 ../app/actions/layers-commands.c:320 ../app/widgets/gimpdrawabletreeview.c:326 ../app/widgets/gimplayertreeview.c:837 +#: ../app/actions/layers-commands.c:252 ../app/actions/layers-commands.c:320 +#: ../app/widgets/gimpdrawabletreeview.c:326 +#: ../app/widgets/gimplayertreeview.c:837 msgid "New Layer" msgstr "Nová vrstva" @@ -4082,7 +4187,8 @@ msgid "Please select a channel first" msgstr "Prosím, vyberte najprv kanál" -#: ../app/actions/layers-commands.c:1088 ../app/dialogs/layer-add-mask-dialog.c:82 +#: ../app/actions/layers-commands.c:1088 +#: ../app/dialogs/layer-add-mask-dialog.c:82 msgid "Add Layer Mask" msgstr "Pridať masku vrstvy" @@ -4516,7 +4622,8 @@ #: ../app/actions/plug-in-commands.c:281 msgid "Do you really want to reset all filters to default values?" -msgstr "Skutočne chcete obnoviť nastavenia všetkých filtrov na štandardné hodnoty?" +msgstr "" +"Skutočne chcete obnoviť nastavenia všetkých filtrov na štandardné hodnoty?" # názov ponuky #: ../app/actions/quick-mask-actions.c:43 @@ -4778,7 +4885,9 @@ msgid "_Lock selection to image edges" msgstr "_Uzamknúť výber k okrajom obrázka" -#: ../app/actions/select-commands.c:345 ../app/actions/select-commands.c:378 ../app/actions/vectors-commands.c:386 ../app/actions/vectors-commands.c:420 ../app/dialogs/stroke-dialog.c:281 +#: ../app/actions/select-commands.c:345 ../app/actions/select-commands.c:378 +#: ../app/actions/vectors-commands.c:386 ../app/actions/vectors-commands.c:420 +#: ../app/dialogs/stroke-dialog.c:281 msgid "There is no active layer or channel to stroke to." msgstr "Neexistuje aktívna vrstva alebo kanál na obtiahnutie." @@ -4858,7 +4967,8 @@ msgstr "Vytvoriť novú šablónu" # Titulok dialógového okna -#: ../app/actions/templates-commands.c:173 ../app/actions/templates-commands.c:176 +#: ../app/actions/templates-commands.c:173 +#: ../app/actions/templates-commands.c:176 msgid "Edit Template" msgstr "Upraviť šablónu" @@ -4869,7 +4979,8 @@ #: ../app/actions/templates-commands.c:237 #, c-format -msgid "Are you sure you want to delete template '%s' from the list and from disk?" +msgid "" +"Are you sure you want to delete template '%s' from the list and from disk?" msgstr "Skutočne chcete odstrániť šablónu „%s“ zo zoznamu aj z disku?" #: ../app/actions/text-editor-actions.c:43 @@ -4917,13 +5028,21 @@ msgstr "Nastaví smer textu zprava doľava" # titulok dialógového okna -#: ../app/actions/text-editor-commands.c:62 ../app/actions/text-tool-commands.c:117 +#: ../app/actions/text-editor-commands.c:62 +#: ../app/actions/text-tool-commands.c:117 msgid "Open Text File (UTF-8)" msgstr "Otvoriť textový súbor (UTF-8)" -#: ../app/actions/text-editor-commands.c:143 ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58 ../app/core/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:443 ../app/core/gimpbrushgenerated-load.c:73 -#: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54 ../app/core/gimpgradient-load.c:63 ../app/core/gimppalette-load.c:77 ../app/core/gimppalette-load.c:274 ../app/core/gimppalette-load.c:320 ../app/core/gimppalette-load.c:377 -#: ../app/core/gimppalette-load.c:467 ../app/core/gimppalette-load.c:634 ../app/core/gimppattern-load.c:76 ../app/tools/gimpcurvestool.c:642 ../app/tools/gimplevelstool.c:747 ../app/xcf/xcf.c:359 +#: ../app/actions/text-editor-commands.c:143 +#: ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58 +#: ../app/core/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:443 +#: ../app/core/gimpbrushgenerated-load.c:73 ../app/core/gimpbrushpipe-load.c:81 +#: ../app/core/gimpcurve-load.c:54 ../app/core/gimpgradient-load.c:63 +#: ../app/core/gimppalette-load.c:77 ../app/core/gimppalette-load.c:274 +#: ../app/core/gimppalette-load.c:320 ../app/core/gimppalette-load.c:377 +#: ../app/core/gimppalette-load.c:467 ../app/core/gimppalette-load.c:634 +#: ../app/core/gimppattern-load.c:76 ../app/tools/gimpcurvestool.c:658 +#: ../app/tools/gimplevelstool.c:747 ../app/xcf/xcf.c:359 #, c-format msgid "Could not open '%s' for reading: %s" msgstr "Nebolo možné otvoriť „%s“ na čítanie: %s" @@ -5067,7 +5186,8 @@ #: ../app/actions/tool-options-commands.c:209 msgid "Do you really want to reset all tool options to default values?" -msgstr "Skutočne chcete vynulovať všetky nastavenia nástrojov na predvolené hodnoty?" +msgstr "" +"Skutočne chcete vynulovať všetky nastavenia nástrojov na predvolené hodnoty?" # názov ponuky #: ../app/actions/tool-presets-actions.c:44 @@ -5465,7 +5585,8 @@ msgstr "Upraviť atribúty cesty" # titulok dialógového okna (okrem iného) -#: ../app/actions/vectors-commands.c:164 ../app/vectors/gimpvectors.c:207 ../app/widgets/gimpvectorstreeview.c:250 +#: ../app/actions/vectors-commands.c:164 ../app/vectors/gimpvectors.c:207 +#: ../app/widgets/gimpvectorstreeview.c:250 msgid "Path" msgstr "Cesta" @@ -5478,7 +5599,8 @@ msgstr "Voľby novej cesty" # titulok dialógového okna (okrem iného) -#: ../app/actions/vectors-commands.c:392 ../app/tools/gimpvectoroptions.c:199 ../app/tools/gimpvectortool.c:1975 +#: ../app/actions/vectors-commands.c:392 ../app/tools/gimpvectoroptions.c:199 +#: ../app/tools/gimpvectortool.c:1975 msgid "Stroke Path" msgstr "Obtiahnuť cestu" @@ -6056,8 +6178,10 @@ # tooltip #: ../app/actions/windows-actions.c:116 msgctxt "windows-action" -msgid "When enabled docks and other dialogs are hidden, leaving only image windows." -msgstr "Keď je zapnuté, doky a ostatné okná sú skryté, zostane iba okno obrázka." +msgid "" +"When enabled docks and other dialogs are hidden, leaving only image windows." +msgstr "" +"Keď je zapnuté, doky a ostatné okná sú skryté, zostane iba okno obrázka." #: ../app/actions/windows-actions.c:122 msgctxt "windows-action" @@ -6277,11 +6401,15 @@ #: ../app/base/tile-swap.c:710 msgid "" -"Unable to open swap file. GIMP has run out of memory and cannot use the swap file. Some parts of your images may be corrupted. Try to save your work using different filenames, restart GIMP and check the location of the swap directory in your " -"Preferences." +"Unable to open swap file. GIMP has run out of memory and cannot use the swap " +"file. Some parts of your images may be corrupted. Try to save your work " +"using different filenames, restart GIMP and check the location of the swap " +"directory in your Preferences." msgstr "" -"Nie je možné otvoriť odkladací súbor (swap). Programu GIMP sa minula pamäť a nemôže použiť odkladací súbor. Niektoré časti vašich obrázok môžu byť poškodené. Skúste uložiť svoju prácu s inými názvami súborov, spustiť znovu GIMP a skontrolovať " -"nastavenie odkladacieho adresára v Nastaveniach." +"Nie je možné otvoriť odkladací súbor (swap). Programu GIMP sa minula pamäť a " +"nemôže použiť odkladací súbor. Niektoré časti vašich obrázok môžu byť " +"poškodené. Skúste uložiť svoju prácu s inými názvami súborov, spustiť znovu " +"GIMP a skontrolovať nastavenie odkladacieho adresára v Nastaveniach." #: ../app/base/tile-swap.c:725 #, c-format @@ -6412,8 +6540,12 @@ msgid "Right-handed" msgstr "Pre pravákov" -#: ../app/config/gimpconfig-file.c:67 ../app/core/gimpbrushgenerated-save.c:62 ../app/core/gimpcurve-save.c:52 ../app/core/gimpgradient-save.c:50 ../app/core/gimpgradient-save.c:144 ../app/core/gimppalette-save.c:56 ../app/gui/themes.c:248 -#: ../app/tools/gimpcurvestool.c:695 ../app/tools/gimplevelstool.c:800 ../app/vectors/gimpvectors-export.c:81 ../app/xcf/xcf.c:452 +#: ../app/config/gimpconfig-file.c:67 ../app/core/gimpbrushgenerated-save.c:62 +#: ../app/core/gimpcurve-save.c:52 ../app/core/gimpgradient-save.c:50 +#: ../app/core/gimpgradient-save.c:144 ../app/core/gimppalette-save.c:56 +#: ../app/gui/themes.c:248 ../app/tools/gimpcurvestool.c:711 +#: ../app/tools/gimplevelstool.c:800 ../app/vectors/gimpvectors-export.c:81 +#: ../app/xcf/xcf.c:452 #, c-format msgid "Could not open '%s' for writing: %s" msgstr "Nepodarilo sa otvoriť „%s“ na zápis: %s" @@ -6430,8 +6562,12 @@ #: ../app/config/gimpconfig-file.c:131 #, c-format -msgid "There was an error parsing your '%s' file. Default values will be used. A backup of your configuration has been created at '%s'." -msgstr "Vyskytla sa chyba počas analyzovania vášho súboru „%s“. Použijú sa predvolené hodnoty. Bola vytvorená záloha vašej konfigurácie v „%s“." +msgid "" +"There was an error parsing your '%s' file. Default values will be used. A " +"backup of your configuration has been created at '%s'." +msgstr "" +"Vyskytla sa chyba počas analyzovania vášho súboru „%s“. Použijú sa " +"predvolené hodnoty. Bola vytvorená záloha vašej konfigurácie v „%s“." # tooltip #. Not all strings defined here are used in the user interface @@ -6439,8 +6575,14 @@ #. * be marked for translation. #. #: ../app/config/gimprc-blurbs.h:13 -msgid "When enabled, an image will become the active image when its image window receives the focus. This is useful for window managers using \"click to focus\"." -msgstr "Keď je povolené, obrázok sa stane aktívny, keď sa okno obrázka stane aktívnym. Toto je užitočné, keď správca okien používa nastavenie „aktívne po kliknutí“." +msgid "" +"When enabled, an image will become the active image when its image window " +"receives the focus. This is useful for window managers using \"click to focus" +"\"." +msgstr "" +"Keď je povolené, obrázok sa stane aktívny, keď sa okno obrázka stane " +"aktívnym. Toto je užitočné, keď správca okien používa nastavenie „aktívne po " +"kliknutí“." # tooltip #: ../app/config/gimprc-blurbs.h:23 ../app/config/gimprc-blurbs.h:28 @@ -6449,8 +6591,12 @@ # tooltip #: ../app/config/gimprc-blurbs.h:33 -msgid "Sets the canvas padding color used if the padding mode is set to custom color." -msgstr "Nastavuje farbu obtekania plátna, ak je nastavený režim obtekania na vlastnú farbu." +msgid "" +"Sets the canvas padding color used if the padding mode is set to custom " +"color." +msgstr "" +"Nastavuje farbu obtekania plátna, ak je nastavený režim obtekania na vlastnú " +"farbu." # tooltip #: ../app/config/gimprc-blurbs.h:37 @@ -6480,32 +6626,53 @@ # tooltip #: ../app/config/gimprc-blurbs.h:55 -msgid "Context-dependent mouse pointers are helpful. They are enabled by default. However, they require overhead that you may want to do without." -msgstr "Kurzory závisiace na kontexte sú užitočné. Implicitne sú povolené. Môžu však viac zaťažiť systém." +msgid "" +"Context-dependent mouse pointers are helpful. They are enabled by default. " +"However, they require overhead that you may want to do without." +msgstr "" +"Kurzory závisiace na kontexte sú užitočné. Implicitne sú povolené. Môžu však " +"viac zaťažiť systém." # tooltip #: ../app/config/gimprc-blurbs.h:71 -msgid "When enabled, this will ensure that each pixel of an image gets mapped to a pixel on the screen." -msgstr "Keď je povolené, zabezpečí to, aby každý pixel na obrázku bol namapovaný na pixel na obrazovke." +msgid "" +"When enabled, this will ensure that each pixel of an image gets mapped to a " +"pixel on the screen." +msgstr "" +"Keď je povolené, zabezpečí to, aby každý pixel na obrázku bol namapovaný na " +"pixel na obrazovke." # tooltip #: ../app/config/gimprc-blurbs.h:93 msgid "This is the distance in pixels where Guide and Grid snapping activates." -msgstr "Toto je vzdialenosť v pixeloch, kde sa aktivuje priťahovanie k vodidlám a mriežke." +msgstr "" +"Toto je vzdialenosť v pixeloch, kde sa aktivuje priťahovanie k vodidlám a " +"mriežke." # tooltip #: ../app/config/gimprc-blurbs.h:109 msgid "" -"Tools such as fuzzy-select and bucket fill find regions based on a seed-fill algorithm. The seed fill starts at the initially selected pixel and progresses in all directions until the difference of pixel intensity from the original is greater than a " -"specified threshold. This value represents the default threshold." +"Tools such as fuzzy-select and bucket fill find regions based on a seed-fill " +"algorithm. The seed fill starts at the initially selected pixel and " +"progresses in all directions until the difference of pixel intensity from " +"the original is greater than a specified threshold. This value represents " +"the default threshold." msgstr "" -"Nástroje ako približný výber a plechovka hľadajú oblasti algoritmom semienkového vyplňovania. Semienkové vyplňovanie začne na pôvodne vybranom pixeli a prebieha vo všetkých smeroch, pokiaľ nie je rozdiel intenzity pixelu od originálu väčší ako zadaný " -"prah. Táto hodnota reprezentuje predvolený prah." +"Nástroje ako približný výber a plechovka hľadajú oblasti algoritmom " +"semienkového vyplňovania. Semienkové vyplňovanie začne na pôvodne vybranom " +"pixeli a prebieha vo všetkých smeroch, pokiaľ nie je rozdiel intenzity " +"pixelu od originálu väčší ako zadaný prah. Táto hodnota reprezentuje " +"predvolený prah." # tooltip #: ../app/config/gimprc-blurbs.h:122 -msgid "The window type hint that is set on dock windows and the toolbox window. This may affect the way your window manager decorates and handles these windows." -msgstr "Typ okna, ktorý je nastavený na dokovacích oknách. Toto môže mať vplyv na to, ako váš správca okien orámuje dokovacie okná a ako s nimi bude narábať." +msgid "" +"The window type hint that is set on dock windows and the toolbox window. " +"This may affect the way your window manager decorates and handles these " +"windows." +msgstr "" +"Typ okna, ktorý je nastavený na dokovacích oknách. Toto môže mať vplyv na " +"to, ako váš správca okien orámuje dokovacie okná a ako s nimi bude narábať." # tooltip #: ../app/config/gimprc-blurbs.h:154 @@ -6544,13 +6711,20 @@ # tooltip #: ../app/config/gimprc-blurbs.h:197 -msgid "When enabled, this will ensure that the full image is visible after a file is opened, otherwise it will be displayed with a scale of 1:1." -msgstr "Keď je povolené, zabezpečí to, že celý obrázok bude viditeľný pri otvorení súboru, inak sa obrázok zobrazí v mierke 1:1." +msgid "" +"When enabled, this will ensure that the full image is visible after a file " +"is opened, otherwise it will be displayed with a scale of 1:1." +msgstr "" +"Keď je povolené, zabezpečí to, že celý obrázok bude viditeľný pri otvorení " +"súboru, inak sa obrázok zobrazí v mierke 1:1." # tooltip #: ../app/config/gimprc-blurbs.h:201 -msgid "Sets the level of interpolation used for scaling and other transformations." -msgstr "Nastavuje úroveň interpolácie použitej pri zmene mierky a iných transformáciách." +msgid "" +"Sets the level of interpolation used for scaling and other transformations." +msgstr "" +"Nastavuje úroveň interpolácie použitej pri zmene mierky a iných " +"transformáciách." # tooltip #: ../app/config/gimprc-blurbs.h:208 @@ -6560,37 +6734,65 @@ # tooltip #: ../app/config/gimprc-blurbs.h:211 msgid "How many recently opened image filenames to keep on the File menu." -msgstr "Koľko názvov nedávno otvorených obrázkov bude udržovaných v ponuke Súbor." +msgstr "" +"Koľko názvov nedávno otvorených obrázkov bude udržovaných v ponuke Súbor." # tooltip #: ../app/config/gimprc-blurbs.h:214 -msgid "Speed of marching ants in the selection outline. This value is in milliseconds (less time indicates faster marching)." -msgstr "Rýchlosť bežiaceho čiarkovania v obvode výberu. Táto hodnota je v milisekundách (menší čas znamená rýchlejší beh)." +msgid "" +"Speed of marching ants in the selection outline. This value is in " +"milliseconds (less time indicates faster marching)." +msgstr "" +"Rýchlosť bežiaceho čiarkovania v obvode výberu. Táto hodnota je v " +"milisekundách (menší čas znamená rýchlejší beh)." # tooltip #: ../app/config/gimprc-blurbs.h:218 -msgid "GIMP will warn the user if an attempt is made to create an image that would take more memory than the size specified here." -msgstr "GIMP bude varovať používateľa pri pokuse vytvoriť obrázok, ktorý by zabral viac pamäte ako je tu určená veľkosť." +msgid "" +"GIMP will warn the user if an attempt is made to create an image that would " +"take more memory than the size specified here." +msgstr "" +"GIMP bude varovať používateľa pri pokuse vytvoriť obrázok, ktorý by zabral " +"viac pamäte ako je tu určená veľkosť." # tooltip #: ../app/config/gimprc-blurbs.h:228 -msgid "Sets the monitor's horizontal resolution, in dots per inch. If set to 0, forces the X server to be queried for both horizontal and vertical resolution information." -msgstr "Nastavuje vodorovné rozlíšenie monitoru v bodoch na palec. Ak je nastavené na 0, vynúti získanie informácií o vodorovnom a zvislom rozlíšení od X serveru." +msgid "" +"Sets the monitor's horizontal resolution, in dots per inch. If set to 0, " +"forces the X server to be queried for both horizontal and vertical " +"resolution information." +msgstr "" +"Nastavuje vodorovné rozlíšenie monitoru v bodoch na palec. Ak je nastavené " +"na 0, vynúti získanie informácií o vodorovnom a zvislom rozlíšení od X " +"serveru." # tooltip #: ../app/config/gimprc-blurbs.h:233 -msgid "Sets the monitor's vertical resolution, in dots per inch. If set to 0, forces the X server to be queried for both horizontal and vertical resolution information." -msgstr "Nastavuje zvislé rozlíšenie monitoru v bodoch na palec. Ak je nastavené na 0, vynúti získanie informácií o vodorovnom a zvislom rozlíšení od X serveru." +msgid "" +"Sets the monitor's vertical resolution, in dots per inch. If set to 0, " +"forces the X server to be queried for both horizontal and vertical " +"resolution information." +msgstr "" +"Nastavuje zvislé rozlíšenie monitoru v bodoch na palec. Ak je nastavené na " +"0, vynúti získanie informácií o vodorovnom a zvislom rozlíšení od X serveru." # tooltip #: ../app/config/gimprc-blurbs.h:238 -msgid "If enabled, the move tool sets the edited layer or path as active. This used to be the default behaviour in older versions." -msgstr "Ak je povolené, nástroj na posun zmení posúvanú vrstvu alebo cestu na aktívnu. Toto bolo v starších verziách predvolené správanie." +msgid "" +"If enabled, the move tool sets the edited layer or path as active. This " +"used to be the default behaviour in older versions." +msgstr "" +"Ak je povolené, nástroj na posun zmení posúvanú vrstvu alebo cestu na " +"aktívnu. Toto bolo v starších verziách predvolené správanie." # tooltip #: ../app/config/gimprc-blurbs.h:242 -msgid "Sets the size of the navigation preview available in the lower right corner of the image window." -msgstr "Nastavuje veľkosť navigačného náhľadu dostupného v pravom dolnom rohu okna obrázka." +msgid "" +"Sets the size of the navigation preview available in the lower right corner " +"of the image window." +msgstr "" +"Nastavuje veľkosť navigačného náhľadu dostupného v pravom dolnom rohu okna " +"obrázka." # tooltip #: ../app/config/gimprc-blurbs.h:246 @@ -6600,21 +6802,36 @@ # tooltip #: ../app/config/gimprc-blurbs.h:259 msgid "" -"When enabled, the X server is queried for the mouse's current position on each motion event, rather than relying on the position hint. This means painting with large brushes should be more accurate, but it may be slower. Conversely, on some X servers " -"enabling this option results in faster painting." +"When enabled, the X server is queried for the mouse's current position on " +"each motion event, rather than relying on the position hint. This means " +"painting with large brushes should be more accurate, but it may be slower. " +"Conversely, on some X servers enabling this option results in faster " +"painting." msgstr "" -"Keď je povolené, vysielajú sa požiadavky, aby X server poskytol informáciu o polohe a pohybe myši, namiesto spoliehania sa na predpokladané údaje. To znamená, že kreslenie s veľkými štetcami bude síce oveľa presnejšie, no pomalšie. Prekvapivé je, že na " -"niektorých X serveroch má povolenie tejto voľby za následok rýchlejšie kreslenie." +"Keď je povolené, vysielajú sa požiadavky, aby X server poskytol informáciu o " +"polohe a pohybe myši, namiesto spoliehania sa na predpokladané údaje. To " +"znamená, že kreslenie s veľkými štetcami bude síce oveľa presnejšie, no " +"pomalšie. Prekvapivé je, že na niektorých X serveroch má povolenie tejto " +"voľby za následok rýchlejšie kreslenie." # tooltip #: ../app/config/gimprc-blurbs.h:275 -msgid "Sets whether GIMP should create previews of layers and channels. Previews in the layers and channels dialog are nice to have but they can slow things down when working with large images." -msgstr "Nastavuje, či GIMP bude vytvárať náhľady vrstiev a kanálov. Náhľady v dialógu vrstiev a kanálov sú pekné, ale pri veľkých obrázkoch môžu spôsobovať spomalenie." +msgid "" +"Sets whether GIMP should create previews of layers and channels. Previews in " +"the layers and channels dialog are nice to have but they can slow things " +"down when working with large images." +msgstr "" +"Nastavuje, či GIMP bude vytvárať náhľady vrstiev a kanálov. Náhľady v " +"dialógu vrstiev a kanálov sú pekné, ale pri veľkých obrázkoch môžu " +"spôsobovať spomalenie." # tooltip #: ../app/config/gimprc-blurbs.h:280 -msgid "Sets the preview size used for layers and channel previews in newly created dialogs." -msgstr "Nastavuje veľkosť náhľadu na vrstvy a kanály v novovytvorených dialógoch." +msgid "" +"Sets the preview size used for layers and channel previews in newly created " +"dialogs." +msgstr "" +"Nastavuje veľkosť náhľadu na vrstvy a kanály v novovytvorených dialógoch." #: ../app/config/gimprc-blurbs.h:284 msgid "Sets the default quick mask color." @@ -6622,28 +6839,44 @@ # tooltip #: ../app/config/gimprc-blurbs.h:287 -msgid "When enabled, the image window will automatically resize itself whenever the physical image size changes." -msgstr "Keď je povolené, okno obrázka automaticky prispôsobí svoju veľkosť vždy, keď sa zmenia fyzické rozmery obrázka." +msgid "" +"When enabled, the image window will automatically resize itself whenever the " +"physical image size changes." +msgstr "" +"Keď je povolené, okno obrázka automaticky prispôsobí svoju veľkosť vždy, keď " +"sa zmenia fyzické rozmery obrázka." # tooltip #: ../app/config/gimprc-blurbs.h:291 -msgid "When enabled, the image window will automatically resize itself when zooming into and out of images." -msgstr "Keď je povolené, okno obrázka sa automaticky prispôsobí vždy, keď príde k zväčšeniu alebo zmenšeniu obrázka." +msgid "" +"When enabled, the image window will automatically resize itself when zooming " +"into and out of images." +msgstr "" +"Keď je povolené, okno obrázka sa automaticky prispôsobí vždy, keď príde k " +"zväčšeniu alebo zmenšeniu obrázka." # tooltip #: ../app/config/gimprc-blurbs.h:295 msgid "Let GIMP try to restore your last saved session on each startup." -msgstr "Nechá GIMP, aby sa pri každom spustení pokúsil obnoviť vašu poslednú uloženú reláciu." +msgstr "" +"Nechá GIMP, aby sa pri každom spustení pokúsil obnoviť vašu poslednú uloženú " +"reláciu." # tooltip #: ../app/config/gimprc-blurbs.h:298 -msgid "Remember the current tool, pattern, color, and brush across GIMP sessions." -msgstr "Zapamätá si aktuálny nástroj, vzor, farbu a štetec medzi reláciami GIMPu." +msgid "" +"Remember the current tool, pattern, color, and brush across GIMP sessions." +msgstr "" +"Zapamätá si aktuálny nástroj, vzor, farbu a štetec medzi reláciami GIMPu." # tooltip #: ../app/config/gimprc-blurbs.h:302 -msgid "Keep a permanent record of all opened and saved files in the Recent Documents list." -msgstr "Ponechá trvalý záznam o všetkých otvorených a uložených súboroch v zozname Nedávne dokumenty." +msgid "" +"Keep a permanent record of all opened and saved files in the Recent " +"Documents list." +msgstr "" +"Ponechá trvalý záznam o všetkých otvorených a uložených súboroch v zozname " +"Nedávne dokumenty." #: ../app/config/gimprc-blurbs.h:306 msgid "Save the positions and sizes of the main dialogs when GIMP exits." @@ -6655,63 +6888,113 @@ # tooltip #: ../app/config/gimprc-blurbs.h:315 -msgid "When enabled, all paint tools will show a preview of the current brush's outline." -msgstr "Keď je povolené, všetky kresliace nástroje budú zobrazovať náhľad obrysu aktuálneho štetca." +msgid "" +"When enabled, all paint tools will show a preview of the current brush's " +"outline." +msgstr "" +"Keď je povolené, všetky kresliace nástroje budú zobrazovať náhľad obrysu " +"aktuálneho štetca." # tooltip #: ../app/config/gimprc-blurbs.h:319 -msgid "When enabled, dialogs will show a help button that gives access to the related help page. Without this button, the help page can still be reached by pressing F1." -msgstr "Keď je povolené, dialógy budú zobrazovať tlačidlo pomocníka, s prístupom k zodpovedajúcej stránke. Bez tohoto tlačidla, stránku pomocníka získate stlačením F1." +msgid "" +"When enabled, dialogs will show a help button that gives access to the " +"related help page. Without this button, the help page can still be reached " +"by pressing F1." +msgstr "" +"Keď je povolené, dialógy budú zobrazovať tlačidlo pomocníka, s prístupom k " +"zodpovedajúcej stránke. Bez tohoto tlačidla, stránku pomocníka získate " +"stlačením F1." # tooltip #: ../app/config/gimprc-blurbs.h:324 -msgid "When enabled, the mouse pointer will be shown over the image while using a paint tool." -msgstr "Keď je povolené, bude sa nad obrázkom počas používania kresliacich nástrojov zobrazovať kurzor." +msgid "" +"When enabled, the mouse pointer will be shown over the image while using a " +"paint tool." +msgstr "" +"Keď je povolené, bude sa nad obrázkom počas používania kresliacich nástrojov " +"zobrazovať kurzor." # tooltip #: ../app/config/gimprc-blurbs.h:328 -msgid "When enabled, the menubar is visible by default. This can also be toggled with the \"View->Show Menubar\" command." -msgstr "Keď je povolené, ponuka je štandardne viditeľná. Toto môže byť zmenené pomocou príkazu „Zobrazenie->Zobraziť ponuku“." +msgid "" +"When enabled, the menubar is visible by default. This can also be toggled " +"with the \"View->Show Menubar\" command." +msgstr "" +"Keď je povolené, ponuka je štandardne viditeľná. Toto môže byť zmenené " +"pomocou príkazu „Zobrazenie->Zobraziť ponuku“." # tooltip #: ../app/config/gimprc-blurbs.h:332 -msgid "When enabled, the rulers are visible by default. This can also be toggled with the \"View->Show Rulers\" command." -msgstr "Keď je povolené, pravítka sú štandardne viditeľné. Toto môže byť zmenené pomocou príkazu „Zobrazenie->Zobraziť pravítka“." +msgid "" +"When enabled, the rulers are visible by default. This can also be toggled " +"with the \"View->Show Rulers\" command." +msgstr "" +"Keď je povolené, pravítka sú štandardne viditeľné. Toto môže byť zmenené " +"pomocou príkazu „Zobrazenie->Zobraziť pravítka“." # tooltip #: ../app/config/gimprc-blurbs.h:336 -msgid "When enabled, the scrollbars are visible by default. This can also be toggled with the \"View->Show Scrollbars\" command." -msgstr "Keď je povolené, posuvníky sú štandardne viditeľné. Toto môže byť zmenené pomocou príkazu „Zobrazenie->Zobraziť posuvníky“." +msgid "" +"When enabled, the scrollbars are visible by default. This can also be " +"toggled with the \"View->Show Scrollbars\" command." +msgstr "" +"Keď je povolené, posuvníky sú štandardne viditeľné. Toto môže byť zmenené " +"pomocou príkazu „Zobrazenie->Zobraziť posuvníky“." # tooltip #: ../app/config/gimprc-blurbs.h:340 -msgid "When enabled, the statusbar is visible by default. This can also be toggled with the \"View->Show Statusbar\" command." -msgstr "Keď je povolené, stavový riadok bude štandardne viditeľný. Toto môže byť zmenené pomocou príkazu „Zobrazenie->Zobraziť stavovú lištu“." +msgid "" +"When enabled, the statusbar is visible by default. This can also be toggled " +"with the \"View->Show Statusbar\" command." +msgstr "" +"Keď je povolené, stavový riadok bude štandardne viditeľný. Toto môže byť " +"zmenené pomocou príkazu „Zobrazenie->Zobraziť stavovú lištu“." # tooltip #: ../app/config/gimprc-blurbs.h:344 -msgid "When enabled, the selection is visible by default. This can also be toggled with the \"View->Show Selection\" command." -msgstr "Keď je povolené, výber je štandardne viditeľný. Toto môže byť zmenené pomocou „Zobrazenie->Zobraziť výber“." +msgid "" +"When enabled, the selection is visible by default. This can also be toggled " +"with the \"View->Show Selection\" command." +msgstr "" +"Keď je povolené, výber je štandardne viditeľný. Toto môže byť zmenené " +"pomocou „Zobrazenie->Zobraziť výber“." # tooltip #: ../app/config/gimprc-blurbs.h:348 -msgid "When enabled, the layer boundary is visible by default. This can also be toggled with the \"View->Show Layer Boundary\" command." -msgstr "Keď je povolené, ohraničenie vrstvy je štandardne viditeľné. Toto môže byť zmenené pomocou „Zobrazenie->Zobraziť ohraničenie vrstvy“." +msgid "" +"When enabled, the layer boundary is visible by default. This can also be " +"toggled with the \"View->Show Layer Boundary\" command." +msgstr "" +"Keď je povolené, ohraničenie vrstvy je štandardne viditeľné. Toto môže byť " +"zmenené pomocou „Zobrazenie->Zobraziť ohraničenie vrstvy“." # tooltip #: ../app/config/gimprc-blurbs.h:352 -msgid "When enabled, the guides are visible by default. This can also be toggled with the \"View->Show Guides\" command." -msgstr "Keď je povolené, vodidlá sú štandardne viditeľné. Toto môže byť zmenené pomocou „Zobrazenie->Zobraziť vodidlá“." +msgid "" +"When enabled, the guides are visible by default. This can also be toggled " +"with the \"View->Show Guides\" command." +msgstr "" +"Keď je povolené, vodidlá sú štandardne viditeľné. Toto môže byť zmenené " +"pomocou „Zobrazenie->Zobraziť vodidlá“." # tooltip #: ../app/config/gimprc-blurbs.h:356 -msgid "When enabled, the grid is visible by default. This can also be toggled with the \"View->Show Grid\" command." -msgstr "Keď je povolené, mriežka je štandardne viditeľná. Toto môže byť zmenené pomocou „Zobraziť->Zobraziť mriežku“." +msgid "" +"When enabled, the grid is visible by default. This can also be toggled with " +"the \"View->Show Grid\" command." +msgstr "" +"Keď je povolené, mriežka je štandardne viditeľná. Toto môže byť zmenené " +"pomocou „Zobraziť->Zobraziť mriežku“." # tooltip #: ../app/config/gimprc-blurbs.h:360 -msgid "When enabled, the sample points are visible by default. This can also be toggled with the \"View->Show Sample Points\" command." -msgstr "Keď je povolené, pravítka sú štandardne viditeľné. Toto môže byť zmenené pomocou príkazu „Zobraziť->Zobraziť bodové vzorky“." +msgid "" +"When enabled, the sample points are visible by default. This can also be " +"toggled with the \"View->Show Sample Points\" command." +msgstr "" +"Keď je povolené, pravítka sú štandardne viditeľné. Toto môže byť zmenené " +"pomocou príkazu „Zobraziť->Zobraziť bodové vzorky“." # tooltip #: ../app/config/gimprc-blurbs.h:364 @@ -6736,11 +7019,20 @@ # tooltip #: ../app/config/gimprc-blurbs.h:376 msgid "" -"Sets the swap file location. GIMP uses a tile based memory allocation scheme. The swap file is used to quickly and easily swap tiles out to disk and back in. Be aware that the swap file can easily get very large if GIMP is used with large images. Also, " -"things can get horribly slow if the swap file is created on a folder that is mounted over NFS. For these reasons, it may be desirable to put your swap file in \"/tmp\"." +"Sets the swap file location. GIMP uses a tile based memory allocation " +"scheme. The swap file is used to quickly and easily swap tiles out to disk " +"and back in. Be aware that the swap file can easily get very large if GIMP " +"is used with large images. Also, things can get horribly slow if the swap " +"file is created on a folder that is mounted over NFS. For these reasons, it " +"may be desirable to put your swap file in \"/tmp\"." msgstr "" -"Nastavuje umiestnenie odkladacieho swap súboru. GIMP používa schému alokácie pamäte založenej na dlaždiciach. Odkladací súbor sa používa pre rýchle a ľahké odkladanie dlaždíc na disk a späť do pamäte. Uvedomte si, že odkladací priestor sa rýchlo môže " -"stať veľmi veľkým, ak používate GIMP na veľké obrázky. Ďalej, ak je odkladací súbor vytvorený v priečinku pripojenom cez NFS, môže byť všetko strašne pomalé. Z týchto dôvodov môže byť vhodné umiestniť váš odkladací súbor do „/tmp“." +"Nastavuje umiestnenie odkladacieho swap súboru. GIMP používa schému alokácie " +"pamäte založenej na dlaždiciach. Odkladací súbor sa používa pre rýchle a " +"ľahké odkladanie dlaždíc na disk a späť do pamäte. Uvedomte si, že odkladací " +"priestor sa rýchlo môže stať veľmi veľkým, ak používate GIMP na veľké " +"obrázky. Ďalej, ak je odkladací súbor vytvorený v priečinku pripojenom cez " +"NFS, môže byť všetko strašne pomalé. Z týchto dôvodov môže byť vhodné " +"umiestniť váš odkladací súbor do „/tmp“." # tooltip #: ../app/config/gimprc-blurbs.h:385 @@ -6749,8 +7041,12 @@ # tooltip #: ../app/config/gimprc-blurbs.h:388 -msgid "When enabled, you can change keyboard shortcuts for menu items by hitting a key combination while the menu item is highlighted." -msgstr "Keď je povolené, môžete meniť klávesové skratky položiek ponuky stlačením kombinácie kláves, keď je položka v ponuke zvýraznená." +msgid "" +"When enabled, you can change keyboard shortcuts for menu items by hitting a " +"key combination while the menu item is highlighted." +msgstr "" +"Keď je povolené, môžete meniť klávesové skratky položiek ponuky stlačením " +"kombinácie kláves, keď je položka v ponuke zvýraznená." # tooltip #: ../app/config/gimprc-blurbs.h:392 @@ -6765,9 +7061,15 @@ # tooltip #: ../app/config/gimprc-blurbs.h:398 msgid "" -"Sets the folder for temporary storage. Files will appear here during the course of running GIMP. Most files will disappear when GIMP exits, but some files are likely to remain, so it is best if this folder not be one that is shared by other users." +"Sets the folder for temporary storage. Files will appear here during the " +"course of running GIMP. Most files will disappear when GIMP exits, but some " +"files are likely to remain, so it is best if this folder not be one that is " +"shared by other users." msgstr "" -"Nastavuje priečinok pre dočasné súbory. Počas behu programu GIMP sa tu budú objavovať súbory. Väčšina súborov zmizne, keď GIMP skončí, ale niektoré súbory pravdepodobne zostanú. Takže je dobré, keď tento priečinok nie je zdieľaný s inými používateľmi." +"Nastavuje priečinok pre dočasné súbory. Počas behu programu GIMP sa tu budú " +"objavovať súbory. Väčšina súborov zmizne, keď GIMP skončí, ale niektoré " +"súbory pravdepodobne zostanú. Takže je dobré, keď tento priečinok nie je " +"zdieľaný s inými používateľmi." # tooltip #: ../app/config/gimprc-blurbs.h:410 @@ -6776,16 +7078,25 @@ # tooltip #: ../app/config/gimprc-blurbs.h:413 -msgid "The thumbnail in the Open dialog will be automatically updated if the file being previewed is smaller than the size set here." -msgstr "Miniatúra v dialógu Otvoriť bude automaticky aktualizovaná, pokiaľ je veľkosť miniatúry menšia ako je tu nastavená hodnota." +msgid "" +"The thumbnail in the Open dialog will be automatically updated if the file " +"being previewed is smaller than the size set here." +msgstr "" +"Miniatúra v dialógu Otvoriť bude automaticky aktualizovaná, pokiaľ je " +"veľkosť miniatúry menšia ako je tu nastavená hodnota." # tooltip #: ../app/config/gimprc-blurbs.h:417 msgid "" -"When the amount of pixel data exceeds this limit, GIMP will start to swap tiles to disk. This is a lot slower but it makes it possible to work on images that wouldn't fit into memory otherwise. If you have a lot of RAM, you may want to set this to a " -"higher value." +"When the amount of pixel data exceeds this limit, GIMP will start to swap " +"tiles to disk. This is a lot slower but it makes it possible to work on " +"images that wouldn't fit into memory otherwise. If you have a lot of RAM, " +"you may want to set this to a higher value." msgstr "" -"Pokiaľ množstvo pixelových dát prekročí tento limit, GIMP začne dlaždice ukladať do swapovacieho súboru. To je oveľa pomalšie, ale umožní to pracovať aj s obrázkami, ktoré sa nezmestia do pamäte. Ak máte veľa pamäte RAM, môžete túto hodnotu zväčšiť." +"Pokiaľ množstvo pixelových dát prekročí tento limit, GIMP začne dlaždice " +"ukladať do swapovacieho súboru. To je oveľa pomalšie, ale umožní to " +"pracovať aj s obrázkami, ktoré sa nezmestia do pamäte. Ak máte veľa pamäte " +"RAM, môžete túto hodnotu zväčšiť." # tooltip #: ../app/config/gimprc-blurbs.h:423 @@ -6810,21 +7121,37 @@ # tooltip #: ../app/config/gimprc-blurbs.h:438 msgid "Sets the size of the checkerboard used to display transparency." -msgstr "Nastavuje veľkosť polí šachovnice, používaných pre zobrazenie priehľadnosti." +msgstr "" +"Nastavuje veľkosť polí šachovnice, používaných pre zobrazenie priehľadnosti." # tooltip #: ../app/config/gimprc-blurbs.h:441 -msgid "When enabled, GIMP will not save an image if it has not been changed since it was opened." -msgstr "Keď je povolené, GIMP neuloží obrázok, pokiaľ nedôjde k jeho zmene od jeho otvorenia." +msgid "" +"When enabled, GIMP will not save an image if it has not been changed since " +"it was opened." +msgstr "" +"Keď je povolené, GIMP neuloží obrázok, pokiaľ nedôjde k jeho zmene od jeho " +"otvorenia." #: ../app/config/gimprc-blurbs.h:445 -msgid "Sets the minimal number of operations that can be undone. More undo levels are kept available until the undo-size limit is reached." -msgstr "Nastavuje minimálny počet operácií, ktoré môžu byť vrátené spať. Viac dostupných úrovní „kroku spať“ sa ukladá až pokiaľ nie je dosiahnutý tento limit." +msgid "" +"Sets the minimal number of operations that can be undone. More undo levels " +"are kept available until the undo-size limit is reached." +msgstr "" +"Nastavuje minimálny počet operácií, ktoré môžu byť vrátené spať. Viac " +"dostupných úrovní „kroku spať“ sa ukladá až pokiaľ nie je dosiahnutý tento " +"limit." # tooltip #: ../app/config/gimprc-blurbs.h:449 -msgid "Sets an upper limit to the memory that is used per image to keep operations on the undo stack. Regardless of this setting, at least as many undo-levels as configured can be undone." -msgstr "Nastavuje horný limit pamäte, ktorá sa použije pre obrázok na udržanie zásobníka vrátení. Bez ohľadu na toto nastavenie je možné vrátiť späť aspoň toľko operácií ako je nastavené." +msgid "" +"Sets an upper limit to the memory that is used per image to keep operations " +"on the undo stack. Regardless of this setting, at least as many undo-levels " +"as configured can be undone." +msgstr "" +"Nastavuje horný limit pamäte, ktorá sa použije pre obrázok na udržanie " +"zásobníka vrátení. Bez ohľadu na toto nastavenie je možné vrátiť späť aspoň " +"toľko operácií ako je nastavené." # tooltip #: ../app/config/gimprc-blurbs.h:454 @@ -6836,7 +7163,9 @@ msgid "When enabled, pressing F1 will open the help browser." msgstr "Keď je povolené, stlačením F1 sa spustí prehliadač pomocníka." -#: ../app/config/gimprc-deserialize.c:135 ../app/core/gimp-modules.c:136 ../app/core/gimp-units.c:167 ../app/gui/session.c:286 ../app/plug-in/plug-in-rc.c:212 +#: ../app/config/gimprc-deserialize.c:135 ../app/core/gimp-modules.c:136 +#: ../app/core/gimp-units.c:167 ../app/gui/session.c:286 +#: ../app/plug-in/plug-in-rc.c:212 msgid "fatal parse error" msgstr "závažná chyba pri analýze" @@ -7307,7 +7636,8 @@ msgstr "Rýchla maska" # názov operácie pre Undo -#: ../app/core/core-enums.c:844 ../app/core/core-enums.c:874 ../app/core/gimpimage-grid.c:63 +#: ../app/core/core-enums.c:844 ../app/core/core-enums.c:874 +#: ../app/core/gimpimage-grid.c:63 msgctxt "undo-type" msgid "Grid" msgstr "Mriežka" @@ -7433,7 +7763,8 @@ msgstr "Text" # názov operácie pre Undo -#: ../app/core/core-enums.c:865 ../app/core/core-enums.c:907 ../app/core/gimpdrawable-transform.c:589 +#: ../app/core/core-enums.c:865 ../app/core/core-enums.c:907 +#: ../app/core/gimpdrawable-transform.c:589 msgctxt "undo-type" msgid "Transform" msgstr "Transformovanie" @@ -7779,7 +8110,9 @@ msgid "Jitter" msgstr "Rozptyl" -#: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:375 ../app/gui/session.c:408 ../app/menus/menus.c:466 ../app/widgets/gimpdevices.c:208 +#: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:375 +#: ../app/gui/session.c:408 ../app/menus/menus.c:466 +#: ../app/widgets/gimpdevices.c:208 #, c-format msgid "Deleting \"%s\" failed: %s" msgstr "Odstránenie „%s“ zlyhalo: %s" @@ -7868,13 +8201,21 @@ #: ../app/core/gimp-user-install.c:203 #, c-format -msgid "It seems you have used GIMP %s before. GIMP will now migrate your user settings to '%s'." -msgstr "Zdá sa, že ste predtým používali GIMP %s. GIMP teraz presunie vaše používateľské nastavenia do „%s“." +msgid "" +"It seems you have used GIMP %s before. GIMP will now migrate your user " +"settings to '%s'." +msgstr "" +"Zdá sa, že ste predtým používali GIMP %s. GIMP teraz presunie vaše " +"používateľské nastavenia do „%s“." #: ../app/core/gimp-user-install.c:208 #, c-format -msgid "It appears that you are using GIMP for the first time. GIMP will now create a folder named '%s' and copy some files to it." -msgstr "Zdá sa, že GIMP používate po prvýkrát. GIMP teraz vytvorí priečinok s názvom „%s“ a skopíruje tam pár súborov." +msgid "" +"It appears that you are using GIMP for the first time. GIMP will now create " +"a folder named '%s' and copy some files to it." +msgstr "" +"Zdá sa, že GIMP používate po prvýkrát. GIMP teraz vytvorí priečinok s názvom " +"„%s“ a skopíruje tam pár súborov." # správa pre install log #: ../app/core/gimp-user-install.c:359 @@ -7913,7 +8254,8 @@ msgstr "Parazity" #. initialize the list of gimp dynamics -#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2750 ../app/tools/gimppaintoptions-gui.c:201 +#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2787 +#: ../app/tools/gimppaintoptions-gui.c:201 msgid "Dynamics" msgstr "Dynamiky" @@ -7923,7 +8265,7 @@ msgstr "Písma (môže to chvíľu trvať)" #. initialize the module list -#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2782 +#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2819 msgid "Modules" msgstr "Moduly" @@ -7965,17 +8307,23 @@ msgid "Fatal parse error in brush file '%s': Unknown version %d." msgstr "Závažná chyba v súbore štetca „%s“: Neznáma verzia %d." -#: ../app/core/gimpbrush-load.c:273 ../app/core/gimpbrush-load.c:410 ../app/core/gimpbrush-load.c:626 ../app/core/gimpbrush-load.c:700 ../app/core/gimpbrush-load.c:763 ../app/core/gimpbrush-load.c:779 ../app/core/gimpbrush-load.c:822 +#: ../app/core/gimpbrush-load.c:273 ../app/core/gimpbrush-load.c:410 +#: ../app/core/gimpbrush-load.c:626 ../app/core/gimpbrush-load.c:700 +#: ../app/core/gimpbrush-load.c:763 ../app/core/gimpbrush-load.c:779 +#: ../app/core/gimpbrush-load.c:822 #, c-format msgid "Fatal parse error in brush file '%s': File appears truncated." msgstr "Závažná chyba v súbore štetca „%s“: Súbor sa zdá byť skrátený." -#: ../app/core/gimpbrush-load.c:281 ../app/core/gimpbrushgenerated-load.c:128 ../app/core/gimpbrushpipe-load.c:97 +#: ../app/core/gimpbrush-load.c:281 ../app/core/gimpbrushgenerated-load.c:128 +#: ../app/core/gimpbrushpipe-load.c:97 #, c-format msgid "Invalid UTF-8 string in brush file '%s'." msgstr "Nesprávny UTF-8 reťazec v súbore štetca „%s“." -#: ../app/core/gimpbrush-load.c:288 ../app/core/gimppattern-load.c:146 ../app/dialogs/template-options-dialog.c:83 ../app/tools/gimpvectortool.c:317 +#: ../app/core/gimpbrush-load.c:288 ../app/core/gimppattern-load.c:146 +#: ../app/dialogs/template-options-dialog.c:83 +#: ../app/tools/gimpvectortool.c:317 msgid "Unnamed" msgstr "Bez názvu" @@ -7984,11 +8332,13 @@ msgid "" "Fatal parse error in brush file '%s': Unsupported brush depth %d\n" "GIMP brushes must be GRAY or RGBA.\n" -"This might be an obsolete GIMP brush file, try loading it as image and save it again." +"This might be an obsolete GIMP brush file, try loading it as image and save " +"it again." msgstr "" "Závažná chyba v súbore štetca „%s“: Nepodporovaná hĺbka štetca %d\n" "Štetce programu GIMP musia byť v Odtieňoch šedej alebo RGBA.\n" -"Tento súbor štetca pre GIMP môže byť zastaralý. Skúste ho načítať ako obrázok a znovu uložiť." +"Tento súbor štetca pre GIMP môže byť zastaralý. Skúste ho načítať ako " +"obrázok a znovu uložiť." #: ../app/core/gimpbrush-load.c:399 #, c-format @@ -8001,8 +8351,10 @@ #: ../app/core/gimpbrush-load.c:471 ../app/core/gimpbrush-load.c:909 #, c-format -msgid "Fatal parse error in brush file '%s': unable to decode abr format version %d." -msgstr "Závažná chyba v súbore štetca „%s“: nedá sa dekódovať abr formát verzie %d." +msgid "" +"Fatal parse error in brush file '%s': unable to decode abr format version %d." +msgstr "" +"Závažná chyba v súbore štetca „%s“: nedá sa dekódovať abr formát verzie %d." #: ../app/core/gimpbrush-load.c:647 #, c-format @@ -8020,12 +8372,15 @@ #: ../app/core/gimpbrushgenerated-load.c:104 #, c-format -msgid "Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d." -msgstr "Závažná chyba v súbore štetca „%s“: Neznáma verzia štetca na riadku %d." +msgid "" +"Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d." +msgstr "" +"Závažná chyba v súbore štetca „%s“: Neznáma verzia štetca na riadku %d." #: ../app/core/gimpbrushgenerated-load.c:150 #, c-format -msgid "Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d." +msgid "" +"Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d." msgstr "Závažná chyba v súbore štetca „%s“: Neznámy tvar štetca na riadku %d." #: ../app/core/gimpbrushgenerated-load.c:226 @@ -8276,7 +8631,8 @@ msgid "Selection Mask" msgstr "Maska výberu" -#: ../app/core/gimpcontext.c:639 ../app/tools/gimppaintoptions-gui.c:109 ../app/widgets/gimpbrushselect.c:177 ../app/widgets/gimplayertreeview.c:284 +#: ../app/core/gimpcontext.c:639 ../app/tools/gimppaintoptions-gui.c:109 +#: ../app/widgets/gimpbrushselect.c:177 ../app/widgets/gimplayertreeview.c:284 msgid "Opacity" msgstr "Krytie" @@ -8289,7 +8645,8 @@ msgid "Could not delete '%s': %s" msgstr "Nepodarilo sa odstrániť „%s“: %s" -#: ../app/core/gimpdatafactory.c:428 ../app/core/gimpdatafactory.c:457 ../app/core/gimpdatafactory.c:623 ../app/core/gimpdatafactory.c:645 +#: ../app/core/gimpdatafactory.c:445 ../app/core/gimpdatafactory.c:470 +#: ../app/core/gimpdatafactory.c:637 ../app/core/gimpdatafactory.c:659 #, c-format msgid "" "Failed to save data:\n" @@ -8300,31 +8657,44 @@ "\n" "%s" -#: ../app/core/gimpdatafactory.c:537 ../app/core/gimpdatafactory.c:540 ../app/core/gimpitem.c:495 ../app/core/gimpitem.c:498 +#: ../app/core/gimpdatafactory.c:551 ../app/core/gimpdatafactory.c:554 +#: ../app/core/gimpitem.c:495 ../app/core/gimpitem.c:498 msgid "copy" msgstr "kópia" -#: ../app/core/gimpdatafactory.c:549 ../app/core/gimpitem.c:507 +#: ../app/core/gimpdatafactory.c:563 ../app/core/gimpitem.c:507 #, c-format msgid "%s copy" msgstr "kópia %s" -#: ../app/core/gimpdatafactory.c:742 +#: ../app/core/gimpdatafactory.c:756 #, c-format -msgid "You have a writable data folder configured (%s), but this folder does not exist. Please create the folder or fix your configuation in the Preferences dialog's 'Folders' section." -msgstr "Nastavili ste zapisovateľný dátový priečinok (%s), ale tento priečinok neexistuje. Prosím, vytvorte priečinok alebo opravte nastavenie v dialógu Nastavenia v časti „Priečinky“." +msgid "" +"You have a writable data folder configured (%s), but this folder does not " +"exist. Please create the folder or fix your configuation in the Preferences " +"dialog's 'Folders' section." +msgstr "" +"Nastavili ste zapisovateľný dátový priečinok (%s), ale tento priečinok " +"neexistuje. Prosím, vytvorte priečinok alebo opravte nastavenie v dialógu " +"Nastavenia v časti „Priečinky“." -#: ../app/core/gimpdatafactory.c:763 +#: ../app/core/gimpdatafactory.c:777 #, c-format -msgid "You have a writable data folder configured, but this folder is not part of your data search path. You probably edited the gimprc file manually, please fix it in the Preferences dialog's 'Folders' section." -msgstr "Nastavili ste zapisovateľný dátový priečinok, ale tento priečinok nie je časťou hľadania vašej cesty dát. Pravdepodobne ste manuálne upravili súbor gimprc, prosím opravte to v dialógu Nastavenia v časti „Priečinky“." +msgid "" +"You have a writable data folder configured, but this folder is not part of " +"your data search path. You probably edited the gimprc file manually, please " +"fix it in the Preferences dialog's 'Folders' section." +msgstr "" +"Nastavili ste zapisovateľný dátový priečinok, ale tento priečinok nie je " +"časťou hľadania vašej cesty dát. Pravdepodobne ste manuálne upravili súbor " +"gimprc, prosím opravte to v dialógu Nastavenia v časti „Priečinky“." -#: ../app/core/gimpdatafactory.c:773 +#: ../app/core/gimpdatafactory.c:787 #, c-format msgid "You don't have any writable data folder configured." msgstr "Nenastavili ste zapisovateľný dátový priečinok." -#: ../app/core/gimpdatafactory.c:941 +#: ../app/core/gimpdatafactory.c:955 #, c-format msgid "" "Failed to load data:\n" @@ -8342,7 +8712,8 @@ msgstr "Prechod" # názov operácie pre Undo -#: ../app/core/gimpdrawable-brightness-contrast.c:70 ../app/core/gimpdrawable-brightness-contrast.c:83 +#: ../app/core/gimpdrawable-brightness-contrast.c:70 +#: ../app/core/gimpdrawable-brightness-contrast.c:83 msgctxt "undo-type" msgid "Brightness-Contrast" msgstr "Jas-Kontrast" @@ -8358,13 +8729,15 @@ msgstr "Plechovka" # názov operácie pre Undo -#: ../app/core/gimpdrawable-color-balance.c:79 ../app/core/gimpdrawable-color-balance.c:89 +#: ../app/core/gimpdrawable-color-balance.c:79 +#: ../app/core/gimpdrawable-color-balance.c:89 msgctxt "undo-type" msgid "Color Balance" msgstr "Farebné vyváženie" # názov operácie pre Undo -#: ../app/core/gimpdrawable-colorize.c:72 ../app/core/gimpdrawable-colorize.c:84 +#: ../app/core/gimpdrawable-colorize.c:72 +#: ../app/core/gimpdrawable-colorize.c:84 msgctxt "undo-type" msgid "Colorize" msgstr "Ofarbenie" @@ -8375,7 +8748,9 @@ msgid "Curves" msgstr "Krivky" -#: ../app/core/gimpdrawable-desaturate.c:70 ../app/core/gimpdrawable-desaturate.c:76 ../app/tools/gimpdesaturatetool.c:77 +#: ../app/core/gimpdrawable-desaturate.c:70 +#: ../app/core/gimpdrawable-desaturate.c:76 +#: ../app/tools/gimpdesaturatetool.c:77 msgid "Desaturate" msgstr "Odfarbenie" @@ -8389,7 +8764,8 @@ msgid "Foreground Extraction" msgstr "Extrakcia farby popredia" -#: ../app/core/gimpdrawable-hue-saturation.c:77 ../app/tools/gimphuesaturationtool.c:102 +#: ../app/core/gimpdrawable-hue-saturation.c:77 +#: ../app/tools/gimphuesaturationtool.c:102 msgid "Hue-Saturation" msgstr "Odtieň-Sýtosť" @@ -8401,7 +8777,8 @@ msgid "Invert" msgstr "Invertovanie" -#: ../app/core/gimpdrawable-levels.c:153 ../app/core/gimpdrawable-levels.c:169 ../app/tools/gimplevelstool.c:150 +#: ../app/core/gimpdrawable-levels.c:153 ../app/core/gimpdrawable-levels.c:169 +#: ../app/tools/gimplevelstool.c:150 msgid "Levels" msgstr "Úrovne" @@ -8411,11 +8788,13 @@ msgid "Offset Drawable" msgstr "Posun kresby" -#: ../app/core/gimpdrawable-posterize.c:69 ../app/core/gimpdrawable-posterize.c:79 ../app/tools/gimpposterizetool.c:84 +#: ../app/core/gimpdrawable-posterize.c:69 +#: ../app/core/gimpdrawable-posterize.c:79 ../app/tools/gimpposterizetool.c:84 msgid "Posterize" msgstr "Posterizácia" -#: ../app/core/gimpdrawable-stroke.c:272 ../app/paint/gimppaintcore-stroke.c:330 ../app/vectors/gimpvectors.c:556 +#: ../app/core/gimpdrawable-stroke.c:272 +#: ../app/paint/gimppaintcore-stroke.c:330 ../app/vectors/gimpvectors.c:556 msgid "Not enough points to stroke" msgstr "Nedostatok bodov pre obtiahnutie" @@ -8429,7 +8808,11 @@ msgid "Render Stroke" msgstr "Generovať obtiahnutie" -#: ../app/core/gimpdrawable-threshold.c:70 ../app/core/gimpdrawable-threshold.c:81 ../app/tools/gimpblendoptions.c:275 ../app/tools/gimpbucketfilloptions.c:285 ../app/tools/gimpregionselectoptions.c:216 ../app/tools/gimpthresholdtool.c:90 +#: ../app/core/gimpdrawable-threshold.c:70 +#: ../app/core/gimpdrawable-threshold.c:81 ../app/tools/gimpblendoptions.c:275 +#: ../app/tools/gimpbucketfilloptions.c:285 +#: ../app/tools/gimpregionselectoptions.c:216 +#: ../app/tools/gimpthresholdtool.c:90 msgid "Threshold" msgstr "Prah" @@ -8465,7 +8848,8 @@ msgid "Output type" msgstr "Výstupný typ" -#: ../app/core/gimpgradient-load.c:72 ../app/core/gimpgradient-load.c:97 ../app/core/gimpgradient-load.c:118 ../app/core/gimpgradient-load.c:169 +#: ../app/core/gimpgradient-load.c:72 ../app/core/gimpgradient-load.c:97 +#: ../app/core/gimpgradient-load.c:118 ../app/core/gimpgradient-load.c:169 #, c-format msgid "Fatal parse error in gradient file '%s': Read error in line %d." msgstr "Závažná chyba spracovania súbora palety „%s“: Chyba čítania riadku %d." @@ -8514,7 +8898,8 @@ msgstr "Farba popredia mriežky." #: ../app/core/gimpgrid.c:96 -msgid "The background color of the grid; only used in double dashed line style." +msgid "" +"The background color of the grid; only used in double dashed line style." msgstr "Farba pozadia mriežky; použije sa iba pri dvojfarebnom štýle čiary." #: ../app/core/gimpgrid.c:102 @@ -8526,7 +8911,8 @@ msgstr "Zvislé medzery medzi čiarami mriežky." #: ../app/core/gimpgrid.c:116 -msgid "Horizontal offset of the first grid line; this may be a negative number." +msgid "" +"Horizontal offset of the first grid line; this may be a negative number." msgstr "Vodorovný posun prvej čiary mriežky; môže to byť aj záporné číslo." #: ../app/core/gimpgrid.c:123 @@ -8687,19 +9073,19 @@ msgstr "Preloženie položiek" # názov operácie pre Undo -#: ../app/core/gimpimage-item-list.c:78 +#: ../app/core/gimpimage-item-list.c:79 msgctxt "undo-type" msgid "Flip Items" msgstr "Preklopenie položiek" # názov operácie pre Undo -#: ../app/core/gimpimage-item-list.c:105 +#: ../app/core/gimpimage-item-list.c:108 ../app/core/gimpitem-linked.c:125 msgctxt "undo-type" msgid "Rotate Items" msgstr "Otočenie položiek" # názov operácie pre Undo -#: ../app/core/gimpimage-item-list.c:135 +#: ../app/core/gimpimage-item-list.c:140 msgctxt "undo-type" msgid "Transform Items" msgstr "Transformovanie položiek" @@ -8880,7 +9266,7 @@ msgid "Remove Path" msgstr "Odstránenie cesty" -#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1715 +#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1750 msgid "Folder" msgstr "Priečinok" @@ -8913,7 +9299,8 @@ msgstr "(Náhľad môže byť neaktuálny)" #. pixel size -#: ../app/core/gimpimagefile.c:796 ../app/widgets/gimpimagepropview.c:440 ../app/widgets/gimpsizebox.c:432 ../app/widgets/gimptemplateeditor.c:581 +#: ../app/core/gimpimagefile.c:796 ../app/widgets/gimpimagepropview.c:440 +#: ../app/widgets/gimpsizebox.c:432 ../app/widgets/gimptemplateeditor.c:581 #, c-format msgid "%d × %d pixel" msgid_plural "%d × %d pixels" @@ -8967,8 +9354,12 @@ msgstr "Ukotvenie plávajúceho výberu" #: ../app/core/gimplayer-floating-sel.c:126 ../app/core/gimplayer.c:620 -msgid "Cannot create a new layer from the floating selection because it belongs to a layer mask or channel." -msgstr "Nie je možné vytvoriť novú vrstvu z plávajúceho výberu, pretože patrí do masky vrstvy alebo kanála." +msgid "" +"Cannot create a new layer from the floating selection because it belongs to " +"a layer mask or channel." +msgstr "" +"Nie je možné vytvoriť novú vrstvu z plávajúceho výberu, pretože patrí do " +"masky vrstvy alebo kanála." # názov operácie pre Undo #: ../app/core/gimplayer-floating-sel.c:133 @@ -9050,7 +9441,8 @@ msgid "Layer cannot be lowered more." msgstr "Vrstvu nie je možné posunúť nižšie." -#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1529 ../app/core/gimplayermask.c:236 +#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1532 +#: ../app/core/gimplayermask.c:236 #, c-format msgid "%s mask" msgstr "maska %s" @@ -9064,52 +9456,52 @@ "Plávajúci výber\n" "(%s)" -#: ../app/core/gimplayer.c:1449 +#: ../app/core/gimplayer.c:1452 msgid "Unable to add a layer mask since the layer already has one." msgstr "Nepodarilo sa pridať masku vrstvy, pretože vrstva už masku má." -#: ../app/core/gimplayer.c:1460 +#: ../app/core/gimplayer.c:1463 msgid "Cannot add layer mask of different dimensions than specified layer." msgstr "Nie je možné pridať masku iných rozmerov, než má špecifikovaná vrstva." # názov operácie pre Undo -#: ../app/core/gimplayer.c:1466 +#: ../app/core/gimplayer.c:1469 msgctxt "undo-type" msgid "Add Layer Mask" msgstr "Pridanie masky vrstvy" # názov operácie pre Undo -#: ../app/core/gimplayer.c:1584 +#: ../app/core/gimplayer.c:1587 msgctxt "undo-type" msgid "Transfer Alpha to Mask" msgstr "Presun alfa kanála do masky" # názov operácie pre Undo -#: ../app/core/gimplayer.c:1754 +#: ../app/core/gimplayer.c:1757 msgctxt "undo-type" msgid "Apply Layer Mask" msgstr "Použiť masku vrstvy" # názov operácie pre Undo -#: ../app/core/gimplayer.c:1755 +#: ../app/core/gimplayer.c:1758 msgctxt "undo-type" msgid "Delete Layer Mask" msgstr "Odstrániť masku vrstvy" # názov operácie pre Undo -#: ../app/core/gimplayer.c:1874 +#: ../app/core/gimplayer.c:1877 msgctxt "undo-type" msgid "Add Alpha Channel" msgstr "Pridanie alfa kanálu" # názov operácie pre Undo -#: ../app/core/gimplayer.c:1928 +#: ../app/core/gimplayer.c:1931 msgctxt "undo-type" msgid "Remove Alpha Channel" msgstr "Odstránenie alfa kanálu" # názov operácie pre Undo -#: ../app/core/gimplayer.c:1948 +#: ../app/core/gimplayer.c:1951 msgctxt "undo-type" msgid "Layer to Image Size" msgstr "Zmena vrstvy na veľkosť obrázka" @@ -9159,7 +9551,9 @@ msgid "Unknown type of palette file: %s" msgstr "Neznámy typ súboru palety: %s" -#: ../app/core/gimppalette-load.c:86 ../app/core/gimppalette-load.c:112 ../app/core/gimppalette-load.c:133 ../app/core/gimppalette-load.c:162 ../app/core/gimppalette-load.c:238 +#: ../app/core/gimppalette-load.c:86 ../app/core/gimppalette-load.c:112 +#: ../app/core/gimppalette-load.c:133 ../app/core/gimppalette-load.c:162 +#: ../app/core/gimppalette-load.c:238 #, c-format msgid "Fatal parse error in palette file '%s': Read error in line %d." msgstr "Závažná chyba v súbore palety „%s“: Chyba čítania na riadku %d." @@ -9176,8 +9570,12 @@ #: ../app/core/gimppalette-load.c:149 #, c-format -msgid "Reading palette file '%s': Invalid number of columns in line %d. Using default value." -msgstr "Čítanie súboru palety „%s“: Neplatný počet stĺpcov na riadku %d. Použije sa štandardná hodnota." +msgid "" +"Reading palette file '%s': Invalid number of columns in line %d. Using " +"default value." +msgstr "" +"Čítanie súboru palety „%s“: Neplatný počet stĺpcov na riadku %d. Použije sa " +"štandardná hodnota." #: ../app/core/gimppalette-load.c:185 #, c-format @@ -9209,14 +9607,16 @@ msgid "Fatal parse error in palette file '%s'" msgstr "Závažná chyba v súbore palety „%s“" -#: ../app/core/gimppattern-load.c:85 ../app/core/gimppattern-load.c:131 ../app/core/gimppattern-load.c:162 +#: ../app/core/gimppattern-load.c:85 ../app/core/gimppattern-load.c:131 +#: ../app/core/gimppattern-load.c:162 #, c-format msgid "Fatal parse error in pattern file '%s': File appears truncated." msgstr "Závažná chyba v súbore vzoru „%s“: Súbor sa zdá byť skrátený." #: ../app/core/gimppattern-load.c:104 #, c-format -msgid "Fatal parse error in pattern file '%s': Unknown pattern format version %d." +msgid "" +"Fatal parse error in pattern file '%s': Unknown pattern format version %d." msgstr "Závažná chyba v súbore vzoru „%s“: Neznáma verzia formátu vzoru %d." #: ../app/core/gimppattern-load.c:114 @@ -9236,7 +9636,9 @@ #: ../app/core/gimppdbprogress.c:279 ../app/widgets/gimppdbdialog.c:331 #, c-format msgid "Unable to run %s callback. The corresponding plug-in may have crashed." -msgstr "Nie je možné spustiť spätné volanie %s. Príslušný zásuvný modul možno havaroval." +msgstr "" +"Nie je možné spustiť spätné volanie %s. Príslušný zásuvný modul možno " +"havaroval." #: ../app/core/gimpprogress.c:106 ../app/core/gimpprogress.c:153 msgid "Please wait" @@ -9308,7 +9710,8 @@ #: ../app/core/gimpselection.c:670 msgid "Unable to cut or copy because the selected region is empty." -msgstr "Nepodarilo sa vystrihnúť alebo kopírovať, lebo označená oblasť je prázdna." +msgstr "" +"Nepodarilo sa vystrihnúť alebo kopírovať, lebo označená oblasť je prázdna." #: ../app/core/gimpselection.c:847 msgid "Cannot float selection because the selected region is empty." @@ -9325,8 +9728,12 @@ msgstr "Plávajúca vrstva" #: ../app/core/gimpstrokeoptions.c:180 -msgid "Convert a mitered join to a bevelled join if the miter would extend to a distance of more than miter-limit * line-width from the actual join point." -msgstr "Zmení bod ostrosti na skosený bod, ak sklon bude prečnievať na väčšiu vzdialenosť ako je limit ostrosti*šírka čiary, z aktuálneho bodu spojenia." +msgid "" +"Convert a mitered join to a bevelled join if the miter would extend to a " +"distance of more than miter-limit * line-width from the actual join point." +msgstr "" +"Zmení bod ostrosti na skosený bod, ak sklon bude prečnievať na väčšiu " +"vzdialenosť ako je limit ostrosti*šírka čiary, z aktuálneho bodu spojenia." #: ../app/core/gimptoolpreset-load.c:61 #, c-format @@ -9335,7 +9742,8 @@ #: ../app/core/gimptemplate.c:129 msgid "The unit used for coordinate display when not in dot-for-dot mode." -msgstr "Jednotka používaná pre zobrazovanie súradníc mimo režimu jedna k jednej." +msgstr "" +"Jednotka používaná pre zobrazovanie súradníc mimo režimu jedna k jednej." #: ../app/core/gimptemplate.c:136 msgid "The horizontal image resolution." @@ -9420,7 +9828,7 @@ msgid "translator-credits" msgstr "" "Peter Mráz , 2010.\n" -"Dušan Kazik , 2015" +"Dušan Kazik , 2017" #: ../app/dialogs/about-dialog.c:521 msgid "GIMP is brought to you by" @@ -9498,10 +9906,12 @@ #: ../app/dialogs/data-delete-dialog.c:107 #, c-format -msgid "Are you sure you want to remove '%s' from the list and delete it on disk?" +msgid "" +"Are you sure you want to remove '%s' from the list and delete it on disk?" msgstr "Naozaj chcete odobrať „%s“ zo zoznamu a odstrániť z disku?" -#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:162 ../app/gui/gui-message.c:149 +#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:174 +#: ../app/gui/gui-message.c:149 msgid "GIMP Message" msgstr "GIMP správa" @@ -9607,57 +10017,75 @@ msgid "_Export" msgstr "_Exportovať" -#: ../app/dialogs/file-save-dialog.c:458 -msgid "Saving remote files needs to determine the file format from the file extension. Please enter a file extension that matches the selected file format or enter no file extension at all." -msgstr "Uloženie vzdialených súborov vyžaduje určenie formátu súboru pomocou prípony súboru. Prosím zadajte príponu súboru, ktorá zodpovedá zvolenému formátu súboru alebo príponu vôbec nezadávajte." +#: ../app/dialogs/file-save-dialog.c:454 +msgid "" +"Saving remote files needs to determine the file format from the file " +"extension. Please enter a file extension that matches the selected file " +"format or enter no file extension at all." +msgstr "" +"Uloženie vzdialených súborov vyžaduje určenie formátu súboru pomocou prípony " +"súboru. Prosím zadajte príponu súboru, ktorá zodpovedá zvolenému formátu " +"súboru alebo príponu vôbec nezadávajte." -#: ../app/dialogs/file-save-dialog.c:605 +#: ../app/dialogs/file-save-dialog.c:601 msgid "The given filename cannot be used for exporting" msgstr "Požadovaný názov súboru sa nedá použiť pre exportovanie." -#: ../app/dialogs/file-save-dialog.c:606 -msgid "You can use this dialog to export to various file formats. If you want to save the image to the GIMP XCF format, use File→Save instead." -msgstr "Tento dialóg môžete použiť na exportovanie súborov do rôznych formátov. Ak chcete uložiť obrázok do formátu GIMP XCF, použite Súbor→Uložiť." +#: ../app/dialogs/file-save-dialog.c:602 +msgid "" +"You can use this dialog to export to various file formats. If you want to " +"save the image to the GIMP XCF format, use File→Save instead." +msgstr "" +"Tento dialóg môžete použiť na exportovanie súborov do rôznych formátov. Ak " +"chcete uložiť obrázok do formátu GIMP XCF, použite Súbor→Uložiť." # tooltip -#: ../app/dialogs/file-save-dialog.c:609 +#: ../app/dialogs/file-save-dialog.c:605 msgid "Take me to the Save dialog" msgstr "Otvorí dialóg s uložením" -#: ../app/dialogs/file-save-dialog.c:613 +#: ../app/dialogs/file-save-dialog.c:609 msgid "The given filename cannot be used for saving" msgstr "Požadovaný názov súboru sa nedá použiť pre uloženie." -#: ../app/dialogs/file-save-dialog.c:614 -msgid "You can use this dialog to save to the GIMP XCF format. Use File→Export to export to other file formats." -msgstr "Tento dialóg môžete použiť na uloženie do formátu GIMP XCF. Na exportovanie súboru do iných formátov použite Súbor→Exportovať." +#: ../app/dialogs/file-save-dialog.c:610 +msgid "" +"You can use this dialog to save to the GIMP XCF format. Use File→Export to " +"export to other file formats." +msgstr "" +"Tento dialóg môžete použiť na uloženie do formátu GIMP XCF. Na exportovanie " +"súboru do iných formátov použite Súbor→Exportovať." # tooltip -#: ../app/dialogs/file-save-dialog.c:616 +#: ../app/dialogs/file-save-dialog.c:612 msgid "Take me to the Export dialog" msgstr "Otvorí dialóg s exportovaním" -#: ../app/dialogs/file-save-dialog.c:619 ../app/dialogs/file-save-dialog.c:694 +#: ../app/dialogs/file-save-dialog.c:615 ../app/dialogs/file-save-dialog.c:690 msgid "Extension Mismatch" msgstr "Nezhoda s príponou" -#: ../app/dialogs/file-save-dialog.c:678 -msgid "The given filename does not have any known file extension. Please enter a known file extension or select a file format from the file format list." -msgstr "Požadovaný názov súboru nemá známu príponu súboru. Prosím, zadajte príponu súboru alebo vyberte formát súboru zo zoznamu formátov." +#: ../app/dialogs/file-save-dialog.c:674 +msgid "" +"The given filename does not have any known file extension. Please enter a " +"known file extension or select a file format from the file format list." +msgstr "" +"Požadovaný názov súboru nemá známu príponu súboru. Prosím, zadajte príponu " +"súboru alebo vyberte formát súboru zo zoznamu formátov." -#: ../app/dialogs/file-save-dialog.c:710 +#: ../app/dialogs/file-save-dialog.c:706 msgid "The given file extension does not match the chosen file type." msgstr "Požadovaná prípona súboru nesúhlasí s vybraným typom súboru." -#: ../app/dialogs/file-save-dialog.c:714 +#: ../app/dialogs/file-save-dialog.c:710 msgid "Do you want to save the image using this name anyway?" msgstr "Chcete napriek tomu uložiť obrázok s použitím tohto názvu?" -#: ../app/dialogs/file-save-dialog.c:776 +#: ../app/dialogs/file-save-dialog.c:772 msgid "Saving canceled" msgstr "Ukladanie zrušené" -#: ../app/dialogs/file-save-dialog.c:784 ../app/widgets/gimpdnd-xds.c:186 +#: ../app/dialogs/file-save-dialog.c:780 ../app/widgets/gimpdnd-xds.c:186 #, c-format msgid "" "Saving '%s' failed:\n" @@ -9727,7 +10155,8 @@ msgid "Create a New Image" msgstr "Vytvoriť nový obrázok" -#: ../app/dialogs/image-new-dialog.c:135 ../app/dialogs/preferences-dialog.c:2016 +#: ../app/dialogs/image-new-dialog.c:135 +#: ../app/dialogs/preferences-dialog.c:2053 msgid "_Template:" msgstr "Š_ablóna:" @@ -9735,17 +10164,23 @@ msgid "Confirm Image Size" msgstr "Potvrdiť rozmery obrázka" -#: ../app/dialogs/image-new-dialog.c:338 ../app/dialogs/image-scale-dialog.c:239 +#: ../app/dialogs/image-new-dialog.c:338 +#: ../app/dialogs/image-scale-dialog.c:239 #, c-format msgid "You are trying to create an image with a size of %s." msgstr "Snažíte sa vytvoriť obrázok s veľkosťou %s." #: ../app/dialogs/image-new-dialog.c:345 #, c-format -msgid "An image of the chosen size will use more memory than what is configured as \"Maximum Image Size\" in the Preferences dialog (currently %s)." -msgstr "Obrázok zvolenej veľkosti bude používať viac pamäti, než je nastavené vo voľbe „Maximálna veľkosť obrázka“ v dialógu Nastavenia (aktuálne %s)." +msgid "" +"An image of the chosen size will use more memory than what is configured as " +"\"Maximum Image Size\" in the Preferences dialog (currently %s)." +msgstr "" +"Obrázok zvolenej veľkosti bude používať viac pamäti, než je nastavené vo " +"voľbe „Maximálna veľkosť obrázka“ v dialógu Nastavenia (aktuálne %s)." -#: ../app/dialogs/image-properties-dialog.c:60 ../app/dialogs/image-properties-dialog.c:63 +#: ../app/dialogs/image-properties-dialog.c:60 +#: ../app/dialogs/image-properties-dialog.c:63 msgid "Image Properties" msgstr "Vlastnosti obrázka" @@ -9772,12 +10207,21 @@ #: ../app/dialogs/image-scale-dialog.c:245 #, c-format -msgid "Scaling the image to the chosen size will make it use more memory than what is configured as \"Maximum Image Size\" in the Preferences dialog (currently %s)." -msgstr "Úprava mierky obrázka na zvolenú veľkosť spôsobí, že sa bude používať viac pamäte, než je nastavené vo voľbe „Maximálna veľkosť obrázka“ v dialógu Nastavenia (aktuálne %s)." +msgid "" +"Scaling the image to the chosen size will make it use more memory than what " +"is configured as \"Maximum Image Size\" in the Preferences dialog (currently " +"%s)." +msgstr "" +"Úprava mierky obrázka na zvolenú veľkosť spôsobí, že sa bude používať viac " +"pamäte, než je nastavené vo voľbe „Maximálna veľkosť obrázka“ v dialógu " +"Nastavenia (aktuálne %s)." #: ../app/dialogs/image-scale-dialog.c:260 -msgid "Scaling the image to the chosen size will shrink some layers completely away." -msgstr "Úprava mierky obrázka na zvolenú veľkosť zmenší niektoré vrstvy natoľko, že zmiznú." +msgid "" +"Scaling the image to the chosen size will shrink some layers completely away." +msgstr "" +"Úprava mierky obrázka na zvolenú veľkosť zmenší niektoré vrstvy natoľko, že " +"zmiznú." #: ../app/dialogs/image-scale-dialog.c:264 msgid "Is this what you want to do?" @@ -9792,8 +10236,12 @@ msgstr "Nastaviť klávesové skratky" #: ../app/dialogs/keyboard-shortcuts-dialog.c:73 -msgid "To edit a shortcut key, click on the corresponding row and type a new accelerator, or press backspace to clear." -msgstr "Klávesovú skratku upravíte kliknutím na príslušný riadok a napísaním novej skratky alebo ju môžeme vymazať stlačením Backspace." +msgid "" +"To edit a shortcut key, click on the corresponding row and type a new " +"accelerator, or press backspace to clear." +msgstr "" +"Klávesovú skratku upravíte kliknutím na príslušný riadok a napísaním novej " +"skratky alebo ju môžeme vymazať stlačením Backspace." # checkbutton #: ../app/dialogs/keyboard-shortcuts-dialog.c:81 @@ -9819,11 +10267,13 @@ msgstr "_Názov vrstvy:" #. The size labels -#: ../app/dialogs/layer-options-dialog.c:139 ../app/tools/gimpmeasuretool.c:1129 +#: ../app/dialogs/layer-options-dialog.c:139 +#: ../app/tools/gimpmeasuretool.c:1129 msgid "Width:" msgstr "Šírka:" -#: ../app/dialogs/layer-options-dialog.c:145 ../app/tools/gimpmeasuretool.c:1157 +#: ../app/dialogs/layer-options-dialog.c:145 +#: ../app/tools/gimpmeasuretool.c:1157 msgid "Height:" msgstr "Výška:" @@ -9891,7 +10341,9 @@ msgstr "Posun kanála" #. The offset frame -#: ../app/dialogs/offset-dialog.c:118 ../app/dialogs/offset-dialog.c:152 ../app/dialogs/resize-dialog.c:198 ../app/tools/gimpblendoptions.c:247 ../app/widgets/gimpgrideditor.c:206 +#: ../app/dialogs/offset-dialog.c:118 ../app/dialogs/offset-dialog.c:152 +#: ../app/dialogs/resize-dialog.c:198 ../app/tools/gimpblendoptions.c:247 +#: ../app/widgets/gimpgrideditor.c:206 msgid "Offset" msgstr "Posun" @@ -9948,7 +10400,8 @@ msgstr "Vyberte zdroj" # radiobutton -#: ../app/dialogs/palette-import-dialog.c:214 ../app/dialogs/preferences-dialog.c:1930 +#: ../app/dialogs/palette-import-dialog.c:214 +#: ../app/dialogs/preferences-dialog.c:1967 msgid "_Gradient" msgstr "_Prechod" @@ -10011,833 +10464,870 @@ msgid "The selected source contains no colors." msgstr "Vybraný zdroj neobsahuje žiadne farby." -#: ../app/dialogs/preferences-dialog.c:268 +#: ../app/dialogs/preferences-dialog.c:266 msgid "Reset All Preferences" msgstr "Obnoviť všetky pôvodné nastavenia" -#: ../app/dialogs/preferences-dialog.c:286 +#: ../app/dialogs/preferences-dialog.c:284 msgid "Do you really want to reset all preferences to default values?" -msgstr "Skutočne chcete obnoviť všetky nastavenia nástrojov na štandardné hodnoty?" +msgstr "" +"Skutočne chcete obnoviť všetky nastavenia nástrojov na štandardné hodnoty?" -#: ../app/dialogs/preferences-dialog.c:356 +#: ../app/dialogs/preferences-dialog.c:362 msgid "You will have to restart GIMP for the following changes to take effect:" msgstr "Aby sa zmeny prejavili, je potrebné reštartovať GIMP:" -#: ../app/dialogs/preferences-dialog.c:538 -msgid "Your keyboard shortcuts will be reset to default values the next time you start GIMP." -msgstr "Klávesové skratky budú nastavené na štandardné hodnoty po nasledujúcom spustení programu GIMP." +#: ../app/dialogs/preferences-dialog.c:544 +msgid "" +"Your keyboard shortcuts will be reset to default values the next time you " +"start GIMP." +msgstr "" +"Klávesové skratky budú nastavené na štandardné hodnoty po nasledujúcom " +"spustení programu GIMP." -#: ../app/dialogs/preferences-dialog.c:549 +#: ../app/dialogs/preferences-dialog.c:555 msgid "Remove all Keyboard Shortcuts" msgstr "Odstrániť všetky klávesové skratky" -#: ../app/dialogs/preferences-dialog.c:571 +#: ../app/dialogs/preferences-dialog.c:577 msgid "Do you really want to remove all keyboard shortcuts from all menus?" msgstr "Skutočne chcete odstrániť klávesové skratky zo všetkých ponúk?" -#: ../app/dialogs/preferences-dialog.c:612 -msgid "Your window setup will be reset to default values the next time you start GIMP." -msgstr "Nastavenia okien budú nastavené na štandardné hodnoty po nasledujúcom spustení programu GIMP." - -#: ../app/dialogs/preferences-dialog.c:647 -msgid "Your input device settings will be reset to default values the next time you start GIMP." -msgstr "Nastavenia vstupných zariadení budú nastavené na štandardné hodnoty po nasledujúcom spustení programu GIMP." - -#: ../app/dialogs/preferences-dialog.c:682 -msgid "Your tool options will be reset to default values the next time you start GIMP." -msgstr "Voľby nástrojov budú nastavené na štandardné hodnoty po nasledujúcom spustení programu GIMP." +#: ../app/dialogs/preferences-dialog.c:618 +msgid "" +"Your window setup will be reset to default values the next time you start " +"GIMP." +msgstr "" +"Nastavenia okien budú nastavené na štandardné hodnoty po nasledujúcom " +"spustení programu GIMP." + +#: ../app/dialogs/preferences-dialog.c:653 +msgid "" +"Your input device settings will be reset to default values the next time you " +"start GIMP." +msgstr "" +"Nastavenia vstupných zariadení budú nastavené na štandardné hodnoty po " +"nasledujúcom spustení programu GIMP." + +#: ../app/dialogs/preferences-dialog.c:688 +msgid "" +"Your tool options will be reset to default values the next time you start " +"GIMP." +msgstr "" +"Voľby nástrojov budú nastavené na štandardné hodnoty po nasledujúcom " +"spustení programu GIMP." -#: ../app/dialogs/preferences-dialog.c:1268 +#: ../app/dialogs/preferences-dialog.c:1303 msgid "Show _menubar" msgstr "Zobraziť po_nuku" -#: ../app/dialogs/preferences-dialog.c:1272 +#: ../app/dialogs/preferences-dialog.c:1307 msgid "Show _rulers" msgstr "Zobraziť _pravítka" -#: ../app/dialogs/preferences-dialog.c:1275 +#: ../app/dialogs/preferences-dialog.c:1310 msgid "Show scroll_bars" msgstr "Zobraziť p_osuvníky" -#: ../app/dialogs/preferences-dialog.c:1278 +#: ../app/dialogs/preferences-dialog.c:1313 msgid "Show s_tatusbar" msgstr "Zobraziť s_tavový riadok" -#: ../app/dialogs/preferences-dialog.c:1286 +#: ../app/dialogs/preferences-dialog.c:1321 msgid "Show s_election" msgstr "Zobraziť výb_er" -#: ../app/dialogs/preferences-dialog.c:1289 +#: ../app/dialogs/preferences-dialog.c:1324 msgid "Show _layer boundary" msgstr "Zobraziť o_hraničenie vrstvy" -#: ../app/dialogs/preferences-dialog.c:1292 +#: ../app/dialogs/preferences-dialog.c:1327 msgid "Show _guides" msgstr "Zobraziť vo_didlá" -#: ../app/dialogs/preferences-dialog.c:1295 +#: ../app/dialogs/preferences-dialog.c:1330 msgid "Show gri_d" msgstr "Zobraziť m_riežku" -#: ../app/dialogs/preferences-dialog.c:1301 +#: ../app/dialogs/preferences-dialog.c:1336 msgid "Canvas _padding mode:" msgstr "Režim _obtekania plátna:" -#: ../app/dialogs/preferences-dialog.c:1306 +#: ../app/dialogs/preferences-dialog.c:1341 msgid "Custom p_adding color:" msgstr "Vlastná f_arba obtekania:" -#: ../app/dialogs/preferences-dialog.c:1307 +#: ../app/dialogs/preferences-dialog.c:1342 msgid "Select Custom Canvas Padding Color" msgstr "Zvoľte vlastnú farbu obtekania plátna" -#: ../app/dialogs/preferences-dialog.c:1405 +#: ../app/dialogs/preferences-dialog.c:1440 msgid "Preferences" msgstr "Nastavenia" -#: ../app/dialogs/preferences-dialog.c:1518 ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:1553 +#: ../app/dialogs/preferences-dialog.c:2827 msgid "Environment" msgstr "Prostredie" -#: ../app/dialogs/preferences-dialog.c:1532 +#: ../app/dialogs/preferences-dialog.c:1567 msgid "Resource Consumption" msgstr "Spotreba zdrojov" -#: ../app/dialogs/preferences-dialog.c:1542 +#: ../app/dialogs/preferences-dialog.c:1577 msgid "Minimal number of _undo levels:" msgstr "Minimálny počet ú_rovní vrátenia späť:" -#: ../app/dialogs/preferences-dialog.c:1545 +#: ../app/dialogs/preferences-dialog.c:1580 msgid "Maximum undo _memory:" msgstr "Maximum _pamäte pre vrátenie späť:" -#: ../app/dialogs/preferences-dialog.c:1548 +#: ../app/dialogs/preferences-dialog.c:1583 msgid "Tile cache _size:" msgstr "Veľkosť vyrovnávacej _pamäte:" -#: ../app/dialogs/preferences-dialog.c:1551 +#: ../app/dialogs/preferences-dialog.c:1586 msgid "Maximum _new image size:" msgstr "Maximálna veľkosť _nového obrázka:" -#: ../app/dialogs/preferences-dialog.c:1556 +#: ../app/dialogs/preferences-dialog.c:1591 msgid "Number of _processors to use:" msgstr "Počet používaných p_rocesorov:" #. Image Thumbnails -#: ../app/dialogs/preferences-dialog.c:1561 +#: ../app/dialogs/preferences-dialog.c:1596 msgid "Image Thumbnails" msgstr "Miniatúry obrázkov" -#: ../app/dialogs/preferences-dialog.c:1566 +#: ../app/dialogs/preferences-dialog.c:1601 msgid "Size of _thumbnails:" msgstr "Veľkosť _miniatúr:" -#: ../app/dialogs/preferences-dialog.c:1570 +#: ../app/dialogs/preferences-dialog.c:1605 msgid "Maximum _filesize for thumbnailing:" msgstr "Maximálna _veľkosť súboru pre miniatúry:" -#: ../app/dialogs/preferences-dialog.c:1580 +#: ../app/dialogs/preferences-dialog.c:1615 msgid "Keep record of used files in the Recent Documents list" msgstr "Ponechať _záznam o súbore v zozname Nedávne dokumenty" -#: ../app/dialogs/preferences-dialog.c:1589 +#: ../app/dialogs/preferences-dialog.c:1624 msgid "User Interface" msgstr "Používateľské rozhranie" -#: ../app/dialogs/preferences-dialog.c:1592 +#: ../app/dialogs/preferences-dialog.c:1627 msgid "Interface" msgstr "Rozhranie" -#: ../app/dialogs/preferences-dialog.c:1602 +#: ../app/dialogs/preferences-dialog.c:1637 msgid "Language" msgstr "Jazyk" #. Previews -#: ../app/dialogs/preferences-dialog.c:1608 +#: ../app/dialogs/preferences-dialog.c:1643 msgid "Previews" msgstr "Náhľady" -#: ../app/dialogs/preferences-dialog.c:1611 +#: ../app/dialogs/preferences-dialog.c:1646 msgid "_Enable layer & channel previews" msgstr "_Povoliť náhľad na vrstvy a kanály" -#: ../app/dialogs/preferences-dialog.c:1617 +#: ../app/dialogs/preferences-dialog.c:1652 msgid "_Default layer & channel preview size:" msgstr "Štandardná veľkosť náhľadu na _vrstvy a kanály:" -#: ../app/dialogs/preferences-dialog.c:1620 +#: ../app/dialogs/preferences-dialog.c:1655 msgid "Na_vigation preview size:" msgstr "Veľkosť _navigačného náhľadu:" #. Keyboard Shortcuts -#: ../app/dialogs/preferences-dialog.c:1624 +#: ../app/dialogs/preferences-dialog.c:1659 msgid "Keyboard Shortcuts" msgstr "Klávesové skratky" -#: ../app/dialogs/preferences-dialog.c:1628 +#: ../app/dialogs/preferences-dialog.c:1663 msgid "_Use dynamic keyboard shortcuts" msgstr "Použiť _dynamické klávesové skratky" -#: ../app/dialogs/preferences-dialog.c:1632 +#: ../app/dialogs/preferences-dialog.c:1667 msgid "Configure _Keyboard Shortcuts..." msgstr "Nastaviť _klávesové skratky..." -#: ../app/dialogs/preferences-dialog.c:1639 +#: ../app/dialogs/preferences-dialog.c:1674 msgid "_Save keyboard shortcuts on exit" msgstr "_Uložiť klávesové skratky pri ukončení" -#: ../app/dialogs/preferences-dialog.c:1643 +#: ../app/dialogs/preferences-dialog.c:1678 msgid "Save Keyboard Shortcuts _Now" msgstr "_Teraz uložiť klávesové skratky" -#: ../app/dialogs/preferences-dialog.c:1650 +#: ../app/dialogs/preferences-dialog.c:1685 msgid "_Reset Keyboard Shortcuts to Default Values" msgstr "O_bnoviť uložené klávesové skratky na štandardné hodnoty" -#: ../app/dialogs/preferences-dialog.c:1659 +#: ../app/dialogs/preferences-dialog.c:1694 msgid "Remove _All Keyboard Shortcuts" msgstr "O_dstrániť všetky klávesové skratky" -#: ../app/dialogs/preferences-dialog.c:1671 ../app/dialogs/preferences-dialog.c:1710 +#: ../app/dialogs/preferences-dialog.c:1706 +#: ../app/dialogs/preferences-dialog.c:1745 msgid "Theme" msgstr "Téma" -#: ../app/dialogs/preferences-dialog.c:1680 +#: ../app/dialogs/preferences-dialog.c:1715 msgid "Select Theme" msgstr "Zvoľte tému" -#: ../app/dialogs/preferences-dialog.c:1762 +#: ../app/dialogs/preferences-dialog.c:1797 msgid "Reload C_urrent Theme" msgstr "Znovunačítanie akt_uálnej témy" -#: ../app/dialogs/preferences-dialog.c:1774 +#: ../app/dialogs/preferences-dialog.c:1809 msgid "Help System" msgstr "Systém pomocníkov" #. General -#: ../app/dialogs/preferences-dialog.c:1786 ../app/dialogs/preferences-dialog.c:1873 ../app/dialogs/preferences-dialog.c:2086 ../app/widgets/gimpcontrollereditor.c:185 +#: ../app/dialogs/preferences-dialog.c:1821 +#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:2123 +#: ../app/widgets/gimpcontrollereditor.c:185 msgid "General" msgstr "Všeobecné" -#: ../app/dialogs/preferences-dialog.c:1789 +#: ../app/dialogs/preferences-dialog.c:1824 msgid "Show _tooltips" msgstr "Zobraziť _bublinového pomocníka" -#: ../app/dialogs/preferences-dialog.c:1792 +#: ../app/dialogs/preferences-dialog.c:1827 msgid "Show help _buttons" msgstr "Zobraziť _tlačidlá pomocníka" -#: ../app/dialogs/preferences-dialog.c:1805 +#: ../app/dialogs/preferences-dialog.c:1832 msgid "Use the online version" msgstr "Použit webovú verziu" -#: ../app/dialogs/preferences-dialog.c:1806 +#: ../app/dialogs/preferences-dialog.c:1833 msgid "Use a locally installed copy" msgstr "Použit lokálne nainštalovanú kópiu" -#: ../app/dialogs/preferences-dialog.c:1807 +#: ../app/dialogs/preferences-dialog.c:1834 msgid "User manual:" msgstr "Používateľská príručka:" -#: ../app/dialogs/preferences-dialog.c:1814 +#: ../app/dialogs/preferences-dialog.c:1841 msgid "There's a local installation of the user manual." msgstr "V počítači je miestna inštalácia používateľskej príručky." -#: ../app/dialogs/preferences-dialog.c:1819 +#: ../app/dialogs/preferences-dialog.c:1847 msgid "The user manual is not installed locally." msgstr "Používateľská príručka nie je v počítači nainštalovaná." -#: ../app/dialogs/preferences-dialog.c:1844 +#. If there is no webkit available, assume we are on a platform +#. * that doesn't use the help browser, so don't bother showing +#. * the combo. +#. +#: ../app/dialogs/preferences-dialog.c:1860 msgid "Help Browser" msgstr "Prehliadač pomocníka" -#: ../app/dialogs/preferences-dialog.c:1848 +#: ../app/dialogs/preferences-dialog.c:1867 msgid "H_elp browser to use:" msgstr "_Prehliadač pre pomocníka:" -#: ../app/dialogs/preferences-dialog.c:1876 +#: ../app/dialogs/preferences-dialog.c:1873 +msgid "" +"The GIMP help browser doesn't seem to be installed. Using the web browser " +"instead." +msgstr "" +"Zdá sa, že prehliadač pomocníka programu GIMP nie je nainštalovaný. Namiesto " +"neho sa použije webový prehliadač." + +#: ../app/dialogs/preferences-dialog.c:1913 msgid "_Save tool options on exit" msgstr "_Uložiť voľby nástrojov pri ukončení" -#: ../app/dialogs/preferences-dialog.c:1880 +#: ../app/dialogs/preferences-dialog.c:1917 msgid "Save Tool Options _Now" msgstr "_Teraz uložiť voľby nástrojov" -#: ../app/dialogs/preferences-dialog.c:1887 +#: ../app/dialogs/preferences-dialog.c:1924 msgid "_Reset Saved Tool Options to Default Values" msgstr "_Obnoviť uložené voľby nástrojov na štandardné hodnoty" #. Snapping Distance -#: ../app/dialogs/preferences-dialog.c:1897 +#: ../app/dialogs/preferences-dialog.c:1934 msgid "Guide & Grid Snapping" msgstr "Priťahovanie k vodidlám a mriežke" -#: ../app/dialogs/preferences-dialog.c:1902 +#: ../app/dialogs/preferences-dialog.c:1939 msgid "_Snap distance:" msgstr "V_zdialenosť pritiahnutia:" -#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:1947 msgid "Default _interpolation:" msgstr "Štandardná _interpolácia:" #. Global Brush, Pattern, ... -#: ../app/dialogs/preferences-dialog.c:1917 +#: ../app/dialogs/preferences-dialog.c:1954 msgid "Paint Options Shared Between Tools" msgstr "Voľby kreslenia budú spoločné pre nástroje" # checkbox -#: ../app/dialogs/preferences-dialog.c:1921 +#: ../app/dialogs/preferences-dialog.c:1958 msgid "_Brush" msgstr "Š_tetec" # checkbox -#: ../app/dialogs/preferences-dialog.c:1924 +#: ../app/dialogs/preferences-dialog.c:1961 msgid "_Dynamics" msgstr "_Dynamiky" # checkbox -#: ../app/dialogs/preferences-dialog.c:1927 +#: ../app/dialogs/preferences-dialog.c:1964 msgid "_Pattern" msgstr "_Vzor" # frame #. Move Tool -#: ../app/dialogs/preferences-dialog.c:1934 +#: ../app/dialogs/preferences-dialog.c:1971 msgid "Move Tool" msgstr "Nástroj na posun" # checkbox -#: ../app/dialogs/preferences-dialog.c:1938 +#: ../app/dialogs/preferences-dialog.c:1975 msgid "Set layer or path as active" msgstr "_Nastaviť presunutú vrstvu alebo cestu ako aktívnu" # frame #. Appearance -#: ../app/dialogs/preferences-dialog.c:1963 ../app/dialogs/preferences-dialog.c:2162 ../app/widgets/gimpgrideditor.c:134 +#: ../app/dialogs/preferences-dialog.c:2000 +#: ../app/dialogs/preferences-dialog.c:2199 ../app/widgets/gimpgrideditor.c:134 msgid "Appearance" msgstr "Vzhľad" # checkbox -#: ../app/dialogs/preferences-dialog.c:1967 +#: ../app/dialogs/preferences-dialog.c:2004 msgid "Show _foreground & background color" msgstr "Zobraziť _farbu popredia a pozadia" # checkbox -#: ../app/dialogs/preferences-dialog.c:1971 +#: ../app/dialogs/preferences-dialog.c:2008 msgid "Show active _brush, pattern & gradient" msgstr "Zobraziť aktívny š_tetec, vzor a prechod" # checkbox -#: ../app/dialogs/preferences-dialog.c:1975 +#: ../app/dialogs/preferences-dialog.c:2012 msgid "Show active _image" msgstr "Zobraziť aktívny _obrázok" # frame #. Tool Editor -#: ../app/dialogs/preferences-dialog.c:1983 +#: ../app/dialogs/preferences-dialog.c:2020 msgid "Tools configuration" msgstr "Konfigurácia nástrojov" # notebook title -#: ../app/dialogs/preferences-dialog.c:1998 +#: ../app/dialogs/preferences-dialog.c:2035 msgid "Default New Image" msgstr "Základné nastavenia pre nový obrázok" # notebook card -#: ../app/dialogs/preferences-dialog.c:2001 +#: ../app/dialogs/preferences-dialog.c:2038 msgid "Default Image" msgstr "Nastavenie obrázka" -#: ../app/dialogs/preferences-dialog.c:2035 +#: ../app/dialogs/preferences-dialog.c:2072 msgid "Set the default Quick Mask color" msgstr "Nastaví predvolenú farbu rýchlej masky" -#: ../app/dialogs/preferences-dialog.c:2041 +#: ../app/dialogs/preferences-dialog.c:2078 msgid "Quick Mask color:" msgstr "Farba rýchlej masky:" # notebook title -#: ../app/dialogs/preferences-dialog.c:2051 +#: ../app/dialogs/preferences-dialog.c:2088 msgid "Default Image Grid" msgstr "Štandardná mriežka obrázka" # notebook card -#: ../app/dialogs/preferences-dialog.c:2054 +#: ../app/dialogs/preferences-dialog.c:2091 msgid "Default Grid" msgstr "Štandardná mriežka" # notebook card -#: ../app/dialogs/preferences-dialog.c:2074 +#: ../app/dialogs/preferences-dialog.c:2111 msgid "Image Windows" msgstr "Okná obrázka" -#: ../app/dialogs/preferences-dialog.c:2089 +#: ../app/dialogs/preferences-dialog.c:2126 msgid "Use \"_Dot for dot\" by default" msgstr "Štandardne použiť „_jedna k jednej“" -#: ../app/dialogs/preferences-dialog.c:2095 +#: ../app/dialogs/preferences-dialog.c:2132 msgid "Marching _ants speed:" msgstr "Rýchlosť behu či_ar výberu:" #. Zoom & Resize Behavior -#: ../app/dialogs/preferences-dialog.c:2099 +#: ../app/dialogs/preferences-dialog.c:2136 msgid "Zoom & Resize Behavior" msgstr "Správanie sa zmeny veľkosti a mierky" -#: ../app/dialogs/preferences-dialog.c:2103 +#: ../app/dialogs/preferences-dialog.c:2140 msgid "Resize window on _zoom" msgstr "Zmeniť veľkosť okna pri _zmene mierky zobrazenia" -#: ../app/dialogs/preferences-dialog.c:2106 +#: ../app/dialogs/preferences-dialog.c:2143 msgid "Resize window on image _size change" msgstr "Zmeniť veľkosť okna pri zmene _rozmerov obrázka" -#: ../app/dialogs/preferences-dialog.c:2112 +#: ../app/dialogs/preferences-dialog.c:2149 msgid "Fit to window" msgstr "Prispôsobiť oknu" -#: ../app/dialogs/preferences-dialog.c:2114 +#: ../app/dialogs/preferences-dialog.c:2151 msgid "Initial zoom _ratio:" msgstr "_Počiatočná mierka zobrazenia:" #. Space Bar -#: ../app/dialogs/preferences-dialog.c:2118 +#: ../app/dialogs/preferences-dialog.c:2155 msgid "Space Bar" msgstr "Medzerník" -#: ../app/dialogs/preferences-dialog.c:2124 +#: ../app/dialogs/preferences-dialog.c:2161 msgid "_While space bar is pressed:" msgstr "Pri _stlačení medzerníka:" #. Mouse Pointers -#: ../app/dialogs/preferences-dialog.c:2128 +#: ../app/dialogs/preferences-dialog.c:2165 msgid "Mouse Pointers" msgstr "Kurzory myši" -#: ../app/dialogs/preferences-dialog.c:2132 +#: ../app/dialogs/preferences-dialog.c:2169 msgid "Show _brush outline" msgstr "Zobraziť _obrys štetca" -#: ../app/dialogs/preferences-dialog.c:2135 +#: ../app/dialogs/preferences-dialog.c:2172 msgid "Show pointer for paint _tools" msgstr "Zobraziť _kurzor pri kreslení" -#: ../app/dialogs/preferences-dialog.c:2141 +#: ../app/dialogs/preferences-dialog.c:2178 msgid "Pointer _mode:" msgstr "_Režim kurzora:" -#: ../app/dialogs/preferences-dialog.c:2144 +#: ../app/dialogs/preferences-dialog.c:2181 msgid "Pointer re_ndering:" msgstr "_Vykreslenie kurzora:" -#: ../app/dialogs/preferences-dialog.c:2147 +#: ../app/dialogs/preferences-dialog.c:2184 msgid "Pointer _handedness:" msgstr "_Kurzor ovládaný pravákom/ľavákom:" -#: ../app/dialogs/preferences-dialog.c:2159 +#: ../app/dialogs/preferences-dialog.c:2196 msgid "Image Window Appearance" msgstr "Vzhľad okna obrázka" -#: ../app/dialogs/preferences-dialog.c:2170 +#: ../app/dialogs/preferences-dialog.c:2207 msgid "Default Appearance in Normal Mode" msgstr "Štandardný vzhľad v bežnom režime" -#: ../app/dialogs/preferences-dialog.c:2175 +#: ../app/dialogs/preferences-dialog.c:2212 msgid "Default Appearance in Fullscreen Mode" msgstr "Štandardný vzhľad v celoobrazovkovom režime" -#: ../app/dialogs/preferences-dialog.c:2184 +#: ../app/dialogs/preferences-dialog.c:2221 msgid "Image Title & Statusbar Format" msgstr "Formát titulku obrázka a stavového riadka" -#: ../app/dialogs/preferences-dialog.c:2187 +#: ../app/dialogs/preferences-dialog.c:2224 msgid "Title & Status" msgstr "Titulok a stavový riadok" -#: ../app/dialogs/preferences-dialog.c:2205 +#: ../app/dialogs/preferences-dialog.c:2242 msgid "Current format" msgstr "Aktuálny formát" -#: ../app/dialogs/preferences-dialog.c:2206 +#: ../app/dialogs/preferences-dialog.c:2243 msgid "Default format" msgstr "Štandardný formát" -#: ../app/dialogs/preferences-dialog.c:2207 +#: ../app/dialogs/preferences-dialog.c:2244 msgid "Show zoom percentage" msgstr "Zobraziť mierku v precentách" -#: ../app/dialogs/preferences-dialog.c:2208 +#: ../app/dialogs/preferences-dialog.c:2245 msgid "Show zoom ratio" msgstr "Zobraziť mierku pomerom" -#: ../app/dialogs/preferences-dialog.c:2209 +#: ../app/dialogs/preferences-dialog.c:2246 msgid "Show image size" msgstr "Zobraziť veľkosť obrázka" -#: ../app/dialogs/preferences-dialog.c:2222 +#: ../app/dialogs/preferences-dialog.c:2259 msgid "Image Title Format" msgstr "Formát titulku obrázka" -#: ../app/dialogs/preferences-dialog.c:2224 +#: ../app/dialogs/preferences-dialog.c:2261 msgid "Image Statusbar Format" msgstr "Formát stavového riadka obrázka" -#: ../app/dialogs/preferences-dialog.c:2309 +#: ../app/dialogs/preferences-dialog.c:2346 msgid "Display" msgstr "Zobrazenie" #. Transparency -#: ../app/dialogs/preferences-dialog.c:2321 +#: ../app/dialogs/preferences-dialog.c:2358 msgid "Transparency" msgstr "Priehľadnosť" -#: ../app/dialogs/preferences-dialog.c:2325 +#: ../app/dialogs/preferences-dialog.c:2362 msgid "_Check style:" msgstr "Š_týl šachovnice:" -#: ../app/dialogs/preferences-dialog.c:2328 +#: ../app/dialogs/preferences-dialog.c:2365 msgid "Check _size:" msgstr "Veľko_sť šachovnice:" -#: ../app/dialogs/preferences-dialog.c:2331 +#: ../app/dialogs/preferences-dialog.c:2368 msgid "Monitor Resolution" msgstr "Rozlíšenie monitora" #. Pixels -#: ../app/dialogs/preferences-dialog.c:2335 ../app/display/gimpcursorview.c:206 ../app/widgets/gimpgrideditor.c:199 ../app/widgets/gimpgrideditor.c:231 +#: ../app/dialogs/preferences-dialog.c:2372 ../app/display/gimpcursorview.c:208 +#: ../app/widgets/gimpgrideditor.c:199 ../app/widgets/gimpgrideditor.c:231 msgid "Pixels" msgstr "Pixelov" -#: ../app/dialogs/preferences-dialog.c:2353 +#: ../app/dialogs/preferences-dialog.c:2390 msgid "Horizontal" msgstr "Vodorovne" -#: ../app/dialogs/preferences-dialog.c:2355 +#: ../app/dialogs/preferences-dialog.c:2392 msgid "Vertical" msgstr "Zvisle" -#: ../app/dialogs/preferences-dialog.c:2357 ../app/widgets/gimpimagepropview.c:469 +#: ../app/dialogs/preferences-dialog.c:2394 +#: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "ppi" # radio button -#: ../app/dialogs/preferences-dialog.c:2373 +#: ../app/dialogs/preferences-dialog.c:2410 #, c-format msgid "_Detect automatically (currently %d × %d ppi)" msgstr "Zistiť _automaticky (momentálne %d x %d ppi)" # radio button -#: ../app/dialogs/preferences-dialog.c:2391 +#: ../app/dialogs/preferences-dialog.c:2428 msgid "_Enter manually" msgstr "_Zadať ručne" # button -#: ../app/dialogs/preferences-dialog.c:2406 +#: ../app/dialogs/preferences-dialog.c:2443 msgid "C_alibrate..." msgstr "K_alibrovať..." # netbook page -#: ../app/dialogs/preferences-dialog.c:2434 +#: ../app/dialogs/preferences-dialog.c:2471 msgid "Color Management" msgstr "Správa farieb" -#: ../app/dialogs/preferences-dialog.c:2454 +#: ../app/dialogs/preferences-dialog.c:2491 msgid "_RGB profile:" msgstr "_RGB profil:" # dialog title -#: ../app/dialogs/preferences-dialog.c:2455 +#: ../app/dialogs/preferences-dialog.c:2492 msgid "Select RGB Color Profile" msgstr "Výbrať profil farieb RGB" -#: ../app/dialogs/preferences-dialog.c:2456 +#: ../app/dialogs/preferences-dialog.c:2493 msgid "_CMYK profile:" msgstr "_CMYK profil:" # dialog title -#: ../app/dialogs/preferences-dialog.c:2457 +#: ../app/dialogs/preferences-dialog.c:2494 msgid "Select CMYK Color Profile" msgstr "Vybrať profil farieb CMYK" -#: ../app/dialogs/preferences-dialog.c:2458 +#: ../app/dialogs/preferences-dialog.c:2495 msgid "_Monitor profile:" msgstr "Profil _Monitora:" # dialog title -#: ../app/dialogs/preferences-dialog.c:2459 +#: ../app/dialogs/preferences-dialog.c:2496 msgid "Select Monitor Color Profile" msgstr "Vybrať profil farieb monitora" -#: ../app/dialogs/preferences-dialog.c:2460 +#: ../app/dialogs/preferences-dialog.c:2497 msgid "_Print simulation profile:" msgstr "Profil _tlačového náhľadu:" -#: ../app/dialogs/preferences-dialog.c:2461 +#: ../app/dialogs/preferences-dialog.c:2498 msgid "Select Printer Color Profile" msgstr "Vybrať profil farieb tlačiarne" -#: ../app/dialogs/preferences-dialog.c:2472 +#: ../app/dialogs/preferences-dialog.c:2509 msgid "_Mode of operation:" msgstr "_Režim spracovania:" # chceckbox -#: ../app/dialogs/preferences-dialog.c:2502 +#: ../app/dialogs/preferences-dialog.c:2539 msgid "_Try to use the system monitor profile" msgstr "_Pokúsiť sa použiť systémový profil monitora" -#: ../app/dialogs/preferences-dialog.c:2512 +#: ../app/dialogs/preferences-dialog.c:2549 msgid "_Display rendering intent:" msgstr "_Kvalita zobrazovania:" # PM: neviem či je to dobrý preklad -#: ../app/dialogs/preferences-dialog.c:2521 +#: ../app/dialogs/preferences-dialog.c:2558 msgid "_Softproof rendering intent:" msgstr "K_valita tlačového náhľadu:" # checkbox -#: ../app/dialogs/preferences-dialog.c:2534 +#: ../app/dialogs/preferences-dialog.c:2571 msgid "Mark out of gamut colors" msgstr "Označiť body nepatriace do farebného priestoru" # dialog title -#: ../app/dialogs/preferences-dialog.c:2539 +#: ../app/dialogs/preferences-dialog.c:2576 msgid "Select Warning Color" msgstr "Vybrať farbu upozornenia" -#: ../app/dialogs/preferences-dialog.c:2552 +#: ../app/dialogs/preferences-dialog.c:2589 msgid "File Open behaviour:" msgstr "Správanie sa pri otvorení súboru:" -#: ../app/dialogs/preferences-dialog.c:2564 +#: ../app/dialogs/preferences-dialog.c:2601 msgid "Input Devices" msgstr "Vstupné zariadenia" #. Extended Input Devices -#: ../app/dialogs/preferences-dialog.c:2574 +#: ../app/dialogs/preferences-dialog.c:2611 msgid "Extended Input Devices" msgstr "Rozšírené vstupné zariadenia" # button -#: ../app/dialogs/preferences-dialog.c:2578 +#: ../app/dialogs/preferences-dialog.c:2615 msgid "Configure E_xtended Input Devices..." msgstr "Nastavenie ro_zšírených vstupných zariadení..." # checkbox -#: ../app/dialogs/preferences-dialog.c:2585 +#: ../app/dialogs/preferences-dialog.c:2622 msgid "_Save input device settings on exit" msgstr "_Uložiť nastavenia vstupného zariadenia pri ukončení" # button -#: ../app/dialogs/preferences-dialog.c:2589 +#: ../app/dialogs/preferences-dialog.c:2626 msgid "Save Input Device Settings _Now" msgstr "_Teraz uložiť nastavenia vstupného zariadenia" # button -#: ../app/dialogs/preferences-dialog.c:2596 +#: ../app/dialogs/preferences-dialog.c:2633 msgid "_Reset Saved Input Device Settings to Default Values" msgstr "Z_meniť uložené nastavenia vstupného zariadenia na štandardné hodnoty" # notebook title -#: ../app/dialogs/preferences-dialog.c:2611 +#: ../app/dialogs/preferences-dialog.c:2648 msgid "Additional Input Controllers" msgstr "Prídavné ovládače vstupu" # notebook tab -#: ../app/dialogs/preferences-dialog.c:2614 +#: ../app/dialogs/preferences-dialog.c:2651 msgid "Input Controllers" msgstr "Ovládače vstupu" # notebook tab -#: ../app/dialogs/preferences-dialog.c:2630 +#: ../app/dialogs/preferences-dialog.c:2667 msgid "Window Management" msgstr "Správa okien" -#: ../app/dialogs/preferences-dialog.c:2639 +#: ../app/dialogs/preferences-dialog.c:2676 msgid "Window Manager Hints" msgstr "Odporúčania pre správcu okien" -#: ../app/dialogs/preferences-dialog.c:2645 +#: ../app/dialogs/preferences-dialog.c:2682 msgid "Hint for _docks and toolbox:" msgstr "Odporúčanie pre _doky a sadu nástrojov:" -#: ../app/dialogs/preferences-dialog.c:2648 +#: ../app/dialogs/preferences-dialog.c:2685 msgid "Focus" msgstr "Zameranie" # chceckbox -#: ../app/dialogs/preferences-dialog.c:2652 +#: ../app/dialogs/preferences-dialog.c:2689 msgid "Activate the _focused image" msgstr "Aktivovať _zameraný obrázok" #. Window Positions -#: ../app/dialogs/preferences-dialog.c:2656 +#: ../app/dialogs/preferences-dialog.c:2693 msgid "Window Positions" msgstr "Pozície okien" # chceckbox -#: ../app/dialogs/preferences-dialog.c:2659 +#: ../app/dialogs/preferences-dialog.c:2696 msgid "_Save window positions on exit" msgstr "_Uložiť pozície okien pri ukončení" # button -#: ../app/dialogs/preferences-dialog.c:2663 +#: ../app/dialogs/preferences-dialog.c:2700 msgid "Save Window Positions _Now" msgstr "_Teraz uložiť pozície okien" # button -#: ../app/dialogs/preferences-dialog.c:2670 +#: ../app/dialogs/preferences-dialog.c:2707 msgid "_Reset Saved Window Positions to Default Values" msgstr "_Zmeniť uložené pozície okien na štandardné hodnoty" # notebook tab -#: ../app/dialogs/preferences-dialog.c:2685 +#: ../app/dialogs/preferences-dialog.c:2722 msgid "Folders" msgstr "Priečinky" -#: ../app/dialogs/preferences-dialog.c:2705 +#: ../app/dialogs/preferences-dialog.c:2742 msgid "Temporary folder:" msgstr "Priečinok pre dočasné súbory:" # dialog title -#: ../app/dialogs/preferences-dialog.c:2706 +#: ../app/dialogs/preferences-dialog.c:2743 msgid "Select Folder for Temporary Files" msgstr "Vybrať priečinok pre dočasné súbory." -#: ../app/dialogs/preferences-dialog.c:2710 +#: ../app/dialogs/preferences-dialog.c:2747 msgid "Swap folder:" msgstr "Priečinok pre odkladací súbor:" # dialog title -#: ../app/dialogs/preferences-dialog.c:2711 +#: ../app/dialogs/preferences-dialog.c:2748 msgid "Select Swap Folder" msgstr "Vybrať priečinok pre odkladací súbor" -#: ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/preferences-dialog.c:2783 msgid "Brush Folders" msgstr "Priečinky štetcov" # dialog title -#: ../app/dialogs/preferences-dialog.c:2748 +#: ../app/dialogs/preferences-dialog.c:2785 msgid "Select Brush Folders" msgstr "Vybrať priečinky štetcov" -#: ../app/dialogs/preferences-dialog.c:2750 +#: ../app/dialogs/preferences-dialog.c:2787 msgid "Dynamics Folders" msgstr "Priečinky písem" # dialog title -#: ../app/dialogs/preferences-dialog.c:2752 +#: ../app/dialogs/preferences-dialog.c:2789 msgid "Select Dynamics Folders" msgstr "Vybrať priečinky písem" -#: ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/preferences-dialog.c:2791 msgid "Pattern Folders" msgstr "Priečinky vzorov" # dialog title -#: ../app/dialogs/preferences-dialog.c:2756 +#: ../app/dialogs/preferences-dialog.c:2793 msgid "Select Pattern Folders" msgstr "Vybrať priečinky vzorov" -#: ../app/dialogs/preferences-dialog.c:2758 +#: ../app/dialogs/preferences-dialog.c:2795 msgid "Palette Folders" msgstr "Priečinky paliet" # dialog title -#: ../app/dialogs/preferences-dialog.c:2760 +#: ../app/dialogs/preferences-dialog.c:2797 msgid "Select Palette Folders" msgstr "Vybrať priečinky paliet" -#: ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/preferences-dialog.c:2799 msgid "Gradient Folders" msgstr "Priečinky prechodov" # dialog title -#: ../app/dialogs/preferences-dialog.c:2764 +#: ../app/dialogs/preferences-dialog.c:2801 msgid "Select Gradient Folders" msgstr "Vybrať priečinky prechodov" -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2803 msgid "Font Folders" msgstr "Priečinky s písmami" # dialog title -#: ../app/dialogs/preferences-dialog.c:2768 +#: ../app/dialogs/preferences-dialog.c:2805 msgid "Select Font Folders" msgstr "Vybrať priečinky s písmami" -#: ../app/dialogs/preferences-dialog.c:2770 +#: ../app/dialogs/preferences-dialog.c:2807 msgid "Tool Preset Folders" msgstr "Priečinky predvolieb nástrojov" # dialog title -#: ../app/dialogs/preferences-dialog.c:2772 +#: ../app/dialogs/preferences-dialog.c:2809 msgid "Select Tool Preset Folders" msgstr "Vybrať priečinky predvolieb nástrojov" -#: ../app/dialogs/preferences-dialog.c:2774 +#: ../app/dialogs/preferences-dialog.c:2811 msgid "Plug-In Folders" msgstr "Priečinky zásuvných modulov" # dialog title -#: ../app/dialogs/preferences-dialog.c:2776 +#: ../app/dialogs/preferences-dialog.c:2813 msgid "Select Plug-In Folders" msgstr "Vybrať priečinky zásuvných modulov" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2815 msgid "Scripts" msgstr "Skripty" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2815 msgid "Script-Fu Folders" msgstr "Script-Fu priečinky" # dialog title -#: ../app/dialogs/preferences-dialog.c:2780 +#: ../app/dialogs/preferences-dialog.c:2817 msgid "Select Script-Fu Folders" msgstr "Vybrať Script-Fu priečinky" -#: ../app/dialogs/preferences-dialog.c:2782 +#: ../app/dialogs/preferences-dialog.c:2819 msgid "Module Folders" msgstr "Priečinky modulov" # dialog title -#: ../app/dialogs/preferences-dialog.c:2784 +#: ../app/dialogs/preferences-dialog.c:2821 msgid "Select Module Folders" msgstr "Vybrať priečinky modulov" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Interpreters" msgstr "Interpretre" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Interpreter Folders" msgstr "Priečinky interpretrov" # dialog title -#: ../app/dialogs/preferences-dialog.c:2788 +#: ../app/dialogs/preferences-dialog.c:2825 msgid "Select Interpreter Folders" msgstr "Vybrať priečinky interpretrov" -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:2827 msgid "Environment Folders" msgstr "Priečinky prostredia" # dialog title -#: ../app/dialogs/preferences-dialog.c:2792 +#: ../app/dialogs/preferences-dialog.c:2829 msgid "Select Environment Folders" msgstr "Vybrať priečinky prostredia" -#: ../app/dialogs/preferences-dialog.c:2794 +#: ../app/dialogs/preferences-dialog.c:2831 msgid "Themes" msgstr "Témy" -#: ../app/dialogs/preferences-dialog.c:2794 +#: ../app/dialogs/preferences-dialog.c:2831 msgid "Theme Folders" msgstr "Priečinky tém" # dialog title -#: ../app/dialogs/preferences-dialog.c:2796 +#: ../app/dialogs/preferences-dialog.c:2833 msgid "Select Theme Folders" msgstr "Vybrať priečinky tém" @@ -10847,20 +11337,24 @@ msgstr "Veľkosť tlače" #. the image size labels -#: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:193 ../app/widgets/gimptemplateeditor.c:180 +#: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:193 +#: ../app/widgets/gimptemplateeditor.c:180 msgid "_Width:" msgstr "Ší_rka:" -#: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:197 ../app/widgets/gimptemplateeditor.c:187 +#: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:197 +#: ../app/widgets/gimptemplateeditor.c:187 msgid "H_eight:" msgstr "_Výška:" #. the resolution labels -#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:260 ../app/widgets/gimptemplateeditor.c:309 +#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:260 +#: ../app/widgets/gimptemplateeditor.c:309 msgid "_X resolution:" msgstr "_X rozlíšenie:" -#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:263 ../app/widgets/gimptemplateeditor.c:316 +#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:263 +#: ../app/widgets/gimptemplateeditor.c:316 msgid "_Y resolution:" msgstr "_Y rozlíšenie:" @@ -10968,8 +11462,12 @@ msgstr "I_nterpolácia:" #: ../app/dialogs/scale-dialog.c:207 -msgid "Indexed color layers are always scaled without interpolation. The chosen interpolation type will affect channels and layer masks only." -msgstr "Mierka vrstiev s indexovanými farbami sa vždy mení bez interpolácie. Zvolený typ interpolácie ovplyvní iba kanály a masky." +msgid "" +"Indexed color layers are always scaled without interpolation. The chosen " +"interpolation type will affect channels and layer masks only." +msgstr "" +"Mierka vrstiev s indexovanými farbami sa vždy mení bez interpolácie. Zvolený " +"typ interpolácie ovplyvní iba kanály a masky." #: ../app/dialogs/stroke-dialog.c:97 msgid "Choose Stroke Style" @@ -11036,7 +11534,9 @@ #: ../app/dialogs/user-install-dialog.c:95 msgid "The GIMP user installation failed; see the log for details." -msgstr "Používateľská inštalácia GIMP zlyhala; viac podrobností sa nachádza v zázname." +msgstr "" +"Používateľská inštalácia GIMP zlyhala; viac podrobností sa nachádza v " +"zázname." #: ../app/dialogs/user-install-dialog.c:98 msgid "Installation Log" @@ -11058,7 +11558,8 @@ msgid "Import Paths from SVG" msgstr "Importovať cesty zo SVG" -#: ../app/dialogs/vectors-import-dialog.c:92 ../app/widgets/gimpprofilechooserdialog.c:122 +#: ../app/dialogs/vectors-import-dialog.c:92 +#: ../app/widgets/gimpprofilechooserdialog.c:122 msgid "All files (*.*)" msgstr "Všetky súbory (*.*)" @@ -11118,44 +11619,54 @@ msgid "Line spacing" msgstr "Medzera medzi čiarami" -#: ../app/display/gimpcursorview.c:216 ../app/display/gimpcursorview.c:222 ../app/display/gimpcursorview.c:241 ../app/display/gimpcursorview.c:247 ../app/display/gimpcursorview.c:266 ../app/display/gimpcursorview.c:272 ../app/display/gimpcursorview.c:288 -#: ../app/display/gimpcursorview.c:295 ../app/display/gimpcursorview.c:672 ../app/display/gimpcursorview.c:673 ../app/display/gimpcursorview.c:674 ../app/display/gimpcursorview.c:675 ../app/display/gimpcursorview.c:788 ../app/display/gimpcursorview.c:789 -#: ../app/display/gimpcursorview.c:790 ../app/display/gimpcursorview.c:791 ../app/widgets/gimpcolorframe.c:633 +#: ../app/display/gimpcursorview.c:218 ../app/display/gimpcursorview.c:224 +#: ../app/display/gimpcursorview.c:243 ../app/display/gimpcursorview.c:249 +#: ../app/display/gimpcursorview.c:268 ../app/display/gimpcursorview.c:274 +#: ../app/display/gimpcursorview.c:290 ../app/display/gimpcursorview.c:297 +#: ../app/display/gimpcursorview.c:688 ../app/display/gimpcursorview.c:689 +#: ../app/display/gimpcursorview.c:690 ../app/display/gimpcursorview.c:691 +#: ../app/display/gimpcursorview.c:804 ../app/display/gimpcursorview.c:805 +#: ../app/display/gimpcursorview.c:806 ../app/display/gimpcursorview.c:807 +#: ../app/widgets/gimpcolorframe.c:633 msgid "n/a" msgstr "-" -#: ../app/display/gimpcursorview.c:219 ../app/display/gimpcursorview.c:244 ../app/display/gimpcursorview.c:269 ../app/widgets/gimpdeviceinfoeditor.c:138 +#: ../app/display/gimpcursorview.c:221 ../app/display/gimpcursorview.c:246 +#: ../app/display/gimpcursorview.c:271 +#: ../app/widgets/gimpdeviceinfoeditor.c:138 msgid "X" msgstr "X" -#: ../app/display/gimpcursorview.c:225 ../app/display/gimpcursorview.c:250 ../app/display/gimpcursorview.c:275 ../app/widgets/gimpdeviceinfoeditor.c:139 +#: ../app/display/gimpcursorview.c:227 ../app/display/gimpcursorview.c:252 +#: ../app/display/gimpcursorview.c:277 +#: ../app/widgets/gimpdeviceinfoeditor.c:139 msgid "Y" msgstr "Y" # frame #. Units -#: ../app/display/gimpcursorview.c:231 +#: ../app/display/gimpcursorview.c:233 msgid "Units" msgstr "Jednotky" # frame #. Selection Bounding Box -#: ../app/display/gimpcursorview.c:256 +#: ../app/display/gimpcursorview.c:258 msgid "Selection Bounding Box" msgstr "Editor výberu" #. Width -#: ../app/display/gimpcursorview.c:292 +#: ../app/display/gimpcursorview.c:294 msgid "W" msgstr "Š" #. Height -#: ../app/display/gimpcursorview.c:299 +#: ../app/display/gimpcursorview.c:301 msgid "H" msgstr "V" # chceckbutton -#: ../app/display/gimpcursorview.c:328 +#: ../app/display/gimpcursorview.c:330 msgid "_Sample Merged" msgstr "Odo_brať zlúčenú vzorku" @@ -11179,12 +11690,14 @@ msgid "Navigate the image display" msgstr "Umožňuje posúvanie po obrázku" -#: ../app/display/gimpdisplayshell.c:746 ../app/display/gimpdisplayshell.c:1331 ../app/widgets/gimptoolbox.c:253 +#: ../app/display/gimpdisplayshell.c:746 ../app/display/gimpdisplayshell.c:1331 +#: ../app/widgets/gimptoolbox.c:253 msgid "Drop image files here to open them" msgstr "Presuňte sem súbor s obrázkom, ktorý chcete otvoriť" # window title -#: ../app/display/gimpdisplayshell-close.c:169 ../app/display/gimpdisplayshell-close.c:269 +#: ../app/display/gimpdisplayshell-close.c:169 +#: ../app/display/gimpdisplayshell-close.c:269 #, c-format msgid "Close %s" msgstr "Zavrieť %s" @@ -11203,23 +11716,32 @@ #: ../app/display/gimpdisplayshell-close.c:310 #, c-format msgid "If you don't save the image, changes from the last hour will be lost." -msgid_plural "If you don't save the image, changes from the last %d hours will be lost." +msgid_plural "" +"If you don't save the image, changes from the last %d hours will be lost." msgstr[0] "Ak obrázok neuložíte, zmeny za posledných %d hodín budú stratené." msgstr[1] "Ak obrázok neuložíte, zmeny za poslednú hodinu budú stratené." msgstr[2] "Ak obrázok neuložíte, zmeny za posledné %d hodiny budú stratené." #: ../app/display/gimpdisplayshell-close.c:321 #, c-format -msgid "If you don't save the image, changes from the last hour and %d minute will be lost." -msgid_plural "If you don't save the image, changes from the last hour and %d minutes will be lost." -msgstr[0] "Ak obrázok neuložíte, zmeny za poslednú hodinu a %d minút budú stratené." -msgstr[1] "Ak obrázok neuložíte, zmeny za poslednú hodinu a %d minútu budú stratené." -msgstr[2] "Ak obrázok neuložíte, zmeny za poslednú hodinu a %d minúty budú stratené." +msgid "" +"If you don't save the image, changes from the last hour and %d minute will " +"be lost." +msgid_plural "" +"If you don't save the image, changes from the last hour and %d minutes will " +"be lost." +msgstr[0] "" +"Ak obrázok neuložíte, zmeny za poslednú hodinu a %d minút budú stratené." +msgstr[1] "" +"Ak obrázok neuložíte, zmeny za poslednú hodinu a %d minútu budú stratené." +msgstr[2] "" +"Ak obrázok neuložíte, zmeny za poslednú hodinu a %d minúty budú stratené." #: ../app/display/gimpdisplayshell-close.c:333 #, c-format msgid "If you don't save the image, changes from the last minute will be lost." -msgid_plural "If you don't save the image, changes from the last %d minutes will be lost." +msgid_plural "" +"If you don't save the image, changes from the last %d minutes will be lost." msgstr[0] "Ak obrázok neuložíte, zmeny za posledných %d minút budú stratené." msgstr[1] "Ak obrázok neuložíte, zmeny za poslednú minútu budú stratené." msgstr[2] "Ak obrázok neuložíte, zmeny za posledné %d minúty budú stratené." @@ -11231,7 +11753,9 @@ # PM: myslí sa tým pustenie ťahanej vrstvy (drag & drop) # názov operácie pre Undo -#: ../app/display/gimpdisplayshell-dnd.c:246 ../app/display/gimpdisplayshell-dnd.c:649 ../app/display/gimpdisplayshell-dnd.c:707 +#: ../app/display/gimpdisplayshell-dnd.c:246 +#: ../app/display/gimpdisplayshell-dnd.c:649 +#: ../app/display/gimpdisplayshell-dnd.c:707 msgid "Drop New Layer" msgstr "Pustenie novej vrstvy" @@ -11240,21 +11764,30 @@ msgid "Drop New Path" msgstr "Pustenie novej cesty" -#: ../app/display/gimpdisplayshell-dnd.c:361 ../app/display/gimpdisplayshell-dnd.c:463 ../app/tools/gimpblendtool.c:173 ../app/tools/gimpbucketfilltool.c:136 ../app/tools/gimpimagemaptool.c:280 ../app/tools/gimpselectiontool.c:427 +#: ../app/display/gimpdisplayshell-dnd.c:361 +#: ../app/display/gimpdisplayshell-dnd.c:463 ../app/tools/gimpblendtool.c:173 +#: ../app/tools/gimpbucketfilltool.c:136 ../app/tools/gimpimagemaptool.c:280 +#: ../app/tools/gimpselectiontool.c:427 msgid "Cannot modify the pixels of layer groups." msgstr "Pixely v skupine vrstiev sa nedajú upraviť." -#: ../app/display/gimpdisplayshell-dnd.c:369 ../app/display/gimpdisplayshell-dnd.c:471 ../app/tools/gimpblendtool.c:180 ../app/tools/gimpbucketfilltool.c:143 ../app/tools/gimpcroptool.c:325 ../app/tools/gimpimagemaptool.c:287 -#: ../app/tools/gimppainttool.c:266 ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:1477 +#: ../app/display/gimpdisplayshell-dnd.c:369 +#: ../app/display/gimpdisplayshell-dnd.c:471 ../app/tools/gimpblendtool.c:180 +#: ../app/tools/gimpbucketfilltool.c:143 ../app/tools/gimpcroptool.c:325 +#: ../app/tools/gimpimagemaptool.c:287 ../app/tools/gimppainttool.c:266 +#: ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:1481 msgid "The active layer's pixels are locked." msgstr "Pixely aktívnej vrstvy sú uzamknuté." # názov operácie pre Undo -#: ../app/display/gimpdisplayshell-dnd.c:549 ../app/widgets/gimplayertreeview.c:725 +#: ../app/display/gimpdisplayshell-dnd.c:549 +#: ../app/widgets/gimplayertreeview.c:725 msgid "Drop layers" msgstr "Pustenie vrstiev" -#: ../app/display/gimpdisplayshell-dnd.c:682 ../app/display/gimpdisplayshell-dnd.c:699 ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:264 +#: ../app/display/gimpdisplayshell-dnd.c:682 +#: ../app/display/gimpdisplayshell-dnd.c:699 +#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:264 msgid "Dropped Buffer" msgstr "Pustená schránka" @@ -11307,7 +11840,9 @@ msgstr "(čistý)" # 1,2 kresba, 3 farba -#: ../app/display/gimpdisplayshell-title.c:338 ../app/display/gimpdisplayshell-title.c:351 ../app/widgets/gimpactiongroup.c:884 +#: ../app/display/gimpdisplayshell-title.c:338 +#: ../app/display/gimpdisplayshell-title.c:351 +#: ../app/widgets/gimpactiongroup.c:884 msgid "(none)" msgstr "(žiadna)" @@ -11321,28 +11856,31 @@ msgid "Not a regular file" msgstr "Nie je bežný súbor" -#: ../app/file/file-open.c:191 +#: ../app/file/file-open.c:197 #, c-format msgid "%s plug-in returned SUCCESS but did not return an image" msgstr "Zásuvný modul %s ohlásil ÚSPECH, ale neposlal obrázok" -#: ../app/file/file-open.c:202 +#: ../app/file/file-open.c:208 #, c-format msgid "%s plug-In could not open image" msgstr "Zásuvnému modulu %s sa nepodarilo otvoriť obrázok" -#: ../app/file/file-open.c:533 +#: ../app/file/file-open.c:539 msgid "Image doesn't contain any layers" msgstr "Obrázok neobsahuje žiadne vrstvy" -#: ../app/file/file-open.c:593 +#: ../app/file/file-open.c:599 #, c-format msgid "Opening '%s' failed: %s" msgstr "Otvorenie „%s“ zlyhalo: %s" -#: ../app/file/file-open.c:703 -msgid "Color management has been disabled. It can be enabled again in the Preferences dialog." -msgstr "Správa farieb bola vypnutá. Môžete ju zapnúť v dialógovom okne Nastavenia." +#: ../app/file/file-open.c:709 +msgid "" +"Color management has been disabled. It can be enabled again in the " +"Preferences dialog." +msgstr "" +"Správa farieb bola vypnutá. Môžete ju zapnúť v dialógovom okne Nastavenia." #: ../app/file/file-procedure.c:195 msgid "Unknown file type" @@ -11388,36 +11926,41 @@ #: ../app/gegl/gimpoperationcagecoefcalc.c:67 msgid "Compute a set of coefficient buffer for the GIMP cage tool" -msgstr "Vypočítať nastavenie koeficientov schránky pre nástroj klietka programu GIMP" +msgstr "" +"Vypočítať nastavenie koeficientov schránky pre nástroj klietka programu GIMP" #: ../app/gegl/gimpoperationcagetransform.c:106 -msgid "Convert a set of coefficient buffer to a coordinate buffer for the GIMP cage tool" -msgstr "Previesť sadu koeficientov schránky na súradnice schránky pre nástroj klietka programu GIMP" +msgid "" +"Convert a set of coefficient buffer to a coordinate buffer for the GIMP cage " +"tool" +msgstr "" +"Previesť sadu koeficientov schránky na súradnice schránky pre nástroj " +"klietka programu GIMP" #: ../app/gegl/gimpoperationcagetransform.c:128 msgid "Fill with plain color" msgstr "Vyplnenie farbou popredia" -#: ../app/gegl/gimpoperationcagetransform.c:129 ../app/tools/gimpcageoptions.c:144 +#: ../app/gegl/gimpoperationcagetransform.c:129 +#: ../app/tools/gimpcageoptions.c:144 msgid "Fill the original position of the cage with a plain color" msgstr "Vyplniť pôvodnú pozíciu klietky jednoduchou farbou" -#. Normally this should have been taken care of during command line -#. * parsing as a post-parse hook of gtk_get_option_group(), using the -#. * system locales. -#. * But user config may have overriden the language, therefore we must -#. * check the widget directions again. +#. TRANSLATORS: there is no need to translate this in GIMP. This uses +#. * "gtk20" domain as a special trick to determine language direction, +#. * but xgettext extracts it anyway mistakenly into GIMP po files. +#. * Leave an empty string as translation. It does not matter. #. -#: ../app/gui/gui.c:208 +#: ../app/gui/gui.c:219 msgid "default:LTR" msgstr "default:LTR" #. initialize the document history -#: ../app/gui/gui.c:433 +#: ../app/gui/gui.c:461 msgid "Documents" msgstr "Dokumenty" -#: ../app/gui/splash.c:115 +#: ../app/gui/splash.c:112 msgid "GIMP Startup" msgstr "Spustenie programu GIMP" @@ -11534,7 +12077,8 @@ msgid "Pencil" msgstr "Ceruzka" -#: ../app/paint/gimpperspectiveclone.c:95 ../app/tools/gimpperspectiveclonetool.c:133 +#: ../app/paint/gimpperspectiveclone.c:95 +#: ../app/tools/gimpperspectiveclonetool.c:133 msgid "Perspective Clone" msgstr "Perspektívne razítko" @@ -11621,19 +12165,29 @@ msgid "Plug-In" msgstr "Zásuvný modul" -#: ../app/pdb/drawable-transform-cmds.c:345 ../app/pdb/drawable-transform-cmds.c:443 ../app/pdb/item-transform-cmds.c:262 ../app/pdb/transform-tools-cmds.c:163 ../app/tools/gimpperspectivetool.c:82 +#: ../app/pdb/drawable-transform-cmds.c:345 +#: ../app/pdb/drawable-transform-cmds.c:443 +#: ../app/pdb/item-transform-cmds.c:262 ../app/pdb/transform-tools-cmds.c:163 +#: ../app/tools/gimpperspectivetool.c:82 msgid "Perspective" msgstr "Perspektíva" -#: ../app/pdb/drawable-transform-cmds.c:957 ../app/pdb/drawable-transform-cmds.c:1042 ../app/pdb/item-transform-cmds.c:611 ../app/pdb/transform-tools-cmds.c:418 ../app/tools/gimpsheartool.c:112 +#: ../app/pdb/drawable-transform-cmds.c:957 +#: ../app/pdb/drawable-transform-cmds.c:1042 +#: ../app/pdb/item-transform-cmds.c:611 ../app/pdb/transform-tools-cmds.c:418 +#: ../app/tools/gimpsheartool.c:112 msgid "Shearing" msgstr "Skosenie" -#: ../app/pdb/drawable-transform-cmds.c:1138 ../app/pdb/item-transform-cmds.c:709 ../app/pdb/transform-tools-cmds.c:507 +#: ../app/pdb/drawable-transform-cmds.c:1138 +#: ../app/pdb/item-transform-cmds.c:709 ../app/pdb/transform-tools-cmds.c:507 msgid "2D Transform" msgstr "2D transformácia" -#: ../app/pdb/drawable-transform-cmds.c:1234 ../app/pdb/drawable-transform-cmds.c:1338 ../app/pdb/drawable-transform-cmds.c:1442 ../app/pdb/item-transform-cmds.c:815 +#: ../app/pdb/drawable-transform-cmds.c:1234 +#: ../app/pdb/drawable-transform-cmds.c:1338 +#: ../app/pdb/drawable-transform-cmds.c:1442 +#: ../app/pdb/item-transform-cmds.c:815 msgid "2D Transforming" msgstr "2D transformácia" @@ -11650,10 +12204,13 @@ msgstr "Táto vrstva sa nedá ukotviť, pretože to nie je plávajúci výber." #: ../app/pdb/floating-sel-cmds.c:131 -msgid "Cannot convert this layer to a normal layer because it is not a floating selection." +msgid "" +"Cannot convert this layer to a normal layer because it is not a floating " +"selection." msgstr "Táto vrstva sa nedá skonvertovať, pretože to nie je plávajúci výber." -#: ../app/pdb/gimppdb-query.c:299 ../app/pdb/gimppdb.c:315 ../app/pdb/gimppdb.c:385 +#: ../app/pdb/gimppdb-query.c:299 ../app/pdb/gimppdb.c:315 +#: ../app/pdb/gimppdb.c:385 #, c-format msgid "Procedure '%s' not found" msgstr "Procedúra „%s“ nenájdená" @@ -11763,17 +12320,25 @@ #: ../app/pdb/gimppdb-utils.c:363 #, c-format msgid "Item '%s' (%d) cannot be used because it is attached to another image" -msgstr "Položka „%s“ (%d) nemôže byť použitá, lebo bola pridaná do iného obrázka" +msgstr "" +"Položka „%s“ (%d) nemôže byť použitá, lebo bola pridaná do iného obrázka" #: ../app/pdb/gimppdb-utils.c:392 #, c-format -msgid "Item '%s' (%d) cannot be used because it is not a direct child of an item tree" -msgstr "Položka „%s“ (%d) nemôže byť použitá, lebo nie je priamym potomkom položky " +msgid "" +"Item '%s' (%d) cannot be used because it is not a direct child of an item " +"tree" +msgstr "" +"Položka „%s“ (%d) nemôže byť použitá, lebo nie je priamym potomkom položky " #: ../app/pdb/gimppdb-utils.c:420 #, c-format -msgid "Items '%s' (%d) and '%s' (%d) cannot be used because they are not part of the same item tree" -msgstr "Položky „%s“ (%d) a „%s“ (%d) nemôžu byť použité, pretože nie sú súčasťou rovnakého stromu položiek" +msgid "" +"Items '%s' (%d) and '%s' (%d) cannot be used because they are not part of " +"the same item tree" +msgstr "" +"Položky „%s“ (%d) a „%s“ (%d) nemôžu byť použité, pretože nie sú súčasťou " +"rovnakého stromu položiek" #: ../app/pdb/gimppdb-utils.c:445 #, c-format @@ -11827,10 +12392,15 @@ #: ../app/pdb/gimppdb.c:420 #, c-format -msgid "Procedure '%s' has been called with a wrong type for argument #%d. Expected %s, got %s." -msgstr "Procedúra „%s“ bola volaná s chybným typom argumentu č. %d. Očakávala sa %s, prijatá bola %s." +msgid "" +"Procedure '%s' has been called with a wrong type for argument #%d. Expected " +"%s, got %s." +msgstr "" +"Procedúra „%s“ bola volaná s chybným typom argumentu č. %d. Očakávala sa %s, " +"prijatá bola %s." -#: ../app/pdb/gimppdbcontext.c:89 ../app/tools/gimpforegroundselectoptions.c:79 ../app/tools/gimpselectionoptions.c:78 +#: ../app/pdb/gimppdbcontext.c:89 ../app/tools/gimpforegroundselectoptions.c:79 +#: ../app/tools/gimpselectionoptions.c:78 msgid "Smooth edges" msgstr "Vyhladzovanie hrán" @@ -11841,63 +12411,103 @@ #: ../app/pdb/gimpprocedure.c:644 #, c-format -msgid "Procedure '%s' returned a wrong value type for return value '%s' (#%d). Expected %s, got %s." -msgstr "Procedúra „%s“ vrátila chybný typ hodnoty pre návratovú hodnotu „%s“ (č. %d). Očakávaný %s, prijatý %s." +msgid "" +"Procedure '%s' returned a wrong value type for return value '%s' (#%d). " +"Expected %s, got %s." +msgstr "" +"Procedúra „%s“ vrátila chybný typ hodnoty pre návratovú hodnotu „%s“ (č. " +"%d). Očakávaný %s, prijatý %s." #: ../app/pdb/gimpprocedure.c:656 #, c-format -msgid "Procedure '%s' has been called with a wrong value type for argument '%s' (#%d). Expected %s, got %s." -msgstr "Procedúra „%s“ bola volaná s chybným typom hodnoty pre argument „%s“ (č. %d). Očakávaný %s, prijatý %s." +msgid "" +"Procedure '%s' has been called with a wrong value type for argument '%s' (#" +"%d). Expected %s, got %s." +msgstr "" +"Procedúra „%s“ bola volaná s chybným typom hodnoty pre argument „%s“ (č. " +"%d). Očakávaný %s, prijatý %s." #: ../app/pdb/gimpprocedure.c:689 #, c-format -msgid "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-in is trying to work on a layer that doesn't exist any longer." -msgstr "Procedúra „%s“ vrátila neplatný identifikátor pre argument „%s“. Pravdepodobne sa zásuvný modul pokúša pracovať s vrstvou, ktorá už neexistuje." +msgid "" +"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-" +"in is trying to work on a layer that doesn't exist any longer." +msgstr "" +"Procedúra „%s“ vrátila neplatný identifikátor pre argument „%s“. " +"Pravdepodobne sa zásuvný modul pokúša pracovať s vrstvou, ktorá už " +"neexistuje." #: ../app/pdb/gimpprocedure.c:702 #, c-format -msgid "Procedure '%s' has been called with an invalid ID for argument '%s'. Most likely a plug-in is trying to work on a layer that doesn't exist any longer." -msgstr "Procedúra „%s“ bola volaná s neplatným identifikátorom pre argument „%s“. Pravdepodobne zásuvný modul pracuje s vrstvou, ktorá už neexistuje." +msgid "" +"Procedure '%s' has been called with an invalid ID for argument '%s'. Most " +"likely a plug-in is trying to work on a layer that doesn't exist any longer." +msgstr "" +"Procedúra „%s“ bola volaná s neplatným identifikátorom pre argument „%s“. " +"Pravdepodobne zásuvný modul pracuje s vrstvou, ktorá už neexistuje." #: ../app/pdb/gimpprocedure.c:719 #, c-format -msgid "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-in is trying to work on an image that doesn't exist any longer." -msgstr "Procedúra „%s“ vrátila neplatný identifikátor pre argument „%s“. Pravdepodobne sa zásuvný modul pokúša pracovať s obrázkom, ktorý už neexistuje." +msgid "" +"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-" +"in is trying to work on an image that doesn't exist any longer." +msgstr "" +"Procedúra „%s“ vrátila neplatný identifikátor pre argument „%s“. " +"Pravdepodobne sa zásuvný modul pokúša pracovať s obrázkom, ktorý už " +"neexistuje." #: ../app/pdb/gimpprocedure.c:732 #, c-format -msgid "Procedure '%s' has been called with an invalid ID for argument '%s'. Most likely a plug-in is trying to work on an image that doesn't exist any longer." -msgstr "Procedúra „%s“ bola volaná s neplatným identifikátorom pre argument „%s“. Pravdepodobne sazásuvný modul pokúša pracovať s obrázkom, ktorý už neexistuje." +msgid "" +"Procedure '%s' has been called with an invalid ID for argument '%s'. Most " +"likely a plug-in is trying to work on an image that doesn't exist any longer." +msgstr "" +"Procedúra „%s“ bola volaná s neplatným identifikátorom pre argument „%s“. " +"Pravdepodobne sazásuvný modul pokúša pracovať s obrázkom, ktorý už " +"neexistuje." #: ../app/pdb/gimpprocedure.c:753 #, c-format -msgid "Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value is out of range." -msgstr "Procedúra „%s“ vrátila „%s“ ako návratovú hodnotu „%s“ (č. %d, typu %s). Táto hodnota je mimo rozsahu." +msgid "" +"Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value " +"is out of range." +msgstr "" +"Procedúra „%s“ vrátila „%s“ ako návratovú hodnotu „%s“ (č. %d, typu %s). " +"Táto hodnota je mimo rozsahu." #: ../app/pdb/gimpprocedure.c:767 #, c-format -msgid "Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type %s). This value is out of range." -msgstr "Procedúra „%s“ bola volaná s hodnotou „%s“ pre argument „%s“ (č. %d, typu %s). Táto hodnota je mimo rozsahu." +msgid "" +"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type " +"%s). This value is out of range." +msgstr "" +"Procedúra „%s“ bola volaná s hodnotou „%s“ pre argument „%s“ (č. %d, typu " +"%s). Táto hodnota je mimo rozsahu." #: ../app/pdb/image-cmds.c:2361 -msgid "Image resolution is out of bounds, using the default resolution instead." -msgstr "Rozlíšenie obrázka je mimo rozsah, namiesto neho sa použije štandardné rozlíšenie." +msgid "" +"Image resolution is out of bounds, using the default resolution instead." +msgstr "" +"Rozlíšenie obrázka je mimo rozsah, namiesto neho sa použije štandardné " +"rozlíšenie." -#: ../app/pdb/image-select-cmds.c:297 ../app/pdb/selection-tools-cmds.c:219 ../app/tools/gimpfreeselecttool.c:196 +#: ../app/pdb/image-select-cmds.c:297 ../app/pdb/selection-tools-cmds.c:219 +#: ../app/tools/gimpfreeselecttool.c:196 msgid "Free Select" msgstr "Voľný výber" -#: ../app/pdb/layer-cmds.c:475 ../app/pdb/layer-cmds.c:513 -msgid "Move Layer" -msgstr "Presunúť vrstvu" - #: ../app/pdb/text-layer-cmds.c:91 #, c-format msgid "Failed to create text layer" msgstr "Nepodarilo sa vytvoriť textovú vrstvu" -#: ../app/pdb/text-layer-cmds.c:164 ../app/pdb/text-layer-cmds.c:274 ../app/pdb/text-layer-cmds.c:353 ../app/pdb/text-layer-cmds.c:426 ../app/pdb/text-layer-cmds.c:498 ../app/pdb/text-layer-cmds.c:570 ../app/pdb/text-layer-cmds.c:642 -#: ../app/pdb/text-layer-cmds.c:714 ../app/pdb/text-layer-cmds.c:786 ../app/pdb/text-layer-cmds.c:856 ../app/pdb/text-layer-cmds.c:928 ../app/pdb/text-layer-cmds.c:1000 ../app/pdb/text-layer-cmds.c:1072 ../app/pdb/text-layer-cmds.c:1114 +#: ../app/pdb/text-layer-cmds.c:164 ../app/pdb/text-layer-cmds.c:274 +#: ../app/pdb/text-layer-cmds.c:353 ../app/pdb/text-layer-cmds.c:426 +#: ../app/pdb/text-layer-cmds.c:498 ../app/pdb/text-layer-cmds.c:570 +#: ../app/pdb/text-layer-cmds.c:642 ../app/pdb/text-layer-cmds.c:714 +#: ../app/pdb/text-layer-cmds.c:786 ../app/pdb/text-layer-cmds.c:856 +#: ../app/pdb/text-layer-cmds.c:928 ../app/pdb/text-layer-cmds.c:1000 +#: ../app/pdb/text-layer-cmds.c:1072 ../app/pdb/text-layer-cmds.c:1114 #: ../app/pdb/text-layer-cmds.c:1196 msgid "Set text layer attribute" msgstr "Nastaviť vlastnosti textovej vrstvy" @@ -11926,11 +12536,13 @@ msgid "Flip path stroke" msgstr "Preklopiť obtiahnutie cesty" -#: ../app/pdb/vectors-cmds.c:706 ../app/pdb/vectors-cmds.c:829 ../app/pdb/vectors-cmds.c:1055 +#: ../app/pdb/vectors-cmds.c:706 ../app/pdb/vectors-cmds.c:829 +#: ../app/pdb/vectors-cmds.c:1055 msgid "Add path stroke" msgstr "Pridať obtiahnutie cesty" -#: ../app/pdb/vectors-cmds.c:882 ../app/pdb/vectors-cmds.c:937 ../app/pdb/vectors-cmds.c:1000 +#: ../app/pdb/vectors-cmds.c:882 ../app/pdb/vectors-cmds.c:937 +#: ../app/pdb/vectors-cmds.c:1000 msgid "Extend path stroke" msgstr "Rozšíriť obtiahnutie cesty" @@ -11972,24 +12584,28 @@ "Chyba vykonania procedúry '%s':\n" "%s" -#: ../app/plug-in/gimpplugin-progress.c:331 +#: ../app/plug-in/gimpplugin-progress.c:339 msgid "Cancelled" msgstr "Zrušený" -#: ../app/plug-in/gimpplugin.c:643 +#: ../app/plug-in/gimpplugin.c:648 #, c-format msgid "" "Plug-in crashed: \"%s\"\n" "(%s)\n" "\n" -"The dying plug-in may have messed up GIMP's internal state. You may want to save your images and restart GIMP to be on the safe side." +"The dying plug-in may have messed up GIMP's internal state. You may want to " +"save your images and restart GIMP to be on the safe side." msgstr "" "Modul spadol: „%s“\n" "(%s)\n" "\n" -"Ukončený zásuvný modul mohol narušiť vnútorný stav GIMPu. Mali by ste uložiť svoje obrázky a reštartovať GIMP, aby ste opäť dosiahli bezpečný stav." +"Ukončený zásuvný modul mohol narušiť vnútorný stav GIMPu. Mali by ste uložiť " +"svoje obrázky a reštartovať GIMP, aby ste opäť dosiahli bezpečný stav." -#: ../app/plug-in/gimppluginmanager-call.c:173 ../app/plug-in/gimppluginmanager-call.c:223 ../app/plug-in/gimppluginmanager-call.c:321 +#: ../app/plug-in/gimppluginmanager-call.c:185 +#: ../app/plug-in/gimppluginmanager-call.c:235 +#: ../app/plug-in/gimppluginmanager-call.c:333 #, c-format msgid "Failed to run plug-in \"%s\"" msgstr "Zlyhanie behu zásuvného modulu „%s“" @@ -12045,12 +12661,16 @@ msgid "Can't apply color profile to grayscale image (%s)" msgstr "Nedá sa aplikovať farebný profil na obrázok v odtieňoch šedej (%s)" -#: ../app/plug-in/plug-in-icc-profile.c:117 ../app/plug-in/plug-in-icc-profile.c:192 ../app/plug-in/plug-in-icc-profile.c:251 +#: ../app/plug-in/plug-in-icc-profile.c:117 +#: ../app/plug-in/plug-in-icc-profile.c:192 +#: ../app/plug-in/plug-in-icc-profile.c:251 #, c-format msgid "Error running '%s'" msgstr "Chyba pri behu „%s“" -#: ../app/plug-in/plug-in-icc-profile.c:141 ../app/plug-in/plug-in-icc-profile.c:202 ../app/plug-in/plug-in-icc-profile.c:261 +#: ../app/plug-in/plug-in-icc-profile.c:141 +#: ../app/plug-in/plug-in-icc-profile.c:202 +#: ../app/plug-in/plug-in-icc-profile.c:261 #, c-format msgid "Plug-In missing (%s)" msgstr "Zásuvný modul (%s) chýba" @@ -12133,8 +12753,12 @@ msgstr "Prázdna textová vrstva" #: ../app/text/gimptextlayer.c:696 -msgid "Your text cannot be rendered. It is likely too big. Please make it shorter or use a smaller font." -msgstr "Váš text sa nedá vykresliť. Je príliš veľký. Prosím, skráťte ho, alebo použite menšie písmo." +msgid "" +"Your text cannot be rendered. It is likely too big. Please make it shorter " +"or use a smaller font." +msgstr "" +"Váš text sa nedá vykresliť. Je príliš veľký. Prosím, skráťte ho, alebo " +"použite menšie písmo." #: ../app/text/gimptextlayer-xcf.c:76 #, c-format @@ -12142,16 +12766,22 @@ "Problems parsing the text parasite for layer '%s':\n" "%s\n" "\n" -"Some text properties may be wrong. Unless you want to edit the text layer, you don't need to worry about this." +"Some text properties may be wrong. Unless you want to edit the text layer, " +"you don't need to worry about this." msgstr "" "Problémy pri spracovaní parazita textu pre vrstvu „%s“':\n" "%s\n" "\n" -"Niektoré vlastnosti textu sú možno nesprávne. Pokiaľ nechcete upravovať vrstvu textu, nemusíte sa tým zaoberať." +"Niektoré vlastnosti textu sú možno nesprávne. Pokiaľ nechcete upravovať " +"vrstvu textu, nemusíte sa tým zaoberať." -#: ../app/text/gimptextlayout.c:577 -msgid "The new text layout cannot be generated. Most likely the font size is too big." -msgstr "Nové rozloženie textu sa nedá vygenerovať. Pravdepodobne je veľkosť písma príliš veľká." +#: ../app/text/gimptextlayout.c:578 +msgid "" +"The new text layout cannot be generated. Most likely the font size is too " +"big." +msgstr "" +"Nové rozloženie textu sa nedá vygenerovať. Pravdepodobne je veľkosť písma " +"príliš veľká." #: ../app/text/text-enums.c:23 msgctxt "text-box-mode" @@ -12173,7 +12803,8 @@ #: ../app/tools/gimpairbrushtool.c:55 msgid "Airbrush Tool: Paint using a brush, with variable pressure" -msgstr "Nástroj rozprašovač: Kreslí premenlivým tlakom s vybraným tvarom štetca " +msgstr "" +"Nástroj rozprašovač: Kreslí premenlivým tlakom s vybraným tvarom štetca " #: ../app/tools/gimpairbrushtool.c:56 msgid "_Airbrush" @@ -12183,7 +12814,8 @@ msgid "Motion only" msgstr "Len pohyb" -#: ../app/tools/gimpairbrushtool.c:91 ../app/tools/gimpconvolvetool.c:228 ../app/tools/gimpsmudgetool.c:91 +#: ../app/tools/gimpairbrushtool.c:91 ../app/tools/gimpconvolvetool.c:228 +#: ../app/tools/gimpsmudgetool.c:91 msgid "Rate" msgstr "Miera" @@ -12277,7 +12909,9 @@ #: ../app/tools/gimpaligntool.c:549 msgid "Click on a layer, path or guide, or Click-Drag to pick several layers" -msgstr "Kliknite na vrstvu, cestu alebo vodidlo, alebo kliknite a ťahajte niekoľko vrstiev " +msgstr "" +"Kliknite na vrstvu, cestu alebo vodidlo, alebo kliknite a ťahajte niekoľko " +"vrstiev " #: ../app/tools/gimpaligntool.c:557 msgid "Click to pick this layer as first item" @@ -12344,7 +12978,7 @@ msgstr "Nie sú dostupné žiadne prechody pre použitie s týmto nástrojom." # pomocník v stavovom riadku -#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:624 +#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:625 #, c-format msgid "%s for constrained angles" msgstr "%s pre zviazanie uhlov" @@ -12411,7 +13045,8 @@ msgid "Base filled area on all visible layers" msgstr "Založiť vyplnenú oblasť do všetkých viditeľných vrstiev" -#: ../app/tools/gimpbucketfilloptions.c:110 ../app/tools/gimpregionselectoptions.c:95 +#: ../app/tools/gimpbucketfilloptions.c:110 +#: ../app/tools/gimpregionselectoptions.c:95 msgid "Maximum color difference" msgstr "Maximálny farebný nesúlad" @@ -12447,7 +13082,10 @@ msgid "Fill transparent areas" msgstr "Vyplniť priehľadné oblasti" -#: ../app/tools/gimpbucketfilloptions.c:279 ../app/tools/gimpclonetool.c:114 ../app/tools/gimpcolorpickeroptions.c:158 ../app/tools/gimphealtool.c:100 ../app/tools/gimpperspectiveclonetool.c:904 ../app/tools/gimpregionselectoptions.c:210 +#: ../app/tools/gimpbucketfilloptions.c:279 ../app/tools/gimpclonetool.c:114 +#: ../app/tools/gimpcolorpickeroptions.c:158 ../app/tools/gimphealtool.c:100 +#: ../app/tools/gimpperspectiveclonetool.c:904 +#: ../app/tools/gimpregionselectoptions.c:210 msgid "Sample merged" msgstr "Zlúčená vzorka" @@ -12535,7 +13173,8 @@ msgid "Source" msgstr "Zdroj" -#: ../app/tools/gimpclonetool.c:128 ../app/tools/gimphealtool.c:109 ../app/tools/gimpperspectiveclonetool.c:918 +#: ../app/tools/gimpclonetool.c:128 ../app/tools/gimphealtool.c:109 +#: ../app/tools/gimpperspectiveclonetool.c:918 msgid "Alignment:" msgstr "Zarovnanie:" @@ -12580,27 +13219,33 @@ msgid "Adjust Color Levels" msgstr "Upravte úrovne farieb" -#: ../app/tools/gimpcolorbalancetool.c:292 ../app/tools/gimphuesaturationtool.c:251 +#: ../app/tools/gimpcolorbalancetool.c:292 +#: ../app/tools/gimphuesaturationtool.c:251 msgid "Cyan" msgstr "Azúrová" -#: ../app/tools/gimpcolorbalancetool.c:292 ../app/tools/gimphuesaturationtool.c:248 +#: ../app/tools/gimpcolorbalancetool.c:292 +#: ../app/tools/gimphuesaturationtool.c:248 msgid "Red" msgstr "Červená" -#: ../app/tools/gimpcolorbalancetool.c:301 ../app/tools/gimphuesaturationtool.c:253 +#: ../app/tools/gimpcolorbalancetool.c:301 +#: ../app/tools/gimphuesaturationtool.c:253 msgid "Magenta" msgstr "Purpurová" -#: ../app/tools/gimpcolorbalancetool.c:301 ../app/tools/gimphuesaturationtool.c:250 +#: ../app/tools/gimpcolorbalancetool.c:301 +#: ../app/tools/gimphuesaturationtool.c:250 msgid "Green" msgstr "Zelená" -#: ../app/tools/gimpcolorbalancetool.c:310 ../app/tools/gimphuesaturationtool.c:249 +#: ../app/tools/gimpcolorbalancetool.c:310 +#: ../app/tools/gimphuesaturationtool.c:249 msgid "Yellow" msgstr "Žltá" -#: ../app/tools/gimpcolorbalancetool.c:310 ../app/tools/gimphuesaturationtool.c:252 +#: ../app/tools/gimpcolorbalancetool.c:310 +#: ../app/tools/gimphuesaturationtool.c:252 msgid "Blue" msgstr "Modrá" @@ -12665,7 +13310,9 @@ msgid "Color Picker Average Radius" msgstr "Stredný polomer farebnej pipety" -#: ../app/tools/gimpcoloroptions.c:157 ../app/tools/gimprectangleselectoptions.c:163 ../app/tools/gimpselectionoptions.c:277 ../app/widgets/gimpbrusheditor.c:155 +#: ../app/tools/gimpcoloroptions.c:157 +#: ../app/tools/gimprectangleselectoptions.c:163 +#: ../app/tools/gimpselectionoptions.c:277 ../app/widgets/gimpbrusheditor.c:155 msgid "Radius" msgstr "Polomer" @@ -12683,8 +13330,11 @@ msgstr "Zvoľte, čo farebná pipeta bude robiť" #: ../app/tools/gimpcolorpickeroptions.c:80 -msgid "Open a floating dialog to view picked color values in various color models" -msgstr "Otvorí plávajúce dialógové okno, aby ste videli hodnoty zložiek farby v rôznych farebných modeloch" +msgid "" +"Open a floating dialog to view picked color values in various color models" +msgstr "" +"Otvorí plávajúce dialógové okno, aby ste videli hodnoty zložiek farby v " +"rôznych farebných modeloch" #. the pick FG/BG frame #: ../app/tools/gimpcolorpickeroptions.c:163 @@ -12756,7 +13406,9 @@ #: ../app/tools/gimpconvolvetool.c:74 msgid "Blur / Sharpen Tool: Selective blurring or unblurring using a brush" -msgstr "Nástroj na zmenu ostrosti: Lokálne rozostrí alebo zaostrí s vybraným tvarom štetca" +msgstr "" +"Nástroj na zmenu ostrosti: Lokálne rozostrí alebo zaostrí s vybraným tvarom " +"štetca" #: ../app/tools/gimpconvolvetool.c:75 msgid "Bl_ur / Sharpen" @@ -12799,7 +13451,8 @@ msgstr "Typ zaostrenia (%s)" # tooltip -#: ../app/tools/gimpcropoptions.c:76 ../app/tools/gimprectangleselectoptions.c:77 +#: ../app/tools/gimpcropoptions.c:76 +#: ../app/tools/gimprectangleselectoptions.c:77 msgid "Dim everything outside selection" msgstr "Stlmí všetko okolo výberu" @@ -12811,7 +13464,8 @@ # tooltip #: ../app/tools/gimpcropoptions.c:88 msgid "Allow resizing canvas by dragging cropping frame beyond image boundary" -msgstr "Povolí zmenu veľkosti plátna ťahaním orezávajúceho rámčeka za hranice obrázka" +msgstr "" +"Povolí zmenu veľkosti plátna ťahaním orezávajúceho rámčeka za hranice obrázka" # chceckbutton #: ../app/tools/gimpcropoptions.c:164 @@ -12845,68 +13499,68 @@ msgid "There is no active layer to crop." msgstr "Na orezanie nie je aktívna vrstva." -#: ../app/tools/gimpcurvestool.c:143 +#: ../app/tools/gimpcurvestool.c:145 msgid "Curves" msgstr "Krivky" # tooltip -#: ../app/tools/gimpcurvestool.c:144 +#: ../app/tools/gimpcurvestool.c:146 msgid "Curves Tool: Adjust color curves" msgstr "Nástroj krivky: Upravuje krivky farieb" -#: ../app/tools/gimpcurvestool.c:145 +#: ../app/tools/gimpcurvestool.c:147 msgid "_Curves..." msgstr "_Krivky..." -#: ../app/tools/gimpcurvestool.c:171 +#: ../app/tools/gimpcurvestool.c:174 msgid "Adjust Color Curves" msgstr "Úprava kriviek farebných kanálov" -#: ../app/tools/gimpcurvestool.c:173 +#: ../app/tools/gimpcurvestool.c:176 msgid "Import Curves" msgstr "Importovať krivky" -#: ../app/tools/gimpcurvestool.c:174 +#: ../app/tools/gimpcurvestool.c:177 msgid "Export Curves" msgstr "Exportovať krivky" -#: ../app/tools/gimpcurvestool.c:225 +#: ../app/tools/gimpcurvestool.c:239 msgid "Curves does not operate on indexed layers." msgstr "Krivky nefungujú na indexovaných vrstvách." # pomocník v stavovom riadku -#: ../app/tools/gimpcurvestool.c:333 +#: ../app/tools/gimpcurvestool.c:348 msgid "Click to add a control point" msgstr "Kliknutím pridáte riadiaci bod" # pomocník v stavovom riadku -#: ../app/tools/gimpcurvestool.c:338 +#: ../app/tools/gimpcurvestool.c:353 msgid "Click to add control points to all channels" msgstr "Kliknutím pridáte riadiace body všetkým kanálom" # pomocník v stavovom riadku -#: ../app/tools/gimpcurvestool.c:343 +#: ../app/tools/gimpcurvestool.c:358 msgid "Click to locate on curve (try Shift, Ctrl)" msgstr "Kliknutím pridáte miesto na krivke (skúste Shift, Ctrl)" -#: ../app/tools/gimpcurvestool.c:456 ../app/tools/gimplevelstool.c:384 +#: ../app/tools/gimpcurvestool.c:473 ../app/tools/gimplevelstool.c:384 msgid "Cha_nnel:" msgstr "_Kanál:" -#: ../app/tools/gimpcurvestool.c:482 ../app/tools/gimplevelstool.c:408 +#: ../app/tools/gimpcurvestool.c:499 ../app/tools/gimplevelstool.c:408 msgid "R_eset Channel" msgstr "_Obnoviť kanál" -#: ../app/tools/gimpcurvestool.c:576 ../app/widgets/gimpdeviceinfoeditor.c:461 +#: ../app/tools/gimpcurvestool.c:590 ../app/widgets/gimpdeviceinfoeditor.c:461 msgid "Curve _type:" msgstr "_Typ krivky:" -#: ../app/tools/gimpcurvestool.c:651 ../app/tools/gimplevelstool.c:756 +#: ../app/tools/gimpcurvestool.c:667 ../app/tools/gimplevelstool.c:756 #, c-format msgid "Could not read header from '%s': %s" msgstr "Nie je možné čítať hlavičku z „%s“: %s" -#: ../app/tools/gimpcurvestool.c:724 +#: ../app/tools/gimpcurvestool.c:740 msgid "Use _old curves file format" msgstr "Použiť _starý formát súboru kriviek" @@ -12936,7 +13590,9 @@ #: ../app/tools/gimpdodgeburntool.c:74 msgid "Dodge / Burn Tool: Selectively lighten or darken using a brush" -msgstr "Nástroj na zmenu svetlosti: Lokálne zosvetlí alebo stmaví s vybraným tvarom štetca" +msgstr "" +"Nástroj na zmenu svetlosti: Lokálne zosvetlí alebo stmaví s vybraným tvarom " +"štetca" #: ../app/tools/gimpdodgeburntool.c:75 msgid "Dod_ge / Burn" @@ -12983,18 +13639,16 @@ msgid "Exposure" msgstr "Expozícia" -#: ../app/tools/gimpeditselectiontool.c:242 -msgid "Move Selection" -msgstr "Presunutie výberu" +#: ../app/tools/gimpeditselectiontool.c:484 +#: ../app/tools/gimpeditselectiontool.c:670 +msgid "Move: " +msgstr "Presun: " -#: ../app/tools/gimpeditselectiontool.c:246 ../app/tools/gimpeditselectiontool.c:1241 +#: ../app/tools/gimpeditselectiontool.c:982 +#: ../app/tools/gimpeditselectiontool.c:1234 msgid "Move Floating Selection" msgstr "Presunúť plávajúci výber" -#: ../app/tools/gimpeditselectiontool.c:455 ../app/tools/gimpeditselectiontool.c:732 -msgid "Move: " -msgstr "Presun: " - #: ../app/tools/gimpellipseselecttool.c:66 msgid "Ellipse Select" msgstr "Eliptický výber" @@ -13009,7 +13663,9 @@ #: ../app/tools/gimperasertool.c:66 msgid "Eraser Tool: Erase to background or transparency using a brush" -msgstr "Nástroj guma: Maže farbou pozadia alebo priehľadnosťou s vybraným tvarom štetca" +msgstr "" +"Nástroj guma: Maže farbou pozadia alebo priehľadnosťou s vybraným tvarom " +"štetca" #: ../app/tools/gimperasertool.c:67 msgid "_Eraser" @@ -13053,8 +13709,11 @@ msgstr "Preklopenie" #: ../app/tools/gimpfliptool.c:85 -msgid "Flip Tool: Reverse the layer, selection or path horizontally or vertically" -msgstr "Nástroj na preklopenie: Vodorovne alebo zvisle preklopí vrstvu, výber alebo cestu" +msgid "" +"Flip Tool: Reverse the layer, selection or path horizontally or vertically" +msgstr "" +"Nástroj na preklopenie: Vodorovne alebo zvisle preklopí vrstvu, výber alebo " +"cestu" #: ../app/tools/gimpfliptool.c:87 msgid "_Flip" @@ -13085,8 +13744,12 @@ msgstr "Výber jednej spojitej oblasti" #: ../app/tools/gimpforegroundselectoptions.c:91 -msgid "Paint over areas to mark color values for inclusion or exclusion from selection" -msgstr "Maľbou nad oblasťami označíte hodnoty farieb na začlenenie alebo vyňatie z výberu" +msgid "" +"Paint over areas to mark color values for inclusion or exclusion from " +"selection" +msgstr "" +"Maľbou nad oblasťami označíte hodnoty farieb na začlenenie alebo vyňatie z " +"výberu" # http://docs.gimp.org/en/gimp-tool-foreground-select.html #: ../app/tools/gimpforegroundselectoptions.c:98 @@ -13094,8 +13757,12 @@ msgstr "Veľkosť štetca pre vylepšovanie" #: ../app/tools/gimpforegroundselectoptions.c:104 -msgid "Smaller values give a more accurate selection border but may introduce holes in the selection" -msgstr "Menšie hodnoty poskytujú presnejší výber okraja, ale môžu spôsobiť diery vo výbere" +msgid "" +"Smaller values give a more accurate selection border but may introduce holes " +"in the selection" +msgstr "" +"Menšie hodnoty poskytujú presnejší výber okraja, ale môžu spôsobiť diery vo " +"výbere" #: ../app/tools/gimpforegroundselectoptions.c:112 msgid "Color of selection preview mask" @@ -13183,8 +13850,10 @@ msgstr "Výber popredia" #: ../app/tools/gimpfreeselecttool.c:197 -msgid "Free Select Tool: Select a hand-drawn region with free and polygonal segments" -msgstr "Nástroj voľný výber: Vyberie ručne obtiahnutú oblasť nepravidelných tvarov" +msgid "" +"Free Select Tool: Select a hand-drawn region with free and polygonal segments" +msgstr "" +"Nástroj voľný výber: Vyberie ručne obtiahnutú oblasť nepravidelných tvarov" #: ../app/tools/gimpfreeselecttool.c:198 msgid "_Free Select" @@ -13205,7 +13874,9 @@ # PM: aj keď nie je preklad presný je podľa mňa OK #: ../app/tools/gimpfreeselecttool.c:1043 msgid "Click-Drag adds a free segment, Click adds a polygonal segment" -msgstr "Kliknutím a ťahaním pridáte rukou nakreslenú časť, kliknutím pridáte priamu časť" +msgstr "" +"Kliknutím a ťahaním pridáte rukou nakreslenú časť, kliknutím pridáte priamu " +"časť" #: ../app/tools/gimpfreeselecttool.c:1562 msgctxt "command" @@ -13376,11 +14047,13 @@ msgid "Adjustment" msgstr "Zarovnanie" -#: ../app/tools/gimpinkoptions-gui.c:64 ../app/tools/gimpinkoptions-gui.c:87 ../app/tools/gimppaintoptions-gui.c:132 +#: ../app/tools/gimpinkoptions-gui.c:64 ../app/tools/gimpinkoptions-gui.c:87 +#: ../app/tools/gimppaintoptions-gui.c:132 msgid "Size" msgstr "Veľkosť" -#: ../app/tools/gimpinkoptions-gui.c:71 ../app/tools/gimppaintoptions-gui.c:181 ../app/widgets/gimpbrusheditor.c:199 +#: ../app/tools/gimpinkoptions-gui.c:71 ../app/tools/gimppaintoptions-gui.c:181 +#: ../app/widgets/gimpbrusheditor.c:199 msgid "Angle" msgstr "Uhol" @@ -13389,7 +14062,8 @@ msgid "Sensitivity" msgstr "Citlivosť" -#: ../app/tools/gimpinkoptions-gui.c:94 ../app/widgets/gimpdynamicseditor.c:144 ../app/widgets/gimpdynamicsoutputeditor.c:72 +#: ../app/tools/gimpinkoptions-gui.c:94 ../app/widgets/gimpdynamicseditor.c:144 +#: ../app/widgets/gimpdynamicsoutputeditor.c:72 msgid "Tilt" msgstr "Sklon" @@ -13426,7 +14100,9 @@ #: ../app/tools/gimpiscissorstool.c:276 msgid "Scissors Select Tool: Select shapes using intelligent edge-fitting" -msgstr "Nástroj výber nožnicami: Vyberie útvary pomocou inteligentne nájdených okrajov" +msgstr "" +"Nástroj výber nožnicami: Vyberie útvary pomocou inteligentne nájdených " +"okrajov" #: ../app/tools/gimpiscissorstool.c:277 msgid "Intelligent _Scissors" @@ -13611,7 +14287,9 @@ msgid "Click-Drag to move all points" msgstr "Kliknutím a ťahaním posuniete všetky body." -#: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084 ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168 ../app/tools/gimppainttool.c:633 +#: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084 +#: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168 +#: ../app/tools/gimppainttool.c:634 msgid "pixels" msgstr "pixelov" @@ -13696,7 +14374,9 @@ msgid "_Paintbrush" msgstr "_Štetec" -#: ../app/tools/gimppaintoptions-gui.c:89 ../app/tools/gimpselectionoptions.c:217 ../app/widgets/gimpbrushselect.c:190 ../app/widgets/gimplayertreeview.c:268 +#: ../app/tools/gimppaintoptions-gui.c:89 +#: ../app/tools/gimpselectionoptions.c:217 ../app/widgets/gimpbrushselect.c:190 +#: ../app/widgets/gimplayertreeview.c:268 msgid "Mode:" msgstr "Režim:" @@ -13781,7 +14461,7 @@ msgid "Cannot paint on layer groups." msgstr "Nie je možné kresliť na skupinu vrstiev." -#: ../app/tools/gimppainttool.c:679 +#: ../app/tools/gimppainttool.c:680 #, c-format msgid "%s for a straight line" msgstr "%s urobí rovnú čiaru" @@ -13795,8 +14475,12 @@ msgstr "_Ceruzka" #: ../app/tools/gimpperspectiveclonetool.c:134 -msgid "Perspective Clone Tool: Clone from an image source after applying a perspective transformation" -msgstr "Nástroj Perspektívne razítko: Klonuje z obrázkového zdroja s aplikáciou perspektívnej transformácie" +msgid "" +"Perspective Clone Tool: Clone from an image source after applying a " +"perspective transformation" +msgstr "" +"Nástroj Perspektívne razítko: Klonuje z obrázkového zdroja s aplikáciou " +"perspektívnej transformácie" #: ../app/tools/gimpperspectiveclonetool.c:136 msgid "_Perspective Clone" @@ -13808,7 +14492,8 @@ #: ../app/tools/gimpperspectivetool.c:83 msgid "Perspective Tool: Change perspective of the layer, selection or path" -msgstr "Nástroj perspektívne razítko: Mení perspektívu vrstvy, výberu alebo cesty" +msgstr "" +"Nástroj perspektívne razítko: Mení perspektívu vrstvy, výberu alebo cesty" #: ../app/tools/gimpperspectivetool.c:85 msgid "_Perspective" @@ -13860,7 +14545,8 @@ msgstr "Použije všetky viditeľné vrstvy pri zmenšovaní do výberu" # tooltip -#: ../app/tools/gimprectangleoptions.c:122 ../app/tools/gimptransformoptions.c:127 +#: ../app/tools/gimprectangleoptions.c:122 +#: ../app/tools/gimptransformoptions.c:127 msgid "Composition guides such as rule of thirds" msgstr "Kompozičné vodidlá, ako napríklad pravidlo tretín" @@ -14184,8 +14870,11 @@ msgstr "Veľkosť písma" #: ../app/tools/gimptextoptions.c:145 -msgid "Hinting alters the font outline to produce a crisp bitmap at small sizes" -msgstr "Dolaďovanie zmení obrys písma tak, aby boli vytvorené ostré bitové mapy aj pri malých veľkostiach" +msgid "" +"Hinting alters the font outline to produce a crisp bitmap at small sizes" +msgstr "" +"Dolaďovanie zmení obrys písma tak, aby boli vytvorené ostré bitové mapy aj " +"pri malých veľkostiach" #: ../app/tools/gimptextoptions.c:153 msgid "The text language may have an effect on the way the text is rendered." @@ -14208,8 +14897,12 @@ msgstr "Upraví rozostup znakov" #: ../app/tools/gimptextoptions.c:188 -msgid "Whether text flows into rectangular shape or moves into a new line when you press Enter" -msgstr "Či má text pretekať vo vnútri obdĺžnika alebo má prejsť na nový riadok po stlačení klávesu Enter" +msgid "" +"Whether text flows into rectangular shape or moves into a new line when you " +"press Enter" +msgstr "" +"Či má text pretekať vo vnútri obdĺžnika alebo má prejsť na nový riadok po " +"stlačení klávesu Enter" #: ../app/tools/gimptextoptions.c:196 msgid "Use an external editor window for text entry" @@ -14278,13 +14971,17 @@ #: ../app/tools/gimptexttool.c:1557 msgid "" -"The layer you selected is a text layer but it has been modified using other tools. Editing the layer with the text tool will discard these modifications.\n" +"The layer you selected is a text layer but it has been modified using other " +"tools. Editing the layer with the text tool will discard these " +"modifications.\n" "\n" "You can edit the layer or create a new text layer from its text attributes." msgstr "" -"Vrstva, ktorú ste vybrali, je vrstva textu, ale bola upravená inými nástrojmi. Úprava vrstvy nástrojom text tieto zmeny zruší.\n" +"Vrstva, ktorú ste vybrali, je vrstva textu, ale bola upravená inými " +"nástrojmi. Úprava vrstvy nástrojom text tieto zmeny zruší.\n" "\n" -"Môžete vrstvu upravovať alebo vytvoriť novú vrstvu textu z atribútov jej textu." +"Môžete vrstvu upravovať alebo vytvoriť novú vrstvu textu z atribútov jej " +"textu." #: ../app/tools/gimptexttool-editor.c:1236 msgid "GIMP Text Editor" @@ -14350,7 +15047,9 @@ msgid "Transform:" msgstr "Transformácia:" -#: ../app/tools/gimptransformoptions.c:286 ../app/widgets/gimpdynamicseditor.c:143 ../app/widgets/gimpdynamicsoutputeditor.c:71 +#: ../app/tools/gimptransformoptions.c:286 +#: ../app/widgets/gimpdynamicseditor.c:143 +#: ../app/widgets/gimpdynamicsoutputeditor.c:71 msgid "Direction" msgstr "Smer" @@ -14404,15 +15103,15 @@ msgid "The selection does not intersect with the layer." msgstr "Výber sa nepretína s vrstvou. " -#: ../app/tools/gimptransformtool.c:1476 +#: ../app/tools/gimptransformtool.c:1480 msgid "There is no layer to transform." msgstr "Neexistuje žiadna vrstva na transformáciu." -#: ../app/tools/gimptransformtool.c:1487 +#: ../app/tools/gimptransformtool.c:1491 msgid "There is no path to transform." msgstr "Neexistuje žiadna cesta na transformáciu." -#: ../app/tools/gimptransformtool.c:1488 +#: ../app/tools/gimptransformtool.c:1492 msgid "The active path's strokes are locked." msgstr "Ťahy aktívnej cesty sú uzamknuté." @@ -14804,7 +15503,8 @@ msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" msgstr "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" -#: ../app/widgets/gimpactionview.c:338 ../app/widgets/gimpcontrollereditor.c:341 +#: ../app/widgets/gimpactionview.c:338 +#: ../app/widgets/gimpcontrollereditor.c:341 msgid "Action" msgstr "Akcia" @@ -14858,15 +15558,18 @@ msgid "Aspect ratio" msgstr "Index lúčov" -#: ../app/widgets/gimpbrusheditor.c:210 ../app/widgets/gimpbrushfactoryview.c:80 ../app/widgets/gimpgrideditor.c:174 +#: ../app/widgets/gimpbrusheditor.c:210 +#: ../app/widgets/gimpbrushfactoryview.c:80 ../app/widgets/gimpgrideditor.c:174 msgid "Spacing" msgstr "Medzera" -#: ../app/widgets/gimpbrusheditor.c:215 ../app/widgets/gimpbrushfactoryview.c:84 +#: ../app/widgets/gimpbrusheditor.c:215 +#: ../app/widgets/gimpbrushfactoryview.c:84 msgid "Percentage of width of brush" msgstr "Percento šírky štetca" -#: ../app/widgets/gimpbufferview.c:179 ../app/widgets/gimpbufferview.c:264 ../app/widgets/gimpeditor.c:747 +#: ../app/widgets/gimpbufferview.c:179 ../app/widgets/gimpbufferview.c:264 +#: ../app/widgets/gimpeditor.c:747 msgid "(None)" msgstr "(Nič)" @@ -14908,9 +15611,13 @@ msgid "No filter selected" msgstr "Nie je vybraný žiadny filter" -#: ../app/widgets/gimpcoloreditor.c:260 -msgid "Hexadecimal color notation as used in HTML and CSS. This entry also accepts CSS color names." -msgstr "Šestnástkový zápis farieb používaný v HTML a CSS. Tento údaj tiež akceptuje názvy farieb CSS." +#: ../app/widgets/gimpcoloreditor.c:264 +msgid "" +"Hexadecimal color notation as used in HTML and CSS. This entry also accepts " +"CSS color names." +msgstr "" +"Šestnástkový zápis farieb používaný v HTML a CSS. Tento údaj tiež akceptuje " +"názvy farieb CSS." #: ../app/widgets/gimpcolorframe.c:511 msgid "Index:" @@ -15035,23 +15742,47 @@ msgid "Select Controller Event Action" msgstr "Zvoľte akciu pre udalosť ovládača" -#: ../app/widgets/gimpcontrollerkeyboard.c:67 ../app/widgets/gimpcontrollerkeyboard.c:70 ../app/widgets/gimpcontrollerkeyboard.c:73 ../app/widgets/gimpcontrollerkeyboard.c:76 ../app/widgets/gimpcontrollerkeyboard.c:79 -#: ../app/widgets/gimpcontrollerkeyboard.c:82 ../app/widgets/gimpcontrollerkeyboard.c:85 ../app/widgets/gimpcontrollerkeyboard.c:88 +#: ../app/widgets/gimpcontrollerkeyboard.c:67 +#: ../app/widgets/gimpcontrollerkeyboard.c:70 +#: ../app/widgets/gimpcontrollerkeyboard.c:73 +#: ../app/widgets/gimpcontrollerkeyboard.c:76 +#: ../app/widgets/gimpcontrollerkeyboard.c:79 +#: ../app/widgets/gimpcontrollerkeyboard.c:82 +#: ../app/widgets/gimpcontrollerkeyboard.c:85 +#: ../app/widgets/gimpcontrollerkeyboard.c:88 msgid "Cursor Up" msgstr "Šípka hore" -#: ../app/widgets/gimpcontrollerkeyboard.c:92 ../app/widgets/gimpcontrollerkeyboard.c:95 ../app/widgets/gimpcontrollerkeyboard.c:98 ../app/widgets/gimpcontrollerkeyboard.c:101 ../app/widgets/gimpcontrollerkeyboard.c:104 -#: ../app/widgets/gimpcontrollerkeyboard.c:107 ../app/widgets/gimpcontrollerkeyboard.c:110 ../app/widgets/gimpcontrollerkeyboard.c:113 +#: ../app/widgets/gimpcontrollerkeyboard.c:92 +#: ../app/widgets/gimpcontrollerkeyboard.c:95 +#: ../app/widgets/gimpcontrollerkeyboard.c:98 +#: ../app/widgets/gimpcontrollerkeyboard.c:101 +#: ../app/widgets/gimpcontrollerkeyboard.c:104 +#: ../app/widgets/gimpcontrollerkeyboard.c:107 +#: ../app/widgets/gimpcontrollerkeyboard.c:110 +#: ../app/widgets/gimpcontrollerkeyboard.c:113 msgid "Cursor Down" msgstr "Šípka dolu" -#: ../app/widgets/gimpcontrollerkeyboard.c:117 ../app/widgets/gimpcontrollerkeyboard.c:120 ../app/widgets/gimpcontrollerkeyboard.c:123 ../app/widgets/gimpcontrollerkeyboard.c:126 ../app/widgets/gimpcontrollerkeyboard.c:129 -#: ../app/widgets/gimpcontrollerkeyboard.c:132 ../app/widgets/gimpcontrollerkeyboard.c:135 ../app/widgets/gimpcontrollerkeyboard.c:138 +#: ../app/widgets/gimpcontrollerkeyboard.c:117 +#: ../app/widgets/gimpcontrollerkeyboard.c:120 +#: ../app/widgets/gimpcontrollerkeyboard.c:123 +#: ../app/widgets/gimpcontrollerkeyboard.c:126 +#: ../app/widgets/gimpcontrollerkeyboard.c:129 +#: ../app/widgets/gimpcontrollerkeyboard.c:132 +#: ../app/widgets/gimpcontrollerkeyboard.c:135 +#: ../app/widgets/gimpcontrollerkeyboard.c:138 msgid "Cursor Left" msgstr "Šípka vľavo" -#: ../app/widgets/gimpcontrollerkeyboard.c:142 ../app/widgets/gimpcontrollerkeyboard.c:145 ../app/widgets/gimpcontrollerkeyboard.c:148 ../app/widgets/gimpcontrollerkeyboard.c:151 ../app/widgets/gimpcontrollerkeyboard.c:154 -#: ../app/widgets/gimpcontrollerkeyboard.c:157 ../app/widgets/gimpcontrollerkeyboard.c:160 ../app/widgets/gimpcontrollerkeyboard.c:163 +#: ../app/widgets/gimpcontrollerkeyboard.c:142 +#: ../app/widgets/gimpcontrollerkeyboard.c:145 +#: ../app/widgets/gimpcontrollerkeyboard.c:148 +#: ../app/widgets/gimpcontrollerkeyboard.c:151 +#: ../app/widgets/gimpcontrollerkeyboard.c:154 +#: ../app/widgets/gimpcontrollerkeyboard.c:157 +#: ../app/widgets/gimpcontrollerkeyboard.c:160 +#: ../app/widgets/gimpcontrollerkeyboard.c:163 msgid "Cursor Right" msgstr "Šípka vpravo" @@ -15064,7 +15795,9 @@ msgstr "Udalosti klávesnice" # PM: je to za labelom Stav: a vzťahuje sa to na stav ovládacieho zariadenia -#: ../app/widgets/gimpcontrollerkeyboard.c:217 ../app/widgets/gimpcontrollermouse.c:245 ../app/widgets/gimpcontrollerwheel.c:219 +#: ../app/widgets/gimpcontrollerkeyboard.c:217 +#: ../app/widgets/gimpcontrollermouse.c:245 +#: ../app/widgets/gimpcontrollerwheel.c:219 msgid "Ready" msgstr "Pripravené" @@ -15147,40 +15880,74 @@ #: ../app/widgets/gimpcontrollerlist.c:583 msgid "" -"Removing this controller from the list of active controllers will permanently delete all event mappings you have configured.\n" +"Removing this controller from the list of active controllers will " +"permanently delete all event mappings you have configured.\n" "\n" -"Selecting \"Disable Controller\" will disable the controller without removing it." +"Selecting \"Disable Controller\" will disable the controller without " +"removing it." msgstr "" -"Odstránením tohto ovládača zo zoznamu aktívnych ovládačov odstránite aj všetky priradené akcie, ktoré ste nastavili.\n" +"Odstránením tohto ovládača zo zoznamu aktívnych ovládačov odstránite aj " +"všetky priradené akcie, ktoré ste nastavili.\n" "\n" -"Ak vyberiete „Vypnúť ovládač“, zariadenie vypnete bez toho, aby ste ho odstránili." +"Ak vyberiete „Vypnúť ovládač“, zariadenie vypnete bez toho, aby ste ho " +"odstránili." #: ../app/widgets/gimpcontrollerlist.c:635 msgid "Configure Input Controller" msgstr "Nastaviť vstupný ovládač" -#: ../app/widgets/gimpcontrollermouse.c:70 ../app/widgets/gimpcontrollermouse.c:73 ../app/widgets/gimpcontrollermouse.c:76 ../app/widgets/gimpcontrollermouse.c:79 ../app/widgets/gimpcontrollermouse.c:82 ../app/widgets/gimpcontrollermouse.c:85 -#: ../app/widgets/gimpcontrollermouse.c:88 ../app/widgets/gimpcontrollermouse.c:91 +#: ../app/widgets/gimpcontrollermouse.c:70 +#: ../app/widgets/gimpcontrollermouse.c:73 +#: ../app/widgets/gimpcontrollermouse.c:76 +#: ../app/widgets/gimpcontrollermouse.c:79 +#: ../app/widgets/gimpcontrollermouse.c:82 +#: ../app/widgets/gimpcontrollermouse.c:85 +#: ../app/widgets/gimpcontrollermouse.c:88 +#: ../app/widgets/gimpcontrollermouse.c:91 msgid "Button 8" msgstr "Tlačidlo 8" -#: ../app/widgets/gimpcontrollermouse.c:95 ../app/widgets/gimpcontrollermouse.c:98 ../app/widgets/gimpcontrollermouse.c:101 ../app/widgets/gimpcontrollermouse.c:104 ../app/widgets/gimpcontrollermouse.c:107 ../app/widgets/gimpcontrollermouse.c:110 -#: ../app/widgets/gimpcontrollermouse.c:113 ../app/widgets/gimpcontrollermouse.c:116 +#: ../app/widgets/gimpcontrollermouse.c:95 +#: ../app/widgets/gimpcontrollermouse.c:98 +#: ../app/widgets/gimpcontrollermouse.c:101 +#: ../app/widgets/gimpcontrollermouse.c:104 +#: ../app/widgets/gimpcontrollermouse.c:107 +#: ../app/widgets/gimpcontrollermouse.c:110 +#: ../app/widgets/gimpcontrollermouse.c:113 +#: ../app/widgets/gimpcontrollermouse.c:116 msgid "Button 9" msgstr "Tlačidlo 9" -#: ../app/widgets/gimpcontrollermouse.c:120 ../app/widgets/gimpcontrollermouse.c:123 ../app/widgets/gimpcontrollermouse.c:126 ../app/widgets/gimpcontrollermouse.c:129 ../app/widgets/gimpcontrollermouse.c:132 ../app/widgets/gimpcontrollermouse.c:135 -#: ../app/widgets/gimpcontrollermouse.c:138 ../app/widgets/gimpcontrollermouse.c:141 +#: ../app/widgets/gimpcontrollermouse.c:120 +#: ../app/widgets/gimpcontrollermouse.c:123 +#: ../app/widgets/gimpcontrollermouse.c:126 +#: ../app/widgets/gimpcontrollermouse.c:129 +#: ../app/widgets/gimpcontrollermouse.c:132 +#: ../app/widgets/gimpcontrollermouse.c:135 +#: ../app/widgets/gimpcontrollermouse.c:138 +#: ../app/widgets/gimpcontrollermouse.c:141 msgid "Button 10" msgstr "Tlačidlo 10" -#: ../app/widgets/gimpcontrollermouse.c:145 ../app/widgets/gimpcontrollermouse.c:148 ../app/widgets/gimpcontrollermouse.c:151 ../app/widgets/gimpcontrollermouse.c:154 ../app/widgets/gimpcontrollermouse.c:157 ../app/widgets/gimpcontrollermouse.c:160 -#: ../app/widgets/gimpcontrollermouse.c:163 ../app/widgets/gimpcontrollermouse.c:166 +#: ../app/widgets/gimpcontrollermouse.c:145 +#: ../app/widgets/gimpcontrollermouse.c:148 +#: ../app/widgets/gimpcontrollermouse.c:151 +#: ../app/widgets/gimpcontrollermouse.c:154 +#: ../app/widgets/gimpcontrollermouse.c:157 +#: ../app/widgets/gimpcontrollermouse.c:160 +#: ../app/widgets/gimpcontrollermouse.c:163 +#: ../app/widgets/gimpcontrollermouse.c:166 msgid "Button 11" msgstr "Tlačidlo 11" -#: ../app/widgets/gimpcontrollermouse.c:170 ../app/widgets/gimpcontrollermouse.c:173 ../app/widgets/gimpcontrollermouse.c:176 ../app/widgets/gimpcontrollermouse.c:179 ../app/widgets/gimpcontrollermouse.c:182 ../app/widgets/gimpcontrollermouse.c:185 -#: ../app/widgets/gimpcontrollermouse.c:188 ../app/widgets/gimpcontrollermouse.c:191 +#: ../app/widgets/gimpcontrollermouse.c:170 +#: ../app/widgets/gimpcontrollermouse.c:173 +#: ../app/widgets/gimpcontrollermouse.c:176 +#: ../app/widgets/gimpcontrollermouse.c:179 +#: ../app/widgets/gimpcontrollermouse.c:182 +#: ../app/widgets/gimpcontrollermouse.c:185 +#: ../app/widgets/gimpcontrollermouse.c:188 +#: ../app/widgets/gimpcontrollermouse.c:191 msgid "Button 12" msgstr "Tlačidlo 12" @@ -15192,23 +15959,47 @@ msgid "Mouse Button Events" msgstr "Udalosti tlačidiel myši" -#: ../app/widgets/gimpcontrollerwheel.c:69 ../app/widgets/gimpcontrollerwheel.c:72 ../app/widgets/gimpcontrollerwheel.c:75 ../app/widgets/gimpcontrollerwheel.c:78 ../app/widgets/gimpcontrollerwheel.c:81 ../app/widgets/gimpcontrollerwheel.c:84 -#: ../app/widgets/gimpcontrollerwheel.c:87 ../app/widgets/gimpcontrollerwheel.c:90 +#: ../app/widgets/gimpcontrollerwheel.c:69 +#: ../app/widgets/gimpcontrollerwheel.c:72 +#: ../app/widgets/gimpcontrollerwheel.c:75 +#: ../app/widgets/gimpcontrollerwheel.c:78 +#: ../app/widgets/gimpcontrollerwheel.c:81 +#: ../app/widgets/gimpcontrollerwheel.c:84 +#: ../app/widgets/gimpcontrollerwheel.c:87 +#: ../app/widgets/gimpcontrollerwheel.c:90 msgid "Scroll Up" msgstr "Rolovanie hore" -#: ../app/widgets/gimpcontrollerwheel.c:94 ../app/widgets/gimpcontrollerwheel.c:97 ../app/widgets/gimpcontrollerwheel.c:100 ../app/widgets/gimpcontrollerwheel.c:103 ../app/widgets/gimpcontrollerwheel.c:106 ../app/widgets/gimpcontrollerwheel.c:109 -#: ../app/widgets/gimpcontrollerwheel.c:112 ../app/widgets/gimpcontrollerwheel.c:115 +#: ../app/widgets/gimpcontrollerwheel.c:94 +#: ../app/widgets/gimpcontrollerwheel.c:97 +#: ../app/widgets/gimpcontrollerwheel.c:100 +#: ../app/widgets/gimpcontrollerwheel.c:103 +#: ../app/widgets/gimpcontrollerwheel.c:106 +#: ../app/widgets/gimpcontrollerwheel.c:109 +#: ../app/widgets/gimpcontrollerwheel.c:112 +#: ../app/widgets/gimpcontrollerwheel.c:115 msgid "Scroll Down" msgstr "Rolovanie dole" -#: ../app/widgets/gimpcontrollerwheel.c:119 ../app/widgets/gimpcontrollerwheel.c:122 ../app/widgets/gimpcontrollerwheel.c:125 ../app/widgets/gimpcontrollerwheel.c:128 ../app/widgets/gimpcontrollerwheel.c:131 ../app/widgets/gimpcontrollerwheel.c:134 -#: ../app/widgets/gimpcontrollerwheel.c:137 ../app/widgets/gimpcontrollerwheel.c:140 +#: ../app/widgets/gimpcontrollerwheel.c:119 +#: ../app/widgets/gimpcontrollerwheel.c:122 +#: ../app/widgets/gimpcontrollerwheel.c:125 +#: ../app/widgets/gimpcontrollerwheel.c:128 +#: ../app/widgets/gimpcontrollerwheel.c:131 +#: ../app/widgets/gimpcontrollerwheel.c:134 +#: ../app/widgets/gimpcontrollerwheel.c:137 +#: ../app/widgets/gimpcontrollerwheel.c:140 msgid "Scroll Left" msgstr "Rolovanie doľava" -#: ../app/widgets/gimpcontrollerwheel.c:144 ../app/widgets/gimpcontrollerwheel.c:147 ../app/widgets/gimpcontrollerwheel.c:150 ../app/widgets/gimpcontrollerwheel.c:153 ../app/widgets/gimpcontrollerwheel.c:156 ../app/widgets/gimpcontrollerwheel.c:159 -#: ../app/widgets/gimpcontrollerwheel.c:162 ../app/widgets/gimpcontrollerwheel.c:165 +#: ../app/widgets/gimpcontrollerwheel.c:144 +#: ../app/widgets/gimpcontrollerwheel.c:147 +#: ../app/widgets/gimpcontrollerwheel.c:150 +#: ../app/widgets/gimpcontrollerwheel.c:153 +#: ../app/widgets/gimpcontrollerwheel.c:156 +#: ../app/widgets/gimpcontrollerwheel.c:159 +#: ../app/widgets/gimpcontrollerwheel.c:162 +#: ../app/widgets/gimpcontrollerwheel.c:165 msgid "Scroll Right" msgstr "Rolovanie doprava" @@ -15254,7 +16045,9 @@ "Chystáte sa odstrániť uložené nastavenia tohto zariadenia.\n" "Pri ďalšom pripojení tohto zariadenia, sa použijú predvolené nastavenia." -#: ../app/widgets/gimpdeviceinfoeditor.c:140 ../app/widgets/gimpdynamicseditor.c:141 ../app/widgets/gimpdynamicsoutputeditor.c:69 +#: ../app/widgets/gimpdeviceinfoeditor.c:140 +#: ../app/widgets/gimpdynamicseditor.c:141 +#: ../app/widgets/gimpdynamicsoutputeditor.c:69 msgid "Pressure" msgstr "Tlak" @@ -15268,7 +16061,9 @@ # *https://bugzilla.gnome.org/show_bug.cgi?id=687256 #. Wheel as in mouse or input device wheel -#: ../app/widgets/gimpdeviceinfoeditor.c:144 ../app/widgets/gimpdynamicseditor.c:145 ../app/widgets/gimpdynamicsoutputeditor.c:73 +#: ../app/widgets/gimpdeviceinfoeditor.c:144 +#: ../app/widgets/gimpdynamicseditor.c:145 +#: ../app/widgets/gimpdynamicsoutputeditor.c:73 msgid "Wheel" msgstr "Koliesko" @@ -15285,7 +16080,8 @@ msgid "Keys" msgstr "Klávesy" -#: ../app/widgets/gimpdeviceinfoeditor.c:366 ../app/widgets/gimpdeviceinfoeditor.c:585 +#: ../app/widgets/gimpdeviceinfoeditor.c:366 +#: ../app/widgets/gimpdeviceinfoeditor.c:585 #, c-format msgid "none" msgstr "žiadne" @@ -15296,7 +16092,8 @@ msgid "%s Curve" msgstr "Krivka pre %s " -#: ../app/widgets/gimpdeviceinfoeditor.c:474 ../app/widgets/gimpdynamicsoutputeditor.c:209 +#: ../app/widgets/gimpdeviceinfoeditor.c:474 +#: ../app/widgets/gimpdynamicsoutputeditor.c:209 msgid "_Reset Curve" msgstr "O_bnoviť krivku" @@ -15372,8 +16169,10 @@ msgstr "Automaticky" #: ../app/widgets/gimpdockwindow.c:395 -msgid "When enabled the dialog automatically follows the image you are working on." -msgstr "Keď je povolené, dialóg automaticky sleduje obrázok, na ktorom pracujete." +msgid "" +"When enabled the dialog automatically follows the image you are working on." +msgstr "" +"Keď je povolené, dialóg automaticky sleduje obrázok, na ktorom pracujete." #: ../app/widgets/gimpdrawabletreeview.c:122 msgid "Lock pixels" @@ -15383,15 +16182,18 @@ msgid "Mapping matrix" msgstr "Mapovacia matica" -#: ../app/widgets/gimpdynamicseditor.c:142 ../app/widgets/gimpdynamicsoutputeditor.c:70 +#: ../app/widgets/gimpdynamicseditor.c:142 +#: ../app/widgets/gimpdynamicsoutputeditor.c:70 msgid "Velocity" msgstr "Rýchlosť" -#: ../app/widgets/gimpdynamicseditor.c:146 ../app/widgets/gimpdynamicsoutputeditor.c:74 +#: ../app/widgets/gimpdynamicseditor.c:146 +#: ../app/widgets/gimpdynamicsoutputeditor.c:74 msgid "Random" msgstr "Náhodný" -#: ../app/widgets/gimpdynamicseditor.c:147 ../app/widgets/gimpdynamicsoutputeditor.c:75 +#: ../app/widgets/gimpdynamicseditor.c:147 +#: ../app/widgets/gimpdynamicsoutputeditor.c:75 msgid "Fade" msgstr "Zoslabenie" @@ -15503,7 +16305,8 @@ msgid "Background color set to:" msgstr "Farba pozadia nastavená na:" -#: ../app/widgets/gimpgradienteditor.c:1235 ../app/widgets/gimpgradienteditor.c:1296 +#: ../app/widgets/gimpgradienteditor.c:1235 +#: ../app/widgets/gimpgradienteditor.c:1296 #, c-format msgid "%s-Drag: move & compress" msgstr "%s-ťahanie: posun a kompresia" @@ -15512,20 +16315,26 @@ msgid "Drag: move" msgstr "Ťahanie: posun" -#: ../app/widgets/gimpgradienteditor.c:1247 ../app/widgets/gimpgradienteditor.c:1260 ../app/widgets/gimpgradienteditor.c:1273 ../app/widgets/gimpgradienteditor.c:1294 +#: ../app/widgets/gimpgradienteditor.c:1247 +#: ../app/widgets/gimpgradienteditor.c:1260 +#: ../app/widgets/gimpgradienteditor.c:1273 +#: ../app/widgets/gimpgradienteditor.c:1294 #, c-format msgid "%s-Click: extend selection" msgstr "%s-Kliknutie: rozšíriť výber" -#: ../app/widgets/gimpgradienteditor.c:1252 ../app/widgets/gimpgradienteditor.c:1265 +#: ../app/widgets/gimpgradienteditor.c:1252 +#: ../app/widgets/gimpgradienteditor.c:1265 msgid "Click: select" msgstr "Kliknutie: výber" -#: ../app/widgets/gimpgradienteditor.c:1278 ../app/widgets/gimpgradienteditor.c:1300 +#: ../app/widgets/gimpgradienteditor.c:1278 +#: ../app/widgets/gimpgradienteditor.c:1300 msgid "Click: select Drag: move" msgstr "Kliknutie: výber Ťahanie: posun" -#: ../app/widgets/gimpgradienteditor.c:1515 ../app/widgets/gimpgradienteditor.c:1523 +#: ../app/widgets/gimpgradienteditor.c:1515 +#: ../app/widgets/gimpgradienteditor.c:1523 #, c-format msgid "Handle position: %0.4f" msgstr "Pozícia riadiaceho bodu: %0.6f" @@ -15564,45 +16373,60 @@ msgid "Height" msgstr "Výška" -#: ../app/widgets/gimphelp.c:297 +#: ../app/widgets/gimphelp.c:308 msgid "Help browser is missing" msgstr "Prehliadač pomocníka chýba" -#: ../app/widgets/gimphelp.c:298 +#: ../app/widgets/gimphelp.c:309 msgid "The GIMP help browser is not available." msgstr "Zabudovaný prehliadač pomocníka nie je dostupný." -#: ../app/widgets/gimphelp.c:299 -msgid "The GIMP help browser plug-in appears to be missing from your installation. You may instead use the web browser for reading the help pages." -msgstr "Zdá sa, že zabudovaný prehliadač pomocníka vo vašej inštalácií chýba. Ak chcete zobraziť stránky pomocníka, môžete miesto neho použiť webový prehliadač." +#: ../app/widgets/gimphelp.c:310 +msgid "" +"The GIMP help browser plug-in appears to be missing from your installation. " +"You may instead use the web browser for reading the help pages." +msgstr "" +"Zdá sa, že zabudovaný prehliadač pomocníka vo vašej inštalácií chýba. Ak " +"chcete zobraziť stránky pomocníka, môžete miesto neho použiť webový " +"prehliadač." -#: ../app/widgets/gimphelp.c:340 +#: ../app/widgets/gimphelp.c:351 msgid "Help browser doesn't start" msgstr "Prehliadač pomocníka neštartuje" -#: ../app/widgets/gimphelp.c:341 +#: ../app/widgets/gimphelp.c:352 msgid "Could not start the GIMP help browser plug-in." msgstr "Nie je možné spustiť prehliadač pomocníka." -#: ../app/widgets/gimphelp.c:368 +#: ../app/widgets/gimphelp.c:354 +msgid "You may instead use the web browser for reading the help pages." +msgstr "" +"Na prečítanie stránok pomocníka môžete namiesto toho použiť webový " +"prehliadač." + +#: ../app/widgets/gimphelp.c:380 msgid "Use _Web Browser" msgstr "Použiť _webový prehliadač" -#: ../app/widgets/gimphelp.c:712 +#: ../app/widgets/gimphelp.c:724 msgid "GIMP user manual is missing" msgstr "Používateľská príručka chýba" -#: ../app/widgets/gimphelp.c:719 +#: ../app/widgets/gimphelp.c:731 msgid "_Read Online" msgstr "Čítať _cez internet" -#: ../app/widgets/gimphelp.c:743 +#: ../app/widgets/gimphelp.c:755 msgid "The GIMP user manual is not installed on your computer." msgstr "Používateľská príručka nie je na vašom počítači nainštalovaná." -#: ../app/widgets/gimphelp.c:746 -msgid "You may either install the additional help package or change your preferences to use the online version." -msgstr "Môžete si nainštalovať prídavný balík s pomocníkom alebo zmeniť vaše nastavenia tak, aby sa použila verzia z internetu." +#: ../app/widgets/gimphelp.c:758 +msgid "" +"You may either install the additional help package or change your " +"preferences to use the online version." +msgstr "" +"Môžete si nainštalovať prídavný balík s pomocníkom alebo zmeniť vaše " +"nastavenia tak, aby sa použila verzia z internetu." #: ../app/widgets/gimphistogrameditor.c:99 msgid "Mean:" @@ -15638,8 +16462,12 @@ msgstr "Použiť predvolený komentár" #: ../app/widgets/gimpimagecommenteditor.c:109 -msgid "Replace the current image comment with the default comment set in Edit→Preferences→Default Image." -msgstr "Nahradí aktuálny komentár obrázka predvoleným komentárom nastaveným v Upraviť→Nastavenia→Predvolený obrázok." +msgid "" +"Replace the current image comment with the default comment set in " +"Edit→Preferences→Default Image." +msgstr "" +"Nahradí aktuálny komentár obrázka predvoleným komentárom nastaveným v " +"Upraviť→Nastavenia→Predvolený obrázok." #: ../app/widgets/gimpimageprofileview.c:202 msgid "Querying..." @@ -15706,7 +16534,8 @@ msgid "None" msgstr "Žiadne" -#: ../app/widgets/gimpimagepropview.c:464 ../app/widgets/gimptemplateeditor.c:331 +#: ../app/widgets/gimpimagepropview.c:464 +#: ../app/widgets/gimptemplateeditor.c:331 #, c-format msgid "pixels/%s" msgstr "pixelov/%s" @@ -15736,7 +16565,8 @@ msgstr[1] "Správa zopakovaná raz." msgstr[2] "Správa zopakovaná %d-krát." -#: ../app/widgets/gimppaletteeditor.c:240 ../app/widgets/gimppaletteeditor.c:715 +#: ../app/widgets/gimppaletteeditor.c:240 +#: ../app/widgets/gimppaletteeditor.c:715 msgid "Undefined" msgstr "Nedefinované" @@ -15876,7 +16706,7 @@ #. * IMPORTANT: use only one of Unicode terminal punctuation chars. #. * http://unicode.org/review/pr-23.html #. -#: ../app/widgets/gimptagentry.c:1734 +#: ../app/widgets/gimptagentry.c:1750 msgid "," msgstr "," @@ -15919,17 +16749,17 @@ msgid "%d ppi, %s" msgstr "%d ppi, %s" -#: ../app/widgets/gimptextbuffer-serialize.c:344 +#: ../app/widgets/gimptextbuffer-serialize.c:269 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "Atribút „%s“ je pri prvku <%s> v tomto kontexte neplatný" -#: ../app/widgets/gimptextbuffer-serialize.c:416 +#: ../app/widgets/gimptextbuffer-serialize.c:341 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "Najvyšším prvkom v texte musí byť nie <%s>" -#: ../app/widgets/gimptextbuffer.c:1459 +#: ../app/widgets/gimptextbuffer.c:1460 #, c-format msgid "Invalid UTF-8 data in file '%s'." msgstr "Nesprávne UTF-8 dáta v súbore „%s“." @@ -15950,7 +16780,8 @@ msgid "Clear style of selected text" msgstr "Vymazať štýl označeného textu" -#: ../app/widgets/gimptextstyleeditor.c:247 ../app/widgets/gimptextstyleeditor.c:256 +#: ../app/widgets/gimptextstyleeditor.c:247 +#: ../app/widgets/gimptextstyleeditor.c:256 msgid "Change color of selected text" msgstr "Zmení farbu označeného textu" @@ -15995,12 +16826,12 @@ msgid "No selection" msgstr "Žiadny výber" -#: ../app/widgets/gimpthumbbox.c:596 ../app/widgets/gimpthumbbox.c:617 +#: ../app/widgets/gimpthumbbox.c:612 ../app/widgets/gimpthumbbox.c:633 #, c-format msgid "Thumbnail %d of %d" msgstr "Miniatúra %d z %d" -#: ../app/widgets/gimpthumbbox.c:730 ../app/widgets/gimpthumbbox.c:740 +#: ../app/widgets/gimpthumbbox.c:746 ../app/widgets/gimpthumbbox.c:756 msgid "Creating preview..." msgstr "Vytváranie náhľadu..." @@ -16024,7 +16855,8 @@ msgid "Change Background Color" msgstr "Zmeniť farbu pozadia" -#: ../app/widgets/gimptoolbox-image-area.c:118 ../app/widgets/gimptoolbox-image-area.c:123 +#: ../app/widgets/gimptoolbox-image-area.c:118 +#: ../app/widgets/gimptoolbox-image-area.c:123 msgid "" "The active image.\n" "Click to open the Image Dialog." @@ -16309,12 +17141,20 @@ msgstr "Nedefinovaný" #: ../app/xcf/xcf-load.c:392 -msgid "This XCF file is corrupt! I have loaded as much of it as I can, but it is incomplete." -msgstr "Tento XCF súbor je poškodený! GIMP z neho nahral toľko, koľko vedel, ale je neúplný." +msgid "" +"This XCF file is corrupt! I have loaded as much of it as I can, but it is " +"incomplete." +msgstr "" +"Tento XCF súbor je poškodený! GIMP z neho nahral toľko, koľko vedel, ale je " +"neúplný." #: ../app/xcf/xcf-load.c:403 -msgid "This XCF file is corrupt! I could not even salvage any partial image data from it." -msgstr "Tento XCF súbor je poškodený! GIMP z neho nedokáže prečítať žiadne dáta obrázka." +msgid "" +"This XCF file is corrupt! I could not even salvage any partial image data " +"from it." +msgstr "" +"Tento XCF súbor je poškodený! GIMP z neho nedokáže prečítať žiadne dáta " +"obrázka." #: ../app/xcf/xcf-load.c:477 msgid "" @@ -16374,22 +17214,39 @@ msgstr "rozstrapkaný" #: ../desktop/gimp.appdata.xml.in.h:1 -msgid "GIMP is an acronym for GNU Image Manipulation Program. It is a freely distributed program for such tasks as photo retouching, image composition and image authoring." -msgstr "GIMP je skratka pre GNU Image Manipulation Program. Je to voľne šíriteľný program na retušovanie fotografií, vytváranie a autorizovanie obrázkov." +msgid "" +"GIMP is an acronym for GNU Image Manipulation Program. It is a freely " +"distributed program for such tasks as photo retouching, image composition " +"and image authoring." +msgstr "" +"GIMP je skratka pre GNU Image Manipulation Program. Je to voľne šíriteľný " +"program na retušovanie fotografií, vytváranie a autorizovanie obrázkov." #: ../desktop/gimp.appdata.xml.in.h:2 -msgid "It has many capabilities. It can be used as a simple paint program, an expert quality photo retouching program, an online batch processing system, a mass production image renderer, an image format converter, etc." +msgid "" +"It has many capabilities. It can be used as a simple paint program, an " +"expert quality photo retouching program, an online batch processing system, " +"a mass production image renderer, an image format converter, etc." msgstr "" -"Disponuje mnohými možnosťami. Môže byť použitý ako jednoduchý kresliaci program, profesionálny program na retušovanie fotografií, internetový dávkový systém na spracovanie fotografií, vykresľovač obrázkov hromadnej výroby, konvertor formátov obrázkov, " -"atď." +"Disponuje mnohými možnosťami. Môže byť použitý ako jednoduchý kresliaci " +"program, profesionálny program na retušovanie fotografií, internetový " +"dávkový systém na spracovanie fotografií, vykresľovač obrázkov hromadnej " +"výroby, konvertor formátov obrázkov, atď." #: ../desktop/gimp.appdata.xml.in.h:3 msgid "" -"GIMP is expandable and extensible. It is designed to be augmented with plug-ins and extensions to do just about anything. The advanced scripting interface allows everything from the simplest task to the most complex image manipulation procedures to be " -"easily scripted. GIMP is available for Linux, Microsoft Windows and OS X." +"GIMP is expandable and extensible. It is designed to be augmented with plug-" +"ins and extensions to do just about anything. The advanced scripting " +"interface allows everything from the simplest task to the most complex image " +"manipulation procedures to be easily scripted. GIMP is available for Linux, " +"Microsoft Windows and OS X." msgstr "" -"GIMP je nepostrádateľný a rozšíriteľný. Je navrhnutý s rozšíreniami pomocou zásuvných modulov a rozšírení, ktoré dokážu vykonať takmer čokoľvek. Pokročilé rozhranie jednoducho ovládateľné pomocou skriptov vám umožňuje vykonať všetko od najľahšej úlohy " -"až po tie najzložitejšie manipulačné procedúry. Program GIMP je dostupný pre systémy Linux, Microsoft Windows a OS X." +"GIMP je nepostrádateľný a rozšíriteľný. Je navrhnutý s rozšíreniami pomocou " +"zásuvných modulov a rozšírení, ktoré dokážu vykonať takmer čokoľvek. " +"Pokročilé rozhranie jednoducho ovládateľné pomocou skriptov vám umožňuje " +"vykonať všetko od najľahšej úlohy až po tie najzložitejšie manipulačné " +"procedúry. Program GIMP je dostupný pre systémy Linux, Microsoft Windows a " +"OS X." #: ../desktop/gimp.desktop.in.in.h:2 msgid "Image Editor" @@ -16399,6 +17256,12 @@ msgid "Create images and edit photographs" msgstr "Vytvárajte a upravujte obrázky alebo fotografie" +#~ msgid "Move Layer" +#~ msgstr "Presunúť vrstvu" + +#~ msgid "Move Selection" +#~ msgstr "Presunutie výberu" + #~ msgctxt "file-action" #~ msgid "Export to" #~ msgstr "Exportovať do" diff -Nru gimp-2.8.18/po/sl.po gimp-2.8.20/po/sl.po --- gimp-2.8.18/po/sl.po 2015-11-01 01:20:52.000000000 +0000 +++ gimp-2.8.20/po/sl.po 2017-01-28 19:08:49.000000000 +0000 @@ -10,19 +10,18 @@ msgstr "" "Project-Id-Version: GIMP 2.8\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-08-10 05:31+0000\n" -"PO-Revision-Date: 2015-08-10 17:53+0200\n" +"product=gimp&keywords=I18N+L10N&component=Internationalisation\n" +"POT-Creation-Date: 2016-08-22 21:46+0000\n" +"PO-Revision-Date: 2016-08-26 16:50+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: Martin Srebotnjak \n" -"Language: sl_SI\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" -"%100==4 ? 3 : 0);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Generator: Poedit 1.8.4\n" +"X-Generator: Poedit 1.8.8\n" #: ../app/about.h:23 msgid "GIMP" @@ -42,31 +41,38 @@ "Copyright © 1995-%s\n" "Spencer Kimball, Peter Mattis in ekipa razvijalcev GIMP-a" -#: ../app/about.h:34 +#. TRANSLATORS: do not end the license URL with a dot, because it would +#. * be in the link. Because of technical limitations, make sure the URL +#. * ends with a space, a newline or is end of text. +#. * Cf. bug 762282. +#. +#: ../app/about.h:39 msgid "" -"GIMP 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.\n" +"GIMP 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.\n" "\n" "GIMP 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.\n" +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details.\n" "\n" "You should have received a copy of the GNU General Public License along with " -"GIMP. If not, see http://www.gnu.org/licenses/." +"GIMP. If not, see: http://www.gnu.org/licenses/" msgstr "" "GIMP je prosta programska oprema: lahko jo razširjate in/ali spreminjate pod " -"pogoji Splošne javne licence GNU, ki jo je objavila Free Software Foundation; in " -"sicer tako pod pogoji 3. različice licence kot (če želite) katere koli novejše " -"različice.\n" +"pogoji Splošne javne licence GNU, ki jo je objavila Free Software " +"Foundation; in sicer tako pod pogoji 3. različice licence kot (če želite) " +"katere koli novejše različice.\n" "\n" -"GIMP razširjamo v upanju, da bo uporaben, vendar BREZ KAKRŠNIH KOLI ZAGOTOVIL " -"ALI GARANCIJE; celo brez implicirane garancije PRODANEGA IZDELKA ali USTREZNOSTI " -"ZA DOLOČEN NAMEN. Če vas zanima več podrobnosti, si oglejte Splošno javno " -"licenco GNU.\n" +"GIMP razširjamo v upanju, da bo uporaben, vendar BREZ KAKRŠNIH KOLI " +"ZAGOTOVIL ALI GARANCIJE; celo brez implicirane garancije PRODANEGA IZDELKA " +"ali USTREZNOSTI ZA DOLOČEN NAMEN. Če vas zanima več podrobnosti, si oglejte " +"Splošno javno licenco GNU.\n" "\n" "Kopijo Splošne javne licence GIMP ste prejeli s programom GIMP; če je niste " -"prejeli, si oglejte http://www.gnu.org/licenses/." +"prejeli, si oglejte http://www.gnu.org/licenses/" #: ../app/app.c:225 #, c-format @@ -89,7 +95,8 @@ #: ../app/batch.c:93 ../app/batch.c:111 #, c-format msgid "The batch interpreter '%s' is not available. Batch mode disabled." -msgstr "Paketni prevajalnik ukazov '%s' ni na voljo. Paketni način je onemogočen." +msgstr "" +"Paketni prevajalnik ukazov '%s' ni na voljo. Paketni način je onemogočen." #: ../app/main.c:148 msgid "Show version information and exit" @@ -221,7 +228,8 @@ "\n" "Please check the value of the environment variable G_FILENAME_ENCODING." msgstr "" -"Nastavljenega kodnega nabora imena datoteke ni mogoče pretvoriti v UTF-8: %s\n" +"Nastavljenega kodnega nabora imena datoteke ni mogoče pretvoriti v UTF-8: " +"%s\n" "\n" "Preverite vrednost okoljske spremenljivke G_FILENAME_ENCODING." @@ -231,15 +239,15 @@ "The name of the directory holding the GIMP user configuration cannot be " "converted to UTF-8: %s\n" "\n" -"Your filesystem probably stores files in an encoding other than UTF-8 and you " -"didn't tell GLib about this. Please set the environment variable " +"Your filesystem probably stores files in an encoding other than UTF-8 and " +"you didn't tell GLib about this. Please set the environment variable " "G_FILENAME_ENCODING." msgstr "" -"Imena mape, ki vsebuje uporabniške prilagoditve GIMPa, ni mogoče pretvoriti v " -"UTF-8: %s\n" +"Imena mape, ki vsebuje uporabniške prilagoditve GIMPa, ni mogoče pretvoriti " +"v UTF-8: %s\n" "\n" -"Vaš datotečni sistem najverjetneje shranjuje datoteke v drugi kodni tabeli kot " -"UTF-8, a GLib tega ne razpozna. Prosimo, da ustrezno nastavite okoljsko " +"Vaš datotečni sistem najverjetneje shranjuje datoteke v drugi kodni tabeli " +"kot UTF-8, a GLib tega ne razpozna. Prosimo, da ustrezno nastavite okoljsko " "spremenljivko G_FILENAME_ENCODING." #. show versions of libraries used by GIMP @@ -259,8 +267,8 @@ msgstr "Urejevalnik čopiča" #. initialize the list of gimp brushes -#: ../app/actions/actions.c:112 ../app/core/gimp.c:951 ../app/dialogs/dialogs.c:317 -#: ../app/dialogs/preferences-dialog.c:2746 +#: ../app/actions/actions.c:112 ../app/core/gimp.c:951 +#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2746 msgid "Brushes" msgstr "Čopiči" @@ -348,13 +356,13 @@ msgstr "Urejevalnik prelivov" #. initialize the list of gimp gradients -#: ../app/actions/actions.c:172 ../app/core/gimp.c:971 ../app/dialogs/dialogs.c:321 -#: ../app/dialogs/preferences-dialog.c:2762 +#: ../app/actions/actions.c:172 ../app/core/gimp.c:971 +#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2762 msgid "Gradients" msgstr "Prelivi" -#: ../app/actions/actions.c:175 ../app/core/gimp.c:983 ../app/dialogs/dialogs.c:337 -#: ../app/dialogs/preferences-dialog.c:2770 +#: ../app/actions/actions.c:175 ../app/core/gimp.c:983 +#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2770 msgid "Tool Presets" msgstr "Prednastavitve orodja" @@ -387,14 +395,14 @@ msgstr "Urejevalnik palet" #. initialize the list of gimp palettes -#: ../app/actions/actions.c:196 ../app/core/gimp.c:966 ../app/dialogs/dialogs.c:323 -#: ../app/dialogs/preferences-dialog.c:2758 +#: ../app/actions/actions.c:196 ../app/core/gimp.c:966 +#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2758 msgid "Palettes" msgstr "Palete" #. initialize the list of gimp patterns -#: ../app/actions/actions.c:199 ../app/core/gimp.c:961 ../app/dialogs/dialogs.c:319 -#: ../app/dialogs/preferences-dialog.c:2754 +#: ../app/actions/actions.c:199 ../app/core/gimp.c:961 +#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2754 msgid "Patterns" msgstr "Vzorci" @@ -417,7 +425,8 @@ msgstr "Izberi" #. initialize the template list -#: ../app/actions/actions.c:214 ../app/core/gimp.c:989 ../app/dialogs/dialogs.c:331 +#: ../app/actions/actions.c:214 ../app/core/gimp.c:989 +#: ../app/dialogs/dialogs.c:331 msgid "Templates" msgstr "Predloge" @@ -749,7 +758,8 @@ msgid "Channel" msgstr "Kanal" -#: ../app/actions/channels-commands.c:117 ../app/actions/channels-commands.c:159 +#: ../app/actions/channels-commands.c:117 +#: ../app/actions/channels-commands.c:159 #: ../app/widgets/gimpchanneltreeview.c:326 msgid "New Channel" msgstr "Nov kanal" @@ -764,7 +774,8 @@ #: ../app/actions/channels-commands.c:244 ../app/core/gimpimage-new.c:257 #: ../app/display/gimpdisplayshell-dnd.c:646 -#: ../app/widgets/gimpchanneltreeview.c:258 ../app/widgets/gimplayertreeview.c:776 +#: ../app/widgets/gimpchanneltreeview.c:258 +#: ../app/widgets/gimplayertreeview.c:776 #, c-format msgid "%s Channel Copy" msgstr "Kopija kanala %s" @@ -963,8 +974,9 @@ #: ../app/dialogs/file-open-dialog.c:265 #: ../app/dialogs/file-open-location-dialog.c:213 #: ../app/dialogs/file-open-location-dialog.c:225 -#: ../app/display/gimpdisplayshell-dnd.c:592 ../app/widgets/gimplayertreeview.c:736 -#: ../app/widgets/gimptoolbox-dnd.c:168 ../app/widgets/gimptoolbox.c:817 +#: ../app/display/gimpdisplayshell-dnd.c:592 +#: ../app/widgets/gimplayertreeview.c:736 ../app/widgets/gimptoolbox-dnd.c:168 +#: ../app/widgets/gimptoolbox.c:817 #, c-format msgid "" "Opening '%s' failed:\n" @@ -1343,8 +1355,8 @@ msgid "_About" msgstr "_O programu" -#: ../app/actions/dialogs-actions.c:333 ../app/dialogs/preferences-dialog.c:1951 -#: ../app/widgets/gimptoolbox.c:539 +#: ../app/actions/dialogs-actions.c:333 +#: ../app/dialogs/preferences-dialog.c:1951 ../app/widgets/gimptoolbox.c:539 msgid "Toolbox" msgstr "Orodjarna" @@ -1625,8 +1637,8 @@ #: ../app/actions/documents-commands.c:218 msgid "" -"Clearing the document history will permanently remove all images from the recent " -"documents list." +"Clearing the document history will permanently remove all images from the " +"recent documents list." msgstr "" "Če počistite zgodovino dokumentov, boste za vedno odstranili vse trenutno " "navedene vnose za vse programe." @@ -1669,7 +1681,8 @@ #: ../app/actions/drawable-actions.c:65 msgctxt "drawable-action" msgid "Shift the pixels, optionally wrapping them at the borders" -msgstr "Zamakne slikovne točke in jih po želji na robovih prelomi v novo vrstico" +msgstr "" +"Zamakne slikovne točke in jih po želji na robovih prelomi v novo vrstico" #: ../app/actions/drawable-actions.c:73 msgctxt "drawable-action" @@ -1898,7 +1911,8 @@ msgctxt "edit-action" msgid "Redo the last operation that was undone, skipping visibility changes" msgstr "" -"Ponovi zadnje dejanje, ki je bilo razveljavljeno, preskoči spremembe v vidnosti" +"Ponovi zadnje dejanje, ki je bilo razveljavljeno, preskoči spremembe v " +"vidnosti" #: ../app/actions/edit-actions.c:97 msgctxt "edit-action" @@ -2116,7 +2130,8 @@ #: ../app/actions/edit-commands.c:176 #, c-format msgid "Clearing the undo history of this image will gain %s of memory." -msgstr "Čiščenje zgodovine razveljavitev za to sliko bi sprostilo %s pomnilnika." +msgstr "" +"Čiščenje zgodovine razveljavitev za to sliko bi sprostilo %s pomnilnika." #: ../app/actions/edit-commands.c:206 msgid "Cut pixels to the clipboard" @@ -2414,7 +2429,7 @@ msgid "No changes need to be saved" msgstr "Nobenih sprememb ni potrebno shraniti" -#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:701 +#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:703 #: ../app/dialogs/file-save-dialog.c:103 msgid "Save Image" msgstr "Shrani sliko" @@ -2446,17 +2461,17 @@ #: ../app/actions/file-commands.c:449 msgid "" -"By reverting the image to the state saved on disk, you will lose all changes, " -"including all undo information." +"By reverting the image to the state saved on disk, you will lose all " +"changes, including all undo information." msgstr "" -"S povrnitvijo slike v zadnje shranjeno stanje boste izgubili vse spremembe in " -"podatke za razveljavitve." +"S povrnitvijo slike v zadnje shranjeno stanje boste izgubili vse spremembe " +"in podatke za razveljavitve." -#: ../app/actions/file-commands.c:731 +#: ../app/actions/file-commands.c:733 msgid "(Unnamed Template)" msgstr "(neimenovana predloga)" -#: ../app/actions/file-commands.c:782 +#: ../app/actions/file-commands.c:784 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -3205,7 +3220,8 @@ msgstr "Nastavi ločljivost tiskanja slike" #: ../app/actions/image-commands.c:379 ../app/pdb/drawable-transform-cmds.c:159 -#: ../app/pdb/drawable-transform-cmds.c:247 ../app/pdb/item-transform-cmds.c:162 +#: ../app/pdb/drawable-transform-cmds.c:247 +#: ../app/pdb/item-transform-cmds.c:162 msgid "Flipping" msgstr "Prevračanje ..." @@ -3786,7 +3802,8 @@ msgstr "Plast" #: ../app/actions/layers-commands.c:252 ../app/actions/layers-commands.c:320 -#: ../app/widgets/gimpdrawabletreeview.c:326 ../app/widgets/gimplayertreeview.c:837 +#: ../app/widgets/gimpdrawabletreeview.c:326 +#: ../app/widgets/gimplayertreeview.c:837 msgid "New Layer" msgstr "Nova plast" @@ -3814,7 +3831,8 @@ msgid "Please select a channel first" msgstr "Najprej izberite kanal" -#: ../app/actions/layers-commands.c:1088 ../app/dialogs/layer-add-mask-dialog.c:82 +#: ../app/actions/layers-commands.c:1088 +#: ../app/dialogs/layer-add-mask-dialog.c:82 msgid "Add Layer Mask" msgstr "Dodaj masko plasti" @@ -4517,7 +4535,8 @@ msgid "Create a New Template" msgstr "Ustvari novo predlogo" -#: ../app/actions/templates-commands.c:173 ../app/actions/templates-commands.c:176 +#: ../app/actions/templates-commands.c:173 +#: ../app/actions/templates-commands.c:176 msgid "Edit Template" msgstr "Uredi predlogo" @@ -4527,7 +4546,8 @@ #: ../app/actions/templates-commands.c:237 #, c-format -msgid "Are you sure you want to delete template '%s' from the list and from disk?" +msgid "" +"Are you sure you want to delete template '%s' from the list and from disk?" msgstr "Ste prepričani, da želite zbrisati predlogo '%s' s seznama in z diska?" #: ../app/actions/text-editor-actions.c:43 @@ -4570,7 +4590,8 @@ msgid "From right to left" msgstr "Od desne proti levi" -#: ../app/actions/text-editor-commands.c:62 ../app/actions/text-tool-commands.c:117 +#: ../app/actions/text-editor-commands.c:62 +#: ../app/actions/text-tool-commands.c:117 msgid "Open Text File (UTF-8)" msgstr "Odpri datoteko z besedilom (UTF-8)" @@ -4582,7 +4603,7 @@ #: ../app/core/gimppalette-load.c:77 ../app/core/gimppalette-load.c:274 #: ../app/core/gimppalette-load.c:320 ../app/core/gimppalette-load.c:377 #: ../app/core/gimppalette-load.c:467 ../app/core/gimppalette-load.c:634 -#: ../app/core/gimppattern-load.c:76 ../app/tools/gimpcurvestool.c:642 +#: ../app/core/gimppattern-load.c:76 ../app/tools/gimpcurvestool.c:658 #: ../app/tools/gimplevelstool.c:747 ../app/xcf/xcf.c:359 #, c-format msgid "Could not open '%s' for reading: %s" @@ -5635,8 +5656,8 @@ msgid "" "When enabled docks and other dialogs are hidden, leaving only image windows." msgstr "" -"Če je vključeno, so sidrišča in druga pogovorna okna skrita, ostanejo le okna s " -"slikami." +"Če je vključeno, so sidrišča in druga pogovorna okna skrita, ostanejo le " +"okna s slikami." #: ../app/actions/windows-actions.c:122 msgctxt "windows-action" @@ -5821,14 +5842,14 @@ #: ../app/base/tile-swap.c:710 msgid "" "Unable to open swap file. GIMP has run out of memory and cannot use the swap " -"file. Some parts of your images may be corrupted. Try to save your work using " -"different filenames, restart GIMP and check the location of the swap directory " -"in your Preferences." +"file. Some parts of your images may be corrupted. Try to save your work " +"using different filenames, restart GIMP and check the location of the swap " +"directory in your Preferences." msgstr "" "Izmenjalne datoteke ni mogoče odpreti. GIMP-u je zmanjkalo pomnilnika, zato " "izmenjalna datoteka ni uporabna. Nekateri deli slike bodo morda okvarjeni. " -"Poskusite shraniti svoje delo pod drugimi imeni datotek, ponovno zagnati GIMP-a " -"in preveriti nastavitve izmenjalne datoteke v svojih nastavitvah." +"Poskusite shraniti svoje delo pod drugimi imeni datotek, ponovno zagnati " +"GIMP-a in preveriti nastavitve izmenjalne datoteke v svojih nastavitvah." #: ../app/base/tile-swap.c:725 #, c-format @@ -5943,7 +5964,7 @@ #: ../app/config/gimpconfig-file.c:67 ../app/core/gimpbrushgenerated-save.c:62 #: ../app/core/gimpcurve-save.c:52 ../app/core/gimpgradient-save.c:50 #: ../app/core/gimpgradient-save.c:144 ../app/core/gimppalette-save.c:56 -#: ../app/gui/themes.c:248 ../app/tools/gimpcurvestool.c:695 +#: ../app/gui/themes.c:248 ../app/tools/gimpcurvestool.c:711 #: ../app/tools/gimplevelstool.c:800 ../app/vectors/gimpvectors-export.c:81 #: ../app/xcf/xcf.c:452 #, c-format @@ -5963,11 +5984,11 @@ #: ../app/config/gimpconfig-file.c:131 #, c-format msgid "" -"There was an error parsing your '%s' file. Default values will be used. A backup " -"of your configuration has been created at '%s'." +"There was an error parsing your '%s' file. Default values will be used. A " +"backup of your configuration has been created at '%s'." msgstr "" -"Napaka pri razčlenjevanju datoteke '%s'. Uporabljene bodo privzete vrednosti. " -"Varnostna kopija nastavitev je bila shranjena v '%s'." +"Napaka pri razčlenjevanju datoteke '%s'. Uporabljene bodo privzete " +"vrednosti. Varnostna kopija nastavitev je bila shranjena v '%s'." #. Not all strings defined here are used in the user interface #. * (the preferences dialog mainly) and only those that are should @@ -5976,11 +5997,12 @@ #: ../app/config/gimprc-blurbs.h:13 msgid "" "When enabled, an image will become the active image when its image window " -"receives the focus. This is useful for window managers using \"click to focus\"." +"receives the focus. This is useful for window managers using \"click to focus" +"\"." msgstr "" -"Če je omogočeno, bo slika postala aktivna, ko njeno okno dobi pozornost. To je " -"uporabno za upravljalnike oken, ki uporabljajo \"klikni za pozornost\". (angl. " -"\"click to focus\")." +"Če je omogočeno, bo slika postala aktivna, ko njeno okno dobi pozornost. To " +"je uporabno za upravljalnike oken, ki uporabljajo \"klikni za pozornost\". " +"(angl. \"click to focus\")." #: ../app/config/gimprc-blurbs.h:23 ../app/config/gimprc-blurbs.h:28 msgid "Sets the dynamics search path." @@ -5988,7 +6010,8 @@ #: ../app/config/gimprc-blurbs.h:33 msgid "" -"Sets the canvas padding color used if the padding mode is set to custom color." +"Sets the canvas padding color used if the padding mode is set to custom " +"color." msgstr "" "Nastavi barvo zapolnjevanja platna, če je le-ta nastavljena na barvo po meri." @@ -6031,25 +6054,28 @@ #: ../app/config/gimprc-blurbs.h:93 msgid "This is the distance in pixels where Guide and Grid snapping activates." msgstr "" -"Na tej razdalji (v slikovnih točkah) se vključi lepljenje na vodila ali mrežo." +"Na tej razdalji (v slikovnih točkah) se vključi lepljenje na vodila ali " +"mrežo." #: ../app/config/gimprc-blurbs.h:109 msgid "" "Tools such as fuzzy-select and bucket fill find regions based on a seed-fill " -"algorithm. The seed fill starts at the initially selected pixel and progresses " -"in all directions until the difference of pixel intensity from the original is " -"greater than a specified threshold. This value represents the default threshold." +"algorithm. The seed fill starts at the initially selected pixel and " +"progresses in all directions until the difference of pixel intensity from " +"the original is greater than a specified threshold. This value represents " +"the default threshold." msgstr "" "Orodja, kot sta mehki izbor in zapolni s kanglico, uporabljajo algoritem " -"polnjenja s sejanjem. To pomeni, da se polnjenje začne v prvi izbrani točki in " -"se izvaja v vse smeri na soležnih točkah, dokler ni razlika v intenzivnosti " -"slikovnih točk od izvirnika večja od nastavljene vrednosti praga. Ta vrednost " -"predstavlja privzeti prag." +"polnjenja s sejanjem. To pomeni, da se polnjenje začne v prvi izbrani točki " +"in se izvaja v vse smeri na soležnih točkah, dokler ni razlika v " +"intenzivnosti slikovnih točk od izvirnika večja od nastavljene vrednosti " +"praga. Ta vrednost predstavlja privzeti prag." #: ../app/config/gimprc-blurbs.h:122 msgid "" -"The window type hint that is set on dock windows and the toolbox window. This " -"may affect the way your window manager decorates and handles these windows." +"The window type hint that is set on dock windows and the toolbox window. " +"This may affect the way your window manager decorates and handles these " +"windows." msgstr "" "Namig okenske vrste, nastavljen na sidrana okna in okno orodjarne. To lahko " "vpliva na način, kako vaš upravljalnik oken opremlja in upravlja ta okna." @@ -6084,14 +6110,15 @@ #: ../app/config/gimprc-blurbs.h:197 msgid "" -"When enabled, this will ensure that the full image is visible after a file is " -"opened, otherwise it will be displayed with a scale of 1:1." +"When enabled, this will ensure that the full image is visible after a file " +"is opened, otherwise it will be displayed with a scale of 1:1." msgstr "" "Če je vključeno, bo po odpiranju datoteke vidna celotna slika, sicer bo " "prikazana v merilu 1:1." #: ../app/config/gimprc-blurbs.h:201 -msgid "Sets the level of interpolation used for scaling and other transformations." +msgid "" +"Sets the level of interpolation used for scaling and other transformations." msgstr "" "Nastavi stopnjo interpolacije, uporabljeno pri spreminjanju merila in drugih " "transformacijah." @@ -6103,57 +6130,58 @@ #: ../app/config/gimprc-blurbs.h:211 msgid "How many recently opened image filenames to keep on the File menu." msgstr "" -"Koliko nedavno odprtih dokumentov naj bo prikazanih na seznamu menija Datoteka." +"Koliko nedavno odprtih dokumentov naj bo prikazanih na seznamu menija " +"Datoteka." #: ../app/config/gimprc-blurbs.h:214 msgid "" -"Speed of marching ants in the selection outline. This value is in milliseconds " -"(less time indicates faster marching)." +"Speed of marching ants in the selection outline. This value is in " +"milliseconds (less time indicates faster marching)." msgstr "" "Hitrost korakanja mravljic po orisu izbora. Vrednost je v milisekundah (manj " "časa pomeni hitrejše korakanje)." #: ../app/config/gimprc-blurbs.h:218 msgid "" -"GIMP will warn the user if an attempt is made to create an image that would take " -"more memory than the size specified here." +"GIMP will warn the user if an attempt is made to create an image that would " +"take more memory than the size specified here." msgstr "" "GIMP uporabnika opozori, če poskuša ustvariti sliko, ki bi zahtevala več " "pomnilnika od tukaj nastavljene velikosti." #: ../app/config/gimprc-blurbs.h:228 msgid "" -"Sets the monitor's horizontal resolution, in dots per inch. If set to 0, forces " -"the X server to be queried for both horizontal and vertical resolution " -"information." +"Sets the monitor's horizontal resolution, in dots per inch. If set to 0, " +"forces the X server to be queried for both horizontal and vertical " +"resolution information." msgstr "" -"Nastavi vodoravno ločljivost zaslona v pikah na palec. Če jo nastavite na 0, bo " -"podatke o vodoravni in navpični ločljivosti podal strežnik X." +"Nastavi vodoravno ločljivost zaslona v pikah na palec. Če jo nastavite na 0, " +"bo podatke o vodoravni in navpični ločljivosti podal strežnik X." #: ../app/config/gimprc-blurbs.h:233 msgid "" -"Sets the monitor's vertical resolution, in dots per inch. If set to 0, forces " -"the X server to be queried for both horizontal and vertical resolution " -"information." +"Sets the monitor's vertical resolution, in dots per inch. If set to 0, " +"forces the X server to be queried for both horizontal and vertical " +"resolution information." msgstr "" -"Nastavi navpično ločljivost zaslona v pikah na palec. Če jo nastavite na 0, bo " -"podatke o vodoravni in navpični ločljivosti podal strežnik X." +"Nastavi navpično ločljivost zaslona v pikah na palec. Če jo nastavite na 0, " +"bo podatke o vodoravni in navpični ločljivosti podal strežnik X." #: ../app/config/gimprc-blurbs.h:238 msgid "" -"If enabled, the move tool sets the edited layer or path as active. This used to " -"be the default behaviour in older versions." +"If enabled, the move tool sets the edited layer or path as active. This " +"used to be the default behaviour in older versions." msgstr "" "Če je vključeno, orodje za premikanje nastavi urejevano plast ali pot kot " "aktivno. To je bilo v starejših različicah privzeto vedenje." #: ../app/config/gimprc-blurbs.h:242 msgid "" -"Sets the size of the navigation preview available in the lower right corner of " -"the image window." +"Sets the size of the navigation preview available in the lower right corner " +"of the image window." msgstr "" -"Nastavi velikost krmarja predogleda, ki se nahaja v spodnjem desnem kotu okna " -"slike." +"Nastavi velikost krmarja predogleda, ki se nahaja v spodnjem desnem kotu " +"okna slike." #: ../app/config/gimprc-blurbs.h:246 msgid "Sets how many processors GIMP should try to use simultaneously." @@ -6161,24 +6189,25 @@ #: ../app/config/gimprc-blurbs.h:259 msgid "" -"When enabled, the X server is queried for the mouse's current position on each " -"motion event, rather than relying on the position hint. This means painting " -"with large brushes should be more accurate, but it may be slower. Conversely, " -"on some X servers enabling this option results in faster painting." -msgstr "" -"Če je vključeno, bo o položaju kazalca pri premiku miške ali kak drug dogodek " -"vedno povprašan strežnik X, namig o položaju bo prezrt. Tako bo risanje z " -"velikimi čopiči natančnejše, a počasnejše. Neverjetno, a na nekaterih strežnikih " -"X to pomeni tudi hitrejše delovanje." +"When enabled, the X server is queried for the mouse's current position on " +"each motion event, rather than relying on the position hint. This means " +"painting with large brushes should be more accurate, but it may be slower. " +"Conversely, on some X servers enabling this option results in faster " +"painting." +msgstr "" +"Če je vključeno, bo o položaju kazalca pri premiku miške ali kak drug " +"dogodek vedno povprašan strežnik X, namig o položaju bo prezrt. Tako bo " +"risanje z velikimi čopiči natančnejše, a počasnejše. Neverjetno, a na " +"nekaterih strežnikih X to pomeni tudi hitrejše delovanje." #: ../app/config/gimprc-blurbs.h:275 msgid "" -"Sets whether GIMP should create previews of layers and channels. Previews in the " -"layers and channels dialog are nice to have but they can slow things down when " -"working with large images." +"Sets whether GIMP should create previews of layers and channels. Previews in " +"the layers and channels dialog are nice to have but they can slow things " +"down when working with large images." msgstr "" -"Nastavi, ali naj GIMP ustvari predoglede plasti in kanalov. Ti so uporabni, a " -"lahko ob delu z velikimi slikami upočasnijo delovanje." +"Nastavi, ali naj GIMP ustvari predoglede plasti in kanalov. Ti so uporabni, " +"a lahko ob delu z velikimi slikami upočasnijo delovanje." #: ../app/config/gimprc-blurbs.h:280 msgid "" @@ -6213,15 +6242,16 @@ msgstr "GIMP naj ob vsakem zagonu poskusi obnoviti nazadnje shranjeno sejo." #: ../app/config/gimprc-blurbs.h:298 -msgid "Remember the current tool, pattern, color, and brush across GIMP sessions." +msgid "" +"Remember the current tool, pattern, color, and brush across GIMP sessions." msgstr "" -"GIMP si med sejami lahko zapomni trenutno uporabljeno orodje, vzorec, barvo in " -"čopič." +"GIMP si med sejami lahko zapomni trenutno uporabljeno orodje, vzorec, barvo " +"in čopič." #: ../app/config/gimprc-blurbs.h:302 msgid "" -"Keep a permanent record of all opened and saved files in the Recent Documents " -"list." +"Keep a permanent record of all opened and saved files in the Recent " +"Documents list." msgstr "" "Ohrani informacije o vseh odprtih in shranjenih datotekah v seznamu nedavno " "odprtih." @@ -6229,7 +6259,8 @@ #: ../app/config/gimprc-blurbs.h:306 msgid "Save the positions and sizes of the main dialogs when GIMP exits." msgstr "" -"Ob izhodu iz programa GIMP shrani položaje in velikosti glavnih pogovornih oken." +"Ob izhodu iz programa GIMP shrani položaje in velikosti glavnih pogovornih " +"oken." #: ../app/config/gimprc-blurbs.h:309 msgid "Save the tool options when GIMP exits." @@ -6237,95 +6268,98 @@ #: ../app/config/gimprc-blurbs.h:315 msgid "" -"When enabled, all paint tools will show a preview of the current brush's outline." +"When enabled, all paint tools will show a preview of the current brush's " +"outline." msgstr "" -"Če je vklopljeno, bodo orodja za risanje kazala predoglede z obrobo trenutnega " -"čopiča." +"Če je vklopljeno, bodo orodja za risanje kazala predoglede z obrobo " +"trenutnega čopiča." #: ../app/config/gimprc-blurbs.h:319 msgid "" -"When enabled, dialogs will show a help button that gives access to the related " -"help page. Without this button, the help page can still be reached by pressing " -"F1." +"When enabled, dialogs will show a help button that gives access to the " +"related help page. Without this button, the help page can still be reached " +"by pressing F1." msgstr "" "Če je vklopljeno, bodo pogovorna okna kazala gumb za pomoč, ki vas usmeri na " -"ustrezno stran pomoči. Do nje lahko dostopate tudi brez gumba, če pritisnete F1." +"ustrezno stran pomoči. Do nje lahko dostopate tudi brez gumba, če " +"pritisnete F1." #: ../app/config/gimprc-blurbs.h:324 msgid "" -"When enabled, the mouse pointer will be shown over the image while using a paint " -"tool." +"When enabled, the mouse pointer will be shown over the image while using a " +"paint tool." msgstr "" -"Če je vključeno, bo kazalec miške ob uporabi orodja barvanja prikazan nad sliko." +"Če je vključeno, bo kazalec miške ob uporabi orodja barvanja prikazan nad " +"sliko." #: ../app/config/gimprc-blurbs.h:328 msgid "" -"When enabled, the menubar is visible by default. This can also be toggled with " -"the \"View->Show Menubar\" command." +"When enabled, the menubar is visible by default. This can also be toggled " +"with the \"View->Show Menubar\" command." msgstr "" "Če je vklopljeno, bo menijska vrstica po privzeti nastavitvi prikazana. " "Nastavitev spremenite z ukazom \"Pogled->Pokaži menijsko vrstico\"." #: ../app/config/gimprc-blurbs.h:332 msgid "" -"When enabled, the rulers are visible by default. This can also be toggled with " -"the \"View->Show Rulers\" command." +"When enabled, the rulers are visible by default. This can also be toggled " +"with the \"View->Show Rulers\" command." msgstr "" "Če je vklopljeno, bosta ravnili po privzeti nastavitvi vidna. To lahko " "spremenite z ukazom \"Pogled->Pokaži ravnili\"." #: ../app/config/gimprc-blurbs.h:336 msgid "" -"When enabled, the scrollbars are visible by default. This can also be toggled " -"with the \"View->Show Scrollbars\" command." +"When enabled, the scrollbars are visible by default. This can also be " +"toggled with the \"View->Show Scrollbars\" command." msgstr "" -"Če je vklopljeno, sta po privzeti nastavitvi drsnika vidna. To lahko spremenite " -"z ukazom \"Pogled->Pokaži drsnika\"." +"Če je vklopljeno, sta po privzeti nastavitvi drsnika vidna. To lahko " +"spremenite z ukazom \"Pogled->Pokaži drsnika\"." #: ../app/config/gimprc-blurbs.h:340 msgid "" -"When enabled, the statusbar is visible by default. This can also be toggled with " -"the \"View->Show Statusbar\" command." +"When enabled, the statusbar is visible by default. This can also be toggled " +"with the \"View->Show Statusbar\" command." msgstr "" "Če je vklopljeno, bo po privzeti nastavitvi vrstica stanja vidna. To lahko " "spremenite z ukazom \"Pogled->Pokaži vrstico stanja\"." #: ../app/config/gimprc-blurbs.h:344 msgid "" -"When enabled, the selection is visible by default. This can also be toggled with " -"the \"View->Show Selection\" command." +"When enabled, the selection is visible by default. This can also be toggled " +"with the \"View->Show Selection\" command." msgstr "" -"Če je vklopljeno, bo izbor po privzeti nastavitvi viden. To lahko spremenite z " -"ukazom \"Pogled->Pokaži izbor\"." +"Če je vklopljeno, bo izbor po privzeti nastavitvi viden. To lahko spremenite " +"z ukazom \"Pogled->Pokaži izbor\"." #: ../app/config/gimprc-blurbs.h:348 msgid "" -"When enabled, the layer boundary is visible by default. This can also be toggled " -"with the \"View->Show Layer Boundary\" command." +"When enabled, the layer boundary is visible by default. This can also be " +"toggled with the \"View->Show Layer Boundary\" command." msgstr "" "Če je vklopljeno, bo rob plasti po privzeti nastavitvi viden. Nastavitev " "spremenite z ukazom \"Pogled->Pokaži rob plasti\"." #: ../app/config/gimprc-blurbs.h:352 msgid "" -"When enabled, the guides are visible by default. This can also be toggled with " -"the \"View->Show Guides\" command." +"When enabled, the guides are visible by default. This can also be toggled " +"with the \"View->Show Guides\" command." msgstr "" -"Če je vklopljeno, bodo vodila po privzeti nastavitvi vidna. To lahko spremenite " -"z ukazom \"Pogled->Pokaži vodila\"." +"Če je vklopljeno, bodo vodila po privzeti nastavitvi vidna. To lahko " +"spremenite z ukazom \"Pogled->Pokaži vodila\"." #: ../app/config/gimprc-blurbs.h:356 msgid "" -"When enabled, the grid is visible by default. This can also be toggled with the " -"\"View->Show Grid\" command." +"When enabled, the grid is visible by default. This can also be toggled with " +"the \"View->Show Grid\" command." msgstr "" -"Če je vklopljeno, bo mreža po privzeti nastavitvi prikazana. To lahko spremenite " -"z ukazom \"Pogled->Pokaži mrežo\"." +"Če je vklopljeno, bo mreža po privzeti nastavitvi prikazana. To lahko " +"spremenite z ukazom \"Pogled->Pokaži mrežo\"." #: ../app/config/gimprc-blurbs.h:360 msgid "" -"When enabled, the sample points are visible by default. This can also be toggled " -"with the \"View->Show Sample Points\" command." +"When enabled, the sample points are visible by default. This can also be " +"toggled with the \"View->Show Sample Points\" command." msgstr "" "Če je vključeno, so vzorčne točke privzeto vidne. To lahko vključite ali " "izključite tudi z ukazom\"Pogled->Pokaži vzorčne točke\"." @@ -6348,19 +6382,19 @@ #: ../app/config/gimprc-blurbs.h:376 msgid "" -"Sets the swap file location. GIMP uses a tile based memory allocation scheme. " -"The swap file is used to quickly and easily swap tiles out to disk and back in. " -"Be aware that the swap file can easily get very large if GIMP is used with large " -"images. Also, things can get horribly slow if the swap file is created on a " -"folder that is mounted over NFS. For these reasons, it may be desirable to put " -"your swap file in \"/tmp\"." +"Sets the swap file location. GIMP uses a tile based memory allocation " +"scheme. The swap file is used to quickly and easily swap tiles out to disk " +"and back in. Be aware that the swap file can easily get very large if GIMP " +"is used with large images. Also, things can get horribly slow if the swap " +"file is created on a folder that is mounted over NFS. For these reasons, it " +"may be desirable to put your swap file in \"/tmp\"." msgstr "" "Izberite mesto izmenjalne datoteke. GIMP uporablja porazdelitveno shemo " -"določanja pomnilnika. Uporablja izmenjalno datoteko za enostavnejše izbiranje " -"delov z diska in nazaj. Vedite, da lahko izmenjalna datoteka hitro zelo naraste, " -"če delate z velikimi slikami. Delo lahko postane izjemno počasno, če jo " -"ustvarite na omrežnem pogonu prek NFS. Zaradi tega priporočamo, da izmenjalni " -"datoteki nastavite pot shranjevanja \"/tmp\"." +"določanja pomnilnika. Uporablja izmenjalno datoteko za enostavnejše " +"izbiranje delov z diska in nazaj. Vedite, da lahko izmenjalna datoteka hitro " +"zelo naraste, če delate z velikimi slikami. Delo lahko postane izjemno " +"počasno, če jo ustvarite na omrežnem pogonu prek NFS. Zaradi tega " +"priporočamo, da izmenjalni datoteki nastavite pot shranjevanja \"/tmp\"." #: ../app/config/gimprc-blurbs.h:385 msgid "When enabled, menus can be torn off." @@ -6368,11 +6402,11 @@ #: ../app/config/gimprc-blurbs.h:388 msgid "" -"When enabled, you can change keyboard shortcuts for menu items by hitting a key " -"combination while the menu item is highlighted." +"When enabled, you can change keyboard shortcuts for menu items by hitting a " +"key combination while the menu item is highlighted." msgstr "" -"Če je vključeno, lahko spreminjate tipke za bližnjice s pritiskom na kombinacijo " -"tipk, ko je izbira v meniju osvetljena." +"Če je vključeno, lahko spreminjate tipke za bližnjice s pritiskom na " +"kombinacijo tipk, ko je izbira v meniju osvetljena." #: ../app/config/gimprc-blurbs.h:392 msgid "Save changed keyboard shortcuts when GIMP exits." @@ -6384,14 +6418,15 @@ #: ../app/config/gimprc-blurbs.h:398 msgid "" -"Sets the folder for temporary storage. Files will appear here during the course " -"of running GIMP. Most files will disappear when GIMP exits, but some files are " -"likely to remain, so it is best if this folder not be one that is shared by " -"other users." -msgstr "" -"Nastavi mapo za začasno hrambo. Med poganjanjem GIMP-a se bodo v njej pojavile " -"datoteke. Večina datotek bo ob zaprtju GIMP-a izginilo, nekatere pa bodo tudi " -"ostale, zato je najbolje, da ta mapa ni v souporabi z drugimi uporabniki." +"Sets the folder for temporary storage. Files will appear here during the " +"course of running GIMP. Most files will disappear when GIMP exits, but some " +"files are likely to remain, so it is best if this folder not be one that is " +"shared by other users." +msgstr "" +"Nastavi mapo za začasno hrambo. Med poganjanjem GIMP-a se bodo v njej " +"pojavile datoteke. Večina datotek bo ob zaprtju GIMP-a izginilo, nekatere pa " +"bodo tudi ostale, zato je najbolje, da ta mapa ni v souporabi z drugimi " +"uporabniki." #: ../app/config/gimprc-blurbs.h:410 msgid "Sets the size of the thumbnail shown in the Open dialog." @@ -6399,18 +6434,18 @@ #: ../app/config/gimprc-blurbs.h:413 msgid "" -"The thumbnail in the Open dialog will be automatically updated if the file being " -"previewed is smaller than the size set here." +"The thumbnail in the Open dialog will be automatically updated if the file " +"being previewed is smaller than the size set here." msgstr "" -"Predogledna sličica v pogovornem oknu Odpri se bo samodejno posodabljala, če bo " -"predogledana slika manjša od tukaj nastavljene velikosti." +"Predogledna sličica v pogovornem oknu Odpri se bo samodejno posodabljala, če " +"bo predogledana slika manjša od tukaj nastavljene velikosti." #: ../app/config/gimprc-blurbs.h:417 msgid "" -"When the amount of pixel data exceeds this limit, GIMP will start to swap tiles " -"to disk. This is a lot slower but it makes it possible to work on images that " -"wouldn't fit into memory otherwise. If you have a lot of RAM, you may want to " -"set this to a higher value." +"When the amount of pixel data exceeds this limit, GIMP will start to swap " +"tiles to disk. This is a lot slower but it makes it possible to work on " +"images that wouldn't fit into memory otherwise. If you have a lot of RAM, " +"you may want to set this to a higher value." msgstr "" "Ko število podatkov slikovnih točk preseže to mejo, bo GIMP pričel izmenjati " "tlakovce z diskom. To je veliko počasneje, vendar omogoča delo s slikami, ki " @@ -6439,25 +6474,26 @@ #: ../app/config/gimprc-blurbs.h:441 msgid "" -"When enabled, GIMP will not save an image if it has not been changed since it " -"was opened." +"When enabled, GIMP will not save an image if it has not been changed since " +"it was opened." msgstr "" "Če je vključeno, GIMP ne shrani slike, če ni bila spremenjena, odkar ste jo " "odprli." #: ../app/config/gimprc-blurbs.h:445 msgid "" -"Sets the minimal number of operations that can be undone. More undo levels are " -"kept available until the undo-size limit is reached." +"Sets the minimal number of operations that can be undone. More undo levels " +"are kept available until the undo-size limit is reached." msgstr "" -"Nastavi najmanjše število dejanj, ki jih je mogoče razveljaviti. Število možnih " -"ravni razveljavitev se povečuje, dokler ne doseže nastavljenega števila operacij." +"Nastavi najmanjše število dejanj, ki jih je mogoče razveljaviti. Število " +"možnih ravni razveljavitev se povečuje, dokler ne doseže nastavljenega " +"števila operacij." #: ../app/config/gimprc-blurbs.h:449 msgid "" -"Sets an upper limit to the memory that is used per image to keep operations on " -"the undo stack. Regardless of this setting, at least as many undo-levels as " -"configured can be undone." +"Sets an upper limit to the memory that is used per image to keep operations " +"on the undo stack. Regardless of this setting, at least as many undo-levels " +"as configured can be undone." msgstr "" "Nastavi zgornjo mejo pomnilnika, ki je na voljo vsaki sliki za shranjevanje " "operacij na skladu za razveljavitve. Ne glede na to nastavitev boste lahko " @@ -7337,8 +7373,8 @@ #: ../app/core/gimp-user-install.c:203 #, c-format msgid "" -"It seems you have used GIMP %s before. GIMP will now migrate your user settings " -"to '%s'." +"It seems you have used GIMP %s before. GIMP will now migrate your user " +"settings to '%s'." msgstr "" "Kot kaže, ste uporabljali GIMP %s. GIMP bo zdaj prenesel vaše uporabniške " "nastavitve v '%s'." @@ -7346,11 +7382,11 @@ #: ../app/core/gimp-user-install.c:208 #, c-format msgid "" -"It appears that you are using GIMP for the first time. GIMP will now create a " -"folder named '%s' and copy some files to it." +"It appears that you are using GIMP for the first time. GIMP will now create " +"a folder named '%s' and copy some files to it." msgstr "" -"Kot kaže, uporabljate GIMP prvič. GIMP bo ustvaril mapo '%s' in vanjo skopiral " -"nekaj datotek." +"Kot kaže, uporabljate GIMP prvič. GIMP bo ustvaril mapo '%s' in vanjo " +"skopiral nekaj datotek." #: ../app/core/gimp-user-install.c:359 #, c-format @@ -7449,7 +7485,8 @@ #, c-format msgid "Fatal parse error in brush file '%s': File appears truncated." msgstr "" -"Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Datoteka je poškodovana." +"Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Datoteka je " +"poškodovana." #: ../app/core/gimpbrush-load.c:281 ../app/core/gimpbrushgenerated-load.c:128 #: ../app/core/gimpbrushpipe-load.c:97 @@ -7458,7 +7495,8 @@ msgstr "Neveljaven niz UTF-8 v datoteki čopičev '%s'." #: ../app/core/gimpbrush-load.c:288 ../app/core/gimppattern-load.c:146 -#: ../app/dialogs/template-options-dialog.c:83 ../app/tools/gimpvectortool.c:317 +#: ../app/dialogs/template-options-dialog.c:83 +#: ../app/tools/gimpvectortool.c:317 msgid "Unnamed" msgstr "Neimenovano" @@ -7467,14 +7505,14 @@ msgid "" "Fatal parse error in brush file '%s': Unsupported brush depth %d\n" "GIMP brushes must be GRAY or RGBA.\n" -"This might be an obsolete GIMP brush file, try loading it as image and save it " -"again." +"This might be an obsolete GIMP brush file, try loading it as image and save " +"it again." msgstr "" -"Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Nepodprta globina čopiča " -"%d\n" +"Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Nepodprta globina " +"čopiča %d\n" "Čopiči za GIMP morajo biti sivinski ali RGBA.\n" -"To je morda zastarela datoteka čopiča GIMP, poskusite jo naložiti kot sliko in " -"jo znova shraniti." +"To je morda zastarela datoteka čopiča GIMP, poskusite jo naložiti kot sliko " +"in jo znova shraniti." #: ../app/core/gimpbrush-load.c:399 #, c-format @@ -7482,8 +7520,8 @@ "Fatal parse error in brush file '%s': Unsupported brush depth %d\n" "GIMP brushes must be GRAY or RGBA." msgstr "" -"Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Nepodprta globina čopiča " -"%d\n" +"Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Nepodprta globina " +"čopiča %d\n" "Čopiči za GIMP morajo biti sivinski ali RGBA." #: ../app/core/gimpbrush-load.c:471 ../app/core/gimpbrush-load.c:909 @@ -7491,8 +7529,8 @@ msgid "" "Fatal parse error in brush file '%s': unable to decode abr format version %d." msgstr "" -"Usodna napaka razhroščevanja datoteke čopiča '%s': zapisa abr različice %d ni " -"mogoče odkodirati." +"Usodna napaka razhroščevanja datoteke čopiča '%s': zapisa abr različice %d " +"ni mogoče odkodirati." #: ../app/core/gimpbrush-load.c:647 #, c-format @@ -7517,15 +7555,16 @@ msgid "" "Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d." msgstr "" -"Usodna napaka razhroščevanja datoteke čopiča '%s': Neznana različica čopiča GIMP " -"v vrstici %d." +"Usodna napaka razhroščevanja datoteke čopiča '%s': Neznana različica čopiča " +"GIMP v vrstici %d." #: ../app/core/gimpbrushgenerated-load.c:150 #, c-format -msgid "Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d." +msgid "" +"Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d." msgstr "" -"Usodna napaka razhroščevanja datoteke čopiča '%s': Neznana oblika čopiča GIMP v " -"vrstici %d." +"Usodna napaka razhroščevanja datoteke čopiča '%s': Neznana oblika čopiča " +"GIMP v vrstici %d." #: ../app/core/gimpbrushgenerated-load.c:226 #, c-format @@ -7570,7 +7609,8 @@ #, c-format msgid "Fatal parse error in brush file '%s': File is corrupt." msgstr "" -"Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Datoteka je okvarjena." +"Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Datoteka je " +"okvarjena." #: ../app/core/gimpchannel-select.c:60 msgctxt "undo-type" @@ -7783,24 +7823,24 @@ #: ../app/core/gimpdatafactory.c:756 #, c-format msgid "" -"You have a writable data folder configured (%s), but this folder does not exist. " -"Please create the folder or fix your configuation in the Preferences dialog's " -"'Folders' section." -msgstr "" -"Nastavljeno imate zapisljivo podatkovno mapo (%s), vendar ta mapa ne obstaja. " -"Najprej ustvarite mapo ali pa popravite nastavitev v odseku Nastavite " -"pogovornega okna 'Mape'." +"You have a writable data folder configured (%s), but this folder does not " +"exist. Please create the folder or fix your configuation in the Preferences " +"dialog's 'Folders' section." +msgstr "" +"Nastavljeno imate zapisljivo podatkovno mapo (%s), vendar ta mapa ne " +"obstaja. Najprej ustvarite mapo ali pa popravite nastavitev v odseku " +"Nastavite pogovornega okna 'Mape'." #: ../app/core/gimpdatafactory.c:777 #, c-format msgid "" -"You have a writable data folder configured, but this folder is not part of your " -"data search path. You probably edited the gimprc file manually, please fix it in " -"the Preferences dialog's 'Folders' section." -msgstr "" -"Nastavljeno imate zapisljivo podatkovno mapo, vendar ta mapa ni del vaše poti " -"iskanja podatkov. Najverjetneje ste ročno urejali datoteko gimprc, popravite jo " -"v odseku Nastavite pogovornega okna 'Mape'." +"You have a writable data folder configured, but this folder is not part of " +"your data search path. You probably edited the gimprc file manually, please " +"fix it in the Preferences dialog's 'Folders' section." +msgstr "" +"Nastavljeno imate zapisljivo podatkovno mapo, vendar ta mapa ni del vaše " +"poti iskanja podatkov. Najverjetneje ste ročno urejali datoteko gimprc, " +"popravite jo v odseku Nastavite pogovornega okna 'Mape'." #: ../app/core/gimpdatafactory.c:787 #, c-format @@ -7844,7 +7884,8 @@ msgid "Color Balance" msgstr "Barvna uravnoteženost" -#: ../app/core/gimpdrawable-colorize.c:72 ../app/core/gimpdrawable-colorize.c:84 +#: ../app/core/gimpdrawable-colorize.c:72 +#: ../app/core/gimpdrawable-colorize.c:84 msgctxt "undo-type" msgid "Colorize" msgstr "Prebarvaj" @@ -7855,7 +7896,8 @@ msgstr "Krivulje" #: ../app/core/gimpdrawable-desaturate.c:70 -#: ../app/core/gimpdrawable-desaturate.c:76 ../app/tools/gimpdesaturatetool.c:77 +#: ../app/core/gimpdrawable-desaturate.c:76 +#: ../app/tools/gimpdesaturatetool.c:77 msgid "Desaturate" msgstr "Zmanjšaj nasičenost" @@ -7891,13 +7933,13 @@ msgid "Offset Drawable" msgstr "Zamakni risano" -#: ../app/core/gimpdrawable-posterize.c:69 ../app/core/gimpdrawable-posterize.c:79 -#: ../app/tools/gimpposterizetool.c:84 +#: ../app/core/gimpdrawable-posterize.c:69 +#: ../app/core/gimpdrawable-posterize.c:79 ../app/tools/gimpposterizetool.c:84 msgid "Posterize" msgstr "Posteriziraj" -#: ../app/core/gimpdrawable-stroke.c:272 ../app/paint/gimppaintcore-stroke.c:330 -#: ../app/vectors/gimpvectors.c:556 +#: ../app/core/gimpdrawable-stroke.c:272 +#: ../app/paint/gimppaintcore-stroke.c:330 ../app/vectors/gimpvectors.c:556 msgid "Not enough points to stroke" msgstr "Premalo točk za potezo" @@ -7910,9 +7952,11 @@ msgid "Render Stroke" msgstr "Upodobi potezo" -#: ../app/core/gimpdrawable-threshold.c:70 ../app/core/gimpdrawable-threshold.c:81 -#: ../app/tools/gimpblendoptions.c:275 ../app/tools/gimpbucketfilloptions.c:285 -#: ../app/tools/gimpregionselectoptions.c:216 ../app/tools/gimpthresholdtool.c:90 +#: ../app/core/gimpdrawable-threshold.c:70 +#: ../app/core/gimpdrawable-threshold.c:81 ../app/tools/gimpblendoptions.c:275 +#: ../app/tools/gimpbucketfilloptions.c:285 +#: ../app/tools/gimpregionselectoptions.c:216 +#: ../app/tools/gimpthresholdtool.c:90 msgid "Threshold" msgstr "Prag" @@ -7968,8 +8012,8 @@ #, c-format msgid "Fatal parse error in gradient file '%s': File is corrupt in line %d." msgstr "" -"Usodna napaka razhroščevanja v datoteki preliva '%s': Datoteka je okvarjena v " -"vrstici %d." +"Usodna napaka razhroščevanja v datoteki preliva '%s': Datoteka je okvarjena " +"v vrstici %d." #: ../app/core/gimpgradient-load.c:219 ../app/core/gimpgradient-load.c:230 #, c-format @@ -7982,7 +8026,8 @@ #, c-format msgid "Gradient file '%s' is corrupt: Segments do not span the range 0-1." msgstr "" -"Datoteka s prelivi '%s' je poškodovana. Odseki ne ustrezajo razponu od 0 do 1." +"Datoteka s prelivi '%s' je poškodovana. Odseki ne ustrezajo razponu od 0 do " +"1." #: ../app/core/gimpgradient-load.c:336 #, c-format @@ -8003,7 +8048,8 @@ msgstr "Barva ospredja mreže." #: ../app/core/gimpgrid.c:96 -msgid "The background color of the grid; only used in double dashed line style." +msgid "" +"The background color of the grid; only used in double dashed line style." msgstr "Barva ozadja mreže; uporabljena je samo za dvojno črtkan slog črte." #: ../app/core/gimpgrid.c:102 @@ -8015,7 +8061,8 @@ msgstr "Navpični razmik črt mreže." #: ../app/core/gimpgrid.c:116 -msgid "Horizontal offset of the first grid line; this may be a negative number." +msgid "" +"Horizontal offset of the first grid line; this may be a negative number." msgstr "Vodoravni zamik prve črte v mreži. Lahko je negativen." #: ../app/core/gimpgrid.c:123 @@ -8406,11 +8453,11 @@ #: ../app/core/gimplayer-floating-sel.c:126 ../app/core/gimplayer.c:620 msgid "" -"Cannot create a new layer from the floating selection because it belongs to a " -"layer mask or channel." +"Cannot create a new layer from the floating selection because it belongs to " +"a layer mask or channel." msgstr "" -"Nove plasti iz plavajočega izbora ni mogoče ustvariti, ker ta pripada maski ali " -"kanalu same plasti." +"Nove plasti iz plavajočega izbora ni mogoče ustvariti, ker ta pripada maski " +"ali kanalu same plasti." #: ../app/core/gimplayer-floating-sel.c:133 msgctxt "undo-type" @@ -8480,7 +8527,7 @@ msgid "Layer cannot be lowered more." msgstr "Plasti ni mogoče bolj spustiti." -#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1529 +#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1532 #: ../app/core/gimplayermask.c:236 #, c-format msgid "%s mask" @@ -8495,45 +8542,45 @@ "Plavajoči izbor\n" "(%s)" -#: ../app/core/gimplayer.c:1449 +#: ../app/core/gimplayer.c:1452 msgid "Unable to add a layer mask since the layer already has one." msgstr "Maske plasti ni mogoče dodati, ker jo plast že ima." -#: ../app/core/gimplayer.c:1460 +#: ../app/core/gimplayer.c:1463 msgid "Cannot add layer mask of different dimensions than specified layer." msgstr "Maske drugačnih mer, kot so mere plasti, ni mogoče dodati." -#: ../app/core/gimplayer.c:1466 +#: ../app/core/gimplayer.c:1469 msgctxt "undo-type" msgid "Add Layer Mask" msgstr "Dodaj masko plasti" -#: ../app/core/gimplayer.c:1584 +#: ../app/core/gimplayer.c:1587 msgctxt "undo-type" msgid "Transfer Alpha to Mask" msgstr "Prenesi alfo v masko" -#: ../app/core/gimplayer.c:1754 +#: ../app/core/gimplayer.c:1757 msgctxt "undo-type" msgid "Apply Layer Mask" msgstr "Uporabi masko plasti" -#: ../app/core/gimplayer.c:1755 +#: ../app/core/gimplayer.c:1758 msgctxt "undo-type" msgid "Delete Layer Mask" msgstr "Izbriši masko plasti" -#: ../app/core/gimplayer.c:1874 +#: ../app/core/gimplayer.c:1877 msgctxt "undo-type" msgid "Add Alpha Channel" msgstr "Dodaj kanal alfa" -#: ../app/core/gimplayer.c:1928 +#: ../app/core/gimplayer.c:1931 msgctxt "undo-type" msgid "Remove Alpha Channel" msgstr "Odstrani kanal alfa" -#: ../app/core/gimplayer.c:1948 +#: ../app/core/gimplayer.c:1951 msgctxt "undo-type" msgid "Layer to Image Size" msgstr "Plast na velikost slike" @@ -8584,8 +8631,8 @@ #, c-format msgid "Fatal parse error in palette file '%s': Read error in line %d." msgstr "" -"Usodna napaka pri razčlenjevanju datoteke palete '%s': Napaka pri branju vrstice " -"%d." +"Usodna napaka pri razčlenjevanju datoteke palete '%s': Napaka pri branju " +"vrstice %d." #: ../app/core/gimppalette-load.c:96 #, c-format @@ -8601,8 +8648,8 @@ #: ../app/core/gimppalette-load.c:149 #, c-format msgid "" -"Reading palette file '%s': Invalid number of columns in line %d. Using default " -"value." +"Reading palette file '%s': Invalid number of columns in line %d. Using " +"default value." msgstr "" "Branje datoteke palete '%s': Nepravilno število stolpcev v vrstici %d. " "Uporabljena bo privzeta vrednost." @@ -8610,7 +8657,8 @@ #: ../app/core/gimppalette-load.c:185 #, c-format msgid "Reading palette file '%s': Missing RED component in line %d." -msgstr "Branje datoteke palete '%s': V vrstici %d manjka rdeča komponenta (RED)." +msgstr "" +"Branje datoteke palete '%s': V vrstici %d manjka rdeča komponenta (RED)." #: ../app/core/gimppalette-load.c:193 #, c-format @@ -8621,12 +8669,14 @@ #: ../app/core/gimppalette-load.c:201 #, c-format msgid "Reading palette file '%s': Missing BLUE component in line %d." -msgstr "Branje datoteke palete '%s': V vrstici %d manjka modra komponenta (BLUE)." +msgstr "" +"Branje datoteke palete '%s': V vrstici %d manjka modra komponenta (BLUE)." #: ../app/core/gimppalette-load.c:211 #, c-format msgid "Reading palette file '%s': RGB value out of range in line %d." -msgstr "Branje datoteke palete '%s': V vrstici %d je vrednost RGB izven dosega." +msgstr "" +"Branje datoteke palete '%s': V vrstici %d je vrednost RGB izven dosega." #: ../app/core/gimppalette-load.c:478 #, c-format @@ -8643,14 +8693,16 @@ #, c-format msgid "Fatal parse error in pattern file '%s': File appears truncated." msgstr "" -"Usodna napaka pri razčlenjevanju datoteke vzorcev '%s': Datoteka je poškodovana " -"oz. odsekana." +"Usodna napaka pri razčlenjevanju datoteke vzorcev '%s': Datoteka je " +"poškodovana oz. odsekana." #: ../app/core/gimppattern-load.c:104 #, c-format -msgid "Fatal parse error in pattern file '%s': Unknown pattern format version %d." +msgid "" +"Fatal parse error in pattern file '%s': Unknown pattern format version %d." msgstr "" -"Usodna napaka pri razčlenjevanju datoteke vzorcev '%s': Neznana oblika vzorca %d." +"Usodna napaka pri razčlenjevanju datoteke vzorcev '%s': Neznana oblika " +"vzorca %d." #: ../app/core/gimppattern-load.c:114 #, c-format @@ -8658,8 +8710,8 @@ "Fatal parse error in pattern file '%s: Unsupported pattern depth %d.\n" "GIMP Patterns must be GRAY or RGB." msgstr "" -"Usodna napaka pri razčlenjevanju datoteke vzorcev '%s': Nepodprta globina vzorca " -"%d.\n" +"Usodna napaka pri razčlenjevanju datoteke vzorcev '%s': Nepodprta globina " +"vzorca %d.\n" "Vzorci za GIMP morajo biti sivinske slike ali slike RGB." #: ../app/core/gimppattern-load.c:139 @@ -8670,7 +8722,8 @@ #: ../app/core/gimppdbprogress.c:279 ../app/widgets/gimppdbdialog.c:331 #, c-format msgid "Unable to run %s callback. The corresponding plug-in may have crashed." -msgstr "Povratnega klica %s ni mogoče pognati. Ustrezni vtičnik se je morda sesul." +msgstr "" +"Povratnega klica %s ni mogoče pognati. Ustrezni vtičnik se je morda sesul." #: ../app/core/gimpprogress.c:106 ../app/core/gimpprogress.c:153 msgid "Please wait" @@ -8752,9 +8805,9 @@ "Convert a mitered join to a bevelled join if the miter would extend to a " "distance of more than miter-limit * line-width from the actual join point." msgstr "" -"Pretvori stikališče s sredico v izbočeno stikališče, če bi se sredica razširila " -"do razdalje, ki presega vrednost meja-sredice * širina-črte od dejanske točke " -"stikališča." +"Pretvori stikališče s sredico v izbočeno stikališče, če bi se sredica " +"razširila do razdalje, ki presega vrednost meja-sredice * širina-črte od " +"dejanske točke stikališča." #: ../app/core/gimptoolpreset-load.c:61 #, c-format @@ -8763,7 +8816,8 @@ #: ../app/core/gimptemplate.c:129 msgid "The unit used for coordinate display when not in dot-for-dot mode." -msgstr "Uporabljena enota za prikaz koordinat, ko niste v načinu točka-za-točko." +msgstr "" +"Uporabljena enota za prikaz koordinat, ko niste v načinu točka-za-točko." #: ../app/core/gimptemplate.c:136 msgid "The horizontal image resolution." @@ -8915,7 +8969,8 @@ #: ../app/dialogs/data-delete-dialog.c:107 #, c-format -msgid "Are you sure you want to remove '%s' from the list and delete it on disk?" +msgid "" +"Are you sure you want to remove '%s' from the list and delete it on disk?" msgstr "Ste prepričani, da želite izbrisati '%s' s seznama in z diska?" #: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:162 @@ -9022,13 +9077,13 @@ #: ../app/dialogs/file-save-dialog.c:454 msgid "" -"Saving remote files needs to determine the file format from the file extension. " -"Please enter a file extension that matches the selected file format or enter no " -"file extension at all." -msgstr "" -"Za shranjevanje oddaljenih datotek je potrebno razločiti vrsto datoteke iz njene " -"končnice. Vnesite končnico datoteke, ki se ujema z zapisom izbrane datoteke ali " -"pa ne vnesite nobene končnice." +"Saving remote files needs to determine the file format from the file " +"extension. Please enter a file extension that matches the selected file " +"format or enter no file extension at all." +msgstr "" +"Za shranjevanje oddaljenih datotek je potrebno razločiti vrsto datoteke iz " +"njene končnice. Vnesite končnico datoteke, ki se ujema z zapisom izbrane " +"datoteke ali pa ne vnesite nobene končnice." #: ../app/dialogs/file-save-dialog.c:601 msgid "The given filename cannot be used for exporting" @@ -9036,8 +9091,8 @@ #: ../app/dialogs/file-save-dialog.c:602 msgid "" -"You can use this dialog to export to various file formats. If you want to save " -"the image to the GIMP XCF format, use File→Save instead." +"You can use this dialog to export to various file formats. If you want to " +"save the image to the GIMP XCF format, use File→Save instead." msgstr "" "S tem pogovornim oknom shranjujete v različne vrste datotek. Uporabite " "Datoteka→Shrani za izvoz v zapisu XCF GIMP." @@ -9055,8 +9110,8 @@ "You can use this dialog to save to the GIMP XCF format. Use File→Export to " "export to other file formats." msgstr "" -"S tem pogovornim oknom shranjujete v zapisu XCF GIMP. Uporabite Datoteka→Izvozi " -"za izvoz v druge vrste datotek." +"S tem pogovornim oknom shranjujete v zapisu XCF GIMP. Uporabite " +"Datoteka→Izvozi za izvoz v druge vrste datotek." #: ../app/dialogs/file-save-dialog.c:612 msgid "Take me to the Export dialog" @@ -9068,11 +9123,11 @@ #: ../app/dialogs/file-save-dialog.c:674 msgid "" -"The given filename does not have any known file extension. Please enter a known " -"file extension or select a file format from the file format list." +"The given filename does not have any known file extension. Please enter a " +"known file extension or select a file format from the file format list." msgstr "" -"Podano ime datoteke je brez znane končnice. Vnesite znano končnico datoteke ali " -"izberite vrsto datoteke s seznama vrst datotek." +"Podano ime datoteke je brez znane končnice. Vnesite znano končnico datoteke " +"ali izberite vrsto datoteke s seznama vrst datotek." #: ../app/dialogs/file-save-dialog.c:706 msgid "The given file extension does not match the chosen file type." @@ -9149,7 +9204,8 @@ msgid "Create a New Image" msgstr "Ustvari novo sliko" -#: ../app/dialogs/image-new-dialog.c:135 ../app/dialogs/preferences-dialog.c:2016 +#: ../app/dialogs/image-new-dialog.c:135 +#: ../app/dialogs/preferences-dialog.c:2016 msgid "_Template:" msgstr "_Predloga:" @@ -9157,7 +9213,8 @@ msgid "Confirm Image Size" msgstr "Potrdite velikost slike" -#: ../app/dialogs/image-new-dialog.c:338 ../app/dialogs/image-scale-dialog.c:239 +#: ../app/dialogs/image-new-dialog.c:338 +#: ../app/dialogs/image-scale-dialog.c:239 #, c-format msgid "You are trying to create an image with a size of %s." msgstr "Ustvariti želite sliko velikosti %s." @@ -9168,9 +9225,9 @@ "An image of the chosen size will use more memory than what is configured as " "\"Maximum Image Size\" in the Preferences dialog (currently %s)." msgstr "" -"Slika izbrane velikosti bi zasedla več pomnilnika, kot je največ dovoljeno glede " -"na nastavitev \"Največja velikost slike\" v pogovornem oknu \"Nastavitve" -"\" (trenutno nastavljeno na %s)." +"Slika izbrane velikosti bi zasedla več pomnilnika, kot je največ dovoljeno " +"glede na nastavitev \"Največja velikost slike\" v pogovornem oknu " +"\"Nastavitve\" (trenutno nastavljeno na %s)." #: ../app/dialogs/image-properties-dialog.c:60 #: ../app/dialogs/image-properties-dialog.c:63 @@ -9201,19 +9258,20 @@ #: ../app/dialogs/image-scale-dialog.c:245 #, c-format msgid "" -"Scaling the image to the chosen size will make it use more memory than what is " -"configured as \"Maximum Image Size\" in the Preferences dialog (currently %s)." -msgstr "" -"Sprememba merila slike na izbrano velikost bi zahtevala več pomnilnika, kot to " -"dovoljuje nastavitev \"Največja velikost slike\" v pogovornem oknu \"Nastavitve" -"\" (trenutno %s)." +"Scaling the image to the chosen size will make it use more memory than what " +"is configured as \"Maximum Image Size\" in the Preferences dialog (currently " +"%s)." +msgstr "" +"Sprememba merila slike na izbrano velikost bi zahtevala več pomnilnika, kot " +"to dovoljuje nastavitev \"Največja velikost slike\" v pogovornem oknu " +"\"Nastavitve\" (trenutno %s)." #: ../app/dialogs/image-scale-dialog.c:260 msgid "" "Scaling the image to the chosen size will shrink some layers completely away." msgstr "" -"Sprememba merila slike na izbrano velikost slike bo skrčila nekatere plasti na " -"ničelno velikost." +"Sprememba merila slike na izbrano velikost slike bo skrčila nekatere plasti " +"na ničelno velikost." #: ../app/dialogs/image-scale-dialog.c:264 msgid "Is this what you want to do?" @@ -9256,11 +9314,13 @@ msgstr "_Ime plasti:" #. The size labels -#: ../app/dialogs/layer-options-dialog.c:139 ../app/tools/gimpmeasuretool.c:1129 +#: ../app/dialogs/layer-options-dialog.c:139 +#: ../app/tools/gimpmeasuretool.c:1129 msgid "Width:" msgstr "Širina:" -#: ../app/dialogs/layer-options-dialog.c:145 ../app/tools/gimpmeasuretool.c:1157 +#: ../app/dialogs/layer-options-dialog.c:145 +#: ../app/tools/gimpmeasuretool.c:1157 msgid "Height:" msgstr "Višina:" @@ -9278,7 +9338,8 @@ #: ../app/dialogs/module-dialog.c:150 msgid "You will have to restart GIMP for the changes to take effect." -msgstr "Morali boste ponovno zagnati GIMP, da bodo naslednje spremembe učinkovale." +msgstr "" +"Morali boste ponovno zagnati GIMP, da bodo naslednje spremembe učinkovale." #: ../app/dialogs/module-dialog.c:191 msgid "Module" @@ -9448,15 +9509,16 @@ #: ../app/dialogs/preferences-dialog.c:356 msgid "You will have to restart GIMP for the following changes to take effect:" -msgstr "Morali boste ponovno zagnati GIMP, da bodo naslednje spremembe učinkovale:" +msgstr "" +"Morali boste ponovno zagnati GIMP, da bodo naslednje spremembe učinkovale:" #: ../app/dialogs/preferences-dialog.c:538 msgid "" -"Your keyboard shortcuts will be reset to default values the next time you start " -"GIMP." +"Your keyboard shortcuts will be reset to default values the next time you " +"start GIMP." msgstr "" -"Tipke za bližnjice bodo ponastavljene na privzete vrednosti ob naslednjem zagonu " -"GIMP-a." +"Tipke za bližnjice bodo ponastavljene na privzete vrednosti ob naslednjem " +"zagonu GIMP-a." #: ../app/dialogs/preferences-dialog.c:549 msgid "Remove all Keyboard Shortcuts" @@ -9468,25 +9530,27 @@ #: ../app/dialogs/preferences-dialog.c:612 msgid "" -"Your window setup will be reset to default values the next time you start GIMP." +"Your window setup will be reset to default values the next time you start " +"GIMP." msgstr "" -"Nastavitve oken bodo ponastavljene na privzete vrednosti ob naslednjem zagonu " -"GIMP-a." +"Nastavitve oken bodo ponastavljene na privzete vrednosti ob naslednjem " +"zagonu GIMP-a." #: ../app/dialogs/preferences-dialog.c:647 msgid "" "Your input device settings will be reset to default values the next time you " "start GIMP." msgstr "" -"Nastavitve vhodne naprave bodo ponastavljene na privzete vrednosti ob naslednjem " -"zagonu GIMP-a." +"Nastavitve vhodne naprave bodo ponastavljene na privzete vrednosti ob " +"naslednjem zagonu GIMP-a." #: ../app/dialogs/preferences-dialog.c:682 msgid "" -"Your tool options will be reset to default values the next time you start GIMP." +"Your tool options will be reset to default values the next time you start " +"GIMP." msgstr "" -"Nastavitve orodij bodo ponastavljene na privzete vrednosti ob naslednjem zagonu " -"GIMP-a." +"Nastavitve orodij bodo ponastavljene na privzete vrednosti ob naslednjem " +"zagonu GIMP-a." #: ../app/dialogs/preferences-dialog.c:1268 msgid "Show _menubar" @@ -9936,7 +10000,7 @@ msgstr "Ločljivost zaslona" #. Pixels -#: ../app/dialogs/preferences-dialog.c:2335 ../app/display/gimpcursorview.c:206 +#: ../app/dialogs/preferences-dialog.c:2335 ../app/display/gimpcursorview.c:208 #: ../app/widgets/gimpgrideditor.c:199 ../app/widgets/gimpgrideditor.c:231 msgid "Pixels" msgstr "slikovnih točk" @@ -9949,7 +10013,8 @@ msgid "Vertical" msgstr "Navpično" -#: ../app/dialogs/preferences-dialog.c:2357 ../app/widgets/gimpimagepropview.c:469 +#: ../app/dialogs/preferences-dialog.c:2357 +#: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "ppi" @@ -10368,7 +10433,8 @@ "interpolation type will affect channels and layer masks only." msgstr "" "Indeksirane barvne plasti se pri spremembi merila spreminjajo brez " -"interpolacije. Izbrana vrsta interpolacije bo učinkovala le na kanale in maske. " +"interpolacije. Izbrana vrsta interpolacije bo učinkovala le na kanale in " +"maske. " #: ../app/dialogs/stroke-dialog.c:97 msgid "Choose Stroke Style" @@ -10435,7 +10501,8 @@ #: ../app/dialogs/user-install-dialog.c:95 msgid "The GIMP user installation failed; see the log for details." -msgstr "Uporabniška namestitev GIMP ni uspela; oglejte si zapisnik s podrobnostmi." +msgstr "" +"Uporabniška namestitev GIMP ni uspela; oglejte si zapisnik s podrobnostmi." #: ../app/dialogs/user-install-dialog.c:98 msgid "Installation Log" @@ -10518,49 +10585,51 @@ msgid "Line spacing" msgstr "Razmik med črtami" -#: ../app/display/gimpcursorview.c:216 ../app/display/gimpcursorview.c:222 -#: ../app/display/gimpcursorview.c:241 ../app/display/gimpcursorview.c:247 -#: ../app/display/gimpcursorview.c:266 ../app/display/gimpcursorview.c:272 -#: ../app/display/gimpcursorview.c:288 ../app/display/gimpcursorview.c:295 -#: ../app/display/gimpcursorview.c:672 ../app/display/gimpcursorview.c:673 -#: ../app/display/gimpcursorview.c:674 ../app/display/gimpcursorview.c:675 -#: ../app/display/gimpcursorview.c:788 ../app/display/gimpcursorview.c:789 -#: ../app/display/gimpcursorview.c:790 ../app/display/gimpcursorview.c:791 +#: ../app/display/gimpcursorview.c:218 ../app/display/gimpcursorview.c:224 +#: ../app/display/gimpcursorview.c:243 ../app/display/gimpcursorview.c:249 +#: ../app/display/gimpcursorview.c:268 ../app/display/gimpcursorview.c:274 +#: ../app/display/gimpcursorview.c:290 ../app/display/gimpcursorview.c:297 +#: ../app/display/gimpcursorview.c:688 ../app/display/gimpcursorview.c:689 +#: ../app/display/gimpcursorview.c:690 ../app/display/gimpcursorview.c:691 +#: ../app/display/gimpcursorview.c:804 ../app/display/gimpcursorview.c:805 +#: ../app/display/gimpcursorview.c:806 ../app/display/gimpcursorview.c:807 #: ../app/widgets/gimpcolorframe.c:633 msgid "n/a" msgstr "ni na voljo" -#: ../app/display/gimpcursorview.c:219 ../app/display/gimpcursorview.c:244 -#: ../app/display/gimpcursorview.c:269 ../app/widgets/gimpdeviceinfoeditor.c:138 +#: ../app/display/gimpcursorview.c:221 ../app/display/gimpcursorview.c:246 +#: ../app/display/gimpcursorview.c:271 +#: ../app/widgets/gimpdeviceinfoeditor.c:138 msgid "X" msgstr "X" -#: ../app/display/gimpcursorview.c:225 ../app/display/gimpcursorview.c:250 -#: ../app/display/gimpcursorview.c:275 ../app/widgets/gimpdeviceinfoeditor.c:139 +#: ../app/display/gimpcursorview.c:227 ../app/display/gimpcursorview.c:252 +#: ../app/display/gimpcursorview.c:277 +#: ../app/widgets/gimpdeviceinfoeditor.c:139 msgid "Y" msgstr "Y" #. Units -#: ../app/display/gimpcursorview.c:231 +#: ../app/display/gimpcursorview.c:233 msgid "Units" msgstr "Enote" #. Selection Bounding Box -#: ../app/display/gimpcursorview.c:256 +#: ../app/display/gimpcursorview.c:258 msgid "Selection Bounding Box" msgstr "Okvir izbora" #. Width -#: ../app/display/gimpcursorview.c:292 +#: ../app/display/gimpcursorview.c:294 msgid "W" msgstr "Š" #. Height -#: ../app/display/gimpcursorview.c:299 +#: ../app/display/gimpcursorview.c:301 msgid "H" msgstr "V" -#: ../app/display/gimpcursorview.c:328 +#: ../app/display/gimpcursorview.c:330 msgid "_Sample Merged" msgstr "_Vzorči spojeno" @@ -10614,16 +10683,19 @@ #: ../app/display/gimpdisplayshell-close.c:321 #, c-format msgid "" -"If you don't save the image, changes from the last hour and %d minute will be " -"lost." +"If you don't save the image, changes from the last hour and %d minute will " +"be lost." msgid_plural "" -"If you don't save the image, changes from the last hour and %d minutes will be " -"lost." -msgstr[0] "Če ne shranite slike, bodo spremembe zadnje ure in %d minut izgubljene." +"If you don't save the image, changes from the last hour and %d minutes will " +"be lost." +msgstr[0] "" +"Če ne shranite slike, bodo spremembe zadnje ure in %d minut izgubljene." msgstr[1] "" "Če ne shranite slike, bodo spremembe zadnje ure in %d minute izgubljene." -msgstr[2] "Če ne shranite slike, bodo spremembe zadnje ure in %d minut izgubljene." -msgstr[3] "Če ne shranite slike, bodo spremembe zadnje ure in %d minut izgubljene." +msgstr[2] "" +"Če ne shranite slike, bodo spremembe zadnje ure in %d minut izgubljene." +msgstr[3] "" +"Če ne shranite slike, bodo spremembe zadnje ure in %d minut izgubljene." #: ../app/display/gimpdisplayshell-close.c:333 #, c-format @@ -10665,13 +10737,14 @@ msgid "The active layer's pixels are locked." msgstr "Slikovne točke aktivne plasti so zaklenjene." -#: ../app/display/gimpdisplayshell-dnd.c:549 ../app/widgets/gimplayertreeview.c:725 +#: ../app/display/gimpdisplayshell-dnd.c:549 +#: ../app/widgets/gimplayertreeview.c:725 msgid "Drop layers" msgstr "Spusti plasti" #: ../app/display/gimpdisplayshell-dnd.c:682 -#: ../app/display/gimpdisplayshell-dnd.c:699 ../app/widgets/gimplayertreeview.c:802 -#: ../app/widgets/gimptoolbox-dnd.c:264 +#: ../app/display/gimpdisplayshell-dnd.c:699 +#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:264 msgid "Dropped Buffer" msgstr "Spuščen medpomnilnik" @@ -10722,7 +10795,8 @@ msgstr "(čisto)" #: ../app/display/gimpdisplayshell-title.c:338 -#: ../app/display/gimpdisplayshell-title.c:351 ../app/widgets/gimpactiongroup.c:884 +#: ../app/display/gimpdisplayshell-title.c:351 +#: ../app/widgets/gimpactiongroup.c:884 msgid "(none)" msgstr "(brez)" @@ -10735,33 +10809,34 @@ msgid "Not a regular file" msgstr "Ni veljavna datoteka" -#: ../app/file/file-open.c:191 +#: ../app/file/file-open.c:197 #, c-format msgid "%s plug-in returned SUCCESS but did not return an image" msgstr "" -"Vtičnik %s je vrnil niz SUCCESS (uspešno dokončana operacija), a ni vrnil slike" +"Vtičnik %s je vrnil niz SUCCESS (uspešno dokončana operacija), a ni vrnil " +"slike" -#: ../app/file/file-open.c:202 +#: ../app/file/file-open.c:208 #, c-format msgid "%s plug-In could not open image" msgstr "Z vtičnikom %s ni mogoče odpreti slike" -#: ../app/file/file-open.c:533 +#: ../app/file/file-open.c:539 msgid "Image doesn't contain any layers" msgstr "Slika ne vsebuje nobenih plasti" -#: ../app/file/file-open.c:593 +#: ../app/file/file-open.c:599 #, c-format msgid "Opening '%s' failed: %s" msgstr "Odpiranje '%s' ni uspelo: %s" -#: ../app/file/file-open.c:703 +#: ../app/file/file-open.c:709 msgid "" -"Color management has been disabled. It can be enabled again in the Preferences " -"dialog." +"Color management has been disabled. It can be enabled again in the " +"Preferences dialog." msgstr "" -"Upravljanje barv je bilo onemogočeno. Znova ga lahko vključite v pogovornem oknu " -"Nastavitve." +"Upravljanje barv je bilo onemogočeno. Znova ga lahko vključite v pogovornem " +"oknu Nastavitve." #: ../app/file/file-procedure.c:195 msgid "Unknown file type" @@ -10809,16 +10884,18 @@ #: ../app/gegl/gimpoperationcagetransform.c:106 msgid "" -"Convert a set of coefficient buffer to a coordinate buffer for the GIMP cage tool" +"Convert a set of coefficient buffer to a coordinate buffer for the GIMP cage " +"tool" msgstr "" -"Pretvori nabor koeficientnega medpomnilnika v koordinatni medpomnilnik za orodje " -"kletke v Gimpu" +"Pretvori nabor koeficientnega medpomnilnika v koordinatni medpomnilnik za " +"orodje kletke v Gimpu" #: ../app/gegl/gimpoperationcagetransform.c:128 msgid "Fill with plain color" msgstr "Zapolni z enakomerno barvo" -#: ../app/gegl/gimpoperationcagetransform.c:129 ../app/tools/gimpcageoptions.c:144 +#: ../app/gegl/gimpoperationcagetransform.c:129 +#: ../app/tools/gimpcageoptions.c:144 msgid "Fill the original position of the cage with a plain color" msgstr "Zapolni izvorni položaj kletke z enakomerno barvo" @@ -10836,7 +10913,7 @@ msgid "Documents" msgstr "Dokumenti" -#: ../app/gui/splash.c:115 +#: ../app/gui/splash.c:112 msgid "GIMP Startup" msgstr "Zagon GIMP-a" @@ -11033,25 +11110,28 @@ msgstr "Vtičnik" #: ../app/pdb/drawable-transform-cmds.c:345 -#: ../app/pdb/drawable-transform-cmds.c:443 ../app/pdb/item-transform-cmds.c:262 -#: ../app/pdb/transform-tools-cmds.c:163 ../app/tools/gimpperspectivetool.c:82 +#: ../app/pdb/drawable-transform-cmds.c:443 +#: ../app/pdb/item-transform-cmds.c:262 ../app/pdb/transform-tools-cmds.c:163 +#: ../app/tools/gimpperspectivetool.c:82 msgid "Perspective" msgstr "Perspektiva" #: ../app/pdb/drawable-transform-cmds.c:957 -#: ../app/pdb/drawable-transform-cmds.c:1042 ../app/pdb/item-transform-cmds.c:611 -#: ../app/pdb/transform-tools-cmds.c:418 ../app/tools/gimpsheartool.c:112 +#: ../app/pdb/drawable-transform-cmds.c:1042 +#: ../app/pdb/item-transform-cmds.c:611 ../app/pdb/transform-tools-cmds.c:418 +#: ../app/tools/gimpsheartool.c:112 msgid "Shearing" msgstr "Nagibanje ..." -#: ../app/pdb/drawable-transform-cmds.c:1138 ../app/pdb/item-transform-cmds.c:709 -#: ../app/pdb/transform-tools-cmds.c:507 +#: ../app/pdb/drawable-transform-cmds.c:1138 +#: ../app/pdb/item-transform-cmds.c:709 ../app/pdb/transform-tools-cmds.c:507 msgid "2D Transform" msgstr "2D-preoblikovanje" #: ../app/pdb/drawable-transform-cmds.c:1234 #: ../app/pdb/drawable-transform-cmds.c:1338 -#: ../app/pdb/drawable-transform-cmds.c:1442 ../app/pdb/item-transform-cmds.c:815 +#: ../app/pdb/drawable-transform-cmds.c:1442 +#: ../app/pdb/item-transform-cmds.c:815 msgid "2D Transforming" msgstr "2D-preoblikovanje ..." @@ -11071,9 +11151,11 @@ msgid "" "Cannot convert this layer to a normal layer because it is not a floating " "selection." -msgstr "Te plasti ni mogoče pretvoriti v navadno plast, ker ni plavajoči izbor." +msgstr "" +"Te plasti ni mogoče pretvoriti v navadno plast, ker ni plavajoči izbor." -#: ../app/pdb/gimppdb-query.c:299 ../app/pdb/gimppdb.c:315 ../app/pdb/gimppdb.c:385 +#: ../app/pdb/gimppdb-query.c:299 ../app/pdb/gimppdb.c:315 +#: ../app/pdb/gimppdb.c:385 #, c-format msgid "Procedure '%s' not found" msgstr "Procedure '%s' ni mogoče najti" @@ -11188,15 +11270,17 @@ #: ../app/pdb/gimppdb-utils.c:392 #, c-format msgid "" -"Item '%s' (%d) cannot be used because it is not a direct child of an item tree" +"Item '%s' (%d) cannot be used because it is not a direct child of an item " +"tree" msgstr "" -"Elementa '%s' (%d) ni mogoče uporabiti, ker ni neposreden otrok drevesa elementa" +"Elementa '%s' (%d) ni mogoče uporabiti, ker ni neposreden otrok drevesa " +"elementa" #: ../app/pdb/gimppdb-utils.c:420 #, c-format msgid "" -"Items '%s' (%d) and '%s' (%d) cannot be used because they are not part of the " -"same item tree" +"Items '%s' (%d) and '%s' (%d) cannot be used because they are not part of " +"the same item tree" msgstr "" "Elementov '%s' (%d) in '%s' (%d) ni mogoče uporabiti, ker nista del drevesa " "istega elementa" @@ -11219,7 +11303,8 @@ #: ../app/pdb/gimppdb-utils.c:496 #, c-format msgid "Item '%s' (%d) cannot be modified because its contents are locked" -msgstr "Elementa '%s' (%d) ni mogoče spremeniti, ker je njegova vsebina zaklenjena" +msgstr "" +"Elementa '%s' (%d) ni mogoče spremeniti, ker je njegova vsebina zaklenjena" #: ../app/pdb/gimppdb-utils.c:516 #, c-format @@ -11254,8 +11339,8 @@ #: ../app/pdb/gimppdb.c:420 #, c-format msgid "" -"Procedure '%s' has been called with a wrong type for argument #%d. Expected %s, " -"got %s." +"Procedure '%s' has been called with a wrong type for argument #%d. Expected " +"%s, got %s." msgstr "" "Procedura '%s' je bila klicana z napačno vrsto vrednosti argumenta #%d. " "Pričakovano %s, prejeto %s." @@ -11273,17 +11358,17 @@ #: ../app/pdb/gimpprocedure.c:644 #, c-format msgid "" -"Procedure '%s' returned a wrong value type for return value '%s' (#%d). Expected " -"%s, got %s." +"Procedure '%s' returned a wrong value type for return value '%s' (#%d). " +"Expected %s, got %s." msgstr "" -"Procedura '%s' je vrnila napačno vrsto vrnjene vrednosti '%s' (#%d). Pričakovana " -"vrednost %s, prejeta %s." +"Procedura '%s' je vrnila napačno vrsto vrnjene vrednosti '%s' (#%d). " +"Pričakovana vrednost %s, prejeta %s." #: ../app/pdb/gimpprocedure.c:656 #, c-format msgid "" -"Procedure '%s' has been called with a wrong value type for argument '%s' (#%d). " -"Expected %s, got %s." +"Procedure '%s' has been called with a wrong value type for argument '%s' (#" +"%d). Expected %s, got %s." msgstr "" "Procedura '%s' je bila priklicana z napačno vrsto vrednosti argumenta '%s' (#" "%d). Pričakovano %s, prejeto %s." @@ -11291,8 +11376,8 @@ #: ../app/pdb/gimpprocedure.c:689 #, c-format msgid "" -"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-in " -"is trying to work on a layer that doesn't exist any longer." +"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-" +"in is trying to work on a layer that doesn't exist any longer." msgstr "" "Procedura '%s' je vrnila neveljaven ID za argument '%s'. Najverjetneje je od " "vtičnika pričakovano delovanje na plasti, ki več ne obstaja." @@ -11300,35 +11385,35 @@ #: ../app/pdb/gimpprocedure.c:702 #, c-format msgid "" -"Procedure '%s' has been called with an invalid ID for argument '%s'. Most likely " -"a plug-in is trying to work on a layer that doesn't exist any longer." +"Procedure '%s' has been called with an invalid ID for argument '%s'. Most " +"likely a plug-in is trying to work on a layer that doesn't exist any longer." msgstr "" -"Klic procedure '%s' ima neveljaven ID za argument '%s'. Najverjetneje poskuša " -"vtičnik delovati na plasti, ki več ne obstaja." +"Klic procedure '%s' ima neveljaven ID za argument '%s'. Najverjetneje " +"poskuša vtičnik delovati na plasti, ki več ne obstaja." #: ../app/pdb/gimpprocedure.c:719 #, c-format msgid "" -"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-in " -"is trying to work on an image that doesn't exist any longer." +"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-" +"in is trying to work on an image that doesn't exist any longer." msgstr "" -"Procedura '%s' je vrnila neveljaven ID za argument '%s'. Najverjetneje poskuša " -"vtičnik delovati na sliki, ki več ne obstaja." +"Procedura '%s' je vrnila neveljaven ID za argument '%s'. Najverjetneje " +"poskuša vtičnik delovati na sliki, ki več ne obstaja." #: ../app/pdb/gimpprocedure.c:732 #, c-format msgid "" -"Procedure '%s' has been called with an invalid ID for argument '%s'. Most likely " -"a plug-in is trying to work on an image that doesn't exist any longer." +"Procedure '%s' has been called with an invalid ID for argument '%s'. Most " +"likely a plug-in is trying to work on an image that doesn't exist any longer." msgstr "" -"Klic procedure '%s' ima neveljaven ID za argument '%s'. Najverjetneje poskuša " -"vtičnik delovati na sliki, ki več ne obstaja." +"Klic procedure '%s' ima neveljaven ID za argument '%s'. Najverjetneje " +"poskuša vtičnik delovati na sliki, ki več ne obstaja." #: ../app/pdb/gimpprocedure.c:753 #, c-format msgid "" -"Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value is " -"out of range." +"Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value " +"is out of range." msgstr "" "Procedura '%s' je vrnila '%s' kot vrnjeno vrednost '%s' (#%d, vrsta %s). Ta " "vrednost je izven dovoljenega obsega." @@ -11336,16 +11421,18 @@ #: ../app/pdb/gimpprocedure.c:767 #, c-format msgid "" -"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type %s). " -"This value is out of range." +"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type " +"%s). This value is out of range." msgstr "" "Klic procedure '%s' ima vrednost '%s' za argument '%s' (#%d, vrsta %s). Ta " "vrednost je zunaj dovoljenega obsega." #: ../app/pdb/image-cmds.c:2361 -msgid "Image resolution is out of bounds, using the default resolution instead." +msgid "" +"Image resolution is out of bounds, using the default resolution instead." msgstr "" -"Ločljivost slike je prekoračila meje, zato bo uporabljena privzeta ločljivost." +"Ločljivost slike je prekoračila meje, zato bo uporabljena privzeta " +"ločljivost." #: ../app/pdb/image-select-cmds.c:297 ../app/pdb/selection-tools-cmds.c:219 #: ../app/tools/gimpfreeselecttool.c:196 @@ -11440,28 +11527,29 @@ "Napaka izvajanja v proceduri '%s':\n" "%s" -#: ../app/plug-in/gimpplugin-progress.c:331 +#: ../app/plug-in/gimpplugin-progress.c:339 msgid "Cancelled" msgstr "Preklicano" -#: ../app/plug-in/gimpplugin.c:643 +#: ../app/plug-in/gimpplugin.c:648 #, c-format msgid "" "Plug-in crashed: \"%s\"\n" "(%s)\n" "\n" -"The dying plug-in may have messed up GIMP's internal state. You may want to save " -"your images and restart GIMP to be on the safe side." +"The dying plug-in may have messed up GIMP's internal state. You may want to " +"save your images and restart GIMP to be on the safe side." msgstr "" "Vtičnik se je sesul: \"%s\"\n" "(%s)\n" "\n" -"Vtičnik je ob sesutju morda pokvaril notranje stanje GIMP-a. Morda je smiselno, " -"da iz varnostnih razlogov shranite svoje slike in ponovno poženete GIMP-a." +"Vtičnik je ob sesutju morda pokvaril notranje stanje GIMP-a. Morda je " +"smiselno, da iz varnostnih razlogov shranite svoje slike in ponovno poženete " +"GIMP-a." -#: ../app/plug-in/gimppluginmanager-call.c:173 -#: ../app/plug-in/gimppluginmanager-call.c:223 -#: ../app/plug-in/gimppluginmanager-call.c:321 +#: ../app/plug-in/gimppluginmanager-call.c:185 +#: ../app/plug-in/gimppluginmanager-call.c:235 +#: ../app/plug-in/gimppluginmanager-call.c:333 #, c-format msgid "Failed to run plug-in \"%s\"" msgstr "Vtičnika \"%s\" ni mogoče zagnati" @@ -11606,8 +11694,8 @@ #: ../app/text/gimptextlayer.c:696 msgid "" -"Your text cannot be rendered. It is likely too big. Please make it shorter or " -"use a smaller font." +"Your text cannot be rendered. It is likely too big. Please make it shorter " +"or use a smaller font." msgstr "" "Besedila ni mogoče upodobiti, najverjetneje je preveliko. Skrajšajte ga ali " "uporabite manjšo pisavo." @@ -11618,20 +11706,22 @@ "Problems parsing the text parasite for layer '%s':\n" "%s\n" "\n" -"Some text properties may be wrong. Unless you want to edit the text layer, you " -"don't need to worry about this." +"Some text properties may be wrong. Unless you want to edit the text layer, " +"you don't need to worry about this." msgstr "" "Težava pri razčlenjevanju besedilnega zajedalca za plast '%s':\n" "%s\n" "\n" -"Nekatere lastnosti besedila so morda napačne. Če plasti z besedilom ne želite " -"urejati, je skrb odveč." +"Nekatere lastnosti besedila so morda napačne. Če plasti z besedilom ne " +"želite urejati, je skrb odveč." #: ../app/text/gimptextlayout.c:577 msgid "" -"The new text layout cannot be generated. Most likely the font size is too big." +"The new text layout cannot be generated. Most likely the font size is too " +"big." msgstr "" -"Nove postavitve besedila ni mogoče izdelati. Najverjetneje je pisava prevelika." +"Nove postavitve besedila ni mogoče izdelati. Najverjetneje je pisava " +"prevelika." #: ../app/text/text-enums.c:23 msgctxt "text-box-mode" @@ -11759,7 +11849,8 @@ #: ../app/tools/gimpaligntool.c:549 msgid "Click on a layer, path or guide, or Click-Drag to pick several layers" msgstr "" -"Kliknite na plast, pot ali vodilo ali pa kliknite-povlecite za izbor več plasti" +"Kliknite na plast, pot ali vodilo ali pa kliknite-povlecite za izbor več " +"plasti" #: ../app/tools/gimpaligntool.c:557 msgid "Click to pick this layer as first item" @@ -11945,7 +12036,8 @@ #: ../app/tools/gimpbucketfilltool.c:87 msgid "Bucket Fill Tool: Fill selected area with a color or pattern" -msgstr "Orodje Zapolni s kanglico: Zapolni izbrano področje z barvo ali vzorcem" +msgstr "" +"Orodje Zapolni s kanglico: Zapolni izbrano področje z barvo ali vzorcem" #: ../app/tools/gimpbucketfilltool.c:88 msgid "_Bucket Fill" @@ -11994,7 +12086,8 @@ #: ../app/tools/gimpclonetool.c:61 msgid "Clone Tool: Selectively copy from an image or pattern, using a brush" -msgstr "Orodje Kloniraj: selektivno kopirajte s slike ali vzorca, z uporabo čopiča" +msgstr "" +"Orodje Kloniraj: selektivno kopirajte s slike ali vzorca, z uporabo čopiča" #: ../app/tools/gimpclonetool.c:62 msgid "_Clone" @@ -12059,27 +12152,33 @@ msgid "Adjust Color Levels" msgstr "Prilagodi ravni barv" -#: ../app/tools/gimpcolorbalancetool.c:292 ../app/tools/gimphuesaturationtool.c:251 +#: ../app/tools/gimpcolorbalancetool.c:292 +#: ../app/tools/gimphuesaturationtool.c:251 msgid "Cyan" msgstr "Cianasta" -#: ../app/tools/gimpcolorbalancetool.c:292 ../app/tools/gimphuesaturationtool.c:248 +#: ../app/tools/gimpcolorbalancetool.c:292 +#: ../app/tools/gimphuesaturationtool.c:248 msgid "Red" msgstr "Rdeča" -#: ../app/tools/gimpcolorbalancetool.c:301 ../app/tools/gimphuesaturationtool.c:253 +#: ../app/tools/gimpcolorbalancetool.c:301 +#: ../app/tools/gimphuesaturationtool.c:253 msgid "Magenta" msgstr "Magenta" -#: ../app/tools/gimpcolorbalancetool.c:301 ../app/tools/gimphuesaturationtool.c:250 +#: ../app/tools/gimpcolorbalancetool.c:301 +#: ../app/tools/gimphuesaturationtool.c:250 msgid "Green" msgstr "Zelena" -#: ../app/tools/gimpcolorbalancetool.c:310 ../app/tools/gimphuesaturationtool.c:249 +#: ../app/tools/gimpcolorbalancetool.c:310 +#: ../app/tools/gimphuesaturationtool.c:249 msgid "Yellow" msgstr "Rumena" -#: ../app/tools/gimpcolorbalancetool.c:310 ../app/tools/gimphuesaturationtool.c:252 +#: ../app/tools/gimpcolorbalancetool.c:310 +#: ../app/tools/gimphuesaturationtool.c:252 msgid "Blue" msgstr "Modra" @@ -12158,7 +12257,8 @@ msgstr "Izberite, kaj bo počela kapalka" #: ../app/tools/gimpcolorpickeroptions.c:80 -msgid "Open a floating dialog to view picked color values in various color models" +msgid "" +"Open a floating dialog to view picked color values in various color models" msgstr "" "Odpri plavajoče pogovorno okno za ogled vrednosti izbranih barv v različnih " "barvnih modelih" @@ -12269,7 +12369,8 @@ msgid "Convolve Type (%s)" msgstr "Vrsta konvolucije (%s)" -#: ../app/tools/gimpcropoptions.c:76 ../app/tools/gimprectangleselectoptions.c:77 +#: ../app/tools/gimpcropoptions.c:76 +#: ../app/tools/gimprectangleselectoptions.c:77 msgid "Dim everything outside selection" msgstr "Zatemni vse zunaj izbora" @@ -12279,7 +12380,8 @@ #: ../app/tools/gimpcropoptions.c:88 msgid "Allow resizing canvas by dragging cropping frame beyond image boundary" -msgstr "Dovoli spremembo merila platna z vlečenjem okvira obrezave prek meja slike" +msgstr "" +"Dovoli spremembo merila platna z vlečenjem okvira obrezave prek meja slike" #: ../app/tools/gimpcropoptions.c:164 msgid "Current layer only" @@ -12309,64 +12411,64 @@ msgid "There is no active layer to crop." msgstr "Ni aktivne plasti, da bi jo obrezali." -#: ../app/tools/gimpcurvestool.c:144 +#: ../app/tools/gimpcurvestool.c:145 msgid "Curves" msgstr "Krivulje" -#: ../app/tools/gimpcurvestool.c:145 +#: ../app/tools/gimpcurvestool.c:146 msgid "Curves Tool: Adjust color curves" msgstr "Orodje Krivulje: Prilagodi ravni barv" -#: ../app/tools/gimpcurvestool.c:146 +#: ../app/tools/gimpcurvestool.c:147 msgid "_Curves..." msgstr "_Krivulje ..." -#: ../app/tools/gimpcurvestool.c:172 +#: ../app/tools/gimpcurvestool.c:174 msgid "Adjust Color Curves" msgstr "Prilagodi krivulje barv" -#: ../app/tools/gimpcurvestool.c:174 +#: ../app/tools/gimpcurvestool.c:176 msgid "Import Curves" msgstr "Uvozi krivulje" -#: ../app/tools/gimpcurvestool.c:175 +#: ../app/tools/gimpcurvestool.c:177 msgid "Export Curves" msgstr "Izvozi krivulje" -#: ../app/tools/gimpcurvestool.c:226 +#: ../app/tools/gimpcurvestool.c:239 msgid "Curves does not operate on indexed layers." msgstr "Krivulje ne delujejo na indeksiranih plasteh." -#: ../app/tools/gimpcurvestool.c:334 +#: ../app/tools/gimpcurvestool.c:348 msgid "Click to add a control point" msgstr "Kliknite za dodatek kontrolne točke" -#: ../app/tools/gimpcurvestool.c:339 +#: ../app/tools/gimpcurvestool.c:353 msgid "Click to add control points to all channels" msgstr "Kliknite za dodajanje nadzornih točk vsem kanalom" -#: ../app/tools/gimpcurvestool.c:344 +#: ../app/tools/gimpcurvestool.c:358 msgid "Click to locate on curve (try Shift, Ctrl)" msgstr "Kliknite za mesto na krivulji (poskusite Shift, Ctrl)" -#: ../app/tools/gimpcurvestool.c:457 ../app/tools/gimplevelstool.c:384 +#: ../app/tools/gimpcurvestool.c:473 ../app/tools/gimplevelstool.c:384 msgid "Cha_nnel:" msgstr "Ka_nal:" -#: ../app/tools/gimpcurvestool.c:483 ../app/tools/gimplevelstool.c:408 +#: ../app/tools/gimpcurvestool.c:499 ../app/tools/gimplevelstool.c:408 msgid "R_eset Channel" msgstr "Po_nastavi kanal" -#: ../app/tools/gimpcurvestool.c:574 ../app/widgets/gimpdeviceinfoeditor.c:461 +#: ../app/tools/gimpcurvestool.c:590 ../app/widgets/gimpdeviceinfoeditor.c:461 msgid "Curve _type:" msgstr "Vrsta _krivulje:" -#: ../app/tools/gimpcurvestool.c:651 ../app/tools/gimplevelstool.c:756 +#: ../app/tools/gimpcurvestool.c:667 ../app/tools/gimplevelstool.c:756 #, c-format msgid "Could not read header from '%s': %s" msgstr "Ni mogoče brati glave iz '%s': %s" -#: ../app/tools/gimpcurvestool.c:724 +#: ../app/tools/gimpcurvestool.c:740 msgid "Use _old curves file format" msgstr "Uporabi _stare datoteke krivulj" @@ -12396,7 +12498,8 @@ #: ../app/tools/gimpdodgeburntool.c:74 msgid "Dodge / Burn Tool: Selectively lighten or darken using a brush" -msgstr "Orodje Posvetli / potemni: Selektivno posvetlite ali potemnite s čopičem" +msgstr "" +"Orodje Posvetli / potemni: Selektivno posvetlite ali potemnite s čopičem" #: ../app/tools/gimpdodgeburntool.c:75 msgid "Dod_ge / Burn" @@ -12511,8 +12614,10 @@ msgstr "Prezrcali" #: ../app/tools/gimpfliptool.c:85 -msgid "Flip Tool: Reverse the layer, selection or path horizontally or vertically" -msgstr "Orodje Prezrcali: Vodoravno ali navpično prezrcalite plast, izbor ali pot" +msgid "" +"Flip Tool: Reverse the layer, selection or path horizontally or vertically" +msgstr "" +"Orodje Prezrcali: Vodoravno ali navpično prezrcalite plast, izbor ali pot" #: ../app/tools/gimpfliptool.c:87 msgid "_Flip" @@ -12542,7 +12647,8 @@ #: ../app/tools/gimpforegroundselectoptions.c:91 msgid "" -"Paint over areas to mark color values for inclusion or exclusion from selection" +"Paint over areas to mark color values for inclusion or exclusion from " +"selection" msgstr "" "Riši po površinah z namenom označevanja barvnih vrednosti za vključitev ali " "izključitev iz izbora" @@ -12553,11 +12659,11 @@ #: ../app/tools/gimpforegroundselectoptions.c:104 msgid "" -"Smaller values give a more accurate selection border but may introduce holes in " -"the selection" +"Smaller values give a more accurate selection border but may introduce holes " +"in the selection" msgstr "" -"Manjše vrednosti podajo bolj natančen rob izbora, vendar lahko tudi povzročijo " -"luknje v izboru" +"Manjše vrednosti podajo bolj natančen rob izbora, vendar lahko tudi " +"povzročijo luknje v izboru" #: ../app/tools/gimpforegroundselectoptions.c:112 msgid "Color of selection preview mask" @@ -12621,7 +12727,8 @@ #: ../app/tools/gimpforegroundselecttool.c:145 msgid "Foreground Select Tool: Select a region containing foreground objects" -msgstr "Orodje Izbor ospredja: Izberite območje, ki vsebuje predmete iz ospredja" +msgstr "" +"Orodje Izbor ospredja: Izberite območje, ki vsebuje predmete iz ospredja" #: ../app/tools/gimpforegroundselecttool.c:146 msgid "F_oreground Select" @@ -12669,7 +12776,8 @@ #: ../app/tools/gimpfreeselecttool.c:1043 msgid "Click-Drag adds a free segment, Click adds a polygonal segment" -msgstr "S klikom in vleko dodate prosti odsek, s klikom dodate mnogokotni odsek" +msgstr "" +"S klikom in vleko dodate prosti odsek, s klikom dodate mnogokotni odsek" #: ../app/tools/gimpfreeselecttool.c:1562 msgctxt "command" @@ -13155,8 +13263,9 @@ msgid "_Paintbrush" msgstr "Slikarski _čopič" -#: ../app/tools/gimppaintoptions-gui.c:89 ../app/tools/gimpselectionoptions.c:217 -#: ../app/widgets/gimpbrushselect.c:190 ../app/widgets/gimplayertreeview.c:268 +#: ../app/tools/gimppaintoptions-gui.c:89 +#: ../app/tools/gimpselectionoptions.c:217 ../app/widgets/gimpbrushselect.c:190 +#: ../app/widgets/gimplayertreeview.c:268 msgid "Mode:" msgstr "Način:" @@ -13256,11 +13365,11 @@ #: ../app/tools/gimpperspectiveclonetool.c:134 msgid "" -"Perspective Clone Tool: Clone from an image source after applying a perspective " -"transformation" +"Perspective Clone Tool: Clone from an image source after applying a " +"perspective transformation" msgstr "" -"Orodje Kloniranje v perspektivi: Klonirajte iz slikovnega vira ob upoštevanju " -"transformacije perspektive" +"Orodje Kloniranje v perspektivi: Klonirajte iz slikovnega vira ob " +"upoštevanju transformacije perspektive" #: ../app/tools/gimpperspectiveclonetool.c:136 msgid "_Perspective Clone" @@ -13319,7 +13428,8 @@ msgid "Use all visible layers when shrinking the selection" msgstr "Ob krčenju izbora uporabi vse vidne plasti" -#: ../app/tools/gimprectangleoptions.c:122 ../app/tools/gimptransformoptions.c:127 +#: ../app/tools/gimprectangleoptions.c:122 +#: ../app/tools/gimptransformoptions.c:127 msgid "Composition guides such as rule of thirds" msgstr "Vodila za kompozicijo, kot je zlati rez" @@ -13621,9 +13731,11 @@ msgstr "Velikost pisave" #: ../app/tools/gimptextoptions.c:145 -msgid "Hinting alters the font outline to produce a crisp bitmap at small sizes" +msgid "" +"Hinting alters the font outline to produce a crisp bitmap at small sizes" msgstr "" -"Namigovanje popravi obris pisave tako, da ta ostane ostra pri majhnih velikostih." +"Namigovanje popravi obris pisave tako, da ta ostane ostra pri majhnih " +"velikostih." #: ../app/tools/gimptextoptions.c:153 msgid "The text language may have an effect on the way the text is rendered." @@ -13650,8 +13762,8 @@ "Whether text flows into rectangular shape or moves into a new line when you " "press Enter" msgstr "" -"Ali besedilo poteka po pravokotnem liku ali pa se premakne v novo vrstico, ko " -"pritisnete tipko Enter" +"Ali besedilo poteka po pravokotnem liku ali pa se premakne v novo vrstico, " +"ko pritisnete tipko Enter" #: ../app/tools/gimptextoptions.c:196 msgid "Use an external editor window for text entry" @@ -13716,12 +13828,13 @@ #: ../app/tools/gimptexttool.c:1557 msgid "" "The layer you selected is a text layer but it has been modified using other " -"tools. Editing the layer with the text tool will discard these modifications.\n" +"tools. Editing the layer with the text tool will discard these " +"modifications.\n" "\n" "You can edit the layer or create a new text layer from its text attributes." msgstr "" -"Izbrali ste plast besedila, ki je bila spremenjena z drugimi orodji. Urejanje " -"plasti z orodjem besedila bo razveljavilo opravljene spremembe.\n" +"Izbrali ste plast besedila, ki je bila spremenjena z drugimi orodji. " +"Urejanje plasti z orodjem besedila bo razveljavilo opravljene spremembe.\n" "\n" "Lahko urejate plast ali pa iz lastnosti besedila ustvarite novo plast." @@ -13789,7 +13902,8 @@ msgid "Transform:" msgstr "Transformiraj:" -#: ../app/tools/gimptransformoptions.c:286 ../app/widgets/gimpdynamicseditor.c:143 +#: ../app/tools/gimptransformoptions.c:286 +#: ../app/widgets/gimpdynamicseditor.c:143 #: ../app/widgets/gimpdynamicsoutputeditor.c:71 msgid "Direction" msgstr "Smer" @@ -14222,7 +14336,8 @@ msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" msgstr "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" -#: ../app/widgets/gimpactionview.c:338 ../app/widgets/gimpcontrollereditor.c:341 +#: ../app/widgets/gimpactionview.c:338 +#: ../app/widgets/gimpcontrollereditor.c:341 msgid "Action" msgstr "Dejanje" @@ -14276,12 +14391,13 @@ msgid "Aspect ratio" msgstr "Razmerje stranic" -#: ../app/widgets/gimpbrusheditor.c:210 ../app/widgets/gimpbrushfactoryview.c:80 -#: ../app/widgets/gimpgrideditor.c:174 +#: ../app/widgets/gimpbrusheditor.c:210 +#: ../app/widgets/gimpbrushfactoryview.c:80 ../app/widgets/gimpgrideditor.c:174 msgid "Spacing" msgstr "Razmik" -#: ../app/widgets/gimpbrusheditor.c:215 ../app/widgets/gimpbrushfactoryview.c:84 +#: ../app/widgets/gimpbrusheditor.c:215 +#: ../app/widgets/gimpbrushfactoryview.c:84 msgid "Percentage of width of brush" msgstr "Odstotek širine čopiča" @@ -14328,13 +14444,13 @@ msgid "No filter selected" msgstr "Noben filter ni izbran" -#: ../app/widgets/gimpcoloreditor.c:260 +#: ../app/widgets/gimpcoloreditor.c:264 msgid "" -"Hexadecimal color notation as used in HTML and CSS. This entry also accepts CSS " -"color names." +"Hexadecimal color notation as used in HTML and CSS. This entry also accepts " +"CSS color names." msgstr "" -"Šestnajstiški zapis barv, kot je v uporabi v HTML in CSS. To polje sprejme tudi " -"imena barv CSS." +"Šestnajstiški zapis barv, kot je v uporabi v HTML in CSS. To polje sprejme " +"tudi imena barv CSS." #: ../app/widgets/gimpcolorframe.c:511 msgid "Index:" @@ -14596,29 +14712,35 @@ #: ../app/widgets/gimpcontrollerlist.c:583 msgid "" -"Removing this controller from the list of active controllers will permanently " -"delete all event mappings you have configured.\n" +"Removing this controller from the list of active controllers will " +"permanently delete all event mappings you have configured.\n" "\n" -"Selecting \"Disable Controller\" will disable the controller without removing it." +"Selecting \"Disable Controller\" will disable the controller without " +"removing it." msgstr "" "Z izbrisom tega kontrolnika s seznama aktivnih kontrolnikov boste nepovratno " "izbrisali vse preslikave dogodkov, ki ste jih nastavili.\n" "\n" -"Z izbiro \"Onemogoči kontrolnik\" lahko onemogočite kontrolnik, ne da bi ga tudi " -"odstranili." +"Z izbiro \"Onemogoči kontrolnik\" lahko onemogočite kontrolnik, ne da bi ga " +"tudi odstranili." #: ../app/widgets/gimpcontrollerlist.c:635 msgid "Configure Input Controller" msgstr "Prilagodi vhodni kontrolnik ..." -#: ../app/widgets/gimpcontrollermouse.c:70 ../app/widgets/gimpcontrollermouse.c:73 -#: ../app/widgets/gimpcontrollermouse.c:76 ../app/widgets/gimpcontrollermouse.c:79 -#: ../app/widgets/gimpcontrollermouse.c:82 ../app/widgets/gimpcontrollermouse.c:85 -#: ../app/widgets/gimpcontrollermouse.c:88 ../app/widgets/gimpcontrollermouse.c:91 +#: ../app/widgets/gimpcontrollermouse.c:70 +#: ../app/widgets/gimpcontrollermouse.c:73 +#: ../app/widgets/gimpcontrollermouse.c:76 +#: ../app/widgets/gimpcontrollermouse.c:79 +#: ../app/widgets/gimpcontrollermouse.c:82 +#: ../app/widgets/gimpcontrollermouse.c:85 +#: ../app/widgets/gimpcontrollermouse.c:88 +#: ../app/widgets/gimpcontrollermouse.c:91 msgid "Button 8" msgstr "Gumb 8" -#: ../app/widgets/gimpcontrollermouse.c:95 ../app/widgets/gimpcontrollermouse.c:98 +#: ../app/widgets/gimpcontrollermouse.c:95 +#: ../app/widgets/gimpcontrollermouse.c:98 #: ../app/widgets/gimpcontrollermouse.c:101 #: ../app/widgets/gimpcontrollermouse.c:104 #: ../app/widgets/gimpcontrollermouse.c:107 @@ -14669,14 +14791,19 @@ msgid "Mouse Button Events" msgstr "Dogodki gumbov miške" -#: ../app/widgets/gimpcontrollerwheel.c:69 ../app/widgets/gimpcontrollerwheel.c:72 -#: ../app/widgets/gimpcontrollerwheel.c:75 ../app/widgets/gimpcontrollerwheel.c:78 -#: ../app/widgets/gimpcontrollerwheel.c:81 ../app/widgets/gimpcontrollerwheel.c:84 -#: ../app/widgets/gimpcontrollerwheel.c:87 ../app/widgets/gimpcontrollerwheel.c:90 +#: ../app/widgets/gimpcontrollerwheel.c:69 +#: ../app/widgets/gimpcontrollerwheel.c:72 +#: ../app/widgets/gimpcontrollerwheel.c:75 +#: ../app/widgets/gimpcontrollerwheel.c:78 +#: ../app/widgets/gimpcontrollerwheel.c:81 +#: ../app/widgets/gimpcontrollerwheel.c:84 +#: ../app/widgets/gimpcontrollerwheel.c:87 +#: ../app/widgets/gimpcontrollerwheel.c:90 msgid "Scroll Up" msgstr "Drsi navzgor" -#: ../app/widgets/gimpcontrollerwheel.c:94 ../app/widgets/gimpcontrollerwheel.c:97 +#: ../app/widgets/gimpcontrollerwheel.c:94 +#: ../app/widgets/gimpcontrollerwheel.c:97 #: ../app/widgets/gimpcontrollerwheel.c:100 #: ../app/widgets/gimpcontrollerwheel.c:103 #: ../app/widgets/gimpcontrollerwheel.c:106 @@ -14748,7 +14875,8 @@ "The next time this device is plugged, default settings will be used." msgstr "" "Izbrisali boste shranjene nastavitve te naprave.\n" -"Ko jo boste naslednjič priključili napravo, bodo uporabljene privzete nastavitve." +"Ko jo boste naslednjič priključili napravo, bodo uporabljene privzete " +"nastavitve." #: ../app/widgets/gimpdeviceinfoeditor.c:140 #: ../app/widgets/gimpdynamicseditor.c:141 @@ -14871,8 +14999,10 @@ msgstr "Samodejno" #: ../app/widgets/gimpdockwindow.c:395 -msgid "When enabled the dialog automatically follows the image you are working on." -msgstr "Če je vključeno, bodo pogovorna okna samodejno sledila aktivnim slikam." +msgid "" +"When enabled the dialog automatically follows the image you are working on." +msgstr "" +"Če je vključeno, bodo pogovorna okna samodejno sledila aktivnim slikam." #: ../app/widgets/gimpdrawabletreeview.c:122 msgid "Lock pixels" @@ -15079,8 +15209,8 @@ #: ../app/widgets/gimphelp.c:299 msgid "" -"The GIMP help browser plug-in appears to be missing from your installation. You " -"may instead use the web browser for reading the help pages." +"The GIMP help browser plug-in appears to be missing from your installation. " +"You may instead use the web browser for reading the help pages." msgstr "" "Očitno v vaši namestivi manjka vtičnik brskalnika pomoči GIMP. Namesto tega " "lahko strani pomoči prebirate s pomočjo svojega spletnega brskalnika." @@ -15111,8 +15241,8 @@ #: ../app/widgets/gimphelp.c:746 msgid "" -"You may either install the additional help package or change your preferences to " -"use the online version." +"You may either install the additional help package or change your " +"preferences to use the online version." msgstr "" "Namestite lahko dodaten paket pomoči ali pa spremenite nastavitve, da boste " "lahko uporabljali spletno različico." @@ -15155,8 +15285,8 @@ "Replace the current image comment with the default comment set in " "Edit→Preferences→Default Image." msgstr "" -"Zamenjaj trenutni komentar k sliki s privzetim komentarjem, kot je nastavljen v " -"Uredi→Nastavitve→Privzeta slika." +"Zamenjaj trenutni komentar k sliki s privzetim komentarjem, kot je " +"nastavljen v Uredi→Nastavitve→Privzeta slika." #: ../app/widgets/gimpimageprofileview.c:202 msgid "Querying..." @@ -15223,7 +15353,8 @@ msgid "None" msgstr "brez" -#: ../app/widgets/gimpimagepropview.c:464 ../app/widgets/gimptemplateeditor.c:331 +#: ../app/widgets/gimpimagepropview.c:464 +#: ../app/widgets/gimptemplateeditor.c:331 #, c-format msgid "pixels/%s" msgstr "slik. točk/%s" @@ -15254,7 +15385,8 @@ msgstr[2] "Sporočilo ponovljeno %d-krat." msgstr[3] "Sporočilo ponovljeno %d-krat." -#: ../app/widgets/gimppaletteeditor.c:240 ../app/widgets/gimppaletteeditor.c:715 +#: ../app/widgets/gimppaletteeditor.c:240 +#: ../app/widgets/gimppaletteeditor.c:715 msgid "Undefined" msgstr "Nedoločeno" @@ -15430,17 +15562,17 @@ msgid "%d ppi, %s" msgstr "%d ppi, %s" -#: ../app/widgets/gimptextbuffer-serialize.c:344 +#: ../app/widgets/gimptextbuffer-serialize.c:269 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "Lastnost \"%s\" je neveljavna za element <%s> v tem kontekstu" -#: ../app/widgets/gimptextbuffer-serialize.c:416 +#: ../app/widgets/gimptextbuffer-serialize.c:341 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "Najbolj zunanji element v besedilu mora biti in ne <%s>" -#: ../app/widgets/gimptextbuffer.c:1459 +#: ../app/widgets/gimptextbuffer.c:1460 #, c-format msgid "Invalid UTF-8 data in file '%s'." msgstr "Neveljavni podatki UTF-8 v datoteki '%s'." @@ -15507,12 +15639,12 @@ msgid "No selection" msgstr "Nič ni izbrano" -#: ../app/widgets/gimpthumbbox.c:596 ../app/widgets/gimpthumbbox.c:617 +#: ../app/widgets/gimpthumbbox.c:612 ../app/widgets/gimpthumbbox.c:633 #, c-format msgid "Thumbnail %d of %d" msgstr "Sličica za predogled %d od %d" -#: ../app/widgets/gimpthumbbox.c:730 ../app/widgets/gimpthumbbox.c:740 +#: ../app/widgets/gimpthumbbox.c:746 ../app/widgets/gimpthumbbox.c:756 msgid "Creating preview..." msgstr "Ustvarjanje predogleda ..." @@ -15830,11 +15962,11 @@ #: ../app/xcf/xcf-load.c:403 msgid "" -"This XCF file is corrupt! I could not even salvage any partial image data from " -"it." +"This XCF file is corrupt! I could not even salvage any partial image data " +"from it." msgstr "" -"Datoteka XCF je okvarjena! Iz nje ni bilo mogoče rešiti niti najmanjšega dela " -"podatkov." +"Datoteka XCF je okvarjena! Iz nje ni bilo mogoče rešiti niti najmanjšega " +"dela podatkov." #: ../app/xcf/xcf-load.c:477 msgid "" @@ -15896,35 +16028,37 @@ #: ../desktop/gimp.appdata.xml.in.h:1 msgid "" "GIMP is an acronym for GNU Image Manipulation Program. It is a freely " -"distributed program for such tasks as photo retouching, image composition and " -"image authoring." +"distributed program for such tasks as photo retouching, image composition " +"and image authoring." msgstr "" -"GIMP je okrajšava polnega angleškega imena, GNU Image Manipulation Program. Je " -"prosto dostopen program, namenjen retuši fotografij, tvorbi in avtorstvu slik." +"GIMP je okrajšava polnega angleškega imena, GNU Image Manipulation Program. " +"Je prosto dostopen program, namenjen retuši fotografij, tvorbi in avtorstvu " +"slik." #: ../desktop/gimp.appdata.xml.in.h:2 msgid "" -"It has many capabilities. It can be used as a simple paint program, an expert " -"quality photo retouching program, an online batch processing system, a mass " -"production image renderer, an image format converter, etc." +"It has many capabilities. It can be used as a simple paint program, an " +"expert quality photo retouching program, an online batch processing system, " +"a mass production image renderer, an image format converter, etc." msgstr "" "Ima veliko zmogljivih funkcij. Uporabite ga lahko kot enostavni program za " -"risanje, kot strokovno kakovosten program za retušo fotografij, spletni sistem " -"za paketno obdelavo, masovni upodobljevalnik slik, pretvornik med slikovnimi " -"zapisi itn." +"risanje, kot strokovno kakovosten program za retušo fotografij, spletni " +"sistem za paketno obdelavo, masovni upodobljevalnik slik, pretvornik med " +"slikovnimi zapisi itn." #: ../desktop/gimp.appdata.xml.in.h:3 msgid "" -"GIMP is expandable and extensible. It is designed to be augmented with plug-ins " -"and extensions to do just about anything. The advanced scripting interface " -"allows everything from the simplest task to the most complex image manipulation " -"procedures to be easily scripted. GIMP is available for Linux, Microsoft Windows " -"and OS X." -msgstr "" -"GIMP je razširljiv. Zasnovan je tako, da ga je mogoče dopolnjevati z vtičniki in " -"razširitvami, da zmore pravzaprav vse. Napredni vmesnik skriptanja omogoča " -"skriptanje vsega, od najenostavnejših nalog do najkompleksnejših procedur " -"obdelave slik. GIMP je na voljo za sisteme GNU/Linux, Microsoft Windows in OS X." +"GIMP is expandable and extensible. It is designed to be augmented with plug-" +"ins and extensions to do just about anything. The advanced scripting " +"interface allows everything from the simplest task to the most complex image " +"manipulation procedures to be easily scripted. GIMP is available for Linux, " +"Microsoft Windows and OS X." +msgstr "" +"GIMP je razširljiv. Zasnovan je tako, da ga je mogoče dopolnjevati z " +"vtičniki in razširitvami, da zmore pravzaprav vse. Napredni vmesnik " +"skriptanja omogoča skriptanje vsega, od najenostavnejših nalog do " +"najkompleksnejših procedur obdelave slik. GIMP je na voljo za sisteme GNU/" +"Linux, Microsoft Windows in OS X." #: ../desktop/gimp.desktop.in.in.h:2 msgid "Image Editor" diff -Nru gimp-2.8.18/po/sr@latin.po gimp-2.8.20/po/sr@latin.po --- gimp-2.8.18/po/sr@latin.po 2015-08-20 22:57:44.000000000 +0000 +++ gimp-2.8.20/po/sr@latin.po 2017-01-28 19:08:50.000000000 +0000 @@ -15,7 +15,7 @@ "PO-Revision-Date: 2014-04-03 21:19+0200\n" "Last-Translator: Miroslav Nikolić \n" "Language-Team: Serbian \n" -"Language: sr\n" +"Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po/sv.po gimp-2.8.20/po/sv.po --- gimp-2.8.18/po/sv.po 2016-06-13 17:17:27.000000000 +0000 +++ gimp-2.8.20/po/sv.po 2017-01-28 19:08:50.000000000 +0000 @@ -11,9 +11,9 @@ msgstr "" "Project-Id-Version: gimp\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-06-11 08:50+0000\n" -"PO-Revision-Date: 2016-06-11 10:54+0200\n" +"product=gimp&keywords=I18N+L10N&component=Internationalisation\n" +"POT-Creation-Date: 2016-09-15 07:19+0000\n" +"PO-Revision-Date: 2016-09-19 11:52+0200\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -21,7 +21,7 @@ "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.8.8\n" +"X-Generator: Poedit 1.8.9\n" #: ../app/about.h:23 msgid "GIMP" @@ -269,7 +269,7 @@ #. initialize the list of gimp brushes #: ../app/actions/actions.c:112 ../app/core/gimp.c:951 -#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2783 msgid "Brushes" msgstr "Penslar" @@ -316,7 +316,7 @@ #. Document History #: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:329 -#: ../app/dialogs/preferences-dialog.c:1577 +#: ../app/dialogs/preferences-dialog.c:1612 msgid "Document History" msgstr "Dokumenthistorik" @@ -347,7 +347,7 @@ msgstr "Fil" #: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:325 -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2803 msgid "Fonts" msgstr "Typsnitt" @@ -358,12 +358,12 @@ #. initialize the list of gimp gradients #: ../app/actions/actions.c:172 ../app/core/gimp.c:971 -#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2799 msgid "Gradients" msgstr "Gradienter" #: ../app/actions/actions.c:175 ../app/core/gimp.c:983 -#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2770 +#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2807 msgid "Tool Presets" msgstr "Verktygsförval" @@ -397,23 +397,23 @@ #. initialize the list of gimp palettes #: ../app/actions/actions.c:196 ../app/core/gimp.c:966 -#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2758 +#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2795 msgid "Palettes" msgstr "Paletter" #. initialize the list of gimp patterns #: ../app/actions/actions.c:199 ../app/core/gimp.c:961 -#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2791 msgid "Patterns" msgstr "Mönster" -#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2774 +#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2811 msgid "Plug-Ins" msgstr "Insticksmoduler" #. Quick Mask Color #: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:386 -#: ../app/dialogs/preferences-dialog.c:2032 +#: ../app/dialogs/preferences-dialog.c:2069 msgid "Quick Mask" msgstr "Snabbmask" @@ -440,7 +440,7 @@ msgstr "Textredigerare" #: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:298 -#: ../app/dialogs/preferences-dialog.c:1861 ../app/gui/gui.c:441 +#: ../app/dialogs/preferences-dialog.c:1898 ../app/gui/gui.c:441 msgid "Tool Options" msgstr "Verktygsalternativ" @@ -1357,7 +1357,7 @@ msgstr "_Om" #: ../app/actions/dialogs-actions.c:333 -#: ../app/dialogs/preferences-dialog.c:1951 ../app/widgets/gimptoolbox.c:539 +#: ../app/dialogs/preferences-dialog.c:1988 ../app/widgets/gimptoolbox.c:539 msgid "Toolbox" msgstr "Verktygslåda" @@ -3245,7 +3245,7 @@ #. Scaling #: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 -#: ../app/dialogs/preferences-dialog.c:1906 +#: ../app/dialogs/preferences-dialog.c:1943 #: ../app/pdb/drawable-transform-cmds.c:783 #: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 #: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524 @@ -7434,7 +7434,7 @@ msgstr "Parasiter" #. initialize the list of gimp dynamics -#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2750 +#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2787 #: ../app/tools/gimppaintoptions-gui.c:201 msgid "Dynamics" msgstr "Dynamik" @@ -7445,7 +7445,7 @@ msgstr "Typsnitt (det här kan ta en stund)" #. initialize the module list -#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2782 +#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2819 msgid "Modules" msgstr "Moduler" @@ -8364,7 +8364,7 @@ msgid "Remove Path" msgstr "Ta bort bana" -#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1715 +#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1750 msgid "Folder" msgstr "Mapp" @@ -9201,7 +9201,7 @@ msgstr "Skapa en ny bild" #: ../app/dialogs/image-new-dialog.c:135 -#: ../app/dialogs/preferences-dialog.c:2016 +#: ../app/dialogs/preferences-dialog.c:2053 msgid "_Template:" msgstr "_Mall:" @@ -9434,7 +9434,7 @@ msgstr "Välj källa" #: ../app/dialogs/palette-import-dialog.c:214 -#: ../app/dialogs/preferences-dialog.c:1930 +#: ../app/dialogs/preferences-dialog.c:1967 msgid "_Gradient" msgstr "_Gradient" @@ -9493,19 +9493,19 @@ msgid "The selected source contains no colors." msgstr "Den valda källan innehåller inga färger." -#: ../app/dialogs/preferences-dialog.c:268 +#: ../app/dialogs/preferences-dialog.c:266 msgid "Reset All Preferences" msgstr "Återställ alla inställningar" -#: ../app/dialogs/preferences-dialog.c:286 +#: ../app/dialogs/preferences-dialog.c:284 msgid "Do you really want to reset all preferences to default values?" msgstr "Vill du verkligen återställa alla inställningar till standardvärden?" -#: ../app/dialogs/preferences-dialog.c:356 +#: ../app/dialogs/preferences-dialog.c:362 msgid "You will have to restart GIMP for the following changes to take effect:" msgstr "Du måste starta om GIMP för att följande ändringar ska ha effekt:" -#: ../app/dialogs/preferences-dialog.c:538 +#: ../app/dialogs/preferences-dialog.c:544 msgid "" "Your keyboard shortcuts will be reset to default values the next time you " "start GIMP." @@ -9513,15 +9513,15 @@ "Dina tangentbordsgenvägar kommer återställas till standardvärden nästa gång " "du startar GIMP." -#: ../app/dialogs/preferences-dialog.c:549 +#: ../app/dialogs/preferences-dialog.c:555 msgid "Remove all Keyboard Shortcuts" msgstr "Ta bort alla tangentbordsgenvägar" -#: ../app/dialogs/preferences-dialog.c:571 +#: ../app/dialogs/preferences-dialog.c:577 msgid "Do you really want to remove all keyboard shortcuts from all menus?" msgstr "Vill du verkligen ta bort alla tangentbordsgenvägar från alla menyer?" -#: ../app/dialogs/preferences-dialog.c:612 +#: ../app/dialogs/preferences-dialog.c:618 msgid "" "Your window setup will be reset to default values the next time you start " "GIMP." @@ -9529,7 +9529,7 @@ "Din fönsteruppställning kommer återställas till standardvärden nästa gång du " "startar GIMP." -#: ../app/dialogs/preferences-dialog.c:647 +#: ../app/dialogs/preferences-dialog.c:653 msgid "" "Your input device settings will be reset to default values the next time you " "start GIMP." @@ -9537,7 +9537,7 @@ "Dina inställningar för inmatningsenheter kommer återställas till " "standardvärden nästa gång du startar GIMP." -#: ../app/dialogs/preferences-dialog.c:682 +#: ../app/dialogs/preferences-dialog.c:688 msgid "" "Your tool options will be reset to default values the next time you start " "GIMP." @@ -9545,753 +9545,765 @@ "Dina verktygsalternativ kommer att återställas till standardvärden nästa " "gång du startar GIMP." -#: ../app/dialogs/preferences-dialog.c:1268 +#: ../app/dialogs/preferences-dialog.c:1303 msgid "Show _menubar" msgstr "Visa _menyrad" -#: ../app/dialogs/preferences-dialog.c:1272 +#: ../app/dialogs/preferences-dialog.c:1307 msgid "Show _rulers" msgstr "Visa _linjaler" -#: ../app/dialogs/preferences-dialog.c:1275 +#: ../app/dialogs/preferences-dialog.c:1310 msgid "Show scroll_bars" msgstr "Visa rullnings_lister" -#: ../app/dialogs/preferences-dialog.c:1278 +#: ../app/dialogs/preferences-dialog.c:1313 msgid "Show s_tatusbar" msgstr "Visa s_tatusrad" -#: ../app/dialogs/preferences-dialog.c:1286 +#: ../app/dialogs/preferences-dialog.c:1321 msgid "Show s_election" msgstr "Visa m_arkering" -#: ../app/dialogs/preferences-dialog.c:1289 +#: ../app/dialogs/preferences-dialog.c:1324 msgid "Show _layer boundary" msgstr "Visa _lagergräns" -#: ../app/dialogs/preferences-dialog.c:1292 +#: ../app/dialogs/preferences-dialog.c:1327 msgid "Show _guides" msgstr "Visa _hjälplinjer" -#: ../app/dialogs/preferences-dialog.c:1295 +#: ../app/dialogs/preferences-dialog.c:1330 msgid "Show gri_d" msgstr "Visa r_utnät" -#: ../app/dialogs/preferences-dialog.c:1301 +#: ../app/dialogs/preferences-dialog.c:1336 msgid "Canvas _padding mode:" msgstr "_Utfyllnadsläge för rityta:" -#: ../app/dialogs/preferences-dialog.c:1306 +#: ../app/dialogs/preferences-dialog.c:1341 msgid "Custom p_adding color:" msgstr "Anpassad u_tfyllnadsfärg:" -#: ../app/dialogs/preferences-dialog.c:1307 +#: ../app/dialogs/preferences-dialog.c:1342 msgid "Select Custom Canvas Padding Color" msgstr "Välj anpassad utfyllnadsfärg för rityta" -#: ../app/dialogs/preferences-dialog.c:1405 +#: ../app/dialogs/preferences-dialog.c:1440 msgid "Preferences" msgstr "Inställningar" -#: ../app/dialogs/preferences-dialog.c:1518 -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:1553 +#: ../app/dialogs/preferences-dialog.c:2827 msgid "Environment" msgstr "Miljö" -#: ../app/dialogs/preferences-dialog.c:1532 +#: ../app/dialogs/preferences-dialog.c:1567 msgid "Resource Consumption" msgstr "Resursanvändning" -#: ../app/dialogs/preferences-dialog.c:1542 +#: ../app/dialogs/preferences-dialog.c:1577 msgid "Minimal number of _undo levels:" msgstr "Minsta antal _ångringsnivåer:" -#: ../app/dialogs/preferences-dialog.c:1545 +#: ../app/dialogs/preferences-dialog.c:1580 msgid "Maximum undo _memory:" msgstr "Maximalt ångrings_minne:" -#: ../app/dialogs/preferences-dialog.c:1548 +#: ../app/dialogs/preferences-dialog.c:1583 msgid "Tile cache _size:" msgstr "Bildblockscache_storlek:" -#: ../app/dialogs/preferences-dialog.c:1551 +#: ../app/dialogs/preferences-dialog.c:1586 msgid "Maximum _new image size:" msgstr "Maximal _ny bildstorlek:" -#: ../app/dialogs/preferences-dialog.c:1556 +#: ../app/dialogs/preferences-dialog.c:1591 msgid "Number of _processors to use:" msgstr "Antalet _processorer att använda:" #. Image Thumbnails -#: ../app/dialogs/preferences-dialog.c:1561 +#: ../app/dialogs/preferences-dialog.c:1596 msgid "Image Thumbnails" msgstr "Miniatyrbilder" -#: ../app/dialogs/preferences-dialog.c:1566 +#: ../app/dialogs/preferences-dialog.c:1601 msgid "Size of _thumbnails:" msgstr "Storlek på _miniatyrbilder:" -#: ../app/dialogs/preferences-dialog.c:1570 +#: ../app/dialogs/preferences-dialog.c:1605 msgid "Maximum _filesize for thumbnailing:" msgstr "Maximal _filstorlek för miniatyrbilder:" -#: ../app/dialogs/preferences-dialog.c:1580 +#: ../app/dialogs/preferences-dialog.c:1615 msgid "Keep record of used files in the Recent Documents list" msgstr "Håll information om använda filer i Senaste dokument-listan" -#: ../app/dialogs/preferences-dialog.c:1589 +#: ../app/dialogs/preferences-dialog.c:1624 msgid "User Interface" msgstr "Användargränssnitt" -#: ../app/dialogs/preferences-dialog.c:1592 +#: ../app/dialogs/preferences-dialog.c:1627 msgid "Interface" msgstr "Gränssnitt" -#: ../app/dialogs/preferences-dialog.c:1602 +#: ../app/dialogs/preferences-dialog.c:1637 msgid "Language" msgstr "Språk" #. Previews -#: ../app/dialogs/preferences-dialog.c:1608 +#: ../app/dialogs/preferences-dialog.c:1643 msgid "Previews" msgstr "Förhandsvisningar" -#: ../app/dialogs/preferences-dialog.c:1611 +#: ../app/dialogs/preferences-dialog.c:1646 msgid "_Enable layer & channel previews" msgstr "_Aktivera förhandsvisning av lager och kanaler" -#: ../app/dialogs/preferences-dialog.c:1617 +#: ../app/dialogs/preferences-dialog.c:1652 msgid "_Default layer & channel preview size:" msgstr "Standardstorlek för förhandsvisning av _lager och kanaler:" -#: ../app/dialogs/preferences-dialog.c:1620 +#: ../app/dialogs/preferences-dialog.c:1655 msgid "Na_vigation preview size:" msgstr "Förhandsvisningsstorlek för _navigering:" #. Keyboard Shortcuts -#: ../app/dialogs/preferences-dialog.c:1624 +#: ../app/dialogs/preferences-dialog.c:1659 msgid "Keyboard Shortcuts" msgstr "Tangentbordsgenvägar" -#: ../app/dialogs/preferences-dialog.c:1628 +#: ../app/dialogs/preferences-dialog.c:1663 msgid "_Use dynamic keyboard shortcuts" msgstr "Använd dynamiska _tangentbordsgenvägar" -#: ../app/dialogs/preferences-dialog.c:1632 +#: ../app/dialogs/preferences-dialog.c:1667 msgid "Configure _Keyboard Shortcuts..." msgstr "Konfigurera _tangentbordsgenvägar..." -#: ../app/dialogs/preferences-dialog.c:1639 +#: ../app/dialogs/preferences-dialog.c:1674 msgid "_Save keyboard shortcuts on exit" msgstr "_Spara tangentbordsgenvägar vid avslut" -#: ../app/dialogs/preferences-dialog.c:1643 +#: ../app/dialogs/preferences-dialog.c:1678 msgid "Save Keyboard Shortcuts _Now" msgstr "Spara tangentbordsgenvägar _nu" -#: ../app/dialogs/preferences-dialog.c:1650 +#: ../app/dialogs/preferences-dialog.c:1685 msgid "_Reset Keyboard Shortcuts to Default Values" msgstr "_Återställ tangentbordsgenvägar till standardvärden" -#: ../app/dialogs/preferences-dialog.c:1659 +#: ../app/dialogs/preferences-dialog.c:1694 msgid "Remove _All Keyboard Shortcuts" msgstr "Ta bort _alla tangentbordsgenvägar" -#: ../app/dialogs/preferences-dialog.c:1671 -#: ../app/dialogs/preferences-dialog.c:1710 +#: ../app/dialogs/preferences-dialog.c:1706 +#: ../app/dialogs/preferences-dialog.c:1745 msgid "Theme" msgstr "Tema" -#: ../app/dialogs/preferences-dialog.c:1680 +#: ../app/dialogs/preferences-dialog.c:1715 msgid "Select Theme" msgstr "Välj tema" -#: ../app/dialogs/preferences-dialog.c:1762 +#: ../app/dialogs/preferences-dialog.c:1797 msgid "Reload C_urrent Theme" msgstr "Läs om a_ktuellt tema" -#: ../app/dialogs/preferences-dialog.c:1774 +#: ../app/dialogs/preferences-dialog.c:1809 msgid "Help System" msgstr "Hjälpsystem" #. General -#: ../app/dialogs/preferences-dialog.c:1786 -#: ../app/dialogs/preferences-dialog.c:1873 -#: ../app/dialogs/preferences-dialog.c:2086 +#: ../app/dialogs/preferences-dialog.c:1821 +#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:2123 #: ../app/widgets/gimpcontrollereditor.c:185 msgid "General" msgstr "Generellt" -#: ../app/dialogs/preferences-dialog.c:1789 +#: ../app/dialogs/preferences-dialog.c:1824 msgid "Show _tooltips" msgstr "Visa verktygs_tips" -#: ../app/dialogs/preferences-dialog.c:1792 +#: ../app/dialogs/preferences-dialog.c:1827 msgid "Show help _buttons" msgstr "Visa hjälp_knappar" -#: ../app/dialogs/preferences-dialog.c:1805 +#: ../app/dialogs/preferences-dialog.c:1832 msgid "Use the online version" msgstr "Använd versionen på nätet" -#: ../app/dialogs/preferences-dialog.c:1806 +#: ../app/dialogs/preferences-dialog.c:1833 msgid "Use a locally installed copy" msgstr "Använd en lokalt installerad kopia" -#: ../app/dialogs/preferences-dialog.c:1807 +#: ../app/dialogs/preferences-dialog.c:1834 msgid "User manual:" msgstr "Användarhandbok:" -#: ../app/dialogs/preferences-dialog.c:1814 +#: ../app/dialogs/preferences-dialog.c:1841 msgid "There's a local installation of the user manual." msgstr "Det finns en lokal installation av användarhandboken." -#: ../app/dialogs/preferences-dialog.c:1819 +#: ../app/dialogs/preferences-dialog.c:1847 msgid "The user manual is not installed locally." msgstr "Användarhandboken är inte lokalt installerad." -#: ../app/dialogs/preferences-dialog.c:1844 +#. If there is no webkit available, assume we are on a platform +#. * that doesn't use the help browser, so don't bother showing +#. * the combo. +#. +#: ../app/dialogs/preferences-dialog.c:1860 msgid "Help Browser" msgstr "Hjälpläsare" -#: ../app/dialogs/preferences-dialog.c:1848 +#: ../app/dialogs/preferences-dialog.c:1867 msgid "H_elp browser to use:" msgstr "Hjälp_läsare att använda:" -#: ../app/dialogs/preferences-dialog.c:1876 +#: ../app/dialogs/preferences-dialog.c:1873 +msgid "" +"The GIMP help browser doesn't seem to be installed. Using the web browser " +"instead." +msgstr "" +"GIMP:s hjälpläsare verkar inte vara installerad. Använder webbläsaren " +"istället." + +#: ../app/dialogs/preferences-dialog.c:1913 msgid "_Save tool options on exit" msgstr "_Spara verktygsalternativ vid avslut" -#: ../app/dialogs/preferences-dialog.c:1880 +#: ../app/dialogs/preferences-dialog.c:1917 msgid "Save Tool Options _Now" msgstr "Spara verktygsalternativ _nu" -#: ../app/dialogs/preferences-dialog.c:1887 +#: ../app/dialogs/preferences-dialog.c:1924 msgid "_Reset Saved Tool Options to Default Values" msgstr "_Återställ sparade verktygsalternativ till standardvärden" #. Snapping Distance -#: ../app/dialogs/preferences-dialog.c:1897 +#: ../app/dialogs/preferences-dialog.c:1934 msgid "Guide & Grid Snapping" msgstr "Fäst mot hjälplinjer och rutnät" -#: ../app/dialogs/preferences-dialog.c:1902 +#: ../app/dialogs/preferences-dialog.c:1939 msgid "_Snap distance:" msgstr "_Fästningsavstånd:" -#: ../app/dialogs/preferences-dialog.c:1910 +#: ../app/dialogs/preferences-dialog.c:1947 msgid "Default _interpolation:" msgstr "Standard_interpolation:" #. Global Brush, Pattern, ... -#: ../app/dialogs/preferences-dialog.c:1917 +#: ../app/dialogs/preferences-dialog.c:1954 msgid "Paint Options Shared Between Tools" msgstr "Målningsalternativ som delas av verktyg" -#: ../app/dialogs/preferences-dialog.c:1921 +#: ../app/dialogs/preferences-dialog.c:1958 msgid "_Brush" msgstr "_Pensel" -#: ../app/dialogs/preferences-dialog.c:1924 +#: ../app/dialogs/preferences-dialog.c:1961 msgid "_Dynamics" msgstr "_Dynamik" -#: ../app/dialogs/preferences-dialog.c:1927 +#: ../app/dialogs/preferences-dialog.c:1964 msgid "_Pattern" msgstr "_Mönster" #. Move Tool -#: ../app/dialogs/preferences-dialog.c:1934 +#: ../app/dialogs/preferences-dialog.c:1971 msgid "Move Tool" msgstr "Flyttningsverktyg" -#: ../app/dialogs/preferences-dialog.c:1938 +#: ../app/dialogs/preferences-dialog.c:1975 msgid "Set layer or path as active" msgstr "Ställ in lager eller bana som aktiv" #. Appearance -#: ../app/dialogs/preferences-dialog.c:1963 -#: ../app/dialogs/preferences-dialog.c:2162 ../app/widgets/gimpgrideditor.c:134 +#: ../app/dialogs/preferences-dialog.c:2000 +#: ../app/dialogs/preferences-dialog.c:2199 ../app/widgets/gimpgrideditor.c:134 msgid "Appearance" msgstr "Utseende" -#: ../app/dialogs/preferences-dialog.c:1967 +#: ../app/dialogs/preferences-dialog.c:2004 msgid "Show _foreground & background color" msgstr "Visa _förgrunds- och bakgrundsfärg" -#: ../app/dialogs/preferences-dialog.c:1971 +#: ../app/dialogs/preferences-dialog.c:2008 msgid "Show active _brush, pattern & gradient" msgstr "Visa aktiva _penslar, mönster och gradient" -#: ../app/dialogs/preferences-dialog.c:1975 +#: ../app/dialogs/preferences-dialog.c:2012 msgid "Show active _image" msgstr "Visa aktiv _bild" #. Tool Editor -#: ../app/dialogs/preferences-dialog.c:1983 +#: ../app/dialogs/preferences-dialog.c:2020 msgid "Tools configuration" msgstr "Verktygskonfiguration" -#: ../app/dialogs/preferences-dialog.c:1998 +#: ../app/dialogs/preferences-dialog.c:2035 msgid "Default New Image" msgstr "Standard ny bild" -#: ../app/dialogs/preferences-dialog.c:2001 +#: ../app/dialogs/preferences-dialog.c:2038 msgid "Default Image" msgstr "Standardbild" -#: ../app/dialogs/preferences-dialog.c:2035 +#: ../app/dialogs/preferences-dialog.c:2072 msgid "Set the default Quick Mask color" msgstr "Ange standardsnabbmaskfärg" -#: ../app/dialogs/preferences-dialog.c:2041 +#: ../app/dialogs/preferences-dialog.c:2078 msgid "Quick Mask color:" msgstr "Snabbmaskfärg:" -#: ../app/dialogs/preferences-dialog.c:2051 +#: ../app/dialogs/preferences-dialog.c:2088 msgid "Default Image Grid" msgstr "Standard bildrutnät" -#: ../app/dialogs/preferences-dialog.c:2054 +#: ../app/dialogs/preferences-dialog.c:2091 msgid "Default Grid" msgstr "Standardrutnät" -#: ../app/dialogs/preferences-dialog.c:2074 +#: ../app/dialogs/preferences-dialog.c:2111 msgid "Image Windows" msgstr "Bildfönster" -#: ../app/dialogs/preferences-dialog.c:2089 +#: ../app/dialogs/preferences-dialog.c:2126 msgid "Use \"_Dot for dot\" by default" msgstr "Använd \"_punkt för punkt\" som standard" -#: ../app/dialogs/preferences-dialog.c:2095 +#: ../app/dialogs/preferences-dialog.c:2132 msgid "Marching _ants speed:" msgstr "Vandrande _myrors hastighet:" #. Zoom & Resize Behavior -#: ../app/dialogs/preferences-dialog.c:2099 +#: ../app/dialogs/preferences-dialog.c:2136 msgid "Zoom & Resize Behavior" msgstr "Zoom- och storleksändringsbeteende" -#: ../app/dialogs/preferences-dialog.c:2103 +#: ../app/dialogs/preferences-dialog.c:2140 msgid "Resize window on _zoom" msgstr "Ändra storlek på fönstret vid _zoom" -#: ../app/dialogs/preferences-dialog.c:2106 +#: ../app/dialogs/preferences-dialog.c:2143 msgid "Resize window on image _size change" msgstr "Ändra storlek på fönstret vid ändring av bild_storlek" -#: ../app/dialogs/preferences-dialog.c:2112 +#: ../app/dialogs/preferences-dialog.c:2149 msgid "Fit to window" msgstr "Passa till fönster" -#: ../app/dialogs/preferences-dialog.c:2114 +#: ../app/dialogs/preferences-dialog.c:2151 msgid "Initial zoom _ratio:" msgstr "Initial zoom_faktor:" #. Space Bar -#: ../app/dialogs/preferences-dialog.c:2118 +#: ../app/dialogs/preferences-dialog.c:2155 msgid "Space Bar" msgstr "Blanksteg" -#: ../app/dialogs/preferences-dialog.c:2124 +#: ../app/dialogs/preferences-dialog.c:2161 msgid "_While space bar is pressed:" msgstr "_När blankstegstangenten trycks ned:" #. Mouse Pointers -#: ../app/dialogs/preferences-dialog.c:2128 +#: ../app/dialogs/preferences-dialog.c:2165 msgid "Mouse Pointers" msgstr "Muspekare" -#: ../app/dialogs/preferences-dialog.c:2132 +#: ../app/dialogs/preferences-dialog.c:2169 msgid "Show _brush outline" msgstr "Visa _penselkontur" -#: ../app/dialogs/preferences-dialog.c:2135 +#: ../app/dialogs/preferences-dialog.c:2172 msgid "Show pointer for paint _tools" msgstr "Visa pekare för målar_verktyg" -#: ../app/dialogs/preferences-dialog.c:2141 +#: ../app/dialogs/preferences-dialog.c:2178 msgid "Pointer _mode:" msgstr "Pekar_läge:" -#: ../app/dialogs/preferences-dialog.c:2144 +#: ../app/dialogs/preferences-dialog.c:2181 msgid "Pointer re_ndering:" msgstr "Pekar_rendering:" -#: ../app/dialogs/preferences-dialog.c:2147 +#: ../app/dialogs/preferences-dialog.c:2184 msgid "Pointer _handedness:" msgstr "Mus_hand:" -#: ../app/dialogs/preferences-dialog.c:2159 +#: ../app/dialogs/preferences-dialog.c:2196 msgid "Image Window Appearance" msgstr "Bildfönsterutseende" -#: ../app/dialogs/preferences-dialog.c:2170 +#: ../app/dialogs/preferences-dialog.c:2207 msgid "Default Appearance in Normal Mode" msgstr "Standardutseende i normalt läge" -#: ../app/dialogs/preferences-dialog.c:2175 +#: ../app/dialogs/preferences-dialog.c:2212 msgid "Default Appearance in Fullscreen Mode" msgstr "Standardutseende i helskärmsläge" -#: ../app/dialogs/preferences-dialog.c:2184 +#: ../app/dialogs/preferences-dialog.c:2221 msgid "Image Title & Statusbar Format" msgstr "Bildtitel och statusradsformat" -#: ../app/dialogs/preferences-dialog.c:2187 +#: ../app/dialogs/preferences-dialog.c:2224 msgid "Title & Status" msgstr "Titel och status" -#: ../app/dialogs/preferences-dialog.c:2205 +#: ../app/dialogs/preferences-dialog.c:2242 msgid "Current format" msgstr "Aktuellt format" -#: ../app/dialogs/preferences-dialog.c:2206 +#: ../app/dialogs/preferences-dialog.c:2243 msgid "Default format" msgstr "Standardformat" -#: ../app/dialogs/preferences-dialog.c:2207 +#: ../app/dialogs/preferences-dialog.c:2244 msgid "Show zoom percentage" msgstr "Visa zoomprocent" -#: ../app/dialogs/preferences-dialog.c:2208 +#: ../app/dialogs/preferences-dialog.c:2245 msgid "Show zoom ratio" msgstr "Visa zoomfaktor" -#: ../app/dialogs/preferences-dialog.c:2209 +#: ../app/dialogs/preferences-dialog.c:2246 msgid "Show image size" msgstr "Visa bildstorlek" -#: ../app/dialogs/preferences-dialog.c:2222 +#: ../app/dialogs/preferences-dialog.c:2259 msgid "Image Title Format" msgstr "Bildtitelformat" -#: ../app/dialogs/preferences-dialog.c:2224 +#: ../app/dialogs/preferences-dialog.c:2261 msgid "Image Statusbar Format" msgstr "Bildstatusradsformat" -#: ../app/dialogs/preferences-dialog.c:2309 +#: ../app/dialogs/preferences-dialog.c:2346 msgid "Display" msgstr "Visning" #. Transparency -#: ../app/dialogs/preferences-dialog.c:2321 +#: ../app/dialogs/preferences-dialog.c:2358 msgid "Transparency" msgstr "Transparens" -#: ../app/dialogs/preferences-dialog.c:2325 +#: ../app/dialogs/preferences-dialog.c:2362 msgid "_Check style:" msgstr "_Rutstil:" -#: ../app/dialogs/preferences-dialog.c:2328 +#: ../app/dialogs/preferences-dialog.c:2365 msgid "Check _size:" msgstr "Rut_storlek:" -#: ../app/dialogs/preferences-dialog.c:2331 +#: ../app/dialogs/preferences-dialog.c:2368 msgid "Monitor Resolution" msgstr "Bildskärmsupplösning" #. Pixels -#: ../app/dialogs/preferences-dialog.c:2335 ../app/display/gimpcursorview.c:208 +#: ../app/dialogs/preferences-dialog.c:2372 ../app/display/gimpcursorview.c:208 #: ../app/widgets/gimpgrideditor.c:199 ../app/widgets/gimpgrideditor.c:231 msgid "Pixels" msgstr "Bildpunkter" -#: ../app/dialogs/preferences-dialog.c:2353 +#: ../app/dialogs/preferences-dialog.c:2390 msgid "Horizontal" msgstr "Horisontell" -#: ../app/dialogs/preferences-dialog.c:2355 +#: ../app/dialogs/preferences-dialog.c:2392 msgid "Vertical" msgstr "Vertikal" -#: ../app/dialogs/preferences-dialog.c:2357 +#: ../app/dialogs/preferences-dialog.c:2394 #: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "punkter/tum" -#: ../app/dialogs/preferences-dialog.c:2373 +#: ../app/dialogs/preferences-dialog.c:2410 #, c-format msgid "_Detect automatically (currently %d × %d ppi)" msgstr "_Identifiera automatiskt (för tillfället %d × %d punkter/tum)" -#: ../app/dialogs/preferences-dialog.c:2391 +#: ../app/dialogs/preferences-dialog.c:2428 msgid "_Enter manually" msgstr "Ange _manuellt" -#: ../app/dialogs/preferences-dialog.c:2406 +#: ../app/dialogs/preferences-dialog.c:2443 msgid "C_alibrate..." msgstr "K_alibrera..." -#: ../app/dialogs/preferences-dialog.c:2434 +#: ../app/dialogs/preferences-dialog.c:2471 msgid "Color Management" msgstr "Färghantering" -#: ../app/dialogs/preferences-dialog.c:2454 +#: ../app/dialogs/preferences-dialog.c:2491 msgid "_RGB profile:" msgstr "_RGB-profil:" -#: ../app/dialogs/preferences-dialog.c:2455 +#: ../app/dialogs/preferences-dialog.c:2492 msgid "Select RGB Color Profile" msgstr "Välj RGB-färgprofil" -#: ../app/dialogs/preferences-dialog.c:2456 +#: ../app/dialogs/preferences-dialog.c:2493 msgid "_CMYK profile:" msgstr "_CMYK-profil:" -#: ../app/dialogs/preferences-dialog.c:2457 +#: ../app/dialogs/preferences-dialog.c:2494 msgid "Select CMYK Color Profile" msgstr "Välj CMYK-färgprofil" -#: ../app/dialogs/preferences-dialog.c:2458 +#: ../app/dialogs/preferences-dialog.c:2495 msgid "_Monitor profile:" msgstr "_Skärmprofil:" -#: ../app/dialogs/preferences-dialog.c:2459 +#: ../app/dialogs/preferences-dialog.c:2496 msgid "Select Monitor Color Profile" msgstr "Välj färgprofil för skärm" -#: ../app/dialogs/preferences-dialog.c:2460 +#: ../app/dialogs/preferences-dialog.c:2497 msgid "_Print simulation profile:" msgstr "_Profil för utskriftssimulering:" -#: ../app/dialogs/preferences-dialog.c:2461 +#: ../app/dialogs/preferences-dialog.c:2498 msgid "Select Printer Color Profile" msgstr "Välj färgprofil för skrivare" -#: ../app/dialogs/preferences-dialog.c:2472 +#: ../app/dialogs/preferences-dialog.c:2509 msgid "_Mode of operation:" msgstr "_Åtgärdsläge:" -#: ../app/dialogs/preferences-dialog.c:2502 +#: ../app/dialogs/preferences-dialog.c:2539 msgid "_Try to use the system monitor profile" msgstr "_Försök att använd systemskärmprofilen" -#: ../app/dialogs/preferences-dialog.c:2512 +#: ../app/dialogs/preferences-dialog.c:2549 msgid "_Display rendering intent:" msgstr "_Visa återgivningsmetod:" -#: ../app/dialogs/preferences-dialog.c:2521 +#: ../app/dialogs/preferences-dialog.c:2558 msgid "_Softproof rendering intent:" msgstr "_Softproof återgivningsmetod:" -#: ../app/dialogs/preferences-dialog.c:2534 +#: ../app/dialogs/preferences-dialog.c:2571 msgid "Mark out of gamut colors" msgstr "Markera färger utanför färgomfång" -#: ../app/dialogs/preferences-dialog.c:2539 +#: ../app/dialogs/preferences-dialog.c:2576 msgid "Select Warning Color" msgstr "Välj varningsfärg" -#: ../app/dialogs/preferences-dialog.c:2552 +#: ../app/dialogs/preferences-dialog.c:2589 msgid "File Open behaviour:" msgstr "Beteende för filöppning:" -#: ../app/dialogs/preferences-dialog.c:2564 +#: ../app/dialogs/preferences-dialog.c:2601 msgid "Input Devices" msgstr "Inmatningsenheter" #. Extended Input Devices -#: ../app/dialogs/preferences-dialog.c:2574 +#: ../app/dialogs/preferences-dialog.c:2611 msgid "Extended Input Devices" msgstr "Utökade inmatningsenheter" -#: ../app/dialogs/preferences-dialog.c:2578 +#: ../app/dialogs/preferences-dialog.c:2615 msgid "Configure E_xtended Input Devices..." msgstr "Konfigurera _utökade inmatningsenheter..." -#: ../app/dialogs/preferences-dialog.c:2585 +#: ../app/dialogs/preferences-dialog.c:2622 msgid "_Save input device settings on exit" msgstr "_Spara inställningar för inmatningsenheter vid avslutning" -#: ../app/dialogs/preferences-dialog.c:2589 +#: ../app/dialogs/preferences-dialog.c:2626 msgid "Save Input Device Settings _Now" msgstr "Spara inställningar för inmatningsenheter _nu" -#: ../app/dialogs/preferences-dialog.c:2596 +#: ../app/dialogs/preferences-dialog.c:2633 msgid "_Reset Saved Input Device Settings to Default Values" msgstr "" "_Återställ sparade inställningar för inmatningsenheter till standardvärden" -#: ../app/dialogs/preferences-dialog.c:2611 +#: ../app/dialogs/preferences-dialog.c:2648 msgid "Additional Input Controllers" msgstr "Ytterligare inmatningsenheter" -#: ../app/dialogs/preferences-dialog.c:2614 +#: ../app/dialogs/preferences-dialog.c:2651 msgid "Input Controllers" msgstr "Inmatningsenheter" -#: ../app/dialogs/preferences-dialog.c:2630 +#: ../app/dialogs/preferences-dialog.c:2667 msgid "Window Management" msgstr "Fönsterhantering" -#: ../app/dialogs/preferences-dialog.c:2639 +#: ../app/dialogs/preferences-dialog.c:2676 msgid "Window Manager Hints" msgstr "Fönsterhintar" -#: ../app/dialogs/preferences-dialog.c:2645 +#: ../app/dialogs/preferences-dialog.c:2682 msgid "Hint for _docks and toolbox:" msgstr "Hint för _dockor och verktygslåda:" -#: ../app/dialogs/preferences-dialog.c:2648 +#: ../app/dialogs/preferences-dialog.c:2685 msgid "Focus" msgstr "Fokus" -#: ../app/dialogs/preferences-dialog.c:2652 +#: ../app/dialogs/preferences-dialog.c:2689 msgid "Activate the _focused image" msgstr "Aktivera den _fokuserade bilden" #. Window Positions -#: ../app/dialogs/preferences-dialog.c:2656 +#: ../app/dialogs/preferences-dialog.c:2693 msgid "Window Positions" msgstr "Fönsterpositioner" -#: ../app/dialogs/preferences-dialog.c:2659 +#: ../app/dialogs/preferences-dialog.c:2696 msgid "_Save window positions on exit" msgstr "_Spara fönsterpositioner vid avslutning" -#: ../app/dialogs/preferences-dialog.c:2663 +#: ../app/dialogs/preferences-dialog.c:2700 msgid "Save Window Positions _Now" msgstr "Spara fönsterpositioner _nu" -#: ../app/dialogs/preferences-dialog.c:2670 +#: ../app/dialogs/preferences-dialog.c:2707 msgid "_Reset Saved Window Positions to Default Values" msgstr "_Återställ sparade fönsterpositioner till standardvärden" -#: ../app/dialogs/preferences-dialog.c:2685 +#: ../app/dialogs/preferences-dialog.c:2722 msgid "Folders" msgstr "Kataloger" -#: ../app/dialogs/preferences-dialog.c:2705 +#: ../app/dialogs/preferences-dialog.c:2742 msgid "Temporary folder:" msgstr "Temporär mapp:" -#: ../app/dialogs/preferences-dialog.c:2706 +#: ../app/dialogs/preferences-dialog.c:2743 msgid "Select Folder for Temporary Files" msgstr "Välj mapp för temporärfiler" -#: ../app/dialogs/preferences-dialog.c:2710 +#: ../app/dialogs/preferences-dialog.c:2747 msgid "Swap folder:" msgstr "Växlingskatalog:" -#: ../app/dialogs/preferences-dialog.c:2711 +#: ../app/dialogs/preferences-dialog.c:2748 msgid "Select Swap Folder" msgstr "Välj växlingskatalog" -#: ../app/dialogs/preferences-dialog.c:2746 +#: ../app/dialogs/preferences-dialog.c:2783 msgid "Brush Folders" msgstr "Penselmappar" -#: ../app/dialogs/preferences-dialog.c:2748 +#: ../app/dialogs/preferences-dialog.c:2785 msgid "Select Brush Folders" msgstr "Välj penselmappar" -#: ../app/dialogs/preferences-dialog.c:2750 +#: ../app/dialogs/preferences-dialog.c:2787 msgid "Dynamics Folders" msgstr "Dynamikmappar" -#: ../app/dialogs/preferences-dialog.c:2752 +#: ../app/dialogs/preferences-dialog.c:2789 msgid "Select Dynamics Folders" msgstr "Välj dynamikmappar" -#: ../app/dialogs/preferences-dialog.c:2754 +#: ../app/dialogs/preferences-dialog.c:2791 msgid "Pattern Folders" msgstr "Mönstermappar" -#: ../app/dialogs/preferences-dialog.c:2756 +#: ../app/dialogs/preferences-dialog.c:2793 msgid "Select Pattern Folders" msgstr "Välj mönstermappar" -#: ../app/dialogs/preferences-dialog.c:2758 +#: ../app/dialogs/preferences-dialog.c:2795 msgid "Palette Folders" msgstr "Palettmappar" -#: ../app/dialogs/preferences-dialog.c:2760 +#: ../app/dialogs/preferences-dialog.c:2797 msgid "Select Palette Folders" msgstr "Välj palettmappar" -#: ../app/dialogs/preferences-dialog.c:2762 +#: ../app/dialogs/preferences-dialog.c:2799 msgid "Gradient Folders" msgstr "Gradientmappar" -#: ../app/dialogs/preferences-dialog.c:2764 +#: ../app/dialogs/preferences-dialog.c:2801 msgid "Select Gradient Folders" msgstr "Välj gradientmappar" -#: ../app/dialogs/preferences-dialog.c:2766 +#: ../app/dialogs/preferences-dialog.c:2803 msgid "Font Folders" msgstr "Typsnittsmappar" -#: ../app/dialogs/preferences-dialog.c:2768 +#: ../app/dialogs/preferences-dialog.c:2805 msgid "Select Font Folders" msgstr "Välj typsnittsmappar" -#: ../app/dialogs/preferences-dialog.c:2770 +#: ../app/dialogs/preferences-dialog.c:2807 msgid "Tool Preset Folders" msgstr "Mappar för verktygsförval" -#: ../app/dialogs/preferences-dialog.c:2772 +#: ../app/dialogs/preferences-dialog.c:2809 msgid "Select Tool Preset Folders" msgstr "Välj verktygsförvalsmappar" -#: ../app/dialogs/preferences-dialog.c:2774 +#: ../app/dialogs/preferences-dialog.c:2811 msgid "Plug-In Folders" msgstr "Mappar för insticksmodul" -#: ../app/dialogs/preferences-dialog.c:2776 +#: ../app/dialogs/preferences-dialog.c:2813 msgid "Select Plug-In Folders" msgstr "Välj mappar för insticksmodul" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2815 msgid "Scripts" msgstr "Skript" -#: ../app/dialogs/preferences-dialog.c:2778 +#: ../app/dialogs/preferences-dialog.c:2815 msgid "Script-Fu Folders" msgstr "Mappar för Script-Fu" -#: ../app/dialogs/preferences-dialog.c:2780 +#: ../app/dialogs/preferences-dialog.c:2817 msgid "Select Script-Fu Folders" msgstr "Välj mappar för Script-Fu" -#: ../app/dialogs/preferences-dialog.c:2782 +#: ../app/dialogs/preferences-dialog.c:2819 msgid "Module Folders" msgstr "Modulmappar" -#: ../app/dialogs/preferences-dialog.c:2784 +#: ../app/dialogs/preferences-dialog.c:2821 msgid "Select Module Folders" msgstr "Välj modulmappar" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Interpreters" msgstr "Tolkar" -#: ../app/dialogs/preferences-dialog.c:2786 +#: ../app/dialogs/preferences-dialog.c:2823 msgid "Interpreter Folders" msgstr "Tolkarmappar" -#: ../app/dialogs/preferences-dialog.c:2788 +#: ../app/dialogs/preferences-dialog.c:2825 msgid "Select Interpreter Folders" msgstr "Välj tolkarmappar" -#: ../app/dialogs/preferences-dialog.c:2790 +#: ../app/dialogs/preferences-dialog.c:2827 msgid "Environment Folders" msgstr "Miljömappar" -#: ../app/dialogs/preferences-dialog.c:2792 +#: ../app/dialogs/preferences-dialog.c:2829 msgid "Select Environment Folders" msgstr "Välj miljömappar" -#: ../app/dialogs/preferences-dialog.c:2794 +#: ../app/dialogs/preferences-dialog.c:2831 msgid "Themes" msgstr "Teman" -#: ../app/dialogs/preferences-dialog.c:2794 +#: ../app/dialogs/preferences-dialog.c:2831 msgid "Theme Folders" msgstr "Temamappar" -#: ../app/dialogs/preferences-dialog.c:2796 +#: ../app/dialogs/preferences-dialog.c:2833 msgid "Select Theme Folders" msgstr "Välj temamappar" @@ -10802,26 +10814,26 @@ msgid "Not a regular file" msgstr "Inte en vanlig fil" -#: ../app/file/file-open.c:191 +#: ../app/file/file-open.c:197 #, c-format msgid "%s plug-in returned SUCCESS but did not return an image" msgstr "Insticksmodulen %s returnerade LYCKADES men returnerade ingen bild" -#: ../app/file/file-open.c:202 +#: ../app/file/file-open.c:208 #, c-format msgid "%s plug-In could not open image" msgstr "Insticksmodulen %s kunde inte öppna bild" -#: ../app/file/file-open.c:533 +#: ../app/file/file-open.c:539 msgid "Image doesn't contain any layers" msgstr "Bilden innehåller inga lager" -#: ../app/file/file-open.c:593 +#: ../app/file/file-open.c:599 #, c-format msgid "Opening '%s' failed: %s" msgstr "Öppnande av \"%s\" misslyckades: %s" -#: ../app/file/file-open.c:703 +#: ../app/file/file-open.c:709 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -11528,7 +11540,7 @@ "Exekveringsfel för proceduren \"%s\":\n" "%s" -#: ../app/plug-in/gimpplugin-progress.c:331 +#: ../app/plug-in/gimpplugin-progress.c:339 msgid "Cancelled" msgstr "Avbruten" @@ -11726,7 +11738,7 @@ #: ../app/text/text-enums.c:23 msgctxt "text-box-mode" msgid "Dynamic" -msgstr "Dynamik" +msgstr "Dynamisk" #: ../app/text/text-enums.c:24 msgctxt "text-box-mode" @@ -15204,15 +15216,15 @@ msgid "Height" msgstr "Höjd" -#: ../app/widgets/gimphelp.c:297 +#: ../app/widgets/gimphelp.c:308 msgid "Help browser is missing" msgstr "Hjälpläsaren saknas" -#: ../app/widgets/gimphelp.c:298 +#: ../app/widgets/gimphelp.c:309 msgid "The GIMP help browser is not available." msgstr "GIMP-hjälpläsaren är inte tillgänglig." -#: ../app/widgets/gimphelp.c:299 +#: ../app/widgets/gimphelp.c:310 msgid "" "The GIMP help browser plug-in appears to be missing from your installation. " "You may instead use the web browser for reading the help pages." @@ -15220,31 +15232,35 @@ "Insticksmodulen för GIMP:s hjälpläsare verkar saknas i din installation. Du " "kan istället använda webbläsaren för att läsa hjälpsidorna." -#: ../app/widgets/gimphelp.c:340 +#: ../app/widgets/gimphelp.c:351 msgid "Help browser doesn't start" msgstr "Hjälp_läsaren startar inte" -#: ../app/widgets/gimphelp.c:341 +#: ../app/widgets/gimphelp.c:352 msgid "Could not start the GIMP help browser plug-in." msgstr "Kunde inte starta GIMP-hjälpläsarinsticksmodulen." -#: ../app/widgets/gimphelp.c:368 +#: ../app/widgets/gimphelp.c:354 +msgid "You may instead use the web browser for reading the help pages." +msgstr "Du kan istället använda webbläsaren för att läsa hjälpsidorna." + +#: ../app/widgets/gimphelp.c:380 msgid "Use _Web Browser" msgstr "Använd _webbläsare" -#: ../app/widgets/gimphelp.c:712 +#: ../app/widgets/gimphelp.c:724 msgid "GIMP user manual is missing" msgstr "GIMP:s användarhandbok saknas" -#: ../app/widgets/gimphelp.c:719 +#: ../app/widgets/gimphelp.c:731 msgid "_Read Online" msgstr "_Läs på nätet" -#: ../app/widgets/gimphelp.c:743 +#: ../app/widgets/gimphelp.c:755 msgid "The GIMP user manual is not installed on your computer." msgstr "GIMP:s användarhandbok är inte installerad på din dator." -#: ../app/widgets/gimphelp.c:746 +#: ../app/widgets/gimphelp.c:758 msgid "" "You may either install the additional help package or change your " "preferences to use the online version." @@ -15565,17 +15581,17 @@ msgid "%d ppi, %s" msgstr "%d punkter/tum, %s" -#: ../app/widgets/gimptextbuffer-serialize.c:344 +#: ../app/widgets/gimptextbuffer-serialize.c:269 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "Attribut \"%s\" är ogiltigt på <%s> element i detta sammanhang" -#: ../app/widgets/gimptextbuffer-serialize.c:416 +#: ../app/widgets/gimptextbuffer-serialize.c:341 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "Yttersta elementet i text måste vara inte <%s>" -#: ../app/widgets/gimptextbuffer.c:1459 +#: ../app/widgets/gimptextbuffer.c:1460 #, c-format msgid "Invalid UTF-8 data in file '%s'." msgstr "Ogiltig UTF-8-data i filen \"%s\"." diff -Nru gimp-2.8.18/po-libgimp/ca@valencia.po gimp-2.8.20/po-libgimp/ca@valencia.po --- gimp-2.8.18/po-libgimp/ca@valencia.po 2015-08-15 07:52:43.000000000 +0000 +++ gimp-2.8.20/po-libgimp/ca@valencia.po 2017-01-28 18:58:05.000000000 +0000 @@ -17,7 +17,7 @@ "PO-Revision-Date: 2011-12-22 22:51+0100\n" "Last-Translator: Albert F. \n" "Language-Team: Catalan \n" -"Language: ca-XV\n" +"Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po-libgimp/da.po gimp-2.8.20/po-libgimp/da.po --- gimp-2.8.18/po-libgimp/da.po 2016-05-25 22:26:47.000000000 +0000 +++ gimp-2.8.20/po-libgimp/da.po 2017-01-28 18:58:05.000000000 +0000 @@ -17,7 +17,7 @@ "Project-Id-Version: GIMP libgimp\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-15 06:11+0000\n" +"POT-Creation-Date: 2016-03-16 07:09+0000\n" "PO-Revision-Date: 2016-02-26 00:00+0200\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish \n" @@ -31,22 +31,22 @@ "X-Source-Language: C\n" #. procedure executed successfully -#: ../libgimp/gimp.c:1102 +#: ../libgimp/gimp.c:1136 msgid "success" msgstr "gennemført" #. procedure execution failed -#: ../libgimp/gimp.c:1106 +#: ../libgimp/gimp.c:1140 msgid "execution error" msgstr "kørselsfejl" #. procedure called incorrectly -#: ../libgimp/gimp.c:1110 +#: ../libgimp/gimp.c:1144 msgid "calling error" msgstr "fejl i kald" #. procedure execution cancelled -#: ../libgimp/gimp.c:1114 +#: ../libgimp/gimp.c:1148 msgid "cancelled" msgstr "afbrudt" @@ -72,9 +72,7 @@ #: ../libgimp/gimpexport.c:252 #, c-format msgid "%s plug-in can't handle layer offsets, size or opacity" -msgstr "" -"Pluginet %s kan ikke håndtere lagforskydning, størrelse eller " -"opacitet" +msgstr "Pluginet %s kan ikke håndtere lagforskydning, størrelse eller opacitet" #: ../libgimp/gimpexport.c:261 ../libgimp/gimpexport.c:270 #, c-format @@ -122,7 +120,7 @@ #: ../libgimp/gimpexport.c:316 ../libgimp/gimpexport.c:345 #: ../libgimp/gimpexport.c:366 msgid "Convert to Grayscale" -msgstr "Konvertér til gråtoner" +msgstr "Konvertér til gråtone" #: ../libgimp/gimpexport.c:324 #, c-format @@ -141,8 +139,7 @@ #: ../libgimp/gimpexport.c:334 #, c-format msgid "%s plug-in can only handle bitmap (two color) indexed images" -msgstr "" -"Pluginet %s kan kun håndtere bitmap-indekserede (tofarvede) billeder" +msgstr "Pluginet %s kan kun håndtere bitmap-indekserede (tofarvede) billeder" #: ../libgimp/gimpexport.c:335 msgid "" @@ -165,8 +162,7 @@ #: ../libgimp/gimpexport.c:363 #, c-format msgid "%s plug-in can only handle grayscale or indexed images" -msgstr "" -"Pluginet %s kan kun håndtere gråtone- eller indekserede billeder" +msgstr "Pluginet %s kan kun håndtere gråtone- eller indekserede billeder" #: ../libgimp/gimpexport.c:374 #, c-format @@ -574,14 +570,12 @@ msgid "Average" msgstr "Gennemsnit" -# scootergrisen: se om skal være noget andet # http://meetthegimp.org/wp-content/uploads/meetthegimp069.mp4 #: ../libgimpbase/gimpbaseenums.c:333 msgctxt "dodge-burn-type" msgid "Dodge" msgstr "Lysne" -# scootergrisen: se om skal være noget andet # http://meetthegimp.org/wp-content/uploads/meetthegimp069.mp4 #: ../libgimpbase/gimpbaseenums.c:334 msgctxt "dodge-burn-type" @@ -744,7 +738,6 @@ msgid "Cubic" msgstr "Kubisk" -# scootergrisen: Lanczos3 med lille l? Kig også i andre strenge #: ../libgimpbase/gimpbaseenums.c:582 msgctxt "interpolation-type" msgid "Sinc (Lanczos3)" @@ -810,14 +803,11 @@ msgid "Midtones" msgstr "Mellemtoner" -# Kunne vi ikke finde et bedre udtryk -# scootergrisen: måske noget med højlys #: ../libgimpbase/gimpbaseenums.c:738 msgctxt "transfer-mode" msgid "Highlights" -msgstr "Highlights" +msgstr "Højlys" -# scootergrisen: måske "Normal (fremad)" er bedre end "Almindelig (fremad)" #: ../libgimpbase/gimpbaseenums.c:767 msgctxt "transform-direction" msgid "Normal (Forward)" @@ -888,11 +878,10 @@ msgid "Slight" msgstr "Let" -# scootergrisen: se om medium er bedre #: ../libgimpbase/gimpbaseenums.c:1139 msgctxt "text-hint-style" msgid "Medium" -msgstr "Mellem/medium" +msgstr "Medium" #: ../libgimpbase/gimpbaseenums.c:1140 msgctxt "text-hint-style" @@ -1014,7 +1003,6 @@ msgstr "Udskriftssimulering" # Opfattelse? -# scootergrisen: måske "Som det opfattes" eller "Sanselig" #: ../libgimpconfig/gimpcolorconfig-enums.c:57 msgctxt "color-rendering-intent" msgid "Perceptual" @@ -1124,7 +1112,6 @@ #. please don't translate 'yes' and 'no' #: ../libgimpconfig/gimpscanner.c:431 #, c-format -#| msgid "expected 'yes' or 'no' for boolean token %s, got '%s'" msgid "expected 'yes' or 'no' for boolean token, got '%s'" msgstr "forventede \"yes\" eller \"no\" for boolesk symbol, fik \"%s\"" @@ -1315,8 +1302,8 @@ "Click the eyedropper, then click a color anywhere on your screen to select " "that color." msgstr "" -"Klik på pipetten og klik derefter et vilkårligt på skærmen " -"for at vælge den pågældende farve." +"Klik på pipetten og klik derefter et vilkårligt på skærmen for at vælge den " +"pågældende farve." #. toggle button to (de)activate the instant preview #: ../libgimpwidgets/gimppreview.c:290 @@ -1387,7 +1374,6 @@ msgid "L_ine Spacing" msgstr "_Linjemellemrum" -# scootergrisen: tilpas/ændr størrelse #: ../libgimpwidgets/gimpstock.c:204 msgid "_Resize" msgstr "_Tilpas" @@ -1468,13 +1454,11 @@ msgid "Square" msgstr "Kvadratisk" -# scootergrisen: portræt? #: ../libgimpwidgets/gimpwidgetsenums.c:25 msgctxt "aspect-type" msgid "Portrait" msgstr "Stående" -# scootergrisen: landskab? #: ../libgimpwidgets/gimpwidgetsenums.c:26 msgctxt "aspect-type" msgid "Landscape" diff -Nru gimp-2.8.18/po-libgimp/nb.po gimp-2.8.20/po-libgimp/nb.po --- gimp-2.8.18/po-libgimp/nb.po 2015-08-20 22:57:30.000000000 +0000 +++ gimp-2.8.20/po-libgimp/nb.po 2017-01-28 19:08:46.000000000 +0000 @@ -12,7 +12,7 @@ "PO-Revision-Date: 2012-02-22 08:40+0100\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian bokmål \n" -"Language: no\n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po-libgimp/pl.po gimp-2.8.20/po-libgimp/pl.po --- gimp-2.8.18/po-libgimp/pl.po 2016-05-25 22:26:47.000000000 +0000 +++ gimp-2.8.20/po-libgimp/pl.po 2017-01-28 19:08:46.000000000 +0000 @@ -1,46 +1,42 @@ -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Aviary.pl -# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz -# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: -# gnomepl@aviary.pl -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +# Polish translation for gimp-libgimp. +# Copyright © 2005-2016 the gimp authors. +# This file is distributed under the same license as the gimp package. # Bartosz Kosiorek , 2005-2011. -# Piotr Drąg , 2011-2015. -# Aviary.pl , 2011-2015. +# Piotr Drąg , 2011-2016. +# Aviary.pl , 2011-2016. +# msgid "" msgstr "" "Project-Id-Version: gimp-libgimp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-27 21:47+0100\n" -"PO-Revision-Date: 2015-11-27 21:48+0100\n" +"POT-Creation-Date: 2016-09-07 18:48+0200\n" +"PO-Revision-Date: 2016-09-07 18:49+0200\n" "Last-Translator: Piotr Drąg \n" -"Language-Team: Polish \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Poedit-Language: Polish\n" -"X-Poedit-Country: Poland\n" #. procedure executed successfully -#: ../libgimp/gimp.c:1136 +#: ../libgimp/gimp.c:1141 msgid "success" msgstr "powodzenie" #. procedure execution failed -#: ../libgimp/gimp.c:1140 +#: ../libgimp/gimp.c:1145 msgid "execution error" msgstr "błąd wykonania" #. procedure called incorrectly -#: ../libgimp/gimp.c:1144 +#: ../libgimp/gimp.c:1149 msgid "calling error" msgstr "błąd wywołania" #. procedure execution cancelled -#: ../libgimp/gimp.c:1148 +#: ../libgimp/gimp.c:1153 msgid "cancelled" msgstr "anulowano" @@ -109,7 +105,7 @@ #: ../libgimp/gimpexport.c:315 #, c-format msgid "%s plug-in can only handle grayscale images" -msgstr "Wtyczka %s obsługuje tylko obrazy w odcieniach szarości" +msgstr "Wtyczka %s obsługuje tylko obrazy w odcieniach szarości" #: ../libgimp/gimpexport.c:316 ../libgimp/gimpexport.c:345 #: ../libgimp/gimpexport.c:366 @@ -127,7 +123,7 @@ "Convert to Indexed using default settings\n" "(Do it manually to tune the result)" msgstr "" -"Konwertuj na indeksowany używając ustawień domyślnych\n" +"Konwertuj na indeksowany za pomocą ustawień domyślnych\n" "(ręczna konwersja pozwoli na lepsze dopasowanie ustawień)" #: ../libgimp/gimpexport.c:334 @@ -140,13 +136,13 @@ "Convert to Indexed using bitmap default settings\n" "(Do it manually to tune the result)" msgstr "" -"Konwertuj na indeksowany używając ustawień domyślnych dla bitmap\n" +"Konwertuj na indeksowany za pomocą ustawień domyślnych dla bitmap\n" "(ręczna konwersja pozwoli na lepsze dopasowanie ustawień)" #: ../libgimp/gimpexport.c:344 #, c-format msgid "%s plug-in can only handle RGB or grayscale images" -msgstr "Wtyczka %s obsługuje tylko obrazy RGB lub w odcieniach szarości" +msgstr "Wtyczka %s obsługuje tylko obrazy RGB lub w odcieniach szarości" #: ../libgimp/gimpexport.c:353 #, c-format @@ -157,7 +153,7 @@ #, c-format msgid "%s plug-in can only handle grayscale or indexed images" msgstr "" -"Wtyczka %s obsługuje tylko obrazy indeksowane lub w odcieniach szarości" +"Wtyczka %s obsługuje tylko obrazy indeksowane lub w odcieniach szarości" #: ../libgimp/gimpexport.c:374 #, c-format @@ -195,8 +191,8 @@ "Your image should be exported before it can be saved as %s for the following " "reasons:" msgstr "" -"Przed zapisaniem w formacie %s obraz powinien zostać wyeksportowany z " -"poniższych powodów:" +"Przed zapisaniem w formacie %s obraz powinien zostać wyeksportowany " +"z poniższych powodów:" #. the footline #: ../libgimp/gimpexport.c:622 @@ -398,7 +394,7 @@ #: ../libgimpbase/gimpbaseenums.c:33 msgctxt "add-mask-type" msgid "_Grayscale copy of layer" -msgstr "Kop_ia warstwy w odcieniach szarości" +msgstr "Kop_ia warstwy w odcieniach szarości" #: ../libgimpbase/gimpbaseenums.c:34 msgctxt "add-mask-type" @@ -458,7 +454,7 @@ #: ../libgimpbase/gimpbaseenums.c:134 msgctxt "channel-ops" msgid "Intersect with the current selection" -msgstr "Część wspólna z bieżącym zaznaczeniem" +msgstr "Część wspólna z bieżącym zaznaczeniem" #: ../libgimpbase/gimpbaseenums.c:167 msgctxt "channel-type" @@ -618,12 +614,12 @@ #: ../libgimpbase/gimpbaseenums.c:409 msgctxt "gradient-type" msgid "Spiral (cw)" -msgstr "Spiralny (w prawo)" +msgstr "Spiralny (w prawo)" #: ../libgimpbase/gimpbaseenums.c:410 msgctxt "gradient-type" msgid "Spiral (ccw)" -msgstr "Spiralny (w lewo)" +msgstr "Spiralny (w lewo)" #: ../libgimpbase/gimpbaseenums.c:442 msgctxt "grid-style" @@ -768,7 +764,7 @@ #: ../libgimpbase/gimpbaseenums.c:676 msgctxt "run-mode" msgid "Run with last used values" -msgstr "Uruchom z ostatnio użytymi wartościami" +msgstr "Uruchom z ostatnio użytymi wartościami" #: ../libgimpbase/gimpbaseenums.c:705 msgctxt "size-type" @@ -823,7 +819,7 @@ #: ../libgimpbase/gimpbaseenums.c:802 msgctxt "transform-resize" msgid "Crop with aspect" -msgstr "Kadrowanie z proporcjami" +msgstr "Kadrowanie z proporcjami" #: ../libgimpbase/gimpbaseenums.c:935 msgctxt "pdb-proc-type" @@ -923,8 +919,8 @@ "windowing system. The configured monitor profile is then only used as a " "fallback." msgstr "" -"Kiedy jest włączone, to program GIMP będzie próbował użyć profilu kolorów z " -"menedżera okien. Skonfigurowany profil monitora jest używany w przypadku " +"Kiedy jest włączone, to program GIMP będzie próbował użyć profilu kolorów " +"z menedżera okien. Skonfigurowany profil monitora jest używany w przypadku " "niepowodzenia." #: ../libgimpconfig/gimpcolorconfig.c:60 @@ -933,7 +929,7 @@ #: ../libgimpconfig/gimpcolorconfig.c:62 msgid "The CMYK color profile used to convert between RGB and CMYK." -msgstr "Profil kolorów CMYK, używany do konwersji między RGB a CMYK." +msgstr "Profil kolorów CMYK, używany do konwersji między RGB a CMYK." #: ../libgimpconfig/gimpcolorconfig.c:64 msgid "The color profile used for simulating a printed version (softproof)." @@ -948,7 +944,7 @@ "Sets how colors are converted from RGB working space to the print simulation " "device." msgstr "" -"Ustawia, jak kolory są konwertowane z obszaru roboczego RGB do urządzenia " +"Ustawia, jak kolory są konwertowane z obszaru roboczego RGB do urządzenia " "symulującego drukowanie." #: ../libgimpconfig/gimpcolorconfig.c:71 @@ -957,7 +953,7 @@ "represented in the target color space." msgstr "" "Kiedy jest włączone, to symulacja druku będzie oznaczała kolory, które nie " -"mogą być przedstawione w docelowej przestrzeni kolorów." +"mogą być przedstawione w docelowej przestrzeni kolorów." #: ../libgimpconfig/gimpcolorconfig.c:74 msgid "The color to use for marking colors which are out of gamut." @@ -971,7 +967,7 @@ #: ../libgimpconfig/gimpcolorconfig-enums.c:25 msgctxt "color-management-mode" msgid "Color managed display" -msgstr "Z zarządzaniem kolorami" +msgstr "Z zarządzaniem kolorami" #: ../libgimpconfig/gimpcolorconfig-enums.c:26 msgctxt "color-management-mode" @@ -1023,7 +1019,7 @@ #: ../libgimpconfig/gimpconfig-deserialize.c:609 #, c-format msgid "while parsing token '%s': %s" -msgstr "podczas przetwarzaniu tokenu „%s”: %s" +msgstr "podczas przetwarzania tokenu „%s”: %s" #: ../libgimpconfig/gimpconfig-iface.c:482 #: ../libgimpconfig/gimpconfig-iface.c:495 ../libgimpconfig/gimpscanner.c:559 @@ -1091,7 +1087,7 @@ #: ../libgimpconfig/gimpscanner.c:668 #, c-format msgid "Error while parsing '%s' in line %d: %s" -msgstr "Błąd podczas przetwarzania „%s” w wierszu %d: %s" +msgstr "Błąd podczas przetwarzania „%s” w %d. wierszu: %s" #: ../libgimpmodule/gimpmodule.c:163 ../libgimpmodule/gimpmodule.c:181 #: ../libgimpmodule/gimpmodule.c:290 ../libgimpmodule/gimpmodule.c:317 @@ -1123,7 +1119,7 @@ "Thumbnails will be stored in the folder for temporary files (%s) instead." msgstr "" "Nie można ustalić prawidłowego katalogu domowego.\n" -"Miniatury będą przechowywane w katalogu na pliki tymczasowe (%s)." +"Miniatury będą przechowywane w katalogu na pliki tymczasowe (%s)." #: ../libgimpthumb/gimpthumb-utils.c:277 ../libgimpthumb/gimpthumb-utils.c:345 #, c-format @@ -1162,7 +1158,7 @@ #: ../libgimpwidgets/gimpcolorprofilestore.c:146 msgid "Select color profile from disk..." -msgstr "Wybierz profil kolorów z dysku…" +msgstr "Wybierz profil kolorów z dysku…" #: ../libgimpwidgets/gimpcolorprofilestore.c:280 msgctxt "profile" @@ -1173,23 +1169,23 @@ msgid "Scales" msgstr "Skale" -#: ../libgimpwidgets/gimpcolorselection.c:220 +#: ../libgimpwidgets/gimpcolorselection.c:222 msgid "Current:" msgstr "Bieżący:" -#: ../libgimpwidgets/gimpcolorselection.c:229 +#: ../libgimpwidgets/gimpcolorselection.c:231 msgid "Old:" msgstr "Poprzedni:" -#: ../libgimpwidgets/gimpcolorselection.c:314 +#: ../libgimpwidgets/gimpcolorselection.c:318 msgid "" "Hexadecimal color notation as used in HTML and CSS. This entry also accepts " "CSS color names." msgstr "" -"Szesnastkowy zapis koloru jest używany w językach HTML i CSS. To pole " +"Szesnastkowy zapis koloru jest używany w językach HTML i CSS. To pole " "dopuszcza również nazwy kolorów CSS." -#: ../libgimpwidgets/gimpcolorselection.c:320 +#: ../libgimpwidgets/gimpcolorselection.c:324 msgid "HTML _notation:" msgstr "_Zapis języka HTML:" @@ -1275,7 +1271,7 @@ "Click the eyedropper, then click a color anywhere on your screen to select " "that color." msgstr "" -"Kliknięcie zakraplacza, a następnie dowolnego punktu obrazu pobierze z niego " +"Kliknięcie zakraplacza, a następnie dowolnego punktu obrazu pobierze z niego " "kolor." #. toggle button to (de)activate the instant preview @@ -1309,7 +1305,7 @@ #: ../libgimpwidgets/gimpstock.c:129 msgid "_Duplicate" -msgstr "_Duplikuj" +msgstr "_Powiel" #: ../libgimpwidgets/gimpstock.c:130 msgid "_Edit" @@ -1392,7 +1388,7 @@ "Use this value for random number generator seed - this allows you to repeat " "a given \"random\" operation" msgstr "" -"Wartość ta może zostać użyta w roli ziarna generatora liczb losowych, co " +"Wartość ta może zostać użyta w roli ziarna generatora liczb losowych, co " "pozwala na dokładne powtórzenie wykonanego „losowego” działania" #: ../libgimpwidgets/gimpwidgets.c:520 @@ -1524,7 +1520,7 @@ #: ../modules/color-selector-cmyk-lcms.c:91 msgid "CMYK color selector (using color profile)" -msgstr "Wybór koloru z przestrzeni CMYK (używając profilu kolorów)" +msgstr "Wybór koloru z przestrzeni CMYK (za pomocą profilu kolorów)" #: ../modules/color-selector-cmyk-lcms.c:154 #: ../modules/color-selector-cmyk.c:101 @@ -1586,7 +1582,7 @@ #: ../modules/color-selector-cmyk.c:70 msgid "CMYK color selector" -msgstr "Wybór koloru z przestrzeni CMYK" +msgstr "Wybór koloru z przestrzeni CMYK" #: ../modules/color-selector-cmyk.c:171 msgid "Black _pullout:" @@ -1650,11 +1646,11 @@ #: ../modules/controller-dx-dinput.c:441 ../modules/controller-linux-input.c:89 msgid "X Move Left" -msgstr "Ruch w lewo X" +msgstr "Ruch w lewo X" #: ../modules/controller-dx-dinput.c:444 ../modules/controller-linux-input.c:90 msgid "X Move Right" -msgstr "Ruch w prawo X" +msgstr "Ruch w prawo X" #: ../modules/controller-dx-dinput.c:450 msgid "Y Move Away" @@ -1682,21 +1678,21 @@ #: ../modules/controller-dx-dinput.c:477 ../modules/controller-linux-input.c:98 msgid "Y Axis Tilt Right" -msgstr "Wychylenie Y w prawo" +msgstr "Wychylenie Y w prawo" #: ../modules/controller-dx-dinput.c:480 ../modules/controller-linux-input.c:99 msgid "Y Axis Tilt Left" -msgstr "Wychylenie Y w lewo" +msgstr "Wychylenie Y w lewo" #: ../modules/controller-dx-dinput.c:486 #: ../modules/controller-linux-input.c:100 msgid "Z Axis Turn Left" -msgstr "Wychylenie Z skręt w lewo" +msgstr "Wychylenie Z skręt w lewo" #: ../modules/controller-dx-dinput.c:489 #: ../modules/controller-linux-input.c:101 msgid "Z Axis Turn Right" -msgstr "Wychylenie Z skręt w prawo" +msgstr "Wychylenie Z skręt w prawo" #: ../modules/controller-dx-dinput.c:500 #, c-format @@ -1807,7 +1803,7 @@ #: ../modules/controller-linux-input.c:74 msgid "Button Back" -msgstr "Tylni przycisk" +msgstr "Tylny przycisk" #: ../modules/controller-linux-input.c:75 msgid "Button Task" @@ -1831,7 +1827,7 @@ #: ../modules/controller-linux-input.c:92 msgid "Y Move Back" -msgstr "Ruch w tył Y" +msgstr "Ruch w tył Y" #: ../modules/controller-linux-input.c:96 msgid "X Axis Tilt Forward" @@ -1843,27 +1839,27 @@ #: ../modules/controller-linux-input.c:103 msgid "Horiz. Wheel Turn Back" -msgstr "Poziome kółko w tył" +msgstr "Poziome kółko w tył" #: ../modules/controller-linux-input.c:104 msgid "Horiz. Wheel Turn Forward" -msgstr "Poziome kółko w przód" +msgstr "Poziome kółko w przód" #: ../modules/controller-linux-input.c:105 msgid "Dial Turn Left" -msgstr "Skręt w lewo" +msgstr "Skręt w lewo" #: ../modules/controller-linux-input.c:106 msgid "Dial Turn Right" -msgstr "Skręt w prawo" +msgstr "Skręt w prawo" #: ../modules/controller-linux-input.c:107 msgid "Wheel Turn Left" -msgstr "Obrót kółka w lewo" +msgstr "Obrót kółka w lewo" #: ../modules/controller-linux-input.c:108 msgid "Wheel Turn Right" -msgstr "Obrót kółka w prawo" +msgstr "Obrót kółka w prawo" #: ../modules/controller-linux-input.c:177 msgid "Linux input event controller" @@ -1885,7 +1881,7 @@ #: ../modules/controller-midi.c:479 #, c-format msgid "Reading from %s" -msgstr "Odczytywanie z %s" +msgstr "Odczytywanie z %s" #: ../modules/controller-linux-input.c:568 #: ../modules/controller-linux-input.c:622 ../modules/controller-midi.c:435 @@ -1979,7 +1975,7 @@ #: ../modules/display-filter-gamma.c:86 msgid "Gamma color display filter" -msgstr "Filtr wyświetlania kolorów z korekcją gamma" +msgstr "Filtr wyświetlania kolorów z korekcją gamma" #: ../modules/display-filter-gamma.c:125 msgid "Gamma" @@ -1991,7 +1987,7 @@ #: ../modules/display-filter-high-contrast.c:86 msgid "High Contrast color display filter" -msgstr "Filtr wyświetlania kolorów z wysokim kontrastem" +msgstr "Filtr wyświetlania kolorów z wysokim kontrastem" #: ../modules/display-filter-high-contrast.c:125 msgid "Contrast" @@ -2018,7 +2014,7 @@ "This filter takes its configuration from the Color Management section in the " "Preferences dialog." msgstr "" -"Ten filtr pobiera konfigurację z sekcji Zarządzanie kolorami okna " +"Ten filtr pobiera konfigurację z sekcji Zarządzanie kolorami okna " "Preferencji." #: ../modules/display-filter-lcms.c:303 @@ -2039,7 +2035,7 @@ #: ../modules/display-filter-proof.c:98 msgid "Color proof filter using ICC color profile" -msgstr "Filtr korygujący kolory używając profilu ICC" +msgstr "Filtr korygujący kolory za pomocą profilu ICC" #: ../modules/display-filter-proof.c:146 msgid "Color Proof" diff -Nru gimp-2.8.18/po-libgimp/rw.po gimp-2.8.20/po-libgimp/rw.po --- gimp-2.8.18/po-libgimp/rw.po 2015-08-20 22:57:30.000000000 +0000 +++ gimp-2.8.20/po-libgimp/rw.po 2017-01-28 18:58:05.000000000 +0000 @@ -23,7 +23,6 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"ULL NAME \n" #: libgimp/gimpbrushmenu.c:140 msgid "Brush Selection" diff -Nru gimp-2.8.18/po-libgimp/sl.po gimp-2.8.20/po-libgimp/sl.po --- gimp-2.8.18/po-libgimp/sl.po 2015-08-20 22:57:30.000000000 +0000 +++ gimp-2.8.20/po-libgimp/sl.po 2017-01-28 19:08:46.000000000 +0000 @@ -1,16 +1,18 @@ +#'gimp/po-libgimp # Slovenian translation of libgimp. # Copyright (C) 2007 Free Software Foundation. # This file is distributed under the same licence as the libgimp package. # # Nedeljko Grabant , 2007. -# Martin Srebotnjak , 2007, 2010. +# Martin Srebotnjak , 2007, 2013-2016. # msgid "" msgstr "" "Project-Id-Version: Gimp - libgimp\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-12-03 23:09+0000\n" -"PO-Revision-Date: 2011-12-04 00:36+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=gimp&keywords=I18N+L10N&component=Internationalisation\n" +"POT-Creation-Date: 2016-08-25 19:36+0000\n" +"PO-Revision-Date: 2016-08-26 16:59+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: Martin Srebotnjak \n" "Language: sl\n" @@ -18,70 +20,64 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n" -"X-Poedit-Language: Slovenian\n" -"X-Poedit-Country: SLOVENIA\n" "X-Poedit-SourceCharset: iso-8859-1\n" +"X-Generator: Poedit 1.8.8\n" #. procedure executed successfully -#: ../libgimp/gimp.c:1077 +#: ../libgimp/gimp.c:1204 msgid "success" msgstr "Uspešno" #. procedure execution failed -#: ../libgimp/gimp.c:1081 +#: ../libgimp/gimp.c:1208 msgid "execution error" msgstr "Napaka pri izvajanju" #. procedure called incorrectly -#: ../libgimp/gimp.c:1085 +#: ../libgimp/gimp.c:1212 msgid "calling error" msgstr "Napaka pri klicu" #. procedure execution cancelled -#: ../libgimp/gimp.c:1089 +#: ../libgimp/gimp.c:1216 msgid "cancelled" msgstr "Preklicano" -#: ../libgimp/gimpbrushselectbutton.c:178 +#: ../libgimp/gimpbrushselectbutton.c:179 msgid "Brush Selection" msgstr "Izbor čopiča" -#: ../libgimp/gimpbrushselectbutton.c:927 -#: ../libgimp/gimppatternselectbutton.c:725 +#: ../libgimp/gimpbrushselectbutton.c:928 +#: ../libgimp/gimppatternselectbutton.c:726 msgid "_Browse..." msgstr "Pre_brskaj ..." -#: ../libgimp/gimpexport.c:243 -#: ../libgimp/gimpexport.c:279 +#: ../libgimp/gimpexport.c:243 ../libgimp/gimpexport.c:279 #, c-format msgid "%s plug-in can't handle layers" msgstr "Vtičnik %s ne zna upravljati s plastmi" -#: ../libgimp/gimpexport.c:244 -#: ../libgimp/gimpexport.c:253 -#: ../libgimp/gimpexport.c:262 -#: ../libgimp/gimpexport.c:280 +#: ../libgimp/gimpexport.c:244 ../libgimp/gimpexport.c:253 +#: ../libgimp/gimpexport.c:262 ../libgimp/gimpexport.c:280 msgid "Merge Visible Layers" msgstr "Spoji vidne plasti" #: ../libgimp/gimpexport.c:252 #, c-format msgid "%s plug-in can't handle layer offsets, size or opacity" -msgstr "Vtičnik %s ne zna ravnati z zamiki, velikostmi ali prekrivnostjo plasti" +msgstr "" +"Vtičnik %s ne zna ravnati z zamiki, velikostmi ali prekrivnostjo plasti" -#: ../libgimp/gimpexport.c:261 -#: ../libgimp/gimpexport.c:270 +#: ../libgimp/gimpexport.c:261 ../libgimp/gimpexport.c:270 #, c-format msgid "%s plug-in can only handle layers as animation frames" msgstr "Vtičnik %s lahko plasti obravnava le kot sličice animacije" -#: ../libgimp/gimpexport.c:262 -#: ../libgimp/gimpexport.c:271 +#: ../libgimp/gimpexport.c:262 ../libgimp/gimpexport.c:271 msgid "Save as Animation" msgstr "Shrani kot animacijo" -#: ../libgimp/gimpexport.c:271 -#: ../libgimp/gimpexport.c:280 +#: ../libgimp/gimpexport.c:271 ../libgimp/gimpexport.c:280 #: ../libgimp/gimpexport.c:289 msgid "Flatten Image" msgstr "Splošči sliko" @@ -105,8 +101,7 @@ msgid "%s plug-in can only handle RGB images" msgstr "Vtičnik %s lahko obdeluje le RGB ali sivinske slike" -#: ../libgimp/gimpexport.c:307 -#: ../libgimp/gimpexport.c:345 +#: ../libgimp/gimpexport.c:307 ../libgimp/gimpexport.c:345 #: ../libgimp/gimpexport.c:354 msgid "Convert to RGB" msgstr "Pretvori v RGB" @@ -116,8 +111,7 @@ msgid "%s plug-in can only handle grayscale images" msgstr "Vtičnik %s lahko obdeluje le RGB ali sivinske slike" -#: ../libgimp/gimpexport.c:316 -#: ../libgimp/gimpexport.c:345 +#: ../libgimp/gimpexport.c:316 ../libgimp/gimpexport.c:345 #: ../libgimp/gimpexport.c:366 msgid "Convert to Grayscale" msgstr "Pretvori v sivinsko" @@ -127,8 +121,7 @@ msgid "%s plug-in can only handle indexed images" msgstr "Vtičnik %s lahko obdeluje le RGB ali indeksirane slike" -#: ../libgimp/gimpexport.c:325 -#: ../libgimp/gimpexport.c:354 +#: ../libgimp/gimpexport.c:325 ../libgimp/gimpexport.c:354 #: ../libgimp/gimpexport.c:364 msgid "" "Convert to Indexed using default settings\n" @@ -190,23 +183,26 @@ msgid "_Ignore" msgstr "_Prezri" -#: ../libgimp/gimpexport.c:518 -#: ../libgimp/gimpexport.c:988 +#: ../libgimp/gimpexport.c:518 ../libgimp/gimpexport.c:1013 msgid "_Export" msgstr "_Izvozi" #. the headline #: ../libgimp/gimpexport.c:548 #, c-format -msgid "Your image should be exported before it can be saved as %s for the following reasons:" -msgstr "Sliko morate izvoziti preden jo lahko shranite kot %s, in sicer iz naslednjih razlogov:" +msgid "" +"Your image should be exported before it can be saved as %s for the following " +"reasons:" +msgstr "" +"Sliko morate izvoziti preden jo lahko shranite kot %s, in sicer iz " +"naslednjih razlogov:" #. the footline #: ../libgimp/gimpexport.c:622 msgid "The export conversion won't modify your original image." msgstr "Pretvorba pri izvozu ne bo spremenila izvorne slike." -#: ../libgimp/gimpexport.c:725 +#: ../libgimp/gimpexport.c:729 #, c-format msgid "" "You are about to save a layer mask as %s.\n" @@ -215,7 +211,7 @@ "Trenutno shranjujete masko plasti kot %s.\n" "Na ta način ne boste shranili vidnih plasti." -#: ../libgimp/gimpexport.c:731 +#: ../libgimp/gimpexport.c:735 #, c-format msgid "" "You are about to save a channel (saved selection) as %s.\n" @@ -224,110 +220,137 @@ "Shranili boste kanal (shrani izbor) kot %s.\n" "S tem ne boste shranili vidnih plasti." -#: ../libgimp/gimpexport.c:979 +#: ../libgimp/gimpexport.c:1004 msgid "Export Image as " msgstr "Izvozi sliko kot" -#: ../libgimp/gimpfontselectbutton.c:138 +#: ../libgimp/gimpfontselectbutton.c:139 msgid "Font Selection" msgstr "Izbor pisave" -#: ../libgimp/gimpfontselectbutton.c:153 -msgid "Sans" -msgstr "Sans" - -#: ../libgimp/gimpgradientselectbutton.c:156 +#: ../libgimp/gimpgradientselectbutton.c:157 msgid "Gradient Selection" msgstr "Izbor preliva" +#: ../libgimp/gimpimagemetadata.c:605 +msgid "Background" +msgstr "Ozadje" + +#: ../libgimp/gimpimagemetadata.c:796 +#, c-format +msgid "Rotate %s?" +msgstr "Želite zasukati %s?" + +#: ../libgimp/gimpimagemetadata.c:802 +msgid "_Keep Original" +msgstr "_Ohrani izvirnik" + +#: ../libgimp/gimpimagemetadata.c:844 +msgid "Original" +msgstr "Izvirnik" + +#: ../libgimp/gimpimagemetadata.c:860 +msgid "Rotated" +msgstr "Zasukano" + +#: ../libgimp/gimpimagemetadata.c:878 +msgid "This image contains Exif orientation metadata." +msgstr "Ta slika vsebuje metapodatke o usmeritvi Exif." + +#: ../libgimp/gimpimagemetadata.c:896 +msgid "Would you like to rotate the image?" +msgstr "Želite zasukati sliko?" + +#: ../libgimp/gimpimagemetadata.c:908 +msgid "_Don't ask me again" +msgstr "_Ne vprašaj več" + #. This string appears in an empty menu as in #. * "nothing selected and nothing to select" #. -#: ../libgimp/gimpmenu.c:461 -#: ../libgimpwidgets/gimpintstore.c:241 +#: ../libgimp/gimpmenu.c:462 ../libgimpwidgets/gimpintstore.c:251 msgid "(Empty)" msgstr "(prazno)" -#: ../libgimp/gimppaletteselectbutton.c:138 +#: ../libgimp/gimppaletteselectbutton.c:139 msgid "Palette Selection" msgstr "Izbor palete" -#: ../libgimp/gimppatternselectbutton.c:164 +#: ../libgimp/gimppatternselectbutton.c:165 msgid "Pattern Selection" msgstr "Izbor vzorca" -#: ../libgimp/gimpprocbrowserdialog.c:149 +#: ../libgimp/gimpprocbrowserdialog.c:150 msgid "by name" msgstr "po imenu" -#: ../libgimp/gimpprocbrowserdialog.c:150 +#: ../libgimp/gimpprocbrowserdialog.c:151 msgid "by description" msgstr "po opisu" -#: ../libgimp/gimpprocbrowserdialog.c:151 +#: ../libgimp/gimpprocbrowserdialog.c:152 msgid "by help" msgstr "po pomoči" -#: ../libgimp/gimpprocbrowserdialog.c:152 +#: ../libgimp/gimpprocbrowserdialog.c:153 msgid "by author" msgstr "po avtorju" -#: ../libgimp/gimpprocbrowserdialog.c:153 +#: ../libgimp/gimpprocbrowserdialog.c:154 msgid "by copyright" msgstr "po avtorskih pravicah" -#: ../libgimp/gimpprocbrowserdialog.c:154 +#: ../libgimp/gimpprocbrowserdialog.c:155 msgid "by date" msgstr "po datumu" -#: ../libgimp/gimpprocbrowserdialog.c:155 +#: ../libgimp/gimpprocbrowserdialog.c:156 msgid "by type" msgstr "po vrsti" #. count label -#: ../libgimp/gimpprocbrowserdialog.c:394 -#: ../libgimp/gimpprocbrowserdialog.c:545 -#: ../libgimpwidgets/gimpbrowser.c:139 +#: ../libgimp/gimpprocbrowserdialog.c:395 +#: ../libgimp/gimpprocbrowserdialog.c:544 ../libgimpwidgets/gimpbrowser.c:140 msgid "No matches" msgstr "Ni zadetkov" -#: ../libgimp/gimpprocbrowserdialog.c:397 +#: ../libgimp/gimpprocbrowserdialog.c:398 msgid "Search term invalid or incomplete" msgstr "Iskani pojem ni veljaven ali nepopoln" -#: ../libgimp/gimpprocbrowserdialog.c:406 +#: ../libgimp/gimpprocbrowserdialog.c:407 msgid "Searching" msgstr "Iskanje" -#: ../libgimp/gimpprocbrowserdialog.c:417 +#: ../libgimp/gimpprocbrowserdialog.c:418 msgid "Searching by name" msgstr "Iskanje po imenu" -#: ../libgimp/gimpprocbrowserdialog.c:438 +#: ../libgimp/gimpprocbrowserdialog.c:439 msgid "Searching by description" msgstr "Iskanje po opisu" -#: ../libgimp/gimpprocbrowserdialog.c:445 +#: ../libgimp/gimpprocbrowserdialog.c:446 msgid "Searching by help" msgstr "Iskanje po pomoči" -#: ../libgimp/gimpprocbrowserdialog.c:452 +#: ../libgimp/gimpprocbrowserdialog.c:453 msgid "Searching by author" msgstr "Iskanje po avtorju" -#: ../libgimp/gimpprocbrowserdialog.c:459 +#: ../libgimp/gimpprocbrowserdialog.c:460 msgid "Searching by copyright" msgstr "Iskanje po copyrightu" -#: ../libgimp/gimpprocbrowserdialog.c:466 +#: ../libgimp/gimpprocbrowserdialog.c:467 msgid "Searching by date" msgstr "Iskanje po datumu" -#: ../libgimp/gimpprocbrowserdialog.c:473 +#: ../libgimp/gimpprocbrowserdialog.c:474 msgid "Searching by type" msgstr "Iskanje po vrsti" -#: ../libgimp/gimpprocbrowserdialog.c:483 +#: ../libgimp/gimpprocbrowserdialog.c:484 #, c-format msgid "%d procedure" msgid_plural "%d procedures" @@ -336,11 +359,11 @@ msgstr[2] "%d proceduri" msgstr[3] "%d procedure" -#: ../libgimp/gimpprocbrowserdialog.c:492 +#: ../libgimp/gimpprocbrowserdialog.c:493 msgid "No matches for your query" msgstr "Vaše povpraševanje ni vrnilo zadetkov" -#: ../libgimp/gimpprocbrowserdialog.c:496 +#: ../libgimp/gimpprocbrowserdialog.c:497 #, c-format msgid "%d procedure matches your query" msgid_plural "%d procedures match your query" @@ -349,27 +372,27 @@ msgstr[2] "%d proceduri se ujemata z vašim povpraševanjem" msgstr[3] "%d procedure se ujemajo z vašim povpraševanjem" -#: ../libgimp/gimpprocview.c:172 +#: ../libgimp/gimpprocview.c:173 msgid "Parameters" msgstr "Parametri" -#: ../libgimp/gimpprocview.c:185 +#: ../libgimp/gimpprocview.c:186 msgid "Return Values" msgstr "Vrnjene vrednosti" -#: ../libgimp/gimpprocview.c:198 +#: ../libgimp/gimpprocview.c:199 msgid "Additional Information" msgstr "Dodatni podatki" -#: ../libgimp/gimpprocview.c:238 +#: ../libgimp/gimpprocview.c:239 msgid "Author:" msgstr "Avtor:" -#: ../libgimp/gimpprocview.c:250 +#: ../libgimp/gimpprocview.c:251 msgid "Date:" msgstr "Datum:" -#: ../libgimp/gimpprocview.c:262 +#: ../libgimp/gimpprocview.c:263 msgid "Copyright:" msgstr "Nosilec avtorskih pravic:" @@ -433,482 +456,875 @@ msgstr "Preliv po meri" #: ../libgimpbase/gimpbaseenums.c:98 +msgctxt "brush-generated-shape" +msgid "Circle" +msgstr "Krog" + +#: ../libgimpbase/gimpbaseenums.c:99 +msgctxt "brush-generated-shape" +msgid "Square" +msgstr "Kvadrat" + +#: ../libgimpbase/gimpbaseenums.c:100 +msgctxt "brush-generated-shape" +msgid "Diamond" +msgstr "Karo" + +#: ../libgimpbase/gimpbaseenums.c:130 msgctxt "bucket-fill-mode" msgid "FG color fill" msgstr "Zapolni z barvo ospredja" -#: ../libgimpbase/gimpbaseenums.c:99 +#: ../libgimpbase/gimpbaseenums.c:131 msgctxt "bucket-fill-mode" msgid "BG color fill" msgstr "Zapolni z barvo ozadja" -#: ../libgimpbase/gimpbaseenums.c:100 +#: ../libgimpbase/gimpbaseenums.c:132 msgctxt "bucket-fill-mode" msgid "Pattern fill" msgstr "Zapolni z vzorcem" -#: ../libgimpbase/gimpbaseenums.c:131 +#: ../libgimpbase/gimpbaseenums.c:162 +msgctxt "cap-style" +msgid "Butt" +msgstr "Odebeljeni konec" + +#: ../libgimpbase/gimpbaseenums.c:163 +msgctxt "cap-style" +msgid "Round" +msgstr "Zaobljeno" + +#: ../libgimpbase/gimpbaseenums.c:164 +msgctxt "cap-style" +msgid "Square" +msgstr "Kvadrat" + +#: ../libgimpbase/gimpbaseenums.c:195 msgctxt "channel-ops" msgid "Add to the current selection" msgstr "Dodaj k trenutnemu izboru" -#: ../libgimpbase/gimpbaseenums.c:132 +#: ../libgimpbase/gimpbaseenums.c:196 msgctxt "channel-ops" msgid "Subtract from the current selection" msgstr "Odštej od trenutnega izbora" -#: ../libgimpbase/gimpbaseenums.c:133 +#: ../libgimpbase/gimpbaseenums.c:197 msgctxt "channel-ops" msgid "Replace the current selection" msgstr "Zamenjaj trenutni izbor" -#: ../libgimpbase/gimpbaseenums.c:134 +#: ../libgimpbase/gimpbaseenums.c:198 msgctxt "channel-ops" msgid "Intersect with the current selection" msgstr "Presekaj s trenutnim izborom" -#: ../libgimpbase/gimpbaseenums.c:167 +#: ../libgimpbase/gimpbaseenums.c:231 msgctxt "channel-type" msgid "Red" msgstr "Rdeča" -#: ../libgimpbase/gimpbaseenums.c:168 +#: ../libgimpbase/gimpbaseenums.c:232 msgctxt "channel-type" msgid "Green" msgstr "Zelena" -#: ../libgimpbase/gimpbaseenums.c:169 +#: ../libgimpbase/gimpbaseenums.c:233 msgctxt "channel-type" msgid "Blue" msgstr "Modra" -#: ../libgimpbase/gimpbaseenums.c:170 +#: ../libgimpbase/gimpbaseenums.c:234 msgctxt "channel-type" msgid "Gray" msgstr "Siva" -#: ../libgimpbase/gimpbaseenums.c:171 +#: ../libgimpbase/gimpbaseenums.c:235 msgctxt "channel-type" msgid "Indexed" msgstr "Indeksirana" -#: ../libgimpbase/gimpbaseenums.c:172 +#: ../libgimpbase/gimpbaseenums.c:236 msgctxt "channel-type" msgid "Alpha" msgstr "Alfa" -#: ../libgimpbase/gimpbaseenums.c:202 +#: ../libgimpbase/gimpbaseenums.c:266 msgctxt "check-size" msgid "Small" msgstr "majhen" -#: ../libgimpbase/gimpbaseenums.c:203 +#: ../libgimpbase/gimpbaseenums.c:267 msgctxt "check-size" msgid "Medium" msgstr "srednji" -#: ../libgimpbase/gimpbaseenums.c:204 +#: ../libgimpbase/gimpbaseenums.c:268 msgctxt "check-size" msgid "Large" msgstr "velik" -#: ../libgimpbase/gimpbaseenums.c:237 +#: ../libgimpbase/gimpbaseenums.c:301 msgctxt "check-type" msgid "Light checks" msgstr "svetla šahovnica" -#: ../libgimpbase/gimpbaseenums.c:238 +#: ../libgimpbase/gimpbaseenums.c:302 msgctxt "check-type" msgid "Mid-tone checks" msgstr "srednje siva šahovnica" -#: ../libgimpbase/gimpbaseenums.c:239 +#: ../libgimpbase/gimpbaseenums.c:303 msgctxt "check-type" msgid "Dark checks" msgstr "temna šahovnica" -#: ../libgimpbase/gimpbaseenums.c:240 +#: ../libgimpbase/gimpbaseenums.c:304 msgctxt "check-type" msgid "White only" msgstr "samo bela" -#: ../libgimpbase/gimpbaseenums.c:241 +#: ../libgimpbase/gimpbaseenums.c:305 msgctxt "check-type" msgid "Gray only" msgstr "samo siva" -#: ../libgimpbase/gimpbaseenums.c:242 +#: ../libgimpbase/gimpbaseenums.c:306 msgctxt "check-type" msgid "Black only" msgstr "samo črna" -#: ../libgimpbase/gimpbaseenums.c:271 +#: ../libgimpbase/gimpbaseenums.c:335 msgctxt "clone-type" msgid "Image" msgstr "Slika" -#: ../libgimpbase/gimpbaseenums.c:272 +#: ../libgimpbase/gimpbaseenums.c:336 msgctxt "clone-type" msgid "Pattern" msgstr "Vzorec" -#: ../libgimpbase/gimpbaseenums.c:302 +#: ../libgimpbase/gimpbaseenums.c:369 +msgctxt "component-type" +msgid "8-bit integer" +msgstr "8-bitna celoštevilska" + +#: ../libgimpbase/gimpbaseenums.c:370 +msgctxt "component-type" +msgid "16-bit integer" +msgstr "16-bitna celoštevilska" + +#: ../libgimpbase/gimpbaseenums.c:371 +msgctxt "component-type" +msgid "32-bit integer" +msgstr "32-bitna celoštevilska" + +#: ../libgimpbase/gimpbaseenums.c:372 +msgctxt "component-type" +msgid "16-bit floating point" +msgstr "16-bitna s plavajočo vejico" + +#: ../libgimpbase/gimpbaseenums.c:373 +msgctxt "component-type" +msgid "32-bit floating point" +msgstr "32-bitna s plavajočo vejico" + +#: ../libgimpbase/gimpbaseenums.c:374 +msgctxt "component-type" +msgid "64-bit floating point" +msgstr "64-bitna s plavajočo vejico" + +#: ../libgimpbase/gimpbaseenums.c:405 +msgctxt "convert-palette-type" +msgid "Generate optimum palette" +msgstr "Tvori optimalno paleto" + +#: ../libgimpbase/gimpbaseenums.c:406 +msgctxt "convert-palette-type" +msgid "Use web-optimized palette" +msgstr "Uporabi paleto, optimizirano za splet" + +#: ../libgimpbase/gimpbaseenums.c:407 +msgctxt "convert-palette-type" +msgid "Use black and white (1-bit) palette" +msgstr "Uporabi črno-belo (1-bitno) paleto" + +#: ../libgimpbase/gimpbaseenums.c:408 +msgctxt "convert-palette-type" +msgid "Use custom palette" +msgstr "Uporabi paleto po meri" + +#: ../libgimpbase/gimpbaseenums.c:437 +msgctxt "convolve-type" +msgid "Blur" +msgstr "Zabriši" + +#: ../libgimpbase/gimpbaseenums.c:438 +msgctxt "convolve-type" +msgid "Sharpen" +msgstr "Izostri" + +#: ../libgimpbase/gimpbaseenums.c:469 msgctxt "desaturate-mode" msgid "Lightness" msgstr "Svetlost" -#: ../libgimpbase/gimpbaseenums.c:303 +#: ../libgimpbase/gimpbaseenums.c:470 msgctxt "desaturate-mode" -msgid "Luminosity" -msgstr "Jakost osvetlitve" +msgid "Luma" +msgstr "Svetilnost" -#: ../libgimpbase/gimpbaseenums.c:304 +#: ../libgimpbase/gimpbaseenums.c:471 msgctxt "desaturate-mode" msgid "Average" msgstr "povprečno" -#: ../libgimpbase/gimpbaseenums.c:333 +#: ../libgimpbase/gimpbaseenums.c:472 +msgctxt "desaturate-mode" +msgid "Luminance" +msgstr "Svetlost" + +#: ../libgimpbase/gimpbaseenums.c:501 msgctxt "dodge-burn-type" msgid "Dodge" msgstr "cikcakasto" -#: ../libgimpbase/gimpbaseenums.c:334 +#: ../libgimpbase/gimpbaseenums.c:502 msgctxt "dodge-burn-type" msgid "Burn" msgstr "vžgano" -#: ../libgimpbase/gimpbaseenums.c:400 +#: ../libgimpbase/gimpbaseenums.c:534 +msgctxt "fill-type" +msgid "Foreground color" +msgstr "Barva ospredja" + +#: ../libgimpbase/gimpbaseenums.c:535 +msgctxt "fill-type" +msgid "Background color" +msgstr "Barva ozadja" + +#: ../libgimpbase/gimpbaseenums.c:536 +msgctxt "fill-type" +msgid "White" +msgstr "Bela" + +#: ../libgimpbase/gimpbaseenums.c:537 +msgctxt "fill-type" +msgid "Transparency" +msgstr "Prosojnost" + +#: ../libgimpbase/gimpbaseenums.c:538 +msgctxt "fill-type" +msgid "Pattern" +msgstr "Vzorec" + +#: ../libgimpbase/gimpbaseenums.c:674 msgctxt "gradient-type" msgid "Linear" msgstr "linearno" -#: ../libgimpbase/gimpbaseenums.c:401 +#: ../libgimpbase/gimpbaseenums.c:675 msgctxt "gradient-type" msgid "Bi-linear" msgstr "bi-linearno" -#: ../libgimpbase/gimpbaseenums.c:402 +#: ../libgimpbase/gimpbaseenums.c:676 msgctxt "gradient-type" msgid "Radial" msgstr "krožno" -#: ../libgimpbase/gimpbaseenums.c:403 +#: ../libgimpbase/gimpbaseenums.c:677 msgctxt "gradient-type" msgid "Square" msgstr "kvadratno" -#: ../libgimpbase/gimpbaseenums.c:404 +#: ../libgimpbase/gimpbaseenums.c:678 msgctxt "gradient-type" msgid "Conical (sym)" msgstr "stožčasto (simetrično)" -#: ../libgimpbase/gimpbaseenums.c:405 +#: ../libgimpbase/gimpbaseenums.c:679 msgctxt "gradient-type" msgid "Conical (asym)" msgstr "stožčasto (asimetrično)" -#: ../libgimpbase/gimpbaseenums.c:406 +#: ../libgimpbase/gimpbaseenums.c:680 msgctxt "gradient-type" msgid "Shaped (angular)" msgstr "oblikovano (kotno)" -#: ../libgimpbase/gimpbaseenums.c:407 +#: ../libgimpbase/gimpbaseenums.c:681 msgctxt "gradient-type" msgid "Shaped (spherical)" msgstr "oblikovano (kroglasto)" -#: ../libgimpbase/gimpbaseenums.c:408 +#: ../libgimpbase/gimpbaseenums.c:682 msgctxt "gradient-type" msgid "Shaped (dimpled)" msgstr "oblikovano (vdrto)" -#: ../libgimpbase/gimpbaseenums.c:409 +#: ../libgimpbase/gimpbaseenums.c:683 msgctxt "gradient-type" msgid "Spiral (cw)" msgstr "spiralno (v SUK)" -#: ../libgimpbase/gimpbaseenums.c:410 +#: ../libgimpbase/gimpbaseenums.c:684 msgctxt "gradient-type" msgid "Spiral (ccw)" msgstr "spiralno (v nasprotni SUK)" -#: ../libgimpbase/gimpbaseenums.c:442 +#: ../libgimpbase/gimpbaseenums.c:716 msgctxt "grid-style" msgid "Intersections (dots)" msgstr "Točke preseka (pike)" -#: ../libgimpbase/gimpbaseenums.c:443 +#: ../libgimpbase/gimpbaseenums.c:717 msgctxt "grid-style" msgid "Intersections (crosshairs)" msgstr "Točke preseka (križci)" -#: ../libgimpbase/gimpbaseenums.c:444 +#: ../libgimpbase/gimpbaseenums.c:718 msgctxt "grid-style" msgid "Dashed" msgstr "črtkano" -#: ../libgimpbase/gimpbaseenums.c:445 +#: ../libgimpbase/gimpbaseenums.c:719 msgctxt "grid-style" msgid "Double dashed" msgstr "dvojno črtkano" -#: ../libgimpbase/gimpbaseenums.c:446 +#: ../libgimpbase/gimpbaseenums.c:720 msgctxt "grid-style" msgid "Solid" msgstr "zapolnjeno" -#: ../libgimpbase/gimpbaseenums.c:476 +#: ../libgimpbase/gimpbaseenums.c:790 msgctxt "icon-type" -msgid "Stock ID" -msgstr "ID vrste" +msgid "Icon name" +msgstr "Ime ikone" -#: ../libgimpbase/gimpbaseenums.c:477 +#: ../libgimpbase/gimpbaseenums.c:791 msgctxt "icon-type" msgid "Inline pixbuf" msgstr "Medvrstični medpomnilnik slikovnih točk" -#: ../libgimpbase/gimpbaseenums.c:478 +#: ../libgimpbase/gimpbaseenums.c:792 msgctxt "icon-type" msgid "Image file" msgstr "Slikovna datoteka" -#: ../libgimpbase/gimpbaseenums.c:508 +#: ../libgimpbase/gimpbaseenums.c:822 msgctxt "image-base-type" msgid "RGB color" msgstr "barva RGB" -#: ../libgimpbase/gimpbaseenums.c:509 +#: ../libgimpbase/gimpbaseenums.c:823 msgctxt "image-base-type" msgid "Grayscale" msgstr "sivinsko" -#: ../libgimpbase/gimpbaseenums.c:510 +#: ../libgimpbase/gimpbaseenums.c:824 msgctxt "image-base-type" msgid "Indexed color" msgstr "indeksirana barva" -#: ../libgimpbase/gimpbaseenums.c:543 +#: ../libgimpbase/gimpbaseenums.c:857 msgctxt "image-type" msgid "RGB" msgstr "RGB" -#: ../libgimpbase/gimpbaseenums.c:544 +#: ../libgimpbase/gimpbaseenums.c:858 msgctxt "image-type" msgid "RGB-alpha" msgstr "RGB-alfa" -#: ../libgimpbase/gimpbaseenums.c:545 +#: ../libgimpbase/gimpbaseenums.c:859 msgctxt "image-type" msgid "Grayscale" msgstr "sivinsko" -#: ../libgimpbase/gimpbaseenums.c:546 +#: ../libgimpbase/gimpbaseenums.c:860 msgctxt "image-type" msgid "Grayscale-alpha" msgstr "sivinsko-alfa" -#: ../libgimpbase/gimpbaseenums.c:547 +#: ../libgimpbase/gimpbaseenums.c:861 msgctxt "image-type" msgid "Indexed" msgstr "indeksirano" -#: ../libgimpbase/gimpbaseenums.c:548 +#: ../libgimpbase/gimpbaseenums.c:862 msgctxt "image-type" msgid "Indexed-alpha" msgstr "indeksirano-alfa" -#: ../libgimpbase/gimpbaseenums.c:579 +#: ../libgimpbase/gimpbaseenums.c:892 +msgctxt "ink-blob-type" +msgid "Circle" +msgstr "Krog" + +#: ../libgimpbase/gimpbaseenums.c:893 +msgctxt "ink-blob-type" +msgid "Square" +msgstr "Kvadrat" + +#: ../libgimpbase/gimpbaseenums.c:894 +msgctxt "ink-blob-type" +msgid "Diamond" +msgstr "Karo" + +#: ../libgimpbase/gimpbaseenums.c:926 msgctxt "interpolation-type" msgid "None" msgstr "brez" -#: ../libgimpbase/gimpbaseenums.c:580 +#: ../libgimpbase/gimpbaseenums.c:927 msgctxt "interpolation-type" msgid "Linear" -msgstr "linearen" +msgstr "linearna" -#: ../libgimpbase/gimpbaseenums.c:581 +#: ../libgimpbase/gimpbaseenums.c:928 msgctxt "interpolation-type" msgid "Cubic" msgstr "kubična" -#: ../libgimpbase/gimpbaseenums.c:582 +#: ../libgimpbase/gimpbaseenums.c:929 msgctxt "interpolation-type" -msgid "Sinc (Lanczos3)" -msgstr "Sinc (Lanczos3)" +msgid "NoHalo" +msgstr "brezodsevna" -#: ../libgimpbase/gimpbaseenums.c:611 +#: ../libgimpbase/gimpbaseenums.c:930 +msgctxt "interpolation-type" +msgid "LoHalo" +msgstr "nizkoodsevna" + +#: ../libgimpbase/gimpbaseenums.c:960 +msgctxt "join-style" +msgid "Miter" +msgstr "Sredica" + +#: ../libgimpbase/gimpbaseenums.c:961 +msgctxt "join-style" +msgid "Round" +msgstr "Zaobljeno" + +#: ../libgimpbase/gimpbaseenums.c:962 +msgctxt "join-style" +msgid "Bevel" +msgstr "Izbočeno" + +#: ../libgimpbase/gimpbaseenums.c:1118 +msgctxt "orientation-type" +msgid "Horizontal" +msgstr "Vodoravno" + +#: ../libgimpbase/gimpbaseenums.c:1119 +msgctxt "orientation-type" +msgid "Vertical" +msgstr "Navpično" + +#: ../libgimpbase/gimpbaseenums.c:1120 +msgctxt "orientation-type" +msgid "Unknown" +msgstr "Neznano" + +#: ../libgimpbase/gimpbaseenums.c:1149 msgctxt "paint-application-mode" msgid "Constant" msgstr "konstantna" -#: ../libgimpbase/gimpbaseenums.c:612 +#: ../libgimpbase/gimpbaseenums.c:1150 msgctxt "paint-application-mode" msgid "Incremental" msgstr "naraščajoča" -#: ../libgimpbase/gimpbaseenums.c:642 +#: ../libgimpbase/gimpbaseenums.c:1283 +msgctxt "pdb-proc-type" +msgid "Internal GIMP procedure" +msgstr "Notranja procedura GIMP" + +#: ../libgimpbase/gimpbaseenums.c:1284 +msgctxt "pdb-proc-type" +msgid "GIMP Plug-In" +msgstr "Vtičnik GIMP" + +#: ../libgimpbase/gimpbaseenums.c:1285 +msgctxt "pdb-proc-type" +msgid "GIMP Extension" +msgstr "Razširitev GIMP" + +#: ../libgimpbase/gimpbaseenums.c:1286 +msgctxt "pdb-proc-type" +msgid "Temporary Procedure" +msgstr "Začasna procedura" + +#: ../libgimpbase/gimpbaseenums.c:1361 +msgctxt "precision" +msgid "8-bit linear integer" +msgstr "8-bitna celoštevilska (linearna)" + +#: ../libgimpbase/gimpbaseenums.c:1362 +msgctxt "precision" +msgid "8-bit gamma integer" +msgstr "8-bitna celoštevilska (gama)" + +#: ../libgimpbase/gimpbaseenums.c:1363 +msgctxt "precision" +msgid "16-bit linear integer" +msgstr "16-bitna celoštevilska (linearna)" + +#: ../libgimpbase/gimpbaseenums.c:1364 +msgctxt "precision" +msgid "16-bit gamma integer" +msgstr "16-bitna celoštevilska (gama)" + +#: ../libgimpbase/gimpbaseenums.c:1365 +msgctxt "precision" +msgid "32-bit linear integer" +msgstr "32-bitna celoštevilska (linearna)" + +#: ../libgimpbase/gimpbaseenums.c:1366 +msgctxt "precision" +msgid "32-bit gamma integer" +msgstr "32-bitna celoštevilska (gama)" + +#: ../libgimpbase/gimpbaseenums.c:1367 +msgctxt "precision" +msgid "16-bit linear floating point" +msgstr "16-bitna s plavajočo vejico (linearna)" + +#: ../libgimpbase/gimpbaseenums.c:1368 +msgctxt "precision" +msgid "16-bit gamma floating point" +msgstr "16-bitna s plavajočo vejico (gama)" + +#: ../libgimpbase/gimpbaseenums.c:1369 +msgctxt "precision" +msgid "32-bit linear floating point" +msgstr "32-bitna s plavajočo vejico (linearna)" + +#: ../libgimpbase/gimpbaseenums.c:1370 +msgctxt "precision" +msgid "32-bit gamma floating point" +msgstr "32-bitna s plavajočo vejico (gama)" + +#: ../libgimpbase/gimpbaseenums.c:1371 +msgctxt "precision" +msgid "64-bit linear floating point" +msgstr "64-bitna s plavajočo vejico (linearna)" + +#: ../libgimpbase/gimpbaseenums.c:1372 +msgctxt "precision" +msgid "64-bit gamma floating point" +msgstr "64-bitna s plavajočo vejico (gama)" + +#: ../libgimpbase/gimpbaseenums.c:1441 msgctxt "repeat-mode" -msgid "None" -msgstr "brez" +msgid "None (extend)" +msgstr "Brez (razširi)" -#: ../libgimpbase/gimpbaseenums.c:643 +#: ../libgimpbase/gimpbaseenums.c:1442 msgctxt "repeat-mode" msgid "Sawtooth wave" msgstr "Žagasti val" -#: ../libgimpbase/gimpbaseenums.c:644 +#: ../libgimpbase/gimpbaseenums.c:1443 msgctxt "repeat-mode" msgid "Triangular wave" msgstr "Trikotni val" -#: ../libgimpbase/gimpbaseenums.c:674 +#: ../libgimpbase/gimpbaseenums.c:1444 +msgctxt "repeat-mode" +msgid "Truncate" +msgstr "Poreži" + +#: ../libgimpbase/gimpbaseenums.c:1506 msgctxt "run-mode" msgid "Run interactively" msgstr "Zaženi interaktivno" -#: ../libgimpbase/gimpbaseenums.c:675 +#: ../libgimpbase/gimpbaseenums.c:1507 msgctxt "run-mode" msgid "Run non-interactively" msgstr "Zaženi neinteraktivno" -#: ../libgimpbase/gimpbaseenums.c:676 +#: ../libgimpbase/gimpbaseenums.c:1508 msgctxt "run-mode" msgid "Run with last used values" msgstr "Zaženi z nazadnje uporabljenimi vrednostmi" -#: ../libgimpbase/gimpbaseenums.c:705 +#: ../libgimpbase/gimpbaseenums.c:1543 +msgctxt "select-criterion" +msgid "Composite" +msgstr "Kompozitno" + +#: ../libgimpbase/gimpbaseenums.c:1544 +msgctxt "select-criterion" +msgid "Red" +msgstr "Rdeča" + +#: ../libgimpbase/gimpbaseenums.c:1545 +msgctxt "select-criterion" +msgid "Green" +msgstr "Zelena" + +#: ../libgimpbase/gimpbaseenums.c:1546 +msgctxt "select-criterion" +msgid "Blue" +msgstr "Modra" + +#: ../libgimpbase/gimpbaseenums.c:1547 +msgctxt "select-criterion" +msgid "Hue" +msgstr "Obarvanost" + +#: ../libgimpbase/gimpbaseenums.c:1548 +msgctxt "select-criterion" +msgid "Saturation" +msgstr "Nasičenost" + +#: ../libgimpbase/gimpbaseenums.c:1549 +msgctxt "select-criterion" +msgid "Value" +msgstr "Vrednost" + +#: ../libgimpbase/gimpbaseenums.c:1550 +msgctxt "select-criterion" +msgid "Alpha" +msgstr "Alfa" + +#: ../libgimpbase/gimpbaseenums.c:1579 msgctxt "size-type" msgid "Pixels" msgstr "Slikovne točke" -#: ../libgimpbase/gimpbaseenums.c:706 +#: ../libgimpbase/gimpbaseenums.c:1580 msgctxt "size-type" msgid "Points" msgstr "Točke" -#: ../libgimpbase/gimpbaseenums.c:736 +#: ../libgimpbase/gimpbaseenums.c:1641 +msgctxt "stroke-method" +msgid "Stroke line" +msgstr "Črta poteze" + +#: ../libgimpbase/gimpbaseenums.c:1642 +msgctxt "stroke-method" +msgid "Stroke with a paint tool" +msgstr "Vlečenje potez z orodjem za risanje" + +#: ../libgimpbase/gimpbaseenums.c:1671 +msgctxt "text-direction" +msgid "From left to right" +msgstr "Od leve proti desni" + +#: ../libgimpbase/gimpbaseenums.c:1672 +msgctxt "text-direction" +msgid "From right to left" +msgstr "Od desne proti levi" + +#: ../libgimpbase/gimpbaseenums.c:1703 +msgctxt "text-hint-style" +msgid "None" +msgstr "brez" + +#: ../libgimpbase/gimpbaseenums.c:1704 +msgctxt "text-hint-style" +msgid "Slight" +msgstr "Rahlo" + +#: ../libgimpbase/gimpbaseenums.c:1705 +msgctxt "text-hint-style" +msgid "Medium" +msgstr "Srednje" + +#: ../libgimpbase/gimpbaseenums.c:1706 +msgctxt "text-hint-style" +msgid "Full" +msgstr "Polno" + +#: ../libgimpbase/gimpbaseenums.c:1737 +msgctxt "text-justification" +msgid "Left justified" +msgstr "Levo poravnano" + +#: ../libgimpbase/gimpbaseenums.c:1738 +msgctxt "text-justification" +msgid "Right justified" +msgstr "Desno poravnano" + +#: ../libgimpbase/gimpbaseenums.c:1739 +msgctxt "text-justification" +msgid "Centered" +msgstr "Sredinsko" + +#: ../libgimpbase/gimpbaseenums.c:1740 +msgctxt "text-justification" +msgid "Filled" +msgstr "Zapolnjeno" + +#: ../libgimpbase/gimpbaseenums.c:1770 msgctxt "transfer-mode" msgid "Shadows" msgstr "Sence" -#: ../libgimpbase/gimpbaseenums.c:737 +#: ../libgimpbase/gimpbaseenums.c:1771 msgctxt "transfer-mode" msgid "Midtones" msgstr "Srednji toni" -#: ../libgimpbase/gimpbaseenums.c:738 +#: ../libgimpbase/gimpbaseenums.c:1772 msgctxt "transfer-mode" msgid "Highlights" msgstr "Svetli toni" -#: ../libgimpbase/gimpbaseenums.c:767 +#: ../libgimpbase/gimpbaseenums.c:1801 msgctxt "transform-direction" msgid "Normal (Forward)" msgstr "Navadno (naprej)" -#: ../libgimpbase/gimpbaseenums.c:768 +#: ../libgimpbase/gimpbaseenums.c:1802 msgctxt "transform-direction" msgid "Corrective (Backward)" msgstr "Popravljalno (nazaj)" -#: ../libgimpbase/gimpbaseenums.c:799 +#: ../libgimpbase/gimpbaseenums.c:1833 msgctxt "transform-resize" msgid "Adjust" msgstr "Prilagodi" -#: ../libgimpbase/gimpbaseenums.c:800 +#: ../libgimpbase/gimpbaseenums.c:1834 msgctxt "transform-resize" msgid "Clip" msgstr "Poreži" -#: ../libgimpbase/gimpbaseenums.c:801 +#: ../libgimpbase/gimpbaseenums.c:1835 msgctxt "transform-resize" msgid "Crop to result" msgstr "Obreži do rezultata" -#: ../libgimpbase/gimpbaseenums.c:802 +#: ../libgimpbase/gimpbaseenums.c:1836 msgctxt "transform-resize" msgid "Crop with aspect" msgstr "Obreži v razmerju stranic" -#: ../libgimpbase/gimpbaseenums.c:935 -msgctxt "pdb-proc-type" -msgid "Internal GIMP procedure" -msgstr "Notranja procedura GIMP" +#: ../libgimpbase/gimpmetadata.c:523 +#, c-format +msgid "Can load metadata only from local files" +msgstr "Metapodatke je mogoče naložiti le s krajevnih datotek" -#: ../libgimpbase/gimpbaseenums.c:936 -msgctxt "pdb-proc-type" -msgid "GIMP Plug-In" -msgstr "Vtičnik GIMP" +#: ../libgimpbase/gimpmetadata.c:583 +#, c-format +msgid "Can save metadata only to local files" +msgstr "Metapodatke je mogoče shraniti le v krajevne datoteke" -#: ../libgimpbase/gimpbaseenums.c:937 -msgctxt "pdb-proc-type" -msgid "GIMP Extension" -msgstr "Razširitev GIMP" +#: ../libgimpbase/gimpmetadata.c:658 +#, c-format +msgid "Parsing Exif data failed." +msgstr "Razčlenjevanje podatkov Exif je spodletelo." -#: ../libgimpbase/gimpbaseenums.c:938 -msgctxt "pdb-proc-type" -msgid "Temporary Procedure" -msgstr "Začasna procedura" +#: ../libgimpbase/gimpmetadata.c:709 +#, c-format +msgid "Parsing XMP data failed." +msgstr "Razčlenjevanje podatkov XMP je spodletelo." -#: ../libgimpbase/gimpbaseenums.c:1105 -msgctxt "text-direction" -msgid "From left to right" -msgstr "Od leve proti desni" +#: ../libgimpbase/gimputils.c:192 ../libgimpbase/gimputils.c:197 +msgid "(invalid UTF-8 string)" +msgstr "(neveljaven niz UTF-8)" -#: ../libgimpbase/gimpbaseenums.c:1106 -msgctxt "text-direction" -msgid "From right to left" -msgstr "Od desne proti levi" +#: ../libgimpbase/gimputils.c:367 +msgid "File path is NULL" +msgstr "Pot datoteke je ničelna (NULL)" -#: ../libgimpbase/gimpbaseenums.c:1137 -msgctxt "text-hint-style" -msgid "None" -msgstr "brez" +#: ../libgimpbase/gimputils.c:376 ../libgimpbase/gimputils.c:387 +msgid "Error converting UTF-8 filename to wide char" +msgstr "Napaka pri pretvorbi imena datoteke UTF-8 v široke znake" -#: ../libgimpbase/gimpbaseenums.c:1138 -msgctxt "text-hint-style" -msgid "Slight" -msgstr "Rahlo" +#: ../libgimpbase/gimputils.c:395 +msgid "ILCreateFromPath() failed" +msgstr "Ukaz ILCreateFromPath() je spodletel" -#: ../libgimpbase/gimpbaseenums.c:1139 -msgctxt "text-hint-style" -msgid "Medium" -msgstr "Srednje" +#: ../libgimpbase/gimputils.c:432 +#, c-format +msgid "Cannot convert '%s' into a valid NSURL." +msgstr "'%s' ni mogoče pretvoriti v veljaven NSURL." -#: ../libgimpbase/gimpbaseenums.c:1140 -msgctxt "text-hint-style" -msgid "Full" -msgstr "Polno" +#: ../libgimpbase/gimputils.c:460 +msgid "Connecting to org.freedesktop.FileManager1 failed: " +msgstr "Povezovanje z org.freedesktop.FileManager1 je spodletelo: " -#: ../libgimpbase/gimpbaseenums.c:1171 -msgctxt "text-justification" -msgid "Left justified" -msgstr "Levo poravnano" +#: ../libgimpbase/gimputils.c:484 +msgid "Calling ShowItems failed: " +msgstr "Klic ShowItems je spodletel: " -#: ../libgimpbase/gimpbaseenums.c:1172 -msgctxt "text-justification" -msgid "Right justified" -msgstr "Desno poravnano" +#: ../libgimpcolor/gimpcolorprofile.c:269 +#, c-format +msgid "'%s' does not appear to be an ICC color profile" +msgstr "'%s' ni videti barvni profil ICC" -#: ../libgimpbase/gimpbaseenums.c:1173 -msgctxt "text-justification" -msgid "Centered" -msgstr "Sredinsko" +#: ../libgimpcolor/gimpcolorprofile.c:315 +msgid "Data does not appear to be an ICC color profile" +msgstr "Podatki se ne zdijo barvni profil ICC" -#: ../libgimpbase/gimpbaseenums.c:1174 -msgctxt "text-justification" -msgid "Filled" -msgstr "Zapolnjeno" +#: ../libgimpcolor/gimpcolorprofile.c:372 +msgid "Could not save color profile to memory" +msgstr "Barvnega profila ni mogoče shraniti v pomnilnik" -#: ../libgimpbase/gimputils.c:178 -#: ../libgimpbase/gimputils.c:183 -#: ../modules/color-selector-cmyk-lcms.c:424 -#: ../modules/color-selector-cmyk-lcms.c:430 -#: ../modules/display-filter-lcms.c:178 -msgid "(invalid UTF-8 string)" -msgstr "(neveljaven niz UTF-8)" +#: ../libgimpcolor/gimpcolorprofile.c:590 +msgid "(unnamed profile)" +msgstr "(neimenovani profil)" + +#: ../libgimpcolor/gimpcolorprofile.c:632 +#, c-format +msgid "Model: %s" +msgstr "Model: %s" + +#: ../libgimpcolor/gimpcolorprofile.c:641 +#, c-format +msgid "Manufacturer: %s" +msgstr "Izdelovalec: %s" + +#: ../libgimpcolor/gimpcolorprofile.c:650 +#, c-format +msgid "Copyright: %s" +msgstr "Avtorske pravice: %s" + +#: ../libgimpconfig/gimpconfigenums.c:24 +msgctxt "color-management-mode" +msgid "No color management" +msgstr "Brez upravljanja barv" + +#: ../libgimpconfig/gimpconfigenums.c:25 +msgctxt "color-management-mode" +msgid "Color-managed display" +msgstr "Zaslon z upravljanjem barv" + +#: ../libgimpconfig/gimpconfigenums.c:26 +msgctxt "color-management-mode" +msgid "Soft-proofing" +msgstr "" + +#: ../libgimpconfig/gimpconfigenums.c:57 +msgctxt "color-rendering-intent" +msgid "Perceptual" +msgstr "Zaznavno" + +#: ../libgimpconfig/gimpconfigenums.c:58 +msgctxt "color-rendering-intent" +msgid "Relative colorimetric" +msgstr "Relativne barvne vrednosti (kalorimetrično)" + +#: ../libgimpconfig/gimpconfigenums.c:59 +msgctxt "color-rendering-intent" +msgid "Saturation" +msgstr "Nasičenost" + +#: ../libgimpconfig/gimpconfigenums.c:60 +msgctxt "color-rendering-intent" +msgid "Absolute colorimetric" +msgstr "Absolutne barvne vrednosti (kalorimetrično)" #. * #. * SECTION: gimpcolorconfig @@ -918,211 +1334,295 @@ #. * Color management settings. #. * #: ../libgimpconfig/gimpcolorconfig.c:52 -msgid "Mode of operation for color management." -msgstr "Način upravljanja z barvami." +msgid "How images are displayed on screen." +msgstr "Kako so slike prikazane na zaslonu." -#: ../libgimpconfig/gimpcolorconfig.c:54 +#: ../libgimpconfig/gimpcolorconfig.c:55 msgid "The color profile of your (primary) monitor." msgstr "Barvni profil vašega (primarnega) zaslona." -#: ../libgimpconfig/gimpcolorconfig.c:56 -msgid "When enabled, GIMP will try to use the display color profile from the windowing system. The configured monitor profile is then only used as a fallback." -msgstr "Če je vključeno, bo GIMP uporabil prikazani barvni profil okenskega sistema. Nastavljeni profil monitorja bo tedaj uporabljen le kot nadomestni." - -#: ../libgimpconfig/gimpcolorconfig.c:60 -msgid "The default RGB working space color profile." -msgstr "Privzeti barvni profil RGB delovne površine." +#: ../libgimpconfig/gimpcolorconfig.c:58 +msgid "" +"When enabled, GIMP will try to use the display color profile from the " +"windowing system. The configured monitor profile is then only used as a " +"fallback." +msgstr "" +"Če je vključeno, bo GIMP uporabil prikazani barvni profil okenskega " +"sistema. Nastavljeni profil monitorja bo tedaj uporabljen le kot nadomestni." -#: ../libgimpconfig/gimpcolorconfig.c:62 -msgid "The CMYK color profile used to convert between RGB and CMYK." -msgstr "Barvni profik CMYK, uporabljen za pretvorbo med RGB in CMYK." +#: ../libgimpconfig/gimpcolorconfig.c:63 +msgid "" +"The preferred RGB working space color profile. It will be offered next to " +"the built-in RGB profile when a color profile can be chosen." +msgstr "" +"Prednostni barvni profil delovnega prostora RGB. Ponujene je poleg " +"vgrajenega profila RGB, ko lahko izbirate barvni profil." -#: ../libgimpconfig/gimpcolorconfig.c:64 -msgid "The color profile used for simulating a printed version (softproof)." -msgstr "Barvni profil, uporabljen za simulacijo tiskane različice (programsko preverjanje)." - -#: ../libgimpconfig/gimpcolorconfig.c:66 -msgid "Sets how colors are mapped for your display." -msgstr "Nastavi preslikavo barv za vaš zaslon." - -#: ../libgimpconfig/gimpcolorconfig.c:68 -msgid "Sets how colors are converted from RGB working space to the print simulation device." -msgstr "Določa pretvorbo barv med delovnim prostorom RGB in napravo simulacije tiskanja." +#: ../libgimpconfig/gimpcolorconfig.c:67 +msgid "" +"The preferred grayscale working space color profile. It will be offered next " +"to the built-in grayscale profile when a color profile can be chosen." +msgstr "" +"Prednostni barvni profil sivinskega delovnega prostora. Ponujen je poleg " +"vgrajenega sivinskega profila, ko lahko izbirate barvni profil." #: ../libgimpconfig/gimpcolorconfig.c:71 -msgid "When enabled, the print simulation will mark colors which can not be represented in the target color space." -msgstr "Če je vključeno, bo simulacija tiskanja označila tiste barve, ki jih ni mogoče predstaviti v ciljnem barvnem prostoru." +msgid "The CMYK color profile used to convert between RGB and CMYK." +msgstr "Barvni profik CMYK, uporabljen za pretvorbo med RGB in CMYK." #: ../libgimpconfig/gimpcolorconfig.c:74 +msgid "" +"The color profile to use for soft-proofing from your image's color space to " +"some other color space, including soft-proofing to a printer or other output " +"device profile. " +msgstr "" +"Barvni profil za mehko preverjanje iz barvnega prostora vaše slike v drug " +"barvni prostor, vključno z mehkim preverjanjem s tiskalnikom ali profilom " +"druge izhodne naprave. " + +#: ../libgimpconfig/gimpcolorconfig.c:79 +msgid "" +"How colors are converted from your image's color space to your display " +"device. Relative colorimetric is usually the best choice. Unless you use a " +"LUT monitor profile (most monitor profiles are matrix), choosing perceptual " +"intent really gives you relative colorimetric." +msgstr "" +"Kako naj se barve iz barvnega prostora vaših slik pretvorijo na napravo z " +"zaslonom. Relativno kolorimetrično je običajno najboljša izbira. Če ne " +"izberete profila zaslona LUT (večina profilov zaslonov je matričnih), vam " +"izbira zaznavnega načina dejansko vrne relativno kolorimetrično vrednost." + +#: ../libgimpconfig/gimpcolorconfig.c:86 +msgid "" +"Do use black point compensation (unless you know you have a reason not to)." +msgstr "" +"Uporabi kompenzacijo črne točke (razen če veste za razlog, da tega ne bi " +"uporabili)." + +#: ../libgimpconfig/gimpcolorconfig.c:90 +msgid "" +"When disabled, image display might be of better quality at the cost of speed." +msgstr "" + +#: ../libgimpconfig/gimpcolorconfig.c:94 +msgid "" +"How colors are converted from your image's color space to the output " +"simulation device (usually your monitor). Try them all and choose what looks " +"the best. " +msgstr "" +"Kako so barve iz barvnega prostora vaše slike pretvorjene v simuliran barvni " +"prostor izhodne naprave (običajno vaš zaslon). Poskusite vse in izberite " +"tisto nastavitev, ki je videti najboljša." + +#: ../libgimpconfig/gimpcolorconfig.c:99 +msgid "" +"Try with and without black point compensation and choose what looks best. " +msgstr "Poskusite z in brez kompenzacije črne točke in izberite boljšo metodo." + +#: ../libgimpconfig/gimpcolorconfig.c:103 +msgid "" +"When disabled, soft-proofing might be of better quality at the cost of speed." +msgstr "" + +#: ../libgimpconfig/gimpcolorconfig.c:107 +msgid "" +"When enabled, the soft-proofing will mark colors which can not be " +"represented in the target color space." +msgstr "" +"Če je vključeno, bo simulacija označila tiste barve, ki jih ni mogoče " +"predstaviti v ciljnem barvnem prostoru." + +#: ../libgimpconfig/gimpcolorconfig.c:111 msgid "The color to use for marking colors which are out of gamut." -msgstr "Barva, ki naj bo uporabljena za označevanje barv, ki so zunaj barvnega obsega." +msgstr "" +"Barva, ki naj bo uporabljena za označevanje barv, ki so zunaj barvnega " +"obsega." + +#: ../libgimpconfig/gimpcolorconfig.c:199 +msgid "Mode of operation" +msgstr "Način delovanja" + +#: ../libgimpconfig/gimpcolorconfig.c:207 +msgid "Preferred RGB profile" +msgstr "Prednostni profil RGB" + +#: ../libgimpconfig/gimpcolorconfig.c:214 +msgid "Preferred grayscale profile" +msgstr "Prednostni sivinski profil" + +#: ../libgimpconfig/gimpcolorconfig.c:221 +msgid "CMYK profile" +msgstr "Profil CMYK" + +#: ../libgimpconfig/gimpcolorconfig.c:228 +msgid "Monitor profile" +msgstr "Profil zaslona" + +#: ../libgimpconfig/gimpcolorconfig.c:235 +msgid "Use the system monitor profile" +msgstr "Uporabi sistemski profil zaslona" + +#: ../libgimpconfig/gimpcolorconfig.c:243 +msgid "Simulation profile for soft-proofing" +msgstr "" + +#: ../libgimpconfig/gimpcolorconfig.c:250 +msgid "Display rendering intent" +msgstr "Namen upodabljanja prikaza" + +#: ../libgimpconfig/gimpcolorconfig.c:258 +msgid "Use black point compensation for the display" +msgstr "Uporabi kompenzacijo črnih točk za zaslon" + +#: ../libgimpconfig/gimpcolorconfig.c:265 +msgid "Optimize display color transformations" +msgstr "Optimiziraj barvne transformacije za zaslon" + +#: ../libgimpconfig/gimpcolorconfig.c:272 +msgid "Soft-proofing rendering intent" +msgstr "" -#: ../libgimpconfig/gimpcolorconfig-enums.c:24 -msgctxt "color-management-mode" -msgid "No color management" -msgstr "Brez upravljanja barv" +#: ../libgimpconfig/gimpcolorconfig.c:280 +msgid "Use black point compensation for soft-proofing" +msgstr "Uporabi kompenzacijo črne točke za preverjanje videza" -#: ../libgimpconfig/gimpcolorconfig-enums.c:25 -msgctxt "color-management-mode" -msgid "Color managed display" -msgstr "Zaslon z upravljanjem barv" +#: ../libgimpconfig/gimpcolorconfig.c:287 +msgid "Optimize soft-proofing color transformations" +msgstr "Optimiziraj barvne transformacije za preverjanje" -#: ../libgimpconfig/gimpcolorconfig-enums.c:26 -msgctxt "color-management-mode" -msgid "Print simulation" -msgstr "Simulacija tiskanja" +#: ../libgimpconfig/gimpcolorconfig.c:294 +msgid "Mark out of gamut colors" +msgstr "Označi barve zunaj barvnega obsega" -#: ../libgimpconfig/gimpcolorconfig-enums.c:57 -msgctxt "color-rendering-intent" -msgid "Perceptual" -msgstr "Zaznavno" +#: ../libgimpconfig/gimpcolorconfig.c:301 +msgid "Out of gamut warning color" +msgstr "Opozorilna barva preseganja obsega" -#: ../libgimpconfig/gimpcolorconfig-enums.c:58 -msgctxt "color-rendering-intent" -msgid "Relative colorimetric" -msgstr "relativne barvne vrednosti (kalorimetrično)" +#: ../libgimpconfig/gimpcolorconfig.c:656 +#: ../libgimpconfig/gimpcolorconfig.c:818 +#, c-format +msgid "Color profile '%s' is not for RGB color space." +msgstr "Barvni profil ‘%s’ ni za barvni prostor RGB." -#: ../libgimpconfig/gimpcolorconfig-enums.c:59 -msgctxt "color-rendering-intent" -msgid "Saturation" -msgstr "Nasičenost" +#: ../libgimpconfig/gimpcolorconfig.c:694 +#: ../libgimpconfig/gimpcolorconfig.c:859 +#, c-format +msgid "Color profile '%s' is not for GRAY color space." +msgstr "Barvni profil ‘%s’ ni za sivinski barvni prostor." -#: ../libgimpconfig/gimpcolorconfig-enums.c:60 -msgctxt "color-rendering-intent" -msgid "Absolute colorimetric" -msgstr "absolutne barvne vrednosti (kalorimetrično)" +#: ../libgimpconfig/gimpcolorconfig.c:732 +#: ../libgimpconfig/gimpcolorconfig.c:900 +#, c-format +msgid "Color profile '%s' is not for CMYK color space." +msgstr "Barvni profil ‘%s’ ni za barvni prostor CMYK." -#: ../libgimpconfig/gimpconfig-deserialize.c:106 +#: ../libgimpconfig/gimpconfig-deserialize.c:113 #, c-format msgid "value for token %s is not a valid UTF-8 string" msgstr "vrednost za žeton %s ni veljaven niz UTF-8" #. please don't translate 'yes' and 'no' -#: ../libgimpconfig/gimpconfig-deserialize.c:444 +#: ../libgimpconfig/gimpconfig-deserialize.c:464 #, c-format msgid "expected 'yes' or 'no' for boolean token %s, got '%s'" -msgstr "za logični žeton %s je pričakovana vrednost 'yes' ali 'no', vrnjena vrednost pa je '%s'" +msgstr "" +"za logični žeton %s je pričakovana vrednost 'yes' ali 'no', vrnjena vrednost " +"pa je '%s'" -#: ../libgimpconfig/gimpconfig-deserialize.c:518 +#: ../libgimpconfig/gimpconfig-deserialize.c:538 #, c-format msgid "invalid value '%s' for token %s" msgstr "neveljavna vrednost '%s' za žeton %s" -#: ../libgimpconfig/gimpconfig-deserialize.c:533 +#: ../libgimpconfig/gimpconfig-deserialize.c:553 #, c-format msgid "invalid value '%ld' for token %s" msgstr "neveljavna vrednost '%ld' za žeton %s" -#: ../libgimpconfig/gimpconfig-deserialize.c:602 +#: ../libgimpconfig/gimpconfig-deserialize.c:622 #, c-format msgid "while parsing token '%s': %s" msgstr "pri razčelenjevanju žetona '%s': %s" -#: ../libgimpconfig/gimpconfig-iface.c:482 -#: ../libgimpconfig/gimpconfig-iface.c:495 -#: ../libgimpconfig/gimpscanner.c:559 -#: ../libgimpconfig/gimpscanner.c:641 -#: ../libgimpwidgets/gimpcolorprofilestore.c:656 +#: ../libgimpconfig/gimpconfig-iface.c:658 +#: ../libgimpconfig/gimpconfig-iface.c:671 ../libgimpconfig/gimpscanner.c:734 +#: ../libgimpconfig/gimpscanner.c:816 +#: ../libgimpwidgets/gimpcolorprofilestore.c:703 msgid "fatal parse error" msgstr "usodna napaka pri razčlenjevanju" -#: ../libgimpconfig/gimpconfig-path.c:387 +#: ../libgimpconfig/gimpconfig-path.c:439 #, c-format msgid "Cannot expand ${%s}" msgstr "Ni mogoče razširiti ${%s}" -#: ../libgimpconfig/gimpconfigwriter.c:87 -#: ../libgimpconfig/gimpconfigwriter.c:728 +#: ../libgimpconfig/gimpconfigwriter.c:88 +#: ../libgimpconfig/gimpconfigwriter.c:658 #, c-format msgid "Error writing to '%s': %s" msgstr "Napaka pri pisanju v '%s': %s" -#: ../libgimpconfig/gimpconfigwriter.c:145 -#, c-format -msgid "Could not create temporary file for '%s': %s" -msgstr "Začasne datoteke za '%s' ni mogoče ustvariti: %s" - -#: ../libgimpconfig/gimpconfigwriter.c:158 -#, c-format -msgid "Could not open '%s' for writing: %s" -msgstr "'%s' ni mogoče odpreti za pisanje: %s" - -#: ../libgimpconfig/gimpconfigwriter.c:689 -#: ../libgimpconfig/gimpconfigwriter.c:709 +#: ../libgimpconfig/gimpconfigwriter.c:184 #, c-format -msgid "" -"Error writing to temporary file for '%s': %s\n" -"The original file has not been touched." -msgstr "" -"Napaka pri pisanju v začasno datoteko za '%s': %s\n" -"Izvorna datoteka ni bila spremenjena." - -#: ../libgimpconfig/gimpconfigwriter.c:717 -#, c-format -msgid "" -"Error writing to temporary file for '%s': %s\n" -"No file has been created." -msgstr "" -"Napaka pri pisanju v začasno datoteko za '%s': %s\n" -"Ustvarjena ni bila nobena datoteka." +msgid "Could not create temporary file for '%s': " +msgstr "Začasne datoteke za '%s' ni mogoče ustvariti: " -#: ../libgimpconfig/gimpconfigwriter.c:741 +#: ../libgimpconfig/gimpconfigwriter.c:761 #, c-format -msgid "Could not create '%s': %s" -msgstr "Ni mogoče ustvariti '%s': %s" +msgid "Error writing '%s': %s" +msgstr "Napaka pri pisanju '%s': %s" -#: ../libgimpconfig/gimpscanner.c:268 +#: ../libgimpconfig/gimpscanner.c:408 #, c-format msgid "invalid UTF-8 string" msgstr "neveljaven niz UTF-8" #. please don't translate 'yes' and 'no' -#: ../libgimpconfig/gimpscanner.c:431 +#: ../libgimpconfig/gimpscanner.c:606 #, c-format msgid "expected 'yes' or 'no' for boolean token, got '%s'" -msgstr "za logični žeton je pričakovana vrednost 'yes' ali 'no', vrnjena vrednost pa je '%s'" +msgstr "" +"za logični žeton je pričakovana vrednost 'yes' ali 'no', vrnjena vrednost pa " +"je '%s'" -#: ../libgimpconfig/gimpscanner.c:668 +#: ../libgimpconfig/gimpscanner.c:843 #, c-format msgid "Error while parsing '%s' in line %d: %s" msgstr "Napaka pri razčlenjevanju '%s' v vrstici %d: %s" -#: ../libgimpmodule/gimpmodule.c:163 -#: ../libgimpmodule/gimpmodule.c:181 -#: ../libgimpmodule/gimpmodule.c:290 -#: ../libgimpmodule/gimpmodule.c:317 -#: ../libgimpmodule/gimpmodule.c:443 +#: ../libgimpmodule/gimpmodule.c:162 ../libgimpmodule/gimpmodule.c:180 +#: ../libgimpmodule/gimpmodule.c:289 ../libgimpmodule/gimpmodule.c:316 +#: ../libgimpmodule/gimpmodule.c:442 #, c-format msgid "Module '%s' load error: %s" msgstr "Napaka nalaganja gradnika '%s': %s" -#: ../libgimpmodule/gimpmodule.c:385 +#: ../libgimpmodule/gimpmodule.c:384 msgid "Module error" msgstr "Napaka gradnika" -#: ../libgimpmodule/gimpmodule.c:386 +#: ../libgimpmodule/gimpmodule.c:385 msgid "Loaded" msgstr "Naloženo" -#: ../libgimpmodule/gimpmodule.c:387 +#: ../libgimpmodule/gimpmodule.c:386 msgid "Load failed" msgstr "Nalaganje ni uspelo" -#: ../libgimpmodule/gimpmodule.c:388 +#: ../libgimpmodule/gimpmodule.c:387 msgid "Not loaded" msgstr "Ni naloženo" -#: ../libgimpthumb/gimpthumb-utils.c:131 +#: ../libgimpthumb/gimpthumb-utils.c:153 #, c-format msgid "" -"Cannot determine a valid home directory.\n" +"Cannot determine a valid thumbnails directory.\n" "Thumbnails will be stored in the folder for temporary files (%s) instead." msgstr "" -"Veljavne domače mape ni mogoče določiti.\n" -"Sličice za predogled bodo zato shranjene v začasni mapi (%s)." +"Veljavne mape oglednih slik ni mogoče določiti.\n" +"Ogledne sličice bodo zato shranjene v začasni mapi (%s)." -#: ../libgimpthumb/gimpthumb-utils.c:255 -#: ../libgimpthumb/gimpthumb-utils.c:323 +#: ../libgimpthumb/gimpthumb-utils.c:299 ../libgimpthumb/gimpthumb-utils.c:367 #, c-format msgid "Failed to create thumbnail folder '%s'." msgstr "Mapa sličic za predogled '%s' ni bila ustvarjena." @@ -1132,126 +1632,269 @@ msgid "Thumbnail contains no Thumb::URI tag" msgstr "Sličica za predogled ne vsebuje oznake Thumb::URI" -#: ../libgimpthumb/gimpthumbnail.c:904 +#: ../libgimpthumb/gimpthumbnail.c:905 #, c-format msgid "Could not create thumbnail for %s: %s" msgstr "Sličice za predogled %s ni bilo mogoče ustvariti: %s" -#: ../libgimpwidgets/gimpbrowser.c:112 +#: ../libgimpwidgets/gimpbrowser.c:113 msgid "_Search:" msgstr "Na_jdi:" -#: ../libgimpwidgets/gimpcolorbutton.c:135 +#: ../libgimpwidgets/gimpcolorbutton.c:136 msgid "_Foreground Color" msgstr "Barva o_spredja" -#: ../libgimpwidgets/gimpcolorbutton.c:139 +#: ../libgimpwidgets/gimpcolorbutton.c:140 msgid "_Background Color" msgstr "Barva o_zadja" -#: ../libgimpwidgets/gimpcolorbutton.c:143 +#: ../libgimpwidgets/gimpcolorbutton.c:144 msgid "Blac_k" msgstr "_Črna" -#: ../libgimpwidgets/gimpcolorbutton.c:147 +#: ../libgimpwidgets/gimpcolorbutton.c:148 msgid "_White" msgstr "_Bela" -#: ../libgimpwidgets/gimpcolorprofilestore.c:146 +#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:94 +msgid "All files (*.*)" +msgstr "Vse datoteke (*.*)" + +#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:99 +msgid "ICC color profile (*.icc, *.icm)" +msgstr "Barvni profil ICC (*.icc, *.icm)" + +#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:325 +#: ../libgimpwidgets/gimppatheditor.c:249 +msgid "Folder" +msgstr "Mapa" + +#: ../libgimpwidgets/gimpcolorprofilechooserdialog.c:330 +msgid "Not a regular file." +msgstr "Ni navadna datoteka." + +#: ../libgimpwidgets/gimpcolorprofilestore.c:145 msgid "Select color profile from disk..." msgstr "Izberite barvni profil z diska ..." -#: ../libgimpwidgets/gimpcolorprofilestore.c:280 +#: ../libgimpwidgets/gimpcolorprofilestore.c:317 msgctxt "profile" msgid "None" msgstr "Brez" -#: ../libgimpwidgets/gimpcolorscales.c:108 +#: ../libgimpwidgets/gimpcolorprofileview.c:174 +msgid "Manufacturer: " +msgstr "Izdelovalec: " + +#: ../libgimpwidgets/gimpcolorprofileview.c:186 +msgid "Copyright: " +msgstr "Avtorske pravice: " + +#: ../libgimpwidgets/gimpcolorscales.c:111 msgid "Scales" msgstr "Lestvice" -#: ../libgimpwidgets/gimpcolorselection.c:220 +#: ../libgimpwidgets/gimpcolorselection.c:221 msgid "Current:" msgstr "Trenutno:" -#: ../libgimpwidgets/gimpcolorselection.c:229 +#: ../libgimpwidgets/gimpcolorselection.c:230 msgid "Old:" msgstr "Staro:" -#: ../libgimpwidgets/gimpcolorselection.c:314 -msgid "Hexadecimal color notation as used in HTML and CSS. This entry also accepts CSS color names." -msgstr "Šestnajstiški zapis barv, kot je v uporabi v HTML in CSS. To polje sprejme tudi imena barv CSS." +#: ../libgimpwidgets/gimpcolorselection.c:315 +msgid "" +"Hexadecimal color notation as used in HTML and CSS. This entry also accepts " +"CSS color names." +msgstr "" +"Šestnajstiški zapis barv, kot je v uporabi v HTML in CSS. To polje sprejme " +"tudi imena barv CSS." -#: ../libgimpwidgets/gimpcolorselection.c:320 +#: ../libgimpwidgets/gimpcolorselection.c:321 msgid "HTML _notation:" msgstr "Zapis _HTML:" -#: ../libgimpwidgets/gimpfileentry.c:200 +#: ../libgimpwidgets/gimpfileentry.c:152 +msgid "Show file location in the file manager" +msgstr "Pokaži mesto datoteke v upravljalniku datotek" + +#: ../libgimpwidgets/gimpfileentry.c:229 msgid "Open a file selector to browse your folders" msgstr "Odpri izbirnik datotek za brskanje po mapah" -#: ../libgimpwidgets/gimpfileentry.c:201 +#: ../libgimpwidgets/gimpfileentry.c:230 msgid "Open a file selector to browse your files" msgstr "Odpri izbirnik datotek za brskanje po datotekah" -#: ../libgimpwidgets/gimpfileentry.c:361 +#: ../libgimpwidgets/gimpfileentry.c:397 +#, c-format +msgid "Can't show file in file manager: %s" +msgstr "Datoteke ni mogoče pokazati v upravljalniku datotek: %s" + +#: ../libgimpwidgets/gimpfileentry.c:424 msgid "Select Folder" msgstr "Izberite mapo" -#: ../libgimpwidgets/gimpfileentry.c:363 +#: ../libgimpwidgets/gimpfileentry.c:426 msgid "Select File" msgstr "Izberite datoteko" -#: ../libgimpwidgets/gimphelpui.c:432 +#: ../libgimpwidgets/gimphelpui.c:433 msgid "Press F1 for more help" msgstr "Pritisnite F1 za dodatno pomoč" -#: ../libgimpwidgets/gimpmemsizeentry.c:220 +#: ../libgimpwidgets/gimpicons.c:61 +msgid "Anchor" +msgstr "Zasidraj" + +#: ../libgimpwidgets/gimpicons.c:62 +msgid "C_enter" +msgstr "Sr_edinsko" + +#: ../libgimpwidgets/gimpicons.c:63 +msgid "_Duplicate" +msgstr "_Podvoji" + +#: ../libgimpwidgets/gimpicons.c:64 +msgid "_Edit" +msgstr "_Uredi" + +#: ../libgimpwidgets/gimpicons.c:65 +msgid "Linked" +msgstr "Povezan" + +#: ../libgimpwidgets/gimpicons.c:66 +msgid "Paste as New" +msgstr "Prilepi kot novo" + +#: ../libgimpwidgets/gimpicons.c:67 +msgid "Paste Into" +msgstr "Prilepi v" + +#: ../libgimpwidgets/gimpicons.c:68 +msgid "_Reset" +msgstr "_Ponastavi" + +#: ../libgimpwidgets/gimpicons.c:69 +msgid "Visible" +msgstr "Vidno" + +#: ../libgimpwidgets/gimpicons.c:70 +msgid "Ne_xt" +msgstr "N_aslednji" + +#: ../libgimpwidgets/gimpicons.c:71 +msgid "Pre_vious" +msgstr "Pre_dhodni" + +#: ../libgimpwidgets/gimpicons.c:72 +msgid "_Open" +msgstr "_Odpri" + +#: ../libgimpwidgets/gimpicons.c:73 +msgid "_Save" +msgstr "_Shrani" + +#: ../libgimpwidgets/gimpicons.c:74 +msgid "Save as" +msgstr "Shrani kot" + +#: ../libgimpwidgets/gimpicons.c:75 +msgid "_Cancel" +msgstr "_Prekliči" + +#: ../libgimpwidgets/gimpicons.c:76 +msgid "_Quit" +msgstr "_Izhod" + +#: ../libgimpwidgets/gimpicons.c:127 ../libgimpwidgets/gimpicons.c:131 +msgid "_Stroke" +msgstr "_Poteza" + +#: ../libgimpwidgets/gimpicons.c:150 +msgid "L_etter Spacing" +msgstr "Razmik čr_k" + +#: ../libgimpwidgets/gimpicons.c:151 +msgid "L_ine Spacing" +msgstr "Razmik _vrstic" + +#: ../libgimpwidgets/gimpicons.c:152 +msgid "I_ndent" +msgstr "_Zamik" + +#: ../libgimpwidgets/gimpicons.c:176 +msgid "Re_size" +msgstr "Spremeni _velikost" + +#: ../libgimpwidgets/gimpicons.c:177 ../libgimpwidgets/gimpicons.c:312 +msgid "_Scale" +msgstr "_Spremeni velikost" + +#: ../libgimpwidgets/gimpicons.c:284 +msgid "Cr_op" +msgstr "_Obreži" + +#: ../libgimpwidgets/gimpicons.c:292 +msgid "_Select" +msgstr "_Izberi" + +#: ../libgimpwidgets/gimpicons.c:295 ../libgimpwidgets/gimpicons.c:307 +#: ../libgimpwidgets/gimpicons.c:318 +msgid "_Transform" +msgstr "_Preoblikuj" + +#: ../libgimpwidgets/gimpicons.c:311 +msgid "_Rotate" +msgstr "_Sukaj" + +#: ../libgimpwidgets/gimpicons.c:314 +msgid "_Shear" +msgstr "_Ostriži" + +#: ../libgimpwidgets/gimpmemsizeentry.c:223 msgid "Kilobytes" msgstr "kilobajtov" -#: ../libgimpwidgets/gimpmemsizeentry.c:221 +#: ../libgimpwidgets/gimpmemsizeentry.c:224 msgid "Megabytes" msgstr "megabajtov" -#: ../libgimpwidgets/gimpmemsizeentry.c:222 +#: ../libgimpwidgets/gimpmemsizeentry.c:225 msgid "Gigabytes" msgstr "gigabajtov" #. Count label -#: ../libgimpwidgets/gimppageselector.c:282 -#: ../libgimpwidgets/gimppageselector.c:1178 +#: ../libgimpwidgets/gimppageselector.c:270 +#: ../libgimpwidgets/gimppageselector.c:1067 msgid "Nothing selected" msgstr "Nič ni izbrano" -#: ../libgimpwidgets/gimppageselector.c:300 +#: ../libgimpwidgets/gimppageselector.c:288 msgid "Select _All" msgstr "Izberi _vse" -#: ../libgimpwidgets/gimppageselector.c:320 +#: ../libgimpwidgets/gimppageselector.c:308 msgid "Select _range:" msgstr "Izberi _območje:" -#: ../libgimpwidgets/gimppageselector.c:332 +#: ../libgimpwidgets/gimppageselector.c:320 msgid "Open _pages as" msgstr "Odpri _strani kot" -#: ../libgimpwidgets/gimppageselector.c:433 -msgid "Page 000" -msgstr "Stran 000" - -#: ../libgimpwidgets/gimppageselector.c:521 -#: ../libgimpwidgets/gimppageselector.c:758 +#: ../libgimpwidgets/gimppageselector.c:449 +#: ../libgimpwidgets/gimppageselector.c:647 #, c-format msgid "Page %d" msgstr "Stran %d" -#: ../libgimpwidgets/gimppageselector.c:1183 +#: ../libgimpwidgets/gimppageselector.c:1072 msgid "One page selected" msgstr "Izbrana je ena stran" -#: ../libgimpwidgets/gimppageselector.c:1190 -#: ../libgimpwidgets/gimppageselector.c:1194 +#: ../libgimpwidgets/gimppageselector.c:1079 +#: ../libgimpwidgets/gimppageselector.c:1083 #, c-format msgid "%d page selected" msgid_plural "All %d pages selected" @@ -1260,32 +1903,32 @@ msgstr[2] "Izbrani sta %d strani" msgstr[3] "Izbrane so %d strani" -#: ../libgimpwidgets/gimppatheditor.c:239 +#: ../libgimpwidgets/gimppatheditor.c:240 msgid "Writable" msgstr "zapisljiva" -#: ../libgimpwidgets/gimppatheditor.c:248 -msgid "Folder" -msgstr "Mapa" - -#: ../libgimpwidgets/gimppickbutton.c:127 -msgid "Click the eyedropper, then click a color anywhere on your screen to select that color." -msgstr "Izberite kapalko, nato kliknite kamor koli na zaslonu, da izberete barvo tega dela." +#: ../libgimpwidgets/gimppickbutton.c:110 +msgid "" +"Click the eyedropper, then click a color anywhere on your screen to select " +"that color." +msgstr "" +"Izberite kapalko, nato kliknite kamor koli na zaslonu, da izberete barvo " +"tega dela." #. toggle button to (de)activate the instant preview -#: ../libgimpwidgets/gimppreview.c:290 +#: ../libgimpwidgets/gimppreview.c:291 msgid "_Preview" msgstr "_Predogled" -#: ../libgimpwidgets/gimppreviewarea.c:103 +#: ../libgimpwidgets/gimppreviewarea.c:126 msgid "Check Size" msgstr "Preveri velikost" -#: ../libgimpwidgets/gimppreviewarea.c:110 +#: ../libgimpwidgets/gimppreviewarea.c:133 msgid "Check Style" msgstr "Preveri slog" -#: ../libgimpwidgets/gimppropwidgets.c:1878 +#: ../libgimpwidgets/gimppropwidgets.c:2110 #, c-format msgid "This text input field is limited to %d character." msgid_plural "This text input field is limited to %d characters." @@ -1294,123 +1937,53 @@ msgstr[2] "Vnosno polje za besedilo je omejeno na %d znaka." msgstr[3] "Vnosno polje za besedilo je omejeno na %d znake." -#: ../libgimpwidgets/gimpstock.c:127 -msgid "Anchor" -msgstr "Zasidraj" - -#: ../libgimpwidgets/gimpstock.c:128 -msgid "C_enter" -msgstr "Sr_edinsko" - -#: ../libgimpwidgets/gimpstock.c:129 -msgid "_Duplicate" -msgstr "_Podvoji" - -#: ../libgimpwidgets/gimpstock.c:130 -msgid "_Edit" -msgstr "_Uredi" - -#: ../libgimpwidgets/gimpstock.c:131 -msgid "Linked" -msgstr "Povezan" - -#: ../libgimpwidgets/gimpstock.c:132 -msgid "Paste as New" -msgstr "Prilepi kot novo" - -#: ../libgimpwidgets/gimpstock.c:133 -msgid "Paste Into" -msgstr "Prilepi v" - -#: ../libgimpwidgets/gimpstock.c:134 -msgid "_Reset" -msgstr "_Ponastavi" - -#: ../libgimpwidgets/gimpstock.c:135 -msgid "Visible" -msgstr "Vidno" - -#: ../libgimpwidgets/gimpstock.c:171 -#: ../libgimpwidgets/gimpstock.c:175 -msgid "_Stroke" -msgstr "_Poteza" - -#: ../libgimpwidgets/gimpstock.c:187 -msgid "L_etter Spacing" -msgstr "Razmik čr_k" - -#: ../libgimpwidgets/gimpstock.c:188 -msgid "L_ine Spacing" -msgstr "Razmik _vrstic" - -#: ../libgimpwidgets/gimpstock.c:204 -msgid "_Resize" -msgstr "Spremeni _velikost" - -#: ../libgimpwidgets/gimpstock.c:205 -#: ../libgimpwidgets/gimpstock.c:340 -msgid "_Scale" -msgstr "_Spremeni velikost" - -#: ../libgimpwidgets/gimpstock.c:315 -msgid "Cr_op" -msgstr "_Obreži" - -#: ../libgimpwidgets/gimpstock.c:335 -msgid "_Transform" -msgstr "_Preoblikuj" - -#: ../libgimpwidgets/gimpstock.c:339 -msgid "_Rotate" -msgstr "_Sukaj" - -#: ../libgimpwidgets/gimpstock.c:341 -msgid "_Shear" -msgstr "_Ostriži" - -#: ../libgimpwidgets/gimpunitmenu.c:264 +#: ../libgimpwidgets/gimpunitmenu.c:265 msgid "More..." msgstr "Več ..." -#: ../libgimpwidgets/gimpunitmenu.c:490 +#: ../libgimpwidgets/gimpunitmenu.c:491 msgid "Unit Selection" msgstr "Izbor enote" -#: ../libgimpwidgets/gimpunitmenu.c:539 +#: ../libgimpwidgets/gimpunitmenu.c:540 msgid "Unit" msgstr "Enota" -#: ../libgimpwidgets/gimpunitmenu.c:543 +#: ../libgimpwidgets/gimpunitmenu.c:544 msgid "Factor" msgstr "Faktor" -#: ../libgimpwidgets/gimpwidgets.c:516 -msgid "Use this value for random number generator seed - this allows you to repeat a given \"random\" operation" -msgstr "Uporabi navedeno vrednost pri izračunavanju naključnih števil. Tako lahko ponovite dano \"naključno\" operacijo." +#: ../libgimpwidgets/gimpwidgets.c:521 +msgid "" +"Use this value for random number generator seed - this allows you to repeat " +"a given \"random\" operation" +msgstr "" +"Uporabi navedeno vrednost pri izračunavanju naključnih števil. Tako lahko " +"ponovite dano \"naključno\" operacijo." -#: ../libgimpwidgets/gimpwidgets.c:520 +#: ../libgimpwidgets/gimpwidgets.c:525 msgid "_New Seed" msgstr "_Novo seme" -#: ../libgimpwidgets/gimpwidgets.c:533 +#: ../libgimpwidgets/gimpwidgets.c:538 msgid "Seed random number generator with a generated random number" msgstr "Ponastavi generator naključnih števil z novim naključnim številom" -#: ../libgimpwidgets/gimpwidgets.c:537 +#: ../libgimpwidgets/gimpwidgets.c:542 msgid "_Randomize" msgstr "Na_redi naključno" -#: ../libgimpwidgets/gimpwidgets-private.c:49 +#: ../libgimpwidgets/gimpwidgets-private.c:47 msgctxt "input-mode" msgid "Disabled" msgstr "Onemogočeno" -#: ../libgimpwidgets/gimpwidgets-private.c:50 +#: ../libgimpwidgets/gimpwidgets-private.c:48 msgctxt "input-mode" msgid "Screen" msgstr "Zaslon" -#: ../libgimpwidgets/gimpwidgets-private.c:51 +#: ../libgimpwidgets/gimpwidgets-private.c:49 msgctxt "input-mode" msgid "Window" msgstr "Okno" @@ -1513,210 +2086,183 @@ msgid "Zoom out" msgstr "Pomanjšaj" -#: ../modules/color-selector-cmyk-lcms.c:86 +#: ../modules/color-selector-cmyk.c:82 msgid "CMYK color selector (using color profile)" msgstr "Barvni izbirnik CMYK (z uporabo barvnega profila)" -#: ../modules/color-selector-cmyk-lcms.c:149 -#: ../modules/color-selector-cmyk.c:101 +#: ../modules/color-selector-cmyk.c:116 msgid "CMYK" msgstr "CMYK" #. Cyan -#: ../modules/color-selector-cmyk-lcms.c:168 -#: ../modules/color-selector-cmyk.c:124 +#: ../modules/color-selector-cmyk.c:138 msgid "_C" msgstr "_C" #. Magenta -#: ../modules/color-selector-cmyk-lcms.c:170 -#: ../modules/color-selector-cmyk.c:126 +#: ../modules/color-selector-cmyk.c:140 msgid "_M" msgstr "_M" #. Yellow -#: ../modules/color-selector-cmyk-lcms.c:172 -#: ../modules/color-selector-cmyk.c:128 +#: ../modules/color-selector-cmyk.c:142 msgid "_Y" msgstr "_Y" #. Key (Black) -#: ../modules/color-selector-cmyk-lcms.c:174 -#: ../modules/color-selector-cmyk.c:130 +#: ../modules/color-selector-cmyk.c:144 msgid "_K" msgstr "_K" -#: ../modules/color-selector-cmyk-lcms.c:178 -#: ../modules/color-selector-cmyk.c:134 +#: ../modules/color-selector-cmyk.c:148 msgid "Cyan" msgstr "Cianasta" -#: ../modules/color-selector-cmyk-lcms.c:179 -#: ../modules/color-selector-cmyk.c:135 +#: ../modules/color-selector-cmyk.c:149 msgid "Magenta" msgstr "Magenta" -#: ../modules/color-selector-cmyk-lcms.c:180 -#: ../modules/color-selector-cmyk.c:136 +#: ../modules/color-selector-cmyk.c:150 msgid "Yellow" msgstr "Rumena" -#: ../modules/color-selector-cmyk-lcms.c:181 -#: ../modules/color-selector-cmyk.c:137 +#: ../modules/color-selector-cmyk.c:151 msgid "Black" msgstr "Črna" -#: ../modules/color-selector-cmyk-lcms.c:412 +#: ../modules/color-selector-cmyk.c:380 msgid "Profile: (none)" msgstr "Profil: (brez)" -#: ../modules/color-selector-cmyk-lcms.c:433 +#: ../modules/color-selector-cmyk.c:392 #, c-format msgid "Profile: %s" msgstr "Profil: %s" -#: ../modules/color-selector-cmyk.c:70 -msgid "CMYK color selector" -msgstr "Izbirnik barv CMYK" - -#: ../modules/color-selector-cmyk.c:171 -msgid "Black _pullout:" -msgstr "Poteg _črnine:" - -#: ../modules/color-selector-cmyk.c:188 -msgid "The percentage of black to pull out of the colored inks." -msgstr "Odstotek črne barve, ki naj bo odvzet barvam." - -#: ../modules/color-selector-water.c:81 +#: ../modules/color-selector-water.c:96 msgid "Watercolor style color selector" msgstr "Izbirnik v slogu akvarela" -#: ../modules/color-selector-water.c:117 +#: ../modules/color-selector-water.c:130 msgid "Watercolor" msgstr "Akvarel" -#: ../modules/color-selector-water.c:185 +#: ../modules/color-selector-water.c:200 msgid "Pressure" msgstr "Pritisk" -#: ../modules/color-selector-wheel.c:71 +#: ../modules/color-selector-wheel.c:72 msgid "HSV color wheel" msgstr "Barvni kolešček HSV" -#: ../modules/color-selector-wheel.c:102 +#: ../modules/color-selector-wheel.c:104 msgid "Wheel" msgstr "Kolešček" -#: ../modules/controller-dx-dinput.c:155 +#: ../modules/controller-dx-dinput.c:156 msgid "DirectX DirectInput event controller" msgstr "Nadzornik dogodkov DirectX DirectInput" -#: ../modules/controller-dx-dinput.c:195 -#: ../modules/controller-linux-input.c:217 -#: ../modules/controller-midi.c:211 +#: ../modules/controller-dx-dinput.c:196 +#: ../modules/controller-linux-input.c:218 ../modules/controller-midi.c:212 msgid "Device:" msgstr "Naprava:" -#: ../modules/controller-dx-dinput.c:196 +#: ../modules/controller-dx-dinput.c:197 msgid "The device to read DirectInput events from." msgstr "Ime naprave za branje vhodnih dogodkov DirectInput." -#: ../modules/controller-dx-dinput.c:205 +#: ../modules/controller-dx-dinput.c:206 msgid "DirectX DirectInput" msgstr "DirectX DirectInput" -#: ../modules/controller-dx-dinput.c:418 +#: ../modules/controller-dx-dinput.c:419 #, c-format msgid "Button %d" msgstr "Gumb %d" -#: ../modules/controller-dx-dinput.c:421 +#: ../modules/controller-dx-dinput.c:422 #, c-format msgid "Button %d Press" msgstr "Gumb %d pritisnjen" -#: ../modules/controller-dx-dinput.c:424 +#: ../modules/controller-dx-dinput.c:425 #, c-format msgid "Button %d Release" msgstr "Gumb %d izpuščen" -#: ../modules/controller-dx-dinput.c:441 -#: ../modules/controller-linux-input.c:89 +#: ../modules/controller-dx-dinput.c:442 ../modules/controller-linux-input.c:90 msgid "X Move Left" msgstr "Pomik levo X" -#: ../modules/controller-dx-dinput.c:444 -#: ../modules/controller-linux-input.c:90 +#: ../modules/controller-dx-dinput.c:445 ../modules/controller-linux-input.c:91 msgid "X Move Right" msgstr "Pomik desno X" -#: ../modules/controller-dx-dinput.c:450 +#: ../modules/controller-dx-dinput.c:451 msgid "Y Move Away" msgstr "Odmik Y" -#: ../modules/controller-dx-dinput.c:453 +#: ../modules/controller-dx-dinput.c:454 msgid "Y Move Near" msgstr "Primik Y" -#: ../modules/controller-dx-dinput.c:459 -#: ../modules/controller-linux-input.c:93 +#: ../modules/controller-dx-dinput.c:460 ../modules/controller-linux-input.c:94 msgid "Z Move Up" msgstr "Pomik navzgor Z" -#: ../modules/controller-dx-dinput.c:462 -#: ../modules/controller-linux-input.c:94 +#: ../modules/controller-dx-dinput.c:463 ../modules/controller-linux-input.c:95 msgid "Z Move Down" msgstr "Pomik navzdol Z" -#: ../modules/controller-dx-dinput.c:468 +#: ../modules/controller-dx-dinput.c:469 msgid "X Axis Tilt Away" msgstr "Nagib vstran od osi X" -#: ../modules/controller-dx-dinput.c:471 +#: ../modules/controller-dx-dinput.c:472 msgid "X Axis Tilt Near" msgstr "Nagib proti osi X" -#: ../modules/controller-dx-dinput.c:477 -#: ../modules/controller-linux-input.c:98 +#: ../modules/controller-dx-dinput.c:478 ../modules/controller-linux-input.c:99 msgid "Y Axis Tilt Right" msgstr "Nagib na desno osi Y" -#: ../modules/controller-dx-dinput.c:480 -#: ../modules/controller-linux-input.c:99 +#: ../modules/controller-dx-dinput.c:481 +#: ../modules/controller-linux-input.c:100 msgid "Y Axis Tilt Left" msgstr "Nagib na levo osi Y" -#: ../modules/controller-dx-dinput.c:486 -#: ../modules/controller-linux-input.c:100 +#: ../modules/controller-dx-dinput.c:487 +#: ../modules/controller-linux-input.c:101 msgid "Z Axis Turn Left" msgstr "Nagib na levo osi Z" -#: ../modules/controller-dx-dinput.c:489 -#: ../modules/controller-linux-input.c:101 +#: ../modules/controller-dx-dinput.c:490 +#: ../modules/controller-linux-input.c:102 msgid "Z Axis Turn Right" msgstr "Nagib na desno osi Z" -#: ../modules/controller-dx-dinput.c:500 +#: ../modules/controller-dx-dinput.c:501 #, c-format msgid "Slider %d Increase" msgstr "Povečanje drnika %d" -#: ../modules/controller-dx-dinput.c:503 +#: ../modules/controller-dx-dinput.c:504 #, c-format msgid "Slider %d Decrease" msgstr "Pomanjšanje drsnika %d" -#: ../modules/controller-dx-dinput.c:513 +#: ../modules/controller-dx-dinput.c:514 #, c-format msgid "POV %d X View" msgstr "Pogled POV %d X" -#: ../modules/controller-dx-dinput.c:516 +#: ../modules/controller-dx-dinput.c:517 #, c-format msgid "POV %d Y View" msgstr "Pogled POV %d Y" -#: ../modules/controller-dx-dinput.c:519 +#: ../modules/controller-dx-dinput.c:520 #, c-format msgid "POV %d Return" msgstr "Povrni POV %d" @@ -1726,341 +2272,351 @@ msgstr "Dogodki DirectInput" #: ../modules/controller-dx-dinput.c:1092 -#: ../modules/controller-linux-input.c:524 -#: ../modules/controller-midi.c:504 +#: ../modules/controller-linux-input.c:525 ../modules/controller-midi.c:505 msgid "No device configured" msgstr "Nobena naprava ni nastavljena" #: ../modules/controller-dx-dinput.c:1117 -#: ../modules/controller-linux-input.c:587 +#: ../modules/controller-linux-input.c:588 msgid "Device not available" msgstr "Naprava ni na voljo" -#: ../modules/controller-linux-input.c:57 +#: ../modules/controller-linux-input.c:58 msgid "Button 0" msgstr "Gumb 0" -#: ../modules/controller-linux-input.c:58 +#: ../modules/controller-linux-input.c:59 msgid "Button 1" msgstr "Gumb 1" -#: ../modules/controller-linux-input.c:59 +#: ../modules/controller-linux-input.c:60 msgid "Button 2" msgstr "Gumb 2" -#: ../modules/controller-linux-input.c:60 +#: ../modules/controller-linux-input.c:61 msgid "Button 3" msgstr "Gumb 3" -#: ../modules/controller-linux-input.c:61 +#: ../modules/controller-linux-input.c:62 msgid "Button 4" msgstr "Gumb 4" -#: ../modules/controller-linux-input.c:62 +#: ../modules/controller-linux-input.c:63 msgid "Button 5" msgstr "Gumb 5" -#: ../modules/controller-linux-input.c:63 +#: ../modules/controller-linux-input.c:64 msgid "Button 6" msgstr "Gumb 6" -#: ../modules/controller-linux-input.c:64 +#: ../modules/controller-linux-input.c:65 msgid "Button 7" msgstr "Gumb 7" -#: ../modules/controller-linux-input.c:65 +#: ../modules/controller-linux-input.c:66 msgid "Button 8" msgstr "Gumb 8" -#: ../modules/controller-linux-input.c:66 +#: ../modules/controller-linux-input.c:67 msgid "Button 9" msgstr "Gumb 9" -#: ../modules/controller-linux-input.c:67 +#: ../modules/controller-linux-input.c:68 msgid "Button Mouse" msgstr "Miškin gumb" -#: ../modules/controller-linux-input.c:68 +#: ../modules/controller-linux-input.c:69 msgid "Button Left" msgstr "Levi gumb" -#: ../modules/controller-linux-input.c:69 +#: ../modules/controller-linux-input.c:70 msgid "Button Right" msgstr "Desni gumb" -#: ../modules/controller-linux-input.c:70 +#: ../modules/controller-linux-input.c:71 msgid "Button Middle" msgstr "Srednji gumb" -#: ../modules/controller-linux-input.c:71 +#: ../modules/controller-linux-input.c:72 msgid "Button Side" msgstr "Stranski gumb" -#: ../modules/controller-linux-input.c:72 +#: ../modules/controller-linux-input.c:73 msgid "Button Extra" msgstr "Dodatni gumb" -#: ../modules/controller-linux-input.c:73 +#: ../modules/controller-linux-input.c:74 msgid "Button Forward" msgstr "Gumb naprej" -#: ../modules/controller-linux-input.c:74 +#: ../modules/controller-linux-input.c:75 msgid "Button Back" msgstr "Gumb - nazaj" -#: ../modules/controller-linux-input.c:75 +#: ../modules/controller-linux-input.c:76 msgid "Button Task" msgstr "Gumb - opravilo" -#: ../modules/controller-linux-input.c:77 +#: ../modules/controller-linux-input.c:78 msgid "Button Wheel" msgstr "Miškin kolešček" -#: ../modules/controller-linux-input.c:80 +#: ../modules/controller-linux-input.c:81 msgid "Button Gear Down" msgstr "Tipka opreme dol" -#: ../modules/controller-linux-input.c:83 +#: ../modules/controller-linux-input.c:84 msgid "Button Gear Up" msgstr "Tipka opreme gor" -#: ../modules/controller-linux-input.c:91 +#: ../modules/controller-linux-input.c:92 msgid "Y Move Forward" msgstr "Pomakni naprej Y" -#: ../modules/controller-linux-input.c:92 +#: ../modules/controller-linux-input.c:93 msgid "Y Move Back" msgstr "Pomakni nazaj Y" -#: ../modules/controller-linux-input.c:96 +#: ../modules/controller-linux-input.c:97 msgid "X Axis Tilt Forward" msgstr "Zasuk po osi X naprej" -#: ../modules/controller-linux-input.c:97 +#: ../modules/controller-linux-input.c:98 msgid "X Axis Tilt Back" msgstr "Zasuk po osi X nazaj" -#: ../modules/controller-linux-input.c:103 +#: ../modules/controller-linux-input.c:104 msgid "Horiz. Wheel Turn Back" msgstr "Vodoraven zasuk koleščka nazaj" -#: ../modules/controller-linux-input.c:104 +#: ../modules/controller-linux-input.c:105 msgid "Horiz. Wheel Turn Forward" msgstr "Vodoraven zasuk koleščka naprej" -#: ../modules/controller-linux-input.c:105 +#: ../modules/controller-linux-input.c:106 msgid "Dial Turn Left" msgstr "Obrat gumba na levo" -#: ../modules/controller-linux-input.c:106 +#: ../modules/controller-linux-input.c:107 msgid "Dial Turn Right" msgstr "Obrat gumba na levo" -#: ../modules/controller-linux-input.c:107 +#: ../modules/controller-linux-input.c:108 msgid "Wheel Turn Left" msgstr "Obrat koleščka na levo" -#: ../modules/controller-linux-input.c:108 +#: ../modules/controller-linux-input.c:109 msgid "Wheel Turn Right" msgstr "Obrat koleščka na desno" -#: ../modules/controller-linux-input.c:177 +#: ../modules/controller-linux-input.c:178 msgid "Linux input event controller" msgstr "Krmilnik vhodnih dogodkov Linux" -#: ../modules/controller-linux-input.c:218 +#: ../modules/controller-linux-input.c:219 msgid "The name of the device to read Linux Input events from." msgstr "Ime naprave za branje vhodnih dogodkov Linux (Input)." -#: ../modules/controller-linux-input.c:229 +#: ../modules/controller-linux-input.c:230 msgid "Linux Input" msgstr "Vhod Linux" -#: ../modules/controller-linux-input.c:512 +#: ../modules/controller-linux-input.c:513 msgid "Linux Input Events" msgstr "Dogodki vhoda v Linuxu" -#: ../modules/controller-linux-input.c:550 -#: ../modules/controller-midi.c:453 -#: ../modules/controller-midi.c:479 +#: ../modules/controller-linux-input.c:551 ../modules/controller-midi.c:454 +#: ../modules/controller-midi.c:480 #, c-format msgid "Reading from %s" msgstr "Branje iz %s" -#: ../modules/controller-linux-input.c:568 -#: ../modules/controller-linux-input.c:622 -#: ../modules/controller-midi.c:435 -#: ../modules/controller-midi.c:496 -#: ../modules/controller-midi.c:567 +#: ../modules/controller-linux-input.c:569 +#: ../modules/controller-linux-input.c:623 ../modules/controller-midi.c:436 +#: ../modules/controller-midi.c:497 ../modules/controller-midi.c:568 #, c-format msgid "Device not available: %s" msgstr "Naprava ni na voljo: %s" -#: ../modules/controller-linux-input.c:631 -#: ../modules/controller-midi.c:576 +#: ../modules/controller-linux-input.c:632 ../modules/controller-midi.c:577 msgid "End of file" msgstr "Konec datoteke" -#: ../modules/controller-midi.c:163 +#: ../modules/controller-midi.c:164 msgid "MIDI event controller" msgstr "Kontrolnik dogodkov MIDI" -#: ../modules/controller-midi.c:202 +#: ../modules/controller-midi.c:203 msgid "The name of the device to read MIDI events from." msgstr "Ime naprave za branje dogodkov MIDI." -#: ../modules/controller-midi.c:205 +#: ../modules/controller-midi.c:206 msgid "Enter 'alsa' to use the ALSA sequencer." msgstr "Vnesite 'alsa' za uporabo sekvenčnika ALSA." -#: ../modules/controller-midi.c:220 +#: ../modules/controller-midi.c:221 msgid "Channel:" msgstr "Kanal:" -#: ../modules/controller-midi.c:221 -msgid "The MIDI channel to read events from. Set to -1 for reading from all MIDI channels." -msgstr "Kanal MIDI, ki bere dogodke. Nastavite na -1 za branje iz vseh kanalov MIDI." +#: ../modules/controller-midi.c:222 +msgid "" +"The MIDI channel to read events from. Set to -1 for reading from all MIDI " +"channels." +msgstr "" +"Kanal MIDI, ki bere dogodke. Nastavite na -1 za branje iz vseh kanalov MIDI." -#: ../modules/controller-midi.c:225 +#: ../modules/controller-midi.c:226 msgid "MIDI" msgstr "MIDI" -#: ../modules/controller-midi.c:354 +#: ../modules/controller-midi.c:355 #, c-format msgid "Note %02x on" msgstr "Nota %02x vključena" -#: ../modules/controller-midi.c:357 +#: ../modules/controller-midi.c:358 #, c-format msgid "Note %02x off" msgstr "Nota %02x izključena" -#: ../modules/controller-midi.c:360 +#: ../modules/controller-midi.c:361 #, c-format msgid "Controller %03d" msgstr "Kontrolnik %03d" -#: ../modules/controller-midi.c:407 +#: ../modules/controller-midi.c:408 msgid "MIDI Events" msgstr "Dogodki MIDI" -#: ../modules/controller-midi.c:425 +#: ../modules/controller-midi.c:426 msgid "GIMP" msgstr "GIMP" -#: ../modules/controller-midi.c:427 +#: ../modules/controller-midi.c:428 msgid "GIMP MIDI Input Controller" msgstr "GIMPov kontrolnik vhoda MIDI" -#: ../modules/display-filter-color-blind.c:67 +#: ../modules/display-filter-color-blind.c:68 msgid "Protanopia (insensitivity to red)" msgstr "Protanopija (intenzivnost v rdečo)" -#: ../modules/display-filter-color-blind.c:69 +#: ../modules/display-filter-color-blind.c:70 msgid "Deuteranopia (insensitivity to green)" msgstr "Devteranopija (intenzivnost v zeleno)" -#: ../modules/display-filter-color-blind.c:71 +#: ../modules/display-filter-color-blind.c:72 msgid "Tritanopia (insensitivity to blue)" msgstr "Tritanopija (intenzivnost v modro)" -#: ../modules/display-filter-color-blind.c:194 +#: ../modules/display-filter-color-blind.c:193 msgid "Color deficit simulation filter (Brettel-Vienot-Mollon algorithm)" msgstr "Filter simulacije barvne slepote (Brettel-Vienot-Mollonov algoritem)" -#: ../modules/display-filter-color-blind.c:257 +#: ../modules/display-filter-color-blind.c:252 +msgid "Deficiency" +msgstr "Barvna slepota" + +#: ../modules/display-filter-color-blind.c:258 msgid "Color Deficient Vision" msgstr "Pogled barvne slepote" -#: ../modules/display-filter-color-blind.c:486 +#: ../modules/display-filter-color-blind.c:419 msgid "Color _deficiency type:" msgstr "Vrsta barvne s_lepote:" -#: ../modules/display-filter-gamma.c:86 +#: ../modules/display-filter-gamma.c:87 msgid "Gamma color display filter" msgstr "Filter za prikaz barv gama" -#: ../modules/display-filter-gamma.c:125 +#: ../modules/display-filter-gamma.c:124 ../modules/display-filter-gamma.c:129 msgid "Gamma" msgstr "Gama" -#: ../modules/display-filter-gamma.c:237 +#: ../modules/display-filter-gamma.c:226 msgid "_Gamma:" msgstr "_Gama:" -#: ../modules/display-filter-high-contrast.c:86 +#: ../modules/display-filter-high-contrast.c:87 msgid "High Contrast color display filter" msgstr "Visokokontrastni filter za prikaz barv" -#: ../modules/display-filter-high-contrast.c:125 +#: ../modules/display-filter-high-contrast.c:124 +#: ../modules/display-filter-high-contrast.c:129 msgid "Contrast" msgstr "Kontrast" -#: ../modules/display-filter-high-contrast.c:237 +#: ../modules/display-filter-high-contrast.c:226 msgid "Contrast c_ycles:" msgstr "Krog_i kontrasta:" -#: ../modules/display-filter-lcms.c:97 +#: ../modules/display-filter-lcms.c:92 msgid "Color management display filter using ICC color profiles" msgstr "Prikazovalni filter upravljanja barv z uporabo barvnih profilov ICC" -#: ../modules/display-filter-lcms.c:129 +#: ../modules/display-filter-lcms.c:124 msgid "Color Management" msgstr "Upravljanje z barvami" -#: ../modules/display-filter-lcms.c:186 -msgid "None" -msgstr "brez" - -#: ../modules/display-filter-lcms.c:207 -msgid "This filter takes its configuration from the Color Management section in the Preferences dialog." -msgstr "Ta filter povzame nastavitve iz odseka Upravljanje barv iz pogovornega okna Nastavitev." +#: ../modules/display-filter-lcms.c:173 +msgid "" +"This filter takes its configuration from the Color Management section in the " +"Preferences dialog." +msgstr "" +"Ta filter povzame nastavitve iz odseka Upravljanje barv iz pogovornega okna " +"Nastavitev." -#: ../modules/display-filter-lcms.c:221 +#: ../modules/display-filter-lcms.c:187 msgid "Mode of operation:" msgstr "Način delovanja:" -#: ../modules/display-filter-lcms.c:228 +#: ../modules/display-filter-lcms.c:194 msgid "Image profile:" msgstr "Profil slike:" -#: ../modules/display-filter-lcms.c:236 +#: ../modules/display-filter-lcms.c:202 msgid "Monitor profile:" msgstr "Profil monitorja:" -#: ../modules/display-filter-lcms.c:244 +#: ../modules/display-filter-lcms.c:210 msgid "Print simulation profile:" msgstr "Profil simulacije tiskanja:" -#: ../modules/display-filter-proof.c:93 +#: ../modules/display-filter-lcms.c:364 +msgid "None" +msgstr "brez" + +#: ../modules/display-filter-proof.c:91 msgid "Color proof filter using ICC color profile" msgstr "Filter korekcije barv z barvnim profilom ICC" -#: ../modules/display-filter-proof.c:141 +#: ../modules/display-filter-proof.c:129 +msgid "Intent" +msgstr "Namen" + +#: ../modules/display-filter-proof.c:137 +msgid "Black point compensation" +msgstr "Kompenzacija črne točke" + +#: ../modules/display-filter-proof.c:144 +msgid "Profile" +msgstr "Profil" + +#: ../modules/display-filter-proof.c:149 msgid "Color Proof" msgstr "Preverjanje barv" -#: ../modules/display-filter-proof.c:338 +#: ../modules/display-filter-proof.c:292 msgid "Choose an ICC Color Profile" msgstr "Izberite barvni profil ICC" -#: ../modules/display-filter-proof.c:365 -msgid "All files (*.*)" -msgstr "Vse datoteke (*.*)" - -#: ../modules/display-filter-proof.c:370 -msgid "ICC color profile (*.icc, *.icm)" -msgstr "Barvni profil ICC (*.icc, *.icm)" - -#: ../modules/display-filter-proof.c:428 +#: ../modules/display-filter-proof.c:314 msgid "_Profile:" msgstr "_Profil:" -#: ../modules/display-filter-proof.c:434 +#: ../modules/display-filter-proof.c:320 msgid "_Intent:" msgstr "_Namen:" -#: ../modules/display-filter-proof.c:439 +#: ../modules/display-filter-proof.c:325 msgid "_Black Point Compensation" msgstr "Kompenzacija _črnih točk" - diff -Nru gimp-2.8.18/po-libgimp/sr@latin.po gimp-2.8.20/po-libgimp/sr@latin.po --- gimp-2.8.18/po-libgimp/sr@latin.po 2015-08-20 22:57:30.000000000 +0000 +++ gimp-2.8.20/po-libgimp/sr@latin.po 2017-01-28 19:08:46.000000000 +0000 @@ -13,7 +13,7 @@ "PO-Revision-Date: 2014-03-27 09:55+0200\n" "Last-Translator: Miroslav Nikolić \n" "Language-Team: Serbian \n" -"Language: sr\n" +"Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po-libgimp/zh_HK.po gimp-2.8.20/po-libgimp/zh_HK.po --- gimp-2.8.18/po-libgimp/zh_HK.po 2015-08-15 07:52:43.000000000 +0000 +++ gimp-2.8.20/po-libgimp/zh_HK.po 2017-01-28 18:58:05.000000000 +0000 @@ -12,7 +12,7 @@ "PO-Revision-Date: 2011-01-01 19:42+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Hong Kong) \n" -"Language: zh_TW\n" +"Language: zh_HK\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po-plug-ins/bs.po gimp-2.8.20/po-plug-ins/bs.po --- gimp-2.8.18/po-plug-ins/bs.po 2015-08-15 07:52:43.000000000 +0000 +++ gimp-2.8.20/po-plug-ins/bs.po 2017-01-28 18:58:05.000000000 +0000 @@ -11,6 +11,7 @@ "PO-Revision-Date: 2015-02-04 15:20+0000\n" "Last-Translator: Samir Ribić \n" "Language-Team: Bosnian \n" +"Language: bs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po-plug-ins/ca@valencia.po gimp-2.8.20/po-plug-ins/ca@valencia.po --- gimp-2.8.18/po-plug-ins/ca@valencia.po 2015-08-20 22:57:31.000000000 +0000 +++ gimp-2.8.20/po-plug-ins/ca@valencia.po 2017-01-28 19:08:46.000000000 +0000 @@ -19,7 +19,7 @@ "PO-Revision-Date: 2012-02-12 22:33+0100\n" "Last-Translator: Albert F. \n" "Language-Team: Catalan \n" -"Language: ca-XV\n" +"Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po-plug-ins/da.po gimp-2.8.20/po-plug-ins/da.po --- gimp-2.8.18/po-plug-ins/da.po 2016-05-25 22:26:47.000000000 +0000 +++ gimp-2.8.20/po-plug-ins/da.po 2017-01-28 18:58:05.000000000 +0000 @@ -1,20 +1,23 @@ # Danish translation for GIMP Plug-Ins. -# Copyright (C) 1999, 2000, 01, 02, 03, 04 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 01, 02, 03, 04, 2016 Free Software Foundation, Inc. +# # Yderligere oplysninger og konventioner kan findes på # http://wiki.dansk-gruppen.dk/index.php/GIMP +# # Kenneth Christiansen , 1999-2000. # Birger Langkjer , 2000. # Keld Simonsen , 2000. # Ole Laursen , 2001, 02, 03, 04. # Gitte Illum , 2011. # scootergrisen, 2015, 2016. +# Gennemgået (delvis) Ask Hjorth Larsen , 2016. msgid "" msgstr "" "Project-Id-Version: GIMP plug-ins\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gimp&ke" -"ywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-05-15 17:30+0000\n" -"PO-Revision-Date: 2016-01-23 02:34+0200\n" +"Report-Msgid-Bugs-To: " +"http://bugzilla.gnome.org/enter_bug.cgi?product=gimp&keywords=I18N+L10N&component=Internationalisation\n" +"POT-Creation-Date: 2016-09-06 19:15+0000\n" +"PO-Revision-Date: 2016-10-08 21:13+0200\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish \n" "Language: da\n" @@ -22,7 +25,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: \n" +"X-Generator: Virtaal 1.0.0-beta1\n" "X-Language: da_DK\n" "X-Source-Language: C\n" "X-Project-Style: gnome\n" @@ -266,7 +269,7 @@ #: ../plug-ins/common/alien-map.c:442 ../plug-ins/common/alien-map.c:466 #: ../plug-ins/common/alien-map.c:490 msgid "Number of cycles covering full value range" -msgstr "" +msgstr "Antal cyklusser som dækker fulde værdiområde" #: ../plug-ins/common/alien-map.c:454 ../plug-ins/common/alien-map.c:478 #: ../plug-ins/common/alien-map.c:502 @@ -275,7 +278,7 @@ #. Propagate Mode #: ../plug-ins/common/alien-map.c:516 ../plug-ins/common/hot.c:613 -#: ../plug-ins/common/value-propagate.c:1121 ../plug-ins/common/waves.c:279 +#: ../plug-ins/common/value-propagate.c:1125 ../plug-ins/common/waves.c:279 msgid "Mode" msgstr "Tilstand" @@ -304,7 +307,6 @@ msgstr "Justér synlige lag" #: ../plug-ins/common/align-layers.c:651 ../plug-ins/common/align-layers.c:682 -#| msgid "None" msgctxt "align-style" msgid "None" msgstr "Ingen" @@ -418,7 +420,6 @@ msgid "_Find Backdrop" msgstr "_Find slagskygge" -# scootergrisen: afoptimere? #: ../plug-ins/common/animation-optimize.c:426 msgid "Unoptimizing animation" msgstr "Afoptimerer animation" @@ -500,7 +501,7 @@ #: ../plug-ins/common/animation-play.c:663 #, c-format msgid "%d fps" -msgstr "%d fps" +msgstr "%d billeder pr. sekund" #: ../plug-ins/common/animation-play.c:674 msgid "Default framerate" @@ -530,11 +531,11 @@ # (GIP) http://da.wikipedia.org/wiki/Antialiasing. Ordet oversættes ikke umiddelbart. Opfundet af Apple. Får bogstaver til at være mere tydelige når de forstørres #: ../plug-ins/common/antialias.c:90 msgid "_Antialias" -msgstr "_Antialias" +msgstr "_Udjævning" #: ../plug-ins/common/antialias.c:147 msgid "Antialiasing..." -msgstr "Antialiasing..." +msgstr "Udjævninger..." #: ../plug-ins/common/apply-canvas.c:1140 msgid "Add a canvas texture to the image" @@ -617,13 +618,13 @@ #. * Create the "background" layer to hold the image... #. #: ../plug-ins/common/blinds.c:279 ../plug-ins/common/compose.c:936 -#: ../plug-ins/common/decompose.c:729 ../plug-ins/common/file-cel.c:442 -#: ../plug-ins/common/file-cel.c:445 ../plug-ins/common/file-dicom.c:612 +#: ../plug-ins/common/decompose.c:729 ../plug-ins/common/file-cel.c:445 +#: ../plug-ins/common/file-cel.c:448 ../plug-ins/common/file-dicom.c:612 #: ../plug-ins/common/file-gif-load.c:980 #: ../plug-ins/common/file-jp2-load.c:356 ../plug-ins/common/file-pcx.c:426 #: ../plug-ins/common/file-pcx.c:432 ../plug-ins/common/file-pix.c:384 -#: ../plug-ins/common/file-png.c:897 ../plug-ins/common/file-pnm.c:585 -#: ../plug-ins/common/file-raw.c:766 ../plug-ins/common/file-sunras.c:979 +#: ../plug-ins/common/file-png.c:898 ../plug-ins/common/file-pnm.c:585 +#: ../plug-ins/common/file-raw.c:780 ../plug-ins/common/file-sunras.c:979 #: ../plug-ins/common/file-tga.c:1095 ../plug-ins/common/file-tiff-load.c:1011 #: ../plug-ins/common/file-xbm.c:898 ../plug-ins/common/film.c:745 #: ../plug-ins/common/smooth-palette.c:257 ../plug-ins/common/tile.c:262 @@ -688,7 +689,7 @@ #: ../plug-ins/common/blur-gauss.c:172 msgid "_Gaussian Blur..." -msgstr "_Gaussisk slør..." +msgstr "_Gaussisk sløring..." #: ../plug-ins/common/blur-gauss.c:179 ../plug-ins/common/blur-gauss.c:199 #: ../plug-ins/common/blur-gauss.c:219 ../plug-ins/common/blur-gauss.c:239 @@ -732,7 +733,7 @@ #: ../plug-ins/common/blur-motion.c:164 ../plug-ins/common/blur-motion.c:177 msgid "_Motion Blur..." -msgstr "_Bevægelsesslør..." +msgstr "_Bevægelsessløring..." #: ../plug-ins/common/blur-motion.c:909 msgid "Motion blurring" @@ -891,11 +892,10 @@ msgid "Co_mpensate for darkening" msgstr "Ko_mpensér for formørkelse" -# scootergrisen: måske "omvend" #. Invert bumpmap #: ../plug-ins/common/bump-map.c:869 msgid "I_nvert bumpmap" -msgstr "I_nvertér højdekort" +msgstr "Om_vend højdekort" #. Tile bumpmap #: ../plug-ins/common/bump-map.c:883 @@ -965,7 +965,8 @@ #. printf("Channel Mixer:: Mode:%d r %f g %f b %f\n ", #. param[3].data.d_int32, mix.black.red_gain, #. mix.black.green_gain, mix.black.blue_gain); -#: ../plug-ins/common/channel-mixer.c:271 ../plug-ins/common/channel-mixer.c:492 +#: ../plug-ins/common/channel-mixer.c:271 +#: ../plug-ins/common/channel-mixer.c:492 msgid "Channel Mixer" msgstr "Kanalmixer" @@ -1030,8 +1031,8 @@ #. stat error (file does not exist) #: ../plug-ins/common/channel-mixer.c:980 #: ../plug-ins/common/cml-explorer.c:2208 ../plug-ins/common/curve-bend.c:891 -#: ../plug-ins/common/file-cel.c:297 ../plug-ins/common/file-cel.c:349 -#: ../plug-ins/common/file-cel.c:580 ../plug-ins/common/file-dicom.c:340 +#: ../plug-ins/common/file-cel.c:300 ../plug-ins/common/file-cel.c:352 +#: ../plug-ins/common/file-cel.c:583 ../plug-ins/common/file-dicom.c:340 #: ../plug-ins/common/file-gbr.c:370 ../plug-ins/common/file-gif-load.c:357 #: ../plug-ins/common/file-gih.c:642 ../plug-ins/common/file-jp2-load.c:196 #: ../plug-ins/common/file-jp2-load.c:205 ../plug-ins/common/file-mng.c:1156 @@ -1039,7 +1040,7 @@ #: ../plug-ins/common/file-pix.c:345 ../plug-ins/common/file-png.c:762 #: ../plug-ins/common/file-pnm.c:496 ../plug-ins/common/file-ps.c:1019 #: ../plug-ins/common/file-ps.c:2915 ../plug-ins/common/file-psp.c:1717 -#: ../plug-ins/common/file-raw.c:257 ../plug-ins/common/file-raw.c:714 +#: ../plug-ins/common/file-raw.c:257 ../plug-ins/common/file-raw.c:728 #: ../plug-ins/common/file-sunras.c:393 ../plug-ins/common/file-svg.c:333 #: ../plug-ins/common/file-svg.c:713 ../plug-ins/common/file-tga.c:443 #: ../plug-ins/common/file-xbm.c:738 ../plug-ins/common/file-xmc.c:657 @@ -1057,10 +1058,11 @@ #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1865 #: ../plug-ins/fractal-explorer/fractal-explorer.c:923 #: ../plug-ins/gfig/gfig.c:433 ../plug-ins/help/gimphelplocale.c:271 -#: ../plug-ins/help/gimphelplocale.c:287 ../plug-ins/lighting/lighting-ui.c:1367 +#: ../plug-ins/help/gimphelplocale.c:287 +#: ../plug-ins/lighting/lighting-ui.c:1367 #, c-format msgid "Could not open '%s' for reading: %s" -msgstr "Kan ikke åbne '%s' til læsning: %s" +msgstr "Kunne ikke åbne \"%s\" til læsning: %s" #: ../plug-ins/common/channel-mixer.c:1003 msgid "Save Channel Mixer Settings" @@ -1068,21 +1070,21 @@ #: ../plug-ins/common/channel-mixer.c:1058 #: ../plug-ins/common/cml-explorer.c:2035 ../plug-ins/common/curve-bend.c:839 -#: ../plug-ins/common/file-cel.c:773 ../plug-ins/common/file-csource.c:407 +#: ../plug-ins/common/file-cel.c:776 ../plug-ins/common/file-csource.c:407 #: ../plug-ins/common/file-dicom.c:1371 ../plug-ins/common/file-gbr.c:665 #: ../plug-ins/common/file-gif-save.c:792 ../plug-ins/common/file-gih.c:1260 #: ../plug-ins/common/file-html-table.c:236 ../plug-ins/common/file-mng.c:649 #: ../plug-ins/common/file-mng.c:984 ../plug-ins/common/file-pat.c:488 #: ../plug-ins/common/file-pcx.c:713 ../plug-ins/common/file-pdf-save.c:438 -#: ../plug-ins/common/file-pix.c:528 ../plug-ins/common/file-png.c:1369 +#: ../plug-ins/common/file-pix.c:528 ../plug-ins/common/file-png.c:1370 #: ../plug-ins/common/file-pnm.c:1012 ../plug-ins/common/file-ps.c:1195 -#: ../plug-ins/common/file-raw.c:609 ../plug-ins/common/file-raw.c:637 +#: ../plug-ins/common/file-raw.c:623 ../plug-ins/common/file-raw.c:651 #: ../plug-ins/common/file-sunras.c:567 ../plug-ins/common/file-tga.c:1202 #: ../plug-ins/common/file-tiff-save.c:842 ../plug-ins/common/file-xbm.c:1037 #: ../plug-ins/common/file-xmc.c:1449 ../plug-ins/common/file-xwd.c:637 #: ../plug-ins/common/sphere-designer.c:2121 #: ../plug-ins/file-bmp/bmp-write.c:311 ../plug-ins/file-fits/fits.c:478 -#: ../plug-ins/file-fli/fli-gimp.c:752 ../plug-ins/file-ico/ico-save.c:1007 +#: ../plug-ins/file-fli/fli-gimp.c:752 ../plug-ins/file-ico/ico-save.c:1020 #: ../plug-ins/file-jpeg/jpeg-save.c:355 ../plug-ins/file-psd/psd-save.c:1653 #: ../plug-ins/file-uri/uri-backend-libcurl.c:166 #: ../plug-ins/file-xjt/xjt.c:1280 ../plug-ins/file-xjt/xjt.c:1719 @@ -1092,7 +1094,7 @@ #: ../plug-ins/lighting/lighting-ui.c:1223 #, c-format msgid "Could not open '%s' for writing: %s" -msgstr "Kan ikke åbne '%s' til skrivning: %s" +msgstr "Kunne ikke åbne \"%s\" til skrivning: %s" #: ../plug-ins/common/channel-mixer.c:1066 #: ../plug-ins/common/cml-explorer.c:2090 @@ -1181,7 +1183,6 @@ msgstr "sin^p, trinvis" #: ../plug-ins/common/cml-explorer.c:166 -#| msgid "None" msgctxt "cml-composition" msgid "None" msgstr "Ingen" @@ -1411,7 +1412,8 @@ # "from seed" er en fejl i originalen, det burde være "fixed seed" som er oversat ovenfor #: ../plug-ins/common/cml-explorer.c:1366 msgid "Seed of Random (only for \"From Seed\" Modes)" -msgstr "Startværdi til tilfældighed (kun til tilstande med \"Fra startværdi\")" +msgstr "" +"Startværdi til tilfældighed (kun til tilstande med \"Fra startværdi\")" #: ../plug-ins/common/cml-explorer.c:1377 ../plug-ins/maze/maze-dialog.c:251 msgid "Seed:" @@ -1446,7 +1448,8 @@ msgid "Source channel:" msgstr "Kildekanal:" -#: ../plug-ins/common/cml-explorer.c:1459 ../plug-ins/common/cml-explorer.c:1507 +#: ../plug-ins/common/cml-explorer.c:1459 +#: ../plug-ins/common/cml-explorer.c:1507 msgid "Destination channel:" msgstr "Målkanal:" @@ -1512,12 +1515,10 @@ msgstr "Parameter k:" #: ../plug-ins/common/cml-explorer.c:1670 -#, fuzzy msgid "Range low:" msgstr "Intervalstart:" #: ../plug-ins/common/cml-explorer.c:1679 -#, fuzzy msgid "Range high:" msgstr "Intervalslut:" @@ -1573,7 +1574,6 @@ msgid "Error: failed to load parameters" msgstr "Fejl: kunne ikke indlæse parametre" -# scootergrisen: tjek senere. Måske "Analysér forekomsten af farver i billedet" #: ../plug-ins/common/color-cube-analyze.c:106 msgid "Analyze the set of colors in the image" msgstr "Analysér farvesættet i billedet" @@ -1613,11 +1613,11 @@ #: ../plug-ins/common/color-enhance.c:80 msgid "_Color Enhance" -msgstr "_Farvefremhævning" +msgstr "_Farvefremhæv" #: ../plug-ins/common/color-enhance.c:114 msgid "Color Enhance" -msgstr "Farvefremhævning" +msgstr "Farvefremhæv" #: ../plug-ins/common/color-exchange.c:122 msgid "Swap one color with another" @@ -1652,17 +1652,14 @@ msgid "Color Exchange: From Color" msgstr "Farveudveksling: fra farve" -# scootergrisen: måske "Grænse for _...:" #: ../plug-ins/common/color-exchange.c:436 msgid "R_ed threshold:" msgstr "_Rød grænse:" -# scootergrisen: måske "Grænse for _...:" #: ../plug-ins/common/color-exchange.c:492 msgid "G_reen threshold:" msgstr "_Grøn grænse:" -# scootergrisen: måske "Grænse for _...:" #: ../plug-ins/common/color-exchange.c:548 msgid "B_lue threshold:" msgstr "_Blå grænse:" @@ -1744,7 +1741,7 @@ #: ../plug-ins/common/colormap-remap.c:297 #: ../plug-ins/common/colormap-remap.c:308 msgid "Invalid remap array was passed to remap function" -msgstr "" +msgstr "Ugyldigt remap-array blev givet til remap-funktion" #: ../plug-ins/common/colormap-remap.c:332 msgid "Rearranging the colormap" @@ -1779,9 +1776,12 @@ "Drag and drop colors to rearrange the colormap. The numbers shown are the " "original indices. Right-click for a menu with sort options." msgstr "" +"Træk og slip farver for at arrangere farvekortet. De viste tal er de " +"oprindelige indeks. Højreklik for at vise en menu med valgmuligheder for " +"sortering." #: ../plug-ins/common/compose.c:189 ../plug-ins/common/decompose.c:170 -#: ../plug-ins/common/file-raw.c:1103 +#: ../plug-ins/common/file-raw.c:1117 msgid "RGB" msgstr "RGB" @@ -1897,16 +1897,15 @@ #: ../plug-ins/common/compose.c:404 msgid "Create an image using multiple gray images as color channels" -msgstr "" +msgstr "Opret et billede ved brug af flere gråtonebilleder som farvekanaler" #: ../plug-ins/common/compose.c:410 msgid "C_ompose..." msgstr "_Sammensæt..." -# scootergrisen: decompose? #: ../plug-ins/common/compose.c:434 msgid "Recompose an image that was previously decomposed" -msgstr "Genkomponér et billede der tidligere blev opdelt" +msgstr "Genkomponér et billede, der tidligere blev opbrudt" #: ../plug-ins/common/compose.c:442 msgid "R_ecompose" @@ -1917,10 +1916,14 @@ "You can only run 'Recompose' if the active image was originally produced by " "'Decompose'." msgstr "" +"Du kan kun køre \"Genkomponér\" hvis det aktive billede oprindeligt blev " +"produceret af \"Opbryd\"." #: ../plug-ins/common/compose.c:512 msgid "Error scanning 'decompose-data' parasite: too few layers found" msgstr "" +"Fejl ved skanning af \"decompose-data\"-parasit (opbrydning): for få lag " +"fundet" #: ../plug-ins/common/compose.c:545 #, c-format @@ -1959,7 +1962,7 @@ #: ../plug-ins/common/compose.c:824 msgid "Unable to recompose, source layer not found" -msgstr "" +msgstr "Kan ikke genkomponere: kildelag ikke fundet" #: ../plug-ins/common/compose.c:1483 msgid "Compose" @@ -1985,7 +1988,7 @@ #: ../plug-ins/common/contrast-normalize.c:79 msgid "Stretch brightness values to cover the full range" -msgstr "" +msgstr "Stræk lysstyrkeværdier til at dække det fulde område" #: ../plug-ins/common/contrast-normalize.c:91 ../plug-ins/common/edge-dog.c:362 msgid "_Normalize" @@ -2007,10 +2010,9 @@ msgid "Retinex" msgstr "Retinex" -# scootergrisen: måske "fremhævning" #: ../plug-ins/common/contrast-retinex.c:285 msgid "Retinex Image Enhancement" -msgstr "Retinex billedforbedring" +msgstr "Retinex-billedforbedring" #: ../plug-ins/common/contrast-retinex.c:321 msgid "Uniform" @@ -2032,7 +2034,6 @@ msgid "_Scale:" msgstr "_Skalér:" -# scootergrisen: måske opdeling #: ../plug-ins/common/contrast-retinex.c:352 msgid "Scale _division:" msgstr "Skalér _opdeling:" @@ -2059,11 +2060,11 @@ #: ../plug-ins/common/contrast-stretch-hsv.c:191 msgid "autostretch_hsv: cmap was NULL! Quitting...\n" -msgstr "" +msgstr "autostretch_hsv: cmap var NULL! Afslutter...\n" #: ../plug-ins/common/contrast-stretch.c:67 msgid "Stretch contrast to cover the maximum possible range" -msgstr "" +msgstr "Stræk kontrasten, så den dækker det størst mulige område" #: ../plug-ins/common/contrast-stretch.c:78 msgid "_Stretch Contrast" @@ -2085,11 +2086,13 @@ msgid "Re_d" msgstr "R_ød" -#: ../plug-ins/common/convolution-matrix.c:66 ../plug-ins/common/newsprint.c:344 +#: ../plug-ins/common/convolution-matrix.c:66 +#: ../plug-ins/common/newsprint.c:344 msgid "_Green" msgstr "_Grøn" -#: ../plug-ins/common/convolution-matrix.c:67 ../plug-ins/common/newsprint.c:352 +#: ../plug-ins/common/convolution-matrix.c:67 +#: ../plug-ins/common/newsprint.c:352 msgid "_Blue" msgstr "_Blå" @@ -2140,9 +2143,9 @@ msgstr "D_ivisor:" #: ../plug-ins/common/convolution-matrix.c:1001 -#: ../plug-ins/common/depth-merge.c:775 ../plug-ins/common/file-raw.c:1124 +#: ../plug-ins/common/depth-merge.c:775 ../plug-ins/common/file-raw.c:1138 msgid "O_ffset:" -msgstr "A_fstand:" +msgstr "_Forskyd:" #: ../plug-ins/common/convolution-matrix.c:1030 msgid "N_ormalise" @@ -2198,7 +2201,7 @@ #: ../plug-ins/common/cubism.c:150 msgid "Convert the image into randomly rotated square blobs" -msgstr "" +msgstr "Konvertér billeder til tilfældigt roterede firkantede klumper" #: ../plug-ins/common/cubism.c:155 msgid "_Cubism..." @@ -2292,12 +2295,11 @@ msgid "Smoo_thing" msgstr "Ud_jævning" -# scootergrisen: udjævning? #. The antialiasing toggle #: ../plug-ins/common/curve-bend.c:1352 ../plug-ins/common/mosaic.c:733 #: ../plug-ins/common/qbist.c:858 ../plug-ins/common/ripple.c:532 msgid "_Antialiasing" -msgstr "_Udglatning" +msgstr "_Udjævning" #. The work_on_copy toggle #: ../plug-ins/common/curve-bend.c:1362 @@ -2415,7 +2417,7 @@ #: ../plug-ins/common/decompose.c:193 ../plug-ins/common/decompose.c:197 msgid "hue_l" -msgstr "" +msgstr "farvetone_l" #: ../plug-ins/common/decompose.c:194 ../plug-ins/common/decompose.c:198 msgid "saturation_l" @@ -2545,17 +2547,14 @@ msgid "Decompose an image into separate colorspace components" msgstr "Opbryd et billede i flere farverumskomponenter" -# scootergrisen: decompose? #: ../plug-ins/common/decompose.c:318 ../plug-ins/common/decompose.c:336 msgid "_Decompose..." -msgstr "Opbry_d..." +msgstr "Op_bryd..." -# scootergrisen: decompose? #: ../plug-ins/common/decompose.c:429 msgid "Decomposing" msgstr "Bryder op" -# scootergrisen: decompose? #: ../plug-ins/common/decompose.c:1493 msgid "Decompose" msgstr "Opbryd" @@ -2564,10 +2563,9 @@ msgid "Extract Channels" msgstr "Udtræk kanaler" -# scootergrisen: decompose? #: ../plug-ins/common/decompose.c:1563 msgid "_Decompose to layers" -msgstr "Opbry_d i lag" +msgstr "_Opbryd i lag" #: ../plug-ins/common/decompose.c:1574 msgid "_Foreground as registration color" @@ -2578,10 +2576,12 @@ "Pixels in the foreground color will appear black in all output images. This " "can be used for things like crop marks that have to show up on all channels." msgstr "" +"Pixels i forgrundsfarven vil være sorte i alle outputbilleder. Dette kan " +"bruges til f.eks. skæringsmærker, som skal vises på alle kanaler." #: ../plug-ins/common/deinterlace.c:91 msgid "Fix images where every other row is missing" -msgstr "" +msgstr "Ret billeder hvor hver anden række mangler" #: ../plug-ins/common/deinterlace.c:100 msgid "_Deinterlace..." @@ -2681,7 +2681,7 @@ #: ../plug-ins/common/destripe.c:103 msgid "Remove vertical stripe artifacts from the image" -msgstr "" +msgstr "Fjern lodrette striber med fejl fra billedet" #: ../plug-ins/common/destripe.c:109 msgid "Des_tripe..." @@ -2697,7 +2697,7 @@ #: ../plug-ins/common/destripe.c:476 ../plug-ins/common/file-html-table.c:584 #: ../plug-ins/common/file-ps.c:3039 ../plug-ins/common/file-ps.c:3237 -#: ../plug-ins/common/file-raw.c:1137 ../plug-ins/common/smooth-palette.c:437 +#: ../plug-ins/common/file-raw.c:1151 ../plug-ins/common/smooth-palette.c:437 #: ../plug-ins/common/tile-paper.c:303 ../plug-ins/common/tile.c:428 #: ../plug-ins/imagemap/imap_cmd_guides.c:164 #: ../plug-ins/imagemap/imap_rectangle.c:401 @@ -2778,7 +2778,7 @@ #: ../plug-ins/common/displace.c:169 msgid "Displace pixels as indicated by displacement maps" -msgstr "" +msgstr "Forskyd pixels som angivet af forskydningskort" #: ../plug-ins/common/displace.c:179 msgid "_Displace..." @@ -2831,12 +2831,11 @@ #: ../plug-ins/common/edge-dog.c:135 msgid "Edge detection with control of edge thickness" -msgstr "" +msgstr "Kantfinding vil styre kantens tykkelse" -# scootergrisen: måske _Forskel af Gaussfunktioner... #: ../plug-ins/common/edge-dog.c:142 msgid "_Difference of Gaussians..." -msgstr "_Forskel af gaussisker..." +msgstr "_Forskel på gaussfunktioner..." #: ../plug-ins/common/edge-dog.c:245 ../plug-ins/common/edge-dog.c:302 msgid "DoG Edge Detect" @@ -2868,7 +2867,6 @@ msgstr "_Laplace" #: ../plug-ins/common/edge-laplace.c:243 ../plug-ins/common/edge.c:664 -#, fuzzy msgid "Laplace" msgstr "Laplace" @@ -2878,7 +2876,7 @@ #: ../plug-ins/common/edge-neon.c:134 msgid "Simulate the glowing boundary of a neon light" -msgstr "" +msgstr "Simulér den glødende kant af et neonlys" #: ../plug-ins/common/edge-neon.c:139 msgid "_Neon..." @@ -2931,7 +2929,6 @@ msgstr "Flere simple metoder til at finde kanter" #: ../plug-ins/common/edge.c:153 -#, fuzzy msgid "_Edge..." msgstr "_Kant..." @@ -2974,7 +2971,7 @@ #: ../plug-ins/common/emboss.c:125 msgid "Simulate an image created by embossing" -msgstr "" +msgstr "Simulér et billede skabt ved relief" #: ../plug-ins/common/emboss.c:131 msgid "_Emboss..." @@ -3018,7 +3015,7 @@ #: ../plug-ins/common/engrave.c:245 ../plug-ins/common/file-html-table.c:600 #: ../plug-ins/common/file-ps.c:3049 ../plug-ins/common/file-ps.c:3246 -#: ../plug-ins/common/file-raw.c:1150 ../plug-ins/common/film.c:1002 +#: ../plug-ins/common/file-raw.c:1164 ../plug-ins/common/film.c:1002 #: ../plug-ins/common/smooth-palette.c:442 ../plug-ins/common/tile-paper.c:314 #: ../plug-ins/common/tile.c:432 ../plug-ins/imagemap/imap_cmd_guides.c:174 #: ../plug-ins/imagemap/imap_rectangle.c:408 @@ -3052,8 +3049,8 @@ msgid "Load KISS Palette" msgstr "Indlæs KISS-palet" -#: ../plug-ins/common/file-cel.c:309 ../plug-ins/common/file-cel.c:364 -#: ../plug-ins/common/file-cel.c:384 +#: ../plug-ins/common/file-cel.c:312 ../plug-ins/common/file-cel.c:367 +#: ../plug-ins/common/file-cel.c:387 #, c-format msgid "EOF or error while reading image header" msgstr "EOF eller fejl ved læsning af billedheader" @@ -3062,13 +3059,13 @@ #. column, highest column ever used #. -1 assume fsel is not available (and not attached to any drawable) #. -1 assume there is no floating selection -#: ../plug-ins/common/file-cel.c:354 ../plug-ins/common/file-dicom.c:345 +#: ../plug-ins/common/file-cel.c:357 ../plug-ins/common/file-dicom.c:345 #: ../plug-ins/common/file-gbr.c:375 ../plug-ins/common/file-gif-load.c:362 #: ../plug-ins/common/file-gih.c:647 ../plug-ins/common/file-jp2-load.c:189 #: ../plug-ins/common/file-pat.c:344 ../plug-ins/common/file-pcx.c:367 #: ../plug-ins/common/file-pdf-load.c:861 ../plug-ins/common/file-pix.c:350 -#: ../plug-ins/common/file-png.c:769 ../plug-ins/common/file-pnm.c:501 -#: ../plug-ins/common/file-ps.c:1025 ../plug-ins/common/file-raw.c:719 +#: ../plug-ins/common/file-png.c:770 ../plug-ins/common/file-pnm.c:501 +#: ../plug-ins/common/file-ps.c:1025 ../plug-ins/common/file-raw.c:733 #: ../plug-ins/common/file-sunras.c:489 ../plug-ins/common/file-tga.c:448 #: ../plug-ins/common/file-tiff-load.c:611 ../plug-ins/common/file-wmf.c:994 #: ../plug-ins/common/file-xbm.c:743 ../plug-ins/common/file-xmc.c:669 @@ -3081,81 +3078,80 @@ msgid "Opening '%s'" msgstr "Åbner '%s'" -#: ../plug-ins/common/file-cel.c:392 +#: ../plug-ins/common/file-cel.c:395 #, c-format -#| msgid "'%s' is not a PCX file" msgid "is not a CEL image file" msgstr "er ikke en CEL-billedfil" -#: ../plug-ins/common/file-cel.c:406 +#: ../plug-ins/common/file-cel.c:409 #, c-format msgid "illegal bpp value in image: %hhu" msgstr "ugyldig bpp-værdi i billede: %hhu" -#: ../plug-ins/common/file-cel.c:420 +#: ../plug-ins/common/file-cel.c:423 #, c-format msgid "" "illegal image dimensions: width: %d, horizontal offset: %d, height: %d, " "vertical offset: %d" msgstr "" +"Ugyldige billeddimensioner: bredde: %d, vandret forskydning: %d, højde: %d, " +"lodret forskydning: %d" -#: ../plug-ins/common/file-cel.c:433 +#: ../plug-ins/common/file-cel.c:436 #, c-format msgid "Can't create a new image" msgstr "Kan ikke oprette nyt billede" -#: ../plug-ins/common/file-cel.c:471 ../plug-ins/common/file-cel.c:506 -#: ../plug-ins/common/file-cel.c:531 +#: ../plug-ins/common/file-cel.c:474 ../plug-ins/common/file-cel.c:509 +#: ../plug-ins/common/file-cel.c:534 #, c-format msgid "EOF or error while reading image data" msgstr "EOF eller fejl ved læsning af billeddata" -#: ../plug-ins/common/file-cel.c:548 +#: ../plug-ins/common/file-cel.c:551 #, c-format msgid "Unsupported bit depth (%d)!" msgstr "Ikke-understøttet farvedybde (%d)" -#: ../plug-ins/common/file-cel.c:630 ../plug-ins/common/file-cel.c:642 +#: ../plug-ins/common/file-cel.c:633 ../plug-ins/common/file-cel.c:645 #, c-format msgid "'%s': EOF or error while reading palette header" msgstr "\"%s\": EOF eller fejl ved læsning af palet-header" -#: ../plug-ins/common/file-cel.c:651 +#: ../plug-ins/common/file-cel.c:654 #, c-format -#| msgid "'%s' is not a PCX file" msgid "'%s': is not a KCF palette file" msgstr "\"%s\": er ikke en KCF-paletfil" -#: ../plug-ins/common/file-cel.c:660 +#: ../plug-ins/common/file-cel.c:663 #, c-format msgid "'%s': illegal bpp value in palette: %hhu" msgstr "'%s': ugyldig bpp-værdi i palet: %hhu" -#: ../plug-ins/common/file-cel.c:669 +#: ../plug-ins/common/file-cel.c:672 #, c-format -#| msgid "Number of colors:" msgid "'%s': illegal number of colors: %u" msgstr "\"%s\": ugyldigt antal farver: %u" -#: ../plug-ins/common/file-cel.c:684 ../plug-ins/common/file-cel.c:701 -#: ../plug-ins/common/file-cel.c:721 +#: ../plug-ins/common/file-cel.c:687 ../plug-ins/common/file-cel.c:704 +#: ../plug-ins/common/file-cel.c:724 #, c-format msgid "'%s': EOF or error while reading palette data" msgstr "\"%s\": EOF eller fejl ved læsning af paletdata" #. init the progress meter #. And let's begin the progress -#: ../plug-ins/common/file-cel.c:778 ../plug-ins/common/file-gbr.c:670 +#: ../plug-ins/common/file-cel.c:781 ../plug-ins/common/file-gbr.c:670 #: ../plug-ins/common/file-gif-save.c:799 ../plug-ins/common/file-gih.c:1265 #: ../plug-ins/common/file-html-table.c:257 ../plug-ins/common/file-pat.c:493 #: ../plug-ins/common/file-pcx.c:645 ../plug-ins/common/file-pix.c:533 -#: ../plug-ins/common/file-png.c:1376 ../plug-ins/common/file-pnm.c:1017 +#: ../plug-ins/common/file-png.c:1377 ../plug-ins/common/file-pnm.c:1017 #: ../plug-ins/common/file-ps.c:1200 ../plug-ins/common/file-sunras.c:572 #: ../plug-ins/common/file-tga.c:1207 ../plug-ins/common/file-tiff-save.c:713 #: ../plug-ins/common/file-xbm.c:1042 ../plug-ins/common/file-xmc.c:1454 #: ../plug-ins/common/file-xpm.c:639 ../plug-ins/common/file-xwd.c:642 #: ../plug-ins/file-bmp/bmp-write.c:322 ../plug-ins/file-fits/fits.c:483 -#: ../plug-ins/file-fli/fli-gimp.c:720 ../plug-ins/file-ico/ico-save.c:1001 +#: ../plug-ins/file-fli/fli-gimp.c:720 ../plug-ins/file-ico/ico-save.c:1014 #: ../plug-ins/file-jpeg/jpeg-save.c:312 ../plug-ins/file-psd/psd-save.c:1658 #: ../plug-ins/file-sgi/sgi.c:578 ../plug-ins/file-xjt/xjt.c:1700 #, c-format @@ -3170,11 +3166,9 @@ msgid "C-Source" msgstr "C-kilde" -# RETMIG: eller "Foranstillet navn"? #: ../plug-ins/common/file-csource.c:719 -#, fuzzy msgid "_Prefixed name:" -msgstr "_Præfiksnavn:" +msgstr "_Foranstillet navn:" #: ../plug-ins/common/file-csource.c:728 msgid "Co_mment:" @@ -3221,7 +3215,7 @@ msgstr "Skrivebordsgenvej" #: ../plug-ins/common/file-desktop-link.c:175 -#, fuzzy, c-format +#, c-format msgid "Error loading desktop file '%s': %s" msgstr "Fejl ved indlæsning af skrivebordsfil \"%s\": %s" @@ -3231,7 +3225,7 @@ #: ../plug-ins/common/file-dicom.c:164 msgid "Digital Imaging and Communications in Medicine image" -msgstr "" +msgstr "Digital Imaging and Communications in Medicine-billede" #: ../plug-ins/common/file-dicom.c:369 #, c-format @@ -3256,7 +3250,7 @@ #: ../plug-ins/common/file-gbr.c:401 ../plug-ins/common/file-pat.c:420 #, c-format msgid "Invalid header data in '%s': width=%lu, height=%lu, bytes=%lu" -msgstr "" +msgstr "Ugyldige headerdata i \"%s\": bredde=%lu, højde=%lu, byte=%lu" #: ../plug-ins/common/file-gbr.c:425 ../plug-ins/common/file-gbr.c:437 msgid "Unsupported brush format" @@ -3296,7 +3290,8 @@ msgid "Description:" msgstr "Beskrivelse:" -#: ../plug-ins/common/file-gif-load.c:148 ../plug-ins/common/file-gif-save.c:177 +#: ../plug-ins/common/file-gif-load.c:148 +#: ../plug-ins/common/file-gif-save.c:177 msgid "GIF image" msgstr "GIF-billede" @@ -3367,10 +3362,8 @@ "Kan ikke gemme RGB-billeder. Konvertér til indekseret eller gråtone først." #: ../plug-ins/common/file-gif-save.c:941 -#, fuzzy msgid "Delay inserted to prevent evil CPU-sucking animation." -msgstr "" -"Ventetid indsat for at forhindre ondsindet processorslugende animation." +msgstr "Ventetid indsat for at forhindre ondsindet CPU-slugende animation." #: ../plug-ins/common/file-gif-save.c:982 msgid "" @@ -3381,13 +3374,12 @@ "billedets kanter." #: ../plug-ins/common/file-gif-save.c:999 -#, fuzzy msgid "" "The GIF file format does not allow this. You may choose whether to crop all " "of the layers to the image borders, or cancel this save." msgstr "" -"GIF-formatet tillader ikke dette. Du kan vælge om du vil beskære alle lagene " -"til billedkanterne, eller annullere dette gemning." +"GIF-filformatet tillader ikke dette. Du kan vælge, om du vil beskære alle " +"lagene til billedkanterne, eller undlade at gemme." #: ../plug-ins/common/file-gif-save.c:1135 msgid "GIF" @@ -3413,13 +3405,15 @@ #: ../plug-ins/common/file-gif-save.c:1201 msgid "One frame per layer (replace)" -msgstr "Et billede per lag (erstat)" +msgstr "Et billede pr. lag (erstat)" #: ../plug-ins/common/file-gif-save.c:1218 msgid "" "You can only export as animation when the image has more than one layer. The " "image you are trying to export only has one layer." msgstr "" +"Du kan kun eksportere som animation, når billedet har mere end et lag. " +"Billedet, du prøver at eksportere, har kun et lag." #: ../plug-ins/common/file-gif-save.c:2322 msgid "Error writing output file." @@ -3458,7 +3452,7 @@ #: ../plug-ins/common/file-gih.c:943 msgid "Pixels" -msgstr "Punkter" +msgstr "Pixels" #: ../plug-ins/common/file-gih.c:948 msgid "Cell size:" @@ -3544,9 +3538,8 @@ # ikke helt magen til engelsk original, men værktøjstippet neden for # giver hjælp #: ../plug-ins/common/file-html-table.c:478 -#, fuzzy msgid "_Use cellspan" -msgstr "Slå _celler sammen" +msgstr "_Brug cellspan" #: ../plug-ins/common/file-html-table.c:484 msgid "" @@ -3558,7 +3551,7 @@ #: ../plug-ins/common/file-html-table.c:493 msgid "Co_mpress TD tags" -msgstr "_Komprimér TD-mærker" +msgstr "_Komprimér TD-tags" #: ../plug-ins/common/file-html-table.c:499 msgid "" @@ -3566,8 +3559,8 @@ "and the cellcontent. This is only necessary for pixel level positioning " "control." msgstr "" -"Undlad mellemrum mellem TD-mærker og celleindholdet. Dette er kun nødvendigt " -"for positionskontrol på punktniveau." +"Tilvælg for at få GTM til at undlade mellemrum mellem TD-tags og " +"celleindholdet. Dette er kun nødvendigt for positionskontrol på pixelniveau." #: ../plug-ins/common/file-html-table.c:509 msgid "C_aption" @@ -3618,18 +3611,14 @@ # RETMIG: er dette rigtigt? #: ../plug-ins/common/file-html-table.c:619 #, fuzzy -#| msgid "The amount of cellpadding." msgid "The amount of cell padding." msgstr "Hvor meget fyld der skal i cellerne omkring teksten." #: ../plug-ins/common/file-html-table.c:628 -#, fuzzy msgid "Cell-_spacing:" -msgstr "Celle_mellemrum:" +msgstr "Celle_afstand:" #: ../plug-ins/common/file-html-table.c:632 -#, fuzzy -#| msgid "The amount of cellspacing." msgid "The amount of cell spacing." msgstr "Afstand mellem cellerne." @@ -3644,13 +3633,14 @@ #: ../plug-ins/common/file-jp2-load.c:237 #, c-format -msgid "The image '%s' is in grayscale but does not contain any gray component." -msgstr "" +msgid "" +"The image '%s' is in grayscale but does not contain any gray component." +msgstr "Billedet \"%s\" er i gråtoner, men indeholder ingen grå komponent." #: ../plug-ins/common/file-jp2-load.c:263 #, c-format msgid "The image '%s' is in RGB, but is missing some of the components." -msgstr "" +msgstr "Billedet \"%s\" er i RGB, men mangler nogle af komponenterne." #: ../plug-ins/common/file-jp2-load.c:289 #, c-format @@ -3658,6 +3648,8 @@ "The image '%s' is in the CIEXYZ color space, but there is no code in place " "to convert it to RGB." msgstr "" +"Billedet \"%s\" er i CIEXYZ-farverum, men der er ingen kode til at " +"konvertere det til RGB." #: ../plug-ins/common/file-jp2-load.c:296 #, c-format @@ -3665,6 +3657,8 @@ "The image '%s' is in the CIELAB color space, but there is no code in place " "to convert it to RGB." msgstr "" +"Billedet \"%s\" er i CIELAB-farverum, men der er ingen kode til at " +"konvertere det til RGB." #: ../plug-ins/common/file-jp2-load.c:303 #, c-format @@ -3672,6 +3666,8 @@ "The image '%s' is in the YCbCr color space, but there is no code in place to " "convert it to RGB." msgstr "" +"Billedet \"%s\" er i YCbCr-farverum, men der er ingen kode til at konvertere " +"det til RGB." #: ../plug-ins/common/file-jp2-load.c:311 #, c-format @@ -3684,21 +3680,26 @@ "Image component %d of image '%s' does not have the same size as the image. " "This is currently not supported." msgstr "" +"Billedkomponenent %d af billedet \"%s\" har ikke den samme størrelse som " +"billedet. Dette understøttes ikke på nuværende tidspunkt." #: ../plug-ins/common/file-jp2-load.c:336 #, c-format msgid "Image component %d of image '%s' does not have both a hstep and vstep." msgstr "" +"Billedkomponenent %d af billedet \"%s\" har ikke både en hstep og vstep." #: ../plug-ins/common/file-jp2-load.c:345 #, c-format msgid "" "Image component %d of image '%s' is signed. This is currently not supported." msgstr "" +"Billedkomponenent %d af billedet \"%s\" er signeret. Dette understøttes ikke " +"på nuværende tidspunkt." #. Inform the user that we couldn't losslessly save the #. * transparency & just use the full palette -#: ../plug-ins/common/file-mng.c:534 ../plug-ins/common/file-png.c:1913 +#: ../plug-ins/common/file-mng.c:534 ../plug-ins/common/file-png.c:1914 msgid "Couldn't losslessly save transparency, saving opacity instead." msgstr "" "Kunne ikke gemme gennemsigtighed uden tab. Gemmer synligheden i stedet." @@ -3732,7 +3733,7 @@ msgstr "Gem oprettelsesdato" #. Dialog init -#: ../plug-ins/common/file-mng.c:1411 ../plug-ins/common/file-png.c:1962 +#: ../plug-ins/common/file-mng.c:1411 ../plug-ins/common/file-png.c:1963 msgid "PNG" msgstr "PNG" @@ -3799,9 +3800,8 @@ msgstr "Sløjfe" #: ../plug-ins/common/file-mng.c:1526 -#, fuzzy msgid "Default frame delay:" -msgstr "Standardbilledtid:" +msgstr "Standardbilledforsinkelse:" #: ../plug-ins/common/file-mng.c:1542 ../plug-ins/ui/plug-in-file-gif.ui.h:7 msgid "milliseconds" @@ -3861,33 +3861,33 @@ msgstr "Ugyldig antal bytes pr. linie i PCX hovedet" #: ../plug-ins/common/file-pcx.c:418 -#, fuzzy, c-format +#, c-format msgid "Image dimensions too large: width %d x height %d" -msgstr "Billedstørrelse: %d x %d" +msgstr "Billedstørrelse for stor: bredde %d x højde %d" #: ../plug-ins/common/file-pcx.c:467 msgid "Unusual PCX flavour, giving up" msgstr "Usædvanlig PCX-variant, giver op" #: ../plug-ins/common/file-pcx.c:686 -#, fuzzy, c-format +#, c-format msgid "Invalid X offset: %d" msgstr "Ugyldig x-forskydning: %d" #: ../plug-ins/common/file-pcx.c:692 -#, fuzzy, c-format +#, c-format msgid "Invalid Y offset: %d" msgstr "Ugyldig y-forskydning: %d" #: ../plug-ins/common/file-pcx.c:698 #, c-format msgid "Right border out of bounds (must be < %d): %d" -msgstr "" +msgstr "Højre kant går ud over grænser (skal være < %d): %d" #: ../plug-ins/common/file-pcx.c:705 #, c-format msgid "Bottom border out of bounds (must be < %d): %d" -msgstr "" +msgstr "Nedre kant går ud over grænser (skal være < %d): %d" #: ../plug-ins/common/file-pcx.c:770 #, c-format @@ -3895,11 +3895,13 @@ msgstr "Skrivning til filen \"%s\" mislykkedes: %s" # GIP) Går ud fra, at det er en forklaring på PDF -#: ../plug-ins/common/file-pdf-load.c:300 ../plug-ins/common/file-pdf-save.c:300 +#: ../plug-ins/common/file-pdf-load.c:300 +#: ../plug-ins/common/file-pdf-save.c:300 msgid "Portable Document Format" msgstr "Portable Document Format" -#: ../plug-ins/common/file-pdf-load.c:548 ../plug-ins/common/file-pdf-load.c:567 +#: ../plug-ins/common/file-pdf-load.c:548 +#: ../plug-ins/common/file-pdf-load.c:567 #, c-format msgid "Could not load '%s': %s" msgstr "Kunne ikke indlæse \"%s\": %s" @@ -3925,7 +3927,7 @@ #: ../plug-ins/common/file-pdf-load.c:1126 msgid "Error getting number of pages from the given PDF file." -msgstr "" +msgstr "Fejl ved hentning af antal sider fra den givne PDF-fil." #: ../plug-ins/common/file-pdf-load.c:1168 msgid "_Width (pixels):" @@ -3939,12 +3941,10 @@ msgid "_Resolution:" msgstr "_Opløsning:" -# scootergrisen: udjævning? #. Antialiasing #: ../plug-ins/common/file-pdf-load.c:1182 -#| msgid "_Antialiasing" msgid "Use _Anti-aliasing" -msgstr "Brug _udglatning" +msgstr "Brug _udjævning" #: ../plug-ins/common/file-pdf-load.c:1460 #: ../plug-ins/common/file-pdf-load.c:1461 ../plug-ins/common/file-svg.c:917 @@ -3970,29 +3970,31 @@ "read only!" msgstr "" -#: ../plug-ins/common/file-pdf-save.c:803 ../plug-ins/common/file-pdf-save.c:920 +#: ../plug-ins/common/file-pdf-save.c:803 +#: ../plug-ins/common/file-pdf-save.c:920 msgid "Omit hidden layers and layers with zero opacity" -msgstr "" +msgstr "Udelad skjulte lag og lag med synlighed nul" -#: ../plug-ins/common/file-pdf-save.c:807 ../plug-ins/common/file-pdf-save.c:924 +#: ../plug-ins/common/file-pdf-save.c:807 +#: ../plug-ins/common/file-pdf-save.c:924 msgid "Convert bitmaps to vector graphics where possible" msgstr "Konvertér bitmaps til vektorgrafik, hvor det er muligt" -#: ../plug-ins/common/file-pdf-save.c:811 ../plug-ins/common/file-pdf-save.c:928 +#: ../plug-ins/common/file-pdf-save.c:811 +#: ../plug-ins/common/file-pdf-save.c:928 msgid "Apply layer masks before saving" msgstr "Påfør lagmasker før gemning" -#: ../plug-ins/common/file-pdf-save.c:814 ../plug-ins/common/file-pdf-save.c:931 +#: ../plug-ins/common/file-pdf-save.c:814 +#: ../plug-ins/common/file-pdf-save.c:931 msgid "Keeping the masks will not change the output" msgstr "" #: ../plug-ins/common/file-pdf-save.c:867 -#| msgid "Separate to:" msgid "Save to:" msgstr "Gem til:" #: ../plug-ins/common/file-pdf-save.c:871 -#| msgid "Browse" msgid "Browse..." msgstr "Gennemse..." @@ -4001,23 +4003,20 @@ msgstr "Flersidet PDF-eksport" #: ../plug-ins/common/file-pdf-save.c:905 -#| msgid "Delete selected area" msgid "Remove the selected pages" msgstr "Fjern de markerede sider" #: ../plug-ins/common/file-pdf-save.c:915 -#| msgid "Print the image" msgid "Add this image" msgstr "Tilføj dette billede" #: ../plug-ins/common/file-pdf-save.c:1028 msgid "Error! In order to save the file, at least one image should be added!" -msgstr "" +msgstr "Fejl! For at kunne gemme filen, skal mindst ét billede tilføjes!" #: ../plug-ins/common/file-pdf-save.c:1351 #: ../plug-ins/print/print-draw-page.c:223 #, fuzzy -#| msgid "Distance from the left of the paper to the right of the image" msgid "Cannot handle the size (either width or height) of the image." msgstr "Afstanden fra venstre kant af papiret til højre kant af billedet" @@ -4038,25 +4037,24 @@ #: ../plug-ins/common/file-png.c:733 #, c-format msgid "Error creating PNG read struct while saving '%s'." -msgstr "" +msgstr "Fejl ved oprettelse af struct til PNG-læsning ved gemning af \"%s\"." #: ../plug-ins/common/file-png.c:743 #, c-format msgid "Error while reading '%s'. File corrupted?" msgstr "Fejl ved læsning af \"%s\". Er filen ødelagt?" -#: ../plug-ins/common/file-png.c:877 +#: ../plug-ins/common/file-png.c:878 #, c-format msgid "Unknown color model in PNG file '%s'." msgstr "Ukendt farvemodel i PNG-filen \"%s\"." -#: ../plug-ins/common/file-png.c:888 -#, fuzzy, c-format -#| msgid "Could not create working folder '%s': %s" +#: ../plug-ins/common/file-png.c:889 +#, c-format msgid "Could not create new image for '%s': %s" -msgstr "Kunne ikke oprette arbejdskatalog \"%s\": %s" +msgstr "Kunne ikke oprette nyt billede for \"%s\": %s" -#: ../plug-ins/common/file-png.c:942 +#: ../plug-ins/common/file-png.c:943 msgid "" "The PNG file specifies an offset that caused the layer to be positioned " "outside the image." @@ -4064,46 +4062,43 @@ "PNG-filen angiver et offset der forårsagede at laget blev anbragt uden for " "billedet." -#: ../plug-ins/common/file-png.c:1244 -#, fuzzy +#: ../plug-ins/common/file-png.c:1245 msgid "Apply PNG Offset" msgstr "Påfør PNG-forskydning" -#: ../plug-ins/common/file-png.c:1248 -#, fuzzy +#: ../plug-ins/common/file-png.c:1249 msgid "Ignore PNG offset" -msgstr "Ignorér PNG-offset" +msgstr "Ignorér PNG-forskydning" -#: ../plug-ins/common/file-png.c:1249 -#, fuzzy +#: ../plug-ins/common/file-png.c:1250 msgid "Apply PNG offset to layer" msgstr "Påfør PNG-forskydning til lag" -#: ../plug-ins/common/file-png.c:1273 +#: ../plug-ins/common/file-png.c:1274 #, c-format msgid "" "The PNG image you are importing specifies an offset of %d, %d. Do you want " "to apply this offset to the layer?" msgstr "" -#: ../plug-ins/common/file-png.c:1341 +#: ../plug-ins/common/file-png.c:1342 #, c-format msgid "Error creating PNG write struct while saving '%s'." msgstr "" +"Fejl ved oprettelse af struct til skrivning af PNG ved forsøg på at gemme " +"\"%s\"." -#: ../plug-ins/common/file-png.c:1351 +#: ../plug-ins/common/file-png.c:1352 #, c-format msgid "Error while saving '%s'. Could not save image." msgstr "Fejl ved gemning af \"%s\". Kunne ikke gemme billede." -#: ../plug-ins/common/file-png.c:1979 -#, fuzzy, c-format +#: ../plug-ins/common/file-png.c:1980 +#, c-format msgid "Error loading UI file '%s': %s" msgstr "Fejl ved indlæsning af brugerfladefilen \"%s\": %s" -#: ../plug-ins/common/file-png.c:1980 -#, fuzzy -#| msgid "Unknown reason" +#: ../plug-ins/common/file-png.c:1981 msgid "Unknown error" msgstr "Ukendt fejl" @@ -4127,7 +4122,6 @@ msgid "PPM image" msgstr "PPM-billede" -# scootergrisen: Premature? #: ../plug-ins/common/file-pnm.c:530 ../plug-ins/common/file-pnm.c:552 #: ../plug-ins/common/file-pnm.c:561 ../plug-ins/common/file-pnm.c:572 #: ../plug-ins/common/file-pnm.c:658 ../plug-ins/common/file-pnm.c:740 @@ -4135,7 +4129,6 @@ msgstr "For tidlig slutning på fil." #: ../plug-ins/common/file-pnm.c:532 -#, fuzzy msgid "Invalid file." msgstr "Ugyldig fil." @@ -4144,18 +4137,16 @@ msgstr "Filen er ikke i et understøttet format." #: ../plug-ins/common/file-pnm.c:555 -#, fuzzy msgid "Invalid X resolution." -msgstr "PNM: Ugyldig x-opløsning." +msgstr "Ugyldig x-opløsning." #: ../plug-ins/common/file-pnm.c:557 msgid "Image width is larger than GIMP can handle." msgstr "Billedbredden er større end GIMP kan håndtere." #: ../plug-ins/common/file-pnm.c:564 -#, fuzzy msgid "Invalid Y resolution." -msgstr "PNM: Ugyldig y-opløsning." +msgstr "Ugyldig y-opløsning." #: ../plug-ins/common/file-pnm.c:566 msgid "Image height is larger than GIMP can handle." @@ -4166,18 +4157,15 @@ msgstr "Ikke-understøttet maksimumsværdi." #: ../plug-ins/common/file-pnm.c:816 -#, fuzzy msgid "Error reading file." -msgstr "Fejl ved læsning af fil" +msgstr "Fejl ved læsning af fil." #: ../plug-ins/common/file-pnm.c:1221 -#, fuzzy msgid "PNM" msgstr "PNM" #. file save type #: ../plug-ins/common/file-pnm.c:1224 -#, fuzzy msgid "Data formatting" msgstr "Dataformatering" @@ -4187,13 +4175,10 @@ # (GIP) Begrebet findes på dansk. #: ../plug-ins/common/file-pnm.c:1229 -#, fuzzy -#| msgid "ASCII art" msgid "ASCII" msgstr "ASCII" #: ../plug-ins/common/file-ps.c:581 ../plug-ins/common/file-ps.c:673 -#, fuzzy msgid "PostScript document" msgstr "PostScript-dokument" @@ -4206,14 +4191,14 @@ msgstr "PDF-dokument" #: ../plug-ins/common/file-ps.c:1032 -#, fuzzy, c-format +#, c-format msgid "Could not interpret Postscript file '%s'" -msgstr "Kunne ikke fortolke \"%s\"" +msgstr "Kunne ikke fortolke PostScript-filen \"%s\"" #: ../plug-ins/common/file-ps.c:1174 #, c-format msgid "PostScript save cannot handle images with alpha channels" -msgstr "Postscript kan ikke håndtere billeder med alfa-kanaler" +msgstr "PostScript kan ikke håndtere billeder med alfa-kanaler" #: ../plug-ins/common/file-ps.c:1809 ../plug-ins/common/file-tiff-load.c:1013 #, c-format @@ -4224,14 +4209,12 @@ #: ../plug-ins/common/file-ps.c:2754 ../plug-ins/common/file-ps.c:2878 #: ../plug-ins/common/file-sunras.c:1506 ../plug-ins/common/file-sunras.c:1612 #: ../plug-ins/file-fits/fits.c:852 ../plug-ins/file-fits/fits.c:975 -#, fuzzy msgid "Write error occurred" msgstr "Der opstod en skrivefejl" #: ../plug-ins/common/file-ps.c:2962 -#, fuzzy msgid "Import from PostScript" -msgstr "Indlæs Postscript" +msgstr "Importér fra PostScript" #. Rendering #: ../plug-ins/common/file-ps.c:3006 @@ -4253,14 +4236,12 @@ msgstr "Sider der skal indlæses (f.eks.: 1-4 eller 1,3,5-7)" #: ../plug-ins/common/file-ps.c:3073 ../plug-ins/common/sphere-designer.c:2657 -#, fuzzy msgid "Layers" -msgstr "Lagstak:" +msgstr "Lag" #: ../plug-ins/common/file-ps.c:3076 -#, fuzzy msgid "Images" -msgstr "Billede" +msgstr "Billeder" #: ../plug-ins/common/file-ps.c:3079 msgid "Open as" @@ -4281,7 +4262,8 @@ #: ../plug-ins/common/file-ps.c:3102 ../plug-ins/common/file-xpm.c:480 #: ../plug-ins/gimpressionist/color.c:65 -#: ../plug-ins/gimpressionist/general.c:169 ../plug-ins/imagemap/imap_menu.c:212 +#: ../plug-ins/gimpressionist/general.c:169 +#: ../plug-ins/imagemap/imap_menu.c:212 msgid "Color" msgstr "Farve" @@ -4290,13 +4272,10 @@ msgstr "Automatisk" #: ../plug-ins/common/file-ps.c:3114 -#, fuzzy msgid "Text antialiasing" msgstr "Tekstudjævning" #: ../plug-ins/common/file-ps.c:3118 ../plug-ins/common/file-ps.c:3130 -#, fuzzy -#| msgid "None" msgctxt "antialiasing" msgid "None" msgstr "Ingen" @@ -4310,14 +4289,12 @@ msgstr "Stærk" #: ../plug-ins/common/file-ps.c:3126 -#, fuzzy msgid "Graphic antialiasing" msgstr "Grafikudjævning" #: ../plug-ins/common/file-ps.c:3204 -#, fuzzy msgid "PostScript" -msgstr "Gem som Postscript" +msgstr "PostScript" #. Image Size #: ../plug-ins/common/file-ps.c:3221 @@ -4333,8 +4310,8 @@ "When toggled, the resulting image will be scaled to fit into the given size " "without changing the aspect ratio." msgstr "" -"Skalér det endelige billede til at passe til den givne størrelse uden at " -"ændre størrelsesforholdet." +"Skalér det endelige billede, så det passer til den givne størrelse uden at " +"ændre højde-bredde-forholdet." #. Unit #: ../plug-ins/common/file-ps.c:3286 @@ -4360,13 +4337,12 @@ msgstr "Output" #: ../plug-ins/common/file-ps.c:3323 -#, fuzzy msgid "_PostScript level 2" -msgstr "_Postscript niveau 2" +msgstr "_PostScript niveau 2" #: ../plug-ins/common/file-ps.c:3332 msgid "_Encapsulated PostScript" -msgstr "_Encapsulated Postscript" +msgstr "_Indkapslet PostScript" #: ../plug-ins/common/file-ps.c:3341 msgid "P_review" @@ -4381,9 +4357,8 @@ msgstr "Paint Shop Pro-billede" #: ../plug-ins/common/file-psp.c:640 -#, fuzzy msgid "PSP" -msgstr "PPI" +msgstr "PSP" #. file save type #: ../plug-ins/common/file-psp.c:643 @@ -4391,8 +4366,6 @@ msgstr "Datakomprimering" #: ../plug-ins/common/file-psp.c:647 -#, fuzzy -#| msgid "None" msgctxt "compression" msgid "None" msgstr "Ingen" @@ -4409,97 +4382,86 @@ msgid "Raw image data" msgstr "Rå billeddata" -#: ../plug-ins/common/file-raw.c:1059 -#, fuzzy +#: ../plug-ins/common/file-raw.c:1073 msgid "Load Image from Raw Data" -msgstr "Indlæs billedkort" +msgstr "Indlæs billede fra rådata" -#: ../plug-ins/common/file-raw.c:1093 -#, fuzzy +#: ../plug-ins/common/file-raw.c:1107 msgid "Image" msgstr "Billede" -#: ../plug-ins/common/file-raw.c:1104 -#, fuzzy +#: ../plug-ins/common/file-raw.c:1118 msgid "RGB Alpha" msgstr "RGB-alfa" -#: ../plug-ins/common/file-raw.c:1105 -#, fuzzy +#: ../plug-ins/common/file-raw.c:1119 msgid "RGB565" msgstr "RGB565" -#: ../plug-ins/common/file-raw.c:1106 +#: ../plug-ins/common/file-raw.c:1120 msgid "Planar RGB" msgstr "" -#: ../plug-ins/common/file-raw.c:1107 +#: ../plug-ins/common/file-raw.c:1121 msgid "Indexed" msgstr "Indekseret" -#: ../plug-ins/common/file-raw.c:1108 -#, fuzzy +#: ../plug-ins/common/file-raw.c:1122 msgid "Indexed Alpha" -msgstr "Indeks" +msgstr "Indekseret alfa" -#: ../plug-ins/common/file-raw.c:1113 +#: ../plug-ins/common/file-raw.c:1127 msgid "Image _Type:" msgstr "Billed_type:" -#: ../plug-ins/common/file-raw.c:1163 +#: ../plug-ins/common/file-raw.c:1177 msgid "Palette" msgstr "Palet" -#: ../plug-ins/common/file-raw.c:1173 ../plug-ins/common/file-raw.c:1258 +#: ../plug-ins/common/file-raw.c:1187 ../plug-ins/common/file-raw.c:1272 msgid "R, G, B (normal)" msgstr "R, G, B (normal)" -#: ../plug-ins/common/file-raw.c:1174 ../plug-ins/common/file-raw.c:1260 +#: ../plug-ins/common/file-raw.c:1188 ../plug-ins/common/file-raw.c:1274 msgid "B, G, R, X (BMP style)" msgstr "B, G, R, X (BMP stil)" -#: ../plug-ins/common/file-raw.c:1179 -#, fuzzy +#: ../plug-ins/common/file-raw.c:1193 msgid "_Palette Type:" msgstr "_Palettype:" -#: ../plug-ins/common/file-raw.c:1190 -#, fuzzy +#: ../plug-ins/common/file-raw.c:1204 msgid "Off_set:" -msgstr "_Afstand:" +msgstr "_Forskydning:" -#: ../plug-ins/common/file-raw.c:1202 -#, fuzzy +#: ../plug-ins/common/file-raw.c:1216 msgid "Select Palette File" -msgstr "Vælg billedfil" +msgstr "Vælg paletfil" -#: ../plug-ins/common/file-raw.c:1208 -#, fuzzy +#: ../plug-ins/common/file-raw.c:1222 msgid "Pal_ette File:" msgstr "_Paletfil:" -#: ../plug-ins/common/file-raw.c:1236 +#: ../plug-ins/common/file-raw.c:1250 msgid "Raw Image" msgstr "Råt billede" -#: ../plug-ins/common/file-raw.c:1244 +#: ../plug-ins/common/file-raw.c:1258 #, fuzzy msgid "RGB Save Type" msgstr "RGB-mønstertype" -#: ../plug-ins/common/file-raw.c:1248 -#, fuzzy +#: ../plug-ins/common/file-raw.c:1262 msgid "Standard (R,G,B)" msgstr "Standard (R,G,B)" -#: ../plug-ins/common/file-raw.c:1249 +#: ../plug-ins/common/file-raw.c:1263 msgid "Planar (RRR,GGG,BBB)" msgstr "" -#: ../plug-ins/common/file-raw.c:1254 -#, fuzzy +#: ../plug-ins/common/file-raw.c:1268 msgid "Indexed Palette Type" -msgstr "Palettype" +msgstr "Indekseret palettype" #: ../plug-ins/common/file-sunras.c:217 ../plug-ins/common/file-sunras.c:237 msgid "SUN Rasterfile image" @@ -4512,7 +4474,7 @@ #: ../plug-ins/common/file-sunras.c:414 msgid "The type of this SUN-rasterfile is not supported" -msgstr "Denne type SUN-rasterfil er ikke understøttet" +msgstr "Denne type SUN-rasterfil understøttes ikke" #: ../plug-ins/common/file-sunras.c:443 #, c-format @@ -4521,7 +4483,7 @@ #: ../plug-ins/common/file-sunras.c:452 msgid "Type of colormap not supported" -msgstr "Farvekorttypen er ikke understøttet" +msgstr "Farvekorttypen understøttes ikke" #: ../plug-ins/common/file-sunras.c:459 ../plug-ins/common/file-xbm.c:828 #: ../plug-ins/common/file-xwd.c:507 @@ -4565,7 +4527,7 @@ #: ../plug-ins/common/file-sunras.c:522 msgid "This image depth is not supported" -msgstr "Billeddybden er ikke understøttet" +msgstr "Billeddybden understøttes ikke" #: ../plug-ins/common/file-sunras.c:546 #, c-format @@ -4585,7 +4547,6 @@ msgstr "EOF fundet ved læsning" #: ../plug-ins/common/file-sunras.c:1629 -#, fuzzy msgid "SUNRAS" msgstr "SUNRAS" @@ -4657,7 +4618,6 @@ #. Path Import #: ../plug-ins/common/file-svg.c:937 -#, fuzzy msgid "Import _paths" msgstr "Importér _baner" @@ -4669,14 +4629,12 @@ "baneværktøj" #: ../plug-ins/common/file-svg.c:952 -#, fuzzy msgid "Merge imported paths" msgstr "Forén importerede baner" #: ../plug-ins/common/file-tga.c:245 ../plug-ins/common/file-tga.c:264 -#, fuzzy msgid "TarGA image" -msgstr "Overfører billede" +msgstr "TarGA-billede" #: ../plug-ins/common/file-tga.c:456 #, c-format @@ -4689,12 +4647,11 @@ msgstr "Kan ikke læse udvidelse fra \"%s\"" #: ../plug-ins/common/file-tga.c:486 -#, fuzzy, c-format +#, c-format msgid "Cannot read header from '%s'" -msgstr "Kunne ikke læse hoved fra \"%s\"" +msgstr "Kan ikke læse hoved fra \"%s\"" #: ../plug-ins/common/file-tga.c:1403 -#, fuzzy msgid "TGA" msgstr "TGA" @@ -4724,7 +4681,7 @@ #: ../plug-ins/common/file-tiff-load.c:297 #, c-format msgid "TIFF '%s' does not contain any directories" -msgstr "" +msgstr "TIFF'en \"%s\" indeholder ingen kataloger" #: ../plug-ins/common/file-tiff-load.c:486 msgid "Import from TIFF" @@ -4759,7 +4716,7 @@ #: ../plug-ins/common/file-tiff-save.c:830 msgid "Indexed pictures cannot be compressed with \"JPEG\"." -msgstr "" +msgstr "Indekserede billeder kan ikke komprimeres med \"JPEG\"." #: ../plug-ins/common/file-tiff-save.c:933 msgid "" @@ -4800,11 +4757,11 @@ #: ../plug-ins/common/file-tiff-save.c:1125 msgid "CCITT Group _3 fax" -msgstr "" +msgstr "CCITT Group _3-fax" #: ../plug-ins/common/file-tiff-save.c:1126 msgid "CCITT Group _4 fax" -msgstr "" +msgstr "CCITT Group _4-fax" #: ../plug-ins/common/file-tiff-save.c:1155 msgid "Save _color values from transparent pixels" @@ -4827,14 +4784,13 @@ "ikke en størrelse!" #: ../plug-ins/common/file-wmf.c:500 -#, fuzzy msgid "Render Windows Metafile" -msgstr "Indlæs Windows-metafil" +msgstr "Gengiv Windows-metafil" #: ../plug-ins/common/file-wmf.c:963 -#, fuzzy, c-format +#, c-format msgid "Could not open '%s' for reading" -msgstr "Kan ikke åbne \"%s\" til læsning." +msgstr "Kunne ikke åbne \"%s\" til læsning" #: ../plug-ins/common/file-wmf.c:1003 msgid "Rendered WMF" @@ -4930,7 +4886,6 @@ #: ../plug-ins/common/file-xmc.c:331 ../plug-ins/common/file-xmc.c:369 #: ../plug-ins/common/file-xmc.c:1046 -#, fuzzy msgid "X11 Mouse Cursor" msgstr "X11-musemarkør" @@ -4949,12 +4904,12 @@ #: ../plug-ins/common/file-xmc.c:680 #, c-format msgid "Frame %d of '%s' is too wide for an X cursor." -msgstr "" +msgstr "Billede %d i \"%s\" er for bred til at være en X-markør." #: ../plug-ins/common/file-xmc.c:687 #, c-format msgid "Frame %d of '%s' is too high for an X cursor." -msgstr "" +msgstr "Billede %d i \"%s\" er for høj til at være en X-markør." #: ../plug-ins/common/file-xmc.c:890 #, c-format @@ -4962,19 +4917,19 @@ msgstr "" #: ../plug-ins/common/file-xmc.c:932 -#, fuzzy, c-format +#, c-format msgid "'%s' is too wide for an X cursor." -msgstr "\"%s\" er for bredt til en X-markør." +msgstr "\"%s\" er for bred til at være en X-markør." #: ../plug-ins/common/file-xmc.c:939 -#, fuzzy, c-format +#, c-format msgid "'%s' is too high for an X cursor." -msgstr "\"%s\" er for højt til en X-markør." +msgstr "\"%s\" er for høj til at være en X-markør." #: ../plug-ins/common/file-xmc.c:1009 -#, fuzzy, c-format +#, c-format msgid "A read error occurred." -msgstr "Der opstod en skrivefejl" +msgstr "Der opstod en skrivefejl." #. #. * parameter settings @@ -4986,13 +4941,14 @@ #: ../plug-ins/common/file-xmc.c:1079 msgid "Enter the X coordinate of the hot spot. The origin is top left corner." msgstr "" +"Indtast x-koordinat for hotspot. Startpunktet er øverste venstre hjørne." #: ../plug-ins/common/file-xmc.c:1097 msgid "Enter the Y coordinate of the hot spot. The origin is top left corner." msgstr "" +"Indtast y-koordinat for hotspot. Startpunktet er øverste venstre hjørne." #: ../plug-ins/common/file-xmc.c:1108 -#, fuzzy msgid "_Auto-Crop all frames." msgstr "_Autobeskær alle billeder." @@ -5025,12 +4981,11 @@ #: ../plug-ins/common/file-xmc.c:1198 msgid "Enter time span in milliseconds in which each frame is rendered." -msgstr "" +msgstr "Indtast periode i millisekunder som hvert billede skal vises i." #: ../plug-ins/common/file-xmc.c:1201 -#, fuzzy msgid "_Delay:" -msgstr "_Forsinkelse:" +msgstr "_Ventetid:" #: ../plug-ins/common/file-xmc.c:1206 msgid "_Use this value only for a frame which delay is not specified." @@ -5044,20 +4999,21 @@ msgid "" "The part of copyright information that exceeded 65535 characters was removed." msgstr "" +"Den del af ophavsretsinformationen, som oversteg 65535 tegn, blev fjernet." #: ../plug-ins/common/file-xmc.c:1244 msgid "Enter copyright information." -msgstr "Indtast copyright-information." +msgstr "Indtast information om ophavsret." -# scootergrisen: ophavsret? #: ../plug-ins/common/file-xmc.c:1246 msgid "_Copyright:" -msgstr "_Copyright:" +msgstr "_Ophavsret:" #: ../plug-ins/common/file-xmc.c:1262 msgid "" "The part of license information that exceeded 65535 characters was removed." msgstr "" +"Den del af licensinformationen, som oversteg 65535 tegn, blev fjernet." #: ../plug-ins/common/file-xmc.c:1272 msgid "Enter license information." @@ -5073,18 +5029,17 @@ #. We use gtk_text_view for "Other" while "Copyright" & "License" is entered #. * in gtk_entry because We want allow '\n' for "Other". #: ../plug-ins/common/file-xmc.c:1281 -#, fuzzy msgid "_Other:" -msgstr "_Andre" +msgstr "_Andre:" #: ../plug-ins/common/file-xmc.c:1315 msgid "Enter other comment if you want." msgstr "Indtast anden kommentar hvis du vil." #: ../plug-ins/common/file-xmc.c:1365 -#, fuzzy, c-format +#, c-format msgid "Comment is limited to %d characters." -msgstr "Standardkommentaren er begrænset til %d tegn." +msgstr "Kommentar er begrænset til %d tegn." #: ../plug-ins/common/file-xmc.c:1483 #, c-format @@ -5094,12 +5049,12 @@ #: ../plug-ins/common/file-xmc.c:1501 #, c-format msgid "Frame '%s' is too wide. Please reduce to no more than %dpx." -msgstr "" +msgstr "Billedet \"%s\" er for bredt. Reducér venligst til højst %dpx." #: ../plug-ins/common/file-xmc.c:1508 #, c-format msgid "Frame '%s' is too high. Please reduce to no more than %dpx." -msgstr "" +msgstr "Billedet \"%s\" er for højt. Reducér venligst til højst %dpx." #: ../plug-ins/common/file-xmc.c:1515 #, c-format @@ -5159,19 +5114,16 @@ msgstr "XPM-fil er ugyldig" #: ../plug-ins/common/file-xpm.c:808 -#, fuzzy msgid "XPM" msgstr "XPM" #: ../plug-ins/common/file-xpm.c:818 -#, fuzzy msgid "_Alpha threshold:" -msgstr "_Alfatærskel" +msgstr "_Alfatærskel:" #: ../plug-ins/common/file-xwd.c:280 ../plug-ins/common/file-xwd.c:300 -#, fuzzy msgid "X window dump" -msgstr "Beskåret til billede" +msgstr "" #: ../plug-ins/common/file-xwd.c:446 #, c-format @@ -5211,14 +5163,12 @@ #: ../plug-ins/common/file-xwd.c:1706 ../plug-ins/common/file-xwd.c:1944 #, c-format -#| msgid "The file is corrupt!" msgid "XWD-file %s is corrupt." msgstr "XWD-filen %s er beskadiget." #: ../plug-ins/common/file-xwd.c:2238 -#, fuzzy msgid "Error during writing indexed/gray image" -msgstr "Fejl under skrivning af indekseret/gråt billede" +msgstr "Fejl under skrivning af gråtone- eller indekseret billede" #: ../plug-ins/common/file-xwd.c:2334 msgid "Error during writing rgb image" @@ -5226,7 +5176,7 @@ #: ../plug-ins/common/film.c:217 msgid "Combine several images on a film strip" -msgstr "Kombiner flere billeder på en filmstrimmel" +msgstr "Kombinér flere billeder på en filmstrimmel" #: ../plug-ins/common/film.c:222 msgid "_Filmstrip..." @@ -5239,27 +5189,23 @@ #: ../plug-ins/common/film.c:423 ../plug-ins/common/guillotine.c:215 #: ../plug-ins/help-browser/dialog.c:1132 msgid "Untitled" -msgstr "Uden navn" +msgstr "Unavngivet" #: ../plug-ins/common/film.c:878 -#, fuzzy msgid "Available images:" msgstr "Tilgængelige billeder:" #: ../plug-ins/common/film.c:879 -#, fuzzy msgid "On film:" msgstr "På film:" #. Film height/colour #: ../plug-ins/common/film.c:975 ../plug-ins/common/film.c:1251 -#, fuzzy msgid "Filmstrip" -msgstr "Filter" +msgstr "Filmstrimmel" #. Keep maximum image height #: ../plug-ins/common/film.c:984 -#, fuzzy msgid "_Fit height to images" msgstr "_Tilpas højde til billeder" @@ -5279,7 +5225,6 @@ msgstr "Nummerering" #: ../plug-ins/common/film.c:1055 -#, fuzzy msgid "Start _index:" msgstr "Start_indeks:" @@ -5293,12 +5238,10 @@ msgstr "Vælg talfarve" #: ../plug-ins/common/film.c:1088 -#, fuzzy msgid "At _bottom" msgstr "_Nederst" #: ../plug-ins/common/film.c:1089 -#, fuzzy msgid "At _top" msgstr "_Øverst" @@ -5308,9 +5251,8 @@ msgstr "Billedmarkering" #: ../plug-ins/common/film.c:1131 -#, fuzzy msgid "All Values are Fractions of the Strip Height" -msgstr "Alle værdier er brøkdele af filmhøjden" +msgstr "Alle værdier er brøkdele af filmstrimlens højde" #: ../plug-ins/common/film.c:1134 msgid "Ad_vanced" @@ -5321,32 +5263,26 @@ msgstr "Billed_højde:" #: ../plug-ins/common/film.c:1164 -#, fuzzy msgid "Image spac_ing:" msgstr "Billed_mellemrum:" #: ../plug-ins/common/film.c:1175 -#, fuzzy msgid "_Hole offset:" msgstr "_Hulafstand:" #: ../plug-ins/common/film.c:1186 -#, fuzzy msgid "Ho_le width:" msgstr "Hulb_redde:" #: ../plug-ins/common/film.c:1197 -#, fuzzy msgid "Hol_e height:" msgstr "Hulhø_jde:" #: ../plug-ins/common/film.c:1208 -#, fuzzy msgid "Hole sp_acing:" msgstr "Hulm_ellemrum:" #: ../plug-ins/common/film.c:1219 -#, fuzzy msgid "_Number height:" msgstr "_Talhøjde:" @@ -5404,19 +5340,17 @@ #: ../plug-ins/common/filter-pack.c:317 msgid "Interactively modify the image colors" -msgstr "" +msgstr "Ændr billedets farver interaktivt" #: ../plug-ins/common/filter-pack.c:322 msgid "_Filter Pack..." msgstr "_Filterpakke..." #: ../plug-ins/common/filter-pack.c:372 -#, fuzzy msgid "FP can only be used on RGB images." msgstr "FP kan kun bruges på RGB-billeder." #: ../plug-ins/common/filter-pack.c:382 -#, fuzzy msgid "FP can only be run interactively." msgstr "FP kan kun køres interaktivt." @@ -5494,12 +5428,10 @@ msgstr "Vis" #: ../plug-ins/common/filter-pack.c:870 -#, fuzzy msgid "_Entire image" msgstr "_Hele billedet" #: ../plug-ins/common/filter-pack.c:871 -#, fuzzy msgid "Se_lection only" msgstr "Kun _markering" @@ -5537,18 +5469,17 @@ msgstr "Eksempelstørrelse" #: ../plug-ins/common/fractal-trace.c:116 -#, fuzzy msgid "Transform image with the Mandelbrot Fractal" msgstr "Transformér billede med Mandelbrot-fraktalen" #: ../plug-ins/common/fractal-trace.c:121 -#, fuzzy msgid "_Fractal Trace..." -msgstr "_Fraktalafbildning..." +msgstr "_Fraktalspor..." -#: ../plug-ins/common/fractal-trace.c:460 ../plug-ins/common/fractal-trace.c:691 +#: ../plug-ins/common/fractal-trace.c:460 +#: ../plug-ins/common/fractal-trace.c:691 msgid "Fractal Trace" -msgstr "Fraktalafbildning" +msgstr "Fraktalspor" #. Settings #: ../plug-ins/common/fractal-trace.c:732 @@ -5581,25 +5512,23 @@ #: ../plug-ins/common/gradient-map.c:84 msgid "Recolor the image using colors from the active gradient" -msgstr "" +msgstr "Genfarvelæg billedet med farver fra den aktive farveovergang" #: ../plug-ins/common/gradient-map.c:97 -#, fuzzy msgid "_Gradient Map" -msgstr "_Farveovergangkort" +msgstr "_Farveovergangskort" #: ../plug-ins/common/gradient-map.c:106 msgid "Recolor the image using colors from the active palette" -msgstr "" +msgstr "Genfarvelæg billedet med farver fra den aktive palet" #: ../plug-ins/common/gradient-map.c:119 msgid "_Palette Map" msgstr "_Paletkort" #: ../plug-ins/common/gradient-map.c:162 -#, fuzzy msgid "Gradient Map" -msgstr "Afbilder farveovergang..." +msgstr "Farveovergangskort" #: ../plug-ins/common/gradient-map.c:167 msgid "Palette Map" @@ -5663,21 +5592,19 @@ #: ../plug-ins/common/guillotine.c:74 msgid "Slice the image into subimages using guides" -msgstr "" +msgstr "Skær billedet ud i underbilleder med hjælpelinjer" #: ../plug-ins/common/guillotine.c:81 -#, fuzzy msgid "_Guillotine" -msgstr "_Guillotinerer" +msgstr "_Guillotine" #: ../plug-ins/common/guillotine.c:119 -#, fuzzy msgid "Guillotine" -msgstr "Guillotinerer..." +msgstr "Guillotine" #: ../plug-ins/common/hot.c:207 msgid "Find and fix pixels that may be unsafely bright" -msgstr "" +msgstr "Find og ret pixels som kan være usikkert lyse" #: ../plug-ins/common/hot.c:217 msgid "_Hot..." @@ -5708,12 +5635,10 @@ msgstr "For_mørk" #: ../plug-ins/common/illusion.c:91 -#, fuzzy msgid "Superimpose many altered copies of the image" -msgstr "Brug billedets farve" +msgstr "Kombinér mange ændrede kopier af billedet" #: ../plug-ins/common/illusion.c:96 -#, fuzzy msgid "_Illusion..." msgstr "_Illusion..." @@ -5721,7 +5646,6 @@ msgid "Illusion" msgstr "Illusion" -# scootergrisen: måske opdelinger #: ../plug-ins/common/illusion.c:389 msgid "_Divisions:" msgstr "_Opdelinger:" @@ -5736,17 +5660,16 @@ #: ../plug-ins/common/iwarp.c:264 msgid "Use mouse control to warp image areas" -msgstr "" +msgstr "Brug musekontrol til at fordreje billedområder" #: ../plug-ins/common/iwarp.c:269 -#, fuzzy msgid "_IWarp..." -msgstr "_Fordrejer..." +msgstr "_Interaktiv fordrejning..." +# eller er det en status? #: ../plug-ins/common/iwarp.c:697 -#, fuzzy msgid "Warping" -msgstr "Advarsel" +msgstr "Fordrejning" #: ../plug-ins/common/iwarp.c:803 #, c-format @@ -5754,20 +5677,18 @@ msgstr "Fordrejer billede %d" #: ../plug-ins/common/iwarp.c:815 -#, fuzzy msgid "Ping pong" msgstr "Frem og tilbage" #: ../plug-ins/common/iwarp.c:974 ../plug-ins/common/whirl-pinch.c:193 msgid "Region affected by plug-in is empty" -msgstr "" +msgstr "Området som påvirkes af plugin er tomt" #: ../plug-ins/common/iwarp.c:1030 msgid "A_nimate" msgstr "A_nimér" #: ../plug-ins/common/iwarp.c:1050 -#, fuzzy msgid "Number of _frames:" msgstr "Antal _billeder:" @@ -5776,7 +5697,6 @@ msgstr "_Omvendt" #: ../plug-ins/common/iwarp.c:1068 -#, fuzzy msgid "_Ping pong" msgstr "_Frem og tilbage" @@ -5813,12 +5733,10 @@ msgstr "Drej m_ed uret" #: ../plug-ins/common/iwarp.c:1150 -#, fuzzy msgid "_Deform radius:" -msgstr "_Deformeringsradius" +msgstr "_Deformeringsradius:" #: ../plug-ins/common/iwarp.c:1160 -#, fuzzy msgid "D_eform amount:" msgstr "Deformerings_mængde:" @@ -5832,7 +5750,6 @@ msgstr "Adaptiv _udjævning" #: ../plug-ins/common/iwarp.c:1204 -#, fuzzy msgid "Ma_x depth:" msgstr "Ma_ks. dybde:" @@ -5854,13 +5771,14 @@ "Click and drag in the preview to define the distortions to apply to the " "image." msgstr "" +"Klik og træk i forhåndsvisningen for at definere forvrængningen, som skal " +"anvendes på billedet." #: ../plug-ins/common/jigsaw.c:356 msgid "Add a jigsaw-puzzle pattern to the image" msgstr "Tilføj et puslespilmønster til billedet" #: ../plug-ins/common/jigsaw.c:361 -#, fuzzy msgid "_Jigsaw..." msgstr "_Puslespil..." @@ -5947,24 +5865,21 @@ msgstr "_Konvertér til farveprofil..." #: ../plug-ins/common/lcms.c:287 -#, fuzzy msgid "Convert to default RGB Profile" -msgstr "Konvertér til RGB" +msgstr "Konvertér til standard-RGB-profil" #: ../plug-ins/common/lcms.c:301 -#, fuzzy msgid "Image Color Profile Information" -msgstr "Farvetransformation" +msgstr "Farveprofilinformation for billede" #: ../plug-ins/common/lcms.c:315 -#, fuzzy msgid "Color Profile Information" -msgstr "Farvetransformation" +msgstr "Farveprofilinformation" #: ../plug-ins/common/lcms.c:656 #, c-format msgid "Color profile '%s' is not for RGB color space." -msgstr "" +msgstr "Farveprofilen \"%s\" er ikke til RGB-farverum." #: ../plug-ins/common/lcms.c:763 msgid "Default RGB working space" @@ -5974,11 +5889,12 @@ msgid "" "Data attached as 'icc-profile' does not appear to be an ICC color profile" msgstr "" +"Data vedhæftet som \"icc-profil\" ser ikke ud til at være en ICC-farveprofil" #: ../plug-ins/common/lcms.c:915 -#, fuzzy, c-format +#, c-format msgid "'%s' does not appear to be an ICC color profile" -msgstr "\"%s\" ser ikke ud til at være en ICC-farveprofil." +msgstr "\"%s\" ser ikke ud til at være en ICC-farveprofil" #. ICC color profile conversion #: ../plug-ins/common/lcms.c:975 @@ -5987,44 +5903,40 @@ msgstr "Konverterer fra '%s' til '%s'" #: ../plug-ins/common/lcms.c:1248 -#, fuzzy, c-format +#, c-format msgid "Could not load ICC profile from '%s'" -msgstr "Kunne ikke læse farvedata fra \"%s\"" +msgstr "Kunne ikke indlæse ICC-profil fra \"%s\"" #: ../plug-ins/common/lcms.c:1270 #, c-format msgid "The image '%s' has an embedded color profile:" -msgstr "" +msgstr "Billedet \"%s\" har en indbygget farveprofil:" #: ../plug-ins/common/lcms.c:1314 -#, fuzzy, c-format +#, c-format msgid "Convert the image to the RGB working space (%s)?" msgstr "Konvertér billedet til RGB-arbejdsrum (%s)?" #: ../plug-ins/common/lcms.c:1345 -#, fuzzy msgid "Convert to RGB working space?" -msgstr "Konvertér til RGB" +msgstr "Konvertér til RGB-arbejdsrum?" # eller en frihåndskurve #: ../plug-ins/common/lcms.c:1350 -#, fuzzy msgid "_Keep" -msgstr "_Frihånds" +msgstr "_Bevar" #: ../plug-ins/common/lcms.c:1355 -#, fuzzy msgid "_Convert" -msgstr "_Invertér" +msgstr "_Konvertér" #: ../plug-ins/common/lcms.c:1383 ../plug-ins/file-jpeg/jpeg-exif.c:436 msgid "_Don't ask me again" msgstr "Sp_ørg mig ikke igen" #: ../plug-ins/common/lcms.c:1450 -#, fuzzy msgid "Select destination profile" -msgstr "Anden målfarve" +msgstr "Vælg destinationsprofil" #: ../plug-ins/common/lcms.c:1477 msgid "All files (*.*)" @@ -6032,10 +5944,10 @@ #: ../plug-ins/common/lcms.c:1482 msgid "ICC color profile (*.icc, *.icm)" -msgstr "" +msgstr "ICC-farveprofil (*.icc, *.icm)" #: ../plug-ins/common/lcms.c:1526 -#, fuzzy, c-format +#, c-format msgid "RGB workspace (%s)" msgstr "RGB-arbejdsrum (%s)" @@ -6063,22 +5975,22 @@ msgid "Assign" msgstr "Tildel" +# wtf? #: ../plug-ins/common/lcms.c:1642 -#, fuzzy msgid "_Rendering Intent:" -msgstr "_Generér" +msgstr "_Renderingshensigt:" #: ../plug-ins/common/lcms.c:1658 msgid "_Black Point Compensation" -msgstr "_Sortpunktkompensation" +msgstr "_Kompensér for sortpunkt" #: ../plug-ins/common/lcms.c:1700 msgid "Destination profile is not for RGB color space." -msgstr "" +msgstr "Destinationsprofil er ikke til RGB-farverum." #: ../plug-ins/common/lens-apply.c:108 msgid "Simulate an elliptical lens over the image" -msgstr "" +msgstr "Simulér en elliptisk linse over billedet" #: ../plug-ins/common/lens-apply.c:114 msgid "Apply _Lens..." @@ -6088,32 +6000,27 @@ msgid "Applying lens" msgstr "Tilføjer linse" -#: ../plug-ins/common/lens-apply.c:394 +#: ../plug-ins/common/lens-apply.c:395 msgid "Lens Effect" msgstr "Linseeffekt" -#: ../plug-ins/common/lens-apply.c:429 -#, fuzzy +#: ../plug-ins/common/lens-apply.c:430 msgid "_Keep original surroundings" msgstr "_Bevar oprindelige omgivelser" -#: ../plug-ins/common/lens-apply.c:444 -#, fuzzy +#: ../plug-ins/common/lens-apply.c:445 msgid "_Set surroundings to index 0" msgstr "_Sæt omgivelserne til indeks 0" -#: ../plug-ins/common/lens-apply.c:445 -#, fuzzy +#: ../plug-ins/common/lens-apply.c:446 msgid "_Set surroundings to background color" msgstr "Sæt _omgivelserne til baggrundsfarven" -#: ../plug-ins/common/lens-apply.c:460 -#, fuzzy +#: ../plug-ins/common/lens-apply.c:461 msgid "_Make surroundings transparent" msgstr "_Gør omgivelserne gennemsigtige" -#: ../plug-ins/common/lens-apply.c:477 -#, fuzzy +#: ../plug-ins/common/lens-apply.c:478 msgid "_Lens refraction index:" msgstr "_Linsens brydningsindeks:" @@ -6122,26 +6029,22 @@ msgstr "Korriger linseforvrængning" #: ../plug-ins/common/lens-distortion.c:118 -#, fuzzy msgid "Lens Distortion..." -msgstr "Finder kanter..." +msgstr "Linseforvrængning..." #: ../plug-ins/common/lens-distortion.c:379 msgid "Lens distortion" msgstr "Linseforvrængning" #: ../plug-ins/common/lens-distortion.c:479 -#, fuzzy msgid "Lens Distortion" -msgstr "Kantfinding" +msgstr "Linseforvrængning" #: ../plug-ins/common/lens-distortion.c:518 -#, fuzzy msgid "_Main:" -msgstr "_Hovedindstillinger:" +msgstr "_Hoved:" #: ../plug-ins/common/lens-distortion.c:532 -#, fuzzy msgid "_Edge:" msgstr "_Kant:" @@ -6175,30 +6078,28 @@ msgstr "Generér linserefleks" #: ../plug-ins/common/lens-flare.c:301 -#, fuzzy msgid "Lens Flare" -msgstr "Nyt blus" +msgstr "Linserefleks" #: ../plug-ins/common/lens-flare.c:745 msgid "Center of Flare Effect" msgstr "Midten af lysskæreffekt" #: ../plug-ins/common/lens-flare.c:785 ../plug-ins/common/nova.c:475 -#, fuzzy msgid "Show _position" msgstr "Vis _position" #: ../plug-ins/common/mail.c:188 msgid "Send the image by email" -msgstr "Send billedet pr. e-mail" +msgstr "Send billedet via e-mail" #: ../plug-ins/common/mail.c:194 msgid "Send by E_mail..." -msgstr "Send pr. e-_mail..." +msgstr "Send via e-_mail..." #: ../plug-ins/common/mail.c:407 msgid "Send by Email" -msgstr "Send pr. e-mail" +msgstr "Send via e-mail" #: ../plug-ins/common/mail.c:412 msgid "_Send" @@ -6209,13 +6110,11 @@ msgstr "_Filnavn:" #: ../plug-ins/common/mail.c:456 -#, fuzzy msgctxt "email-address" msgid "_To:" msgstr "_Til:" #: ../plug-ins/common/mail.c:470 -#, fuzzy msgctxt "email-address" msgid "_From:" msgstr "_Fra:" @@ -6235,7 +6134,7 @@ #: ../plug-ins/common/max-rgb.c:90 msgid "Reduce image to pure red, green, and blue" -msgstr "" +msgstr "Reducér billede til ren rød, grøn og blå" #: ../plug-ins/common/max-rgb.c:95 msgid "Maxim_um RGB..." @@ -6254,12 +6153,10 @@ msgstr "Maksimal RGB-værdi" #: ../plug-ins/common/max-rgb.c:293 -#, fuzzy msgid "_Hold the maximal channels" msgstr "Bevar de m_aksimale kanaler" #: ../plug-ins/common/max-rgb.c:296 -#, fuzzy msgid "Ho_ld the minimal channels" msgstr "Bevar de m_inimale kanaler" @@ -6333,19 +6230,16 @@ msgstr "Farve_variation:" #: ../plug-ins/common/mosaic.c:745 -#, fuzzy msgid "Co_lor averaging" msgstr "F_arvegennemsnitsberegning" #: ../plug-ins/common/mosaic.c:758 -#, fuzzy msgid "Allo_w tile splitting" -msgstr "_Tillad flisedeling" +msgstr "_Tillad deling af fliser" #: ../plug-ins/common/mosaic.c:771 -#, fuzzy msgid "_Pitted surfaces" -msgstr "For_dybninger i overflader" +msgstr "_Hullede overflader" #: ../plug-ins/common/mosaic.c:784 msgid "_FG/BG lighting" @@ -6365,11 +6259,11 @@ #: ../plug-ins/common/newsprint.c:144 msgid "PS Square (Euclidean Dot)" -msgstr "Postscriptkvadrat (euklidisk punkt)" +msgstr "PostScript-kvadrat (euklidisk punkt)" #: ../plug-ins/common/newsprint.c:153 msgid "PS Diamond" -msgstr "Postscriptdiamant" +msgstr "PostScript-diamant" #: ../plug-ins/common/newsprint.c:323 msgid "_Grey" @@ -6397,7 +6291,7 @@ #: ../plug-ins/common/newsprint.c:508 msgid "Halftone the image to give newspaper-like effect" -msgstr "" +msgstr "Anvend avistrykeffekt (halftone) på billedet" #: ../plug-ins/common/newsprint.c:517 msgid "Newsprin_t..." @@ -6408,7 +6302,6 @@ msgstr "Avistryk" #: ../plug-ins/common/newsprint.c:1022 -#, fuzzy msgid "_Spot function:" msgstr "_Punktfunktion:" @@ -6438,9 +6331,8 @@ msgstr "Skærm" #: ../plug-ins/common/newsprint.c:1310 -#, fuzzy msgid "B_lack pullout (%):" -msgstr "_Sort udtræk (%)" +msgstr "_Sort udtræk (%):" #: ../plug-ins/common/newsprint.c:1332 msgid "Separate to:" @@ -6466,14 +6358,12 @@ msgid "_Factory Defaults" msgstr "_Fabriksindstillinger" -# scootergrisen: udjævning? #. anti-alias control #: ../plug-ins/common/newsprint.c:1434 ../plug-ins/gfig/gfig-dialog.c:1293 msgid "Antialiasing" -msgstr "Udglatning" +msgstr "Udjævning" #: ../plug-ins/common/newsprint.c:1442 -#, fuzzy msgid "O_versample:" msgstr "O_verprøvning:" @@ -6500,9 +6390,8 @@ # RETMIG: er dette rigtigt? #: ../plug-ins/common/nl-filter.c:1052 -#, fuzzy msgid "Op_timal estimation" -msgstr "O_ptimale gæt" +msgstr "O_ptimal tilnærmelse" #: ../plug-ins/common/nl-filter.c:1054 msgid "_Edge enhancement" @@ -6514,7 +6403,7 @@ #: ../plug-ins/common/noise-hsv.c:103 msgid "Randomize hue/saturation/value independently" -msgstr "" +msgstr "Tilfældiggør farvetone/farvemætning/værdi hver for sig" #: ../plug-ins/common/noise-hsv.c:108 msgid "HSV Noise..." @@ -6532,20 +6421,23 @@ msgid "H_ue:" msgstr "Farve_tone:" +# * This plug-in adds a user-defined amount of randomization to an +# * image. Variations include: +# * +# * - hurling (spewing random colors) +# * - picking a nearby pixel at random +# * - slurring (a crude form of melting) #: ../plug-ins/common/noise-randomize.c:102 -#, fuzzy msgid "Random Hurl" -msgstr "Tilfældige hvirvler 1.7" +msgstr "Tilfældig farve" #: ../plug-ins/common/noise-randomize.c:103 -#, fuzzy msgid "Random Pick" -msgstr "Tilfældige udvalg 1.7" +msgstr "Tilfældig fra omgivelser" #: ../plug-ins/common/noise-randomize.c:104 -#, fuzzy msgid "Random Slur" -msgstr "Tilfældig smeltning 1.7" +msgstr "Tilfældig smeltning" #: ../plug-ins/common/noise-randomize.c:202 msgid "Completely randomize a fraction of pixels" @@ -6553,27 +6445,28 @@ #: ../plug-ins/common/noise-randomize.c:204 msgid "Randomly interchange some pixels with neighbors" -msgstr "" +msgstr "Ombyt nogle nabopixels tilfældigt" #: ../plug-ins/common/noise-randomize.c:206 msgid "Randomly slide some pixels downward (similar to melting)" msgstr "" +# Se forklaring i kildekode eller kommentar andetsteds i denne fil #: ../plug-ins/common/noise-randomize.c:233 -#, fuzzy msgid "_Hurl..." -msgstr "_Hvirvler..." +msgstr "_Tilfældig..." #: ../plug-ins/common/noise-randomize.c:245 msgid "_Pick..." msgstr "_Vælg..." +# Se forklaring i kildekode eller kommentar andetsteds i denne fil #: ../plug-ins/common/noise-randomize.c:257 -#, fuzzy msgid "_Slur..." -msgstr "_Kilde..." +msgstr "_Smeltning..." -#: ../plug-ins/common/noise-randomize.c:767 ../plug-ins/common/noise-solid.c:603 +#: ../plug-ins/common/noise-randomize.c:767 +#: ../plug-ins/common/noise-solid.c:603 msgid "_Random seed:" msgstr "Tilfældig _startværdi:" @@ -6595,7 +6488,7 @@ #: ../plug-ins/common/noise-rgb.c:145 msgid "Distort colors by random amounts" -msgstr "" +msgstr "Forvræng farver med tilfældige mængder" #: ../plug-ins/common/noise-rgb.c:155 msgid "_RGB Noise..." @@ -6629,7 +6522,7 @@ #: ../plug-ins/common/noise-solid.c:176 msgid "Create a random cloud-like texture" -msgstr "" +msgstr "Opret et tilfældigt sky-ligende mønster" #: ../plug-ins/common/noise-solid.c:182 msgid "_Solid Noise..." @@ -6664,7 +6557,7 @@ #: ../plug-ins/common/noise-spread.c:87 msgid "Move pixels around randomly" -msgstr "" +msgstr "Flyt pixels tilfæligt rundt" #: ../plug-ins/common/noise-spread.c:96 msgid "Sp_read..." @@ -6684,7 +6577,7 @@ #: ../plug-ins/common/nova.c:163 msgid "Add a starburst to the image" -msgstr "" +msgstr "Tilføj en stjerneformet eksplosion til billedet" #: ../plug-ins/common/nova.c:172 msgid "Super_nova..." @@ -6716,21 +6609,19 @@ #: ../plug-ins/common/oilify.c:119 ../plug-ins/common/oilify.c:134 msgid "Smear colors to simulate an oil painting" -msgstr "" +msgstr "Smør farverne ud for at simulere et oliemaleri" #: ../plug-ins/common/oilify.c:125 -#, fuzzy msgid "Oili_fy..." -msgstr "_Oliemaleri..." +msgstr "_Olie..." #: ../plug-ins/common/oilify.c:247 msgid "Oil painting" msgstr "Oliemaleri" #: ../plug-ins/common/oilify.c:778 -#, fuzzy msgid "Oilify" -msgstr "Oliemaleri" +msgstr "Olie" #: ../plug-ins/common/oilify.c:817 msgid "_Mask size:" @@ -6792,15 +6683,15 @@ #: ../plug-ins/common/pixelize.c:171 msgid "_Pixelize..." -msgstr "_Opdeler i små firkanter..." +msgstr "_Pixelering..." #: ../plug-ins/common/pixelize.c:273 msgid "Pixelizing" -msgstr "Opdeler i små firkanter" +msgstr "Pixelering" #: ../plug-ins/common/pixelize.c:316 msgid "Pixelize" -msgstr "Små firkanter" +msgstr "Pixelér" #: ../plug-ins/common/pixelize.c:353 msgid "Pixel _width:" @@ -6812,7 +6703,7 @@ #: ../plug-ins/common/plasma.c:176 msgid "Create a random plasma texture" -msgstr "" +msgstr "Opret et tilfældigt plasmamønster" #: ../plug-ins/common/plasma.c:181 msgid "_Plasma..." @@ -6836,7 +6727,7 @@ #: ../plug-ins/common/plugin-browser.c:144 msgid "_Plug-In Browser" -msgstr "_Plugin-browser" +msgstr "_Pluginbrowser" #: ../plug-ins/common/plugin-browser.c:363 msgid "Searching by name" @@ -6867,7 +6758,7 @@ # den sædvanlige "gennemse..."-knap #: ../plug-ins/common/plugin-browser.c:546 msgid "Plug-In Browser" -msgstr "Plugin-browser" +msgstr "Pluginbrowser" #: ../plug-ins/common/plugin-browser.c:589 msgid "Name" @@ -6913,14 +6804,12 @@ msgstr "Polærekoordinater" #: ../plug-ins/common/polar-coords.c:631 -#, fuzzy msgid "Circle _depth in percent:" msgstr "Cirkel_dybde i procent:" #: ../plug-ins/common/polar-coords.c:643 -#, fuzzy msgid "Offset _angle:" -msgstr "Start_vinkel:" +msgstr "Forskydnings_vinkel:" #: ../plug-ins/common/polar-coords.c:659 #, fuzzy @@ -6977,12 +6866,10 @@ msgstr "Generér en stor varation af abstrakte mønstre" #: ../plug-ins/common/qbist.c:416 -#, fuzzy msgid "_Qbist..." msgstr "_Qbist..." #: ../plug-ins/common/qbist.c:515 -#, fuzzy msgid "Qbist" msgstr "Qbist" @@ -7031,19 +6918,16 @@ msgstr "Fjerner røde øjne" #: ../plug-ins/common/ripple.c:126 -#, fuzzy msgid "Displace pixels in a ripple pattern" -msgstr "Flyt pixels i et bølgemønster" +msgstr "Forskyd pixels i et krusningsmønster" #: ../plug-ins/common/ripple.c:133 -#, fuzzy msgid "_Ripple..." -msgstr "_Skaber krusninger..." +msgstr "_Krusninger..." #: ../plug-ins/common/ripple.c:223 -#, fuzzy msgid "Rippling" -msgstr "Skaber krusninger..." +msgstr "Krusninger" #: ../plug-ins/common/ripple.c:485 msgid "Ripple" @@ -7059,9 +6943,8 @@ msgstr "Kanter" #: ../plug-ins/common/ripple.c:587 -#, fuzzy msgid "_Blank" -msgstr "_Sort" +msgstr "_Tom" #. Wave toggle box #: ../plug-ins/common/ripple.c:610 @@ -7131,26 +7014,22 @@ msgstr "Kilde:" #: ../plug-ins/common/sample-colorize.c:1385 -#, fuzzy msgid "From reverse gradient" msgstr "Fra omvendt farveovergang" #: ../plug-ins/common/sample-colorize.c:1390 -#, fuzzy msgid "From gradient" msgstr "Fra farveovergang" #. check button #: ../plug-ins/common/sample-colorize.c:1411 #: ../plug-ins/common/sample-colorize.c:1438 -#, fuzzy msgid "Show selection" msgstr "Vis markering" #. check button #: ../plug-ins/common/sample-colorize.c:1422 #: ../plug-ins/common/sample-colorize.c:1449 -#, fuzzy msgid "Show color" msgstr "Vis farve" @@ -7164,32 +7043,27 @@ #. check button #: ../plug-ins/common/sample-colorize.c:1654 -#, fuzzy msgid "Hold intensity" msgstr "Bevar intensitet" #. check button #: ../plug-ins/common/sample-colorize.c:1665 -#, fuzzy msgid "Original intensity" msgstr "Oprindelig intensitet" #. check button #: ../plug-ins/common/sample-colorize.c:1683 -#, fuzzy msgid "Use subcolors" -msgstr "Benyt mellemfarver" +msgstr "Brug underfarver" #. check button #: ../plug-ins/common/sample-colorize.c:1694 -#, fuzzy msgid "Smooth samples" -msgstr "Udglat farveprøver" +msgstr "Udglat prøver" #: ../plug-ins/common/sample-colorize.c:2666 -#, fuzzy msgid "Sample analyze" -msgstr "Analyserer farveprøverne..." +msgstr "Prøveanalyse" #: ../plug-ins/common/sample-colorize.c:3046 #, fuzzy @@ -7198,89 +7072,79 @@ #: ../plug-ins/common/screenshot.c:250 msgid "Create an image from an area of the screen" -msgstr "" +msgstr "Opret et billede fra et område af skærmen" #: ../plug-ins/common/screenshot.c:272 -#, fuzzy msgid "_Screenshot..." msgstr "_Skærmbillede..." #: ../plug-ins/common/screenshot.c:445 -#, fuzzy msgid "Error selecting the window" -msgstr "Fejl ved beslaglæggelse af markøren" +msgstr "Fejl ved valg af vinduet" #: ../plug-ins/common/screenshot.c:813 -#, fuzzy msgid "Importing screenshot" -msgstr "Fejl ved indhentning af skærmbillede" +msgstr "Importerer skærmbillede" #: ../plug-ins/common/screenshot.c:839 ../plug-ins/common/screenshot.c:1204 -#, fuzzy msgid "Screenshot" msgstr "Skærmbillede" #: ../plug-ins/common/screenshot.c:880 -#, fuzzy msgid "Mouse Pointer" -msgstr "Indsæt punkt" +msgstr "Musemarkør" #: ../plug-ins/common/screenshot.c:1014 msgid "Specified window not found" msgstr "Angivet vindue ikke fundet" #: ../plug-ins/common/screenshot.c:1213 -#, fuzzy msgid "S_nap" -msgstr "B_yt" +msgstr "_Tag skærmbillede" #: ../plug-ins/common/screenshot.c:1243 msgid "After the delay, the screenshot is taken." -msgstr "" +msgstr "Skærmbilledet tages når ventetiden udløber." #: ../plug-ins/common/screenshot.c:1245 msgid "" "After the delay, drag your mouse to select the region for the screenshot." -msgstr "" +msgstr "Træk din mus efter ventetiden for at vælge skærmbilledets område." #: ../plug-ins/common/screenshot.c:1248 msgid "At the end of the delay, click in a window to snap it." msgstr "" +"Klik på et vindue efter ventetiden for at tage et skærmbillede af det." #. Area #: ../plug-ins/common/screenshot.c:1254 -#, fuzzy msgid "Area" -msgstr "Areal:" +msgstr "Område" #: ../plug-ins/common/screenshot.c:1265 msgid "Take a screenshot of a single _window" -msgstr "" +msgstr "Tag et skræmbillede af et enkelt _vindue" #: ../plug-ins/common/screenshot.c:1284 -#, fuzzy msgid "Include window _decoration" -msgstr "_Med vinduesudsmykninger" +msgstr "_Medtag vinduesdekoration" #: ../plug-ins/common/screenshot.c:1304 msgid "Take a screenshot of the entire _screen" -msgstr "" +msgstr "Tag et skærmbillede af hele _skærmen" #: ../plug-ins/common/screenshot.c:1323 -#, fuzzy msgid "Include _mouse pointer" msgstr "Inkludér _musemarkør" #: ../plug-ins/common/screenshot.c:1344 -#, fuzzy msgid "Select a _region to grab" -msgstr "_Vælg et område at holde fast i" +msgstr "_Vælg et område" #. Delay #: ../plug-ins/common/screenshot.c:1359 -#, fuzzy msgid "Delay" -msgstr "Læg over" +msgstr "Ventetid" #. this is the unit label of a spinbutton #: ../plug-ins/common/screenshot.c:1381 @@ -7289,7 +7153,7 @@ #: ../plug-ins/common/semi-flatten.c:67 msgid "Replace partial transparency with the current background color" -msgstr "" +msgstr "Erstat delvis gennemsigtighed med den nuværende baggrundsfarve" #: ../plug-ins/common/semi-flatten.c:74 msgid "_Semi-Flatten" @@ -7304,15 +7168,13 @@ msgstr "" #: ../plug-ins/common/sharpen.c:118 -#, fuzzy msgid "_Sharpen..." -msgstr "_Skærper..." +msgstr "_Skærp..." #. #. * Let the user know what we're doing... #. #: ../plug-ins/common/sharpen.c:303 -#, fuzzy msgid "Sharpening" msgstr "Skærper" @@ -7325,9 +7187,8 @@ msgstr "Flyt hver række af pixels tilfældigt" #: ../plug-ins/common/shift.c:108 -#, fuzzy msgid "_Shift..." -msgstr "_Skifter..." +msgstr "_Forskyd..." #: ../plug-ins/common/shift.c:189 msgid "Shifting" @@ -7338,19 +7199,16 @@ msgstr "Skift" #: ../plug-ins/common/shift.c:390 -#, fuzzy msgid "Shift _horizontally" -msgstr "Skift _vandret" +msgstr "Forskyd _vandret" #: ../plug-ins/common/shift.c:393 -#, fuzzy msgid "Shift _vertically" -msgstr "Skift _lodret" +msgstr "Forskyd _lodret" #: ../plug-ins/common/shift.c:424 -#, fuzzy msgid "Shift _amount:" -msgstr "Skifte_størrelse:" +msgstr "_Forskydning:" #: ../plug-ins/common/sinus.c:186 msgid "Generate complex sinusoidal textures" @@ -7375,12 +7233,10 @@ msgstr "Tegningsindstillinger" #: ../plug-ins/common/sinus.c:701 -#, fuzzy msgid "_X scale:" msgstr "_x-skalering:" #: ../plug-ins/common/sinus.c:710 -#, fuzzy msgid "_Y scale:" msgstr "_y-skalering:" @@ -7419,26 +7275,22 @@ msgstr "Farverne er hvid og sort" #: ../plug-ins/common/sinus.c:803 -#, fuzzy msgid "Bl_ack & white" -msgstr "S_ort/hvid" +msgstr "S_ort og hvid" #: ../plug-ins/common/sinus.c:805 -#, fuzzy msgid "_Foreground & background" -msgstr "_Forgrund/baggrund" +msgstr "_Forgrund og baggrund" #: ../plug-ins/common/sinus.c:807 msgid "C_hoose here:" msgstr "_Vælg her:" #: ../plug-ins/common/sinus.c:820 -#, fuzzy msgid "First color" msgstr "Første farve" #: ../plug-ins/common/sinus.c:830 -#, fuzzy msgid "Second color" msgstr "Anden farve" @@ -7447,12 +7299,10 @@ msgstr "Alfa-kanaler" #: ../plug-ins/common/sinus.c:856 -#, fuzzy msgid "F_irst color:" msgstr "F_ørste farve:" #: ../plug-ins/common/sinus.c:871 -#, fuzzy msgid "S_econd color:" msgstr "_Anden farve:" @@ -7512,37 +7362,32 @@ msgstr "" #: ../plug-ins/common/softglow.c:139 -#, fuzzy msgid "_Softglow..." -msgstr "_Sobel" +msgstr "_Blødt skær..." #: ../plug-ins/common/softglow.c:633 -#, fuzzy msgid "Softglow" msgstr "Blødt skær" #: ../plug-ins/common/softglow.c:671 -#, fuzzy msgid "_Glow radius:" -msgstr "_Sløringsradius:" +msgstr "_Skærets radius:" #: ../plug-ins/common/sparkle.c:178 msgid "Turn bright spots into starry sparkles" -msgstr "" +msgstr "Gør lyse punkter til stjerneglans" #: ../plug-ins/common/sparkle.c:186 -#, fuzzy msgid "_Sparkle..." -msgstr "_Udsmelter..." +msgstr "_Glans..." #: ../plug-ins/common/sparkle.c:223 msgid "Region selected for filter is empty" msgstr "" #: ../plug-ins/common/sparkle.c:299 -#, fuzzy msgid "Sparkling" -msgstr "Udsmelter" +msgstr "Glans" #: ../plug-ins/common/sparkle.c:337 msgid "Sparkle" @@ -7563,9 +7408,8 @@ msgstr "F_lammeintensitet:" #: ../plug-ins/common/sparkle.c:390 -#, fuzzy msgid "Adjust the flare intensity" -msgstr "Justér flammeintensiteten" +msgstr "Justér skærets intensitet" #: ../plug-ins/common/sparkle.c:400 msgid "_Spike length:" @@ -7584,9 +7428,8 @@ msgstr "Justér antallet af stråler" #: ../plug-ins/common/sparkle.c:426 -#, fuzzy msgid "Spi_ke angle (-1: random):" -msgstr "Stråle_vinkel (-1: tilfældig)" +msgstr "Stråle_vinkel (-1: tilfældig):" #: ../plug-ins/common/sparkle.c:429 #, fuzzy @@ -7603,16 +7446,14 @@ msgstr "Justér stråletætheden" #: ../plug-ins/common/sparkle.c:453 -#, fuzzy msgid "Tr_ansparency:" -msgstr "_Gennemsigtig:" +msgstr "_Gennemsigtighed:" #: ../plug-ins/common/sparkle.c:456 msgid "Adjust the opacity of the spikes" msgstr "Justér strålernes synlighed" #: ../plug-ins/common/sparkle.c:466 -#, fuzzy msgid "_Random hue:" msgstr "Tilfældig _farvetone:" @@ -7622,12 +7463,10 @@ msgstr "Indstil hvor meget farvetonen skal ændres tilfældigt" #: ../plug-ins/common/sparkle.c:479 -#, fuzzy msgid "Rando_m saturation:" msgstr "Tilfældig _mætning:" #: ../plug-ins/common/sparkle.c:482 -#, fuzzy msgid "Adjust how much the saturation should be changed randomly" msgstr "Indstil hvor meget mætningen skal ændres tilfældigt" @@ -7637,21 +7476,18 @@ msgstr "_Bevar lysstyrke" #: ../plug-ins/common/sparkle.c:506 -#, fuzzy msgid "Should the luminosity be preserved?" -msgstr "Bevar den samme lysstyrke" +msgstr "Skal lysstyrken bevares?" #: ../plug-ins/common/sparkle.c:515 msgid "In_verse" msgstr "In_vertér" #: ../plug-ins/common/sparkle.c:521 -#, fuzzy msgid "Should the effect be inversed?" -msgstr "Benyt en invers effekt" +msgstr "Skal effekten vendes om?" #: ../plug-ins/common/sparkle.c:530 -#, fuzzy msgid "A_dd border" msgstr "Tilføj _kant" @@ -7660,34 +7496,28 @@ msgstr "Tegn en kant af stråler omkring billedet" #: ../plug-ins/common/sparkle.c:550 -#, fuzzy msgid "_Natural color" msgstr "_Naturlig farve" #: ../plug-ins/common/sparkle.c:551 -#, fuzzy msgid "_Foreground color" msgstr "_Forgrundsfarve" #: ../plug-ins/common/sparkle.c:552 -#, fuzzy msgid "_Background color" msgstr "_Baggrundsfarve" #: ../plug-ins/common/sparkle.c:559 -#, fuzzy msgid "Use the color of the image" msgstr "Brug billedets farve" #: ../plug-ins/common/sparkle.c:560 -#, fuzzy msgid "Use the foreground color" -msgstr "Benyt forgrundsfarve" +msgstr "Brug forgrundsfarven" #: ../plug-ins/common/sparkle.c:561 -#, fuzzy msgid "Use the background color" -msgstr "Benyt baggrundsfarve" +msgstr "Brug baggrundsfarven" #: ../plug-ins/common/sphere-designer.c:293 #: ../plug-ins/gimpressionist/general.c:165 @@ -7758,9 +7588,8 @@ msgstr "Kugledesigner" #: ../plug-ins/common/sphere-designer.c:2690 -#, fuzzy msgid "Properties" -msgstr "Teksturegenskaber" +msgstr "Egenskaber" #: ../plug-ins/common/sphere-designer.c:2706 msgid "Bump" @@ -7807,7 +7636,6 @@ msgstr "Eksp:" #: ../plug-ins/common/sphere-designer.c:2792 -#, fuzzy msgid "Transformations" msgstr "Transformationer" @@ -7837,29 +7665,26 @@ msgstr "Rotér z:" #: ../plug-ins/common/sphere-designer.c:2849 -#, fuzzy msgid "Position X:" -msgstr "Placering" +msgstr "x-placering:" #: ../plug-ins/common/sphere-designer.c:2856 -#, fuzzy msgid "Position Y:" -msgstr "Placering" +msgstr "y-placering:" #: ../plug-ins/common/sphere-designer.c:2863 -#, fuzzy msgid "Position Z:" -msgstr "Placering" +msgstr "z-placering:" +# Fra kildekoden: gimp_progress_init (_("Rendering sphere")); +# Dvs. det er en proces #: ../plug-ins/common/sphere-designer.c:2979 -#, fuzzy msgid "Rendering sphere" msgstr "Genererer kugle" #: ../plug-ins/common/sphere-designer.c:3030 -#, fuzzy msgid "Create an image of a textured sphere" -msgstr "Centrér billedet på papiret" +msgstr "Opret et billede af en kugle med mønster" #: ../plug-ins/common/sphere-designer.c:3037 msgid "Sphere _Designer..." @@ -7871,7 +7696,7 @@ #: ../plug-ins/common/threshold-alpha.c:85 msgid "Make transparency all-or-nothing" -msgstr "" +msgstr "Gør transparens alt-eller-intet" #: ../plug-ins/common/threshold-alpha.c:90 msgid "_Threshold Alpha..." @@ -7885,10 +7710,10 @@ msgid "RGBA/GRAYA drawable is not selected." msgstr "RGBA/GRAYA-tegneobjekt ikke valgt." +# gimp_progress_init (_("Coloring transparency")); #: ../plug-ins/common/threshold-alpha.c:165 -#, fuzzy msgid "Coloring transparency" -msgstr "Ryd gennemsigtigt" +msgstr "Farvetransparens" #: ../plug-ins/common/threshold-alpha.c:248 msgid "Threshold Alpha" @@ -7900,19 +7725,17 @@ #: ../plug-ins/common/tile-glass.c:124 msgid "Simulate distortion caused by square glass tiles" -msgstr "" +msgstr "Simulér forvrængning med firkantede glasfliser" #: ../plug-ins/common/tile-glass.c:130 -#, fuzzy msgid "_Glass Tile..." -msgstr "_Glasflise..." +msgstr "_Glasfliser..." #: ../plug-ins/common/tile-glass.c:210 ../plug-ins/common/tile-glass.c:250 msgid "Glass Tile" -msgstr "Glasflise" +msgstr "Glasfliser" #: ../plug-ins/common/tile-glass.c:290 -#, fuzzy msgid "Tile _width:" msgstr "Flise_bredde:" @@ -7921,7 +7744,6 @@ msgid "Paper Tile" msgstr "Papirbrikker" -# scootergrisen: måske opdeling #: ../plug-ins/common/tile-paper.c:270 msgid "Division" msgstr "Opdeling" @@ -7964,21 +7786,18 @@ msgstr "Baggrundstype" #: ../plug-ins/common/tile-paper.c:387 -#, fuzzy msgid "I_nverted image" -msgstr "I_nverteret billede" +msgstr "Om_vendt billede" #: ../plug-ins/common/tile-paper.c:389 msgid "Im_age" msgstr "_Billede" #: ../plug-ins/common/tile-paper.c:391 -#, fuzzy msgid "Fo_reground color" msgstr "Fo_rgrundsfarve" #: ../plug-ins/common/tile-paper.c:393 -#, fuzzy msgid "Bac_kground color" msgstr "Bag_grundsfarve" @@ -7992,14 +7811,13 @@ #: ../plug-ins/common/tile-paper.c:848 msgid "Cut image into paper tiles, and slide them" -msgstr "" +msgstr "Klip billede til papirbrikker og flyt dem" #: ../plug-ins/common/tile-paper.c:853 msgid "September 31, 1999" msgstr "31. september, 1999" #: ../plug-ins/common/tile-paper.c:854 -#, fuzzy msgid "_Paper Tile..." msgstr "_Papirbrikker..." @@ -8009,12 +7827,10 @@ "Ændre kanterne så billedet kan lægges som fliser uden en synlig overgang" #: ../plug-ins/common/tile-seamless.c:72 -#, fuzzy msgid "_Make Seamless" msgstr "_Gør sømløs" #: ../plug-ins/common/tile-seamless.c:335 -#, fuzzy msgid "Tiler" msgstr "Fliselæg" @@ -8024,7 +7840,6 @@ msgstr "Billedet til mindre versioner af originalen" #: ../plug-ins/common/tile-small.c:227 -#, fuzzy msgid "_Small Tiles..." msgstr "_Små fliser..." @@ -8040,18 +7855,17 @@ #. Get the preview image #: ../plug-ins/common/tile-small.c:371 -#, fuzzy msgid "Small Tiles" msgstr "Små fliser" #. Area for buttons etc #. Flip -#: ../plug-ins/common/tile-small.c:421 ../plug-ins/ifs-compose/ifs-compose.c:609 +#: ../plug-ins/common/tile-small.c:421 +#: ../plug-ins/ifs-compose/ifs-compose.c:609 msgid "Flip" msgstr "Spejling" #: ../plug-ins/common/tile-small.c:470 -#, fuzzy msgid "A_ll tiles" msgstr "A_lle fliser" @@ -8079,7 +7893,6 @@ #. Lower frame saying howmany segments #: ../plug-ins/common/tile-small.c:594 -#, fuzzy msgid "Number of Segments" msgstr "Antal segmenter" @@ -8102,7 +7915,6 @@ msgstr "Fliselæg for at opnå ny størrelse" #: ../plug-ins/common/tile.c:441 -#, fuzzy msgid "C_reate new image" msgstr "_Opret nyt billede" @@ -8190,7 +8002,7 @@ #: ../plug-ins/common/unit-editor.c:121 msgid "Create a new unit from scratch" -msgstr "Lav en ny enhed fra bunden af" +msgstr "Opret en ny enhed fra bunden" #: ../plug-ins/common/unit-editor.c:127 msgid "Create a new unit using the currently selected unit as template" @@ -8237,12 +8049,10 @@ msgstr "_Flertal:" #: ../plug-ins/common/unit-editor.c:346 -#, fuzzy msgid "Incomplete input" -msgstr "Ufuldstændig input" +msgstr "Ufuldstændigt input" #: ../plug-ins/common/unit-editor.c:349 -#, fuzzy msgid "Please fill in all text fields." msgstr "Udfyld venligst alle tekstfelter." @@ -8252,10 +8062,16 @@ #: ../plug-ins/common/unsharp-mask.c:131 msgid "The most widely useful method for sharpening an image" -msgstr "" +msgstr "Den mest brugte metode til at skærpe et billede" +# "The most widely useful method for sharpening an image"), +# "The unsharp mask is a sharpening filter that works " +# "by comparing using the difference of the image and " +# "a blurred version of the image. It is commonly " +# "used on photographic images, and is provides a much " +# "more pleasing result than the standard sharpen " +# "filter.", #: ../plug-ins/common/unsharp-mask.c:141 -#, fuzzy msgid "_Unsharp Mask..." msgstr "_Uskarp maske..." @@ -8268,25 +8084,22 @@ msgstr "Uskarp maske" #: ../plug-ins/common/value-invert.c:89 -#, fuzzy msgid "Invert the brightness of each pixel" -msgstr "Angiv højden af udskriften" +msgstr "Omvend lysstyrken for hver pixel" #: ../plug-ins/common/value-invert.c:103 msgid "_Value Invert" -msgstr "_Værdiinvertér" +msgstr "_Omvend værdier" #: ../plug-ins/common/value-invert.c:190 msgid "Value Invert" -msgstr "Værdiinvertér" +msgstr "Omvend værdier" #: ../plug-ins/common/value-propagate.c:189 -#, fuzzy msgid "More _white (larger value)" msgstr "Mere _hvidt (større værdi)" #: ../plug-ins/common/value-propagate.c:192 -#, fuzzy msgid "More blac_k (smaller value)" msgstr "Mere _sort (mindre værdi)" @@ -8301,12 +8114,10 @@ msgstr "_Forgrund for spidserne" #: ../plug-ins/common/value-propagate.c:201 -#, fuzzy msgid "O_nly foreground" msgstr "_Kun forgrund" #: ../plug-ins/common/value-propagate.c:204 -#, fuzzy msgid "Only b_ackground" msgstr "Kun _baggrund" @@ -8315,9 +8126,8 @@ msgstr "Mere _synlig" #: ../plug-ins/common/value-propagate.c:210 -#, fuzzy msgid "More t_ransparent" -msgstr "Mere _gennemsigtigt" +msgstr "Mere _gennemsigtig" #: ../plug-ins/common/value-propagate.c:233 msgid "Propagate certain colors to neighboring pixels" @@ -8334,9 +8144,8 @@ msgstr "Den første række i billedet" #: ../plug-ins/common/value-propagate.c:250 -#, fuzzy msgid "E_rode" -msgstr "Tilstand" +msgstr "_Erosion" #: ../plug-ins/common/value-propagate.c:257 #, fuzzy @@ -8344,65 +8153,56 @@ msgstr "Den første række i billedet" #: ../plug-ins/common/value-propagate.c:262 -#, fuzzy msgid "_Dilate" -msgstr "_Udpak" +msgstr "_Udvid" -#: ../plug-ins/common/value-propagate.c:476 -#: ../plug-ins/common/value-propagate.c:1086 +#: ../plug-ins/common/value-propagate.c:480 +#: ../plug-ins/common/value-propagate.c:1090 msgid "Value Propagate" msgstr "Værdipropagering" #. Parameter settings -#: ../plug-ins/common/value-propagate.c:1153 -#, fuzzy +#: ../plug-ins/common/value-propagate.c:1157 msgid "Propagate" -msgstr "Propageringstilstand" +msgstr "Udbred" -#: ../plug-ins/common/value-propagate.c:1166 -#, fuzzy +#: ../plug-ins/common/value-propagate.c:1170 msgid "Lower t_hreshold:" msgstr "_Nedre tærskel:" -#: ../plug-ins/common/value-propagate.c:1178 -#, fuzzy +#: ../plug-ins/common/value-propagate.c:1182 msgid "_Upper threshold:" msgstr "_Øvre tærskel:" -#: ../plug-ins/common/value-propagate.c:1190 +#: ../plug-ins/common/value-propagate.c:1194 #, fuzzy msgid "_Propagating rate:" msgstr "_Propageringsgrad:" -#: ../plug-ins/common/value-propagate.c:1201 -#, fuzzy +#: ../plug-ins/common/value-propagate.c:1205 msgid "To l_eft" msgstr "Til _venstre" -#: ../plug-ins/common/value-propagate.c:1204 -#, fuzzy +#: ../plug-ins/common/value-propagate.c:1208 msgid "To _right" msgstr "Til _højre" -#: ../plug-ins/common/value-propagate.c:1207 -#, fuzzy +#: ../plug-ins/common/value-propagate.c:1211 msgid "To _top" msgstr "Til _top" -#: ../plug-ins/common/value-propagate.c:1210 -#, fuzzy +#: ../plug-ins/common/value-propagate.c:1214 msgid "To _bottom" msgstr "Til _bund" -#: ../plug-ins/common/value-propagate.c:1219 -#, fuzzy +# Bedre ord? +#: ../plug-ins/common/value-propagate.c:1223 msgid "Propagating _alpha channel" -msgstr "Propagerer _alfa-kanal" +msgstr "Udbred for _alfa-kanal" -#: ../plug-ins/common/value-propagate.c:1230 -#, fuzzy +#: ../plug-ins/common/value-propagate.c:1234 msgid "Propagating value channel" -msgstr "Propagerer værdikanal" +msgstr "Udbred for værdikanal" #: ../plug-ins/common/van-gogh-lic.c:569 ../plug-ins/common/van-gogh-lic.c:644 msgid "Van Gogh (LIC)" @@ -8437,17 +8237,14 @@ msgstr "_Med hvid støj" #: ../plug-ins/common/van-gogh-lic.c:701 -#, fuzzy msgid "W_ith source image" msgstr "Med _kildebillede" #: ../plug-ins/common/van-gogh-lic.c:720 -#, fuzzy msgid "_Effect image:" msgstr "_Effektbillede:" #: ../plug-ins/common/van-gogh-lic.c:731 -#, fuzzy msgid "_Filter length:" msgstr "_Filterlængde:" @@ -8462,21 +8259,18 @@ msgstr "In_tegrationsskridt:" #: ../plug-ins/common/van-gogh-lic.c:758 -#, fuzzy msgid "_Minimum value:" msgstr "_Minimumsværdi:" #: ../plug-ins/common/van-gogh-lic.c:767 -#, fuzzy msgid "M_aximum value:" msgstr "M_aksimumsværdi:" #: ../plug-ins/common/van-gogh-lic.c:813 msgid "Special effects that nobody understands" -msgstr "" +msgstr "Specielle effekter som ingen forstår" #: ../plug-ins/common/van-gogh-lic.c:818 -#, fuzzy msgid "_Van Gogh (LIC)..." msgstr "_Van Gogh (LIC)..." @@ -8521,7 +8315,6 @@ msgstr "" #: ../plug-ins/common/video.c:1814 -#, fuzzy msgid "Vi_deo..." msgstr "Vi_deo..." @@ -8531,9 +8324,8 @@ #. frame for the radio buttons #: ../plug-ins/common/video.c:2040 -#, fuzzy msgid "Video Pattern" -msgstr "Mønster" +msgstr "Videomønster" #: ../plug-ins/common/video.c:2084 msgid "_Additive" @@ -8672,7 +8464,7 @@ # "flow" er svært at oversætte og overflødigt #: ../plug-ins/common/warp.c:1249 -#, fuzzy, c-format +#, c-format, fuzzy msgid "Flow step %d" msgstr "Skridt %d..." @@ -8704,83 +8496,82 @@ msgid "_Wavelength:" msgstr "_Bølgelængde:" +# gimp_progress_init (_("Waving")); #: ../plug-ins/common/waves.c:449 -#, fuzzy msgid "Waving" -msgstr "Frembringer bølger..." +msgstr "Frembringer bølger" -#: ../plug-ins/common/web-browser.c:135 +#: ../plug-ins/common/web-browser.c:141 msgid "The operating system is out of memory or resources." -msgstr "" +msgstr "Styresystemet har ikke mere ledig hukommelse eller ressourcer." -#: ../plug-ins/common/web-browser.c:138 +#: ../plug-ins/common/web-browser.c:144 #, fuzzy msgid "The specified file was not found." msgstr "Angivet vindue ikke fundet" -#: ../plug-ins/common/web-browser.c:141 -#, fuzzy +# Det drejer sig om filer iflg. koden +#: ../plug-ins/common/web-browser.c:147 msgid "The specified path was not found." -msgstr "Angivet vindue ikke fundet" +msgstr "Den angivne sti blev ikke fundet." -#: ../plug-ins/common/web-browser.c:144 +#: ../plug-ins/common/web-browser.c:150 msgid "" "The .exe file is invalid (non-Microsoft Win32 .exe or error in .exe image)." msgstr "" +".exe-filen er ugyldig (ikke en Microsoft Win32-.exe eller fejl i " +".exe-aftryk)." -#: ../plug-ins/common/web-browser.c:147 -#, fuzzy +#: ../plug-ins/common/web-browser.c:153 msgid "The operating system denied access to the specified file." -msgstr "Gem de nuværende indstillinger i den angivne fil" +msgstr "Styresystemet nægtede adgang til den angivne fil." -#: ../plug-ins/common/web-browser.c:150 +#: ../plug-ins/common/web-browser.c:156 msgid "The file name association is incomplete or invalid." -msgstr "" +msgstr "Filnavnstilknytningen er ikke ufuldstændig eller ugyldig." -#: ../plug-ins/common/web-browser.c:153 +#: ../plug-ins/common/web-browser.c:159 msgid "DDE transaction busy" -msgstr "" +msgstr "DDE-transaktion er optaget" -#: ../plug-ins/common/web-browser.c:156 +#: ../plug-ins/common/web-browser.c:162 msgid "The DDE transaction failed." -msgstr "" +msgstr "DDE-transaktionen mislykkedes." -#: ../plug-ins/common/web-browser.c:159 +#: ../plug-ins/common/web-browser.c:165 msgid "The DDE transaction timed out." -msgstr "" +msgstr "DDE-transaktionen fik timeout." -#: ../plug-ins/common/web-browser.c:162 +#: ../plug-ins/common/web-browser.c:168 #, fuzzy msgid "The specified DLL was not found." msgstr "Angivet vindue ikke fundet" -#: ../plug-ins/common/web-browser.c:165 +#: ../plug-ins/common/web-browser.c:171 msgid "There is no application associated with the given file name extension." -msgstr "" +msgstr "Der er ikke tilknyttet noget program til den givne filnavnsendelse." -#: ../plug-ins/common/web-browser.c:168 +#: ../plug-ins/common/web-browser.c:174 #, fuzzy msgid "There was not enough memory to complete the operation." msgstr "Der er ikke nok lag at justere." -#: ../plug-ins/common/web-browser.c:171 +#: ../plug-ins/common/web-browser.c:177 msgid "A sharing violation occurred." -msgstr "" +msgstr "Der opstod en overtrædelse af deling." -#: ../plug-ins/common/web-browser.c:174 -#, fuzzy +#: ../plug-ins/common/web-browser.c:180 msgid "Unknown Microsoft Windows error." -msgstr "Microsoft Windows ikon" +msgstr "Ukendt Microsoft Windows-fejl." -#: ../plug-ins/common/web-browser.c:177 +#: ../plug-ins/common/web-browser.c:183 #, c-format msgid "Failed to open '%s': %s" msgstr "Kunne ikke åbne \"%s\": %s" #: ../plug-ins/common/web-page.c:98 -#, fuzzy msgid "Create an image of a webpage" -msgstr "Centrér billedet på papiret" +msgstr "Opret et billede ud fra en webside" #: ../plug-ins/common/web-page.c:104 msgid "From _Webpage..." @@ -8816,7 +8607,6 @@ msgstr "Stor" #: ../plug-ins/common/web-page.c:317 -#| msgid "Default" msgctxt "web-page" msgid "Default" msgstr "Standard" @@ -8830,9 +8620,9 @@ msgstr "Meget lille" #: ../plug-ins/common/web-page.c:443 -#, fuzzy, c-format +#, c-format msgid "No URL was specified" -msgstr "Ingen URL angivet" +msgstr "Der er ikke angivet en URL" #: ../plug-ins/common/web-page.c:510 #, c-format @@ -8840,9 +8630,9 @@ msgstr "Downloader websiden \"%s\"" #: ../plug-ins/common/web-page.c:527 -#, fuzzy, c-format +#, c-format msgid "Transferring webpage image for '%s'" -msgstr "Overfører webside-billede for \"%s\"" +msgstr "Overfører websidebillede for \"%s\"" #: ../plug-ins/common/web-page.c:536 msgid "Webpage" @@ -8850,40 +8640,35 @@ #: ../plug-ins/common/whirl-pinch.c:138 msgid "Distort an image by whirling and pinching" -msgstr "" +msgstr "Forvræng et billede ved at hvirvle eller knibe" #: ../plug-ins/common/whirl-pinch.c:149 -#, fuzzy msgid "W_hirl and Pinch..." -msgstr "Hvirvel og knibning" +msgstr "_Hvirvl og knib..." #: ../plug-ins/common/whirl-pinch.c:341 -#, fuzzy msgid "Whirling and pinching" -msgstr "Hvirvler og kniber..." +msgstr "Hvirvler og kniber" #: ../plug-ins/common/whirl-pinch.c:529 msgid "Whirl and Pinch" msgstr "Hvirvel og knibning" #: ../plug-ins/common/whirl-pinch.c:567 -#, fuzzy msgid "_Whirl angle:" msgstr "_Hvirvelvinkel:" #: ../plug-ins/common/whirl-pinch.c:579 -#, fuzzy msgid "_Pinch amount:" msgstr "_Knibningsmængde:" #: ../plug-ins/common/wind.c:175 msgid "Smear image to give windblown effect" -msgstr "" +msgstr "Smør billedet ud for at give en vindblæst effekt" #: ../plug-ins/common/wind.c:180 -#, fuzzy msgid "Wi_nd..." -msgstr "Frembringer bølger..." +msgstr "_Vind..." #: ../plug-ins/common/wind.c:314 #, fuzzy @@ -8891,9 +8676,8 @@ msgstr "Genererer eksplosion..." #: ../plug-ins/common/wind.c:444 -#, fuzzy msgid "Rendering wind" -msgstr "Genererer vind..." +msgstr "Genererer vind" #: ../plug-ins/common/wind.c:876 msgid "Wind" @@ -8981,7 +8765,7 @@ #: ../plug-ins/file-bmp/bmp-read.c:641 msgid "Unrecognized or invalid BMP compression format." -msgstr "" +msgstr "Ikke genkendt eller ugyldigt BMP-komprimeringsformat." #: ../plug-ins/file-bmp/bmp-read.c:683 msgid "Unsupported or invalid bitdepth." @@ -8989,35 +8773,32 @@ #: ../plug-ins/file-bmp/bmp-read.c:835 ../plug-ins/file-bmp/bmp-read.c:876 #: ../plug-ins/file-bmp/bmp-read.c:926 -#, fuzzy msgid "The bitmap ends unexpectedly." -msgstr "Bitmappen afslutter uventet." +msgstr "Bitmappen slutter uventet." #: ../plug-ins/file-bmp/bmp-write.c:193 ../plug-ins/file-bmp/bmp-write.c:219 msgid "Cannot save indexed image with transparency in BMP file format." msgstr "" +"Kan ikke gemme indekseret billede med gennemsigtighed i BMP-filformat." #: ../plug-ins/file-bmp/bmp-write.c:195 ../plug-ins/file-bmp/bmp-write.c:221 -#, fuzzy msgid "Alpha channel will be ignored." msgstr "Alfa-kanal vil blive ignoreret." +# https://en.wikipedia.org/wiki/Run-length_encoding #. Run-Length Encoded #: ../plug-ins/file-bmp/bmp-write.c:870 -#, fuzzy msgid "_Run-Length Encoded" -msgstr "Rækkekomprimeret (RLE)" +msgstr "_Rækkekomprimeret (RLE)" #. Compatibility Options #: ../plug-ins/file-bmp/bmp-write.c:883 -#, fuzzy -#| msgid "Table Options" msgid "Co_mpatibility Options" -msgstr "Tabelindstillinger" +msgstr "_Kompatiblitetsindstillinger" #: ../plug-ins/file-bmp/bmp-write.c:893 msgid "_Do not write color space information" -msgstr "" +msgstr "_Skriv ikke information om farverum" #: ../plug-ins/file-bmp/bmp-write.c:895 msgid "" @@ -9025,12 +8806,15 @@ "information. GIMP writes color space information by default. Enabling this " "option will cause GIMP to not write color space information to the file." msgstr "" +"Nogle programmer kan ikke læse BMP-billeder, som inkluderer information om " +"farverum. GIMP skriver information om farverum som standard. Denne " +"valgmulighed vil gøre, at GIMP ikke skriver information om farverum til " +"filen." #. Advanced Options #: ../plug-ins/file-bmp/bmp-write.c:911 ../plug-ins/file-jpeg/jpeg-save.c:924 -#, fuzzy msgid "_Advanced Options" -msgstr "Avancerede indstillinger" +msgstr "_Avancerede indstillinger" #: ../plug-ins/file-bmp/bmp-write.c:926 msgid "16 bits" @@ -9048,20 +8832,26 @@ msgid "Windows BMP image" msgstr "Windows BMP-billede" -#: ../plug-ins/file-compressor/file-compressor.c:166 +#: ../plug-ins/file-compressor/file-compressor.c:167 msgid "gzip archive" msgstr "gzip-arkiv" -#: ../plug-ins/file-compressor/file-compressor.c:185 +#: ../plug-ins/file-compressor/file-compressor.c:186 msgid "bzip archive" msgstr "bzip-arkiv" -#: ../plug-ins/file-compressor/file-compressor.c:392 +#: ../plug-ins/file-compressor/file-compressor.c:393 #, fuzzy msgid "No sensible file extension, saving as compressed XCF." msgstr "Ingen fornuftig filendelse, gemmer som komprimeret XCF." -#: ../plug-ins/file-compressor/file-compressor.c:448 +#: ../plug-ins/file-compressor/file-compressor.c:416 +#, c-format, fuzzy +#| msgid "Compression" +msgid "Compressing '%s'" +msgstr "Komprimering" + +#: ../plug-ins/file-compressor/file-compressor.c:453 #, fuzzy msgid "No sensible file extension, attempting to load with file magic." msgstr "Ingen fornuftig filendelse, prøver at indlæse vha. filmagi." @@ -9092,7 +8882,7 @@ #: ../plug-ins/file-fits/fits.c:1018 msgid "Replacement for undefined pixels" -msgstr "" +msgstr "Erstatning for udefinerede pixels" #: ../plug-ins/file-fits/fits.c:1023 ../plug-ins/gfig/gfig-dialog.c:1323 #: ../plug-ins/gfig/gfig-dialog.c:1498 @@ -9100,9 +8890,8 @@ msgstr "Hvid" #: ../plug-ins/file-fits/fits.c:1030 -#, fuzzy msgid "Pixel value scaling" -msgstr "Punktværdiskalering" +msgstr "" #: ../plug-ins/file-fits/fits.c:1035 msgid "By DATAMIN/DATAMAX" @@ -9113,14 +8902,11 @@ msgstr "Billedsammensætning" #: ../plug-ins/file-fits/fits.c:1046 -#, fuzzy -#| msgid "None" msgctxt "composing" msgid "None" msgstr "Ingen" #: ../plug-ins/file-fli/fli-gimp.c:166 ../plug-ins/file-fli/fli-gimp.c:186 -#, fuzzy msgid "AutoDesk FLIC animation" msgstr "AutoDesk FLIC-animation" @@ -9138,37 +8924,34 @@ msgstr "GFLI 1.3 - indlæs animation" #: ../plug-ins/file-fli/fli-gimp.c:878 ../plug-ins/file-fli/fli-gimp.c:934 -#, fuzzy msgctxt "frame-range" msgid "From:" msgstr "Fra:" #: ../plug-ins/file-fli/fli-gimp.c:887 ../plug-ins/file-fli/fli-gimp.c:943 -#, fuzzy msgctxt "frame-range" msgid "To:" msgstr "Til:" #: ../plug-ins/file-fli/fli-gimp.c:917 -#, fuzzy msgid "GFLI 1.3" msgstr "GFLI 1.3" #: ../plug-ins/file-ico/ico-dialog.c:53 -#, fuzzy msgid "Windows Icon" -msgstr "Gem som ikon" +msgstr "Windows-ikon" #: ../plug-ins/file-ico/ico-dialog.c:73 -#, fuzzy msgid "Icon Details" -msgstr "Samlingsoplysninger" +msgstr "Ikondetaljer" #: ../plug-ins/file-ico/ico-dialog.c:93 msgid "" "Large icons and compression are not supported by all programs. Older " "applications may not open this file correctly." msgstr "" +"Store ikoner og komprimering understøttes ikke af alle programmer. Ældre " +"programmer kan måske ikke åbne denne fil korrekt." #: ../plug-ins/file-ico/ico-dialog.c:165 msgid "1 bpp, 1-bit alpha, 2-slot palette" @@ -9202,9 +8985,9 @@ #: ../plug-ins/file-ico/ico-load.c:722 ../plug-ins/file-jpeg/jpeg-load.c:696 #: ../plug-ins/file-psd/psd-thumb-load.c:84 -#, fuzzy, c-format +#, c-format msgid "Opening thumbnail for '%s'" -msgstr "Åbner '%s'..." +msgstr "Åbner miniature for \"%s\"" #: ../plug-ins/file-ico/ico.c:102 ../plug-ins/file-ico/ico.c:136 msgid "Microsoft Windows icon" @@ -9224,7 +9007,7 @@ #: ../plug-ins/file-jpeg/jpeg-exif.c:426 msgid "Would you like GIMP to rotate it into the standard orientation?" -msgstr "Ønsker du at GIMP roterer det til standart retning?" +msgstr "Vil du have at GIMP roterer det til standardorienteringen?" #: ../plug-ins/file-jpeg/jpeg-load.c:252 msgid "JPEG preview" @@ -9311,34 +9094,27 @@ #. Subsampling #: ../plug-ins/file-jpeg/jpeg-save.c:1111 -#, fuzzy msgid "Su_bsampling:" -msgstr "Underprøver:" +msgstr "_Underprøver:" #: ../plug-ins/file-jpeg/jpeg-save.c:1118 -#, fuzzy -#| msgid "1x1,1x1,1x1 (best quality)" msgid "4:4:4 (best quality)" msgstr "4:4:4 (bedste kvalitet)" #: ../plug-ins/file-jpeg/jpeg-save.c:1120 -#, fuzzy msgid "4:2:2 horizontal (chroma halved)" -msgstr "4:2:2 vandret (chroma halveret)" +msgstr "4:2:2 vandret (halv chroma)" #: ../plug-ins/file-jpeg/jpeg-save.c:1122 -#, fuzzy msgid "4:2:2 vertical (chroma halved)" -msgstr "4:2:2 lodret (chroma halveret)" +msgstr "4:2:2 lodret (halv chroma)" #: ../plug-ins/file-jpeg/jpeg-save.c:1124 -#, fuzzy msgid "4:2:0 (chroma quartered)" msgstr "4:2:0 (kvart chroma)" #. DCT method #: ../plug-ins/file-jpeg/jpeg-save.c:1154 -#, fuzzy msgid "_DCT method:" msgstr "_DCT-metode:" @@ -9360,12 +9136,10 @@ #: ../plug-ins/file-jpeg/jpeg-save.c:1215 #: ../plug-ins/ui/plug-in-file-png.ui.h:11 -#, fuzzy msgid "_Load Defaults" msgstr "_Indlæs standardværdier" #: ../plug-ins/file-jpeg/jpeg-save.c:1224 -#, fuzzy msgid "Sa_ve Defaults" msgstr "_Gem standardværdier" @@ -9377,13 +9151,14 @@ msgid "Export Preview" msgstr "Forhåndsvis eksport" -#: ../plug-ins/file-psd/psd-load.c:214 ../plug-ins/file-psd/psd-thumb-load.c:130 -#, fuzzy, c-format +#: ../plug-ins/file-psd/psd-load.c:214 +#: ../plug-ins/file-psd/psd-thumb-load.c:130 +#, c-format msgid "Error loading PSD file: %s" -msgstr "Fejl ved indlæsning af PSD-filen: \"%s\"" +msgstr "Fejl ved indlæsning af PSD-filen: %s" #: ../plug-ins/file-psd/psd-load.c:269 -#, fuzzy, c-format +#, c-format msgid "Not a valid Photoshop document file" msgstr "Ikke en gyldig Photoshop-dokumentfil" @@ -9393,7 +9168,7 @@ msgstr "Ikke-understøttet version af filformat: %d" #: ../plug-ins/file-psd/psd-load.c:283 -#, fuzzy, c-format +#, c-format msgid "Too many channels in file: %d" msgstr "For mange kanaler i filen: %d" @@ -9419,7 +9194,7 @@ msgstr "Filen er ødelagt!" #: ../plug-ins/file-psd/psd-load.c:554 -#, fuzzy, c-format +#, c-format msgid "Too many channels in layer: %d" msgstr "For mange kanaler i lag: %d" @@ -9464,6 +9239,9 @@ "The layer mask is partly outside the layer boundary. The mask will be " "cropped which may result in data loss." msgstr "" +"Advarsel\n" +"Lagmasken er delvist uden for lagets grænse. Masken vil blive klippet, " +"hvilket kan resultere i tab af data." #: ../plug-ins/file-psd/psd-load.c:1724 msgid "Extra" @@ -9515,30 +9293,29 @@ #: ../plug-ins/file-sgi/sgi.c:327 #, c-format msgid "Could not open '%s' for reading." -msgstr "Kan ikke åbne \"%s\" til læsning." +msgstr "Kunne ikke åbne \"%s\" til læsning." #: ../plug-ins/file-sgi/sgi.c:345 -#, fuzzy, c-format +#, c-format msgid "Invalid width: %hu" msgstr "Udyldig bredde: %hu" #: ../plug-ins/file-sgi/sgi.c:352 -#, fuzzy, c-format +#, c-format msgid "Invalid height: %hu" msgstr "Ugyldig højde: %hu" #: ../plug-ins/file-sgi/sgi.c:359 -#, fuzzy, c-format +#, c-format msgid "Invalid number of channels: %hu" -msgstr "Ugyldig antal kanaler: %hu" +msgstr "Ugyldigt antal kanaler: %hu" #: ../plug-ins/file-sgi/sgi.c:573 #, c-format msgid "Could not open '%s' for writing." -msgstr "Kan ikke åbne \"%s\" til skrivning." +msgstr "Kunne ikke åbne \"%s\" til skrivning." #: ../plug-ins/file-sgi/sgi.c:654 -#, fuzzy msgid "SGI" msgstr "SGI" @@ -9555,13 +9332,12 @@ msgstr "Rækkekomprimering (RLE)" #: ../plug-ins/file-sgi/sgi.c:664 -#, fuzzy msgid "" "Aggressive RLE\n" "(not supported by SGI)" msgstr "" "Agressiv RLE\n" -"(ikke understøttet af SGI)" +"(understøttes ikke af SGI)" #: ../plug-ins/file-uri/uri-backend-gvfs.c:233 #, c-format @@ -9588,14 +9364,12 @@ #: ../plug-ins/file-uri/uri-backend-gvfs.c:317 #: ../plug-ins/file-uri/uri-backend-libcurl.c:161 #: ../plug-ins/file-uri/uri-backend-wget.c:200 -#, fuzzy msgid "Connecting to server" -msgstr "Ingen markering at omdanne" +msgstr "Forbinder til server" #: ../plug-ins/file-uri/uri-backend-libcurl.c:58 -#, fuzzy msgid "Could not initialize libcurl" -msgstr "Kunne ikke klargøre libcurl" +msgstr "Kunne ikke starte libcurl" #: ../plug-ins/file-uri/uri-backend-libcurl.c:127 #: ../plug-ins/file-uri/uri-backend-wget.c:361 @@ -9603,10 +9377,11 @@ msgid "Downloading %s of image data" msgstr "Henter %s af billeddata" +# Uvist om %s er svarkoden eller programmet, den kommer fra #: ../plug-ins/file-uri/uri-backend-libcurl.c:244 #, c-format msgid "Opening '%s' for reading resulted in %s response code: %ld" -msgstr "" +msgstr "Åbner \"%s\" til læsning af resultater i %s-svarkode: %ld" #: ../plug-ins/file-uri/uri-backend-wget.c:162 #: ../plug-ins/file-uri/uri-backend-wget.c:182 @@ -9617,19 +9392,18 @@ #: ../plug-ins/file-uri/uri-backend-wget.c:351 #, c-format msgid "wget exited abnormally on URI '%s'" -msgstr "" +msgstr "wget afsluttede unormalt på URI'en \"%s\"" #. The third line is "Connecting to..." #: ../plug-ins/file-uri/uri-backend-wget.c:195 -#, fuzzy, c-format +#, c-format msgid "(timeout is %d second)" msgid_plural "(timeout is %d seconds)" -msgstr[0] "(timeout er %d sekund)" -msgstr[1] "(timeout er %d sekunder)" +msgstr[0] "(ventetid er %d sekund)" +msgstr[1] "(ventetid er %d sekunder)" #. The fourth line is either the network request or an error #: ../plug-ins/file-uri/uri-backend-wget.c:224 -#, fuzzy msgid "Opening URI" msgstr "Åbner URI" @@ -9637,7 +9411,7 @@ #: ../plug-ins/file-uri/uri-backend-wget.c:245 #: ../plug-ins/file-uri/uri-backend-wget.c:271 #: ../plug-ins/file-uri/uri-backend-wget.c:309 -#, fuzzy, c-format +#, c-format msgid "A network error occurred: %s" msgstr "Der opstod en netværksfejl: %s" @@ -9651,7 +9425,6 @@ #: ../plug-ins/file-uri/uri.c:318 #, c-format -#| msgid "Failed to save PPM file '%s': %s" msgid "Failed to save to temporary file '%s'" msgstr "Kunne ikke gemme til midlertidig fil \"%s\"" @@ -9690,7 +9463,6 @@ msgstr "Advarsel: ikke-understøttet enhedstype %d gemt i XJT" #: ../plug-ins/file-xjt/xjt.c:867 -#, fuzzy msgid "XJT" msgstr "XJT" @@ -9699,9 +9471,8 @@ msgstr "Optimér" #: ../plug-ins/file-xjt/xjt.c:887 -#, fuzzy msgid "Clear transparent" -msgstr "Ryd gennemsigtigt" +msgstr "Ryd gennemsigtighed" #: ../plug-ins/file-xjt/xjt.c:899 msgid "Quality:" @@ -9735,9 +9506,8 @@ msgstr "_Flamme..." #: ../plug-ins/flame/flame.c:227 -#, fuzzy msgid "Drawing flame" -msgstr "Tegner flammer" +msgstr "Tegner flamme" #: ../plug-ins/flame/flame.c:317 msgid "Flame works only on RGB drawables." @@ -9785,7 +9555,6 @@ msgid "Horseshoe" msgstr "Hestesko" -# scootergrisen: måske polære #: ../plug-ins/flame/flame.c:752 ../plug-ins/gfig/gfig-dialog.c:1479 msgid "Polar" msgstr "Polær" @@ -9799,22 +9568,20 @@ msgstr "Lommetørklæde" #: ../plug-ins/flame/flame.c:755 -#, fuzzy msgid "Heart" -msgstr "Stregtegning" +msgstr "Hjerte" #: ../plug-ins/flame/flame.c:756 -#, fuzzy msgid "Disc" -msgstr "Diverse" +msgstr "Skive" #: ../plug-ins/flame/flame.c:758 msgid "Hyperbolic" -msgstr "" +msgstr "Hyperbolsk" #: ../plug-ins/flame/flame.c:760 msgid "Ex" -msgstr "" +msgstr "Ex" #: ../plug-ins/flame/flame.c:761 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:846 @@ -9822,24 +9589,20 @@ msgstr "Julia" #: ../plug-ins/flame/flame.c:763 -#, fuzzy msgid "Fisheye" -msgstr "Fast startværdi" +msgstr "Fiskeøje" #: ../plug-ins/flame/flame.c:764 -#, fuzzy msgid "Popcorn" msgstr "Popcorn" #: ../plug-ins/flame/flame.c:765 -#, fuzzy msgid "Exponential" -msgstr "_Eksponent:" +msgstr "Eksponentiel" #: ../plug-ins/flame/flame.c:766 -#, fuzzy msgid "Power" -msgstr "_Nedre" +msgstr "Styrke" #: ../plug-ins/flame/flame.c:767 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:999 @@ -9849,31 +9612,28 @@ msgstr "Cosinus" #: ../plug-ins/flame/flame.c:768 -#, fuzzy msgid "Rings" -msgstr "Radianer" +msgstr "Ringe" #: ../plug-ins/flame/flame.c:769 msgid "Fan" -msgstr "" +msgstr "Blæser" #: ../plug-ins/flame/flame.c:770 msgid "Eyefish" -msgstr "" +msgstr "Fiskeøje" #: ../plug-ins/flame/flame.c:771 -#, fuzzy msgid "Bubble" -msgstr "Blå" +msgstr "Boble" #: ../plug-ins/flame/flame.c:772 ../plug-ins/map-object/map-object-ui.c:431 msgid "Cylinder" msgstr "Cylinder" #: ../plug-ins/flame/flame.c:774 -#, fuzzy msgid "Blur" -msgstr "Slør" +msgstr "Sløring" #: ../plug-ins/flame/flame.c:775 msgid "Gaussian" @@ -9926,7 +9686,6 @@ msgstr "Farve_kort:" #: ../plug-ins/flame/flame.c:1205 -#, fuzzy msgid "Custom gradient" msgstr "Brugerdefineret farveovergang" @@ -9954,9 +9713,8 @@ msgstr "Fraktaludforsker" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:637 -#, fuzzy msgid "Realtime preview" -msgstr "Realtidsminiature" +msgstr "Realtidsforhåndsvisning" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:645 #, fuzzy @@ -9965,9 +9723,8 @@ "Ved denne funktion er slået til, bliver miniaturen gentegnet automatisk" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:648 -#, fuzzy msgid "R_edraw preview" -msgstr "Gentegn miniature" +msgstr "_Gentegn forhåndsvisning" #. Zoom Options #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:656 @@ -9975,14 +9732,12 @@ msgstr "Zoom" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:694 -#, fuzzy msgid "Undo last zoom change" -msgstr "Fortryd sidste zoom" +msgstr "Fortryd sidste zoomændring" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:704 -#, fuzzy msgid "Redo last zoom change" -msgstr "Gentag sidste zoom" +msgstr "Omgør sidste zoomændring" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:719 msgid "_Parameters" @@ -10015,8 +9770,7 @@ #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:774 msgid "" "The higher the number of iterations, the more details will be calculated" -msgstr "" -"Jo flere gennemgange, jo flere detaljer vil blive udregnet" +msgstr "Jo flere gennemgange, jo flere detaljer vil blive udregnet" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:782 msgid "CX:" @@ -10025,7 +9779,7 @@ #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:785 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:795 msgid "Changes aspect of fractal" -msgstr "" +msgstr "Ændrer fraktalens højde-bredde-forhold" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:792 msgid "CY:" @@ -10127,8 +9881,6 @@ #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1001 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1042 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1083 -#, fuzzy -#| msgid "None" msgctxt "color-function" msgid "None" msgstr "Ingen" @@ -10230,17 +9982,14 @@ msgstr "'%s' er beskadiget. Linje %d-sektionen er ikke korrekt" #: ../plug-ins/fractal-explorer/fractal-explorer.c:236 -#, fuzzy msgid "Render fractal art" -msgstr "Genererer fraktal" +msgstr "Generér fraktalbilleder" #: ../plug-ins/fractal-explorer/fractal-explorer.c:241 -#, fuzzy msgid "_Fractal Explorer..." -msgstr "Tilføj sti for Fraktaludforsker..." +msgstr "_Fraktaludforsker..." #: ../plug-ins/fractal-explorer/fractal-explorer.c:368 -#, fuzzy msgid "Rendering fractal" msgstr "Genererer fraktal" @@ -10278,9 +10027,8 @@ msgstr "Vælg mappe og genskan samling" #: ../plug-ins/fractal-explorer/fractal-explorer.c:1075 -#, fuzzy msgid "Apply currently selected fractal" -msgstr "Slet den valgte fraktal" +msgstr "Påfør den valgte fraktal" #: ../plug-ins/fractal-explorer/fractal-explorer.c:1087 msgid "Delete currently selected fractal" @@ -10317,14 +10065,12 @@ #. Tool options notebook #: ../plug-ins/gfig/gfig-dialog.c:335 -#, fuzzy msgid "Tool Options" -msgstr "Zoomindstillinger" +msgstr "Værktøjsindstillinger" #: ../plug-ins/gfig/gfig-dialog.c:352 -#, fuzzy msgid "_Stroke" -msgstr "_Stråler:" +msgstr "_Strøg" #. Fill frame on right side #: ../plug-ins/gfig/gfig-dialog.c:399 @@ -10332,23 +10078,20 @@ msgstr "Udfyld" #: ../plug-ins/gfig/gfig-dialog.c:413 -#, fuzzy msgid "No fill" msgstr "Ingen udfyldning" #: ../plug-ins/gfig/gfig-dialog.c:414 -#, fuzzy msgid "Color fill" -msgstr "Farve" +msgstr "Farveudfyldning" #: ../plug-ins/gfig/gfig-dialog.c:415 msgid "Pattern fill" msgstr "Udfyld mønster" #: ../plug-ins/gfig/gfig-dialog.c:416 -#, fuzzy msgid "Shape gradient" -msgstr "Fra farveovergang" +msgstr "Form farveovergang" #: ../plug-ins/gfig/gfig-dialog.c:417 msgid "Vertical gradient" @@ -10371,7 +10114,6 @@ #. "show grid" checkbutton at bottom of style frame #: ../plug-ins/gfig/gfig-dialog.c:500 -#, fuzzy msgid "Show grid" msgstr "Vis gitter" @@ -10389,14 +10131,12 @@ msgstr "Første figur" #: ../plug-ins/gfig/gfig-dialog.c:886 -#, fuzzy msgid "_Undo" -msgstr "Fortryd" +msgstr "_Fortryd" #: ../plug-ins/gfig/gfig-dialog.c:890 -#, fuzzy msgid "_Clear" -msgstr "Ryd" +msgstr "_Ryd" #: ../plug-ins/gfig/gfig-dialog.c:894 ../plug-ins/imagemap/imap_menu.c:208 msgid "_Grid" @@ -10447,7 +10187,6 @@ msgstr "Opret ellipse" #: ../plug-ins/gfig/gfig-dialog.c:944 ../plug-ins/gfig/gfig-stock.c:43 -#, fuzzy msgid "Create arc" msgstr "Opret bue" @@ -10493,17 +10232,14 @@ #. Put buttons in #: ../plug-ins/gfig/gfig-dialog.c:1265 -#, fuzzy msgid "Show position" msgstr "Vis position" #: ../plug-ins/gfig/gfig-dialog.c:1277 -#, fuzzy msgid "Show control points" -msgstr "Skjul kontrolpunkter" +msgstr "Vis kontrolpunkter" #: ../plug-ins/gfig/gfig-dialog.c:1311 -#, fuzzy msgid "Max undo:" msgstr "Maks. fortryd:" @@ -10562,7 +10298,6 @@ msgstr "Isometrisk" #: ../plug-ins/gfig/gfig-dialog.c:1489 -#, fuzzy msgid "Grid type:" msgstr "Gittertype:" @@ -10588,14 +10323,12 @@ msgstr "Meget mørk" #: ../plug-ins/gfig/gfig-dialog.c:1511 -#, fuzzy msgid "Grid color:" msgstr "Gitterfarve:" #: ../plug-ins/gfig/gfig-dialog.c:1732 -#, fuzzy msgid "Sides:" -msgstr "Størrelser:" +msgstr "Sider:" #: ../plug-ins/gfig/gfig-dialog.c:1742 msgid "Right" @@ -10645,19 +10378,16 @@ msgstr "Antal punkter i stjerne" #: ../plug-ins/gfig/gfig-stock.c:40 -#, fuzzy msgid "Create bezier curve" -msgstr "Opret cirkel" +msgstr "Opret bezierkurve" #: ../plug-ins/gfig/gfig.c:122 -#, fuzzy msgid "Create geometric shapes" -msgstr "Skab geometriske figurer" +msgstr "Opret geometriske figurer" #: ../plug-ins/gfig/gfig.c:133 -#, fuzzy msgid "_Gfig..." -msgstr "Figurer..." +msgstr "_Gfig..." #: ../plug-ins/gfig/gfig.c:738 msgid "" @@ -10665,7 +10395,7 @@ msgstr "" #: ../plug-ins/gfig/gfig.c:765 -#, fuzzy, c-format +#, c-format, fuzzy msgid "Error trying to open temporary file '%s' for parasite loading: %s" msgstr "Kan ikke åbne '%s' til læsning: %s" @@ -10701,14 +10431,16 @@ msgid "Specifies the aspect ratio of the brush" msgstr "Angiver højde-bredde-forholdet for penslen" -#: ../plug-ins/gimpressionist/brush.c:608 ../plug-ins/gimpressionist/paper.c:205 +#: ../plug-ins/gimpressionist/brush.c:608 +#: ../plug-ins/gimpressionist/paper.c:205 msgid "Relief:" msgstr "Relief:" -# scootergrisen: kig på senere -#: ../plug-ins/gimpressionist/brush.c:612 ../plug-ins/gimpressionist/paper.c:209 +#: ../plug-ins/gimpressionist/brush.c:612 +#: ../plug-ins/gimpressionist/paper.c:209 msgid "Specifies the amount of embossing to apply to the image (in percent)" -msgstr "Angiver styrken af reliefeffekter (i %)" +msgstr "" +"Angiver mængden af reliefeffekter, som skal påføres billedet (i procent)" #: ../plug-ins/gimpressionist/color.c:59 msgid "Co_lor" @@ -10787,7 +10519,6 @@ "overgang" #: ../plug-ins/gimpressionist/general.c:221 -#, fuzzy msgid "Drop shadow" msgstr "Baggrundsskygge" @@ -10838,7 +10569,7 @@ #: ../plug-ins/gimpressionist/gimp.c:89 msgid "Performs various artistic operations" -msgstr "" +msgstr "Udfører diverse kunstneriske handlinger" #: ../plug-ins/gimpressionist/gimp.c:94 msgid "_GIMPressionist..." @@ -10846,7 +10577,7 @@ #: ../plug-ins/gimpressionist/gimp.c:164 msgid "The selection does not intersect the active layer or mask." -msgstr "" +msgstr "Markeringen krydser ikke det aktive lag eller maske." #: ../plug-ins/gimpressionist/gimp.c:391 msgid "Painting" @@ -10913,8 +10644,10 @@ msgstr "Radiel" #: ../plug-ins/gimpressionist/orientation.c:168 -msgid "Let the direction from the center determine the direction of the stroke" -msgstr "Retningen fra billedets midtpunkt bestemmer hvert penselstrøgs retning" +msgid "" +"Let the direction from the center determine the direction of the stroke" +msgstr "" +"Retningen fra billedets midtpunkt bestemmer hvert penselstrøgs retning" #: ../plug-ins/gimpressionist/orientation.c:175 #: ../plug-ins/gimpressionist/size.c:178 @@ -11072,9 +10805,10 @@ msgid "Inverts the Papers texture" msgstr "Invertér papirtekstur" +# ? #: ../plug-ins/gimpressionist/paper.c:176 msgid "O_verlay" -msgstr "_Læg over" +msgstr "_Overlap" #: ../plug-ins/gimpressionist/paper.c:181 msgid "Applies the paper as it is (without embossing it)" @@ -11147,10 +10881,10 @@ msgid "_Presets" msgstr "_Forudindstillinger" +# slipper for en/et-problem #: ../plug-ins/gimpressionist/presets.c:1030 -#, fuzzy msgid "Save Current..." -msgstr "Gem aktuel..." +msgstr "Gem nuværende..." #: ../plug-ins/gimpressionist/presets.c:1038 msgid "Save the current settings to the specified file" @@ -11221,14 +10955,12 @@ #: ../plug-ins/gimpressionist/size.c:159 msgid "" "Let the value (brightness) of the region determine the size of the stroke" -msgstr "" -"Værdien (lysstyrken) af området bestemmer størrelsen på strøget" +msgstr "Værdien (lysstyrken) af området bestemmer størrelsen på strøget" #: ../plug-ins/gimpressionist/size.c:163 msgid "" "The distance from the center of the image determines the size of the stroke" -msgstr "" -"Afstanden fra billedets midtpunkt bestemmer størrelsen på strøget" +msgstr "Afstanden fra billedets midtpunkt bestemmer størrelsen på strøget" #: ../plug-ins/gimpressionist/size.c:167 msgid "Selects a random size for each stroke" @@ -11312,17 +11044,14 @@ "indflydelse" #: ../plug-ins/ui/plug-in-file-gif.ui.h:1 -#, fuzzy -#| msgid "Interlace" msgid "I_nterlace" -msgstr "Understøt gradvis indlæsning" +msgstr "_Sammenflet" #: ../plug-ins/ui/plug-in-file-gif.ui.h:2 msgid "_GIF comment:" msgstr "_GIF-kommentar:" #: ../plug-ins/ui/plug-in-file-gif.ui.h:3 -#, fuzzy msgid "As _animation" msgstr "Som _animation" @@ -11331,27 +11060,24 @@ msgstr "GIF-indstillinger" #: ../plug-ins/ui/plug-in-file-gif.ui.h:5 -#, fuzzy msgid "_Loop forever" -msgstr "Evig løkke" +msgstr "_Uendelig løkke" #: ../plug-ins/ui/plug-in-file-gif.ui.h:6 -#, fuzzy msgid "_Delay between frames where unspecified:" -msgstr "Pause mellem billeder hvis ikke angivet:" +msgstr "_Pause mellem billeder hvis ikke angivet:" #: ../plug-ins/ui/plug-in-file-gif.ui.h:8 -#, fuzzy msgid "_Frame disposal where unspecified:" -msgstr "Overgang mellem billeder hvis ikke angivet:" +msgstr "_Overgang mellem billeder hvis ikke angivet:" #: ../plug-ins/ui/plug-in-file-gif.ui.h:9 msgid "_Use delay entered above for all frames" -msgstr "" +msgstr "_Brug ventetiden ovenfor til alle billeder" #: ../plug-ins/ui/plug-in-file-gif.ui.h:10 msgid "U_se disposal entered above for all frames" -msgstr "" +msgstr "B_rug \"disposal\" ovenfor til alle billeder" #: ../plug-ins/ui/plug-in-file-gif.ui.h:11 msgid "Animated GIF Options" @@ -11379,7 +11105,6 @@ msgstr "Gem oprettelses_dato" #: ../plug-ins/ui/plug-in-file-png.ui.h:7 -#, fuzzy msgid "Save comme_nt" msgstr "Gem _kommentar" @@ -11389,12 +11114,10 @@ msgstr "Gem _farveværdier fra gennemsigtige punkter" #: ../plug-ins/ui/plug-in-file-png.ui.h:9 -#, fuzzy msgid "Co_mpression level:" msgstr "Ko_mprimeringsniveau:" #: ../plug-ins/ui/plug-in-file-png.ui.h:12 -#, fuzzy msgid "S_ave Defaults" msgstr "_Gem standardværdier" @@ -11404,23 +11127,21 @@ #: ../plug-ins/gradient-flare/gradient-flare.c:553 msgid "Overlay" -msgstr "Læg over" +msgstr "Overlap" #: ../plug-ins/gradient-flare/gradient-flare.c:807 msgid "Produce a lense flare effect using gradients" msgstr "" #: ../plug-ins/gradient-flare/gradient-flare.c:812 -#, fuzzy msgid "_Gradient Flare..." -msgstr "Farveovergangsblus..." +msgstr "_Farveovergangsblus..." #. #. * Dialog Shell #. #: ../plug-ins/gradient-flare/gradient-flare.c:951 #: ../plug-ins/gradient-flare/gradient-flare.c:2356 -#, fuzzy msgid "Gradient Flare" msgstr "Farveovergangsblus" @@ -11446,7 +11167,8 @@ "(gflare-path \"%s\")\n" "and make a folder '%s', then you can save your own GFlares into that folder." msgstr "" -"GFlare \"%s\" blev ikke gemt. Hvis du tilføjer en ny linje til \"%s\", a la:\n" +"GFlare \"%s\" blev ikke gemt. Hvis du tilføjer en ny linje til \"%s\", a " +"la:\n" "(gflare-path \"%s\")\n" "og opretter mappen \"%s\", så kan du gemme dine egne blus i den mappe." @@ -11486,17 +11208,14 @@ msgstr "_Rotering:" #: ../plug-ins/gradient-flare/gradient-flare.c:2782 -#, fuzzy msgid "_Hue rotation:" -msgstr "Farve_tonerotering:" +msgstr "Farve_tonerotation:" #: ../plug-ins/gradient-flare/gradient-flare.c:2794 -#, fuzzy msgid "Vector _angle:" msgstr "Vektor_vinkel:" #: ../plug-ins/gradient-flare/gradient-flare.c:2806 -#, fuzzy msgid "Vector _length:" msgstr "Vektor_længde:" @@ -11506,7 +11225,6 @@ msgstr "A_daptiv udjævning" #: ../plug-ins/gradient-flare/gradient-flare.c:2848 -#, fuzzy msgid "_Max depth:" msgstr "Ma_ks. dybde:" @@ -11519,9 +11237,8 @@ msgstr "V_ælger" #: ../plug-ins/gradient-flare/gradient-flare.c:3060 -#, fuzzy msgid "New Gradient Flare" -msgstr "Farveovergangsblus" +msgstr "Nyt farveovergangsblus" #: ../plug-ins/gradient-flare/gradient-flare.c:3063 msgid "Enter a name for the new GFlare" @@ -11533,9 +11250,8 @@ msgstr "Navnet '%s' er allerede i brug!" #: ../plug-ins/gradient-flare/gradient-flare.c:3139 -#, fuzzy msgid "Copy Gradient Flare" -msgstr "Farveovergangsblus" +msgstr "Kopiér farveovergangsblus" #: ../plug-ins/gradient-flare/gradient-flare.c:3142 msgid "Enter a name for the copied GFlare" @@ -11551,9 +11267,8 @@ msgstr "Kan ikke slette! Der skal mindst være ét blus." #: ../plug-ins/gradient-flare/gradient-flare.c:3205 -#, fuzzy msgid "Delete Gradient Flare" -msgstr "Slet blus" +msgstr "Slet farveovergangsblus" #: ../plug-ins/gradient-flare/gradient-flare.c:3277 #, c-format @@ -11561,9 +11276,8 @@ msgstr "kunne ikke finde %s i gflares_list" #: ../plug-ins/gradient-flare/gradient-flare.c:3318 -#, fuzzy msgid "Gradient Flare Editor" -msgstr "Blusredigering" +msgstr "Redigering af farveovergangsblus" #: ../plug-ins/gradient-flare/gradient-flare.c:3322 msgid "Rescan Gradients" @@ -11583,9 +11297,8 @@ #: ../plug-ins/gradient-flare/gradient-flare.c:3471 #: ../plug-ins/gradient-flare/gradient-flare.c:3499 #: ../plug-ins/gradient-flare/gradient-flare.c:3527 -#, fuzzy msgid "Paint mode:" -msgstr "Tegnetilstand:" +msgstr "Maletilstand:" #. Rays #: ../plug-ins/gradient-flare/gradient-flare.c:3475 @@ -11609,21 +11322,18 @@ #: ../plug-ins/gradient-flare/gradient-flare.c:3567 #: ../plug-ins/gradient-flare/gradient-flare.c:3672 #: ../plug-ins/gradient-flare/gradient-flare.c:3809 -#, fuzzy msgid "Radial gradient:" -msgstr "Radiel overgang:" +msgstr "Radiel farveovergang:" #: ../plug-ins/gradient-flare/gradient-flare.c:3571 #: ../plug-ins/gradient-flare/gradient-flare.c:3676 -#, fuzzy msgid "Angular gradient:" -msgstr "Drejet overgang:" +msgstr "Drejet farveovergang:" #: ../plug-ins/gradient-flare/gradient-flare.c:3575 #: ../plug-ins/gradient-flare/gradient-flare.c:3680 -#, fuzzy msgid "Angular size gradient:" -msgstr "Størrelse på drejet overgang:" +msgstr "Størrelse på drejet farveovergang:" #: ../plug-ins/gradient-flare/gradient-flare.c:3595 #: ../plug-ins/gradient-flare/gradient-flare.c:3700 @@ -11640,9 +11350,8 @@ #: ../plug-ins/gradient-flare/gradient-flare.c:3619 #: ../plug-ins/gradient-flare/gradient-flare.c:3725 #: ../plug-ins/gradient-flare/gradient-flare.c:3862 -#, fuzzy msgid "Hue rotation:" -msgstr "Farve_tonerotering:" +msgstr "Farvetonerotation:" #: ../plug-ins/gradient-flare/gradient-flare.c:3633 msgid "G_low" @@ -11653,7 +11362,6 @@ msgstr "Antal spidser:" #: ../plug-ins/gradient-flare/gradient-flare.c:3749 -#, fuzzy msgid "Spike thickness:" msgstr "Spidsernes tykkelse:" @@ -11667,7 +11375,6 @@ msgstr "Størrelsesfaktor for overgang:" #: ../plug-ins/gradient-flare/gradient-flare.c:3817 -#, fuzzy msgid "Probability gradient:" msgstr "Sandsynlighedsfarveovergang:" @@ -11702,33 +11409,29 @@ #: ../plug-ins/help-browser/dialog.c:582 msgid "Go back one page" -msgstr "Gå en side tilbage" +msgstr "Gå én side tilbage" #: ../plug-ins/help-browser/dialog.c:587 msgid "Go forward one page" -msgstr "Gå en side frem" +msgstr "Gå én side fremad" #: ../plug-ins/help-browser/dialog.c:592 -#, fuzzy msgid "_Reload" -msgstr "_Rød:" +msgstr "_Genindlæs" #: ../plug-ins/help-browser/dialog.c:592 -#, fuzzy msgid "Reload current page" -msgstr "Genindlæs billede" +msgstr "Genindlæs nuværende side" #: ../plug-ins/help-browser/dialog.c:597 msgid "_Stop" msgstr "_Stop" #: ../plug-ins/help-browser/dialog.c:597 -#, fuzzy msgid "Stop loading this page" -msgstr "Stop indlæsningen af siden" +msgstr "Stop indlæsningen af denne side" #: ../plug-ins/help-browser/dialog.c:602 -#, fuzzy msgid "Go to the index page" msgstr "Gå til indekssiden" @@ -11737,28 +11440,24 @@ msgstr "K_opier placering" #: ../plug-ins/help-browser/dialog.c:608 -#, fuzzy msgid "Copy the location of this page to the clipboard" -msgstr "Kopiér den aktive kurve til den anden kant" +msgstr "Kopiér placeringen af denne side til udklipsholderen" #: ../plug-ins/help-browser/dialog.c:628 -#, fuzzy msgid "Find text in current page" -msgstr "Find tekst på nuværende side" +msgstr "Find teksten på nuværende side" #: ../plug-ins/help-browser/dialog.c:633 -#, fuzzy msgid "Find _Again" msgstr "Find _igen" #: ../plug-ins/help-browser/dialog.c:652 -#, fuzzy msgid "S_how Index" -msgstr "Vis gitter" +msgstr "_Vis indeks" #: ../plug-ins/help-browser/dialog.c:653 msgid "Toggle the visibility of the sidebar" -msgstr "Slå synligheden af sidepanelet til/fra" +msgstr "Slå sidepanelets synlighed til/fra" #: ../plug-ins/help-browser/dialog.c:674 msgid "Visit the GIMP documentation website" @@ -11781,23 +11480,31 @@ #: ../plug-ins/help/gimphelpdomain.c:180 #, c-format msgid "The help pages for '%s' are not available." -msgstr "Hjælpefilerne til '%s' er ikke tilgængelige." +msgstr "Hjælpesiderne til \"%s\" er ikke tilgængelige." #: ../plug-ins/help/gimphelpdomain.c:186 msgid "The GIMP user manual is not available." msgstr "GIMP'ens brugermanual er ikke tilgængelig." -#: ../plug-ins/help/gimphelpdomain.c:187 +#. TRANSLATORS: do not end the URL with a dot, +#. * it would be in the link. Because of +#. * technical limitations, make sure the URL +#. * ends with a space, a newline or is end of text. +#. * Cf. bug 762282. +#. +#: ../plug-ins/help/gimphelpdomain.c:193 msgid "" -"Please install the additional help package or use the online user manual at " -"http://docs.gimp.org/." +"Please install the additional help package or use the online user manual at: " +"http://docs.gimp.org/" msgstr "" +"Installér den ekstra hjælpepakke eller se brugermanualen online på " +"http://docs.gimp.org/" -#: ../plug-ins/help/gimphelpdomain.c:196 +#: ../plug-ins/help/gimphelpdomain.c:202 msgid "Perhaps you are missing GIO backends and need to install GVFS?" -msgstr "" +msgstr "Måske mangler du GIO-backends og skal installere GVFS?" -#: ../plug-ins/help/gimphelpdomain.c:215 +#: ../plug-ins/help/gimphelpdomain.c:221 #, c-format msgid "Help ID '%s' unknown" msgstr "Hjælpe-id \"%s\" ukendt" @@ -11818,7 +11525,7 @@ #: ../plug-ins/ifs-compose/ifs-compose.c:333 msgid "Create an Iterated Function System (IFS) fractal" -msgstr "" +msgstr "Opret en fraktal via itereret funktionssystem (IFS)" #: ../plug-ins/ifs-compose/ifs-compose.c:345 msgid "_IFS Fractal..." @@ -11861,7 +11568,6 @@ msgstr "Simpel" #: ../plug-ins/ifs-compose/ifs-compose.c:649 -#, fuzzy msgid "IFS Fractal: Target" msgstr "IFS-fraktal: Mål" @@ -11907,7 +11613,6 @@ msgstr "Farvetransformation" #: ../plug-ins/ifs-compose/ifs-compose.c:883 -#, fuzzy msgid "Relative probability:" msgstr "Relativ sandsynlighed:" @@ -11917,9 +11622,8 @@ msgstr "Markér _alt" #: ../plug-ins/ifs-compose/ifs-compose.c:1060 -#, fuzzy msgid "Re_center" -msgstr "i midten" +msgstr "_Gencentrér" #: ../plug-ins/ifs-compose/ifs-compose.c:1060 msgid "Recompute Center" @@ -11960,7 +11664,6 @@ msgstr "Underinddelinger:" #: ../plug-ins/ifs-compose/ifs-compose.c:1236 -#, fuzzy msgid "Spot radius:" msgstr "Punktradius:" @@ -12005,7 +11708,7 @@ #: ../plug-ins/imagemap/imap_about.c:46 msgid "Copyright © 1999-2005 by Maurits Rijk" -msgstr "Copyright © 1999-2005 Maurits Rijk" +msgstr "Ophavsret © 1999-2005 Maurits Rijk" #: ../plug-ins/imagemap/imap_about.c:48 msgid "Released under the GNU General Public License" @@ -12128,14 +11831,12 @@ "\"miniaturer\", der er egnet til navigationslinjer." #: ../plug-ins/imagemap/imap_cmd_guides.c:169 -#, fuzzy msgid "_Left start at:" msgstr "V_enstre start ved:" #: ../plug-ins/imagemap/imap_cmd_guides.c:179 -#, fuzzy msgid "_Top start at:" -msgstr "Begynd _foroven ved:" +msgstr "_Øvre start ved:" #: ../plug-ins/imagemap/imap_cmd_guides.c:184 msgid "_Horz. spacing:" @@ -12194,7 +11895,8 @@ msgid "Move Up" msgstr "Flyt op" -#: ../plug-ins/imagemap/imap_cmd_paste.c:50 ../plug-ins/imagemap/imap_menu.c:160 +#: ../plug-ins/imagemap/imap_cmd_paste.c:50 +#: ../plug-ins/imagemap/imap_menu.c:160 msgid "Paste" msgstr "Indsæt" @@ -12372,17 +12074,17 @@ msgstr "E_ksempel" #: ../plug-ins/imagemap/imap_main.c:121 -#, fuzzy msgid "Create a clickable imagemap" -msgstr "Opret nyt billede" +msgstr "Opret nyt klikbart billedkort" #: ../plug-ins/imagemap/imap_main.c:126 msgid "_Image Map..." msgstr "_Billedkort..." -#: ../plug-ins/imagemap/imap_main.c:490 ../plug-ins/imagemap/imap_settings.c:170 +#: ../plug-ins/imagemap/imap_main.c:490 +#: ../plug-ins/imagemap/imap_settings.c:170 msgid "" -msgstr "" +msgstr "" #: ../plug-ins/imagemap/imap_main.c:632 msgid "Some data has been changed!" @@ -12462,10 +12164,9 @@ #: ../plug-ins/imagemap/imap_menu.c:157 msgid "Redo" -msgstr "Gentag" +msgstr "Omgør" #: ../plug-ins/imagemap/imap_menu.c:163 -#, fuzzy msgid "D_eselect All" msgstr "Fravælg _alt" @@ -12482,14 +12183,12 @@ msgstr "Indstillinger" #: ../plug-ins/imagemap/imap_menu.c:169 -#, fuzzy msgid "Move Area to Front" -msgstr "Flyt til forrest" +msgstr "Flyt område forrest" #: ../plug-ins/imagemap/imap_menu.c:171 -#, fuzzy msgid "Move Area to Bottom" -msgstr "Flyt til forrest" +msgstr "Flyt område bagerst" #: ../plug-ins/imagemap/imap_menu.c:173 msgid "Delete Area" @@ -12737,7 +12436,8 @@ msgid "Default _URL:" msgstr "Standard-_URL:" -#: ../plug-ins/imagemap/imap_settings.c:107 ../plug-ins/metadata/interface.c:247 +#: ../plug-ins/imagemap/imap_settings.c:107 +#: ../plug-ins/metadata/interface.c:247 msgid "_Description:" msgstr "_Beskrivelse:" @@ -12770,7 +12470,6 @@ msgstr "Generelle indstillinger" #: ../plug-ins/lighting/lighting-ui.c:305 -#, fuzzy msgid "T_ransparent background" msgstr "_Gennemsigtig baggrund" @@ -12789,9 +12488,8 @@ msgstr "Opret et nyt billede ved brug af filter" #: ../plug-ins/lighting/lighting-ui.c:330 -#, fuzzy msgid "High _quality preview" -msgstr "Høj_kvalitetsminiature" +msgstr "Forhåndsvisning i høj _kvalitet" # lidt mere sigende end original #: ../plug-ins/lighting/lighting-ui.c:340 @@ -12799,9 +12497,8 @@ msgstr "Aktivér/Deaktivér forhåndsvisning af højkvalitet" #: ../plug-ins/lighting/lighting-ui.c:347 -#, fuzzy msgid "Distance:" -msgstr "Forskydning" +msgstr "Afstand:" #: ../plug-ins/lighting/lighting-ui.c:380 #: ../plug-ins/map-object/map-object-ui.c:573 @@ -12837,8 +12534,6 @@ msgstr "Farve:" #: ../plug-ins/lighting/lighting-ui.c:418 -#, fuzzy -#| msgid "None" msgctxt "light-source" msgid "None" msgstr "Ingen" @@ -12871,9 +12566,8 @@ msgstr "_Intensitet:" #: ../plug-ins/lighting/lighting-ui.c:466 -#, fuzzy msgid "Light intensity" -msgstr "Oprindelig intensitet" +msgstr "Lysintensitet" #: ../plug-ins/lighting/lighting-ui.c:469 #: ../plug-ins/map-object/map-object-ui.c:613 @@ -12926,9 +12620,8 @@ msgstr "Lyskildens z-retning i xyz-rummet" #: ../plug-ins/lighting/lighting-ui.c:568 -#, fuzzy msgid "I_solate" -msgstr "_Udpak" +msgstr "_Isolér" #: ../plug-ins/lighting/lighting-ui.c:577 #, fuzzy @@ -12941,9 +12634,8 @@ msgstr "Teksturegenskaber" #: ../plug-ins/lighting/lighting-ui.c:641 -#, fuzzy msgid "_Glowing:" -msgstr "Flydende" +msgstr "_Glød:" #: ../plug-ins/lighting/lighting-ui.c:660 #: ../plug-ins/map-object/map-object-ui.c:778 @@ -12971,7 +12663,6 @@ msgstr "Styrer hvor intense højlys bliver" #: ../plug-ins/lighting/lighting-ui.c:739 -#, fuzzy msgid "_Polished:" msgstr "_Poleret:" @@ -12986,9 +12677,8 @@ msgstr "_Metallisk" #: ../plug-ins/lighting/lighting-ui.c:805 -#, fuzzy msgid "E_nable bump mapping" -msgstr "Benyt _højdekortsafbildning" +msgstr "Aktivér _højdekortsafbildning" # mere sigende #: ../plug-ins/lighting/lighting-ui.c:819 @@ -12996,7 +12686,6 @@ msgstr "Aktivér/deaktivér højdekort (billeddybde)" #: ../plug-ins/lighting/lighting-ui.c:842 -#, fuzzy msgid "Bumpm_ap image:" msgstr "Højdekorts_billede:" @@ -13009,7 +12698,6 @@ msgstr "Ku_rve:" #: ../plug-ins/lighting/lighting-ui.c:863 -#, fuzzy msgid "Ma_ximum height:" msgstr "Ma_ksimumshøjde:" @@ -13074,14 +12762,12 @@ msgstr "Lav miniaturen i en bedre kvalitet (der tager længere tid)" #: ../plug-ins/lighting/lighting-ui.c:1149 -#, fuzzy msgid "Save Lighting Preset" -msgstr "Lyseffekter" +msgstr "Gem forudindstilling for lyseffekter" #: ../plug-ins/lighting/lighting-ui.c:1293 -#, fuzzy msgid "Load Lighting Preset" -msgstr "Lyseffekter" +msgstr "Indlæs forudindstilling for lyseffekter" #: ../plug-ins/map-object/map-object-apply.c:251 #: ../plug-ins/map-object/map-object-apply.c:272 @@ -13106,13 +12792,13 @@ #: ../plug-ins/map-object/map-object-main.c:188 msgid "Map the image to an object (plane, sphere, box or cylinder)" -msgstr "" +msgstr "Afbilder billedet på et objekt (flade, kugle, boks eller cylinder)" # overskriften for modulet +# jf. "Map the image to an object (plane, sphere, box or cylinder)" #: ../plug-ins/map-object/map-object-main.c:193 -#, fuzzy msgid "Map _Object..." -msgstr "Afbild på objekt..." +msgstr "Afbild på _objekt..." #: ../plug-ins/map-object/map-object-ui.c:207 #: ../plug-ins/map-object/map-object-ui.c:1260 @@ -13155,9 +12841,8 @@ # "side om side" bruges også andre steder i Gnome #: ../plug-ins/map-object/map-object-ui.c:456 -#, fuzzy msgid "Tile source image" -msgstr "Side om side" +msgstr "Fliselæg med kildebillede" #: ../plug-ins/map-object/map-object-ui.c:467 msgid "Tile source image: useful for infinite planes" @@ -13198,7 +12883,6 @@ msgstr "Punktlys" #: ../plug-ins/map-object/map-object-ui.c:583 -#, fuzzy msgid "Directional light" msgstr "Retningsbestemt lys" @@ -13207,12 +12891,10 @@ msgstr "Intet lys" #: ../plug-ins/map-object/map-object-ui.c:589 -#, fuzzy msgid "Lightsource type:" msgstr "Lyskildetype:" #: ../plug-ins/map-object/map-object-ui.c:603 -#, fuzzy msgid "Lightsource color:" msgstr "Lyskildefarve:" @@ -13345,24 +13027,20 @@ # knytter sig til ovenstående "preview!" #: ../plug-ins/map-object/map-object-ui.c:1375 -#, fuzzy msgid "Show _wireframe" -msgstr "Vis _gitter i eksempel" +msgstr "Vis _gitter" #: ../plug-ins/map-object/map-object-ui.c:1384 -#, fuzzy msgid "Update preview _live" -msgstr "Opdatér miniature" +msgstr "Opdatér forhåndsvisning _løbende" #: ../plug-ins/maze/maze-algorithms.c:278 -#, fuzzy msgid "Constructing maze using Prim's Algorithm" msgstr "Konstruerer labyrint med Prims algoritme" #: ../plug-ins/maze/maze-algorithms.c:488 -#, fuzzy msgid "Constructing tileable maze using Prim's Algorithm" -msgstr "Konstruerer fliselægbar labyrint med Prims algoritme" +msgstr "Konstruerer periodisk labyrintsegment med Prims algoritme" #: ../plug-ins/maze/maze-dialog.c:162 msgid "Maze" @@ -13391,9 +13069,8 @@ msgstr "Dybde først" #: ../plug-ins/maze/maze-dialog.c:261 -#, fuzzy msgid "Prim's algorithm" -msgstr "Prims algoritme" +msgstr "Prim's algoritme" #: ../plug-ins/maze/maze-dialog.c:380 msgid "" @@ -13420,7 +13097,6 @@ msgstr "Egenskab" #: ../plug-ins/metadata/interface.c:204 ../plug-ins/metadata/interface.c:206 -#| msgid "Description:" msgid "Description" msgstr "Beskrivelse" @@ -13429,14 +13105,12 @@ msgstr "_Billedtitel:" #: ../plug-ins/metadata/interface.c:231 -#| msgid "Author:" msgid "_Author:" msgstr "Forf_atter:" #: ../plug-ins/metadata/interface.c:256 -#| msgid "Description:" msgid "Description _writer:" -msgstr "_Beskrivelsesforfatter:" +msgstr "_Beskrivelsens forfatter:" #: ../plug-ins/metadata/interface.c:272 msgid "_Keywords:" @@ -13445,81 +13119,62 @@ #. FIXME: add entries, cross-link with XMP model #: ../plug-ins/metadata/interface.c:284 ../plug-ins/metadata/interface.c:296 #: ../plug-ins/metadata/interface.c:308 ../plug-ins/metadata/interface.c:320 -#, fuzzy msgid "Empty" msgstr "Tom" #: ../plug-ins/metadata/interface.c:286 -#, fuzzy msgid "Copyright" -msgstr "Copyright:" +msgstr "Ophavsret" #: ../plug-ins/metadata/interface.c:298 -#| msgid "Original" msgid "Origin" msgstr "Oprindelse" #: ../plug-ins/metadata/interface.c:310 -#| msgid "C_amera" msgid "Camera 1" msgstr "Kamera 1" #: ../plug-ins/metadata/interface.c:322 -#| msgid "C_amera" msgid "Camera 2" msgstr "Kamera 2" #: ../plug-ins/metadata/interface.c:337 -#, fuzzy msgid "Thumbnail" -msgstr "Gem fil" +msgstr "Miniature" #: ../plug-ins/metadata/interface.c:356 -#, fuzzy -#| msgid "_Advanced" msgid "Advanced" msgstr "Avanceret" #: ../plug-ins/metadata/interface.c:447 -#| msgid "Import from PDF" msgid "Import XMP from File" msgstr "Importér XMP fra fil" #: ../plug-ins/metadata/interface.c:498 -#, fuzzy -#| msgid "Can't create a new image" msgid "Cannot create file" -msgstr "Kan ikke oprette nyt billede" +msgstr "Kan ikke oprette filen" #: ../plug-ins/metadata/interface.c:508 -#, fuzzy -#| msgid "An error occurred while trying to print:" msgid "Some error occurred while saving" -msgstr "Der opstod en fejl ved forsøg på at udskrive" +msgstr "Der opstod en fejl under forsøg på at gemme" #: ../plug-ins/metadata/interface.c:518 -#| msgid "Couldn't save file:" msgid "Could not close the file" msgstr "Kunne ikke lukke filen" #: ../plug-ins/metadata/interface.c:540 -#| msgid "Export Preview" msgid "Export XMP to File" msgstr "Eksportér XMP til fil" #: ../plug-ins/metadata/interface.c:607 -#, fuzzy msgid "Image Properties" -msgstr "Teksturegenskaber" +msgstr "Billedegenskaber" #: ../plug-ins/metadata/interface.c:611 -#, fuzzy -#| msgid "_Import" msgid "_Import XMP..." msgstr "_Importér XMP..." #: ../plug-ins/metadata/interface.c:612 -#, fuzzy msgid "_Export XMP..." msgstr "_Eksportér XMP..." @@ -13532,39 +13187,39 @@ msgstr "_Egenskaber" #: ../plug-ins/metadata/xmp-parse.c:237 -#, fuzzy, c-format +#, c-format msgid "Error: No XMP packet found" msgstr "Fejl: Ingen XMP-pakke fundet" #: ../plug-ins/metadata/xmp-parse.c:253 -#, fuzzy, c-format +#, c-format msgid "Error on line %d char %d: %s" msgstr "Fejl på linje %d tegn %d: %s" #: ../plug-ins/metadata/xmp-parse.c:275 #, c-format msgid "Expected text or optional element <%s>, found <%s> instead" -msgstr "" +msgstr "Forventede tekst eller valgfrit element <%s>, fandt i stedet <%s>" #: ../plug-ins/metadata/xmp-parse.c:279 #, c-format msgid "Expected element <%s>, found <%s> instead" -msgstr "" +msgstr "Forventede elementet <%s>, fandt i stedet <%s>" #: ../plug-ins/metadata/xmp-parse.c:294 -#, fuzzy, c-format +#, c-format msgid "Unknown element <%s>" msgstr "Ukendt element <%s>" #: ../plug-ins/metadata/xmp-parse.c:323 #, c-format msgid "Unknown attribute \"%s\"=\"%s\" in element <%s>" -msgstr "" +msgstr "Ukendt attribut \"%s\"=\"%s\" i elementet <%s>" #: ../plug-ins/metadata/xmp-parse.c:676 #, c-format msgid "Required attribute rdf:about missing in <%s>" -msgstr "" +msgstr "Nødvendig attribut rdf:about mangler i <%s>" #: ../plug-ins/metadata/xmp-parse.c:902 #, c-format @@ -13574,15 +13229,14 @@ #: ../plug-ins/metadata/xmp-parse.c:1031 #, c-format msgid "End of element <%s> not expected in this context" -msgstr "" +msgstr "Slut på elementet <%s> ikke forventet i denne sammehæng" #: ../plug-ins/metadata/xmp-parse.c:1139 #, c-format msgid "The current element (<%s>) cannot contain text" -msgstr "" +msgstr "Det akutelle element (<%s>) må ikke indeholde tekst" #: ../plug-ins/metadata/xmp-parse.c:1164 -#, fuzzy msgid "XMP packets must start with " msgstr "XMP-pakker skal starte med " @@ -13591,19 +13245,16 @@ msgstr "XMP-pakker skal ende med " #: ../plug-ins/metadata/xmp-parse.c:1191 -#, fuzzy msgid "XMP cannot contain XML comments or processing instructions" msgstr "XMP må ikke indeholde XML-kommentarer eller behandlingsinstruktioner" #: ../plug-ins/pagecurl/pagecurl.c:216 -#, fuzzy msgid "Curl up one of the image corners" -msgstr "Rul et af hjørnerne på billedet" +msgstr "Rul et af billedets hjørner" #: ../plug-ins/pagecurl/pagecurl.c:221 -#, fuzzy msgid "_Pagecurl..." -msgstr "Krøller papir..." +msgstr "_Bladreeffekt..." # "effect" er overflødigt #: ../plug-ins/pagecurl/pagecurl.c:442 @@ -13635,19 +13286,16 @@ msgstr "Krølleorientering" #: ../plug-ins/pagecurl/pagecurl.c:571 -#, fuzzy msgid "_Shade under curl" -msgstr "_Skygge under krølle" +msgstr "_Skygge under hjørne" #: ../plug-ins/pagecurl/pagecurl.c:584 -#, fuzzy msgid "Current gradient (reversed)" msgstr "Nuværende farveovergang (omvendt)" #: ../plug-ins/pagecurl/pagecurl.c:589 -#, fuzzy msgid "Current gradient" -msgstr "Brugerdefineret farveovergang" +msgstr "Nuværende farveovergang" #: ../plug-ins/pagecurl/pagecurl.c:594 msgid "Foreground / background colors" @@ -13667,21 +13315,18 @@ #: ../plug-ins/print/print-page-layout.c:153 msgid "Ignore Page _Margins" -msgstr "" +msgstr "Ignorér side_margener" #. crop marks toggle #: ../plug-ins/print/print-page-layout.c:164 -#, fuzzy msgid "_Draw Crop Marks" msgstr "_Tegn skæringsmærker" #: ../plug-ins/print/print-page-layout.c:322 -#, fuzzy msgid "_X resolution:" msgstr "_x-opløsning:" #: ../plug-ins/print/print-page-layout.c:326 -#, fuzzy msgid "_Y resolution:" msgstr "_y-opløsning:" @@ -13690,7 +13335,6 @@ msgstr "_Venstre:" #: ../plug-ins/print/print-page-layout.c:417 -#, fuzzy msgid "_Right:" msgstr "_Højre:" @@ -13702,8 +13346,6 @@ #. if and how to center the image on the page #: ../plug-ins/print/print-page-layout.c:478 -#, fuzzy -#| msgid "None" msgctxt "center-mode" msgid "None" msgstr "Ingen" @@ -13783,11 +13425,11 @@ #: ../plug-ins/win-snap/winsnap.c:888 msgid "Grab a single window" -msgstr "Opsnap et enkelt vindue" +msgstr "Indfang et enkelt vindue" #: ../plug-ins/win-snap/winsnap.c:902 msgid "Grab the whole screen" -msgstr "Opsnap hele skærmbilledet" +msgstr "Indfang hele skærmbilledet" #: ../plug-ins/win-snap/winsnap.c:918 msgid "after" @@ -13799,7 +13441,7 @@ #: ../plug-ins/win-snap/winsnap.c:937 msgid "Include decorations" -msgstr "Med udsmykninger" +msgstr "Medtag dekorationer" #: ../plug-ins/win-snap/winsnap.c:996 msgid "Capture a window or desktop image" @@ -13812,3 +13454,4 @@ #: ../plug-ins/win-snap/winsnap.c:1149 msgid "No data captured" msgstr "Ingen data taget" + diff -Nru gimp-2.8.18/po-plug-ins/el.po gimp-2.8.20/po-plug-ins/el.po --- gimp-2.8.18/po-plug-ins/el.po 2016-05-25 22:26:47.000000000 +0000 +++ gimp-2.8.20/po-plug-ins/el.po 2017-01-28 19:08:46.000000000 +0000 @@ -4,22 +4,22 @@ # Simos Xenitellis , 2001, 2002. # Nikos Charonitakis , 2003, 2004. # Dimitris Spingos (Δημήτρης Σπίγγος) , 2011, 2012. -# Dimitris Spingos (Δημήτρης Σπίγγος) , 2012, 2013, 2014. +# Dimitris Spingos (Δημήτρης Σπίγγος) , 2012, 2013, 2014, 2016. msgid "" msgstr "" "Project-Id-Version: gimp-plug-ins.master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-04-14 18:20+0000\n" -"PO-Revision-Date: 2016-04-18 04:20+0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gimp&ke" +"ywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2016-07-18 08:01+0000\n" +"PO-Revision-Date: 2016-07-19 08:20+0300\n" "Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) \n" -"Language-Team: www.gnome.gr\n" +"Language-Team: team@lists.gnome.gr\n" "Language: el\n" "MIME-Version: 1.0\n" "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: Virtaal 0.7.1\n" "X-Project-Style: gnome\n" #: ../plug-ins/color-rotate/color-rotate-dialog.c:120 @@ -639,8 +639,8 @@ #. * Create the "background" layer to hold the image... #. #: ../plug-ins/common/blinds.c:279 ../plug-ins/common/compose.c:936 -#: ../plug-ins/common/decompose.c:729 ../plug-ins/common/file-cel.c:442 -#: ../plug-ins/common/file-cel.c:445 ../plug-ins/common/file-dicom.c:612 +#: ../plug-ins/common/decompose.c:729 ../plug-ins/common/file-cel.c:445 +#: ../plug-ins/common/file-cel.c:448 ../plug-ins/common/file-dicom.c:612 #: ../plug-ins/common/file-gif-load.c:980 #: ../plug-ins/common/file-jp2-load.c:356 ../plug-ins/common/file-pcx.c:426 #: ../plug-ins/common/file-pcx.c:432 ../plug-ins/common/file-pix.c:384 @@ -654,8 +654,7 @@ #: ../plug-ins/file-jpeg/jpeg-load.c:824 #: ../plug-ins/file-psd/psd-image-res-load.c:1001 #: ../plug-ins/file-psd/psd-load.c:1655 ../plug-ins/file-sgi/sgi.c:409 -#: ../plug-ins/gfig/gfig-dialog.c:1321 -#: ../plug-ins/gimpressionist/general.c:139 +#: ../plug-ins/gfig/gfig-dialog.c:1321 ../plug-ins/gimpressionist/general.c:139 #: ../plug-ins/map-object/map-object-apply.c:252 ../plug-ins/twain/twain.c:567 #: ../plug-ins/win-snap/winsnap.c:1162 msgid "Background" @@ -1064,8 +1063,8 @@ #. stat error (file does not exist) #: ../plug-ins/common/channel-mixer.c:980 #: ../plug-ins/common/cml-explorer.c:2208 ../plug-ins/common/curve-bend.c:891 -#: ../plug-ins/common/file-cel.c:297 ../plug-ins/common/file-cel.c:349 -#: ../plug-ins/common/file-cel.c:580 ../plug-ins/common/file-dicom.c:340 +#: ../plug-ins/common/file-cel.c:300 ../plug-ins/common/file-cel.c:352 +#: ../plug-ins/common/file-cel.c:583 ../plug-ins/common/file-dicom.c:340 #: ../plug-ins/common/file-gbr.c:370 ../plug-ins/common/file-gif-load.c:357 #: ../plug-ins/common/file-gih.c:642 ../plug-ins/common/file-jp2-load.c:196 #: ../plug-ins/common/file-jp2-load.c:205 ../plug-ins/common/file-mng.c:1156 @@ -1103,7 +1102,7 @@ #: ../plug-ins/common/channel-mixer.c:1058 #: ../plug-ins/common/cml-explorer.c:2035 ../plug-ins/common/curve-bend.c:839 -#: ../plug-ins/common/file-cel.c:773 ../plug-ins/common/file-csource.c:407 +#: ../plug-ins/common/file-cel.c:776 ../plug-ins/common/file-csource.c:407 #: ../plug-ins/common/file-dicom.c:1371 ../plug-ins/common/file-gbr.c:665 #: ../plug-ins/common/file-gif-save.c:792 ../plug-ins/common/file-gih.c:1260 #: ../plug-ins/common/file-html-table.c:236 ../plug-ins/common/file-mng.c:649 @@ -2036,8 +2035,7 @@ msgstr "Επέκταση τιμών φωτεινότητας για κάλυψη όλης της περιοχής" # -#: ../plug-ins/common/contrast-normalize.c:91 -#: ../plug-ins/common/edge-dog.c:362 +#: ../plug-ins/common/contrast-normalize.c:91 ../plug-ins/common/edge-dog.c:362 msgid "_Normalize" msgstr "Κα_νονικοποίηση" @@ -2156,9 +2154,9 @@ msgstr "Ε_πέκταση" # -#: ../plug-ins/common/convolution-matrix.c:74 -#: ../plug-ins/common/displace.c:477 ../plug-ins/common/edge.c:700 -#: ../plug-ins/common/fractal-trace.c:737 ../plug-ins/common/ripple.c:585 +#: ../plug-ins/common/convolution-matrix.c:74 ../plug-ins/common/displace.c:477 +#: ../plug-ins/common/edge.c:700 ../plug-ins/common/fractal-trace.c:737 +#: ../plug-ins/common/ripple.c:585 msgid "_Wrap" msgstr "Ανα_δίπλωση" @@ -3132,8 +3130,8 @@ msgid "Load KISS Palette" msgstr "Φόρτωση παλέτας KISS" -#: ../plug-ins/common/file-cel.c:309 ../plug-ins/common/file-cel.c:364 -#: ../plug-ins/common/file-cel.c:384 +#: ../plug-ins/common/file-cel.c:312 ../plug-ins/common/file-cel.c:367 +#: ../plug-ins/common/file-cel.c:387 #, c-format msgid "EOF or error while reading image header" msgstr "Τέλος αρχείου ή σφάλμα ανάγνωσης κεφαλίδας εικόνας" @@ -3142,7 +3140,7 @@ #. column, highest column ever used #. -1 assume fsel is not available (and not attached to any drawable) #. -1 assume there is no floating selection -#: ../plug-ins/common/file-cel.c:354 ../plug-ins/common/file-dicom.c:345 +#: ../plug-ins/common/file-cel.c:357 ../plug-ins/common/file-dicom.c:345 #: ../plug-ins/common/file-gbr.c:375 ../plug-ins/common/file-gif-load.c:362 #: ../plug-ins/common/file-gih.c:647 ../plug-ins/common/file-jp2-load.c:189 #: ../plug-ins/common/file-pat.c:344 ../plug-ins/common/file-pcx.c:367 @@ -3161,17 +3159,17 @@ msgid "Opening '%s'" msgstr "Άνοιγμα του '%s'" -#: ../plug-ins/common/file-cel.c:392 +#: ../plug-ins/common/file-cel.c:395 #, c-format msgid "is not a CEL image file" msgstr "δεν είναι αρχείο εικόνας CEL" -#: ../plug-ins/common/file-cel.c:406 +#: ../plug-ins/common/file-cel.c:409 #, c-format msgid "illegal bpp value in image: %hhu" msgstr "μη αποδεκτή τιμή bpp στην εικόνα: %hhu" -#: ../plug-ins/common/file-cel.c:420 +#: ../plug-ins/common/file-cel.c:423 #, c-format msgid "" "illegal image dimensions: width: %d, horizontal offset: %d, height: %d, " @@ -3180,51 +3178,51 @@ "μη αποδεκτές διαστάσεις εικόνας: πλάτος: %d, οριζόντια αντιστάθμιση: %d, " "ύψος: %d, κάθετη αντιστάθμιση: %d" -#: ../plug-ins/common/file-cel.c:433 +#: ../plug-ins/common/file-cel.c:436 #, c-format msgid "Can't create a new image" msgstr "Αδυναμία δημιουργίας νέας εικόνας" -#: ../plug-ins/common/file-cel.c:471 ../plug-ins/common/file-cel.c:506 -#: ../plug-ins/common/file-cel.c:531 +#: ../plug-ins/common/file-cel.c:474 ../plug-ins/common/file-cel.c:509 +#: ../plug-ins/common/file-cel.c:534 #, c-format msgid "EOF or error while reading image data" msgstr "Τέλος αρχείου ή σφάλμα ανάγνωσης δεδομένων εικόνας" -#: ../plug-ins/common/file-cel.c:548 +#: ../plug-ins/common/file-cel.c:551 #, c-format msgid "Unsupported bit depth (%d)!" msgstr "Μη υποστηριζόμενη βάθος δυαδικού ψηφίου (%d)!" -#: ../plug-ins/common/file-cel.c:630 ../plug-ins/common/file-cel.c:642 +#: ../plug-ins/common/file-cel.c:633 ../plug-ins/common/file-cel.c:645 #, c-format msgid "'%s': EOF or error while reading palette header" msgstr "'%s': Τέλος αρχείου ή σφάλμα ανάγνωσης κεφαλίδας παλέτας" -#: ../plug-ins/common/file-cel.c:651 +#: ../plug-ins/common/file-cel.c:654 #, c-format msgid "'%s': is not a KCF palette file" msgstr "'%s': δεν είναι αρχείο παλέτας KCF" -#: ../plug-ins/common/file-cel.c:660 +#: ../plug-ins/common/file-cel.c:663 #, c-format msgid "'%s': illegal bpp value in palette: %hhu" msgstr "'%s': απαράδεκτη τιμή bpp σε παλέτα: %hhu" -#: ../plug-ins/common/file-cel.c:669 +#: ../plug-ins/common/file-cel.c:672 #, c-format msgid "'%s': illegal number of colors: %u" msgstr "'%s': απαράδεκτος αριθμός χρωμάτων: %u" -#: ../plug-ins/common/file-cel.c:684 ../plug-ins/common/file-cel.c:701 -#: ../plug-ins/common/file-cel.c:721 +#: ../plug-ins/common/file-cel.c:687 ../plug-ins/common/file-cel.c:704 +#: ../plug-ins/common/file-cel.c:724 #, c-format msgid "'%s': EOF or error while reading palette data" msgstr "'%s': τέλος αρχείου ή σφάλμα ανάγνωσης δεδομένων παλέτας" #. init the progress meter #. And let's begin the progress -#: ../plug-ins/common/file-cel.c:778 ../plug-ins/common/file-gbr.c:670 +#: ../plug-ins/common/file-cel.c:781 ../plug-ins/common/file-gbr.c:670 #: ../plug-ins/common/file-gif-save.c:799 ../plug-ins/common/file-gih.c:1265 #: ../plug-ins/common/file-html-table.c:257 ../plug-ins/common/file-pat.c:493 #: ../plug-ins/common/file-pcx.c:645 ../plug-ins/common/file-pix.c:533 @@ -4455,8 +4453,7 @@ msgstr "_Χιλιοστό" #. Rotation -#: ../plug-ins/common/file-ps.c:3302 -#: ../plug-ins/map-object/map-object-ui.c:989 +#: ../plug-ins/common/file-ps.c:3302 ../plug-ins/map-object/map-object-ui.c:989 msgid "Rotation" msgstr "Περιστροφή" @@ -4832,8 +4829,7 @@ msgid "TIFF Channel" msgstr "Κανάλι TIFF" -#: ../plug-ins/common/file-tiff-load.c:1038 -#: ../plug-ins/file-psd/psd-load.c:333 +#: ../plug-ins/common/file-tiff-load.c:1038 ../plug-ins/file-psd/psd-load.c:333 msgid "" "Warning:\n" "The image you are loading has 16 bits per channel. GIMP can only handle 8 " @@ -9076,19 +9072,25 @@ msgid "Windows BMP image" msgstr "Εικόνα Windows BMP" -#: ../plug-ins/file-compressor/file-compressor.c:166 +#: ../plug-ins/file-compressor/file-compressor.c:167 msgid "gzip archive" msgstr "αρχείο gzip" -#: ../plug-ins/file-compressor/file-compressor.c:185 +#: ../plug-ins/file-compressor/file-compressor.c:186 msgid "bzip archive" msgstr "αρχείο bzip" -#: ../plug-ins/file-compressor/file-compressor.c:392 +#: ../plug-ins/file-compressor/file-compressor.c:393 msgid "No sensible file extension, saving as compressed XCF." msgstr "Χωρίς λογική επέκταση αρχείου, αποθήκευση ως συμπιεσμένο XCF." -#: ../plug-ins/file-compressor/file-compressor.c:448 +#: ../plug-ins/file-compressor/file-compressor.c:416 +#, c-format +#| msgid "Compression" +msgid "Compressing '%s'" +msgstr "Συμπιέζεται το '%s'" + +#: ../plug-ins/file-compressor/file-compressor.c:453 msgid "No sensible file extension, attempting to load with file magic." msgstr "Χωρίς λογική επέκταση αρχείου, προσπάθεια φόρτωσης με μαγικό αρχείο." @@ -10535,8 +10537,7 @@ msgid "Max undo:" msgstr "Μέγιστες αναιρέσεις:" -#: ../plug-ins/gfig/gfig-dialog.c:1320 -#: ../plug-ins/gimpressionist/general.c:184 +#: ../plug-ins/gfig/gfig-dialog.c:1320 ../plug-ins/gimpressionist/general.c:184 msgid "Transparent" msgstr "Διαφανές" @@ -11726,8 +11727,7 @@ msgid "_Second Flares" msgstr "_Δεύτερες λάμψεις" -#: ../plug-ins/help-browser/dialog.c:184 -#: ../plug-ins/help-browser/dialog.c:1133 +#: ../plug-ins/help-browser/dialog.c:184 ../plug-ins/help-browser/dialog.c:1133 msgid "GIMP Help Browser" msgstr "Περιηγητής βοήθειας GIMP" @@ -11821,9 +11821,6 @@ #. * Cf. bug 762282. #. #: ../plug-ins/help/gimphelpdomain.c:193 -#| msgid "" -#| "Please install the additional help package or use the online user manual " -#| "at http://docs.gimp.org/." msgid "" "Please install the additional help package or use the online user manual at: " "http://docs.gimp.org/" @@ -12061,8 +12058,7 @@ #: ../plug-ins/imagemap/imap_circle.c:268 #: ../plug-ins/imagemap/imap_circle.c:275 #: ../plug-ins/imagemap/imap_circle.c:281 ../plug-ins/imagemap/imap_grid.c:249 -#: ../plug-ins/imagemap/imap_grid.c:255 -#: ../plug-ins/imagemap/imap_polygon.c:505 +#: ../plug-ins/imagemap/imap_grid.c:255 ../plug-ins/imagemap/imap_polygon.c:505 #: ../plug-ins/imagemap/imap_polygon.c:513 #: ../plug-ins/imagemap/imap_rectangle.c:392 #: ../plug-ins/imagemap/imap_rectangle.c:399 diff -Nru gimp-2.8.18/po-plug-ins/es.po gimp-2.8.20/po-plug-ins/es.po --- gimp-2.8.18/po-plug-ins/es.po 2015-08-20 22:57:32.000000000 +0000 +++ gimp-2.8.20/po-plug-ins/es.po 2017-01-28 19:08:46.000000000 +0000 @@ -13,15 +13,15 @@ # Jorge González , 2007, 2009, 2011. # Benjamín Valero Espinosa , 2011. # Francisco Vila , 2006, 2007, 2008, 2009, 2011, 2012. -# Daniel Mustieles , 2011, 2012, 2013, 2014. +# Daniel Mustieles , 2011, 2012, 2013, 2014, 2016. # msgid "" msgstr "" "Project-Id-Version: gimp-plug-ins.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2014-06-20 05:25+0000\n" -"PO-Revision-Date: 2014-06-20 13:38+0200\n" +"POT-Creation-Date: 2016-07-17 23:13+0000\n" +"PO-Revision-Date: 2016-07-18 09:54+0200\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: Español; Castellano \n" "Language: es\n" @@ -280,7 +280,7 @@ #. Propagate Mode #: ../plug-ins/common/alien-map.c:516 ../plug-ins/common/hot.c:613 -#: ../plug-ins/common/value-propagate.c:1121 ../plug-ins/common/waves.c:279 +#: ../plug-ins/common/value-propagate.c:1125 ../plug-ins/common/waves.c:279 msgid "Mode" msgstr "Modo" @@ -617,21 +617,21 @@ #. * Create the "background" layer to hold the image... #. #: ../plug-ins/common/blinds.c:279 ../plug-ins/common/compose.c:936 -#: ../plug-ins/common/decompose.c:729 ../plug-ins/common/file-cel.c:442 -#: ../plug-ins/common/file-cel.c:445 ../plug-ins/common/file-dicom.c:612 -#: ../plug-ins/common/file-gif-load.c:943 +#: ../plug-ins/common/decompose.c:729 ../plug-ins/common/file-cel.c:445 +#: ../plug-ins/common/file-cel.c:448 ../plug-ins/common/file-dicom.c:612 +#: ../plug-ins/common/file-gif-load.c:980 #: ../plug-ins/common/file-jp2-load.c:356 ../plug-ins/common/file-pcx.c:426 #: ../plug-ins/common/file-pcx.c:432 ../plug-ins/common/file-pix.c:384 -#: ../plug-ins/common/file-png.c:897 ../plug-ins/common/file-pnm.c:585 -#: ../plug-ins/common/file-raw.c:781 ../plug-ins/common/file-sunras.c:979 -#: ../plug-ins/common/file-tga.c:1073 ../plug-ins/common/file-tiff-load.c:1010 +#: ../plug-ins/common/file-png.c:898 ../plug-ins/common/file-pnm.c:585 +#: ../plug-ins/common/file-raw.c:780 ../plug-ins/common/file-sunras.c:979 +#: ../plug-ins/common/file-tga.c:1095 ../plug-ins/common/file-tiff-load.c:1011 #: ../plug-ins/common/file-xbm.c:898 ../plug-ins/common/film.c:745 #: ../plug-ins/common/smooth-palette.c:257 ../plug-ins/common/tile.c:262 -#: ../plug-ins/file-bmp/bmp-read.c:680 ../plug-ins/file-faxg3/faxg3.c:474 +#: ../plug-ins/file-bmp/bmp-read.c:700 ../plug-ins/file-faxg3/faxg3.c:474 #: ../plug-ins/file-fits/fits.c:532 ../plug-ins/file-jpeg/jpeg-load.c:260 #: ../plug-ins/file-jpeg/jpeg-load.c:824 #: ../plug-ins/file-psd/psd-image-res-load.c:1001 -#: ../plug-ins/file-psd/psd-load.c:1644 ../plug-ins/file-sgi/sgi.c:409 +#: ../plug-ins/file-psd/psd-load.c:1655 ../plug-ins/file-sgi/sgi.c:409 #: ../plug-ins/gfig/gfig-dialog.c:1321 #: ../plug-ins/gimpressionist/general.c:139 #: ../plug-ins/map-object/map-object-apply.c:252 ../plug-ins/twain/twain.c:567 @@ -1032,16 +1032,16 @@ #. stat error (file does not exist) #: ../plug-ins/common/channel-mixer.c:980 #: ../plug-ins/common/cml-explorer.c:2208 ../plug-ins/common/curve-bend.c:891 -#: ../plug-ins/common/file-cel.c:297 ../plug-ins/common/file-cel.c:349 -#: ../plug-ins/common/file-cel.c:580 ../plug-ins/common/file-dicom.c:340 -#: ../plug-ins/common/file-gbr.c:370 ../plug-ins/common/file-gif-load.c:355 +#: ../plug-ins/common/file-cel.c:300 ../plug-ins/common/file-cel.c:352 +#: ../plug-ins/common/file-cel.c:583 ../plug-ins/common/file-dicom.c:340 +#: ../plug-ins/common/file-gbr.c:370 ../plug-ins/common/file-gif-load.c:357 #: ../plug-ins/common/file-gih.c:642 ../plug-ins/common/file-jp2-load.c:196 #: ../plug-ins/common/file-jp2-load.c:205 ../plug-ins/common/file-mng.c:1156 #: ../plug-ins/common/file-pat.c:339 ../plug-ins/common/file-pcx.c:362 #: ../plug-ins/common/file-pix.c:345 ../plug-ins/common/file-png.c:762 #: ../plug-ins/common/file-pnm.c:496 ../plug-ins/common/file-ps.c:1019 #: ../plug-ins/common/file-ps.c:2915 ../plug-ins/common/file-psp.c:1717 -#: ../plug-ins/common/file-raw.c:257 ../plug-ins/common/file-raw.c:729 +#: ../plug-ins/common/file-raw.c:257 ../plug-ins/common/file-raw.c:728 #: ../plug-ins/common/file-sunras.c:393 ../plug-ins/common/file-svg.c:333 #: ../plug-ins/common/file-svg.c:713 ../plug-ins/common/file-tga.c:443 #: ../plug-ins/common/file-xbm.c:738 ../plug-ins/common/file-xmc.c:657 @@ -1058,8 +1058,8 @@ #: ../plug-ins/flame/flame.c:411 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1865 #: ../plug-ins/fractal-explorer/fractal-explorer.c:923 -#: ../plug-ins/gfig/gfig.c:433 ../plug-ins/help/gimphelplocale.c:222 -#: ../plug-ins/help/gimphelplocale.c:238 +#: ../plug-ins/gfig/gfig.c:433 ../plug-ins/help/gimphelplocale.c:271 +#: ../plug-ins/help/gimphelplocale.c:287 #: ../plug-ins/lighting/lighting-ui.c:1367 #, c-format msgid "Could not open '%s' for reading: %s" @@ -1071,26 +1071,27 @@ #: ../plug-ins/common/channel-mixer.c:1058 #: ../plug-ins/common/cml-explorer.c:2035 ../plug-ins/common/curve-bend.c:839 -#: ../plug-ins/common/file-cel.c:773 ../plug-ins/common/file-csource.c:407 +#: ../plug-ins/common/file-cel.c:776 ../plug-ins/common/file-csource.c:407 #: ../plug-ins/common/file-dicom.c:1371 ../plug-ins/common/file-gbr.c:665 #: ../plug-ins/common/file-gif-save.c:792 ../plug-ins/common/file-gih.c:1260 #: ../plug-ins/common/file-html-table.c:236 ../plug-ins/common/file-mng.c:649 #: ../plug-ins/common/file-mng.c:984 ../plug-ins/common/file-pat.c:488 -#: ../plug-ins/common/file-pcx.c:713 ../plug-ins/common/file-pix.c:528 -#: ../plug-ins/common/file-png.c:1369 ../plug-ins/common/file-pnm.c:1012 -#: ../plug-ins/common/file-ps.c:1195 ../plug-ins/common/file-raw.c:609 -#: ../plug-ins/common/file-raw.c:637 ../plug-ins/common/file-sunras.c:567 -#: ../plug-ins/common/file-tga.c:1180 ../plug-ins/common/file-tiff-save.c:838 -#: ../plug-ins/common/file-xbm.c:1037 ../plug-ins/common/file-xmc.c:1449 -#: ../plug-ins/common/file-xwd.c:637 ../plug-ins/common/sphere-designer.c:2121 -#: ../plug-ins/file-bmp/bmp-write.c:309 ../plug-ins/file-fits/fits.c:478 -#: ../plug-ins/file-fli/fli-gimp.c:752 ../plug-ins/file-ico/ico-save.c:1007 +#: ../plug-ins/common/file-pcx.c:713 ../plug-ins/common/file-pdf-save.c:438 +#: ../plug-ins/common/file-pix.c:528 ../plug-ins/common/file-png.c:1370 +#: ../plug-ins/common/file-pnm.c:1012 ../plug-ins/common/file-ps.c:1195 +#: ../plug-ins/common/file-raw.c:623 ../plug-ins/common/file-raw.c:651 +#: ../plug-ins/common/file-sunras.c:567 ../plug-ins/common/file-tga.c:1202 +#: ../plug-ins/common/file-tiff-save.c:842 ../plug-ins/common/file-xbm.c:1037 +#: ../plug-ins/common/file-xmc.c:1449 ../plug-ins/common/file-xwd.c:637 +#: ../plug-ins/common/sphere-designer.c:2121 +#: ../plug-ins/file-bmp/bmp-write.c:311 ../plug-ins/file-fits/fits.c:478 +#: ../plug-ins/file-fli/fli-gimp.c:752 ../plug-ins/file-ico/ico-save.c:1020 #: ../plug-ins/file-jpeg/jpeg-save.c:355 ../plug-ins/file-psd/psd-save.c:1653 #: ../plug-ins/file-uri/uri-backend-libcurl.c:166 #: ../plug-ins/file-xjt/xjt.c:1280 ../plug-ins/file-xjt/xjt.c:1719 #: ../plug-ins/flame/flame.c:442 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1548 -#: ../plug-ins/gfig/gfig.c:797 ../plug-ins/ifs-compose/ifs-compose.c:2408 +#: ../plug-ins/gfig/gfig.c:801 ../plug-ins/ifs-compose/ifs-compose.c:2408 #: ../plug-ins/lighting/lighting-ui.c:1223 #, c-format msgid "Could not open '%s' for writing: %s" @@ -1779,7 +1780,7 @@ "menú con opciones de ordenación." #: ../plug-ins/common/compose.c:189 ../plug-ins/common/decompose.c:170 -#: ../plug-ins/common/file-raw.c:1118 +#: ../plug-ins/common/file-raw.c:1117 msgid "RGB" msgstr "RGB" @@ -2144,7 +2145,7 @@ msgstr "D_ivisor:" #: ../plug-ins/common/convolution-matrix.c:1001 -#: ../plug-ins/common/depth-merge.c:775 ../plug-ins/common/file-raw.c:1139 +#: ../plug-ins/common/depth-merge.c:775 ../plug-ins/common/file-raw.c:1138 msgid "O_ffset:" msgstr "Des_plazamiento:" @@ -2196,7 +2197,7 @@ msgid "Zealous cropping" msgstr "Recorte Zealous" -#: ../plug-ins/common/crop-zealous.c:252 +#: ../plug-ins/common/crop-zealous.c:253 msgid "Nothing to crop." msgstr "Nada para recortar." @@ -2699,7 +2700,7 @@ #: ../plug-ins/common/destripe.c:476 ../plug-ins/common/file-html-table.c:584 #: ../plug-ins/common/file-ps.c:3039 ../plug-ins/common/file-ps.c:3237 -#: ../plug-ins/common/file-raw.c:1152 ../plug-ins/common/smooth-palette.c:437 +#: ../plug-ins/common/file-raw.c:1151 ../plug-ins/common/smooth-palette.c:437 #: ../plug-ins/common/tile-paper.c:303 ../plug-ins/common/tile.c:428 #: ../plug-ins/imagemap/imap_cmd_guides.c:164 #: ../plug-ins/imagemap/imap_rectangle.c:401 @@ -3014,7 +3015,7 @@ #: ../plug-ins/common/engrave.c:245 ../plug-ins/common/file-html-table.c:600 #: ../plug-ins/common/file-ps.c:3049 ../plug-ins/common/file-ps.c:3246 -#: ../plug-ins/common/file-raw.c:1165 ../plug-ins/common/film.c:1002 +#: ../plug-ins/common/file-raw.c:1164 ../plug-ins/common/film.c:1002 #: ../plug-ins/common/smooth-palette.c:442 ../plug-ins/common/tile-paper.c:314 #: ../plug-ins/common/tile.c:432 ../plug-ins/imagemap/imap_cmd_guides.c:174 #: ../plug-ins/imagemap/imap_rectangle.c:408 @@ -3047,8 +3048,8 @@ msgid "Load KISS Palette" msgstr "Cargar paleta KISS" -#: ../plug-ins/common/file-cel.c:309 ../plug-ins/common/file-cel.c:364 -#: ../plug-ins/common/file-cel.c:384 +#: ../plug-ins/common/file-cel.c:312 ../plug-ins/common/file-cel.c:367 +#: ../plug-ins/common/file-cel.c:387 #, c-format msgid "EOF or error while reading image header" msgstr "EOF o error al leer la cabecera de la imagen" @@ -3057,13 +3058,13 @@ #. column, highest column ever used #. -1 assume fsel is not available (and not attached to any drawable) #. -1 assume there is no floating selection -#: ../plug-ins/common/file-cel.c:354 ../plug-ins/common/file-dicom.c:345 -#: ../plug-ins/common/file-gbr.c:375 ../plug-ins/common/file-gif-load.c:360 +#: ../plug-ins/common/file-cel.c:357 ../plug-ins/common/file-dicom.c:345 +#: ../plug-ins/common/file-gbr.c:375 ../plug-ins/common/file-gif-load.c:362 #: ../plug-ins/common/file-gih.c:647 ../plug-ins/common/file-jp2-load.c:189 #: ../plug-ins/common/file-pat.c:344 ../plug-ins/common/file-pcx.c:367 #: ../plug-ins/common/file-pdf-load.c:861 ../plug-ins/common/file-pix.c:350 -#: ../plug-ins/common/file-png.c:769 ../plug-ins/common/file-pnm.c:501 -#: ../plug-ins/common/file-ps.c:1025 ../plug-ins/common/file-raw.c:734 +#: ../plug-ins/common/file-png.c:770 ../plug-ins/common/file-pnm.c:501 +#: ../plug-ins/common/file-ps.c:1025 ../plug-ins/common/file-raw.c:733 #: ../plug-ins/common/file-sunras.c:489 ../plug-ins/common/file-tga.c:448 #: ../plug-ins/common/file-tiff-load.c:611 ../plug-ins/common/file-wmf.c:994 #: ../plug-ins/common/file-xbm.c:743 ../plug-ins/common/file-xmc.c:669 @@ -3076,17 +3077,17 @@ msgid "Opening '%s'" msgstr "Abriendo «%s»" -#: ../plug-ins/common/file-cel.c:392 +#: ../plug-ins/common/file-cel.c:395 #, c-format msgid "is not a CEL image file" msgstr "no es un archivo de imagen CEL" -#: ../plug-ins/common/file-cel.c:406 +#: ../plug-ins/common/file-cel.c:409 #, c-format msgid "illegal bpp value in image: %hhu" msgstr "valor de bpp ilegal en la imagne: %hhu" -#: ../plug-ins/common/file-cel.c:420 +#: ../plug-ins/common/file-cel.c:423 #, c-format msgid "" "illegal image dimensions: width: %d, horizontal offset: %d, height: %d, " @@ -3095,61 +3096,61 @@ "dimensiones de la imagen ilegales: anchura: %d, desplazamiento horizontal: " "%d, altura: %d, desplazamiento vertical: %d" -#: ../plug-ins/common/file-cel.c:433 +#: ../plug-ins/common/file-cel.c:436 #, c-format msgid "Can't create a new image" msgstr "No se puede crear una imagen nueva" -#: ../plug-ins/common/file-cel.c:471 ../plug-ins/common/file-cel.c:506 -#: ../plug-ins/common/file-cel.c:531 +#: ../plug-ins/common/file-cel.c:474 ../plug-ins/common/file-cel.c:509 +#: ../plug-ins/common/file-cel.c:534 #, c-format msgid "EOF or error while reading image data" msgstr "EOF o error al leer los datos de la imagen" -#: ../plug-ins/common/file-cel.c:548 +#: ../plug-ins/common/file-cel.c:551 #, c-format msgid "Unsupported bit depth (%d)!" msgstr "¡Profundidad de bits no soportada (%d)!" -#: ../plug-ins/common/file-cel.c:630 ../plug-ins/common/file-cel.c:642 +#: ../plug-ins/common/file-cel.c:633 ../plug-ins/common/file-cel.c:645 #, c-format msgid "'%s': EOF or error while reading palette header" msgstr "«%s»: EOF o error al leer la cabecera de la paleta" -#: ../plug-ins/common/file-cel.c:651 +#: ../plug-ins/common/file-cel.c:654 #, c-format msgid "'%s': is not a KCF palette file" msgstr "«%s» no es un archivo de paleta KCF" -#: ../plug-ins/common/file-cel.c:660 +#: ../plug-ins/common/file-cel.c:663 #, c-format msgid "'%s': illegal bpp value in palette: %hhu" msgstr "«%s»: valor e bpp ilegal en la paleta: %hhu" -#: ../plug-ins/common/file-cel.c:669 +#: ../plug-ins/common/file-cel.c:672 #, c-format msgid "'%s': illegal number of colors: %u" msgstr "«%s»: número ilegal de colores: %u" -#: ../plug-ins/common/file-cel.c:684 ../plug-ins/common/file-cel.c:701 -#: ../plug-ins/common/file-cel.c:721 +#: ../plug-ins/common/file-cel.c:687 ../plug-ins/common/file-cel.c:704 +#: ../plug-ins/common/file-cel.c:724 #, c-format msgid "'%s': EOF or error while reading palette data" msgstr "«%s»: EOF o error al leer los datos de la paleta" #. init the progress meter #. And let's begin the progress -#: ../plug-ins/common/file-cel.c:778 ../plug-ins/common/file-gbr.c:670 +#: ../plug-ins/common/file-cel.c:781 ../plug-ins/common/file-gbr.c:670 #: ../plug-ins/common/file-gif-save.c:799 ../plug-ins/common/file-gih.c:1265 #: ../plug-ins/common/file-html-table.c:257 ../plug-ins/common/file-pat.c:493 #: ../plug-ins/common/file-pcx.c:645 ../plug-ins/common/file-pix.c:533 -#: ../plug-ins/common/file-png.c:1376 ../plug-ins/common/file-pnm.c:1017 +#: ../plug-ins/common/file-png.c:1377 ../plug-ins/common/file-pnm.c:1017 #: ../plug-ins/common/file-ps.c:1200 ../plug-ins/common/file-sunras.c:572 -#: ../plug-ins/common/file-tga.c:1185 ../plug-ins/common/file-tiff-save.c:709 +#: ../plug-ins/common/file-tga.c:1207 ../plug-ins/common/file-tiff-save.c:713 #: ../plug-ins/common/file-xbm.c:1042 ../plug-ins/common/file-xmc.c:1454 #: ../plug-ins/common/file-xpm.c:639 ../plug-ins/common/file-xwd.c:642 -#: ../plug-ins/file-bmp/bmp-write.c:320 ../plug-ins/file-fits/fits.c:483 -#: ../plug-ins/file-fli/fli-gimp.c:720 ../plug-ins/file-ico/ico-save.c:1001 +#: ../plug-ins/file-bmp/bmp-write.c:322 ../plug-ins/file-fits/fits.c:483 +#: ../plug-ins/file-fli/fli-gimp.c:720 ../plug-ins/file-ico/ico-save.c:1014 #: ../plug-ins/file-jpeg/jpeg-save.c:312 ../plug-ins/file-psd/psd-save.c:1658 #: ../plug-ins/file-sgi/sgi.c:578 ../plug-ins/file-xjt/xjt.c:1700 #, c-format @@ -3280,11 +3281,11 @@ msgstr "Pincel" #. attach labels -#: ../plug-ins/common/file-gbr.c:786 ../plug-ins/common/grid.c:792 +#: ../plug-ins/common/file-gbr.c:787 ../plug-ins/common/grid.c:792 msgid "Spacing:" msgstr "Espaciado:" -#: ../plug-ins/common/file-gbr.c:797 ../plug-ins/common/file-gih.c:890 +#: ../plug-ins/common/file-gbr.c:799 ../plug-ins/common/file-gih.c:890 #: ../plug-ins/common/file-pat.c:570 ../plug-ins/gimpressionist/presets.c:666 msgid "Description:" msgstr "Descripción:" @@ -3294,36 +3295,36 @@ msgid "GIF image" msgstr "Imagen GIF" -#: ../plug-ins/common/file-gif-load.c:372 +#: ../plug-ins/common/file-gif-load.c:374 msgid "This is not a GIF file" msgstr "No es un archivo de tipo GIF" -#: ../plug-ins/common/file-gif-load.c:411 +#: ../plug-ins/common/file-gif-load.c:413 msgid "Non-square pixels. Image might look squashed." msgstr "Píxeles no cuadrados. La imagen se verá aplastada." -#: ../plug-ins/common/file-gif-load.c:945 +#: ../plug-ins/common/file-gif-load.c:982 #, c-format msgid "Background (%d%s)" msgstr "Fondo (%d%s)" -#: ../plug-ins/common/file-gif-load.c:968 +#: ../plug-ins/common/file-gif-load.c:1005 #, c-format msgid "Opening '%s' (frame %d)" msgstr "Abriendo «%s» (fotograma %d)" -#: ../plug-ins/common/file-gif-load.c:997 ../plug-ins/common/iwarp.c:792 +#: ../plug-ins/common/file-gif-load.c:1034 ../plug-ins/common/iwarp.c:792 #: ../plug-ins/common/iwarp.c:827 #, c-format msgid "Frame %d" msgstr "Cuadro %d" -#: ../plug-ins/common/file-gif-load.c:999 +#: ../plug-ins/common/file-gif-load.c:1036 #, c-format msgid "Frame %d (%d%s)" msgstr "Cuadro %d (%d%s)" -#: ../plug-ins/common/file-gif-load.c:1030 +#: ../plug-ins/common/file-gif-load.c:1067 #, c-format msgid "" "GIF: Undocumented GIF composite type %d is not handled. Animation might not " @@ -3697,7 +3698,7 @@ #. Inform the user that we couldn't losslessly save the #. * transparency & just use the full palette -#: ../plug-ins/common/file-mng.c:534 ../plug-ins/common/file-png.c:1913 +#: ../plug-ins/common/file-mng.c:534 ../plug-ins/common/file-png.c:1914 msgid "Couldn't losslessly save transparency, saving opacity instead." msgstr "" "No se pudo guardar la transparencia sin pérdidas, guardando la opacidad en " @@ -3732,7 +3733,7 @@ msgstr "Guardar la hora de creación" #. Dialog init -#: ../plug-ins/common/file-mng.c:1411 ../plug-ins/common/file-png.c:1962 +#: ../plug-ins/common/file-mng.c:1411 ../plug-ins/common/file-png.c:1963 msgid "PNG" msgstr "PNG" @@ -3845,13 +3846,13 @@ msgid "'%s' is not a PCX file" msgstr "«%s» no es un archivo PCX" -#: ../plug-ins/common/file-pcx.c:398 ../plug-ins/file-bmp/bmp-read.c:669 +#: ../plug-ins/common/file-pcx.c:398 ../plug-ins/file-bmp/bmp-read.c:689 #: ../plug-ins/file-psd/psd-load.c:301 #, c-format msgid "Unsupported or invalid image width: %d" msgstr "Anchura de imagen no soportada o no válida: %d" -#: ../plug-ins/common/file-pcx.c:404 ../plug-ins/file-bmp/bmp-read.c:675 +#: ../plug-ins/common/file-pcx.c:404 ../plug-ins/file-bmp/bmp-read.c:695 #: ../plug-ins/file-psd/psd-load.c:293 #, c-format msgid "Unsupported or invalid image height: %d" @@ -3897,7 +3898,7 @@ msgstr "Ocurrió un error al escribir en el archivo «%s»: %s" #: ../plug-ins/common/file-pdf-load.c:300 -#: ../plug-ins/common/file-pdf-save.c:298 +#: ../plug-ins/common/file-pdf-save.c:300 msgid "Portable Document Format" msgstr "Portable Document Format" @@ -3954,15 +3955,15 @@ msgid "pixels/%a" msgstr "píxeles/%a" -#: ../plug-ins/common/file-pdf-save.c:313 +#: ../plug-ins/common/file-pdf-save.c:315 msgid "_Create multipage PDF..." msgstr "_Crear PDF de varias páginas…" -#: ../plug-ins/common/file-pdf-save.c:421 +#: ../plug-ins/common/file-pdf-save.c:423 msgid "You must select a file to save!" msgstr "Debe seleccionar un archivo para grabar." -#: ../plug-ins/common/file-pdf-save.c:431 +#: ../plug-ins/common/file-pdf-save.c:449 #, c-format msgid "" "An error occured while creating the PDF file:\n" @@ -3975,54 +3976,54 @@ "Asegúrese de que ha introducido un nombre de archivo válido y que la carpeta " "de destino no es de solo lectura." -#: ../plug-ins/common/file-pdf-save.c:785 -#: ../plug-ins/common/file-pdf-save.c:902 +#: ../plug-ins/common/file-pdf-save.c:803 +#: ../plug-ins/common/file-pdf-save.c:920 msgid "Omit hidden layers and layers with zero opacity" msgstr "Omitir las capas ocultas y las que tienen opacidad cero" -#: ../plug-ins/common/file-pdf-save.c:789 -#: ../plug-ins/common/file-pdf-save.c:906 +#: ../plug-ins/common/file-pdf-save.c:807 +#: ../plug-ins/common/file-pdf-save.c:924 msgid "Convert bitmaps to vector graphics where possible" msgstr "Convertir los mapas de bit a gráficos vectoriales cuando sea posible" -#: ../plug-ins/common/file-pdf-save.c:793 -#: ../plug-ins/common/file-pdf-save.c:910 +#: ../plug-ins/common/file-pdf-save.c:811 +#: ../plug-ins/common/file-pdf-save.c:928 msgid "Apply layer masks before saving" msgstr "Aplicar máscaras de capa antes de guardar" -#: ../plug-ins/common/file-pdf-save.c:796 -#: ../plug-ins/common/file-pdf-save.c:913 +#: ../plug-ins/common/file-pdf-save.c:814 +#: ../plug-ins/common/file-pdf-save.c:931 msgid "Keeping the masks will not change the output" msgstr "Mantener las máscaras no cambiará la salida" -#: ../plug-ins/common/file-pdf-save.c:849 +#: ../plug-ins/common/file-pdf-save.c:867 msgid "Save to:" msgstr "Guardar en:" -#: ../plug-ins/common/file-pdf-save.c:853 +#: ../plug-ins/common/file-pdf-save.c:871 msgid "Browse..." msgstr "Explorar…" -#: ../plug-ins/common/file-pdf-save.c:854 +#: ../plug-ins/common/file-pdf-save.c:872 msgid "Multipage PDF export" msgstr "Exportación de PDF de varias páginas" -#: ../plug-ins/common/file-pdf-save.c:887 +#: ../plug-ins/common/file-pdf-save.c:905 msgid "Remove the selected pages" msgstr "Eliminar las páginas seleccionadas" # Pendiente hasa que sepa lo que significa. FVD # Puede ser una imagen pix de Alias WaveFront # Gracias ¿Quién lo dice? pon tus iniciales. FVD -#: ../plug-ins/common/file-pdf-save.c:897 +#: ../plug-ins/common/file-pdf-save.c:915 msgid "Add this image" msgstr "Añadir esta imagen" -#: ../plug-ins/common/file-pdf-save.c:1010 +#: ../plug-ins/common/file-pdf-save.c:1028 msgid "Error! In order to save the file, at least one image should be added!" msgstr "Error: para guardar el archivo, debe añadirse al menos una imagen." -#: ../plug-ins/common/file-pdf-save.c:1333 +#: ../plug-ins/common/file-pdf-save.c:1351 #: ../plug-ins/print/print-draw-page.c:223 msgid "Cannot handle the size (either width or height) of the image." msgstr "No se puede gestionar el tamaño (la altura o la anchura) de la imagen." @@ -4054,17 +4055,17 @@ msgid "Error while reading '%s'. File corrupted?" msgstr "Ocurrió un error al leer el archivo «%s». ¿Está corrupto el archivo?" -#: ../plug-ins/common/file-png.c:877 +#: ../plug-ins/common/file-png.c:878 #, c-format msgid "Unknown color model in PNG file '%s'." msgstr "Modelo de color desconocido en el archivo PNG «%s»." -#: ../plug-ins/common/file-png.c:888 +#: ../plug-ins/common/file-png.c:889 #, c-format msgid "Could not create new image for '%s': %s" msgstr "No se pudo crear una imagen nueva para «%s»: %s" -#: ../plug-ins/common/file-png.c:942 +#: ../plug-ins/common/file-png.c:943 msgid "" "The PNG file specifies an offset that caused the layer to be positioned " "outside the image." @@ -4072,19 +4073,19 @@ "El archivo PNG especifica un desplazamiento que ha causado que la capa sea " "posicionada fuera de la imagen." -#: ../plug-ins/common/file-png.c:1244 +#: ../plug-ins/common/file-png.c:1245 msgid "Apply PNG Offset" msgstr "Aplicar desplazamiento de PNG" -#: ../plug-ins/common/file-png.c:1248 +#: ../plug-ins/common/file-png.c:1249 msgid "Ignore PNG offset" msgstr "Ignorar el desplazamiento de PNG" -#: ../plug-ins/common/file-png.c:1249 +#: ../plug-ins/common/file-png.c:1250 msgid "Apply PNG offset to layer" msgstr "Aplicar desplazamiento de PNG a la capa" -#: ../plug-ins/common/file-png.c:1273 +#: ../plug-ins/common/file-png.c:1274 #, c-format msgid "" "The PNG image you are importing specifies an offset of %d, %d. Do you want " @@ -4093,22 +4094,22 @@ "La imagen PNG que está importando especifica un desplazamiento de %d, %d. " "¿Quiere aplicar este desplazamiento a la capa?" -#: ../plug-ins/common/file-png.c:1341 +#: ../plug-ins/common/file-png.c:1342 #, c-format msgid "Error creating PNG write struct while saving '%s'." msgstr "Error al crear la estructura de escritura PNG al guardar «%s»." -#: ../plug-ins/common/file-png.c:1351 +#: ../plug-ins/common/file-png.c:1352 #, c-format msgid "Error while saving '%s'. Could not save image." msgstr "Ocurrió un error al guardar «%s». No se pudo guardar la imagen." -#: ../plug-ins/common/file-png.c:1979 +#: ../plug-ins/common/file-png.c:1980 #, c-format msgid "Error loading UI file '%s': %s" msgstr "Ocurrió un error al cargar el archivo de IU «%s»: %s" -#: ../plug-ins/common/file-png.c:1980 +#: ../plug-ins/common/file-png.c:1981 msgid "Unknown error" msgstr "Error desconocido" @@ -4209,7 +4210,7 @@ msgid "PostScript save cannot handle images with alpha channels" msgstr "Guardar como PostScript no funciona con imágenes con canales alfa" -#: ../plug-ins/common/file-ps.c:1809 ../plug-ins/common/file-tiff-load.c:1012 +#: ../plug-ins/common/file-ps.c:1809 ../plug-ins/common/file-tiff-load.c:1013 #, c-format msgid "Page %d" msgstr "Página %d" @@ -4393,83 +4394,83 @@ msgid "Raw image data" msgstr "Datos de imagen en bruto" -#: ../plug-ins/common/file-raw.c:1074 +#: ../plug-ins/common/file-raw.c:1073 msgid "Load Image from Raw Data" msgstr "Cargar imagen a partir de los datos en bruto" -#: ../plug-ins/common/file-raw.c:1108 +#: ../plug-ins/common/file-raw.c:1107 msgid "Image" msgstr "Imagen" -#: ../plug-ins/common/file-raw.c:1119 +#: ../plug-ins/common/file-raw.c:1118 msgid "RGB Alpha" msgstr "RGB con Alfa" -#: ../plug-ins/common/file-raw.c:1120 +#: ../plug-ins/common/file-raw.c:1119 msgid "RGB565" msgstr "RGB565" -#: ../plug-ins/common/file-raw.c:1121 +#: ../plug-ins/common/file-raw.c:1120 msgid "Planar RGB" msgstr "RGB planar" -#: ../plug-ins/common/file-raw.c:1122 +#: ../plug-ins/common/file-raw.c:1121 msgid "Indexed" msgstr "Indexado" -#: ../plug-ins/common/file-raw.c:1123 +#: ../plug-ins/common/file-raw.c:1122 msgid "Indexed Alpha" msgstr "Indexado con Alfa" -#: ../plug-ins/common/file-raw.c:1128 +#: ../plug-ins/common/file-raw.c:1127 msgid "Image _Type:" msgstr "_Tipo de imagen:" -#: ../plug-ins/common/file-raw.c:1178 +#: ../plug-ins/common/file-raw.c:1177 msgid "Palette" msgstr "Paleta" -#: ../plug-ins/common/file-raw.c:1188 ../plug-ins/common/file-raw.c:1273 +#: ../plug-ins/common/file-raw.c:1187 ../plug-ins/common/file-raw.c:1272 msgid "R, G, B (normal)" msgstr "R, G, B (normal)" -#: ../plug-ins/common/file-raw.c:1189 ../plug-ins/common/file-raw.c:1275 +#: ../plug-ins/common/file-raw.c:1188 ../plug-ins/common/file-raw.c:1274 msgid "B, G, R, X (BMP style)" msgstr "B, G, R, X (estilo BMP)" -#: ../plug-ins/common/file-raw.c:1194 +#: ../plug-ins/common/file-raw.c:1193 msgid "_Palette Type:" msgstr "Tipo de _paleta:" -#: ../plug-ins/common/file-raw.c:1205 +#: ../plug-ins/common/file-raw.c:1204 msgid "Off_set:" msgstr "_Desfase:" -#: ../plug-ins/common/file-raw.c:1217 +#: ../plug-ins/common/file-raw.c:1216 msgid "Select Palette File" msgstr "Seleccione el archivo de paleta" -#: ../plug-ins/common/file-raw.c:1223 +#: ../plug-ins/common/file-raw.c:1222 msgid "Pal_ette File:" msgstr "Archivo de _paleta:" -#: ../plug-ins/common/file-raw.c:1251 +#: ../plug-ins/common/file-raw.c:1250 msgid "Raw Image" msgstr "Imagen Raw (en bruto)" -#: ../plug-ins/common/file-raw.c:1259 +#: ../plug-ins/common/file-raw.c:1258 msgid "RGB Save Type" msgstr "Guardar tipo RGB" -#: ../plug-ins/common/file-raw.c:1263 +#: ../plug-ins/common/file-raw.c:1262 msgid "Standard (R,G,B)" msgstr "Estándar (R,G,B)" -#: ../plug-ins/common/file-raw.c:1264 +#: ../plug-ins/common/file-raw.c:1263 msgid "Planar (RRR,GGG,BBB)" msgstr "Planar (RRR,GGG,BBB)" -#: ../plug-ins/common/file-raw.c:1269 +#: ../plug-ins/common/file-raw.c:1268 msgid "Indexed Palette Type" msgstr "Tipo de paleta indexada" @@ -4660,24 +4661,24 @@ msgid "Cannot read header from '%s'" msgstr "No se pudo leer la cabecera de «%s»" -#: ../plug-ins/common/file-tga.c:1381 +#: ../plug-ins/common/file-tga.c:1403 msgid "TGA" msgstr "TGA" #. rle -#: ../plug-ins/common/file-tga.c:1390 +#: ../plug-ins/common/file-tga.c:1412 msgid "_RLE compression" msgstr "Compresión _RLE" -#: ../plug-ins/common/file-tga.c:1404 +#: ../plug-ins/common/file-tga.c:1426 msgid "Or_igin:" msgstr "Or_iginal:" -#: ../plug-ins/common/file-tga.c:1408 +#: ../plug-ins/common/file-tga.c:1430 msgid "Bottom left" msgstr "Inferior izquierdo" -#: ../plug-ins/common/file-tga.c:1409 +#: ../plug-ins/common/file-tga.c:1431 msgid "Top left" msgstr "Arriba a la izquierda" @@ -4696,16 +4697,16 @@ msgid "Import from TIFF" msgstr "Importar desde TIFF" -#: ../plug-ins/common/file-tiff-load.c:818 +#: ../plug-ins/common/file-tiff-load.c:819 #, c-format msgid "%s-%d-of-%d-pages" msgstr "%s-%d-de-%d-páginas" -#: ../plug-ins/common/file-tiff-load.c:1028 +#: ../plug-ins/common/file-tiff-load.c:1029 msgid "TIFF Channel" msgstr "Canal TIFF" -#: ../plug-ins/common/file-tiff-load.c:1037 +#: ../plug-ins/common/file-tiff-load.c:1038 #: ../plug-ins/file-psd/psd-load.c:333 msgid "" "Warning:\n" @@ -4718,7 +4719,7 @@ "8 bits, por lo cual será convertida para usted. Debido a esta conversión se " "perderá información." -#: ../plug-ins/common/file-tiff-save.c:812 +#: ../plug-ins/common/file-tiff-save.c:816 msgid "" "Only monochrome pictures can be compressed with \"CCITT Group 4\" or \"CCITT " "Group 3\"." @@ -4726,11 +4727,11 @@ "Sólo se pueden comprimir imágenes monocromo con «CCITT grupo 4» o «CCITT " "grupo 3»." -#: ../plug-ins/common/file-tiff-save.c:826 +#: ../plug-ins/common/file-tiff-save.c:830 msgid "Indexed pictures cannot be compressed with \"JPEG\"." msgstr "Las imágenes indexadas no se pueden comprimir con «JPEG»." -#: ../plug-ins/common/file-tiff-save.c:929 +#: ../plug-ins/common/file-tiff-save.c:933 msgid "" "The TIFF format only supports comments in\n" "7bit ASCII encoding. No comment is saved." @@ -4738,48 +4739,48 @@ "El formato TIFF sólo soporta comentarios en \n" "codificación ASCII de 7 bits. No se guardará ningún comentario." -#: ../plug-ins/common/file-tiff-save.c:1104 +#: ../plug-ins/common/file-tiff-save.c:1108 msgid "TIFF" msgstr "TIFF" #. compression -#: ../plug-ins/common/file-tiff-save.c:1112 +#: ../plug-ins/common/file-tiff-save.c:1116 msgid "Compression" msgstr "Compresión" -#: ../plug-ins/common/file-tiff-save.c:1116 +#: ../plug-ins/common/file-tiff-save.c:1120 msgid "_None" msgstr "_Ninguno" -#: ../plug-ins/common/file-tiff-save.c:1117 +#: ../plug-ins/common/file-tiff-save.c:1121 msgid "_LZW" msgstr "_LZW" -#: ../plug-ins/common/file-tiff-save.c:1118 +#: ../plug-ins/common/file-tiff-save.c:1122 msgid "_Pack Bits" msgstr "_Paquetes de bits" -#: ../plug-ins/common/file-tiff-save.c:1119 +#: ../plug-ins/common/file-tiff-save.c:1123 msgid "_Deflate" msgstr "_Desinflar" -#: ../plug-ins/common/file-tiff-save.c:1120 +#: ../plug-ins/common/file-tiff-save.c:1124 msgid "_JPEG" msgstr "_JPEG" -#: ../plug-ins/common/file-tiff-save.c:1121 +#: ../plug-ins/common/file-tiff-save.c:1125 msgid "CCITT Group _3 fax" msgstr "Fax CCITT grupo _3" -#: ../plug-ins/common/file-tiff-save.c:1122 +#: ../plug-ins/common/file-tiff-save.c:1126 msgid "CCITT Group _4 fax" msgstr "Fax CCITT grupo _4" -#: ../plug-ins/common/file-tiff-save.c:1151 +#: ../plug-ins/common/file-tiff-save.c:1155 msgid "Save _color values from transparent pixels" msgstr "Guardar los valores de los colores de los píxeles _transparentes" -#: ../plug-ins/common/file-tiff-save.c:1167 ../plug-ins/common/file-xbm.c:1236 +#: ../plug-ins/common/file-tiff-save.c:1171 ../plug-ins/common/file-xbm.c:1236 msgid "Comment:" msgstr "Comentario:" @@ -6046,27 +6047,27 @@ msgid "Applying lens" msgstr "Aplicando lentes" -#: ../plug-ins/common/lens-apply.c:394 +#: ../plug-ins/common/lens-apply.c:395 msgid "Lens Effect" msgstr "Efecto de lente" -#: ../plug-ins/common/lens-apply.c:429 +#: ../plug-ins/common/lens-apply.c:430 msgid "_Keep original surroundings" msgstr "M_antener los alrededores originales" -#: ../plug-ins/common/lens-apply.c:444 +#: ../plug-ins/common/lens-apply.c:445 msgid "_Set surroundings to index 0" msgstr "E_stablecer los alrededores a índice 0" -#: ../plug-ins/common/lens-apply.c:445 +#: ../plug-ins/common/lens-apply.c:446 msgid "_Set surroundings to background color" msgstr "Establ_ecer los alrededores a color de fondo" -#: ../plug-ins/common/lens-apply.c:460 +#: ../plug-ins/common/lens-apply.c:461 msgid "_Make surroundings transparent" msgstr "H_acer los alrededores transparentes" -#: ../plug-ins/common/lens-apply.c:477 +#: ../plug-ins/common/lens-apply.c:478 msgid "_Lens refraction index:" msgstr "índice de refracción de los _lentes:" @@ -8162,49 +8163,49 @@ msgid "_Dilate" msgstr "_Dilatar" -#: ../plug-ins/common/value-propagate.c:476 -#: ../plug-ins/common/value-propagate.c:1086 +#: ../plug-ins/common/value-propagate.c:480 +#: ../plug-ins/common/value-propagate.c:1090 msgid "Value Propagate" msgstr "Propagar valor" #. Parameter settings -#: ../plug-ins/common/value-propagate.c:1153 +#: ../plug-ins/common/value-propagate.c:1157 msgid "Propagate" msgstr "Propagar" -#: ../plug-ins/common/value-propagate.c:1166 +#: ../plug-ins/common/value-propagate.c:1170 msgid "Lower t_hreshold:" msgstr "Umbral in_ferior:" -#: ../plug-ins/common/value-propagate.c:1178 +#: ../plug-ins/common/value-propagate.c:1182 msgid "_Upper threshold:" msgstr "Um_bral superior:" -#: ../plug-ins/common/value-propagate.c:1190 +#: ../plug-ins/common/value-propagate.c:1194 msgid "_Propagating rate:" msgstr "Tasa de _propagación:" -#: ../plug-ins/common/value-propagate.c:1201 +#: ../plug-ins/common/value-propagate.c:1205 msgid "To l_eft" msgstr "A la izqui_erda" -#: ../plug-ins/common/value-propagate.c:1204 +#: ../plug-ins/common/value-propagate.c:1208 msgid "To _right" msgstr "A la de_recha" -#: ../plug-ins/common/value-propagate.c:1207 +#: ../plug-ins/common/value-propagate.c:1211 msgid "To _top" msgstr "A la c_ima" -#: ../plug-ins/common/value-propagate.c:1210 +#: ../plug-ins/common/value-propagate.c:1214 msgid "To _bottom" msgstr "Al f_ondo" -#: ../plug-ins/common/value-propagate.c:1219 +#: ../plug-ins/common/value-propagate.c:1223 msgid "Propagating _alpha channel" msgstr "Propagando canal _alfa" -#: ../plug-ins/common/value-propagate.c:1230 +#: ../plug-ins/common/value-propagate.c:1234 msgid "Propagating value channel" msgstr "Propagando canal de valor" @@ -8735,64 +8736,64 @@ #: ../plug-ins/file-bmp/bmp-read.c:222 ../plug-ins/file-bmp/bmp-read.c:232 #: ../plug-ins/file-bmp/bmp-read.c:239 ../plug-ins/file-bmp/bmp-read.c:248 -#: ../plug-ins/file-bmp/bmp-read.c:263 ../plug-ins/file-bmp/bmp-read.c:445 -#: ../plug-ins/file-bmp/bmp-read.c:466 ../plug-ins/file-bmp/bmp-read.c:477 -#: ../plug-ins/file-bmp/bmp-read.c:485 ../plug-ins/file-bmp/bmp-read.c:493 -#: ../plug-ins/file-bmp/bmp-read.c:505 +#: ../plug-ins/file-bmp/bmp-read.c:263 ../plug-ins/file-bmp/bmp-read.c:465 +#: ../plug-ins/file-bmp/bmp-read.c:486 ../plug-ins/file-bmp/bmp-read.c:497 +#: ../plug-ins/file-bmp/bmp-read.c:505 ../plug-ins/file-bmp/bmp-read.c:513 +#: ../plug-ins/file-bmp/bmp-read.c:525 #, c-format msgid "'%s' is not a valid BMP file" msgstr "«%s» no es un archivo BMP válido" #: ../plug-ins/file-bmp/bmp-read.c:277 ../plug-ins/file-bmp/bmp-read.c:304 -#: ../plug-ins/file-bmp/bmp-read.c:332 ../plug-ins/file-bmp/bmp-read.c:361 -#: ../plug-ins/file-bmp/bmp-read.c:391 ../plug-ins/file-bmp/bmp-read.c:425 +#: ../plug-ins/file-bmp/bmp-read.c:336 ../plug-ins/file-bmp/bmp-read.c:373 +#: ../plug-ins/file-bmp/bmp-read.c:403 ../plug-ins/file-bmp/bmp-read.c:445 #, c-format msgid "Error reading BMP file header from '%s'" msgstr "Ocurrió un error al leer cabecera del archivo BMP de «%s»" -#: ../plug-ins/file-bmp/bmp-read.c:350 +#: ../plug-ins/file-bmp/bmp-read.c:358 #, c-format msgid "Unsupported compression (%lu) in BMP file from '%s'" msgstr "Modo de compresión (%lu) no soportado en el archivo BMP de «%s»" -#: ../plug-ins/file-bmp/bmp-read.c:621 +#: ../plug-ins/file-bmp/bmp-read.c:641 msgid "Unrecognized or invalid BMP compression format." msgstr "Formato de compresión BMP no reconocido o no válido." -#: ../plug-ins/file-bmp/bmp-read.c:663 +#: ../plug-ins/file-bmp/bmp-read.c:683 msgid "Unsupported or invalid bitdepth." msgstr "Profundidad de bits no soportada o no válida." -#: ../plug-ins/file-bmp/bmp-read.c:815 ../plug-ins/file-bmp/bmp-read.c:856 -#: ../plug-ins/file-bmp/bmp-read.c:906 +#: ../plug-ins/file-bmp/bmp-read.c:835 ../plug-ins/file-bmp/bmp-read.c:876 +#: ../plug-ins/file-bmp/bmp-read.c:926 msgid "The bitmap ends unexpectedly." msgstr "El mapa de bits finaliza inesperadamente." -#: ../plug-ins/file-bmp/bmp-write.c:191 ../plug-ins/file-bmp/bmp-write.c:217 +#: ../plug-ins/file-bmp/bmp-write.c:193 ../plug-ins/file-bmp/bmp-write.c:219 msgid "Cannot save indexed image with transparency in BMP file format." msgstr "" "No se puede guardar una imagen indexada con transparencia en formato de " "archivo BMP." -#: ../plug-ins/file-bmp/bmp-write.c:193 ../plug-ins/file-bmp/bmp-write.c:219 +#: ../plug-ins/file-bmp/bmp-write.c:195 ../plug-ins/file-bmp/bmp-write.c:221 msgid "Alpha channel will be ignored." msgstr "El canal alfa se ignorará." #. Run-Length Encoded -#: ../plug-ins/file-bmp/bmp-write.c:864 +#: ../plug-ins/file-bmp/bmp-write.c:870 msgid "_Run-Length Encoded" msgstr "Codificación _Run-Lenght" #. Compatibility Options -#: ../plug-ins/file-bmp/bmp-write.c:877 +#: ../plug-ins/file-bmp/bmp-write.c:883 msgid "Co_mpatibility Options" msgstr "Opciones de co_mpatibilidad" -#: ../plug-ins/file-bmp/bmp-write.c:887 +#: ../plug-ins/file-bmp/bmp-write.c:893 msgid "_Do not write color space information" msgstr "No escribir la información del espacio _de colores" -#: ../plug-ins/file-bmp/bmp-write.c:889 +#: ../plug-ins/file-bmp/bmp-write.c:895 msgid "" "Some applications can not read BMP images that include color space " "information. GIMP writes color space information by default. Enabling this " @@ -8804,19 +8805,19 @@ "información del espacio de color en el archivo." #. Advanced Options -#: ../plug-ins/file-bmp/bmp-write.c:905 ../plug-ins/file-jpeg/jpeg-save.c:924 +#: ../plug-ins/file-bmp/bmp-write.c:911 ../plug-ins/file-jpeg/jpeg-save.c:924 msgid "_Advanced Options" msgstr "_Opciones avanzadas" -#: ../plug-ins/file-bmp/bmp-write.c:920 +#: ../plug-ins/file-bmp/bmp-write.c:926 msgid "16 bits" msgstr "16 bits" -#: ../plug-ins/file-bmp/bmp-write.c:956 +#: ../plug-ins/file-bmp/bmp-write.c:962 msgid "24 bits" msgstr "24 bits" -#: ../plug-ins/file-bmp/bmp-write.c:973 +#: ../plug-ins/file-bmp/bmp-write.c:979 msgid "32 bits" msgstr "32 bits" @@ -8824,19 +8825,25 @@ msgid "Windows BMP image" msgstr "Imagen BMP de Windows" -#: ../plug-ins/file-compressor/file-compressor.c:166 +#: ../plug-ins/file-compressor/file-compressor.c:167 msgid "gzip archive" msgstr "archivador gzip" -#: ../plug-ins/file-compressor/file-compressor.c:185 +#: ../plug-ins/file-compressor/file-compressor.c:186 msgid "bzip archive" msgstr "archivador bzip" -#: ../plug-ins/file-compressor/file-compressor.c:392 +#: ../plug-ins/file-compressor/file-compressor.c:393 msgid "No sensible file extension, saving as compressed XCF." msgstr "No hay una extensión razonable, guardando como XCF comprimido." -#: ../plug-ins/file-compressor/file-compressor.c:448 +#: ../plug-ins/file-compressor/file-compressor.c:416 +#, c-format +#| msgid "Compression" +msgid "Compressing '%s'" +msgstr "Comprimiendo «%s»" + +#: ../plug-ins/file-compressor/file-compressor.c:453 msgid "No sensible file extension, attempting to load with file magic." msgstr "" "No hay una extensión razonable, intentando cargar mediante magia de archivos." @@ -9216,12 +9223,12 @@ msgid "Unsupported or invalid layer mask size: %dx%d" msgstr "Tamaño de la máscara de capa no soportado o no válido: %dx%d" -#: ../plug-ins/file-psd/psd-load.c:1231 ../plug-ins/file-psd/psd-load.c:1620 +#: ../plug-ins/file-psd/psd-load.c:1236 ../plug-ins/file-psd/psd-load.c:1631 #, c-format msgid "Unsupported compression mode: %d" msgstr "Modo de compresión no soportado: %d" -#: ../plug-ins/file-psd/psd-load.c:1412 +#: ../plug-ins/file-psd/psd-load.c:1423 msgid "" "Warning\n" "The layer mask is partly outside the layer boundary. The mask will be " @@ -9231,11 +9238,11 @@ "La máscara de capa está parcialmente fuera de los límites de la capa. Las " "máscara se recortará, lo que puede producir pérdida de datos-" -#: ../plug-ins/file-psd/psd-load.c:1713 +#: ../plug-ins/file-psd/psd-load.c:1724 msgid "Extra" msgstr "Extra" -#: ../plug-ins/file-psd/psd-load.c:1888 +#: ../plug-ins/file-psd/psd-load.c:1899 #, c-format msgid "Unsupported or invalid channel size" msgstr "Tamaño del canal no soportado o no válido" @@ -10385,14 +10392,14 @@ msgid "_Gfig..." msgstr "_Gfig…" -#: ../plug-ins/gfig/gfig.c:734 +#: ../plug-ins/gfig/gfig.c:738 msgid "" "Error trying to save figure as a parasite: can't attach parasite to drawable." msgstr "" "Se produjo un error al intentar guardar la figura como un parásito: no se " "puede adjuntar un parásito a un dibujable." -#: ../plug-ins/gfig/gfig.c:761 +#: ../plug-ins/gfig/gfig.c:765 #, c-format msgid "Error trying to open temporary file '%s' for parasite loading: %s" msgstr "" @@ -11486,29 +11493,38 @@ msgid "The GIMP user manual is not available." msgstr "No está disponible el manual de usuario de GIMP." -#: ../plug-ins/help/gimphelpdomain.c:187 +#. TRANSLATORS: do not end the URL with a dot, +#. * it would be in the link. Because of +#. * technical limitations, make sure the URL +#. * ends with a space, a newline or is end of text. +#. * Cf. bug 762282. +#. +#: ../plug-ins/help/gimphelpdomain.c:193 +#| msgid "" +#| "Please install the additional help package or use the online user manual " +#| "at http://docs.gimp.org/." msgid "" -"Please install the additional help package or use the online user manual at " -"http://docs.gimp.org/." +"Please install the additional help package or use the online user manual at: " +"http://docs.gimp.org/" msgstr "" -"Por favor, instale el paquete adicional de ayuda o use el manual en línea en " -"http://docs.gimp.org/." +"Instale el paquete adicional de ayuda o use el manual en línea en http://" +"docs.gimp.org/" -#: ../plug-ins/help/gimphelpdomain.c:196 +#: ../plug-ins/help/gimphelpdomain.c:202 msgid "Perhaps you are missing GIO backends and need to install GVFS?" msgstr "¿Quizá le faltan los «backends» de GIO y necesita instalar GVFS?" -#: ../plug-ins/help/gimphelpdomain.c:215 +#: ../plug-ins/help/gimphelpdomain.c:221 #, c-format msgid "Help ID '%s' unknown" msgstr "El ID de la ayuda «%s» es desconocido" -#: ../plug-ins/help/gimphelplocale.c:208 +#: ../plug-ins/help/gimphelplocale.c:257 #, c-format msgid "Loading index from '%s'" msgstr "Cargando el índice desde «%s»" -#: ../plug-ins/help/gimphelplocale.c:266 +#: ../plug-ins/help/gimphelplocale.c:315 #, c-format msgid "" "Parse error in '%s':\n" diff -Nru gimp-2.8.18/po-plug-ins/fi.po gimp-2.8.20/po-plug-ins/fi.po --- gimp-2.8.18/po-plug-ins/fi.po 2015-08-20 22:57:32.000000000 +0000 +++ gimp-2.8.20/po-plug-ins/fi.po 2017-01-28 19:08:46.000000000 +0000 @@ -7,21 +7,23 @@ # Ilkka Tuohela , 2006. # Aapo Rantalainen , 2009. # Lasse Liehu , 2014. +# Jiri Grönroos , 2016. +# msgid "" msgstr "" "Project-Id-Version: gimp-plug-ins\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2014-05-21 05:24+0000\n" -"PO-Revision-Date: 2014-05-21 18:15+0300\n" -"Last-Translator: Lasse Liehu \n" -"Language-Team: Finnish \n" +"product=gimp&keywords=I18N+L10N&component=Internationalisation\n" +"POT-Creation-Date: 2016-10-09 07:44+0000\n" +"PO-Revision-Date: 2016-10-09 11:43+0300\n" +"Last-Translator: Jiri Grönroos \n" +"Language-Team: suomi \n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Gtranslator 2.91.7\n" #: ../plug-ins/color-rotate/color-rotate-dialog.c:120 msgid "Original" @@ -279,7 +281,7 @@ #. Propagate Mode #: ../plug-ins/common/alien-map.c:516 ../plug-ins/common/hot.c:613 -#: ../plug-ins/common/value-propagate.c:1121 ../plug-ins/common/waves.c:279 +#: ../plug-ins/common/value-propagate.c:1125 ../plug-ins/common/waves.c:279 msgid "Mode" msgstr "Toimintatapa" @@ -618,23 +620,22 @@ #. * Create the "background" layer to hold the image... #. #: ../plug-ins/common/blinds.c:279 ../plug-ins/common/compose.c:936 -#: ../plug-ins/common/decompose.c:729 ../plug-ins/common/file-cel.c:442 -#: ../plug-ins/common/file-cel.c:445 ../plug-ins/common/file-dicom.c:612 -#: ../plug-ins/common/file-gif-load.c:943 +#: ../plug-ins/common/decompose.c:729 ../plug-ins/common/file-cel.c:445 +#: ../plug-ins/common/file-cel.c:448 ../plug-ins/common/file-dicom.c:612 +#: ../plug-ins/common/file-gif-load.c:980 #: ../plug-ins/common/file-jp2-load.c:356 ../plug-ins/common/file-pcx.c:426 #: ../plug-ins/common/file-pcx.c:432 ../plug-ins/common/file-pix.c:384 -#: ../plug-ins/common/file-png.c:897 ../plug-ins/common/file-pnm.c:585 -#: ../plug-ins/common/file-raw.c:781 ../plug-ins/common/file-sunras.c:979 -#: ../plug-ins/common/file-tga.c:1073 ../plug-ins/common/file-tiff-load.c:1010 +#: ../plug-ins/common/file-png.c:898 ../plug-ins/common/file-pnm.c:585 +#: ../plug-ins/common/file-raw.c:780 ../plug-ins/common/file-sunras.c:979 +#: ../plug-ins/common/file-tga.c:1095 ../plug-ins/common/file-tiff-load.c:1011 #: ../plug-ins/common/file-xbm.c:898 ../plug-ins/common/film.c:745 #: ../plug-ins/common/smooth-palette.c:257 ../plug-ins/common/tile.c:262 -#: ../plug-ins/file-bmp/bmp-read.c:680 ../plug-ins/file-faxg3/faxg3.c:474 +#: ../plug-ins/file-bmp/bmp-read.c:700 ../plug-ins/file-faxg3/faxg3.c:474 #: ../plug-ins/file-fits/fits.c:532 ../plug-ins/file-jpeg/jpeg-load.c:260 #: ../plug-ins/file-jpeg/jpeg-load.c:824 #: ../plug-ins/file-psd/psd-image-res-load.c:1001 -#: ../plug-ins/file-psd/psd-load.c:1644 ../plug-ins/file-sgi/sgi.c:409 -#: ../plug-ins/gfig/gfig-dialog.c:1321 -#: ../plug-ins/gimpressionist/general.c:139 +#: ../plug-ins/file-psd/psd-load.c:1655 ../plug-ins/file-sgi/sgi.c:409 +#: ../plug-ins/gfig/gfig-dialog.c:1321 ../plug-ins/gimpressionist/general.c:139 #: ../plug-ins/map-object/map-object-apply.c:252 ../plug-ins/twain/twain.c:567 #: ../plug-ins/win-snap/winsnap.c:1162 msgid "Background" @@ -671,7 +672,7 @@ #: ../plug-ins/common/edge-dog.c:269 ../plug-ins/common/edge-neon.c:228 #: ../plug-ins/common/edge-sobel.c:212 ../plug-ins/common/photocopy.c:244 #: ../plug-ins/common/pixelize.c:293 ../plug-ins/common/softglow.c:224 -#: ../plug-ins/file-sgi/sgi.c:560 ../plug-ins/file-xjt/xjt.c:1687 +#: ../plug-ins/file-sgi/sgi.c:560 ../plug-ins/file-xjt/xjt.c:1691 #: ../plug-ins/gradient-flare/gradient-flare.c:966 msgid "Cannot operate on indexed color images." msgstr "Ei voi toimia indeksoiduilla kuvilla" @@ -1030,16 +1031,16 @@ #. stat error (file does not exist) #: ../plug-ins/common/channel-mixer.c:980 #: ../plug-ins/common/cml-explorer.c:2208 ../plug-ins/common/curve-bend.c:891 -#: ../plug-ins/common/file-cel.c:297 ../plug-ins/common/file-cel.c:349 -#: ../plug-ins/common/file-cel.c:580 ../plug-ins/common/file-dicom.c:340 -#: ../plug-ins/common/file-gbr.c:370 ../plug-ins/common/file-gif-load.c:355 +#: ../plug-ins/common/file-cel.c:300 ../plug-ins/common/file-cel.c:352 +#: ../plug-ins/common/file-cel.c:583 ../plug-ins/common/file-dicom.c:340 +#: ../plug-ins/common/file-gbr.c:370 ../plug-ins/common/file-gif-load.c:357 #: ../plug-ins/common/file-gih.c:642 ../plug-ins/common/file-jp2-load.c:196 #: ../plug-ins/common/file-jp2-load.c:205 ../plug-ins/common/file-mng.c:1156 #: ../plug-ins/common/file-pat.c:339 ../plug-ins/common/file-pcx.c:362 #: ../plug-ins/common/file-pix.c:345 ../plug-ins/common/file-png.c:762 #: ../plug-ins/common/file-pnm.c:496 ../plug-ins/common/file-ps.c:1019 #: ../plug-ins/common/file-ps.c:2915 ../plug-ins/common/file-psp.c:1717 -#: ../plug-ins/common/file-raw.c:257 ../plug-ins/common/file-raw.c:729 +#: ../plug-ins/common/file-raw.c:257 ../plug-ins/common/file-raw.c:728 #: ../plug-ins/common/file-sunras.c:393 ../plug-ins/common/file-svg.c:333 #: ../plug-ins/common/file-svg.c:713 ../plug-ins/common/file-tga.c:443 #: ../plug-ins/common/file-xbm.c:738 ../plug-ins/common/file-xmc.c:657 @@ -1052,12 +1053,12 @@ #: ../plug-ins/file-jpeg/jpeg-load.c:894 ../plug-ins/file-psd/psd-load.c:130 #: ../plug-ins/file-psd/psd-thumb-load.c:79 #: ../plug-ins/file-uri/uri-backend-libcurl.c:193 -#: ../plug-ins/file-xjt/xjt.c:2529 ../plug-ins/file-xjt/xjt.c:2537 +#: ../plug-ins/file-xjt/xjt.c:2533 ../plug-ins/file-xjt/xjt.c:2541 #: ../plug-ins/flame/flame.c:411 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1865 #: ../plug-ins/fractal-explorer/fractal-explorer.c:923 -#: ../plug-ins/gfig/gfig.c:433 ../plug-ins/help/gimphelplocale.c:222 -#: ../plug-ins/help/gimphelplocale.c:238 +#: ../plug-ins/gfig/gfig.c:433 ../plug-ins/help/gimphelplocale.c:271 +#: ../plug-ins/help/gimphelplocale.c:287 #: ../plug-ins/lighting/lighting-ui.c:1367 #, c-format msgid "Could not open '%s' for reading: %s" @@ -1069,26 +1070,27 @@ #: ../plug-ins/common/channel-mixer.c:1058 #: ../plug-ins/common/cml-explorer.c:2035 ../plug-ins/common/curve-bend.c:839 -#: ../plug-ins/common/file-cel.c:773 ../plug-ins/common/file-csource.c:407 +#: ../plug-ins/common/file-cel.c:776 ../plug-ins/common/file-csource.c:407 #: ../plug-ins/common/file-dicom.c:1371 ../plug-ins/common/file-gbr.c:665 #: ../plug-ins/common/file-gif-save.c:792 ../plug-ins/common/file-gih.c:1260 #: ../plug-ins/common/file-html-table.c:236 ../plug-ins/common/file-mng.c:649 #: ../plug-ins/common/file-mng.c:984 ../plug-ins/common/file-pat.c:488 -#: ../plug-ins/common/file-pcx.c:713 ../plug-ins/common/file-pix.c:528 -#: ../plug-ins/common/file-png.c:1369 ../plug-ins/common/file-pnm.c:1012 -#: ../plug-ins/common/file-ps.c:1195 ../plug-ins/common/file-raw.c:609 -#: ../plug-ins/common/file-raw.c:637 ../plug-ins/common/file-sunras.c:567 -#: ../plug-ins/common/file-tga.c:1180 ../plug-ins/common/file-tiff-save.c:838 -#: ../plug-ins/common/file-xbm.c:1037 ../plug-ins/common/file-xmc.c:1449 -#: ../plug-ins/common/file-xwd.c:637 ../plug-ins/common/sphere-designer.c:2121 -#: ../plug-ins/file-bmp/bmp-write.c:309 ../plug-ins/file-fits/fits.c:478 -#: ../plug-ins/file-fli/fli-gimp.c:752 ../plug-ins/file-ico/ico-save.c:1007 +#: ../plug-ins/common/file-pcx.c:713 ../plug-ins/common/file-pdf-save.c:438 +#: ../plug-ins/common/file-pix.c:528 ../plug-ins/common/file-png.c:1370 +#: ../plug-ins/common/file-pnm.c:1012 ../plug-ins/common/file-ps.c:1195 +#: ../plug-ins/common/file-raw.c:623 ../plug-ins/common/file-raw.c:651 +#: ../plug-ins/common/file-sunras.c:567 ../plug-ins/common/file-tga.c:1202 +#: ../plug-ins/common/file-tiff-save.c:842 ../plug-ins/common/file-xbm.c:1037 +#: ../plug-ins/common/file-xmc.c:1449 ../plug-ins/common/file-xwd.c:637 +#: ../plug-ins/common/sphere-designer.c:2121 +#: ../plug-ins/file-bmp/bmp-write.c:311 ../plug-ins/file-fits/fits.c:478 +#: ../plug-ins/file-fli/fli-gimp.c:752 ../plug-ins/file-ico/ico-save.c:1020 #: ../plug-ins/file-jpeg/jpeg-save.c:355 ../plug-ins/file-psd/psd-save.c:1653 #: ../plug-ins/file-uri/uri-backend-libcurl.c:166 -#: ../plug-ins/file-xjt/xjt.c:1276 ../plug-ins/file-xjt/xjt.c:1715 +#: ../plug-ins/file-xjt/xjt.c:1280 ../plug-ins/file-xjt/xjt.c:1719 #: ../plug-ins/flame/flame.c:442 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1548 -#: ../plug-ins/gfig/gfig.c:797 ../plug-ins/ifs-compose/ifs-compose.c:2408 +#: ../plug-ins/gfig/gfig.c:801 ../plug-ins/ifs-compose/ifs-compose.c:2408 #: ../plug-ins/lighting/lighting-ui.c:1223 #, c-format msgid "Could not open '%s' for writing: %s" @@ -1764,7 +1766,7 @@ msgstr "" #: ../plug-ins/common/compose.c:189 ../plug-ins/common/decompose.c:170 -#: ../plug-ins/common/file-raw.c:1118 +#: ../plug-ins/common/file-raw.c:1117 msgid "RGB" msgstr "RGB" @@ -1971,8 +1973,7 @@ msgid "Stretch brightness values to cover the full range" msgstr "Venytä valoisuus arvoja täyttämään koko alueen" -#: ../plug-ins/common/contrast-normalize.c:91 -#: ../plug-ins/common/edge-dog.c:362 +#: ../plug-ins/common/contrast-normalize.c:91 ../plug-ins/common/edge-dog.c:362 msgid "_Normalize" msgstr "_Normalisoi" @@ -2086,9 +2087,9 @@ msgid "E_xtend" msgstr "_Laajenna" -#: ../plug-ins/common/convolution-matrix.c:74 -#: ../plug-ins/common/displace.c:477 ../plug-ins/common/edge.c:700 -#: ../plug-ins/common/fractal-trace.c:737 ../plug-ins/common/ripple.c:585 +#: ../plug-ins/common/convolution-matrix.c:74 ../plug-ins/common/displace.c:477 +#: ../plug-ins/common/edge.c:700 ../plug-ins/common/fractal-trace.c:737 +#: ../plug-ins/common/ripple.c:585 msgid "_Wrap" msgstr "_Kiedo" @@ -2125,7 +2126,7 @@ msgstr "Jakaja:" #: ../plug-ins/common/convolution-matrix.c:1001 -#: ../plug-ins/common/depth-merge.c:775 ../plug-ins/common/file-raw.c:1139 +#: ../plug-ins/common/depth-merge.c:775 ../plug-ins/common/file-raw.c:1138 msgid "O_ffset:" msgstr "Siirtymä:" @@ -2177,7 +2178,7 @@ msgid "Zealous cropping" msgstr "Tiukka automaattinen rajaus" -#: ../plug-ins/common/crop-zealous.c:252 +#: ../plug-ins/common/crop-zealous.c:253 msgid "Nothing to crop." msgstr "Ei rajattavaa." @@ -2675,7 +2676,7 @@ #: ../plug-ins/common/destripe.c:476 ../plug-ins/common/file-html-table.c:584 #: ../plug-ins/common/file-ps.c:3039 ../plug-ins/common/file-ps.c:3237 -#: ../plug-ins/common/file-raw.c:1152 ../plug-ins/common/smooth-palette.c:437 +#: ../plug-ins/common/file-raw.c:1151 ../plug-ins/common/smooth-palette.c:437 #: ../plug-ins/common/tile-paper.c:303 ../plug-ins/common/tile.c:428 #: ../plug-ins/imagemap/imap_cmd_guides.c:164 #: ../plug-ins/imagemap/imap_rectangle.c:401 @@ -2987,7 +2988,7 @@ #: ../plug-ins/common/engrave.c:245 ../plug-ins/common/file-html-table.c:600 #: ../plug-ins/common/file-ps.c:3049 ../plug-ins/common/file-ps.c:3246 -#: ../plug-ins/common/file-raw.c:1165 ../plug-ins/common/film.c:1002 +#: ../plug-ins/common/file-raw.c:1164 ../plug-ins/common/film.c:1002 #: ../plug-ins/common/smooth-palette.c:442 ../plug-ins/common/tile-paper.c:314 #: ../plug-ins/common/tile.c:432 ../plug-ins/imagemap/imap_cmd_guides.c:174 #: ../plug-ins/imagemap/imap_rectangle.c:408 @@ -3005,10 +3006,9 @@ #. Create the actual window. #: ../plug-ins/common/file-aa.c:351 -#, fuzzy #| msgid "Texture" msgid "Text" -msgstr "Kuvio" +msgstr "Teksti" #: ../plug-ins/common/file-aa.c:359 msgid "_Format:" @@ -3022,8 +3022,8 @@ msgid "Load KISS Palette" msgstr "Ladataan KISS paletti" -#: ../plug-ins/common/file-cel.c:309 ../plug-ins/common/file-cel.c:364 -#: ../plug-ins/common/file-cel.c:384 +#: ../plug-ins/common/file-cel.c:312 ../plug-ins/common/file-cel.c:367 +#: ../plug-ins/common/file-cel.c:387 #, fuzzy, c-format #| msgid "Error while reading '%s'. File corrupted?" msgid "EOF or error while reading image header" @@ -3033,13 +3033,13 @@ #. column, highest column ever used #. -1 assume fsel is not available (and not attached to any drawable) #. -1 assume there is no floating selection -#: ../plug-ins/common/file-cel.c:354 ../plug-ins/common/file-dicom.c:345 -#: ../plug-ins/common/file-gbr.c:375 ../plug-ins/common/file-gif-load.c:360 +#: ../plug-ins/common/file-cel.c:357 ../plug-ins/common/file-dicom.c:345 +#: ../plug-ins/common/file-gbr.c:375 ../plug-ins/common/file-gif-load.c:362 #: ../plug-ins/common/file-gih.c:647 ../plug-ins/common/file-jp2-load.c:189 #: ../plug-ins/common/file-pat.c:344 ../plug-ins/common/file-pcx.c:367 #: ../plug-ins/common/file-pdf-load.c:861 ../plug-ins/common/file-pix.c:350 -#: ../plug-ins/common/file-png.c:769 ../plug-ins/common/file-pnm.c:501 -#: ../plug-ins/common/file-ps.c:1025 ../plug-ins/common/file-raw.c:734 +#: ../plug-ins/common/file-png.c:770 ../plug-ins/common/file-pnm.c:501 +#: ../plug-ins/common/file-ps.c:1025 ../plug-ins/common/file-raw.c:733 #: ../plug-ins/common/file-sunras.c:489 ../plug-ins/common/file-tga.c:448 #: ../plug-ins/common/file-tiff-load.c:611 ../plug-ins/common/file-wmf.c:994 #: ../plug-ins/common/file-xbm.c:743 ../plug-ins/common/file-xmc.c:669 @@ -3047,89 +3047,89 @@ #: ../plug-ins/file-bmp/bmp-read.c:211 ../plug-ins/file-faxg3/faxg3.c:213 #: ../plug-ins/file-fli/fli-gimp.c:503 ../plug-ins/file-ico/ico-load.c:644 #: ../plug-ins/file-jpeg/jpeg-load.c:128 ../plug-ins/file-psd/psd-load.c:135 -#: ../plug-ins/file-sgi/sgi.c:332 ../plug-ins/file-xjt/xjt.c:3333 +#: ../plug-ins/file-sgi/sgi.c:332 ../plug-ins/file-xjt/xjt.c:3337 #, c-format msgid "Opening '%s'" msgstr "Avataan \"%s\"" -#: ../plug-ins/common/file-cel.c:392 -#, fuzzy, c-format +#: ../plug-ins/common/file-cel.c:395 +#, c-format #| msgid "'%s' is not a PCX file" msgid "is not a CEL image file" -msgstr "'%s' ei ole PCX tiedosto" +msgstr "ei ole CEL-kuvatiedosto" -#: ../plug-ins/common/file-cel.c:406 +#: ../plug-ins/common/file-cel.c:409 #, c-format msgid "illegal bpp value in image: %hhu" msgstr "" -#: ../plug-ins/common/file-cel.c:420 +#: ../plug-ins/common/file-cel.c:423 #, c-format msgid "" "illegal image dimensions: width: %d, horizontal offset: %d, height: %d, " "vertical offset: %d" msgstr "" -#: ../plug-ins/common/file-cel.c:433 +#: ../plug-ins/common/file-cel.c:436 #, c-format msgid "Can't create a new image" msgstr "Ei voi luoda uutta kuvaa" -#: ../plug-ins/common/file-cel.c:471 ../plug-ins/common/file-cel.c:506 -#: ../plug-ins/common/file-cel.c:531 +#: ../plug-ins/common/file-cel.c:474 ../plug-ins/common/file-cel.c:509 +#: ../plug-ins/common/file-cel.c:534 #, fuzzy, c-format #| msgid "Error while reading '%s'. File corrupted?" msgid "EOF or error while reading image data" msgstr "Virhe luettaessa '%s'. Tiedosto korruptoitunut?" -#: ../plug-ins/common/file-cel.c:548 +#: ../plug-ins/common/file-cel.c:551 #, c-format msgid "Unsupported bit depth (%d)!" msgstr "Värejä on väärä määrä (%d)" -#: ../plug-ins/common/file-cel.c:630 ../plug-ins/common/file-cel.c:642 +#: ../plug-ins/common/file-cel.c:633 ../plug-ins/common/file-cel.c:645 #, c-format msgid "'%s': EOF or error while reading palette header" msgstr "" -#: ../plug-ins/common/file-cel.c:651 -#, fuzzy, c-format +#: ../plug-ins/common/file-cel.c:654 +#, c-format #| msgid "'%s' is not a PCX file" msgid "'%s': is not a KCF palette file" -msgstr "'%s' ei ole PCX tiedosto" +msgstr "'%s': ei ole KCF-palettitiedosto" -#: ../plug-ins/common/file-cel.c:660 +#: ../plug-ins/common/file-cel.c:663 #, c-format msgid "'%s': illegal bpp value in palette: %hhu" msgstr "" -#: ../plug-ins/common/file-cel.c:669 +#: ../plug-ins/common/file-cel.c:672 #, fuzzy, c-format #| msgid "Number of colors:" msgid "'%s': illegal number of colors: %u" msgstr "Värien lukumäärä:" -#: ../plug-ins/common/file-cel.c:684 ../plug-ins/common/file-cel.c:701 -#: ../plug-ins/common/file-cel.c:721 +#: ../plug-ins/common/file-cel.c:687 ../plug-ins/common/file-cel.c:704 +#: ../plug-ins/common/file-cel.c:724 #, c-format msgid "'%s': EOF or error while reading palette data" msgstr "" #. init the progress meter #. And let's begin the progress -#: ../plug-ins/common/file-cel.c:778 ../plug-ins/common/file-gbr.c:670 +#: ../plug-ins/common/file-cel.c:781 ../plug-ins/common/file-gbr.c:670 #: ../plug-ins/common/file-gif-save.c:799 ../plug-ins/common/file-gih.c:1265 #: ../plug-ins/common/file-html-table.c:257 ../plug-ins/common/file-pat.c:493 #: ../plug-ins/common/file-pcx.c:645 ../plug-ins/common/file-pix.c:533 -#: ../plug-ins/common/file-png.c:1376 ../plug-ins/common/file-pnm.c:1017 +#: ../plug-ins/common/file-png.c:1377 ../plug-ins/common/file-pnm.c:1017 #: ../plug-ins/common/file-ps.c:1200 ../plug-ins/common/file-sunras.c:572 -#: ../plug-ins/common/file-tga.c:1185 ../plug-ins/common/file-tiff-save.c:709 +#: ../plug-ins/common/file-tga.c:1207 ../plug-ins/common/file-tiff-save.c:713 #: ../plug-ins/common/file-xbm.c:1042 ../plug-ins/common/file-xmc.c:1454 #: ../plug-ins/common/file-xpm.c:639 ../plug-ins/common/file-xwd.c:642 -#: ../plug-ins/file-bmp/bmp-write.c:320 ../plug-ins/file-fits/fits.c:483 -#: ../plug-ins/file-fli/fli-gimp.c:720 ../plug-ins/file-ico/ico-save.c:1001 +#: ../plug-ins/file-bmp/bmp-write.c:322 ../plug-ins/file-fits/fits.c:483 +#: ../plug-ins/file-fli/fli-gimp.c:720 ../plug-ins/file-ico/ico-save.c:1014 #: ../plug-ins/file-jpeg/jpeg-save.c:312 ../plug-ins/file-psd/psd-save.c:1658 -#: ../plug-ins/file-sgi/sgi.c:578 ../plug-ins/file-xjt/xjt.c:1696 +#: ../plug-ins/file-sgi/sgi.c:578 ../plug-ins/file-xjt/xjt.c:1700 #, c-format msgid "Saving '%s'" msgstr "Tallennetaan \"%s\"" @@ -3180,7 +3180,7 @@ #. #: ../plug-ins/common/file-csource.c:798 msgid "Save as _RGB565 (16-bit)" -msgstr "" +msgstr "Tallenna _RGB565-muodossa (16-bit)" #: ../plug-ins/common/file-csource.c:821 msgid "Op_acity:" @@ -3215,7 +3215,7 @@ #: ../plug-ins/common/file-dicom.c:1354 ../plug-ins/common/file-ps.c:1185 #: ../plug-ins/common/file-ps.c:1217 ../plug-ins/common/file-xwd.c:627 -#: ../plug-ins/file-fits/fits.c:468 ../plug-ins/file-xjt/xjt.c:1691 +#: ../plug-ins/file-fits/fits.c:468 ../plug-ins/file-xjt/xjt.c:1695 msgid "Cannot operate on unknown image types." msgstr "Ei voi käsitellä tuntemattomia kuvatyyppejä." @@ -3259,11 +3259,11 @@ msgstr "Sivellin" #. attach labels -#: ../plug-ins/common/file-gbr.c:786 ../plug-ins/common/grid.c:792 +#: ../plug-ins/common/file-gbr.c:787 ../plug-ins/common/grid.c:792 msgid "Spacing:" msgstr "Välistys:" -#: ../plug-ins/common/file-gbr.c:797 ../plug-ins/common/file-gih.c:890 +#: ../plug-ins/common/file-gbr.c:799 ../plug-ins/common/file-gih.c:890 #: ../plug-ins/common/file-pat.c:570 ../plug-ins/gimpressionist/presets.c:666 msgid "Description:" msgstr "Kuvaus:" @@ -3273,36 +3273,36 @@ msgid "GIF image" msgstr "GIF-kuva" -#: ../plug-ins/common/file-gif-load.c:372 +#: ../plug-ins/common/file-gif-load.c:374 msgid "This is not a GIF file" msgstr "Tämä ei ole GIF-kuva" -#: ../plug-ins/common/file-gif-load.c:411 +#: ../plug-ins/common/file-gif-load.c:413 msgid "Non-square pixels. Image might look squashed." msgstr "Pikselisuhde ei ole neliömäinen. Kuva voi näyttää litistyneeltä." -#: ../plug-ins/common/file-gif-load.c:945 +#: ../plug-ins/common/file-gif-load.c:982 #, c-format msgid "Background (%d%s)" msgstr "Tausta (%d%s)" -#: ../plug-ins/common/file-gif-load.c:968 +#: ../plug-ins/common/file-gif-load.c:1005 #, c-format msgid "Opening '%s' (frame %d)" msgstr "Avataan \"%s\" (ruutu %d)" -#: ../plug-ins/common/file-gif-load.c:997 ../plug-ins/common/iwarp.c:792 +#: ../plug-ins/common/file-gif-load.c:1034 ../plug-ins/common/iwarp.c:792 #: ../plug-ins/common/iwarp.c:827 #, c-format msgid "Frame %d" msgstr "Ruutu %d" -#: ../plug-ins/common/file-gif-load.c:999 +#: ../plug-ins/common/file-gif-load.c:1036 #, c-format msgid "Frame %d (%d%s)" msgstr "Ruutu %d (%d%s)" -#: ../plug-ins/common/file-gif-load.c:1030 +#: ../plug-ins/common/file-gif-load.c:1067 #, c-format msgid "" "GIF: Undocumented GIF composite type %d is not handled. Animation might not " @@ -3353,7 +3353,7 @@ #: ../plug-ins/common/file-gif-save.c:1135 msgid "GIF" -msgstr "" +msgstr "GIF" #: ../plug-ins/common/file-gif-save.c:1143 #, fuzzy, c-format @@ -3587,10 +3587,9 @@ msgstr "Solujen välin leveys." #: ../plug-ins/common/file-jp2-load.c:96 -#, fuzzy #| msgid "JPEG image" msgid "JPEG 2000 image" -msgstr "JPEG-kuva" +msgstr "JPEG 2000 -kuva" #: ../plug-ins/common/file-jp2-load.c:214 #, fuzzy, c-format @@ -3655,15 +3654,14 @@ #. Inform the user that we couldn't losslessly save the #. * transparency & just use the full palette -#: ../plug-ins/common/file-mng.c:534 ../plug-ins/common/file-png.c:1913 +#: ../plug-ins/common/file-mng.c:534 ../plug-ins/common/file-png.c:1914 msgid "Couldn't losslessly save transparency, saving opacity instead." msgstr "Läpinäkyvyyttä voi voi tallentaa, tallennetaan peittävänä." #: ../plug-ins/common/file-mng.c:1335 -#, fuzzy #| msgid "PNG" msgid "MNG" -msgstr "PNG" +msgstr "MNG" #: ../plug-ins/common/file-mng.c:1342 msgid "MNG Options" @@ -3690,7 +3688,7 @@ msgstr "Tallenna aikaleima" #. Dialog init -#: ../plug-ins/common/file-mng.c:1411 ../plug-ins/common/file-png.c:1962 +#: ../plug-ins/common/file-mng.c:1411 ../plug-ins/common/file-png.c:1963 msgid "PNG" msgstr "PNG" @@ -3789,7 +3787,7 @@ #: ../plug-ins/common/file-pcx.c:133 ../plug-ins/common/file-pcx.c:152 msgid "ZSoft PCX image" -msgstr "" +msgstr "ZSoft PCX -kuva" #: ../plug-ins/common/file-pcx.c:373 #, c-format @@ -3801,13 +3799,13 @@ msgid "'%s' is not a PCX file" msgstr "'%s' ei ole PCX tiedosto" -#: ../plug-ins/common/file-pcx.c:398 ../plug-ins/file-bmp/bmp-read.c:669 +#: ../plug-ins/common/file-pcx.c:398 ../plug-ins/file-bmp/bmp-read.c:689 #: ../plug-ins/file-psd/psd-load.c:301 #, c-format msgid "Unsupported or invalid image width: %d" msgstr "Kuvan leveys ei ole tuettu tai on virheellinen: %d" -#: ../plug-ins/common/file-pcx.c:404 ../plug-ins/file-bmp/bmp-read.c:675 +#: ../plug-ins/common/file-pcx.c:404 ../plug-ins/file-bmp/bmp-read.c:695 #: ../plug-ins/file-psd/psd-load.c:293 #, c-format msgid "Unsupported or invalid image height: %d" @@ -3853,7 +3851,7 @@ msgstr "Kirjoitus tiedostoon \"%s\" epäonnistui: %s" #: ../plug-ins/common/file-pdf-load.c:300 -#: ../plug-ins/common/file-pdf-save.c:298 +#: ../plug-ins/common/file-pdf-save.c:300 msgid "Portable Document Format" msgstr "" @@ -3913,17 +3911,17 @@ msgid "pixels/%a" msgstr "pikseliä/%a" -#: ../plug-ins/common/file-pdf-save.c:313 +#: ../plug-ins/common/file-pdf-save.c:315 #, fuzzy #| msgid "Create Guides..." msgid "_Create multipage PDF..." msgstr "Luo apulinjoja..." -#: ../plug-ins/common/file-pdf-save.c:421 +#: ../plug-ins/common/file-pdf-save.c:423 msgid "You must select a file to save!" -msgstr "" +msgstr "Valitse tallennettava tiedosto!" -#: ../plug-ins/common/file-pdf-save.c:431 +#: ../plug-ins/common/file-pdf-save.c:449 #, c-format msgid "" "An error occured while creating the PDF file:\n" @@ -3932,59 +3930,57 @@ "read only!" msgstr "" -#: ../plug-ins/common/file-pdf-save.c:785 -#: ../plug-ins/common/file-pdf-save.c:902 +#: ../plug-ins/common/file-pdf-save.c:803 +#: ../plug-ins/common/file-pdf-save.c:920 msgid "Omit hidden layers and layers with zero opacity" msgstr "" -#: ../plug-ins/common/file-pdf-save.c:789 -#: ../plug-ins/common/file-pdf-save.c:906 +#: ../plug-ins/common/file-pdf-save.c:807 +#: ../plug-ins/common/file-pdf-save.c:924 msgid "Convert bitmaps to vector graphics where possible" msgstr "" -#: ../plug-ins/common/file-pdf-save.c:793 -#: ../plug-ins/common/file-pdf-save.c:910 +#: ../plug-ins/common/file-pdf-save.c:811 +#: ../plug-ins/common/file-pdf-save.c:928 msgid "Apply layer masks before saving" msgstr "" -#: ../plug-ins/common/file-pdf-save.c:796 -#: ../plug-ins/common/file-pdf-save.c:913 +#: ../plug-ins/common/file-pdf-save.c:814 +#: ../plug-ins/common/file-pdf-save.c:931 msgid "Keeping the masks will not change the output" msgstr "" -#: ../plug-ins/common/file-pdf-save.c:849 +#: ../plug-ins/common/file-pdf-save.c:867 #, fuzzy #| msgid "Separate to:" msgid "Save to:" msgstr "Erottele:" -#: ../plug-ins/common/file-pdf-save.c:853 -#, fuzzy +#: ../plug-ins/common/file-pdf-save.c:871 #| msgid "_RGB Noise..." msgid "Browse..." -msgstr "_RGB-kohina..." +msgstr "Selaa..." -#: ../plug-ins/common/file-pdf-save.c:854 +#: ../plug-ins/common/file-pdf-save.c:872 msgid "Multipage PDF export" msgstr "" -#: ../plug-ins/common/file-pdf-save.c:887 -#, fuzzy +#: ../plug-ins/common/file-pdf-save.c:905 #| msgid "Move Selected Objects" msgid "Remove the selected pages" -msgstr "Siirrä valitut objektit" +msgstr "Poista valitut sivut" -#: ../plug-ins/common/file-pdf-save.c:897 +#: ../plug-ins/common/file-pdf-save.c:915 #, fuzzy #| msgid "Print the image" msgid "Add this image" msgstr "Tulosta kuva" -#: ../plug-ins/common/file-pdf-save.c:1010 +#: ../plug-ins/common/file-pdf-save.c:1028 msgid "Error! In order to save the file, at least one image should be added!" msgstr "" -#: ../plug-ins/common/file-pdf-save.c:1333 +#: ../plug-ins/common/file-pdf-save.c:1351 #: ../plug-ins/print/print-draw-page.c:223 msgid "Cannot handle the size (either width or height) of the image." msgstr "" @@ -4013,18 +4009,18 @@ msgid "Error while reading '%s'. File corrupted?" msgstr "Virhe luettaessa '%s'. Tiedosto korruptoitunut?" -#: ../plug-ins/common/file-png.c:877 +#: ../plug-ins/common/file-png.c:878 #, c-format msgid "Unknown color model in PNG file '%s'." msgstr "Tuntematon värimalli PNG tiedostossa '%s'." -#: ../plug-ins/common/file-png.c:888 +#: ../plug-ins/common/file-png.c:889 #, fuzzy, c-format #| msgid "Could not create working folder '%s': %s" msgid "Could not create new image for '%s': %s" msgstr "Ei voi luoda työhakemistoa '%s': %s" -#: ../plug-ins/common/file-png.c:942 +#: ../plug-ins/common/file-png.c:943 msgid "" "The PNG file specifies an offset that caused the layer to be positioned " "outside the image." @@ -4032,48 +4028,47 @@ "PNG-tiedosto määrittää siirtymän, jonka takia taso sijoitetaan kuvan " "ulkopuolelle." -#: ../plug-ins/common/file-png.c:1244 +#: ../plug-ins/common/file-png.c:1245 msgid "Apply PNG Offset" msgstr "" -#: ../plug-ins/common/file-png.c:1248 +#: ../plug-ins/common/file-png.c:1249 #, fuzzy #| msgid "_Hole offset:" msgid "Ignore PNG offset" msgstr "Reiän siirtymä:" -#: ../plug-ins/common/file-png.c:1249 +#: ../plug-ins/common/file-png.c:1250 msgid "Apply PNG offset to layer" msgstr "" -#: ../plug-ins/common/file-png.c:1273 +#: ../plug-ins/common/file-png.c:1274 #, c-format msgid "" "The PNG image you are importing specifies an offset of %d, %d. Do you want " "to apply this offset to the layer?" msgstr "" -#: ../plug-ins/common/file-png.c:1341 +#: ../plug-ins/common/file-png.c:1342 #, c-format msgid "Error creating PNG write struct while saving '%s'." msgstr "" -#: ../plug-ins/common/file-png.c:1351 +#: ../plug-ins/common/file-png.c:1352 #, c-format msgid "Error while saving '%s'. Could not save image." msgstr "Virhe tallennettaessa tiedostoa \"%s\". Ei voi tallentaa." -#: ../plug-ins/common/file-png.c:1979 +#: ../plug-ins/common/file-png.c:1980 #, fuzzy, c-format #| msgid "Error loading desktop file '%s': %s" msgid "Error loading UI file '%s': %s" msgstr "Virhe ladattaessa desktop-tiedostoa '%s': %s" -#: ../plug-ins/common/file-png.c:1980 -#, fuzzy +#: ../plug-ins/common/file-png.c:1981 #| msgid "Unknown reason" msgid "Unknown error" -msgstr "Tuntematon syy" +msgstr "Tuntematon virhe" #: ../plug-ins/common/file-pnm.c:248 msgid "PNM Image" @@ -4134,10 +4129,9 @@ msgstr "Virhe luettaessa tiedostoa." #: ../plug-ins/common/file-pnm.c:1221 -#, fuzzy #| msgid "PNG" msgid "PNM" -msgstr "PNG" +msgstr "PNM" #. file save type #: ../plug-ins/common/file-pnm.c:1224 @@ -4149,10 +4143,9 @@ msgstr "Raaka" #: ../plug-ins/common/file-pnm.c:1229 -#, fuzzy #| msgid "ASCII art" msgid "ASCII" -msgstr "ASCII kuvana" +msgstr "ASCII" #: ../plug-ins/common/file-ps.c:581 ../plug-ins/common/file-ps.c:673 msgid "PostScript document" @@ -4176,7 +4169,7 @@ msgid "PostScript save cannot handle images with alpha channels" msgstr "PostScript ei voi tallentaa kuvia joissa on läpinäkyvyys" -#: ../plug-ins/common/file-ps.c:1809 ../plug-ins/common/file-tiff-load.c:1012 +#: ../plug-ins/common/file-ps.c:1809 ../plug-ins/common/file-tiff-load.c:1013 #, c-format msgid "Page %d" msgstr "Sivu %d" @@ -4271,10 +4264,9 @@ msgstr "Grafiikan antialiasointi" #: ../plug-ins/common/file-ps.c:3204 -#, fuzzy #| msgid "Save as PostScript" msgid "PostScript" -msgstr "Tallenna PostScript" +msgstr "PostScript" #. Image Size #: ../plug-ins/common/file-ps.c:3221 @@ -4307,8 +4299,7 @@ msgstr "Millimetri" #. Rotation -#: ../plug-ins/common/file-ps.c:3302 -#: ../plug-ins/map-object/map-object-ui.c:989 +#: ../plug-ins/common/file-ps.c:3302 ../plug-ins/map-object/map-object-ui.c:989 msgid "Rotation" msgstr "Pyöritys" @@ -4335,11 +4326,11 @@ #: ../plug-ins/common/file-psp.c:599 ../plug-ins/common/file-psp.c:623 msgid "Paint Shop Pro image" -msgstr "" +msgstr "Paint Shop Pro -kuva" #: ../plug-ins/common/file-psp.c:640 msgid "PSP" -msgstr "" +msgstr "PSP" #. file save type #: ../plug-ins/common/file-psp.c:643 @@ -4365,85 +4356,84 @@ msgid "Raw image data" msgstr "Raakakuva" -#: ../plug-ins/common/file-raw.c:1074 +#: ../plug-ins/common/file-raw.c:1073 msgid "Load Image from Raw Data" msgstr "Lataa kuva raakakuvasta" -#: ../plug-ins/common/file-raw.c:1108 +#: ../plug-ins/common/file-raw.c:1107 msgid "Image" msgstr "Kuva" -#: ../plug-ins/common/file-raw.c:1119 +#: ../plug-ins/common/file-raw.c:1118 msgid "RGB Alpha" msgstr "RGB-alfa" -#: ../plug-ins/common/file-raw.c:1120 +#: ../plug-ins/common/file-raw.c:1119 msgid "RGB565" -msgstr "" +msgstr "RGB565" -#: ../plug-ins/common/file-raw.c:1121 +#: ../plug-ins/common/file-raw.c:1120 msgid "Planar RGB" msgstr "Planaari-RGB" -#: ../plug-ins/common/file-raw.c:1122 +#: ../plug-ins/common/file-raw.c:1121 msgid "Indexed" msgstr "Indeksoitu" -#: ../plug-ins/common/file-raw.c:1123 +#: ../plug-ins/common/file-raw.c:1122 msgid "Indexed Alpha" msgstr "Indeksoitu alfa" -#: ../plug-ins/common/file-raw.c:1128 +#: ../plug-ins/common/file-raw.c:1127 msgid "Image _Type:" msgstr "Kuvatyyppi:" -#: ../plug-ins/common/file-raw.c:1178 +#: ../plug-ins/common/file-raw.c:1177 msgid "Palette" msgstr "Paletti" -#: ../plug-ins/common/file-raw.c:1188 ../plug-ins/common/file-raw.c:1273 +#: ../plug-ins/common/file-raw.c:1187 ../plug-ins/common/file-raw.c:1272 msgid "R, G, B (normal)" msgstr "R, G, B (normaali)" -#: ../plug-ins/common/file-raw.c:1189 ../plug-ins/common/file-raw.c:1275 +#: ../plug-ins/common/file-raw.c:1188 ../plug-ins/common/file-raw.c:1274 msgid "B, G, R, X (BMP style)" msgstr "B, G, R, X (BMP-tyylinen)" -#: ../plug-ins/common/file-raw.c:1194 +#: ../plug-ins/common/file-raw.c:1193 msgid "_Palette Type:" msgstr "Palettityyppi:" -#: ../plug-ins/common/file-raw.c:1205 +#: ../plug-ins/common/file-raw.c:1204 msgid "Off_set:" msgstr "Siirtymä:" -#: ../plug-ins/common/file-raw.c:1217 +#: ../plug-ins/common/file-raw.c:1216 msgid "Select Palette File" msgstr "Valitse palettitiedosto" -#: ../plug-ins/common/file-raw.c:1223 +#: ../plug-ins/common/file-raw.c:1222 msgid "Pal_ette File:" msgstr "Palettitiedosto:" -#: ../plug-ins/common/file-raw.c:1251 -#, fuzzy +#: ../plug-ins/common/file-raw.c:1250 #| msgid "Raw Image Save" msgid "Raw Image" -msgstr "Pakkaamattoman kuvan koko" +msgstr "Raw-kuva" -#: ../plug-ins/common/file-raw.c:1259 +#: ../plug-ins/common/file-raw.c:1258 msgid "RGB Save Type" msgstr "RGB-tyyppi" -#: ../plug-ins/common/file-raw.c:1263 +#: ../plug-ins/common/file-raw.c:1262 msgid "Standard (R,G,B)" msgstr "Standardi (R,G,B)" -#: ../plug-ins/common/file-raw.c:1264 +#: ../plug-ins/common/file-raw.c:1263 msgid "Planar (RRR,GGG,BBB)" msgstr "Planaari (RRR,GGG,BBB)" -#: ../plug-ins/common/file-raw.c:1269 +#: ../plug-ins/common/file-raw.c:1268 msgid "Indexed Palette Type" msgstr "Indeksoitu paletti" @@ -4503,7 +4493,7 @@ #: ../plug-ins/common/file-sunras.c:522 msgid "This image depth is not supported" -msgstr "" +msgstr "Tämä kuvasyvyys ei ole tuettu" #: ../plug-ins/common/file-sunras.c:546 #, c-format @@ -4523,10 +4513,9 @@ msgstr "Tiedosto päättyi kesken lukiessa" #: ../plug-ins/common/file-sunras.c:1629 -#, fuzzy #| msgid "Save as SUNRAS" msgid "SUNRAS" -msgstr "Tallenna SUNRAS" +msgstr "SUNRAS" #. file save type #: ../plug-ins/common/file-sunras.c:1632 @@ -4626,24 +4615,24 @@ msgid "Cannot read header from '%s'" msgstr "Otsikkoa tiedostosta \"%s\" ei voitu lukea" -#: ../plug-ins/common/file-tga.c:1381 +#: ../plug-ins/common/file-tga.c:1403 msgid "TGA" -msgstr "" +msgstr "TGA" #. rle -#: ../plug-ins/common/file-tga.c:1390 +#: ../plug-ins/common/file-tga.c:1412 msgid "_RLE compression" msgstr "_RLE pakkaus" -#: ../plug-ins/common/file-tga.c:1404 +#: ../plug-ins/common/file-tga.c:1426 msgid "Or_igin:" msgstr "_Nollakohta:" -#: ../plug-ins/common/file-tga.c:1408 +#: ../plug-ins/common/file-tga.c:1430 msgid "Bottom left" msgstr "Alhaalla vasemmalla" -#: ../plug-ins/common/file-tga.c:1409 +#: ../plug-ins/common/file-tga.c:1431 msgid "Top left" msgstr "Ylhäällä vasemmalla" @@ -4662,17 +4651,16 @@ msgid "Import from TIFF" msgstr "Tuo TIFF-tiedostosta" -#: ../plug-ins/common/file-tiff-load.c:818 +#: ../plug-ins/common/file-tiff-load.c:819 #, c-format msgid "%s-%d-of-%d-pages" msgstr "" -#: ../plug-ins/common/file-tiff-load.c:1028 +#: ../plug-ins/common/file-tiff-load.c:1029 msgid "TIFF Channel" msgstr "TIFF-kanava" -#: ../plug-ins/common/file-tiff-load.c:1037 -#: ../plug-ins/file-psd/psd-load.c:333 +#: ../plug-ins/common/file-tiff-load.c:1038 ../plug-ins/file-psd/psd-load.c:333 msgid "" "Warning:\n" "The image you are loading has 16 bits per channel. GIMP can only handle 8 " @@ -4683,70 +4671,70 @@ "Kuvassa on 16 bittiä värikanavaa kohti. GIMP voi käsitellä vain 8 bittiä per " "kanava. Tiedosto muunnetaan ja tarkkuutta katoaa tämän muutoksen vuoksi." -#: ../plug-ins/common/file-tiff-save.c:812 +#: ../plug-ins/common/file-tiff-save.c:816 msgid "" "Only monochrome pictures can be compressed with \"CCITT Group 4\" or \"CCITT " "Group 3\"." msgstr "" -#: ../plug-ins/common/file-tiff-save.c:826 +#: ../plug-ins/common/file-tiff-save.c:830 msgid "Indexed pictures cannot be compressed with \"JPEG\"." msgstr "" -#: ../plug-ins/common/file-tiff-save.c:929 +#: ../plug-ins/common/file-tiff-save.c:933 msgid "" "The TIFF format only supports comments in\n" "7bit ASCII encoding. No comment is saved." msgstr "TIFF tukee vain ASCII-kommentteja. Kommenttia ei tallenneta." -#: ../plug-ins/common/file-tiff-save.c:1104 +#: ../plug-ins/common/file-tiff-save.c:1108 msgid "TIFF" -msgstr "" +msgstr "TIFF" #. compression -#: ../plug-ins/common/file-tiff-save.c:1112 +#: ../plug-ins/common/file-tiff-save.c:1116 msgid "Compression" msgstr "Pakkaus" -#: ../plug-ins/common/file-tiff-save.c:1116 +#: ../plug-ins/common/file-tiff-save.c:1120 msgid "_None" msgstr "Ei mitään" -#: ../plug-ins/common/file-tiff-save.c:1117 +#: ../plug-ins/common/file-tiff-save.c:1121 msgid "_LZW" msgstr "_LZW" -#: ../plug-ins/common/file-tiff-save.c:1118 +#: ../plug-ins/common/file-tiff-save.c:1122 msgid "_Pack Bits" msgstr "_Pack Bits" -#: ../plug-ins/common/file-tiff-save.c:1119 +#: ../plug-ins/common/file-tiff-save.c:1123 msgid "_Deflate" msgstr "_Deflate" -#: ../plug-ins/common/file-tiff-save.c:1120 +#: ../plug-ins/common/file-tiff-save.c:1124 msgid "_JPEG" msgstr "_JPEG" -#: ../plug-ins/common/file-tiff-save.c:1121 +#: ../plug-ins/common/file-tiff-save.c:1125 msgid "CCITT Group _3 fax" msgstr "" -#: ../plug-ins/common/file-tiff-save.c:1122 +#: ../plug-ins/common/file-tiff-save.c:1126 msgid "CCITT Group _4 fax" msgstr "" -#: ../plug-ins/common/file-tiff-save.c:1151 +#: ../plug-ins/common/file-tiff-save.c:1155 msgid "Save _color values from transparent pixels" msgstr "Tallenna väriarvot läpinäkyvistä pikseleistä" -#: ../plug-ins/common/file-tiff-save.c:1167 ../plug-ins/common/file-xbm.c:1236 +#: ../plug-ins/common/file-tiff-save.c:1171 ../plug-ins/common/file-xbm.c:1236 msgid "Comment:" msgstr "Kommentti:" #: ../plug-ins/common/file-wmf.c:129 msgid "Microsoft WMF file" -msgstr "" +msgstr "Microsoft WMF -tiedosto" #: ../plug-ins/common/file-wmf.c:352 msgid "" @@ -4804,7 +4792,7 @@ #: ../plug-ins/common/file-xbm.c:1189 msgid "XBM" -msgstr "" +msgstr "XBM" #. parameter settings #: ../plug-ins/common/file-xbm.c:1192 @@ -4849,7 +4837,7 @@ #: ../plug-ins/common/file-xmc.c:331 ../plug-ins/common/file-xmc.c:369 #: ../plug-ins/common/file-xmc.c:1046 msgid "X11 Mouse Cursor" -msgstr "" +msgstr "X11-hiiriosoitin" #: ../plug-ins/common/file-xmc.c:473 #, c-format @@ -4890,10 +4878,10 @@ msgstr "" #: ../plug-ins/common/file-xmc.c:1009 -#, fuzzy, c-format +#, c-format #| msgid "Write error occurred" msgid "A read error occurred." -msgstr "virhe kirjoitettaessa" +msgstr "Tapahtui lukuvirhe." #. #. * parameter settings @@ -4968,13 +4956,12 @@ #: ../plug-ins/common/file-xmc.c:1244 msgid "Enter copyright information." -msgstr "" +msgstr "Kirjoita tekijänoikeustiedot." #: ../plug-ins/common/file-xmc.c:1246 -#, fuzzy #| msgid "_Top-right" msgid "_Copyright:" -msgstr "Ylä-oikea" +msgstr "_Tekijänoikeus:" #: ../plug-ins/common/file-xmc.c:1262 msgid "" @@ -4983,11 +4970,11 @@ #: ../plug-ins/common/file-xmc.c:1272 msgid "Enter license information." -msgstr "" +msgstr "Kirjoita lisenssitiedot." #: ../plug-ins/common/file-xmc.c:1274 msgid "_License:" -msgstr "" +msgstr "_Lisenssi:" #. #. * Other @@ -4995,10 +4982,9 @@ #. We use gtk_text_view for "Other" while "Copyright" & "License" is entered #. * in gtk_entry because We want allow '\n' for "Other". #: ../plug-ins/common/file-xmc.c:1281 -#, fuzzy #| msgid "O_thers" msgid "_Other:" -msgstr "Muut" +msgstr "_Muu:" #: ../plug-ins/common/file-xmc.c:1315 msgid "Enter other comment if you want." @@ -5071,7 +5057,7 @@ #: ../plug-ins/common/file-xpm.c:174 ../plug-ins/common/file-xpm.c:199 msgid "X PixMap image" -msgstr "" +msgstr "X PixMap -kuva" #: ../plug-ins/common/file-xpm.c:364 ../plug-ins/common/file-xpm.c:776 #, c-format @@ -5080,11 +5066,11 @@ #: ../plug-ins/common/file-xpm.c:370 ../plug-ins/common/file-xpm.c:782 msgid "XPM file invalid" -msgstr "" +msgstr "XPM-tiedosto virheellinen" #: ../plug-ins/common/file-xpm.c:808 msgid "XPM" -msgstr "" +msgstr "XPM" #: ../plug-ins/common/file-xpm.c:818 msgid "_Alpha threshold:" @@ -5955,27 +5941,27 @@ msgid "Applying lens" msgstr "Toteutetaan linssiefekti" -#: ../plug-ins/common/lens-apply.c:394 +#: ../plug-ins/common/lens-apply.c:395 msgid "Lens Effect" msgstr "Linssiefekti" -#: ../plug-ins/common/lens-apply.c:429 +#: ../plug-ins/common/lens-apply.c:430 msgid "_Keep original surroundings" msgstr "Säilytä alkuperäiset ympärykset" -#: ../plug-ins/common/lens-apply.c:444 +#: ../plug-ins/common/lens-apply.c:445 msgid "_Set surroundings to index 0" msgstr "Ympärykset väriksi 0" -#: ../plug-ins/common/lens-apply.c:445 +#: ../plug-ins/common/lens-apply.c:446 msgid "_Set surroundings to background color" msgstr "Ympärykset taustaväriksi" -#: ../plug-ins/common/lens-apply.c:460 +#: ../plug-ins/common/lens-apply.c:461 msgid "_Make surroundings transparent" msgstr "Ympärykset läpinäkyväksi" -#: ../plug-ins/common/lens-apply.c:477 +#: ../plug-ins/common/lens-apply.c:478 msgid "_Lens refraction index:" msgstr "Linssin refraktiokerroin:" @@ -8052,49 +8038,49 @@ msgid "_Dilate" msgstr "" -#: ../plug-ins/common/value-propagate.c:476 -#: ../plug-ins/common/value-propagate.c:1086 +#: ../plug-ins/common/value-propagate.c:480 +#: ../plug-ins/common/value-propagate.c:1090 msgid "Value Propagate" msgstr "Arvojen monistus" #. Parameter settings -#: ../plug-ins/common/value-propagate.c:1153 +#: ../plug-ins/common/value-propagate.c:1157 msgid "Propagate" msgstr "Monistus" -#: ../plug-ins/common/value-propagate.c:1166 +#: ../plug-ins/common/value-propagate.c:1170 msgid "Lower t_hreshold:" msgstr "Alempi kynnysarvo:" -#: ../plug-ins/common/value-propagate.c:1178 +#: ../plug-ins/common/value-propagate.c:1182 msgid "_Upper threshold:" msgstr "Ylempi kynnysarvo:" -#: ../plug-ins/common/value-propagate.c:1190 +#: ../plug-ins/common/value-propagate.c:1194 msgid "_Propagating rate:" msgstr "Voimakkuus:" -#: ../plug-ins/common/value-propagate.c:1201 +#: ../plug-ins/common/value-propagate.c:1205 msgid "To l_eft" msgstr "Vasemmalle" -#: ../plug-ins/common/value-propagate.c:1204 +#: ../plug-ins/common/value-propagate.c:1208 msgid "To _right" msgstr "Oikealle" -#: ../plug-ins/common/value-propagate.c:1207 +#: ../plug-ins/common/value-propagate.c:1211 msgid "To _top" msgstr "Ylös" -#: ../plug-ins/common/value-propagate.c:1210 +#: ../plug-ins/common/value-propagate.c:1214 msgid "To _bottom" msgstr "Alas" -#: ../plug-ins/common/value-propagate.c:1219 +#: ../plug-ins/common/value-propagate.c:1223 msgid "Propagating _alpha channel" msgstr "_Alfakanavan monistus" -#: ../plug-ins/common/value-propagate.c:1230 +#: ../plug-ins/common/value-propagate.c:1234 msgid "Propagating value channel" msgstr "Arvokanavan monistus" @@ -8188,7 +8174,7 @@ #: ../plug-ins/common/video.c:47 msgid "_3x3" -msgstr "" +msgstr "_3x3" #: ../plug-ins/common/video.c:48 msgid "Larg_e 3x3" @@ -8386,84 +8372,81 @@ msgid "Waving" msgstr "Aallotetaan" -#: ../plug-ins/common/web-browser.c:135 +#: ../plug-ins/common/web-browser.c:141 msgid "The operating system is out of memory or resources." msgstr "" -#: ../plug-ins/common/web-browser.c:138 +#: ../plug-ins/common/web-browser.c:144 #, fuzzy #| msgid "Specified layer %d not found" msgid "The specified file was not found." msgstr "Annettua kerrosta %d ei löydy" -#: ../plug-ins/common/web-browser.c:141 -#, fuzzy +#: ../plug-ins/common/web-browser.c:147 #| msgid "Specified layer %d not found" msgid "The specified path was not found." -msgstr "Annettua kerrosta %d ei löydy" +msgstr "Annettua polkua ei löytynyt." -#: ../plug-ins/common/web-browser.c:144 +#: ../plug-ins/common/web-browser.c:150 msgid "" "The .exe file is invalid (non-Microsoft Win32 .exe or error in .exe image)." msgstr "" -#: ../plug-ins/common/web-browser.c:147 +#: ../plug-ins/common/web-browser.c:153 msgid "The operating system denied access to the specified file." msgstr "" -#: ../plug-ins/common/web-browser.c:150 +#: ../plug-ins/common/web-browser.c:156 msgid "The file name association is incomplete or invalid." msgstr "" -#: ../plug-ins/common/web-browser.c:153 +#: ../plug-ins/common/web-browser.c:159 msgid "DDE transaction busy" msgstr "" -#: ../plug-ins/common/web-browser.c:156 +#: ../plug-ins/common/web-browser.c:162 msgid "The DDE transaction failed." msgstr "" -#: ../plug-ins/common/web-browser.c:159 +#: ../plug-ins/common/web-browser.c:165 msgid "The DDE transaction timed out." msgstr "" -#: ../plug-ins/common/web-browser.c:162 +#: ../plug-ins/common/web-browser.c:168 #, fuzzy #| msgid "Specified window not found" msgid "The specified DLL was not found." msgstr "Annettua ikkunaa ei löytynyt" -#: ../plug-ins/common/web-browser.c:165 +#: ../plug-ins/common/web-browser.c:171 msgid "There is no application associated with the given file name extension." msgstr "" -#: ../plug-ins/common/web-browser.c:168 +#: ../plug-ins/common/web-browser.c:174 #, fuzzy #| msgid "There are not enough layers to align." msgid "There was not enough memory to complete the operation." msgstr "Tasoja ei ole tarpeeksi kohdistukseen." -#: ../plug-ins/common/web-browser.c:171 +#: ../plug-ins/common/web-browser.c:177 msgid "A sharing violation occurred." msgstr "" -#: ../plug-ins/common/web-browser.c:174 -#, fuzzy +#: ../plug-ins/common/web-browser.c:180 #| msgid "Microsoft Windows icon" msgid "Unknown Microsoft Windows error." -msgstr "Microsoft Windows -kuvake" +msgstr "Tuntematon Microsoft Windows -virhe." -#: ../plug-ins/common/web-browser.c:177 +#: ../plug-ins/common/web-browser.c:183 #, fuzzy, c-format #| msgid "Failed to open GFlare file '%s': %s" msgid "Failed to open '%s': %s" msgstr "Tiedoston '%s' avaaminen epäonnistui: %s" #: ../plug-ins/common/web-page.c:98 -#, fuzzy #| msgid "Create an image of a textured sphere" msgid "Create an image of a webpage" -msgstr "Luo kuvan pinnoitetusta pallopinnasta" +msgstr "Luo kuva verkkosivusta" #: ../plug-ins/common/web-page.c:104 #, fuzzy @@ -8472,16 +8455,14 @@ msgstr "Paperista" #: ../plug-ins/common/web-page.c:233 -#, fuzzy #| msgid "Create rectangle" msgid "Create from webpage" -msgstr "Luo nelikulmio" +msgstr "Luo verkkosivustosta" #: ../plug-ins/common/web-page.c:238 -#, fuzzy #| msgid "Create" msgid "_Create" -msgstr "Luo" +msgstr "_Luo" #: ../plug-ins/common/web-page.c:266 msgid "Enter location (URI):" @@ -8493,48 +8474,44 @@ msgstr "Leveys (pikseliä):" #: ../plug-ins/common/web-page.c:308 -#, fuzzy #| msgid "Step size:" msgid "Font size:" -msgstr "Askelkoko:" +msgstr "Fontin koko:" #: ../plug-ins/common/web-page.c:315 msgid "Huge" -msgstr "" +msgstr "Valtava" #: ../plug-ins/common/web-page.c:316 -#, fuzzy #| msgid "Target" msgid "Large" -msgstr "Kohde" +msgstr "Suuri" #: ../plug-ins/common/web-page.c:317 -#, fuzzy #| msgid "Default" msgctxt "web-page" msgid "Default" msgstr "Oletus" #: ../plug-ins/common/web-page.c:318 -#, fuzzy #| msgid "Small Tiles" msgid "Small" -msgstr "Pienet laatat" +msgstr "Pieni" #: ../plug-ins/common/web-page.c:319 msgid "Tiny" -msgstr "" +msgstr "Pienenpieni" #: ../plug-ins/common/web-page.c:443 #, c-format msgid "No URL was specified" -msgstr "" +msgstr "Osoitetta ei määritetty" #: ../plug-ins/common/web-page.c:510 -#, fuzzy, c-format +#, c-format #| msgid "Downloading image (%s of %s)" msgid "Downloading webpage '%s'" -msgstr "Noudetaan kuva (%s/%s)" +msgstr "Ladataan verkkosivua '%s'" #: ../plug-ins/common/web-page.c:527 #, c-format @@ -8543,7 +8520,7 @@ #: ../plug-ins/common/web-page.c:536 msgid "Webpage" -msgstr "" +msgstr "Verkkosivu" #: ../plug-ins/common/whirl-pinch.c:138 msgid "Distort an image by whirling and pinching" @@ -8649,65 +8626,65 @@ #: ../plug-ins/file-bmp/bmp-read.c:222 ../plug-ins/file-bmp/bmp-read.c:232 #: ../plug-ins/file-bmp/bmp-read.c:239 ../plug-ins/file-bmp/bmp-read.c:248 -#: ../plug-ins/file-bmp/bmp-read.c:263 ../plug-ins/file-bmp/bmp-read.c:445 -#: ../plug-ins/file-bmp/bmp-read.c:466 ../plug-ins/file-bmp/bmp-read.c:477 -#: ../plug-ins/file-bmp/bmp-read.c:485 ../plug-ins/file-bmp/bmp-read.c:493 -#: ../plug-ins/file-bmp/bmp-read.c:505 +#: ../plug-ins/file-bmp/bmp-read.c:263 ../plug-ins/file-bmp/bmp-read.c:465 +#: ../plug-ins/file-bmp/bmp-read.c:486 ../plug-ins/file-bmp/bmp-read.c:497 +#: ../plug-ins/file-bmp/bmp-read.c:505 ../plug-ins/file-bmp/bmp-read.c:513 +#: ../plug-ins/file-bmp/bmp-read.c:525 #, c-format msgid "'%s' is not a valid BMP file" msgstr "'%s' ei ole kelvollinen BMP-tiedosto" #: ../plug-ins/file-bmp/bmp-read.c:277 ../plug-ins/file-bmp/bmp-read.c:304 -#: ../plug-ins/file-bmp/bmp-read.c:332 ../plug-ins/file-bmp/bmp-read.c:361 -#: ../plug-ins/file-bmp/bmp-read.c:391 ../plug-ins/file-bmp/bmp-read.c:425 +#: ../plug-ins/file-bmp/bmp-read.c:336 ../plug-ins/file-bmp/bmp-read.c:373 +#: ../plug-ins/file-bmp/bmp-read.c:403 ../plug-ins/file-bmp/bmp-read.c:445 #, c-format msgid "Error reading BMP file header from '%s'" msgstr "Virhe luettaessa BMP-tiedoston \"%s\" otsikkoa" -#: ../plug-ins/file-bmp/bmp-read.c:350 +#: ../plug-ins/file-bmp/bmp-read.c:358 #, fuzzy, c-format #| msgid "Unsupported compression mode: %d" msgid "Unsupported compression (%lu) in BMP file from '%s'" msgstr "Pakkaustila ei ole tuettu: %d" -#: ../plug-ins/file-bmp/bmp-read.c:621 +#: ../plug-ins/file-bmp/bmp-read.c:641 msgid "Unrecognized or invalid BMP compression format." msgstr "Tunnistamaton BMP pakkaustapa." -#: ../plug-ins/file-bmp/bmp-read.c:663 +#: ../plug-ins/file-bmp/bmp-read.c:683 msgid "Unsupported or invalid bitdepth." msgstr "Bittisyvyys ei ole tuettu tai on virheellinen." -#: ../plug-ins/file-bmp/bmp-read.c:815 ../plug-ins/file-bmp/bmp-read.c:856 -#: ../plug-ins/file-bmp/bmp-read.c:906 +#: ../plug-ins/file-bmp/bmp-read.c:835 ../plug-ins/file-bmp/bmp-read.c:876 +#: ../plug-ins/file-bmp/bmp-read.c:926 msgid "The bitmap ends unexpectedly." msgstr "Kuvakartta loppui yllättäen." -#: ../plug-ins/file-bmp/bmp-write.c:191 ../plug-ins/file-bmp/bmp-write.c:217 +#: ../plug-ins/file-bmp/bmp-write.c:193 ../plug-ins/file-bmp/bmp-write.c:219 msgid "Cannot save indexed image with transparency in BMP file format." msgstr "Indeksoituja kuvia läpinäkyvyydellä ei voi tallentaa BMP-muodossa." -#: ../plug-ins/file-bmp/bmp-write.c:193 ../plug-ins/file-bmp/bmp-write.c:219 +#: ../plug-ins/file-bmp/bmp-write.c:195 ../plug-ins/file-bmp/bmp-write.c:221 msgid "Alpha channel will be ignored." msgstr "Alfa-kanava jätetään huomioimatta." #. Run-Length Encoded -#: ../plug-ins/file-bmp/bmp-write.c:864 +#: ../plug-ins/file-bmp/bmp-write.c:870 msgid "_Run-Length Encoded" msgstr "RLE-pakattu" #. Compatibility Options -#: ../plug-ins/file-bmp/bmp-write.c:877 +#: ../plug-ins/file-bmp/bmp-write.c:883 #, fuzzy #| msgid "Table Options" msgid "Co_mpatibility Options" msgstr "Taulukon asetukset" -#: ../plug-ins/file-bmp/bmp-write.c:887 +#: ../plug-ins/file-bmp/bmp-write.c:893 msgid "_Do not write color space information" -msgstr "" +msgstr "_Älä kirjoita väriavaruuden tietoja" -#: ../plug-ins/file-bmp/bmp-write.c:889 +#: ../plug-ins/file-bmp/bmp-write.c:895 msgid "" "Some applications can not read BMP images that include color space " "information. GIMP writes color space information by default. Enabling this " @@ -8715,19 +8692,19 @@ msgstr "" #. Advanced Options -#: ../plug-ins/file-bmp/bmp-write.c:905 ../plug-ins/file-jpeg/jpeg-save.c:924 +#: ../plug-ins/file-bmp/bmp-write.c:911 ../plug-ins/file-jpeg/jpeg-save.c:924 msgid "_Advanced Options" msgstr "_Lisäasetukset" -#: ../plug-ins/file-bmp/bmp-write.c:920 +#: ../plug-ins/file-bmp/bmp-write.c:926 msgid "16 bits" msgstr "16 bittiä" -#: ../plug-ins/file-bmp/bmp-write.c:956 +#: ../plug-ins/file-bmp/bmp-write.c:962 msgid "24 bits" msgstr "24 bittiä" -#: ../plug-ins/file-bmp/bmp-write.c:973 +#: ../plug-ins/file-bmp/bmp-write.c:979 msgid "32 bits" msgstr "32 bittiä" @@ -8735,20 +8712,26 @@ msgid "Windows BMP image" msgstr "Windows BMP kuva" -#: ../plug-ins/file-compressor/file-compressor.c:166 +#: ../plug-ins/file-compressor/file-compressor.c:167 msgid "gzip archive" msgstr "gzip paketti" -#: ../plug-ins/file-compressor/file-compressor.c:185 +#: ../plug-ins/file-compressor/file-compressor.c:186 msgid "bzip archive" msgstr "bzip paketti" -#: ../plug-ins/file-compressor/file-compressor.c:392 +#: ../plug-ins/file-compressor/file-compressor.c:393 msgid "No sensible file extension, saving as compressed XCF." msgstr "" "Ei tunnistettua tiedostopäätettä, tallennetaan pakattuna XCF-tiedostona." -#: ../plug-ins/file-compressor/file-compressor.c:448 +#: ../plug-ins/file-compressor/file-compressor.c:416 +#, fuzzy, c-format +#| msgid "Compression" +msgid "Compressing '%s'" +msgstr "Pakkaus" + +#: ../plug-ins/file-compressor/file-compressor.c:453 msgid "No sensible file extension, attempting to load with file magic." msgstr "" "Ei tunnistettua päätettä, yritetään ladata tiedoston tunnistuksen avulla." @@ -8917,10 +8900,10 @@ msgstr "JPEG esikatselu" #: ../plug-ins/file-jpeg/jpeg-save.c:215 -#, fuzzy, c-format +#, c-format #| msgid "_Tile size:" msgid "File size: %s" -msgstr "Koko:" +msgstr "Tiedoston koko: %s" #: ../plug-ins/file-jpeg/jpeg-save.c:225 ../plug-ins/file-jpeg/jpeg-save.c:233 #: ../plug-ins/file-jpeg/jpeg-save.c:805 ../plug-ins/file-jpeg/jpeg-save.c:900 @@ -8932,10 +8915,9 @@ msgstr "Lasketaan kuvan koko..." #: ../plug-ins/file-jpeg/jpeg-save.c:863 -#, fuzzy #| msgid "_JPEG" msgid "JPEG" -msgstr "_JPEG" +msgstr "JPEG" #: ../plug-ins/file-jpeg/jpeg-save.c:886 msgid "_Quality:" @@ -9005,10 +8987,9 @@ msgstr "_Alinäytteistys:" #: ../plug-ins/file-jpeg/jpeg-save.c:1118 -#, fuzzy #| msgid "1x1,1x1,1x1 (best quality)" msgid "4:4:4 (best quality)" -msgstr "1x1,1x1,1x1 (paras laatu)" +msgstr "4:4:4 (paras laatu)" #: ../plug-ins/file-jpeg/jpeg-save.c:1120 msgid "4:2:2 horizontal (chroma halved)" @@ -9143,23 +9124,23 @@ msgid "Unsupported or invalid layer mask size: %dx%d" msgstr "Tason leveys ei ole tuettu tai on virheellinen: %d" -#: ../plug-ins/file-psd/psd-load.c:1231 ../plug-ins/file-psd/psd-load.c:1620 +#: ../plug-ins/file-psd/psd-load.c:1236 ../plug-ins/file-psd/psd-load.c:1631 #, c-format msgid "Unsupported compression mode: %d" msgstr "Pakkaustila ei ole tuettu: %d" -#: ../plug-ins/file-psd/psd-load.c:1412 +#: ../plug-ins/file-psd/psd-load.c:1423 msgid "" "Warning\n" "The layer mask is partly outside the layer boundary. The mask will be " "cropped which may result in data loss." msgstr "" -#: ../plug-ins/file-psd/psd-load.c:1713 +#: ../plug-ins/file-psd/psd-load.c:1724 msgid "Extra" msgstr "Lisäosat" -#: ../plug-ins/file-psd/psd-load.c:1888 +#: ../plug-ins/file-psd/psd-load.c:1899 #, fuzzy, c-format #| msgid "Unsupported or invalid bitdepth." msgid "Unsupported or invalid channel size" @@ -9215,16 +9196,16 @@ msgstr "Ei voi avata \"%s\" lukua varten." #: ../plug-ins/file-sgi/sgi.c:345 -#, fuzzy, c-format +#, c-format #| msgid "Invalid X offset: %d" msgid "Invalid width: %hu" -msgstr "Virheellinen x-siirtymä: %d" +msgstr "Virheellinen leveys: %hu" #: ../plug-ins/file-sgi/sgi.c:352 -#, fuzzy, c-format +#, c-format #| msgid "Invalid X offset: %d" msgid "Invalid height: %hu" -msgstr "Virheellinen x-siirtymä: %d" +msgstr "Virheellinen korkeus: %hu" #: ../plug-ins/file-sgi/sgi.c:359 #, c-format @@ -9238,7 +9219,7 @@ #: ../plug-ins/file-sgi/sgi.c:654 msgid "SGI" -msgstr "" +msgstr "SGI" #: ../plug-ins/file-sgi/sgi.c:656 msgid "Compression type" @@ -9349,71 +9330,71 @@ msgid "Failed to save to temporary file '%s'" msgstr "PPM-tiedoston '%s' kirjoittaminen epäonnistui: %s" -#: ../plug-ins/file-xjt/xjt.c:485 ../plug-ins/file-xjt/xjt.c:503 +#: ../plug-ins/file-xjt/xjt.c:487 ../plug-ins/file-xjt/xjt.c:506 msgid "GIMP compressed XJT image" msgstr "" -#: ../plug-ins/file-xjt/xjt.c:733 +#: ../plug-ins/file-xjt/xjt.c:737 #, c-format msgid "XJT file contains unknown layermode %d" msgstr "" -#: ../plug-ins/file-xjt/xjt.c:770 +#: ../plug-ins/file-xjt/xjt.c:774 #, c-format msgid "Warning: unsupported layermode %d saved to XJT" msgstr "" -#: ../plug-ins/file-xjt/xjt.c:786 +#: ../plug-ins/file-xjt/xjt.c:790 #, c-format msgid "XJT file contains unknown pathtype %d" msgstr "" -#: ../plug-ins/file-xjt/xjt.c:802 +#: ../plug-ins/file-xjt/xjt.c:806 #, c-format msgid "Warning: unsupported pathtype %d saved to XJT" msgstr "" -#: ../plug-ins/file-xjt/xjt.c:821 +#: ../plug-ins/file-xjt/xjt.c:825 #, c-format msgid "XJT file contains unknown unittype %d" msgstr "" -#: ../plug-ins/file-xjt/xjt.c:842 +#: ../plug-ins/file-xjt/xjt.c:846 #, c-format msgid "Warning: unsupported unittype %d saved to XJT" msgstr "" -#: ../plug-ins/file-xjt/xjt.c:863 +#: ../plug-ins/file-xjt/xjt.c:867 msgid "XJT" -msgstr "" +msgstr "XJT" -#: ../plug-ins/file-xjt/xjt.c:873 +#: ../plug-ins/file-xjt/xjt.c:877 msgid "Optimize" msgstr "Optimoi" -#: ../plug-ins/file-xjt/xjt.c:883 +#: ../plug-ins/file-xjt/xjt.c:887 msgid "Clear transparent" msgstr "Läpinäkyvä" -#: ../plug-ins/file-xjt/xjt.c:895 +#: ../plug-ins/file-xjt/xjt.c:899 msgid "Quality:" msgstr "Laatu:" -#: ../plug-ins/file-xjt/xjt.c:904 +#: ../plug-ins/file-xjt/xjt.c:908 msgid "Smoothing:" msgstr "Pehmennys:" -#: ../plug-ins/file-xjt/xjt.c:1705 ../plug-ins/file-xjt/xjt.c:3343 +#: ../plug-ins/file-xjt/xjt.c:1709 ../plug-ins/file-xjt/xjt.c:3347 #, c-format msgid "Could not create working folder '%s': %s" msgstr "Ei voi luoda työhakemistoa '%s': %s" -#: ../plug-ins/file-xjt/xjt.c:3209 +#: ../plug-ins/file-xjt/xjt.c:3213 #, c-format msgid "Error: Could not read XJT property file '%s'." msgstr "" -#: ../plug-ins/file-xjt/xjt.c:3216 +#: ../plug-ins/file-xjt/xjt.c:3220 #, c-format msgid "Error: XJT property file '%s' is empty." msgstr "" @@ -10153,8 +10134,7 @@ msgid "Max undo:" msgstr "Perumisten enimmäismäärä:" -#: ../plug-ins/gfig/gfig-dialog.c:1320 -#: ../plug-ins/gimpressionist/general.c:184 +#: ../plug-ins/gfig/gfig-dialog.c:1320 ../plug-ins/gimpressionist/general.c:184 msgid "Transparent" msgstr "Läpinäkyvä" @@ -10297,12 +10277,12 @@ msgid "_Gfig..." msgstr "_Gfig..." -#: ../plug-ins/gfig/gfig.c:734 +#: ../plug-ins/gfig/gfig.c:738 msgid "" "Error trying to save figure as a parasite: can't attach parasite to drawable." msgstr "" -#: ../plug-ins/gfig/gfig.c:761 +#: ../plug-ins/gfig/gfig.c:765 #, c-format msgid "Error trying to open temporary file '%s' for parasite loading: %s" msgstr "" @@ -10592,7 +10572,7 @@ #: ../plug-ins/gimpressionist/orientmap.c:552 msgid "Vectors" -msgstr "" +msgstr "Vektorit" #: ../plug-ins/gimpressionist/orientmap.c:564 msgid "" @@ -10607,20 +10587,20 @@ #: ../plug-ins/gimpressionist/orientmap.c:611 msgid "Select previous vector" -msgstr "" +msgstr "Valitse edellinen vektori" #: ../plug-ins/gimpressionist/orientmap.c:617 msgid "Select next vector" -msgstr "" +msgstr "Valitse seuraava vektori" #: ../plug-ins/gimpressionist/orientmap.c:619 #: ../plug-ins/gimpressionist/sizemap.c:489 msgid "A_dd" -msgstr "" +msgstr "Lisä_ä" #: ../plug-ins/gimpressionist/orientmap.c:623 msgid "Add new vector" -msgstr "" +msgstr "Lisää uusi vektori" #: ../plug-ins/gimpressionist/orientmap.c:625 #: ../plug-ins/gimpressionist/sizemap.c:496 @@ -10629,7 +10609,7 @@ #: ../plug-ins/gimpressionist/orientmap.c:629 msgid "Delete selected vector" -msgstr "" +msgstr "Poista valittu vektori" #: ../plug-ins/gimpressionist/orientmap.c:640 msgid "Type" @@ -11280,8 +11260,7 @@ msgid "_Second Flares" msgstr "Toissijainen liekki" -#: ../plug-ins/help-browser/dialog.c:184 -#: ../plug-ins/help-browser/dialog.c:1133 +#: ../plug-ins/help-browser/dialog.c:184 ../plug-ins/help-browser/dialog.c:1133 msgid "GIMP Help Browser" msgstr "GIMPin ohjeselain" @@ -11339,7 +11318,7 @@ #: ../plug-ins/help-browser/dialog.c:674 msgid "Visit the GIMP documentation website" -msgstr "" +msgstr "Vieraile Gimpin dokumentaation sivustolla" #: ../plug-ins/help-browser/dialog.c:1174 msgid "Find:" @@ -11362,29 +11341,35 @@ #: ../plug-ins/help/gimphelpdomain.c:186 msgid "The GIMP user manual is not available." -msgstr "" +msgstr "GIMP-käyttöohjetta ei ole saatavilla." -#: ../plug-ins/help/gimphelpdomain.c:187 +#. TRANSLATORS: do not end the URL with a dot, +#. * it would be in the link. Because of +#. * technical limitations, make sure the URL +#. * ends with a space, a newline or is end of text. +#. * Cf. bug 762282. +#. +#: ../plug-ins/help/gimphelpdomain.c:193 msgid "" -"Please install the additional help package or use the online user manual at " -"http://docs.gimp.org/." +"Please install the additional help package or use the online user manual at: " +"http://docs.gimp.org/" msgstr "" -#: ../plug-ins/help/gimphelpdomain.c:196 +#: ../plug-ins/help/gimphelpdomain.c:202 msgid "Perhaps you are missing GIO backends and need to install GVFS?" msgstr "" -#: ../plug-ins/help/gimphelpdomain.c:215 +#: ../plug-ins/help/gimphelpdomain.c:221 #, c-format msgid "Help ID '%s' unknown" msgstr "Avustus: koodi '%s' on tuntematon" -#: ../plug-ins/help/gimphelplocale.c:208 +#: ../plug-ins/help/gimphelplocale.c:257 #, c-format msgid "Loading index from '%s'" msgstr "Ladataan indeksiä tiedostosta \"%s\"" -#: ../plug-ins/help/gimphelplocale.c:266 +#: ../plug-ins/help/gimphelplocale.c:315 #, c-format msgid "" "Parse error in '%s':\n" @@ -11595,8 +11580,7 @@ #: ../plug-ins/imagemap/imap_circle.c:268 #: ../plug-ins/imagemap/imap_circle.c:275 #: ../plug-ins/imagemap/imap_circle.c:281 ../plug-ins/imagemap/imap_grid.c:249 -#: ../plug-ins/imagemap/imap_grid.c:255 -#: ../plug-ins/imagemap/imap_polygon.c:505 +#: ../plug-ins/imagemap/imap_grid.c:255 ../plug-ins/imagemap/imap_polygon.c:505 #: ../plug-ins/imagemap/imap_polygon.c:513 #: ../plug-ins/imagemap/imap_rectangle.c:392 #: ../plug-ins/imagemap/imap_rectangle.c:399 @@ -12263,7 +12247,7 @@ #: ../plug-ins/imagemap/imap_selection.c:349 msgid "#" -msgstr "" +msgstr "#" #: ../plug-ins/imagemap/imap_selection.c:360 msgid "URL" @@ -12706,10 +12690,9 @@ msgstr "Luo uusi kuva" #: ../plug-ins/map-object/map-object-ui.c:483 -#, fuzzy #| msgid "Create _new layer" msgid "Create new layer" -msgstr "Luo _uusi taso" +msgstr "Luo uusi taso" #: ../plug-ins/map-object/map-object-ui.c:494 #, fuzzy @@ -12954,10 +12937,9 @@ msgstr "Ominaisuudet" #: ../plug-ins/metadata/interface.c:204 ../plug-ins/metadata/interface.c:206 -#, fuzzy #| msgid "Description:" msgid "Description" -msgstr "Kuvaus:" +msgstr "Kuvaus" #: ../plug-ins/metadata/interface.c:222 #, fuzzy @@ -12978,22 +12960,20 @@ msgstr "Kuvaus:" #: ../plug-ins/metadata/interface.c:272 -#, fuzzy #| msgid "_Password:" msgid "_Keywords:" -msgstr "_Salasana:" +msgstr "_Avainsanat:" #. FIXME: add entries, cross-link with XMP model #: ../plug-ins/metadata/interface.c:284 ../plug-ins/metadata/interface.c:296 #: ../plug-ins/metadata/interface.c:308 ../plug-ins/metadata/interface.c:320 msgid "Empty" -msgstr "" +msgstr "Tyhjä" #: ../plug-ins/metadata/interface.c:286 -#, fuzzy #| msgid "_Top-right" msgid "Copyright" -msgstr "Ylä-oikea" +msgstr "Tekijänoikeus" #: ../plug-ins/metadata/interface.c:298 #, fuzzy @@ -13026,28 +13006,24 @@ msgstr "_Lisäasetukset" #: ../plug-ins/metadata/interface.c:447 -#, fuzzy #| msgid "Import from TIFF" msgid "Import XMP from File" -msgstr "Tuo TIFF-tiedostosta" +msgstr "Tuo XMP-tiedostosta" #: ../plug-ins/metadata/interface.c:498 -#, fuzzy #| msgid "Can't create a new image" msgid "Cannot create file" -msgstr "Ei voi luoda uutta kuvaa" +msgstr "Ei voi luoda tiedostoa" #: ../plug-ins/metadata/interface.c:508 -#, fuzzy #| msgid "An error occurred while trying to print:" msgid "Some error occurred while saving" -msgstr "Tapahtui virhe tulostettaessa:" +msgstr "Tallennettaessa tapahtui jokin virhe" #: ../plug-ins/metadata/interface.c:518 -#, fuzzy #| msgid "Couldn't save file:" msgid "Could not close the file" -msgstr "Tiedostoa ei voitu tallentaa:" +msgstr "Tiedostoa ei voitu sulkea" #: ../plug-ins/metadata/interface.c:540 #, fuzzy @@ -13056,32 +13032,28 @@ msgstr "Vientiesikatselu" #: ../plug-ins/metadata/interface.c:607 -#, fuzzy #| msgid "Properties" msgid "Image Properties" -msgstr "Ominaisuudet" +msgstr "Kuvan ominaisuudet" #: ../plug-ins/metadata/interface.c:611 -#, fuzzy #| msgid "_Import" msgid "_Import XMP..." -msgstr "_Tuo" +msgstr "_Tuo XMP..." #: ../plug-ins/metadata/interface.c:612 -#, fuzzy #| msgid "CML _Explorer..." msgid "_Export XMP..." -msgstr "CML _selain..." +msgstr "_Vie XMP..." #: ../plug-ins/metadata/metadata.c:185 msgid "View and edit metadata (EXIF, IPTC, XMP)" -msgstr "" +msgstr "Katsele ja muokkaa metatietoja (EXIF, IPTC, XMP)" #: ../plug-ins/metadata/metadata.c:194 -#, fuzzy #| msgid "Properties" msgid "Propert_ies" -msgstr "Ominaisuudet" +msgstr "_Ominaisuudet" #: ../plug-ins/metadata/xmp-parse.c:237 #, c-format diff -Nru gimp-2.8.18/po-plug-ins/fr.po gimp-2.8.20/po-plug-ins/fr.po --- gimp-2.8.18/po-plug-ins/fr.po 2015-08-20 22:57:32.000000000 +0000 +++ gimp-2.8.20/po-plug-ins/fr.po 2017-01-28 19:08:46.000000000 +0000 @@ -1,5 +1,5 @@ # French translation of gimp-plug-ins. -# Copyright (C) 1998-2011 Free Software Foundation, Inc. +# Copyright (C) 1998-2016 Free Software Foundation, Inc. # This file is distributed under the same license as the gimp package. # # Vincent Renardias , 1998-1999. @@ -12,15 +12,16 @@ # Laurent Monin , 2007. # Stéphane Raimbault , 2007. # Jean-Luc Coulon , 2007. -# Claude Paroz , 2008-2011. -# Julien Hardelin , 2004-2009, 2011. +# Claude Paroz , 2008-2011, 2016. +# Julien Hardelin , 2004-2009, 2011, 2016. +# msgid "" msgstr "" "Project-Id-Version: gimp-plugins HEAD fr\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-12-07 18:10+0000\n" -"PO-Revision-Date: 2011-12-09 14:42+0100\n" +"product=gimp&keywords=I18N+L10N&component=Internationalisation\n" +"POT-Creation-Date: 2016-09-23 09:09+0000\n" +"PO-Revision-Date: 2016-09-24 15:12+0200\n" "Last-Translator: Claude Paroz \n" "Language-Team: GNOME French Team \n" "Language: fr\n" @@ -29,122 +30,122 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:118 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:120 msgid "Original" msgstr "Original" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:136 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:138 msgid "Rotated" msgstr "Tourné" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:154 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:156 msgid "Continuous update" msgstr "Mise à jour continue" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:167 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:169 msgid "Area:" msgstr "Zone :" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:171 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:173 msgid "Entire Layer" msgstr "Calque entier" #. Create selection -#: ../plug-ins/color-rotate/color-rotate-dialog.c:172 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:174 #: ../plug-ins/common/film.c:965 ../plug-ins/imagemap/imap_selection.c:339 #: ../plug-ins/selection-to-path/selection-to-path.c:434 msgid "Selection" msgstr "Sélection" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:173 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:175 msgid "Context" msgstr "Contexte" #. spinbutton 1 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:297 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:299 msgctxt "color-range" msgid "From:" msgstr "Depuis :" #. spinbutton 2 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:323 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:326 msgctxt "color-range" msgid "To:" msgstr "Vers :" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:375 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:377 msgctxt "color-rotate" msgid "From:" msgstr "Depuis :" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:376 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:378 msgctxt "color-rotate" msgid "To:" msgstr "Vers :" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:416 -#: ../plug-ins/common/file-ps.c:3234 ../plug-ins/imagemap/imap_menu.c:213 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:418 +#: ../plug-ins/common/file-ps.c:3101 ../plug-ins/imagemap/imap_menu.c:213 msgid "Gray" msgstr "Gris" #. Gray: Circle: Spinbutton 1 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:464 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:466 msgid "Hue:" msgstr "Teinte :" #. Gray: Circle: Spinbutton 2 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:491 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:553 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:493 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:555 msgid "Saturation:" msgstr "Saturation :" #. * Gray: Operation-Mode * -#: ../plug-ins/color-rotate/color-rotate-dialog.c:511 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:513 msgid "Gray Mode" msgstr "Mode gris" #. Gray: Operation-Mode: two radio buttons -#: ../plug-ins/color-rotate/color-rotate-dialog.c:520 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:522 msgid "Treat as this" msgstr "Traiter comme cela" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:532 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:534 msgid "Change to this" msgstr "Modifier en cela" #. * Gray: What is gray? * -#: ../plug-ins/color-rotate/color-rotate-dialog.c:545 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:547 msgid "Gray Threshold" msgstr "Seuil gris" #. * Misc: Used unit selection * -#: ../plug-ins/color-rotate/color-rotate-dialog.c:585 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:695 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:587 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:697 msgid "Units" msgstr "Unités" #. Misc: Used unit selection: 3 radio buttons -#: ../plug-ins/color-rotate/color-rotate-dialog.c:594 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:596 msgid "Radians" msgstr "Radians" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:606 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:608 msgid "Radians/Pi" msgstr "Radians/Pi" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:618 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:620 msgid "Degrees" msgstr "Degrés" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:649 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:651 msgid "Rotate Colors" msgstr "Rotation des couleurs" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:689 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:691 msgid "Main Options" msgstr "Options principales" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:692 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:694 msgid "Gray Options" msgstr "Options gris" @@ -277,7 +278,7 @@ #. Propagate Mode #: ../plug-ins/common/alien-map.c:516 ../plug-ins/common/hot.c:613 -#: ../plug-ins/common/value-propagate.c:1121 ../plug-ins/common/waves.c:279 +#: ../plug-ins/common/value-propagate.c:1125 ../plug-ins/common/waves.c:279 msgid "Mode" msgstr "Mode" @@ -289,97 +290,97 @@ msgid "_HSL color model" msgstr "Modèle de couleur _TSL" -#: ../plug-ins/common/align-layers.c:128 +#: ../plug-ins/common/align-layers.c:158 msgid "Align all visible layers of the image" msgstr "Aligner tous les calques visibles de l'image" -#: ../plug-ins/common/align-layers.c:133 +#: ../plug-ins/common/align-layers.c:163 msgid "Align Visi_ble Layers..." msgstr "Aligner les calques _visibles..." -#: ../plug-ins/common/align-layers.c:173 +#: ../plug-ins/common/align-layers.c:207 msgid "There are not enough layers to align." msgstr "Il n'y a pas assez de calques à aligner." -#: ../plug-ins/common/align-layers.c:400 +#: ../plug-ins/common/align-layers.c:627 msgid "Align Visible Layers" msgstr "Aligner les calques visibles" -#: ../plug-ins/common/align-layers.c:424 ../plug-ins/common/align-layers.c:455 +#: ../plug-ins/common/align-layers.c:651 ../plug-ins/common/align-layers.c:682 msgctxt "align-style" msgid "None" msgstr "Aucun" -#: ../plug-ins/common/align-layers.c:425 ../plug-ins/common/align-layers.c:456 +#: ../plug-ins/common/align-layers.c:652 ../plug-ins/common/align-layers.c:683 msgid "Collect" msgstr "Rassembler" -#: ../plug-ins/common/align-layers.c:426 +#: ../plug-ins/common/align-layers.c:653 msgid "Fill (left to right)" msgstr "Remplir (de gauche à droite)" -#: ../plug-ins/common/align-layers.c:427 +#: ../plug-ins/common/align-layers.c:654 msgid "Fill (right to left)" msgstr "Remplir (de droite à gauche)" -#: ../plug-ins/common/align-layers.c:428 ../plug-ins/common/align-layers.c:459 +#: ../plug-ins/common/align-layers.c:655 ../plug-ins/common/align-layers.c:686 msgid "Snap to grid" msgstr "Accrocher à la grille" -#: ../plug-ins/common/align-layers.c:437 +#: ../plug-ins/common/align-layers.c:664 msgid "_Horizontal style:" msgstr "Style _horizontal :" -#: ../plug-ins/common/align-layers.c:441 +#: ../plug-ins/common/align-layers.c:668 msgid "Left edge" msgstr "Bord gauche" -#: ../plug-ins/common/align-layers.c:442 ../plug-ins/common/align-layers.c:472 +#: ../plug-ins/common/align-layers.c:669 ../plug-ins/common/align-layers.c:699 #: ../plug-ins/gradient-flare/gradient-flare.c:2712 msgid "Center" msgstr "Centrer" -#: ../plug-ins/common/align-layers.c:443 +#: ../plug-ins/common/align-layers.c:670 msgid "Right edge" msgstr "Bord droit" -#: ../plug-ins/common/align-layers.c:452 +#: ../plug-ins/common/align-layers.c:679 msgid "Ho_rizontal base:" msgstr "Base ho_rizontale :" -#: ../plug-ins/common/align-layers.c:457 +#: ../plug-ins/common/align-layers.c:684 msgid "Fill (top to bottom)" msgstr "Remplir (de haut en bas)" -#: ../plug-ins/common/align-layers.c:458 +#: ../plug-ins/common/align-layers.c:685 msgid "Fill (bottom to top)" msgstr "Remplir (de bas en haut)" -#: ../plug-ins/common/align-layers.c:468 +#: ../plug-ins/common/align-layers.c:695 msgid "_Vertical style:" msgstr "Style _vertical :" -#: ../plug-ins/common/align-layers.c:471 +#: ../plug-ins/common/align-layers.c:698 msgid "Top edge" msgstr "Bord haut" -#: ../plug-ins/common/align-layers.c:473 +#: ../plug-ins/common/align-layers.c:700 msgid "Bottom edge" msgstr "Bord bas" -#: ../plug-ins/common/align-layers.c:482 +#: ../plug-ins/common/align-layers.c:709 msgid "Ver_tical base:" msgstr "Base ver_ticale :" -#: ../plug-ins/common/align-layers.c:486 +#: ../plug-ins/common/align-layers.c:713 msgid "_Grid size:" msgstr "Taille de _grille :" -#: ../plug-ins/common/align-layers.c:495 +#: ../plug-ins/common/align-layers.c:722 msgid "_Ignore the bottom layer even if visible" msgstr "_Ignorer le calque du bas même s'il est visible" -#: ../plug-ins/common/align-layers.c:505 +#: ../plug-ins/common/align-layers.c:732 msgid "_Use the (invisible) bottom layer as the base" msgstr "_Utiliser le calque le plus bas (invisible) comme base" @@ -601,12 +602,12 @@ msgstr "Orientation" #: ../plug-ins/common/blinds.c:262 ../plug-ins/common/ripple.c:561 -#: ../plug-ins/common/tile-small.c:434 ../plug-ins/pagecurl/pagecurl.c:535 +#: ../plug-ins/common/tile-small.c:434 ../plug-ins/pagecurl/pagecurl.c:537 msgid "_Horizontal" msgstr "_Horizontal" #: ../plug-ins/common/blinds.c:265 ../plug-ins/common/ripple.c:564 -#: ../plug-ins/common/tile-small.c:444 ../plug-ins/pagecurl/pagecurl.c:534 +#: ../plug-ins/common/tile-small.c:444 ../plug-ins/pagecurl/pagecurl.c:536 msgid "_Vertical" msgstr "_Vertical" @@ -614,25 +615,24 @@ #. * Create the "background" layer to hold the image... #. #: ../plug-ins/common/blinds.c:279 ../plug-ins/common/compose.c:936 -#: ../plug-ins/common/decompose.c:729 ../plug-ins/common/file-cel.c:363 -#: ../plug-ins/common/file-cel.c:366 ../plug-ins/common/file-dicom.c:612 -#: ../plug-ins/common/file-gif-load.c:943 -#: ../plug-ins/common/file-jp2-load.c:354 ../plug-ins/common/file-pcx.c:425 -#: ../plug-ins/common/file-pcx.c:431 ../plug-ins/common/file-pix.c:382 -#: ../plug-ins/common/file-png.c:887 ../plug-ins/common/file-pnm.c:583 -#: ../plug-ins/common/file-raw.c:763 ../plug-ins/common/file-sunras.c:977 -#: ../plug-ins/common/file-tga.c:1064 ../plug-ins/common/file-tiff-load.c:997 -#: ../plug-ins/common/file-xbm.c:897 ../plug-ins/common/film.c:745 +#: ../plug-ins/common/decompose.c:729 ../plug-ins/common/file-cel.c:445 +#: ../plug-ins/common/file-cel.c:448 ../plug-ins/common/file-dicom.c:612 +#: ../plug-ins/common/file-gif-load.c:980 +#: ../plug-ins/common/file-jp2-load.c:356 ../plug-ins/common/file-pcx.c:426 +#: ../plug-ins/common/file-pcx.c:432 ../plug-ins/common/file-pix.c:384 +#: ../plug-ins/common/file-png.c:898 ../plug-ins/common/file-pnm.c:585 +#: ../plug-ins/common/file-raw.c:780 ../plug-ins/common/file-sunras.c:979 +#: ../plug-ins/common/file-tga.c:1095 ../plug-ins/common/file-tiff-load.c:1011 +#: ../plug-ins/common/file-xbm.c:898 ../plug-ins/common/film.c:745 #: ../plug-ins/common/smooth-palette.c:257 ../plug-ins/common/tile.c:262 -#: ../plug-ins/file-bmp/bmp-read.c:380 ../plug-ins/file-bmp/bmp-read.c:647 -#: ../plug-ins/file-faxg3/faxg3.c:474 ../plug-ins/file-fits/fits.c:530 -#: ../plug-ins/file-jpeg/jpeg-load.c:255 ../plug-ins/file-jpeg/jpeg-load.c:819 +#: ../plug-ins/file-bmp/bmp-read.c:700 ../plug-ins/file-faxg3/faxg3.c:474 +#: ../plug-ins/file-fits/fits.c:532 ../plug-ins/file-jpeg/jpeg-load.c:260 +#: ../plug-ins/file-jpeg/jpeg-load.c:824 #: ../plug-ins/file-psd/psd-image-res-load.c:1001 -#: ../plug-ins/file-psd/psd-load.c:1637 ../plug-ins/file-sgi/sgi.c:407 -#: ../plug-ins/gfig/gfig-dialog.c:1306 -#: ../plug-ins/gimpressionist/general.c:139 +#: ../plug-ins/file-psd/psd-load.c:1655 ../plug-ins/file-sgi/sgi.c:409 +#: ../plug-ins/gfig/gfig-dialog.c:1321 ../plug-ins/gimpressionist/general.c:139 #: ../plug-ins/map-object/map-object-apply.c:252 ../plug-ins/twain/twain.c:567 -#: ../plug-ins/win-snap/winsnap.c:1156 +#: ../plug-ins/win-snap/winsnap.c:1162 msgid "Background" msgstr "Arrière-plan" @@ -668,7 +668,7 @@ #: ../plug-ins/common/edge-dog.c:269 ../plug-ins/common/edge-neon.c:228 #: ../plug-ins/common/edge-sobel.c:212 ../plug-ins/common/photocopy.c:244 #: ../plug-ins/common/pixelize.c:293 ../plug-ins/common/softglow.c:224 -#: ../plug-ins/file-sgi/sgi.c:558 ../plug-ins/file-xjt/xjt.c:1687 +#: ../plug-ins/file-sgi/sgi.c:560 ../plug-ins/file-xjt/xjt.c:1691 #: ../plug-ins/gradient-flare/gradient-flare.c:966 msgid "Cannot operate on indexed color images." msgstr "Impossible d'opérer sur des images en couleurs indexées." @@ -805,7 +805,7 @@ msgid "_Blur" msgstr "_Flou" -#: ../plug-ins/common/blur.c:177 ../plug-ins/common/unsharp-mask.c:582 +#: ../plug-ins/common/blur.c:177 ../plug-ins/common/unsharp-mask.c:589 msgid "Blurring" msgstr "Flou en cours" @@ -909,7 +909,7 @@ msgid "_Elevation:" msgstr "É_lévation :" -#: ../plug-ins/common/bump-map.c:936 ../plug-ins/common/file-ps.c:3388 +#: ../plug-ins/common/bump-map.c:936 ../plug-ins/common/file-ps.c:3255 msgid "_X offset:" msgstr "Décalage _X :" @@ -921,7 +921,7 @@ "Le décalage peut être ajusté en glissant l'aperçu avec le bouton du milieu " "de la souris." -#: ../plug-ins/common/bump-map.c:950 ../plug-ins/common/file-ps.c:3397 +#: ../plug-ins/common/bump-map.c:950 ../plug-ins/common/file-ps.c:3264 msgid "_Y offset:" msgstr "Décalage _Y :" @@ -1029,36 +1029,35 @@ #. stat error (file does not exist) #: ../plug-ins/common/channel-mixer.c:980 -#: ../plug-ins/common/cml-explorer.c:2208 ../plug-ins/common/curve-bend.c:892 -#: ../plug-ins/common/file-cel.c:312 ../plug-ins/common/file-compressor.c:497 -#: ../plug-ins/common/file-compressor.c:666 -#: ../plug-ins/common/file-dicom.c:340 ../plug-ins/common/file-gbr.c:368 -#: ../plug-ins/common/file-gif-load.c:355 ../plug-ins/common/file-gih.c:640 -#: ../plug-ins/common/file-jp2-load.c:194 -#: ../plug-ins/common/file-jp2-load.c:203 ../plug-ins/common/file-mng.c:1156 -#: ../plug-ins/common/file-pat.c:337 ../plug-ins/common/file-pcx.c:361 -#: ../plug-ins/common/file-pix.c:343 ../plug-ins/common/file-png.c:752 -#: ../plug-ins/common/file-pnm.c:494 ../plug-ins/common/file-ps.c:1037 -#: ../plug-ins/common/file-ps.c:3048 ../plug-ins/common/file-psp.c:1717 -#: ../plug-ins/common/file-raw.c:256 ../plug-ins/common/file-raw.c:711 -#: ../plug-ins/common/file-sunras.c:391 ../plug-ins/common/file-svg.c:333 -#: ../plug-ins/common/file-svg.c:713 ../plug-ins/common/file-tga.c:442 -#: ../plug-ins/common/file-tiff-load.c:291 ../plug-ins/common/file-xbm.c:737 -#: ../plug-ins/common/file-xmc.c:663 ../plug-ins/common/file-xmc.c:848 -#: ../plug-ins/common/file-xwd.c:433 ../plug-ins/common/sphere-designer.c:2010 -#: ../plug-ins/file-bmp/bmp-read.c:153 ../plug-ins/file-faxg3/faxg3.c:229 -#: ../plug-ins/file-fits/fits.c:358 ../plug-ins/file-fli/fli-gimp.c:459 -#: ../plug-ins/file-fli/fli-gimp.c:496 ../plug-ins/file-ico/ico-load.c:651 -#: ../plug-ins/file-ico/ico-load.c:729 ../plug-ins/file-jpeg/jpeg-load.c:117 -#: ../plug-ins/file-jpeg/jpeg-load.c:889 ../plug-ins/file-psd/psd-load.c:130 +#: ../plug-ins/common/cml-explorer.c:2208 ../plug-ins/common/curve-bend.c:891 +#: ../plug-ins/common/file-cel.c:300 ../plug-ins/common/file-cel.c:352 +#: ../plug-ins/common/file-cel.c:583 ../plug-ins/common/file-dicom.c:340 +#: ../plug-ins/common/file-gbr.c:370 ../plug-ins/common/file-gif-load.c:357 +#: ../plug-ins/common/file-gih.c:642 ../plug-ins/common/file-jp2-load.c:196 +#: ../plug-ins/common/file-jp2-load.c:205 ../plug-ins/common/file-mng.c:1156 +#: ../plug-ins/common/file-pat.c:339 ../plug-ins/common/file-pcx.c:362 +#: ../plug-ins/common/file-pix.c:345 ../plug-ins/common/file-png.c:762 +#: ../plug-ins/common/file-pnm.c:496 ../plug-ins/common/file-ps.c:1019 +#: ../plug-ins/common/file-ps.c:2915 ../plug-ins/common/file-psp.c:1717 +#: ../plug-ins/common/file-raw.c:257 ../plug-ins/common/file-raw.c:728 +#: ../plug-ins/common/file-sunras.c:393 ../plug-ins/common/file-svg.c:333 +#: ../plug-ins/common/file-svg.c:713 ../plug-ins/common/file-tga.c:443 +#: ../plug-ins/common/file-xbm.c:738 ../plug-ins/common/file-xmc.c:657 +#: ../plug-ins/common/file-xmc.c:842 ../plug-ins/common/file-xwd.c:437 +#: ../plug-ins/common/sphere-designer.c:2010 +#: ../plug-ins/file-bmp/bmp-read.c:206 ../plug-ins/file-faxg3/faxg3.c:229 +#: ../plug-ins/file-fits/fits.c:360 ../plug-ins/file-fli/fli-gimp.c:461 +#: ../plug-ins/file-fli/fli-gimp.c:498 ../plug-ins/file-ico/ico-load.c:651 +#: ../plug-ins/file-ico/ico-load.c:729 ../plug-ins/file-jpeg/jpeg-load.c:122 +#: ../plug-ins/file-jpeg/jpeg-load.c:894 ../plug-ins/file-psd/psd-load.c:130 #: ../plug-ins/file-psd/psd-thumb-load.c:79 #: ../plug-ins/file-uri/uri-backend-libcurl.c:193 -#: ../plug-ins/file-xjt/xjt.c:2529 ../plug-ins/file-xjt/xjt.c:2537 +#: ../plug-ins/file-xjt/xjt.c:2533 ../plug-ins/file-xjt/xjt.c:2541 #: ../plug-ins/flame/flame.c:411 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1865 -#: ../plug-ins/fractal-explorer/fractal-explorer.c:926 -#: ../plug-ins/gfig/gfig.c:434 ../plug-ins/help/gimphelplocale.c:222 -#: ../plug-ins/help/gimphelplocale.c:238 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:923 +#: ../plug-ins/gfig/gfig.c:433 ../plug-ins/help/gimphelplocale.c:271 +#: ../plug-ins/help/gimphelplocale.c:287 #: ../plug-ins/lighting/lighting-ui.c:1367 #, c-format msgid "Could not open '%s' for reading: %s" @@ -1069,31 +1068,28 @@ msgstr "Enregistrez les paramètres du mixeur de canaux" #: ../plug-ins/common/channel-mixer.c:1058 -#: ../plug-ins/common/cml-explorer.c:2035 ../plug-ins/common/curve-bend.c:840 -#: ../plug-ins/common/file-cel.c:585 ../plug-ins/common/file-compressor.c:425 -#: ../plug-ins/common/file-compressor.c:507 -#: ../plug-ins/common/file-compressor.c:589 -#: ../plug-ins/common/file-compressor.c:677 -#: ../plug-ins/common/file-csource.c:407 ../plug-ins/common/file-dicom.c:1351 -#: ../plug-ins/common/file-gbr.c:663 ../plug-ins/common/file-gif-save.c:782 -#: ../plug-ins/common/file-gih.c:1258 ../plug-ins/common/file-html-table.c:236 -#: ../plug-ins/common/file-mng.c:649 ../plug-ins/common/file-mng.c:984 -#: ../plug-ins/common/file-pat.c:486 ../plug-ins/common/file-pcx.c:712 -#: ../plug-ins/common/file-pix.c:526 ../plug-ins/common/file-png.c:1285 -#: ../plug-ins/common/file-pnm.c:1010 ../plug-ins/common/file-ps.c:1214 -#: ../plug-ins/common/file-raw.c:591 ../plug-ins/common/file-raw.c:619 -#: ../plug-ins/common/file-sunras.c:565 ../plug-ins/common/file-tga.c:1171 -#: ../plug-ins/common/file-tiff-save.c:684 ../plug-ins/common/file-xbm.c:1036 -#: ../plug-ins/common/file-xmc.c:1455 ../plug-ins/common/file-xwd.c:619 +#: ../plug-ins/common/cml-explorer.c:2035 ../plug-ins/common/curve-bend.c:839 +#: ../plug-ins/common/file-cel.c:776 ../plug-ins/common/file-csource.c:407 +#: ../plug-ins/common/file-dicom.c:1371 ../plug-ins/common/file-gbr.c:665 +#: ../plug-ins/common/file-gif-save.c:792 ../plug-ins/common/file-gih.c:1260 +#: ../plug-ins/common/file-html-table.c:236 ../plug-ins/common/file-mng.c:649 +#: ../plug-ins/common/file-mng.c:984 ../plug-ins/common/file-pat.c:488 +#: ../plug-ins/common/file-pcx.c:713 ../plug-ins/common/file-pdf-save.c:438 +#: ../plug-ins/common/file-pix.c:528 ../plug-ins/common/file-png.c:1370 +#: ../plug-ins/common/file-pnm.c:1012 ../plug-ins/common/file-ps.c:1195 +#: ../plug-ins/common/file-raw.c:623 ../plug-ins/common/file-raw.c:651 +#: ../plug-ins/common/file-sunras.c:567 ../plug-ins/common/file-tga.c:1202 +#: ../plug-ins/common/file-tiff-save.c:842 ../plug-ins/common/file-xbm.c:1037 +#: ../plug-ins/common/file-xmc.c:1449 ../plug-ins/common/file-xwd.c:637 #: ../plug-ins/common/sphere-designer.c:2121 -#: ../plug-ins/file-bmp/bmp-write.c:306 ../plug-ins/file-fits/fits.c:476 -#: ../plug-ins/file-fli/fli-gimp.c:750 ../plug-ins/file-ico/ico-save.c:1007 -#: ../plug-ins/file-jpeg/jpeg-save.c:332 ../plug-ins/file-psd/psd-save.c:1652 +#: ../plug-ins/file-bmp/bmp-write.c:311 ../plug-ins/file-fits/fits.c:478 +#: ../plug-ins/file-fli/fli-gimp.c:752 ../plug-ins/file-ico/ico-save.c:1020 +#: ../plug-ins/file-jpeg/jpeg-save.c:355 ../plug-ins/file-psd/psd-save.c:1653 #: ../plug-ins/file-uri/uri-backend-libcurl.c:166 -#: ../plug-ins/file-xjt/xjt.c:1276 ../plug-ins/file-xjt/xjt.c:1715 +#: ../plug-ins/file-xjt/xjt.c:1280 ../plug-ins/file-xjt/xjt.c:1719 #: ../plug-ins/flame/flame.c:442 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1548 -#: ../plug-ins/gfig/gfig.c:798 ../plug-ins/ifs-compose/ifs-compose.c:2408 +#: ../plug-ins/gfig/gfig.c:801 ../plug-ins/ifs-compose/ifs-compose.c:2408 #: ../plug-ins/lighting/lighting-ui.c:1223 #, c-format msgid "Could not open '%s' for writing: %s" @@ -1121,7 +1117,7 @@ msgid "Checkerboard" msgstr "Damier" -#: ../plug-ins/common/checkerboard.c:413 ../plug-ins/common/file-xmc.c:1162 +#: ../plug-ins/common/checkerboard.c:413 ../plug-ins/common/file-xmc.c:1156 #: ../plug-ins/gimpressionist/sizemap.c:510 msgid "_Size:" msgstr "_Taille :" @@ -1243,7 +1239,7 @@ msgid "Min (x-d, -), (0.5 < x)" msgstr "Min (x-d, -), (0.5 < x)" -#: ../plug-ins/common/cml-explorer.c:200 ../plug-ins/common/file-sunras.c:1635 +#: ../plug-ins/common/cml-explorer.c:200 ../plug-ins/common/file-sunras.c:1637 msgid "Standard" msgstr "Standard" @@ -1338,7 +1334,7 @@ #: ../plug-ins/common/cml-explorer.c:302 ../plug-ins/common/cml-explorer.c:310 #: ../plug-ins/common/decompose.c:190 #: ../plug-ins/gimpressionist/orientation.c:155 -#: ../plug-ins/gimpressionist/size.c:158 +#: ../plug-ins/gimpressionist/size.c:158 ../plug-ins/metadata/interface.c:144 msgid "Value" msgstr "Valeur" @@ -1774,7 +1770,7 @@ "un menu d'options de tri." #: ../plug-ins/common/compose.c:189 ../plug-ins/common/decompose.c:170 -#: ../plug-ins/common/file-raw.c:1100 +#: ../plug-ins/common/file-raw.c:1117 msgid "RGB" msgstr "RVB" @@ -1984,8 +1980,7 @@ msgid "Stretch brightness values to cover the full range" msgstr "Étend la luminosité de l'image sur une échelle maximale" -#: ../plug-ins/common/contrast-normalize.c:91 -#: ../plug-ins/common/edge-dog.c:362 +#: ../plug-ins/common/contrast-normalize.c:91 ../plug-ins/common/edge-dog.c:362 msgid "_Normalize" msgstr "N_ormaliser" @@ -2099,9 +2094,9 @@ msgid "E_xtend" msgstr "É_tendre" -#: ../plug-ins/common/convolution-matrix.c:74 -#: ../plug-ins/common/displace.c:477 ../plug-ins/common/edge.c:700 -#: ../plug-ins/common/fractal-trace.c:737 ../plug-ins/common/ripple.c:585 +#: ../plug-ins/common/convolution-matrix.c:74 ../plug-ins/common/displace.c:477 +#: ../plug-ins/common/edge.c:700 ../plug-ins/common/fractal-trace.c:737 +#: ../plug-ins/common/ripple.c:585 msgid "_Wrap" msgstr "Enro_uler" @@ -2139,7 +2134,7 @@ msgstr "Divi_seur :" #: ../plug-ins/common/convolution-matrix.c:1001 -#: ../plug-ins/common/depth-merge.c:775 ../plug-ins/common/file-raw.c:1121 +#: ../plug-ins/common/depth-merge.c:775 ../plug-ins/common/file-raw.c:1138 msgid "O_ffset:" msgstr "_Décalage :" @@ -2163,36 +2158,36 @@ msgid "Remove empty borders from the image" msgstr "Supprime les bords vides autour de l'image" -#: ../plug-ins/common/crop-auto.c:89 +#: ../plug-ins/common/crop-auto.c:94 msgid "Autocrop Imag_e" msgstr "Découpage _automatique de l'image" -#: ../plug-ins/common/crop-auto.c:98 +#: ../plug-ins/common/crop-auto.c:103 msgid "Remove empty borders from the layer" msgstr "Supprime les bords vides autour du calque" -#: ../plug-ins/common/crop-auto.c:103 +#: ../plug-ins/common/crop-auto.c:108 msgid "Autocrop Lay_er" msgstr "Découpage _automatique du calque" -#: ../plug-ins/common/crop-auto.c:150 +#: ../plug-ins/common/crop-auto.c:155 msgid "Cropping" msgstr "Découpage" -#: ../plug-ins/common/crop-zealous.c:84 +#: ../plug-ins/common/crop-zealous.c:68 msgid "Autocrop unused space from edges and middle" msgstr "" "Découpage automatique des espaces inutilisés sur les bords et au milieu" -#: ../plug-ins/common/crop-zealous.c:89 +#: ../plug-ins/common/crop-zealous.c:73 msgid "_Zealous Crop" msgstr "Découpage _futé..." -#: ../plug-ins/common/crop-zealous.c:137 +#: ../plug-ins/common/crop-zealous.c:121 msgid "Zealous cropping" msgstr "Découpage futé" -#: ../plug-ins/common/crop-zealous.c:238 +#: ../plug-ins/common/crop-zealous.c:253 msgid "Nothing to crop." msgstr "Rien à découper." @@ -2224,159 +2219,159 @@ msgid "Cubistic transformation" msgstr "Transformation cubiste" -#: ../plug-ins/common/curve-bend.c:527 +#: ../plug-ins/common/curve-bend.c:526 msgid "Bend the image using two control curves" msgstr "Déforme l'image en utilisant deux courbes de contrôle" -#: ../plug-ins/common/curve-bend.c:548 +#: ../plug-ins/common/curve-bend.c:547 msgid "_Curve Bend..." msgstr "_Courber..." -#: ../plug-ins/common/curve-bend.c:684 ../plug-ins/common/edge-dog.c:178 +#: ../plug-ins/common/curve-bend.c:683 ../plug-ins/common/edge-dog.c:178 msgid "Can operate on layers only (but was called on channel or mask)." msgstr "" "Ne peut opérer que sur des calques (mais a été lancé depuis un canal ou un " "masque). " -#: ../plug-ins/common/curve-bend.c:694 +#: ../plug-ins/common/curve-bend.c:693 msgid "Cannot operate on layers with masks." msgstr "Impossible d'opérer sur des calques comprenant un masque." -#: ../plug-ins/common/curve-bend.c:706 +#: ../plug-ins/common/curve-bend.c:705 msgid "Cannot operate on empty selections." msgstr "Impossible d'opérer sur des sélections vides." -#: ../plug-ins/common/curve-bend.c:902 +#: ../plug-ins/common/curve-bend.c:901 #, c-format msgid "Error while reading '%s': %s" msgstr "Erreur lors de la lecture de « %s » : %s" #. Possibly retrieve data from a previous run #. The shell and main vbox -#: ../plug-ins/common/curve-bend.c:1225 ../plug-ins/common/curve-bend.c:2956 +#: ../plug-ins/common/curve-bend.c:1224 ../plug-ins/common/curve-bend.c:2955 msgid "Curve Bend" msgstr "Déformer selon une courbe" #. Preview area, top of column #. preview -#: ../plug-ins/common/curve-bend.c:1262 +#: ../plug-ins/common/curve-bend.c:1261 #: ../plug-ins/gimpressionist/orientmap.c:590 #: ../plug-ins/gimpressionist/sizemap.c:459 -#: ../plug-ins/print/print-page-layout.c:171 +#: ../plug-ins/print/print-page-layout.c:175 msgid "Preview" msgstr "Aperçu" #. The preview button -#: ../plug-ins/common/curve-bend.c:1291 +#: ../plug-ins/common/curve-bend.c:1290 msgid "_Preview Once" msgstr "Lancer l'aperç_u" #. The preview toggle -#: ../plug-ins/common/curve-bend.c:1300 +#: ../plug-ins/common/curve-bend.c:1299 msgid "Automatic pre_view" msgstr "Aperçu automati_que" #. Options area, bottom of column #. Options section -#: ../plug-ins/common/curve-bend.c:1310 ../plug-ins/common/ripple.c:523 -#: ../plug-ins/gfig/gfig-dialog.c:1228 +#: ../plug-ins/common/curve-bend.c:1309 ../plug-ins/common/ripple.c:523 +#: ../plug-ins/gfig/gfig-dialog.c:1243 msgid "Options" msgstr "Options" #. Rotate spinbutton -#: ../plug-ins/common/curve-bend.c:1324 +#: ../plug-ins/common/curve-bend.c:1323 msgid "Rotat_e:" msgstr "_Rotation :" #. The smoothing toggle -#: ../plug-ins/common/curve-bend.c:1343 +#: ../plug-ins/common/curve-bend.c:1342 msgid "Smoo_thing" msgstr "_Adoucissement" #. The antialiasing toggle -#: ../plug-ins/common/curve-bend.c:1353 ../plug-ins/common/mosaic.c:729 +#: ../plug-ins/common/curve-bend.c:1352 ../plug-ins/common/mosaic.c:733 #: ../plug-ins/common/qbist.c:858 ../plug-ins/common/ripple.c:532 msgid "_Antialiasing" msgstr "_Lissage" #. The work_on_copy toggle -#: ../plug-ins/common/curve-bend.c:1363 +#: ../plug-ins/common/curve-bend.c:1362 msgid "Work on cop_y" msgstr "Travailler sur une co_pie" #. The curves graph -#: ../plug-ins/common/curve-bend.c:1373 +#: ../plug-ins/common/curve-bend.c:1372 msgid "Modify Curves" msgstr "Modification des courbes" -#: ../plug-ins/common/curve-bend.c:1401 +#: ../plug-ins/common/curve-bend.c:1400 msgid "Curve for Border" msgstr "Courbe pour la limite" -#: ../plug-ins/common/curve-bend.c:1405 +#: ../plug-ins/common/curve-bend.c:1404 msgid "_Upper" msgstr "_Supérieure" -#: ../plug-ins/common/curve-bend.c:1406 +#: ../plug-ins/common/curve-bend.c:1405 msgid "_Lower" msgstr "In_férieure" -#: ../plug-ins/common/curve-bend.c:1416 +#: ../plug-ins/common/curve-bend.c:1415 msgid "Curve Type" msgstr "Type de courbe" -#: ../plug-ins/common/curve-bend.c:1420 +#: ../plug-ins/common/curve-bend.c:1419 msgid "Smoot_h" msgstr "A_doucie" -#: ../plug-ins/common/curve-bend.c:1421 +#: ../plug-ins/common/curve-bend.c:1420 msgid "_Free" msgstr "_Libre" #. The Copy button -#: ../plug-ins/common/curve-bend.c:1436 +#: ../plug-ins/common/curve-bend.c:1435 msgid "_Copy" msgstr "_Copier" -#: ../plug-ins/common/curve-bend.c:1441 +#: ../plug-ins/common/curve-bend.c:1440 msgid "Copy the active curve to the other border" msgstr "Copie la courbe active vers l'autre limite" #. The CopyInv button -#: ../plug-ins/common/curve-bend.c:1448 +#: ../plug-ins/common/curve-bend.c:1447 msgid "_Mirror" msgstr "_Miroir" -#: ../plug-ins/common/curve-bend.c:1453 +#: ../plug-ins/common/curve-bend.c:1452 msgid "Mirror the active curve to the other border" msgstr "Symétrise la courbe active vers l'autre limite" #. The Swap button -#: ../plug-ins/common/curve-bend.c:1461 +#: ../plug-ins/common/curve-bend.c:1460 msgid "S_wap" msgstr "Échan_ger" -#: ../plug-ins/common/curve-bend.c:1466 +#: ../plug-ins/common/curve-bend.c:1465 msgid "Swap the two curves" msgstr "Échange les deux courbes" -#: ../plug-ins/common/curve-bend.c:1478 +#: ../plug-ins/common/curve-bend.c:1477 msgid "Reset the active curve" msgstr "Réinitialise la courbe active" -#: ../plug-ins/common/curve-bend.c:1495 +#: ../plug-ins/common/curve-bend.c:1494 msgid "Load the curves from a file" msgstr "Charge les courbes depuis un fichier" -#: ../plug-ins/common/curve-bend.c:1507 +#: ../plug-ins/common/curve-bend.c:1506 msgid "Save the curves to a file" msgstr "Enregistre les courbes dans un fichier" -#: ../plug-ins/common/curve-bend.c:2063 +#: ../plug-ins/common/curve-bend.c:2062 msgid "Load Curve Points from File" msgstr "Charge les points de la courbe depuis un fichier" -#: ../plug-ins/common/curve-bend.c:2098 +#: ../plug-ins/common/curve-bend.c:2097 msgid "Save Curve Points to File" msgstr "Enregistrez les points de la courbe dans un fichier" @@ -2660,9 +2655,9 @@ msgid "R_ecursive" msgstr "Ré_cursif" -#: ../plug-ins/common/despeckle.c:510 ../plug-ins/common/edge-neon.c:734 +#: ../plug-ins/common/despeckle.c:510 ../plug-ins/common/edge-neon.c:735 #: ../plug-ins/common/nl-filter.c:1091 ../plug-ins/common/nova.c:362 -#: ../plug-ins/common/unsharp-mask.c:865 ../plug-ins/common/whirl-pinch.c:591 +#: ../plug-ins/common/unsharp-mask.c:872 ../plug-ins/common/whirl-pinch.c:591 #: ../plug-ins/gradient-flare/gradient-flare.c:2757 #: ../plug-ins/imagemap/imap_circle.c:277 msgid "_Radius:" @@ -2693,12 +2688,12 @@ msgstr "Anti-traînées" #: ../plug-ins/common/destripe.c:476 ../plug-ins/common/file-html-table.c:584 -#: ../plug-ins/common/file-ps.c:3172 ../plug-ins/common/file-ps.c:3370 -#: ../plug-ins/common/file-raw.c:1134 ../plug-ins/common/smooth-palette.c:437 +#: ../plug-ins/common/file-ps.c:3039 ../plug-ins/common/file-ps.c:3237 +#: ../plug-ins/common/file-raw.c:1151 ../plug-ins/common/smooth-palette.c:437 #: ../plug-ins/common/tile-paper.c:303 ../plug-ins/common/tile.c:428 #: ../plug-ins/imagemap/imap_cmd_guides.c:164 #: ../plug-ins/imagemap/imap_rectangle.c:401 -#: ../plug-ins/print/print-page-layout.c:264 +#: ../plug-ins/print/print-page-layout.c:280 msgid "_Width:" msgstr "_Largeur :" @@ -2881,11 +2876,11 @@ msgid "Neon" msgstr "Néon" -#: ../plug-ins/common/edge-neon.c:696 +#: ../plug-ins/common/edge-neon.c:697 msgid "Neon Detection" msgstr "Détection néon" -#: ../plug-ins/common/edge-neon.c:749 ../plug-ins/common/unsharp-mask.c:878 +#: ../plug-ins/common/edge-neon.c:750 ../plug-ins/common/unsharp-mask.c:885 msgid "_Amount:" msgstr "_Quantité :" @@ -2913,7 +2908,7 @@ msgid "_Keep sign of result (one direction only)" msgstr "_Garder le signe du résultat (une direction seulement)" -#: ../plug-ins/common/edge-sobel.c:371 +#: ../plug-ins/common/edge-sobel.c:372 msgid "Sobel edge detecting" msgstr "Détection de bord Sobel" @@ -3007,12 +3002,12 @@ msgstr "Gravure" #: ../plug-ins/common/engrave.c:245 ../plug-ins/common/file-html-table.c:600 -#: ../plug-ins/common/file-ps.c:3182 ../plug-ins/common/file-ps.c:3379 -#: ../plug-ins/common/file-raw.c:1147 ../plug-ins/common/film.c:1002 +#: ../plug-ins/common/file-ps.c:3049 ../plug-ins/common/file-ps.c:3246 +#: ../plug-ins/common/file-raw.c:1164 ../plug-ins/common/film.c:1002 #: ../plug-ins/common/smooth-palette.c:442 ../plug-ins/common/tile-paper.c:314 #: ../plug-ins/common/tile.c:432 ../plug-ins/imagemap/imap_cmd_guides.c:174 #: ../plug-ins/imagemap/imap_rectangle.c:408 -#: ../plug-ins/print/print-page-layout.c:266 +#: ../plug-ins/print/print-page-layout.c:282 msgid "_Height:" msgstr "_Hauteur :" @@ -3025,89 +3020,127 @@ msgstr "Art ASCII" #. Create the actual window. -#: ../plug-ins/common/file-aa.c:349 +#: ../plug-ins/common/file-aa.c:351 msgid "Text" msgstr "Texte" -#: ../plug-ins/common/file-aa.c:357 +#: ../plug-ins/common/file-aa.c:359 msgid "_Format:" msgstr "_Format :" -#: ../plug-ins/common/file-cel.c:111 ../plug-ins/common/file-cel.c:129 +#: ../plug-ins/common/file-cel.c:114 ../plug-ins/common/file-cel.c:132 msgid "KISS CEL" msgstr "KISS CEL" -#: ../plug-ins/common/file-cel.c:191 +#: ../plug-ins/common/file-cel.c:202 msgid "Load KISS Palette" msgstr "Charger une palette KISS" +#: ../plug-ins/common/file-cel.c:312 ../plug-ins/common/file-cel.c:367 +#: ../plug-ins/common/file-cel.c:387 +msgid "EOF or error while reading image header" +msgstr "EOF ou erreur lors de la lecture de l'en-tête d'image" + #. max. rows allocated #. column, highest column ever used #. -1 assume fsel is not available (and not attached to any drawable) #. -1 assume there is no floating selection -#: ../plug-ins/common/file-cel.c:317 ../plug-ins/common/file-dicom.c:345 -#: ../plug-ins/common/file-gbr.c:373 ../plug-ins/common/file-gif-load.c:360 -#: ../plug-ins/common/file-gih.c:645 ../plug-ins/common/file-jp2-load.c:187 -#: ../plug-ins/common/file-pat.c:342 ../plug-ins/common/file-pcx.c:366 -#: ../plug-ins/common/file-pdf-load.c:842 ../plug-ins/common/file-pix.c:348 -#: ../plug-ins/common/file-png.c:759 ../plug-ins/common/file-pnm.c:499 -#: ../plug-ins/common/file-ps.c:1043 ../plug-ins/common/file-raw.c:716 -#: ../plug-ins/common/file-sunras.c:487 ../plug-ins/common/file-tga.c:447 -#: ../plug-ins/common/file-tiff-load.c:603 ../plug-ins/common/file-wmf.c:994 -#: ../plug-ins/common/file-xbm.c:742 ../plug-ins/common/file-xmc.c:675 -#: ../plug-ins/common/file-xpm.c:352 ../plug-ins/common/file-xwd.c:524 -#: ../plug-ins/file-bmp/bmp-read.c:158 ../plug-ins/file-faxg3/faxg3.c:213 -#: ../plug-ins/file-fli/fli-gimp.c:501 ../plug-ins/file-ico/ico-load.c:644 -#: ../plug-ins/file-jpeg/jpeg-load.c:123 ../plug-ins/file-psd/psd-load.c:135 -#: ../plug-ins/file-sgi/sgi.c:330 ../plug-ins/file-xjt/xjt.c:3333 +#: ../plug-ins/common/file-cel.c:357 ../plug-ins/common/file-dicom.c:345 +#: ../plug-ins/common/file-gbr.c:375 ../plug-ins/common/file-gif-load.c:362 +#: ../plug-ins/common/file-gih.c:647 ../plug-ins/common/file-jp2-load.c:189 +#: ../plug-ins/common/file-pat.c:344 ../plug-ins/common/file-pcx.c:367 +#: ../plug-ins/common/file-pdf-load.c:861 ../plug-ins/common/file-pix.c:350 +#: ../plug-ins/common/file-png.c:770 ../plug-ins/common/file-pnm.c:501 +#: ../plug-ins/common/file-ps.c:1025 ../plug-ins/common/file-raw.c:733 +#: ../plug-ins/common/file-sunras.c:489 ../plug-ins/common/file-tga.c:448 +#: ../plug-ins/common/file-tiff-load.c:611 ../plug-ins/common/file-wmf.c:994 +#: ../plug-ins/common/file-xbm.c:743 ../plug-ins/common/file-xmc.c:669 +#: ../plug-ins/common/file-xpm.c:353 ../plug-ins/common/file-xwd.c:534 +#: ../plug-ins/file-bmp/bmp-read.c:211 ../plug-ins/file-faxg3/faxg3.c:213 +#: ../plug-ins/file-fli/fli-gimp.c:503 ../plug-ins/file-ico/ico-load.c:644 +#: ../plug-ins/file-jpeg/jpeg-load.c:128 ../plug-ins/file-psd/psd-load.c:135 +#: ../plug-ins/file-sgi/sgi.c:332 ../plug-ins/file-xjt/xjt.c:3337 #, c-format msgid "Opening '%s'" msgstr "Ouverture de « %s »" -#: ../plug-ins/common/file-cel.c:354 +#: ../plug-ins/common/file-cel.c:395 +msgid "is not a CEL image file" +msgstr "n'est pas un fichier d'image CEL" + +#: ../plug-ins/common/file-cel.c:409 +#, c-format +msgid "illegal bpp value in image: %hhu" +msgstr "valeur bpp interdite dans l'image : %hhu" + +#: ../plug-ins/common/file-cel.c:423 +#, c-format +msgid "" +"illegal image dimensions: width: %d, horizontal offset: %d, height: %d, " +"vertical offset: %d" +msgstr "" +"dimensions d'image interdites : largeur : %d, décalage horizontal : %d, " +"hauteur : %d, décalage vertical : %d" + +#: ../plug-ins/common/file-cel.c:436 +#, c-format msgid "Can't create a new image" msgstr "Impossible de créer une nouvelle image" -#: ../plug-ins/common/file-cel.c:444 +#: ../plug-ins/common/file-cel.c:474 ../plug-ins/common/file-cel.c:509 +#: ../plug-ins/common/file-cel.c:534 +msgid "EOF or error while reading image data" +msgstr "EOF ou erreur lors de la lecture des données d'image" + +#: ../plug-ins/common/file-cel.c:551 #, c-format msgid "Unsupported bit depth (%d)!" msgstr "Profondeur de bit non prise en charge (%d)" -#. init the progress meter -#. And let's begin the progress -#: ../plug-ins/common/file-cel.c:590 ../plug-ins/common/file-gbr.c:668 -#: ../plug-ins/common/file-gif-save.c:789 ../plug-ins/common/file-gih.c:1263 -#: ../plug-ins/common/file-html-table.c:257 ../plug-ins/common/file-pat.c:491 -#: ../plug-ins/common/file-pcx.c:644 ../plug-ins/common/file-pix.c:531 -#: ../plug-ins/common/file-png.c:1292 ../plug-ins/common/file-pnm.c:1015 -#: ../plug-ins/common/file-ps.c:1219 ../plug-ins/common/file-sunras.c:570 -#: ../plug-ins/common/file-tga.c:1176 ../plug-ins/common/file-tiff-save.c:694 -#: ../plug-ins/common/file-xbm.c:1041 ../plug-ins/common/file-xmc.c:1460 -#: ../plug-ins/common/file-xpm.c:638 ../plug-ins/common/file-xwd.c:624 -#: ../plug-ins/file-bmp/bmp-write.c:317 ../plug-ins/file-fits/fits.c:481 -#: ../plug-ins/file-fli/fli-gimp.c:718 ../plug-ins/file-ico/ico-save.c:1001 -#: ../plug-ins/file-jpeg/jpeg-save.c:289 ../plug-ins/file-psd/psd-save.c:1657 -#: ../plug-ins/file-sgi/sgi.c:576 ../plug-ins/file-xjt/xjt.c:1696 +#: ../plug-ins/common/file-cel.c:633 ../plug-ins/common/file-cel.c:645 #, c-format -msgid "Saving '%s'" -msgstr "Enregistrement de « %s »" +msgid "'%s': EOF or error while reading palette header" +msgstr "« %s » : EOF ou erreur lors de la lecture de l'en-tête de palette" -#: ../plug-ins/common/file-compressor.c:159 -msgid "gzip archive" -msgstr "archive gzip" +#: ../plug-ins/common/file-cel.c:654 +#, c-format +msgid "'%s': is not a KCF palette file" +msgstr "« %s » : ce n'est pas un fichier de palette KCF" -#: ../plug-ins/common/file-compressor.c:180 -msgid "bzip archive" -msgstr "archive bzip" +#: ../plug-ins/common/file-cel.c:663 +#, c-format +msgid "'%s': illegal bpp value in palette: %hhu" +msgstr "« %s » : valeur bpp non autorisée dans la palette : %hhu" -#: ../plug-ins/common/file-compressor.c:389 -msgid "No sensible file extension, saving as compressed XCF." -msgstr "Pas d'extension convenable, sauvegarde en tant que XCF compressé." +#: ../plug-ins/common/file-cel.c:672 +#, c-format +msgid "'%s': illegal number of colors: %u" +msgstr "« %s » : nombre de couleurs non autorisé : %u" -#: ../plug-ins/common/file-compressor.c:571 -msgid "No sensible file extension, attempting to load with file magic." -msgstr "" -"Pas d'extension convenable, essai de chargement avec détection magique." +#: ../plug-ins/common/file-cel.c:687 ../plug-ins/common/file-cel.c:704 +#: ../plug-ins/common/file-cel.c:724 +#, c-format +msgid "'%s': EOF or error while reading palette data" +msgstr "« %s » : EOF ou erreur lors de la lecture des données de palette" + +#. init the progress meter +#. And let's begin the progress +#: ../plug-ins/common/file-cel.c:781 ../plug-ins/common/file-gbr.c:670 +#: ../plug-ins/common/file-gif-save.c:799 ../plug-ins/common/file-gih.c:1265 +#: ../plug-ins/common/file-html-table.c:257 ../plug-ins/common/file-pat.c:493 +#: ../plug-ins/common/file-pcx.c:645 ../plug-ins/common/file-pix.c:533 +#: ../plug-ins/common/file-png.c:1377 ../plug-ins/common/file-pnm.c:1017 +#: ../plug-ins/common/file-ps.c:1200 ../plug-ins/common/file-sunras.c:572 +#: ../plug-ins/common/file-tga.c:1207 ../plug-ins/common/file-tiff-save.c:713 +#: ../plug-ins/common/file-xbm.c:1042 ../plug-ins/common/file-xmc.c:1454 +#: ../plug-ins/common/file-xpm.c:639 ../plug-ins/common/file-xwd.c:642 +#: ../plug-ins/file-bmp/bmp-write.c:322 ../plug-ins/file-fits/fits.c:483 +#: ../plug-ins/file-fli/fli-gimp.c:720 ../plug-ins/file-ico/ico-save.c:1014 +#: ../plug-ins/file-jpeg/jpeg-save.c:312 ../plug-ins/file-psd/psd-save.c:1658 +#: ../plug-ins/file-sgi/sgi.c:578 ../plug-ins/file-xjt/xjt.c:1700 +#, c-format +msgid "Saving '%s'" +msgstr "Enregistrement de « %s »" #: ../plug-ins/common/file-csource.c:113 msgid "C source code" @@ -3181,14 +3214,14 @@ msgid "'%s' is not a DICOM file." msgstr "« %s » n'est pas un fichier DICOM." -#: ../plug-ins/common/file-dicom.c:1319 ../plug-ins/common/file-pcx.c:676 -#: ../plug-ins/common/file-pnm.c:1000 +#: ../plug-ins/common/file-dicom.c:1339 ../plug-ins/common/file-pcx.c:677 +#: ../plug-ins/common/file-pnm.c:1002 msgid "Cannot save images with alpha channel." msgstr "Impossible d'enregistrer des images avec un canal alpha." -#: ../plug-ins/common/file-dicom.c:1334 ../plug-ins/common/file-ps.c:1204 -#: ../plug-ins/common/file-ps.c:1236 ../plug-ins/common/file-xwd.c:609 -#: ../plug-ins/file-fits/fits.c:466 ../plug-ins/file-xjt/xjt.c:1691 +#: ../plug-ins/common/file-dicom.c:1354 ../plug-ins/common/file-ps.c:1185 +#: ../plug-ins/common/file-ps.c:1217 ../plug-ins/common/file-xwd.c:627 +#: ../plug-ins/file-fits/fits.c:468 ../plug-ins/file-xjt/xjt.c:1695 msgid "Cannot operate on unknown image types." msgstr "Impossible d'opérer sur des types d'images inconnus." @@ -3196,48 +3229,49 @@ msgid "GIMP brush" msgstr "Brosse GIMP" -#: ../plug-ins/common/file-gbr.c:399 ../plug-ins/common/file-pat.c:418 +#: ../plug-ins/common/file-gbr.c:401 ../plug-ins/common/file-pat.c:420 #, c-format msgid "Invalid header data in '%s': width=%lu, height=%lu, bytes=%lu" msgstr "" -"Données d'en-tête non valides dans « %s » : largeur=%lu, hauteur=%lu, octets=%" -"lu" +"Données d'en-tête non valides dans « %s » : largeur=%lu, hauteur=%lu, octets=" +"%lu" -#: ../plug-ins/common/file-gbr.c:423 ../plug-ins/common/file-gbr.c:435 +#: ../plug-ins/common/file-gbr.c:425 ../plug-ins/common/file-gbr.c:437 msgid "Unsupported brush format" msgstr "Format de brosse non pris en charge" -#: ../plug-ins/common/file-gbr.c:447 +#: ../plug-ins/common/file-gbr.c:449 #, c-format msgid "Error in GIMP brush file '%s'" msgstr "Erreur dans le fichier de brosse GIMP « %s »" -#: ../plug-ins/common/file-gbr.c:455 +#: ../plug-ins/common/file-gbr.c:457 #, c-format msgid "Invalid UTF-8 string in brush file '%s'." -msgstr "Chaîne de caractères UTF-8 non valide dans le fichier de brosse « %s »." +msgstr "" +"Chaîne de caractères UTF-8 non valide dans le fichier de brosse « %s »." -#: ../plug-ins/common/file-gbr.c:461 ../plug-ins/common/file-gih.c:487 -#: ../plug-ins/common/file-gih.c:1137 +#: ../plug-ins/common/file-gbr.c:463 ../plug-ins/common/file-gih.c:489 +#: ../plug-ins/common/file-gih.c:1139 #: ../plug-ins/gradient-flare/gradient-flare.c:3064 msgid "Unnamed" msgstr "Sans nom" -#: ../plug-ins/common/file-gbr.c:653 +#: ../plug-ins/common/file-gbr.c:655 msgid "GIMP brushes are either GRAYSCALE or RGBA" msgstr "Les brosses GIMP sont soit TONS DE GRIS soit RVBA" -#: ../plug-ins/common/file-gbr.c:770 +#: ../plug-ins/common/file-gbr.c:772 msgid "Brush" msgstr "Brosse" #. attach labels -#: ../plug-ins/common/file-gbr.c:784 ../plug-ins/common/grid.c:792 +#: ../plug-ins/common/file-gbr.c:787 ../plug-ins/common/grid.c:792 msgid "Spacing:" msgstr "Espacement :" -#: ../plug-ins/common/file-gbr.c:795 ../plug-ins/common/file-gih.c:888 -#: ../plug-ins/common/file-pat.c:568 ../plug-ins/gimpressionist/presets.c:666 +#: ../plug-ins/common/file-gbr.c:799 ../plug-ins/common/file-gih.c:890 +#: ../plug-ins/common/file-pat.c:570 ../plug-ins/gimpressionist/presets.c:666 msgid "Description:" msgstr "Description :" @@ -3246,36 +3280,36 @@ msgid "GIF image" msgstr "Image GIF" -#: ../plug-ins/common/file-gif-load.c:372 +#: ../plug-ins/common/file-gif-load.c:374 msgid "This is not a GIF file" msgstr "Ce n'est pas un fichier GIF." -#: ../plug-ins/common/file-gif-load.c:411 +#: ../plug-ins/common/file-gif-load.c:413 msgid "Non-square pixels. Image might look squashed." msgstr "Pixels non carrés. L'image peut apparaître tassée." -#: ../plug-ins/common/file-gif-load.c:945 +#: ../plug-ins/common/file-gif-load.c:982 #, c-format msgid "Background (%d%s)" msgstr "Arrière-plan (%d%s)" -#: ../plug-ins/common/file-gif-load.c:968 +#: ../plug-ins/common/file-gif-load.c:1005 #, c-format msgid "Opening '%s' (frame %d)" msgstr "Ouverture de « %s » (image vidéo %d)" -#: ../plug-ins/common/file-gif-load.c:997 ../plug-ins/common/iwarp.c:792 +#: ../plug-ins/common/file-gif-load.c:1034 ../plug-ins/common/iwarp.c:792 #: ../plug-ins/common/iwarp.c:827 #, c-format msgid "Frame %d" msgstr "Image %d" -#: ../plug-ins/common/file-gif-load.c:999 +#: ../plug-ins/common/file-gif-load.c:1036 #, c-format msgid "Frame %d (%d%s)" msgstr "Image vidéo %d (%d%s)" -#: ../plug-ins/common/file-gif-load.c:1030 +#: ../plug-ins/common/file-gif-load.c:1067 #, c-format msgid "" "GIF: Undocumented GIF composite type %d is not handled. Animation might not " @@ -3285,13 +3319,13 @@ "charge. L'animation pourrait ne pas se jouer ni être ré-enregistrée " "parfaitement." -#: ../plug-ins/common/file-gif-save.c:468 +#: ../plug-ins/common/file-gif-save.c:476 msgid "Couldn't simply reduce colors further. Saving as opaque." msgstr "" "Impossible de réduire les couleurs de manière plus poussée. Enregistrement " "en tant qu'image opaque." -#: ../plug-ins/common/file-gif-save.c:583 +#: ../plug-ins/common/file-gif-save.c:591 #, c-format msgid "" "Unable to save '%s'. The GIF file format does not support images that are " @@ -3300,7 +3334,7 @@ "Impossible d'enregistrer « %s ». Le format GIF ne prend pas en charge les " "images de plus de %d pixels de haut ou de large." -#: ../plug-ins/common/file-gif-save.c:694 +#: ../plug-ins/common/file-gif-save.c:704 msgid "" "The GIF format only supports comments in 7bit ASCII encoding. No comment is " "saved." @@ -3308,20 +3342,20 @@ "Le format GIF prend uniquement en charge les commentaires codés en ASCII 7 " "bits. Aucun commentaire n'est enregistré." -#: ../plug-ins/common/file-gif-save.c:753 +#: ../plug-ins/common/file-gif-save.c:763 msgid "" "Cannot save RGB color images. Convert to indexed color or grayscale first." msgstr "" "Impossible d'enregistrer des images RVB. Convertissez d'abord en couleurs " "indexées ou en niveaux de gris." -#: ../plug-ins/common/file-gif-save.c:931 +#: ../plug-ins/common/file-gif-save.c:941 msgid "Delay inserted to prevent evil CPU-sucking animation." msgstr "" "Pause insérée pour éviter une animation particulièrement consommatrice de " "CPU." -#: ../plug-ins/common/file-gif-save.c:972 +#: ../plug-ins/common/file-gif-save.c:982 msgid "" "The image you are trying to save as a GIF contains layers which extend " "beyond the actual borders of the image." @@ -3329,7 +3363,7 @@ "L'image que vous essayez d'enregistrer au format GIF contient des calques " "qui s'étendent au-delà des limites actuelles de l'image." -#: ../plug-ins/common/file-gif-save.c:989 +#: ../plug-ins/common/file-gif-save.c:999 msgid "" "The GIF file format does not allow this. You may choose whether to crop all " "of the layers to the image borders, or cancel this save." @@ -3337,11 +3371,11 @@ "Cela n'est pas permis dans les GIFs. Vous pouvez choisir soit de rogner tous " "les calques aux dimensions de l'image, soit d'annuler cet enregistrement." -#: ../plug-ins/common/file-gif-save.c:1125 +#: ../plug-ins/common/file-gif-save.c:1135 msgid "GIF" msgstr "GIF" -#: ../plug-ins/common/file-gif-save.c:1133 +#: ../plug-ins/common/file-gif-save.c:1143 #, c-format msgid "" "Error loading UI file '%s':\n" @@ -3350,19 +3384,19 @@ "Erreur lors du chargement du fichier d'interface utilisateur « %s » :\n" "%s" -#: ../plug-ins/common/file-gif-save.c:1187 +#: ../plug-ins/common/file-gif-save.c:1197 msgid "I don't care" msgstr "Peu importe" -#: ../plug-ins/common/file-gif-save.c:1189 +#: ../plug-ins/common/file-gif-save.c:1199 msgid "Cumulative layers (combine)" msgstr "Calques cumulatifs (combiner)" -#: ../plug-ins/common/file-gif-save.c:1191 +#: ../plug-ins/common/file-gif-save.c:1201 msgid "One frame per layer (replace)" msgstr "Une image par calque (remplacer)" -#: ../plug-ins/common/file-gif-save.c:1208 +#: ../plug-ins/common/file-gif-save.c:1218 msgid "" "You can only export as animation when the image has more than one layer. The " "image you are trying to export only has one layer." @@ -3370,11 +3404,12 @@ "Vous ne pouvez exporter une animation que si l'image a plus d'un calque. " "L'image que vous essayez d'exporter n'a qu'un seul calque." -#: ../plug-ins/common/file-gif-save.c:2312 +#: ../plug-ins/common/file-gif-save.c:2322 msgid "Error writing output file." msgstr "Erreur lors de l'écriture du fichier de sortie." -#: ../plug-ins/common/file-gif-save.c:2382 +#. translators: the %d is *always* 240 here +#: ../plug-ins/common/file-gif-save.c:2395 #, c-format msgid "The default comment is limited to %d characters." msgstr "Le commentaire par défaut est limité à %d caractères." @@ -3383,63 +3418,63 @@ msgid "GIMP brush (animated)" msgstr "Brosse GIMP (animée)" -#: ../plug-ins/common/file-gih.c:480 +#: ../plug-ins/common/file-gih.c:482 msgid "Error in GIMP brush pipe file." msgstr "Erreur dans le fichier de brosse animée GIMP" -#: ../plug-ins/common/file-gih.c:546 +#: ../plug-ins/common/file-gih.c:548 msgid "GIMP brush file appears to be corrupted." msgstr "Le fichier de brosse GIMP semble être endommagé." -#: ../plug-ins/common/file-gih.c:696 +#: ../plug-ins/common/file-gih.c:698 msgid "Couldn't load one brush in the pipe, giving up." msgstr "Impossible de charger une brosse dans l'animation." -#: ../plug-ins/common/file-gih.c:857 +#: ../plug-ins/common/file-gih.c:859 msgid "Brush Pipe" msgstr "Brosse animée" -#: ../plug-ins/common/file-gih.c:874 +#: ../plug-ins/common/file-gih.c:876 msgid "Spacing (percent):" msgstr "Espacement (pourcentage) :" -#: ../plug-ins/common/file-gih.c:941 +#: ../plug-ins/common/file-gih.c:943 msgid "Pixels" msgstr "Pixels" -#: ../plug-ins/common/file-gih.c:946 +#: ../plug-ins/common/file-gih.c:948 msgid "Cell size:" msgstr "Taille des cases :" -#: ../plug-ins/common/file-gih.c:958 +#: ../plug-ins/common/file-gih.c:960 msgid "Number of cells:" msgstr "Nombre de cases :" -#: ../plug-ins/common/file-gih.c:983 +#: ../plug-ins/common/file-gih.c:985 msgid " Rows of " msgstr " Rangées de " -#: ../plug-ins/common/file-gih.c:995 +#: ../plug-ins/common/file-gih.c:997 msgid " Columns on each layer" msgstr " Colonnes sur chaque calque" -#: ../plug-ins/common/file-gih.c:999 +#: ../plug-ins/common/file-gih.c:1001 msgid " (Width Mismatch!) " msgstr " (hauteurs incohérentes !)" -#: ../plug-ins/common/file-gih.c:1003 +#: ../plug-ins/common/file-gih.c:1005 msgid " (Height Mismatch!) " msgstr " (largeurs incohérentes !)" -#: ../plug-ins/common/file-gih.c:1008 +#: ../plug-ins/common/file-gih.c:1010 msgid "Display as:" msgstr "Afficher comme :" -#: ../plug-ins/common/file-gih.c:1017 +#: ../plug-ins/common/file-gih.c:1019 msgid "Dimension:" msgstr "Dimension :" -#: ../plug-ins/common/file-gih.c:1092 +#: ../plug-ins/common/file-gih.c:1094 msgid "Ranks:" msgstr "Rangs :" @@ -3580,24 +3615,24 @@ msgid "JPEG 2000 image" msgstr "Image JPEG 2000" -#: ../plug-ins/common/file-jp2-load.c:212 +#: ../plug-ins/common/file-jp2-load.c:214 #, c-format msgid "Couldn't decode '%s'." msgstr "Impossible de décoder « %s »." -#: ../plug-ins/common/file-jp2-load.c:235 +#: ../plug-ins/common/file-jp2-load.c:237 #, c-format msgid "The image '%s' is in grayscale but does not contain any gray component." msgstr "" "L'image « %s » est en niveaux de gris mais ne contient aucune composante de " "gris." -#: ../plug-ins/common/file-jp2-load.c:261 +#: ../plug-ins/common/file-jp2-load.c:263 #, c-format msgid "The image '%s' is in RGB, but is missing some of the components." msgstr "L'image « %s » est en RVB mais certaines composantes sont absentes." -#: ../plug-ins/common/file-jp2-load.c:287 +#: ../plug-ins/common/file-jp2-load.c:289 #, c-format msgid "" "The image '%s' is in the CIEXYZ color space, but there is no code in place " @@ -3606,7 +3641,7 @@ "L'image « %s » est dans l'espace colorimétrique CIEXYZ mais aucun code n'est " "présent pour la convertir en RVB." -#: ../plug-ins/common/file-jp2-load.c:294 +#: ../plug-ins/common/file-jp2-load.c:296 #, c-format msgid "" "The image '%s' is in the CIELAB color space, but there is no code in place " @@ -3615,7 +3650,7 @@ "L'image « %s » est dans l'espace colorimétrique CIELAB mais aucun code n'est " "présent pour la convertir en RVB." -#: ../plug-ins/common/file-jp2-load.c:301 +#: ../plug-ins/common/file-jp2-load.c:303 #, c-format msgid "" "The image '%s' is in the YCbCr color space, but there is no code in place to " @@ -3624,28 +3659,28 @@ "L'image « %s » est dans l'espace colorimétrique YCbCr mais aucun code n'est " "présent pour la convertir en RVB." -#: ../plug-ins/common/file-jp2-load.c:309 +#: ../plug-ins/common/file-jp2-load.c:311 #, c-format msgid "The image '%s' is in an unknown color space." msgstr "L'image « %s » est dans un espace colorimétrique inconnu." -#: ../plug-ins/common/file-jp2-load.c:323 +#: ../plug-ins/common/file-jp2-load.c:325 #, c-format msgid "" "Image component %d of image '%s' does not have the same size as the image. " "This is currently not supported." msgstr "" -"Le composant d'image %d de l'image « %s » n'a pas la même taille que l'image, " -"ce qui n'est actuellement pas pris en charge." +"Le composant d'image %d de l'image « %s » n'a pas la même taille que " +"l'image, ce qui n'est actuellement pas pris en charge." -#: ../plug-ins/common/file-jp2-load.c:334 +#: ../plug-ins/common/file-jp2-load.c:336 #, c-format msgid "Image component %d of image '%s' does not have both a hstep and vstep." msgstr "" "Le composant %d de l'image « %s » n'a pas à la fois un « hstep » et un " "« vstep »." -#: ../plug-ins/common/file-jp2-load.c:343 +#: ../plug-ins/common/file-jp2-load.c:345 #, c-format msgid "" "Image component %d of image '%s' is signed. This is currently not supported." @@ -3655,7 +3690,7 @@ #. Inform the user that we couldn't losslessly save the #. * transparency & just use the full palette -#: ../plug-ins/common/file-mng.c:534 ../plug-ins/common/file-png.c:1829 +#: ../plug-ins/common/file-mng.c:534 ../plug-ins/common/file-png.c:1914 msgid "Couldn't losslessly save transparency, saving opacity instead." msgstr "" "Impossible d'enregistrer la transparence sans perte, enregistrement de " @@ -3677,7 +3712,7 @@ msgid "Save background color" msgstr "Enregistrer la couleur d'arrière-plan" -#: ../plug-ins/common/file-mng.c:1371 +#: ../plug-ins/common/file-mng.c:1371 ../plug-ins/ui/plug-in-file-png.ui.h:3 msgid "Save gamma" msgstr "Enregistrer le gamma" @@ -3690,7 +3725,7 @@ msgstr "Enregistrer la date de création" #. Dialog init -#: ../plug-ins/common/file-mng.c:1411 ../plug-ins/common/file-png.c:1878 +#: ../plug-ins/common/file-mng.c:1411 ../plug-ins/common/file-png.c:1963 msgid "PNG" msgstr "PNG" @@ -3734,7 +3769,7 @@ msgid "PNG compression level:" msgstr "Niveau de compression PNG :" -#: ../plug-ins/common/file-mng.c:1465 +#: ../plug-ins/common/file-mng.c:1465 ../plug-ins/ui/plug-in-file-png.ui.h:10 msgid "Choose a high compression level for small file size" msgstr "" "Choisissez un haut degré de compression pour des fichiers de petite taille" @@ -3759,7 +3794,7 @@ msgid "Default frame delay:" msgstr "Temps par défaut d'affichage d'une séquence :" -#: ../plug-ins/common/file-mng.c:1542 +#: ../plug-ins/common/file-mng.c:1542 ../plug-ins/ui/plug-in-file-gif.ui.h:7 msgid "milliseconds" msgstr "millisecondes" @@ -3779,12 +3814,12 @@ msgid "GIMP pattern" msgstr "Motif GIMP" -#: ../plug-ins/common/file-pat.c:378 +#: ../plug-ins/common/file-pat.c:380 #, c-format msgid "Invalid UTF-8 string in pattern file '%s'." msgstr "Chaîne de caractères UTF-8 non valide dans le fichier de motif « %s »." -#: ../plug-ins/common/file-pat.c:553 +#: ../plug-ins/common/file-pat.c:555 msgid "Pattern" msgstr "Motif" @@ -3792,132 +3827,136 @@ msgid "ZSoft PCX image" msgstr "Image ZSoft PCX" -#: ../plug-ins/common/file-pcx.c:372 +#: ../plug-ins/common/file-pcx.c:373 #, c-format msgid "Could not read header from '%s'" msgstr "Impossible de lire l'en-tête depuis « %s »" -#: ../plug-ins/common/file-pcx.c:383 +#: ../plug-ins/common/file-pcx.c:384 #, c-format msgid "'%s' is not a PCX file" msgstr "« %s » n'est pas un fichier PCX" -#: ../plug-ins/common/file-pcx.c:397 ../plug-ins/file-bmp/bmp-read.c:636 +#: ../plug-ins/common/file-pcx.c:398 ../plug-ins/file-bmp/bmp-read.c:689 #: ../plug-ins/file-psd/psd-load.c:301 #, c-format msgid "Unsupported or invalid image width: %d" msgstr "La largeur de l'image est non valide ou non prise en charge : %d" -#: ../plug-ins/common/file-pcx.c:403 ../plug-ins/file-bmp/bmp-read.c:642 +#: ../plug-ins/common/file-pcx.c:404 ../plug-ins/file-bmp/bmp-read.c:695 #: ../plug-ins/file-psd/psd-load.c:293 #, c-format msgid "Unsupported or invalid image height: %d" msgstr "La hauteur de l'image est non valide ou non prise en charge : %d" -#: ../plug-ins/common/file-pcx.c:409 +#: ../plug-ins/common/file-pcx.c:410 msgid "Invalid number of bytes per line in PCX header" msgstr "Nombre d'octets par ligne non valide dans l'en-tête PCX" -#: ../plug-ins/common/file-pcx.c:417 +#: ../plug-ins/common/file-pcx.c:418 #, c-format msgid "Image dimensions too large: width %d x height %d" msgstr "Dimensions de l'image trop grandes : largeur %d x hauteur %d" -#: ../plug-ins/common/file-pcx.c:466 +#: ../plug-ins/common/file-pcx.c:467 msgid "Unusual PCX flavour, giving up" msgstr "Semble PCX inhabituel, abandon" -#: ../plug-ins/common/file-pcx.c:685 +#: ../plug-ins/common/file-pcx.c:686 #, c-format msgid "Invalid X offset: %d" msgstr "Décalage X non valide : %d" -#: ../plug-ins/common/file-pcx.c:691 +#: ../plug-ins/common/file-pcx.c:692 #, c-format msgid "Invalid Y offset: %d" msgstr "Décalage Y non valide : %d" -#: ../plug-ins/common/file-pcx.c:697 +#: ../plug-ins/common/file-pcx.c:698 #, c-format msgid "Right border out of bounds (must be < %d): %d" msgstr "La bordure droite est hors limites (doit être inférieure à %d) : %d" -#: ../plug-ins/common/file-pcx.c:704 +#: ../plug-ins/common/file-pcx.c:705 #, c-format msgid "Bottom border out of bounds (must be < %d): %d" msgstr "" "La bordure inférieure est hors limites (doit être inférieure à %d) : %d" -#: ../plug-ins/common/file-pcx.c:769 +#: ../plug-ins/common/file-pcx.c:770 #, c-format msgid "Writing to file '%s' failed: %s" msgstr "Impossible d'écrire dans le fichier « %s » : %s" -#: ../plug-ins/common/file-pdf-load.c:296 -#: ../plug-ins/common/file-pdf-save.c:273 -#: ../plug-ins/common/file-pdf-save.c:288 +#: ../plug-ins/common/file-pdf-load.c:300 +#: ../plug-ins/common/file-pdf-save.c:300 msgid "Portable Document Format" msgstr "PDF (Portable Document Format)" -#: ../plug-ins/common/file-pdf-load.c:543 -#: ../plug-ins/common/file-pdf-load.c:562 +#: ../plug-ins/common/file-pdf-load.c:548 +#: ../plug-ins/common/file-pdf-load.c:567 #, c-format msgid "Could not load '%s': %s" msgstr "Impossible de charger « %s » : %s" -#: ../plug-ins/common/file-pdf-load.c:876 +#: ../plug-ins/common/file-pdf-load.c:895 #, c-format msgid "%s-%s" msgstr "%s-%s" -#: ../plug-ins/common/file-pdf-load.c:878 ../plug-ins/common/file-ps.c:1126 +#: ../plug-ins/common/file-pdf-load.c:897 ../plug-ins/common/file-ps.c:1107 #, c-format msgid "%s-pages" msgstr "%s-pages" -#: ../plug-ins/common/file-pdf-load.c:1068 +#: ../plug-ins/common/file-pdf-load.c:1088 msgid "Import from PDF" msgstr "Importation depuis un PDF" -#: ../plug-ins/common/file-pdf-load.c:1073 ../plug-ins/common/file-ps.c:3100 -#: ../plug-ins/common/file-tiff-load.c:483 +#: ../plug-ins/common/file-pdf-load.c:1093 ../plug-ins/common/file-ps.c:2967 +#: ../plug-ins/common/file-tiff-load.c:491 msgid "_Import" msgstr "_Importer" -#: ../plug-ins/common/file-pdf-load.c:1106 +#: ../plug-ins/common/file-pdf-load.c:1126 msgid "Error getting number of pages from the given PDF file." msgstr "" "Erreur lors de l'obtention du nombre de pages contenues dans le fichier PDF " "indiqué." -#: ../plug-ins/common/file-pdf-load.c:1148 +#: ../plug-ins/common/file-pdf-load.c:1168 msgid "_Width (pixels):" msgstr "_Largeur (pixels) :" -#: ../plug-ins/common/file-pdf-load.c:1149 +#: ../plug-ins/common/file-pdf-load.c:1169 msgid "_Height (pixels):" msgstr "_Hauteur (pixels) :" -#: ../plug-ins/common/file-pdf-load.c:1151 +#: ../plug-ins/common/file-pdf-load.c:1171 msgid "_Resolution:" msgstr "_Résolution :" -#: ../plug-ins/common/file-pdf-load.c:1431 -#: ../plug-ins/common/file-pdf-load.c:1432 ../plug-ins/common/file-svg.c:917 -#: ../plug-ins/common/file-wmf.c:698 ../plug-ins/print/print-page-layout.c:285 +#. Antialiasing +#: ../plug-ins/common/file-pdf-load.c:1182 +msgid "Use _Anti-aliasing" +msgstr "Utiliser le _lissage" + +#: ../plug-ins/common/file-pdf-load.c:1460 +#: ../plug-ins/common/file-pdf-load.c:1461 ../plug-ins/common/file-svg.c:917 +#: ../plug-ins/common/file-wmf.c:698 ../plug-ins/print/print-page-layout.c:301 #, c-format msgid "pixels/%a" msgstr "pixels/%a" -#: ../plug-ins/common/file-pdf-save.c:303 +#: ../plug-ins/common/file-pdf-save.c:315 msgid "_Create multipage PDF..." msgstr "_Créer un PDF multipage..." -#: ../plug-ins/common/file-pdf-save.c:396 +#: ../plug-ins/common/file-pdf-save.c:423 msgid "You must select a file to save!" msgstr "Vous devez choisir un fichier pour enregistrer !" -#: ../plug-ins/common/file-pdf-save.c:405 +#: ../plug-ins/common/file-pdf-save.c:449 #, c-format msgid "" "An error occured while creating the PDF file:\n" @@ -3930,87 +3969,93 @@ "Vérifiez que le nom de fichier saisi est valide et que l'emplacement choisi " "n'est pas en lecture seule." -#: ../plug-ins/common/file-pdf-save.c:715 -#: ../plug-ins/common/file-pdf-save.c:832 +#: ../plug-ins/common/file-pdf-save.c:803 +#: ../plug-ins/common/file-pdf-save.c:920 msgid "Omit hidden layers and layers with zero opacity" msgstr "Omettre les calques masqués et les calques dont l'opacité est à 0" -#: ../plug-ins/common/file-pdf-save.c:719 -#: ../plug-ins/common/file-pdf-save.c:836 +#: ../plug-ins/common/file-pdf-save.c:807 +#: ../plug-ins/common/file-pdf-save.c:924 msgid "Convert bitmaps to vector graphics where possible" msgstr "Convertir si possible les images bitmaps en images vectorielles" -#: ../plug-ins/common/file-pdf-save.c:723 -#: ../plug-ins/common/file-pdf-save.c:840 +#: ../plug-ins/common/file-pdf-save.c:811 +#: ../plug-ins/common/file-pdf-save.c:928 msgid "Apply layer masks before saving" msgstr "Appliquer les masques de calque avant d'enregistrer" -#: ../plug-ins/common/file-pdf-save.c:726 -#: ../plug-ins/common/file-pdf-save.c:843 +#: ../plug-ins/common/file-pdf-save.c:814 +#: ../plug-ins/common/file-pdf-save.c:931 msgid "Keeping the masks will not change the output" msgstr "La conservation des masques ne change pas le résultat" -#: ../plug-ins/common/file-pdf-save.c:779 +#: ../plug-ins/common/file-pdf-save.c:867 msgid "Save to:" msgstr "Enregistrer dans :" -#: ../plug-ins/common/file-pdf-save.c:783 +#: ../plug-ins/common/file-pdf-save.c:871 msgid "Browse..." msgstr "Parcourir..." -#: ../plug-ins/common/file-pdf-save.c:784 +#: ../plug-ins/common/file-pdf-save.c:872 msgid "Multipage PDF export" msgstr "Exportation PDF multipage" -#: ../plug-ins/common/file-pdf-save.c:817 +#: ../plug-ins/common/file-pdf-save.c:905 msgid "Remove the selected pages" msgstr "Enlever les pages sélectionnées" -#: ../plug-ins/common/file-pdf-save.c:827 +#: ../plug-ins/common/file-pdf-save.c:915 msgid "Add this image" msgstr "Ajouter cette image" -#: ../plug-ins/common/file-pdf-save.c:940 +#: ../plug-ins/common/file-pdf-save.c:1028 msgid "Error! In order to save the file, at least one image should be added!" -msgstr "Erreur. Pour enregistrer le fichier, il faut ajouter au moins une image." +msgstr "" +"Erreur. Pour enregistrer le fichier, il faut ajouter au moins une image." + +#: ../plug-ins/common/file-pdf-save.c:1351 +#: ../plug-ins/print/print-draw-page.c:223 +msgid "Cannot handle the size (either width or height) of the image." +msgstr "Impossible de traiter la taille (la largeur ou la hauteur) de l'image." #: ../plug-ins/common/file-pix.c:142 ../plug-ins/common/file-pix.c:159 msgid "Alias Pix image" msgstr "Image Alias Pix" -#: ../plug-ins/common/file-png.c:275 ../plug-ins/common/file-png.c:296 -#: ../plug-ins/common/file-png.c:316 ../plug-ins/common/file-png.c:333 +#: ../plug-ins/common/file-png.c:279 ../plug-ins/common/file-png.c:300 +#: ../plug-ins/common/file-png.c:320 ../plug-ins/common/file-png.c:337 msgid "PNG image" msgstr "Image PNG" -#: ../plug-ins/common/file-png.c:640 +#: ../plug-ins/common/file-png.c:645 #, c-format msgid "Error loading PNG file: %s" msgstr "Erreur lors du chargement du fichier PNG : %s" -#: ../plug-ins/common/file-png.c:728 +#: ../plug-ins/common/file-png.c:733 #, c-format msgid "Error creating PNG read struct while saving '%s'." msgstr "" "Erreur de création d'une structure PNG « read » lors de l'enregistrement de " "« %s »." -#: ../plug-ins/common/file-png.c:738 +#: ../plug-ins/common/file-png.c:743 #, c-format msgid "Error while reading '%s'. File corrupted?" msgstr "Erreur en lecture de « %s ». Fichier endommagé ?" -#: ../plug-ins/common/file-png.c:867 +#: ../plug-ins/common/file-png.c:878 #, c-format msgid "Unknown color model in PNG file '%s'." msgstr "Modèle de couleur inconnu dans le fichier PNG « %s »." -#: ../plug-ins/common/file-png.c:878 +#: ../plug-ins/common/file-png.c:889 #, c-format msgid "Could not create new image for '%s': %s" msgstr "Impossible de créer une nouvelle image pour « %s » : %s" -#: ../plug-ins/common/file-png.c:927 +#: ../plug-ins/common/file-png.c:943 msgid "" "The PNG file specifies an offset that caused the layer to be positioned " "outside the image." @@ -4018,25 +4063,46 @@ "Le fichier PNG spécifie un décalage qui entraîne un calque positionné en " "dehors de l'image." -#: ../plug-ins/common/file-png.c:1262 +#: ../plug-ins/common/file-png.c:1245 +msgid "Apply PNG Offset" +msgstr "Appliquer le décalage PNG" + +#: ../plug-ins/common/file-png.c:1249 +msgid "Ignore PNG offset" +msgstr "Ignorer le décalage PNG" + +#: ../plug-ins/common/file-png.c:1250 +msgid "Apply PNG offset to layer" +msgstr "Appliquer le décalage PNG au calque" + +#: ../plug-ins/common/file-png.c:1274 +#, c-format +msgid "" +"The PNG image you are importing specifies an offset of %d, %d. Do you want " +"to apply this offset to the layer?" +msgstr "" +"L'image PNG importée indique un décalage de %d, %d. Voulez-vous appliquer ce " +"décalage au calque ?" + +#: ../plug-ins/common/file-png.c:1342 #, c-format msgid "Error creating PNG write struct while saving '%s'." msgstr "" "Erreur de création d'une structure PNG « write » lors de l'enregistrement de " "« %s »." -#: ../plug-ins/common/file-png.c:1272 +#: ../plug-ins/common/file-png.c:1352 #, c-format msgid "Error while saving '%s'. Could not save image." msgstr "Erreur en écriture de « %s ». Impossible d'enregistrer l'image." -#: ../plug-ins/common/file-png.c:1895 +#: ../plug-ins/common/file-png.c:1980 #, c-format msgid "Error loading UI file '%s': %s" msgstr "" "Erreur lors du chargement du fichier d'interface utilisateur « %s » : %s" -#: ../plug-ins/common/file-png.c:1896 +#: ../plug-ins/common/file-png.c:1981 msgid "Unknown error" msgstr "Erreur inconnue" @@ -4060,204 +4126,191 @@ msgid "PPM image" msgstr "Image PPM" -#: ../plug-ins/common/file-pnm.c:528 ../plug-ins/common/file-pnm.c:550 -#: ../plug-ins/common/file-pnm.c:559 ../plug-ins/common/file-pnm.c:570 -#: ../plug-ins/common/file-pnm.c:656 ../plug-ins/common/file-pnm.c:738 +#: ../plug-ins/common/file-pnm.c:530 ../plug-ins/common/file-pnm.c:552 +#: ../plug-ins/common/file-pnm.c:561 ../plug-ins/common/file-pnm.c:572 +#: ../plug-ins/common/file-pnm.c:658 ../plug-ins/common/file-pnm.c:740 msgid "Premature end of file." msgstr "Fin de fichier prématurée." -#: ../plug-ins/common/file-pnm.c:530 +#: ../plug-ins/common/file-pnm.c:532 msgid "Invalid file." msgstr "Fichier non valide." -#: ../plug-ins/common/file-pnm.c:544 +#: ../plug-ins/common/file-pnm.c:546 msgid "File not in a supported format." msgstr "Le fichier est dans un format non pris en charge." -#: ../plug-ins/common/file-pnm.c:553 +#: ../plug-ins/common/file-pnm.c:555 msgid "Invalid X resolution." msgstr "Résolution X non valide." -#: ../plug-ins/common/file-pnm.c:555 +#: ../plug-ins/common/file-pnm.c:557 msgid "Image width is larger than GIMP can handle." msgstr "L'image est plus large que GIMP ne peut prendre en charge." -#: ../plug-ins/common/file-pnm.c:562 +#: ../plug-ins/common/file-pnm.c:564 msgid "Invalid Y resolution." msgstr "Résolution Y non valide." -#: ../plug-ins/common/file-pnm.c:564 +#: ../plug-ins/common/file-pnm.c:566 msgid "Image height is larger than GIMP can handle." msgstr "L'image est plus haute que GIMP ne peut prendre en charge." -#: ../plug-ins/common/file-pnm.c:574 +#: ../plug-ins/common/file-pnm.c:576 msgid "Unsupported maximum value." msgstr "Valeur maximale non valide." -#: ../plug-ins/common/file-pnm.c:814 +#: ../plug-ins/common/file-pnm.c:816 msgid "Error reading file." msgstr "Erreur de lecture du fichier." -#: ../plug-ins/common/file-pnm.c:1219 +#: ../plug-ins/common/file-pnm.c:1221 msgid "PNM" msgstr "PNM" #. file save type -#: ../plug-ins/common/file-pnm.c:1222 +#: ../plug-ins/common/file-pnm.c:1224 msgid "Data formatting" msgstr "Formatage des données" -#: ../plug-ins/common/file-pnm.c:1226 +#: ../plug-ins/common/file-pnm.c:1228 msgid "Raw" msgstr "Brut" -#: ../plug-ins/common/file-pnm.c:1227 +#: ../plug-ins/common/file-pnm.c:1229 msgid "ASCII" msgstr "ASCII" -#: ../plug-ins/common/file-ps.c:601 ../plug-ins/common/file-ps.c:693 +#: ../plug-ins/common/file-ps.c:581 ../plug-ins/common/file-ps.c:673 msgid "PostScript document" msgstr "Document PostScript" -#: ../plug-ins/common/file-ps.c:620 ../plug-ins/common/file-ps.c:709 +#: ../plug-ins/common/file-ps.c:600 ../plug-ins/common/file-ps.c:689 msgid "Encapsulated PostScript image" msgstr "Image PostScript encapsulé" -#: ../plug-ins/common/file-ps.c:640 +#: ../plug-ins/common/file-ps.c:620 msgid "PDF document" msgstr "Document PDF" -#: ../plug-ins/common/file-ps.c:1051 +#: ../plug-ins/common/file-ps.c:1032 #, c-format msgid "Could not interpret Postscript file '%s'" msgstr "Impossible d'interpréter le fichier Postscript « %s »" -#: ../plug-ins/common/file-ps.c:1193 +#: ../plug-ins/common/file-ps.c:1174 #, c-format msgid "PostScript save cannot handle images with alpha channels" msgstr "" "L'enregistrement PostScript ne peux pas gérer les images avec des canaux " "alpha" -#: ../plug-ins/common/file-ps.c:1740 ../plug-ins/common/file-ps.c:1775 -#, c-format -msgid "" -"Error starting Ghostscript. Make sure that Ghostscript is installed and - if " -"necessary - use the environment variable GS_PROG to tell GIMP about its " -"location.\n" -"(%s)" -msgstr "" -"Erreur de démarrage de Ghostscript. Assurez-vous que Ghostscript soit bien " -"installé et si nécessaire utilisez la variable d'environnement GS_PROG pour " -"indiquer à GIMP son emplacement.\n" -"(%s)" - -#: ../plug-ins/common/file-ps.c:1942 ../plug-ins/common/file-tiff-load.c:999 +#: ../plug-ins/common/file-ps.c:1809 ../plug-ins/common/file-tiff-load.c:1013 #, c-format msgid "Page %d" msgstr "Page %d" -#: ../plug-ins/common/file-ps.c:2607 ../plug-ins/common/file-ps.c:2738 -#: ../plug-ins/common/file-ps.c:2887 ../plug-ins/common/file-ps.c:3011 -#: ../plug-ins/common/file-sunras.c:1504 ../plug-ins/common/file-sunras.c:1610 -#: ../plug-ins/file-fits/fits.c:850 ../plug-ins/file-fits/fits.c:973 +#: ../plug-ins/common/file-ps.c:2474 ../plug-ins/common/file-ps.c:2605 +#: ../plug-ins/common/file-ps.c:2754 ../plug-ins/common/file-ps.c:2878 +#: ../plug-ins/common/file-sunras.c:1506 ../plug-ins/common/file-sunras.c:1612 +#: ../plug-ins/file-fits/fits.c:852 ../plug-ins/file-fits/fits.c:975 msgid "Write error occurred" msgstr "Une erreur d'écriture est survenue" -#: ../plug-ins/common/file-ps.c:3095 +#: ../plug-ins/common/file-ps.c:2962 msgid "Import from PostScript" msgstr "Importation depuis un PostScript" #. Rendering -#: ../plug-ins/common/file-ps.c:3139 +#: ../plug-ins/common/file-ps.c:3006 msgid "Rendering" msgstr "Interprétation" #. Resolution -#: ../plug-ins/common/file-ps.c:3155 ../plug-ins/common/file-svg.c:911 +#: ../plug-ins/common/file-ps.c:3023 ../plug-ins/common/file-svg.c:911 #: ../plug-ins/common/file-wmf.c:692 msgid "Resolution:" msgstr "Résolution :" -#: ../plug-ins/common/file-ps.c:3194 +#: ../plug-ins/common/file-ps.c:3061 msgid "Pages:" msgstr "Pages :" -#: ../plug-ins/common/file-ps.c:3201 +#: ../plug-ins/common/file-ps.c:3068 msgid "Pages to load (e.g.: 1-4 or 1,3,5-7)" msgstr "Pages à charger (par ex. : 1-4 ou 1,3,5-7)" -#: ../plug-ins/common/file-ps.c:3206 ../plug-ins/common/sphere-designer.c:2657 +#: ../plug-ins/common/file-ps.c:3073 ../plug-ins/common/sphere-designer.c:2657 msgid "Layers" msgstr "Calques" -#: ../plug-ins/common/file-ps.c:3209 +#: ../plug-ins/common/file-ps.c:3076 msgid "Images" msgstr "Images" -#: ../plug-ins/common/file-ps.c:3212 +#: ../plug-ins/common/file-ps.c:3079 msgid "Open as" msgstr "Ouvrir comme" -#: ../plug-ins/common/file-ps.c:3216 +#: ../plug-ins/common/file-ps.c:3083 msgid "Try Bounding Box" msgstr "Essayer la BoundingBox" #. Colouring -#: ../plug-ins/common/file-ps.c:3229 +#: ../plug-ins/common/file-ps.c:3096 msgid "Coloring" msgstr "Coloration" -#: ../plug-ins/common/file-ps.c:3233 +#: ../plug-ins/common/file-ps.c:3100 msgid "B/W" msgstr "N/B" -#: ../plug-ins/common/file-ps.c:3235 ../plug-ins/common/file-xpm.c:479 +#: ../plug-ins/common/file-ps.c:3102 ../plug-ins/common/file-xpm.c:480 #: ../plug-ins/gimpressionist/color.c:65 #: ../plug-ins/gimpressionist/general.c:169 #: ../plug-ins/imagemap/imap_menu.c:212 msgid "Color" msgstr "Couleur" -#: ../plug-ins/common/file-ps.c:3236 ../plug-ins/file-fits/fits.c:1032 +#: ../plug-ins/common/file-ps.c:3103 ../plug-ins/file-fits/fits.c:1034 msgid "Automatic" msgstr "Automatique" -#: ../plug-ins/common/file-ps.c:3247 +#: ../plug-ins/common/file-ps.c:3114 msgid "Text antialiasing" msgstr "Lissage du texte" -#: ../plug-ins/common/file-ps.c:3251 ../plug-ins/common/file-ps.c:3263 +#: ../plug-ins/common/file-ps.c:3118 ../plug-ins/common/file-ps.c:3130 msgctxt "antialiasing" msgid "None" msgstr "Aucun" -#: ../plug-ins/common/file-ps.c:3252 ../plug-ins/common/file-ps.c:3264 +#: ../plug-ins/common/file-ps.c:3119 ../plug-ins/common/file-ps.c:3131 msgid "Weak" msgstr "Faible" -#: ../plug-ins/common/file-ps.c:3253 ../plug-ins/common/file-ps.c:3265 +#: ../plug-ins/common/file-ps.c:3120 ../plug-ins/common/file-ps.c:3132 msgid "Strong" msgstr "Fort" -#: ../plug-ins/common/file-ps.c:3259 +#: ../plug-ins/common/file-ps.c:3126 msgid "Graphic antialiasing" msgstr "Lissage Graphique" -#: ../plug-ins/common/file-ps.c:3337 +#: ../plug-ins/common/file-ps.c:3204 msgid "PostScript" msgstr "PostScript" #. Image Size -#: ../plug-ins/common/file-ps.c:3354 +#: ../plug-ins/common/file-ps.c:3221 msgid "Image Size" msgstr "Taille de l'image" -#: ../plug-ins/common/file-ps.c:3403 +#: ../plug-ins/common/file-ps.c:3270 msgid "_Keep aspect ratio" msgstr "Proportions _fixes" -#: ../plug-ins/common/file-ps.c:3409 +#: ../plug-ins/common/file-ps.c:3276 msgid "" "When toggled, the resulting image will be scaled to fit into the given size " "without changing the aspect ratio." @@ -4266,42 +4319,41 @@ "taille donnée sans changer les proportions." #. Unit -#: ../plug-ins/common/file-ps.c:3419 +#: ../plug-ins/common/file-ps.c:3286 msgid "Unit" msgstr "Unité" -#: ../plug-ins/common/file-ps.c:3423 +#: ../plug-ins/common/file-ps.c:3290 msgid "_Inch" msgstr "_Pouce" -#: ../plug-ins/common/file-ps.c:3424 +#: ../plug-ins/common/file-ps.c:3291 msgid "_Millimeter" msgstr "_Millimètre" #. Rotation -#: ../plug-ins/common/file-ps.c:3435 -#: ../plug-ins/map-object/map-object-ui.c:989 +#: ../plug-ins/common/file-ps.c:3302 ../plug-ins/map-object/map-object-ui.c:989 msgid "Rotation" msgstr "Rotation" #. Format -#: ../plug-ins/common/file-ps.c:3450 +#: ../plug-ins/common/file-ps.c:3317 msgid "Output" msgstr "Sortie" -#: ../plug-ins/common/file-ps.c:3456 +#: ../plug-ins/common/file-ps.c:3323 msgid "_PostScript level 2" msgstr "_PostScript niveau 2" -#: ../plug-ins/common/file-ps.c:3465 +#: ../plug-ins/common/file-ps.c:3332 msgid "_Encapsulated PostScript" msgstr "PostScript _encapsulé" -#: ../plug-ins/common/file-ps.c:3474 +#: ../plug-ins/common/file-ps.c:3341 msgid "P_review" msgstr "Aperç_u" -#: ../plug-ins/common/file-ps.c:3496 +#: ../plug-ins/common/file-ps.c:3363 msgid "Preview _size:" msgstr "_Taille de l'aperçu :" @@ -4335,83 +4387,83 @@ msgid "Raw image data" msgstr "Données d'image Raw" -#: ../plug-ins/common/file-raw.c:1056 +#: ../plug-ins/common/file-raw.c:1073 msgid "Load Image from Raw Data" msgstr "Charger une image depuis les données Raw" -#: ../plug-ins/common/file-raw.c:1090 +#: ../plug-ins/common/file-raw.c:1107 msgid "Image" msgstr "Image" -#: ../plug-ins/common/file-raw.c:1101 +#: ../plug-ins/common/file-raw.c:1118 msgid "RGB Alpha" msgstr "Alpha RVB" -#: ../plug-ins/common/file-raw.c:1102 +#: ../plug-ins/common/file-raw.c:1119 msgid "RGB565" msgstr "RVB565" -#: ../plug-ins/common/file-raw.c:1103 +#: ../plug-ins/common/file-raw.c:1120 msgid "Planar RGB" msgstr "RVB plat" -#: ../plug-ins/common/file-raw.c:1104 +#: ../plug-ins/common/file-raw.c:1121 msgid "Indexed" msgstr "Indexé" -#: ../plug-ins/common/file-raw.c:1105 +#: ../plug-ins/common/file-raw.c:1122 msgid "Indexed Alpha" msgstr "Alpha indexé" -#: ../plug-ins/common/file-raw.c:1110 +#: ../plug-ins/common/file-raw.c:1127 msgid "Image _Type:" msgstr "_Type d'image :" -#: ../plug-ins/common/file-raw.c:1160 +#: ../plug-ins/common/file-raw.c:1177 msgid "Palette" msgstr "Palette" -#: ../plug-ins/common/file-raw.c:1170 ../plug-ins/common/file-raw.c:1255 +#: ../plug-ins/common/file-raw.c:1187 ../plug-ins/common/file-raw.c:1272 msgid "R, G, B (normal)" msgstr "R, V, B (normal)" -#: ../plug-ins/common/file-raw.c:1171 ../plug-ins/common/file-raw.c:1257 +#: ../plug-ins/common/file-raw.c:1188 ../plug-ins/common/file-raw.c:1274 msgid "B, G, R, X (BMP style)" msgstr "B, V, R, X (style BMP)" -#: ../plug-ins/common/file-raw.c:1176 +#: ../plug-ins/common/file-raw.c:1193 msgid "_Palette Type:" msgstr "Type de _palettes :" -#: ../plug-ins/common/file-raw.c:1187 +#: ../plug-ins/common/file-raw.c:1204 msgid "Off_set:" msgstr "_Décalage :" -#: ../plug-ins/common/file-raw.c:1199 +#: ../plug-ins/common/file-raw.c:1216 msgid "Select Palette File" msgstr "Sélectionner le fichier de palette" -#: ../plug-ins/common/file-raw.c:1205 +#: ../plug-ins/common/file-raw.c:1222 msgid "Pal_ette File:" msgstr "Fichier de _palettes :" -#: ../plug-ins/common/file-raw.c:1233 +#: ../plug-ins/common/file-raw.c:1250 msgid "Raw Image" msgstr "Image Raw" -#: ../plug-ins/common/file-raw.c:1241 +#: ../plug-ins/common/file-raw.c:1258 msgid "RGB Save Type" msgstr "Type d'enregistrement RVB" -#: ../plug-ins/common/file-raw.c:1245 +#: ../plug-ins/common/file-raw.c:1262 msgid "Standard (R,G,B)" msgstr "Standard (R,V,B)" -#: ../plug-ins/common/file-raw.c:1246 +#: ../plug-ins/common/file-raw.c:1263 msgid "Planar (RRR,GGG,BBB)" msgstr "Plat (RRR,VVV,BBB)" -#: ../plug-ins/common/file-raw.c:1251 +#: ../plug-ins/common/file-raw.c:1268 msgid "Indexed Palette Type" msgstr "Type de palette indexée" @@ -4419,26 +4471,26 @@ msgid "SUN Rasterfile image" msgstr "Image Raster SUN" -#: ../plug-ins/common/file-sunras.c:402 +#: ../plug-ins/common/file-sunras.c:404 #, c-format msgid "Could not open '%s' as SUN-raster-file" msgstr "Impossible d'ouvrir « %s » comme un fichier SUN-Raster" -#: ../plug-ins/common/file-sunras.c:412 +#: ../plug-ins/common/file-sunras.c:414 msgid "The type of this SUN-rasterfile is not supported" msgstr "Le type de ce fichier SUN-Raster n'est pas pris en charge" -#: ../plug-ins/common/file-sunras.c:441 +#: ../plug-ins/common/file-sunras.c:443 #, c-format msgid "Could not read color entries from '%s'" msgstr "Impossible de lire les entrées de couleurs de « %s »" -#: ../plug-ins/common/file-sunras.c:450 +#: ../plug-ins/common/file-sunras.c:452 msgid "Type of colormap not supported" msgstr "Type de palette de couleurs non pris en charge" -#: ../plug-ins/common/file-sunras.c:457 ../plug-ins/common/file-xbm.c:827 -#: ../plug-ins/common/file-xwd.c:489 +#: ../plug-ins/common/file-sunras.c:459 ../plug-ins/common/file-xbm.c:828 +#: ../plug-ins/common/file-xwd.c:507 #, c-format msgid "" "'%s':\n" @@ -4447,8 +4499,8 @@ "« %s » :\n" "Largeur d'image non indiquée" -#: ../plug-ins/common/file-sunras.c:465 ../plug-ins/common/file-xbm.c:834 -#: ../plug-ins/common/file-xwd.c:499 +#: ../plug-ins/common/file-sunras.c:467 ../plug-ins/common/file-xbm.c:835 +#: ../plug-ins/common/file-xwd.c:515 #, c-format msgid "" "'%s':\n" @@ -4457,8 +4509,8 @@ "« %s » :\n" "La largeur de l'image est supérieure à celle prise en charge par GIMP" -#: ../plug-ins/common/file-sunras.c:473 ../plug-ins/common/file-xbm.c:841 -#: ../plug-ins/common/file-xwd.c:508 +#: ../plug-ins/common/file-sunras.c:475 ../plug-ins/common/file-xbm.c:842 +#: ../plug-ins/common/file-xwd.c:522 #, c-format msgid "" "'%s':\n" @@ -4467,8 +4519,8 @@ "« %s » :\n" "Hauteur d'image non indiquée" -#: ../plug-ins/common/file-sunras.c:481 ../plug-ins/common/file-xbm.c:848 -#: ../plug-ins/common/file-xwd.c:517 +#: ../plug-ins/common/file-sunras.c:483 ../plug-ins/common/file-xbm.c:849 +#: ../plug-ins/common/file-xwd.c:529 #, c-format msgid "" "'%s':\n" @@ -4477,39 +4529,39 @@ "« %s » :\n" "La hauteur de l'image est supérieure à celle prise en charge par GIMP" -#: ../plug-ins/common/file-sunras.c:520 +#: ../plug-ins/common/file-sunras.c:522 msgid "This image depth is not supported" msgstr "Cette résolution d'image n'est pas prise en charge" -#: ../plug-ins/common/file-sunras.c:544 +#: ../plug-ins/common/file-sunras.c:546 #, c-format msgid "SUNRAS save cannot handle images with alpha channels" msgstr "" "Il est impossible d'enregistrer des images avec des canaux alpha au format " "SUNRAS." -#: ../plug-ins/common/file-sunras.c:555 +#: ../plug-ins/common/file-sunras.c:557 msgid "Can't operate on unknown image types" msgstr "Impossible d'opérer sur des types d'images inconnus." -#: ../plug-ins/common/file-sunras.c:1084 ../plug-ins/common/file-sunras.c:1175 -#: ../plug-ins/common/file-sunras.c:1256 ../plug-ins/common/file-sunras.c:1351 -#: ../plug-ins/common/file-xwd.c:1357 ../plug-ins/common/file-xwd.c:1458 -#: ../plug-ins/common/file-xwd.c:1616 ../plug-ins/common/file-xwd.c:1817 -#: ../plug-ins/common/file-xwd.c:2069 ../plug-ins/file-fits/fits.c:698 +#: ../plug-ins/common/file-sunras.c:1086 ../plug-ins/common/file-sunras.c:1177 +#: ../plug-ins/common/file-sunras.c:1258 ../plug-ins/common/file-sunras.c:1353 +#: ../plug-ins/common/file-xwd.c:1375 ../plug-ins/common/file-xwd.c:1476 +#: ../plug-ins/common/file-xwd.c:1634 ../plug-ins/common/file-xwd.c:1846 +#: ../plug-ins/common/file-xwd.c:2109 ../plug-ins/file-fits/fits.c:700 msgid "EOF encountered on reading" msgstr "Fin de fichier rencontrée lors de la lecture" -#: ../plug-ins/common/file-sunras.c:1627 +#: ../plug-ins/common/file-sunras.c:1629 msgid "SUNRAS" msgstr "SUNRAS" #. file save type -#: ../plug-ins/common/file-sunras.c:1630 +#: ../plug-ins/common/file-sunras.c:1632 msgid "Data Formatting" msgstr "Formatage des données" -#: ../plug-ins/common/file-sunras.c:1634 +#: ../plug-ins/common/file-sunras.c:1636 msgid "RunLength Encoded" msgstr "Encodage RunLength" @@ -4589,68 +4641,67 @@ msgid "TarGA image" msgstr "Image TarGA" -#: ../plug-ins/common/file-tga.c:455 +#: ../plug-ins/common/file-tga.c:456 #, c-format msgid "Cannot read footer from '%s'" msgstr "Impossible de lire le pied de page depuis « %s »" -#: ../plug-ins/common/file-tga.c:473 +#: ../plug-ins/common/file-tga.c:474 #, c-format msgid "Cannot read extension from '%s'" msgstr "Impossible de lire l'extension depuis « %s »" -#: ../plug-ins/common/file-tga.c:485 +#: ../plug-ins/common/file-tga.c:486 #, c-format msgid "Cannot read header from '%s'" msgstr "Impossible de lire l'en-tête depuis « %s »" -#: ../plug-ins/common/file-tga.c:1372 +#: ../plug-ins/common/file-tga.c:1403 msgid "TGA" msgstr "TGA" #. rle -#: ../plug-ins/common/file-tga.c:1381 +#: ../plug-ins/common/file-tga.c:1412 msgid "_RLE compression" msgstr "Compression _RLE" -#: ../plug-ins/common/file-tga.c:1395 +#: ../plug-ins/common/file-tga.c:1426 msgid "Or_igin:" msgstr "Or_igine :" -#: ../plug-ins/common/file-tga.c:1399 +#: ../plug-ins/common/file-tga.c:1430 msgid "Bottom left" msgstr "En bas à gauche" -#: ../plug-ins/common/file-tga.c:1400 +#: ../plug-ins/common/file-tga.c:1431 msgid "Top left" msgstr "En haut à gauche" -#: ../plug-ins/common/file-tiff-load.c:240 -#: ../plug-ins/common/file-tiff-save.c:183 -#: ../plug-ins/common/file-tiff-save.c:200 +#: ../plug-ins/common/file-tiff-load.c:243 +#: ../plug-ins/common/file-tiff-save.c:187 +#: ../plug-ins/common/file-tiff-save.c:204 msgid "TIFF image" msgstr "Image TIFF" -#: ../plug-ins/common/file-tiff-load.c:310 +#: ../plug-ins/common/file-tiff-load.c:297 #, c-format msgid "TIFF '%s' does not contain any directories" msgstr "TIFF « %s » ne contient aucun répertoire" -#: ../plug-ins/common/file-tiff-load.c:478 +#: ../plug-ins/common/file-tiff-load.c:486 msgid "Import from TIFF" msgstr "Importation depuis TIFF" -#: ../plug-ins/common/file-tiff-load.c:780 +#: ../plug-ins/common/file-tiff-load.c:819 #, c-format msgid "%s-%d-of-%d-pages" msgstr "%s-page-%d-sur-%d" -#: ../plug-ins/common/file-tiff-load.c:1015 +#: ../plug-ins/common/file-tiff-load.c:1029 msgid "TIFF Channel" msgstr "Canal TIFF" -#: ../plug-ins/common/file-tiff-load.c:1024 -#: ../plug-ins/file-psd/psd-load.c:333 +#: ../plug-ins/common/file-tiff-load.c:1038 ../plug-ins/file-psd/psd-load.c:333 msgid "" "Warning:\n" "The image you are loading has 16 bits per channel. GIMP can only handle 8 " @@ -4662,7 +4713,19 @@ "que 8 bits, donc elle sera convertie pour vous. Des informations seront " "perdues à cause de cette conversion." -#: ../plug-ins/common/file-tiff-save.c:888 +#: ../plug-ins/common/file-tiff-save.c:816 +msgid "" +"Only monochrome pictures can be compressed with \"CCITT Group 4\" or \"CCITT " +"Group 3\"." +msgstr "" +"Seules les images monochromes peuvent être compressées avec « CCITT Group " +"4 » ou « CCITT Group 3 »." + +#: ../plug-ins/common/file-tiff-save.c:830 +msgid "Indexed pictures cannot be compressed with \"JPEG\"." +msgstr "Les images indexées ne peuvent pas être compressées avec « JPEG »." + +#: ../plug-ins/common/file-tiff-save.c:933 msgid "" "The TIFF format only supports comments in\n" "7bit ASCII encoding. No comment is saved." @@ -4670,48 +4733,48 @@ "Le format TIFF ne prend seulement en charge que les commentaires\n" "codés en ASCII 7 bits. Aucune commentaire n'est enregistré." -#: ../plug-ins/common/file-tiff-save.c:1062 +#: ../plug-ins/common/file-tiff-save.c:1108 msgid "TIFF" msgstr "TIFF" #. compression -#: ../plug-ins/common/file-tiff-save.c:1070 +#: ../plug-ins/common/file-tiff-save.c:1116 msgid "Compression" msgstr "Compression" -#: ../plug-ins/common/file-tiff-save.c:1074 +#: ../plug-ins/common/file-tiff-save.c:1120 msgid "_None" msgstr "_Aucune" -#: ../plug-ins/common/file-tiff-save.c:1075 +#: ../plug-ins/common/file-tiff-save.c:1121 msgid "_LZW" msgstr "_LZW" -#: ../plug-ins/common/file-tiff-save.c:1076 +#: ../plug-ins/common/file-tiff-save.c:1122 msgid "_Pack Bits" msgstr "_Pack Bits" -#: ../plug-ins/common/file-tiff-save.c:1077 +#: ../plug-ins/common/file-tiff-save.c:1123 msgid "_Deflate" msgstr "_Déflation" -#: ../plug-ins/common/file-tiff-save.c:1078 +#: ../plug-ins/common/file-tiff-save.c:1124 msgid "_JPEG" msgstr "_JPEG" -#: ../plug-ins/common/file-tiff-save.c:1079 +#: ../plug-ins/common/file-tiff-save.c:1125 msgid "CCITT Group _3 fax" msgstr "Télécopie CCITT groupe _3" -#: ../plug-ins/common/file-tiff-save.c:1080 +#: ../plug-ins/common/file-tiff-save.c:1126 msgid "CCITT Group _4 fax" msgstr "Télécopie CCITT groupe _4" -#: ../plug-ins/common/file-tiff-save.c:1102 +#: ../plug-ins/common/file-tiff-save.c:1155 msgid "Save _color values from transparent pixels" msgstr "Enregistrer les valeurs de couleur pour les pixels _transparents" -#: ../plug-ins/common/file-tiff-save.c:1118 ../plug-ins/common/file-xbm.c:1235 +#: ../plug-ins/common/file-tiff-save.c:1171 ../plug-ins/common/file-xbm.c:1236 msgid "Comment:" msgstr "Commentaire :" @@ -4744,7 +4807,7 @@ msgid "X BitMap image" msgstr "Image bitmap X" -#: ../plug-ins/common/file-xbm.c:820 +#: ../plug-ins/common/file-xbm.c:821 #, c-format msgid "" "'%s':\n" @@ -4753,7 +4816,7 @@ "« %s » :\n" "Impossible de lire l'en-tête (ftell == %ld)" -#: ../plug-ins/common/file-xbm.c:855 +#: ../plug-ins/common/file-xbm.c:856 #, c-format msgid "" "'%s':\n" @@ -4763,7 +4826,7 @@ "Type d'image non indiqué" #. The image is not black-and-white. -#: ../plug-ins/common/file-xbm.c:999 +#: ../plug-ins/common/file-xbm.c:1000 msgid "" "The image which you are trying to save as an XBM contains more than two " "colors.\n" @@ -4775,7 +4838,7 @@ "\n" "Convertissez l'image en noir et blanc (1-bit, indexé) et essayez à nouveau." -#: ../plug-ins/common/file-xbm.c:1010 +#: ../plug-ins/common/file-xbm.c:1011 msgid "" "You cannot save a cursor mask for an image\n" "which has no alpha channel." @@ -4783,56 +4846,56 @@ "Vous ne pouvez pas enregistrer un masque de curseur\n" "pour une image qui n'a pas de canal alpha." -#: ../plug-ins/common/file-xbm.c:1188 +#: ../plug-ins/common/file-xbm.c:1189 msgid "XBM" msgstr "XBM" #. parameter settings -#: ../plug-ins/common/file-xbm.c:1191 +#: ../plug-ins/common/file-xbm.c:1192 msgid "XBM Options" msgstr "Options XBM" #. X10 format -#: ../plug-ins/common/file-xbm.c:1201 +#: ../plug-ins/common/file-xbm.c:1202 msgid "_X10 format bitmap" msgstr "Format bitmap _X10" -#: ../plug-ins/common/file-xbm.c:1221 +#: ../plug-ins/common/file-xbm.c:1222 msgid "_Identifier prefix:" msgstr "Préfixe d'_identification :" #. hotspot toggle -#: ../plug-ins/common/file-xbm.c:1243 +#: ../plug-ins/common/file-xbm.c:1244 msgid "_Write hot spot values" msgstr "Écrire les valeurs du point acti_f" -#: ../plug-ins/common/file-xbm.c:1266 ../plug-ins/common/file-xmc.c:1089 +#: ../plug-ins/common/file-xbm.c:1267 ../plug-ins/common/file-xmc.c:1083 msgid "Hot spot _X:" msgstr "Point actif _X :" -#: ../plug-ins/common/file-xbm.c:1276 +#: ../plug-ins/common/file-xbm.c:1277 msgid "Hot spot _Y:" msgstr "Point actif _Y :" #. mask file -#: ../plug-ins/common/file-xbm.c:1283 +#: ../plug-ins/common/file-xbm.c:1284 msgid "Mask File" msgstr "Fichier du masque" -#: ../plug-ins/common/file-xbm.c:1293 +#: ../plug-ins/common/file-xbm.c:1294 msgid "W_rite extra mask file" msgstr "Éc_rire le fichier optionnel de masque" -#: ../plug-ins/common/file-xbm.c:1306 +#: ../plug-ins/common/file-xbm.c:1307 msgid "_Mask file extension:" msgstr "Extension du fichier de _masque :" -#: ../plug-ins/common/file-xmc.c:333 ../plug-ins/common/file-xmc.c:373 -#: ../plug-ins/common/file-xmc.c:1052 +#: ../plug-ins/common/file-xmc.c:331 ../plug-ins/common/file-xmc.c:369 +#: ../plug-ins/common/file-xmc.c:1046 msgid "X11 Mouse Cursor" msgstr "Curseur de souris X11" -#: ../plug-ins/common/file-xmc.c:481 +#: ../plug-ins/common/file-xmc.c:473 #, c-format msgid "" "Cannot set the hot spot!\n" @@ -4841,37 +4904,37 @@ "Impossible de fixer le point actif !\n" "Vous devez disposer les calques pour qu'ils aient tous une intersection." -#: ../plug-ins/common/file-xmc.c:670 +#: ../plug-ins/common/file-xmc.c:664 #, c-format msgid "'%s' is not a valid X cursor." msgstr "« %s » n'est pas un curseur X valide." -#: ../plug-ins/common/file-xmc.c:686 +#: ../plug-ins/common/file-xmc.c:680 #, c-format -msgid "The width of frame %d of '%s' is too big for X cursor." -msgstr "Le cadre %d de « %s » est trop large pour le curseur X." +msgid "Frame %d of '%s' is too wide for an X cursor." +msgstr "L'image %d de « %s » est trop large pour un curseur X." -#: ../plug-ins/common/file-xmc.c:693 +#: ../plug-ins/common/file-xmc.c:687 #, c-format -msgid "The height of frame %d of '%s' is too big for X cursor." -msgstr "Le cadre %d de « %s » est trop haut pour le curseur X." +msgid "Frame %d of '%s' is too high for an X cursor." +msgstr "L'image %d de « %s » est trop haute pour un curseur X." -#: ../plug-ins/common/file-xmc.c:896 +#: ../plug-ins/common/file-xmc.c:890 #, c-format msgid "there is no image chunk in \"%s\"." msgstr "il n'y a pas d'élément d'image dans « %s »." -#: ../plug-ins/common/file-xmc.c:938 +#: ../plug-ins/common/file-xmc.c:932 #, c-format -msgid "The width of '%s' is too big for X cursor." -msgstr "« %s » est trop large pour le curseur X." +msgid "'%s' is too wide for an X cursor." +msgstr "« %s » est trop large pour un curseur X." -#: ../plug-ins/common/file-xmc.c:945 +#: ../plug-ins/common/file-xmc.c:939 #, c-format -msgid "The height of '%s' is too big for X cursor." -msgstr "« %s » est trop haute pour le curseur X." +msgid "'%s' is too high for an X cursor." +msgstr "« %s » est trop haut pour un curseur X." -#: ../plug-ins/common/file-xmc.c:1015 +#: ../plug-ins/common/file-xmc.c:1009 #, c-format msgid "A read error occurred." msgstr "Une erreur de lecture est survenue." @@ -4879,27 +4942,27 @@ #. #. * parameter settings #. -#: ../plug-ins/common/file-xmc.c:1057 +#: ../plug-ins/common/file-xmc.c:1051 msgid "XMC Options" msgstr "Options XMC" -#: ../plug-ins/common/file-xmc.c:1085 +#: ../plug-ins/common/file-xmc.c:1079 msgid "Enter the X coordinate of the hot spot. The origin is top left corner." msgstr "" "Saisissez la coordonnée X du point actif. L'origine est le coin en haut à " "gauche." -#: ../plug-ins/common/file-xmc.c:1103 +#: ../plug-ins/common/file-xmc.c:1097 msgid "Enter the Y coordinate of the hot spot. The origin is top left corner." msgstr "" "Saisissez la coordonnée Y du point actif. L'origine est le coin en haut à " "gauche." -#: ../plug-ins/common/file-xmc.c:1114 +#: ../plug-ins/common/file-xmc.c:1108 msgid "_Auto-Crop all frames." msgstr "Rogner _automatiquement tous les cadres" -#: ../plug-ins/common/file-xmc.c:1127 +#: ../plug-ins/common/file-xmc.c:1121 msgid "" "Remove the empty borders of all frames.\n" "This reduces the file size and may fix the problem that some large cursors " @@ -4912,7 +4975,7 @@ "Décochez cette option si vous envisagez de modifier le curseur exporté en " "utilisant d'autres programmes." -#: ../plug-ins/common/file-xmc.c:1150 +#: ../plug-ins/common/file-xmc.c:1144 msgid "" "Choose the nominal size of frames.\n" "If you don't have plans to make multi-sized cursor, or you have no idea, " @@ -4931,57 +4994,57 @@ "d'animation, et quelle séquence est utilisée sur la base de la valeur de " "« gtk-cursor-theme-size »." -#: ../plug-ins/common/file-xmc.c:1167 +#: ../plug-ins/common/file-xmc.c:1161 msgid "_Use this value only for a frame which size is not specified." msgstr "N'_utiliser cette valeur que pour un cadre sans taille indiquée" -#: ../plug-ins/common/file-xmc.c:1170 +#: ../plug-ins/common/file-xmc.c:1164 msgid "_Replace the size of all frames even if it is specified." msgstr "_Remplacer la taille de tous les cadres même si elle est indiquée" -#: ../plug-ins/common/file-xmc.c:1204 +#: ../plug-ins/common/file-xmc.c:1198 msgid "Enter time span in milliseconds in which each frame is rendered." msgstr "Saisissez la durée d'apparition de chaque cadre, en millisecondes." -#: ../plug-ins/common/file-xmc.c:1207 +#: ../plug-ins/common/file-xmc.c:1201 msgid "_Delay:" msgstr "_Délai :" -#: ../plug-ins/common/file-xmc.c:1212 +#: ../plug-ins/common/file-xmc.c:1206 msgid "_Use this value only for a frame which delay is not specified." msgstr "N'_utiliser cette valeur que pour un cadre sans délai indiqué" -#: ../plug-ins/common/file-xmc.c:1215 +#: ../plug-ins/common/file-xmc.c:1209 msgid "_Replace the delay of all frames even if it is specified." msgstr "_Remplacer le délai de tous les cadres même s'il est indiqué" -#: ../plug-ins/common/file-xmc.c:1240 +#: ../plug-ins/common/file-xmc.c:1234 msgid "" "The part of copyright information that exceeded 65535 characters was removed." msgstr "" "La partie des informations de copyright excédant 65535 caractères a été " "supprimée." -#: ../plug-ins/common/file-xmc.c:1250 +#: ../plug-ins/common/file-xmc.c:1244 msgid "Enter copyright information." msgstr "Saisissez les informations de copyright." -#: ../plug-ins/common/file-xmc.c:1252 +#: ../plug-ins/common/file-xmc.c:1246 msgid "_Copyright:" msgstr "_Copyright :" -#: ../plug-ins/common/file-xmc.c:1268 +#: ../plug-ins/common/file-xmc.c:1262 msgid "" "The part of license information that exceeded 65535 characters was removed." msgstr "" "La partie des informations de licence excédant 65535 caractères a été " "supprimée." -#: ../plug-ins/common/file-xmc.c:1278 +#: ../plug-ins/common/file-xmc.c:1272 msgid "Enter license information." msgstr "Saisissez les informations de licence." -#: ../plug-ins/common/file-xmc.c:1280 +#: ../plug-ins/common/file-xmc.c:1274 msgid "_License:" msgstr "_Licence :" @@ -4990,56 +5053,57 @@ #. #. We use gtk_text_view for "Other" while "Copyright" & "License" is entered #. * in gtk_entry because We want allow '\n' for "Other". -#: ../plug-ins/common/file-xmc.c:1287 +#: ../plug-ins/common/file-xmc.c:1281 msgid "_Other:" msgstr "_Autre :" -#: ../plug-ins/common/file-xmc.c:1321 +#: ../plug-ins/common/file-xmc.c:1315 msgid "Enter other comment if you want." msgstr "Saisissez un autre commentaire si vous le souhaitez." -#: ../plug-ins/common/file-xmc.c:1371 +#: ../plug-ins/common/file-xmc.c:1365 #, c-format msgid "Comment is limited to %d characters." msgstr "Le commentaire est limité à %d caractères." -#: ../plug-ins/common/file-xmc.c:1489 +#: ../plug-ins/common/file-xmc.c:1483 #, c-format -msgid "This plug-in can only handle RGBA image format with 8bit color depth." +msgid "This plug-in can only handle RGBA image files with 8bit color depth." msgstr "" -"Ce greffon ne peut gérer que le format d'image RVBA avec une profondeur de " +"Ce greffon ne peut gérer que les fichiers images RVBA avec une profondeur de " "couleurs de 8 bits." -#: ../plug-ins/common/file-xmc.c:1507 +#: ../plug-ins/common/file-xmc.c:1501 #, c-format -msgid "Width of '%s' is too large. Please reduce more than %dpx." -msgstr "« %s » est trop large. Réduisez au-delà de %dpx." +msgid "Frame '%s' is too wide. Please reduce to no more than %dpx." +msgstr "L'image « %s » est trop large. Ne réduisez pas de plus de %dpx." -#: ../plug-ins/common/file-xmc.c:1514 +#: ../plug-ins/common/file-xmc.c:1508 #, c-format -msgid "Height of '%s' is too large. Please reduce more than %dpx." -msgstr " %s » est trop haute. Réduisez au-delà de %dpx." +msgid "Frame '%s' is too high. Please reduce to no more than %dpx." +msgstr "L'image « %s » est trop haute. Ne réduisez pas de plus de %dpx." -#: ../plug-ins/common/file-xmc.c:1521 +#: ../plug-ins/common/file-xmc.c:1515 #, c-format -msgid "The size of '%s' is zero!" -msgstr "La taille de « %s » est zéro !" +msgid "Width and/or height of frame '%s' is zero!" +msgstr "La largeur et/ou la hauteur de l'image « %s » sont égales à zéro !" -#: ../plug-ins/common/file-xmc.c:1561 +#: ../plug-ins/common/file-xmc.c:1555 #, c-format msgid "" -"Cannot save the cursor because the hot spot is not on '%s'.\n" +"Cannot save the cursor because the hot spot is not on frame '%s'.\n" "Try to change the hot spot position, layer geometry or save without auto-" "crop." msgstr "" -"Impossible d'enregistrer le curseur car le point actif n'est pas sur « %s ».\n" +"Impossible d'enregistrer le curseur car le point actif n'est pas sur " +"l'image « %s ».\n" "Essayez de changer la position du point actif, la géométrie du calque ou " "enregistrez sans rognage automatique." -#: ../plug-ins/common/file-xmc.c:1717 +#: ../plug-ins/common/file-xmc.c:1712 #, c-format msgid "" -"Your cursor was successfully saved but it contains one or more frames which " +"Your cursor was successfully saved but it contains one or more frames whose " "width or height is more than %ipx.\n" "It will clutter the screen in some environments." msgstr "" @@ -5047,30 +5111,31 @@ "cadres dont la largeur ou la hauteur dépasse %ipx.\n" "Cela risque de perturber l'écran dans certains environnements." -#: ../plug-ins/common/file-xmc.c:1724 +#: ../plug-ins/common/file-xmc.c:1719 msgid "" "Your cursor was successfully saved but it contains one or more frames whose " -"nominal size is not supported by gnome-appearance-properties.\n" -"You can satisfy it by checking \"Replace the size of all frame...\" in the " -"save dialog, or your cursor may not appear in gnome-appearance-properties." +"nominal size is not supported by GNOME settings.\n" +"You can satisfy it by checking \"Replace the size of all frames...\" in the " +"save dialog, or your cursor may not appear in GNOME settings." msgstr "" "Votre curseur a été enregistré avec succès, mais il contient un ou plusieurs " -"cadres dont la taille nominale n'est pas reconnue par gnome-appearance-" -"properties.\n" +"cadres dont la taille nominale n'est pas reconnue par le paramétrage de " +"GNOME.\n" "Vous pouvez régler cela en cochant « Remplacer la taille de tous les " "cadres... » dans la fenêtre d'enregistrement, ou votre curseur n'apparaîtra " -"pas dans les propriétés d'apparence de GNOME." +"pas dans les paramètres de GNOME." -#: ../plug-ins/common/file-xmc.c:1961 +#: ../plug-ins/common/file-xmc.c:1956 #, c-format msgid "" -"The parasite \"%s\" is too long for X cursor.\n" -"The overflowed string was dropped." +"The parasite \"%s\" is too long for an X cursor comment. It was cut off to " +"fit." msgstr "" -"Le parasite « %s » est trop long pour le curseur X.\n" -"La chaîne excédentaire a été rejetée." +"Le parasite « %s » est trop long pour un commentaire de curseur X. La chaîne " +"excédentaire a été rejetée." -#: ../plug-ins/common/file-xmc.c:2163 +#. translators: the %i is *always* 8 here +#: ../plug-ins/common/file-xmc.c:2159 #, c-format msgid "" "Sorry, this plug-in cannot handle a cursor which contains over %i different " @@ -5083,37 +5148,55 @@ msgid "X PixMap image" msgstr "Image pixmap X" -#: ../plug-ins/common/file-xpm.c:363 ../plug-ins/common/file-xpm.c:775 +#: ../plug-ins/common/file-xpm.c:364 ../plug-ins/common/file-xpm.c:776 #, c-format msgid "Error opening file '%s'" msgstr "Erreur lors de l'ouverture du fichier « %s »" -#: ../plug-ins/common/file-xpm.c:369 ../plug-ins/common/file-xpm.c:781 +#: ../plug-ins/common/file-xpm.c:370 ../plug-ins/common/file-xpm.c:782 msgid "XPM file invalid" msgstr "Fichier XPM non valide" -#: ../plug-ins/common/file-xpm.c:807 +#: ../plug-ins/common/file-xpm.c:808 msgid "XPM" msgstr "XPM" -#: ../plug-ins/common/file-xpm.c:817 +#: ../plug-ins/common/file-xpm.c:818 msgid "_Alpha threshold:" msgstr "Seuil _alpha :" -#: ../plug-ins/common/file-xwd.c:278 ../plug-ins/common/file-xwd.c:298 +#: ../plug-ins/common/file-xwd.c:280 ../plug-ins/common/file-xwd.c:300 msgid "X window dump" msgstr "Dump X window" -#: ../plug-ins/common/file-xwd.c:442 +#: ../plug-ins/common/file-xwd.c:446 #, c-format msgid "Could not read XWD header from '%s'" msgstr "Impossible de lire l'en-tête XWD depuis « %s »" -#: ../plug-ins/common/file-xwd.c:480 +#: ../plug-ins/common/file-xwd.c:467 +#, c-format +msgid "" +"'%s':\n" +"Illegal number of colormap entries: %ld" +msgstr "" +"« %s » :\n" +"Nombre d'entrées dans la carte de couleurs interdit : %ld" + +#: ../plug-ins/common/file-xwd.c:477 +#, c-format +msgid "" +"'%s':\n" +"Number of colormap entries < number of colors" +msgstr "" +"« %s » :\n" +"Nombre d'entrées dans la carte de couleurs < nombre de couleurs" + +#: ../plug-ins/common/file-xwd.c:500 msgid "Can't read color entries" msgstr "impossible de lire les entrées de couleurs." -#: ../plug-ins/common/file-xwd.c:575 +#: ../plug-ins/common/file-xwd.c:582 #, c-format msgid "" "XWD-file %s has format %d, depth %d and bits per pixel %d. Currently this is " @@ -5122,15 +5205,19 @@ "Le fichier XWD %s est de format %d, profondeur %d et bits par pixel %d. De " "tels fichiers ne sont pas pris en charge." -#: ../plug-ins/common/file-xwd.c:598 +#: ../plug-ins/common/file-xwd.c:616 msgid "Cannot save images with alpha channels." msgstr "Impossible d'enregistrer des images avec des canaux alpha." -#: ../plug-ins/common/file-xwd.c:2198 +#: ../plug-ins/common/file-xwd.c:1706 ../plug-ins/common/file-xwd.c:1944 +msgid "XWD-file %s is corrupt." +msgstr "Le fichier XWD %s est endommagé." + +#: ../plug-ins/common/file-xwd.c:2238 msgid "Error during writing indexed/gray image" msgstr "Erreur durant l'écriture d'une image indexée ou tons de gris" -#: ../plug-ins/common/file-xwd.c:2294 +#: ../plug-ins/common/file-xwd.c:2334 msgid "Error during writing rgb image" msgstr "Erreur durant l'écriture de l'image RVB" @@ -5147,7 +5234,7 @@ msgstr "Composition des images" #: ../plug-ins/common/film.c:423 ../plug-ins/common/guillotine.c:215 -#: ../plug-ins/help-browser/dialog.c:1109 +#: ../plug-ins/help-browser/dialog.c:1132 msgid "Untitled" msgstr "Sans titre" @@ -5499,7 +5586,7 @@ msgid "Drawing grid" msgstr "Tracé de la grille" -#: ../plug-ins/common/grid.c:636 ../plug-ins/gfig/gfig-dialog.c:1376 +#: ../plug-ins/common/grid.c:636 ../plug-ins/gfig/gfig-dialog.c:1391 #: ../plug-ins/imagemap/imap_menu.c:208 msgid "Grid" msgstr "Grille" @@ -5796,146 +5883,146 @@ msgid "Each piece has curved sides" msgstr "Chaque pièce a des côtés courbés" -#: ../plug-ins/common/lcms.c:218 +#: ../plug-ins/common/lcms.c:229 msgid "Set a color profile on the image" msgstr "Affecter un profil colorimétrique à l'image" -#: ../plug-ins/common/lcms.c:225 +#: ../plug-ins/common/lcms.c:236 msgid "_Assign Color Profile..." msgstr "_Assigner un profil de couleurs..." -#: ../plug-ins/common/lcms.c:241 +#: ../plug-ins/common/lcms.c:252 msgid "Assign default RGB Profile" msgstr "Assigner un profil RVB par défaut" -#: ../plug-ins/common/lcms.c:248 +#: ../plug-ins/common/lcms.c:259 msgid "Apply a color profile on the image" msgstr "Appliquer un profil colorimétrique sur l'image" -#: ../plug-ins/common/lcms.c:258 +#: ../plug-ins/common/lcms.c:269 msgid "_Convert to Color Profile..." msgstr "_Convertir en un profil de couleurs..." -#: ../plug-ins/common/lcms.c:276 +#: ../plug-ins/common/lcms.c:287 msgid "Convert to default RGB Profile" msgstr "Convertir en un profil RVB par défaut" -#: ../plug-ins/common/lcms.c:290 +#: ../plug-ins/common/lcms.c:301 msgid "Image Color Profile Information" msgstr "Information sur le profil de couleurs de l'image" -#: ../plug-ins/common/lcms.c:304 +#: ../plug-ins/common/lcms.c:315 msgid "Color Profile Information" msgstr "Information sur le profil de couleurs" -#: ../plug-ins/common/lcms.c:572 +#: ../plug-ins/common/lcms.c:656 #, c-format msgid "Color profile '%s' is not for RGB color space." msgstr "Le profil de couleurs « %s » n'est pas pour un espace de couleur RVB." -#: ../plug-ins/common/lcms.c:679 +#: ../plug-ins/common/lcms.c:763 msgid "Default RGB working space" msgstr "Espace de travail RVB par défaut" -#: ../plug-ins/common/lcms.c:775 +#: ../plug-ins/common/lcms.c:865 msgid "" "Data attached as 'icc-profile' does not appear to be an ICC color profile" msgstr "" -"Les données attachées comme « icc-profile » ne semblent pas être un profil de " -"couleur ICC" +"Les données attachées comme « icc-profile » ne semblent pas être un profil " +"de couleur ICC" -#: ../plug-ins/common/lcms.c:825 +#: ../plug-ins/common/lcms.c:915 #, c-format msgid "'%s' does not appear to be an ICC color profile" msgstr "« %s » ne semble pas être un fichier de couleur ICC" #. ICC color profile conversion -#: ../plug-ins/common/lcms.c:885 +#: ../plug-ins/common/lcms.c:975 #, c-format msgid "Converting from '%s' to '%s'" msgstr "Conversion de « %s » vers « %s »" -#: ../plug-ins/common/lcms.c:1129 +#: ../plug-ins/common/lcms.c:1248 #, c-format msgid "Could not load ICC profile from '%s'" msgstr "Impossible de charger le profil ICC depuis « %s »" -#: ../plug-ins/common/lcms.c:1151 +#: ../plug-ins/common/lcms.c:1270 #, c-format msgid "The image '%s' has an embedded color profile:" msgstr "L'image « %s » a un profil de couleurs embarqué :" -#: ../plug-ins/common/lcms.c:1195 +#: ../plug-ins/common/lcms.c:1314 #, c-format msgid "Convert the image to the RGB working space (%s)?" msgstr "Convertir l'image vers l'espace de travail RVB (%s) ?" -#: ../plug-ins/common/lcms.c:1226 +#: ../plug-ins/common/lcms.c:1345 msgid "Convert to RGB working space?" msgstr "Convertir vers l'espace de travail RVB ?" -#: ../plug-ins/common/lcms.c:1231 +#: ../plug-ins/common/lcms.c:1350 msgid "_Keep" msgstr "_Conserver" -#: ../plug-ins/common/lcms.c:1236 +#: ../plug-ins/common/lcms.c:1355 msgid "_Convert" msgstr "_Convertir" -#: ../plug-ins/common/lcms.c:1264 ../plug-ins/file-jpeg/jpeg-exif.c:436 +#: ../plug-ins/common/lcms.c:1383 ../plug-ins/file-jpeg/jpeg-exif.c:436 msgid "_Don't ask me again" msgstr "_Ne plus me demander" -#: ../plug-ins/common/lcms.c:1328 +#: ../plug-ins/common/lcms.c:1450 msgid "Select destination profile" msgstr "Sélection du profil de destination" -#: ../plug-ins/common/lcms.c:1355 +#: ../plug-ins/common/lcms.c:1477 msgid "All files (*.*)" msgstr "Tous les fichiers (*.*)" -#: ../plug-ins/common/lcms.c:1360 +#: ../plug-ins/common/lcms.c:1482 msgid "ICC color profile (*.icc, *.icm)" msgstr "Profil de couleurs ICC (*.icc, *.icm)" -#: ../plug-ins/common/lcms.c:1403 +#: ../plug-ins/common/lcms.c:1526 #, c-format msgid "RGB workspace (%s)" msgstr "Espace de travail RVB (%s)" -#: ../plug-ins/common/lcms.c:1453 +#: ../plug-ins/common/lcms.c:1576 msgid "Convert to ICC Color Profile" msgstr "Convertir en profil de couleurs ICC" -#: ../plug-ins/common/lcms.c:1454 +#: ../plug-ins/common/lcms.c:1577 msgid "Assign ICC Color Profile" msgstr "Assigner un profil de couleurs ICC" -#: ../plug-ins/common/lcms.c:1462 +#: ../plug-ins/common/lcms.c:1585 msgid "_Assign" msgstr "_Assigner" -#: ../plug-ins/common/lcms.c:1480 +#: ../plug-ins/common/lcms.c:1603 msgid "Current Color Profile" msgstr "Profil de couleurs actuel" -#: ../plug-ins/common/lcms.c:1495 +#: ../plug-ins/common/lcms.c:1618 msgid "Convert to" msgstr "Convertir" -#: ../plug-ins/common/lcms.c:1495 +#: ../plug-ins/common/lcms.c:1618 msgid "Assign" msgstr "Assigner" -#: ../plug-ins/common/lcms.c:1519 +#: ../plug-ins/common/lcms.c:1642 msgid "_Rendering Intent:" msgstr "Destination du _rendu :" -#: ../plug-ins/common/lcms.c:1535 +#: ../plug-ins/common/lcms.c:1658 msgid "_Black Point Compensation" msgstr "_Compensation du point noir" -#: ../plug-ins/common/lcms.c:1577 +#: ../plug-ins/common/lcms.c:1700 msgid "Destination profile is not for RGB color space." msgstr "Le profil de destination n'est pas pour un espace de couleur RVB." @@ -5951,27 +6038,27 @@ msgid "Applying lens" msgstr "Simulation de lentille" -#: ../plug-ins/common/lens-apply.c:394 +#: ../plug-ins/common/lens-apply.c:395 msgid "Lens Effect" msgstr "Effet de lentille optique" -#: ../plug-ins/common/lens-apply.c:429 +#: ../plug-ins/common/lens-apply.c:430 msgid "_Keep original surroundings" msgstr "_Garder l'entourage original" -#: ../plug-ins/common/lens-apply.c:444 +#: ../plug-ins/common/lens-apply.c:445 msgid "_Set surroundings to index 0" msgstr "_Définir l'entourage à l'index 0" -#: ../plug-ins/common/lens-apply.c:445 +#: ../plug-ins/common/lens-apply.c:446 msgid "_Set surroundings to background color" msgstr "_Définir l'entourage à la couleur d'arrière-plan" -#: ../plug-ins/common/lens-apply.c:460 +#: ../plug-ins/common/lens-apply.c:461 msgid "_Make surroundings transparent" msgstr "R_endre l'entourage transparent" -#: ../plug-ins/common/lens-apply.c:477 +#: ../plug-ins/common/lens-apply.c:478 msgid "_Lens refraction index:" msgstr "Indice de réfraction de la _lentille : " @@ -6110,86 +6197,86 @@ msgid "Ho_ld the minimal channels" msgstr "Conserve les canaux _minimaux" -#: ../plug-ins/common/mosaic.c:359 +#: ../plug-ins/common/mosaic.c:363 msgid "Convert the image into irregular tiles" msgstr "Convertit l'image en carreaux irréguliers" -#: ../plug-ins/common/mosaic.c:364 +#: ../plug-ins/common/mosaic.c:368 msgid "_Mosaic..." msgstr "_Mosaïque..." #. progress bar for gradient finding -#: ../plug-ins/common/mosaic.c:505 +#: ../plug-ins/common/mosaic.c:509 msgid "Finding edges" msgstr "Recherche des bords" #. Progress bar for rendering tiles -#: ../plug-ins/common/mosaic.c:557 +#: ../plug-ins/common/mosaic.c:561 msgid "Rendering tiles" msgstr "Calcul des carreaux en cours" -#: ../plug-ins/common/mosaic.c:590 +#: ../plug-ins/common/mosaic.c:594 msgid "Mosaic" msgstr "Mosaïque" -#: ../plug-ins/common/mosaic.c:631 +#: ../plug-ins/common/mosaic.c:635 msgid "Squares" msgstr "Carrés" -#: ../plug-ins/common/mosaic.c:632 +#: ../plug-ins/common/mosaic.c:636 msgid "Hexagons" msgstr "Hexagones" -#: ../plug-ins/common/mosaic.c:633 +#: ../plug-ins/common/mosaic.c:637 msgid "Octagons & squares" msgstr "Octogones et carrés" -#: ../plug-ins/common/mosaic.c:634 +#: ../plug-ins/common/mosaic.c:638 msgid "Triangles" msgstr "Triangles" -#: ../plug-ins/common/mosaic.c:642 +#: ../plug-ins/common/mosaic.c:646 msgid "_Tiling primitives:" msgstr "Forme des carreaux :" -#: ../plug-ins/common/mosaic.c:650 +#: ../plug-ins/common/mosaic.c:654 msgid "Tile _size:" msgstr "Ta_ille d'un carreau :" -#: ../plug-ins/common/mosaic.c:662 ../plug-ins/common/tile-glass.c:304 +#: ../plug-ins/common/mosaic.c:666 ../plug-ins/common/tile-glass.c:304 msgid "Tile _height:" msgstr "_Hauteur des carreaux :" -#: ../plug-ins/common/mosaic.c:675 +#: ../plug-ins/common/mosaic.c:679 msgid "Til_e spacing:" msgstr "_Espacement des carreaux :" -#: ../plug-ins/common/mosaic.c:687 +#: ../plug-ins/common/mosaic.c:691 msgid "Tile _neatness:" msgstr "_Régularité des carreaux :" -#: ../plug-ins/common/mosaic.c:700 +#: ../plug-ins/common/mosaic.c:704 msgid "Light _direction:" msgstr "_Direction de la lumière :" -#: ../plug-ins/common/mosaic.c:712 +#: ../plug-ins/common/mosaic.c:716 msgid "Color _variation:" msgstr "Variation de la coule_ur :" -#: ../plug-ins/common/mosaic.c:741 +#: ../plug-ins/common/mosaic.c:745 msgid "Co_lor averaging" msgstr "_Moyenne des couleurs" -#: ../plug-ins/common/mosaic.c:754 +#: ../plug-ins/common/mosaic.c:758 msgid "Allo_w tile splitting" msgstr "Au_torise le découpage des carreaux" # bof -#: ../plug-ins/common/mosaic.c:767 +#: ../plug-ins/common/mosaic.c:771 msgid "_Pitted surfaces" msgstr "_Surfaces piquées" -#: ../plug-ins/common/mosaic.c:780 +#: ../plug-ins/common/mosaic.c:784 msgid "_FG/BG lighting" msgstr "É_clairage de l'AV/AR Plan" @@ -6306,7 +6393,7 @@ msgstr "Ré_glages par défaut" #. anti-alias control -#: ../plug-ins/common/newsprint.c:1434 ../plug-ins/gfig/gfig-dialog.c:1278 +#: ../plug-ins/common/newsprint.c:1434 ../plug-ins/gfig/gfig-dialog.c:1293 msgid "Antialiasing" msgstr "Lissage" @@ -6402,24 +6489,24 @@ msgid "_Slur..." msgstr "_Mélanger..." -#: ../plug-ins/common/noise-randomize.c:769 +#: ../plug-ins/common/noise-randomize.c:767 #: ../plug-ins/common/noise-solid.c:603 msgid "_Random seed:" msgstr "_Germe aléatoire :" -#: ../plug-ins/common/noise-randomize.c:778 +#: ../plug-ins/common/noise-randomize.c:776 msgid "R_andomization (%):" msgstr "_Aléa (%) :" -#: ../plug-ins/common/noise-randomize.c:781 +#: ../plug-ins/common/noise-randomize.c:779 msgid "Percentage of pixels to be filtered" msgstr "Pourcentage des pixels à filtrer" -#: ../plug-ins/common/noise-randomize.c:793 +#: ../plug-ins/common/noise-randomize.c:791 msgid "R_epeat:" msgstr "Ré_pétition :" -#: ../plug-ins/common/noise-randomize.c:796 +#: ../plug-ins/common/noise-randomize.c:794 msgid "Number of times to apply filter" msgstr "Combien de fois appliquer le filtre" @@ -6829,7 +6916,7 @@ msgstr "Suppression des yeux rouges" #: ../plug-ins/common/red-eye-removal.c:171 -#: ../plug-ins/common/unsharp-mask.c:891 ../plug-ins/common/wind.c:1006 +#: ../plug-ins/common/unsharp-mask.c:898 ../plug-ins/common/wind.c:1006 #: ../plug-ins/imagemap/imap_preferences.c:455 #: ../plug-ins/map-object/map-object-ui.c:539 msgid "_Threshold:" @@ -7003,84 +7090,84 @@ msgid "Remap colorized" msgstr "Appliquer à nouveau le colorié" -#: ../plug-ins/common/screenshot.c:240 +#: ../plug-ins/common/screenshot.c:250 msgid "Create an image from an area of the screen" msgstr "Crée une image depuis une région de l'écran" -#: ../plug-ins/common/screenshot.c:253 +#: ../plug-ins/common/screenshot.c:272 msgid "_Screenshot..." msgstr "_Capture d'écran..." -#: ../plug-ins/common/screenshot.c:418 +#: ../plug-ins/common/screenshot.c:445 msgid "Error selecting the window" msgstr "Erreur de sélection de la fenêtre" -#: ../plug-ins/common/screenshot.c:786 +#: ../plug-ins/common/screenshot.c:813 msgid "Importing screenshot" msgstr "Importation de la capture d'écran" -#: ../plug-ins/common/screenshot.c:812 ../plug-ins/common/screenshot.c:1085 +#: ../plug-ins/common/screenshot.c:839 ../plug-ins/common/screenshot.c:1204 msgid "Screenshot" msgstr "Capture d'écran" -#: ../plug-ins/common/screenshot.c:853 +#: ../plug-ins/common/screenshot.c:880 msgid "Mouse Pointer" msgstr "Pointeur de la souris" -#: ../plug-ins/common/screenshot.c:972 +#: ../plug-ins/common/screenshot.c:1014 msgid "Specified window not found" msgstr "Fenêtre indiquée non trouvée" -#: ../plug-ins/common/screenshot.c:1094 +#: ../plug-ins/common/screenshot.c:1213 msgid "S_nap" msgstr "_Capturer" -#: ../plug-ins/common/screenshot.c:1124 +#: ../plug-ins/common/screenshot.c:1243 msgid "After the delay, the screenshot is taken." msgstr "Après le délai, la capture est faite." -#: ../plug-ins/common/screenshot.c:1126 +#: ../plug-ins/common/screenshot.c:1245 msgid "" "After the delay, drag your mouse to select the region for the screenshot." msgstr "" "Après le délai, déplacez votre souris pour sélectionner la région à capturer." -#: ../plug-ins/common/screenshot.c:1129 +#: ../plug-ins/common/screenshot.c:1248 msgid "At the end of the delay, click in a window to snap it." msgstr "À la fin du délai, cliquez sur une fenêtre pour la capturer." #. Area -#: ../plug-ins/common/screenshot.c:1135 +#: ../plug-ins/common/screenshot.c:1254 msgid "Area" msgstr "Région" -#: ../plug-ins/common/screenshot.c:1146 +#: ../plug-ins/common/screenshot.c:1265 msgid "Take a screenshot of a single _window" msgstr "Prendre une capture d'écran d'une _fenêtre unique" -#: ../plug-ins/common/screenshot.c:1165 +#: ../plug-ins/common/screenshot.c:1284 msgid "Include window _decoration" msgstr "Inclure les _décorations de fenêtre" -#: ../plug-ins/common/screenshot.c:1185 +#: ../plug-ins/common/screenshot.c:1304 msgid "Take a screenshot of the entire _screen" msgstr "Prendre une capture d'écran de l'é_cran entier" -#: ../plug-ins/common/screenshot.c:1204 +#: ../plug-ins/common/screenshot.c:1323 msgid "Include _mouse pointer" msgstr "Inclure le _pointeur de la souris" -#: ../plug-ins/common/screenshot.c:1225 +#: ../plug-ins/common/screenshot.c:1344 msgid "Select a _region to grab" msgstr "Sélectionner une _région à capturer" #. Delay -#: ../plug-ins/common/screenshot.c:1240 +#: ../plug-ins/common/screenshot.c:1359 msgid "Delay" msgstr "Délai" #. this is the unit label of a spinbutton -#: ../plug-ins/common/screenshot.c:1262 +#: ../plug-ins/common/screenshot.c:1381 msgid "seconds" msgstr "secondes" @@ -7984,11 +8071,11 @@ msgid "_Unsharp Mask..." msgstr "Renforcer la _netteté..." -#: ../plug-ins/common/unsharp-mask.c:684 +#: ../plug-ins/common/unsharp-mask.c:691 msgid "Merging" msgstr "Fusion en cours" -#: ../plug-ins/common/unsharp-mask.c:828 +#: ../plug-ins/common/unsharp-mask.c:835 msgid "Unsharp Mask" msgstr "Renforcer la netteté" @@ -8060,49 +8147,49 @@ msgid "_Dilate" msgstr "_Dilater" -#: ../plug-ins/common/value-propagate.c:476 -#: ../plug-ins/common/value-propagate.c:1086 +#: ../plug-ins/common/value-propagate.c:480 +#: ../plug-ins/common/value-propagate.c:1090 msgid "Value Propagate" msgstr "Propagation de valeur" #. Parameter settings -#: ../plug-ins/common/value-propagate.c:1153 +#: ../plug-ins/common/value-propagate.c:1157 msgid "Propagate" msgstr "Propagation" -#: ../plug-ins/common/value-propagate.c:1166 +#: ../plug-ins/common/value-propagate.c:1170 msgid "Lower t_hreshold:" msgstr "_Seuil bas" -#: ../plug-ins/common/value-propagate.c:1178 +#: ../plug-ins/common/value-propagate.c:1182 msgid "_Upper threshold:" msgstr "Se_uil haut" -#: ../plug-ins/common/value-propagate.c:1190 +#: ../plug-ins/common/value-propagate.c:1194 msgid "_Propagating rate:" msgstr "_Taux de propagation :" -#: ../plug-ins/common/value-propagate.c:1201 +#: ../plug-ins/common/value-propagate.c:1205 msgid "To l_eft" msgstr "À _gauche" -#: ../plug-ins/common/value-propagate.c:1204 +#: ../plug-ins/common/value-propagate.c:1208 msgid "To _right" msgstr "À _droite" -#: ../plug-ins/common/value-propagate.c:1207 +#: ../plug-ins/common/value-propagate.c:1211 msgid "To _top" msgstr "En _haut" -#: ../plug-ins/common/value-propagate.c:1210 +#: ../plug-ins/common/value-propagate.c:1214 msgid "To _bottom" msgstr "En _bas" -#: ../plug-ins/common/value-propagate.c:1219 +#: ../plug-ins/common/value-propagate.c:1223 msgid "Propagating _alpha channel" msgstr "Propagation du canal a_lpha" -#: ../plug-ins/common/value-propagate.c:1230 +#: ../plug-ins/common/value-propagate.c:1234 msgid "Propagating value channel" msgstr "Propagation du canal valeur" @@ -8281,8 +8368,8 @@ msgid "Smear" msgstr "Étaler" -#: ../plug-ins/common/warp.c:502 ../plug-ins/file-fits/fits.c:1020 -#: ../plug-ins/flame/flame.c:1174 ../plug-ins/gfig/gfig-dialog.c:1482 +#: ../plug-ins/common/warp.c:502 ../plug-ins/file-fits/fits.c:1022 +#: ../plug-ins/flame/flame.c:1174 ../plug-ins/gfig/gfig-dialog.c:1497 msgid "Black" msgstr "Noir" @@ -8395,67 +8482,67 @@ msgid "Waving" msgstr "Calcul d'ondulations" -#: ../plug-ins/common/web-browser.c:135 +#: ../plug-ins/common/web-browser.c:141 msgid "The operating system is out of memory or resources." msgstr "Le système d'exploitation n'a plus assez de mémoire ou de ressources." -#: ../plug-ins/common/web-browser.c:138 +#: ../plug-ins/common/web-browser.c:144 msgid "The specified file was not found." msgstr "Le fichier indiqué n'a pas été trouvé." -#: ../plug-ins/common/web-browser.c:141 +#: ../plug-ins/common/web-browser.c:147 msgid "The specified path was not found." msgstr "Le chemin indiqué n'a pas été trouvé." -#: ../plug-ins/common/web-browser.c:144 +#: ../plug-ins/common/web-browser.c:150 msgid "" "The .exe file is invalid (non-Microsoft Win32 .exe or error in .exe image)." msgstr "" "Le fichier .exe n'est pas valide (ce n'est pas un .exe Microsoft Win32 ou " "l'image .exe contient une erreur)." -#: ../plug-ins/common/web-browser.c:147 +#: ../plug-ins/common/web-browser.c:153 msgid "The operating system denied access to the specified file." msgstr "Le système d'exploitation a refusé l'accès au fichier indiqué." -#: ../plug-ins/common/web-browser.c:150 +#: ../plug-ins/common/web-browser.c:156 msgid "The file name association is incomplete or invalid." msgstr "L'association de nom de fichier est incomplète ou non valide." -#: ../plug-ins/common/web-browser.c:153 +#: ../plug-ins/common/web-browser.c:159 msgid "DDE transaction busy" msgstr "La transaction DDE est occupée" -#: ../plug-ins/common/web-browser.c:156 +#: ../plug-ins/common/web-browser.c:162 msgid "The DDE transaction failed." msgstr "La transaction DDE a échoué." -#: ../plug-ins/common/web-browser.c:159 +#: ../plug-ins/common/web-browser.c:165 msgid "The DDE transaction timed out." msgstr "Le délai de la transaction DDE est expiré." -#: ../plug-ins/common/web-browser.c:162 +#: ../plug-ins/common/web-browser.c:168 msgid "The specified DLL was not found." msgstr "La DLL indiquée n'a pas été trouvée." -#: ../plug-ins/common/web-browser.c:165 +#: ../plug-ins/common/web-browser.c:171 msgid "There is no application associated with the given file name extension." msgstr "" "Aucune application n'est associée à l'extension de nom de fichier fournie." -#: ../plug-ins/common/web-browser.c:168 +#: ../plug-ins/common/web-browser.c:174 msgid "There was not enough memory to complete the operation." msgstr "Mémoire insuffisante pour terminer l'opération." -#: ../plug-ins/common/web-browser.c:171 +#: ../plug-ins/common/web-browser.c:177 msgid "A sharing violation occurred." msgstr "Une violation de partage s'est produite." -#: ../plug-ins/common/web-browser.c:174 +#: ../plug-ins/common/web-browser.c:180 msgid "Unknown Microsoft Windows error." msgstr "Erreur Microsoft Windows inconnue." -#: ../plug-ins/common/web-browser.c:177 +#: ../plug-ins/common/web-browser.c:183 #, c-format msgid "Failed to open '%s': %s" msgstr "Échec d'ouverture de « %s » : %s" @@ -8628,65 +8715,71 @@ msgid "Higher values increase the magnitude of the effect" msgstr "De grandes valeur augmentent l'ampleur de l'effet" -#: ../plug-ins/file-bmp/bmp-read.c:85 +#: ../plug-ins/file-bmp/bmp-read.c:138 msgid "Bad colormap" msgstr "Mauvaise palette de couleurs" -#: ../plug-ins/file-bmp/bmp-read.c:169 ../plug-ins/file-bmp/bmp-read.c:180 -#: ../plug-ins/file-bmp/bmp-read.c:187 ../plug-ins/file-bmp/bmp-read.c:196 -#: ../plug-ins/file-bmp/bmp-read.c:211 ../plug-ins/file-bmp/bmp-read.c:416 -#: ../plug-ins/file-bmp/bmp-read.c:437 ../plug-ins/file-bmp/bmp-read.c:448 -#: ../plug-ins/file-bmp/bmp-read.c:456 ../plug-ins/file-bmp/bmp-read.c:464 -#: ../plug-ins/file-bmp/bmp-read.c:476 +#: ../plug-ins/file-bmp/bmp-read.c:222 ../plug-ins/file-bmp/bmp-read.c:232 +#: ../plug-ins/file-bmp/bmp-read.c:239 ../plug-ins/file-bmp/bmp-read.c:248 +#: ../plug-ins/file-bmp/bmp-read.c:263 ../plug-ins/file-bmp/bmp-read.c:465 +#: ../plug-ins/file-bmp/bmp-read.c:486 ../plug-ins/file-bmp/bmp-read.c:497 +#: ../plug-ins/file-bmp/bmp-read.c:505 ../plug-ins/file-bmp/bmp-read.c:513 +#: ../plug-ins/file-bmp/bmp-read.c:525 #, c-format msgid "'%s' is not a valid BMP file" msgstr "« %s » n'est pas un fichier BMP valide" -#: ../plug-ins/file-bmp/bmp-read.c:225 ../plug-ins/file-bmp/bmp-read.c:252 -#: ../plug-ins/file-bmp/bmp-read.c:280 ../plug-ins/file-bmp/bmp-read.c:345 -#: ../plug-ins/file-bmp/bmp-read.c:395 +#: ../plug-ins/file-bmp/bmp-read.c:277 ../plug-ins/file-bmp/bmp-read.c:304 +#: ../plug-ins/file-bmp/bmp-read.c:336 ../plug-ins/file-bmp/bmp-read.c:373 +#: ../plug-ins/file-bmp/bmp-read.c:403 ../plug-ins/file-bmp/bmp-read.c:445 #, c-format msgid "Error reading BMP file header from '%s'" msgstr "Erreur de lecture de l'en-tête BMP depuis « %s »" -#: ../plug-ins/file-bmp/bmp-read.c:588 +#: ../plug-ins/file-bmp/bmp-read.c:358 +#, c-format +msgid "Unsupported compression (%lu) in BMP file from '%s'" +msgstr "" +"Mode de compression non pris en charge (%lu) dans le fichier BMP de « %s »" + +#: ../plug-ins/file-bmp/bmp-read.c:641 msgid "Unrecognized or invalid BMP compression format." msgstr "Format de compression BMP inconnu ou non valide." -#: ../plug-ins/file-bmp/bmp-read.c:630 +#: ../plug-ins/file-bmp/bmp-read.c:683 msgid "Unsupported or invalid bitdepth." msgstr "Profondeur de bit non valide ou non prise en charge." -#: ../plug-ins/file-bmp/bmp-read.c:818 ../plug-ins/file-bmp/bmp-read.c:859 -#: ../plug-ins/file-bmp/bmp-read.c:909 +#: ../plug-ins/file-bmp/bmp-read.c:835 ../plug-ins/file-bmp/bmp-read.c:876 +#: ../plug-ins/file-bmp/bmp-read.c:926 msgid "The bitmap ends unexpectedly." msgstr "Fin de bitmap anormale." -#: ../plug-ins/file-bmp/bmp-write.c:191 ../plug-ins/file-bmp/bmp-write.c:217 +#: ../plug-ins/file-bmp/bmp-write.c:193 ../plug-ins/file-bmp/bmp-write.c:219 msgid "Cannot save indexed image with transparency in BMP file format." msgstr "" "Impossible d'enregistrer une image indexée avec transparence dans le format " "BMP." -#: ../plug-ins/file-bmp/bmp-write.c:193 ../plug-ins/file-bmp/bmp-write.c:219 +#: ../plug-ins/file-bmp/bmp-write.c:195 ../plug-ins/file-bmp/bmp-write.c:221 msgid "Alpha channel will be ignored." msgstr "La canal alpha sera ignoré." #. Run-Length Encoded -#: ../plug-ins/file-bmp/bmp-write.c:860 +#: ../plug-ins/file-bmp/bmp-write.c:870 msgid "_Run-Length Encoded" msgstr "Encodé en _Run-Length" #. Compatibility Options -#: ../plug-ins/file-bmp/bmp-write.c:873 +#: ../plug-ins/file-bmp/bmp-write.c:883 msgid "Co_mpatibility Options" msgstr "Options de co_mpatibilité" -#: ../plug-ins/file-bmp/bmp-write.c:883 +#: ../plug-ins/file-bmp/bmp-write.c:893 msgid "_Do not write color space information" msgstr "Ne _pas inscrire l'information d'espace couleur" -#: ../plug-ins/file-bmp/bmp-write.c:885 +#: ../plug-ins/file-bmp/bmp-write.c:895 msgid "" "Some applications can not read BMP images that include color space " "information. GIMP writes color space information by default. Enabling this " @@ -8697,19 +8790,19 @@ "En activant cette option, GIMP ne l'inscrira pas dans le fichier." #. Advanced Options -#: ../plug-ins/file-bmp/bmp-write.c:901 ../plug-ins/file-jpeg/jpeg-save.c:901 +#: ../plug-ins/file-bmp/bmp-write.c:911 ../plug-ins/file-jpeg/jpeg-save.c:924 msgid "_Advanced Options" msgstr "_Options avancées" -#: ../plug-ins/file-bmp/bmp-write.c:916 +#: ../plug-ins/file-bmp/bmp-write.c:926 msgid "16 bits" msgstr "16 bits" -#: ../plug-ins/file-bmp/bmp-write.c:952 +#: ../plug-ins/file-bmp/bmp-write.c:962 msgid "24 bits" msgstr "24 bits" -#: ../plug-ins/file-bmp/bmp-write.c:969 +#: ../plug-ins/file-bmp/bmp-write.c:979 msgid "32 bits" msgstr "32 bits" @@ -8717,6 +8810,28 @@ msgid "Windows BMP image" msgstr "Image Windows BMP" +#: ../plug-ins/file-compressor/file-compressor.c:167 +msgid "gzip archive" +msgstr "archive gzip" + +#: ../plug-ins/file-compressor/file-compressor.c:186 +msgid "bzip archive" +msgstr "archive bzip" + +#: ../plug-ins/file-compressor/file-compressor.c:393 +msgid "No sensible file extension, saving as compressed XCF." +msgstr "Pas d'extension convenable, sauvegarde en tant que XCF compressé." + +#: ../plug-ins/file-compressor/file-compressor.c:416 +#, c-format +msgid "Compressing '%s'" +msgstr "Compression de « %s »" + +#: ../plug-ins/file-compressor/file-compressor.c:453 +msgid "No sensible file extension, attempting to load with file magic." +msgstr "" +"Pas d'extension convenable, essai de chargement avec détection magique." + #: ../plug-ins/file-faxg3/faxg3.c:102 msgid "G3 fax image" msgstr "Image fax G3" @@ -8725,45 +8840,45 @@ msgid "Flexible Image Transport System" msgstr "Système de transport d'image flexible" -#: ../plug-ins/file-fits/fits.c:368 +#: ../plug-ins/file-fits/fits.c:370 msgid "Error during open of FITS file" msgstr "Erreur durant l'ouverture de l'image FITS" -#: ../plug-ins/file-fits/fits.c:374 +#: ../plug-ins/file-fits/fits.c:376 msgid "FITS file keeps no displayable images" msgstr "Le fichier FITS ne contient pas d'image affichable" -#: ../plug-ins/file-fits/fits.c:455 +#: ../plug-ins/file-fits/fits.c:457 msgid "FITS save cannot handle images with alpha channels" msgstr "" "Impossible d'enregistrer des images avec des canaux alpha au format FITS" -#: ../plug-ins/file-fits/fits.c:992 +#: ../plug-ins/file-fits/fits.c:994 msgid "Load FITS File" msgstr "Charger un fichier FITS" -#: ../plug-ins/file-fits/fits.c:1016 +#: ../plug-ins/file-fits/fits.c:1018 msgid "Replacement for undefined pixels" msgstr "Remplacement pour les pixels indéfinis" -#: ../plug-ins/file-fits/fits.c:1021 ../plug-ins/gfig/gfig-dialog.c:1308 -#: ../plug-ins/gfig/gfig-dialog.c:1483 +#: ../plug-ins/file-fits/fits.c:1023 ../plug-ins/gfig/gfig-dialog.c:1323 +#: ../plug-ins/gfig/gfig-dialog.c:1498 msgid "White" msgstr "Blanc" -#: ../plug-ins/file-fits/fits.c:1028 +#: ../plug-ins/file-fits/fits.c:1030 msgid "Pixel value scaling" msgstr "Mise à l'échelle des valeurs de pixels" -#: ../plug-ins/file-fits/fits.c:1033 +#: ../plug-ins/file-fits/fits.c:1035 msgid "By DATAMIN/DATAMAX" msgstr "Par DATAMIN/DATAMAX" -#: ../plug-ins/file-fits/fits.c:1040 +#: ../plug-ins/file-fits/fits.c:1042 msgid "Image Composing" msgstr "Composition de l'image" -#: ../plug-ins/file-fits/fits.c:1044 +#: ../plug-ins/file-fits/fits.c:1046 msgctxt "composing" msgid "None" msgstr "Aucune" @@ -8772,32 +8887,32 @@ msgid "AutoDesk FLIC animation" msgstr "Animation Autodesk FLIC" -#: ../plug-ins/file-fli/fli-gimp.c:561 +#: ../plug-ins/file-fli/fli-gimp.c:563 #, c-format msgid "Frame (%i)" msgstr "Image (%i)" -#: ../plug-ins/file-fli/fli-gimp.c:714 +#: ../plug-ins/file-fli/fli-gimp.c:716 msgid "Sorry, I can save only INDEXED and GRAY images." msgstr "" "Désolé, seul l'enregistrement des images en couleurs indexées ou en tons de " "gris est pris en charge." -#: ../plug-ins/file-fli/fli-gimp.c:847 +#: ../plug-ins/file-fli/fli-gimp.c:849 msgid "GFLI 1.3 - Load framestack" msgstr "GFLI 1.3 - Charger la pile de calques" -#: ../plug-ins/file-fli/fli-gimp.c:876 ../plug-ins/file-fli/fli-gimp.c:932 +#: ../plug-ins/file-fli/fli-gimp.c:878 ../plug-ins/file-fli/fli-gimp.c:934 msgctxt "frame-range" msgid "From:" msgstr "Depuis :" -#: ../plug-ins/file-fli/fli-gimp.c:885 ../plug-ins/file-fli/fli-gimp.c:941 +#: ../plug-ins/file-fli/fli-gimp.c:887 ../plug-ins/file-fli/fli-gimp.c:943 msgctxt "frame-range" msgid "To:" msgstr "Vers :" -#: ../plug-ins/file-fli/fli-gimp.c:915 +#: ../plug-ins/file-fli/fli-gimp.c:917 msgid "GFLI 1.3" msgstr "GFLI 1.3" @@ -8848,7 +8963,7 @@ msgid "Icon #%i" msgstr "Icône n° %i" -#: ../plug-ins/file-ico/ico-load.c:722 ../plug-ins/file-jpeg/jpeg-load.c:691 +#: ../plug-ins/file-ico/ico-load.c:722 ../plug-ins/file-jpeg/jpeg-load.c:696 #: ../plug-ins/file-psd/psd-thumb-load.c:84 #, c-format msgid "Opening thumbnail for '%s'" @@ -8874,80 +8989,81 @@ msgid "Would you like GIMP to rotate it into the standard orientation?" msgstr "Souhaitez-vous que GIMP la pivote vers son orientation normale ?" -#: ../plug-ins/file-jpeg/jpeg-load.c:247 +#: ../plug-ins/file-jpeg/jpeg-load.c:252 msgid "JPEG preview" msgstr "Aperçu JPEG" -#: ../plug-ins/file-jpeg/jpeg-save.c:206 +#: ../plug-ins/file-jpeg/jpeg-save.c:215 #, c-format msgid "File size: %s" msgstr "Taille du fichier : %s" -#: ../plug-ins/file-jpeg/jpeg-save.c:690 -msgid "Calculating file size..." -msgstr "Calcul de la taille du fichier..." - -#: ../plug-ins/file-jpeg/jpeg-save.c:782 ../plug-ins/file-jpeg/jpeg-save.c:877 +#: ../plug-ins/file-jpeg/jpeg-save.c:225 ../plug-ins/file-jpeg/jpeg-save.c:233 +#: ../plug-ins/file-jpeg/jpeg-save.c:805 ../plug-ins/file-jpeg/jpeg-save.c:900 msgid "File size: unknown" msgstr "Taille du fichier : inconnue" -#: ../plug-ins/file-jpeg/jpeg-save.c:840 +#: ../plug-ins/file-jpeg/jpeg-save.c:713 +msgid "Calculating file size..." +msgstr "Calcul de la taille du fichier..." + +#: ../plug-ins/file-jpeg/jpeg-save.c:863 msgid "JPEG" msgstr "JPEG" -#: ../plug-ins/file-jpeg/jpeg-save.c:863 +#: ../plug-ins/file-jpeg/jpeg-save.c:886 msgid "_Quality:" msgstr "_Qualité :" -#: ../plug-ins/file-jpeg/jpeg-save.c:867 +#: ../plug-ins/file-jpeg/jpeg-save.c:890 msgid "JPEG quality parameter" msgstr "Paramètres de qualité du JPEG" -#: ../plug-ins/file-jpeg/jpeg-save.c:886 +#: ../plug-ins/file-jpeg/jpeg-save.c:909 msgid "Enable preview to obtain the file size." msgstr "Active l'aperçu pour obtenir la taille de fichier." -#: ../plug-ins/file-jpeg/jpeg-save.c:889 +#: ../plug-ins/file-jpeg/jpeg-save.c:912 msgid "Sho_w preview in image window" msgstr "A_fficher l'aperçu dans la fenêtre d'image" -#: ../plug-ins/file-jpeg/jpeg-save.c:930 +#: ../plug-ins/file-jpeg/jpeg-save.c:953 msgid "S_moothing:" msgstr "Ad_oucissement :" -#: ../plug-ins/file-jpeg/jpeg-save.c:943 +#: ../plug-ins/file-jpeg/jpeg-save.c:966 msgid "Interval (MCU rows):" msgstr "Intervalle (lignes MCU) :" -#: ../plug-ins/file-jpeg/jpeg-save.c:960 +#: ../plug-ins/file-jpeg/jpeg-save.c:983 msgid "Use _restart markers" msgstr "_Marqueurs de reprise" -#: ../plug-ins/file-jpeg/jpeg-save.c:976 +#: ../plug-ins/file-jpeg/jpeg-save.c:999 msgid "_Optimize" msgstr "_Optimiser" -#: ../plug-ins/file-jpeg/jpeg-save.c:990 +#: ../plug-ins/file-jpeg/jpeg-save.c:1013 msgid "_Progressive" msgstr "_Progressif" -#: ../plug-ins/file-jpeg/jpeg-save.c:1006 +#: ../plug-ins/file-jpeg/jpeg-save.c:1029 msgid "Save _EXIF data" msgstr "Enregistrer les données EXI_F" -#: ../plug-ins/file-jpeg/jpeg-save.c:1023 +#: ../plug-ins/file-jpeg/jpeg-save.c:1046 msgid "Save _thumbnail" msgstr "Enregistrer la _vignette" -#: ../plug-ins/file-jpeg/jpeg-save.c:1040 +#: ../plug-ins/file-jpeg/jpeg-save.c:1063 msgid "Save _XMP data" msgstr "Enregistrer les données _XMP" -#: ../plug-ins/file-jpeg/jpeg-save.c:1055 +#: ../plug-ins/file-jpeg/jpeg-save.c:1081 msgid "_Use quality settings from original image" msgstr "_Utiliser les paramètres de qualité de l'image originale" -#: ../plug-ins/file-jpeg/jpeg-save.c:1061 +#: ../plug-ins/file-jpeg/jpeg-save.c:1087 msgid "" "If the original image was loaded from a JPEG file using non-standard quality " "settings (quantization tables), enable this option to get almost the same " @@ -8958,52 +9074,53 @@ "cette option pour obtenir une qualité et une taille de fichier similaire." #. Subsampling -#: ../plug-ins/file-jpeg/jpeg-save.c:1085 +#: ../plug-ins/file-jpeg/jpeg-save.c:1111 msgid "Su_bsampling:" msgstr "_Sous-échantillonnage :" -#: ../plug-ins/file-jpeg/jpeg-save.c:1092 +#: ../plug-ins/file-jpeg/jpeg-save.c:1118 msgid "4:4:4 (best quality)" msgstr "4:4:4 (meilleure qualité) " -#: ../plug-ins/file-jpeg/jpeg-save.c:1094 +#: ../plug-ins/file-jpeg/jpeg-save.c:1120 msgid "4:2:2 horizontal (chroma halved)" msgstr "4:2:2 horizontal (demi-chrominance)" -#: ../plug-ins/file-jpeg/jpeg-save.c:1096 +#: ../plug-ins/file-jpeg/jpeg-save.c:1122 msgid "4:2:2 vertical (chroma halved)" msgstr "4:2:2 vertical (demi-chrominance) " -#: ../plug-ins/file-jpeg/jpeg-save.c:1098 +#: ../plug-ins/file-jpeg/jpeg-save.c:1124 msgid "4:2:0 (chroma quartered)" msgstr "4:2:0 (quart de chrominance)" #. DCT method -#: ../plug-ins/file-jpeg/jpeg-save.c:1128 +#: ../plug-ins/file-jpeg/jpeg-save.c:1154 msgid "_DCT method:" msgstr "Méthode DC_T :" -#: ../plug-ins/file-jpeg/jpeg-save.c:1134 +#: ../plug-ins/file-jpeg/jpeg-save.c:1160 msgid "Fast Integer" msgstr "Entier rapide" -#: ../plug-ins/file-jpeg/jpeg-save.c:1135 +#: ../plug-ins/file-jpeg/jpeg-save.c:1161 msgid "Integer" msgstr "Entier" -#: ../plug-ins/file-jpeg/jpeg-save.c:1136 +#: ../plug-ins/file-jpeg/jpeg-save.c:1162 msgid "Floating-Point" msgstr "Virgule flottante" -#: ../plug-ins/file-jpeg/jpeg-save.c:1152 +#: ../plug-ins/file-jpeg/jpeg-save.c:1178 msgid "Comment" msgstr "Commentaire" -#: ../plug-ins/file-jpeg/jpeg-save.c:1189 +#: ../plug-ins/file-jpeg/jpeg-save.c:1215 +#: ../plug-ins/ui/plug-in-file-png.ui.h:11 msgid "_Load Defaults" msgstr "_Charger défauts" -#: ../plug-ins/file-jpeg/jpeg-save.c:1198 +#: ../plug-ins/file-jpeg/jpeg-save.c:1224 msgid "Sa_ve Defaults" msgstr "Enre_gistrer défauts" @@ -9011,7 +9128,7 @@ msgid "JPEG image" msgstr "Image JPEG" -#: ../plug-ins/file-jpeg/jpeg.c:303 +#: ../plug-ins/file-jpeg/jpeg.c:305 msgid "Export Preview" msgstr "Exporter l'aperçu" @@ -9092,16 +9209,26 @@ msgid "Unsupported or invalid layer mask size: %dx%d" msgstr "Taille de masque de calque non valide ou non prise en charge : %dx%d" -#: ../plug-ins/file-psd/psd-load.c:1231 ../plug-ins/file-psd/psd-load.c:1613 +#: ../plug-ins/file-psd/psd-load.c:1236 ../plug-ins/file-psd/psd-load.c:1631 #, c-format msgid "Unsupported compression mode: %d" msgstr "Mode de compression non pris en charge : %d" -#: ../plug-ins/file-psd/psd-load.c:1706 +#: ../plug-ins/file-psd/psd-load.c:1423 +msgid "" +"Warning\n" +"The layer mask is partly outside the layer boundary. The mask will be " +"cropped which may result in data loss." +msgstr "" +"Avertissement\n" +"Le masque de calque est en partie hors des limites du calque. Le masque sera " +"rogné ce qui pourrait faire perdre certaines données." + +#: ../plug-ins/file-psd/psd-load.c:1724 msgid "Extra" msgstr "Supplémentaire" -#: ../plug-ins/file-psd/psd-load.c:1881 +#: ../plug-ins/file-psd/psd-load.c:1899 #, c-format msgid "Unsupported or invalid channel size" msgstr "Taille de canal non valide ou non prise en charge" @@ -9111,7 +9238,7 @@ msgid "Photoshop image" msgstr "Image Photoshop" -#: ../plug-ins/file-psd/psd-save.c:374 +#: ../plug-ins/file-psd/psd-save.c:375 #, c-format msgid "" "Unable to save layer with mode '%s'. Either the PSD file format or the save " @@ -9121,11 +9248,11 @@ "fichier PSD, soit le greffon d'enregistrement ne le prend pas en charge, " "utilisation du mode normal à la place." -#: ../plug-ins/file-psd/psd-save.c:634 +#: ../plug-ins/file-psd/psd-save.c:635 msgid "Error: Can't convert GIMP base imagetype to PSD mode" msgstr "Erreur : ne peut convertir le type d'image de base GIMP en mode PSD" -#: ../plug-ins/file-psd/psd-save.c:1622 +#: ../plug-ins/file-psd/psd-save.c:1623 #, c-format msgid "" "Unable to save '%s'. The PSD file format does not support images that are " @@ -9134,7 +9261,7 @@ "Impossible d'enregistrer « %s ». Le format PSD ne prend pas en charge les " "images de plus de 30 000 pixels de haut ou de large." -#: ../plug-ins/file-psd/psd-save.c:1637 +#: ../plug-ins/file-psd/psd-save.c:1638 #, c-format msgid "" "Unable to save '%s'. The PSD file format does not support images with " @@ -9151,48 +9278,48 @@ msgid "Silicon Graphics IRIS image" msgstr "Image Silicon Graphic IRIS" -#: ../plug-ins/file-sgi/sgi.c:325 +#: ../plug-ins/file-sgi/sgi.c:327 #, c-format msgid "Could not open '%s' for reading." msgstr "Impossible d'ouvrir « %s » en lecture." -#: ../plug-ins/file-sgi/sgi.c:343 +#: ../plug-ins/file-sgi/sgi.c:345 #, c-format msgid "Invalid width: %hu" msgstr "Largeur non valide : %hu" -#: ../plug-ins/file-sgi/sgi.c:350 +#: ../plug-ins/file-sgi/sgi.c:352 #, c-format msgid "Invalid height: %hu" msgstr "Hauteur non valide : %hu" -#: ../plug-ins/file-sgi/sgi.c:357 +#: ../plug-ins/file-sgi/sgi.c:359 #, c-format msgid "Invalid number of channels: %hu" msgstr "Nombre de canaux non valide : %hu" -#: ../plug-ins/file-sgi/sgi.c:571 +#: ../plug-ins/file-sgi/sgi.c:573 #, c-format msgid "Could not open '%s' for writing." msgstr "Impossible d'ouvrir le fichier « %s » en écriture." -#: ../plug-ins/file-sgi/sgi.c:652 +#: ../plug-ins/file-sgi/sgi.c:654 msgid "SGI" msgstr "SGI" -#: ../plug-ins/file-sgi/sgi.c:654 +#: ../plug-ins/file-sgi/sgi.c:656 msgid "Compression type" msgstr "Type de compression" -#: ../plug-ins/file-sgi/sgi.c:658 +#: ../plug-ins/file-sgi/sgi.c:660 msgid "No compression" msgstr "Aucune compression" -#: ../plug-ins/file-sgi/sgi.c:660 +#: ../plug-ins/file-sgi/sgi.c:662 msgid "RLE compression" msgstr "Compression RLE" -#: ../plug-ins/file-sgi/sgi.c:662 +#: ../plug-ins/file-sgi/sgi.c:664 msgid "" "Aggressive RLE\n" "(not supported by SGI)" @@ -9283,78 +9410,83 @@ msgid "URI" msgstr "URI" -#: ../plug-ins/file-xjt/xjt.c:485 ../plug-ins/file-xjt/xjt.c:503 +#: ../plug-ins/file-uri/uri.c:318 +#, c-format +msgid "Failed to save to temporary file '%s'" +msgstr "Échec d'enregistrement vers le fichier temporaire « %s »" + +#: ../plug-ins/file-xjt/xjt.c:487 ../plug-ins/file-xjt/xjt.c:506 msgid "GIMP compressed XJT image" msgstr "Image compressée GIMP XJT" -#: ../plug-ins/file-xjt/xjt.c:733 +#: ../plug-ins/file-xjt/xjt.c:737 #, c-format msgid "XJT file contains unknown layermode %d" msgstr "Le fichier XJT contient le mode de calque inconnu %d" -#: ../plug-ins/file-xjt/xjt.c:770 +#: ../plug-ins/file-xjt/xjt.c:774 #, c-format msgid "Warning: unsupported layermode %d saved to XJT" msgstr "" "Avertissement : mode de calque %d non pris en charge lors de " "l'enregistrement au format XJT" -#: ../plug-ins/file-xjt/xjt.c:786 +#: ../plug-ins/file-xjt/xjt.c:790 #, c-format msgid "XJT file contains unknown pathtype %d" msgstr "Le fichier XJT contient le type de chemin inconnu %d" -#: ../plug-ins/file-xjt/xjt.c:802 +#: ../plug-ins/file-xjt/xjt.c:806 #, c-format msgid "Warning: unsupported pathtype %d saved to XJT" msgstr "" "Avertissement : type de chemin %d non pris en charge lors de " "l'enregistrement au format XJT" -#: ../plug-ins/file-xjt/xjt.c:821 +#: ../plug-ins/file-xjt/xjt.c:825 #, c-format msgid "XJT file contains unknown unittype %d" msgstr "Le fichier XJT contient le type d'unité inconnu %d" -#: ../plug-ins/file-xjt/xjt.c:842 +#: ../plug-ins/file-xjt/xjt.c:846 #, c-format msgid "Warning: unsupported unittype %d saved to XJT" msgstr "" "Avertissement : type d'unité %d non pris en charge lors de l'enregistrement " "au format XJT" -#: ../plug-ins/file-xjt/xjt.c:863 +#: ../plug-ins/file-xjt/xjt.c:867 msgid "XJT" msgstr "XJT" -#: ../plug-ins/file-xjt/xjt.c:873 +#: ../plug-ins/file-xjt/xjt.c:877 msgid "Optimize" msgstr "Optimiser" #  ??? -#: ../plug-ins/file-xjt/xjt.c:883 +#: ../plug-ins/file-xjt/xjt.c:887 msgid "Clear transparent" msgstr "Épurer le transparent" -#: ../plug-ins/file-xjt/xjt.c:895 +#: ../plug-ins/file-xjt/xjt.c:899 msgid "Quality:" msgstr "Qualité :" -#: ../plug-ins/file-xjt/xjt.c:904 +#: ../plug-ins/file-xjt/xjt.c:908 msgid "Smoothing:" msgstr "Adoucissement :" -#: ../plug-ins/file-xjt/xjt.c:1705 ../plug-ins/file-xjt/xjt.c:3343 +#: ../plug-ins/file-xjt/xjt.c:1709 ../plug-ins/file-xjt/xjt.c:3347 #, c-format msgid "Could not create working folder '%s': %s" msgstr "Impossible de créer le dossier de travail « %s » : %s" -#: ../plug-ins/file-xjt/xjt.c:3209 +#: ../plug-ins/file-xjt/xjt.c:3213 #, c-format msgid "Error: Could not read XJT property file '%s'." msgstr "Erreur : Impossible de lire le fichier de propriétés XJT « %s »." -#: ../plug-ins/file-xjt/xjt.c:3216 +#: ../plug-ins/file-xjt/xjt.c:3220 #, c-format msgid "Error: XJT property file '%s' is empty." msgstr "Erreur : le fichier de propriétés XJT « %s » est vide." @@ -9417,7 +9549,7 @@ msgid "Horseshoe" msgstr "Fer à cheval" -#: ../plug-ins/flame/flame.c:752 ../plug-ins/gfig/gfig-dialog.c:1464 +#: ../plug-ins/flame/flame.c:752 ../plug-ins/gfig/gfig-dialog.c:1479 msgid "Polar" msgstr "Polaire" @@ -9554,7 +9686,7 @@ msgstr "C_améra" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:546 -#: ../plug-ins/gfig/gfig-dialog.c:277 ../plug-ins/gimpressionist/utils.c:142 +#: ../plug-ins/gfig/gfig-dialog.c:275 ../plug-ins/gimpressionist/utils.c:142 #: ../plug-ins/gradient-flare/gradient-flare.c:881 #, c-format msgid "" @@ -9839,34 +9971,34 @@ msgid "'%s' is corrupt. Line %d Option section incorrect" msgstr "« %s » est endommagé. Ligne option %d section incorrecte" -#: ../plug-ins/fractal-explorer/fractal-explorer.c:238 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:236 msgid "Render fractal art" msgstr "Rendu d'art fractal" -#: ../plug-ins/fractal-explorer/fractal-explorer.c:243 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:241 msgid "_Fractal Explorer..." msgstr "Explorateur de _fractales..." -#: ../plug-ins/fractal-explorer/fractal-explorer.c:371 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:368 msgid "Rendering fractal" msgstr "Calcul de la fractale" -#: ../plug-ins/fractal-explorer/fractal-explorer.c:754 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:751 #: ../plug-ins/gradient-flare/gradient-flare.c:3201 #, c-format msgid "Are you sure you want to delete \"%s\" from the list and from disk?" msgstr "Voulez-vous vraiment effacer « %s » de la liste et du disque ?" -#: ../plug-ins/fractal-explorer/fractal-explorer.c:758 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:755 msgid "Delete Fractal" msgstr "Supprimer la fractale" -#: ../plug-ins/fractal-explorer/fractal-explorer.c:947 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:944 #, c-format msgid "File '%s' is not a FractalExplorer file" msgstr "Le fichier « %s » n'est pas un fichier FractalExplorer." -#: ../plug-ins/fractal-explorer/fractal-explorer.c:957 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:954 #, c-format msgid "" "File '%s' is corrupt.\n" @@ -9875,249 +10007,248 @@ "Le fichier « %s » est endommagé.\n" "Ligne %d : section d'option incorrecte." -#: ../plug-ins/fractal-explorer/fractal-explorer.c:1002 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:999 msgid "My first fractal" msgstr "Ma première fractale" -#: ../plug-ins/fractal-explorer/fractal-explorer.c:1066 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:1063 msgid "Select folder and rescan collection" msgstr "Sélectionne un dossier et analyse à nouveau la collection" -#: ../plug-ins/fractal-explorer/fractal-explorer.c:1078 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:1075 msgid "Apply currently selected fractal" msgstr "Applique la fractale actuellement sélectionnée" -#: ../plug-ins/fractal-explorer/fractal-explorer.c:1090 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:1087 msgid "Delete currently selected fractal" msgstr "Supprime la fractale actuellement sélectionnée." -#: ../plug-ins/fractal-explorer/fractal-explorer.c:1113 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:1110 msgid "Rescan for Fractals" msgstr "Actualisez la liste de fractales" -#: ../plug-ins/fractal-explorer/fractal-explorer.c:1132 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:1129 msgid "Add FractalExplorer Path" msgstr "Ajoutez un chemin FractalExplorer" -#: ../plug-ins/gfig/gfig-bezier.c:442 +#: ../plug-ins/gfig/gfig-bezier.c:401 msgid "Closed" msgstr "Courbe fermée" -#: ../plug-ins/gfig/gfig-bezier.c:447 +#: ../plug-ins/gfig/gfig-bezier.c:406 msgid "Close curve on completion" msgstr "Fermer la courbe lorsqu'elle est terminée" -#: ../plug-ins/gfig/gfig-bezier.c:452 +#: ../plug-ins/gfig/gfig-bezier.c:411 msgid "Show Line Frame" msgstr "Afficher les lignes de l'image" -#: ../plug-ins/gfig/gfig-bezier.c:457 +#: ../plug-ins/gfig/gfig-bezier.c:416 msgid "Draws lines between the control points. Only during curve creation" msgstr "" "Montre les lignes entre les points de contrôle (seulement pendant la " "création de courbe)" #. Start building the dialog up -#: ../plug-ins/gfig/gfig-dialog.c:289 +#: ../plug-ins/gfig/gfig-dialog.c:287 msgid "Gfig" msgstr "Figures géométriques" #. Tool options notebook -#: ../plug-ins/gfig/gfig-dialog.c:337 +#: ../plug-ins/gfig/gfig-dialog.c:335 msgid "Tool Options" msgstr "Options d'outil" -#: ../plug-ins/gfig/gfig-dialog.c:354 +#: ../plug-ins/gfig/gfig-dialog.c:352 msgid "_Stroke" msgstr "_Tracer" #. Fill frame on right side -#: ../plug-ins/gfig/gfig-dialog.c:401 +#: ../plug-ins/gfig/gfig-dialog.c:399 msgid "Fill" msgstr "Remplir" -#: ../plug-ins/gfig/gfig-dialog.c:415 +#: ../plug-ins/gfig/gfig-dialog.c:413 msgid "No fill" msgstr "Ne pas remplir" -#: ../plug-ins/gfig/gfig-dialog.c:416 +#: ../plug-ins/gfig/gfig-dialog.c:414 msgid "Color fill" msgstr "Remplir avec une couleur" -#: ../plug-ins/gfig/gfig-dialog.c:417 +#: ../plug-ins/gfig/gfig-dialog.c:415 msgid "Pattern fill" msgstr "Remplir avec le motif" -#: ../plug-ins/gfig/gfig-dialog.c:418 +#: ../plug-ins/gfig/gfig-dialog.c:416 msgid "Shape gradient" msgstr "Dégradé de forme" -#: ../plug-ins/gfig/gfig-dialog.c:419 +#: ../plug-ins/gfig/gfig-dialog.c:417 msgid "Vertical gradient" msgstr "Dégradé vertical" -#: ../plug-ins/gfig/gfig-dialog.c:420 +#: ../plug-ins/gfig/gfig-dialog.c:418 msgid "Horizontal gradient" msgstr "Dégradé horizontal" #. "show image" checkbutton at bottom of style frame -#: ../plug-ins/gfig/gfig-dialog.c:480 +#: ../plug-ins/gfig/gfig-dialog.c:478 msgid "Show image" msgstr "Afficher l'image" #. "snap to grid" checkbutton at bottom of style frame -#: ../plug-ins/gfig/gfig-dialog.c:493 +#: ../plug-ins/gfig/gfig-dialog.c:491 msgctxt "checkbutton" msgid "Snap to grid" msgstr "Coller à la grille" #. "show grid" checkbutton at bottom of style frame -#: ../plug-ins/gfig/gfig-dialog.c:502 +#: ../plug-ins/gfig/gfig-dialog.c:500 msgid "Show grid" msgstr "Afficher la grille" -#: ../plug-ins/gfig/gfig-dialog.c:639 +#: ../plug-ins/gfig/gfig-dialog.c:635 msgid "Load Gfig Object Collection" msgstr "Charger la collection d'objets Gfig" -#: ../plug-ins/gfig/gfig-dialog.c:688 +#: ../plug-ins/gfig/gfig-dialog.c:684 msgid "Save Gfig Drawing" msgstr "Enregistrer le tracé Gfig" -#: ../plug-ins/gfig/gfig-dialog.c:833 +#: ../plug-ins/gfig/gfig-dialog.c:848 msgid "First Gfig" msgstr "Première Gfig" -#: ../plug-ins/gfig/gfig-dialog.c:871 +#: ../plug-ins/gfig/gfig-dialog.c:886 msgid "_Undo" msgstr "A_nnuler" -#: ../plug-ins/gfig/gfig-dialog.c:875 +#: ../plug-ins/gfig/gfig-dialog.c:890 msgid "_Clear" msgstr "_Effacer" -#: ../plug-ins/gfig/gfig-dialog.c:879 ../plug-ins/imagemap/imap_menu.c:208 +#: ../plug-ins/gfig/gfig-dialog.c:894 ../plug-ins/imagemap/imap_menu.c:208 msgid "_Grid" msgstr "_Grille" -#: ../plug-ins/gfig/gfig-dialog.c:887 +#: ../plug-ins/gfig/gfig-dialog.c:902 msgid "Raise selected object" msgstr "Monter l'objet sélectionné" -#: ../plug-ins/gfig/gfig-dialog.c:891 +#: ../plug-ins/gfig/gfig-dialog.c:906 msgid "Lower selected object" msgstr "Descendre l'objet sélectionné" -#: ../plug-ins/gfig/gfig-dialog.c:895 +#: ../plug-ins/gfig/gfig-dialog.c:910 msgid "Raise selected object to top" msgstr "Monter l'objet sélectionné tout en haut" -#: ../plug-ins/gfig/gfig-dialog.c:899 +#: ../plug-ins/gfig/gfig-dialog.c:914 msgid "Lower selected object to bottom" msgstr "Descendre l'objet sélectionné tout en bas" -#: ../plug-ins/gfig/gfig-dialog.c:903 +#: ../plug-ins/gfig/gfig-dialog.c:918 msgid "Show previous object" msgstr "Montre l'objet précédent" -#: ../plug-ins/gfig/gfig-dialog.c:907 +#: ../plug-ins/gfig/gfig-dialog.c:922 msgid "Show next object" msgstr "Montre l'objet suivant" -#: ../plug-ins/gfig/gfig-dialog.c:911 ../plug-ins/gfig/gfig-stock.c:52 +#: ../plug-ins/gfig/gfig-dialog.c:926 ../plug-ins/gfig/gfig-stock.c:52 msgid "Show all objects" msgstr "Montrer tous les objets" -#: ../plug-ins/gfig/gfig-dialog.c:917 ../plug-ins/gfig/gfig-stock.c:46 +#: ../plug-ins/gfig/gfig-dialog.c:932 ../plug-ins/gfig/gfig-stock.c:46 msgid "Create line" msgstr "Créer une ligne" -#: ../plug-ins/gfig/gfig-dialog.c:920 ../plug-ins/gfig/gfig-stock.c:50 +#: ../plug-ins/gfig/gfig-dialog.c:935 ../plug-ins/gfig/gfig-stock.c:50 msgid "Create rectangle" msgstr "Créer un rectangle" -#: ../plug-ins/gfig/gfig-dialog.c:923 ../plug-ins/gfig/gfig-stock.c:41 +#: ../plug-ins/gfig/gfig-dialog.c:938 ../plug-ins/gfig/gfig-stock.c:41 msgid "Create circle" msgstr "Créer un cercle" -#: ../plug-ins/gfig/gfig-dialog.c:926 ../plug-ins/gfig/gfig-stock.c:45 +#: ../plug-ins/gfig/gfig-dialog.c:941 ../plug-ins/gfig/gfig-stock.c:45 msgid "Create ellipse" msgstr "Créer une ellipse" -#: ../plug-ins/gfig/gfig-dialog.c:929 ../plug-ins/gfig/gfig-stock.c:43 +#: ../plug-ins/gfig/gfig-dialog.c:944 ../plug-ins/gfig/gfig-stock.c:43 msgid "Create arc" msgstr "Créer un arc" -#: ../plug-ins/gfig/gfig-dialog.c:932 ../plug-ins/gfig/gfig-stock.c:49 +#: ../plug-ins/gfig/gfig-dialog.c:947 ../plug-ins/gfig/gfig-stock.c:49 msgid "Create reg polygon" msgstr "Créer un polygone régulier" -#: ../plug-ins/gfig/gfig-dialog.c:935 ../plug-ins/gfig/gfig-stock.c:54 +#: ../plug-ins/gfig/gfig-dialog.c:950 ../plug-ins/gfig/gfig-stock.c:54 msgid "Create star" msgstr "Créer une étoile" -#: ../plug-ins/gfig/gfig-dialog.c:938 ../plug-ins/gfig/gfig-stock.c:53 +#: ../plug-ins/gfig/gfig-dialog.c:953 ../plug-ins/gfig/gfig-stock.c:53 msgid "Create spiral" msgstr "Créer une spirale" -#: ../plug-ins/gfig/gfig-dialog.c:941 +#: ../plug-ins/gfig/gfig-dialog.c:956 msgid "Create bezier curve. Shift + Button ends object creation." msgstr "" "Créer une courbe de Bézier. + bouton termine la création de l'objet." -#: ../plug-ins/gfig/gfig-dialog.c:945 ../plug-ins/gfig/gfig-stock.c:47 +#: ../plug-ins/gfig/gfig-dialog.c:960 ../plug-ins/gfig/gfig-stock.c:47 msgid "Move an object" msgstr "Déplacer un objet" -#: ../plug-ins/gfig/gfig-dialog.c:948 ../plug-ins/gfig/gfig-stock.c:48 +#: ../plug-ins/gfig/gfig-dialog.c:963 ../plug-ins/gfig/gfig-stock.c:48 msgid "Move a single point" msgstr "Déplacer un point seul" -#: ../plug-ins/gfig/gfig-dialog.c:951 ../plug-ins/gfig/gfig-stock.c:42 +#: ../plug-ins/gfig/gfig-dialog.c:966 ../plug-ins/gfig/gfig-stock.c:42 msgid "Copy an object" msgstr "Copier un objet" -#: ../plug-ins/gfig/gfig-dialog.c:954 ../plug-ins/gfig/gfig-stock.c:44 +#: ../plug-ins/gfig/gfig-dialog.c:969 ../plug-ins/gfig/gfig-stock.c:44 msgid "Delete an object" msgstr "Effacer un objet" -#: ../plug-ins/gfig/gfig-dialog.c:957 ../plug-ins/gfig/gfig-stock.c:51 +#: ../plug-ins/gfig/gfig-dialog.c:972 ../plug-ins/gfig/gfig-stock.c:51 msgid "Select an object" msgstr "Sélectionner un objet" -#: ../plug-ins/gfig/gfig-dialog.c:1039 +#: ../plug-ins/gfig/gfig-dialog.c:1054 msgid "This tool has no options" msgstr "Cet outil n'a pas d'options" #. Put buttons in -#: ../plug-ins/gfig/gfig-dialog.c:1250 +#: ../plug-ins/gfig/gfig-dialog.c:1265 msgid "Show position" msgstr "Afficher la position" -#: ../plug-ins/gfig/gfig-dialog.c:1262 +#: ../plug-ins/gfig/gfig-dialog.c:1277 msgid "Show control points" msgstr "Afficher les points de contrôle" -#: ../plug-ins/gfig/gfig-dialog.c:1296 +#: ../plug-ins/gfig/gfig-dialog.c:1311 msgid "Max undo:" msgstr "Maximum d'annulations :" -#: ../plug-ins/gfig/gfig-dialog.c:1305 -#: ../plug-ins/gimpressionist/general.c:184 +#: ../plug-ins/gfig/gfig-dialog.c:1320 ../plug-ins/gimpressionist/general.c:184 msgid "Transparent" msgstr "Transparent" -#: ../plug-ins/gfig/gfig-dialog.c:1307 +#: ../plug-ins/gfig/gfig-dialog.c:1322 msgid "Foreground" msgstr "Premier plan" -#: ../plug-ins/gfig/gfig-dialog.c:1309 ../plug-ins/imagemap/imap_cmd_copy.c:53 +#: ../plug-ins/gfig/gfig-dialog.c:1324 ../plug-ins/imagemap/imap_cmd_copy.c:53 #: ../plug-ins/imagemap/imap_cmd_copy_object.c:54 #: ../plug-ins/imagemap/imap_menu.c:159 msgid "Copy" msgstr "Copier" -#: ../plug-ins/gfig/gfig-dialog.c:1318 +#: ../plug-ins/gfig/gfig-dialog.c:1333 msgid "" "Layer background type. Copy causes the previous layer to be copied before " "the draw is performed." @@ -10125,115 +10256,115 @@ "Type d'arrière-plan pour le calque. Copier fait que le calque précédent est " "copié avant que le dessin ne soit effectué." -#: ../plug-ins/gfig/gfig-dialog.c:1324 +#: ../plug-ins/gfig/gfig-dialog.c:1339 msgid "Background:" msgstr "Arrière-plan :" -#: ../plug-ins/gfig/gfig-dialog.c:1327 +#: ../plug-ins/gfig/gfig-dialog.c:1342 msgid "Feather" msgstr "Adoucir" -#: ../plug-ins/gfig/gfig-dialog.c:1350 +#: ../plug-ins/gfig/gfig-dialog.c:1365 msgid "Radius:" msgstr "Rayon :" -#: ../plug-ins/gfig/gfig-dialog.c:1408 +#: ../plug-ins/gfig/gfig-dialog.c:1423 msgid "Grid spacing:" msgstr "Espacement de la grille :" -#: ../plug-ins/gfig/gfig-dialog.c:1425 +#: ../plug-ins/gfig/gfig-dialog.c:1440 msgid "Polar grid sectors desired:" msgstr "Secteurs souhaités pour la grille polaire :" -#: ../plug-ins/gfig/gfig-dialog.c:1447 +#: ../plug-ins/gfig/gfig-dialog.c:1462 msgid "Polar grid radius interval:" msgstr "Intervalle de rayon de la grille polaire :" -#: ../plug-ins/gfig/gfig-dialog.c:1463 ../plug-ins/imagemap/imap_menu.c:219 +#: ../plug-ins/gfig/gfig-dialog.c:1478 ../plug-ins/imagemap/imap_menu.c:219 msgid "Rectangle" msgstr "Rectangle" -#: ../plug-ins/gfig/gfig-dialog.c:1465 +#: ../plug-ins/gfig/gfig-dialog.c:1480 msgid "Isometric" msgstr "Isométrique" -#: ../plug-ins/gfig/gfig-dialog.c:1474 +#: ../plug-ins/gfig/gfig-dialog.c:1489 msgid "Grid type:" msgstr "Type de grille :" -#: ../plug-ins/gfig/gfig-dialog.c:1481 +#: ../plug-ins/gfig/gfig-dialog.c:1496 #: ../plug-ins/gradient-flare/gradient-flare.c:551 msgid "Normal" msgstr "Normal" -#: ../plug-ins/gfig/gfig-dialog.c:1484 +#: ../plug-ins/gfig/gfig-dialog.c:1499 msgid "Grey" msgstr "Gris" -#: ../plug-ins/gfig/gfig-dialog.c:1485 +#: ../plug-ins/gfig/gfig-dialog.c:1500 msgid "Darker" msgstr "Plus sombre" -#: ../plug-ins/gfig/gfig-dialog.c:1486 +#: ../plug-ins/gfig/gfig-dialog.c:1501 msgid "Lighter" msgstr "Plus lumineux" -#: ../plug-ins/gfig/gfig-dialog.c:1487 +#: ../plug-ins/gfig/gfig-dialog.c:1502 msgid "Very dark" msgstr "Très sombre" -#: ../plug-ins/gfig/gfig-dialog.c:1496 +#: ../plug-ins/gfig/gfig-dialog.c:1511 msgid "Grid color:" msgstr "Couleur de la grille :" -#: ../plug-ins/gfig/gfig-dialog.c:1717 +#: ../plug-ins/gfig/gfig-dialog.c:1732 msgid "Sides:" msgstr "Cotés :" -#: ../plug-ins/gfig/gfig-dialog.c:1727 +#: ../plug-ins/gfig/gfig-dialog.c:1742 msgid "Right" msgstr "Droite" -#: ../plug-ins/gfig/gfig-dialog.c:1728 +#: ../plug-ins/gfig/gfig-dialog.c:1743 msgid "Left" msgstr "Gauche" -#: ../plug-ins/gfig/gfig-dialog.c:1738 +#: ../plug-ins/gfig/gfig-dialog.c:1753 #: ../plug-ins/gimpressionist/orientation.c:147 msgid "Orientation:" msgstr "Orientation :" -#: ../plug-ins/gfig/gfig-dobject.c:584 +#: ../plug-ins/gfig/gfig-dobject.c:580 msgid "Hey where has the object gone ?" msgstr "Hé, mais où l'objet est-il passé ?" -#: ../plug-ins/gfig/gfig-dobject.c:953 +#: ../plug-ins/gfig/gfig-dobject.c:922 msgid "Error reading file" msgstr "Erreur lors de la lecture du fichier" -#: ../plug-ins/gfig/gfig-dobject.c:1042 +#: ../plug-ins/gfig/gfig-dobject.c:1011 msgid "Editing read-only object - you will not be able to save it" msgstr "" "Modification d'un objet en lecture seule : vous ne pourrez pas l'enregistrer" -#: ../plug-ins/gfig/gfig-poly.c:50 +#: ../plug-ins/gfig/gfig-poly.c:51 msgid "Regular Polygon Number of Sides" msgstr "Polygone régulier : nombre de côtés" -#: ../plug-ins/gfig/gfig-preview.c:328 +#: ../plug-ins/gfig/gfig-preview.c:337 msgid "Object Details" msgstr "Détails objet" #. Position labels -#: ../plug-ins/gfig/gfig-preview.c:379 +#: ../plug-ins/gfig/gfig-preview.c:388 msgid "XY position:" msgstr "Position XY :" -#: ../plug-ins/gfig/gfig-spiral.c:54 +#: ../plug-ins/gfig/gfig-spiral.c:55 msgid "Spiral Number of Turns" msgstr "Nombre de tours de la spirale" -#: ../plug-ins/gfig/gfig-star.c:51 +#: ../plug-ins/gfig/gfig-star.c:52 msgid "Star Number of Points" msgstr "Étoile : nombre de points" @@ -10241,27 +10372,27 @@ msgid "Create bezier curve" msgstr "Créer une courbe de Bézier" -#: ../plug-ins/gfig/gfig.c:123 +#: ../plug-ins/gfig/gfig.c:122 msgid "Create geometric shapes" msgstr "Créer des formes géométriques" -#: ../plug-ins/gfig/gfig.c:134 +#: ../plug-ins/gfig/gfig.c:133 msgid "_Gfig..." msgstr "Figures _géométriques (GFig)..." -#: ../plug-ins/gfig/gfig.c:735 +#: ../plug-ins/gfig/gfig.c:738 msgid "" "Error trying to save figure as a parasite: can't attach parasite to drawable." msgstr "" "Erreur lors de l'enregistrement de la figure en tant que parasite : ne peut " "rattacher le parasite à l'objet graphique." -#: ../plug-ins/gfig/gfig.c:762 +#: ../plug-ins/gfig/gfig.c:765 #, c-format msgid "Error trying to open temporary file '%s' for parasite loading: %s" msgstr "" -"Erreur lors de l'ouverture du fichier temporaire « %s » pour le chargement du " -"parasite : %s." +"Erreur lors de l'ouverture du fichier temporaire « %s » pour le chargement " +"du parasite : %s." #: ../plug-ins/gimpressionist/brush.c:243 msgid "Can only save drawables!" @@ -10768,7 +10899,7 @@ msgstr "Recharge le dossier des préréglages" #: ../plug-ins/gimpressionist/preview.c:174 -#: ../plug-ins/gimpressionist/repaint.c:1182 +#: ../plug-ins/gimpressionist/repaint.c:1197 #: ../plug-ins/imagemap/imap_polygon.c:515 #: ../plug-ins/lighting/lighting-ui.c:1082 msgid "_Update" @@ -10908,6 +11039,82 @@ "Le mode Voronoï fait que seul le vecteur le plus proche d'un point donné a " "une influence." +#: ../plug-ins/ui/plug-in-file-gif.ui.h:1 +msgid "I_nterlace" +msgstr "E_ntrelacement" + +#: ../plug-ins/ui/plug-in-file-gif.ui.h:2 +msgid "_GIF comment:" +msgstr "Commentaire _GIF :" + +#: ../plug-ins/ui/plug-in-file-gif.ui.h:3 +msgid "As _animation" +msgstr "En tant qu'_animation" + +#: ../plug-ins/ui/plug-in-file-gif.ui.h:4 +msgid "GIF Options" +msgstr "Options GIF" + +#: ../plug-ins/ui/plug-in-file-gif.ui.h:5 +msgid "_Loop forever" +msgstr "Bouc_ler indéfiniment" + +#: ../plug-ins/ui/plug-in-file-gif.ui.h:6 +msgid "_Delay between frames where unspecified:" +msgstr "_Délai entre les images là où ce n'est pas spécifié :" + +#: ../plug-ins/ui/plug-in-file-gif.ui.h:8 +msgid "_Frame disposal where unspecified:" +msgstr "Arran_gement des images là où ce n'est pas spécifié :" + +#: ../plug-ins/ui/plug-in-file-gif.ui.h:9 +msgid "_Use delay entered above for all frames" +msgstr "_Utiliser le délai saisi ci-dessus pour toutes les images" + +#: ../plug-ins/ui/plug-in-file-gif.ui.h:10 +msgid "U_se disposal entered above for all frames" +msgstr "Utili_ser l'arrangement saisi ci-dessus pour toutes les images" + +#: ../plug-ins/ui/plug-in-file-gif.ui.h:11 +msgid "Animated GIF Options" +msgstr "Options de GIF animé" + +#: ../plug-ins/ui/plug-in-file-png.ui.h:1 +msgid "_Interlacing (Adam7)" +msgstr "_Entrelacement (Adam7)" + +#: ../plug-ins/ui/plug-in-file-png.ui.h:2 +msgid "Save _background color" +msgstr "Enregistrer la couleur d'_arrière-plan" + +#: ../plug-ins/ui/plug-in-file-png.ui.h:4 +msgid "Save layer o_ffset" +msgstr "Enregistrer le _décalage de calque" + +#: ../plug-ins/ui/plug-in-file-png.ui.h:5 +msgid "Save _resolution" +msgstr "Enregistrer la _résolution" + +#: ../plug-ins/ui/plug-in-file-png.ui.h:6 +msgid "Save creation _time" +msgstr "Enregistrer la da_te de création" + +#: ../plug-ins/ui/plug-in-file-png.ui.h:7 +msgid "Save comme_nt" +msgstr "Enregistrer le comme_ntaire" + +#: ../plug-ins/ui/plug-in-file-png.ui.h:8 +msgid "Save color _values from transparent pixels" +msgstr "Enregistrer les _valeurs de couleur pour les pixels transparents" + +#: ../plug-ins/ui/plug-in-file-png.ui.h:9 +msgid "Co_mpression level:" +msgstr "Niveau de compression :" + +#: ../plug-ins/ui/plug-in-file-png.ui.h:12 +msgid "S_ave Defaults" +msgstr "Enre_gistrer les valeurs par défaut" + #: ../plug-ins/gradient-flare/gradient-flare.c:552 msgid "Addition" msgstr "Addition" @@ -11189,77 +11396,76 @@ msgid "_Second Flares" msgstr "Reflets _secondaires" -#: ../plug-ins/help-browser/dialog.c:184 -#: ../plug-ins/help-browser/dialog.c:1110 +#: ../plug-ins/help-browser/dialog.c:184 ../plug-ins/help-browser/dialog.c:1133 msgid "GIMP Help Browser" msgstr "Navigateur d'aide GIMP" -#: ../plug-ins/help-browser/dialog.c:559 +#: ../plug-ins/help-browser/dialog.c:582 msgid "Go back one page" msgstr "Recule d'une page" -#: ../plug-ins/help-browser/dialog.c:564 +#: ../plug-ins/help-browser/dialog.c:587 msgid "Go forward one page" msgstr "Avance d'une page" -#: ../plug-ins/help-browser/dialog.c:569 +#: ../plug-ins/help-browser/dialog.c:592 msgid "_Reload" msgstr "_Recharger" -#: ../plug-ins/help-browser/dialog.c:569 +#: ../plug-ins/help-browser/dialog.c:592 msgid "Reload current page" msgstr "Recharge la page actuelle" -#: ../plug-ins/help-browser/dialog.c:574 +#: ../plug-ins/help-browser/dialog.c:597 msgid "_Stop" msgstr "_Arrêter" -#: ../plug-ins/help-browser/dialog.c:574 +#: ../plug-ins/help-browser/dialog.c:597 msgid "Stop loading this page" msgstr "Arrête le chargement de la page" -#: ../plug-ins/help-browser/dialog.c:579 +#: ../plug-ins/help-browser/dialog.c:602 msgid "Go to the index page" msgstr "Va à la page du sommaire" -#: ../plug-ins/help-browser/dialog.c:584 +#: ../plug-ins/help-browser/dialog.c:607 msgid "C_opy location" msgstr "C_opier l'emplacement" -#: ../plug-ins/help-browser/dialog.c:585 +#: ../plug-ins/help-browser/dialog.c:608 msgid "Copy the location of this page to the clipboard" msgstr "Copie l'emplacement de cette page dans le presse-papiers" -#: ../plug-ins/help-browser/dialog.c:605 +#: ../plug-ins/help-browser/dialog.c:628 msgid "Find text in current page" msgstr "Recherche du texte dans la page actuelle" -#: ../plug-ins/help-browser/dialog.c:610 +#: ../plug-ins/help-browser/dialog.c:633 msgid "Find _Again" msgstr "Reprendre l_a recherche" -#: ../plug-ins/help-browser/dialog.c:629 +#: ../plug-ins/help-browser/dialog.c:652 msgid "S_how Index" msgstr "Afficher le so_mmaire" -#: ../plug-ins/help-browser/dialog.c:630 +#: ../plug-ins/help-browser/dialog.c:653 msgid "Toggle the visibility of the sidebar" msgstr "Affiche ou masque le panneau latéral" -#: ../plug-ins/help-browser/dialog.c:651 +#: ../plug-ins/help-browser/dialog.c:674 msgid "Visit the GIMP documentation website" msgstr "Visiter le site Web de la documentation GIMP" -#: ../plug-ins/help-browser/dialog.c:1151 +#: ../plug-ins/help-browser/dialog.c:1174 msgid "Find:" msgstr "Chercher :" -#: ../plug-ins/help-browser/dialog.c:1168 +#: ../plug-ins/help-browser/dialog.c:1191 msgctxt "search" msgid "_Previous" msgstr "_Précédent" -#: ../plug-ins/help-browser/dialog.c:1180 +#: ../plug-ins/help-browser/dialog.c:1203 msgctxt "search" msgid "_Next" msgstr "_Suivant" @@ -11273,30 +11479,36 @@ msgid "The GIMP user manual is not available." msgstr "Le manuel d'utilisation de GIMP n'est pas disponible." -#: ../plug-ins/help/gimphelpdomain.c:187 +#. TRANSLATORS: do not end the URL with a dot, +#. * it would be in the link. Because of +#. * technical limitations, make sure the URL +#. * ends with a space, a newline or is end of text. +#. * Cf. bug 762282. +#. +#: ../plug-ins/help/gimphelpdomain.c:193 msgid "" -"Please install the additional help package or use the online user manual at " -"http://docs.gimp.org/." +"Please install the additional help package or use the online user manual at: " +"http://docs.gimp.org/" msgstr "" "Veuillez installer le paquet d'aide ou utilisez le manuel en ligne à " -"l'adresse http://docs.gimp.org/fr." +"l'adresse http://docs.gimp.org/fr" -#: ../plug-ins/help/gimphelpdomain.c:196 +#: ../plug-ins/help/gimphelpdomain.c:202 msgid "Perhaps you are missing GIO backends and need to install GVFS?" msgstr "" "Il vous manque peut-être des moteurs GIO et il faudrait alors installer GVFS." -#: ../plug-ins/help/gimphelpdomain.c:215 +#: ../plug-ins/help/gimphelpdomain.c:221 #, c-format msgid "Help ID '%s' unknown" msgstr "ID d'aide « %s » inconnu" -#: ../plug-ins/help/gimphelplocale.c:208 +#: ../plug-ins/help/gimphelplocale.c:257 #, c-format msgid "Loading index from '%s'" msgstr "Chargement du sommaire depuis « %s »" -#: ../plug-ins/help/gimphelplocale.c:266 +#: ../plug-ins/help/gimphelplocale.c:315 #, c-format msgid "" "Parse error in '%s':\n" @@ -11460,11 +11672,14 @@ msgstr "Transformation %s" #: ../plug-ins/ifs-compose/ifs-compose.c:2413 +#: ../plug-ins/metadata/interface.c:507 ../plug-ins/metadata/interface.c:517 msgid "Save failed" msgstr "Échec d'enregistrement" #: ../plug-ins/ifs-compose/ifs-compose.c:2496 #: ../plug-ins/ifs-compose/ifs-compose.c:2509 +#: ../plug-ins/metadata/interface.c:413 ../plug-ins/metadata/interface.c:423 +#: ../plug-ins/metadata/interface.c:497 msgid "Open failed" msgstr "L'ouverture a échoué" @@ -11504,8 +11719,7 @@ #: ../plug-ins/imagemap/imap_circle.c:268 #: ../plug-ins/imagemap/imap_circle.c:275 #: ../plug-ins/imagemap/imap_circle.c:281 ../plug-ins/imagemap/imap_grid.c:249 -#: ../plug-ins/imagemap/imap_grid.c:255 -#: ../plug-ins/imagemap/imap_polygon.c:505 +#: ../plug-ins/imagemap/imap_grid.c:255 ../plug-ins/imagemap/imap_polygon.c:505 #: ../plug-ins/imagemap/imap_polygon.c:513 #: ../plug-ins/imagemap/imap_rectangle.c:392 #: ../plug-ins/imagemap/imap_rectangle.c:399 @@ -12215,6 +12429,7 @@ msgstr "_URL par défaut :" #: ../plug-ins/imagemap/imap_settings.c:107 +#: ../plug-ins/metadata/interface.c:247 msgid "_Description:" msgstr "_Description :" @@ -12346,7 +12561,7 @@ #: ../plug-ins/lighting/lighting-ui.c:469 #: ../plug-ins/map-object/map-object-ui.c:613 #: ../plug-ins/map-object/map-object-ui.c:940 -#: ../plug-ins/print/print-page-layout.c:355 +#: ../plug-ins/print/print-page-layout.c:372 msgid "Position" msgstr "Position" @@ -12628,8 +12843,8 @@ #: ../plug-ins/map-object/map-object-ui.c:513 msgid "Enable/disable jagged edges removal (antialiasing)" msgstr "" -"(Dés)active l'élimination du déplaisant « effet de créneaux » (anticrénelage, " -"antialiasing)" +"(Dés)active l'élimination du déplaisant « effet de " +"créneaux » (anticrénelage, antialiasing)" #: ../plug-ins/map-object/map-object-ui.c:530 msgid "Antialiasing quality. Higher is better, but slower" @@ -12745,12 +12960,12 @@ msgstr "Échelle en Z (taille)" #: ../plug-ins/map-object/map-object-ui.c:1147 -#: ../plug-ins/print/print-page-layout.c:414 +#: ../plug-ins/print/print-page-layout.c:431 msgid "_Top:" msgstr "_Dessus :" #: ../plug-ins/map-object/map-object-ui.c:1147 -#: ../plug-ins/print/print-page-layout.c:433 +#: ../plug-ins/print/print-page-layout.c:450 msgid "_Bottom:" msgstr "_Bas :" @@ -12759,7 +12974,7 @@ msgstr "Images pour les extrémités du cylindre" #: ../plug-ins/map-object/map-object-ui.c:1181 -#: ../plug-ins/print/print-page-layout.c:231 +#: ../plug-ins/print/print-page-layout.c:247 msgid "Size" msgstr "Taille" @@ -12850,10 +13065,96 @@ msgid "_Maze..." msgstr "_Labyrinthe" -#: ../plug-ins/maze/maze.c:425 +#: ../plug-ins/maze/maze.c:427 msgid "Drawing maze" msgstr "Dessin du labyrinthe en cours" +#: ../plug-ins/metadata/interface.c:110 +msgid "Property" +msgstr "Propriété" + +#: ../plug-ins/metadata/interface.c:204 ../plug-ins/metadata/interface.c:206 +msgid "Description" +msgstr "Description" + +#: ../plug-ins/metadata/interface.c:222 +msgid "Image _title:" +msgstr "_Titre de l'image :" + +#: ../plug-ins/metadata/interface.c:231 +msgid "_Author:" +msgstr "_Auteur :" + +#: ../plug-ins/metadata/interface.c:256 +msgid "Description _writer:" +msgstr "_Rédacteur de description :" + +#: ../plug-ins/metadata/interface.c:272 +msgid "_Keywords:" +msgstr "_Mots clés" + +#. FIXME: add entries, cross-link with XMP model +#: ../plug-ins/metadata/interface.c:284 ../plug-ins/metadata/interface.c:296 +#: ../plug-ins/metadata/interface.c:308 ../plug-ins/metadata/interface.c:320 +msgid "Empty" +msgstr "Vide" + +#: ../plug-ins/metadata/interface.c:286 +msgid "Copyright" +msgstr "Copyright" + +#: ../plug-ins/metadata/interface.c:298 +msgid "Origin" +msgstr "Origine" + +#: ../plug-ins/metadata/interface.c:310 +msgid "Camera 1" +msgstr "Caméra 1" + +#: ../plug-ins/metadata/interface.c:322 +msgid "Camera 2" +msgstr "Caméra 2" + +#: ../plug-ins/metadata/interface.c:337 +msgid "Thumbnail" +msgstr "Vignette" + +#: ../plug-ins/metadata/interface.c:356 +msgid "Advanced" +msgstr "Avancé" + +#: ../plug-ins/metadata/interface.c:447 +msgid "Import XMP from File" +msgstr "Importation XMP depuis un fichier" + +#: ../plug-ins/metadata/interface.c:498 +msgid "Cannot create file" +msgstr "Impossible de créer un fichier" + +#: ../plug-ins/metadata/interface.c:508 +msgid "Some error occurred while saving" +msgstr "Une erreur est survenue lors de l'enregistrement" + +#: ../plug-ins/metadata/interface.c:518 +msgid "Could not close the file" +msgstr "Impossible de fermer le fichier" + +#: ../plug-ins/metadata/interface.c:540 +msgid "Export XMP to File" +msgstr "Exportation XMP vert un fichier" + +#: ../plug-ins/metadata/interface.c:607 +msgid "Image Properties" +msgstr "Propriétés d'image" + +#: ../plug-ins/metadata/interface.c:611 +msgid "_Import XMP..." +msgstr "_Importer un XMP..." + +#: ../plug-ins/metadata/interface.c:612 +msgid "_Export XMP..." +msgstr "_Exporter un XMP..." + #: ../plug-ins/metadata/metadata.c:185 msgid "View and edit metadata (EXIF, IPTC, XMP)" msgstr "Afficher et modifier les métadonnées (EXIF, IPTC, XMP)" @@ -12907,20 +13208,20 @@ msgid "End of element <%s> not expected in this context" msgstr "La fin de l'élément « %s » n'est pas attendue dans ce contexte" -#: ../plug-ins/metadata/xmp-parse.c:1140 +#: ../plug-ins/metadata/xmp-parse.c:1139 #, c-format msgid "The current element (<%s>) cannot contain text" msgstr "L'élément courant (« %s ») ne peut contenir du texte" -#: ../plug-ins/metadata/xmp-parse.c:1165 +#: ../plug-ins/metadata/xmp-parse.c:1164 msgid "XMP packets must start with " msgstr "Les paquets XMP doivent commencer par " -#: ../plug-ins/metadata/xmp-parse.c:1179 +#: ../plug-ins/metadata/xmp-parse.c:1178 msgid "XMP packets must end with " msgstr "Les paquets XMP doivent finir par " -#: ../plug-ins/metadata/xmp-parse.c:1192 +#: ../plug-ins/metadata/xmp-parse.c:1191 msgid "XMP cannot contain XML comments or processing instructions" msgstr "" "XMP ne peut contenir des commentaires XML ou des instructions de commandes" @@ -12933,134 +13234,134 @@ msgid "_Pagecurl..." msgstr "Coin de p_age..." -#: ../plug-ins/pagecurl/pagecurl.c:440 +#: ../plug-ins/pagecurl/pagecurl.c:442 msgid "Pagecurl Effect" msgstr "Effet de coin de page" -#: ../plug-ins/pagecurl/pagecurl.c:462 +#: ../plug-ins/pagecurl/pagecurl.c:464 msgid "Curl Location" msgstr "Emplacement du coin" -#: ../plug-ins/pagecurl/pagecurl.c:481 +#: ../plug-ins/pagecurl/pagecurl.c:483 msgid "Lower right" msgstr "Inférieur droit" -#: ../plug-ins/pagecurl/pagecurl.c:482 +#: ../plug-ins/pagecurl/pagecurl.c:484 msgid "Lower left" msgstr "Inférieur gauche" -#: ../plug-ins/pagecurl/pagecurl.c:483 +#: ../plug-ins/pagecurl/pagecurl.c:485 msgid "Upper left" msgstr "Supérieur gauche" -#: ../plug-ins/pagecurl/pagecurl.c:484 +#: ../plug-ins/pagecurl/pagecurl.c:486 msgid "Upper right" msgstr "Supérieur droit" -#: ../plug-ins/pagecurl/pagecurl.c:524 +#: ../plug-ins/pagecurl/pagecurl.c:526 msgid "Curl Orientation" msgstr "Orientation du coin" -#: ../plug-ins/pagecurl/pagecurl.c:569 +#: ../plug-ins/pagecurl/pagecurl.c:571 msgid "_Shade under curl" msgstr "_Ombre sous le coin" -#: ../plug-ins/pagecurl/pagecurl.c:582 +#: ../plug-ins/pagecurl/pagecurl.c:584 msgid "Current gradient (reversed)" msgstr "Dégradé actif (inversé)" -#: ../plug-ins/pagecurl/pagecurl.c:587 +#: ../plug-ins/pagecurl/pagecurl.c:589 msgid "Current gradient" msgstr "Dégradé actif" -#: ../plug-ins/pagecurl/pagecurl.c:592 +#: ../plug-ins/pagecurl/pagecurl.c:594 msgid "Foreground / background colors" msgstr "Couleurs de premier / arrière-plan" -#: ../plug-ins/pagecurl/pagecurl.c:612 +#: ../plug-ins/pagecurl/pagecurl.c:614 msgid "_Opacity:" msgstr "O_pacité :" -#: ../plug-ins/pagecurl/pagecurl.c:735 +#: ../plug-ins/pagecurl/pagecurl.c:730 msgid "Curl Layer" msgstr "Coin du calque" -#: ../plug-ins/pagecurl/pagecurl.c:1026 +#: ../plug-ins/pagecurl/pagecurl.c:1022 msgid "Page Curl" msgstr "Coin de page" -#: ../plug-ins/print/print-page-layout.c:149 +#: ../plug-ins/print/print-page-layout.c:153 msgid "Ignore Page _Margins" msgstr "Ignorer les _marges de pages" #. crop marks toggle -#: ../plug-ins/print/print-page-layout.c:160 +#: ../plug-ins/print/print-page-layout.c:164 msgid "_Draw Crop Marks" msgstr "Tracer des _repères de coupe" -#: ../plug-ins/print/print-page-layout.c:306 +#: ../plug-ins/print/print-page-layout.c:322 msgid "_X resolution:" msgstr "Résolution _X :" -#: ../plug-ins/print/print-page-layout.c:310 +#: ../plug-ins/print/print-page-layout.c:326 msgid "_Y resolution:" msgstr "Résolution _Y :" -#: ../plug-ins/print/print-page-layout.c:381 +#: ../plug-ins/print/print-page-layout.c:398 msgid "_Left:" msgstr "_Gauche :" -#: ../plug-ins/print/print-page-layout.c:400 +#: ../plug-ins/print/print-page-layout.c:417 msgid "_Right:" msgstr "_Droite :" -#: ../plug-ins/print/print-page-layout.c:454 +#: ../plug-ins/print/print-page-layout.c:471 msgid "C_enter:" msgstr "C_entre :" #. if and how to center the image on the page -#: ../plug-ins/print/print-page-layout.c:461 +#: ../plug-ins/print/print-page-layout.c:478 msgctxt "center-mode" msgid "None" msgstr "Aucun" -#: ../plug-ins/print/print-page-layout.c:462 +#: ../plug-ins/print/print-page-layout.c:479 msgid "Horizontally" msgstr "Horizontalement" -#: ../plug-ins/print/print-page-layout.c:463 +#: ../plug-ins/print/print-page-layout.c:480 msgid "Vertically" msgstr "Verticalement" -#: ../plug-ins/print/print-page-layout.c:464 +#: ../plug-ins/print/print-page-layout.c:481 msgid "Both" msgstr "Les deux" -#: ../plug-ins/print/print.c:102 +#: ../plug-ins/print/print.c:106 msgid "Print the image" msgstr "Imprimer l'image" -#: ../plug-ins/print/print.c:107 +#: ../plug-ins/print/print.c:111 msgid "_Print..." msgstr "_Imprimer..." -#: ../plug-ins/print/print.c:118 +#: ../plug-ins/print/print.c:123 msgid "Adjust page size and orientation for printing" msgstr "Ajuster la taille et l'orientation des pages en vue de l'impression" -#: ../plug-ins/print/print.c:124 +#: ../plug-ins/print/print.c:129 msgid "Page Set_up" msgstr "_Mise en page" -#: ../plug-ins/print/print.c:263 +#: ../plug-ins/print/print.c:274 msgid "Image Settings" msgstr "Paramètres de l'image" -#: ../plug-ins/print/print.c:347 +#: ../plug-ins/print/print.c:372 msgid "An error occurred while trying to print:" msgstr "Une erreur est survenue en essayant d'imprimer :" -#: ../plug-ins/print/print.c:374 +#: ../plug-ins/print/print.c:399 msgid "Printing" msgstr "Impression" @@ -13090,38 +13391,38 @@ msgid "Transferring data from scanner/camera" msgstr "Transfert des données depuis le scanneur/appareil photo" -#: ../plug-ins/win-snap/winsnap.c:865 +#: ../plug-ins/win-snap/winsnap.c:871 msgid "Grab" msgstr "Capturer" -#: ../plug-ins/win-snap/winsnap.c:882 +#: ../plug-ins/win-snap/winsnap.c:888 msgid "Grab a single window" msgstr "Capture une fenêtre seule" -#: ../plug-ins/win-snap/winsnap.c:896 +#: ../plug-ins/win-snap/winsnap.c:902 msgid "Grab the whole screen" msgstr "Capturer l'écran entièrement" -#: ../plug-ins/win-snap/winsnap.c:912 +#: ../plug-ins/win-snap/winsnap.c:918 msgid "after" msgstr "après" -#: ../plug-ins/win-snap/winsnap.c:924 +#: ../plug-ins/win-snap/winsnap.c:930 msgid "Seconds delay" msgstr "Secondes de pause" -#: ../plug-ins/win-snap/winsnap.c:931 +#: ../plug-ins/win-snap/winsnap.c:937 msgid "Include decorations" msgstr "Inclure les décorations" -#: ../plug-ins/win-snap/winsnap.c:990 +#: ../plug-ins/win-snap/winsnap.c:996 msgid "Capture a window or desktop image" msgstr "Capture une image d'une fenêtre ou du bureau" -#: ../plug-ins/win-snap/winsnap.c:995 +#: ../plug-ins/win-snap/winsnap.c:1001 msgid "_Screen Shot..." msgstr "_Capture d'écran..." -#: ../plug-ins/win-snap/winsnap.c:1143 +#: ../plug-ins/win-snap/winsnap.c:1149 msgid "No data captured" msgstr "Aucune donnée capturée" diff -Nru gimp-2.8.18/po-plug-ins/hu.po gimp-2.8.20/po-plug-ins/hu.po --- gimp-2.8.18/po-plug-ins/hu.po 2016-05-25 22:26:47.000000000 +0000 +++ gimp-2.8.20/po-plug-ins/hu.po 2017-01-28 19:08:46.000000000 +0000 @@ -14,7 +14,7 @@ "Project-Id-Version: gimp-plug-ins.gimp-2-8\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-25 22:42+0000\n" +"POT-Creation-Date: 2016-07-24 23:29+0000\n" "PO-Revision-Date: 2016-03-26 00:43+0100\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" @@ -610,8 +610,8 @@ #. * Create the "background" layer to hold the image... #. #: ../plug-ins/common/blinds.c:279 ../plug-ins/common/compose.c:936 -#: ../plug-ins/common/decompose.c:729 ../plug-ins/common/file-cel.c:442 -#: ../plug-ins/common/file-cel.c:445 ../plug-ins/common/file-dicom.c:612 +#: ../plug-ins/common/decompose.c:729 ../plug-ins/common/file-cel.c:445 +#: ../plug-ins/common/file-cel.c:448 ../plug-ins/common/file-dicom.c:612 #: ../plug-ins/common/file-gif-load.c:980 #: ../plug-ins/common/file-jp2-load.c:356 ../plug-ins/common/file-pcx.c:426 #: ../plug-ins/common/file-pcx.c:432 ../plug-ins/common/file-pix.c:384 @@ -1021,8 +1021,8 @@ #. stat error (file does not exist) #: ../plug-ins/common/channel-mixer.c:980 #: ../plug-ins/common/cml-explorer.c:2208 ../plug-ins/common/curve-bend.c:891 -#: ../plug-ins/common/file-cel.c:297 ../plug-ins/common/file-cel.c:349 -#: ../plug-ins/common/file-cel.c:580 ../plug-ins/common/file-dicom.c:340 +#: ../plug-ins/common/file-cel.c:300 ../plug-ins/common/file-cel.c:352 +#: ../plug-ins/common/file-cel.c:583 ../plug-ins/common/file-dicom.c:340 #: ../plug-ins/common/file-gbr.c:370 ../plug-ins/common/file-gif-load.c:357 #: ../plug-ins/common/file-gih.c:642 ../plug-ins/common/file-jp2-load.c:196 #: ../plug-ins/common/file-jp2-load.c:205 ../plug-ins/common/file-mng.c:1156 @@ -1060,7 +1060,7 @@ #: ../plug-ins/common/channel-mixer.c:1058 #: ../plug-ins/common/cml-explorer.c:2035 ../plug-ins/common/curve-bend.c:839 -#: ../plug-ins/common/file-cel.c:773 ../plug-ins/common/file-csource.c:407 +#: ../plug-ins/common/file-cel.c:776 ../plug-ins/common/file-csource.c:407 #: ../plug-ins/common/file-dicom.c:1371 ../plug-ins/common/file-gbr.c:665 #: ../plug-ins/common/file-gif-save.c:792 ../plug-ins/common/file-gih.c:1260 #: ../plug-ins/common/file-html-table.c:236 ../plug-ins/common/file-mng.c:649 @@ -3026,8 +3026,8 @@ msgid "Load KISS Palette" msgstr "KISS paletta betöltése" -#: ../plug-ins/common/file-cel.c:309 ../plug-ins/common/file-cel.c:364 -#: ../plug-ins/common/file-cel.c:384 +#: ../plug-ins/common/file-cel.c:312 ../plug-ins/common/file-cel.c:367 +#: ../plug-ins/common/file-cel.c:387 #, c-format msgid "EOF or error while reading image header" msgstr "Fájl vége vagy hiba a képfejléc olvasása közben" @@ -3036,7 +3036,7 @@ #. column, highest column ever used #. -1 assume fsel is not available (and not attached to any drawable) #. -1 assume there is no floating selection -#: ../plug-ins/common/file-cel.c:354 ../plug-ins/common/file-dicom.c:345 +#: ../plug-ins/common/file-cel.c:357 ../plug-ins/common/file-dicom.c:345 #: ../plug-ins/common/file-gbr.c:375 ../plug-ins/common/file-gif-load.c:362 #: ../plug-ins/common/file-gih.c:647 ../plug-ins/common/file-jp2-load.c:189 #: ../plug-ins/common/file-pat.c:344 ../plug-ins/common/file-pcx.c:367 @@ -3055,17 +3055,17 @@ msgid "Opening '%s'" msgstr "„%s” megnyitása" -#: ../plug-ins/common/file-cel.c:392 +#: ../plug-ins/common/file-cel.c:395 #, c-format msgid "is not a CEL image file" msgstr "ez nem egy CEL képfájl" -#: ../plug-ins/common/file-cel.c:406 +#: ../plug-ins/common/file-cel.c:409 #, c-format msgid "illegal bpp value in image: %hhu" msgstr "érvénytelen bpp érték a képen: %hhu" -#: ../plug-ins/common/file-cel.c:420 +#: ../plug-ins/common/file-cel.c:423 #, c-format msgid "" "illegal image dimensions: width: %d, horizontal offset: %d, height: %d, " @@ -3074,51 +3074,51 @@ "érvénytelen képdimenziók: szélesség: %d, vízszintes eltolás: %d, magasság: " "%d, függőleges eltolás: %d" -#: ../plug-ins/common/file-cel.c:433 +#: ../plug-ins/common/file-cel.c:436 #, c-format msgid "Can't create a new image" msgstr "Nem lehet új képet létrehozni" -#: ../plug-ins/common/file-cel.c:471 ../plug-ins/common/file-cel.c:506 -#: ../plug-ins/common/file-cel.c:531 +#: ../plug-ins/common/file-cel.c:474 ../plug-ins/common/file-cel.c:509 +#: ../plug-ins/common/file-cel.c:534 #, c-format msgid "EOF or error while reading image data" msgstr "Fájl vége vagy hiba a képadatok olvasása közben" -#: ../plug-ins/common/file-cel.c:548 +#: ../plug-ins/common/file-cel.c:551 #, c-format msgid "Unsupported bit depth (%d)!" msgstr "Nem támogatott bitmélység (%d)" -#: ../plug-ins/common/file-cel.c:630 ../plug-ins/common/file-cel.c:642 +#: ../plug-ins/common/file-cel.c:633 ../plug-ins/common/file-cel.c:645 #, c-format msgid "'%s': EOF or error while reading palette header" msgstr "„%s”: fájl vége vagy hiba a palettafejléc olvasása közben" -#: ../plug-ins/common/file-cel.c:651 +#: ../plug-ins/common/file-cel.c:654 #, c-format msgid "'%s': is not a KCF palette file" msgstr "„%s”: ez nem egy KCF palettafájl" -#: ../plug-ins/common/file-cel.c:660 +#: ../plug-ins/common/file-cel.c:663 #, c-format msgid "'%s': illegal bpp value in palette: %hhu" msgstr "„%s”: érvénytelen bpp érték a palettán: %hhu" -#: ../plug-ins/common/file-cel.c:669 +#: ../plug-ins/common/file-cel.c:672 #, c-format msgid "'%s': illegal number of colors: %u" msgstr "„%s”: a színek száma érvénytelen: %u" -#: ../plug-ins/common/file-cel.c:684 ../plug-ins/common/file-cel.c:701 -#: ../plug-ins/common/file-cel.c:721 +#: ../plug-ins/common/file-cel.c:687 ../plug-ins/common/file-cel.c:704 +#: ../plug-ins/common/file-cel.c:724 #, c-format msgid "'%s': EOF or error while reading palette data" msgstr "„%s”: fájl vége vagy hiba a palettaadatok olvasása közben" #. init the progress meter #. And let's begin the progress -#: ../plug-ins/common/file-cel.c:778 ../plug-ins/common/file-gbr.c:670 +#: ../plug-ins/common/file-cel.c:781 ../plug-ins/common/file-gbr.c:670 #: ../plug-ins/common/file-gif-save.c:799 ../plug-ins/common/file-gih.c:1265 #: ../plug-ins/common/file-html-table.c:257 ../plug-ins/common/file-pat.c:493 #: ../plug-ins/common/file-pcx.c:645 ../plug-ins/common/file-pix.c:533 @@ -8766,19 +8766,24 @@ msgid "Windows BMP image" msgstr "Windows BMP-kép" -#: ../plug-ins/file-compressor/file-compressor.c:166 +#: ../plug-ins/file-compressor/file-compressor.c:167 msgid "gzip archive" msgstr "gzip-archívum" -#: ../plug-ins/file-compressor/file-compressor.c:185 +#: ../plug-ins/file-compressor/file-compressor.c:186 msgid "bzip archive" msgstr "bzip-archívum" -#: ../plug-ins/file-compressor/file-compressor.c:392 +#: ../plug-ins/file-compressor/file-compressor.c:393 msgid "No sensible file extension, saving as compressed XCF." msgstr "Nincs értelmezhető fájlkiterjesztés; mentés tömörített XCF-ként." -#: ../plug-ins/file-compressor/file-compressor.c:448 +#: ../plug-ins/file-compressor/file-compressor.c:416 +#, c-format +msgid "Compressing '%s'" +msgstr "„%s” tömörítése" + +#: ../plug-ins/file-compressor/file-compressor.c:453 msgid "No sensible file extension, attempting to load with file magic." msgstr "" "Nincs értelmezhető fájlkiterjesztés; feldolgozás a fájltartalom alapján." @@ -11415,9 +11420,6 @@ #. * Cf. bug 762282. #. #: ../plug-ins/help/gimphelpdomain.c:193 -#| msgid "" -#| "Please install the additional help package or use the online user manual " -#| "at http://docs.gimp.org/." msgid "" "Please install the additional help package or use the online user manual at: " "http://docs.gimp.org/" diff -Nru gimp-2.8.18/po-plug-ins/it.po gimp-2.8.20/po-plug-ins/it.po --- gimp-2.8.18/po-plug-ins/it.po 2016-05-25 22:26:47.000000000 +0000 +++ gimp-2.8.20/po-plug-ins/it.po 2017-01-28 19:08:46.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: gimp 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-29 09:41+0200\n" -"PO-Revision-Date: 2016-04-29 09:41+0200\n" +"POT-Creation-Date: 2016-11-09 19:08+0100\n" +"PO-Revision-Date: 2016-11-09 19:09+0100\n" "Last-Translator: Marco Ciampa \n" "Language-Team: tp@lists.linux.it\n" "Language: it\n" @@ -602,8 +602,8 @@ #. * Create the "background" layer to hold the image... #. #: ../plug-ins/common/blinds.c:279 ../plug-ins/common/compose.c:936 -#: ../plug-ins/common/decompose.c:729 ../plug-ins/common/file-cel.c:442 -#: ../plug-ins/common/file-cel.c:445 ../plug-ins/common/file-dicom.c:612 +#: ../plug-ins/common/decompose.c:729 ../plug-ins/common/file-cel.c:445 +#: ../plug-ins/common/file-cel.c:448 ../plug-ins/common/file-dicom.c:612 #: ../plug-ins/common/file-gif-load.c:980 #: ../plug-ins/common/file-jp2-load.c:356 ../plug-ins/common/file-pcx.c:426 #: ../plug-ins/common/file-pcx.c:432 ../plug-ins/common/file-pix.c:384 @@ -617,8 +617,7 @@ #: ../plug-ins/file-jpeg/jpeg-load.c:824 #: ../plug-ins/file-psd/psd-image-res-load.c:1001 #: ../plug-ins/file-psd/psd-load.c:1655 ../plug-ins/file-sgi/sgi.c:409 -#: ../plug-ins/gfig/gfig-dialog.c:1321 -#: ../plug-ins/gimpressionist/general.c:139 +#: ../plug-ins/gfig/gfig-dialog.c:1321 ../plug-ins/gimpressionist/general.c:139 #: ../plug-ins/map-object/map-object-apply.c:252 ../plug-ins/twain/twain.c:567 #: ../plug-ins/win-snap/winsnap.c:1162 msgid "Background" @@ -652,7 +651,7 @@ #: ../plug-ins/common/blur-gauss-selective.c:211 #: ../plug-ins/common/blur-gauss.c:448 ../plug-ins/common/cartoon.c:232 -#: ../plug-ins/common/edge-dog.c:269 ../plug-ins/common/edge-neon.c:228 +#: ../plug-ins/common/edge-dog.c:277 ../plug-ins/common/edge-neon.c:228 #: ../plug-ins/common/edge-sobel.c:212 ../plug-ins/common/photocopy.c:244 #: ../plug-ins/common/pixelize.c:293 ../plug-ins/common/softglow.c:224 #: ../plug-ins/file-sgi/sgi.c:560 ../plug-ins/file-xjt/xjt.c:1691 @@ -1015,8 +1014,8 @@ #. stat error (file does not exist) #: ../plug-ins/common/channel-mixer.c:980 #: ../plug-ins/common/cml-explorer.c:2208 ../plug-ins/common/curve-bend.c:891 -#: ../plug-ins/common/file-cel.c:297 ../plug-ins/common/file-cel.c:349 -#: ../plug-ins/common/file-cel.c:580 ../plug-ins/common/file-dicom.c:340 +#: ../plug-ins/common/file-cel.c:300 ../plug-ins/common/file-cel.c:352 +#: ../plug-ins/common/file-cel.c:583 ../plug-ins/common/file-dicom.c:340 #: ../plug-ins/common/file-gbr.c:370 ../plug-ins/common/file-gif-load.c:357 #: ../plug-ins/common/file-gih.c:642 ../plug-ins/common/file-jp2-load.c:196 #: ../plug-ins/common/file-jp2-load.c:205 ../plug-ins/common/file-mng.c:1156 @@ -1054,7 +1053,7 @@ #: ../plug-ins/common/channel-mixer.c:1058 #: ../plug-ins/common/cml-explorer.c:2035 ../plug-ins/common/curve-bend.c:839 -#: ../plug-ins/common/file-cel.c:773 ../plug-ins/common/file-csource.c:407 +#: ../plug-ins/common/file-cel.c:776 ../plug-ins/common/file-csource.c:407 #: ../plug-ins/common/file-dicom.c:1371 ../plug-ins/common/file-gbr.c:665 #: ../plug-ins/common/file-gif-save.c:792 ../plug-ins/common/file-gih.c:1260 #: ../plug-ins/common/file-html-table.c:236 ../plug-ins/common/file-mng.c:649 @@ -1963,8 +1962,7 @@ msgid "Stretch brightness values to cover the full range" msgstr "Amplia i valori di luminosità per coprire tutto il campo possibile" -#: ../plug-ins/common/contrast-normalize.c:91 -#: ../plug-ins/common/edge-dog.c:362 +#: ../plug-ins/common/contrast-normalize.c:91 ../plug-ins/common/edge-dog.c:370 msgid "_Normalize" msgstr "_Normalizza" @@ -2079,9 +2077,9 @@ msgid "E_xtend" msgstr "_Estendi" -#: ../plug-ins/common/convolution-matrix.c:74 -#: ../plug-ins/common/displace.c:477 ../plug-ins/common/edge.c:700 -#: ../plug-ins/common/fractal-trace.c:737 ../plug-ins/common/ripple.c:585 +#: ../plug-ins/common/convolution-matrix.c:74 ../plug-ins/common/displace.c:477 +#: ../plug-ins/common/edge.c:700 ../plug-ins/common/fractal-trace.c:737 +#: ../plug-ins/common/ripple.c:585 msgid "_Wrap" msgstr "_Avvolto" @@ -2210,7 +2208,7 @@ msgid "_Curve Bend..." msgstr "Piega _curva..." -#: ../plug-ins/common/curve-bend.c:683 ../plug-ins/common/edge-dog.c:178 +#: ../plug-ins/common/curve-bend.c:683 ../plug-ins/common/edge-dog.c:179 msgid "Can operate on layers only (but was called on channel or mask)." msgstr "" "Può operare solamente sui livelli (ma è stato chiamato su un canale o una " @@ -2810,23 +2808,28 @@ msgid "_Difference of Gaussians..." msgstr "_Differenze di gaussiane..." -#: ../plug-ins/common/edge-dog.c:245 ../plug-ins/common/edge-dog.c:302 +#: ../plug-ins/common/edge-dog.c:193 ../plug-ins/common/iwarp.c:974 +#: ../plug-ins/common/whirl-pinch.c:193 +msgid "Region affected by plug-in is empty" +msgstr "La regione soggetta al plug-in è vuota" + +#: ../plug-ins/common/edge-dog.c:253 ../plug-ins/common/edge-dog.c:310 msgid "DoG Edge Detect" msgstr "Rilevamento contorni ddg" -#: ../plug-ins/common/edge-dog.c:332 +#: ../plug-ins/common/edge-dog.c:340 msgid "Smoothing Parameters" msgstr "Parametri di arrotondamento" -#: ../plug-ins/common/edge-dog.c:346 +#: ../plug-ins/common/edge-dog.c:354 msgid "_Radius 1:" msgstr "_Raggio 1:" -#: ../plug-ins/common/edge-dog.c:350 +#: ../plug-ins/common/edge-dog.c:358 msgid "R_adius 2:" msgstr "R_aggio 2:" -#: ../plug-ins/common/edge-dog.c:373 ../plug-ins/gimpressionist/paper.c:166 +#: ../plug-ins/common/edge-dog.c:381 ../plug-ins/gimpressionist/paper.c:166 msgid "_Invert" msgstr "_Inverti" @@ -3017,8 +3020,8 @@ msgid "Load KISS Palette" msgstr "Carica tavolozza KISS" -#: ../plug-ins/common/file-cel.c:309 ../plug-ins/common/file-cel.c:364 -#: ../plug-ins/common/file-cel.c:384 +#: ../plug-ins/common/file-cel.c:312 ../plug-ins/common/file-cel.c:367 +#: ../plug-ins/common/file-cel.c:387 #, c-format msgid "EOF or error while reading image header" msgstr "EOF o errore durante la lettura dell'intestazione dell'immagine" @@ -3027,7 +3030,7 @@ #. column, highest column ever used #. -1 assume fsel is not available (and not attached to any drawable) #. -1 assume there is no floating selection -#: ../plug-ins/common/file-cel.c:354 ../plug-ins/common/file-dicom.c:345 +#: ../plug-ins/common/file-cel.c:357 ../plug-ins/common/file-dicom.c:345 #: ../plug-ins/common/file-gbr.c:375 ../plug-ins/common/file-gif-load.c:362 #: ../plug-ins/common/file-gih.c:647 ../plug-ins/common/file-jp2-load.c:189 #: ../plug-ins/common/file-pat.c:344 ../plug-ins/common/file-pcx.c:367 @@ -3046,17 +3049,17 @@ msgid "Opening '%s'" msgstr "Apertura di '%s'" -#: ../plug-ins/common/file-cel.c:392 +#: ../plug-ins/common/file-cel.c:395 #, c-format msgid "is not a CEL image file" msgstr "non è un file immagine CEL" -#: ../plug-ins/common/file-cel.c:406 +#: ../plug-ins/common/file-cel.c:409 #, c-format msgid "illegal bpp value in image: %hhu" msgstr "valore bpp fuori norma nell'immagine: %hhu" -#: ../plug-ins/common/file-cel.c:420 +#: ../plug-ins/common/file-cel.c:423 #, c-format msgid "" "illegal image dimensions: width: %d, horizontal offset: %d, height: %d, " @@ -3065,52 +3068,52 @@ "dimensioni immagine fuori norma: larghezza: %d, spostamento orizzontale: %d, " "altezza: %d, spostamento verticale: %d" -#: ../plug-ins/common/file-cel.c:433 +#: ../plug-ins/common/file-cel.c:436 #, c-format msgid "Can't create a new image" msgstr "Impossibile creare una nuova immagine" -#: ../plug-ins/common/file-cel.c:471 ../plug-ins/common/file-cel.c:506 -#: ../plug-ins/common/file-cel.c:531 +#: ../plug-ins/common/file-cel.c:474 ../plug-ins/common/file-cel.c:509 +#: ../plug-ins/common/file-cel.c:534 #, c-format msgid "EOF or error while reading image data" msgstr "EOF o errore durante la lettura dei dati immagine" -#: ../plug-ins/common/file-cel.c:548 +#: ../plug-ins/common/file-cel.c:551 #, c-format msgid "Unsupported bit depth (%d)!" msgstr "Profondità di colore (in bit) non supportata (%d)!" -#: ../plug-ins/common/file-cel.c:630 ../plug-ins/common/file-cel.c:642 +#: ../plug-ins/common/file-cel.c:633 ../plug-ins/common/file-cel.c:645 #, c-format msgid "'%s': EOF or error while reading palette header" msgstr "" "\"%s\": EOF o errore durante la lettura della instestazione della tavolozza" -#: ../plug-ins/common/file-cel.c:651 +#: ../plug-ins/common/file-cel.c:654 #, c-format msgid "'%s': is not a KCF palette file" msgstr "\"%s\": non è un file tavolozza KCF" -#: ../plug-ins/common/file-cel.c:660 +#: ../plug-ins/common/file-cel.c:663 #, c-format msgid "'%s': illegal bpp value in palette: %hhu" msgstr "\"%s\": valore bpp fuori norma nella tavolozza: %hhu" -#: ../plug-ins/common/file-cel.c:669 +#: ../plug-ins/common/file-cel.c:672 #, c-format msgid "'%s': illegal number of colors: %u" msgstr "\"%s\": numero di colori fuori norma: %u" -#: ../plug-ins/common/file-cel.c:684 ../plug-ins/common/file-cel.c:701 -#: ../plug-ins/common/file-cel.c:721 +#: ../plug-ins/common/file-cel.c:687 ../plug-ins/common/file-cel.c:704 +#: ../plug-ins/common/file-cel.c:724 #, c-format msgid "'%s': EOF or error while reading palette data" msgstr "\"%s\": EOF o errore durante la lettura dei dati della tavolozza" #. init the progress meter #. And let's begin the progress -#: ../plug-ins/common/file-cel.c:778 ../plug-ins/common/file-gbr.c:670 +#: ../plug-ins/common/file-cel.c:781 ../plug-ins/common/file-gbr.c:670 #: ../plug-ins/common/file-gif-save.c:799 ../plug-ins/common/file-gih.c:1265 #: ../plug-ins/common/file-html-table.c:257 ../plug-ins/common/file-pat.c:493 #: ../plug-ins/common/file-pcx.c:645 ../plug-ins/common/file-pix.c:533 @@ -4299,8 +4302,7 @@ msgstr "_Millimetri" #. Rotation -#: ../plug-ins/common/file-ps.c:3302 -#: ../plug-ins/map-object/map-object-ui.c:989 +#: ../plug-ins/common/file-ps.c:3302 ../plug-ins/map-object/map-object-ui.c:989 msgid "Rotation" msgstr "Rotazione" @@ -4667,8 +4669,7 @@ msgid "TIFF Channel" msgstr "Canale TIFF" -#: ../plug-ins/common/file-tiff-load.c:1038 -#: ../plug-ins/file-psd/psd-load.c:333 +#: ../plug-ins/common/file-tiff-load.c:1038 ../plug-ins/file-psd/psd-load.c:333 msgid "" "Warning:\n" "The image you are loading has 16 bits per channel. GIMP can only handle 8 " @@ -5695,10 +5696,6 @@ msgid "Ping pong" msgstr "Ping pong" -#: ../plug-ins/common/iwarp.c:974 ../plug-ins/common/whirl-pinch.c:193 -msgid "Region affected by plug-in is empty" -msgstr "La regione soggetta al plug-in è vuota" - #: ../plug-ins/common/iwarp.c:1030 msgid "A_nimate" msgstr "A_nima" @@ -8453,66 +8450,66 @@ msgid "Waving" msgstr "Ondeggiatura" -#: ../plug-ins/common/web-browser.c:135 +#: ../plug-ins/common/web-browser.c:141 msgid "The operating system is out of memory or resources." msgstr "Il sistema operativo ha esaurito le risorse di memoria." -#: ../plug-ins/common/web-browser.c:138 +#: ../plug-ins/common/web-browser.c:144 msgid "The specified file was not found." msgstr "Il file specificato non è stato trovato." -#: ../plug-ins/common/web-browser.c:141 +#: ../plug-ins/common/web-browser.c:147 msgid "The specified path was not found." msgstr "Il percorso specificato non è stato trovato." -#: ../plug-ins/common/web-browser.c:144 +#: ../plug-ins/common/web-browser.c:150 msgid "" "The .exe file is invalid (non-Microsoft Win32 .exe or error in .exe image)." msgstr "" "Il file .exe non è valido (.exe win32 non Microsoft o errore nell'immagine ." "exe)." -#: ../plug-ins/common/web-browser.c:147 +#: ../plug-ins/common/web-browser.c:153 msgid "The operating system denied access to the specified file." msgstr "Il sistema operativo ha rifiutato l'accesso al file specificato." -#: ../plug-ins/common/web-browser.c:150 +#: ../plug-ins/common/web-browser.c:156 msgid "The file name association is incomplete or invalid." msgstr "L'associazione del nome del file è incompleta o non valida." -#: ../plug-ins/common/web-browser.c:153 +#: ../plug-ins/common/web-browser.c:159 msgid "DDE transaction busy" msgstr "Transazione DDE occupata" -#: ../plug-ins/common/web-browser.c:156 +#: ../plug-ins/common/web-browser.c:162 msgid "The DDE transaction failed." msgstr "Transazione DDE fallita." -#: ../plug-ins/common/web-browser.c:159 +#: ../plug-ins/common/web-browser.c:165 msgid "The DDE transaction timed out." msgstr "La transazione DDE è scaduta." -#: ../plug-ins/common/web-browser.c:162 +#: ../plug-ins/common/web-browser.c:168 msgid "The specified DLL was not found." msgstr "La DLL specificata non è stata trovata." -#: ../plug-ins/common/web-browser.c:165 +#: ../plug-ins/common/web-browser.c:171 msgid "There is no application associated with the given file name extension." msgstr "Non ci sono applicazioni associate alla data estensione di file." -#: ../plug-ins/common/web-browser.c:168 +#: ../plug-ins/common/web-browser.c:174 msgid "There was not enough memory to complete the operation." msgstr "Non c'è abbastanza memoria per completare l'operazione." -#: ../plug-ins/common/web-browser.c:171 +#: ../plug-ins/common/web-browser.c:177 msgid "A sharing violation occurred." msgstr "Si è verificata una violazione di condivisione." -#: ../plug-ins/common/web-browser.c:174 +#: ../plug-ins/common/web-browser.c:180 msgid "Unknown Microsoft Windows error." msgstr "Errore Microsoft Windows sconosciuto." -#: ../plug-ins/common/web-browser.c:177 +#: ../plug-ins/common/web-browser.c:183 #, c-format msgid "Failed to open '%s': %s" msgstr "Fallito il caricamento di \"%s\": %s" @@ -8782,19 +8779,24 @@ msgid "Windows BMP image" msgstr "Immagine BMP Windows" -#: ../plug-ins/file-compressor/file-compressor.c:166 +#: ../plug-ins/file-compressor/file-compressor.c:167 msgid "gzip archive" msgstr "archivio gzip" -#: ../plug-ins/file-compressor/file-compressor.c:185 +#: ../plug-ins/file-compressor/file-compressor.c:186 msgid "bzip archive" msgstr "archivio bzip" -#: ../plug-ins/file-compressor/file-compressor.c:392 +#: ../plug-ins/file-compressor/file-compressor.c:393 msgid "No sensible file extension, saving as compressed XCF." msgstr "Nessuna estensione plausibile, salvataggio come XCF compresso." -#: ../plug-ins/file-compressor/file-compressor.c:448 +#: ../plug-ins/file-compressor/file-compressor.c:416 +#, c-format +msgid "Compressing '%s'" +msgstr "Compressione di \"%s\"" + +#: ../plug-ins/file-compressor/file-compressor.c:453 msgid "No sensible file extension, attempting to load with file magic." msgstr "" "Nessuna estensione plausibile, tentativo di salvataggio tramite il magic del " @@ -10192,8 +10194,7 @@ msgid "Max undo:" msgstr "Numero max di ripristini:" -#: ../plug-ins/gfig/gfig-dialog.c:1320 -#: ../plug-ins/gimpressionist/general.c:184 +#: ../plug-ins/gfig/gfig-dialog.c:1320 ../plug-ins/gimpressionist/general.c:184 msgid "Transparent" msgstr "Trasparente" @@ -11346,8 +11347,7 @@ msgid "_Second Flares" msgstr "Riverberi _secondari" -#: ../plug-ins/help-browser/dialog.c:184 -#: ../plug-ins/help-browser/dialog.c:1133 +#: ../plug-ins/help-browser/dialog.c:184 ../plug-ins/help-browser/dialog.c:1133 msgid "GIMP Help Browser" msgstr "Navigatore della guida di Gimp" @@ -11440,7 +11440,9 @@ msgid "" "Please install the additional help package or use the online user manual at: " "http://docs.gimp.org/" -msgstr "Installare il pacchetto aggiuntivo di aiuto o usare il manuale utente in linea che si trova su http://docs.gimp.org/" +msgstr "" +"Installare il pacchetto aggiuntivo di aiuto o usare il manuale utente in " +"linea che si trova su http://docs.gimp.org/" #: ../plug-ins/help/gimphelpdomain.c:202 msgid "Perhaps you are missing GIO backends and need to install GVFS?" @@ -11667,8 +11669,7 @@ #: ../plug-ins/imagemap/imap_circle.c:268 #: ../plug-ins/imagemap/imap_circle.c:275 #: ../plug-ins/imagemap/imap_circle.c:281 ../plug-ins/imagemap/imap_grid.c:249 -#: ../plug-ins/imagemap/imap_grid.c:255 -#: ../plug-ins/imagemap/imap_polygon.c:505 +#: ../plug-ins/imagemap/imap_grid.c:255 ../plug-ins/imagemap/imap_polygon.c:505 #: ../plug-ins/imagemap/imap_polygon.c:513 #: ../plug-ins/imagemap/imap_rectangle.c:392 #: ../plug-ins/imagemap/imap_rectangle.c:399 diff -Nru gimp-2.8.18/po-plug-ins/pl.po gimp-2.8.20/po-plug-ins/pl.po --- gimp-2.8.18/po-plug-ins/pl.po 2016-06-06 20:20:37.000000000 +0000 +++ gimp-2.8.20/po-plug-ins/pl.po 2017-01-28 19:08:46.000000000 +0000 @@ -1,30 +1,26 @@ -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Aviary.pl -# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz -# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: -# gnomepl@aviary.pl -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +# Polish translation for gimp-plug-ins. +# Copyright © 1999-2016 the gimp authors. +# This file is distributed under the same license as the gimp package. # GNOME PL Team , 1999-2005. # Artur Polaczyński , 1999. # Bartosz Kosiorek , 2005-2011. # Piotr Drąg , 2011-2016. -# Aviary.pl , 2011-2016. +# Aviary.pl , 2011-2016. +# msgid "" msgstr "" "Project-Id-Version: gimp-plug-ins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-05 19:24+0200\n" -"PO-Revision-Date: 2016-06-05 19:25+0200\n" +"POT-Creation-Date: 2016-09-07 18:48+0200\n" +"PO-Revision-Date: 2016-09-07 18:49+0200\n" "Last-Translator: Piotr Drąg \n" -"Language-Team: Polish \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Poedit-Language: Polish\n" -"X-Poedit-Country: Poland\n" #: ../plug-ins/color-rotate/color-rotate-dialog.c:120 msgid "Original" @@ -248,7 +244,7 @@ #: ../plug-ins/common/alien-map.c:183 msgid "Alter colors in various psychedelic ways" -msgstr "Zmienia kolory w różny psychodeliczne sposoby" +msgstr "Zmienia kolory w różny psychodeliczne sposoby" #: ../plug-ins/common/alien-map.c:188 msgid "_Alien Map..." @@ -265,7 +261,7 @@ #: ../plug-ins/common/alien-map.c:442 ../plug-ins/common/alien-map.c:466 #: ../plug-ins/common/alien-map.c:490 msgid "Number of cycles covering full value range" -msgstr "Ilość cykli pokrywających pełen zakres" +msgstr "Liczba cykli pokrywających pełen zakres" #: ../plug-ins/common/alien-map.c:454 ../plug-ins/common/alien-map.c:478 #: ../plug-ins/common/alien-map.c:502 @@ -346,11 +342,11 @@ #: ../plug-ins/common/align-layers.c:684 msgid "Fill (top to bottom)" -msgstr "Wypełnienie (z góry na dół)" +msgstr "Wypełnienie (z góry na dół)" #: ../plug-ins/common/align-layers.c:685 msgid "Fill (bottom to top)" -msgstr "Wypełnienie (z dołu do góry)" +msgstr "Wypełnienie (z dołu do góry)" #: ../plug-ins/common/align-layers.c:695 msgid "_Vertical style:" @@ -512,7 +508,7 @@ #: ../plug-ins/common/animation-play.c:1351 #, c-format msgid "Frame %d of %d" -msgstr "Klatka %d z %d" +msgstr "Klatka %d z %d" #: ../plug-ins/common/animation-play.c:1474 msgid "Stop playback" @@ -520,7 +516,7 @@ #: ../plug-ins/common/antialias.c:84 msgid "Antialias using the Scale3X edge-extrapolation algorithm" -msgstr "Wygładzanie używając algorytmu ekstrapolacji krawędziowej Scale3X" +msgstr "Wygładzanie za pomocą algorytmu ekstrapolacji krawędziowej Scale3X" #: ../plug-ins/common/antialias.c:90 msgid "_Antialias" @@ -647,7 +643,7 @@ #: ../plug-ins/common/blur-gauss-selective.c:104 msgid "Blur neighboring pixels, but only in low-contrast areas" -msgstr "Rozmywa sąsiednie piksele, ale tylko w obszarach o niskim kontraście" +msgstr "Rozmywa sąsiednie piksele, ale tylko w obszarach o niskim kontraście" #: ../plug-ins/common/blur-gauss-selective.c:115 msgid "_Selective Gaussian Blur..." @@ -722,7 +718,7 @@ #: ../plug-ins/common/blur-motion.c:157 ../plug-ins/common/blur-motion.c:171 msgid "Simulate movement using directional blur" -msgstr "Symuluje ruch używając rozmycia kierunkowego" +msgstr "Symuluje ruch za pomocą rozmycia kierunkowego" #: ../plug-ins/common/blur-motion.c:164 ../plug-ins/common/blur-motion.c:177 msgid "_Motion Blur..." @@ -840,7 +836,7 @@ #: ../plug-ins/common/bump-map.c:257 msgid "Create an embossing effect using a bump map" -msgstr "Tworzy efekt wytłoczenia używając mapy wypukłości" +msgstr "Tworzy efekt wytłoczenia za pomocą mapy wypukłości" #: ../plug-ins/common/bump-map.c:267 msgid "_Bump Map..." @@ -910,7 +906,7 @@ "The offset can be adjusted by dragging the preview using the middle mouse " "button." msgstr "" -"Przesunięcie może być regulowane przez kliknięcie i przeciąganie podglądu za " +"Przesunięcie może być regulowane przez kliknięcie i przeciąganie podglądu za " "pomocą środkowego przycisku myszy." #: ../plug-ins/common/bump-map.c:950 ../plug-ins/common/file-ps.c:3264 @@ -1091,7 +1087,7 @@ #: ../plug-ins/common/cml-explorer.c:2090 #, c-format msgid "Parameters were saved to '%s'" -msgstr "Zapisano parametry w „%s”" +msgstr "Zapisano parametry w „%s”" #: ../plug-ins/common/checkerboard.c:89 msgid "Create a checkerboard pattern" @@ -1136,7 +1132,7 @@ #: ../plug-ins/common/cml-explorer.c:133 msgid "k{x(1-x)}^p stepped" -msgstr "k{x(1-x)}^p z krokiem" +msgstr "k{x(1-x)}^p z krokiem" #: ../plug-ins/common/cml-explorer.c:134 msgid "kx^p" @@ -1144,7 +1140,7 @@ #: ../plug-ins/common/cml-explorer.c:135 msgid "kx^p stepped" -msgstr "kx^p z krokiem" +msgstr "kx^p z krokiem" #: ../plug-ins/common/cml-explorer.c:136 msgid "k(1-x^p)" @@ -1152,7 +1148,7 @@ #: ../plug-ins/common/cml-explorer.c:137 msgid "k(1-x^p) stepped" -msgstr "k(1-x^p) z krokiem" +msgstr "k(1-x^p) z krokiem" #: ../plug-ins/common/cml-explorer.c:138 msgid "Delta function" @@ -1160,7 +1156,7 @@ #: ../plug-ins/common/cml-explorer.c:139 msgid "Delta function stepped" -msgstr "Funkcja delta z krokiem" +msgstr "Funkcja delta z krokiem" #: ../plug-ins/common/cml-explorer.c:140 msgid "sin^p-based function" @@ -1168,7 +1164,7 @@ #: ../plug-ins/common/cml-explorer.c:141 msgid "sin^p, stepped" -msgstr "sin^p z krokiem" +msgstr "sin^p z krokiem" #: ../plug-ins/common/cml-explorer.c:166 msgctxt "cml-composition" @@ -1201,35 +1197,35 @@ #: ../plug-ins/common/cml-explorer.c:173 msgid "Max (x+d, -), (x < 0.5)" -msgstr "Maksymalnie (x+d, -), (x < 0.5)" +msgstr "Maksymalnie (x+d, -), (x < 0,5)" #: ../plug-ins/common/cml-explorer.c:174 msgid "Max (x+d, -), (0.5 < x)" -msgstr "Maksymalnie (x+d, -), (0.5 < x)" +msgstr "Maksymalnie (x+d, -), (0,5 < x)" #: ../plug-ins/common/cml-explorer.c:175 msgid "Max (x-d, -), (x < 0.5)" -msgstr "Maksymalnie (x-d, -), (x < 0.5)" +msgstr "Maksymalnie (x-d, -), (x < 0,5)" #: ../plug-ins/common/cml-explorer.c:176 msgid "Max (x-d, -), (0.5 < x)" -msgstr "Maksymalnie (x-d, -), (0.5 < x)" +msgstr "Maksymalnie (x-d, -), (0,5 < x)" #: ../plug-ins/common/cml-explorer.c:177 msgid "Min (x+d, -), (x < 0.5)" -msgstr "Minimalnie (x+d, -), (x < 0.5)" +msgstr "Minimalnie (x+d, -), (x < 0,5)" #: ../plug-ins/common/cml-explorer.c:178 msgid "Min (x+d, -), (0.5 < x)" -msgstr "Minimalnie (x+d, -), (0.5 < x)" +msgstr "Minimalnie (x+d, -), (0,5 < x)" #: ../plug-ins/common/cml-explorer.c:179 msgid "Min (x-d, -), (x < 0.5)" -msgstr "Minimalnie (x-d, -), (x < 0.5)" +msgstr "Minimalnie (x-d, -), (x < 0,5)" #: ../plug-ins/common/cml-explorer.c:180 msgid "Min (x-d, -), (0.5 < x)" -msgstr "Minimalnie (x-d, -), (0.5 < x)" +msgstr "Minimalnie (x-d, -), (0,5 < x)" #: ../plug-ins/common/cml-explorer.c:200 ../plug-ins/common/file-sunras.c:1637 msgid "Standard" @@ -1269,7 +1265,7 @@ #: ../plug-ins/common/cml-explorer.c:209 msgid "With p and random (0,1)" -msgstr "Z „p” i losową (0,1)" +msgstr "Z „p” i losową (0,1)" #: ../plug-ins/common/cml-explorer.c:223 msgid "All black" @@ -1305,11 +1301,11 @@ #: ../plug-ins/common/cml-explorer.c:231 msgid "Randoms from seed" -msgstr "Losowo z ziarna" +msgstr "Losowo z ziarna" #: ../plug-ins/common/cml-explorer.c:232 msgid "Randoms from seed (shared)" -msgstr "Losowo z ziarna (współdzielone)" +msgstr "Losowo z ziarna (współdzielone)" #: ../plug-ins/common/cml-explorer.c:300 ../plug-ins/common/cml-explorer.c:308 #: ../plug-ins/common/decompose.c:188 @@ -1405,7 +1401,7 @@ #: ../plug-ins/common/cml-explorer.c:1390 msgid "Switch to \"From seed\" With the Last Seed" -msgstr "Przełącza na „Z ziarna” z ostatnim ziarnem" +msgstr "Przełącza na „Z ziarna” z ostatnim ziarnem" #: ../plug-ins/common/cml-explorer.c:1402 msgid "" @@ -1415,7 +1411,7 @@ "(2) all mutation rates equal to zero." msgstr "" "To samo ziarno losowości tworzy ten sam obraz, jeśli (1) szerokości obrazów " -"są takie same (to przyczyna różnicy podglądu i obrazu) oraz (2) wszystkie " +"są takie same (to przyczyna różnicy podglądu i obrazu) oraz (2) wszystkie " "wartości modyfikujące są równe zero." #: ../plug-ins/common/cml-explorer.c:1410 @@ -1445,7 +1441,7 @@ #: ../plug-ins/common/cml-explorer.c:1492 msgid "Source channel in file:" -msgstr "Kanał źródłowy w pliku:" +msgstr "Kanał źródłowy w pliku:" #: ../plug-ins/common/cml-explorer.c:1513 msgid "_Misc Ops." @@ -1521,7 +1517,7 @@ #: ../plug-ins/common/cml-explorer.c:1920 msgid "Warning: the source and the destination are the same channel." -msgstr "Uwaga: źródło i przeznaczenie są na tym samym kanale." +msgstr "Uwaga: źródło i przeznaczenie są na tym samym kanale." #: ../plug-ins/common/cml-explorer.c:1979 msgid "Save CML Explorer Parameters" @@ -1533,18 +1529,18 @@ #: ../plug-ins/common/cml-explorer.c:2230 msgid "Error: it's not CML parameter file." -msgstr "Błąd: to nie jest plik z parametrami CML." +msgstr "Błąd: to nie jest plik z parametrami CML." #: ../plug-ins/common/cml-explorer.c:2237 #, c-format msgid "Warning: '%s' is an old format file." -msgstr "Ostrzeżenie: „%s” jest plikiem w starym formacie." +msgstr "Ostrzeżenie: „%s” jest plikiem w starym formacie." #: ../plug-ins/common/cml-explorer.c:2241 #, c-format msgid "Warning: '%s' is a parameter file for a newer version of CML Explorer." msgstr "" -"Ostrzeżenie: „%s” jest plikiem z parametrami dla nowszej przeglądarki CML." +"Ostrzeżenie: „%s” jest plikiem z parametrami dla nowszej przeglądarki CML." #: ../plug-ins/common/cml-explorer.c:2304 msgid "Error: failed to load parameters" @@ -1552,7 +1548,7 @@ #: ../plug-ins/common/color-cube-analyze.c:106 msgid "Analyze the set of colors in the image" -msgstr "Analizuje zestawy kolorów w obrazie" +msgstr "Analizuje zestawy kolorów w obrazie" #: ../plug-ins/common/color-cube-analyze.c:112 msgid "Colorcube A_nalysis..." @@ -1597,7 +1593,7 @@ #: ../plug-ins/common/color-exchange.c:122 msgid "Swap one color with another" -msgstr "Zamienia jeden kolor z innym" +msgstr "Zamienia jeden kolor z innym" #: ../plug-ins/common/color-exchange.c:128 msgid "_Color Exchange..." @@ -1709,7 +1705,7 @@ #: ../plug-ins/common/colormap-remap.c:116 msgid "Swap two colors in the colormap" -msgstr "Zamienia dwa kolory w palecie" +msgstr "Zamienia dwa kolory w palecie" #: ../plug-ins/common/colormap-remap.c:123 msgid "_Swap Colors" @@ -1754,7 +1750,7 @@ "Drag and drop colors to rearrange the colormap. The numbers shown are the " "original indices. Right-click for a menu with sort options." msgstr "" -"Przeciągnięcie i upuszczenie kolorów przekłada paletę. Wyświetlane liczby to " +"Przeciągnięcie i upuszczenie kolorów przekłada paletę. Wyświetlane liczby to " "pierwotne wskaźniki. Kliknięcie prawym przyciskiem wyświetli opcje " "porządkowania." @@ -1875,7 +1871,7 @@ #: ../plug-ins/common/compose.c:404 msgid "Create an image using multiple gray images as color channels" -msgstr "Tworzy obraz używając wielu szarych obrazów jako kanały kolorów" +msgstr "Tworzy obraz za pomocą wielu szarych obrazów jako kanały kolorów" #: ../plug-ins/common/compose.c:410 msgid "C_ompose..." @@ -1900,7 +1896,8 @@ #: ../plug-ins/common/compose.c:512 msgid "Error scanning 'decompose-data' parasite: too few layers found" msgstr "" -"Błąd podczas skanowania pasożytu „decompose-data”: odnaleziono za mało warstw" +"Błąd podczas skanowania danych pasożytniczych „decompose-data”: odnaleziono " +"za mało warstw" #: ../plug-ins/common/compose.c:545 #, c-format @@ -1935,7 +1932,7 @@ #: ../plug-ins/common/compose.c:796 #, c-format msgid "Image is not a gray image (bpp=%d)" -msgstr "Obraz nie jest w odcieniach szarości (bpp=%d)" +msgstr "Obraz nie jest w odcieniach szarości (bpp=%d)" #: ../plug-ins/common/compose.c:824 msgid "Unable to recompose, source layer not found" @@ -1977,7 +1974,7 @@ #: ../plug-ins/common/contrast-retinex.c:156 msgid "Enhance contrast using the Retinex method" -msgstr "Uwydatnia kontrast używając metody Retinex" +msgstr "Uwydatnia kontrast za pomocą metody Retinex" #: ../plug-ins/common/contrast-retinex.c:166 msgid "Retine_x..." @@ -2102,7 +2099,7 @@ #: ../plug-ins/common/convolution-matrix.c:241 msgid "Convolution does not work on layers smaller than 3x3 pixels." msgstr "" -"Macierz przekształceń nie działa na warstwach mniejszych niż 3x3 piksele." +"Macierz przekształceń nie działa na warstwach mniejszych niż 3×3 piksele." #: ../plug-ins/common/convolution-matrix.c:314 msgid "Applying convolution" @@ -2143,7 +2140,7 @@ #: ../plug-ins/common/crop-auto.c:84 msgid "Remove empty borders from the image" -msgstr "Usuwa puste krawędzie z obrazu" +msgstr "Usuwa puste krawędzie z obrazu" #: ../plug-ins/common/crop-auto.c:94 msgid "Autocrop Imag_e" @@ -2151,7 +2148,7 @@ #: ../plug-ins/common/crop-auto.c:103 msgid "Remove empty borders from the layer" -msgstr "Usuwa puste krawędzie z warstwy" +msgstr "Usuwa puste krawędzie z warstwy" #: ../plug-ins/common/crop-auto.c:108 msgid "Autocrop Lay_er" @@ -2163,7 +2160,7 @@ #: ../plug-ins/common/crop-zealous.c:68 msgid "Autocrop unused space from edges and middle" -msgstr "Automatycznie kadruje nieużywaną przestrzeń z krawędzi i środka" +msgstr "Automatycznie kadruje nieużywaną przestrzeń z krawędzi i środka" #: ../plug-ins/common/crop-zealous.c:73 msgid "_Zealous Crop" @@ -2207,7 +2204,7 @@ #: ../plug-ins/common/curve-bend.c:526 msgid "Bend the image using two control curves" -msgstr "Wygina obraz używając dwóch krzywych kontrolnych" +msgstr "Wygina obraz za pomocą dwóch krzywych kontrolnych" #: ../plug-ins/common/curve-bend.c:547 msgid "_Curve Bend..." @@ -2221,7 +2218,7 @@ #: ../plug-ins/common/curve-bend.c:693 msgid "Cannot operate on layers with masks." -msgstr "Nie można wykonywać działania na warstwach z maskami." +msgstr "Nie można wykonywać działania na warstwach z maskami." #: ../plug-ins/common/curve-bend.c:705 msgid "Cannot operate on empty selections." @@ -2347,7 +2344,7 @@ #: ../plug-ins/common/curve-bend.c:1494 msgid "Load the curves from a file" -msgstr "Wczytuje krzywą z pliku" +msgstr "Wczytuje krzywą z pliku" #: ../plug-ins/common/curve-bend.c:1506 msgid "Save the curves to a file" @@ -2355,7 +2352,7 @@ #: ../plug-ins/common/curve-bend.c:2062 msgid "Load Curve Points from File" -msgstr "Wczytanie punktów krzywej z pliku" +msgstr "Wczytanie punktów krzywej z pliku" #: ../plug-ins/common/curve-bend.c:2097 msgid "Save Curve Points to File" @@ -2553,13 +2550,13 @@ "Pixels in the foreground color will appear black in all output images. This " "can be used for things like crop marks that have to show up on all channels." msgstr "" -"Piksele w kolorze pierwszoplanowym pojawią się jako czarne na wszystkich " +"Piksele w kolorze pierwszoplanowym pojawią się jako czarne na wszystkich " "obrazach wynikowych. Może to być używane do oznaczeń kadrowania, które muszą " "być na wszystkich kanałach." #: ../plug-ins/common/deinterlace.c:91 msgid "Fix images where every other row is missing" -msgstr "Naprawia obrazy, w których brakuje każdego przestępnego rzędu" +msgstr "Naprawia obrazy, w których brakuje każdego przestępnego rzędu" #: ../plug-ins/common/deinterlace.c:100 msgid "_Deinterlace..." @@ -2579,7 +2576,7 @@ #: ../plug-ins/common/depth-merge.c:183 msgid "Combine two images using depth maps (z-buffers)" -msgstr "Łączy dwa obrazy używając map głębi (buforów Z)" +msgstr "Łączy dwa obrazy za pomocą map głębi (buforów Z)" #: ../plug-ins/common/depth-merge.c:192 msgid "_Depth Merge..." @@ -2619,7 +2616,7 @@ #: ../plug-ins/common/despeckle.c:160 msgid "Remove speckle noise from the image" -msgstr "Ustawa plamy z obrazu" +msgstr "Ustawa plamy z obrazu" #: ../plug-ins/common/despeckle.c:166 msgid "Des_peckle..." @@ -2635,11 +2632,11 @@ #: ../plug-ins/common/despeckle.c:479 msgid "_Adaptive" -msgstr "_Adaptacyjnie" +msgstr "_Adaptatywne" #: ../plug-ins/common/despeckle.c:489 msgid "R_ecursive" -msgstr "_Rekurencyjnie" +msgstr "_Rekurencyjne" #: ../plug-ins/common/despeckle.c:510 ../plug-ins/common/edge-neon.c:735 #: ../plug-ins/common/nl-filter.c:1091 ../plug-ins/common/nova.c:362 @@ -2659,7 +2656,7 @@ #: ../plug-ins/common/destripe.c:103 msgid "Remove vertical stripe artifacts from the image" -msgstr "Usuwa pionowe paski z obrazu" +msgstr "Usuwa pionowe paski z obrazu" #: ../plug-ins/common/destripe.c:109 msgid "Des_tripe..." @@ -2891,7 +2888,7 @@ #: ../plug-ins/common/edge-sobel.c:285 msgid "_Keep sign of result (one direction only)" -msgstr "_Zapamiętanie znaku wyniku (tylko w jednym kierunku)" +msgstr "_Zapamiętanie znaku wyniku (tylko w jednym kierunku)" #: ../plug-ins/common/edge-sobel.c:372 msgid "Sobel edge detecting" @@ -3057,7 +3054,7 @@ #: ../plug-ins/common/file-cel.c:409 #, c-format msgid "illegal bpp value in image: %hhu" -msgstr "niedozwolona wartość BPP w obrazie: %hhu" +msgstr "niedozwolona wartość BPP w obrazie: %hhu" #: ../plug-ins/common/file-cel.c:423 #, c-format @@ -3097,7 +3094,7 @@ #: ../plug-ins/common/file-cel.c:663 #, c-format msgid "'%s': illegal bpp value in palette: %hhu" -msgstr "„%s”: niedozwolona wartość BPP w deseniu: %hhu" +msgstr "„%s”: niedozwolona wartość BPP w deseniu: %hhu" #: ../plug-ins/common/file-cel.c:672 #, c-format @@ -3149,13 +3146,13 @@ #. #: ../plug-ins/common/file-csource.c:735 msgid "_Save comment to file" -msgstr "Zapisanie ko_mentarza w pliku" +msgstr "Zapisanie ko_mentarza w pliku" #. GLib types #. #: ../plug-ins/common/file-csource.c:747 msgid "_Use GLib types (guint8*)" -msgstr "Użycie typów z _biblioteki GLib (guint8*)" +msgstr "Użycie typów z _biblioteki GLib (guint8*)" #: ../plug-ins/common/file-csource.c:760 msgid "Us_e macros instead of struct" @@ -3204,7 +3201,7 @@ #: ../plug-ins/common/file-dicom.c:1339 ../plug-ins/common/file-pcx.c:677 #: ../plug-ins/common/file-pnm.c:1002 msgid "Cannot save images with alpha channel." -msgstr "Nie można zapisać obrazów z kanałem alfa." +msgstr "Nie można zapisać obrazów z kanałem alfa." #: ../plug-ins/common/file-dicom.c:1354 ../plug-ins/common/file-ps.c:1185 #: ../plug-ins/common/file-ps.c:1217 ../plug-ins/common/file-xwd.c:627 @@ -3220,7 +3217,7 @@ #, c-format msgid "Invalid header data in '%s': width=%lu, height=%lu, bytes=%lu" msgstr "" -"Nieprawidłowe dane nagłówka w „%s”: szerokość=%lu, wysokość=%lu, bajty=%lu" +"Nieprawidłowe dane nagłówka w „%s”: szerokość=%lu, wysokość=%lu, bajty=%lu" #: ../plug-ins/common/file-gbr.c:425 ../plug-ins/common/file-gbr.c:437 msgid "Unsupported brush format" @@ -3229,12 +3226,12 @@ #: ../plug-ins/common/file-gbr.c:449 #, c-format msgid "Error in GIMP brush file '%s'" -msgstr "Błąd w pliku pędzla programu GIMP „%s”." +msgstr "Błąd w pliku pędzla programu GIMP „%s”." #: ../plug-ins/common/file-gbr.c:457 #, c-format msgid "Invalid UTF-8 string in brush file '%s'." -msgstr "Nieprawidłowy ciąg UTF-8 w pliku pędzla „%s”." +msgstr "Nieprawidłowy ciąg UTF-8 w pliku pędzla „%s”." #: ../plug-ins/common/file-gbr.c:463 ../plug-ins/common/file-gih.c:489 #: ../plug-ins/common/file-gih.c:1139 @@ -3244,7 +3241,7 @@ #: ../plug-ins/common/file-gbr.c:655 msgid "GIMP brushes are either GRAYSCALE or RGBA" -msgstr "Pędzle programu GIMP zapisywane są w odcieniach szarości lub jako RGBA" +msgstr "Pędzle programu GIMP zapisywane są w odcieniach szarości lub jako RGBA" #: ../plug-ins/common/file-gbr.c:772 msgid "Brush" @@ -3302,12 +3299,12 @@ "play or re-save perfectly." msgstr "" "GIF: nieudokumentowany typ łączenia %d nie jest obsługiwany. Animacja może " -"być odtwarzana w nieoczekiwany sposób, zmieni się ona również po zapisaniu." +"być odtwarzana w nieoczekiwany sposób, zmieni się ona również po zapisaniu." #: ../plug-ins/common/file-gif-save.c:476 msgid "Couldn't simply reduce colors further. Saving as opaque." msgstr "" -"Nie można w prosty sposób bardziej zredukować kolorów. Zapisywanie bez " +"Nie można w prosty sposób bardziej zredukować kolorów. Zapisywanie bez " "przezroczystości." #: ../plug-ins/common/file-gif-save.c:591 @@ -3324,14 +3321,14 @@ "The GIF format only supports comments in 7bit ASCII encoding. No comment is " "saved." msgstr "" -"Format GIF obsługuje jedynie komentarze zapisane w 7-bitowym kodowaniu " +"Format GIF obsługuje jedynie komentarze zapisane w 7-bitowym kodowaniu " "ASCII. Komentarz nie został zapisany." #: ../plug-ins/common/file-gif-save.c:763 msgid "" "Cannot save RGB color images. Convert to indexed color or grayscale first." msgstr "" -"Nie można zapisywać obrazów RGB w formacie GIF. Należy najpierw skonwertować " +"Nie można zapisywać obrazów RGB w formacie GIF. Należy najpierw skonwertować " "obraz do odcieni szarości lub do trybu indeksowanego." #: ../plug-ins/common/file-gif-save.c:941 @@ -3344,7 +3341,7 @@ "The image you are trying to save as a GIF contains layers which extend " "beyond the actual borders of the image." msgstr "" -"Zapisywany obraz w formacie GIF zawiera warstwy, które wykraczają poza " +"Zapisywany obraz w formacie GIF zawiera warstwy, które wykraczają poza " "granice obrazu." #: ../plug-ins/common/file-gif-save.c:999 @@ -3352,7 +3349,7 @@ "The GIF file format does not allow this. You may choose whether to crop all " "of the layers to the image borders, or cancel this save." msgstr "" -"W formacie GIF takie sytuacje nie są dopuszczalne. Można wybrać między " +"W formacie GIF takie sytuacje nie są dopuszczalne. Można wybrać między " "przycięciem wszystkich warstw do granic obrazu lub anulowaniem zapisu." #: ../plug-ins/common/file-gif-save.c:1135 @@ -3385,8 +3382,8 @@ "You can only export as animation when the image has more than one layer. The " "image you are trying to export only has one layer." msgstr "" -"Można wyeksportować animację tylko, jeśli obraz posiada więcej niż jedną " -"warstwę. Eksportowany obraz posiada tylko jedną warstwę." +"Można wyeksportować animację tylko, jeśli obraz ma więcej niż jedną warstwę. " +"Eksportowany obraz ma tylko jedną warstwę." #: ../plug-ins/common/file-gif-save.c:2322 msgid "Error writing output file." @@ -3404,7 +3401,7 @@ #: ../plug-ins/common/file-gih.c:482 msgid "Error in GIMP brush pipe file." -msgstr "Błąd w potoku pędzla programu GIMP." +msgstr "Błąd w potoku pędzla programu GIMP." #: ../plug-ins/common/file-gih.c:548 msgid "GIMP brush file appears to be corrupted." @@ -3412,7 +3409,7 @@ #: ../plug-ins/common/file-gih.c:698 msgid "Couldn't load one brush in the pipe, giving up." -msgstr "Nie można wczytać jednego z pędzli w potoku, rezygnacja." +msgstr "Nie można wczytać jednego z pędzli w potoku, rezygnacja." #: ../plug-ins/common/file-gih.c:859 msgid "Brush Pipe" @@ -3499,7 +3496,7 @@ "If checked GTM will output a full HTML document with , , etc. " "tags instead of just the table html." msgstr "" -"Powoduje zapisywanie pełnego dokumentu HTML wraz z , itp. " +"Powoduje zapisywanie pełnego dokumentu HTML wraz z , itp. " "zamiast samej tabeli." #. HTML Table Creation Options @@ -3516,8 +3513,8 @@ "If checked GTM will replace any rectangular sections of identically colored " "blocks with one large cell with ROWSPAN and COLSPAN values." msgstr "" -"Powoduje zastępowanie każdego prostokątnego obszaru o jednolitym obszarze " -"jedną komórką z wartościami ROWSPAN i COLSPAN." +"Powoduje zastępowanie każdego prostokątnego obszaru o jednolitym obszarze " +"jedną komórką z wartościami ROWSPAN i COLSPAN." #: ../plug-ins/common/file-html-table.c:493 msgid "Co_mpress TD tags" @@ -3539,7 +3536,7 @@ #: ../plug-ins/common/file-html-table.c:515 msgid "Check if you would like to have the table captioned." -msgstr "Należy zaznaczyć, aby utworzyć tabelę z podpisem." +msgstr "Należy zaznaczyć, aby utworzyć tabelę z podpisem." #: ../plug-ins/common/file-html-table.c:530 msgid "The text for the table caption." @@ -3603,12 +3600,12 @@ #, c-format msgid "The image '%s' is in grayscale but does not contain any gray component." msgstr "" -"Obraz „%s” jest w skali szarości, ale nie zawiera żadnych szarych składowych." +"Obraz „%s” jest w skali szarości, ale nie zawiera żadnych szarych składowych." #: ../plug-ins/common/file-jp2-load.c:263 #, c-format msgid "The image '%s' is in RGB, but is missing some of the components." -msgstr "Obraz „%s” jest w formacie RGB, ale brakuje mu części składowych." +msgstr "Obraz „%s” jest w formacie RGB, ale brakuje mu części składowych." #: ../plug-ins/common/file-jp2-load.c:289 #, c-format @@ -3616,7 +3613,7 @@ "The image '%s' is in the CIEXYZ color space, but there is no code in place " "to convert it to RGB." msgstr "" -"Obraz „%s” jest w przestrzeni kolorów CIEXYZ, ale brakuje kodu do " +"Obraz „%s” jest w przestrzeni kolorów CIEXYZ, ale brakuje kodu do " "konwertowania do RGB." #: ../plug-ins/common/file-jp2-load.c:296 @@ -3625,7 +3622,7 @@ "The image '%s' is in the CIELAB color space, but there is no code in place " "to convert it to RGB." msgstr "" -"Obraz „%s” jest w przestrzeni kolorów CIELAB, ale brakuje kodu do " +"Obraz „%s” jest w przestrzeni kolorów CIELAB, ale brakuje kodu do " "konwertowania do RGB." #: ../plug-ins/common/file-jp2-load.c:303 @@ -3634,13 +3631,13 @@ "The image '%s' is in the YCbCr color space, but there is no code in place to " "convert it to RGB." msgstr "" -"Obraz „%s” jest w przestrzeni kolorów YCbCr, ale brakuje kodu do " +"Obraz „%s” jest w przestrzeni kolorów YCbCr, ale brakuje kodu do " "konwertowania do RGB." #: ../plug-ins/common/file-jp2-load.c:311 #, c-format msgid "The image '%s' is in an unknown color space." -msgstr "Obraz „%s” jest w nieznanej przestrzeni kolorów." +msgstr "Obraz „%s” jest w nieznanej przestrzeni kolorów." #: ../plug-ins/common/file-jp2-load.c:325 #, c-format @@ -3648,13 +3645,13 @@ "Image component %d of image '%s' does not have the same size as the image. " "This is currently not supported." msgstr "" -"Składowa obrazu %d obrazu „%s” nie posiada tego samego rozmiaru co obraz. " -"Nie jest to obecnie obsługiwane." +"Składowa obrazu %d obrazu „%s” nie ma tego samego rozmiaru co obraz. Nie " +"jest to obecnie obsługiwane." #: ../plug-ins/common/file-jp2-load.c:336 #, c-format msgid "Image component %d of image '%s' does not have both a hstep and vstep." -msgstr "Składowa obrazu %d obrazu „%s” nie posiada hstep i vstep." +msgstr "Składowa obrazu %d obrazu „%s” nie ma hstep i vstep." #: ../plug-ins/common/file-jp2-load.c:345 #, c-format @@ -3777,8 +3774,8 @@ "These options are only available when the exported image has more than one " "layer. The image you are exporting only has one layer." msgstr "" -"Te opcje są dostępne tylko, jeśli eksportowany obraz posiada więcej niż " -"jedną warstwę. Eksportowany obraz posiada tylko jedną warstwę." +"Te opcje są dostępne tylko, jeśli eksportowany obraz ma więcej niż jedną " +"warstwę. Eksportowany obraz ma tylko jedną warstwę." #: ../plug-ins/common/file-mng.c:1608 msgid "MNG animation" @@ -3791,7 +3788,7 @@ #: ../plug-ins/common/file-pat.c:380 #, c-format msgid "Invalid UTF-8 string in pattern file '%s'." -msgstr "Nieprawidłowy ciąg UTF-8 w pliku z deseniem „%s”." +msgstr "Nieprawidłowy ciąg UTF-8 w pliku z deseniem „%s”." #: ../plug-ins/common/file-pat.c:555 msgid "Pattern" @@ -3825,7 +3822,7 @@ #: ../plug-ins/common/file-pcx.c:410 msgid "Invalid number of bytes per line in PCX header" -msgstr "Nieprawidłowa liczba bajtów na wiersz w nagłówku PCX" +msgstr "Nieprawidłowa liczba bajtów na wiersz w nagłówku PCX" #: ../plug-ins/common/file-pcx.c:418 #, c-format @@ -3884,7 +3881,7 @@ #: ../plug-ins/common/file-pdf-load.c:1088 msgid "Import from PDF" -msgstr "Import z PDF" +msgstr "Import z PDF" #: ../plug-ins/common/file-pdf-load.c:1093 ../plug-ins/common/file-ps.c:2967 #: ../plug-ins/common/file-tiff-load.c:491 @@ -3893,7 +3890,7 @@ #: ../plug-ins/common/file-pdf-load.c:1126 msgid "Error getting number of pages from the given PDF file." -msgstr "Błąd podczas uzyskiwania liczby stron z podanego pliku PDF." +msgstr "Błąd podczas uzyskiwania liczby stron z podanego pliku PDF." #: ../plug-ins/common/file-pdf-load.c:1168 msgid "_Width (pixels):" @@ -3937,13 +3934,13 @@ msgstr "" "Wystąpił błąd podczas tworzenia pliku PDF:\n" "%s\n" -"Proszę się upewnić, że podano prawidłową nazwę pliku i zaznaczone położenie " +"Proszę się upewnić, że podano prawidłową nazwę pliku i zaznaczone położenie " "nie jest tylko do odczytu." #: ../plug-ins/common/file-pdf-save.c:803 #: ../plug-ins/common/file-pdf-save.c:920 msgid "Omit hidden layers and layers with zero opacity" -msgstr "Pominięcie ukrytych warstw i warstw o zerowym kryciu" +msgstr "Pominięcie ukrytych warstw i warstw o zerowym kryciu" #: ../plug-ins/common/file-pdf-save.c:807 #: ../plug-ins/common/file-pdf-save.c:924 @@ -4016,7 +4013,7 @@ #: ../plug-ins/common/file-png.c:878 #, c-format msgid "Unknown color model in PNG file '%s'." -msgstr "Nieznany model kolorów w pliku PNG „%s”." +msgstr "Nieznany model kolorów w pliku PNG „%s”." #: ../plug-ins/common/file-png.c:889 #, c-format @@ -4103,7 +4100,7 @@ #: ../plug-ins/common/file-pnm.c:546 msgid "File not in a supported format." -msgstr "Plik jest w nieobsługiwanym formacie." +msgstr "Plik jest w nieobsługiwanym formacie." #: ../plug-ins/common/file-pnm.c:555 msgid "Invalid X resolution." @@ -4111,7 +4108,7 @@ #: ../plug-ins/common/file-pnm.c:557 msgid "Image width is larger than GIMP can handle." -msgstr "Szerokość obrazu jest większa niż program GIMP może obsłużyć." +msgstr "Szerokość obrazu jest większa, niż program GIMP może obsłużyć." #: ../plug-ins/common/file-pnm.c:564 msgid "Invalid Y resolution." @@ -4119,7 +4116,7 @@ #: ../plug-ins/common/file-pnm.c:566 msgid "Image height is larger than GIMP can handle." -msgstr "Wysokość obrazu jest większa niż program GIMP może obsłużyć." +msgstr "Wysokość obrazu jest większa, niż program GIMP może obsłużyć." #: ../plug-ins/common/file-pnm.c:576 msgid "Unsupported maximum value." @@ -4152,7 +4149,7 @@ #: ../plug-ins/common/file-ps.c:600 ../plug-ins/common/file-ps.c:689 msgid "Encapsulated PostScript image" -msgstr "Zagnieżdżalny obraz PostScript" +msgstr "Osadzony obraz PostScript" #: ../plug-ins/common/file-ps.c:620 msgid "PDF document" @@ -4166,7 +4163,7 @@ #: ../plug-ins/common/file-ps.c:1174 #, c-format msgid "PostScript save cannot handle images with alpha channels" -msgstr "Zapis PostScript nie obsługuje obrazów z kanałami alfa" +msgstr "Zapis PostScript nie obsługuje obrazów z kanałami alfa" #: ../plug-ins/common/file-ps.c:1809 ../plug-ins/common/file-tiff-load.c:1013 #, c-format @@ -4182,7 +4179,7 @@ #: ../plug-ins/common/file-ps.c:2962 msgid "Import from PostScript" -msgstr "Import z pliku PostScript" +msgstr "Import z pliku PostScript" #. Rendering #: ../plug-ins/common/file-ps.c:3006 @@ -4352,7 +4349,7 @@ #: ../plug-ins/common/file-raw.c:1073 msgid "Load Image from Raw Data" -msgstr "Wczytanie obrazu z danych Raw" +msgstr "Wczytanie obrazu z danych Raw" #: ../plug-ins/common/file-raw.c:1107 msgid "Image" @@ -4446,7 +4443,7 @@ #: ../plug-ins/common/file-sunras.c:443 #, c-format msgid "Could not read color entries from '%s'" -msgstr "Nie można odczytać wpisów kolorów z pliku „%s”" +msgstr "Nie można odczytać wpisów kolorów z pliku „%s”" #: ../plug-ins/common/file-sunras.c:452 msgid "Type of colormap not supported" @@ -4470,7 +4467,7 @@ "Image width is larger than GIMP can handle" msgstr "" "'%s':\n" -"Szerokość obrazu jest większa niż program GIMP może obsłużyć" +"Szerokość obrazu jest większa, niż program GIMP może obsłużyć" #: ../plug-ins/common/file-sunras.c:475 ../plug-ins/common/file-xbm.c:842 #: ../plug-ins/common/file-xwd.c:522 @@ -4490,7 +4487,7 @@ "Image height is larger than GIMP can handle" msgstr "" "'%s':\n" -"Wysokość obrazu jest większa niż program GIMP może obsłużyć" +"Wysokość obrazu jest większa, niż program GIMP może obsłużyć" #: ../plug-ins/common/file-sunras.c:522 msgid "This image depth is not supported" @@ -4499,7 +4496,7 @@ #: ../plug-ins/common/file-sunras.c:546 #, c-format msgid "SUNRAS save cannot handle images with alpha channels" -msgstr "Zapis SUNRAS nie obsługuje obrazów z kanałami alfa" +msgstr "Zapis SUNRAS nie obsługuje obrazów z kanałami alfa" #: ../plug-ins/common/file-sunras.c:557 msgid "Can't operate on unknown image types" @@ -4591,8 +4588,8 @@ msgid "" "Import path elements of the SVG so they can be used with the GIMP path tool" msgstr "" -"Powoduje importowanie elementów ścieżek z pliku SVG w taki sposób, że są one " -"widoczne w programie GIMP w postaci ścieżek" +"Powoduje importowanie elementów ścieżek z pliku SVG w taki sposób, że są one " +"widoczne w programie GIMP w postaci ścieżek" #: ../plug-ins/common/file-svg.c:952 msgid "Merge imported paths" @@ -4605,17 +4602,17 @@ #: ../plug-ins/common/file-tga.c:456 #, c-format msgid "Cannot read footer from '%s'" -msgstr "Nie można odczytać stopki z pliku „%s”" +msgstr "Nie można odczytać stopki z pliku „%s”" #: ../plug-ins/common/file-tga.c:474 #, c-format msgid "Cannot read extension from '%s'" -msgstr "Nie można odczytać rozszerzenia z pliku „%s”" +msgstr "Nie można odczytać rozszerzenia z pliku „%s”" #: ../plug-ins/common/file-tga.c:486 #, c-format msgid "Cannot read header from '%s'" -msgstr "Nie można odczytać nagłówka z pliku „%s”" +msgstr "Nie można odczytać nagłówka z pliku „%s”" #: ../plug-ins/common/file-tga.c:1403 msgid "TGA" @@ -4651,7 +4648,7 @@ #: ../plug-ins/common/file-tiff-load.c:486 msgid "Import from TIFF" -msgstr "Import z pliku TIFF" +msgstr "Import z pliku TIFF" #: ../plug-ins/common/file-tiff-load.c:819 #, c-format @@ -4671,7 +4668,7 @@ msgstr "" "Ostrzeżenie:\n" "Wczytywany obraz zawiera 16 bitów na kanał. Program GIMP obsługuje tylko 8 " -"bitów, więc obraz zostanie skonwertowany. Z tego powodu część danych może " +"bitów, więc obraz zostanie skonwertowany. Z tego powodu część danych może " "zostać utracona." #: ../plug-ins/common/file-tiff-save.c:816 @@ -4692,7 +4689,7 @@ "7bit ASCII encoding. No comment is saved." msgstr "" "Format TIFF obsługuje tylko komentarze\n" -"zapisane w 7 bitowym kodowaniu ASCII.\n" +"zapisane w 7-bitowym kodowaniu ASCII.\n" "Komentarz nie został zapisany." #: ../plug-ins/common/file-tiff-save.c:1108 @@ -4795,9 +4792,9 @@ "\n" "Please convert it to a black and white (1-bit) indexed image and try again." msgstr "" -"Obraz zapisywany w formacie XBM zawiera więcej niż dwa kolory.\n" +"Obraz zapisywany w formacie XBM zawiera więcej niż dwa kolory.\n" "\n" -"Proszę skonwertować obraz na indeksowany czarno-biały (1-bitowy) i spróbować " +"Proszę skonwertować obraz na indeksowany czarno-biały (1-bitowy) i spróbować " "ponownie." #: ../plug-ins/common/file-xbm.c:1011 @@ -4820,7 +4817,7 @@ #. X10 format #: ../plug-ins/common/file-xbm.c:1202 msgid "_X10 format bitmap" -msgstr "Bitmapa w formacie _X10" +msgstr "Bitmapa w formacie _X10" #: ../plug-ins/common/file-xbm.c:1222 msgid "_Identifier prefix:" @@ -4864,7 +4861,7 @@ "You must arrange layers so that all of them have an intersection." msgstr "" "Nie można ustawić gorącego punktu.\n" -"Należy uporządkować warstwy, aby wszystkie posiadały przecięcie." +"Należy uporządkować warstwy, aby wszystkie miały przecięcie." #: ../plug-ins/common/file-xmc.c:664 #, c-format @@ -4874,17 +4871,17 @@ #: ../plug-ins/common/file-xmc.c:680 #, c-format msgid "Frame %d of '%s' is too wide for an X cursor." -msgstr "Klatka %d z „%s” jest za szeroka dla kursora X." +msgstr "Klatka %d z „%s” jest za szeroka dla kursora X." #: ../plug-ins/common/file-xmc.c:687 #, c-format msgid "Frame %d of '%s' is too high for an X cursor." -msgstr "Klatka %d z „%s” jest za wysoka dla kursora X." +msgstr "Klatka %d z „%s” jest za wysoka dla kursora X." #: ../plug-ins/common/file-xmc.c:890 #, c-format msgid "there is no image chunk in \"%s\"." -msgstr "brak fragmentu obrazu w „%s”." +msgstr "brak fragmentu obrazu w „%s”." #: ../plug-ins/common/file-xmc.c:932 #, c-format @@ -4932,10 +4929,10 @@ "Uncheck if you plan to edit the exported cursor using other programs." msgstr "" "Usuwa puste krawędzie wszystkich klatek.\n" -"Zmniejsza to rozmiar pliku i może naprawić problem z dużymi kursorami " +"Zmniejsza to rozmiar pliku i może naprawić problem z dużymi kursorami " "zniekształcającymi ekran.\n" "Należy odznaczyć, jeśli planowane jest modyfikowanie wyeksportowanego " -"kursora używając innych programów." +"kursora za pomocą innych programów." #: ../plug-ins/common/file-xmc.c:1144 msgid "" @@ -4948,9 +4945,9 @@ "theme-size\"." msgstr "" "Wybiera nominalny rozmiar klatek.\n" -"Jeśli kursor nie ma posiadać wielu rozmiarów lub nie wiadomo, co wybrać, to " +"Jeśli kursor nie ma mieć wielu rozmiarów lub nie wiadomo, co wybrać, to " "należy zostawić „32px”.\n" -"Nominalny rozmiar nie jest powiązany z właściwym rozmiarem (szerokością lub " +"Nominalny rozmiar nie jest powiązany z właściwym rozmiarem (szerokością lub " "wysokością).\n" "Jest używany tylko do określania, które klatki zależą od której sekwencji " "animacji, oraz która sekwencja jest używana na podstawie wartości „gtk-" @@ -4966,7 +4963,7 @@ #: ../plug-ins/common/file-xmc.c:1198 msgid "Enter time span in milliseconds in which each frame is rendered." -msgstr "Proszę wprowadzić czas renderowania każdej klatki w milisekundach." +msgstr "Proszę wprowadzić czas renderowania każdej klatki w milisekundach." #: ../plug-ins/common/file-xmc.c:1201 msgid "_Delay:" @@ -4984,12 +4981,12 @@ msgid "" "The part of copyright information that exceeded 65535 characters was removed." msgstr "" -"Część informacji o prawach autorskich przekraczającą 65535 znaków została " +"Część informacji o prawach autorskich przekraczającą 65535 znaków została " "usunięta." #: ../plug-ins/common/file-xmc.c:1244 msgid "Enter copyright information." -msgstr "Proszę wprowadzić informacje o prawach autorskich." +msgstr "Proszę wprowadzić informacje o prawach autorskich." #: ../plug-ins/common/file-xmc.c:1246 msgid "_Copyright:" @@ -4999,11 +4996,11 @@ msgid "" "The part of license information that exceeded 65535 characters was removed." msgstr "" -"Część informacji o licencji przekraczającą 65535 znaków została usunięta." +"Część informacji o licencji przekraczającą 65535 znaków została usunięta." #: ../plug-ins/common/file-xmc.c:1272 msgid "Enter license information." -msgstr "Proszę wprowadzić informacje o licencji." +msgstr "Proszę wprowadzić informacje o licencji." #: ../plug-ins/common/file-xmc.c:1274 msgid "_License:" @@ -5031,25 +5028,25 @@ #, c-format msgid "This plug-in can only handle RGBA image files with 8bit color depth." msgstr "" -"Ta wtyczka obsługuje tylko pliki obrazów RGBA o 8-bitowej głębi kolorów." +"Ta wtyczka obsługuje tylko pliki obrazów RGBA o 8-bitowej głębi kolorów." #: ../plug-ins/common/file-xmc.c:1501 #, c-format msgid "Frame '%s' is too wide. Please reduce to no more than %dpx." msgstr "" -"Klatka „%s” jest za szeroka. Proszę ją zmniejszyć nie więcej niż o %d " +"Klatka „%s” jest za szeroka. Proszę ją zmniejszyć nie więcej niż o %d " "pikseli." #: ../plug-ins/common/file-xmc.c:1508 #, c-format msgid "Frame '%s' is too high. Please reduce to no more than %dpx." msgstr "" -"Klatka „%s” jest za wysoka. Proszę ją zmniejszyć nie więcej niż o %d pikseli." +"Klatka „%s” jest za wysoka. Proszę ją zmniejszyć nie więcej niż o %d pikseli." #: ../plug-ins/common/file-xmc.c:1515 #, c-format msgid "Width and/or height of frame '%s' is zero!" -msgstr "Szerokość i/lub wysokość klatki „%s” wynosi zero." +msgstr "Szerokość lub wysokość klatki „%s” wynosi zero." #: ../plug-ins/common/file-xmc.c:1555 #, c-format @@ -5058,7 +5055,7 @@ "Try to change the hot spot position, layer geometry or save without auto-" "crop." msgstr "" -"Nie można zapisać kursora, ponieważ gorący punkt nie znajduje się w klatce " +"Nie można zapisać kursora, ponieważ gorący punkt nie znajduje się w klatce " "„%s”.\n" "Proszę spróbować zmienić położenie gorącego punktu, geometrię warstw lub " "zapisać bez automatycznego przycinania." @@ -5070,9 +5067,9 @@ "width or height is more than %ipx.\n" "It will clutter the screen in some environments." msgstr "" -"Kursor został pomyślnie zapisany, ale zawiera jedną lub więcej klatek o " -"szerokości lub wysokości większej niż %i pikseli.\n" -"Spowoduje to zaśmiecenie ekranu w niektórych środowiskach." +"Kursor został pomyślnie zapisany, ale zawiera jedną lub więcej klatek " +"o szerokości lub wysokości większej niż %i pikseli.\n" +"Spowoduje to zaśmiecenie ekranu w niektórych środowiskach." #: ../plug-ins/common/file-xmc.c:1719 msgid "" @@ -5081,11 +5078,11 @@ "You can satisfy it by checking \"Replace the size of all frames...\" in the " "save dialog, or your cursor may not appear in GNOME settings." msgstr "" -"Kursor został pomyślnie zapisany, ale zawiera jedną lub więcej klatek o " -"rozmiarze nominalnym nieobsługiwanym przez ustawienia środowiska GNOME.\n" +"Kursor został pomyślnie zapisany, ale zawiera jedną lub więcej klatek " +"o rozmiarze nominalnym nieobsługiwanym przez ustawienia środowiska GNOME.\n" "Można to naprawić przez zaznaczenie opcji „Zastąpienie rozmiaru wszystkich " -"klatek…” w oknie zapisywania. W innym przypadku kursor nie pojawi się w " -"ustawieniach środowiska GNOME." +"klatek…” w oknie zapisywania. W innym przypadku kursor nie pojawi się " +"w ustawieniach środowiska GNOME." #: ../plug-ins/common/file-xmc.c:1956 #, c-format @@ -5093,8 +5090,8 @@ "The parasite \"%s\" is too long for an X cursor comment. It was cut off to " "fit." msgstr "" -"Pasożyt „%s” jest za długi dla komentarza kursora systemu X. Został " -"skrócony, aby pasował." +"Dane pasożytnicze „%s” są za długie dla komentarza kursora systemu X. " +"Zostały skrócone, aby pasowały." #. translators: the %i is *always* 8 here #: ../plug-ins/common/file-xmc.c:2159 @@ -5134,7 +5131,7 @@ #: ../plug-ins/common/file-xwd.c:446 #, c-format msgid "Could not read XWD header from '%s'" -msgstr "Nie można odczytać nagłówka XWD z „%s”" +msgstr "Nie można odczytać nagłówka XWD z „%s”" #: ../plug-ins/common/file-xwd.c:467 #, c-format @@ -5164,12 +5161,12 @@ "XWD-file %s has format %d, depth %d and bits per pixel %d. Currently this is " "not supported." msgstr "" -"Plik XWD %s w formacie %d o głębi %d i o liczbie bitów na piksel równej %d " +"Plik XWD %s w formacie %d o głębi %d i o liczbie bitów na piksel równej %d " "obecnie nie jest obsługiwany." #: ../plug-ins/common/file-xwd.c:616 msgid "Cannot save images with alpha channels." -msgstr "Nie można zapisać obrazów z kanałami alfa." +msgstr "Nie można zapisać obrazów z kanałami alfa." #: ../plug-ins/common/file-xwd.c:1706 ../plug-ins/common/file-xwd.c:1944 #, c-format @@ -5186,7 +5183,7 @@ #: ../plug-ins/common/film.c:217 msgid "Combine several images on a film strip" -msgstr "Łączy kilka obrazów w jeden odcinek filmowy" +msgstr "Łączy kilka obrazów w jeden odcinek filmowy" #: ../plug-ins/common/film.c:222 msgid "_Filmstrip..." @@ -5444,7 +5441,7 @@ #: ../plug-ins/common/filter-pack.c:872 msgid "Selec_tion in context" -msgstr "Zaznaczenie w _kontekście" +msgstr "Zaznaczenie w _kontekście" #: ../plug-ins/common/filter-pack.c:1203 msgid "Filter Pack Simulation" @@ -5515,7 +5512,7 @@ #: ../plug-ins/common/gradient-map.c:84 msgid "Recolor the image using colors from the active gradient" -msgstr "Ponownie koloruje obraz używając kolorów z aktywnego gradientu" +msgstr "Ponownie koloruje obraz za pomocą kolorów z aktywnego gradientu" #: ../plug-ins/common/gradient-map.c:97 msgid "_Gradient Map" @@ -5523,7 +5520,7 @@ #: ../plug-ins/common/gradient-map.c:106 msgid "Recolor the image using colors from the active palette" -msgstr "Ponownie koloruje obraz używając kolorów z aktywnej palety" +msgstr "Ponownie koloruje obraz za pomocą kolorów z aktywnej palety" #: ../plug-ins/common/gradient-map.c:119 msgid "_Palette Map" @@ -5595,7 +5592,7 @@ #: ../plug-ins/common/guillotine.c:74 msgid "Slice the image into subimages using guides" -msgstr "Dzieli obraz na podobrazy używając prowadnic" +msgstr "Dzieli obraz na podobrazy za pomocą prowadnic" #: ../plug-ins/common/guillotine.c:81 msgid "_Guillotine" @@ -5607,7 +5604,7 @@ #: ../plug-ins/common/hot.c:207 msgid "Find and fix pixels that may be unsafely bright" -msgstr "Wyszukuje o naprawia niebezpiecznie jasne piksele" +msgstr "Wyszukuje o naprawia niebezpiecznie jasne piksele" #: ../plug-ins/common/hot.c:217 msgid "_Hot..." @@ -5748,7 +5745,7 @@ #: ../plug-ins/common/iwarp.c:1183 msgid "Adaptive s_upersample" -msgstr "Na_dpróbkowanie adaptywne" +msgstr "Na_dpróbkowanie adaptatywne" #: ../plug-ins/common/iwarp.c:1204 msgid "Ma_x depth:" @@ -5772,7 +5769,7 @@ "Click and drag in the preview to define the distortions to apply to the " "image." msgstr "" -"Kliknięcie i przeciągnięcie na podglądzie określi zniekształcenia, które " +"Kliknięcie i przeciągnięcie na podglądzie określi zniekształcenia, które " "zostaną wykonane na obrazie." #: ../plug-ins/common/jigsaw.c:356 @@ -5797,11 +5794,11 @@ #: ../plug-ins/common/jigsaw.c:2438 msgid "Number of pieces going across" -msgstr "Liczba puzzli w poziomie" +msgstr "Liczba puzzli w poziomie" #: ../plug-ins/common/jigsaw.c:2455 msgid "Number of pieces going down" -msgstr "Liczba puzzli w pionie" +msgstr "Liczba puzzli w pionie" #: ../plug-ins/common/jigsaw.c:2469 msgid "Bevel Edges" @@ -5870,16 +5867,16 @@ #: ../plug-ins/common/lcms.c:301 msgid "Image Color Profile Information" -msgstr "Informacje o profilu kolorów obrazu" +msgstr "Informacje o profilu kolorów obrazu" #: ../plug-ins/common/lcms.c:315 msgid "Color Profile Information" -msgstr "Informacje o profilu kolorów" +msgstr "Informacje o profilu kolorów" #: ../plug-ins/common/lcms.c:656 #, c-format msgid "Color profile '%s' is not for RGB color space." -msgstr "Profil kolorów „%s” nie jest w przestrzeni kolorów RGB." +msgstr "Profil kolorów „%s” nie jest w przestrzeni kolorów RGB." #: ../plug-ins/common/lcms.c:763 msgid "Default RGB working space" @@ -5899,17 +5896,17 @@ #: ../plug-ins/common/lcms.c:975 #, c-format msgid "Converting from '%s' to '%s'" -msgstr "Konwertowanie z „%s” do „%s”" +msgstr "Konwertowanie z „%s” do „%s”" #: ../plug-ins/common/lcms.c:1248 #, c-format msgid "Could not load ICC profile from '%s'" -msgstr "Nie można wczytać profilu kolorów ICC z „%s”" +msgstr "Nie można wczytać profilu kolorów ICC z „%s”" #: ../plug-ins/common/lcms.c:1270 #, c-format msgid "The image '%s' has an embedded color profile:" -msgstr "Obraz „%s” posiada osadzony profil kolorów:" +msgstr "Obraz „%s” ma osadzony profil kolorów:" #: ../plug-ins/common/lcms.c:1314 #, c-format @@ -6130,7 +6127,7 @@ #: ../plug-ins/common/max-rgb.c:90 msgid "Reduce image to pure red, green, and blue" -msgstr "Redukuje obraz do samej czerwieni, zielonego i niebieskiego" +msgstr "Redukuje obraz do samej czerwieni, zielonego i niebieskiego" #: ../plug-ins/common/max-rgb.c:95 msgid "Maxim_um RGB..." @@ -6188,7 +6185,7 @@ #: ../plug-ins/common/mosaic.c:637 msgid "Octagons & squares" -msgstr "Ośmiokąty i kwadraty" +msgstr "Ośmiokąty i kwadraty" #: ../plug-ins/common/mosaic.c:638 msgid "Triangles" @@ -6228,7 +6225,7 @@ #: ../plug-ins/common/mosaic.c:758 msgid "Allo_w tile splitting" -msgstr "Dozwololenie po_działu kafli" +msgstr "Dozwolenie po_działu kafli" #: ../plug-ins/common/mosaic.c:771 msgid "_Pitted surfaces" @@ -6428,11 +6425,11 @@ #: ../plug-ins/common/noise-randomize.c:204 msgid "Randomly interchange some pixels with neighbors" -msgstr "Losowo zamienia niektóre piksele z ich sąsiadami" +msgstr "Losowo zamienia niektóre piksele z ich sąsiadami" #: ../plug-ins/common/noise-randomize.c:206 msgid "Randomly slide some pixels downward (similar to melting)" -msgstr "Losowo przesuwa niektóre piksele w dół (podobne do topienia)" +msgstr "Losowo przesuwa niektóre piksele w dół (podobne do topienia)" #: ../plug-ins/common/noise-randomize.c:233 msgid "_Hurl..." @@ -6469,7 +6466,7 @@ #: ../plug-ins/common/noise-rgb.c:145 msgid "Distort colors by random amounts" -msgstr "Zniekształca kolory o losowe ilości" +msgstr "Zniekształca kolory o losowe ilości" #: ../plug-ins/common/noise-rgb.c:155 msgid "_RGB Noise..." @@ -6703,7 +6700,7 @@ #: ../plug-ins/common/plugin-browser.c:134 msgid "Display information about plug-ins" -msgstr "Wyświetla informacje o wtyczkach" +msgstr "Wyświetla informacje o wtyczkach" #: ../plug-ins/common/plugin-browser.c:144 msgid "_Plug-In Browser" @@ -6770,7 +6767,7 @@ #: ../plug-ins/common/polar-coords.c:156 msgid "Convert image to or from polar coordinates" -msgstr "Konwertuje obraz do lub z współrzędnych polarnych" +msgstr "Konwertuje obraz do lub z współrzędnych polarnych" #: ../plug-ins/common/polar-coords.c:163 msgid "P_olar Coordinates..." @@ -6786,7 +6783,7 @@ #: ../plug-ins/common/polar-coords.c:631 msgid "Circle _depth in percent:" -msgstr "_Głębia okręgu w procentach:" +msgstr "_Głębia okręgu w procentach:" #: ../plug-ins/common/polar-coords.c:643 msgid "Offset _angle:" @@ -6810,7 +6807,7 @@ msgid "" "If unchecked the mapping will put the bottom row in the middle and the top " "row on the outside. If checked it will be the opposite." -msgstr "Powoduje odwzorowanie dolnego wiersza w środku i górnego na zewnątrz." +msgstr "Powoduje odwzorowanie dolnego wiersza w środku i górnego na zewnątrz." #: ../plug-ins/common/polar-coords.c:694 msgid "To _polar" @@ -6824,7 +6821,7 @@ #: ../plug-ins/common/procedure-browser.c:83 msgid "List available procedures in the PDB" -msgstr "Wyświetla listę dostępnych procedur w PDB" +msgstr "Wyświetla listę dostępnych procedur w PDB" #: ../plug-ins/common/procedure-browser.c:88 msgid "Procedure _Browser" @@ -6891,7 +6888,7 @@ #: ../plug-ins/common/ripple.c:126 msgid "Displace pixels in a ripple pattern" -msgstr "Rozmieszcza piksele w falującym deseniu" +msgstr "Rozmieszcza piksele w falującym deseniu" #: ../plug-ins/common/ripple.c:133 msgid "_Ripple..." @@ -6953,7 +6950,7 @@ #: ../plug-ins/common/rotate.c:426 msgid "Sorry, channels and masks can not be rotated." -msgstr "Kanały i maski nie mogą być obracane." +msgstr "Kanały i maski nie mogą być obracane." #: ../plug-ins/common/rotate.c:432 msgid "Rotating" @@ -6961,7 +6958,7 @@ #: ../plug-ins/common/sample-colorize.c:298 msgid "Colorize image using a sample image as a guide" -msgstr "Koloryzuje obraz używając próbki obrazu jako przewodnika" +msgstr "Koloryzuje obraz za pomocą próbki obrazu jako przewodnika" #: ../plug-ins/common/sample-colorize.c:303 msgid "_Sample Colorize..." @@ -6987,11 +6984,11 @@ #: ../plug-ins/common/sample-colorize.c:1385 msgid "From reverse gradient" -msgstr "Z odwróconego gradientu" +msgstr "Z odwróconego gradientu" #: ../plug-ins/common/sample-colorize.c:1390 msgid "From gradient" -msgstr "Z gradientu" +msgstr "Z gradientu" #. check button #: ../plug-ins/common/sample-colorize.c:1411 @@ -7043,7 +7040,7 @@ #: ../plug-ins/common/screenshot.c:250 msgid "Create an image from an area of the screen" -msgstr "Tworzy obraz z obszaru ekranu" +msgstr "Tworzy obraz z obszaru ekranu" #: ../plug-ins/common/screenshot.c:272 msgid "_Screenshot..." @@ -7098,7 +7095,7 @@ #: ../plug-ins/common/screenshot.c:1284 msgid "Include window _decoration" -msgstr "Wraz z _dekoracją okna" +msgstr "Wraz z _dekoracją okna" #: ../plug-ins/common/screenshot.c:1304 msgid "Take a screenshot of the entire _screen" @@ -7106,7 +7103,7 @@ #: ../plug-ins/common/screenshot.c:1323 msgid "Include _mouse pointer" -msgstr "Wraz z kursorem _myszy" +msgstr "Wraz z kursorem _myszy" #: ../plug-ins/common/screenshot.c:1344 msgid "Select a _region to grab" @@ -7155,7 +7152,7 @@ #: ../plug-ins/common/shift.c:101 msgid "Shift each row of pixels by a random amount" -msgstr "Przesuwa rząd pikseli o losową wartość" +msgstr "Przesuwa rząd pikseli o losową wartość" #: ../plug-ins/common/shift.c:108 msgid "_Shift..." @@ -7243,15 +7240,15 @@ #. if in grey scale, the colors are necessarily black and white #: ../plug-ins/common/sinus.c:792 msgid "The colors are white and black." -msgstr "Kolorami są czarny i biały." +msgstr "Kolorami są czarny i biały." #: ../plug-ins/common/sinus.c:803 msgid "Bl_ack & white" -msgstr "_Czarny i biały" +msgstr "_Czarny i biały" #: ../plug-ins/common/sinus.c:805 msgid "_Foreground & background" -msgstr "Kolor p_ierwszoplanowy i tło" +msgstr "Kolor p_ierwszoplanowy i tło" #: ../plug-ins/common/sinus.c:807 msgid "C_hoose here:" @@ -7308,7 +7305,7 @@ #: ../plug-ins/common/smooth-palette.c:83 msgid "Derive a smooth color palette from the image" -msgstr "Wyprowadza wygładzoną paletę kolorów z obrazu" +msgstr "Wyprowadza wygładzoną paletę kolorów z obrazu" #: ../plug-ins/common/smooth-palette.c:88 msgid "Smoo_th Palette..." @@ -7328,7 +7325,7 @@ #: ../plug-ins/common/softglow.c:134 msgid "Simulate glow by making highlights intense and fuzzy" -msgstr "Symuluje poświatę przez zintensyfikowanie i rozmycie podświetleń" +msgstr "Symuluje poświatę przez zintensyfikowanie i rozmycie podświetleń" #: ../plug-ins/common/softglow.c:139 msgid "_Softglow..." @@ -7344,7 +7341,7 @@ #: ../plug-ins/common/sparkle.c:178 msgid "Turn bright spots into starry sparkles" -msgstr "Zmienia jasne punkty w błyszczące gwiazdki" +msgstr "Zmienia jasne punkty w błyszczące gwiazdki" #: ../plug-ins/common/sparkle.c:186 msgid "_Sparkle..." @@ -7456,7 +7453,7 @@ #: ../plug-ins/common/sparkle.c:536 msgid "Draw a border of spikes around the image" -msgstr "Rysuje brzeg z iskier wokół obrazu" +msgstr "Rysuje brzeg z iskier wokół obrazu" #: ../plug-ins/common/sparkle.c:550 msgid "_Natural color" @@ -7767,7 +7764,7 @@ #: ../plug-ins/common/tile-paper.c:848 msgid "Cut image into paper tiles, and slide them" -msgstr "Wycina obraz na kawałki papieru i przesuwa je" +msgstr "Wycina obraz na kawałki papieru i przesuwa je" #: ../plug-ins/common/tile-paper.c:853 msgid "September 31, 1999" @@ -7791,7 +7788,7 @@ #: ../plug-ins/common/tile-small.c:222 msgid "Tile image into smaller versions of the original" -msgstr "Zmienia obraz w małe wersje oryginału" +msgstr "Zmienia obraz w małe wersje oryginału" #: ../plug-ins/common/tile-small.c:227 msgid "_Small Tiles..." @@ -7861,7 +7858,7 @@ #: ../plug-ins/common/tile.c:419 msgid "Tile to New Size" -msgstr "Ułożenie o nowym rozmiarze" +msgstr "Ułożenie o nowym rozmiarze" #: ../plug-ins/common/tile.c:441 msgid "C_reate new image" @@ -7877,7 +7874,7 @@ "checked." msgstr "" "Definicja jednostki zostanie zapisana przed zakończeniem programu GIMP " -"tylko, jeśli zostanie ona zaznaczona w tej kolumnie." +"tylko, jeśli zostanie ona zaznaczona w tej kolumnie." #: ../plug-ins/common/unit-editor.c:96 msgid "ID" @@ -7887,7 +7884,7 @@ msgid "" "This string will be used to identify a unit in GIMP's configuration files." msgstr "" -"Ten ciąg zostanie użyty do identyfikacji jednostki w plikach " +"Ten ciąg zostanie użyty do identyfikacji jednostki w plikach " "konfiguracyjnych programu GIMP." #: ../plug-ins/common/unit-editor.c:98 @@ -7908,10 +7905,10 @@ "decimal digits the input field should provide to get approximately the same " "accuracy as an \"inch\" input field with two decimal digits." msgstr "" -"Pole to jest wykorzystywane przy polach służących wprowadzaniu wartości w " -"podanej jednostce. Określa ono, na ile cyfr powinno zostać przeznaczone " +"Pole to jest wykorzystywane przy polach służących wprowadzaniu wartości " +"w podanej jednostce. Określa ono, na ile cyfr powinno zostać przeznaczone " "miejsce, aby umożliwić wprowadzenie podobnego zakresu wartości jak dla " -"wartości dwucyfrowych w calach." +"wartości dwucyfrowych w calach." #: ../plug-ins/common/unit-editor.c:104 msgid "Symbol" @@ -7955,11 +7952,11 @@ #: ../plug-ins/common/unit-editor.c:127 msgid "Create a new unit using the currently selected unit as template" -msgstr "Tworzy nową jednostkę używając wybranej jednostki jako szablon" +msgstr "Tworzy nową jednostkę za pomocą wybranej jednostki jako szablon" #: ../plug-ins/common/unit-editor.c:145 msgid "Create or alter units used in GIMP" -msgstr "Tworzy lub zmienia jednostki używane w programie GIMP" +msgstr "Tworzy lub zmienia jednostki używane w programie GIMP" #: ../plug-ins/common/unit-editor.c:150 msgid "U_nits" @@ -8169,11 +8166,11 @@ #: ../plug-ins/common/van-gogh-lic.c:700 msgid "_With white noise" -msgstr "Z _białym szumem" +msgstr "Z _białym szumem" #: ../plug-ins/common/van-gogh-lic.c:701 msgid "W_ith source image" -msgstr "Z o_brazem źródłowym" +msgstr "Z o_brazem źródłowym" #: ../plug-ins/common/van-gogh-lic.c:720 msgid "_Effect image:" @@ -8217,11 +8214,11 @@ #: ../plug-ins/common/video.c:44 msgid "S_triped" -msgstr "W pas_ki" +msgstr "W pas_ki" #: ../plug-ins/common/video.c:45 msgid "_Wide-striped" -msgstr "W _szerokie paski" +msgstr "W _szerokie paski" #: ../plug-ins/common/video.c:46 msgid "Lo_ng-staggered" @@ -8229,11 +8226,11 @@ #: ../plug-ins/common/video.c:47 msgid "_3x3" -msgstr "_3x3" +msgstr "_3×3" #: ../plug-ins/common/video.c:48 msgid "Larg_e 3x3" -msgstr "Duż_e 3x3" +msgstr "Duż_e 3×3" #: ../plug-ins/common/video.c:49 msgid "_Hex" @@ -8246,7 +8243,7 @@ #: ../plug-ins/common/video.c:1807 msgid "Simulate distortion produced by a fuzzy or low-res monitor" msgstr "" -"Symuluje zniekształcenie tworzone przez rozmyty monitor lub monitor o małej " +"Symuluje zniekształcenie tworzone przez rozmyty monitor lub monitor o małej " "rozdzielczości" #: ../plug-ins/common/video.c:1814 @@ -8376,7 +8373,7 @@ #: ../plug-ins/common/warp.c:703 msgid "Fixed-direction-vector map selection menu" -msgstr "Menu wyboru mapy wektorów o stałym kierunku" +msgstr "Menu wyboru mapy wektorów o stałym kierunku" #. make sure layer is visible #: ../plug-ins/common/warp.c:1178 @@ -8429,66 +8426,66 @@ msgid "Waving" msgstr "Falowanie" -#: ../plug-ins/common/web-browser.c:135 +#: ../plug-ins/common/web-browser.c:141 msgid "The operating system is out of memory or resources." -msgstr "W systemie operacyjnym brakuje pamięci lub zasobów." +msgstr "W systemie operacyjnym brakuje pamięci lub zasobów." -#: ../plug-ins/common/web-browser.c:138 +#: ../plug-ins/common/web-browser.c:144 msgid "The specified file was not found." msgstr "Nie odnaleziono podanego pliku." -#: ../plug-ins/common/web-browser.c:141 +#: ../plug-ins/common/web-browser.c:147 msgid "The specified path was not found." msgstr "Nie odnaleziono podanej ścieżki." -#: ../plug-ins/common/web-browser.c:144 +#: ../plug-ins/common/web-browser.c:150 msgid "" "The .exe file is invalid (non-Microsoft Win32 .exe or error in .exe image)." msgstr "" "Plik .exe jest nieprawidłowy (nie jest plikiem .exe systemu Microsoft Win32 " "lub obraz .exe zawiera błąd)." -#: ../plug-ins/common/web-browser.c:147 +#: ../plug-ins/common/web-browser.c:153 msgid "The operating system denied access to the specified file." msgstr "System operacyjny zabronił dostępu do podanego pliku." -#: ../plug-ins/common/web-browser.c:150 +#: ../plug-ins/common/web-browser.c:156 msgid "The file name association is incomplete or invalid." msgstr "Powiązanie nazwy pliku jest niepełne lub nieprawidłowe." -#: ../plug-ins/common/web-browser.c:153 +#: ../plug-ins/common/web-browser.c:159 msgid "DDE transaction busy" msgstr "Zajęta transakcja DDE" -#: ../plug-ins/common/web-browser.c:156 +#: ../plug-ins/common/web-browser.c:162 msgid "The DDE transaction failed." msgstr "Transakcja DDE się nie powiodła." -#: ../plug-ins/common/web-browser.c:159 +#: ../plug-ins/common/web-browser.c:165 msgid "The DDE transaction timed out." msgstr "Transakcja DDE przekroczyła czas oczekiwania." -#: ../plug-ins/common/web-browser.c:162 +#: ../plug-ins/common/web-browser.c:168 msgid "The specified DLL was not found." msgstr "Nie odnaleziono podanego pliku DLL." -#: ../plug-ins/common/web-browser.c:165 +#: ../plug-ins/common/web-browser.c:171 msgid "There is no application associated with the given file name extension." -msgstr "Brak powiązanego programu z podanym rozszerzeniem nazwy pliku." +msgstr "Brak powiązanego programu z podanym rozszerzeniem nazwy pliku." -#: ../plug-ins/common/web-browser.c:168 +#: ../plug-ins/common/web-browser.c:174 msgid "There was not enough memory to complete the operation." msgstr "Za mało pamięci, aby ukończyć działanie." -#: ../plug-ins/common/web-browser.c:171 +#: ../plug-ins/common/web-browser.c:177 msgid "A sharing violation occurred." msgstr "Wystąpiło naruszenie współdzielenia." -#: ../plug-ins/common/web-browser.c:174 +#: ../plug-ins/common/web-browser.c:180 msgid "Unknown Microsoft Windows error." msgstr "Nieznany błąd systemu Microsoft Windows." -#: ../plug-ins/common/web-browser.c:177 +#: ../plug-ins/common/web-browser.c:183 #, c-format msgid "Failed to open '%s': %s" msgstr "Otwarcie „%s” się nie powiodło: %s" @@ -8564,19 +8561,19 @@ #: ../plug-ins/common/whirl-pinch.c:138 msgid "Distort an image by whirling and pinching" -msgstr "Zniekształca obraz przez skręcanie i zaciskanie" +msgstr "Zniekształca obraz przez skręcanie i zaciskanie" #: ../plug-ins/common/whirl-pinch.c:149 msgid "W_hirl and Pinch..." -msgstr "S_kręcenie i zaciskanie…" +msgstr "S_kręcenie i zaciskanie…" #: ../plug-ins/common/whirl-pinch.c:341 msgid "Whirling and pinching" -msgstr "Skręcanie i zaciskanie" +msgstr "Skręcanie i zaciskanie" #: ../plug-ins/common/whirl-pinch.c:529 msgid "Whirl and Pinch" -msgstr "Skręcenie i zaciskanie" +msgstr "Skręcenie i zaciskanie" #: ../plug-ins/common/whirl-pinch.c:567 msgid "_Whirl angle:" @@ -8623,11 +8620,11 @@ #: ../plug-ins/common/wind.c:947 msgid "_Left" -msgstr "W _lewo" +msgstr "W _lewo" #: ../plug-ins/common/wind.c:948 msgid "_Right" -msgstr "W p_rawo" +msgstr "W p_rawo" #. **************************************************** #. radio buttons for choosing BOTH, LEADING, TRAILING @@ -8679,12 +8676,12 @@ #: ../plug-ins/file-bmp/bmp-read.c:403 ../plug-ins/file-bmp/bmp-read.c:445 #, c-format msgid "Error reading BMP file header from '%s'" -msgstr "Błąd podczas odczytywania nagłówka pliku BMP z „%s”" +msgstr "Błąd podczas odczytywania nagłówka pliku BMP z „%s”" #: ../plug-ins/file-bmp/bmp-read.c:358 #, c-format msgid "Unsupported compression (%lu) in BMP file from '%s'" -msgstr "Nieobsługiwana kompresja (%lu) w pliku BMP z „%s”" +msgstr "Nieobsługiwana kompresja (%lu) w pliku BMP z „%s”" #: ../plug-ins/file-bmp/bmp-read.c:641 msgid "Unrecognized or invalid BMP compression format." @@ -8702,7 +8699,7 @@ #: ../plug-ins/file-bmp/bmp-write.c:193 ../plug-ins/file-bmp/bmp-write.c:219 msgid "Cannot save indexed image with transparency in BMP file format." msgstr "" -"Nie można zapisać indeksowanego obrazu z przezroczystością w formacie pliku " +"Nie można zapisać indeksowanego obrazu z przezroczystością w formacie pliku " "BMP." #: ../plug-ins/file-bmp/bmp-write.c:195 ../plug-ins/file-bmp/bmp-write.c:221 @@ -8721,7 +8718,7 @@ #: ../plug-ins/file-bmp/bmp-write.c:893 msgid "_Do not write color space information" -msgstr "_Bez zapisywania informacji o przestrzeni kolorów" +msgstr "_Bez zapisywania informacji o przestrzeni kolorów" #: ../plug-ins/file-bmp/bmp-write.c:895 msgid "" @@ -8729,10 +8726,10 @@ "information. GIMP writes color space information by default. Enabling this " "option will cause GIMP to not write color space information to the file." msgstr "" -"Niektóre programy nie mogą odczytywać obrazów BMP zawierających informacje o " -"przestrzeni kolorów. Program GIMP domyślnie zapisuje informacje o " -"przestrzeni kolorów. Włączenie tej opcji powoduje, że program GIMP nie " -"zapisuje informacji o przestrzeni kolorów do pliku." +"Niektóre programy nie mogą odczytywać obrazów BMP zawierających informacje " +"o przestrzeni kolorów. Program GIMP domyślnie zapisuje informacje " +"o przestrzeni kolorów. Włączenie tej opcji powoduje, że program GIMP nie " +"zapisuje informacji o przestrzeni kolorów do pliku." #. Advanced Options #: ../plug-ins/file-bmp/bmp-write.c:911 ../plug-ins/file-jpeg/jpeg-save.c:924 @@ -8794,7 +8791,7 @@ #: ../plug-ins/file-fits/fits.c:457 msgid "FITS save cannot handle images with alpha channels" -msgstr "FITS nie zapisuje obrazów z kanałami alfa" +msgstr "FITS nie zapisuje obrazów z kanałami alfa" #: ../plug-ins/file-fits/fits.c:994 msgid "Load FITS File" @@ -8838,7 +8835,7 @@ #: ../plug-ins/file-fli/fli-gimp.c:716 msgid "Sorry, I can save only INDEXED and GRAY images." msgstr "" -"Można zapisywać obrazy tylko w trybie indeksowanym lub w odcieniach szarości." +"Można zapisywać obrazy tylko w trybie indeksowanym lub w odcieniach szarości." #: ../plug-ins/file-fli/fli-gimp.c:849 msgid "GFLI 1.3 - Load framestack" @@ -8871,7 +8868,7 @@ "Large icons and compression are not supported by all programs. Older " "applications may not open this file correctly." msgstr "" -"Duże ikony i kompresja nie są obsługiwane przez wszystkie programy. Starsze " +"Duże ikony i kompresja nie są obsługiwane przez wszystkie programy. Starsze " "programy mogą otwierać ten plik niepoprawnie." #: ../plug-ins/file-ico/ico-dialog.c:165 @@ -8924,7 +8921,7 @@ #: ../plug-ins/file-jpeg/jpeg-exif.c:411 msgid "According to the EXIF data, this image is rotated." -msgstr "Zgodnie z danymi EXIF ten obraz jest obrócony." +msgstr "Zgodnie z danymi EXIF ten obraz jest obrócony." #: ../plug-ins/file-jpeg/jpeg-exif.c:426 msgid "Would you like GIMP to rotate it into the standard orientation?" @@ -8966,7 +8963,7 @@ #: ../plug-ins/file-jpeg/jpeg-save.c:912 msgid "Sho_w preview in image window" -msgstr "_Podgląd w oknie obrazu" +msgstr "_Podgląd w oknie obrazu" #: ../plug-ins/file-jpeg/jpeg-save.c:953 msgid "S_moothing:" @@ -9010,9 +9007,9 @@ "settings (quantization tables), enable this option to get almost the same " "quality and file size." msgstr "" -"Jeśli pierwotny obraz został wczytany z pliku JPEG używając niestandardowych " -"ustawień jakości (tablice kwantyzacji), to włączenie tej opcji umożliwia " -"uzyskanie prawie takiej samej jakości i rozmiaru pliku." +"Jeśli pierwotny obraz został wczytany z pliku JPEG za pomocą " +"niestandardowych ustawień jakości (tablice kwantyzacji), to włączenie tej " +"opcji umożliwia uzyskanie prawie takiej samej jakości i rozmiaru pliku." #. Subsampling #: ../plug-ins/file-jpeg/jpeg-save.c:1111 @@ -9025,15 +9022,15 @@ #: ../plug-ins/file-jpeg/jpeg-save.c:1120 msgid "4:2:2 horizontal (chroma halved)" -msgstr "4∶2∶2 poziomo (zmniejszenie nasycenia o połowę)" +msgstr "4∶2∶2 poziomo (zmniejszenie nasycenia o połowę)" #: ../plug-ins/file-jpeg/jpeg-save.c:1122 msgid "4:2:2 vertical (chroma halved)" -msgstr "4∶2∶2 pionowo (zmniejszenie nasycenia o połowę)" +msgstr "4∶2∶2 pionowo (zmniejszenie nasycenia o połowę)" #: ../plug-ins/file-jpeg/jpeg-save.c:1124 msgid "4:2:0 (chroma quartered)" -msgstr "4∶2∶0 (zmniejszenie nasycenia o jedną czwartą)" +msgstr "4∶2∶0 (zmniejszenie nasycenia o jedną czwartą)" #. DCT method #: ../plug-ins/file-jpeg/jpeg-save.c:1154 @@ -9092,7 +9089,7 @@ #: ../plug-ins/file-psd/psd-load.c:283 #, c-format msgid "Too many channels in file: %d" -msgstr "Za dużo kanałów w pliku: %d" +msgstr "Za dużo kanałów w pliku: %d" #: ../plug-ins/file-psd/psd-load.c:310 #, c-format @@ -9118,7 +9115,7 @@ #: ../plug-ins/file-psd/psd-load.c:554 #, c-format msgid "Too many channels in layer: %d" -msgstr "Za dużo kanałów w warstwie: %d" +msgstr "Za dużo kanałów w warstwie: %d" #: ../plug-ins/file-psd/psd-load.c:562 #, c-format @@ -9209,7 +9206,7 @@ "Unable to save '%s'. The PSD file format does not support images with " "layers that are more than 30,000 pixels wide or tall." msgstr "" -"Nie można zapisać „%s”. Format pliku PSD nie obsługuje obrazów z warstwami " +"Nie można zapisać „%s”. Format pliku PSD nie obsługuje obrazów z warstwami " "większymi niż 30000 pikseli wzdłuż lub wszerz." #: ../plug-ins/file-psd/psd-util.c:50 @@ -9272,12 +9269,12 @@ #: ../plug-ins/file-uri/uri-backend-gvfs.c:233 #, c-format msgid "Downloading image (%s of %s)" -msgstr "Pobieranie obrazu (%s z %s)" +msgstr "Pobieranie obrazu (%s z %s)" #: ../plug-ins/file-uri/uri-backend-gvfs.c:237 #, c-format msgid "Uploading image (%s of %s)" -msgstr "Wysyłanie obrazu (%s z %s)" +msgstr "Wysyłanie obrazu (%s z %s)" #: ../plug-ins/file-uri/uri-backend-gvfs.c:259 #: ../plug-ins/file-uri/uri-backend-libcurl.c:134 @@ -9295,7 +9292,7 @@ #: ../plug-ins/file-uri/uri-backend-libcurl.c:161 #: ../plug-ins/file-uri/uri-backend-wget.c:200 msgid "Connecting to server" -msgstr "Łączenie z serwerem" +msgstr "Łączenie z serwerem" #: ../plug-ins/file-uri/uri-backend-libcurl.c:58 msgid "Could not initialize libcurl" @@ -9634,8 +9631,8 @@ "(%s \"%s\")\n" "to your %s file." msgstr "" -"Brak wpisu %s w pliku gimprc:\n" -"Należy dodać wiersz w postaci\n" +"Brak wpisu %s w pliku gimprc:\n" +"Należy dodać wiersz w postaci\n" "(%s \"%s\")\n" "do pliku %s." @@ -9645,7 +9642,7 @@ #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:637 msgid "Realtime preview" -msgstr "Podgląd w czasie rzeczywistym" +msgstr "Podgląd w czasie rzeczywistym" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:645 msgid "If enabled the preview will be redrawn automatically" @@ -9700,7 +9697,7 @@ msgid "" "The higher the number of iterations, the more details will be calculated" msgstr "" -"Zmienia liczbę iteracji. Wraz z jej wzrostem obliczana jest większa liczba " +"Zmienia liczbę iteracji. Wraz z jej wzrostem obliczana jest większa liczba " "szczegółów" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:782 @@ -9718,7 +9715,7 @@ #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:811 msgid "Load a fractal from file" -msgstr "Wczytuje fraktal z pliku" +msgstr "Wczytuje fraktal z pliku" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:819 msgid "Reset parameters to default values" @@ -9852,7 +9849,7 @@ "If you enable this option higher color values will be swapped with lower " "ones and vice versa" msgstr "" -"Włączenie tej opcji powoduje zamianę większych wartości koloru z mniejszymi" +"Włączenie tej opcji powoduje zamianę większych wartości koloru z mniejszymi" #. Colormode toggle box #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1116 @@ -9877,7 +9874,7 @@ #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1159 msgid "Create a color-map using a gradient from the gradient editor" -msgstr "Tworzy paletę kolorów używając gradientu z edytora gradientów" +msgstr "Tworzy paletę kolorów za pomocą gradientu z edytora gradientów" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1170 msgid "FractalExplorer Gradient" @@ -9908,7 +9905,7 @@ #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1880 #, c-format msgid "'%s' is corrupt. Line %d Option section incorrect" -msgstr "Plik „%s” jest uszkodzony. Wiersz %d w sekcji Option jest niepoprawny" +msgstr "Plik „%s” jest uszkodzony. %d. wiersz w sekcji Option jest niepoprawny" #: ../plug-ins/fractal-explorer/fractal-explorer.c:236 msgid "Render fractal art" @@ -9926,7 +9923,7 @@ #: ../plug-ins/gradient-flare/gradient-flare.c:3201 #, c-format msgid "Are you sure you want to delete \"%s\" from the list and from disk?" -msgstr "Na pewno usunąć „%s” z listy i z dysku?" +msgstr "Na pewno usunąć „%s” z listy i z dysku?" #: ../plug-ins/fractal-explorer/fractal-explorer.c:755 msgid "Delete Fractal" @@ -9944,7 +9941,7 @@ "Line %d Option section incorrect" msgstr "" "Plik „%s” jest uszkodzony.\n" -"Wiersz %d w sekcji Option jest niepoprawny" +"%d. wiersz w sekcji Option jest niepoprawny" #: ../plug-ins/fractal-explorer/fractal-explorer.c:999 msgid "My first fractal" @@ -9952,7 +9949,7 @@ #: ../plug-ins/fractal-explorer/fractal-explorer.c:1063 msgid "Select folder and rescan collection" -msgstr "Wybiera katalog i odświeża kolekcję" +msgstr "Wybiera katalog i odświeża kolekcję" #: ../plug-ins/fractal-explorer/fractal-explorer.c:1075 msgid "Apply currently selected fractal" @@ -10156,7 +10153,7 @@ #: ../plug-ins/gfig/gfig-dialog.c:1054 msgid "This tool has no options" -msgstr "To narzędzie nie posiada opcji" +msgstr "To narzędzie nie ma opcji" #. Put buttons in #: ../plug-ins/gfig/gfig-dialog.c:1265 @@ -10260,11 +10257,11 @@ #: ../plug-ins/gfig/gfig-dialog.c:1742 msgid "Right" -msgstr "W prawo" +msgstr "W prawo" #: ../plug-ins/gfig/gfig-dialog.c:1743 msgid "Left" -msgstr "W lewo" +msgstr "W lewo" #: ../plug-ins/gfig/gfig-dialog.c:1753 #: ../plug-ins/gimpressionist/orientation.c:147 @@ -10320,13 +10317,15 @@ msgid "" "Error trying to save figure as a parasite: can't attach parasite to drawable." msgstr "" -"Błąd podczas próby zapisania figury jako pasożytu: nie można dołączyć " -"pasożytu do obszaru rysowania." +"Błąd podczas próby zapisania figury jako danych pasożytniczych: nie można " +"dołączyć danych pasożytniczych do obszaru rysowania." #: ../plug-ins/gfig/gfig.c:765 #, c-format msgid "Error trying to open temporary file '%s' for parasite loading: %s" -msgstr "Nie można otworzyć pliku tymczasowego „%s” do wczytania pasożytu: %s" +msgstr "" +"Nie można otworzyć pliku tymczasowego „%s” do wczytania danych " +"pasożytniczych: %s" #: ../plug-ins/gimpressionist/brush.c:243 msgid "Can only save drawables!" @@ -10368,7 +10367,7 @@ #: ../plug-ins/gimpressionist/brush.c:612 #: ../plug-ins/gimpressionist/paper.c:209 msgid "Specifies the amount of embossing to apply to the image (in percent)" -msgstr "Określa stopień wytłoczenia obrazu (w procentach)" +msgstr "Określa stopień wytłoczenia obrazu (w procentach)" #: ../plug-ins/gimpressionist/color.c:59 msgid "Co_lor" @@ -10388,7 +10387,7 @@ #: ../plug-ins/gimpressionist/color.c:82 msgid "Samples the color from the pixel in the center of the brush" -msgstr "Próbkuje kolor punktu, znajdującego się w środku pędzla" +msgstr "Próbkuje kolor punktu, znajdującego się w środku pędzla" #: ../plug-ins/gimpressionist/color.c:93 msgid "Color _noise:" @@ -10413,7 +10412,7 @@ #: ../plug-ins/gimpressionist/general.c:155 msgid "From paper" -msgstr "Z papieru" +msgstr "Z papieru" #: ../plug-ins/gimpressionist/general.c:156 msgid "Copy the texture of the selected paper as a background" @@ -10421,7 +10420,7 @@ #: ../plug-ins/gimpressionist/general.c:166 msgid "Solid colored background" -msgstr "Tło o jednolitym kolorze" +msgstr "Tło o jednolitym kolorze" #: ../plug-ins/gimpressionist/general.c:185 msgid "Use a transparent background; Only the strokes painted will be visible" @@ -10444,7 +10443,7 @@ #: ../plug-ins/gimpressionist/general.c:216 msgid "Selects if the resulting image should be seamlessly tileable" msgstr "" -"Określa, czy wynikowy obraz powinien układać się kafelkowo w sposób ciągły" +"Określa, czy wynikowy obraz powinien układać się kafelkowo w sposób ciągły" #: ../plug-ins/gimpressionist/general.c:221 msgid "Drop shadow" @@ -10591,7 +10590,7 @@ #: ../plug-ins/gimpressionist/orientation.c:183 #: ../plug-ins/gimpressionist/size.c:186 msgid "Adaptive" -msgstr "Adaptacyjne" +msgstr "Adaptatywne" #: ../plug-ins/gimpressionist/orientation.c:184 msgid "The direction that matches the original image the closest is selected" @@ -10704,7 +10703,7 @@ #: ../plug-ins/gimpressionist/orientmap.c:686 msgid "Offset all vectors with a given angle" -msgstr "Przesuwa wszystkie wektory o podanym kącie" +msgstr "Przesuwa wszystkie wektory o podanym kącie" #: ../plug-ins/gimpressionist/orientmap.c:697 msgid "Change the strength of the selected vector" @@ -10757,11 +10756,11 @@ #: ../plug-ins/gimpressionist/placement.c:88 msgid "Place strokes randomly around the image" -msgstr "Umieszcza pociągnięcia losowo w obrazie" +msgstr "Umieszcza pociągnięcia losowo w obrazie" #: ../plug-ins/gimpressionist/placement.c:92 msgid "The strokes are evenly distributed across the image" -msgstr "Rozmieszcza pociągnięcia losowo w obrazie" +msgstr "Rozmieszcza pociągnięcia losowo w obrazie" #: ../plug-ins/gimpressionist/placement.c:101 msgid "Centered" @@ -10818,7 +10817,7 @@ #: ../plug-ins/gimpressionist/presets.c:1078 msgid "Reread the folder of Presets" -msgstr "Ponownie odczytuje katalog z zapisanymi ustawieniami" +msgstr "Ponownie odczytuje katalog z zapisanymi ustawieniami" #: ../plug-ins/gimpressionist/preview.c:174 #: ../plug-ins/gimpressionist/repaint.c:1197 @@ -10978,7 +10977,7 @@ #: ../plug-ins/ui/plug-in-file-gif.ui.h:5 msgid "_Loop forever" -msgstr "_Powtarzanie w nieskończoność" +msgstr "_Powtarzanie w nieskończoność" #: ../plug-ins/ui/plug-in-file-gif.ui.h:6 msgid "_Delay between frames where unspecified:" @@ -11046,7 +11045,7 @@ #: ../plug-ins/gradient-flare/gradient-flare.c:807 msgid "Produce a lense flare effect using gradients" -msgstr "Tworzy efekt błysku soczewki używając gradientów" +msgstr "Tworzy efekt błysku soczewki za pomocą gradientów" #: ../plug-ins/gradient-flare/gradient-flare.c:812 msgid "_Gradient Flare..." @@ -11082,10 +11081,10 @@ "(gflare-path \"%s\")\n" "and make a folder '%s', then you can save your own GFlares into that folder." msgstr "" -"Plik GFlare „%s” nie został zapisany. Po dodaniu w pliku „%s” nowego wpisu w " -"postaci:\n" +"Plik GFlare „%s” nie został zapisany. Po dodaniu w pliku „%s” nowego wpisu " +"w postaci:\n" "(gflare-path \"%s\")\n" -"i utworzeniu katalogu %s będzie możliwe zapisywanie w nim własnych plików " +"i utworzeniu katalogu %s będzie możliwe zapisywanie w nim własnych plików " "GFlare." #: ../plug-ins/gradient-flare/gradient-flare.c:1485 @@ -11187,7 +11186,7 @@ #: ../plug-ins/gradient-flare/gradient-flare.c:3277 #, c-format msgid "not found %s in gflares_list" -msgstr "nie odnaleziono %s w gflares_list" +msgstr "nie odnaleziono %s w gflares_list" #: ../plug-ins/gradient-flare/gradient-flare.c:3318 msgid "Gradient Flare Editor" @@ -11410,7 +11409,7 @@ "Please install the additional help package or use the online user manual at: " "http://docs.gimp.org/" msgstr "" -"Proszę zainstalować dodatkowy pakiet pomocy lub skorzystać z podręcznika " +"Proszę zainstalować dodatkowy pakiet pomocy lub skorzystać z podręcznika " "użytkownika na stronie http://docs.gimp.org/" #: ../plug-ins/help/gimphelpdomain.c:202 @@ -11426,7 +11425,7 @@ #: ../plug-ins/help/gimphelplocale.c:257 #, c-format msgid "Loading index from '%s'" -msgstr "Wczytywanie indeksu z „%s”" +msgstr "Wczytywanie indeksu z „%s”" #: ../plug-ins/help/gimphelplocale.c:315 #, c-format @@ -11434,7 +11433,7 @@ "Parse error in '%s':\n" "%s" msgstr "" -"Błąd przetwarzania w „%s”:\n" +"Błąd przetwarzania w „%s”:\n" "%s" #: ../plug-ins/ifs-compose/ifs-compose.c:333 @@ -11738,7 +11737,7 @@ "suitable for navigation bars." msgstr "" "Prowadnice są wcześniej określonymi prostokątami pokrywającymi obraz. " -"Określa się je według ich szerokości, wysokości i odstępu między nimi. " +"Określa się je według ich szerokości, wysokości i odstępu między nimi. " "Umożliwia to szybkie tworzenie najczęściej używanego typu mapy obrazu — " "kolekcji obrazów „miniatur”, odpowiedniej dla pasków nawigacji." @@ -11752,15 +11751,15 @@ #: ../plug-ins/imagemap/imap_cmd_guides.c:184 msgid "_Horz. spacing:" -msgstr "Odstępy w pio_nie:" +msgstr "Odstępy w pio_nie:" #: ../plug-ins/imagemap/imap_cmd_guides.c:190 msgid "_No. across:" -msgstr "_Liczba w poprzek:" +msgstr "_Liczba w poprzek:" #: ../plug-ins/imagemap/imap_cmd_guides.c:196 msgid "_Vert. spacing:" -msgstr "Odstępy w po_ziomie:" +msgstr "Odstępy w po_ziomie:" #: ../plug-ins/imagemap/imap_cmd_guides.c:202 msgid "No. _down:" @@ -11787,7 +11786,7 @@ #: ../plug-ins/imagemap/imap_cmd_object_down.c:54 #: ../plug-ins/imagemap/imap_menu.c:175 msgid "Move Down" -msgstr "Przesuwa w dół" +msgstr "Przesuwa w dół" #: ../plug-ins/imagemap/imap_cmd_move_sash.c:69 msgid "Move Sash" @@ -11805,7 +11804,7 @@ #: ../plug-ins/imagemap/imap_cmd_object_up.c:54 #: ../plug-ins/imagemap/imap_menu.c:174 msgid "Move Up" -msgstr "Przesuwa w górę" +msgstr "Przesuwa w górę" #: ../plug-ins/imagemap/imap_cmd_paste.c:50 #: ../plug-ins/imagemap/imap_menu.c:160 @@ -11945,7 +11944,7 @@ #: ../plug-ins/imagemap/imap_grid.c:206 msgid "Grid Visibility and Type" -msgstr "Widoczność i typ siatki" +msgstr "Widoczność i typ siatki" #: ../plug-ins/imagemap/imap_grid.c:213 msgid "_Hidden" @@ -12086,11 +12085,11 @@ #: ../plug-ins/imagemap/imap_menu.c:165 msgid "Edit Area _Info..." -msgstr "Modyfikuj _informacje o obszarze…" +msgstr "Modyfikuj _informacje o obszarze…" #: ../plug-ins/imagemap/imap_menu.c:166 msgid "Edit selected area info" -msgstr "Modyfikuje informacje o zaznaczonym obszarze" +msgstr "Modyfikuje informacje o zaznaczonym obszarze" #: ../plug-ins/imagemap/imap_menu.c:167 msgid "Preferences" @@ -12134,11 +12133,11 @@ #: ../plug-ins/imagemap/imap_menu.c:187 msgid "Edit Map Info..." -msgstr "Modyfikuj informacje o mapie…" +msgstr "Modyfikuj informacje o mapie…" #: ../plug-ins/imagemap/imap_menu.c:188 msgid "Edit Map Info" -msgstr "Modyfikuj informacje o mapie" +msgstr "Modyfikuj informacje o mapie" #: ../plug-ins/imagemap/imap_menu.c:190 msgid "_Tools" @@ -12230,7 +12229,7 @@ #: ../plug-ins/imagemap/imap_preferences.c:383 msgid "_Prompt for area info" -msgstr "_Pytanie o informacje o obszarze" +msgstr "_Pytanie o informacje o obszarze" #: ../plug-ins/imagemap/imap_preferences.c:385 msgid "_Require default URL" @@ -12246,11 +12245,11 @@ #: ../plug-ins/imagemap/imap_preferences.c:391 msgid "Show area URL _tip" -msgstr "Wyświ_etlanie adresów URL obszarów w podpowiedzi" +msgstr "Wyświ_etlanie adresów URL obszarów w podpowiedzi" #: ../plug-ins/imagemap/imap_preferences.c:394 msgid "_Use double-sized grab handles" -msgstr "Uchwyty obszarów o po_dwójnej grubości" +msgstr "Uchwyty obszarów o po_dwójnej grubości" #: ../plug-ins/imagemap/imap_preferences.c:401 msgid "Menu" @@ -12322,7 +12321,7 @@ #: ../plug-ins/imagemap/imap_settings.c:89 msgid "Settings for this Mapfile" -msgstr "Ustawienia pliku z mapą obrazu" +msgstr "Ustawienia pliku z mapą obrazu" #: ../plug-ins/imagemap/imap_settings.c:93 msgid "Filename:" @@ -12387,12 +12386,12 @@ #: ../plug-ins/lighting/lighting-ui.c:315 msgid "Make destination image transparent where bump height is zero" msgstr "" -"Tworzenie obrazu docelowego jako przezroczystego z zerową wysokością " +"Tworzenie obrazu docelowego jako przezroczystego z zerową wysokością " "wypukłości" #: ../plug-ins/lighting/lighting-ui.c:318 msgid "Cre_ate new image" -msgstr "U_tworz nowy obraz" +msgstr "U_twórz nowy obraz" #: ../plug-ins/lighting/lighting-ui.c:328 #: ../plug-ins/map-object/map-object-ui.c:481 @@ -12490,12 +12489,12 @@ #: ../plug-ins/lighting/lighting-ui.c:487 #: ../plug-ins/map-object/map-object-ui.c:637 msgid "Light source X position in XYZ space" -msgstr "Położenie X źródła światła w przestrzeni XYZ" +msgstr "Położenie X źródła światła w przestrzeni XYZ" #: ../plug-ins/lighting/lighting-ui.c:502 #: ../plug-ins/map-object/map-object-ui.c:651 msgid "Light source Y position in XYZ space" -msgstr "Pozycja Y źródła światła w przestrzeni XYZ" +msgstr "Pozycja Y źródła światła w przestrzeni XYZ" #: ../plug-ins/lighting/lighting-ui.c:509 msgid "_Z:" @@ -12504,17 +12503,17 @@ #: ../plug-ins/lighting/lighting-ui.c:517 #: ../plug-ins/map-object/map-object-ui.c:665 msgid "Light source Z position in XYZ space" -msgstr "Pozycja Z źródła światła w przestrzeni XYZ" +msgstr "Pozycja Z źródła światła w przestrzeni XYZ" #: ../plug-ins/lighting/lighting-ui.c:537 #: ../plug-ins/map-object/map-object-ui.c:691 msgid "Light source X direction in XYZ space" -msgstr "Kierunek X źródła światła w przestrzeni XYZ" +msgstr "Kierunek X źródła światła w przestrzeni XYZ" #: ../plug-ins/lighting/lighting-ui.c:551 #: ../plug-ins/map-object/map-object-ui.c:704 msgid "Light source Y direction in XYZ space" -msgstr "Kierunek Y źródła światła w przestrzeni XYZ" +msgstr "Kierunek Y źródła światła w przestrzeni XYZ" #: ../plug-ins/lighting/lighting-ui.c:557 #: ../plug-ins/map-object/map-object-ui.c:657 @@ -12528,7 +12527,7 @@ #: ../plug-ins/lighting/lighting-ui.c:565 #: ../plug-ins/map-object/map-object-ui.c:717 msgid "Light source Z direction in XYZ space" -msgstr "Kierunek Z źródła światła w przestrzeni XYZ" +msgstr "Kierunek Z źródła światła w przestrzeni XYZ" #: ../plug-ins/lighting/lighting-ui.c:568 msgid "I_solate" @@ -12594,7 +12593,7 @@ #: ../plug-ins/lighting/lighting-ui.c:842 msgid "Bumpm_ap image:" -msgstr "O_braz z mapą wypukłości:" +msgstr "O_braz z mapą wypukłości:" #: ../plug-ins/lighting/lighting-ui.c:846 msgid "Logarithmic" @@ -12661,7 +12660,7 @@ #: ../plug-ins/lighting/lighting-ui.c:1105 msgid "Enable/disable real time preview of changes" -msgstr "Włącza/wyłącza podglądu w czasie rzeczywistym" +msgstr "Włącza/wyłącza podglądu w czasie rzeczywistym" #: ../plug-ins/lighting/lighting-ui.c:1149 msgid "Save Lighting Preset" @@ -12835,15 +12834,15 @@ #: ../plug-ins/map-object/map-object-ui.c:954 msgid "Object X position in XYZ space" -msgstr "Współrzędna X obiektu w przestrzeni XYZ" +msgstr "Współrzędna X obiektu w przestrzeni XYZ" #: ../plug-ins/map-object/map-object-ui.c:967 msgid "Object Y position in XYZ space" -msgstr "Współrzędna Y obiektu w przestrzeni XYZ" +msgstr "Współrzędna Y obiektu w przestrzeni XYZ" #: ../plug-ins/map-object/map-object-ui.c:980 msgid "Object Z position in XYZ space" -msgstr "Współrzędna Z obiektu w przestrzeni XYZ" +msgstr "Współrzędna Z obiektu w przestrzeni XYZ" #: ../plug-ins/map-object/map-object-ui.c:1003 msgid "Rotation angle about X axis" @@ -12934,11 +12933,11 @@ #: ../plug-ins/maze/maze-algorithms.c:278 msgid "Constructing maze using Prim's Algorithm" -msgstr "Tworzenie labiryntu używając algorytmu Prima" +msgstr "Tworzenie labiryntu za pomocą algorytmu Prima" #: ../plug-ins/maze/maze-algorithms.c:488 msgid "Constructing tileable maze using Prim's Algorithm" -msgstr "Tworzenie kafelkowalnego labiryntu używając algorytmu Prima" +msgstr "Tworzenie kafelkowalnego labiryntu za pomocą algorytmu Prima" #: ../plug-ins/maze/maze-dialog.c:162 msgid "Maze" @@ -13046,7 +13045,7 @@ #: ../plug-ins/metadata/interface.c:447 msgid "Import XMP from File" -msgstr "Import XMP z pliku" +msgstr "Import XMP z pliku" #: ../plug-ins/metadata/interface.c:498 msgid "Cannot create file" @@ -13078,7 +13077,7 @@ #: ../plug-ins/metadata/metadata.c:185 msgid "View and edit metadata (EXIF, IPTC, XMP)" -msgstr "Wyświetla i modyfikuje metadane (EXIF, IPTC, XMP)" +msgstr "Wyświetla i modyfikuje metadane (EXIF, IPTC, XMP)" #: ../plug-ins/metadata/metadata.c:194 msgid "Propert_ies" @@ -13092,18 +13091,18 @@ #: ../plug-ins/metadata/xmp-parse.c:253 #, c-format msgid "Error on line %d char %d: %s" -msgstr "Błąd w wierszu %d, znaku %d: %s" +msgstr "Błąd w %d. wierszu, %d. znaku: %s" #: ../plug-ins/metadata/xmp-parse.c:275 #, c-format msgid "Expected text or optional element <%s>, found <%s> instead" msgstr "" -"Nieoczekiwany tekst lub opcjonalny element <%s> odnaleziono w <%s> zamiast" +"Nieoczekiwany tekst lub opcjonalny element <%s> odnaleziono w <%s> zamiast" #: ../plug-ins/metadata/xmp-parse.c:279 #, c-format msgid "Expected element <%s>, found <%s> instead" -msgstr "Oczekiwany element <%s> odnaleziono w <%s> zamiast" +msgstr "Oczekiwany element <%s> odnaleziono w <%s> zamiast" #: ../plug-ins/metadata/xmp-parse.c:294 #, c-format @@ -13118,12 +13117,12 @@ #: ../plug-ins/metadata/xmp-parse.c:676 #, c-format msgid "Required attribute rdf:about missing in <%s>" -msgstr "Brak wymaganego atrybutu rdf:about w <%s>" +msgstr "Brak wymaganego atrybutu rdf:about w <%s>" #: ../plug-ins/metadata/xmp-parse.c:902 #, c-format msgid "Nested elements (<%s>) are not allowed in this context" -msgstr "Zagnieżdżone elementy (<%s>) nie są dozwolone w tym kontekście" +msgstr "Osadzone elementy (<%s>) nie są dozwolone w tym kontekście" #: ../plug-ins/metadata/xmp-parse.c:1031 #, c-format @@ -13145,7 +13144,7 @@ #: ../plug-ins/metadata/xmp-parse.c:1191 msgid "XMP cannot contain XML comments or processing instructions" -msgstr "XMP nie może zawierać komentarzy i instrukcji przetwarzania XML" +msgstr "XMP nie może zawierać komentarzy i instrukcji przetwarzania XML" #: ../plug-ins/pagecurl/pagecurl.c:216 msgid "Curl up one of the image corners" @@ -13268,7 +13267,7 @@ #: ../plug-ins/print/print.c:123 msgid "Adjust page size and orientation for printing" -msgstr "Dostosowuje wymiary strony i ułożenie dla drukowania" +msgstr "Dostosowuje wymiary strony i ułożenie dla drukowania" #: ../plug-ins/print/print.c:129 msgid "Page Set_up" @@ -13330,11 +13329,11 @@ #: ../plug-ins/win-snap/winsnap.c:930 msgid "Seconds delay" -msgstr "Opóźnienie w sekundach" +msgstr "Opóźnienie w sekundach" #: ../plug-ins/win-snap/winsnap.c:937 msgid "Include decorations" -msgstr "Wraz z dekoracją" +msgstr "Wraz z dekoracją" #: ../plug-ins/win-snap/winsnap.c:996 msgid "Capture a window or desktop image" diff -Nru gimp-2.8.18/po-plug-ins/rw.po gimp-2.8.20/po-plug-ins/rw.po --- gimp-2.8.18/po-plug-ins/rw.po 2015-08-20 22:57:36.000000000 +0000 +++ gimp-2.8.20/po-plug-ins/rw.po 2017-01-28 18:58:06.000000000 +0000 @@ -23,7 +23,6 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"ULL NAME \n" #: plug-ins/FractalExplorer/Dialogs.c:548 plug-ins/gfig/gfig-dialog.c:280 #: plug-ins/gflare/gflare.c:894 diff -Nru gimp-2.8.18/po-plug-ins/sl.po gimp-2.8.20/po-plug-ins/sl.po --- gimp-2.8.18/po-plug-ins/sl.po 2015-11-01 01:20:52.000000000 +0000 +++ gimp-2.8.20/po-plug-ins/sl.po 2017-01-28 19:08:46.000000000 +0000 @@ -15,7 +15,7 @@ "PO-Revision-Date: 2015-08-10 17:50+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: Martin Srebotnjak \n" -"Language: sl_SI\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po-plug-ins/sr@latin.po gimp-2.8.20/po-plug-ins/sr@latin.po --- gimp-2.8.18/po-plug-ins/sr@latin.po 2015-08-20 22:57:36.000000000 +0000 +++ gimp-2.8.20/po-plug-ins/sr@latin.po 2017-01-28 19:08:46.000000000 +0000 @@ -14,7 +14,7 @@ "PO-Revision-Date: 2014-03-30 15:00+0200\n" "Last-Translator: Miroslav Nikolić \n" "Language-Team: Serbian \n" -"Language: sr\n" +"Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po-plug-ins/zh_HK.po gimp-2.8.20/po-plug-ins/zh_HK.po --- gimp-2.8.18/po-plug-ins/zh_HK.po 2015-08-20 22:57:36.000000000 +0000 +++ gimp-2.8.20/po-plug-ins/zh_HK.po 2017-01-28 19:08:47.000000000 +0000 @@ -12,7 +12,7 @@ "PO-Revision-Date: 2012-09-05 14:01+0800\n" "Last-Translator: taijuin \n" "Language-Team: Chinese (Hong Kong) \n" -"Language: zh_TW\n" +"Language: zh_HK\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po-python/bs.po gimp-2.8.20/po-python/bs.po --- gimp-2.8.18/po-python/bs.po 2015-08-15 07:52:46.000000000 +0000 +++ gimp-2.8.20/po-python/bs.po 2017-01-28 18:58:06.000000000 +0000 @@ -11,6 +11,7 @@ "PO-Revision-Date: 2015-02-05 00:25+0000\n" "Last-Translator: Izudin Vragić \n" "Language-Team: Bosnian \n" +"Language: bs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po-python/ca@valencia.po gimp-2.8.20/po-python/ca@valencia.po --- gimp-2.8.18/po-python/ca@valencia.po 2015-08-15 07:52:46.000000000 +0000 +++ gimp-2.8.20/po-python/ca@valencia.po 2017-01-28 18:58:06.000000000 +0000 @@ -15,7 +15,7 @@ "PO-Revision-Date: 2011-06-14 17:48+0100\n" "Last-Translator: Albert F. \n" "Language-Team: Catalan \n" -"Language: ca-XV\n" +"Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po-python/fi.po gimp-2.8.20/po-python/fi.po --- gimp-2.8.18/po-python/fi.po 2015-08-20 22:57:36.000000000 +0000 +++ gimp-2.8.20/po-python/fi.po 2017-01-28 19:08:47.000000000 +0000 @@ -4,20 +4,22 @@ # Mikko Paananen, 2004. # Ville Hautamäki , 2000. # Lasse Liehu , 2014. +# Jiri Grönroos , 2016. +# msgid "" msgstr "" "Project-Id-Version: tiny-fu\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2014-05-21 05:25+0000\n" -"PO-Revision-Date: 2014-05-21 18:16+0300\n" -"Last-Translator: Lasse Liehu \n" -"Language-Team: Finnish \n" +"product=gimp&keywords=I18N+L10N&component=Internationalisation\n" +"POT-Creation-Date: 2016-10-09 08:47+0000\n" +"PO-Revision-Date: 2016-10-09 12:07+0300\n" +"Last-Translator: Jiri Grönroos \n" +"Language-Team: suomi \n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Gtranslator 2.91.7\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../plug-ins/pygimp/gimpfu.py:394 @@ -26,7 +28,6 @@ #: ../plug-ins/pygimp/gimpfu.py:403 #, python-format -#| msgid "An error occured running %s" msgid "An error occurred running %s" msgstr "Tapahtui virhe suoritettaessa %s" @@ -34,24 +35,24 @@ msgid "_More Information" msgstr "_Lisätietoja" -#: ../plug-ins/pygimp/gimpfu.py:526 ../plug-ins/pygimp/gimpfu.py:538 -#: ../plug-ins/pygimp/gimpfu.py:544 +#: ../plug-ins/pygimp/gimpfu.py:527 ../plug-ins/pygimp/gimpfu.py:539 +#: ../plug-ins/pygimp/gimpfu.py:545 msgid "No" msgstr "Ei" -#: ../plug-ins/pygimp/gimpfu.py:536 ../plug-ins/pygimp/gimpfu.py:544 +#: ../plug-ins/pygimp/gimpfu.py:537 ../plug-ins/pygimp/gimpfu.py:545 msgid "Yes" msgstr "Kyllä" -#: ../plug-ins/pygimp/gimpfu.py:597 ../plug-ins/pygimp/gimpui.py:223 +#: ../plug-ins/pygimp/gimpfu.py:598 ../plug-ins/pygimp/gimpui.py:223 msgid "Python-Fu File Selection" msgstr "Python-Fu tiedostovalinta" -#: ../plug-ins/pygimp/gimpfu.py:643 +#: ../plug-ins/pygimp/gimpfu.py:644 msgid "Python-Fu Folder Selection" msgstr "Python-Fu kansiovalinta" -#: ../plug-ins/pygimp/gimpfu.py:732 +#: ../plug-ins/pygimp/gimpfu.py:733 #, python-format msgid "Invalid input for '%s'" msgstr "Virheellinen syöte skriptille \"%s\"" @@ -102,7 +103,7 @@ #: ../plug-ins/pygimp/plug-ins/gradients-save-as-css.py:96 msgid "Gradient to use" -msgstr "" +msgstr "Käytettävä väriliuku" #: ../plug-ins/pygimp/plug-ins/gradients-save-as-css.py:97 msgid "File Name" @@ -325,11 +326,11 @@ #: ../plug-ins/pygimp/plug-ins/text-brush.py:76 msgid "Create a new brush with characters from a text sequence" -msgstr "" +msgstr "Luo uusi sivellin tekstissä olevissa merkeistä" #: ../plug-ins/pygimp/plug-ins/text-brush.py:82 msgid "New Brush from _Text..." -msgstr "" +msgstr "Uusi sivellin _tekstistä..." #: ../plug-ins/pygimp/plug-ins/text-brush.py:85 msgid "Font" @@ -337,10 +338,8 @@ #: ../plug-ins/pygimp/plug-ins/text-brush.py:86 msgid "Pixel Size" -msgstr "" +msgstr "Pikselikoko" #: ../plug-ins/pygimp/plug-ins/text-brush.py:87 -#| msgid "Text file" msgid "Text" msgstr "Teksti" - diff -Nru gimp-2.8.18/po-python/nb.po gimp-2.8.20/po-python/nb.po --- gimp-2.8.18/po-python/nb.po 2015-08-20 22:57:36.000000000 +0000 +++ gimp-2.8.20/po-python/nb.po 2017-01-28 19:08:47.000000000 +0000 @@ -10,7 +10,7 @@ "PO-Revision-Date: 2011-07-18 23:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" -"Language: no\n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" diff -Nru gimp-2.8.18/po-python/pa.po gimp-2.8.20/po-python/pa.po --- gimp-2.8.18/po-python/pa.po 2015-08-20 22:57:36.000000000 +0000 +++ gimp-2.8.20/po-python/pa.po 2017-01-28 18:58:06.000000000 +0000 @@ -4,48 +4,6 @@ # This file is distributed under the same license as the gimp-python packageJaswinder Singh Phulewala , 2004. # Amanpreet Singh Alam , 2004. # Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. -# Amanpreet Singh Alam[ਆਲਮ] , 2005. # # msgid "" diff -Nru gimp-2.8.18/po-python/pl.po gimp-2.8.20/po-python/pl.po --- gimp-2.8.18/po-python/pl.po 2015-11-01 01:20:52.000000000 +0000 +++ gimp-2.8.20/po-python/pl.po 2017-01-28 19:08:47.000000000 +0000 @@ -1,35 +1,31 @@ -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Aviary.pl -# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz -# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: -# gnomepl@aviary.pl -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +# Polish translation for gimp-python. +# Copyright © 1999-2016 the gimp authors. +# This file is distributed under the same license as the gimp package. # GNOME PL Team , 1999-2005. # Artur Polaczyński , 1999, 2000. # Hubert Stachurski , 2008. # Bartosz Kosiorek , 2005-2011. -# Piotr Drąg , 2011-2015. -# Aviary.pl , 2011-2015. +# Piotr Drąg , 2011-2016. +# Aviary.pl , 2011-2016. +# msgid "" msgstr "" "Project-Id-Version: gimp-python\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-29 18:17+0200\n" -"PO-Revision-Date: 2015-08-29 18:18+0200\n" +"POT-Creation-Date: 2016-09-07 18:48+0200\n" +"PO-Revision-Date: 2016-09-07 18:49+0200\n" "Last-Translator: Piotr Drąg \n" -"Language-Team: Polish \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Poedit-Language: Polish\n" -"X-Poedit-Country: Poland\n" #: ../plug-ins/pygimp/gimpfu.py:394 msgid "Missing exception information" -msgstr "Brak informacji o wyjątku" +msgstr "Brak informacji o wyjątku" #: ../plug-ins/pygimp/gimpfu.py:403 #, python-format @@ -100,7 +96,7 @@ #: ../plug-ins/pygimp/plug-ins/colorxhtml.py:204 msgid "Fo_nt size in pixels" -msgstr "Rozmiar _czcionki w pikselach" +msgstr "Rozmiar _czcionki w pikselach" #: ../plug-ins/pygimp/plug-ins/colorxhtml.py:205 msgid "_Write a separate CSS file" @@ -144,7 +140,7 @@ #: ../plug-ins/pygimp/plug-ins/palette-offset.py:44 msgid "Offset the colors in a palette" -msgstr "Przesuwa kolory w palecie " +msgstr "Przesuwa kolory w palecie " #: ../plug-ins/pygimp/plug-ins/palette-offset.py:49 msgid "_Offset Palette..." @@ -163,7 +159,7 @@ #: ../plug-ins/pygimp/plug-ins/palette-sort.py:48 msgid "Sort the colors in a palette" -msgstr "Porządkuje kolory w palecie" +msgstr "Porządkuje kolory w palecie" #: ../plug-ins/pygimp/plug-ins/palette-sort.py:53 msgid "_Sort Palette..." @@ -203,7 +199,7 @@ #: ../plug-ins/pygimp/plug-ins/palette-to-gradient.py:52 msgid "Create a repeating gradient using colors from the palette" -msgstr "Tworzy powtarzający się gradient używając kolorów z palety" +msgstr "Tworzy powtarzający się gradient za pomocą kolorów z palety" #: ../plug-ins/pygimp/plug-ins/palette-to-gradient.py:57 msgid "Palette to _Repeating Gradient" @@ -211,7 +207,7 @@ #: ../plug-ins/pygimp/plug-ins/palette-to-gradient.py:74 msgid "Create a gradient using colors from the palette" -msgstr "Tworzy gradient używając kolorów z palety" +msgstr "Tworzy gradient za pomocą kolorów z palety" #: ../plug-ins/pygimp/plug-ins/palette-to-gradient.py:79 msgid "Palette to _Gradient" @@ -224,7 +220,7 @@ #. table snippet means a small piece of HTML code here #: ../plug-ins/pygimp/plug-ins/py-slice.py:420 msgid "Cuts an image along its guides, creates images and a HTML table snippet" -msgstr "Obcina obraz wzdłuż prowadnic, tworzy obrazy i fragmenty tabel HTML " +msgstr "Obcina obraz wzdłuż prowadnic, tworzy obrazy i fragmenty tabel HTML " #: ../plug-ins/pygimp/plug-ins/py-slice.py:431 msgid "_Slice..." @@ -260,7 +256,7 @@ #: ../plug-ins/pygimp/plug-ins/py-slice.py:445 msgid "Javascript for onmouseover and clicked" -msgstr "JavaScript dla zdarzeń „onmouseover” i „clicked”" +msgstr "JavaScript dla zdarzeń „onmouseover” i „clicked”" #. table caps are table cells on the edge of the table #: ../plug-ins/pygimp/plug-ins/py-slice.py:448 @@ -303,11 +299,11 @@ #: ../plug-ins/pygimp/plug-ins/shadow_bevel.py:60 msgid "Add a drop shadow to a layer, and optionally bevel it" -msgstr "Rzuca cień na warstwę i opcjonalnie krawędź" +msgstr "Rzuca cień na warstwę i opcjonalnie krawędź" #: ../plug-ins/pygimp/plug-ins/shadow_bevel.py:65 msgid "_Drop Shadow and Bevel..." -msgstr "_Rzuć cień i krawędź…" +msgstr "_Rzuć cień i krawędź…" #: ../plug-ins/pygimp/plug-ins/shadow_bevel.py:70 msgid "_Shadow blur" @@ -321,23 +317,23 @@ msgid "_Drop shadow" msgstr "_Rzuć cień" -# "drop shadow" pominięte ze względu na zgodność z aktualnym tłumaczeniem (filtr->rzucanie cienia) +# "drop shadow" pominięte ze względu na zgodność z obecnym tłumaczeniem (filtr→rzucanie cienia) #: ../plug-ins/pygimp/plug-ins/shadow_bevel.py:73 msgid "Drop shadow _X displacement" msgstr "Przesunięcie _X cienia" -# "drop shadow" pominięte ze względu na zgodność z aktualnym tłumaczeniem (filtr->rzucanie cienia) +# "drop shadow" pominięte ze względu na zgodność z obecnym tłumaczeniem (filtr→rzucanie cienia) #: ../plug-ins/pygimp/plug-ins/shadow_bevel.py:74 msgid "Drop shadow _Y displacement" msgstr "Przesunięcie _Y cienia" #: ../plug-ins/pygimp/plug-ins/text-brush.py:76 msgid "Create a new brush with characters from a text sequence" -msgstr "Tworzy nowy pędzel za pomocą znaków z tekstu" +msgstr "Tworzy nowy pędzel za pomocą znaków z tekstu" #: ../plug-ins/pygimp/plug-ins/text-brush.py:82 msgid "New Brush from _Text..." -msgstr "Nowy pędzel z _tekstu…" +msgstr "Nowy pędzel z _tekstu…" #: ../plug-ins/pygimp/plug-ins/text-brush.py:85 msgid "Font" diff -Nru gimp-2.8.18/po-python/rw.po gimp-2.8.20/po-python/rw.po --- gimp-2.8.18/po-python/rw.po 2015-08-20 22:57:36.000000000 +0000 +++ gimp-2.8.20/po-python/rw.po 2017-01-28 18:58:06.000000000 +0000 @@ -23,7 +23,6 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"ULL NAME \n" #: ../plug-ins/pygimp/plug-ins/gimpcons.py:43 msgid "Python Console" diff -Nru gimp-2.8.18/po-python/sr@latin.po gimp-2.8.20/po-python/sr@latin.po --- gimp-2.8.18/po-python/sr@latin.po 2015-08-20 22:57:36.000000000 +0000 +++ gimp-2.8.20/po-python/sr@latin.po 2017-01-28 19:08:47.000000000 +0000 @@ -13,7 +13,7 @@ "PO-Revision-Date: 2014-03-27 09:31+0200\n" "Last-Translator: Miroslav Nikolić \n" "Language-Team: Serbian \n" -"Language: sr\n" +"Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po-python/zh_HK.po gimp-2.8.20/po-python/zh_HK.po --- gimp-2.8.18/po-python/zh_HK.po 2015-08-20 22:57:36.000000000 +0000 +++ gimp-2.8.20/po-python/zh_HK.po 2017-01-28 19:08:47.000000000 +0000 @@ -12,7 +12,7 @@ "PO-Revision-Date: 2012-09-05 14:00+0800\n" "Last-Translator: taijuin \n" "Language-Team: Chinese (Hong Kong) \n" -"Language: zh_TW\n" +"Language: zh_HK\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po-script-fu/ca@valencia.po gimp-2.8.20/po-script-fu/ca@valencia.po --- gimp-2.8.18/po-script-fu/ca@valencia.po 2015-08-20 22:57:36.000000000 +0000 +++ gimp-2.8.20/po-script-fu/ca@valencia.po 2017-01-28 19:08:47.000000000 +0000 @@ -15,7 +15,7 @@ "PO-Revision-Date: 2011-12-22 23:13+0100\n" "Last-Translator: Albert F. \n" "Language-Team: Catalan \n" -"Language: ca-XV\n" +"Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po-script-fu/cs.po gimp-2.8.20/po-script-fu/cs.po --- gimp-2.8.18/po-script-fu/cs.po 2015-08-20 22:57:36.000000000 +0000 +++ gimp-2.8.20/po-script-fu/cs.po 2017-01-28 19:08:47.000000000 +0000 @@ -8,21 +8,23 @@ # Miloslav Trmac , 2003 - 2005. # Jakub Friedl , 2006, 2007. # JardaK , 2009. -# Marek Černocký , 2012. +# Marek Černocký , 2012, 2016. # msgid "" msgstr "" -"Project-Id-Version: script-fu\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-04 00:47+1200\n" -"PO-Revision-Date: 2012-01-08 14:37+0100\n" -"Last-Translator: JardaK \n" -"Language-Team: Czech \n" +"Project-Id-Version: script-fu gimp-2.8\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=gimp&keywords=I18N+L10N&component=Internationalisation\n" +"POT-Creation-Date: 2016-09-19 09:56+0000\n" +"PO-Revision-Date: 2016-09-21 09:51+0200\n" +"Last-Translator: Marek Černocký \n" +"Language-Team: čeština \n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Gtranslator 2.91.7\n" #: ../plug-ins/script-fu/script-fu.c:111 msgid "Interactive console for Script-Fu development" @@ -138,16 +140,16 @@ msgid "Script-Fu evaluation mode only allows non-interactive invocation" msgstr "Vyhodnocovací režim Script-fu umožňuje pouze neinteraktivní spuštění" -#: ../plug-ins/script-fu/script-fu-interface.c:198 +#: ../plug-ins/script-fu/script-fu-interface.c:200 msgid "Script-Fu cannot process two scripts at the same time." msgstr "Script-Fu nemůže zpracovávat dva skripty současně." -#: ../plug-ins/script-fu/script-fu-interface.c:200 +#: ../plug-ins/script-fu/script-fu-interface.c:202 #, c-format msgid "You are already running the \"%s\" script." msgstr "Již máte spuštěn skript „%s“." -#: ../plug-ins/script-fu/script-fu-interface.c:226 +#: ../plug-ins/script-fu/script-fu-interface.c:228 #, c-format msgid "Script-Fu: %s" msgstr "Script-Fu: %s" @@ -155,44 +157,44 @@ #. we add a colon after the label; #. * some languages want an extra space here #. -#: ../plug-ins/script-fu/script-fu-interface.c:290 +#: ../plug-ins/script-fu/script-fu-interface.c:292 #, c-format msgid "%s:" msgstr "%s:" -#: ../plug-ins/script-fu/script-fu-interface.c:337 +#: ../plug-ins/script-fu/script-fu-interface.c:339 msgid "Script-Fu Color Selection" msgstr "Script-Fu výběr barvy" -#: ../plug-ins/script-fu/script-fu-interface.c:446 +#: ../plug-ins/script-fu/script-fu-interface.c:448 msgid "Script-Fu File Selection" msgstr "Script-Fu výběr souboru" -#: ../plug-ins/script-fu/script-fu-interface.c:449 +#: ../plug-ins/script-fu/script-fu-interface.c:451 msgid "Script-Fu Folder Selection" msgstr "Script-Fu výběr složky" -#: ../plug-ins/script-fu/script-fu-interface.c:462 +#: ../plug-ins/script-fu/script-fu-interface.c:464 msgid "Script-Fu Font Selection" msgstr "Script-Fu výběr písma" -#: ../plug-ins/script-fu/script-fu-interface.c:470 +#: ../plug-ins/script-fu/script-fu-interface.c:472 msgid "Script-Fu Palette Selection" msgstr "Script-Fu výběr palety" -#: ../plug-ins/script-fu/script-fu-interface.c:479 +#: ../plug-ins/script-fu/script-fu-interface.c:481 msgid "Script-Fu Pattern Selection" msgstr "Script-Fu výběr vzorku" -#: ../plug-ins/script-fu/script-fu-interface.c:488 +#: ../plug-ins/script-fu/script-fu-interface.c:490 msgid "Script-Fu Gradient Selection" msgstr "Script-Fu výběr přechodu" -#: ../plug-ins/script-fu/script-fu-interface.c:497 +#: ../plug-ins/script-fu/script-fu-interface.c:499 msgid "Script-Fu Brush Selection" msgstr "Script-Fu výběr stopy" -#: ../plug-ins/script-fu/script-fu-interface.c:840 +#: ../plug-ins/script-fu/script-fu-interface.c:868 #, c-format msgid "Error while executing %s:" msgstr "Chyba při spouštění %s:" @@ -216,7 +218,7 @@ #: ../plug-ins/script-fu/script-fu-server.c:862 msgid "Listen on IP:" -msgstr "" +msgstr "Naslouchat na adrese:" #: ../plug-ins/script-fu/script-fu-server.c:869 msgid "Server port:" @@ -231,6 +233,8 @@ "Listening on an IP address other than 127.0.0.1 (especially 0.0.0.0) can " "allow attackers to remotely execute arbitrary code on this machine." msgstr "" +"Naslouchání na jiné IP adrese než 127.0.0.1 (hlavně 0.0.0.0) může umožnit " +"útočníkům vzdáleně spustit libovolný kód na tomto počítači." #: ../plug-ins/script-fu/scripts/3d-outline.scm:120 #: ../plug-ins/script-fu/scripts/3d-outline.scm:166 @@ -252,7 +256,7 @@ #: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm:85 #: ../plug-ins/script-fu/scripts/chip-away.scm:155 #: ../plug-ins/script-fu/scripts/chip-away.scm:202 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:128 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:126 msgid "Pattern" msgstr "Vzorek" @@ -329,7 +333,7 @@ #: ../plug-ins/script-fu/scripts/speed-text.scm:92 #: ../plug-ins/script-fu/scripts/starscape-logo.scm:145 #: ../plug-ins/script-fu/scripts/text-circle.scm:213 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:167 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:165 #: ../plug-ins/script-fu/scripts/title-header.scm:171 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:144 msgid "Text" @@ -365,7 +369,7 @@ #: ../plug-ins/script-fu/scripts/speed-text.scm:94 #: ../plug-ins/script-fu/scripts/starscape-logo.scm:146 #: ../plug-ins/script-fu/scripts/text-circle.scm:217 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:168 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:166 #: ../plug-ins/script-fu/scripts/title-header.scm:172 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:145 msgid "Font size (pixels)" @@ -402,7 +406,7 @@ #: ../plug-ins/script-fu/scripts/speed-text.scm:93 #: ../plug-ins/script-fu/scripts/starscape-logo.scm:147 #: ../plug-ins/script-fu/scripts/text-circle.scm:219 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:169 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:167 #: ../plug-ins/script-fu/scripts/title-header.scm:173 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:146 msgid "Font" @@ -461,8 +465,8 @@ #: ../plug-ins/script-fu/scripts/news-text.scm:90 #: ../plug-ins/script-fu/scripts/speed-text.scm:97 #: ../plug-ins/script-fu/scripts/swirltile.scm:65 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:132 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:174 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:130 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:172 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:111 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:151 #: ../plug-ins/script-fu/scripts/truchet.scm:173 @@ -1101,7 +1105,7 @@ msgstr "Barva 3" #: ../plug-ins/script-fu/scripts/camo.scm:105 -#: ../plug-ins/script-fu/scripts/distress-selection.scm:113 +#: ../plug-ins/script-fu/scripts/distress-selection.scm:116 msgid "Smooth" msgstr "Vyhladit" @@ -1155,7 +1159,7 @@ #: ../plug-ins/script-fu/scripts/carve-it.scm:182 msgid "Stencil C_arve..." -msgstr "_Vyřezat…" +msgstr "Řez_ba…" #: ../plug-ins/script-fu/scripts/carve-it.scm:190 msgid "Image to carve" @@ -1471,39 +1475,39 @@ msgid "Background image" msgstr "Obrázek na pozadí" -#: ../plug-ins/script-fu/scripts/difference-clouds.scm:67 +#: ../plug-ins/script-fu/scripts/difference-clouds.scm:70 msgid "Difference Clouds..." msgstr "Odečíst mraky…" -#: ../plug-ins/script-fu/scripts/difference-clouds.scm:68 +#: ../plug-ins/script-fu/scripts/difference-clouds.scm:71 msgid "Solid noise applied with Difference layer mode" msgstr "Rovnoměrný šum aplikovaný režimem rozdílu vrstev" -#: ../plug-ins/script-fu/scripts/distress-selection.scm:102 +#: ../plug-ins/script-fu/scripts/distress-selection.scm:105 msgid "_Distort..." msgstr "_Deformovat…" -#: ../plug-ins/script-fu/scripts/distress-selection.scm:103 +#: ../plug-ins/script-fu/scripts/distress-selection.scm:106 msgid "Distress the selection" msgstr "Deformovat výběr" -#: ../plug-ins/script-fu/scripts/distress-selection.scm:110 +#: ../plug-ins/script-fu/scripts/distress-selection.scm:113 msgid "Threshold (bigger 1<-->254 smaller)" msgstr "Práh (větší 1<-->255 menší)" -#: ../plug-ins/script-fu/scripts/distress-selection.scm:111 +#: ../plug-ins/script-fu/scripts/distress-selection.scm:114 msgid "Spread" msgstr "Rozprostřít" -#: ../plug-ins/script-fu/scripts/distress-selection.scm:112 +#: ../plug-ins/script-fu/scripts/distress-selection.scm:115 msgid "Granularity (1 is low)" msgstr "Zrnitost (1 je malá)" -#: ../plug-ins/script-fu/scripts/distress-selection.scm:114 +#: ../plug-ins/script-fu/scripts/distress-selection.scm:117 msgid "Smooth horizontally" msgstr "Vyhladit vodorovně" -#: ../plug-ins/script-fu/scripts/distress-selection.scm:115 +#: ../plug-ins/script-fu/scripts/distress-selection.scm:118 msgid "Smooth vertically" msgstr "Vyhladit svisle" @@ -1883,7 +1887,7 @@ "Přidat do vybrané oblasti (nebo alfakanálu) a zářivý vzhled a efekt zkosení" #: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:102 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:127 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:125 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:106 msgid "Border size (pixels)" msgstr "Velikost okraje (v pixelech)" @@ -1928,9 +1932,9 @@ msgstr "Nová vodítka z _výběru" #: ../plug-ins/script-fu/scripts/guides-from-selection.scm:33 -#, fuzzy msgid "Create four guides around the bounding box of the current selection" -msgstr "Zaoblit rohy aktuálního výběru" +msgstr "" +"Vytvořit čtyři vodicí linky podle ohraničujicího obdélníku aktuálního výběru" #: ../plug-ins/script-fu/scripts/guides-new-percent.scm:27 msgid "New Guide (by _Percent)..." @@ -2032,29 +2036,29 @@ msgid "Use current gradient" msgstr "Použít aktuální přechod" -#: ../plug-ins/script-fu/scripts/line-nova.scm:106 +#: ../plug-ins/script-fu/scripts/line-nova.scm:108 msgid "Line _Nova..." msgstr "Čárová _nova…" -#: ../plug-ins/script-fu/scripts/line-nova.scm:107 +#: ../plug-ins/script-fu/scripts/line-nova.scm:109 msgid "" "Fill a layer with rays emanating outward from its center using the " "foreground color" msgstr "Vyplnit vrstvu paprsky v barvě popředí vycházejícími ze středu" -#: ../plug-ins/script-fu/scripts/line-nova.scm:114 +#: ../plug-ins/script-fu/scripts/line-nova.scm:116 msgid "Number of lines" msgstr "Počet čar" -#: ../plug-ins/script-fu/scripts/line-nova.scm:115 +#: ../plug-ins/script-fu/scripts/line-nova.scm:117 msgid "Sharpness (degrees)" msgstr "Ostrost (ve stupních)" -#: ../plug-ins/script-fu/scripts/line-nova.scm:116 +#: ../plug-ins/script-fu/scripts/line-nova.scm:118 msgid "Offset radius" msgstr "Poloměr posunu" -#: ../plug-ins/script-fu/scripts/line-nova.scm:117 +#: ../plug-ins/script-fu/scripts/line-nova.scm:119 msgid "Randomness" msgstr "Náhodnost" @@ -2170,11 +2174,11 @@ msgid "Mottle" msgstr "Skvrnka" -#: ../plug-ins/script-fu/scripts/palette-export.scm:235 +#: ../plug-ins/script-fu/scripts/palette-export.scm:226 msgid "Folder for the output file" msgstr "Složka pro výstupní soubor" -#: ../plug-ins/script-fu/scripts/palette-export.scm:236 +#: ../plug-ins/script-fu/scripts/palette-export.scm:227 msgid "" "The name of the file to create (if a file with this name already exist, it " "will be replaced)" @@ -2182,11 +2186,11 @@ "Název souboru, který se má vytvořit (pokud soubor s tímto názvem již " "existuje, bude nahrazen)" -#: ../plug-ins/script-fu/scripts/palette-export.scm:244 +#: ../plug-ins/script-fu/scripts/palette-export.scm:235 msgid "The filename you entered is not a suitable name for a file." msgstr "Název souboru, který jste zadali není název použitelný pro soubor." -#: ../plug-ins/script-fu/scripts/palette-export.scm:246 +#: ../plug-ins/script-fu/scripts/palette-export.scm:237 msgid "" "All characters in the name are either white-spaces or characters which can " "not appear in filenames." @@ -2194,7 +2198,7 @@ "Všechny znaky v názvu jsou buď bílé znaky nebo znaky, které se neobjevují v " "názvu souboru." -#: ../plug-ins/script-fu/scripts/palette-export.scm:274 +#: ../plug-ins/script-fu/scripts/palette-export.scm:265 msgid "" "Export the active palette as a CSS stylesheet with the color entry name as " "their class name, and the color itself as the color attribute" @@ -2202,15 +2206,15 @@ "Exportovat aktivní paletu jako stylopis CSS s názvy barev jako názvy jejich " "tříd a barvou jako vlastní hodnotou atributu barvy" -#: ../plug-ins/script-fu/scripts/palette-export.scm:300 +#: ../plug-ins/script-fu/scripts/palette-export.scm:291 msgid "Export the active palette as a PHP dictionary (name => color)" msgstr "Exportovat aktivní paletu jako slovník v jazyce PHP (název=>barva)" -#: ../plug-ins/script-fu/scripts/palette-export.scm:332 +#: ../plug-ins/script-fu/scripts/palette-export.scm:323 msgid "Export the active palette as a Python dictionary (name: color)" msgstr "Exportovat aktivní paletu jako slovník v jazyce Python (název: barva)" -#: ../plug-ins/script-fu/scripts/palette-export.scm:361 +#: ../plug-ins/script-fu/scripts/palette-export.scm:352 msgid "" "Write all the colors in a palette to a text file, one hexadecimal value per " "line (no names)" @@ -2218,7 +2222,7 @@ "Zapsat všechny barvy v paletě do textového souboru, co řádek to jedna " "šestnáctková hodnota (bez názvů)" -#: ../plug-ins/script-fu/scripts/palette-export.scm:408 +#: ../plug-ins/script-fu/scripts/palette-export.scm:399 msgid "Export the active palette as a java.util.Hashtable" msgstr "Exportovat aktivní paletu jako java.util.Hashtable<Řetězec, Barva>" @@ -2706,9 +2710,8 @@ msgstr "Počet opakování víru" #: ../plug-ins/script-fu/scripts/test-sphere.scm:267 -#, fuzzy msgid "_Sphere..." -msgstr "Ch_rom…" +msgstr "_Koule…" #: ../plug-ins/script-fu/scripts/text-circle.scm:207 msgid "Text C_ircle..." @@ -2727,12 +2730,12 @@ msgid "Antialias" msgstr "Vyhlazování" -#: ../plug-ins/script-fu/scripts/textured-logo.scm:119 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:161 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:117 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:159 msgid "_Textured..." msgstr "_Texturované…" -#: ../plug-ins/script-fu/scripts/textured-logo.scm:120 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:118 msgid "" "Fill the selected region (or alpha) with a texture and add highlights, " "shadows, and a mosaic background" @@ -2740,42 +2743,42 @@ "Vyplnit vybranou oblast (nebo alfakanál) texturou a přidat světla, stíny a " "mozaikovité pozadí" -#: ../plug-ins/script-fu/scripts/textured-logo.scm:129 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:171 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:127 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:169 msgid "Mosaic tile type" msgstr "Typ dláždění mozaiky" -#: ../plug-ins/script-fu/scripts/textured-logo.scm:129 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:171 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:127 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:169 msgid "Squares" msgstr "Čtverce" -#: ../plug-ins/script-fu/scripts/textured-logo.scm:130 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:172 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:128 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:170 msgid "Hexagons" msgstr "Šestiúhelníky" -#: ../plug-ins/script-fu/scripts/textured-logo.scm:131 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:173 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:129 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:171 msgid "Octagons" msgstr "Osmiúhelníky" -#: ../plug-ins/script-fu/scripts/textured-logo.scm:133 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:175 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:131 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:173 msgid "Starting blend" msgstr "Počáteční mísení" -#: ../plug-ins/script-fu/scripts/textured-logo.scm:134 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:176 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:132 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:174 msgid "Ending blend" msgstr "Koncové splývání" -#: ../plug-ins/script-fu/scripts/textured-logo.scm:162 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:160 msgid "" "Create a textured logo with highlights, shadows, and a mosaic background" msgstr "Vytvořit texturované logo se světly, stíny a mozaikovitým pozadím" -#: ../plug-ins/script-fu/scripts/textured-logo.scm:170 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:168 msgid "Text pattern" msgstr "Vzorek textu" diff -Nru gimp-2.8.18/po-script-fu/da.po gimp-2.8.20/po-script-fu/da.po --- gimp-2.8.18/po-script-fu/da.po 2016-05-25 22:26:47.000000000 +0000 +++ gimp-2.8.20/po-script-fu/da.po 2017-01-28 19:08:47.000000000 +0000 @@ -9,15 +9,15 @@ # Ole Laursen , 2001, 2002, 2004. # Mads Lundby , 2009. # Joe Hansen , 2010, 2011. -# scootergrisen, 2015. +# scootergrisen, 2015, 2016. # msgid "" msgstr "" "Project-Id-Version: GIMP script-fu\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-04-12 05:30+0000\n" -"PO-Revision-Date: 2015-06-09 00:00+0200\n" +"product=gimp&keywords=I18N+L10N&component=Internationalisation\n" +"POT-Creation-Date: 2016-08-22 21:49+0000\n" +"PO-Revision-Date: 2016-10-08 22:44+0200\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish \n" "Language: da\n" @@ -25,7 +25,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: \n" +"X-Generator: Poedit 1.6.10\n" "X-Language: da_DK\n" "X-Source-Language: C\n" @@ -75,7 +75,7 @@ #: ../plug-ins/script-fu/script-fu.c:323 msgid "_Web Page Themes" -msgstr "_Hjemmesidetemaer" +msgstr "_Websidetemaer" #: ../plug-ins/script-fu/script-fu.c:325 msgid "_Alien Glow" @@ -144,16 +144,16 @@ msgid "Script-Fu evaluation mode only allows non-interactive invocation" msgstr "Script-Fu evalueringstilstand kan kun startes ikke-interaktivt" -#: ../plug-ins/script-fu/script-fu-interface.c:198 +#: ../plug-ins/script-fu/script-fu-interface.c:200 msgid "Script-Fu cannot process two scripts at the same time." msgstr "Script-Fu kan ikke behandle to programmer på samme tid." -#: ../plug-ins/script-fu/script-fu-interface.c:200 +#: ../plug-ins/script-fu/script-fu-interface.c:202 #, c-format msgid "You are already running the \"%s\" script." msgstr "Du kører allerede scriptet \"%s\"." -#: ../plug-ins/script-fu/script-fu-interface.c:226 +#: ../plug-ins/script-fu/script-fu-interface.c:228 #, c-format msgid "Script-Fu: %s" msgstr "Script-Fu: %s" @@ -161,44 +161,44 @@ #. we add a colon after the label; #. * some languages want an extra space here #. -#: ../plug-ins/script-fu/script-fu-interface.c:290 +#: ../plug-ins/script-fu/script-fu-interface.c:292 #, c-format msgid "%s:" msgstr "%s:" -#: ../plug-ins/script-fu/script-fu-interface.c:337 +#: ../plug-ins/script-fu/script-fu-interface.c:339 msgid "Script-Fu Color Selection" msgstr "Script-Fu-farvevælger" -#: ../plug-ins/script-fu/script-fu-interface.c:446 +#: ../plug-ins/script-fu/script-fu-interface.c:448 msgid "Script-Fu File Selection" msgstr "Script-Fu-filvælger" -#: ../plug-ins/script-fu/script-fu-interface.c:449 +#: ../plug-ins/script-fu/script-fu-interface.c:451 msgid "Script-Fu Folder Selection" msgstr "Script-Fu-mappevælger" -#: ../plug-ins/script-fu/script-fu-interface.c:462 +#: ../plug-ins/script-fu/script-fu-interface.c:464 msgid "Script-Fu Font Selection" msgstr "Script-Fu-skrifttypevælger" -#: ../plug-ins/script-fu/script-fu-interface.c:470 +#: ../plug-ins/script-fu/script-fu-interface.c:472 msgid "Script-Fu Palette Selection" msgstr "Script-Fu-paletvælger" -#: ../plug-ins/script-fu/script-fu-interface.c:479 +#: ../plug-ins/script-fu/script-fu-interface.c:481 msgid "Script-Fu Pattern Selection" msgstr "Script-Fu-mønstervælger" -#: ../plug-ins/script-fu/script-fu-interface.c:488 +#: ../plug-ins/script-fu/script-fu-interface.c:490 msgid "Script-Fu Gradient Selection" msgstr "Script-Fu-farveovergangsvælger" -#: ../plug-ins/script-fu/script-fu-interface.c:497 +#: ../plug-ins/script-fu/script-fu-interface.c:499 msgid "Script-Fu Brush Selection" msgstr "Script-Fu-penselvælger" -#: ../plug-ins/script-fu/script-fu-interface.c:857 +#: ../plug-ins/script-fu/script-fu-interface.c:868 #, c-format msgid "Error while executing %s:" msgstr "Fejl ved kørsel af %s:" @@ -240,1884 +240,2818 @@ "Lytning på en anden IP-adresse end 127.0.0.1 (særligt 0.0.0.0) kan give " "fjern-computere mulighed for at udføre kode på denne computer." -#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182 -#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156 -msgid "Right" -msgstr "Højre" - -# "Forgrund-baggrund-RGB" / "FG-BG-RGB" -#: ../plug-ins/script-fu/scripts/blended-logo.scm:136 -#: ../plug-ins/script-fu/scripts/blended-logo.scm:195 -msgid "FG-BG-RGB" -msgstr "Forgrund-baggrund-RGB" - -#: ../plug-ins/script-fu/scripts/erase-rows.scm:47 -msgid "Rows" -msgstr "Rækker" - -#: ../plug-ins/script-fu/scripts/erase-rows.scm:48 -msgid "Even" -msgstr "Lige" - -#: ../plug-ins/script-fu/scripts/erase-rows.scm:49 -msgid "Erase" -msgstr "Slet" - -#: ../plug-ins/script-fu/scripts/font-map.scm:164 -msgid "Black on white" -msgstr "Sort på hvid" - -#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:35 -#: ../plug-ins/script-fu/scripts/guides-new.scm:35 -msgid "Horizontal" -msgstr "Vandret" - -#: ../plug-ins/script-fu/scripts/rendermap.scm:90 -msgid "Tile" -msgstr "Flise" - -#: ../plug-ins/script-fu/scripts/ripply-anim.scm:129 -msgid "Wrap" -msgstr "Ombryd" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:323 -msgid "Spyrograph" -msgstr "Spyrograf" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:326 -msgid "Circle" -msgstr "Cirkel" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:342 -msgid "Pencil" -msgstr "Blyant" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:347 -msgid "Solid Color" -msgstr "Ensfarvet" - -#: ../plug-ins/script-fu/scripts/textured-logo.scm:127 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:169 -msgid "Squares" -msgstr "Firkanter" - -#: ../plug-ins/script-fu/scripts/tileblur.scm:79 -msgid "IIR" -msgstr "IIR" - -#~ msgid "3D _Outline..." -#~ msgstr "3D-_omrids..." - -#~ msgid "" -#~ "Outline the selected region (or alpha) with a pattern and add a drop " -#~ "shadow" -#~ msgstr "" -#~ "Lav et omrids med et mønster for den valgte markering (eller alfa) og " -#~ "tilføj en slagskygge" +#: ../plug-ins/script-fu/scripts/3d-outline.scm:120 +#: ../plug-ins/script-fu/scripts/3d-outline.scm:166 +msgid "3D _Outline..." +msgstr "3D-_omrids..." -#~ msgid "Pattern" -#~ msgstr "Mønster" - -#~ msgid "Outline blur radius" -#~ msgstr "Radius for omridssløring" +#: ../plug-ins/script-fu/scripts/3d-outline.scm:121 +msgid "" +"Outline the selected region (or alpha) with a pattern and add a drop shadow" +msgstr "" +"Lav et omrids med et mønster for den valgte markering (eller alfa) og tilføj " +"en slagskygge" -#~ msgid "Shadow blur radius" -#~ msgstr "Skyggesløringsradius" +#: ../plug-ins/script-fu/scripts/3d-outline.scm:128 +#: ../plug-ins/script-fu/scripts/3d-outline.scm:172 +#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:157 +#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm:91 +#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:130 +#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:116 +#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm:85 +#: ../plug-ins/script-fu/scripts/chip-away.scm:155 +#: ../plug-ins/script-fu/scripts/chip-away.scm:202 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:126 +msgid "Pattern" +msgstr "Mønster" + +#: ../plug-ins/script-fu/scripts/3d-outline.scm:129 +#: ../plug-ins/script-fu/scripts/3d-outline.scm:176 +msgid "Outline blur radius" +msgstr "Radius for omridssløring" + +#: ../plug-ins/script-fu/scripts/3d-outline.scm:130 +#: ../plug-ins/script-fu/scripts/3d-outline.scm:177 +msgid "Shadow blur radius" +msgstr "Skyggesløringsradius" # hm, dækker vist nogenlunde -#~ msgid "Bumpmap (alpha layer) blur radius" -#~ msgstr "Ujævnhedskort (alfalag) sløringsradius" - -#~ msgid "Default bumpmap settings" -#~ msgstr "Standardindstillinger for ujævnhedskort" +#: ../plug-ins/script-fu/scripts/3d-outline.scm:131 +#: ../plug-ins/script-fu/scripts/3d-outline.scm:178 +msgid "Bumpmap (alpha layer) blur radius" +msgstr "Ujævnhedskort (alfalag) sløringsradius" + +#: ../plug-ins/script-fu/scripts/3d-outline.scm:132 +#: ../plug-ins/script-fu/scripts/3d-outline.scm:179 +#: ../plug-ins/script-fu/scripts/glossy.scm:216 +#: ../plug-ins/script-fu/scripts/glossy.scm:288 +msgid "Default bumpmap settings" +msgstr "Standardindstillinger for ujævnhedskort" # "X-forskydning for skygge" / "Skyggeforskydning X" / "Vandret # forskydning for skygge" -#~ msgid "Shadow X offset" -#~ msgstr "Skygge x-forskydning" +#: ../plug-ins/script-fu/scripts/3d-outline.scm:133 +#: ../plug-ins/script-fu/scripts/3d-outline.scm:180 +#: ../plug-ins/script-fu/scripts/glossy.scm:218 +#: ../plug-ins/script-fu/scripts/glossy.scm:290 +#: ../plug-ins/script-fu/scripts/round-corners.scm:139 +msgid "Shadow X offset" +msgstr "Skygge x-forskydning" # "Y-forskydning for skygge" / "Skyggeforskydning Y" / "Lodret forskydning # for skygge" -#~ msgid "Shadow Y offset" -#~ msgstr "Skygge y-forskydning" - -#~ msgid "Create a logo with outlined text and a drop shadow" -#~ msgstr "Opret et logo med tekstomrids og en slagskygge" - -#~ msgid "Text" -#~ msgstr "Tekst" - -#~ msgid "Font size (pixels)" -#~ msgstr "Skriftstørrelse (pixels)" - -#~ msgid "Font" -#~ msgstr "Skrifttype" +#: ../plug-ins/script-fu/scripts/3d-outline.scm:134 +#: ../plug-ins/script-fu/scripts/3d-outline.scm:181 +#: ../plug-ins/script-fu/scripts/glossy.scm:219 +#: ../plug-ins/script-fu/scripts/glossy.scm:291 +#: ../plug-ins/script-fu/scripts/round-corners.scm:140 +msgid "Shadow Y offset" +msgstr "Skygge y-forskydning" + +#: ../plug-ins/script-fu/scripts/3d-outline.scm:167 +msgid "Create a logo with outlined text and a drop shadow" +msgstr "Opret et logo med tekstomrids og en slagskygge" + +#: ../plug-ins/script-fu/scripts/3d-outline.scm:173 +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:156 +#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:111 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:175 +#: ../plug-ins/script-fu/scripts/basic1-logo.scm:98 +#: ../plug-ins/script-fu/scripts/basic2-logo.scm:120 +#: ../plug-ins/script-fu/scripts/beveled-button.scm:148 +#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:126 +#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:113 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:190 +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:131 +#: ../plug-ins/script-fu/scripts/carved-logo.scm:168 +#: ../plug-ins/script-fu/scripts/chalk.scm:128 +#: ../plug-ins/script-fu/scripts/chip-away.scm:192 +#: ../plug-ins/script-fu/scripts/chrome-logo.scm:126 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:158 +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:184 +#: ../plug-ins/script-fu/scripts/crystal-logo.scm:216 +#: ../plug-ins/script-fu/scripts/frosty-logo.scm:203 +#: ../plug-ins/script-fu/scripts/glossy.scm:273 +#: ../plug-ins/script-fu/scripts/glowing-logo.scm:115 +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:139 +#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:98 +#: ../plug-ins/script-fu/scripts/neon-logo.scm:286 +#: ../plug-ins/script-fu/scripts/news-text.scm:83 +#: ../plug-ins/script-fu/scripts/pupi-button.scm:193 +#: ../plug-ins/script-fu/scripts/slide.scm:244 +#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:213 +#: ../plug-ins/script-fu/scripts/speed-text.scm:92 +#: ../plug-ins/script-fu/scripts/starscape-logo.scm:145 +#: ../plug-ins/script-fu/scripts/text-circle.scm:213 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:165 +#: ../plug-ins/script-fu/scripts/title-header.scm:171 +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:144 +msgid "Text" +msgstr "Tekst" + +#: ../plug-ins/script-fu/scripts/3d-outline.scm:174 +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:158 +#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:112 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:176 +#: ../plug-ins/script-fu/scripts/basic1-logo.scm:99 +#: ../plug-ins/script-fu/scripts/basic2-logo.scm:121 +#: ../plug-ins/script-fu/scripts/beveled-button.scm:149 +#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:127 +#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:114 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:191 +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:132 +#: ../plug-ins/script-fu/scripts/carved-logo.scm:169 +#: ../plug-ins/script-fu/scripts/chalk.scm:129 +#: ../plug-ins/script-fu/scripts/chip-away.scm:194 +#: ../plug-ins/script-fu/scripts/chrome-logo.scm:127 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:159 +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:185 +#: ../plug-ins/script-fu/scripts/crystal-logo.scm:217 +#: ../plug-ins/script-fu/scripts/frosty-logo.scm:204 +#: ../plug-ins/script-fu/scripts/glossy.scm:274 +#: ../plug-ins/script-fu/scripts/glowing-logo.scm:116 +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:140 +#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:102 +#: ../plug-ins/script-fu/scripts/neon-logo.scm:287 +#: ../plug-ins/script-fu/scripts/news-text.scm:85 +#: ../plug-ins/script-fu/scripts/pupi-button.scm:194 +#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:214 +#: ../plug-ins/script-fu/scripts/speed-text.scm:94 +#: ../plug-ins/script-fu/scripts/starscape-logo.scm:146 +#: ../plug-ins/script-fu/scripts/text-circle.scm:217 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:166 +#: ../plug-ins/script-fu/scripts/title-header.scm:172 +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:145 +msgid "Font size (pixels)" +msgstr "Skriftstørrelse (pixels)" + +#: ../plug-ins/script-fu/scripts/3d-outline.scm:175 +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:157 +#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:113 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:177 +#: ../plug-ins/script-fu/scripts/basic1-logo.scm:100 +#: ../plug-ins/script-fu/scripts/basic2-logo.scm:122 +#: ../plug-ins/script-fu/scripts/beveled-button.scm:150 +#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:128 +#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:115 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:192 +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:133 +#: ../plug-ins/script-fu/scripts/carved-logo.scm:170 +#: ../plug-ins/script-fu/scripts/chalk.scm:130 +#: ../plug-ins/script-fu/scripts/chip-away.scm:193 +#: ../plug-ins/script-fu/scripts/chrome-logo.scm:128 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:160 +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:186 +#: ../plug-ins/script-fu/scripts/crystal-logo.scm:218 +#: ../plug-ins/script-fu/scripts/frosty-logo.scm:205 +#: ../plug-ins/script-fu/scripts/glossy.scm:275 +#: ../plug-ins/script-fu/scripts/glowing-logo.scm:117 +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:141 +#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:101 +#: ../plug-ins/script-fu/scripts/neon-logo.scm:288 +#: ../plug-ins/script-fu/scripts/news-text.scm:84 +#: ../plug-ins/script-fu/scripts/pupi-button.scm:195 +#: ../plug-ins/script-fu/scripts/slide.scm:246 +#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:215 +#: ../plug-ins/script-fu/scripts/speed-text.scm:93 +#: ../plug-ins/script-fu/scripts/starscape-logo.scm:147 +#: ../plug-ins/script-fu/scripts/text-circle.scm:219 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:167 +#: ../plug-ins/script-fu/scripts/title-header.scm:173 +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:146 +msgid "Font" +msgstr "Skrifttype" # Truchet er en effekt opkaldt efter navnet på en munk. Derfor egennavn -#~ msgid "3_D Truchet..." -#~ msgstr "3_D-Truchet..." +#: ../plug-ins/script-fu/scripts/3dTruchet.scm:225 +msgid "3_D Truchet..." +msgstr "3_D-Truchet..." # Truchet er en effekt opkaldt efter navnet på en munk. Derfor egennavn -#~ msgid "Create an image filled with a 3D Truchet pattern" -#~ msgstr "Lav et billede der er udfyldt med et 3D-Truchet-mønster" - -#~ msgid "Block size" -#~ msgstr "Blokstørrelse" - -#~ msgid "Thickness" -#~ msgstr "Tykkelse" - -#~ msgid "Background color" -#~ msgstr "Baggrundsfarve" - -#~ msgid "Start blend" -#~ msgstr "Start blanding" - -#~ msgid "End blend" -#~ msgstr "Afslut blanding" +#: ../plug-ins/script-fu/scripts/3dTruchet.scm:226 +msgid "Create an image filled with a 3D Truchet pattern" +msgstr "Lav et billede der er udfyldt med et 3D-Truchet-mønster" + +#: ../plug-ins/script-fu/scripts/3dTruchet.scm:231 +#: ../plug-ins/script-fu/scripts/truchet.scm:171 +msgid "Block size" +msgstr "Blokstørrelse" + +#: ../plug-ins/script-fu/scripts/3dTruchet.scm:232 +#: ../plug-ins/script-fu/scripts/add-bevel.scm:193 +#: ../plug-ins/script-fu/scripts/truchet.scm:172 +msgid "Thickness" +msgstr "Tykkelse" + +#: ../plug-ins/script-fu/scripts/3dTruchet.scm:233 +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:184 +#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:95 +#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:107 +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:161 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:135 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:179 +#: ../plug-ins/script-fu/scripts/basic1-logo.scm:67 +#: ../plug-ins/script-fu/scripts/basic1-logo.scm:101 +#: ../plug-ins/script-fu/scripts/basic2-logo.scm:89 +#: ../plug-ins/script-fu/scripts/basic2-logo.scm:123 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:135 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:194 +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:136 +#: ../plug-ins/script-fu/scripts/chalk.scm:89 +#: ../plug-ins/script-fu/scripts/chalk.scm:131 +#: ../plug-ins/script-fu/scripts/chrome-logo.scm:129 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:124 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:165 +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:149 +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:187 +#: ../plug-ins/script-fu/scripts/frosty-logo.scm:144 +#: ../plug-ins/script-fu/scripts/frosty-logo.scm:206 +#: ../plug-ins/script-fu/scripts/glossy.scm:209 +#: ../plug-ins/script-fu/scripts/glossy.scm:281 +#: ../plug-ins/script-fu/scripts/glowing-logo.scm:85 +#: ../plug-ins/script-fu/scripts/glowing-logo.scm:118 +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:105 +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:144 +#: ../plug-ins/script-fu/scripts/neon-logo.scm:253 +#: ../plug-ins/script-fu/scripts/neon-logo.scm:289 +#: ../plug-ins/script-fu/scripts/news-text.scm:90 +#: ../plug-ins/script-fu/scripts/speed-text.scm:97 +#: ../plug-ins/script-fu/scripts/swirltile.scm:65 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:130 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:172 +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:111 +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:151 +#: ../plug-ins/script-fu/scripts/truchet.scm:173 +msgid "Background color" +msgstr "Baggrundsfarve" + +#: ../plug-ins/script-fu/scripts/3dTruchet.scm:234 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:140 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:199 +msgid "Start blend" +msgstr "Start blanding" + +#: ../plug-ins/script-fu/scripts/3dTruchet.scm:235 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:141 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:200 +msgid "End blend" +msgstr "Afslut blanding" # 'supersampling' dækker over 'adaptive supersampling' som vist nok går # ud på en intelligent form for udjævning vha. ekstra prøver der hvor # det er nødvendigt -#~ msgid "Supersample" -#~ msgstr "Adaptiv udjævning" +#: ../plug-ins/script-fu/scripts/3dTruchet.scm:236 +msgid "Supersample" +msgstr "Adaptiv udjævning" + +#: ../plug-ins/script-fu/scripts/3dTruchet.scm:237 +#: ../plug-ins/script-fu/scripts/truchet.scm:175 +msgid "Number of X tiles" +msgstr "Antal x-fliser" + +#: ../plug-ins/script-fu/scripts/3dTruchet.scm:238 +#: ../plug-ins/script-fu/scripts/truchet.scm:176 +msgid "Number of Y tiles" +msgstr "Antal y-fliser" + +#: ../plug-ins/script-fu/scripts/add-bevel.scm:76 +#: ../plug-ins/script-fu/scripts/beveled-button.scm:77 +#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:79 +#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm:26 +#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:57 +#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:44 +#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm:30 +msgid "Bumpmap" +msgstr "Ujævnhedslag" + +#: ../plug-ins/script-fu/scripts/add-bevel.scm:185 +msgid "Add B_evel..." +msgstr "Tilføj fac_et..." + +#: ../plug-ins/script-fu/scripts/add-bevel.scm:186 +msgid "Add a beveled border to an image" +msgstr "Tilføj en facetkant til et billede" + +#: ../plug-ins/script-fu/scripts/add-bevel.scm:194 +#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:160 +#: ../plug-ins/script-fu/scripts/old-photo.scm:104 +#: ../plug-ins/script-fu/scripts/round-corners.scm:143 +#: ../plug-ins/script-fu/scripts/slide.scm:248 +#: ../plug-ins/script-fu/scripts/spinning-globe.scm:106 +msgid "Work on copy" +msgstr "Arbejd på kopi" + +#: ../plug-ins/script-fu/scripts/add-bevel.scm:195 +#: ../plug-ins/script-fu/scripts/chip-away.scm:152 +#: ../plug-ins/script-fu/scripts/chip-away.scm:199 +msgid "Keep bump layer" +msgstr "Behold ujævnhedslag" + +#: ../plug-ins/script-fu/scripts/addborder.scm:108 +msgid "Border Layer" +msgstr "Kantlag" + +#: ../plug-ins/script-fu/scripts/addborder.scm:160 +msgid "Add _Border..." +msgstr "Tilføj _kant..." + +#: ../plug-ins/script-fu/scripts/addborder.scm:161 +msgid "Add a border around an image" +msgstr "Tilføj en kant rundt om et billede" + +#: ../plug-ins/script-fu/scripts/addborder.scm:168 +msgid "Border X size" +msgstr "X-størrelse for kant" + +#: ../plug-ins/script-fu/scripts/addborder.scm:169 +msgid "Border Y size" +msgstr "Y-størrelse for kant" + +#: ../plug-ins/script-fu/scripts/addborder.scm:170 +msgid "Border color" +msgstr "Kantfarve" + +#: ../plug-ins/script-fu/scripts/addborder.scm:171 +msgid "Delta value on color" +msgstr "Deltaværdi for farve" + +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:118 +#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:78 +msgid "Arrow" +msgstr "Pil" + +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:121 +#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:35 +#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:46 +msgid "Alien Glow" +msgstr "Rumvæsenglød" + +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:124 +#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:38 +#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:48 +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:78 +#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:56 +#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:41 +#: ../plug-ins/script-fu/scripts/chrome-it.scm:103 +msgid "Background" +msgstr "Baggrund" + +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:175 +#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:149 +msgid "_Arrow..." +msgstr "_Pil..." + +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:176 +msgid "Create an arrow graphic with an eerie glow for web pages" +msgstr "Lav en pilegrafik med en mystisk glød til websider" + +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:181 +#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:155 +#: ../plug-ins/script-fu/scripts/lava.scm:126 +msgid "Size" +msgstr "Størrelse" -#~ msgid "Number of X tiles" -#~ msgstr "Antal x-fliser" +# "Orientering" +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182 +#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156 +msgid "Orientation" +msgstr "Retning" -#~ msgid "Number of Y tiles" -#~ msgstr "Antal y-fliser" +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182 +#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156 +msgid "Right" +msgstr "Højre" -#~ msgid "Bumpmap" -#~ msgstr "Ujævnhedslag" +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182 +#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156 +msgid "Left" +msgstr "Venstre" -#~ msgid "Add B_evel..." -#~ msgstr "Tilføj fac_et..." +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182 +#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156 +msgid "Up" +msgstr "Op" -#~ msgid "Add a beveled border to an image" -#~ msgstr "Tilføj en facetkant til et billede" +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182 +#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156 +msgid "Down" +msgstr "Ned" -#~ msgid "Work on copy" -#~ msgstr "Arbejd på kopi" +# Ok, men det kunne nok også skrives "Glødfarve" +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:183 +#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:94 +#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:106 +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:160 +#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:74 +#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:114 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:134 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:178 +#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:227 +#: ../plug-ins/script-fu/scripts/neon-logo.scm:254 +#: ../plug-ins/script-fu/scripts/neon-logo.scm:290 +#: ../plug-ins/script-fu/scripts/starscape-logo.scm:148 +msgid "Glow color" +msgstr "Glødefarve" + +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:185 +#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:96 +#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:108 +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:164 +#: ../plug-ins/script-fu/scripts/camo.scm:106 +#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:161 +msgid "Flatten image" +msgstr "Fladgør billede" + +#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:32 +msgid "Bar" +msgstr "Bjælke" + +#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:86 +#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm:77 +msgid "_Hrule..." +msgstr "_Vandret skillelinje..." + +#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:87 +msgid "Create an Hrule graphic with an eerie glow for web pages" +msgstr "Lav en \"vandret skillelinje\"-grafik med en mystisk glød til websider" + +#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:92 +msgid "Bar length" +msgstr "Bjælkelængde" + +#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:93 +msgid "Bar height" +msgstr "Bjælkehøjde" + +#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:44 +#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm:25 +msgid "Bullet" +msgstr "Punkttegn" + +#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:99 +#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm:84 +msgid "_Bullet..." +msgstr "_Punkttegn..." + +#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:100 +msgid "Create a bullet graphic with an eerie glow for web pages" +msgstr "Lav en punkttegnsgrafik med en mystisk glød til websider" + +#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:105 +#: ../plug-ins/script-fu/scripts/text-circle.scm:214 +#: ../plug-ins/script-fu/scripts/tileblur.scm:76 +msgid "Radius" +msgstr "Radius" + +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:81 +msgid "Glow" +msgstr "Glød" + +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:84 +msgid "Button" +msgstr "Knap" + +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:150 +#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:120 +msgid "B_utton..." +msgstr "_Knap..." + +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:151 +msgid "Create a button graphic with an eerie glow for web pages" +msgstr "Lav en knapgrafik med en mystisk glød til websider" + +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:159 +#: ../plug-ins/script-fu/scripts/basic1-logo.scm:68 +#: ../plug-ins/script-fu/scripts/basic1-logo.scm:102 +#: ../plug-ins/script-fu/scripts/basic2-logo.scm:90 +#: ../plug-ins/script-fu/scripts/basic2-logo.scm:124 +#: ../plug-ins/script-fu/scripts/beveled-button.scm:153 +#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:129 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:193 +#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:99 +#: ../plug-ins/script-fu/scripts/news-text.scm:89 +#: ../plug-ins/script-fu/scripts/pupi-button.scm:198 +#: ../plug-ins/script-fu/scripts/speed-text.scm:96 +msgid "Text color" +msgstr "Tekstfarve" + +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:162 +#: ../plug-ins/script-fu/scripts/beveled-button.scm:154 +msgid "Padding" +msgstr "Fyldning" -#~ msgid "Keep bump layer" -#~ msgstr "Behold ujævnhedslag" +# eller "Glødradius" +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:163 +msgid "Glow radius" +msgstr "Gløderadius" + +#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:65 +#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:105 +msgid "Alien _Glow..." +msgstr "Mystisk _glød..." + +#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:66 +msgid "Add an eerie glow around the selected region (or alpha)" +msgstr "Tilføj en mystisk glød rundt om det markerede område (eller alfa)" + +#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:73 +msgid "Glow size (pixels * 4)" +msgstr "Glødestørrelse (pixels * 4)" + +#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:106 +msgid "Create a logo with an alien glow around the text" +msgstr "Lav et logo med rumvæsenglød rundt om teksten" + +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:126 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:169 +msgid "Alien _Neon..." +msgstr "Rumvæsen_neon..." + +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:127 +msgid "Add psychedelic outlines to the selected region (or alpha)" +msgstr "Tilføj psykedeliske omrids til det markerede område (eller alfa)" + +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:136 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:180 +msgid "Width of bands" +msgstr "Båndbredde" + +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:137 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:181 +msgid "Width of gaps" +msgstr "Mellemrumsbredde" + +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:138 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:182 +msgid "Number of bands" +msgstr "Antal bånd" + +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:139 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:183 +msgid "Fade away" +msgstr "Udtoning" + +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:170 +msgid "Create a logo with psychedelic outlines around the text" +msgstr "Lav et logo med psykedeliske omrids rundt om teksten" + +#: ../plug-ins/script-fu/scripts/basic1-logo.scm:59 +#: ../plug-ins/script-fu/scripts/basic1-logo.scm:92 +msgid "_Basic I..." +msgstr "_Basis I..." -#~ msgid "Border Layer" -#~ msgstr "Kantlag" +#: ../plug-ins/script-fu/scripts/basic1-logo.scm:60 +msgid "" +"Add a gradient effect, a drop shadow, and a background to the selected " +"region (or alpha)" +msgstr "" +"Tilføj en farveovergangseffekt, en slagskygge og en baggrund til det " +"markerede område (eller alfa)" -#~ msgid "Add _Border..." -#~ msgstr "Tilføj _kant..." +#: ../plug-ins/script-fu/scripts/basic1-logo.scm:93 +msgid "" +"Create a plain text logo with a gradient effect, a drop shadow, and a " +"background" +msgstr "" +"Lav et klartekstlogo med en farveovergangseffekt, en slagskygge og en " +"baggrund" -#~ msgid "Add a border around an image" -#~ msgstr "Tilføj en kant rundt om et billede" +#: ../plug-ins/script-fu/scripts/basic2-logo.scm:81 +#: ../plug-ins/script-fu/scripts/basic2-logo.scm:114 +msgid "B_asic II..." +msgstr "B_asis II..." + +#: ../plug-ins/script-fu/scripts/basic2-logo.scm:82 +msgid "Add a shadow and a highlight to the selected region (or alpha)" +msgstr "Tilføj en skygge og et highlight til det markerede område (eller alfa)" + +#: ../plug-ins/script-fu/scripts/basic2-logo.scm:115 +msgid "Create a simple logo with a shadow and a highlight" +msgstr "Lav et simpelt logo med en skygge og et highlight" + +#: ../plug-ins/script-fu/scripts/beveled-button.scm:80 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:142 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:201 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:120 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:161 +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:150 +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:188 +#: ../plug-ins/script-fu/scripts/land.scm:87 +#: ../plug-ins/script-fu/scripts/lava.scm:128 +#: ../plug-ins/script-fu/scripts/rendermap.scm:88 +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:351 +msgid "Gradient" +msgstr "Farveovergang" + +#: ../plug-ins/script-fu/scripts/beveled-button.scm:142 +msgid "Simple _Beveled Button..." +msgstr "Simpel _facetskåret knap..." + +#: ../plug-ins/script-fu/scripts/beveled-button.scm:143 +msgid "Create a simple, beveled button graphic for webpages" +msgstr "Lav en simpel facetskåret grafikknap til websider" + +#: ../plug-ins/script-fu/scripts/beveled-button.scm:151 +msgid "Upper-left color" +msgstr "Farve øverst til venstre" + +#: ../plug-ins/script-fu/scripts/beveled-button.scm:152 +msgid "Lower-right color" +msgstr "Nederste-højre farve" + +#: ../plug-ins/script-fu/scripts/beveled-button.scm:155 +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:104 +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:143 +#: ../plug-ins/script-fu/scripts/pupi-button.scm:204 +msgid "Bevel width" +msgstr "Facetbredde" + +#: ../plug-ins/script-fu/scripts/beveled-button.scm:156 +#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:131 +#: ../plug-ins/script-fu/scripts/pupi-button.scm:208 +msgid "Pressed" +msgstr "Trykket" + +#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:150 +msgid "Create a beveled pattern arrow for webpages" +msgstr "Lav en facetskåret mønsterpil til websider" + +#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm:85 +msgid "Create a beveled pattern bullet for webpages" +msgstr "Lav et facetskåret mønsterpunkttegn til websider" + +#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm:90 +msgid "Diameter" +msgstr "Diameter" + +#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm:92 +#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:117 +#: ../plug-ins/script-fu/scripts/spinning-globe.scm:104 +msgid "Transparent background" +msgstr "Gennemsigtig baggrund" + +#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:121 +msgid "Create a beveled pattern button for webpages" +msgstr "Lav en facetskåret mønsterknap til websider" -#~ msgid "Border X size" -#~ msgstr "X-størrelse for kant" +# Sidehoved, Er det ikke nærmere "Overskrift" eller "Tekst" +#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:107 +msgid "H_eading..." +msgstr "_Overskrift..." + +#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:108 +msgid "Create a beveled pattern heading for webpages" +msgstr "Lav et facetskåret mønstertoppanel til websider" + +#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm:27 +msgid "Rule" +msgstr "Skillelinje" + +#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm:78 +msgid "Create a beveled pattern hrule for webpages" +msgstr "Lav en facetmønstret vandret skillelinje til websider" + +#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm:83 +#: ../plug-ins/script-fu/scripts/gradient-example.scm:69 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:70 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:138 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:194 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:263 +#: ../plug-ins/script-fu/scripts/swirltile.scm:62 +msgid "Width" +msgstr "Bredde" + +#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm:84 +#: ../plug-ins/script-fu/scripts/gradient-example.scm:70 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:71 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:139 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:195 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:264 +#: ../plug-ins/script-fu/scripts/swirltile.scm:61 +msgid "Height" +msgstr "Højde" + +#: ../plug-ins/script-fu/scripts/blend-anim.scm:206 +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:327 +msgid "Frame" +msgstr "Ramme" + +#: ../plug-ins/script-fu/scripts/blend-anim.scm:222 +msgid "Blend Animation needs at least three source layers" +msgstr "Blandeanimation skal bruge mindst tre kildelag" + +#: ../plug-ins/script-fu/scripts/blend-anim.scm:228 +msgid "_Blend..." +msgstr "_Bland..." -#~ msgid "Border Y size" -#~ msgstr "Y-størrelse for kant" +#: ../plug-ins/script-fu/scripts/blend-anim.scm:229 +msgid "" +"Create intermediate layers to blend two or more layers over a background as " +"an animation" +msgstr "" +"Lav mellemliggende lag til at blande to eller flere lag over en baggrund som " +"en animation" -#~ msgid "Border color" -#~ msgstr "Kantfarve" +#: ../plug-ins/script-fu/scripts/blend-anim.scm:236 +msgid "Intermediate frames" +msgstr "Mellembilleder" + +#: ../plug-ins/script-fu/scripts/blend-anim.scm:237 +msgid "Max. blur radius" +msgstr "Maks. sløringsradius" -#~ msgid "Delta value on color" -#~ msgstr "Deltaværdi for farve" +# "Løkke" / "I løkke" / "Gentaget" / "Løkket" +#: ../plug-ins/script-fu/scripts/blend-anim.scm:238 +msgid "Looped" +msgstr "Gentaget" + +#: ../plug-ins/script-fu/scripts/blended-logo.scm:126 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:184 +msgid "Blen_ded..." +msgstr "Blan_det..." -#~ msgid "Arrow" -#~ msgstr "Pil" +#: ../plug-ins/script-fu/scripts/blended-logo.scm:127 +msgid "" +"Add blended backgrounds, highlights, and shadows to the selected region (or " +"alpha)" +msgstr "" +"Tilføj blandede baggrunde, highlights og skygger til det markerede område " +"(eller alfa)" -#~ msgid "Alien Glow" -#~ msgstr "Rumvæsenglød" +#: ../plug-ins/script-fu/scripts/blended-logo.scm:134 +msgid "Offset (pixels)" +msgstr "Forskydning (pixels)" -#~ msgid "Background" -#~ msgstr "Baggrund" +#: ../plug-ins/script-fu/scripts/blended-logo.scm:136 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:195 +msgid "Blend mode" +msgstr "Blandingsmåde" -#~ msgid "_Arrow..." -#~ msgstr "_Pil..." +# "Forgrund-baggrund-RGB" / "FG-BG-RGB" +#: ../plug-ins/script-fu/scripts/blended-logo.scm:136 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:195 +msgid "FG-BG-RGB" +msgstr "Forgrund-baggrund-RGB" -#~ msgid "Create an arrow graphic with an eerie glow for web pages" -#~ msgstr "Lav en pilegrafik med en mystisk glød til hjemmesider" +# forskellige blandingsmåder +# "Forgrund-baggrund-HSV" / "FG-BG-HSV" +#: ../plug-ins/script-fu/scripts/blended-logo.scm:137 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:196 +msgid "FG-BG-HSV" +msgstr "Forgrund-baggrund (HSV)" -#~ msgid "Size" -#~ msgstr "Størrelse" +# "Forgrund-gennemsigtig" +#: ../plug-ins/script-fu/scripts/blended-logo.scm:138 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:197 +msgid "FG-Transparent" +msgstr "Forgrund, gennemsigtig" + +#: ../plug-ins/script-fu/scripts/blended-logo.scm:139 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:198 +msgid "Custom Gradient" +msgstr "Brugerdefineret farveovergang" + +#: ../plug-ins/script-fu/scripts/blended-logo.scm:143 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:202 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:121 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:162 +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:151 +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:189 +#: ../plug-ins/script-fu/scripts/gradient-example.scm:71 +#: ../plug-ins/script-fu/scripts/rendermap.scm:89 +#: ../plug-ins/script-fu/scripts/title-header.scm:174 +msgid "Gradient reverse" +msgstr "Farveovergang, omvendt" + +#: ../plug-ins/script-fu/scripts/blended-logo.scm:185 +msgid "Create a logo with blended backgrounds, highlights, and shadows" +msgstr "Lav et logo med blandede baggrunde, highlights og skygger" + +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:91 +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:125 +msgid "Bo_vination..." +msgstr "K_vægeffekt..." + +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:92 +msgid "Add 'cow spots' to the selected region (or alpha)" +msgstr "Tilføj \"ko-pletter\" til det markerede område (eller alfa)" -# "Orientering" -#~ msgid "Orientation" -#~ msgstr "Retning" +# Vandret plettæthed +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:99 +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:134 +msgid "Spots density X" +msgstr "Plettæthed x" -#~ msgid "Left" -#~ msgstr "Venstre" +# "Lodret plettæthed" +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:100 +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:135 +msgid "Spots density Y" +msgstr "Plettæthed y" + +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:101 +#: ../plug-ins/script-fu/scripts/chrome-logo.scm:96 +msgid "Background Color" +msgstr "Baggrundsfarve" + +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:126 +msgid "Create a logo with text in the style of 'cow spots'" +msgstr "Lav et logo med tekst i stil med \"ko-pletter\"" -#~ msgid "Up" -#~ msgstr "Op" +#. --- false form of "if-1" +#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:212 +msgid "" +"The Burn-In script needs two layers in total. A foreground layer with " +"transparency and a background layer." +msgstr "" +"Scriptet laserbrænding skal bruge to lag i alt. Et forgrundslag med " +"gennemsigtighed og et baggrundslag." -#~ msgid "Down" -#~ msgstr "Ned" +# http://fuchur.leute.server.de/burn_in/ +#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:219 +msgid "B_urn-In..." +msgstr "_Laserbrænding..." -# Ok, men det kunne nok også skrives "Glødfarve" -#~ msgid "Glow color" -#~ msgstr "Glødefarve" +#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:220 +msgid "" +"Create intermediate layers to produce an animated 'burn-in' transition " +"between two layers" +msgstr "" +"Lav et mellemliggende lag for at lave en animeret \"laserbrændings\"-" +"overgang mellem to lag" -#~ msgid "Flatten image" -#~ msgstr "Fladgør billede" +#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:228 +msgid "Fadeout" +msgstr "Udtoning" + +#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:229 +msgid "Fadeout width" +msgstr "Udtoningsbredde" + +#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:230 +msgid "Corona width" +msgstr "Corona-bredde" + +#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:231 +msgid "After glow" +msgstr "Efterglød" + +#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:232 +msgid "Add glowing" +msgstr "Tilføj glød" + +#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:233 +msgid "Prepare for GIF" +msgstr "Forbered til GIF" + +#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:234 +msgid "Speed (pixels/frame)" +msgstr "Hastighed (punkter/billede)" + +#: ../plug-ins/script-fu/scripts/camo.scm:94 +msgid "_Camouflage..." +msgstr "_Kamuflage..." + +#: ../plug-ins/script-fu/scripts/camo.scm:95 +msgid "Create an image filled with a camouflage pattern" +msgstr "Lav et billede udfyldt med et kamuflagemønster" + +#: ../plug-ins/script-fu/scripts/camo.scm:100 +#: ../plug-ins/script-fu/scripts/rendermap.scm:86 +msgid "Image size" +msgstr "Billedstørrelse" + +#: ../plug-ins/script-fu/scripts/camo.scm:101 +#: ../plug-ins/script-fu/scripts/rendermap.scm:87 +msgid "Granularity" +msgstr "Kornethed" + +#: ../plug-ins/script-fu/scripts/camo.scm:102 +msgid "Color 1" +msgstr "Farve 1" + +#: ../plug-ins/script-fu/scripts/camo.scm:103 +msgid "Color 2" +msgstr "Farve 2" + +#: ../plug-ins/script-fu/scripts/camo.scm:104 +msgid "Color 3" +msgstr "Farve 3" + +#: ../plug-ins/script-fu/scripts/camo.scm:105 +#: ../plug-ins/script-fu/scripts/distress-selection.scm:116 +msgid "Smooth" +msgstr "Udjævn" + +#: ../plug-ins/script-fu/scripts/carved-logo.scm:148 +#: ../plug-ins/script-fu/scripts/carve-it.scm:168 +msgid "Carved Surface" +msgstr "Udhugget overflade" + +#: ../plug-ins/script-fu/scripts/carved-logo.scm:149 +#: ../plug-ins/script-fu/scripts/carve-it.scm:169 +msgid "Bevel Shadow" +msgstr "Facetskygge" + +#: ../plug-ins/script-fu/scripts/carved-logo.scm:150 +#: ../plug-ins/script-fu/scripts/carve-it.scm:170 +msgid "Bevel Highlight" +msgstr "Facetfremhævelse" + +#: ../plug-ins/script-fu/scripts/carved-logo.scm:151 +#: ../plug-ins/script-fu/scripts/carve-it.scm:171 +msgid "Cast Shadow" +msgstr "Kast skygge" + +#: ../plug-ins/script-fu/scripts/carved-logo.scm:152 +#: ../plug-ins/script-fu/scripts/carve-it.scm:172 +msgid "Inset" +msgstr "Indlæg" + +#: ../plug-ins/script-fu/scripts/carved-logo.scm:162 +msgid "Carved..." +msgstr "Udskåret..." -#~ msgid "Bar" -#~ msgstr "Bjælke" +#: ../plug-ins/script-fu/scripts/carved-logo.scm:163 +msgid "" +"Create a logo with text raised above or carved in to the specified " +"background image" +msgstr "" +"Lav et logo med tekst hævet over eller udskåret ind i det angivne " +"baggrundsbillede" -#~ msgid "_Hrule..." -#~ msgstr "_Vandret skillelinje..." +#: ../plug-ins/script-fu/scripts/carved-logo.scm:171 +msgid "Background Image" +msgstr "Baggrundsbillede" -#~ msgid "Create an Hrule graphic with an eerie glow for web pages" -#~ msgstr "" -#~ "Lav en \"vandret skillelinje\"-grafik med en mystisk glød til hjemmesider" +# man kan enten få hugget teksten ind i baggrunden eller baggrunden +# hugget væk så teksten står ud +#: ../plug-ins/script-fu/scripts/carved-logo.scm:174 +msgid "Carve raised text" +msgstr "Udhug tekstomgivelser" + +#: ../plug-ins/script-fu/scripts/carved-logo.scm:175 +msgid "Padding around text" +msgstr "Fyldning omkring tekst" + +#: ../plug-ins/script-fu/scripts/carve-it.scm:182 +msgid "Stencil C_arve..." +msgstr "Skabelon_udskæring..." + +#: ../plug-ins/script-fu/scripts/carve-it.scm:190 +msgid "Image to carve" +msgstr "Billede der skal udhugges" + +#: ../plug-ins/script-fu/scripts/carve-it.scm:191 +msgid "Carve white areas" +msgstr "Udhug hvide flader" + +#: ../plug-ins/script-fu/scripts/chalk.scm:81 +#: ../plug-ins/script-fu/scripts/chalk.scm:122 +msgid "_Chalk..." +msgstr "_Kridt..." + +#: ../plug-ins/script-fu/scripts/chalk.scm:82 +msgid "Create a chalk drawing effect for the selected region (or alpha)" +msgstr "Lav en kridttegningseffekt til det markerede område (eller alfa)" + +#: ../plug-ins/script-fu/scripts/chalk.scm:123 +msgid "Create a logo resembling chalk scribbled on a blackboard" +msgstr "Lav et logo, der ligner kridt på en tavle" + +#: ../plug-ins/script-fu/scripts/chalk.scm:132 +msgid "Chalk color" +msgstr "Kridtfarve" + +#: ../plug-ins/script-fu/scripts/chip-away.scm:140 +#: ../plug-ins/script-fu/scripts/chip-away.scm:186 +msgid "Chip Awa_y..." +msgstr "Skær _væk..." -#~ msgid "Bar length" -#~ msgstr "Bjælkelængde" +#: ../plug-ins/script-fu/scripts/chip-away.scm:141 +msgid "Add a chipped woodcarving effect to the selected region (or alpha)" +msgstr "" +"Tilføj en skåret træudskæringseffekt til det markerede område (eller alfa)" -#~ msgid "Bar height" -#~ msgstr "Bjælkehøjde" +# dækker så nogenlunde +#: ../plug-ins/script-fu/scripts/chip-away.scm:148 +#: ../plug-ins/script-fu/scripts/chip-away.scm:195 +msgid "Chip amount" +msgstr "Afskalningsmængde" + +#: ../plug-ins/script-fu/scripts/chip-away.scm:149 +#: ../plug-ins/script-fu/scripts/chip-away.scm:196 +msgid "Blur amount" +msgstr "Sløringsmængde" + +#: ../plug-ins/script-fu/scripts/chip-away.scm:150 +#: ../plug-ins/script-fu/scripts/chip-away.scm:197 +msgid "Invert" +msgstr "Invertér" + +#: ../plug-ins/script-fu/scripts/chip-away.scm:151 +#: ../plug-ins/script-fu/scripts/chip-away.scm:198 +msgid "Drop shadow" +msgstr "Slagskygge" + +#: ../plug-ins/script-fu/scripts/chip-away.scm:153 +#: ../plug-ins/script-fu/scripts/chip-away.scm:200 +msgid "Fill BG with pattern" +msgstr "Udfyld baggrund med mønster" + +#: ../plug-ins/script-fu/scripts/chip-away.scm:154 +#: ../plug-ins/script-fu/scripts/chip-away.scm:201 +msgid "Keep background" +msgstr "Behold baggrund" -#~ msgid "Bullet" -#~ msgstr "Punkttegn" +# "en træudskæring" / "en trædskæring med hakker +#: ../plug-ins/script-fu/scripts/chip-away.scm:187 +msgid "Create a logo resembling a chipped wood carving" +msgstr "Opret et logo der ligner en skåret træudskæring" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:104 +msgid "Layer 1" +msgstr "Lag 1" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:105 +msgid "Layer 2" +msgstr "Lag 2" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:106 +msgid "Layer 3" +msgstr "Lag 3" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:107 +msgid "Drop Shadow" +msgstr "Dråbeskygge" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:201 +msgid "Chrome" +msgstr "Forkrom" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:202 +#: ../plug-ins/script-fu/scripts/xach-effect.scm:68 +msgid "Highlight" +msgstr "Highlight" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:214 +msgid "Stencil C_hrome..." +msgstr "Skabelon_krom..." -#~ msgid "_Bullet..." -#~ msgstr "_Punkttegn..." +#: ../plug-ins/script-fu/scripts/chrome-it.scm:215 +msgid "" +"Add a chrome effect to the selected region (or alpha) using a specified " +"(grayscale) stencil" +msgstr "" +"Tilføj en kromeffekt til det markerede område (eller alfa) med brug af en " +"specifik (gråskala) skabelon" -#~ msgid "Create a bullet graphic with an eerie glow for web pages" -#~ msgstr "Lav en punkttegnsgrafik med en mystisk glød til hjemmesider" +#: ../plug-ins/script-fu/scripts/chrome-it.scm:222 +#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:210 +msgid "Chrome saturation" +msgstr "Forkromningsmætning" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:223 +#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:211 +msgid "Chrome lightness" +msgstr "Forkromningslysstyrke" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:224 +#: ../plug-ins/script-fu/scripts/crystal-logo.scm:215 +#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:212 +msgid "Chrome factor" +msgstr "Forkromningsfaktor" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:225 +#: ../plug-ins/script-fu/scripts/crystal-logo.scm:222 +#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:216 +msgid "Environment map" +msgstr "Omgivelsesreflektioner" -#~ msgid "Radius" -#~ msgstr "Radius" +# nogle områder er stærkt belyste +#: ../plug-ins/script-fu/scripts/chrome-it.scm:228 +#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:219 +msgid "Highlight balance" +msgstr "Highlightbalance" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:229 +#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:220 +msgid "Chrome balance" +msgstr "Krombalance" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:230 +msgid "Chrome white areas" +msgstr "Forkrom hvide flader" + +#: ../plug-ins/script-fu/scripts/chrome-logo.scm:87 +#: ../plug-ins/script-fu/scripts/chrome-logo.scm:120 +msgid "C_hrome..." +msgstr "Forkr_om..." + +#: ../plug-ins/script-fu/scripts/chrome-logo.scm:88 +msgid "Add a simple chrome effect to the selected region (or alpha)" +msgstr "Tilføj en enkel kromeffekt til det markerede område (eller alfa)" + +#: ../plug-ins/script-fu/scripts/chrome-logo.scm:95 +msgid "Offsets (pixels * 2)" +msgstr "Forskydning (pixels * 2)" + +#: ../plug-ins/script-fu/scripts/chrome-logo.scm:121 +msgid "Create a simplistic, but cool, chromed logo" +msgstr "Opret et enkelt, men smart, forkromet logo" + +#: ../plug-ins/script-fu/scripts/circuit.scm:81 +msgid "Effect layer" +msgstr "Effektlag" + +#: ../plug-ins/script-fu/scripts/circuit.scm:134 +msgid "_Circuit..." +msgstr "_Kredsløb..." -#~ msgid "Glow" -#~ msgstr "Glød" +#: ../plug-ins/script-fu/scripts/circuit.scm:135 +msgid "" +"Fill the selected region (or alpha) with traces like those on a circuit board" +msgstr "" +"Udfyld det markerede område (eller alfa) med spor som dem på et kredsløbsbræt" -#~ msgid "Button" -#~ msgstr "Knap" +# 'oilify' er næsten uoversætteligt +# "Maskestørrelse for olieficering" +# Er /olieficering/ en udtværende effekt, skaber den mere genskin, ændrer +# den farverne, eller? +#: ../plug-ins/script-fu/scripts/circuit.scm:142 +msgid "Oilify mask size" +msgstr "Olieficer maskestørrelse" + +#: ../plug-ins/script-fu/scripts/circuit.scm:143 +msgid "Circuit seed" +msgstr "Startværdi for kredsløb" + +#: ../plug-ins/script-fu/scripts/circuit.scm:144 +msgid "No background (only for separate layer)" +msgstr "Ingen baggrund (kun til separate lag)" + +#: ../plug-ins/script-fu/scripts/circuit.scm:145 +#: ../plug-ins/script-fu/scripts/lava.scm:129 +#: ../plug-ins/script-fu/scripts/predator.scm:132 +#: ../plug-ins/script-fu/scripts/xach-effect.scm:138 +msgid "Keep selection" +msgstr "Behold markering" + +#: ../plug-ins/script-fu/scripts/circuit.scm:146 +#: ../plug-ins/script-fu/scripts/lava.scm:130 +#: ../plug-ins/script-fu/scripts/predator.scm:133 +msgid "Separate layer" +msgstr "Separat lag" + +#: ../plug-ins/script-fu/scripts/clothify.scm:51 +msgid "_Clothify..." +msgstr "_Tekstileffekt..." + +#: ../plug-ins/script-fu/scripts/clothify.scm:52 +msgid "Add a cloth-like texture to the selected region (or alpha)" +msgstr "Tilføj en stoflignende tekstur til det markerede område (eller alfa)" + +#: ../plug-ins/script-fu/scripts/clothify.scm:59 +msgid "Blur X" +msgstr "Sløring x" + +#: ../plug-ins/script-fu/scripts/clothify.scm:60 +msgid "Blur Y" +msgstr "Sløring y" + +#: ../plug-ins/script-fu/scripts/clothify.scm:61 +#: ../plug-ins/script-fu/scripts/swirltile.scm:58 +msgid "Azimuth" +msgstr "Azimut" + +#: ../plug-ins/script-fu/scripts/clothify.scm:62 +#: ../plug-ins/script-fu/scripts/swirltile.scm:59 +msgid "Elevation" +msgstr "Hævning" + +#: ../plug-ins/script-fu/scripts/clothify.scm:63 +#: ../plug-ins/script-fu/scripts/swirltile.scm:57 +msgid "Depth" +msgstr "Dybde" + +#: ../plug-ins/script-fu/scripts/coffee.scm:36 +msgid "Stain" +msgstr "Stænk" + +#: ../plug-ins/script-fu/scripts/coffee.scm:81 +msgid "_Coffee Stain..." +msgstr "_Kaffeplet..." + +#: ../plug-ins/script-fu/scripts/coffee.scm:82 +msgid "Add realistic looking coffee stains to the image" +msgstr "Tilføj realistisk udseende kaffepletter til billedet" + +#: ../plug-ins/script-fu/scripts/coffee.scm:89 +msgid "Stains" +msgstr "Stænk" + +#: ../plug-ins/script-fu/scripts/coffee.scm:90 +msgid "Darken only" +msgstr "Formørk kun" + +#: ../plug-ins/script-fu/scripts/comic-logo.scm:112 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:152 +msgid "Comic Boo_k..." +msgstr "Te_gneserie..." -#~ msgid "B_utton..." -#~ msgstr "_Knap..." +#: ../plug-ins/script-fu/scripts/comic-logo.scm:113 +msgid "" +"Add a comic-book effect to the selected region (or alpha) by outlining and " +"filling with a gradient" +msgstr "" +"Tilføj en tegneserieeffekt til det markerede område (eller alfa) ved at " +"omridse og udfylde med en farveovergang" -#~ msgid "Create a button graphic with an eerie glow for web pages" -#~ msgstr "Lav en knapgrafik med en mystisk glød til hjemmesider" +#: ../plug-ins/script-fu/scripts/comic-logo.scm:122 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:163 +#: ../plug-ins/script-fu/scripts/glossy.scm:208 +#: ../plug-ins/script-fu/scripts/glossy.scm:280 +msgid "Outline size" +msgstr "Omridsstørrelse" + +#: ../plug-ins/script-fu/scripts/comic-logo.scm:123 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:164 +msgid "Outline color" +msgstr "Omridsfarve" -#~ msgid "Text color" -#~ msgstr "Tekstfarve" +#: ../plug-ins/script-fu/scripts/comic-logo.scm:153 +msgid "Create a comic-book style logo by outlining and filling with a gradient" +msgstr "" +"Opret et logo med en tegneseriestil omridset og udfyldt med en farveovergang" -#~ msgid "Padding" -#~ msgstr "Fyldning" +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:140 +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:178 +msgid "Cool _Metal..." +msgstr "Smart _metal..." -# eller "Glødradius" -#~ msgid "Glow radius" -#~ msgstr "Gløderadius" +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:141 +msgid "" +"Add a metallic effect to the selected region (or alpha) with reflections and " +"perspective shadows" +msgstr "" +"Tilføj en metaleffekt til det markerede område (eller alfa) med reflektioner " +"og perspektivskygger" -#~ msgid "Alien _Glow..." -#~ msgstr "Mystisk _glød..." +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:148 +#: ../plug-ins/script-fu/scripts/frosty-logo.scm:143 +#: ../plug-ins/script-fu/scripts/glowing-logo.scm:84 +#: ../plug-ins/script-fu/scripts/neon-logo.scm:252 +msgid "Effect size (pixels)" +msgstr "Effektstørrelse (pixels)" + +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:179 +msgid "Create a metallic logo with reflections and perspective shadows" +msgstr "Opret et metallogo med reflektioner og perspektivskygger" + +#: ../plug-ins/script-fu/scripts/crystal-logo.scm:209 +msgid "Crystal..." +msgstr "Krystal..." + +#: ../plug-ins/script-fu/scripts/crystal-logo.scm:210 +msgid "Create a logo with a crystal/gel effect displacing the image underneath" +msgstr "Opret et logo med en krystal-/gel-effekt der viser billedet nedenunder" + +#: ../plug-ins/script-fu/scripts/crystal-logo.scm:219 +msgid "Background image" +msgstr "Baggrundsbillede" + +#: ../plug-ins/script-fu/scripts/difference-clouds.scm:70 +msgid "Difference Clouds..." +msgstr "Forskelsskyer..." + +#: ../plug-ins/script-fu/scripts/difference-clouds.scm:71 +msgid "Solid noise applied with Difference layer mode" +msgstr "Konstant støj påført i tilstanden lagforskelle" + +#: ../plug-ins/script-fu/scripts/distress-selection.scm:105 +msgid "_Distort..." +msgstr "_Forvræng..." + +#: ../plug-ins/script-fu/scripts/distress-selection.scm:106 +msgid "Distress the selection" +msgstr "Gør markering uroligt" + +#: ../plug-ins/script-fu/scripts/distress-selection.scm:113 +msgid "Threshold (bigger 1<-->254 smaller)" +msgstr "Grænse (større 1<-->255 mindre)" + +#: ../plug-ins/script-fu/scripts/distress-selection.scm:114 +msgid "Spread" +msgstr "Spredning" + +#: ../plug-ins/script-fu/scripts/distress-selection.scm:115 +msgid "Granularity (1 is low)" +msgstr "Kornethed (1 er lav)" + +#: ../plug-ins/script-fu/scripts/distress-selection.scm:117 +msgid "Smooth horizontally" +msgstr "Vandret udjævning" + +#: ../plug-ins/script-fu/scripts/distress-selection.scm:118 +msgid "Smooth vertically" +msgstr "Lodret udjævning" + +#: ../plug-ins/script-fu/scripts/drop-shadow.scm:170 +msgid "_Drop Shadow..." +msgstr "_Slagskygge..." + +#: ../plug-ins/script-fu/scripts/drop-shadow.scm:171 +msgid "Add a drop shadow to the selected region (or alpha)" +msgstr "Tilføj en slagskygge til det markerede område (eller alfa)" + +#: ../plug-ins/script-fu/scripts/drop-shadow.scm:178 +msgid "Offset X" +msgstr "Forskydning x" + +#: ../plug-ins/script-fu/scripts/drop-shadow.scm:179 +msgid "Offset Y" +msgstr "Forskydning y" + +#: ../plug-ins/script-fu/scripts/drop-shadow.scm:180 +#: ../plug-ins/script-fu/scripts/news-text.scm:88 +#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:209 +#: ../plug-ins/script-fu/scripts/round-corners.scm:141 +#: ../plug-ins/script-fu/scripts/swirltile.scm:60 +msgid "Blur radius" +msgstr "Sløringsradius" + +#: ../plug-ins/script-fu/scripts/drop-shadow.scm:181 +#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:154 +#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:210 +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:350 +msgid "Color" +msgstr "Farve" + +#: ../plug-ins/script-fu/scripts/drop-shadow.scm:182 +#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:211 +msgid "Opacity" +msgstr "Synlighed" + +#: ../plug-ins/script-fu/scripts/drop-shadow.scm:183 +#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:213 +msgid "Allow resizing" +msgstr "Tillad størrelsesændring" + +#: ../plug-ins/script-fu/scripts/erase-rows.scm:39 +msgid "_Erase Every Other Row..." +msgstr "Sl_et hver anden række..." + +#: ../plug-ins/script-fu/scripts/erase-rows.scm:40 +msgid "Erase every other row or column" +msgstr "Slet hver anden række eller kolonne" -#~ msgid "Add an eerie glow around the selected region (or alpha)" -#~ msgstr "Tilføj en mystisk glød rundt om det markerede område (eller alfa)" +#: ../plug-ins/script-fu/scripts/erase-rows.scm:47 +msgid "Rows/cols" +msgstr "Rækker/kolonner" -#~ msgid "Glow size (pixels * 4)" -#~ msgstr "Glødestørrelse (pixels * 4)" +#: ../plug-ins/script-fu/scripts/erase-rows.scm:47 +msgid "Rows" +msgstr "Rækker" -#~ msgid "Create a logo with an alien glow around the text" -#~ msgstr "Lav et logo med rumvæsenglød rundt om teksten" +#: ../plug-ins/script-fu/scripts/erase-rows.scm:47 +msgid "Columns" +msgstr "Kolonner" -#~ msgid "Alien _Neon..." -#~ msgstr "Rumvæsen_neon..." +#: ../plug-ins/script-fu/scripts/erase-rows.scm:48 +msgid "Even/odd" +msgstr "Lige/ulige" -#~ msgid "Add psychedelic outlines to the selected region (or alpha)" -#~ msgstr "Tilføj psykedeliske omrids til det markerede område (eller alfa)" +#: ../plug-ins/script-fu/scripts/erase-rows.scm:48 +msgid "Even" +msgstr "Lige" -#~ msgid "Width of bands" -#~ msgstr "Båndbredde" +#: ../plug-ins/script-fu/scripts/erase-rows.scm:48 +msgid "Odd" +msgstr "Ulige" -#~ msgid "Width of gaps" -#~ msgstr "Mellemrumsbredde" +#: ../plug-ins/script-fu/scripts/erase-rows.scm:49 +msgid "Erase/fill" +msgstr "Slet/udfyld" -#~ msgid "Number of bands" -#~ msgstr "Antal bånd" +#: ../plug-ins/script-fu/scripts/erase-rows.scm:49 +msgid "Erase" +msgstr "Slet" -#~ msgid "Fade away" -#~ msgstr "Udtoning" +#: ../plug-ins/script-fu/scripts/erase-rows.scm:49 +msgid "Fill with BG" +msgstr "Udfyld med baggrund" -#~ msgid "Create a logo with psychedelic outlines around the text" -#~ msgstr "Lav et logo med psykedeliske omrids rundt om teksten" +#: ../plug-ins/script-fu/scripts/flatland.scm:60 +msgid "_Flatland..." +msgstr "_Fladt land..." + +#: ../plug-ins/script-fu/scripts/flatland.scm:61 +msgid "Create an image filled with a Land Pattern" +msgstr "Opret et billede udfyldt med et landmønster" + +#: ../plug-ins/script-fu/scripts/flatland.scm:66 +#: ../plug-ins/script-fu/scripts/land.scm:79 +msgid "Image width" +msgstr "Billedbredde" + +#: ../plug-ins/script-fu/scripts/flatland.scm:67 +#: ../plug-ins/script-fu/scripts/land.scm:80 +msgid "Image height" +msgstr "Billedhøjde" + +#: ../plug-ins/script-fu/scripts/flatland.scm:68 +#: ../plug-ins/script-fu/scripts/land.scm:81 +msgid "Random seed" +msgstr "Startværdi for tilfældighedsgenerator" + +#: ../plug-ins/script-fu/scripts/flatland.scm:69 +#: ../plug-ins/script-fu/scripts/land.scm:82 +msgid "Detail level" +msgstr "Detaljeniveau" + +#: ../plug-ins/script-fu/scripts/flatland.scm:70 +#: ../plug-ins/script-fu/scripts/land.scm:85 +msgid "Scale X" +msgstr "X-skalering" + +#: ../plug-ins/script-fu/scripts/flatland.scm:71 +#: ../plug-ins/script-fu/scripts/land.scm:86 +msgid "Scale Y" +msgstr "Y-skalering" + +#: ../plug-ins/script-fu/scripts/font-map.scm:152 +msgid "Render _Font Map..." +msgstr "Optegn _skrifttypekort..." -#~ msgid "_Basic I..." -#~ msgstr "_Basis I..." +#: ../plug-ins/script-fu/scripts/font-map.scm:153 +msgid "" +"Create an image filled with previews of fonts matching a fontname filter" +msgstr "" +"Opret et billede fyldt med forhåndsvisninger af skrifttyper der matcher et " +"filter for skrifttypenavne" -#~ msgid "" -#~ "Add a gradient effect, a drop shadow, and a background to the selected " -#~ "region (or alpha)" -#~ msgstr "" -#~ "Tilføj en farveovergangseffekt, en slagskygge og en baggrund til det " -#~ "markerede område (eller alfa)" +#: ../plug-ins/script-fu/scripts/font-map.scm:158 +msgid "_Text" +msgstr "_Tekst" + +#: ../plug-ins/script-fu/scripts/font-map.scm:159 +msgid "Use font _name as text" +msgstr "Benyt skrifttype_navn som tekst" + +#: ../plug-ins/script-fu/scripts/font-map.scm:160 +msgid "_Labels" +msgstr "_Etiketter" + +#: ../plug-ins/script-fu/scripts/font-map.scm:161 +msgid "_Filter (regexp)" +msgstr "_Filter (reg. udtryk)" + +#: ../plug-ins/script-fu/scripts/font-map.scm:162 +msgid "Font _size (pixels)" +msgstr "Skrift_størrelse (pixels)" + +#: ../plug-ins/script-fu/scripts/font-map.scm:163 +msgid "_Border (pixels)" +msgstr "_Kant (pixels)" -#~ msgid "" -#~ "Create a plain text logo with a gradient effect, a drop shadow, and a " -#~ "background" -#~ msgstr "" -#~ "Lav et klartekstlogo med en farveovergangseffekt, en slagskygge og en " -#~ "baggrund" +#: ../plug-ins/script-fu/scripts/font-map.scm:164 +msgid "_Color scheme" +msgstr "_Farveskema" -#~ msgid "B_asic II..." -#~ msgstr "B_asis II..." +#: ../plug-ins/script-fu/scripts/font-map.scm:164 +msgid "Black on white" +msgstr "Sort på hvid" -#~ msgid "Add a shadow and a highlight to the selected region (or alpha)" -#~ msgstr "" -#~ "Tilføj en skygge og et highlight til det markerede område (eller alfa)" +#: ../plug-ins/script-fu/scripts/font-map.scm:164 +msgid "Active colors" +msgstr "Aktive farver" -#~ msgid "Create a simple logo with a shadow and a highlight" -#~ msgstr "Lav et simpelt logo med en skygge og et highlight" +#: ../plug-ins/script-fu/scripts/frosty-logo.scm:135 +#: ../plug-ins/script-fu/scripts/frosty-logo.scm:197 +msgid "_Frosty..." +msgstr "_Frosset..." -#~ msgid "Gradient" -#~ msgstr "Farveovergang" +#: ../plug-ins/script-fu/scripts/frosty-logo.scm:136 +msgid "" +"Add a frost effect to the selected region (or alpha) with an added drop " +"shadow" +msgstr "" +"Tilføj en frosteffekt til det markerede område (eller alfa) med en tilføjet " +"slagskygge" -#~ msgid "Simple _Beveled Button..." -#~ msgstr "Simpel _facetskåret knap..." +#: ../plug-ins/script-fu/scripts/frosty-logo.scm:198 +msgid "Create frozen logo with an added drop shadow" +msgstr "Opret frossent logo med en tilføjet slagskygge" + +#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:146 +msgid "_Fuzzy Border..." +msgstr "Ud_flydende kant..." -#~ msgid "Create a simple, beveled button graphic for webpages" -#~ msgstr "Lav en simpel facetskåret grafikknap til hjemmesider" +# Her synes jeg ikke at fuzzy->udflydende passer særlig godt +#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:147 +msgid "Add a jagged, fuzzy border to an image" +msgstr "Tilføj en hakket, ujævn kant til et billede" + +#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:155 +#: ../plug-ins/script-fu/scripts/old-photo.scm:98 +msgid "Border size" +msgstr "Kantstørrelse" + +#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:156 +msgid "Blur border" +msgstr "Slør kant" + +#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:157 +msgid "Granularity (1 is Low)" +msgstr "Kornethed (1 er lav)" + +#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:158 +msgid "Add shadow" +msgstr "Tilføj skygge" + +#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:159 +msgid "Shadow weight (%)" +msgstr "Skyggevægt (%)" -#~ msgid "Upper-left color" -#~ msgstr "Farve øverst til venstre" +# "Brugsmønstre" - jeg forestiller mig at dette er henvisninger til et +# afsnit i en manual eller lignende. +#: ../plug-ins/script-fu/scripts/gimp-online.scm:59 +msgid "Using _Paths" +msgstr "Bruge hjæl_pelinjer" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:60 +#: ../plug-ins/script-fu/scripts/gimp-online.scm:73 +#: ../plug-ins/script-fu/scripts/gimp-online.scm:86 +#: ../plug-ins/script-fu/scripts/gimp-online.scm:99 +#: ../plug-ins/script-fu/scripts/gimp-online.scm:112 +#: ../plug-ins/script-fu/scripts/gimp-online.scm:125 +#: ../plug-ins/script-fu/scripts/gimp-online.scm:138 +#: ../plug-ins/script-fu/scripts/gimp-online.scm:151 +msgid "Bookmark to the user manual" +msgstr "Bogmærke til brugermanualen" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:72 +msgid "_Preparing your Images for the Web" +msgstr "_Klargør dine billeder til nettet" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:85 +msgid "_Working with Digital Camera Photos" +msgstr "_Arbejde med fotografier fra digitalkameraer" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:98 +msgid "Create, Open and Save _Files" +msgstr "Opret, åbn og gem _filer" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:111 +msgid "_Basic Concepts" +msgstr "_Grundlæggende ideer" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:124 +msgid "How to Use _Dialogs" +msgstr "Sådan bruger du _dialoger" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:137 +msgid "Drawing _Simple Objects" +msgstr "Tegn _simple objekter" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:150 +msgid "Create and Use _Selections" +msgstr "Opret og brug _markeringer" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:178 +msgid "_Main Web Site" +msgstr "_Hovedwebsted" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:179 +#: ../plug-ins/script-fu/scripts/gimp-online.scm:192 +#: ../plug-ins/script-fu/scripts/gimp-online.scm:205 +#: ../plug-ins/script-fu/scripts/gimp-online.scm:218 +msgid "Bookmark to the GIMP web site" +msgstr "Bogmærk til GIMP-webstedet" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:191 +msgid "_Developer Web Site" +msgstr "_Websted for udviklere" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:204 +msgid "_User Manual Web Site" +msgstr "_Brugermanualens webside" -#~ msgid "Lower-right color" -#~ msgstr "Nederste-højre farve" +# "Register for udvidelsesmoduler" +#: ../plug-ins/script-fu/scripts/gimp-online.scm:217 +msgid "Plug-in _Registry" +msgstr "Plugin_registreringsdatabase" + +#: ../plug-ins/script-fu/scripts/glossy.scm:196 +#: ../plug-ins/script-fu/scripts/glossy.scm:267 +msgid "Glo_ssy..." +msgstr "_Blank..." -#~ msgid "Bevel width" -#~ msgstr "Facetbredde" +#: ../plug-ins/script-fu/scripts/glossy.scm:197 +msgid "" +"Add gradients, patterns, shadows, and bump maps to the selected region (or " +"alpha)" +msgstr "" +"Tilføj farveovergange, mønstre, skygger og ujævnhedskort til det markerede " +"område (eller alfa)" -#~ msgid "Pressed" -#~ msgstr "Trykket" +#: ../plug-ins/script-fu/scripts/glossy.scm:204 +#: ../plug-ins/script-fu/scripts/glossy.scm:276 +msgid "Blend gradient (text)" +msgstr "Farveovergang (tekst)" + +#: ../plug-ins/script-fu/scripts/glossy.scm:205 +#: ../plug-ins/script-fu/scripts/glossy.scm:277 +msgid "Text gradient reverse" +msgstr "Tekstovergang, omvendt" -#~ msgid "Create a beveled pattern arrow for webpages" -#~ msgstr "Lav en facetskåret mønsterpil til hjemmesider" +# 'blend' er vist overflødigt +#: ../plug-ins/script-fu/scripts/glossy.scm:206 +#: ../plug-ins/script-fu/scripts/glossy.scm:278 +msgid "Blend gradient (outline)" +msgstr "Farveovergang (omrids)" + +#: ../plug-ins/script-fu/scripts/glossy.scm:207 +#: ../plug-ins/script-fu/scripts/glossy.scm:279 +msgid "Outline gradient reverse" +msgstr "Omridsfarveovergang, omvendt" + +#: ../plug-ins/script-fu/scripts/glossy.scm:210 +#: ../plug-ins/script-fu/scripts/glossy.scm:282 +msgid "Use pattern for text instead of gradient" +msgstr "Benyt mønster til tekst i stedet for farveovergang" + +#: ../plug-ins/script-fu/scripts/glossy.scm:211 +#: ../plug-ins/script-fu/scripts/glossy.scm:283 +msgid "Pattern (text)" +msgstr "Mønster (tekst)" + +#: ../plug-ins/script-fu/scripts/glossy.scm:212 +#: ../plug-ins/script-fu/scripts/glossy.scm:284 +msgid "Use pattern for outline instead of gradient" +msgstr "Benyt mønster til omrids i stedet for farveovergang" + +#: ../plug-ins/script-fu/scripts/glossy.scm:213 +#: ../plug-ins/script-fu/scripts/glossy.scm:285 +msgid "Pattern (outline)" +msgstr "Mønster (omrids)" + +#: ../plug-ins/script-fu/scripts/glossy.scm:214 +#: ../plug-ins/script-fu/scripts/glossy.scm:286 +msgid "Use pattern overlay" +msgstr "Benyt mønsteroverlægning" + +#: ../plug-ins/script-fu/scripts/glossy.scm:215 +#: ../plug-ins/script-fu/scripts/glossy.scm:287 +msgid "Pattern (overlay)" +msgstr "Mønster (overlægning)" + +#: ../plug-ins/script-fu/scripts/glossy.scm:217 +#: ../plug-ins/script-fu/scripts/glossy.scm:289 +#: ../plug-ins/script-fu/scripts/xach-effect.scm:92 +msgid "Shadow" +msgstr "Skygge" + +#: ../plug-ins/script-fu/scripts/glossy.scm:268 +msgid "Create a logo with gradients, patterns, shadows, and bump maps" +msgstr "Lav et logo med farveovergange, mønstre, skygger og ujævnhedskort" + +#: ../plug-ins/script-fu/scripts/glowing-logo.scm:76 +#: ../plug-ins/script-fu/scripts/glowing-logo.scm:109 +msgid "Glo_wing Hot..." +msgstr "Glø_dende varmt..." -#~ msgid "Create a beveled pattern bullet for webpages" -#~ msgstr "Lav et facetskåret mønsterpunkttegn til hjemmesider" +#: ../plug-ins/script-fu/scripts/glowing-logo.scm:77 +msgid "Add a glowing hot metal effect to the selected region (or alpha)" +msgstr "" +"Tilføj en glødende varm metaleffekt til det markerede område (eller alfa)" -#~ msgid "Diameter" -#~ msgstr "Diameter" +#: ../plug-ins/script-fu/scripts/glowing-logo.scm:110 +msgid "Create a logo that looks like glowing hot metal" +msgstr "Lav et logo der ser ud som glødende varmt metal" + +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:94 +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:133 +msgid "Gradient Beve_l..." +msgstr "Fa_cetkant med farveovergang..." -#~ msgid "Transparent background" -#~ msgstr "Gennemsigtig baggrund" +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:95 +msgid "Add a shiny look and bevel effect to the selected region (or alpha)" +msgstr "" +"Tilføj et skinnende udseende og kanteffekt til det markerede område (eller " +"alfa)" -#~ msgid "Create a beveled pattern button for webpages" -#~ msgstr "Lav en facetskåret mønsterknap til hjemmesider" +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:102 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:125 +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:106 +msgid "Border size (pixels)" +msgstr "Kantstørrelse (pixels)" + +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:103 +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:142 +msgid "Bevel height (sharpness)" +msgstr "Facethøjde (skarphed)" + +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:134 +msgid "Create a logo with a shiny look and beveled edges" +msgstr "Lav et logo med et skinnende udseende og facetskårne kanter" + +#: ../plug-ins/script-fu/scripts/gradient-example.scm:63 +msgid "Custom _Gradient..." +msgstr "Brugerdefineret farveover_gang..." + +#: ../plug-ins/script-fu/scripts/gradient-example.scm:64 +msgid "Create an image filled with an example of the current gradient" +msgstr "Opret et billede udfyldt med et eksempel på den aktuelle farveovergang" + +#: ../plug-ins/script-fu/scripts/grid-system.scm:84 +msgid "_Grid..." +msgstr "_Gitter..." -# Sidehoved, Er det ikke nærmere "Overskrift" eller "Tekst" -#~ msgid "H_eading..." -#~ msgstr "_Overskrift..." +#: ../plug-ins/script-fu/scripts/grid-system.scm:85 +msgid "" +"Draw a grid as specified by the lists of X and Y locations using the current " +"brush" +msgstr "" +"Tegn et gitter som angivet af listen af X- og Y-koordinater der bruger den " +"aktuelle pensel" -#~ msgid "Create a beveled pattern heading for webpages" -#~ msgstr "Lav et facetskåret mønstertoppanel til hjemmesider" +#: ../plug-ins/script-fu/scripts/grid-system.scm:92 +msgid "X divisions" +msgstr "X-opdelinger" + +#: ../plug-ins/script-fu/scripts/grid-system.scm:93 +msgid "Y divisions" +msgstr "Y-opdelinger" + +#: ../plug-ins/script-fu/scripts/guides-from-selection.scm:32 +msgid "New Guides from _Selection" +msgstr "Nye hjælpelinjer fra _markering" + +#: ../plug-ins/script-fu/scripts/guides-from-selection.scm:33 +msgid "Create four guides around the bounding box of the current selection" +msgstr "Opret fire hjælpelinjer omkring kanterne på den nuværende markering" + +#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:27 +msgid "New Guide (by _Percent)..." +msgstr "Ny hjælpelinje (i _procent)..." -#~ msgid "Rule" -#~ msgstr "Skillelinje" +#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:28 +msgid "Add a guide at the position specified as a percentage of the image size" +msgstr "" +"Tilføj en hjælpelinje ved den position, som er angivet som en procentdel af " +"billedstørrelsen" -#~ msgid "Create a beveled pattern hrule for webpages" -#~ msgstr "Lav en facetmønstret vandret skillelinje til hjemmesider" +#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:35 +#: ../plug-ins/script-fu/scripts/guides-new.scm:35 +msgid "Direction" +msgstr "Retning" -#~ msgid "Width" -#~ msgstr "Bredde" +#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:35 +#: ../plug-ins/script-fu/scripts/guides-new.scm:35 +msgid "Horizontal" +msgstr "Vandret" -#~ msgid "Height" -#~ msgstr "Højde" +#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:36 +#: ../plug-ins/script-fu/scripts/guides-new.scm:35 +msgid "Vertical" +msgstr "Lodret" -#~ msgid "Frame" -#~ msgstr "Ramme" +# "Position (procentangivelse)" / "Position (%)" / "Position (i procent)" +#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:37 +msgid "Position (in %)" +msgstr "Placering (i %)" + +#: ../plug-ins/script-fu/scripts/guides-new.scm:27 +msgid "New _Guide..." +msgstr "Ny _hjælpelinje..." -#~ msgid "Blend Animation needs at least three source layers" -#~ msgstr "Blandeanimation skal bruge mindst tre kildelag" +#: ../plug-ins/script-fu/scripts/guides-new.scm:28 +msgid "Add a guide at the orientation and position specified (in pixels)" +msgstr "" +"Tlføj en hjælpelinje ved den angivne orientering og position (i pixels)" -#~ msgid "_Blend..." -#~ msgstr "_Bland..." +#: ../plug-ins/script-fu/scripts/guides-new.scm:36 +msgid "Position" +msgstr "Placering" + +#: ../plug-ins/script-fu/scripts/guides-remove-all.scm:19 +msgid "_Remove all Guides" +msgstr "_Fjern alle hjælpelinjer" + +#: ../plug-ins/script-fu/scripts/guides-remove-all.scm:20 +msgid "Remove all horizontal and vertical guides" +msgstr "Fjern alle vandrette og lodrette hjælpelinjer" -#~ msgid "" -#~ "Create intermediate layers to blend two or more layers over a background " -#~ "as an animation" -#~ msgstr "" -#~ "Lav mellemliggende lag til at blande to eller flere lag over en baggrund " -#~ "som en animation" +# Imigre ser ud til at være et firma der laver skrifttyper +#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:92 +msgid "Imigre-_26..." +msgstr "Imigre-_26..." + +#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:93 +msgid "Create a logo in a two-color, scribbled text style" +msgstr "Opret et logo i en tofarvet, griflet tekststil" + +#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:100 +msgid "Frame color" +msgstr "Rammefarve" + +#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:103 +msgid "Frame size" +msgstr "Rammestørrelse" + +#: ../plug-ins/script-fu/scripts/land.scm:73 +msgid "_Land..." +msgstr "_Land..." + +#: ../plug-ins/script-fu/scripts/land.scm:74 +msgid "Create an image filled with a topographic map pattern" +msgstr "Opret et billede udfyldt med et topografisk kortmønster" + +#: ../plug-ins/script-fu/scripts/land.scm:83 +msgid "Land height" +msgstr "Landhøjde" -#~ msgid "Intermediate frames" -#~ msgstr "Mellembilleder" +# 'sea' er havet her (drejer sig om landkort) +#: ../plug-ins/script-fu/scripts/land.scm:84 +msgid "Sea depth" +msgstr "Havdybde" + +#: ../plug-ins/script-fu/scripts/lava.scm:117 +msgid "_Lava..." +msgstr "_Lava..." + +#: ../plug-ins/script-fu/scripts/lava.scm:118 +msgid "Fill the current selection with lava" +msgstr "Udfyld den aktuelle markering med lava" + +#: ../plug-ins/script-fu/scripts/lava.scm:125 +msgid "Seed" +msgstr "Startværdi" + +#: ../plug-ins/script-fu/scripts/lava.scm:127 +#: ../plug-ins/script-fu/scripts/swirltile.scm:64 +msgid "Roughness" +msgstr "Ruhed" + +#: ../plug-ins/script-fu/scripts/lava.scm:131 +msgid "Use current gradient" +msgstr "Brug aktiv farveovergang" + +#: ../plug-ins/script-fu/scripts/line-nova.scm:108 +msgid "Line _Nova..." +msgstr "Linje_nova..." -#~ msgid "Max. blur radius" -#~ msgstr "Maks. sløringsradius" +#: ../plug-ins/script-fu/scripts/line-nova.scm:109 +msgid "" +"Fill a layer with rays emanating outward from its center using the " +"foreground color" +msgstr "" +"Udfyld et lag med stråler, der går ud fra dets midte med brug af " +"forgrundsfarven" -# "Løkke" / "I løkke" / "Gentaget" / "Løkket" -#~ msgid "Looped" -#~ msgstr "Gentaget" +#: ../plug-ins/script-fu/scripts/line-nova.scm:116 +msgid "Number of lines" +msgstr "Antal linjer" + +#: ../plug-ins/script-fu/scripts/line-nova.scm:117 +msgid "Sharpness (degrees)" +msgstr "Skarphed (grader)" + +#: ../plug-ins/script-fu/scripts/line-nova.scm:118 +msgid "Offset radius" +msgstr "Forskydningsradius" + +#: ../plug-ins/script-fu/scripts/line-nova.scm:119 +msgid "Randomness" +msgstr "Tilfældighed" + +#: ../plug-ins/script-fu/scripts/mkbrush.scm:63 +msgid "_Rectangular..." +msgstr "_Rektangulær..." + +#: ../plug-ins/script-fu/scripts/mkbrush.scm:64 +msgid "Create a rectangular brush" +msgstr "Lav en rektangulær pensel" + +#: ../plug-ins/script-fu/scripts/mkbrush.scm:69 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:137 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:193 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:262 +msgid "Name" +msgstr "Navn" + +#: ../plug-ins/script-fu/scripts/mkbrush.scm:72 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:141 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:196 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:266 +#: ../plug-ins/script-fu/scripts/paste-as-brush.scm:70 +#: ../plug-ins/script-fu/scripts/select-to-brush.scm:143 +msgid "Spacing" +msgstr "Mellemrum" + +#: ../plug-ins/script-fu/scripts/mkbrush.scm:131 +msgid "Re_ctangular, Feathered..." +msgstr "Re_ktangulær, udtyndet..." + +#: ../plug-ins/script-fu/scripts/mkbrush.scm:132 +msgid "Create a rectangular brush with feathered edges" +msgstr "Lav en rektangulær pensel med udtyndede kanter" + +#: ../plug-ins/script-fu/scripts/mkbrush.scm:140 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:265 +msgid "Feathering" +msgstr "Udtynding" + +#: ../plug-ins/script-fu/scripts/mkbrush.scm:187 +msgid "_Elliptical..." +msgstr "_Elliptisk..." + +#: ../plug-ins/script-fu/scripts/mkbrush.scm:188 +msgid "Create an elliptical brush" +msgstr "Lav en elliptisk pensel" + +#: ../plug-ins/script-fu/scripts/mkbrush.scm:256 +msgid "Elli_ptical, Feathered..." +msgstr "Elli_ptisk, udtyndet..." + +#: ../plug-ins/script-fu/scripts/mkbrush.scm:257 +msgid "Create an elliptical brush with feathered edges" +msgstr "Lav en elliptisk pensel med udtyndede kanter" + +#: ../plug-ins/script-fu/scripts/neon-logo.scm:244 +#: ../plug-ins/script-fu/scripts/neon-logo.scm:280 +msgid "N_eon..." +msgstr "N_eon..." + +#: ../plug-ins/script-fu/scripts/neon-logo.scm:245 +msgid "Convert the selected region (or alpha) into a neon-sign like object" +msgstr "Omdan det valgte område (eller alfa) til et neonskiltlignende objekt" + +#: ../plug-ins/script-fu/scripts/neon-logo.scm:255 +#: ../plug-ins/script-fu/scripts/neon-logo.scm:291 +msgid "Create shadow" +msgstr "Generér skygge" + +#: ../plug-ins/script-fu/scripts/neon-logo.scm:281 +msgid "Create a logo in the style of a neon sign" +msgstr "Lav et logo i stil med et neonskilt" + +#: ../plug-ins/script-fu/scripts/news-text.scm:77 +msgid "Newsprint Te_xt..." +msgstr "Avistr_yk-tekst..." + +#: ../plug-ins/script-fu/scripts/news-text.scm:78 +msgid "Create a logo in the style of newspaper printing" +msgstr "Lav et logo i stil med avistrykning" + +#: ../plug-ins/script-fu/scripts/news-text.scm:86 +msgid "Cell size (pixels)" +msgstr "Cellestørrelse (pixels)" + +#: ../plug-ins/script-fu/scripts/news-text.scm:87 +#: ../plug-ins/script-fu/scripts/speed-text.scm:95 +msgid "Density (%)" +msgstr "Tæthed (%)" + +#: ../plug-ins/script-fu/scripts/old-photo.scm:89 +msgid "_Old Photo..." +msgstr "Gammelt f_otografi..." + +#: ../plug-ins/script-fu/scripts/old-photo.scm:90 +msgid "Make an image look like an old photo" +msgstr "Få et billede til at ligne et gammelt fotografi" + +#: ../plug-ins/script-fu/scripts/old-photo.scm:97 +msgid "Defocus" +msgstr "Stil uskarpt" + +#. since this plug-in uses the fuzzy-border plug-in, I used the +#. values of the latter, with the exception of the initial value +#. and the 'minimum' value. +#: ../plug-ins/script-fu/scripts/old-photo.scm:102 +msgid "Sepia" +msgstr "Sepia" -#~ msgid "Blen_ded..." -#~ msgstr "Blan_det..." +# tilføjer uregelmæssigt plettelignende støj +#: ../plug-ins/script-fu/scripts/old-photo.scm:103 +msgid "Mottle" +msgstr "Spætter" + +#: ../plug-ins/script-fu/scripts/palette-export.scm:226 +msgid "Folder for the output file" +msgstr "Mappe til outputfilen" -#~ msgid "" -#~ "Add blended backgrounds, highlights, and shadows to the selected region " -#~ "(or alpha)" -#~ msgstr "" -#~ "Tilføj blandede baggrunde, highlights og skygger til det markerede " -#~ "område (eller alfa)" +#: ../plug-ins/script-fu/scripts/palette-export.scm:227 +msgid "" +"The name of the file to create (if a file with this name already exist, it " +"will be replaced)" +msgstr "" +"Navnet på filen der skal oprettes (hvis en fil med dette navn allerede " +"findes, så vil den blive erstattet)" -#~ msgid "Offset (pixels)" -#~ msgstr "Forskydning (pixels)" +#: ../plug-ins/script-fu/scripts/palette-export.scm:235 +msgid "The filename you entered is not a suitable name for a file." +msgstr "Filnavnet du indtastede er ikke et egnet navn for en fil." -#~ msgid "Blend mode" -#~ msgstr "Blandingsmåde" +#: ../plug-ins/script-fu/scripts/palette-export.scm:237 +msgid "" +"All characters in the name are either white-spaces or characters which can " +"not appear in filenames." +msgstr "" +"Alle tegn i navnet er enten blanktegn eller tegn som ikke kan være i " +"filnavne." -# forskellige blandingsmåder -# "Forgrund-baggrund-HSV" / "FG-BG-HSV" -#~ msgid "FG-BG-HSV" -#~ msgstr "Forgrund-baggrund (HSV)" +#: ../plug-ins/script-fu/scripts/palette-export.scm:265 +msgid "" +"Export the active palette as a CSS stylesheet with the color entry name as " +"their class name, and the color itself as the color attribute" +msgstr "" +"Eksporter den aktive palet som et CSS-stilark med farvepunktnavnet som deres " +"klassenavn og selve farven som farveattributten" -# "Forgrund-gennemsigtig" -#~ msgid "FG-Transparent" -#~ msgstr "Forgrund, gennemsigtig" +#: ../plug-ins/script-fu/scripts/palette-export.scm:291 +msgid "Export the active palette as a PHP dictionary (name => color)" +msgstr "Eksporter den aktive palet som en PHP-ordbog (navn => farve)" + +#: ../plug-ins/script-fu/scripts/palette-export.scm:323 +msgid "Export the active palette as a Python dictionary (name: color)" +msgstr "Eksporter den aktive palet som en Pythonordbog (navn: farve)" -#~ msgid "Custom Gradient" -#~ msgstr "Brugerdefineret farveovergang" +#: ../plug-ins/script-fu/scripts/palette-export.scm:352 +msgid "" +"Write all the colors in a palette to a text file, one hexadecimal value per " +"line (no names)" +msgstr "" +"Skriv alle farverne i en palette til en tekstfil, en heksadecimal værdi per " +"linje (ingen navne)" -#~ msgid "Gradient reverse" -#~ msgstr "Farveovergang, omvendt" +#: ../plug-ins/script-fu/scripts/palette-export.scm:399 +msgid "Export the active palette as a java.util.Hashtable" +msgstr "Eksporter den aktive palet som en java.util.Hashtable" + +#: ../plug-ins/script-fu/scripts/paste-as-brush.scm:56 +#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm:44 +msgid "There is no image data in the clipboard to paste." +msgstr "Der er ikke nogen billeddata at indsætte fra udklipsholderen." + +#: ../plug-ins/script-fu/scripts/paste-as-brush.scm:62 +msgid "New _Brush..." +msgstr "Ny _pensel..." + +#: ../plug-ins/script-fu/scripts/paste-as-brush.scm:63 +msgid "Paste the clipboard contents into a new brush" +msgstr "Indsæt udklipsholderens indhold i en ny pensel" + +#: ../plug-ins/script-fu/scripts/paste-as-brush.scm:68 +#: ../plug-ins/script-fu/scripts/select-to-brush.scm:141 +msgid "Brush name" +msgstr "Penselnavn" + +#: ../plug-ins/script-fu/scripts/paste-as-brush.scm:69 +#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm:57 +#: ../plug-ins/script-fu/scripts/select-to-brush.scm:142 +#: ../plug-ins/script-fu/scripts/select-to-pattern.scm:102 +msgid "File name" +msgstr "Filnavn" + +#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm:50 +msgid "New _Pattern..." +msgstr "Nyt _mønster..." + +#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm:51 +msgid "Paste the clipboard contents into a new pattern" +msgstr "Indsæt udklipsholderens indhold i et nyt mønster" + +#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm:56 +#: ../plug-ins/script-fu/scripts/select-to-pattern.scm:101 +msgid "Pattern name" +msgstr "Mønsternavn" + +#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:198 +msgid "_Perspective..." +msgstr "_Perspektiv..." + +#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:199 +msgid "Add a perspective shadow to the selected region (or alpha)" +msgstr "Tilføj en perspektivskygge til det valgte område (eller alfa)" + +#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:206 +msgid "Angle" +msgstr "Vinkel" + +#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:207 +msgid "Relative distance of horizon" +msgstr "Relativ afstand til horisont" + +#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:208 +msgid "Relative length of shadow" +msgstr "Relativ skyggelængde" + +#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:212 +msgid "Interpolation" +msgstr "Interpolering" + +#: ../plug-ins/script-fu/scripts/predator.scm:121 +msgid "_Predator..." +msgstr "_Predator..." + +#: ../plug-ins/script-fu/scripts/predator.scm:122 +msgid "Add a 'Predator' effect to the selected region (or alpha)" +msgstr "Tilføj en 'Predator'-effekt til det markerede område (eller alfa)" + +#: ../plug-ins/script-fu/scripts/predator.scm:129 +msgid "Edge amount" +msgstr "Kantmængde" + +#: ../plug-ins/script-fu/scripts/predator.scm:130 +msgid "Pixelize" +msgstr "Opdel i små firkanter" -#~ msgid "Create a logo with blended backgrounds, highlights, and shadows" -#~ msgstr "Lav et logo med blandede baggrunde, highlights og skygger" +# hører sammen med næste +#: ../plug-ins/script-fu/scripts/predator.scm:131 +msgid "Pixel amount" +msgstr "Punktmængde" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:187 +msgid "_Round Button..." +msgstr "_Rund knap..." + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:188 +msgid "Create images, each containing an oval button graphic" +msgstr "Lav billeder, der hver indeholder en oval knapgrafik" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:196 +msgid "Upper color" +msgstr "Øverste farve" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:197 +msgid "Lower color" +msgstr "Nederste farve" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:199 +msgid "Upper color (active)" +msgstr "Øverste farve (aktiv)" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:200 +msgid "Lower color (active)" +msgstr "Nederste farve (aktiv)" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:201 +msgid "Text color (active)" +msgstr "Tekstfarve (aktiv)" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:202 +msgid "Padding X" +msgstr "Fyldning x" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:203 +msgid "Padding Y" +msgstr "Fyldning y" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:205 +msgid "Round ratio" +msgstr "Afrundingsforhold" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:206 +msgid "Not pressed" +msgstr "Ikke trykket" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:207 +msgid "Not pressed (active)" +msgstr "Ikke trykket (aktiv)" + +#: ../plug-ins/script-fu/scripts/rendermap.scm:80 +msgid "Render _Map..." +msgstr "Optegn _kort..." + +#: ../plug-ins/script-fu/scripts/rendermap.scm:81 +msgid "Create an image filled with an Earth-like map pattern" +msgstr "Opret et billede udfyldt med et jordlignende kortmønster" -#~ msgid "Bo_vination..." -#~ msgstr "K_vægeffekt..." +#: ../plug-ins/script-fu/scripts/rendermap.scm:90 +msgid "Behavior" +msgstr "Opførsel" -#~ msgid "Add 'cow spots' to the selected region (or alpha)" -#~ msgstr "Tilføj \"ko-pletter\" til det markerede område (eller alfa)" +#: ../plug-ins/script-fu/scripts/rendermap.scm:90 +msgid "Tile" +msgstr "Flise" -# Vandret plettæthed -#~ msgid "Spots density X" -#~ msgstr "Plettæthed x" +#: ../plug-ins/script-fu/scripts/rendermap.scm:90 +msgid "Detail in Middle" +msgstr "Detaljer i midten" -# "Lodret plettæthed" -#~ msgid "Spots density Y" -#~ msgstr "Plettæthed y" +#: ../plug-ins/script-fu/scripts/reverse-layers.scm:42 +msgid "Reverse Layer Order" +msgstr "Omvendt lagrækkefølge" + +#: ../plug-ins/script-fu/scripts/reverse-layers.scm:43 +msgid "Reverse the order of layers in the image" +msgstr "Vend rækkefølgen for lag i billedet" + +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:119 +msgid "_Rippling..." +msgstr "_Krusning..." -#~ msgid "Background Color" -#~ msgstr "Baggrundsfarve" +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:120 +msgid "" +"Create a multi-layer image by adding a ripple effect to the current image" +msgstr "" +"Opret et flerlagsbillede ved at tilføje en krusningseffelt til det aktuelle " +"billede" -#~ msgid "Create a logo with text in the style of 'cow spots'" -#~ msgstr "Lav et logo med tekst i stil med \"ko-pletter\"" +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:127 +msgid "Rippling strength" +msgstr "Krusningsstyrke" + +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:128 +#: ../plug-ins/script-fu/scripts/waves-anim.scm:105 +msgid "Number of frames" +msgstr "Antal billeder" -#~ msgid "" -#~ "The Burn-In script needs two layers in total. A foreground layer with " -#~ "transparency and a background layer." -#~ msgstr "" -#~ "Scriptet laserbrænding skal bruge to lag i alt. Et forgrundslag med " -#~ "gennemsigtighed og et baggrundslag." +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:129 +msgid "Edge behavior" +msgstr "Kantopførsel" -# http://fuchur.leute.server.de/burn_in/ -#~ msgid "B_urn-In..." -#~ msgstr "_Laserbrænding..." +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:129 +msgid "Wrap" +msgstr "Ombryd" -#~ msgid "" -#~ "Create intermediate layers to produce an animated 'burn-in' transition " -#~ "between two layers" -#~ msgstr "" -#~ "Lav et mellemliggende lag for at lave en animeret " -#~ "\"laserbrændings\"-overgang mellem to lag" +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:129 +msgid "Smear" +msgstr "Udsmør" -#~ msgid "Fadeout" -#~ msgstr "Udtoning" +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:129 +msgid "Black" +msgstr "Sort" -#~ msgid "Fadeout width" -#~ msgstr "Udtoningsbredde" +#: ../plug-ins/script-fu/scripts/round-corners.scm:129 +msgid "_Round Corners..." +msgstr "_Afrundede hjørner..." -#~ msgid "Corona width" -#~ msgstr "Corona-bredde" +#: ../plug-ins/script-fu/scripts/round-corners.scm:130 +msgid "" +"Round the corners of an image and optionally add a drop-shadow and background" +msgstr "" +"Afrund hjørnerne af billede og valgfrit tilføj en slagskygge og baggrund" -#~ msgid "After glow" -#~ msgstr "Efterglød" +#: ../plug-ins/script-fu/scripts/round-corners.scm:137 +msgid "Edge radius" +msgstr "Kantradius" + +#: ../plug-ins/script-fu/scripts/round-corners.scm:138 +msgid "Add drop-shadow" +msgstr "Tilføj slagskygge" + +#: ../plug-ins/script-fu/scripts/round-corners.scm:142 +msgid "Add background" +msgstr "Tilføj baggrund" + +#: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm:53 +msgid "Se_t Colormap..." +msgstr "_Sæt farvekort..." + +#: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm:54 +msgid "Change the colormap of an image to the colors in a specified palette." +msgstr "Ændr farvekortet på et billede til farverne i den angivne palet." + +#: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm:61 +msgid "Palette" +msgstr "Palet" + +#: ../plug-ins/script-fu/scripts/selection-round.scm:139 +msgid "Rounded R_ectangle..." +msgstr "_Afrundet rektangel..." + +#: ../plug-ins/script-fu/scripts/selection-round.scm:140 +msgid "Round the corners of the current selection" +msgstr "Afrund hjørnerne på den nuværende markering" + +#: ../plug-ins/script-fu/scripts/selection-round.scm:147 +msgid "Radius (%)" +msgstr "Radius (%)" + +#: ../plug-ins/script-fu/scripts/selection-round.scm:148 +msgid "Concave" +msgstr "Konkav" + +#: ../plug-ins/script-fu/scripts/select-to-brush.scm:133 +msgid "To _Brush..." +msgstr "Til _pensel..." + +#: ../plug-ins/script-fu/scripts/select-to-brush.scm:134 +msgid "Convert a selection to a brush" +msgstr "Omdan en markering til en pensel" + +#: ../plug-ins/script-fu/scripts/select-to-image.scm:81 +msgid "To _Image" +msgstr "Til b_illede" + +#: ../plug-ins/script-fu/scripts/select-to-image.scm:82 +msgid "Convert a selection to an image" +msgstr "Omdan en markering til et billede" + +#: ../plug-ins/script-fu/scripts/select-to-pattern.scm:93 +msgid "To _Pattern..." +msgstr "Til _mønster..." + +#: ../plug-ins/script-fu/scripts/select-to-pattern.scm:94 +msgid "Convert a selection to a pattern" +msgstr "Omdan en markering til et mønster" + +#: ../plug-ins/script-fu/scripts/slide.scm:236 +msgid "_Slide..." +msgstr "_Dias..." -#~ msgid "Add glowing" -#~ msgstr "Tilføj glød" +# "Tilføj diasramme" / "Tilføj ramme som på diasfilm +#: ../plug-ins/script-fu/scripts/slide.scm:237 +msgid "Add a slide-film like frame, sprocket holes, and labels to an image" +msgstr "" +"Tilføj en diasfilmlignende ramme, perforering og etiketter til et billede" -#~ msgid "Prepare for GIF" -#~ msgstr "Forbered til GIF" +#: ../plug-ins/script-fu/scripts/slide.scm:245 +msgid "Number" +msgstr "Antal" + +#: ../plug-ins/script-fu/scripts/slide.scm:247 +msgid "Font color" +msgstr "Skriftfarve" + +#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:204 +msgid "SOTA Chrome..." +msgstr "SOTA-krom..." + +#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:205 +msgid "Create a State Of The Art chromed logo" +msgstr "Opret et hypermoderne forkromet logo" + +#: ../plug-ins/script-fu/scripts/speed-text.scm:86 +msgid "Speed Text..." +msgstr "Farttekst..." + +#: ../plug-ins/script-fu/scripts/speed-text.scm:87 +msgid "Create a logo with a speedy text effect" +msgstr "Opret et logo med en fartteksteffekt" + +#: ../plug-ins/script-fu/scripts/spinning-globe.scm:94 +msgid "_Spinning Globe..." +msgstr "_Roterende kugle..." -#~ msgid "Speed (pixels/frame)" -#~ msgstr "Hastighed (punkter/billede)" +#: ../plug-ins/script-fu/scripts/spinning-globe.scm:95 +msgid "Create an animation by mapping the current image onto a spinning sphere" +msgstr "" +"Opret en animation ved at placere det aktuelle billede på en roterende kugle" -#~ msgid "_Camouflage..." -#~ msgstr "_Kamuflage..." +#: ../plug-ins/script-fu/scripts/spinning-globe.scm:102 +msgid "Frames" +msgstr "Rammer" -#~ msgid "Create an image filled with a camouflage pattern" -#~ msgstr "Lav et billede udfyldt med et kamuflagemønster" +#: ../plug-ins/script-fu/scripts/spinning-globe.scm:103 +msgid "Turn from left to right" +msgstr "Drej fra venstre mod højre" -#~ msgid "Image size" -#~ msgstr "Billedstørrelse" +#: ../plug-ins/script-fu/scripts/spinning-globe.scm:105 +msgid "Index to n colors (0 = remain RGB)" +msgstr "Indeks til n farver (0 = forbliv RGB)" -#~ msgid "Granularity" -#~ msgstr "Kornethed" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:240 +msgid "Rendering Spyro" +msgstr "Optegner spyro" -#~ msgid "Color 1" -#~ msgstr "Farve 1" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:314 +msgid "_Spyrogimp..." +msgstr "_Spyrogimp..." -#~ msgid "Color 2" -#~ msgstr "Farve 2" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:315 +msgid "" +"Add Spirographs, Epitrochoids, and Lissajous Curves to the current layer" +msgstr "" +"Tilføjer spirografer, epitrochoider og Lissajous-kurver til det aktuelle lag" -#~ msgid "Color 3" -#~ msgstr "Farve 3" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:323 +msgid "Type" +msgstr "Type" -#~ msgid "Smooth" -#~ msgstr "Udjævn" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:323 +msgid "Spyrograph" +msgstr "Spyrograf" -#~ msgid "Carved Surface" -#~ msgstr "Udhugget overflade" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:324 +msgid "Epitrochoid" +msgstr "Epitrochoide" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:325 +msgid "Lissajous" +msgstr "Lissajous" -#~ msgid "Bevel Shadow" -#~ msgstr "Facetskygge" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:326 +msgid "Shape" +msgstr "Form" -#~ msgid "Bevel Highlight" -#~ msgstr "Facetfremhævelse" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:326 +msgid "Circle" +msgstr "Cirkel" -#~ msgid "Cast Shadow" -#~ msgstr "Kast skygge" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:328 +msgid "Triangle" +msgstr "Trekant" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:329 +msgid "Square" +msgstr "Kvadrat" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:330 +msgid "Pentagon" +msgstr "Femkant" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:331 +msgid "Hexagon" +msgstr "Sekskant" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:332 +msgid "Polygon: 7 sides" +msgstr "Polygon: 7 sider" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:333 +msgid "Polygon: 8 sides" +msgstr "Polygon: 8 sider" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:334 +msgid "Polygon: 9 sides" +msgstr "Polygon: 9 sider" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:335 +msgid "Polygon: 10 sides" +msgstr "Polygon: 10 sider" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:336 +msgid "Outer teeth" +msgstr "Ydre tand" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:337 +msgid "Inner teeth" +msgstr "Indre tand" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:338 +msgid "Margin (pixels)" +msgstr "Margen (pixels)" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:339 +msgid "Hole ratio" +msgstr "Hulforhold" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:340 +#: ../plug-ins/script-fu/scripts/text-circle.scm:215 +msgid "Start angle" +msgstr "Startvinkel" -#~ msgid "Inset" -#~ msgstr "Indlæg" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:342 +msgid "Tool" +msgstr "Værktøj" -#~ msgid "Carved..." -#~ msgstr "Udskåret..." +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:342 +msgid "Pencil" +msgstr "Blyant" -#~ msgid "" -#~ "Create a logo with text raised above or carved in to the specified " -#~ "background image" -#~ msgstr "" -#~ "Lav et logo med tekst hævet over eller udskåret ind i det angivne " -#~ "baggrundsbillede" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:343 +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:345 +msgid "Brush" +msgstr "Pensel" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:344 +msgid "Airbrush" +msgstr "Sprøjtepistol" -#~ msgid "Background Image" -#~ msgstr "Baggrundsbillede" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:347 +msgid "Color method" +msgstr "Farvemetode" -# man kan enten få hugget teksten ind i baggrunden eller baggrunden -# hugget væk så teksten står ud -#~ msgid "Carve raised text" -#~ msgstr "Udhug tekstomgivelser" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:347 +msgid "Solid Color" +msgstr "Ensfarvet" -#~ msgid "Padding around text" -#~ msgstr "Fyldning omkring tekst" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:348 +msgid "Gradient: Loop Sawtooth" +msgstr "Overgang: savtandsløkke" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:349 +msgid "Gradient: Loop Triangle" +msgstr "Overgang: trekantsløkke" + +#: ../plug-ins/script-fu/scripts/starscape-logo.scm:139 +msgid "Sta_rscape..." +msgstr "Stje_rnehimmel..." -#~ msgid "Stencil C_arve..." -#~ msgstr "Skabelon_udskæring..." +#: ../plug-ins/script-fu/scripts/starscape-logo.scm:140 +msgid "Create a logo using a rock-like texture, a nova glow, and shadow" +msgstr "" +"Opret et logo der bruger en stenlignende tekstur, en novaglød og skygge" -#~ msgid "Image to carve" -#~ msgstr "Billede der skal udhugges" +#: ../plug-ins/script-fu/scripts/swirltile.scm:51 +msgid "Swirl-_Tile..." +msgstr "_Hvirvelfelt..." -#~ msgid "Carve white areas" -#~ msgstr "Udhug hvide flader" +#: ../plug-ins/script-fu/scripts/swirltile.scm:52 +msgid "Create an image filled with a swirled tile effect" +msgstr "Opret et billede udfyldt med en hvirvlet felteffekt" -#~ msgid "_Chalk..." -#~ msgstr "_Kridt..." +#: ../plug-ins/script-fu/scripts/swirltile.scm:63 +msgid "Whirl amount" +msgstr "Omdrejningsgrad" -#~ msgid "Create a chalk drawing effect for the selected region (or alpha)" -#~ msgstr "Lav en kridttegningseffekt til det markerede område (eller alfa)" +#: ../plug-ins/script-fu/scripts/swirly-pattern.scm:82 +msgid "_Swirly..." +msgstr "_Hvirvlende..." -#~ msgid "Create a logo resembling chalk scribbled on a blackboard" -#~ msgstr "Lav et logo, der ligner kridt på en tavle" +#: ../plug-ins/script-fu/scripts/swirly-pattern.scm:83 +msgid "Create an image filled with a swirly pattern" +msgstr "Opret et billede udfyldt med et hvirvelmønster" -#~ msgid "Chalk color" -#~ msgstr "Kridtfarve" +#: ../plug-ins/script-fu/scripts/swirly-pattern.scm:88 +msgid "Quarter size" +msgstr "Størrelse for fjerdedel" -#~ msgid "Chip Awa_y..." -#~ msgstr "Skær _væk..." +#: ../plug-ins/script-fu/scripts/swirly-pattern.scm:89 +msgid "Whirl angle" +msgstr "Omdrejningsvinkel" -#~ msgid "Add a chipped woodcarving effect to the selected region (or alpha)" -#~ msgstr "" -#~ "Tilføj en skåret træudskæringseffekt til det markerede område (eller alfa)" +#: ../plug-ins/script-fu/scripts/swirly-pattern.scm:90 +msgid "Number of times to whirl" +msgstr "Antal omdrejninger" -# dækker så nogenlunde -#~ msgid "Chip amount" -#~ msgstr "Afskalningsmængde" +#: ../plug-ins/script-fu/scripts/test-sphere.scm:267 +msgid "_Sphere..." +msgstr "_Kugle..." -#~ msgid "Blur amount" -#~ msgstr "Sløringsmængde" +#: ../plug-ins/script-fu/scripts/text-circle.scm:207 +msgid "Text C_ircle..." +msgstr "Tekstc_irkel..." -#~ msgid "Invert" -#~ msgstr "Invertér" +#: ../plug-ins/script-fu/scripts/text-circle.scm:208 +msgid "" +"Create a logo by rendering the specified text along the perimeter of a circle" +msgstr "" +"Opret et logo ved at optegne den angivne tekst langs omkredsen af en cirkel" -#~ msgid "Drop shadow" -#~ msgstr "Slagskygge" +#: ../plug-ins/script-fu/scripts/text-circle.scm:216 +msgid "Fill angle" +msgstr "Udfyldningsvinkel" + +#: ../plug-ins/script-fu/scripts/text-circle.scm:218 +msgid "Antialias" +msgstr "Udjævning" + +#: ../plug-ins/script-fu/scripts/textured-logo.scm:117 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:159 +msgid "_Textured..." +msgstr "Med _tekstur..." -#~ msgid "Fill BG with pattern" -#~ msgstr "Udfyld baggrund med mønster" - -#~ msgid "Keep background" -#~ msgstr "Behold baggrund" - -# "en træudskæring" / "en trædskæring med hakker -#~ msgid "Create a logo resembling a chipped wood carving" -#~ msgstr "Opret et logo der ligner en skåret træudskæring" - -#~ msgid "Layer 1" -#~ msgstr "Lag 1" - -#~ msgid "Layer 2" -#~ msgstr "Lag 2" - -#~ msgid "Layer 3" -#~ msgstr "Lag 3" - -#~ msgid "Drop Shadow" -#~ msgstr "Dråbeskygge" - -#~ msgid "Chrome" -#~ msgstr "Forkrom" - -#~ msgid "Highlight" -#~ msgstr "Highlight" - -#~ msgid "Stencil C_hrome..." -#~ msgstr "Skabelon_krom..." - -#~ msgid "" -#~ "Add a chrome effect to the selected region (or alpha) using a specified " -#~ "(grayscale) stencil" -#~ msgstr "" -#~ "Tilføj en kromeffekt til det markerede område (eller alfa) med brug af en " -#~ "specifik (gråskala) skabelon" - -#~ msgid "Chrome saturation" -#~ msgstr "Forkromningsmætning" - -#~ msgid "Chrome lightness" -#~ msgstr "Forkromningslysstyrke" - -#~ msgid "Chrome factor" -#~ msgstr "Forkromningsfaktor" - -#~ msgid "Environment map" -#~ msgstr "Omgivelsesreflektioner" - -# nogle områder er stærkt belyste -#~ msgid "Highlight balance" -#~ msgstr "Highlightbalance" - -#~ msgid "Chrome balance" -#~ msgstr "Krombalance" - -#~ msgid "Chrome white areas" -#~ msgstr "Forkrom hvide flader" - -#~ msgid "C_hrome..." -#~ msgstr "Forkr_om..." - -#~ msgid "Add a simple chrome effect to the selected region (or alpha)" -#~ msgstr "Tilføj en enkel kromeffekt til det markerede område (eller alfa)" - -#~ msgid "Offsets (pixels * 2)" -#~ msgstr "Forskydning (pixels * 2)" - -#~ msgid "Create a simplistic, but cool, chromed logo" -#~ msgstr "Opret et enkelt, men smart, forkromet logo" - -#~ msgid "Effect layer" -#~ msgstr "Effektlag" - -#~ msgid "_Circuit..." -#~ msgstr "_Kredsløb..." - -#~ msgid "" -#~ "Fill the selected region (or alpha) with traces like those on a circuit " -#~ "board" -#~ msgstr "" -#~ "Udfyld det markerede område (eller alfa) med spor som dem på et " -#~ "kredsløbsbræt" - -# 'oilify' er næsten uoversætteligt -# "Maskestørrelse for olieficering" -# Er /olieficering/ en udtværende effekt, skaber den mere genskin, ændrer -# den farverne, eller? -#~ msgid "Oilify mask size" -#~ msgstr "Olieficer maskestørrelse" - -#~ msgid "Circuit seed" -#~ msgstr "Startværdi for kredsløb" - -#~ msgid "No background (only for separate layer)" -#~ msgstr "Ingen baggrund (kun til separate lag)" - -#~ msgid "Keep selection" -#~ msgstr "Behold markering" - -#~ msgid "Separate layer" -#~ msgstr "Separat lag" - -#~ msgid "_Clothify..." -#~ msgstr "_Tekstileffekt..." - -#~ msgid "Add a cloth-like texture to the selected region (or alpha)" -#~ msgstr "" -#~ "Tilføj en stoflignende tekstur til det markerede område (eller alfa)" - -#~ msgid "Blur X" -#~ msgstr "Sløring x" - -#~ msgid "Blur Y" -#~ msgstr "Sløring y" - -#~ msgid "Azimuth" -#~ msgstr "Azimut" - -#~ msgid "Elevation" -#~ msgstr "Hævning" - -#~ msgid "Depth" -#~ msgstr "Dybde" - -#~ msgid "Stain" -#~ msgstr "Stænk" - -#~ msgid "_Coffee Stain..." -#~ msgstr "_Kaffeplet..." - -#~ msgid "Add realistic looking coffee stains to the image" -#~ msgstr "Tilføj realistisk udseende kaffepletter til billedet" - -#~ msgid "Stains" -#~ msgstr "Stænk" - -#~ msgid "Darken only" -#~ msgstr "Formørk kun" - -#~ msgid "Comic Boo_k..." -#~ msgstr "Te_gneserie..." - -#~ msgid "" -#~ "Add a comic-book effect to the selected region (or alpha) by outlining " -#~ "and filling with a gradient" -#~ msgstr "" -#~ "Tilføj en tegneserieeffekt til det markerede område (eller alfa) ved at " -#~ "omridse og udfylde med en farveovergang" - -#~ msgid "Outline size" -#~ msgstr "Omridsstørrelse" - -#~ msgid "Outline color" -#~ msgstr "Omridsfarve" - -#~ msgid "" -#~ "Create a comic-book style logo by outlining and filling with a gradient" -#~ msgstr "" -#~ "Opret et logo med en tegneseriestil omridset og udfyldt med en " -#~ "farveovergang" - -#~ msgid "Cool _Metal..." -#~ msgstr "Smart _metal..." - -#~ msgid "" -#~ "Add a metallic effect to the selected region (or alpha) with reflections " -#~ "and perspective shadows" -#~ msgstr "" -#~ "Tilføj en metaleffekt til det markerede område (eller alfa) med " -#~ "reflektioner og perspektivskygger" - -#~ msgid "Effect size (pixels)" -#~ msgstr "Effektstørrelse (pixels)" - -#~ msgid "Create a metallic logo with reflections and perspective shadows" -#~ msgstr "Opret et metallogo med reflektioner og perspektivskygger" - -#~ msgid "Crystal..." -#~ msgstr "Krystal..." - -#~ msgid "" -#~ "Create a logo with a crystal/gel effect displacing the image underneath" -#~ msgstr "" -#~ "Opret et logo med en krystal-/gel-effekt der viser billedet nedenunder" - -#~ msgid "Background image" -#~ msgstr "Baggrundsbillede" - -#~ msgid "Difference Clouds..." -#~ msgstr "Forskelsskyer..." - -#~ msgid "Solid noise applied with Difference layer mode" -#~ msgstr "Konstant støj påført i tilstanden lagforskelle" - -#~ msgid "_Distort..." -#~ msgstr "_Forvræng..." - -#~ msgid "Distress the selection" -#~ msgstr "Gør markering uroligt" - -#~ msgid "Threshold (bigger 1<-->254 smaller)" -#~ msgstr "Grænse (større 1<-->255 mindre)" - -#~ msgid "Spread" -#~ msgstr "Spredning" - -#~ msgid "Granularity (1 is low)" -#~ msgstr "Kornethed (1 er lav)" - -#~ msgid "Smooth horizontally" -#~ msgstr "Vandret udjævning" - -#~ msgid "Smooth vertically" -#~ msgstr "Lodret udjævning" - -#~ msgid "_Drop Shadow..." -#~ msgstr "_Slagskygge..." - -#~ msgid "Add a drop shadow to the selected region (or alpha)" -#~ msgstr "Tilføj en slagskygge til det markerede område (eller alfa)" - -#~ msgid "Offset X" -#~ msgstr "Forskydning x" - -#~ msgid "Offset Y" -#~ msgstr "Forskydning y" - -#~ msgid "Blur radius" -#~ msgstr "Sløringsradius" - -#~ msgid "Color" -#~ msgstr "Farve" - -#~ msgid "Opacity" -#~ msgstr "Synlighed" - -#~ msgid "Allow resizing" -#~ msgstr "Tillad størrelsesændring" - -#~ msgid "_Erase Every Other Row..." -#~ msgstr "Sl_et hver anden række..." - -#~ msgid "Erase every other row or column" -#~ msgstr "Slet hver anden række eller kolonne" - -#~ msgid "Rows/cols" -#~ msgstr "Rækker/kolonner" - -#~ msgid "Columns" -#~ msgstr "Kolonner" - -#~ msgid "Even/odd" -#~ msgstr "Lige/ulige" - -#~ msgid "Odd" -#~ msgstr "Ulige" - -#~ msgid "Erase/fill" -#~ msgstr "Slet/udfyld" - -#~ msgid "Fill with BG" -#~ msgstr "Udfyld med baggrund" - -#~ msgid "_Flatland..." -#~ msgstr "_Fladt land..." - -#~ msgid "Create an image filled with a Land Pattern" -#~ msgstr "Opret et billede udfyldt med et landmønster" - -#~ msgid "Image width" -#~ msgstr "Billedbredde" - -#~ msgid "Image height" -#~ msgstr "Billedhøjde" - -#~ msgid "Random seed" -#~ msgstr "Startværdi for tilfældighedsgenerator" - -#~ msgid "Detail level" -#~ msgstr "Detaljeniveau" - -#~ msgid "Scale X" -#~ msgstr "X-skalering" - -#~ msgid "Scale Y" -#~ msgstr "Y-skalering" - -#~ msgid "Render _Font Map..." -#~ msgstr "Optegn _skrifttypekort..." - -#~ msgid "" -#~ "Create an image filled with previews of fonts matching a fontname filter" -#~ msgstr "" -#~ "Opret et billede fyldt med forhåndsvisninger af skrifttyper der matcher " -#~ "et filter for skrifttypenavne" - -#~ msgid "_Text" -#~ msgstr "_Tekst" - -#~ msgid "Use font _name as text" -#~ msgstr "Benyt skrifttype_navn som tekst" - -#~ msgid "_Labels" -#~ msgstr "_Etiketter" - -#~ msgid "_Filter (regexp)" -#~ msgstr "_Filter (reg. udtryk)" - -#~ msgid "Font _size (pixels)" -#~ msgstr "Skrift_størrelse (pixels)" - -#~ msgid "_Border (pixels)" -#~ msgstr "_Kant (pixels)" - -#~ msgid "_Color scheme" -#~ msgstr "_Farveskema" - -#~ msgid "Active colors" -#~ msgstr "Aktive farver" - -#~ msgid "_Frosty..." -#~ msgstr "_Frosset..." - -#~ msgid "" -#~ "Add a frost effect to the selected region (or alpha) with an added drop " -#~ "shadow" -#~ msgstr "" -#~ "Tilføj en frosteffekt til det markerede område (eller alfa) med en " -#~ "tilføjet slagskygge" - -#~ msgid "Create frozen logo with an added drop shadow" -#~ msgstr "Opret frossent logo med en tilføjet slagskygge" - -#~ msgid "_Fuzzy Border..." -#~ msgstr "Ud_flydende kant..." - -# Her synes jeg ikke at fuzzy->udflydende passer særlig godt -#~ msgid "Add a jagged, fuzzy border to an image" -#~ msgstr "Tilføj en hakket, ujævn kant til et billede" - -#~ msgid "Border size" -#~ msgstr "Kantstørrelse" - -#~ msgid "Blur border" -#~ msgstr "Slør kant" - -#~ msgid "Granularity (1 is Low)" -#~ msgstr "Kornethed (1 er lav)" - -#~ msgid "Add shadow" -#~ msgstr "Tilføj skygge" - -#~ msgid "Shadow weight (%)" -#~ msgstr "Skyggevægt (%)" - -# "Brugsmønstre" - jeg forestiller mig at dette er henvisninger til et -# afsnit i en manual eller lignende. -#~ msgid "Using _Paths" -#~ msgstr "Bruger hjæl_pelinjer" - -#~ msgid "Bookmark to the user manual" -#~ msgstr "Bogmærke til brugermanualen" - -#~ msgid "_Preparing your Images for the Web" -#~ msgstr "_Tilpas dine billeder til internettet" - -#~ msgid "_Working with Digital Camera Photos" -#~ msgstr "_Arbejde med fotografier fra digitalkameraer" - -#~ msgid "Create, Open and Save _Files" -#~ msgstr "Opret, åbn og gem _filer" - -#~ msgid "_Basic Concepts" -#~ msgstr "_Grundlæggende ideer" - -#~ msgid "How to Use _Dialogs" -#~ msgstr "Sådan bruger du _dialoger" - -#~ msgid "Drawing _Simple Objects" -#~ msgstr "Tegn _simple objekter" - -#~ msgid "Create and Use _Selections" -#~ msgstr "Opret og brug _markeringer" - -#~ msgid "_Main Web Site" -#~ msgstr "_Hovedhjemmeside" - -#~ msgid "Bookmark to the GIMP web site" -#~ msgstr "Bogmærk til GIMP-hjemmesiden" - -#~ msgid "_Developer Web Site" -#~ msgstr "_Internetside for udviklere" - -#~ msgid "_User Manual Web Site" -#~ msgstr "_Hjemmeside for brugermanual" - -# "Register for udvidelsesmoduler" -#~ msgid "Plug-in _Registry" -#~ msgstr "Plugin-registreringsdatabase" - -#~ msgid "Glo_ssy..." -#~ msgstr "_Blank..." - -#~ msgid "" -#~ "Add gradients, patterns, shadows, and bump maps to the selected region " -#~ "(or alpha)" -#~ msgstr "" -#~ "Tilføj farveovergange, mønstre, skygger og ujævnhedskort til det " -#~ "markerede område (eller alfa)" - -#~ msgid "Blend gradient (text)" -#~ msgstr "Farveovergang (tekst)" - -#~ msgid "Text gradient reverse" -#~ msgstr "Tekstovergang, omvendt" - -# 'blend' er vist overflødigt -#~ msgid "Blend gradient (outline)" -#~ msgstr "Farveovergang (omrids)" - -#~ msgid "Outline gradient reverse" -#~ msgstr "Omridsfarveovergang, omvendt" - -#~ msgid "Use pattern for text instead of gradient" -#~ msgstr "Benyt mønster til tekst i stedet for farveovergang" - -#~ msgid "Pattern (text)" -#~ msgstr "Mønster (tekst)" - -#~ msgid "Use pattern for outline instead of gradient" -#~ msgstr "Benyt mønster til omrids i stedet for farveovergang" - -#~ msgid "Pattern (outline)" -#~ msgstr "Mønster (omrids)" - -#~ msgid "Use pattern overlay" -#~ msgstr "Benyt mønsteroverlægning" - -#~ msgid "Pattern (overlay)" -#~ msgstr "Mønster (overlægning)" - -#~ msgid "Shadow" -#~ msgstr "Skygge" - -#~ msgid "Create a logo with gradients, patterns, shadows, and bump maps" -#~ msgstr "Lav et logo med farveovergange, mønstre, skygger og ujævnhedskort" - -#~ msgid "Glo_wing Hot..." -#~ msgstr "Glø_dende varmt..." - -#~ msgid "Add a glowing hot metal effect to the selected region (or alpha)" -#~ msgstr "" -#~ "Tilføj en glødende varm metaleffekt til det markerede område (eller alfa)" - -#~ msgid "Create a logo that looks like glowing hot metal" -#~ msgstr "Lav et logo der ser ud som glødende varmt metal" - -#~ msgid "Gradient Beve_l..." -#~ msgstr "Fa_cetkant med farveovergang..." - -#~ msgid "Add a shiny look and bevel effect to the selected region (or alpha)" -#~ msgstr "" -#~ "Tilføj et skinnende udseende og kanteffekt til det markerede område " -#~ "(eller alfa)" - -#~ msgid "Border size (pixels)" -#~ msgstr "Kantstørrelse (pixels)" - -#~ msgid "Bevel height (sharpness)" -#~ msgstr "Facethøjde (skarphed)" - -#~ msgid "Create a logo with a shiny look and beveled edges" -#~ msgstr "Lav et logo med et skinnende udseende og facetskårne kanter" - -#~ msgid "Custom _Gradient..." -#~ msgstr "Brugerdefineret farveover_gang..." - -#~ msgid "Create an image filled with an example of the current gradient" -#~ msgstr "" -#~ "Opret et billede udfyldt med et eksempel på den aktuelle farveovergang" - -#~ msgid "_Grid..." -#~ msgstr "_Gitter..." - -#~ msgid "" -#~ "Draw a grid as specified by the lists of X and Y locations using the " -#~ "current brush" -#~ msgstr "" -#~ "Tegn et gitter som angivet af listen af X- og Y-koordinater der bruger " -#~ "den aktuelle pensel" - -#~ msgid "X divisions" -#~ msgstr "X-opdelinger" - -#~ msgid "Y divisions" -#~ msgstr "Y-opdelinger" - -#~ msgid "New Guides from _Selection" -#~ msgstr "Nye hjælpelinjer fra _markering" - -#~ msgid "Create four guides around the bounding box of the current selection" -#~ msgstr "Opret fire hjælpelinjer omkring kanterne på den nuværende markering" - -#~ msgid "New Guide (by _Percent)..." -#~ msgstr "Ny hjælpelinje (i _procent)..." - -#~ msgid "" -#~ "Add a guide at the position specified as a percentage of the image size" -#~ msgstr "" -#~ "Tilføj en hjælpelinje ved den position, som er angivet som en procentdel " -#~ "af billedstørrelsen" - -#~ msgid "Direction" -#~ msgstr "Retning" - -#~ msgid "Vertical" -#~ msgstr "Lodret" - -# "Position (procentangivelse)" / "Position (%)" / "Position (i procent)" -#~ msgid "Position (in %)" -#~ msgstr "Placering (i %)" - -#~ msgid "New _Guide..." -#~ msgstr "Ny _hjælpelinje..." - -#~ msgid "Add a guide at the orientation and position specified (in pixels)" -#~ msgstr "" -#~ "Tlføj en hjælpelinje ved den angivne orientering og position (i " -#~ "pixels)" - -#~ msgid "Position" -#~ msgstr "Placering" - -#~ msgid "_Remove all Guides" -#~ msgstr "_Fjern alle hjælpelinjer" - -#~ msgid "Remove all horizontal and vertical guides" -#~ msgstr "Fjern alle vandrette og lodrette hjælpelinjer" - -# Imigre ser ud til at være et firma der laver skrifttyper -#~ msgid "Imigre-_26..." -#~ msgstr "Imigre-_26..." - -#~ msgid "Create a logo in a two-color, scribbled text style" -#~ msgstr "Opret et logo i en tofarvet, griflet tekststil" - -#~ msgid "Frame color" -#~ msgstr "Rammefarve" - -#~ msgid "Frame size" -#~ msgstr "Rammestørrelse" - -#~ msgid "_Land..." -#~ msgstr "_Land..." - -#~ msgid "Create an image filled with a topographic map pattern" -#~ msgstr "Opret et billede udfyldt med et topografisk kortmønster" - -#~ msgid "Land height" -#~ msgstr "Landhøjde" - -# 'sea' er havet her (drejer sig om landkort) -#~ msgid "Sea depth" -#~ msgstr "Havdybde" - -#~ msgid "_Lava..." -#~ msgstr "_Lava..." - -#~ msgid "Fill the current selection with lava" -#~ msgstr "Udfyld den aktuelle markering med lava" - -#~ msgid "Seed" -#~ msgstr "Startværdi" - -#~ msgid "Roughness" -#~ msgstr "Ruhed" - -#~ msgid "Use current gradient" -#~ msgstr "Brug aktiv farveovergang" - -#~ msgid "Line _Nova..." -#~ msgstr "Linje_nova..." - -#~ msgid "" -#~ "Fill a layer with rays emanating outward from its center using the " -#~ "foreground color" -#~ msgstr "" -#~ "Udfyld et lag med stråler, der går ud fra dets midte med brug af " -#~ "forgrundsfarven" - -#~ msgid "Number of lines" -#~ msgstr "Antal linjer" - -#~ msgid "Sharpness (degrees)" -#~ msgstr "Skarphed (grader)" - -#~ msgid "Offset radius" -#~ msgstr "Forskydningsradius" - -#~ msgid "Randomness" -#~ msgstr "Tilfældighed" - -#~ msgid "_Rectangular..." -#~ msgstr "_Rektangulær..." - -#~ msgid "Create a rectangular brush" -#~ msgstr "Lav en rektangulær pensel" - -#~ msgid "Name" -#~ msgstr "Navn" - -#~ msgid "Spacing" -#~ msgstr "Mellemrum" - -#~ msgid "Re_ctangular, Feathered..." -#~ msgstr "Re_ktangulær, udtyndet..." - -#~ msgid "Create a rectangular brush with feathered edges" -#~ msgstr "Lav en rektangulær pensel med udtyndede kanter" - -#~ msgid "Feathering" -#~ msgstr "Udtynding" - -#~ msgid "_Elliptical..." -#~ msgstr "_Elliptisk..." - -#~ msgid "Create an elliptical brush" -#~ msgstr "Lav en elliptisk pensel" - -#~ msgid "Elli_ptical, Feathered..." -#~ msgstr "Elli_ptisk, udtyndet..." - -#~ msgid "Create an elliptical brush with feathered edges" -#~ msgstr "Lav en elliptisk pensel med udtyndede kanter" - -#~ msgid "N_eon..." -#~ msgstr "N_eon..." - -#~ msgid "Convert the selected region (or alpha) into a neon-sign like object" -#~ msgstr "" -#~ "Omdan det valgte område (eller alfa) til et neonskiltlignende objekt" - -#~ msgid "Create shadow" -#~ msgstr "Generér skygge" - -#~ msgid "Create a logo in the style of a neon sign" -#~ msgstr "Lav et logo i stil med et neonskilt" - -#~ msgid "Newsprint Te_xt..." -#~ msgstr "Avistr_yk-tekst..." - -#~ msgid "Create a logo in the style of newspaper printing" -#~ msgstr "Lav et logo i stil med avistrykning" - -#~ msgid "Cell size (pixels)" -#~ msgstr "Cellestørrelse (pixels)" - -#~ msgid "Density (%)" -#~ msgstr "Tæthed (%)" - -#~ msgid "_Old Photo..." -#~ msgstr "Gammelt f_otografi..." - -#~ msgid "Make an image look like an old photo" -#~ msgstr "Få et billede til at ligne et gammelt fotografi" - -#~ msgid "Defocus" -#~ msgstr "Stil uskarpt" - -#~ msgid "Sepia" -#~ msgstr "Sepia" - -# tilføjer uregelmæssigt plettelignende støj -#~ msgid "Mottle" -#~ msgstr "Spætter" - -#~ msgid "Folder for the output file" -#~ msgstr "Mappe til outputfilen" - -#~ msgid "" -#~ "The name of the file to create (if a file with this name already exist, " -#~ "it will be replaced)" -#~ msgstr "" -#~ "Navnet på filen der skal oprettes (hvis en fil med dette navn allerede " -#~ "findes, så vil den blive erstattet)" - -#~ msgid "The filename you entered is not a suitable name for a file." -#~ msgstr "Filnavnet du indtastede er ikke et egnet navn for en fil." - -#~ msgid "" -#~ "All characters in the name are either white-spaces or characters which " -#~ "can not appear in filenames." -#~ msgstr "" -#~ "Alle tegn i navnet er enten blanktegn eller tegn som ikke kan være i " -#~ "filnavne." - -#~ msgid "" -#~ "Export the active palette as a CSS stylesheet with the color entry name " -#~ "as their class name, and the color itself as the color attribute" -#~ msgstr "" -#~ "Eksporter den aktive palet som et CSS-stilark med farvepunktnavnet som " -#~ "deres klassenavn og selve farven som farveattributten" - -#~ msgid "Export the active palette as a PHP dictionary (name => color)" -#~ msgstr "Eksporter den aktive palet som en PHP-ordbog (navn => farve)" - -#~ msgid "Export the active palette as a Python dictionary (name: color)" -#~ msgstr "Eksporter den aktive palet som en Pythonordbog (navn: farve)" - -#~ msgid "" -#~ "Write all the colors in a palette to a text file, one hexadecimal value " -#~ "per line (no names)" -#~ msgstr "" -#~ "Skriv alle farverne i en palette til en tekstfil, en heksadecimal værdi " -#~ "per linje (ingen navne)" - -#~ msgid "Export the active palette as a java.util.Hashtable" -#~ msgstr "" -#~ "Eksporter den aktive palet som en java.util.Hashtable" - -#~ msgid "There is no image data in the clipboard to paste." -#~ msgstr "Der er ingen billeddata i udklipsholderen at indsætte." - -#~ msgid "New _Brush..." -#~ msgstr "Ny _pensel..." - -#~ msgid "Paste the clipboard contents into a new brush" -#~ msgstr "Indsæt udklipsholderens indhold i en ny pensel" - -#~ msgid "Brush name" -#~ msgstr "Penselnavn" - -#~ msgid "File name" -#~ msgstr "Filnavn" - -#~ msgid "New _Pattern..." -#~ msgstr "Nyt _mønster..." - -#~ msgid "Paste the clipboard contents into a new pattern" -#~ msgstr "Indsæt udklipsholderens indhold i et nyt mønster" - -#~ msgid "Pattern name" -#~ msgstr "Mønsternavn" - -#~ msgid "_Perspective..." -#~ msgstr "_Perspektiv..." - -#~ msgid "Add a perspective shadow to the selected region (or alpha)" -#~ msgstr "Tilføj en perspektivskygge til det valgte område (eller alfa)" - -#~ msgid "Angle" -#~ msgstr "Vinkel" - -#~ msgid "Relative distance of horizon" -#~ msgstr "Relativ afstand til horisont" - -#~ msgid "Relative length of shadow" -#~ msgstr "Relativ skyggelængde" - -#~ msgid "Interpolation" -#~ msgstr "Interpolering" - -#~ msgid "_Predator..." -#~ msgstr "_Predator..." - -#~ msgid "Add a 'Predator' effect to the selected region (or alpha)" -#~ msgstr "Tilføj en 'Predator'-effekt til det markerede område (eller alfa)" - -#~ msgid "Edge amount" -#~ msgstr "Kantmængde" - -#~ msgid "Pixelize" -#~ msgstr "Opdel i små firkanter" - -# hører sammen med næste -#~ msgid "Pixel amount" -#~ msgstr "Punktmængde" - -#~ msgid "_Round Button..." -#~ msgstr "_Rund knap..." - -#~ msgid "Create images, each containing an oval button graphic" -#~ msgstr "Lav billeder, der hver indeholder en oval knapgrafik" - -#~ msgid "Upper color" -#~ msgstr "Øverste farve" - -#~ msgid "Lower color" -#~ msgstr "Nederste farve" - -#~ msgid "Upper color (active)" -#~ msgstr "Øverste farve (aktiv)" - -#~ msgid "Lower color (active)" -#~ msgstr "Nederste farve (aktiv)" - -#~ msgid "Text color (active)" -#~ msgstr "Tekstfarve (aktiv)" - -#~ msgid "Padding X" -#~ msgstr "Fyldning x" - -#~ msgid "Padding Y" -#~ msgstr "Fyldning y" - -#~ msgid "Round ratio" -#~ msgstr "Afrundingsforhold" - -#~ msgid "Not pressed" -#~ msgstr "Ikke trykket" - -#~ msgid "Not pressed (active)" -#~ msgstr "Ikke trykket (aktiv)" - -#~ msgid "Render _Map..." -#~ msgstr "Optegn _kort..." - -#~ msgid "Create an image filled with an Earth-like map pattern" -#~ msgstr "Opret et billede udfyldt med et jordlignende kortmønster" - -#~ msgid "Behavior" -#~ msgstr "Opførsel" - -#~ msgid "Detail in Middle" -#~ msgstr "Detaljer i midten" - -#~ msgid "Reverse Layer Order" -#~ msgstr "Omvendt lagrækkefølge" - -#~ msgid "Reverse the order of layers in the image" -#~ msgstr "Vend rækkefølgen for lag i billedet" - -#~ msgid "_Rippling..." -#~ msgstr "_Krusning..." - -#~ msgid "" -#~ "Create a multi-layer image by adding a ripple effect to the current image" -#~ msgstr "" -#~ "Opret et flerlagsbillede ved at tilføje en krusningseffelt til det " -#~ "aktuelle billede" - -#~ msgid "Rippling strength" -#~ msgstr "Krusningsstyrke" - -#~ msgid "Number of frames" -#~ msgstr "Antal rammer" - -#~ msgid "Edge behavior" -#~ msgstr "Kantopførsel" - -#~ msgid "Smear" -#~ msgstr "Udsmør" - -#~ msgid "Black" -#~ msgstr "Sort" - -#~ msgid "_Round Corners..." -#~ msgstr "_Afrundede hjørner..." - -#~ msgid "" -#~ "Round the corners of an image and optionally add a drop-shadow and " -#~ "background" -#~ msgstr "" -#~ "Afrund hjørnerne af billede og valgfrit tilføj en slagskygge og baggrund" - -#~ msgid "Edge radius" -#~ msgstr "Kantradius" - -#~ msgid "Add drop-shadow" -#~ msgstr "Tilføj slagskygge" - -#~ msgid "Add background" -#~ msgstr "Tilføj baggrund" - -#~ msgid "Se_t Colormap..." -#~ msgstr "_Sæt farvekort..." - -#~ msgid "" -#~ "Change the colormap of an image to the colors in a specified palette." -#~ msgstr "Ændr farvekortet på et billede til farverne i den angivne palet." - -#~ msgid "Palette" -#~ msgstr "Palet" - -#~ msgid "Rounded R_ectangle..." -#~ msgstr "_Afrundet rektangel..." - -#~ msgid "Round the corners of the current selection" -#~ msgstr "Afrund hjørnerne på den nuværende markering" - -#~ msgid "Radius (%)" -#~ msgstr "Radius (%)" - -#~ msgid "Concave" -#~ msgstr "Konkav" - -#~ msgid "To _Brush..." -#~ msgstr "Til _pensel..." - -#~ msgid "Convert a selection to a brush" -#~ msgstr "Omdan en markering til en pensel" - -#~ msgid "To _Image" -#~ msgstr "Til b_illede" - -#~ msgid "Convert a selection to an image" -#~ msgstr "Omdan en markering til et billede" - -#~ msgid "To _Pattern..." -#~ msgstr "Til _mønster..." - -#~ msgid "Convert a selection to a pattern" -#~ msgstr "Omdan en markering til et mønster" - -#~ msgid "_Slide..." -#~ msgstr "_Dias..." - -# "Tilføj diasramme" / "Tilføj ramme som på diasfilm -#~ msgid "Add a slide-film like frame, sprocket holes, and labels to an image" -#~ msgstr "" -#~ "Tilføj en diasfilmlignende ramme, perforering og etiketter til et billede" - -#~ msgid "Number" -#~ msgstr "Antal" - -#~ msgid "Font color" -#~ msgstr "Skriftfarve" - -#~ msgid "SOTA Chrome..." -#~ msgstr "SOTA-krom..." - -#~ msgid "Create a State Of The Art chromed logo" -#~ msgstr "Opret et hypermoderne forkromet logo" - -#~ msgid "Speed Text..." -#~ msgstr "Farttekst..." - -#~ msgid "Create a logo with a speedy text effect" -#~ msgstr "Opret et logo med en fartteksteffekt" - -#~ msgid "_Spinning Globe..." -#~ msgstr "_Roterende kugle..." - -#~ msgid "" -#~ "Create an animation by mapping the current image onto a spinning sphere" -#~ msgstr "" -#~ "Opret en animation ved at placere det aktuelle billede på en roterende " -#~ "kugle" - -#~ msgid "Frames" -#~ msgstr "Rammer" - -#~ msgid "Turn from left to right" -#~ msgstr "Drej fra venstre mod højre" - -#~ msgid "Index to n colors (0 = remain RGB)" -#~ msgstr "Indeks til n farver (0 = forbliv RGB)" - -#~ msgid "Rendering Spyro" -#~ msgstr "Optegner spyro" - -#~ msgid "_Spyrogimp..." -#~ msgstr "_Spyrogimp..." - -#~ msgid "" -#~ "Add Spirographs, Epitrochoids, and Lissajous Curves to the current layer" -#~ msgstr "" -#~ "Tilføjer spirografer, epitrochoider og Lissajous-kurver til det aktuelle " -#~ "lag" - -#~ msgid "Type" -#~ msgstr "Type" - -#~ msgid "Epitrochoid" -#~ msgstr "Epitrochoide" - -#~ msgid "Lissajous" -#~ msgstr "Lissajous" - -#~ msgid "Shape" -#~ msgstr "Form" - -#~ msgid "Triangle" -#~ msgstr "Trekant" - -#~ msgid "Square" -#~ msgstr "Kvadrat" - -#~ msgid "Pentagon" -#~ msgstr "Femkant" - -#~ msgid "Hexagon" -#~ msgstr "Sekskant" - -#~ msgid "Polygon: 7 sides" -#~ msgstr "Polygon: 7 sider" - -#~ msgid "Polygon: 8 sides" -#~ msgstr "Polygon: 8 sider" - -#~ msgid "Polygon: 9 sides" -#~ msgstr "Polygon: 9 sider" - -#~ msgid "Polygon: 10 sides" -#~ msgstr "Polygon: 10 sider" - -#~ msgid "Outer teeth" -#~ msgstr "Ydre tand" - -#~ msgid "Inner teeth" -#~ msgstr "Indre tand" - -#~ msgid "Margin (pixels)" -#~ msgstr "Margen (pixels)" - -#~ msgid "Hole ratio" -#~ msgstr "Hulforhold" - -#~ msgid "Start angle" -#~ msgstr "Startvinkel" - -#~ msgid "Tool" -#~ msgstr "Værktøj" - -#~ msgid "Brush" -#~ msgstr "Pensel" - -#~ msgid "Airbrush" -#~ msgstr "Sprøjtepistol" - -#~ msgid "Color method" -#~ msgstr "Farvemetode" - -#~ msgid "Gradient: Loop Sawtooth" -#~ msgstr "Overgang: savtandsløkke" - -#~ msgid "Gradient: Loop Triangle" -#~ msgstr "Overgang: trekantsløkke" - -#~ msgid "Sta_rscape..." -#~ msgstr "Stje_rnehimmel..." - -#~ msgid "Create a logo using a rock-like texture, a nova glow, and shadow" -#~ msgstr "" -#~ "Opret et logo der bruger en stenlignende tekstur, en novaglød og skygge" - -#~ msgid "Swirl-_Tile..." -#~ msgstr "_Hvirvelfelt..." - -#~ msgid "Create an image filled with a swirled tile effect" -#~ msgstr "Opret et billede udfyldt med en hvirvlet felteffekt" - -#~ msgid "Whirl amount" -#~ msgstr "Omdrejningsgrad" - -#~ msgid "_Swirly..." -#~ msgstr "_Hvirvlende..." - -#~ msgid "Create an image filled with a swirly pattern" -#~ msgstr "Opret et billede udfyldt med et hvirvelmønster" - -#~ msgid "Quarter size" -#~ msgstr "Størrelse for fjerdedel" - -#~ msgid "Whirl angle" -#~ msgstr "Omdrejningsvinkel" - -#~ msgid "Number of times to whirl" -#~ msgstr "Antal omdrejninger" - -#~ msgid "_Sphere..." -#~ msgstr "_Kugle..." - -#~ msgid "Text C_ircle..." -#~ msgstr "Tekstc_irkel..." - -#~ msgid "" -#~ "Create a logo by rendering the specified text along the perimeter of a " -#~ "circle" -#~ msgstr "" -#~ "Opret et logo ved at optegne den angivne tekst langs omkredsen af en " -#~ "cirkel" - -#~ msgid "Fill angle" -#~ msgstr "Udfyldningsvinkel" - -#~ msgid "Antialias" -#~ msgstr "Udjævning" - -#~ msgid "_Textured..." -#~ msgstr "Med _tekstur..." - -#~ msgid "" -#~ "Fill the selected region (or alpha) with a texture and add highlights, " -#~ "shadows, and a mosaic background" -#~ msgstr "" -#~ "Udfyld det markerede område (eller alfa) med en tekstur og tilføj " -#~ "fremhævninger, skygger og en mosaikbaggrund" - -#~ msgid "Mosaic tile type" -#~ msgstr "Mosaikflisetype" - -#~ msgid "Hexagons" -#~ msgstr "Sekskanter" +#: ../plug-ins/script-fu/scripts/textured-logo.scm:118 +msgid "" +"Fill the selected region (or alpha) with a texture and add highlights, " +"shadows, and a mosaic background" +msgstr "" +"Udfyld det markerede område (eller alfa) med en tekstur og tilføj " +"fremhævninger, skygger og en mosaikbaggrund" -#~ msgid "Octagons" -#~ msgstr "Ottekanter" +#: ../plug-ins/script-fu/scripts/textured-logo.scm:127 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:169 +msgid "Mosaic tile type" +msgstr "Mosaikflisetype" -#~ msgid "Starting blend" -#~ msgstr "Starter blanding" +#: ../plug-ins/script-fu/scripts/textured-logo.scm:127 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:169 +msgid "Squares" +msgstr "Firkanter" -#~ msgid "Ending blend" -#~ msgstr "Afslutter blanding" +#: ../plug-ins/script-fu/scripts/textured-logo.scm:128 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:170 +msgid "Hexagons" +msgstr "Sekskanter" + +#: ../plug-ins/script-fu/scripts/textured-logo.scm:129 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:171 +msgid "Octagons" +msgstr "Ottekanter" + +#: ../plug-ins/script-fu/scripts/textured-logo.scm:131 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:173 +msgid "Starting blend" +msgstr "Starter blanding" + +#: ../plug-ins/script-fu/scripts/textured-logo.scm:132 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:174 +msgid "Ending blend" +msgstr "Afslutter blanding" -#~ msgid "" -#~ "Create a textured logo with highlights, shadows, and a mosaic background" -#~ msgstr "" -#~ "Opret et teksturlogo med fremhævninger, skygger og en mosaikbaggrund" +#: ../plug-ins/script-fu/scripts/textured-logo.scm:160 +msgid "" +"Create a textured logo with highlights, shadows, and a mosaic background" +msgstr "Opret et teksturlogo med fremhævninger, skygger og en mosaikbaggrund" -#~ msgid "Text pattern" -#~ msgstr "Tekstmønster" +#: ../plug-ins/script-fu/scripts/textured-logo.scm:168 +msgid "Text pattern" +msgstr "Tekstmønster" # 'tileable' er ikke let at oversætte # Hvis vi skal have hele meningen med bliver det noget i retning af "Slør # der kan lægges i fliser". Jeg synes godt, man kan forkorte dét til # "Fliseslør" -#~ msgid "_Tileable Blur..." -#~ msgstr "_Fliseslør..." - -#~ msgid "Blur the edges of an image so the result tiles seamlessly" -#~ msgstr "" -#~ "Slør kanterne af et billede så det færdige resultat bliver regelmæssigt" - -#~ msgid "Blur vertically" -#~ msgstr "Lodret sløring" - -#~ msgid "Blur horizontally" -#~ msgstr "Vandret sløring" - -#~ msgid "Blur type" -#~ msgstr "Sløringstype" - -#~ msgid "RLE" -#~ msgstr "RLE" - -#~ msgid "Web Title Header..." -#~ msgstr "Internetsidehoved for titlen..." - -#~ msgid "Create a decorative web title header" -#~ msgstr "Opret et dekorativt internetsidehoved for titlen" - -#~ msgid "_Particle Trace..." -#~ msgstr "_Partikelspor..." - -#~ msgid "Add a Trace of Particles effect to the selected region (or alpha)" -#~ msgstr "" -#~ "Tilføj spor af partikeleffekter til det markerede område (eller alfa)" - -#~ msgid "Hit rate" -#~ msgstr "Sammenstødsgrad" - -#~ msgid "Edge width" -#~ msgstr "Kantbredde" - -#~ msgid "Edge only" -#~ msgstr "Kun kant" - -#~ msgid "Base color" -#~ msgstr "Grundfarve" - -#~ msgid "Create a logo using a Trace Of Particles effect" -#~ msgstr "Opret et logo der bruger effekten spor af partikler" - -#~ msgid "T_ruchet..." -#~ msgstr "_Truchet..." - -#~ msgid "Create an image filled with a Truchet pattern" -#~ msgstr "Opret et billede udfyldt med et Truchet-mønster" - -#~ msgid "Foreground color" -#~ msgstr "Forgrundsfarve" - -#~ msgid "Mask size" -#~ msgstr "Maskens størrelse" +#: ../plug-ins/script-fu/scripts/tileblur.scm:68 +msgid "_Tileable Blur..." +msgstr "_Fliseslør..." -#~ msgid "Mask opacity" -#~ msgstr "Maskens synlighed" - -#~ msgid "_Waves..." -#~ msgstr "_Bølger..." - -#~ msgid "" -#~ "Create a multi-layer image with an effect like a stone was thrown into " -#~ "the current image" -#~ msgstr "" -#~ "Opret et flerlagsbillede med en effekt som om en sten er blevet smidt ind " -#~ "i det aktuelle billede" - -#~ msgid "Amplitude" -#~ msgstr "Amplitude" - -#~ msgid "Wavelength" -#~ msgstr "Bølgelængde" - -#~ msgid "Invert direction" -#~ msgstr "Omvendt retning" - -#~ msgid "_Weave..." -#~ msgstr "_Vævning..." - -#~ msgid "" -#~ "Create a new layer filled with a weave effect to be used as an overlay or " -#~ "bump map" -#~ msgstr "" -#~ "Lav et nyt lag udfyldt med en vævningseffekt, som kan bruges til " -#~ "overlægning eller ujævnhedskort" - -#~ msgid "Ribbon width" -#~ msgstr "Båndbredde" - -#~ msgid "Ribbon spacing" -#~ msgstr "Båndmellemrum" - -#~ msgid "Shadow darkness" -#~ msgstr "Skyggemørkhed" - -#~ msgid "Shadow depth" -#~ msgstr "Skyggedybde" - -#~ msgid "Thread length" -#~ msgstr "Trådlængde" - -#~ msgid "Thread density" -#~ msgstr "Trådtæthed" - -#~ msgid "Thread intensity" -#~ msgstr "Trådintensitet" +#: ../plug-ins/script-fu/scripts/tileblur.scm:69 +msgid "Blur the edges of an image so the result tiles seamlessly" +msgstr "" +"Slør kanterne af et billede så det færdige resultat bliver regelmæssigt" -#~ msgid "_Xach-Effect..." -#~ msgstr "_Xach-effekt..." +#: ../plug-ins/script-fu/scripts/tileblur.scm:77 +msgid "Blur vertically" +msgstr "Lodret sløring" + +#: ../plug-ins/script-fu/scripts/tileblur.scm:78 +msgid "Blur horizontally" +msgstr "Vandret sløring" -#~ msgid "Add a subtle translucent 3D effect to the selected region (or alpha)" -#~ msgstr "" -#~ "Tilføj en diskret halvgennemsigtig 3D-effekt til det markerede område " -#~ "(eller alfa)" +#: ../plug-ins/script-fu/scripts/tileblur.scm:79 +msgid "Blur type" +msgstr "Sløringstype" -#~ msgid "Highlight X offset" -#~ msgstr "X-forskydning for highlight" +#: ../plug-ins/script-fu/scripts/tileblur.scm:79 +msgid "IIR" +msgstr "IIR" -#~ msgid "Highlight Y offset" -#~ msgstr "Y-forskydning for highlight" +#: ../plug-ins/script-fu/scripts/tileblur.scm:79 +msgid "RLE" +msgstr "RLE" -#~ msgid "Highlight color" -#~ msgstr "Highlightfarve" +#: ../plug-ins/script-fu/scripts/title-header.scm:165 +msgid "Web Title Header..." +msgstr "Internetsidehoved for titlen..." + +#: ../plug-ins/script-fu/scripts/title-header.scm:166 +msgid "Create a decorative web title header" +msgstr "Opret et dekorativt internetsidehoved for titlen" + +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:98 +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:138 +msgid "_Particle Trace..." +msgstr "_Partikelspor..." + +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:99 +msgid "Add a Trace of Particles effect to the selected region (or alpha)" +msgstr "Tilføj spor af partikeleffekter til det markerede område (eller alfa)" + +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:107 +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:147 +msgid "Hit rate" +msgstr "Sammenstødsgrad" + +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:108 +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:148 +msgid "Edge width" +msgstr "Kantbredde" + +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:109 +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:149 +msgid "Edge only" +msgstr "Kun kant" + +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:110 +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:150 +msgid "Base color" +msgstr "Grundfarve" + +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:139 +msgid "Create a logo using a Trace Of Particles effect" +msgstr "Opret et logo der bruger effekten spor af partikler" + +#: ../plug-ins/script-fu/scripts/truchet.scm:165 +msgid "T_ruchet..." +msgstr "_Truchet..." + +#: ../plug-ins/script-fu/scripts/truchet.scm:166 +msgid "Create an image filled with a Truchet pattern" +msgstr "Opret et billede udfyldt med et Truchet-mønster" + +#: ../plug-ins/script-fu/scripts/truchet.scm:174 +msgid "Foreground color" +msgstr "Forgrundsfarve" + +#: ../plug-ins/script-fu/scripts/unsharp-mask.scm:82 +msgid "Mask size" +msgstr "Maskens størrelse" + +#: ../plug-ins/script-fu/scripts/unsharp-mask.scm:83 +msgid "Mask opacity" +msgstr "Maskens synlighed" + +#: ../plug-ins/script-fu/scripts/waves-anim.scm:95 +msgid "_Waves..." +msgstr "_Bølger..." -#~ msgid "Highlight opacity" -#~ msgstr "Highlight synlighed" +#: ../plug-ins/script-fu/scripts/waves-anim.scm:96 +msgid "" +"Create a multi-layer image with an effect like a stone was thrown into the " +"current image" +msgstr "" +"Opret et flerlagsbillede med en effekt som om en sten er blevet smidt ind i " +"det aktuelle billede" -#~ msgid "Drop shadow color" -#~ msgstr "Slagskyggefarve" +#: ../plug-ins/script-fu/scripts/waves-anim.scm:103 +msgid "Amplitude" +msgstr "Amplitude" + +#: ../plug-ins/script-fu/scripts/waves-anim.scm:104 +msgid "Wavelength" +msgstr "Bølgelængde" + +#: ../plug-ins/script-fu/scripts/waves-anim.scm:106 +msgid "Invert direction" +msgstr "Omvendt retning" + +#: ../plug-ins/script-fu/scripts/weave.scm:389 +msgid "_Weave..." +msgstr "_Vævning..." -#~ msgid "Drop shadow opacity" -#~ msgstr "Slagskygge synlighed" +#: ../plug-ins/script-fu/scripts/weave.scm:390 +msgid "" +"Create a new layer filled with a weave effect to be used as an overlay or " +"bump map" +msgstr "" +"Lav et nyt lag udfyldt med en vævningseffekt, som kan bruges til overlægning " +"eller ujævnhedskort" -#~ msgid "Drop shadow blur radius" -#~ msgstr "Sløringsradius for slagskygge" +#: ../plug-ins/script-fu/scripts/weave.scm:397 +msgid "Ribbon width" +msgstr "Båndbredde" + +#: ../plug-ins/script-fu/scripts/weave.scm:398 +msgid "Ribbon spacing" +msgstr "Båndmellemrum" + +#: ../plug-ins/script-fu/scripts/weave.scm:399 +msgid "Shadow darkness" +msgstr "Skyggemørkhed" + +#: ../plug-ins/script-fu/scripts/weave.scm:400 +msgid "Shadow depth" +msgstr "Skyggedybde" + +#: ../plug-ins/script-fu/scripts/weave.scm:401 +msgid "Thread length" +msgstr "Trådlængde" + +#: ../plug-ins/script-fu/scripts/weave.scm:402 +msgid "Thread density" +msgstr "Trådtæthed" + +#: ../plug-ins/script-fu/scripts/weave.scm:403 +msgid "Thread intensity" +msgstr "Trådintensitet" + +#: ../plug-ins/script-fu/scripts/xach-effect.scm:121 +msgid "_Xach-Effect..." +msgstr "_Xach-effekt..." -#~ msgid "Drop shadow X offset" -#~ msgstr "X-forskydning for slagskygge" +#: ../plug-ins/script-fu/scripts/xach-effect.scm:122 +msgid "Add a subtle translucent 3D effect to the selected region (or alpha)" +msgstr "" +"Tilføj en diskret halvgennemsigtig 3D-effekt til det markerede område (eller " +"alfa)" -#~ msgid "Drop shadow Y offset" -#~ msgstr "Y-forskydning for slagskygge" +#: ../plug-ins/script-fu/scripts/xach-effect.scm:129 +msgid "Highlight X offset" +msgstr "X-forskydning for highlight" + +#: ../plug-ins/script-fu/scripts/xach-effect.scm:130 +msgid "Highlight Y offset" +msgstr "Y-forskydning for highlight" + +#: ../plug-ins/script-fu/scripts/xach-effect.scm:131 +msgid "Highlight color" +msgstr "Highlightfarve" + +#: ../plug-ins/script-fu/scripts/xach-effect.scm:132 +msgid "Highlight opacity" +msgstr "Highlight synlighed" + +#: ../plug-ins/script-fu/scripts/xach-effect.scm:133 +msgid "Drop shadow color" +msgstr "Slagskyggefarve" + +#: ../plug-ins/script-fu/scripts/xach-effect.scm:134 +msgid "Drop shadow opacity" +msgstr "Slagskygge synlighed" + +#: ../plug-ins/script-fu/scripts/xach-effect.scm:135 +msgid "Drop shadow blur radius" +msgstr "Sløringsradius for slagskygge" + +#: ../plug-ins/script-fu/scripts/xach-effect.scm:136 +msgid "Drop shadow X offset" +msgstr "X-forskydning for slagskygge" + +#: ../plug-ins/script-fu/scripts/xach-effect.scm:137 +msgid "Drop shadow Y offset" +msgstr "Y-forskydning for slagskygge" diff -Nru gimp-2.8.18/po-script-fu/es.po gimp-2.8.20/po-script-fu/es.po --- gimp-2.8.18/po-script-fu/es.po 2015-08-20 22:57:36.000000000 +0000 +++ gimp-2.8.20/po-script-fu/es.po 2017-01-28 19:08:47.000000000 +0000 @@ -8,15 +8,15 @@ # Francisco Vila , 2006, 2007, 2008, 2009, 2011. # Jorge González , 2007. # Oscar Cebellán Ramos -# Daniel Mustieles , 2011, 2014. +# Daniel Mustieles , 2011, 2014, 2016. # msgid "" msgstr "" "Project-Id-Version: gimp-script-fu.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2014-06-20 05:26+0000\n" -"PO-Revision-Date: 2014-06-20 13:39+0200\n" +"POT-Creation-Date: 2016-07-17 23:14+0000\n" +"PO-Revision-Date: 2016-07-18 09:55+0200\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: Español; Castellano \n" "Language: es\n" @@ -143,16 +143,16 @@ msgstr "" "El modo de evaluación de Script-Fu sólo permite invocación no interactiva" -#: ../plug-ins/script-fu/script-fu-interface.c:198 +#: ../plug-ins/script-fu/script-fu-interface.c:200 msgid "Script-Fu cannot process two scripts at the same time." msgstr "Script-Fu no puede procesar dos scripts a la vez." -#: ../plug-ins/script-fu/script-fu-interface.c:200 +#: ../plug-ins/script-fu/script-fu-interface.c:202 #, c-format msgid "You are already running the \"%s\" script." msgstr "Ya está ejecutando el script «%s»." -#: ../plug-ins/script-fu/script-fu-interface.c:226 +#: ../plug-ins/script-fu/script-fu-interface.c:228 #, c-format msgid "Script-Fu: %s" msgstr "Script-Fu: %s" @@ -160,44 +160,44 @@ #. we add a colon after the label; #. * some languages want an extra space here #. -#: ../plug-ins/script-fu/script-fu-interface.c:290 +#: ../plug-ins/script-fu/script-fu-interface.c:292 #, c-format msgid "%s:" msgstr "%s: " -#: ../plug-ins/script-fu/script-fu-interface.c:337 +#: ../plug-ins/script-fu/script-fu-interface.c:339 msgid "Script-Fu Color Selection" msgstr "Selección de color de Script-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:446 +#: ../plug-ins/script-fu/script-fu-interface.c:448 msgid "Script-Fu File Selection" msgstr "Selección de archivos de Script-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:449 +#: ../plug-ins/script-fu/script-fu-interface.c:451 msgid "Script-Fu Folder Selection" msgstr "Selección de carpetas de Script-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:462 +#: ../plug-ins/script-fu/script-fu-interface.c:464 msgid "Script-Fu Font Selection" msgstr "Selección de tipografía de Script-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:470 +#: ../plug-ins/script-fu/script-fu-interface.c:472 msgid "Script-Fu Palette Selection" msgstr "Selección de paleta de Script-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:479 +#: ../plug-ins/script-fu/script-fu-interface.c:481 msgid "Script-Fu Pattern Selection" msgstr "Selección de patrón de Script-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:488 +#: ../plug-ins/script-fu/script-fu-interface.c:490 msgid "Script-Fu Gradient Selection" msgstr "Selección de degradado de Script-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:497 +#: ../plug-ins/script-fu/script-fu-interface.c:499 msgid "Script-Fu Brush Selection" msgstr "Selección de pincel de Script-Fu" -#: ../plug-ins/script-fu/script-fu-interface.c:840 +#: ../plug-ins/script-fu/script-fu-interface.c:868 #, c-format msgid "Error while executing %s:" msgstr "Error al ejecutar %s:" @@ -240,1888 +240,2825 @@ "0.0.0.0) puede permitir a los atacantes ejecutar código arbitrario en este " "equipo." -#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182 -#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156 -msgid "Right" -msgstr "Derecha" - -#: ../plug-ins/script-fu/scripts/blended-logo.scm:136 -#: ../plug-ins/script-fu/scripts/blended-logo.scm:195 -msgid "FG-BG-RGB" -msgstr "Frente a fondo (RGB)" - -#: ../plug-ins/script-fu/scripts/erase-rows.scm:47 -msgid "Rows" -msgstr "Filas" - -#: ../plug-ins/script-fu/scripts/erase-rows.scm:48 -msgid "Even" -msgstr "Pares" - -#: ../plug-ins/script-fu/scripts/erase-rows.scm:49 -msgid "Erase" -msgstr "Borrar" - -#: ../plug-ins/script-fu/scripts/font-map.scm:164 -msgid "Black on white" -msgstr "Negro sobre blanco" +#: ../plug-ins/script-fu/scripts/3d-outline.scm:120 +#: ../plug-ins/script-fu/scripts/3d-outline.scm:166 +msgid "3D _Outline..." +msgstr "_Contorno 3D…" -#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:35 -#: ../plug-ins/script-fu/scripts/guides-new.scm:35 -msgid "Horizontal" -msgstr "Horizontal" +#: ../plug-ins/script-fu/scripts/3d-outline.scm:121 +msgid "" +"Outline the selected region (or alpha) with a pattern and add a drop shadow" +msgstr "" +"Contornear la región o transparencia seleccionada con un patrón y añadir una " +"sombra arrojada" -#: ../plug-ins/script-fu/scripts/rendermap.scm:90 -msgid "Tile" -msgstr "Mosaico" +#: ../plug-ins/script-fu/scripts/3d-outline.scm:128 +#: ../plug-ins/script-fu/scripts/3d-outline.scm:172 +#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:157 +#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm:91 +#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:130 +#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:116 +#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm:85 +#: ../plug-ins/script-fu/scripts/chip-away.scm:155 +#: ../plug-ins/script-fu/scripts/chip-away.scm:202 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:126 +msgid "Pattern" +msgstr "Patrón" + +#: ../plug-ins/script-fu/scripts/3d-outline.scm:129 +#: ../plug-ins/script-fu/scripts/3d-outline.scm:176 +msgid "Outline blur radius" +msgstr "Radio de desenfoque del contorno" + +#: ../plug-ins/script-fu/scripts/3d-outline.scm:130 +#: ../plug-ins/script-fu/scripts/3d-outline.scm:177 +msgid "Shadow blur radius" +msgstr "Radio de desenfoque de la sombra" + +#: ../plug-ins/script-fu/scripts/3d-outline.scm:131 +#: ../plug-ins/script-fu/scripts/3d-outline.scm:178 +msgid "Bumpmap (alpha layer) blur radius" +msgstr "Radio de desenfoque del mapa de relieve (capa alfa)" + +#: ../plug-ins/script-fu/scripts/3d-outline.scm:132 +#: ../plug-ins/script-fu/scripts/3d-outline.scm:179 +#: ../plug-ins/script-fu/scripts/glossy.scm:216 +#: ../plug-ins/script-fu/scripts/glossy.scm:288 +msgid "Default bumpmap settings" +msgstr "Ajustes predeterminados del mapa de relieve" + +#: ../plug-ins/script-fu/scripts/3d-outline.scm:133 +#: ../plug-ins/script-fu/scripts/3d-outline.scm:180 +#: ../plug-ins/script-fu/scripts/glossy.scm:218 +#: ../plug-ins/script-fu/scripts/glossy.scm:290 +#: ../plug-ins/script-fu/scripts/round-corners.scm:139 +msgid "Shadow X offset" +msgstr "Desplazamiento X de la sombra" + +#: ../plug-ins/script-fu/scripts/3d-outline.scm:134 +#: ../plug-ins/script-fu/scripts/3d-outline.scm:181 +#: ../plug-ins/script-fu/scripts/glossy.scm:219 +#: ../plug-ins/script-fu/scripts/glossy.scm:291 +#: ../plug-ins/script-fu/scripts/round-corners.scm:140 +msgid "Shadow Y offset" +msgstr "Desplazamiento Y de la sombra" + +#: ../plug-ins/script-fu/scripts/3d-outline.scm:167 +msgid "Create a logo with outlined text and a drop shadow" +msgstr "Crear un logotipo con texto con contorno y sombra arrojada" + +#: ../plug-ins/script-fu/scripts/3d-outline.scm:173 +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:156 +#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:111 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:175 +#: ../plug-ins/script-fu/scripts/basic1-logo.scm:98 +#: ../plug-ins/script-fu/scripts/basic2-logo.scm:120 +#: ../plug-ins/script-fu/scripts/beveled-button.scm:148 +#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:126 +#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:113 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:190 +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:131 +#: ../plug-ins/script-fu/scripts/carved-logo.scm:168 +#: ../plug-ins/script-fu/scripts/chalk.scm:128 +#: ../plug-ins/script-fu/scripts/chip-away.scm:192 +#: ../plug-ins/script-fu/scripts/chrome-logo.scm:126 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:158 +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:184 +#: ../plug-ins/script-fu/scripts/crystal-logo.scm:216 +#: ../plug-ins/script-fu/scripts/frosty-logo.scm:203 +#: ../plug-ins/script-fu/scripts/glossy.scm:273 +#: ../plug-ins/script-fu/scripts/glowing-logo.scm:115 +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:139 +#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:98 +#: ../plug-ins/script-fu/scripts/neon-logo.scm:286 +#: ../plug-ins/script-fu/scripts/news-text.scm:83 +#: ../plug-ins/script-fu/scripts/pupi-button.scm:193 +#: ../plug-ins/script-fu/scripts/slide.scm:244 +#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:213 +#: ../plug-ins/script-fu/scripts/speed-text.scm:92 +#: ../plug-ins/script-fu/scripts/starscape-logo.scm:145 +#: ../plug-ins/script-fu/scripts/text-circle.scm:213 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:165 +#: ../plug-ins/script-fu/scripts/title-header.scm:171 +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:144 +msgid "Text" +msgstr "Texto" + +#: ../plug-ins/script-fu/scripts/3d-outline.scm:174 +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:158 +#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:112 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:176 +#: ../plug-ins/script-fu/scripts/basic1-logo.scm:99 +#: ../plug-ins/script-fu/scripts/basic2-logo.scm:121 +#: ../plug-ins/script-fu/scripts/beveled-button.scm:149 +#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:127 +#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:114 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:191 +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:132 +#: ../plug-ins/script-fu/scripts/carved-logo.scm:169 +#: ../plug-ins/script-fu/scripts/chalk.scm:129 +#: ../plug-ins/script-fu/scripts/chip-away.scm:194 +#: ../plug-ins/script-fu/scripts/chrome-logo.scm:127 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:159 +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:185 +#: ../plug-ins/script-fu/scripts/crystal-logo.scm:217 +#: ../plug-ins/script-fu/scripts/frosty-logo.scm:204 +#: ../plug-ins/script-fu/scripts/glossy.scm:274 +#: ../plug-ins/script-fu/scripts/glowing-logo.scm:116 +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:140 +#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:102 +#: ../plug-ins/script-fu/scripts/neon-logo.scm:287 +#: ../plug-ins/script-fu/scripts/news-text.scm:85 +#: ../plug-ins/script-fu/scripts/pupi-button.scm:194 +#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:214 +#: ../plug-ins/script-fu/scripts/speed-text.scm:94 +#: ../plug-ins/script-fu/scripts/starscape-logo.scm:146 +#: ../plug-ins/script-fu/scripts/text-circle.scm:217 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:166 +#: ../plug-ins/script-fu/scripts/title-header.scm:172 +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:145 +msgid "Font size (pixels)" +msgstr "Tamaño de la tipografía (píxeles)" + +#: ../plug-ins/script-fu/scripts/3d-outline.scm:175 +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:157 +#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:113 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:177 +#: ../plug-ins/script-fu/scripts/basic1-logo.scm:100 +#: ../plug-ins/script-fu/scripts/basic2-logo.scm:122 +#: ../plug-ins/script-fu/scripts/beveled-button.scm:150 +#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:128 +#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:115 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:192 +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:133 +#: ../plug-ins/script-fu/scripts/carved-logo.scm:170 +#: ../plug-ins/script-fu/scripts/chalk.scm:130 +#: ../plug-ins/script-fu/scripts/chip-away.scm:193 +#: ../plug-ins/script-fu/scripts/chrome-logo.scm:128 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:160 +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:186 +#: ../plug-ins/script-fu/scripts/crystal-logo.scm:218 +#: ../plug-ins/script-fu/scripts/frosty-logo.scm:205 +#: ../plug-ins/script-fu/scripts/glossy.scm:275 +#: ../plug-ins/script-fu/scripts/glowing-logo.scm:117 +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:141 +#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:101 +#: ../plug-ins/script-fu/scripts/neon-logo.scm:288 +#: ../plug-ins/script-fu/scripts/news-text.scm:84 +#: ../plug-ins/script-fu/scripts/pupi-button.scm:195 +#: ../plug-ins/script-fu/scripts/slide.scm:246 +#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:215 +#: ../plug-ins/script-fu/scripts/speed-text.scm:93 +#: ../plug-ins/script-fu/scripts/starscape-logo.scm:147 +#: ../plug-ins/script-fu/scripts/text-circle.scm:219 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:167 +#: ../plug-ins/script-fu/scripts/title-header.scm:173 +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:146 +msgid "Font" +msgstr "Tipografía" + +#: ../plug-ins/script-fu/scripts/3dTruchet.scm:225 +msgid "3_D Truchet..." +msgstr "Truchet 3_D…" + +#: ../plug-ins/script-fu/scripts/3dTruchet.scm:226 +msgid "Create an image filled with a 3D Truchet pattern" +msgstr "Crear una imagen rellenada de un patrón de Truchet en 3D" + +#: ../plug-ins/script-fu/scripts/3dTruchet.scm:231 +#: ../plug-ins/script-fu/scripts/truchet.scm:171 +msgid "Block size" +msgstr "Tamaño de bloque" + +#: ../plug-ins/script-fu/scripts/3dTruchet.scm:232 +#: ../plug-ins/script-fu/scripts/add-bevel.scm:193 +#: ../plug-ins/script-fu/scripts/truchet.scm:172 +msgid "Thickness" +msgstr "Grosor" + +#: ../plug-ins/script-fu/scripts/3dTruchet.scm:233 +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:184 +#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:95 +#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:107 +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:161 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:135 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:179 +#: ../plug-ins/script-fu/scripts/basic1-logo.scm:67 +#: ../plug-ins/script-fu/scripts/basic1-logo.scm:101 +#: ../plug-ins/script-fu/scripts/basic2-logo.scm:89 +#: ../plug-ins/script-fu/scripts/basic2-logo.scm:123 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:135 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:194 +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:136 +#: ../plug-ins/script-fu/scripts/chalk.scm:89 +#: ../plug-ins/script-fu/scripts/chalk.scm:131 +#: ../plug-ins/script-fu/scripts/chrome-logo.scm:129 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:124 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:165 +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:149 +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:187 +#: ../plug-ins/script-fu/scripts/frosty-logo.scm:144 +#: ../plug-ins/script-fu/scripts/frosty-logo.scm:206 +#: ../plug-ins/script-fu/scripts/glossy.scm:209 +#: ../plug-ins/script-fu/scripts/glossy.scm:281 +#: ../plug-ins/script-fu/scripts/glowing-logo.scm:85 +#: ../plug-ins/script-fu/scripts/glowing-logo.scm:118 +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:105 +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:144 +#: ../plug-ins/script-fu/scripts/neon-logo.scm:253 +#: ../plug-ins/script-fu/scripts/neon-logo.scm:289 +#: ../plug-ins/script-fu/scripts/news-text.scm:90 +#: ../plug-ins/script-fu/scripts/speed-text.scm:97 +#: ../plug-ins/script-fu/scripts/swirltile.scm:65 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:130 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:172 +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:111 +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:151 +#: ../plug-ins/script-fu/scripts/truchet.scm:173 +msgid "Background color" +msgstr "Color de fondo" + +#: ../plug-ins/script-fu/scripts/3dTruchet.scm:234 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:140 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:199 +msgid "Start blend" +msgstr "Iniciar fundido [blend]" + +#: ../plug-ins/script-fu/scripts/3dTruchet.scm:235 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:141 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:200 +msgid "End blend" +msgstr "Fundido final" + +#: ../plug-ins/script-fu/scripts/3dTruchet.scm:236 +msgid "Supersample" +msgstr "Sobremuestreo" + +#: ../plug-ins/script-fu/scripts/3dTruchet.scm:237 +#: ../plug-ins/script-fu/scripts/truchet.scm:175 +msgid "Number of X tiles" +msgstr "Número de baldosas en X" + +#: ../plug-ins/script-fu/scripts/3dTruchet.scm:238 +#: ../plug-ins/script-fu/scripts/truchet.scm:176 +msgid "Number of Y tiles" +msgstr "Número de baldosas en Y" + +#: ../plug-ins/script-fu/scripts/add-bevel.scm:76 +#: ../plug-ins/script-fu/scripts/beveled-button.scm:77 +#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:79 +#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm:26 +#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:57 +#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:44 +#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm:30 +msgid "Bumpmap" +msgstr "Mapa de relieve" + +#: ../plug-ins/script-fu/scripts/add-bevel.scm:185 +msgid "Add B_evel..." +msgstr "Añadir _bisel…" + +#: ../plug-ins/script-fu/scripts/add-bevel.scm:186 +msgid "Add a beveled border to an image" +msgstr "Añadir un borde biselado a una imagen" + +#: ../plug-ins/script-fu/scripts/add-bevel.scm:194 +#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:160 +#: ../plug-ins/script-fu/scripts/old-photo.scm:104 +#: ../plug-ins/script-fu/scripts/round-corners.scm:143 +#: ../plug-ins/script-fu/scripts/slide.scm:248 +#: ../plug-ins/script-fu/scripts/spinning-globe.scm:106 +msgid "Work on copy" +msgstr "Trabajar en copia" + +#: ../plug-ins/script-fu/scripts/add-bevel.scm:195 +#: ../plug-ins/script-fu/scripts/chip-away.scm:152 +#: ../plug-ins/script-fu/scripts/chip-away.scm:199 +msgid "Keep bump layer" +msgstr "Mantener la capa de relieve" + +#: ../plug-ins/script-fu/scripts/addborder.scm:108 +msgid "Border Layer" +msgstr "Capa de borde" + +#: ../plug-ins/script-fu/scripts/addborder.scm:160 +msgid "Add _Border..." +msgstr "Añadir _borde…" + +#: ../plug-ins/script-fu/scripts/addborder.scm:161 +msgid "Add a border around an image" +msgstr "Añadir un borde alrededor de una imagen" + +#: ../plug-ins/script-fu/scripts/addborder.scm:168 +msgid "Border X size" +msgstr "Tamaño X del borde" + +#: ../plug-ins/script-fu/scripts/addborder.scm:169 +msgid "Border Y size" +msgstr "Tamaño Y del borde" + +#: ../plug-ins/script-fu/scripts/addborder.scm:170 +msgid "Border color" +msgstr "Color del borde" + +#: ../plug-ins/script-fu/scripts/addborder.scm:171 +msgid "Delta value on color" +msgstr "Valor delta en el color" + +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:118 +#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:78 +msgid "Arrow" +msgstr "Flecha" + +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:121 +#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:35 +#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:46 +msgid "Alien Glow" +msgstr "Resplandor alienígena" + +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:124 +#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:38 +#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:48 +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:78 +#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:56 +#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:41 +#: ../plug-ins/script-fu/scripts/chrome-it.scm:103 +msgid "Background" +msgstr "Fondo" + +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:175 +#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:149 +msgid "_Arrow..." +msgstr "_Flecha…" -#: ../plug-ins/script-fu/scripts/ripply-anim.scm:129 -msgid "Wrap" -msgstr "Desformar" +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:176 +msgid "Create an arrow graphic with an eerie glow for web pages" +msgstr "" +"Crear un gráfico en forma de flecha con un resplandor misteriorso para " +"páginas web" -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:323 -msgid "Spyrograph" -msgstr "Espirógrafo" +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:181 +#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:155 +#: ../plug-ins/script-fu/scripts/lava.scm:126 +msgid "Size" +msgstr "Tamaño" -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:326 -msgid "Circle" -msgstr "Circulo" +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182 +#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156 +msgid "Orientation" +msgstr "Orientación" -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:342 -msgid "Pencil" -msgstr "Lápiz" +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182 +#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156 +msgid "Right" +msgstr "Derecha" -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:347 -msgid "Solid Color" -msgstr "Color liso" +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182 +#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156 +msgid "Left" +msgstr "Izquierda" -#: ../plug-ins/script-fu/scripts/textured-logo.scm:129 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:171 -msgid "Squares" -msgstr "Cuadrados" +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182 +#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156 +msgid "Up" +msgstr "Arriba" -#: ../plug-ins/script-fu/scripts/tileblur.scm:79 -msgid "IIR" -msgstr "IIR" +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182 +#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156 +msgid "Down" +msgstr "Abajo" -#~ msgid "3D _Outline..." -#~ msgstr "_Contorno 3D…" +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:183 +#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:94 +#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:106 +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:160 +#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:74 +#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:114 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:134 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:178 +#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:227 +#: ../plug-ins/script-fu/scripts/neon-logo.scm:254 +#: ../plug-ins/script-fu/scripts/neon-logo.scm:290 +#: ../plug-ins/script-fu/scripts/starscape-logo.scm:148 +msgid "Glow color" +msgstr "Color del resplandor" + +#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:185 +#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:96 +#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:108 +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:164 +#: ../plug-ins/script-fu/scripts/camo.scm:106 +#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:161 +msgid "Flatten image" +msgstr "Aplanar imagen" + +#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:32 +msgid "Bar" +msgstr "Barra" + +#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:86 +#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm:77 +msgid "_Hrule..." +msgstr "_Regla horizontal…" -#~ msgid "" -#~ "Outline the selected region (or alpha) with a pattern and add a drop " -#~ "shadow" -#~ msgstr "" -#~ "Contornear la región o transparencia seleccionada con un patrón y añadir " -#~ "una sombra arrojada" +#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:87 +msgid "Create an Hrule graphic with an eerie glow for web pages" +msgstr "" +"Crear un gráfico de línea separadora con un resplandor misterioso para " +"páginas web" -#~ msgid "Pattern" -#~ msgstr "Patrón" +#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:92 +msgid "Bar length" +msgstr "Longitud de la barra" + +#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:93 +msgid "Bar height" +msgstr "Altura de la barra" + +#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:44 +#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm:25 +msgid "Bullet" +msgstr "Punto" + +#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:99 +#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm:84 +msgid "_Bullet..." +msgstr "_Punto…" -#~ msgid "Outline blur radius" -#~ msgstr "Radio de desenfoque del contorno" +#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:100 +msgid "Create a bullet graphic with an eerie glow for web pages" +msgstr "" +"Crear un gráfico de viñeta con un resplandor misterioso para páginas web" -#~ msgid "Shadow blur radius" -#~ msgstr "Radio de desenfoque de la sombra" +#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:105 +#: ../plug-ins/script-fu/scripts/text-circle.scm:214 +#: ../plug-ins/script-fu/scripts/tileblur.scm:76 +msgid "Radius" +msgstr "Radio" + +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:81 +msgid "Glow" +msgstr "Resplandor" + +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:84 +msgid "Button" +msgstr "Botón" + +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:150 +#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:120 +msgid "B_utton..." +msgstr "_Botón…" -#~ msgid "Bumpmap (alpha layer) blur radius" -#~ msgstr "Radio de desenfoque del mapa de relieve (capa alfa)" +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:151 +msgid "Create a button graphic with an eerie glow for web pages" +msgstr "" +"Crear un gráfico de botón con un resplandor misterioso para páginas web" -#~ msgid "Default bumpmap settings" -#~ msgstr "Ajustes predeterminados del mapa de relieve" +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:159 +#: ../plug-ins/script-fu/scripts/basic1-logo.scm:68 +#: ../plug-ins/script-fu/scripts/basic1-logo.scm:102 +#: ../plug-ins/script-fu/scripts/basic2-logo.scm:90 +#: ../plug-ins/script-fu/scripts/basic2-logo.scm:124 +#: ../plug-ins/script-fu/scripts/beveled-button.scm:153 +#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:129 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:193 +#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:99 +#: ../plug-ins/script-fu/scripts/news-text.scm:89 +#: ../plug-ins/script-fu/scripts/pupi-button.scm:198 +#: ../plug-ins/script-fu/scripts/speed-text.scm:96 +msgid "Text color" +msgstr "Color de texto" + +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:162 +#: ../plug-ins/script-fu/scripts/beveled-button.scm:154 +msgid "Padding" +msgstr "Relleno [Padding]" + +#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:163 +msgid "Glow radius" +msgstr "Radio del resplandor" + +#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:65 +#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:105 +msgid "Alien _Glow..." +msgstr "_Resplandor alienígena…" -#~ msgid "Shadow X offset" -#~ msgstr "Desplazamiento X de la sombra" +#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:66 +msgid "Add an eerie glow around the selected region (or alpha)" +msgstr "" +"Añadir un resplandor misterioso alrededor de la región o transparencia " +"seleccionada" -#~ msgid "Shadow Y offset" -#~ msgstr "Desplazamiento Y de la sombra" +#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:73 +msgid "Glow size (pixels * 4)" +msgstr "Tamaño del resplandor (píxeles * 4)" + +#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:106 +msgid "Create a logo with an alien glow around the text" +msgstr "Crear un logotipo con un resplandor alienígena alrededor del texto" + +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:126 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:169 +msgid "Alien _Neon..." +msgstr "_Neón alienígena…" + +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:127 +msgid "Add psychedelic outlines to the selected region (or alpha)" +msgstr "Añadir contornos sicodélicos a la región o transparencia seleccionada" -#~ msgid "Create a logo with outlined text and a drop shadow" -#~ msgstr "Crear un logotipo con texto con contorno y sombra arrojada" +# //O Nuevas traducciones desde cero, las "Bands" sos bandas con el color de +# fondo que se elige en el "script", los "gaps" son las bandas con el color de +# primer plano, por lo que voy a traducir "bands" como huecos en referencia +# al uso de color de fondo y "gap" como las bandas, por usar el color de primer +# plano, ¿mejor así? +# //R Vale +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:136 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:180 +msgid "Width of bands" +msgstr "Anchura de las bandas" + +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:137 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:181 +msgid "Width of gaps" +msgstr "Anchura de los huecos" + +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:138 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:182 +msgid "Number of bands" +msgstr "Número de bandas" + +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:139 +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:183 +msgid "Fade away" +msgstr "Desvanecerse" + +#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:170 +msgid "Create a logo with psychedelic outlines around the text" +msgstr "Crear un logotipo con contornos sicodélicos alrededor del texto" + +#: ../plug-ins/script-fu/scripts/basic1-logo.scm:59 +#: ../plug-ins/script-fu/scripts/basic1-logo.scm:92 +msgid "_Basic I..." +msgstr "_Básico I…" -#~ msgid "Text" -#~ msgstr "Texto" +#: ../plug-ins/script-fu/scripts/basic1-logo.scm:60 +msgid "" +"Add a gradient effect, a drop shadow, and a background to the selected " +"region (or alpha)" +msgstr "" +"Añadir un efecto de degradado, una sombra arrojada y un fondo a la región o " +"transparencia seleccionada" -#~ msgid "Font size (pixels)" -#~ msgstr "Tamaño de la tipografía (píxeles)" +#: ../plug-ins/script-fu/scripts/basic1-logo.scm:93 +msgid "" +"Create a plain text logo with a gradient effect, a drop shadow, and a " +"background" +msgstr "" +"Crear un logotipo de texto sencillo con un efecto de degradado, una sombra " +"arrojada y un fondo" -#~ msgid "Font" -#~ msgstr "Tipografía" +#: ../plug-ins/script-fu/scripts/basic2-logo.scm:81 +#: ../plug-ins/script-fu/scripts/basic2-logo.scm:114 +msgid "B_asic II..." +msgstr "B_ásico II…" + +#: ../plug-ins/script-fu/scripts/basic2-logo.scm:82 +msgid "Add a shadow and a highlight to the selected region (or alpha)" +msgstr "Añadir sombra y brillos a la región o transparencia seleccionada" + +#: ../plug-ins/script-fu/scripts/basic2-logo.scm:115 +msgid "Create a simple logo with a shadow and a highlight" +msgstr "Crear un logotipo sencillo con sombra y brillos" + +#: ../plug-ins/script-fu/scripts/beveled-button.scm:80 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:142 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:201 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:120 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:161 +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:150 +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:188 +#: ../plug-ins/script-fu/scripts/land.scm:87 +#: ../plug-ins/script-fu/scripts/lava.scm:128 +#: ../plug-ins/script-fu/scripts/rendermap.scm:88 +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:351 +msgid "Gradient" +msgstr "Degradado" + +#: ../plug-ins/script-fu/scripts/beveled-button.scm:142 +msgid "Simple _Beveled Button..." +msgstr "Botón simple _biselado…" + +#: ../plug-ins/script-fu/scripts/beveled-button.scm:143 +msgid "Create a simple, beveled button graphic for webpages" +msgstr "Crear un gráfico de botón biselado simple para páginas web" + +#: ../plug-ins/script-fu/scripts/beveled-button.scm:151 +msgid "Upper-left color" +msgstr "Color superior-izquierdo" + +#: ../plug-ins/script-fu/scripts/beveled-button.scm:152 +msgid "Lower-right color" +msgstr "Color inferior-derecho" + +#: ../plug-ins/script-fu/scripts/beveled-button.scm:155 +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:104 +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:143 +#: ../plug-ins/script-fu/scripts/pupi-button.scm:204 +msgid "Bevel width" +msgstr "Anchura del bisel" + +#: ../plug-ins/script-fu/scripts/beveled-button.scm:156 +#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:131 +#: ../plug-ins/script-fu/scripts/pupi-button.scm:208 +msgid "Pressed" +msgstr "Pulsado" + +#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:150 +msgid "Create a beveled pattern arrow for webpages" +msgstr "Crear un dibujo de flecha biselada para páginas web" + +#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm:85 +msgid "Create a beveled pattern bullet for webpages" +msgstr "Crear un dibujo de viñeta biselada para páginas web" + +#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm:90 +msgid "Diameter" +msgstr "Diámetro" + +#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm:92 +#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:117 +#: ../plug-ins/script-fu/scripts/spinning-globe.scm:104 +msgid "Transparent background" +msgstr "Fondo transparente" + +#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:121 +msgid "Create a beveled pattern button for webpages" +msgstr "Crear un dibujo de botón biselado para páginas web" + +#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:107 +msgid "H_eading..." +msgstr "_Cabecera…" + +#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:108 +msgid "Create a beveled pattern heading for webpages" +msgstr "Crear un encabezamiento biselado para páginas web" + +#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm:27 +msgid "Rule" +msgstr "Regla" + +#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm:78 +msgid "Create a beveled pattern hrule for webpages" +msgstr "Crear un dibujo de línea separadora biselada para páginas web" + +#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm:83 +#: ../plug-ins/script-fu/scripts/gradient-example.scm:69 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:70 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:138 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:194 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:263 +#: ../plug-ins/script-fu/scripts/swirltile.scm:62 +msgid "Width" +msgstr "Anchura" + +#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm:84 +#: ../plug-ins/script-fu/scripts/gradient-example.scm:70 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:71 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:139 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:195 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:264 +#: ../plug-ins/script-fu/scripts/swirltile.scm:61 +msgid "Height" +msgstr "Altura" + +#: ../plug-ins/script-fu/scripts/blend-anim.scm:206 +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:327 +msgid "Frame" +msgstr "Cuadro" + +#: ../plug-ins/script-fu/scripts/blend-anim.scm:222 +msgid "Blend Animation needs at least three source layers" +msgstr "Animación de fundido requiere al menos tres capas fuente" + +#: ../plug-ins/script-fu/scripts/blend-anim.scm:228 +msgid "_Blend..." +msgstr "_Fundir…" -#~ msgid "3_D Truchet..." -#~ msgstr "Truchet 3_D…" +#: ../plug-ins/script-fu/scripts/blend-anim.scm:229 +msgid "" +"Create intermediate layers to blend two or more layers over a background as " +"an animation" +msgstr "" +"Crear capas intermedias para fundir dos o más capas sobre un fondo como una " +"animación" -#~ msgid "Create an image filled with a 3D Truchet pattern" -#~ msgstr "Crear una imagen rellenada de un patrón de Truchet en 3D" +#: ../plug-ins/script-fu/scripts/blend-anim.scm:236 +msgid "Intermediate frames" +msgstr "Fotogramas intermedios" + +#: ../plug-ins/script-fu/scripts/blend-anim.scm:237 +msgid "Max. blur radius" +msgstr "Radio Máx. de desenfoque" + +#: ../plug-ins/script-fu/scripts/blend-anim.scm:238 +msgid "Looped" +msgstr "Bucle" + +#: ../plug-ins/script-fu/scripts/blended-logo.scm:126 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:184 +msgid "Blen_ded..." +msgstr "_Fundido…[Blended]" -#~ msgid "Block size" -#~ msgstr "Tamaño de bloque" +#: ../plug-ins/script-fu/scripts/blended-logo.scm:127 +msgid "" +"Add blended backgrounds, highlights, and shadows to the selected region (or " +"alpha)" +msgstr "" +"Añadir fondos, brillos y sombras fundidos a la región o transparencia " +"seleccionada" -#~ msgid "Thickness" -#~ msgstr "Grosor" +#: ../plug-ins/script-fu/scripts/blended-logo.scm:134 +msgid "Offset (pixels)" +msgstr "Desplazamiento (píxeles)" -#~ msgid "Background color" -#~ msgstr "Color de fondo" +#: ../plug-ins/script-fu/scripts/blended-logo.scm:136 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:195 +msgid "Blend mode" +msgstr "Modo de fundido" -#~ msgid "Start blend" -#~ msgstr "Iniciar fundido [blend]" +#: ../plug-ins/script-fu/scripts/blended-logo.scm:136 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:195 +msgid "FG-BG-RGB" +msgstr "Frente a fondo (RGB)" -#~ msgid "End blend" -#~ msgstr "Fundido final" +#: ../plug-ins/script-fu/scripts/blended-logo.scm:137 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:196 +msgid "FG-BG-HSV" +msgstr "Frente a fondo (HSV)" + +#: ../plug-ins/script-fu/scripts/blended-logo.scm:138 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:197 +msgid "FG-Transparent" +msgstr "Frente a transparente" + +#: ../plug-ins/script-fu/scripts/blended-logo.scm:139 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:198 +msgid "Custom Gradient" +msgstr "Degradado personalizado" + +#: ../plug-ins/script-fu/scripts/blended-logo.scm:143 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:202 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:121 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:162 +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:151 +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:189 +#: ../plug-ins/script-fu/scripts/gradient-example.scm:71 +#: ../plug-ins/script-fu/scripts/rendermap.scm:89 +#: ../plug-ins/script-fu/scripts/title-header.scm:174 +msgid "Gradient reverse" +msgstr "Degradado invertido" + +#: ../plug-ins/script-fu/scripts/blended-logo.scm:185 +msgid "Create a logo with blended backgrounds, highlights, and shadows" +msgstr "Crear un logotipo con fondos, brillos y sombras fundidos" -#~ msgid "Supersample" -#~ msgstr "Sobremuestreo" +# a mí el carácter de puntos suspensivos me sale elevado, no abajo. ¿? FVD +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:91 +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:125 +msgid "Bo_vination..." +msgstr "Bo_vinación…" + +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:92 +msgid "Add 'cow spots' to the selected region (or alpha)" +msgstr "Añadir «manchas de vaca» a la región o transparencia seleccionada" -#~ msgid "Number of X tiles" -#~ msgstr "Número de baldosas en X" +# //R ¿Manchas o lunares? +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:99 +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:134 +msgid "Spots density X" +msgstr "Densidad X de manchas" + +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:100 +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:135 +msgid "Spots density Y" +msgstr "Densidad Y de manchas" + +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:101 +#: ../plug-ins/script-fu/scripts/chrome-logo.scm:96 +msgid "Background Color" +msgstr "Color de fondo" + +#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:126 +msgid "Create a logo with text in the style of 'cow spots'" +msgstr "Crear un logotipo con texto al estilo de «manchas de vaca»" -#~ msgid "Number of Y tiles" -#~ msgstr "Número de baldosas en Y" +#. --- false form of "if-1" +#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:212 +msgid "" +"The Burn-In script needs two layers in total. A foreground layer with " +"transparency and a background layer." +msgstr "" +"El script de quemado requiere dos capas en total. Una capa con transparencia " +"en primer plano y una capa de fondo." -#~ msgid "Bumpmap" -#~ msgstr "Mapa de relieve" +#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:219 +msgid "B_urn-In..." +msgstr "_Quemado…" -#~ msgid "Add B_evel..." -#~ msgstr "Añadir _bisel…" +#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:220 +msgid "" +"Create intermediate layers to produce an animated 'burn-in' transition " +"between two layers" +msgstr "" +"Crear capas intermedias para producir una transición de «quemado» entre dos " +"capas" -#~ msgid "Add a beveled border to an image" -#~ msgstr "Añadir un borde biselado a una imagen" +#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:228 +msgid "Fadeout" +msgstr "Desvanecer" + +#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:229 +msgid "Fadeout width" +msgstr "Anchura del desvanecimiento" + +#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:230 +msgid "Corona width" +msgstr "Ancho de la corona" + +#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:231 +msgid "After glow" +msgstr "Después de resplandecer" + +#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:232 +msgid "Add glowing" +msgstr "Añadir resplandor" + +#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:233 +msgid "Prepare for GIF" +msgstr "Preparar para GIF" + +#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:234 +msgid "Speed (pixels/frame)" +msgstr "Velocidad (píxeles/cuadro)" + +#: ../plug-ins/script-fu/scripts/camo.scm:94 +msgid "_Camouflage..." +msgstr "_Camuflaje…" + +#: ../plug-ins/script-fu/scripts/camo.scm:95 +msgid "Create an image filled with a camouflage pattern" +msgstr "Crear una imagen rellena con un dibujo de camuflaje" + +#: ../plug-ins/script-fu/scripts/camo.scm:100 +#: ../plug-ins/script-fu/scripts/rendermap.scm:86 +msgid "Image size" +msgstr "Tamaño de la imagen" + +#: ../plug-ins/script-fu/scripts/camo.scm:101 +#: ../plug-ins/script-fu/scripts/rendermap.scm:87 +msgid "Granularity" +msgstr "Granularidad" + +#: ../plug-ins/script-fu/scripts/camo.scm:102 +msgid "Color 1" +msgstr "Color 1" + +#: ../plug-ins/script-fu/scripts/camo.scm:103 +msgid "Color 2" +msgstr "Color 2" + +#: ../plug-ins/script-fu/scripts/camo.scm:104 +msgid "Color 3" +msgstr "Color 3" + +#: ../plug-ins/script-fu/scripts/camo.scm:105 +#: ../plug-ins/script-fu/scripts/distress-selection.scm:116 +msgid "Smooth" +msgstr "Suave" + +#: ../plug-ins/script-fu/scripts/carved-logo.scm:148 +#: ../plug-ins/script-fu/scripts/carve-it.scm:168 +msgid "Carved Surface" +msgstr "Superficie tallada" + +#: ../plug-ins/script-fu/scripts/carved-logo.scm:149 +#: ../plug-ins/script-fu/scripts/carve-it.scm:169 +msgid "Bevel Shadow" +msgstr "Sombra de bisel" + +#: ../plug-ins/script-fu/scripts/carved-logo.scm:150 +#: ../plug-ins/script-fu/scripts/carve-it.scm:170 +msgid "Bevel Highlight" +msgstr "Brillo de bisel" + +#: ../plug-ins/script-fu/scripts/carved-logo.scm:151 +#: ../plug-ins/script-fu/scripts/carve-it.scm:171 +msgid "Cast Shadow" +msgstr "Sombra del objeto" + +#: ../plug-ins/script-fu/scripts/carved-logo.scm:152 +#: ../plug-ins/script-fu/scripts/carve-it.scm:172 +msgid "Inset" +msgstr "Interna" + +#: ../plug-ins/script-fu/scripts/carved-logo.scm:162 +msgid "Carved..." +msgstr "Esculpido…" -#~ msgid "Work on copy" -#~ msgstr "Trabajar en copia" +#: ../plug-ins/script-fu/scripts/carved-logo.scm:163 +msgid "" +"Create a logo with text raised above or carved in to the specified " +"background image" +msgstr "" +"Crear un logotipo con texto elevado o hueco grabado en la imagen de fondo " +"especificada" -#~ msgid "Keep bump layer" -#~ msgstr "Mantener la capa de relieve" +#: ../plug-ins/script-fu/scripts/carved-logo.scm:171 +msgid "Background Image" +msgstr "Imagen de fondo" + +#: ../plug-ins/script-fu/scripts/carved-logo.scm:174 +msgid "Carve raised text" +msgstr "Esculpir texto elevado" + +#: ../plug-ins/script-fu/scripts/carved-logo.scm:175 +msgid "Padding around text" +msgstr "Rellenado alrededor del texto [Padding]" + +#: ../plug-ins/script-fu/scripts/carve-it.scm:182 +msgid "Stencil C_arve..." +msgstr "_Esculpido Stencil…" + +#: ../plug-ins/script-fu/scripts/carve-it.scm:190 +msgid "Image to carve" +msgstr "Imagen a tallar" + +#: ../plug-ins/script-fu/scripts/carve-it.scm:191 +msgid "Carve white areas" +msgstr "Esculpir las áreas blancas" + +#: ../plug-ins/script-fu/scripts/chalk.scm:81 +#: ../plug-ins/script-fu/scripts/chalk.scm:122 +msgid "_Chalk..." +msgstr "_Tiza…" -#~ msgid "Border Layer" -#~ msgstr "Capa de borde" +#: ../plug-ins/script-fu/scripts/chalk.scm:82 +msgid "Create a chalk drawing effect for the selected region (or alpha)" +msgstr "" +"Crear un efecto de dibujo con tiza para la región o transparencia " +"seleccionada" -#~ msgid "Add _Border..." -#~ msgstr "Añadir _borde…" +#: ../plug-ins/script-fu/scripts/chalk.scm:123 +msgid "Create a logo resembling chalk scribbled on a blackboard" +msgstr "Crear un logotipo imitando tiza garabateada sobre una pizarra" + +#: ../plug-ins/script-fu/scripts/chalk.scm:132 +msgid "Chalk color" +msgstr "Color de la tiza" + +#: ../plug-ins/script-fu/scripts/chip-away.scm:140 +#: ../plug-ins/script-fu/scripts/chip-away.scm:186 +msgid "Chip Awa_y..." +msgstr "_Desmenuzar…" -#~ msgid "Add a border around an image" -#~ msgstr "Añadir un borde alrededor de una imagen" +#: ../plug-ins/script-fu/scripts/chip-away.scm:141 +msgid "Add a chipped woodcarving effect to the selected region (or alpha)" +msgstr "" +"Añadir un efecto de talla en madera astillada a la región o transparencia " +"seleccionada" -#~ msgid "Border X size" -#~ msgstr "Tamaño X del borde" +# //R He leído que "desconchado" es la traducción literal +# //O Sique sin convencerme desconchado, como mucho desmenuzado, porque es lo +# que parece, como si fueses a hacer un bizcocho cuando metes todas las cosas +# en la batidora-picadora y... (yo siempre pensando en comida...) X-DD +# //R Como quieeeerasss :) +#: ../plug-ins/script-fu/scripts/chip-away.scm:148 +#: ../plug-ins/script-fu/scripts/chip-away.scm:195 +msgid "Chip amount" +msgstr "Cantidad de desmenuzado [Chip]" + +#: ../plug-ins/script-fu/scripts/chip-away.scm:149 +#: ../plug-ins/script-fu/scripts/chip-away.scm:196 +msgid "Blur amount" +msgstr "Cantidad de desenfoque [blur]" + +#: ../plug-ins/script-fu/scripts/chip-away.scm:150 +#: ../plug-ins/script-fu/scripts/chip-away.scm:197 +msgid "Invert" +msgstr "Invertir" + +#: ../plug-ins/script-fu/scripts/chip-away.scm:151 +#: ../plug-ins/script-fu/scripts/chip-away.scm:198 +msgid "Drop shadow" +msgstr "Sombra base" + +#: ../plug-ins/script-fu/scripts/chip-away.scm:153 +#: ../plug-ins/script-fu/scripts/chip-away.scm:200 +msgid "Fill BG with pattern" +msgstr "Rellenar fondo con patrón" + +#: ../plug-ins/script-fu/scripts/chip-away.scm:154 +#: ../plug-ins/script-fu/scripts/chip-away.scm:201 +msgid "Keep background" +msgstr "Mantener fondo" + +#: ../plug-ins/script-fu/scripts/chip-away.scm:187 +msgid "Create a logo resembling a chipped wood carving" +msgstr "Crear un logotipo imitando una talla en madera astillada" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:104 +msgid "Layer 1" +msgstr "Capa 1" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:105 +msgid "Layer 2" +msgstr "Capa 2" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:106 +msgid "Layer 3" +msgstr "Capa 3" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:107 +msgid "Drop Shadow" +msgstr "Sombra base" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:201 +msgid "Chrome" +msgstr "Cromado" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:202 +#: ../plug-ins/script-fu/scripts/xach-effect.scm:68 +msgid "Highlight" +msgstr "Brillo" -#~ msgid "Border Y size" -#~ msgstr "Tamaño Y del borde" +# Yo creo que Stencil es Estarcido. FVD +#: ../plug-ins/script-fu/scripts/chrome-it.scm:214 +msgid "Stencil C_hrome..." +msgstr "_Cromado Stencil…" -#~ msgid "Border color" -#~ msgstr "Color del borde" +#: ../plug-ins/script-fu/scripts/chrome-it.scm:215 +msgid "" +"Add a chrome effect to the selected region (or alpha) using a specified " +"(grayscale) stencil" +msgstr "" +"Añadir un efecto cromado a la región o transparencia seleccionada utilizando " +"el estarcido de grises especificado" -#~ msgid "Delta value on color" -#~ msgstr "Valor delta en el color" +#: ../plug-ins/script-fu/scripts/chrome-it.scm:222 +#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:210 +msgid "Chrome saturation" +msgstr "Saturación del cromado" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:223 +#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:211 +msgid "Chrome lightness" +msgstr "Luminosidad del cromado" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:224 +#: ../plug-ins/script-fu/scripts/crystal-logo.scm:215 +#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:212 +msgid "Chrome factor" +msgstr "Factor de cromado" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:225 +#: ../plug-ins/script-fu/scripts/crystal-logo.scm:222 +#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:216 +msgid "Environment map" +msgstr "Mapa de entorno" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:228 +#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:219 +msgid "Highlight balance" +msgstr "Balance del brillo" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:229 +#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:220 +msgid "Chrome balance" +msgstr "Balance del cromado" + +#: ../plug-ins/script-fu/scripts/chrome-it.scm:230 +msgid "Chrome white areas" +msgstr "Cromar las áreas blancas" + +#: ../plug-ins/script-fu/scripts/chrome-logo.scm:87 +#: ../plug-ins/script-fu/scripts/chrome-logo.scm:120 +msgid "C_hrome..." +msgstr "_Cromar…" -#~ msgid "Arrow" -#~ msgstr "Flecha" +#: ../plug-ins/script-fu/scripts/chrome-logo.scm:88 +msgid "Add a simple chrome effect to the selected region (or alpha)" +msgstr "" +"Añadir un efecto de cromado sencillo a la región o transparencia seleccionada" -#~ msgid "Alien Glow" -#~ msgstr "Resplandor alienígena" +#: ../plug-ins/script-fu/scripts/chrome-logo.scm:95 +msgid "Offsets (pixels * 2)" +msgstr "Desplazamiento (píxeles * 2)" -#~ msgid "Background" -#~ msgstr "Fondo" +#: ../plug-ins/script-fu/scripts/chrome-logo.scm:121 +msgid "Create a simplistic, but cool, chromed logo" +msgstr "Crear un logotipo cromado sencillo pero llamativo" -#~ msgid "_Arrow..." -#~ msgstr "_Flecha…" +#: ../plug-ins/script-fu/scripts/circuit.scm:81 +msgid "Effect layer" +msgstr "Capa de efectos" -#~ msgid "Create an arrow graphic with an eerie glow for web pages" -#~ msgstr "" -#~ "Crear un gráfico en forma de flecha con un resplandor misteriorso para " -#~ "páginas web" +#: ../plug-ins/script-fu/scripts/circuit.scm:134 +msgid "_Circuit..." +msgstr "_Circuito…" -#~ msgid "Size" -#~ msgstr "Tamaño" +#: ../plug-ins/script-fu/scripts/circuit.scm:135 +msgid "" +"Fill the selected region (or alpha) with traces like those on a circuit board" +msgstr "" +"Rellenar la región o transparencia seleccionada con pistas como las de un " +"circuito impreso" -#~ msgid "Orientation" -#~ msgstr "Orientación" +# //O Bueno, siguiendo tus maravillosos consejos... +#: ../plug-ins/script-fu/scripts/circuit.scm:142 +msgid "Oilify mask size" +msgstr "Tamaño de la máscara para el efecto de óleo" + +#: ../plug-ins/script-fu/scripts/circuit.scm:143 +msgid "Circuit seed" +msgstr "Semilla del circuito" + +#: ../plug-ins/script-fu/scripts/circuit.scm:144 +msgid "No background (only for separate layer)" +msgstr "Sin fondo (sólo para capa separada)" + +#: ../plug-ins/script-fu/scripts/circuit.scm:145 +#: ../plug-ins/script-fu/scripts/lava.scm:129 +#: ../plug-ins/script-fu/scripts/predator.scm:132 +#: ../plug-ins/script-fu/scripts/xach-effect.scm:138 +msgid "Keep selection" +msgstr "Mantener la selección" + +#: ../plug-ins/script-fu/scripts/circuit.scm:146 +#: ../plug-ins/script-fu/scripts/lava.scm:130 +#: ../plug-ins/script-fu/scripts/predator.scm:133 +msgid "Separate layer" +msgstr "Capa separada" + +#: ../plug-ins/script-fu/scripts/clothify.scm:51 +msgid "_Clothify..." +msgstr "_Entelar…" -#~ msgid "Left" -#~ msgstr "Izquierda" +#: ../plug-ins/script-fu/scripts/clothify.scm:52 +msgid "Add a cloth-like texture to the selected region (or alpha)" +msgstr "" +"Añadir una textura como de tela a la región o transparencia seleccionada" -#~ msgid "Up" -#~ msgstr "Arriba" +#: ../plug-ins/script-fu/scripts/clothify.scm:59 +msgid "Blur X" +msgstr "Desenfoque en X" + +#: ../plug-ins/script-fu/scripts/clothify.scm:60 +msgid "Blur Y" +msgstr "Desenfoque en Y" + +#: ../plug-ins/script-fu/scripts/clothify.scm:61 +#: ../plug-ins/script-fu/scripts/swirltile.scm:58 +msgid "Azimuth" +msgstr "Azimut" + +#: ../plug-ins/script-fu/scripts/clothify.scm:62 +#: ../plug-ins/script-fu/scripts/swirltile.scm:59 +msgid "Elevation" +msgstr "Elevación" + +#: ../plug-ins/script-fu/scripts/clothify.scm:63 +#: ../plug-ins/script-fu/scripts/swirltile.scm:57 +msgid "Depth" +msgstr "Profundidad" + +#: ../plug-ins/script-fu/scripts/coffee.scm:36 +msgid "Stain" +msgstr "Mancha" + +#: ../plug-ins/script-fu/scripts/coffee.scm:81 +msgid "_Coffee Stain..." +msgstr "Manchas de _café…" + +#: ../plug-ins/script-fu/scripts/coffee.scm:82 +msgid "Add realistic looking coffee stains to the image" +msgstr "Añadir manchas de café de aspecto realista a la imagen" + +#: ../plug-ins/script-fu/scripts/coffee.scm:89 +msgid "Stains" +msgstr "Manchas" + +#: ../plug-ins/script-fu/scripts/coffee.scm:90 +msgid "Darken only" +msgstr "Color oscuro" + +#: ../plug-ins/script-fu/scripts/comic-logo.scm:112 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:152 +msgid "Comic Boo_k..." +msgstr "_Libro de cómic…" -#~ msgid "Down" -#~ msgstr "Abajo" +#: ../plug-ins/script-fu/scripts/comic-logo.scm:113 +msgid "" +"Add a comic-book effect to the selected region (or alpha) by outlining and " +"filling with a gradient" +msgstr "" +"Añadir un efecto de cómic a la región o transparencia seleccionada bordeando " +"y rellenando con un degradado" -#~ msgid "Glow color" -#~ msgstr "Color del resplandor" +#: ../plug-ins/script-fu/scripts/comic-logo.scm:122 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:163 +#: ../plug-ins/script-fu/scripts/glossy.scm:208 +#: ../plug-ins/script-fu/scripts/glossy.scm:280 +msgid "Outline size" +msgstr "Tamaño del contorno" + +#: ../plug-ins/script-fu/scripts/comic-logo.scm:123 +#: ../plug-ins/script-fu/scripts/comic-logo.scm:164 +msgid "Outline color" +msgstr "Color del contorno" -#~ msgid "Flatten image" -#~ msgstr "Aplanar imagen" +#: ../plug-ins/script-fu/scripts/comic-logo.scm:153 +msgid "Create a comic-book style logo by outlining and filling with a gradient" +msgstr "" +"Crear un logotipo al estilo de un cómic bordeando y rellenando con un " +"degradado" -#~ msgid "Bar" -#~ msgstr "Barra" +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:140 +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:178 +msgid "Cool _Metal..." +msgstr "_Metal frío…" -#~ msgid "_Hrule..." -#~ msgstr "_Regla horizontal…" +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:141 +msgid "" +"Add a metallic effect to the selected region (or alpha) with reflections and " +"perspective shadows" +msgstr "" +"Añadir un efecto metálico a la región o transparencia seleccionada con " +"reflejos y sombras con perspectiva" -#~ msgid "Create an Hrule graphic with an eerie glow for web pages" -#~ msgstr "" -#~ "Crear un gráfico de línea separadora con un resplandor misterioso para " -#~ "páginas web" +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:148 +#: ../plug-ins/script-fu/scripts/frosty-logo.scm:143 +#: ../plug-ins/script-fu/scripts/glowing-logo.scm:84 +#: ../plug-ins/script-fu/scripts/neon-logo.scm:252 +msgid "Effect size (pixels)" +msgstr "Tamaño del efecto (píxeles)" + +#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:179 +msgid "Create a metallic logo with reflections and perspective shadows" +msgstr "Crear un logotipo metálico con reflejos y sombras con perspectiva" + +#: ../plug-ins/script-fu/scripts/crystal-logo.scm:209 +msgid "Crystal..." +msgstr "Cristal…" -#~ msgid "Bar length" -#~ msgstr "Longitud de la barra" +#: ../plug-ins/script-fu/scripts/crystal-logo.scm:210 +msgid "Create a logo with a crystal/gel effect displacing the image underneath" +msgstr "" +"Crear un logotipo con un efecto de cristal o gel desplazando la imagen " +"subyacente" -#~ msgid "Bar height" -#~ msgstr "Altura de la barra" +#: ../plug-ins/script-fu/scripts/crystal-logo.scm:219 +msgid "Background image" +msgstr "Imagen de fondo" + +#: ../plug-ins/script-fu/scripts/difference-clouds.scm:70 +msgid "Difference Clouds..." +msgstr "Nubes de diferencia…" + +#: ../plug-ins/script-fu/scripts/difference-clouds.scm:71 +msgid "Solid noise applied with Difference layer mode" +msgstr "Ruido sólido aplicado con el modo de capa Diferencia" + +#: ../plug-ins/script-fu/scripts/distress-selection.scm:105 +msgid "_Distort..." +msgstr "_Distorsión…" + +#: ../plug-ins/script-fu/scripts/distress-selection.scm:106 +msgid "Distress the selection" +msgstr "Destruir la selección" + +#: ../plug-ins/script-fu/scripts/distress-selection.scm:113 +msgid "Threshold (bigger 1<-->254 smaller)" +msgstr "Umbral (mayor 1<-->254 menor)" + +#: ../plug-ins/script-fu/scripts/distress-selection.scm:114 +msgid "Spread" +msgstr "Difusión" + +#: ../plug-ins/script-fu/scripts/distress-selection.scm:115 +msgid "Granularity (1 is low)" +msgstr "Granularidad (1 es la más baja)" + +#: ../plug-ins/script-fu/scripts/distress-selection.scm:117 +msgid "Smooth horizontally" +msgstr "Suavizado horizontal" + +#: ../plug-ins/script-fu/scripts/distress-selection.scm:118 +msgid "Smooth vertically" +msgstr "Suavizado vertical" + +#: ../plug-ins/script-fu/scripts/drop-shadow.scm:170 +msgid "_Drop Shadow..." +msgstr "_Sombra arrojada…" + +#: ../plug-ins/script-fu/scripts/drop-shadow.scm:171 +msgid "Add a drop shadow to the selected region (or alpha)" +msgstr "Añadir una sombra arrojada a la región o transparencia seleccionada" + +#: ../plug-ins/script-fu/scripts/drop-shadow.scm:178 +msgid "Offset X" +msgstr "Desplazamiento en X" + +#: ../plug-ins/script-fu/scripts/drop-shadow.scm:179 +msgid "Offset Y" +msgstr "Desplazamiento en Y" + +#: ../plug-ins/script-fu/scripts/drop-shadow.scm:180 +#: ../plug-ins/script-fu/scripts/news-text.scm:88 +#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:209 +#: ../plug-ins/script-fu/scripts/round-corners.scm:141 +#: ../plug-ins/script-fu/scripts/swirltile.scm:60 +msgid "Blur radius" +msgstr "Radio de desenfoque" + +#: ../plug-ins/script-fu/scripts/drop-shadow.scm:181 +#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:154 +#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:210 +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:350 +msgid "Color" +msgstr "Color" + +#: ../plug-ins/script-fu/scripts/drop-shadow.scm:182 +#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:211 +msgid "Opacity" +msgstr "Opacidad" + +#: ../plug-ins/script-fu/scripts/drop-shadow.scm:183 +#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:213 +msgid "Allow resizing" +msgstr "Permitir redimensionado" + +#: ../plug-ins/script-fu/scripts/erase-rows.scm:39 +msgid "_Erase Every Other Row..." +msgstr "_Borrar las otras filas…" + +#: ../plug-ins/script-fu/scripts/erase-rows.scm:40 +msgid "Erase every other row or column" +msgstr "Borra las otras filas o columnas" -#~ msgid "Bullet" -#~ msgstr "Punto" +#: ../plug-ins/script-fu/scripts/erase-rows.scm:47 +msgid "Rows/cols" +msgstr "Filas/columnas" -#~ msgid "_Bullet..." -#~ msgstr "_Punto…" +#: ../plug-ins/script-fu/scripts/erase-rows.scm:47 +msgid "Rows" +msgstr "Filas" -#~ msgid "Create a bullet graphic with an eerie glow for web pages" -#~ msgstr "" -#~ "Crear un gráfico de viñeta con un resplandor misterioso para páginas web" +#: ../plug-ins/script-fu/scripts/erase-rows.scm:47 +msgid "Columns" +msgstr "Columnas" -#~ msgid "Radius" -#~ msgstr "Radio" +#: ../plug-ins/script-fu/scripts/erase-rows.scm:48 +msgid "Even/odd" +msgstr "Pares/impares" -#~ msgid "Glow" -#~ msgstr "Resplandor" +#: ../plug-ins/script-fu/scripts/erase-rows.scm:48 +msgid "Even" +msgstr "Pares" -#~ msgid "Button" -#~ msgstr "Botón" +#: ../plug-ins/script-fu/scripts/erase-rows.scm:48 +msgid "Odd" +msgstr "Impares" -#~ msgid "B_utton..." -#~ msgstr "_Botón…" +# //R COMPROBAR +#: ../plug-ins/script-fu/scripts/erase-rows.scm:49 +msgid "Erase/fill" +msgstr "Borrar/Rellenar" -#~ msgid "Create a button graphic with an eerie glow for web pages" -#~ msgstr "" -#~ "Crear un gráfico de botón con un resplandor misterioso para páginas web" +#: ../plug-ins/script-fu/scripts/erase-rows.scm:49 +msgid "Erase" +msgstr "Borrar" -#~ msgid "Text color" -#~ msgstr "Color de texto" +#: ../plug-ins/script-fu/scripts/erase-rows.scm:49 +msgid "Fill with BG" +msgstr "Rellenar con fondo" -#~ msgid "Padding" -#~ msgstr "Relleno [Padding]" +#: ../plug-ins/script-fu/scripts/flatland.scm:60 +msgid "_Flatland..." +msgstr "_Planilandia…" + +#: ../plug-ins/script-fu/scripts/flatland.scm:61 +msgid "Create an image filled with a Land Pattern" +msgstr "Crear una imagen rellena con un dibujo de terreno" + +#: ../plug-ins/script-fu/scripts/flatland.scm:66 +#: ../plug-ins/script-fu/scripts/land.scm:79 +msgid "Image width" +msgstr "Anchura de imagen" + +#: ../plug-ins/script-fu/scripts/flatland.scm:67 +#: ../plug-ins/script-fu/scripts/land.scm:80 +msgid "Image height" +msgstr "Altura de imagen" + +#: ../plug-ins/script-fu/scripts/flatland.scm:68 +#: ../plug-ins/script-fu/scripts/land.scm:81 +msgid "Random seed" +msgstr "Semilla aleatoria" + +#: ../plug-ins/script-fu/scripts/flatland.scm:69 +#: ../plug-ins/script-fu/scripts/land.scm:82 +msgid "Detail level" +msgstr "Nivel de detalle" + +#: ../plug-ins/script-fu/scripts/flatland.scm:70 +#: ../plug-ins/script-fu/scripts/land.scm:85 +msgid "Scale X" +msgstr "Escala en X" + +#: ../plug-ins/script-fu/scripts/flatland.scm:71 +#: ../plug-ins/script-fu/scripts/land.scm:86 +msgid "Scale Y" +msgstr "Escala en Y" + +#: ../plug-ins/script-fu/scripts/font-map.scm:152 +msgid "Render _Font Map..." +msgstr "Renderizar mapa de tipogra_fías…" -#~ msgid "Glow radius" -#~ msgstr "Radio del resplandor" +#: ../plug-ins/script-fu/scripts/font-map.scm:153 +msgid "" +"Create an image filled with previews of fonts matching a fontname filter" +msgstr "" +"Crear una imagen rellena de vistas previas de tipografías que coincidan con " +"un filtro de nombres" -#~ msgid "Alien _Glow..." -#~ msgstr "_Resplandor alienígena…" +#: ../plug-ins/script-fu/scripts/font-map.scm:158 +msgid "_Text" +msgstr "_Texto" + +#: ../plug-ins/script-fu/scripts/font-map.scm:159 +msgid "Use font _name as text" +msgstr "Usar el _nombre de la tipografía como texto" + +#: ../plug-ins/script-fu/scripts/font-map.scm:160 +msgid "_Labels" +msgstr "E_tiquetas" + +#: ../plug-ins/script-fu/scripts/font-map.scm:161 +msgid "_Filter (regexp)" +msgstr "_Filtro (exp. reg.)" + +#: ../plug-ins/script-fu/scripts/font-map.scm:162 +msgid "Font _size (pixels)" +msgstr "_Tamaño de la tipografía (píxeles)" + +#: ../plug-ins/script-fu/scripts/font-map.scm:163 +msgid "_Border (pixels)" +msgstr "_Borde (píxeles)" -#~ msgid "Add an eerie glow around the selected region (or alpha)" -#~ msgstr "" -#~ "Añadir un resplandor misterioso alrededor de la región o transparencia " -#~ "seleccionada" +#: ../plug-ins/script-fu/scripts/font-map.scm:164 +msgid "_Color scheme" +msgstr "Esquema de _colores" -#~ msgid "Glow size (pixels * 4)" -#~ msgstr "Tamaño del resplandor (píxeles * 4)" +#: ../plug-ins/script-fu/scripts/font-map.scm:164 +msgid "Black on white" +msgstr "Negro sobre blanco" -#~ msgid "Create a logo with an alien glow around the text" -#~ msgstr "Crear un logotipo con un resplandor alienígena alrededor del texto" +#: ../plug-ins/script-fu/scripts/font-map.scm:164 +msgid "Active colors" +msgstr "Colores activos" -#~ msgid "Alien _Neon..." -#~ msgstr "_Neón alienígena…" +#: ../plug-ins/script-fu/scripts/frosty-logo.scm:135 +#: ../plug-ins/script-fu/scripts/frosty-logo.scm:197 +msgid "_Frosty..." +msgstr "_Escarchado…" -#~ msgid "Add psychedelic outlines to the selected region (or alpha)" -#~ msgstr "" -#~ "Añadir contornos sicodélicos a la región o transparencia seleccionada" +#: ../plug-ins/script-fu/scripts/frosty-logo.scm:136 +msgid "" +"Add a frost effect to the selected region (or alpha) with an added drop " +"shadow" +msgstr "" +"Añadir un efecto de escarchado a la región o transparencia seleccionada con " +"una sombra arrojada" -# //O Nuevas traducciones desde cero, las "Bands" sos bandas con el color de -# fondo que se elige en el "script", los "gaps" son las bandas con el color de -# primer plano, por lo que voy a traducir "bands" como huecos en referencia -# al uso de color de fondo y "gap" como las bandas, por usar el color de primer -# plano, ¿mejor así? -# //R Vale -#~ msgid "Width of bands" -#~ msgstr "Anchura de las bandas" +#: ../plug-ins/script-fu/scripts/frosty-logo.scm:198 +msgid "Create frozen logo with an added drop shadow" +msgstr "Crear un logotipo escarchado con una sombra arrojada añadida" + +#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:146 +msgid "_Fuzzy Border..." +msgstr "_Difuminar borde…" + +#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:147 +msgid "Add a jagged, fuzzy border to an image" +msgstr "Añadir un borde difuso e irregular a una imagen" + +#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:155 +#: ../plug-ins/script-fu/scripts/old-photo.scm:98 +msgid "Border size" +msgstr "Tamaño del borde" + +#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:156 +msgid "Blur border" +msgstr "Desenfocar el borde" + +#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:157 +msgid "Granularity (1 is Low)" +msgstr "Granularidad (1 es la más baja)" + +#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:158 +msgid "Add shadow" +msgstr "Añadir sombra" + +#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:159 +msgid "Shadow weight (%)" +msgstr "Peso de la sombra (%)" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:59 +msgid "Using _Paths" +msgstr "Utilización de las _rutas" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:60 +#: ../plug-ins/script-fu/scripts/gimp-online.scm:73 +#: ../plug-ins/script-fu/scripts/gimp-online.scm:86 +#: ../plug-ins/script-fu/scripts/gimp-online.scm:99 +#: ../plug-ins/script-fu/scripts/gimp-online.scm:112 +#: ../plug-ins/script-fu/scripts/gimp-online.scm:125 +#: ../plug-ins/script-fu/scripts/gimp-online.scm:138 +#: ../plug-ins/script-fu/scripts/gimp-online.scm:151 +msgid "Bookmark to the user manual" +msgstr "Marcador al manual de usuario" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:72 +msgid "_Preparing your Images for the Web" +msgstr "_Preparación de imágenes para la Web" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:85 +msgid "_Working with Digital Camera Photos" +msgstr "_Trabajar con fotografías de cámaras digitales" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:98 +msgid "Create, Open and Save _Files" +msgstr "Crear, abrir y guardar _archivos" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:111 +msgid "_Basic Concepts" +msgstr "Conceptos _básicos" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:124 +msgid "How to Use _Dialogs" +msgstr "Cómo utilizar los cuadros de _diálogo" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:137 +msgid "Drawing _Simple Objects" +msgstr "Dibujar objetos _sencillos" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:150 +msgid "Create and Use _Selections" +msgstr "Crear y usar las _selecciones" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:178 +msgid "_Main Web Site" +msgstr "Sitio web _principal" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:179 +#: ../plug-ins/script-fu/scripts/gimp-online.scm:192 +#: ../plug-ins/script-fu/scripts/gimp-online.scm:205 +#: ../plug-ins/script-fu/scripts/gimp-online.scm:218 +msgid "Bookmark to the GIMP web site" +msgstr "Marcador al sitio web de GIMP" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:191 +msgid "_Developer Web Site" +msgstr "Sitio web del _desarrollador" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:204 +msgid "_User Manual Web Site" +msgstr "Sitio web del _manual de usuario" + +#: ../plug-ins/script-fu/scripts/gimp-online.scm:217 +msgid "Plug-in _Registry" +msgstr "_Registro de complementos" + +#: ../plug-ins/script-fu/scripts/glossy.scm:196 +#: ../plug-ins/script-fu/scripts/glossy.scm:267 +msgid "Glo_ssy..." +msgstr "_Bruñido…" -#~ msgid "Width of gaps" -#~ msgstr "Anchura de los huecos" +#: ../plug-ins/script-fu/scripts/glossy.scm:197 +msgid "" +"Add gradients, patterns, shadows, and bump maps to the selected region (or " +"alpha)" +msgstr "" +"Añadir degradados, dibujos, sombras y mapas de relieve a la región o " +"transparencia seleccionada" -#~ msgid "Number of bands" -#~ msgstr "Número de bandas" +#: ../plug-ins/script-fu/scripts/glossy.scm:204 +#: ../plug-ins/script-fu/scripts/glossy.scm:276 +msgid "Blend gradient (text)" +msgstr "Degradado de fundido (texto)" + +#: ../plug-ins/script-fu/scripts/glossy.scm:205 +#: ../plug-ins/script-fu/scripts/glossy.scm:277 +msgid "Text gradient reverse" +msgstr "Texto degradado invertido" + +#: ../plug-ins/script-fu/scripts/glossy.scm:206 +#: ../plug-ins/script-fu/scripts/glossy.scm:278 +msgid "Blend gradient (outline)" +msgstr "Degradado de fundido (contorno)" + +#: ../plug-ins/script-fu/scripts/glossy.scm:207 +#: ../plug-ins/script-fu/scripts/glossy.scm:279 +msgid "Outline gradient reverse" +msgstr "Degradado de contorno invertido" + +#: ../plug-ins/script-fu/scripts/glossy.scm:210 +#: ../plug-ins/script-fu/scripts/glossy.scm:282 +msgid "Use pattern for text instead of gradient" +msgstr "Usar patrón para texto en vez de un degradado" + +#: ../plug-ins/script-fu/scripts/glossy.scm:211 +#: ../plug-ins/script-fu/scripts/glossy.scm:283 +msgid "Pattern (text)" +msgstr "Patrón (texto)" + +#: ../plug-ins/script-fu/scripts/glossy.scm:212 +#: ../plug-ins/script-fu/scripts/glossy.scm:284 +msgid "Use pattern for outline instead of gradient" +msgstr "Usar patrón en lugar de degradado para el contorno" + +#: ../plug-ins/script-fu/scripts/glossy.scm:213 +#: ../plug-ins/script-fu/scripts/glossy.scm:285 +msgid "Pattern (outline)" +msgstr "Patrón (contorno)" + +#: ../plug-ins/script-fu/scripts/glossy.scm:214 +#: ../plug-ins/script-fu/scripts/glossy.scm:286 +msgid "Use pattern overlay" +msgstr "Usar superposición de patrón" + +#: ../plug-ins/script-fu/scripts/glossy.scm:215 +#: ../plug-ins/script-fu/scripts/glossy.scm:287 +msgid "Pattern (overlay)" +msgstr "Patrón (superpuesto)" + +#: ../plug-ins/script-fu/scripts/glossy.scm:217 +#: ../plug-ins/script-fu/scripts/glossy.scm:289 +#: ../plug-ins/script-fu/scripts/xach-effect.scm:92 +msgid "Shadow" +msgstr "Sombra" + +#: ../plug-ins/script-fu/scripts/glossy.scm:268 +msgid "Create a logo with gradients, patterns, shadows, and bump maps" +msgstr "Crear un logotipo con degradados, dibujos, sombras y mapas de relieve" + +#: ../plug-ins/script-fu/scripts/glowing-logo.scm:76 +#: ../plug-ins/script-fu/scripts/glowing-logo.scm:109 +msgid "Glo_wing Hot..." +msgstr "Calor _resplandeciente…" -#~ msgid "Fade away" -#~ msgstr "Desvanecerse" +#: ../plug-ins/script-fu/scripts/glowing-logo.scm:77 +msgid "Add a glowing hot metal effect to the selected region (or alpha)" +msgstr "" +"Añadir un efecto resplandeciente de metal caliente a la región o " +"transparencia seleccionada" -#~ msgid "Create a logo with psychedelic outlines around the text" -#~ msgstr "Crear un logotipo con contornos sicodélicos alrededor del texto" +#: ../plug-ins/script-fu/scripts/glowing-logo.scm:110 +msgid "Create a logo that looks like glowing hot metal" +msgstr "Crear un logotipo que parece un metal caliente que resplandece" + +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:94 +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:133 +msgid "Gradient Beve_l..." +msgstr "Bise_l degradado…" -#~ msgid "_Basic I..." -#~ msgstr "_Básico I…" +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:95 +msgid "Add a shiny look and bevel effect to the selected region (or alpha)" +msgstr "" +"Añadir una apariencia pulida y un efecto de biselado a la región o " +"transparencia seleccionada" -#~ msgid "" -#~ "Add a gradient effect, a drop shadow, and a background to the selected " -#~ "region (or alpha)" -#~ msgstr "" -#~ "Añadir un efecto de degradado, una sombra arrojada y un fondo a la región " -#~ "o transparencia seleccionada" +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:102 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:125 +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:106 +msgid "Border size (pixels)" +msgstr "Tamaño del borde (píxeles)" + +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:103 +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:142 +msgid "Bevel height (sharpness)" +msgstr "Altura del bisel (afilado)" + +#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:134 +msgid "Create a logo with a shiny look and beveled edges" +msgstr "Crear un logotipo con una apariencia pulida y bordes biselados" + +#: ../plug-ins/script-fu/scripts/gradient-example.scm:63 +msgid "Custom _Gradient..." +msgstr "_Degradado personalizado…" + +#: ../plug-ins/script-fu/scripts/gradient-example.scm:64 +msgid "Create an image filled with an example of the current gradient" +msgstr "Crear una imagen rellena con una muestra del degradado actual" + +#: ../plug-ins/script-fu/scripts/grid-system.scm:84 +msgid "_Grid..." +msgstr "_Rejilla…" -#~ msgid "" -#~ "Create a plain text logo with a gradient effect, a drop shadow, and a " -#~ "background" -#~ msgstr "" -#~ "Crear un logotipo de texto sencillo con un efecto de degradado, una " -#~ "sombra arrojada y un fondo" +#: ../plug-ins/script-fu/scripts/grid-system.scm:85 +msgid "" +"Draw a grid as specified by the lists of X and Y locations using the current " +"brush" +msgstr "" +"Dibujar una rejilla como se especifica en las listas de posiciones X e Y " +"utilizando el pincel actual" -#~ msgid "B_asic II..." -#~ msgstr "B_ásico II…" +#: ../plug-ins/script-fu/scripts/grid-system.scm:92 +msgid "X divisions" +msgstr "Divisiones X" + +#: ../plug-ins/script-fu/scripts/grid-system.scm:93 +msgid "Y divisions" +msgstr "Divisiones Y" + +#: ../plug-ins/script-fu/scripts/guides-from-selection.scm:32 +msgid "New Guides from _Selection" +msgstr "Guías nuevas desde la _selección" + +#: ../plug-ins/script-fu/scripts/guides-from-selection.scm:33 +msgid "Create four guides around the bounding box of the current selection" +msgstr "Crear cuatro guías alrededor de la selección actual" + +#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:27 +msgid "New Guide (by _Percent)..." +msgstr "Guía nueva (por _porcentaje)…" -#~ msgid "Add a shadow and a highlight to the selected region (or alpha)" -#~ msgstr "Añadir sombra y brillos a la región o transparencia seleccionada" +#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:28 +msgid "Add a guide at the position specified as a percentage of the image size" +msgstr "" +"Añadir una línea guía en la posición especificada como porcentaje del tamaño " +"de la imagen" -#~ msgid "Create a simple logo with a shadow and a highlight" -#~ msgstr "Crear un logotipo sencillo con sombra y brillos" +#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:35 +#: ../plug-ins/script-fu/scripts/guides-new.scm:35 +msgid "Direction" +msgstr "Dirección " -#~ msgid "Gradient" -#~ msgstr "Degradado" +#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:35 +#: ../plug-ins/script-fu/scripts/guides-new.scm:35 +msgid "Horizontal" +msgstr "Horizontal" -#~ msgid "Simple _Beveled Button..." -#~ msgstr "Botón simple _biselado…" +#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:36 +#: ../plug-ins/script-fu/scripts/guides-new.scm:35 +msgid "Vertical" +msgstr "Vertical" -#~ msgid "Create a simple, beveled button graphic for webpages" -#~ msgstr "Crear un gráfico de botón biselado simple para páginas web" +#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:37 +msgid "Position (in %)" +msgstr "Posición (en %)" + +#: ../plug-ins/script-fu/scripts/guides-new.scm:27 +msgid "New _Guide..." +msgstr "_Guía nueva…" -#~ msgid "Upper-left color" -#~ msgstr "Color superior-izquierdo" +#: ../plug-ins/script-fu/scripts/guides-new.scm:28 +msgid "Add a guide at the orientation and position specified (in pixels)" +msgstr "" +"Añadir una línea guía en la orientación y posición especificadas en píxeles" -#~ msgid "Lower-right color" -#~ msgstr "Color inferior-derecho" +#: ../plug-ins/script-fu/scripts/guides-new.scm:36 +msgid "Position" +msgstr "Posición" + +#: ../plug-ins/script-fu/scripts/guides-remove-all.scm:19 +msgid "_Remove all Guides" +msgstr "_Quitar todas las guías" + +#: ../plug-ins/script-fu/scripts/guides-remove-all.scm:20 +msgid "Remove all horizontal and vertical guides" +msgstr "Quitar todas las líneas guía horizontales y verticales" + +#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:92 +msgid "Imigre-_26..." +msgstr "Imigre-_26…" + +#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:93 +msgid "Create a logo in a two-color, scribbled text style" +msgstr "Crear un logotipo al estilo de un texto garabateado de dos colores" + +#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:100 +msgid "Frame color" +msgstr "Color del fotograma" + +#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:103 +msgid "Frame size" +msgstr "Tamaño del fotograma" + +#: ../plug-ins/script-fu/scripts/land.scm:73 +msgid "_Land..." +msgstr "_Tierra…" + +#: ../plug-ins/script-fu/scripts/land.scm:74 +msgid "Create an image filled with a topographic map pattern" +msgstr "Crear una imagen rellena de un patrón de mapa topográfico" + +#: ../plug-ins/script-fu/scripts/land.scm:83 +msgid "Land height" +msgstr "Altura del terreno" + +#: ../plug-ins/script-fu/scripts/land.scm:84 +msgid "Sea depth" +msgstr "Profundidad del océano" + +#: ../plug-ins/script-fu/scripts/lava.scm:117 +msgid "_Lava..." +msgstr "_Lava…" + +#: ../plug-ins/script-fu/scripts/lava.scm:118 +msgid "Fill the current selection with lava" +msgstr "Rellenar la selección actual con lava" + +#: ../plug-ins/script-fu/scripts/lava.scm:125 +msgid "Seed" +msgstr "Semilla" + +#: ../plug-ins/script-fu/scripts/lava.scm:127 +#: ../plug-ins/script-fu/scripts/swirltile.scm:64 +msgid "Roughness" +msgstr "Rugosidad" + +#: ../plug-ins/script-fu/scripts/lava.scm:131 +msgid "Use current gradient" +msgstr "Usar el degradado actual" + +#: ../plug-ins/script-fu/scripts/line-nova.scm:108 +msgid "Line _Nova..." +msgstr "_Nova de líneas…" -#~ msgid "Bevel width" -#~ msgstr "Anchura del bisel" +#: ../plug-ins/script-fu/scripts/line-nova.scm:109 +msgid "" +"Fill a layer with rays emanating outward from its center using the " +"foreground color" +msgstr "" +"Rellenar una capa con rayos que salen desde el centro utilizando el color de " +"frente" -#~ msgid "Pressed" -#~ msgstr "Pulsado" +#: ../plug-ins/script-fu/scripts/line-nova.scm:116 +msgid "Number of lines" +msgstr "Número de líneas" -#~ msgid "Create a beveled pattern arrow for webpages" -#~ msgstr "Crear un dibujo de flecha biselada para páginas web" +# //O Gracias de nuevo por los consejos. +#: ../plug-ins/script-fu/scripts/line-nova.scm:117 +msgid "Sharpness (degrees)" +msgstr "Ángulo de la púas" + +#: ../plug-ins/script-fu/scripts/line-nova.scm:118 +msgid "Offset radius" +msgstr "Radio de desplazamiento" + +#: ../plug-ins/script-fu/scripts/line-nova.scm:119 +msgid "Randomness" +msgstr "Aleatoriedad" + +#: ../plug-ins/script-fu/scripts/mkbrush.scm:63 +msgid "_Rectangular..." +msgstr "_Rectangular…" + +#: ../plug-ins/script-fu/scripts/mkbrush.scm:64 +msgid "Create a rectangular brush" +msgstr "Crear un pincel rectangular" + +#: ../plug-ins/script-fu/scripts/mkbrush.scm:69 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:137 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:193 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:262 +msgid "Name" +msgstr "Nombre" + +#: ../plug-ins/script-fu/scripts/mkbrush.scm:72 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:141 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:196 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:266 +#: ../plug-ins/script-fu/scripts/paste-as-brush.scm:70 +#: ../plug-ins/script-fu/scripts/select-to-brush.scm:143 +msgid "Spacing" +msgstr "Espaciado" + +#: ../plug-ins/script-fu/scripts/mkbrush.scm:131 +msgid "Re_ctangular, Feathered..." +msgstr "Re_ctangular, difuminada…" + +#: ../plug-ins/script-fu/scripts/mkbrush.scm:132 +msgid "Create a rectangular brush with feathered edges" +msgstr "Crear un pincel rectangular con bordes difuminados" + +#: ../plug-ins/script-fu/scripts/mkbrush.scm:140 +#: ../plug-ins/script-fu/scripts/mkbrush.scm:265 +msgid "Feathering" +msgstr "Difuminar" + +#: ../plug-ins/script-fu/scripts/mkbrush.scm:187 +msgid "_Elliptical..." +msgstr "_Elíptica…" + +#: ../plug-ins/script-fu/scripts/mkbrush.scm:188 +msgid "Create an elliptical brush" +msgstr "Crear un pincel elíptico" + +#: ../plug-ins/script-fu/scripts/mkbrush.scm:256 +msgid "Elli_ptical, Feathered..." +msgstr "Elí_ptica, difuminada…" + +#: ../plug-ins/script-fu/scripts/mkbrush.scm:257 +msgid "Create an elliptical brush with feathered edges" +msgstr "Crear un pincel elíptico con bordes difuminados" + +#: ../plug-ins/script-fu/scripts/neon-logo.scm:244 +#: ../plug-ins/script-fu/scripts/neon-logo.scm:280 +msgid "N_eon..." +msgstr "N_eón…" -#~ msgid "Create a beveled pattern bullet for webpages" -#~ msgstr "Crear un dibujo de viñeta biselada para páginas web" +#: ../plug-ins/script-fu/scripts/neon-logo.scm:245 +msgid "Convert the selected region (or alpha) into a neon-sign like object" +msgstr "" +"Convertir la región o transparencia seleccionada en un objeto parecido a un " +"letrero de neón" -#~ msgid "Diameter" -#~ msgstr "Diámetro" +#: ../plug-ins/script-fu/scripts/neon-logo.scm:255 +#: ../plug-ins/script-fu/scripts/neon-logo.scm:291 +msgid "Create shadow" +msgstr "Crear sombra" + +#: ../plug-ins/script-fu/scripts/neon-logo.scm:281 +msgid "Create a logo in the style of a neon sign" +msgstr "Crear un logotipo al estilo de un letrero de neón" + +#: ../plug-ins/script-fu/scripts/news-text.scm:77 +msgid "Newsprint Te_xt..." +msgstr "Te_xto de periódico…" + +#: ../plug-ins/script-fu/scripts/news-text.scm:78 +msgid "Create a logo in the style of newspaper printing" +msgstr "Crear un logotipo al estilo de la impresión en periódico" + +#: ../plug-ins/script-fu/scripts/news-text.scm:86 +msgid "Cell size (pixels)" +msgstr "Tamaño de celda (píxeles)" + +#: ../plug-ins/script-fu/scripts/news-text.scm:87 +#: ../plug-ins/script-fu/scripts/speed-text.scm:95 +msgid "Density (%)" +msgstr "Densidad (%)" + +#: ../plug-ins/script-fu/scripts/old-photo.scm:89 +msgid "_Old Photo..." +msgstr "_Foto antigua…" + +#: ../plug-ins/script-fu/scripts/old-photo.scm:90 +msgid "Make an image look like an old photo" +msgstr "Hacer que una imagen parezca una foto vieja" + +#: ../plug-ins/script-fu/scripts/old-photo.scm:97 +msgid "Defocus" +msgstr "Desenfocar" + +#. since this plug-in uses the fuzzy-border plug-in, I used the +#. values of the latter, with the exception of the initial value +#. and the 'minimum' value. +#: ../plug-ins/script-fu/scripts/old-photo.scm:102 +msgid "Sepia" +msgstr "Sepia" + +#: ../plug-ins/script-fu/scripts/old-photo.scm:103 +msgid "Mottle" +msgstr "Moteado" + +#: ../plug-ins/script-fu/scripts/palette-export.scm:226 +msgid "Folder for the output file" +msgstr "Carpeta para el archivo de salida" -#~ msgid "Transparent background" -#~ msgstr "Fondo transparente" +#: ../plug-ins/script-fu/scripts/palette-export.scm:227 +msgid "" +"The name of the file to create (if a file with this name already exist, it " +"will be replaced)" +msgstr "" +"Nombre del archivo que crear (si ya existe un archivo con este nombre, se " +"sustituirá)" -#~ msgid "Create a beveled pattern button for webpages" -#~ msgstr "Crear un dibujo de botón biselado para páginas web" +#: ../plug-ins/script-fu/scripts/palette-export.scm:235 +msgid "The filename you entered is not a suitable name for a file." +msgstr "El nombre que ha introducido no es apto para un nombre de archivo." -#~ msgid "H_eading..." -#~ msgstr "_Cabecera…" +#: ../plug-ins/script-fu/scripts/palette-export.scm:237 +msgid "" +"All characters in the name are either white-spaces or characters which can " +"not appear in filenames." +msgstr "" +"Todos los caracteres del nombre son espacios o caracteres que no pueden " +"aparecer en los nombres de archivo." -#~ msgid "Create a beveled pattern heading for webpages" -#~ msgstr "Crear un encabezamiento biselado para páginas web" +#: ../plug-ins/script-fu/scripts/palette-export.scm:265 +msgid "" +"Export the active palette as a CSS stylesheet with the color entry name as " +"their class name, and the color itself as the color attribute" +msgstr "" +"Exportar la paleta activa como una hoja de estilos CSS con el nombre del " +"color como nombre de la clase, y el color en sí como atributo de color" -#~ msgid "Rule" -#~ msgstr "Regla" +#: ../plug-ins/script-fu/scripts/palette-export.scm:291 +msgid "Export the active palette as a PHP dictionary (name => color)" +msgstr "Exportar la paleta activa como un diccionario de PHP (nombre => color)" -#~ msgid "Create a beveled pattern hrule for webpages" -#~ msgstr "Crear un dibujo de línea separadora biselada para páginas web" +#: ../plug-ins/script-fu/scripts/palette-export.scm:323 +msgid "Export the active palette as a Python dictionary (name: color)" +msgstr "" +"Exportar la paleta activa como un diccionario de Python (nombre: color)" -#~ msgid "Width" -#~ msgstr "Anchura" +#: ../plug-ins/script-fu/scripts/palette-export.scm:352 +msgid "" +"Write all the colors in a palette to a text file, one hexadecimal value per " +"line (no names)" +msgstr "" +"Escribir todos los colores de una paleta a un archivo de texto, con un valor " +"hexadecimal por cada línea (sin nombres)" -#~ msgid "Height" -#~ msgstr "Altura" +#: ../plug-ins/script-fu/scripts/palette-export.scm:399 +msgid "Export the active palette as a java.util.Hashtable" +msgstr "" +"Exportar la paleta activa como una tabla java.util.Hashtable" -#~ msgid "Frame" -#~ msgstr "Cuadro" +#: ../plug-ins/script-fu/scripts/paste-as-brush.scm:56 +#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm:44 +msgid "There is no image data in the clipboard to paste." +msgstr "No hay ningún dato de imagen en el portapapeles que se pueda pegar." + +#: ../plug-ins/script-fu/scripts/paste-as-brush.scm:62 +msgid "New _Brush..." +msgstr "_Pincel nuevo…" + +#: ../plug-ins/script-fu/scripts/paste-as-brush.scm:63 +msgid "Paste the clipboard contents into a new brush" +msgstr "Pegar el contenido del portapapeles en un pincel nuevo" + +#: ../plug-ins/script-fu/scripts/paste-as-brush.scm:68 +#: ../plug-ins/script-fu/scripts/select-to-brush.scm:141 +msgid "Brush name" +msgstr "Nombre del pincel" + +#: ../plug-ins/script-fu/scripts/paste-as-brush.scm:69 +#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm:57 +#: ../plug-ins/script-fu/scripts/select-to-brush.scm:142 +#: ../plug-ins/script-fu/scripts/select-to-pattern.scm:102 +msgid "File name" +msgstr "Nombre de archivo" + +#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm:50 +msgid "New _Pattern..." +msgstr "_Patrón nuevo…" + +#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm:51 +msgid "Paste the clipboard contents into a new pattern" +msgstr "Pegar el contenido del portapapeles en un patrón nuevo" + +#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm:56 +#: ../plug-ins/script-fu/scripts/select-to-pattern.scm:101 +msgid "Pattern name" +msgstr "Nombre del patrón" + +#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:198 +msgid "_Perspective..." +msgstr "_Perspectiva…" -#~ msgid "Blend Animation needs at least three source layers" -#~ msgstr "Animación de fundido requiere al menos tres capas fuente" +#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:199 +msgid "Add a perspective shadow to the selected region (or alpha)" +msgstr "" +"Añadir una sombra de perspectiva a la región o transparencia seleccionada" -#~ msgid "_Blend..." -#~ msgstr "_Fundir…" +#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:206 +msgid "Angle" +msgstr "Ángulo" + +#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:207 +msgid "Relative distance of horizon" +msgstr "Distancia relativa del horizonte" + +#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:208 +msgid "Relative length of shadow" +msgstr "Longitud relativa de la sombra" + +#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:212 +msgid "Interpolation" +msgstr "Interpolación" -#~ msgid "" -#~ "Create intermediate layers to blend two or more layers over a background " -#~ "as an animation" -#~ msgstr "" -#~ "Crear capas intermedias para fundir dos o más capas sobre un fondo como " -#~ "una animación" +# Cuidado porque esto no es «Voraz» sino que se refiere a una película de Swartzenegger llamada «Predator», «El depredador». FVD +#: ../plug-ins/script-fu/scripts/predator.scm:121 +msgid "_Predator..." +msgstr "_Depredador…" -#~ msgid "Intermediate frames" -#~ msgstr "Fotogramas intermedios" +#: ../plug-ins/script-fu/scripts/predator.scm:122 +msgid "Add a 'Predator' effect to the selected region (or alpha)" +msgstr "" +"Añadir un efecto de «Depredador» a la región o transparencia seleccionada" -#~ msgid "Max. blur radius" -#~ msgstr "Radio Máx. de desenfoque" +#: ../plug-ins/script-fu/scripts/predator.scm:129 +msgid "Edge amount" +msgstr "Grosor del borde" + +#: ../plug-ins/script-fu/scripts/predator.scm:130 +msgid "Pixelize" +msgstr "Pixelizar" + +#: ../plug-ins/script-fu/scripts/predator.scm:131 +msgid "Pixel amount" +msgstr "Tamaño del píxel" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:187 +msgid "_Round Button..." +msgstr "Botón _redondo…" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:188 +msgid "Create images, each containing an oval button graphic" +msgstr "Crear imágenes con un gráfico de botón ovalado cada una" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:196 +msgid "Upper color" +msgstr "Color superior" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:197 +msgid "Lower color" +msgstr "Color inferior" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:199 +msgid "Upper color (active)" +msgstr "Color superior (activo)" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:200 +msgid "Lower color (active)" +msgstr "Color inferior (activo)" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:201 +msgid "Text color (active)" +msgstr "Color del texto (activo)" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:202 +msgid "Padding X" +msgstr "Relleno en X" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:203 +msgid "Padding Y" +msgstr "Relleno en Y" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:205 +msgid "Round ratio" +msgstr "Razón de redondeo" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:206 +msgid "Not pressed" +msgstr "No pulsado" + +#: ../plug-ins/script-fu/scripts/pupi-button.scm:207 +msgid "Not pressed (active)" +msgstr "No pulsado (activo)" + +#: ../plug-ins/script-fu/scripts/rendermap.scm:80 +msgid "Render _Map..." +msgstr "_Renderizar mapa…" + +#: ../plug-ins/script-fu/scripts/rendermap.scm:81 +msgid "Create an image filled with an Earth-like map pattern" +msgstr "Crear una imagen rellena con un patrón parecido a un mapa terrestre" -#~ msgid "Looped" -#~ msgstr "Bucle" +#: ../plug-ins/script-fu/scripts/rendermap.scm:90 +msgid "Behavior" +msgstr "Comportamiento" -#~ msgid "Blen_ded..." -#~ msgstr "_Fundido…[Blended]" +#: ../plug-ins/script-fu/scripts/rendermap.scm:90 +msgid "Tile" +msgstr "Mosaico" -#~ msgid "" -#~ "Add blended backgrounds, highlights, and shadows to the selected region " -#~ "(or alpha)" -#~ msgstr "" -#~ "Añadir fondos, brillos y sombras fundidos a la región o transparencia " -#~ "seleccionada" +#: ../plug-ins/script-fu/scripts/rendermap.scm:90 +msgid "Detail in Middle" +msgstr "Detalle en el medio" -#~ msgid "Offset (pixels)" -#~ msgstr "Desplazamiento (píxeles)" +#: ../plug-ins/script-fu/scripts/reverse-layers.scm:42 +msgid "Reverse Layer Order" +msgstr "Orden inverso de las capas" + +#: ../plug-ins/script-fu/scripts/reverse-layers.scm:43 +msgid "Reverse the order of layers in the image" +msgstr "Invertir el orden de las capas de la imagen" + +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:119 +msgid "_Rippling..." +msgstr "_Ondas…" -#~ msgid "Blend mode" -#~ msgstr "Modo de fundido" +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:120 +msgid "" +"Create a multi-layer image by adding a ripple effect to the current image" +msgstr "" +"Crear una imagen multicapa añadiendo un efecto de rizado a la imagen actual" -#~ msgid "FG-BG-HSV" -#~ msgstr "Frente a fondo (HSV)" +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:127 +msgid "Rippling strength" +msgstr "Fuerza de ondulación" + +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:128 +#: ../plug-ins/script-fu/scripts/waves-anim.scm:105 +msgid "Number of frames" +msgstr "Número de fotogramas" -#~ msgid "FG-Transparent" -#~ msgstr "Frente a transparente" +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:129 +msgid "Edge behavior" +msgstr "Comportamiento del borde" -#~ msgid "Custom Gradient" -#~ msgstr "Degradado personalizado" +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:129 +msgid "Wrap" +msgstr "Desformar" -#~ msgid "Gradient reverse" -#~ msgstr "Degradado invertido" +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:129 +msgid "Smear" +msgstr "Manchar" -#~ msgid "Create a logo with blended backgrounds, highlights, and shadows" -#~ msgstr "Crear un logotipo con fondos, brillos y sombras fundidos" +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:129 +msgid "Black" +msgstr "Negro" -# a mí el carácter de puntos suspensivos me sale elevado, no abajo. ¿? FVD -#~ msgid "Bo_vination..." -#~ msgstr "Bo_vinación…" +#: ../plug-ins/script-fu/scripts/round-corners.scm:129 +msgid "_Round Corners..." +msgstr "Esquinas _redondeadas…" -#~ msgid "Add 'cow spots' to the selected region (or alpha)" -#~ msgstr "Añadir «manchas de vaca» a la región o transparencia seleccionada" +#: ../plug-ins/script-fu/scripts/round-corners.scm:130 +msgid "" +"Round the corners of an image and optionally add a drop-shadow and background" +msgstr "" +"Redondear las esquinas de una imagen y añadir una sombra arrojada y un fondo " +"opcionales" -# //R ¿Manchas o lunares? -#~ msgid "Spots density X" -#~ msgstr "Densidad X de manchas" +#: ../plug-ins/script-fu/scripts/round-corners.scm:137 +msgid "Edge radius" +msgstr "Radio del borde" + +#: ../plug-ins/script-fu/scripts/round-corners.scm:138 +msgid "Add drop-shadow" +msgstr "Añadir sombra base" + +#: ../plug-ins/script-fu/scripts/round-corners.scm:142 +msgid "Add background" +msgstr "Añadir fondo" + +#: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm:53 +msgid "Se_t Colormap..." +msgstr "Es_tablecer el mapa de colores…" -#~ msgid "Spots density Y" -#~ msgstr "Densidad Y de manchas" +#: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm:54 +msgid "Change the colormap of an image to the colors in a specified palette." +msgstr "" +"Cambiar el mapa de colores de una imagen a los de la paleta especificada." -#~ msgid "Background Color" -#~ msgstr "Color de fondo" +#: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm:61 +msgid "Palette" +msgstr "Paleta" + +#: ../plug-ins/script-fu/scripts/selection-round.scm:139 +msgid "Rounded R_ectangle..." +msgstr "_Rectángulo redondeado…" + +#: ../plug-ins/script-fu/scripts/selection-round.scm:140 +msgid "Round the corners of the current selection" +msgstr "Redondea las esquinas de la selección actual" + +#: ../plug-ins/script-fu/scripts/selection-round.scm:147 +msgid "Radius (%)" +msgstr "Radio (%)" + +#: ../plug-ins/script-fu/scripts/selection-round.scm:148 +msgid "Concave" +msgstr "Cóncavo" + +#: ../plug-ins/script-fu/scripts/select-to-brush.scm:133 +msgid "To _Brush..." +msgstr "A _pincel…" + +#: ../plug-ins/script-fu/scripts/select-to-brush.scm:134 +msgid "Convert a selection to a brush" +msgstr "Convertir una selección en un pincel" + +#: ../plug-ins/script-fu/scripts/select-to-image.scm:81 +msgid "To _Image" +msgstr "A _imagen" + +#: ../plug-ins/script-fu/scripts/select-to-image.scm:82 +msgid "Convert a selection to an image" +msgstr "Convertir una selección en una imagen" + +#: ../plug-ins/script-fu/scripts/select-to-pattern.scm:93 +msgid "To _Pattern..." +msgstr "A _patrón…" + +#: ../plug-ins/script-fu/scripts/select-to-pattern.scm:94 +msgid "Convert a selection to a pattern" +msgstr "Convertir una selección en un patrón" + +#: ../plug-ins/script-fu/scripts/slide.scm:236 +msgid "_Slide..." +msgstr "_Diapositiva…" -#~ msgid "Create a logo with text in the style of 'cow spots'" -#~ msgstr "Crear un logotipo con texto al estilo de «manchas de vaca»" +#: ../plug-ins/script-fu/scripts/slide.scm:237 +msgid "Add a slide-film like frame, sprocket holes, and labels to an image" +msgstr "" +"Añadir un marco como el de una película diapositiva, agujeros de rueda " +"dentada y etiquetas a una imagen" -#~ msgid "" -#~ "The Burn-In script needs two layers in total. A foreground layer with " -#~ "transparency and a background layer." -#~ msgstr "" -#~ "El script de quemado requiere dos capas en total. Una capa con " -#~ "transparencia en primer plano y una capa de fondo." +#: ../plug-ins/script-fu/scripts/slide.scm:245 +msgid "Number" +msgstr "Número" + +#: ../plug-ins/script-fu/scripts/slide.scm:247 +msgid "Font color" +msgstr "Color de la tipografía" + +#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:204 +msgid "SOTA Chrome..." +msgstr "Cromado flipante…" -#~ msgid "B_urn-In..." -#~ msgstr "_Quemado…" +# SOTA=flipante. FVD +#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:205 +msgid "Create a State Of The Art chromed logo" +msgstr "Crear un logotipo cromado flipante" -#~ msgid "" -#~ "Create intermediate layers to produce an animated 'burn-in' transition " -#~ "between two layers" -#~ msgstr "" -#~ "Crear capas intermedias para producir una transición de «quemado» entre " -#~ "dos capas" +# Velocidad del texto: noooooooo... FVD +#: ../plug-ins/script-fu/scripts/speed-text.scm:86 +msgid "Speed Text..." +msgstr "Texto en movimiento…" + +#: ../plug-ins/script-fu/scripts/speed-text.scm:87 +msgid "Create a logo with a speedy text effect" +msgstr "Crear un logotipo con un efecto de texto en movimiento" + +#: ../plug-ins/script-fu/scripts/spinning-globe.scm:94 +msgid "_Spinning Globe..." +msgstr "Globo _giratorio…" -#~ msgid "Fadeout" -#~ msgstr "Desvanecer" +#: ../plug-ins/script-fu/scripts/spinning-globe.scm:95 +msgid "Create an animation by mapping the current image onto a spinning sphere" +msgstr "" +"Crear una animación proyectando la imagen actual sobre una esfera giratoria" -#~ msgid "Fadeout width" -#~ msgstr "Anchura del desvanecimiento" +#: ../plug-ins/script-fu/scripts/spinning-globe.scm:102 +msgid "Frames" +msgstr "Fotogramas" -#~ msgid "Corona width" -#~ msgstr "Ancho de la corona" +#: ../plug-ins/script-fu/scripts/spinning-globe.scm:103 +msgid "Turn from left to right" +msgstr "Girar de izquierda a derecha" -#~ msgid "After glow" -#~ msgstr "Después de resplandecer" +#: ../plug-ins/script-fu/scripts/spinning-globe.scm:105 +msgid "Index to n colors (0 = remain RGB)" +msgstr "Indexar a n colores (0 = permanece RGB)" -#~ msgid "Add glowing" -#~ msgstr "Añadir resplandor" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:240 +msgid "Rendering Spyro" +msgstr "Trazando Spyro" -#~ msgid "Prepare for GIF" -#~ msgstr "Preparar para GIF" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:314 +msgid "_Spyrogimp..." +msgstr "_Espirógrafo del GIMP…" -#~ msgid "Speed (pixels/frame)" -#~ msgstr "Velocidad (píxeles/cuadro)" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:315 +msgid "" +"Add Spirographs, Epitrochoids, and Lissajous Curves to the current layer" +msgstr "" +"Añade espirografías, epitrotopías y curvas de Lissajous a la capa actual" -#~ msgid "_Camouflage..." -#~ msgstr "_Camuflaje…" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:323 +msgid "Type" +msgstr "Tipo" -#~ msgid "Create an image filled with a camouflage pattern" -#~ msgstr "Crear una imagen rellena con un dibujo de camuflaje" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:323 +msgid "Spyrograph" +msgstr "Espirógrafo" -#~ msgid "Image size" -#~ msgstr "Tamaño de la imagen" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:324 +msgid "Epitrochoid" +msgstr "Epitrocoide" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:325 +msgid "Lissajous" +msgstr "Lissajous" -#~ msgid "Granularity" -#~ msgstr "Granularidad" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:326 +msgid "Shape" +msgstr "Forma" -#~ msgid "Color 1" -#~ msgstr "Color 1" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:326 +msgid "Circle" +msgstr "Circulo" -#~ msgid "Color 2" -#~ msgstr "Color 2" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:328 +msgid "Triangle" +msgstr "Triángulo" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:329 +msgid "Square" +msgstr "Cuadrado" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:330 +msgid "Pentagon" +msgstr "Pentágono" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:331 +msgid "Hexagon" +msgstr "Hexágono" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:332 +msgid "Polygon: 7 sides" +msgstr "Polígono: 7 lados" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:333 +msgid "Polygon: 8 sides" +msgstr "Polígono: 8 lados" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:334 +msgid "Polygon: 9 sides" +msgstr "Polígono: 9 lados" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:335 +msgid "Polygon: 10 sides" +msgstr "Polígono: 10 lados" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:336 +msgid "Outer teeth" +msgstr "Dientes exteriores" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:337 +msgid "Inner teeth" +msgstr "Dientes interiores" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:338 +msgid "Margin (pixels)" +msgstr "Margen (píxeles)" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:339 +msgid "Hole ratio" +msgstr "Radio del hoyo" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:340 +#: ../plug-ins/script-fu/scripts/text-circle.scm:215 +msgid "Start angle" +msgstr "Ángulo inicial" -#~ msgid "Color 3" -#~ msgstr "Color 3" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:342 +msgid "Tool" +msgstr "Herramienta" -#~ msgid "Smooth" -#~ msgstr "Suave" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:342 +msgid "Pencil" +msgstr "Lápiz" -#~ msgid "Carved Surface" -#~ msgstr "Superficie tallada" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:343 +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:345 +msgid "Brush" +msgstr "Pincel" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:344 +msgid "Airbrush" +msgstr "Aerógrafo" -#~ msgid "Bevel Shadow" -#~ msgstr "Sombra de bisel" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:347 +msgid "Color method" +msgstr "Método de coloración" -#~ msgid "Bevel Highlight" -#~ msgstr "Brillo de bisel" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:347 +msgid "Solid Color" +msgstr "Color liso" -#~ msgid "Cast Shadow" -#~ msgstr "Sombra del objeto" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:348 +msgid "Gradient: Loop Sawtooth" +msgstr "Degradado: bucle diente de sierra" + +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:349 +msgid "Gradient: Loop Triangle" +msgstr "Degradado: bucle de triángulo" + +#: ../plug-ins/script-fu/scripts/starscape-logo.scm:139 +msgid "Sta_rscape..." +msgstr "Paisaje estela_r…" -#~ msgid "Inset" -#~ msgstr "Interna" +#: ../plug-ins/script-fu/scripts/starscape-logo.scm:140 +msgid "Create a logo using a rock-like texture, a nova glow, and shadow" +msgstr "" +"Crear un logotipo utilizando una textura rocosa, un fulgor de nova y una " +"sombra" -#~ msgid "Carved..." -#~ msgstr "Esculpido…" +#: ../plug-ins/script-fu/scripts/swirltile.scm:51 +msgid "Swirl-_Tile..." +msgstr "_Embaldosado de remolinos…" + +#: ../plug-ins/script-fu/scripts/swirltile.scm:52 +msgid "Create an image filled with a swirled tile effect" +msgstr "Crear una imagen rellena con un efecto de baldosas en espiral" -#~ msgid "" -#~ "Create a logo with text raised above or carved in to the specified " -#~ "background image" -#~ msgstr "" -#~ "Crear un logotipo con texto elevado o hueco grabado en la imagen de fondo " -#~ "especificada" +# //O Algo cutre, pero cuanto mayor es, más "arrastra" la imagen, por eso +# lo de fuerza. +#: ../plug-ins/script-fu/scripts/swirltile.scm:63 +msgid "Whirl amount" +msgstr "Fuerza del remolino" + +#: ../plug-ins/script-fu/scripts/swirly-pattern.scm:82 +msgid "_Swirly..." +msgstr "_Remolino…" + +#: ../plug-ins/script-fu/scripts/swirly-pattern.scm:83 +msgid "Create an image filled with a swirly pattern" +msgstr "Crear una imagen rellena de un patrón en espiral" + +#: ../plug-ins/script-fu/scripts/swirly-pattern.scm:88 +msgid "Quarter size" +msgstr "Tamaño del cuadrante" + +#: ../plug-ins/script-fu/scripts/swirly-pattern.scm:89 +msgid "Whirl angle" +msgstr "Ángulo del remolino" + +#: ../plug-ins/script-fu/scripts/swirly-pattern.scm:90 +msgid "Number of times to whirl" +msgstr "Número de veces a girar" + +#: ../plug-ins/script-fu/scripts/test-sphere.scm:267 +msgid "_Sphere..." +msgstr "_Esferificar…" + +#: ../plug-ins/script-fu/scripts/text-circle.scm:207 +msgid "Text C_ircle..." +msgstr "Texto _circular…" -#~ msgid "Background Image" -#~ msgstr "Imagen de fondo" +#: ../plug-ins/script-fu/scripts/text-circle.scm:208 +msgid "" +"Create a logo by rendering the specified text along the perimeter of a circle" +msgstr "" +"Crear un logotipo colocando el texto especificado alrededor de un " +"circunferencia" -#~ msgid "Carve raised text" -#~ msgstr "Esculpir texto elevado" +#: ../plug-ins/script-fu/scripts/text-circle.scm:216 +msgid "Fill angle" +msgstr "Ángulo de relleno" + +#: ../plug-ins/script-fu/scripts/text-circle.scm:218 +msgid "Antialias" +msgstr "Alisado" + +#: ../plug-ins/script-fu/scripts/textured-logo.scm:117 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:159 +msgid "_Textured..." +msgstr "_Texturizado…" -#~ msgid "Padding around text" -#~ msgstr "Rellenado alrededor del texto [Padding]" +#: ../plug-ins/script-fu/scripts/textured-logo.scm:118 +msgid "" +"Fill the selected region (or alpha) with a texture and add highlights, " +"shadows, and a mosaic background" +msgstr "" +"Rellenar la región o transparencia seleccionada con una textura y añadir " +"luces, sombras y un fondo de mosaico" -#~ msgid "Stencil C_arve..." -#~ msgstr "_Esculpido Stencil…" +#: ../plug-ins/script-fu/scripts/textured-logo.scm:127 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:169 +msgid "Mosaic tile type" +msgstr "Tipo de embaldosado del mosaico" -#~ msgid "Image to carve" -#~ msgstr "Imagen a tallar" +#: ../plug-ins/script-fu/scripts/textured-logo.scm:127 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:169 +msgid "Squares" +msgstr "Cuadrados" -#~ msgid "Carve white areas" -#~ msgstr "Esculpir las áreas blancas" +#: ../plug-ins/script-fu/scripts/textured-logo.scm:128 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:170 +msgid "Hexagons" +msgstr "Hexágonos" -#~ msgid "_Chalk..." -#~ msgstr "_Tiza…" +#: ../plug-ins/script-fu/scripts/textured-logo.scm:129 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:171 +msgid "Octagons" +msgstr "Octógonos" -#~ msgid "Create a chalk drawing effect for the selected region (or alpha)" -#~ msgstr "" -#~ "Crear un efecto de dibujo con tiza para la región o transparencia " -#~ "seleccionada" +#: ../plug-ins/script-fu/scripts/textured-logo.scm:131 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:173 +msgid "Starting blend" +msgstr "Color inicial de fundido" + +#: ../plug-ins/script-fu/scripts/textured-logo.scm:132 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:174 +msgid "Ending blend" +msgstr "Fundido de final" -#~ msgid "Create a logo resembling chalk scribbled on a blackboard" -#~ msgstr "Crear un logotipo imitando tiza garabateada sobre una pizarra" +#: ../plug-ins/script-fu/scripts/textured-logo.scm:160 +msgid "" +"Create a textured logo with highlights, shadows, and a mosaic background" +msgstr "Crear un logotipo texturizado con luces, sombras y un fondo de mosaico" -#~ msgid "Chalk color" -#~ msgstr "Color de la tiza" +#: ../plug-ins/script-fu/scripts/textured-logo.scm:168 +msgid "Text pattern" +msgstr "Patrón del texto" + +#: ../plug-ins/script-fu/scripts/tileblur.scm:68 +msgid "_Tileable Blur..." +msgstr "Desenfoque en_losable…" -#~ msgid "Chip Awa_y..." -#~ msgstr "_Desmenuzar…" +#: ../plug-ins/script-fu/scripts/tileblur.scm:69 +msgid "Blur the edges of an image so the result tiles seamlessly" +msgstr "" +"Desenfocar los bordes de una imagen para el resultado forme un mosaico con " +"facilidad" -#~ msgid "Add a chipped woodcarving effect to the selected region (or alpha)" -#~ msgstr "" -#~ "Añadir un efecto de talla en madera astillada a la región o transparencia " -#~ "seleccionada" +#: ../plug-ins/script-fu/scripts/tileblur.scm:77 +msgid "Blur vertically" +msgstr "Desenfocar verticalmente" + +#: ../plug-ins/script-fu/scripts/tileblur.scm:78 +msgid "Blur horizontally" +msgstr "Desenfocar horizontalmente" -# //R He leído que "desconchado" es la traducción literal -# //O Sique sin convencerme desconchado, como mucho desmenuzado, porque es lo -# que parece, como si fueses a hacer un bizcocho cuando metes todas las cosas -# en la batidora-picadora y... (yo siempre pensando en comida...) X-DD -# //R Como quieeeerasss :) -#~ msgid "Chip amount" -#~ msgstr "Cantidad de desmenuzado [Chip]" +#: ../plug-ins/script-fu/scripts/tileblur.scm:79 +msgid "Blur type" +msgstr "Tipo de desenfoque" -#~ msgid "Blur amount" -#~ msgstr "Cantidad de desenfoque [blur]" +#: ../plug-ins/script-fu/scripts/tileblur.scm:79 +msgid "IIR" +msgstr "IIR" -#~ msgid "Invert" -#~ msgstr "Invertir" +#: ../plug-ins/script-fu/scripts/tileblur.scm:79 +msgid "RLE" +msgstr "RLE" -#~ msgid "Drop shadow" -#~ msgstr "Sombra base" +#: ../plug-ins/script-fu/scripts/title-header.scm:165 +msgid "Web Title Header..." +msgstr "Cabecera de título web…" + +#: ../plug-ins/script-fu/scripts/title-header.scm:166 +msgid "Create a decorative web title header" +msgstr "Crea una cabecera de título web decorativa" + +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:98 +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:138 +msgid "_Particle Trace..." +msgstr "_Trazado de partículas…" -#~ msgid "Fill BG with pattern" -#~ msgstr "Rellenar fondo con patrón" +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:99 +msgid "Add a Trace of Particles effect to the selected region (or alpha)" +msgstr "" +"Añadir un efecto de traza de partículas a la región o transparencia " +"seleccionada" -#~ msgid "Keep background" -#~ msgstr "Mantener fondo" +# //R Quizás "tasa de choques" +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:107 +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:147 +msgid "Hit rate" +msgstr "Tasa de choques" + +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:108 +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:148 +msgid "Edge width" +msgstr "Anchura del borde" + +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:109 +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:149 +msgid "Edge only" +msgstr "Sólo borde" + +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:110 +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:150 +msgid "Base color" +msgstr "Color base" + +#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:139 +msgid "Create a logo using a Trace Of Particles effect" +msgstr "Crear un logotipo utilizando un efecto de traza de partículas" + +#: ../plug-ins/script-fu/scripts/truchet.scm:165 +msgid "T_ruchet..." +msgstr "T_ruchet…" + +#: ../plug-ins/script-fu/scripts/truchet.scm:166 +msgid "Create an image filled with a Truchet pattern" +msgstr "Crea una imagen rellena con un patrón Truchet" + +#: ../plug-ins/script-fu/scripts/truchet.scm:174 +msgid "Foreground color" +msgstr "Color de primer plano" + +#: ../plug-ins/script-fu/scripts/unsharp-mask.scm:82 +msgid "Mask size" +msgstr "Tamaño de máscara" + +#: ../plug-ins/script-fu/scripts/unsharp-mask.scm:83 +msgid "Mask opacity" +msgstr "Opacidad de máscara" + +#: ../plug-ins/script-fu/scripts/waves-anim.scm:95 +msgid "_Waves..." +msgstr "_Ondas…" -#~ msgid "Create a logo resembling a chipped wood carving" -#~ msgstr "Crear un logotipo imitando una talla en madera astillada" +#: ../plug-ins/script-fu/scripts/waves-anim.scm:96 +msgid "" +"Create a multi-layer image with an effect like a stone was thrown into the " +"current image" +msgstr "" +"Crear una imagen multicapa con un efecto como si una piedra hubiera caído " +"sobre la imagen actual" -#~ msgid "Layer 1" -#~ msgstr "Capa 1" +#: ../plug-ins/script-fu/scripts/waves-anim.scm:103 +msgid "Amplitude" +msgstr "Amplitud" + +#: ../plug-ins/script-fu/scripts/waves-anim.scm:104 +msgid "Wavelength" +msgstr "Longitud de onda" + +#: ../plug-ins/script-fu/scripts/waves-anim.scm:106 +msgid "Invert direction" +msgstr "Invertir dirección" + +#: ../plug-ins/script-fu/scripts/weave.scm:389 +msgid "_Weave..." +msgstr "_Ondular…" -#~ msgid "Layer 2" -#~ msgstr "Capa 2" +#: ../plug-ins/script-fu/scripts/weave.scm:390 +msgid "" +"Create a new layer filled with a weave effect to be used as an overlay or " +"bump map" +msgstr "" +"Crea una capa nueva rellena con un efecto onda para usarla como overlay o " +"mapa de relieve" -#~ msgid "Layer 3" -#~ msgstr "Capa 3" +#: ../plug-ins/script-fu/scripts/weave.scm:397 +msgid "Ribbon width" +msgstr "Ancho del lazo" + +#: ../plug-ins/script-fu/scripts/weave.scm:398 +msgid "Ribbon spacing" +msgstr "Espacio entre lazos" + +#: ../plug-ins/script-fu/scripts/weave.scm:399 +msgid "Shadow darkness" +msgstr "Oscuridad de la sombra" + +#: ../plug-ins/script-fu/scripts/weave.scm:400 +msgid "Shadow depth" +msgstr "Profundidad de la sombra" + +#: ../plug-ins/script-fu/scripts/weave.scm:401 +msgid "Thread length" +msgstr "Longitud de las hebras" + +#: ../plug-ins/script-fu/scripts/weave.scm:402 +msgid "Thread density" +msgstr "Densidad de hebras" + +#: ../plug-ins/script-fu/scripts/weave.scm:403 +msgid "Thread intensity" +msgstr "Intensidad de las hebras" + +#: ../plug-ins/script-fu/scripts/xach-effect.scm:121 +msgid "_Xach-Effect..." +msgstr "Efecto _Xach…" -#~ msgid "Drop Shadow" -#~ msgstr "Sombra base" - -#~ msgid "Chrome" -#~ msgstr "Cromado" - -#~ msgid "Highlight" -#~ msgstr "Brillo" - -# Yo creo que Stencil es Estarcido. FVD -#~ msgid "Stencil C_hrome..." -#~ msgstr "_Cromado Stencil…" - -#~ msgid "" -#~ "Add a chrome effect to the selected region (or alpha) using a specified " -#~ "(grayscale) stencil" -#~ msgstr "" -#~ "Añadir un efecto cromado a la región o transparencia seleccionada " -#~ "utilizando el estarcido de grises especificado" - -#~ msgid "Chrome saturation" -#~ msgstr "Saturación del cromado" - -#~ msgid "Chrome lightness" -#~ msgstr "Luminosidad del cromado" - -#~ msgid "Chrome factor" -#~ msgstr "Factor de cromado" - -#~ msgid "Environment map" -#~ msgstr "Mapa de entorno" - -#~ msgid "Highlight balance" -#~ msgstr "Balance del brillo" - -#~ msgid "Chrome balance" -#~ msgstr "Balance del cromado" - -#~ msgid "Chrome white areas" -#~ msgstr "Cromar las áreas blancas" - -#~ msgid "C_hrome..." -#~ msgstr "_Cromar…" - -#~ msgid "Add a simple chrome effect to the selected region (or alpha)" -#~ msgstr "" -#~ "Añadir un efecto de cromado sencillo a la región o transparencia " -#~ "seleccionada" - -#~ msgid "Offsets (pixels * 2)" -#~ msgstr "Desplazamiento (píxeles * 2)" - -#~ msgid "Create a simplistic, but cool, chromed logo" -#~ msgstr "Crear un logotipo cromado sencillo pero llamativo" - -#~ msgid "Effect layer" -#~ msgstr "Capa de efectos" - -#~ msgid "_Circuit..." -#~ msgstr "_Circuito…" - -#~ msgid "" -#~ "Fill the selected region (or alpha) with traces like those on a circuit " -#~ "board" -#~ msgstr "" -#~ "Rellenar la región o transparencia seleccionada con pistas como las de un " -#~ "circuito impreso" - -# //O Bueno, siguiendo tus maravillosos consejos... -#~ msgid "Oilify mask size" -#~ msgstr "Tamaño de la máscara para el efecto de óleo" - -#~ msgid "Circuit seed" -#~ msgstr "Semilla del circuito" - -#~ msgid "No background (only for separate layer)" -#~ msgstr "Sin fondo (sólo para capa separada)" - -#~ msgid "Keep selection" -#~ msgstr "Mantener la selección" - -#~ msgid "Separate layer" -#~ msgstr "Capa separada" - -#~ msgid "_Clothify..." -#~ msgstr "_Entelar…" - -#~ msgid "Add a cloth-like texture to the selected region (or alpha)" -#~ msgstr "" -#~ "Añadir una textura como de tela a la región o transparencia seleccionada" - -#~ msgid "Blur X" -#~ msgstr "Desenfoque en X" - -#~ msgid "Blur Y" -#~ msgstr "Desenfoque en Y" - -#~ msgid "Azimuth" -#~ msgstr "Azimut" - -#~ msgid "Elevation" -#~ msgstr "Elevación" - -#~ msgid "Depth" -#~ msgstr "Profundidad" - -#~ msgid "Stain" -#~ msgstr "Mancha" - -#~ msgid "_Coffee Stain..." -#~ msgstr "Manchas de _café…" - -#~ msgid "Add realistic looking coffee stains to the image" -#~ msgstr "Añadir manchas de café de aspecto realista a la imagen" - -#~ msgid "Stains" -#~ msgstr "Manchas" - -#~ msgid "Darken only" -#~ msgstr "Color oscuro" - -#~ msgid "Comic Boo_k..." -#~ msgstr "_Libro de cómic…" - -#~ msgid "" -#~ "Add a comic-book effect to the selected region (or alpha) by outlining " -#~ "and filling with a gradient" -#~ msgstr "" -#~ "Añadir un efecto de cómic a la región o transparencia seleccionada " -#~ "bordeando y rellenando con un degradado" - -#~ msgid "Outline size" -#~ msgstr "Tamaño del contorno" - -#~ msgid "Outline color" -#~ msgstr "Color del contorno" - -#~ msgid "" -#~ "Create a comic-book style logo by outlining and filling with a gradient" -#~ msgstr "" -#~ "Crear un logotipo al estilo de un cómic bordeando y rellenando con un " -#~ "degradado" - -#~ msgid "Cool _Metal..." -#~ msgstr "_Metal frío…" - -#~ msgid "" -#~ "Add a metallic effect to the selected region (or alpha) with reflections " -#~ "and perspective shadows" -#~ msgstr "" -#~ "Añadir un efecto metálico a la región o transparencia seleccionada con " -#~ "reflejos y sombras con perspectiva" - -#~ msgid "Effect size (pixels)" -#~ msgstr "Tamaño del efecto (píxeles)" - -#~ msgid "Create a metallic logo with reflections and perspective shadows" -#~ msgstr "Crear un logotipo metálico con reflejos y sombras con perspectiva" - -#~ msgid "Crystal..." -#~ msgstr "Cristal…" - -#~ msgid "" -#~ "Create a logo with a crystal/gel effect displacing the image underneath" -#~ msgstr "" -#~ "Crear un logotipo con un efecto de cristal o gel desplazando la imagen " -#~ "subyacente" - -#~ msgid "Background image" -#~ msgstr "Imagen de fondo" - -#~ msgid "Difference Clouds..." -#~ msgstr "Nubes de diferencia…" - -#~ msgid "Solid noise applied with Difference layer mode" -#~ msgstr "Ruido sólido aplicado con el modo de capa Diferencia" - -#~ msgid "_Distort..." -#~ msgstr "_Distorsión…" - -#~ msgid "Distress the selection" -#~ msgstr "Destruir la selección" - -#~ msgid "Threshold (bigger 1<-->254 smaller)" -#~ msgstr "Umbral (mayor 1<-->254 menor)" - -#~ msgid "Spread" -#~ msgstr "Difusión" - -#~ msgid "Granularity (1 is low)" -#~ msgstr "Granularidad (1 es la más baja)" - -#~ msgid "Smooth horizontally" -#~ msgstr "Suavizado horizontal" - -#~ msgid "Smooth vertically" -#~ msgstr "Suavizado vertical" - -#~ msgid "_Drop Shadow..." -#~ msgstr "_Sombra arrojada…" - -#~ msgid "Add a drop shadow to the selected region (or alpha)" -#~ msgstr "Añadir una sombra arrojada a la región o transparencia seleccionada" - -#~ msgid "Offset X" -#~ msgstr "Desplazamiento en X" - -#~ msgid "Offset Y" -#~ msgstr "Desplazamiento en Y" - -#~ msgid "Blur radius" -#~ msgstr "Radio de desenfoque" - -#~ msgid "Color" -#~ msgstr "Color" - -#~ msgid "Opacity" -#~ msgstr "Opacidad" - -#~ msgid "Allow resizing" -#~ msgstr "Permitir redimensionado" - -#~ msgid "_Erase Every Other Row..." -#~ msgstr "_Borrar las otras filas…" - -#~ msgid "Erase every other row or column" -#~ msgstr "Borra las otras filas o columnas" - -#~ msgid "Rows/cols" -#~ msgstr "Filas/columnas" - -#~ msgid "Columns" -#~ msgstr "Columnas" - -#~ msgid "Even/odd" -#~ msgstr "Pares/impares" - -#~ msgid "Odd" -#~ msgstr "Impares" - -# //R COMPROBAR -#~ msgid "Erase/fill" -#~ msgstr "Borrar/Rellenar" - -#~ msgid "Fill with BG" -#~ msgstr "Rellenar con fondo" - -#~ msgid "_Flatland..." -#~ msgstr "_Planilandia…" - -#~ msgid "Create an image filled with a Land Pattern" -#~ msgstr "Crear una imagen rellena con un dibujo de terreno" - -#~ msgid "Image width" -#~ msgstr "Anchura de imagen" - -#~ msgid "Image height" -#~ msgstr "Altura de imagen" - -#~ msgid "Random seed" -#~ msgstr "Semilla aleatoria" - -#~ msgid "Detail level" -#~ msgstr "Nivel de detalle" - -#~ msgid "Scale X" -#~ msgstr "Escala en X" - -#~ msgid "Scale Y" -#~ msgstr "Escala en Y" - -#~ msgid "Render _Font Map..." -#~ msgstr "Renderizar mapa de tipogra_fías…" - -#~ msgid "" -#~ "Create an image filled with previews of fonts matching a fontname filter" -#~ msgstr "" -#~ "Crear una imagen rellena de vistas previas de tipografías que coincidan " -#~ "con un filtro de nombres" - -#~ msgid "_Text" -#~ msgstr "_Texto" - -#~ msgid "Use font _name as text" -#~ msgstr "Usar el _nombre de la tipografía como texto" - -#~ msgid "_Labels" -#~ msgstr "E_tiquetas" - -#~ msgid "_Filter (regexp)" -#~ msgstr "_Filtro (exp. reg.)" - -#~ msgid "Font _size (pixels)" -#~ msgstr "_Tamaño de la tipografía (píxeles)" - -#~ msgid "_Border (pixels)" -#~ msgstr "_Borde (píxeles)" - -#~ msgid "_Color scheme" -#~ msgstr "Esquema de _colores" - -#~ msgid "Active colors" -#~ msgstr "Colores activos" - -#~ msgid "_Frosty..." -#~ msgstr "_Escarchado…" - -#~ msgid "" -#~ "Add a frost effect to the selected region (or alpha) with an added drop " -#~ "shadow" -#~ msgstr "" -#~ "Añadir un efecto de escarchado a la región o transparencia seleccionada " -#~ "con una sombra arrojada" - -#~ msgid "Create frozen logo with an added drop shadow" -#~ msgstr "Crear un logotipo escarchado con una sombra arrojada añadida" - -#~ msgid "_Fuzzy Border..." -#~ msgstr "_Difuminar borde…" - -#~ msgid "Add a jagged, fuzzy border to an image" -#~ msgstr "Añadir un borde difuso e irregular a una imagen" - -#~ msgid "Border size" -#~ msgstr "Tamaño del borde" - -#~ msgid "Blur border" -#~ msgstr "Desenfocar el borde" - -#~ msgid "Granularity (1 is Low)" -#~ msgstr "Granularidad (1 es la más baja)" - -#~ msgid "Add shadow" -#~ msgstr "Añadir sombra" - -#~ msgid "Shadow weight (%)" -#~ msgstr "Peso de la sombra (%)" - -#~ msgid "Using _Paths" -#~ msgstr "Utilización de las _rutas" - -#~ msgid "Bookmark to the user manual" -#~ msgstr "Marcador al manual de usuario" - -#~ msgid "_Preparing your Images for the Web" -#~ msgstr "_Preparación de imágenes para la Web" - -#~ msgid "_Working with Digital Camera Photos" -#~ msgstr "_Trabajar con fotografías de cámaras digitales" - -#~ msgid "Create, Open and Save _Files" -#~ msgstr "Crear, abrir y guardar _archivos" - -#~ msgid "_Basic Concepts" -#~ msgstr "Conceptos _básicos" - -#~ msgid "How to Use _Dialogs" -#~ msgstr "Cómo utilizar los cuadros de _diálogo" - -#~ msgid "Drawing _Simple Objects" -#~ msgstr "Dibujar objetos _sencillos" - -#~ msgid "Create and Use _Selections" -#~ msgstr "Crear y usar las _selecciones" - -#~ msgid "_Main Web Site" -#~ msgstr "Sitio web _principal" - -#~ msgid "Bookmark to the GIMP web site" -#~ msgstr "Marcador al sitio web de GIMP" - -#~ msgid "_Developer Web Site" -#~ msgstr "Sitio web del _desarrollador" - -#~ msgid "_User Manual Web Site" -#~ msgstr "Sitio web del _manual de usuario" - -#~ msgid "Plug-in _Registry" -#~ msgstr "_Registro de complementos" - -#~ msgid "Glo_ssy..." -#~ msgstr "_Bruñido…" - -#~ msgid "" -#~ "Add gradients, patterns, shadows, and bump maps to the selected region " -#~ "(or alpha)" -#~ msgstr "" -#~ "Añadir degradados, dibujos, sombras y mapas de relieve a la región o " -#~ "transparencia seleccionada" - -#~ msgid "Blend gradient (text)" -#~ msgstr "Degradado de fundido (texto)" - -#~ msgid "Text gradient reverse" -#~ msgstr "Texto degradado invertido" - -#~ msgid "Blend gradient (outline)" -#~ msgstr "Degradado de fundido (contorno)" - -#~ msgid "Outline gradient reverse" -#~ msgstr "Degradado de contorno invertido" - -#~ msgid "Use pattern for text instead of gradient" -#~ msgstr "Usar patrón para texto en vez de un degradado" - -#~ msgid "Pattern (text)" -#~ msgstr "Patrón (texto)" - -#~ msgid "Use pattern for outline instead of gradient" -#~ msgstr "Usar patrón en lugar de degradado para el contorno" - -#~ msgid "Pattern (outline)" -#~ msgstr "Patrón (contorno)" - -#~ msgid "Use pattern overlay" -#~ msgstr "Usar superposición de patrón" - -#~ msgid "Pattern (overlay)" -#~ msgstr "Patrón (superpuesto)" - -#~ msgid "Shadow" -#~ msgstr "Sombra" - -#~ msgid "Create a logo with gradients, patterns, shadows, and bump maps" -#~ msgstr "" -#~ "Crear un logotipo con degradados, dibujos, sombras y mapas de relieve" - -#~ msgid "Glo_wing Hot..." -#~ msgstr "Calor _resplandeciente…" - -#~ msgid "Add a glowing hot metal effect to the selected region (or alpha)" -#~ msgstr "" -#~ "Añadir un efecto resplandeciente de metal caliente a la región o " -#~ "transparencia seleccionada" - -#~ msgid "Create a logo that looks like glowing hot metal" -#~ msgstr "Crear un logotipo que parece un metal caliente que resplandece" - -#~ msgid "Gradient Beve_l..." -#~ msgstr "Bise_l degradado…" - -#~ msgid "Add a shiny look and bevel effect to the selected region (or alpha)" -#~ msgstr "" -#~ "Añadir una apariencia pulida y un efecto de biselado a la región o " -#~ "transparencia seleccionada" - -#~ msgid "Border size (pixels)" -#~ msgstr "Tamaño del borde (píxeles)" - -#~ msgid "Bevel height (sharpness)" -#~ msgstr "Altura del bisel (afilado)" - -#~ msgid "Create a logo with a shiny look and beveled edges" -#~ msgstr "Crear un logotipo con una apariencia pulida y bordes biselados" - -#~ msgid "Custom _Gradient..." -#~ msgstr "_Degradado personalizado…" - -#~ msgid "Create an image filled with an example of the current gradient" -#~ msgstr "Crear una imagen rellena con una muestra del degradado actual" - -#~ msgid "_Grid..." -#~ msgstr "_Rejilla…" - -#~ msgid "" -#~ "Draw a grid as specified by the lists of X and Y locations using the " -#~ "current brush" -#~ msgstr "" -#~ "Dibujar una rejilla como se especifica en las listas de posiciones X e Y " -#~ "utilizando el pincel actual" - -#~ msgid "X divisions" -#~ msgstr "Divisiones X" - -#~ msgid "Y divisions" -#~ msgstr "Divisiones Y" - -#~ msgid "New Guides from _Selection" -#~ msgstr "Guías nuevas desde la _selección" - -#, fuzzy -#~ msgid "Create four guides around the bounding box of the current selection" -#~ msgstr "Redondea las esquinas de la selección actual" - -#~ msgid "New Guide (by _Percent)..." -#~ msgstr "Guía nueva (por _porcentaje)…" - -#~ msgid "" -#~ "Add a guide at the position specified as a percentage of the image size" -#~ msgstr "" -#~ "Añadir una línea guía en la posición especificada como porcentaje del " -#~ "tamaño de la imagen" - -#~ msgid "Direction" -#~ msgstr "Dirección " - -#~ msgid "Vertical" -#~ msgstr "Vertical" - -#~ msgid "Position (in %)" -#~ msgstr "Posición (en %)" - -#~ msgid "New _Guide..." -#~ msgstr "_Guía nueva…" - -#~ msgid "Add a guide at the orientation and position specified (in pixels)" -#~ msgstr "" -#~ "Añadir una línea guía en la orientación y posición especificadas en " -#~ "píxeles" - -#~ msgid "Position" -#~ msgstr "Posición" - -#~ msgid "_Remove all Guides" -#~ msgstr "_Quitar todas las guías" - -#~ msgid "Remove all horizontal and vertical guides" -#~ msgstr "Quitar todas las líneas guía horizontales y verticales" - -#~ msgid "Imigre-_26..." -#~ msgstr "Imigre-_26…" - -#~ msgid "Create a logo in a two-color, scribbled text style" -#~ msgstr "Crear un logotipo al estilo de un texto garabateado de dos colores" - -#~ msgid "Frame color" -#~ msgstr "Color del fotograma" - -#~ msgid "Frame size" -#~ msgstr "Tamaño del fotograma" - -#~ msgid "_Land..." -#~ msgstr "_Tierra…" - -#~ msgid "Create an image filled with a topographic map pattern" -#~ msgstr "Crear una imagen rellena de un patrón de mapa topográfico" - -#~ msgid "Land height" -#~ msgstr "Altura del terreno" - -#~ msgid "Sea depth" -#~ msgstr "Profundidad del océano" - -#~ msgid "_Lava..." -#~ msgstr "_Lava…" - -#~ msgid "Fill the current selection with lava" -#~ msgstr "Rellenar la selección actual con lava" - -#~ msgid "Seed" -#~ msgstr "Semilla" - -#~ msgid "Roughness" -#~ msgstr "Rugosidad" - -#~ msgid "Use current gradient" -#~ msgstr "Usar el degradado actual" - -#~ msgid "Line _Nova..." -#~ msgstr "_Nova de líneas…" - -#~ msgid "" -#~ "Fill a layer with rays emanating outward from its center using the " -#~ "foreground color" -#~ msgstr "" -#~ "Rellenar una capa con rayos que salen desde el centro utilizando el color " -#~ "de frente" - -#~ msgid "Number of lines" -#~ msgstr "Número de líneas" - -# //O Gracias de nuevo por los consejos. -#~ msgid "Sharpness (degrees)" -#~ msgstr "Ángulo de la púas" - -#~ msgid "Offset radius" -#~ msgstr "Radio de desplazamiento" - -#~ msgid "Randomness" -#~ msgstr "Aleatoriedad" - -#~ msgid "_Rectangular..." -#~ msgstr "_Rectangular…" - -#~ msgid "Create a rectangular brush" -#~ msgstr "Crear un pincel rectangular" - -#~ msgid "Name" -#~ msgstr "Nombre" - -#~ msgid "Spacing" -#~ msgstr "Espaciado" - -#~ msgid "Re_ctangular, Feathered..." -#~ msgstr "Re_ctangular, difuminada…" - -#~ msgid "Create a rectangular brush with feathered edges" -#~ msgstr "Crear un pincel rectangular con bordes difuminados" - -#~ msgid "Feathering" -#~ msgstr "Difuminar" - -#~ msgid "_Elliptical..." -#~ msgstr "_Elíptica…" - -#~ msgid "Create an elliptical brush" -#~ msgstr "Crear un pincel elíptico" - -#~ msgid "Elli_ptical, Feathered..." -#~ msgstr "Elí_ptica, difuminada…" - -#~ msgid "Create an elliptical brush with feathered edges" -#~ msgstr "Crear un pincel elíptico con bordes difuminados" - -#~ msgid "N_eon..." -#~ msgstr "N_eón…" - -#~ msgid "Convert the selected region (or alpha) into a neon-sign like object" -#~ msgstr "" -#~ "Convertir la región o transparencia seleccionada en un objeto parecido a " -#~ "un letrero de neón" - -#~ msgid "Create shadow" -#~ msgstr "Crear sombra" - -#~ msgid "Create a logo in the style of a neon sign" -#~ msgstr "Crear un logotipo al estilo de un letrero de neón" - -#~ msgid "Newsprint Te_xt..." -#~ msgstr "Te_xto de periódico…" - -#~ msgid "Create a logo in the style of newspaper printing" -#~ msgstr "Crear un logotipo al estilo de la impresión en periódico" - -#~ msgid "Cell size (pixels)" -#~ msgstr "Tamaño de celda (píxeles)" - -#~ msgid "Density (%)" -#~ msgstr "Densidad (%)" - -#~ msgid "_Old Photo..." -#~ msgstr "_Foto antigua…" - -#~ msgid "Make an image look like an old photo" -#~ msgstr "Hacer que una imagen parezca una foto vieja" - -#~ msgid "Defocus" -#~ msgstr "Desenfocar" - -#~ msgid "Sepia" -#~ msgstr "Sepia" - -#~ msgid "Mottle" -#~ msgstr "Moteado" - -#~ msgid "Folder for the output file" -#~ msgstr "Carpeta para el archivo de salida" - -#~ msgid "" -#~ "The name of the file to create (if a file with this name already exist, " -#~ "it will be replaced)" -#~ msgstr "" -#~ "Nombre del archivo que crear (si ya existe un archivo con este nombre, se " -#~ "sustituirá)" - -#~ msgid "The filename you entered is not a suitable name for a file." -#~ msgstr "El nombre que ha introducido no es apto para un nombre de archivo." - -#~ msgid "" -#~ "All characters in the name are either white-spaces or characters which " -#~ "can not appear in filenames." -#~ msgstr "" -#~ "Todos los caracteres del nombre son espacios o caracteres que no pueden " -#~ "aparecer en los nombres de archivo." - -#~ msgid "" -#~ "Export the active palette as a CSS stylesheet with the color entry name " -#~ "as their class name, and the color itself as the color attribute" -#~ msgstr "" -#~ "Exportar la paleta activa como una hoja de estilos CSS con el nombre del " -#~ "color como nombre de la clase, y el color en sí como atributo de color" - -#~ msgid "Export the active palette as a PHP dictionary (name => color)" -#~ msgstr "" -#~ "Exportar la paleta activa como un diccionario de PHP (nombre => color)" - -#~ msgid "Export the active palette as a Python dictionary (name: color)" -#~ msgstr "" -#~ "Exportar la paleta activa como un diccionario de Python (nombre: color)" - -#~ msgid "" -#~ "Write all the colors in a palette to a text file, one hexadecimal value " -#~ "per line (no names)" -#~ msgstr "" -#~ "Escribir todos los colores de una paleta a un archivo de texto, con un " -#~ "valor hexadecimal por cada línea (sin nombres)" - -#~ msgid "Export the active palette as a java.util.Hashtable" -#~ msgstr "" -#~ "Exportar la paleta activa como una tabla java.util.Hashtable" - -#~ msgid "There is no image data in the clipboard to paste." -#~ msgstr "No hay ningún dato de imagen en el portapapeles que se pueda pegar." - -#~ msgid "New _Brush..." -#~ msgstr "_Pincel nuevo…" - -#~ msgid "Paste the clipboard contents into a new brush" -#~ msgstr "Pegar el contenido del portapapeles en un pincel nuevo" - -#~ msgid "Brush name" -#~ msgstr "Nombre del pincel" - -#~ msgid "File name" -#~ msgstr "Nombre de archivo" - -#~ msgid "New _Pattern..." -#~ msgstr "_Patrón nuevo…" - -#~ msgid "Paste the clipboard contents into a new pattern" -#~ msgstr "Pegar el contenido del portapapeles en un patrón nuevo" - -#~ msgid "Pattern name" -#~ msgstr "Nombre del patrón" - -#~ msgid "_Perspective..." -#~ msgstr "_Perspectiva…" - -#~ msgid "Add a perspective shadow to the selected region (or alpha)" -#~ msgstr "" -#~ "Añadir una sombra de perspectiva a la región o transparencia seleccionada" - -#~ msgid "Angle" -#~ msgstr "Ángulo" - -#~ msgid "Relative distance of horizon" -#~ msgstr "Distancia relativa del horizonte" - -#~ msgid "Relative length of shadow" -#~ msgstr "Longitud relativa de la sombra" - -#~ msgid "Interpolation" -#~ msgstr "Interpolación" - -# Cuidado porque esto no es «Voraz» sino que se refiere a una película de Swartzenegger llamada «Predator», «El depredador». FVD -#~ msgid "_Predator..." -#~ msgstr "_Depredador…" - -#~ msgid "Add a 'Predator' effect to the selected region (or alpha)" -#~ msgstr "" -#~ "Añadir un efecto de «Depredador» a la región o transparencia seleccionada" - -#~ msgid "Edge amount" -#~ msgstr "Grosor del borde" - -#~ msgid "Pixelize" -#~ msgstr "Pixelizar" - -#~ msgid "Pixel amount" -#~ msgstr "Tamaño del píxel" - -#~ msgid "_Round Button..." -#~ msgstr "Botón _redondo…" - -#~ msgid "Create images, each containing an oval button graphic" -#~ msgstr "Crear imágenes con un gráfico de botón ovalado cada una" - -#~ msgid "Upper color" -#~ msgstr "Color superior" - -#~ msgid "Lower color" -#~ msgstr "Color inferior" - -#~ msgid "Upper color (active)" -#~ msgstr "Color superior (activo)" - -#~ msgid "Lower color (active)" -#~ msgstr "Color inferior (activo)" - -#~ msgid "Text color (active)" -#~ msgstr "Color del texto (activo)" - -#~ msgid "Padding X" -#~ msgstr "Relleno en X" - -#~ msgid "Padding Y" -#~ msgstr "Relleno en Y" - -#~ msgid "Round ratio" -#~ msgstr "Razón de redondeo" - -#~ msgid "Not pressed" -#~ msgstr "No pulsado" - -#~ msgid "Not pressed (active)" -#~ msgstr "No pulsado (activo)" - -#~ msgid "Render _Map..." -#~ msgstr "_Renderizar mapa…" - -#~ msgid "Create an image filled with an Earth-like map pattern" -#~ msgstr "Crear una imagen rellena con un patrón parecido a un mapa terrestre" - -#~ msgid "Behavior" -#~ msgstr "Comportamiento" - -#~ msgid "Detail in Middle" -#~ msgstr "Detalle en el medio" - -#~ msgid "Reverse Layer Order" -#~ msgstr "Orden inverso de las capas" - -#~ msgid "Reverse the order of layers in the image" -#~ msgstr "Invertir el orden de las capas de la imagen" - -#~ msgid "_Rippling..." -#~ msgstr "_Ondas…" - -#~ msgid "" -#~ "Create a multi-layer image by adding a ripple effect to the current image" -#~ msgstr "" -#~ "Crear una imagen multicapa añadiendo un efecto de rizado a la imagen " -#~ "actual" - -#~ msgid "Rippling strength" -#~ msgstr "Fuerza de ondulación" - -#~ msgid "Number of frames" -#~ msgstr "Número de fotogramas" - -#~ msgid "Edge behavior" -#~ msgstr "Comportamiento del borde" - -#~ msgid "Smear" -#~ msgstr "Manchar" - -#~ msgid "Black" -#~ msgstr "Negro" - -#~ msgid "_Round Corners..." -#~ msgstr "Esquinas _redondeadas…" - -#~ msgid "" -#~ "Round the corners of an image and optionally add a drop-shadow and " -#~ "background" -#~ msgstr "" -#~ "Redondear las esquinas de una imagen y añadir una sombra arrojada y un " -#~ "fondo opcionales" - -#~ msgid "Edge radius" -#~ msgstr "Radio del borde" - -#~ msgid "Add drop-shadow" -#~ msgstr "Añadir sombra base" - -#~ msgid "Add background" -#~ msgstr "Añadir fondo" - -#~ msgid "Se_t Colormap..." -#~ msgstr "Es_tablecer el mapa de colores…" - -#~ msgid "" -#~ "Change the colormap of an image to the colors in a specified palette." -#~ msgstr "" -#~ "Cambiar el mapa de colores de una imagen a los de la paleta especificada." - -#~ msgid "Palette" -#~ msgstr "Paleta" - -#~ msgid "Rounded R_ectangle..." -#~ msgstr "_Rectángulo redondeado…" - -#~ msgid "Round the corners of the current selection" -#~ msgstr "Redondea las esquinas de la selección actual" - -#~ msgid "Radius (%)" -#~ msgstr "Radio (%)" - -#~ msgid "Concave" -#~ msgstr "Cóncavo" - -#~ msgid "To _Brush..." -#~ msgstr "A _pincel…" - -#~ msgid "Convert a selection to a brush" -#~ msgstr "Convertir una selección en un pincel" - -#~ msgid "To _Image" -#~ msgstr "A _imagen" - -#~ msgid "Convert a selection to an image" -#~ msgstr "Convertir una selección en una imagen" - -#~ msgid "To _Pattern..." -#~ msgstr "A _patrón…" - -#~ msgid "Convert a selection to a pattern" -#~ msgstr "Convertir una selección en un patrón" - -#~ msgid "_Slide..." -#~ msgstr "_Diapositiva…" - -#~ msgid "Add a slide-film like frame, sprocket holes, and labels to an image" -#~ msgstr "" -#~ "Añadir un marco como el de una película diapositiva, agujeros de rueda " -#~ "dentada y etiquetas a una imagen" - -#~ msgid "Number" -#~ msgstr "Número" - -#~ msgid "Font color" -#~ msgstr "Color de la tipografía" - -#~ msgid "SOTA Chrome..." -#~ msgstr "Cromado flipante…" - -# SOTA=flipante. FVD -#~ msgid "Create a State Of The Art chromed logo" -#~ msgstr "Crear un logotipo cromado flipante" - -# Velocidad del texto: noooooooo... FVD -#~ msgid "Speed Text..." -#~ msgstr "Texto en movimiento…" - -#~ msgid "Create a logo with a speedy text effect" -#~ msgstr "Crear un logotipo con un efecto de texto en movimiento" - -#~ msgid "_Spinning Globe..." -#~ msgstr "Globo _giratorio…" - -#~ msgid "" -#~ "Create an animation by mapping the current image onto a spinning sphere" -#~ msgstr "" -#~ "Crear una animación proyectando la imagen actual sobre una esfera " -#~ "giratoria" - -#~ msgid "Frames" -#~ msgstr "Fotogramas" - -#~ msgid "Turn from left to right" -#~ msgstr "Girar de izquierda a derecha" - -#~ msgid "Index to n colors (0 = remain RGB)" -#~ msgstr "Indexar a n colores (0 = permanece RGB)" - -#~ msgid "Rendering Spyro" -#~ msgstr "Trazando Spyro" - -#~ msgid "_Spyrogimp..." -#~ msgstr "_Espirógrafo del GIMP…" - -#~ msgid "" -#~ "Add Spirographs, Epitrochoids, and Lissajous Curves to the current layer" -#~ msgstr "" -#~ "Añade espirografías, epitrotopías y curvas de Lissajous a la capa actual" - -#~ msgid "Type" -#~ msgstr "Tipo" - -#~ msgid "Epitrochoid" -#~ msgstr "Epitrocoide" - -#~ msgid "Lissajous" -#~ msgstr "Lissajous" - -#~ msgid "Shape" -#~ msgstr "Forma" - -#~ msgid "Triangle" -#~ msgstr "Triángulo" - -#~ msgid "Square" -#~ msgstr "Cuadrado" - -#~ msgid "Pentagon" -#~ msgstr "Pentágono" - -#~ msgid "Hexagon" -#~ msgstr "Hexágono" - -#~ msgid "Polygon: 7 sides" -#~ msgstr "Polígono: 7 lados" - -#~ msgid "Polygon: 8 sides" -#~ msgstr "Polígono: 8 lados" - -#~ msgid "Polygon: 9 sides" -#~ msgstr "Polígono: 9 lados" - -#~ msgid "Polygon: 10 sides" -#~ msgstr "Polígono: 10 lados" - -#~ msgid "Outer teeth" -#~ msgstr "Dientes exteriores" - -#~ msgid "Inner teeth" -#~ msgstr "Dientes interiores" - -#~ msgid "Margin (pixels)" -#~ msgstr "Margen (píxeles)" - -#~ msgid "Hole ratio" -#~ msgstr "Radio del hoyo" - -#~ msgid "Start angle" -#~ msgstr "Ángulo inicial" - -#~ msgid "Tool" -#~ msgstr "Herramienta" - -#~ msgid "Brush" -#~ msgstr "Pincel" - -#~ msgid "Airbrush" -#~ msgstr "Aerógrafo" - -#~ msgid "Color method" -#~ msgstr "Método de coloración" - -#~ msgid "Gradient: Loop Sawtooth" -#~ msgstr "Degradado: bucle diente de sierra" - -#~ msgid "Gradient: Loop Triangle" -#~ msgstr "Degradado: bucle de triángulo" - -#~ msgid "Sta_rscape..." -#~ msgstr "Paisaje estela_r…" - -#~ msgid "Create a logo using a rock-like texture, a nova glow, and shadow" -#~ msgstr "" -#~ "Crear un logotipo utilizando una textura rocosa, un fulgor de nova y una " -#~ "sombra" - -#~ msgid "Swirl-_Tile..." -#~ msgstr "_Embaldosado de remolinos…" - -#~ msgid "Create an image filled with a swirled tile effect" -#~ msgstr "Crear una imagen rellena con un efecto de baldosas en espiral" - -# //O Algo cutre, pero cuanto mayor es, más "arrastra" la imagen, por eso -# lo de fuerza. -#~ msgid "Whirl amount" -#~ msgstr "Fuerza del remolino" - -#~ msgid "_Swirly..." -#~ msgstr "_Remolino…" - -#~ msgid "Create an image filled with a swirly pattern" -#~ msgstr "Crear una imagen rellena de un patrón en espiral" - -#~ msgid "Quarter size" -#~ msgstr "Tamaño del cuadrante" - -#~ msgid "Whirl angle" -#~ msgstr "Ángulo del remolino" - -#~ msgid "Number of times to whirl" -#~ msgstr "Número de veces a girar" - -#, fuzzy -#~ msgid "_Sphere..." -#~ msgstr "_Cromar…" - -#~ msgid "Text C_ircle..." -#~ msgstr "Texto _circular…" - -#~ msgid "" -#~ "Create a logo by rendering the specified text along the perimeter of a " -#~ "circle" -#~ msgstr "" -#~ "Crear un logotipo colocando el texto especificado alrededor de un " -#~ "circunferencia" - -#~ msgid "Fill angle" -#~ msgstr "Ángulo de relleno" - -#~ msgid "Antialias" -#~ msgstr "Alisado" - -#~ msgid "_Textured..." -#~ msgstr "_Texturizado…" - -#~ msgid "" -#~ "Fill the selected region (or alpha) with a texture and add highlights, " -#~ "shadows, and a mosaic background" -#~ msgstr "" -#~ "Rellenar la región o transparencia seleccionada con una textura y añadir " -#~ "luces, sombras y un fondo de mosaico" - -#~ msgid "Mosaic tile type" -#~ msgstr "Tipo de embaldosado del mosaico" - -#~ msgid "Hexagons" -#~ msgstr "Hexágonos" - -#~ msgid "Octagons" -#~ msgstr "Octógonos" - -#~ msgid "Starting blend" -#~ msgstr "Color inicial de fundido" - -#~ msgid "Ending blend" -#~ msgstr "Fundido de final" - -#~ msgid "" -#~ "Create a textured logo with highlights, shadows, and a mosaic background" -#~ msgstr "" -#~ "Crear un logotipo texturizado con luces, sombras y un fondo de mosaico" - -#~ msgid "Text pattern" -#~ msgstr "Patrón del texto" - -#~ msgid "_Tileable Blur..." -#~ msgstr "Desenfoque en_losable…" - -#~ msgid "Blur the edges of an image so the result tiles seamlessly" -#~ msgstr "" -#~ "Desenfocar los bordes de una imagen para el resultado forme un mosaico " -#~ "con facilidad" - -#~ msgid "Blur vertically" -#~ msgstr "Desenfocar verticalmente" - -#~ msgid "Blur horizontally" -#~ msgstr "Desenfocar horizontalmente" - -#~ msgid "Blur type" -#~ msgstr "Tipo de desenfoque" - -#~ msgid "RLE" -#~ msgstr "RLE" - -#~ msgid "Web Title Header..." -#~ msgstr "Cabecera de título web…" - -#~ msgid "Create a decorative web title header" -#~ msgstr "Crea una cabecera de título web decorativa" - -#~ msgid "_Particle Trace..." -#~ msgstr "_Trazado de partículas…" - -#~ msgid "Add a Trace of Particles effect to the selected region (or alpha)" -#~ msgstr "" -#~ "Añadir un efecto de traza de partículas a la región o transparencia " -#~ "seleccionada" - -# //R Quizás "tasa de choques" -#~ msgid "Hit rate" -#~ msgstr "Tasa de choques" - -#~ msgid "Edge width" -#~ msgstr "Anchura del borde" - -#~ msgid "Edge only" -#~ msgstr "Sólo borde" - -#~ msgid "Base color" -#~ msgstr "Color base" - -#~ msgid "Create a logo using a Trace Of Particles effect" -#~ msgstr "Crear un logotipo utilizando un efecto de traza de partículas" - -#~ msgid "T_ruchet..." -#~ msgstr "T_ruchet…" - -#~ msgid "Create an image filled with a Truchet pattern" -#~ msgstr "Crea una imagen rellena con un patrón Truchet" - -#~ msgid "Foreground color" -#~ msgstr "Color de primer plano" - -#~ msgid "Mask size" -#~ msgstr "Tamaño de máscara" - -#~ msgid "Mask opacity" -#~ msgstr "Opacidad de máscara" - -#~ msgid "_Waves..." -#~ msgstr "_Ondas…" - -#~ msgid "" -#~ "Create a multi-layer image with an effect like a stone was thrown into " -#~ "the current image" -#~ msgstr "" -#~ "Crear una imagen multicapa con un efecto como si una piedra hubiera caído " -#~ "sobre la imagen actual" - -#~ msgid "Amplitude" -#~ msgstr "Amplitud" - -#~ msgid "Wavelength" -#~ msgstr "Longitud de onda" - -#~ msgid "Invert direction" -#~ msgstr "Invertir dirección" - -#~ msgid "_Weave..." -#~ msgstr "_Ondular…" - -#~ msgid "" -#~ "Create a new layer filled with a weave effect to be used as an overlay or " -#~ "bump map" -#~ msgstr "" -#~ "Crea una capa nueva rellena con un efecto onda para usarla como overlay o " -#~ "mapa de relieve" - -#~ msgid "Ribbon width" -#~ msgstr "Ancho del lazo" - -#~ msgid "Ribbon spacing" -#~ msgstr "Espacio entre lazos" - -#~ msgid "Shadow darkness" -#~ msgstr "Oscuridad de la sombra" - -#~ msgid "Shadow depth" -#~ msgstr "Profundidad de la sombra" - -#~ msgid "Thread length" -#~ msgstr "Longitud de las hebras" - -#~ msgid "Thread density" -#~ msgstr "Densidad de hebras" - -#~ msgid "Thread intensity" -#~ msgstr "Intensidad de las hebras" - -#~ msgid "_Xach-Effect..." -#~ msgstr "Efecto _Xach…" - -#~ msgid "Add a subtle translucent 3D effect to the selected region (or alpha)" -#~ msgstr "" -#~ "Añade un sutil efecto traslúcido 3D a la región o transparencia " -#~ "seleccionada" - -#~ msgid "Highlight X offset" -#~ msgstr "Desplazamiento X del brillo" - -#~ msgid "Highlight Y offset" -#~ msgstr "Desplazamiento Y del brillo" - -#~ msgid "Highlight color" -#~ msgstr "Color del brillo" - -#~ msgid "Highlight opacity" -#~ msgstr "Opacidad del brillo" - -#~ msgid "Drop shadow color" -#~ msgstr "Color de la sombra base" - -#~ msgid "Drop shadow opacity" -#~ msgstr "Opacidad de la sombra base" - -#~ msgid "Drop shadow blur radius" -#~ msgstr "Radio de desenfoque de la sombra base" - -#~ msgid "Drop shadow X offset" -#~ msgstr "Desplazamiento X de la sombra base" +#: ../plug-ins/script-fu/scripts/xach-effect.scm:122 +msgid "Add a subtle translucent 3D effect to the selected region (or alpha)" +msgstr "" +"Añade un sutil efecto traslúcido 3D a la región o transparencia seleccionada" -#~ msgid "Drop shadow Y offset" -#~ msgstr "Desplazamiento Y de la sombra base" +#: ../plug-ins/script-fu/scripts/xach-effect.scm:129 +msgid "Highlight X offset" +msgstr "Desplazamiento X del brillo" + +#: ../plug-ins/script-fu/scripts/xach-effect.scm:130 +msgid "Highlight Y offset" +msgstr "Desplazamiento Y del brillo" + +#: ../plug-ins/script-fu/scripts/xach-effect.scm:131 +msgid "Highlight color" +msgstr "Color del brillo" + +#: ../plug-ins/script-fu/scripts/xach-effect.scm:132 +msgid "Highlight opacity" +msgstr "Opacidad del brillo" + +#: ../plug-ins/script-fu/scripts/xach-effect.scm:133 +msgid "Drop shadow color" +msgstr "Color de la sombra base" + +#: ../plug-ins/script-fu/scripts/xach-effect.scm:134 +msgid "Drop shadow opacity" +msgstr "Opacidad de la sombra base" + +#: ../plug-ins/script-fu/scripts/xach-effect.scm:135 +msgid "Drop shadow blur radius" +msgstr "Radio de desenfoque de la sombra base" + +#: ../plug-ins/script-fu/scripts/xach-effect.scm:136 +msgid "Drop shadow X offset" +msgstr "Desplazamiento X de la sombra base" + +#: ../plug-ins/script-fu/scripts/xach-effect.scm:137 +msgid "Drop shadow Y offset" +msgstr "Desplazamiento Y de la sombra base" diff -Nru gimp-2.8.18/po-script-fu/gd.po gimp-2.8.20/po-script-fu/gd.po --- gimp-2.8.18/po-script-fu/gd.po 2015-08-20 22:57:36.000000000 +0000 +++ gimp-2.8.20/po-script-fu/gd.po 2017-01-28 19:08:47.000000000 +0000 @@ -6,8 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: gimp gimp-2-8\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-04 00:47+1200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gimp&k" +"eywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2014-02-07 00:36+0000\n" "PO-Revision-Date: 2014-02-07 01:11+0100\n" "Last-Translator: Michael Bauer \n" "Language-Team: Akerbeltz\n" @@ -20,85 +21,85 @@ "X-Generator: Virtaal 0.7.1-beta1\n" "X-Project-Style: gnome\n" -#: ../plug-ins/script-fu/script-fu.c:111 +#: ../plug-ins/script-fu/script-fu.c:110 msgid "Interactive console for Script-Fu development" msgstr "Consoil eadar-ghnìomhach airson leasachadh Script-Fu" -#: ../plug-ins/script-fu/script-fu.c:117 +#: ../plug-ins/script-fu/script-fu.c:116 msgid "_Console" msgstr "_Consoil" -#: ../plug-ins/script-fu/script-fu.c:141 +#: ../plug-ins/script-fu/script-fu.c:140 msgid "Server for remote Script-Fu operation" msgstr "Frithealaiche airson gnìomh Script-Fu cèin" -#: ../plug-ins/script-fu/script-fu.c:151 +#: ../plug-ins/script-fu/script-fu.c:145 msgid "_Start Server..." msgstr "Tòi_sich am frithealaiche..." -#: ../plug-ins/script-fu/script-fu.c:307 +#: ../plug-ins/script-fu/script-fu.c:301 msgid "_GIMP Online" msgstr "_GIMP air loidhne" -#: ../plug-ins/script-fu/script-fu.c:308 +#: ../plug-ins/script-fu/script-fu.c:302 msgid "_User Manual" msgstr "_Treòir a' chleachdaiche" -#: ../plug-ins/script-fu/script-fu.c:311 +#: ../plug-ins/script-fu/script-fu.c:305 msgid "_Script-Fu" msgstr "_Script-Fu" -#: ../plug-ins/script-fu/script-fu.c:313 +#: ../plug-ins/script-fu/script-fu.c:307 msgid "_Test" msgstr "_Deuchainn" -#: ../plug-ins/script-fu/script-fu.c:316 +#: ../plug-ins/script-fu/script-fu.c:310 msgid "_Buttons" msgstr "_Putanan" -#: ../plug-ins/script-fu/script-fu.c:318 +#: ../plug-ins/script-fu/script-fu.c:312 msgid "_Logos" msgstr "S_uaicheantasan" -#: ../plug-ins/script-fu/script-fu.c:320 +#: ../plug-ins/script-fu/script-fu.c:314 msgid "_Patterns" msgstr "Pàtra_nan" -#: ../plug-ins/script-fu/script-fu.c:323 +#: ../plug-ins/script-fu/script-fu.c:317 msgid "_Web Page Themes" msgstr "Ùrlaran _duilleige-lìn" -#: ../plug-ins/script-fu/script-fu.c:325 +#: ../plug-ins/script-fu/script-fu.c:319 msgid "_Alien Glow" msgstr "Riomb_all fànais" -#: ../plug-ins/script-fu/script-fu.c:327 +#: ../plug-ins/script-fu/script-fu.c:321 msgid "_Beveled Pattern" msgstr "Pàtran _beibhealaichte" -#: ../plug-ins/script-fu/script-fu.c:329 +#: ../plug-ins/script-fu/script-fu.c:323 msgid "_Classic.Gimp.Org" msgstr "_Classic.Gimp.Org" -#: ../plug-ins/script-fu/script-fu.c:332 +#: ../plug-ins/script-fu/script-fu.c:326 msgid "Alpha to _Logo" msgstr "A_lpha 'na shuaicheantas" -#: ../plug-ins/script-fu/script-fu.c:335 +#: ../plug-ins/script-fu/script-fu.c:329 msgid "Re-read all available Script-Fu scripts" msgstr "Ath-leugh gach sgriobt Script-Fu a tha ri làimh" -#: ../plug-ins/script-fu/script-fu.c:340 +#: ../plug-ins/script-fu/script-fu.c:334 msgid "_Refresh Scripts" msgstr "Ath-nuadhaich na sg_riobtaichean" -#: ../plug-ins/script-fu/script-fu.c:363 +#: ../plug-ins/script-fu/script-fu.c:357 msgid "" "You can not use \"Refresh Scripts\" while a Script-Fu dialog box is open. " "Please close all Script-Fu windows and try again." msgstr "" -"Chan urrainn dhut \"Ath-nuadhaich na sgriobtaichean\" a chleachdadh fhad 's " -"a tha bogsa-còmhraidh Script-Fu fosgailte. Dùin gach uinneag Script-Fu 's " +"Chan urrainn dhut \"Ath-nuadhaich na sgriobtaichean\" a chleachdadh fhad 's a " +"tha bogsa-còmhraidh Script-Fu fosgailte. Dùin gach uinneag Script-Fu 's " "feuch ris a-rithist." #: ../plug-ins/script-fu/script-fu-console.c:130 @@ -204,2757 +205,82 @@ msgid "Error while loading %s:" msgstr "Mearachd rè luchdadh %s:" -#: ../plug-ins/script-fu/script-fu-server.c:824 +#: ../plug-ins/script-fu/script-fu-server.c:811 msgid "Script-Fu Server Options" msgstr "Roghainnean frithealaiche Script-Fu" -#: ../plug-ins/script-fu/script-fu-server.c:829 +#: ../plug-ins/script-fu/script-fu-server.c:816 msgid "_Start Server" msgstr "Tòi_sich am frithealaiche" -#: ../plug-ins/script-fu/script-fu-server.c:862 -msgid "Listen on IP:" -msgstr "" - -#: ../plug-ins/script-fu/script-fu-server.c:869 +#: ../plug-ins/script-fu/script-fu-server.c:844 msgid "Server port:" msgstr "Port an fhrithealaiche:" -#: ../plug-ins/script-fu/script-fu-server.c:875 +#: ../plug-ins/script-fu/script-fu-server.c:850 msgid "Server logfile:" msgstr "Faidhle loga an fhrithealaiche:" -#: ../plug-ins/script-fu/script-fu-server.c:887 -msgid "" -"Listening on an IP address other than 127.0.0.1 (especially 0.0.0.0) can " -"allow attackers to remotely execute arbitrary code on this machine." -msgstr "" - -#: ../plug-ins/script-fu/scripts/3d-outline.scm:120 -#: ../plug-ins/script-fu/scripts/3d-outline.scm:166 -msgid "3D _Outline..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/3d-outline.scm:121 -msgid "" -"Outline the selected region (or alpha) with a pattern and add a drop shadow" -msgstr "" - -#: ../plug-ins/script-fu/scripts/3d-outline.scm:128 -#: ../plug-ins/script-fu/scripts/3d-outline.scm:172 -#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:157 -#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm:91 -#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:130 -#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:116 -#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm:85 -#: ../plug-ins/script-fu/scripts/chip-away.scm:155 -#: ../plug-ins/script-fu/scripts/chip-away.scm:202 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:128 -#, fuzzy -msgid "Pattern" -msgstr "Pàtra_nan" - -#: ../plug-ins/script-fu/scripts/3d-outline.scm:129 -#: ../plug-ins/script-fu/scripts/3d-outline.scm:176 -msgid "Outline blur radius" -msgstr "" - -#: ../plug-ins/script-fu/scripts/3d-outline.scm:130 -#: ../plug-ins/script-fu/scripts/3d-outline.scm:177 -msgid "Shadow blur radius" -msgstr "" - -#: ../plug-ins/script-fu/scripts/3d-outline.scm:131 -#: ../plug-ins/script-fu/scripts/3d-outline.scm:178 -msgid "Bumpmap (alpha layer) blur radius" -msgstr "" - -#: ../plug-ins/script-fu/scripts/3d-outline.scm:132 -#: ../plug-ins/script-fu/scripts/3d-outline.scm:179 -#: ../plug-ins/script-fu/scripts/glossy.scm:216 -#: ../plug-ins/script-fu/scripts/glossy.scm:288 -msgid "Default bumpmap settings" -msgstr "" - -#: ../plug-ins/script-fu/scripts/3d-outline.scm:133 -#: ../plug-ins/script-fu/scripts/3d-outline.scm:180 -#: ../plug-ins/script-fu/scripts/glossy.scm:218 -#: ../plug-ins/script-fu/scripts/glossy.scm:290 -#: ../plug-ins/script-fu/scripts/round-corners.scm:139 -msgid "Shadow X offset" -msgstr "" - -#: ../plug-ins/script-fu/scripts/3d-outline.scm:134 -#: ../plug-ins/script-fu/scripts/3d-outline.scm:181 -#: ../plug-ins/script-fu/scripts/glossy.scm:219 -#: ../plug-ins/script-fu/scripts/glossy.scm:291 -#: ../plug-ins/script-fu/scripts/round-corners.scm:140 -msgid "Shadow Y offset" -msgstr "" - -#: ../plug-ins/script-fu/scripts/3d-outline.scm:167 -msgid "Create a logo with outlined text and a drop shadow" -msgstr "" - -#: ../plug-ins/script-fu/scripts/3d-outline.scm:173 -#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:156 -#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:111 -#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:175 -#: ../plug-ins/script-fu/scripts/basic1-logo.scm:98 -#: ../plug-ins/script-fu/scripts/basic2-logo.scm:120 -#: ../plug-ins/script-fu/scripts/beveled-button.scm:148 -#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:126 -#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:113 -#: ../plug-ins/script-fu/scripts/blended-logo.scm:190 -#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:131 -#: ../plug-ins/script-fu/scripts/carved-logo.scm:168 -#: ../plug-ins/script-fu/scripts/chalk.scm:128 -#: ../plug-ins/script-fu/scripts/chip-away.scm:192 -#: ../plug-ins/script-fu/scripts/chrome-logo.scm:126 -#: ../plug-ins/script-fu/scripts/comic-logo.scm:158 -#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:184 -#: ../plug-ins/script-fu/scripts/crystal-logo.scm:216 -#: ../plug-ins/script-fu/scripts/frosty-logo.scm:203 -#: ../plug-ins/script-fu/scripts/glossy.scm:273 -#: ../plug-ins/script-fu/scripts/glowing-logo.scm:115 -#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:139 -#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:98 -#: ../plug-ins/script-fu/scripts/neon-logo.scm:286 -#: ../plug-ins/script-fu/scripts/news-text.scm:83 -#: ../plug-ins/script-fu/scripts/pupi-button.scm:193 -#: ../plug-ins/script-fu/scripts/slide.scm:244 -#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:213 -#: ../plug-ins/script-fu/scripts/speed-text.scm:92 -#: ../plug-ins/script-fu/scripts/starscape-logo.scm:145 -#: ../plug-ins/script-fu/scripts/text-circle.scm:213 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:167 -#: ../plug-ins/script-fu/scripts/title-header.scm:171 -#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:144 -msgid "Text" -msgstr "" - -#: ../plug-ins/script-fu/scripts/3d-outline.scm:174 -#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:158 -#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:112 -#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:176 -#: ../plug-ins/script-fu/scripts/basic1-logo.scm:99 -#: ../plug-ins/script-fu/scripts/basic2-logo.scm:121 -#: ../plug-ins/script-fu/scripts/beveled-button.scm:149 -#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:127 -#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:114 -#: ../plug-ins/script-fu/scripts/blended-logo.scm:191 -#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:132 -#: ../plug-ins/script-fu/scripts/carved-logo.scm:169 -#: ../plug-ins/script-fu/scripts/chalk.scm:129 -#: ../plug-ins/script-fu/scripts/chip-away.scm:194 -#: ../plug-ins/script-fu/scripts/chrome-logo.scm:127 -#: ../plug-ins/script-fu/scripts/comic-logo.scm:159 -#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:185 -#: ../plug-ins/script-fu/scripts/crystal-logo.scm:217 -#: ../plug-ins/script-fu/scripts/frosty-logo.scm:204 -#: ../plug-ins/script-fu/scripts/glossy.scm:274 -#: ../plug-ins/script-fu/scripts/glowing-logo.scm:116 -#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:140 -#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:102 -#: ../plug-ins/script-fu/scripts/neon-logo.scm:287 -#: ../plug-ins/script-fu/scripts/news-text.scm:85 -#: ../plug-ins/script-fu/scripts/pupi-button.scm:194 -#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:214 -#: ../plug-ins/script-fu/scripts/speed-text.scm:94 -#: ../plug-ins/script-fu/scripts/starscape-logo.scm:146 -#: ../plug-ins/script-fu/scripts/text-circle.scm:217 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:168 -#: ../plug-ins/script-fu/scripts/title-header.scm:172 -#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:145 -msgid "Font size (pixels)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/3d-outline.scm:175 -#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:157 -#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:113 -#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:177 -#: ../plug-ins/script-fu/scripts/basic1-logo.scm:100 -#: ../plug-ins/script-fu/scripts/basic2-logo.scm:122 -#: ../plug-ins/script-fu/scripts/beveled-button.scm:150 -#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:128 -#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:115 -#: ../plug-ins/script-fu/scripts/blended-logo.scm:192 -#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:133 -#: ../plug-ins/script-fu/scripts/carved-logo.scm:170 -#: ../plug-ins/script-fu/scripts/chalk.scm:130 -#: ../plug-ins/script-fu/scripts/chip-away.scm:193 -#: ../plug-ins/script-fu/scripts/chrome-logo.scm:128 -#: ../plug-ins/script-fu/scripts/comic-logo.scm:160 -#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:186 -#: ../plug-ins/script-fu/scripts/crystal-logo.scm:218 -#: ../plug-ins/script-fu/scripts/frosty-logo.scm:205 -#: ../plug-ins/script-fu/scripts/glossy.scm:275 -#: ../plug-ins/script-fu/scripts/glowing-logo.scm:117 -#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:141 -#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:101 -#: ../plug-ins/script-fu/scripts/neon-logo.scm:288 -#: ../plug-ins/script-fu/scripts/news-text.scm:84 -#: ../plug-ins/script-fu/scripts/pupi-button.scm:195 -#: ../plug-ins/script-fu/scripts/slide.scm:246 -#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:215 -#: ../plug-ins/script-fu/scripts/speed-text.scm:93 -#: ../plug-ins/script-fu/scripts/starscape-logo.scm:147 -#: ../plug-ins/script-fu/scripts/text-circle.scm:219 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:169 -#: ../plug-ins/script-fu/scripts/title-header.scm:173 -#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:146 -msgid "Font" -msgstr "" - -#: ../plug-ins/script-fu/scripts/3dTruchet.scm:225 -msgid "3_D Truchet..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/3dTruchet.scm:226 -msgid "Create an image filled with a 3D Truchet pattern" -msgstr "" - -#: ../plug-ins/script-fu/scripts/3dTruchet.scm:231 -#: ../plug-ins/script-fu/scripts/truchet.scm:171 -msgid "Block size" -msgstr "" - -#: ../plug-ins/script-fu/scripts/3dTruchet.scm:232 -#: ../plug-ins/script-fu/scripts/add-bevel.scm:193 -#: ../plug-ins/script-fu/scripts/truchet.scm:172 -msgid "Thickness" -msgstr "" - -#: ../plug-ins/script-fu/scripts/3dTruchet.scm:233 -#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:184 -#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:95 -#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:107 -#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:161 -#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:135 -#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:179 -#: ../plug-ins/script-fu/scripts/basic1-logo.scm:67 -#: ../plug-ins/script-fu/scripts/basic1-logo.scm:101 -#: ../plug-ins/script-fu/scripts/basic2-logo.scm:89 -#: ../plug-ins/script-fu/scripts/basic2-logo.scm:123 -#: ../plug-ins/script-fu/scripts/blended-logo.scm:135 -#: ../plug-ins/script-fu/scripts/blended-logo.scm:194 -#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:136 -#: ../plug-ins/script-fu/scripts/chalk.scm:89 -#: ../plug-ins/script-fu/scripts/chalk.scm:131 -#: ../plug-ins/script-fu/scripts/chrome-logo.scm:129 -#: ../plug-ins/script-fu/scripts/comic-logo.scm:124 -#: ../plug-ins/script-fu/scripts/comic-logo.scm:165 -#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:149 -#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:187 -#: ../plug-ins/script-fu/scripts/frosty-logo.scm:144 -#: ../plug-ins/script-fu/scripts/frosty-logo.scm:206 -#: ../plug-ins/script-fu/scripts/glossy.scm:209 -#: ../plug-ins/script-fu/scripts/glossy.scm:281 -#: ../plug-ins/script-fu/scripts/glowing-logo.scm:85 -#: ../plug-ins/script-fu/scripts/glowing-logo.scm:118 -#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:105 -#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:144 -#: ../plug-ins/script-fu/scripts/neon-logo.scm:253 -#: ../plug-ins/script-fu/scripts/neon-logo.scm:289 -#: ../plug-ins/script-fu/scripts/news-text.scm:90 -#: ../plug-ins/script-fu/scripts/speed-text.scm:97 -#: ../plug-ins/script-fu/scripts/swirltile.scm:65 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:132 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:174 -#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:111 -#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:151 -#: ../plug-ins/script-fu/scripts/truchet.scm:173 -msgid "Background color" -msgstr "" - -#: ../plug-ins/script-fu/scripts/3dTruchet.scm:234 -#: ../plug-ins/script-fu/scripts/blended-logo.scm:140 -#: ../plug-ins/script-fu/scripts/blended-logo.scm:199 -msgid "Start blend" -msgstr "" - -#: ../plug-ins/script-fu/scripts/3dTruchet.scm:235 -#: ../plug-ins/script-fu/scripts/blended-logo.scm:141 -#: ../plug-ins/script-fu/scripts/blended-logo.scm:200 -msgid "End blend" -msgstr "" - -#: ../plug-ins/script-fu/scripts/3dTruchet.scm:236 -msgid "Supersample" -msgstr "" - -#: ../plug-ins/script-fu/scripts/3dTruchet.scm:237 -#: ../plug-ins/script-fu/scripts/truchet.scm:175 -msgid "Number of X tiles" -msgstr "" - -#: ../plug-ins/script-fu/scripts/3dTruchet.scm:238 -#: ../plug-ins/script-fu/scripts/truchet.scm:176 -msgid "Number of Y tiles" -msgstr "" - -#: ../plug-ins/script-fu/scripts/add-bevel.scm:76 -#: ../plug-ins/script-fu/scripts/beveled-button.scm:77 -#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:79 -#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm:26 -#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:57 -#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:44 -#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm:30 -msgid "Bumpmap" -msgstr "" - -#: ../plug-ins/script-fu/scripts/add-bevel.scm:185 -msgid "Add B_evel..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/add-bevel.scm:186 -msgid "Add a beveled border to an image" -msgstr "" - -#: ../plug-ins/script-fu/scripts/add-bevel.scm:194 -#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:160 -#: ../plug-ins/script-fu/scripts/old-photo.scm:104 -#: ../plug-ins/script-fu/scripts/round-corners.scm:143 -#: ../plug-ins/script-fu/scripts/slide.scm:248 -#: ../plug-ins/script-fu/scripts/spinning-globe.scm:106 -msgid "Work on copy" -msgstr "" - -#: ../plug-ins/script-fu/scripts/add-bevel.scm:195 -#: ../plug-ins/script-fu/scripts/chip-away.scm:152 -#: ../plug-ins/script-fu/scripts/chip-away.scm:199 -msgid "Keep bump layer" -msgstr "" - -#: ../plug-ins/script-fu/scripts/addborder.scm:108 -msgid "Border Layer" -msgstr "" - -#: ../plug-ins/script-fu/scripts/addborder.scm:160 -msgid "Add _Border..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/addborder.scm:161 -msgid "Add a border around an image" -msgstr "" - -#: ../plug-ins/script-fu/scripts/addborder.scm:168 -msgid "Border X size" -msgstr "" - -#: ../plug-ins/script-fu/scripts/addborder.scm:169 -msgid "Border Y size" -msgstr "" - -#: ../plug-ins/script-fu/scripts/addborder.scm:170 -#, fuzzy -msgid "Border color" -msgstr "Dath soladach" - -#: ../plug-ins/script-fu/scripts/addborder.scm:171 -msgid "Delta value on color" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:118 -#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:78 -msgid "Arrow" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:121 -#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:35 -#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:46 -#, fuzzy -msgid "Alien Glow" -msgstr "Riomb_all fànais" - -#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:124 -#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:38 -#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:48 -#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:78 -#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:56 -#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:41 -#: ../plug-ins/script-fu/scripts/chrome-it.scm:103 -msgid "Background" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:175 -#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:149 -msgid "_Arrow..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:176 -msgid "Create an arrow graphic with an eerie glow for web pages" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:181 -#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:155 -#: ../plug-ins/script-fu/scripts/lava.scm:126 -msgid "Size" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182 -#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156 -msgid "Orientation" -msgstr "" - #: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182 #: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156 msgid "Right" msgstr "Deas" -#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182 -#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156 -msgid "Left" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182 -#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156 -msgid "Up" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182 -#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156 -msgid "Down" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:183 -#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:94 -#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:106 -#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:160 -#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:74 -#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:114 -#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:134 -#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:178 -#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:227 -#: ../plug-ins/script-fu/scripts/neon-logo.scm:254 -#: ../plug-ins/script-fu/scripts/neon-logo.scm:290 -#: ../plug-ins/script-fu/scripts/starscape-logo.scm:148 -msgid "Glow color" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:185 -#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:96 -#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:108 -#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:164 -#: ../plug-ins/script-fu/scripts/camo.scm:106 -#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:161 -msgid "Flatten image" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:32 -msgid "Bar" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:86 -#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm:77 -#, fuzzy -msgid "_Hrule..." -msgstr "_Brabhsaich..." - -#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:87 -msgid "Create an Hrule graphic with an eerie glow for web pages" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:92 -msgid "Bar length" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:93 -msgid "Bar height" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:44 -#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm:25 -msgid "Bullet" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:99 -#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm:84 -msgid "_Bullet..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:100 -msgid "Create a bullet graphic with an eerie glow for web pages" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:105 -#: ../plug-ins/script-fu/scripts/text-circle.scm:214 -#: ../plug-ins/script-fu/scripts/tileblur.scm:76 -msgid "Radius" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:81 -msgid "Glow" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:84 -#, fuzzy -msgid "Button" -msgstr "_Putanan" - -#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:150 -#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:120 -#, fuzzy -msgid "B_utton..." -msgstr "_Putanan" - -#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:151 -msgid "Create a button graphic with an eerie glow for web pages" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:159 -#: ../plug-ins/script-fu/scripts/basic1-logo.scm:68 -#: ../plug-ins/script-fu/scripts/basic1-logo.scm:102 -#: ../plug-ins/script-fu/scripts/basic2-logo.scm:90 -#: ../plug-ins/script-fu/scripts/basic2-logo.scm:124 -#: ../plug-ins/script-fu/scripts/beveled-button.scm:153 -#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:129 -#: ../plug-ins/script-fu/scripts/blended-logo.scm:193 -#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:99 -#: ../plug-ins/script-fu/scripts/news-text.scm:89 -#: ../plug-ins/script-fu/scripts/pupi-button.scm:198 -#: ../plug-ins/script-fu/scripts/speed-text.scm:96 -msgid "Text color" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:162 -#: ../plug-ins/script-fu/scripts/beveled-button.scm:154 -msgid "Padding" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-button.scm:163 -msgid "Glow radius" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:65 -#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:105 -#, fuzzy -msgid "Alien _Glow..." -msgstr "Riomb_all fànais" - -#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:66 -msgid "Add an eerie glow around the selected region (or alpha)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:73 -msgid "Glow size (pixels * 4)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:106 -msgid "Create a logo with an alien glow around the text" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:126 -#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:169 -msgid "Alien _Neon..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:127 -msgid "Add psychedelic outlines to the selected region (or alpha)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:136 -#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:180 -msgid "Width of bands" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:137 -#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:181 -msgid "Width of gaps" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:138 -#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:182 -msgid "Number of bands" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:139 -#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:183 -msgid "Fade away" -msgstr "" - -#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:170 -msgid "Create a logo with psychedelic outlines around the text" -msgstr "" - -#: ../plug-ins/script-fu/scripts/basic1-logo.scm:59 -#: ../plug-ins/script-fu/scripts/basic1-logo.scm:92 -msgid "_Basic I..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/basic1-logo.scm:60 -msgid "" -"Add a gradient effect, a drop shadow, and a background to the selected " -"region (or alpha)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/basic1-logo.scm:93 -msgid "" -"Create a plain text logo with a gradient effect, a drop shadow, and a " -"background" -msgstr "" - -#: ../plug-ins/script-fu/scripts/basic2-logo.scm:81 -#: ../plug-ins/script-fu/scripts/basic2-logo.scm:114 -msgid "B_asic II..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/basic2-logo.scm:82 -msgid "Add a shadow and a highlight to the selected region (or alpha)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/basic2-logo.scm:115 -msgid "Create a simple logo with a shadow and a highlight" -msgstr "" - -#: ../plug-ins/script-fu/scripts/beveled-button.scm:80 -#: ../plug-ins/script-fu/scripts/blended-logo.scm:142 -#: ../plug-ins/script-fu/scripts/blended-logo.scm:201 -#: ../plug-ins/script-fu/scripts/comic-logo.scm:120 -#: ../plug-ins/script-fu/scripts/comic-logo.scm:161 -#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:150 -#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:188 -#: ../plug-ins/script-fu/scripts/land.scm:87 -#: ../plug-ins/script-fu/scripts/lava.scm:128 -#: ../plug-ins/script-fu/scripts/rendermap.scm:88 -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:351 -msgid "Gradient" -msgstr "" - -#: ../plug-ins/script-fu/scripts/beveled-button.scm:142 -msgid "Simple _Beveled Button..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/beveled-button.scm:143 -msgid "Create a simple, beveled button graphic for webpages" -msgstr "" - -#: ../plug-ins/script-fu/scripts/beveled-button.scm:151 -msgid "Upper-left color" -msgstr "" - -#: ../plug-ins/script-fu/scripts/beveled-button.scm:152 -msgid "Lower-right color" -msgstr "" - -#: ../plug-ins/script-fu/scripts/beveled-button.scm:155 -#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:104 -#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:143 -#: ../plug-ins/script-fu/scripts/pupi-button.scm:204 -msgid "Bevel width" -msgstr "" - -#: ../plug-ins/script-fu/scripts/beveled-button.scm:156 -#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:131 -#: ../plug-ins/script-fu/scripts/pupi-button.scm:208 -msgid "Pressed" -msgstr "" - -#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:150 -msgid "Create a beveled pattern arrow for webpages" -msgstr "" - -#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm:85 -msgid "Create a beveled pattern bullet for webpages" -msgstr "" - -#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm:90 -msgid "Diameter" -msgstr "" +#: ../plug-ins/script-fu/scripts/blended-logo.scm:136 +#: ../plug-ins/script-fu/scripts/blended-logo.scm:195 +msgid "FG-BG-RGB" +msgstr "FG-BG-RGB" -#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm:92 -#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:117 -#: ../plug-ins/script-fu/scripts/spinning-globe.scm:104 -msgid "Transparent background" -msgstr "" +#: ../plug-ins/script-fu/scripts/erase-rows.scm:47 +msgid "Rows" +msgstr "Ràghan" -#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm:121 -msgid "Create a beveled pattern button for webpages" -msgstr "" +#: ../plug-ins/script-fu/scripts/erase-rows.scm:48 +msgid "Even" +msgstr "Cothrom" -#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:107 -msgid "H_eading..." -msgstr "" +#: ../plug-ins/script-fu/scripts/erase-rows.scm:49 +msgid "Erase" +msgstr "Suath às" -#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm:108 -msgid "Create a beveled pattern heading for webpages" -msgstr "" +#: ../plug-ins/script-fu/scripts/font-map.scm:164 +msgid "Black on white" +msgstr "Dubh air geal" -#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm:27 -msgid "Rule" -msgstr "" +#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:35 +#: ../plug-ins/script-fu/scripts/guides-new.scm:35 +msgid "Horizontal" +msgstr "Còmhnard" -#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm:78 -msgid "Create a beveled pattern hrule for webpages" -msgstr "" +#: ../plug-ins/script-fu/scripts/rendermap.scm:90 +msgid "Tile" +msgstr "Leacaich" -#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm:83 -#: ../plug-ins/script-fu/scripts/gradient-example.scm:69 -#: ../plug-ins/script-fu/scripts/mkbrush.scm:70 -#: ../plug-ins/script-fu/scripts/mkbrush.scm:138 -#: ../plug-ins/script-fu/scripts/mkbrush.scm:194 -#: ../plug-ins/script-fu/scripts/mkbrush.scm:263 -#: ../plug-ins/script-fu/scripts/swirltile.scm:62 -msgid "Width" -msgstr "" +#: ../plug-ins/script-fu/scripts/ripply-anim.scm:129 +msgid "Wrap" +msgstr "Paisg" -#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm:84 -#: ../plug-ins/script-fu/scripts/gradient-example.scm:70 -#: ../plug-ins/script-fu/scripts/mkbrush.scm:71 -#: ../plug-ins/script-fu/scripts/mkbrush.scm:139 -#: ../plug-ins/script-fu/scripts/mkbrush.scm:195 -#: ../plug-ins/script-fu/scripts/mkbrush.scm:264 -#: ../plug-ins/script-fu/scripts/swirltile.scm:61 -#, fuzzy -msgid "Height" -msgstr "Deas" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:323 +msgid "Spyrograph" +msgstr "Spyrograph" -#: ../plug-ins/script-fu/scripts/blend-anim.scm:206 -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:327 -msgid "Frame" -msgstr "" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:326 +msgid "Circle" +msgstr "Cearcall" -#: ../plug-ins/script-fu/scripts/blend-anim.scm:222 -msgid "Blend Animation needs at least three source layers" -msgstr "" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:342 +msgid "Pencil" +msgstr "Peansail" -#: ../plug-ins/script-fu/scripts/blend-anim.scm:228 -msgid "_Blend..." -msgstr "" +#: ../plug-ins/script-fu/scripts/spyrogimp.scm:347 +msgid "Solid Color" +msgstr "Dath soladach" -#: ../plug-ins/script-fu/scripts/blend-anim.scm:229 -msgid "" -"Create intermediate layers to blend two or more layers over a background as " -"an animation" -msgstr "" - -#: ../plug-ins/script-fu/scripts/blend-anim.scm:236 -msgid "Intermediate frames" -msgstr "" - -#: ../plug-ins/script-fu/scripts/blend-anim.scm:237 -msgid "Max. blur radius" -msgstr "" - -#: ../plug-ins/script-fu/scripts/blend-anim.scm:238 -msgid "Looped" -msgstr "" - -#: ../plug-ins/script-fu/scripts/blended-logo.scm:126 -#: ../plug-ins/script-fu/scripts/blended-logo.scm:184 -msgid "Blen_ded..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/blended-logo.scm:127 -msgid "" -"Add blended backgrounds, highlights, and shadows to the selected region (or " -"alpha)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/blended-logo.scm:134 -msgid "Offset (pixels)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/blended-logo.scm:136 -#: ../plug-ins/script-fu/scripts/blended-logo.scm:195 -msgid "Blend mode" -msgstr "" - -#: ../plug-ins/script-fu/scripts/blended-logo.scm:136 -#: ../plug-ins/script-fu/scripts/blended-logo.scm:195 -msgid "FG-BG-RGB" -msgstr "FG-BG-RGB" - -#: ../plug-ins/script-fu/scripts/blended-logo.scm:137 -#: ../plug-ins/script-fu/scripts/blended-logo.scm:196 -#, fuzzy -msgid "FG-BG-HSV" -msgstr "FG-BG-RGB" - -#: ../plug-ins/script-fu/scripts/blended-logo.scm:138 -#: ../plug-ins/script-fu/scripts/blended-logo.scm:197 -msgid "FG-Transparent" -msgstr "" - -#: ../plug-ins/script-fu/scripts/blended-logo.scm:139 -#: ../plug-ins/script-fu/scripts/blended-logo.scm:198 -msgid "Custom Gradient" -msgstr "" - -#: ../plug-ins/script-fu/scripts/blended-logo.scm:143 -#: ../plug-ins/script-fu/scripts/blended-logo.scm:202 -#: ../plug-ins/script-fu/scripts/comic-logo.scm:121 -#: ../plug-ins/script-fu/scripts/comic-logo.scm:162 -#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:151 -#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:189 -#: ../plug-ins/script-fu/scripts/gradient-example.scm:71 -#: ../plug-ins/script-fu/scripts/rendermap.scm:89 -#: ../plug-ins/script-fu/scripts/title-header.scm:174 -msgid "Gradient reverse" -msgstr "" - -#: ../plug-ins/script-fu/scripts/blended-logo.scm:185 -msgid "Create a logo with blended backgrounds, highlights, and shadows" -msgstr "" - -#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:91 -#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:125 -msgid "Bo_vination..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:92 -msgid "Add 'cow spots' to the selected region (or alpha)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:99 -#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:134 -msgid "Spots density X" -msgstr "" - -#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:100 -#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:135 -msgid "Spots density Y" -msgstr "" - -#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:101 -#: ../plug-ins/script-fu/scripts/chrome-logo.scm:96 -msgid "Background Color" -msgstr "" - -#: ../plug-ins/script-fu/scripts/bovinated-logo.scm:126 -msgid "Create a logo with text in the style of 'cow spots'" -msgstr "" - -#. --- false form of "if-1" -#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:212 -msgid "" -"The Burn-In script needs two layers in total. A foreground layer with " -"transparency and a background layer." -msgstr "" - -#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:219 -msgid "B_urn-In..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:220 -msgid "" -"Create intermediate layers to produce an animated 'burn-in' transition " -"between two layers" -msgstr "" - -#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:228 -msgid "Fadeout" -msgstr "" - -#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:229 -msgid "Fadeout width" -msgstr "" - -#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:230 -msgid "Corona width" -msgstr "" - -#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:231 -msgid "After glow" -msgstr "" - -#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:232 -msgid "Add glowing" -msgstr "" - -#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:233 -msgid "Prepare for GIF" -msgstr "" - -#: ../plug-ins/script-fu/scripts/burn-in-anim.scm:234 -msgid "Speed (pixels/frame)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/camo.scm:94 -msgid "_Camouflage..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/camo.scm:95 -msgid "Create an image filled with a camouflage pattern" -msgstr "" - -#: ../plug-ins/script-fu/scripts/camo.scm:100 -#: ../plug-ins/script-fu/scripts/rendermap.scm:86 -msgid "Image size" -msgstr "" - -#: ../plug-ins/script-fu/scripts/camo.scm:101 -#: ../plug-ins/script-fu/scripts/rendermap.scm:87 -msgid "Granularity" -msgstr "" - -#: ../plug-ins/script-fu/scripts/camo.scm:102 -msgid "Color 1" -msgstr "" - -#: ../plug-ins/script-fu/scripts/camo.scm:103 -msgid "Color 2" -msgstr "" - -#: ../plug-ins/script-fu/scripts/camo.scm:104 -msgid "Color 3" -msgstr "" - -#: ../plug-ins/script-fu/scripts/camo.scm:105 -#: ../plug-ins/script-fu/scripts/distress-selection.scm:113 -msgid "Smooth" -msgstr "" - -#: ../plug-ins/script-fu/scripts/carved-logo.scm:148 -#: ../plug-ins/script-fu/scripts/carve-it.scm:168 -msgid "Carved Surface" -msgstr "" - -#: ../plug-ins/script-fu/scripts/carved-logo.scm:149 -#: ../plug-ins/script-fu/scripts/carve-it.scm:169 -msgid "Bevel Shadow" -msgstr "" - -#: ../plug-ins/script-fu/scripts/carved-logo.scm:150 -#: ../plug-ins/script-fu/scripts/carve-it.scm:170 -msgid "Bevel Highlight" -msgstr "" - -#: ../plug-ins/script-fu/scripts/carved-logo.scm:151 -#: ../plug-ins/script-fu/scripts/carve-it.scm:171 -msgid "Cast Shadow" -msgstr "" - -#: ../plug-ins/script-fu/scripts/carved-logo.scm:152 -#: ../plug-ins/script-fu/scripts/carve-it.scm:172 -msgid "Inset" -msgstr "" - -#: ../plug-ins/script-fu/scripts/carved-logo.scm:162 -msgid "Carved..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/carved-logo.scm:163 -msgid "" -"Create a logo with text raised above or carved in to the specified " -"background image" -msgstr "" - -#: ../plug-ins/script-fu/scripts/carved-logo.scm:171 -msgid "Background Image" -msgstr "" - -#: ../plug-ins/script-fu/scripts/carved-logo.scm:174 -msgid "Carve raised text" -msgstr "" - -#: ../plug-ins/script-fu/scripts/carved-logo.scm:175 -msgid "Padding around text" -msgstr "" - -#: ../plug-ins/script-fu/scripts/carve-it.scm:182 -msgid "Stencil C_arve..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/carve-it.scm:190 -msgid "Image to carve" -msgstr "" - -#: ../plug-ins/script-fu/scripts/carve-it.scm:191 -msgid "Carve white areas" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chalk.scm:81 -#: ../plug-ins/script-fu/scripts/chalk.scm:122 -msgid "_Chalk..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/chalk.scm:82 -msgid "Create a chalk drawing effect for the selected region (or alpha)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chalk.scm:123 -msgid "Create a logo resembling chalk scribbled on a blackboard" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chalk.scm:132 -msgid "Chalk color" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chip-away.scm:140 -#: ../plug-ins/script-fu/scripts/chip-away.scm:186 -msgid "Chip Awa_y..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/chip-away.scm:141 -msgid "Add a chipped woodcarving effect to the selected region (or alpha)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chip-away.scm:148 -#: ../plug-ins/script-fu/scripts/chip-away.scm:195 -msgid "Chip amount" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chip-away.scm:149 -#: ../plug-ins/script-fu/scripts/chip-away.scm:196 -msgid "Blur amount" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chip-away.scm:150 -#: ../plug-ins/script-fu/scripts/chip-away.scm:197 -msgid "Invert" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chip-away.scm:151 -#: ../plug-ins/script-fu/scripts/chip-away.scm:198 -msgid "Drop shadow" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chip-away.scm:153 -#: ../plug-ins/script-fu/scripts/chip-away.scm:200 -msgid "Fill BG with pattern" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chip-away.scm:154 -#: ../plug-ins/script-fu/scripts/chip-away.scm:201 -msgid "Keep background" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chip-away.scm:187 -msgid "Create a logo resembling a chipped wood carving" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chrome-it.scm:104 -msgid "Layer 1" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chrome-it.scm:105 -msgid "Layer 2" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chrome-it.scm:106 -msgid "Layer 3" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chrome-it.scm:107 -msgid "Drop Shadow" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chrome-it.scm:201 -msgid "Chrome" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chrome-it.scm:202 -#: ../plug-ins/script-fu/scripts/xach-effect.scm:68 -msgid "Highlight" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chrome-it.scm:214 -msgid "Stencil C_hrome..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/chrome-it.scm:215 -msgid "" -"Add a chrome effect to the selected region (or alpha) using a specified " -"(grayscale) stencil" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chrome-it.scm:222 -#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:210 -msgid "Chrome saturation" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chrome-it.scm:223 -#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:211 -msgid "Chrome lightness" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chrome-it.scm:224 -#: ../plug-ins/script-fu/scripts/crystal-logo.scm:215 -#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:212 -msgid "Chrome factor" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chrome-it.scm:225 -#: ../plug-ins/script-fu/scripts/crystal-logo.scm:222 -#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:216 -msgid "Environment map" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chrome-it.scm:228 -#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:219 -msgid "Highlight balance" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chrome-it.scm:229 -#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:220 -msgid "Chrome balance" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chrome-it.scm:230 -msgid "Chrome white areas" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chrome-logo.scm:87 -#: ../plug-ins/script-fu/scripts/chrome-logo.scm:120 -#, fuzzy -msgid "C_hrome..." -msgstr "_Brabhsaich..." - -#: ../plug-ins/script-fu/scripts/chrome-logo.scm:88 -msgid "Add a simple chrome effect to the selected region (or alpha)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chrome-logo.scm:95 -msgid "Offsets (pixels * 2)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/chrome-logo.scm:121 -msgid "Create a simplistic, but cool, chromed logo" -msgstr "" - -#: ../plug-ins/script-fu/scripts/circuit.scm:81 -msgid "Effect layer" -msgstr "" - -#: ../plug-ins/script-fu/scripts/circuit.scm:134 -msgid "_Circuit..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/circuit.scm:135 -msgid "" -"Fill the selected region (or alpha) with traces like those on a circuit board" -msgstr "" - -#: ../plug-ins/script-fu/scripts/circuit.scm:142 -msgid "Oilify mask size" -msgstr "" - -#: ../plug-ins/script-fu/scripts/circuit.scm:143 -msgid "Circuit seed" -msgstr "" - -#: ../plug-ins/script-fu/scripts/circuit.scm:144 -msgid "No background (only for separate layer)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/circuit.scm:145 -#: ../plug-ins/script-fu/scripts/lava.scm:129 -#: ../plug-ins/script-fu/scripts/predator.scm:132 -#: ../plug-ins/script-fu/scripts/xach-effect.scm:138 -msgid "Keep selection" -msgstr "" - -#: ../plug-ins/script-fu/scripts/circuit.scm:146 -#: ../plug-ins/script-fu/scripts/lava.scm:130 -#: ../plug-ins/script-fu/scripts/predator.scm:133 -msgid "Separate layer" -msgstr "" - -#: ../plug-ins/script-fu/scripts/clothify.scm:51 -msgid "_Clothify..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/clothify.scm:52 -msgid "Add a cloth-like texture to the selected region (or alpha)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/clothify.scm:59 -msgid "Blur X" -msgstr "" - -#: ../plug-ins/script-fu/scripts/clothify.scm:60 -msgid "Blur Y" -msgstr "" - -#: ../plug-ins/script-fu/scripts/clothify.scm:61 -#: ../plug-ins/script-fu/scripts/swirltile.scm:58 -msgid "Azimuth" -msgstr "" - -#: ../plug-ins/script-fu/scripts/clothify.scm:62 -#: ../plug-ins/script-fu/scripts/swirltile.scm:59 -msgid "Elevation" -msgstr "" - -#: ../plug-ins/script-fu/scripts/clothify.scm:63 -#: ../plug-ins/script-fu/scripts/swirltile.scm:57 -msgid "Depth" -msgstr "" - -#: ../plug-ins/script-fu/scripts/coffee.scm:36 -msgid "Stain" -msgstr "" - -#: ../plug-ins/script-fu/scripts/coffee.scm:81 -msgid "_Coffee Stain..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/coffee.scm:82 -msgid "Add realistic looking coffee stains to the image" -msgstr "" - -#: ../plug-ins/script-fu/scripts/coffee.scm:89 -msgid "Stains" -msgstr "" - -#: ../plug-ins/script-fu/scripts/coffee.scm:90 -msgid "Darken only" -msgstr "" - -#: ../plug-ins/script-fu/scripts/comic-logo.scm:112 -#: ../plug-ins/script-fu/scripts/comic-logo.scm:152 -msgid "Comic Boo_k..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/comic-logo.scm:113 -msgid "" -"Add a comic-book effect to the selected region (or alpha) by outlining and " -"filling with a gradient" -msgstr "" - -#: ../plug-ins/script-fu/scripts/comic-logo.scm:122 -#: ../plug-ins/script-fu/scripts/comic-logo.scm:163 -#: ../plug-ins/script-fu/scripts/glossy.scm:208 -#: ../plug-ins/script-fu/scripts/glossy.scm:280 -msgid "Outline size" -msgstr "" - -#: ../plug-ins/script-fu/scripts/comic-logo.scm:123 -#: ../plug-ins/script-fu/scripts/comic-logo.scm:164 -msgid "Outline color" -msgstr "" - -#: ../plug-ins/script-fu/scripts/comic-logo.scm:153 -msgid "Create a comic-book style logo by outlining and filling with a gradient" -msgstr "" - -#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:140 -#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:178 -msgid "Cool _Metal..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:141 -msgid "" -"Add a metallic effect to the selected region (or alpha) with reflections and " -"perspective shadows" -msgstr "" - -#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:148 -#: ../plug-ins/script-fu/scripts/frosty-logo.scm:143 -#: ../plug-ins/script-fu/scripts/glowing-logo.scm:84 -#: ../plug-ins/script-fu/scripts/neon-logo.scm:252 -msgid "Effect size (pixels)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:179 -msgid "Create a metallic logo with reflections and perspective shadows" -msgstr "" - -#: ../plug-ins/script-fu/scripts/crystal-logo.scm:209 -msgid "Crystal..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/crystal-logo.scm:210 -msgid "Create a logo with a crystal/gel effect displacing the image underneath" -msgstr "" - -#: ../plug-ins/script-fu/scripts/crystal-logo.scm:219 -msgid "Background image" -msgstr "" - -#: ../plug-ins/script-fu/scripts/difference-clouds.scm:67 -msgid "Difference Clouds..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/difference-clouds.scm:68 -msgid "Solid noise applied with Difference layer mode" -msgstr "" - -#: ../plug-ins/script-fu/scripts/distress-selection.scm:102 -msgid "_Distort..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/distress-selection.scm:103 -msgid "Distress the selection" -msgstr "" - -#: ../plug-ins/script-fu/scripts/distress-selection.scm:110 -msgid "Threshold (bigger 1<-->254 smaller)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/distress-selection.scm:111 -msgid "Spread" -msgstr "" - -#: ../plug-ins/script-fu/scripts/distress-selection.scm:112 -msgid "Granularity (1 is low)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/distress-selection.scm:114 -#, fuzzy -msgid "Smooth horizontally" -msgstr "Còmhnard" - -#: ../plug-ins/script-fu/scripts/distress-selection.scm:115 -msgid "Smooth vertically" -msgstr "" - -#: ../plug-ins/script-fu/scripts/drop-shadow.scm:170 -msgid "_Drop Shadow..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/drop-shadow.scm:171 -msgid "Add a drop shadow to the selected region (or alpha)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/drop-shadow.scm:178 -msgid "Offset X" -msgstr "" - -#: ../plug-ins/script-fu/scripts/drop-shadow.scm:179 -msgid "Offset Y" -msgstr "" - -#: ../plug-ins/script-fu/scripts/drop-shadow.scm:180 -#: ../plug-ins/script-fu/scripts/news-text.scm:88 -#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:209 -#: ../plug-ins/script-fu/scripts/round-corners.scm:141 -#: ../plug-ins/script-fu/scripts/swirltile.scm:60 -msgid "Blur radius" -msgstr "" - -#: ../plug-ins/script-fu/scripts/drop-shadow.scm:181 -#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:154 -#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:210 -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:350 -#, fuzzy -msgid "Color" -msgstr "Dath soladach" - -#: ../plug-ins/script-fu/scripts/drop-shadow.scm:182 -#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:211 -msgid "Opacity" -msgstr "" - -#: ../plug-ins/script-fu/scripts/drop-shadow.scm:183 -#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:213 -msgid "Allow resizing" -msgstr "" - -#: ../plug-ins/script-fu/scripts/erase-rows.scm:39 -msgid "_Erase Every Other Row..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/erase-rows.scm:40 -msgid "Erase every other row or column" -msgstr "" - -#: ../plug-ins/script-fu/scripts/erase-rows.scm:47 -#, fuzzy -msgid "Rows/cols" -msgstr "Ràghan" - -#: ../plug-ins/script-fu/scripts/erase-rows.scm:47 -msgid "Rows" -msgstr "Ràghan" - -#: ../plug-ins/script-fu/scripts/erase-rows.scm:47 -msgid "Columns" -msgstr "" - -#: ../plug-ins/script-fu/scripts/erase-rows.scm:48 -#, fuzzy -msgid "Even/odd" -msgstr "Cothrom" - -#: ../plug-ins/script-fu/scripts/erase-rows.scm:48 -msgid "Even" -msgstr "Cothrom" - -#: ../plug-ins/script-fu/scripts/erase-rows.scm:48 -msgid "Odd" -msgstr "" - -#: ../plug-ins/script-fu/scripts/erase-rows.scm:49 -#, fuzzy -msgid "Erase/fill" -msgstr "Suath às" - -#: ../plug-ins/script-fu/scripts/erase-rows.scm:49 -msgid "Erase" -msgstr "Suath às" - -#: ../plug-ins/script-fu/scripts/erase-rows.scm:49 -msgid "Fill with BG" -msgstr "" - -#: ../plug-ins/script-fu/scripts/flatland.scm:60 -msgid "_Flatland..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/flatland.scm:61 -msgid "Create an image filled with a Land Pattern" -msgstr "" - -#: ../plug-ins/script-fu/scripts/flatland.scm:66 -#: ../plug-ins/script-fu/scripts/land.scm:79 -msgid "Image width" -msgstr "" - -#: ../plug-ins/script-fu/scripts/flatland.scm:67 -#: ../plug-ins/script-fu/scripts/land.scm:80 -msgid "Image height" -msgstr "" - -#: ../plug-ins/script-fu/scripts/flatland.scm:68 -#: ../plug-ins/script-fu/scripts/land.scm:81 -msgid "Random seed" -msgstr "" - -#: ../plug-ins/script-fu/scripts/flatland.scm:69 -#: ../plug-ins/script-fu/scripts/land.scm:82 -msgid "Detail level" -msgstr "" - -#: ../plug-ins/script-fu/scripts/flatland.scm:70 -#: ../plug-ins/script-fu/scripts/land.scm:85 -msgid "Scale X" -msgstr "" - -#: ../plug-ins/script-fu/scripts/flatland.scm:71 -#: ../plug-ins/script-fu/scripts/land.scm:86 -msgid "Scale Y" -msgstr "" - -#: ../plug-ins/script-fu/scripts/font-map.scm:152 -msgid "Render _Font Map..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/font-map.scm:153 -msgid "" -"Create an image filled with previews of fonts matching a fontname filter" -msgstr "" - -#: ../plug-ins/script-fu/scripts/font-map.scm:158 -msgid "_Text" -msgstr "" - -#: ../plug-ins/script-fu/scripts/font-map.scm:159 -msgid "Use font _name as text" -msgstr "" - -#: ../plug-ins/script-fu/scripts/font-map.scm:160 -msgid "_Labels" -msgstr "" - -#: ../plug-ins/script-fu/scripts/font-map.scm:161 -msgid "_Filter (regexp)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/font-map.scm:162 -msgid "Font _size (pixels)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/font-map.scm:163 -msgid "_Border (pixels)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/font-map.scm:164 -msgid "_Color scheme" -msgstr "" - -#: ../plug-ins/script-fu/scripts/font-map.scm:164 -msgid "Black on white" -msgstr "Dubh air geal" - -#: ../plug-ins/script-fu/scripts/font-map.scm:164 -msgid "Active colors" -msgstr "" - -#: ../plug-ins/script-fu/scripts/frosty-logo.scm:135 -#: ../plug-ins/script-fu/scripts/frosty-logo.scm:197 -msgid "_Frosty..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/frosty-logo.scm:136 -msgid "" -"Add a frost effect to the selected region (or alpha) with an added drop " -"shadow" -msgstr "" - -#: ../plug-ins/script-fu/scripts/frosty-logo.scm:198 -msgid "Create frozen logo with an added drop shadow" -msgstr "" - -#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:146 -msgid "_Fuzzy Border..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:147 -msgid "Add a jagged, fuzzy border to an image" -msgstr "" - -#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:155 -#: ../plug-ins/script-fu/scripts/old-photo.scm:98 -msgid "Border size" -msgstr "" - -#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:156 -msgid "Blur border" -msgstr "" - -#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:157 -msgid "Granularity (1 is Low)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:158 -msgid "Add shadow" -msgstr "" - -#: ../plug-ins/script-fu/scripts/fuzzyborder.scm:159 -msgid "Shadow weight (%)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/gimp-online.scm:59 -msgid "Using _Paths" -msgstr "" - -#: ../plug-ins/script-fu/scripts/gimp-online.scm:60 -#: ../plug-ins/script-fu/scripts/gimp-online.scm:73 -#: ../plug-ins/script-fu/scripts/gimp-online.scm:86 -#: ../plug-ins/script-fu/scripts/gimp-online.scm:99 -#: ../plug-ins/script-fu/scripts/gimp-online.scm:112 -#: ../plug-ins/script-fu/scripts/gimp-online.scm:125 -#: ../plug-ins/script-fu/scripts/gimp-online.scm:138 -#: ../plug-ins/script-fu/scripts/gimp-online.scm:151 -msgid "Bookmark to the user manual" -msgstr "" - -#: ../plug-ins/script-fu/scripts/gimp-online.scm:72 -msgid "_Preparing your Images for the Web" -msgstr "" - -#: ../plug-ins/script-fu/scripts/gimp-online.scm:85 -msgid "_Working with Digital Camera Photos" -msgstr "" - -#: ../plug-ins/script-fu/scripts/gimp-online.scm:98 -msgid "Create, Open and Save _Files" -msgstr "" - -#: ../plug-ins/script-fu/scripts/gimp-online.scm:111 -msgid "_Basic Concepts" -msgstr "" - -#: ../plug-ins/script-fu/scripts/gimp-online.scm:124 -msgid "How to Use _Dialogs" -msgstr "" - -#: ../plug-ins/script-fu/scripts/gimp-online.scm:137 -msgid "Drawing _Simple Objects" -msgstr "" - -#: ../plug-ins/script-fu/scripts/gimp-online.scm:150 -msgid "Create and Use _Selections" -msgstr "" - -#: ../plug-ins/script-fu/scripts/gimp-online.scm:178 -msgid "_Main Web Site" -msgstr "" - -#: ../plug-ins/script-fu/scripts/gimp-online.scm:179 -#: ../plug-ins/script-fu/scripts/gimp-online.scm:192 -#: ../plug-ins/script-fu/scripts/gimp-online.scm:205 -#: ../plug-ins/script-fu/scripts/gimp-online.scm:218 -msgid "Bookmark to the GIMP web site" -msgstr "" - -#: ../plug-ins/script-fu/scripts/gimp-online.scm:191 -msgid "_Developer Web Site" -msgstr "" - -#: ../plug-ins/script-fu/scripts/gimp-online.scm:204 -#, fuzzy -msgid "_User Manual Web Site" -msgstr "_Treòir a' chleachdaiche" - -#: ../plug-ins/script-fu/scripts/gimp-online.scm:217 -msgid "Plug-in _Registry" -msgstr "" - -#: ../plug-ins/script-fu/scripts/glossy.scm:196 -#: ../plug-ins/script-fu/scripts/glossy.scm:267 -msgid "Glo_ssy..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/glossy.scm:197 -msgid "" -"Add gradients, patterns, shadows, and bump maps to the selected region (or " -"alpha)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/glossy.scm:204 -#: ../plug-ins/script-fu/scripts/glossy.scm:276 -msgid "Blend gradient (text)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/glossy.scm:205 -#: ../plug-ins/script-fu/scripts/glossy.scm:277 -msgid "Text gradient reverse" -msgstr "" - -#: ../plug-ins/script-fu/scripts/glossy.scm:206 -#: ../plug-ins/script-fu/scripts/glossy.scm:278 -msgid "Blend gradient (outline)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/glossy.scm:207 -#: ../plug-ins/script-fu/scripts/glossy.scm:279 -msgid "Outline gradient reverse" -msgstr "" - -#: ../plug-ins/script-fu/scripts/glossy.scm:210 -#: ../plug-ins/script-fu/scripts/glossy.scm:282 -msgid "Use pattern for text instead of gradient" -msgstr "" - -#: ../plug-ins/script-fu/scripts/glossy.scm:211 -#: ../plug-ins/script-fu/scripts/glossy.scm:283 -#, fuzzy -msgid "Pattern (text)" -msgstr "Pàtra_nan" - -#: ../plug-ins/script-fu/scripts/glossy.scm:212 -#: ../plug-ins/script-fu/scripts/glossy.scm:284 -msgid "Use pattern for outline instead of gradient" -msgstr "" - -#: ../plug-ins/script-fu/scripts/glossy.scm:213 -#: ../plug-ins/script-fu/scripts/glossy.scm:285 -msgid "Pattern (outline)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/glossy.scm:214 -#: ../plug-ins/script-fu/scripts/glossy.scm:286 -msgid "Use pattern overlay" -msgstr "" - -#: ../plug-ins/script-fu/scripts/glossy.scm:215 -#: ../plug-ins/script-fu/scripts/glossy.scm:287 -msgid "Pattern (overlay)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/glossy.scm:217 -#: ../plug-ins/script-fu/scripts/glossy.scm:289 -#: ../plug-ins/script-fu/scripts/xach-effect.scm:92 -msgid "Shadow" -msgstr "" - -#: ../plug-ins/script-fu/scripts/glossy.scm:268 -msgid "Create a logo with gradients, patterns, shadows, and bump maps" -msgstr "" - -#: ../plug-ins/script-fu/scripts/glowing-logo.scm:76 -#: ../plug-ins/script-fu/scripts/glowing-logo.scm:109 -msgid "Glo_wing Hot..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/glowing-logo.scm:77 -msgid "Add a glowing hot metal effect to the selected region (or alpha)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/glowing-logo.scm:110 -msgid "Create a logo that looks like glowing hot metal" -msgstr "" - -#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:94 -#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:133 -msgid "Gradient Beve_l..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:95 -msgid "Add a shiny look and bevel effect to the selected region (or alpha)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:102 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:127 -#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:106 -msgid "Border size (pixels)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:103 -#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:142 -msgid "Bevel height (sharpness)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:134 -msgid "Create a logo with a shiny look and beveled edges" -msgstr "" - -#: ../plug-ins/script-fu/scripts/gradient-example.scm:63 -msgid "Custom _Gradient..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/gradient-example.scm:64 -msgid "Create an image filled with an example of the current gradient" -msgstr "" - -#: ../plug-ins/script-fu/scripts/grid-system.scm:84 -msgid "_Grid..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/grid-system.scm:85 -msgid "" -"Draw a grid as specified by the lists of X and Y locations using the current " -"brush" -msgstr "" - -#: ../plug-ins/script-fu/scripts/grid-system.scm:92 -msgid "X divisions" -msgstr "" - -#: ../plug-ins/script-fu/scripts/grid-system.scm:93 -msgid "Y divisions" -msgstr "" - -#: ../plug-ins/script-fu/scripts/guides-from-selection.scm:32 -msgid "New Guides from _Selection" -msgstr "" - -#: ../plug-ins/script-fu/scripts/guides-from-selection.scm:33 -msgid "Create four guides around the bounding box of the current selection" -msgstr "" - -#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:27 -msgid "New Guide (by _Percent)..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:28 -msgid "Add a guide at the position specified as a percentage of the image size" -msgstr "" - -#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:35 -#: ../plug-ins/script-fu/scripts/guides-new.scm:35 -msgid "Direction" -msgstr "" - -#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:35 -#: ../plug-ins/script-fu/scripts/guides-new.scm:35 -msgid "Horizontal" -msgstr "Còmhnard" - -#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:36 -#: ../plug-ins/script-fu/scripts/guides-new.scm:35 -msgid "Vertical" -msgstr "" - -#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:37 -msgid "Position (in %)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/guides-new.scm:27 -msgid "New _Guide..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/guides-new.scm:28 -msgid "Add a guide at the orientation and position specified (in pixels)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/guides-new.scm:36 -msgid "Position" -msgstr "" - -#: ../plug-ins/script-fu/scripts/guides-remove-all.scm:19 -msgid "_Remove all Guides" -msgstr "" - -#: ../plug-ins/script-fu/scripts/guides-remove-all.scm:20 -msgid "Remove all horizontal and vertical guides" -msgstr "" - -#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:92 -msgid "Imigre-_26..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:93 -msgid "Create a logo in a two-color, scribbled text style" -msgstr "" - -#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:100 -msgid "Frame color" -msgstr "" - -#: ../plug-ins/script-fu/scripts/i26-gunya2.scm:103 -msgid "Frame size" -msgstr "" - -#: ../plug-ins/script-fu/scripts/land.scm:73 -msgid "_Land..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/land.scm:74 -msgid "Create an image filled with a topographic map pattern" -msgstr "" - -#: ../plug-ins/script-fu/scripts/land.scm:83 -msgid "Land height" -msgstr "" - -#: ../plug-ins/script-fu/scripts/land.scm:84 -msgid "Sea depth" -msgstr "" - -#: ../plug-ins/script-fu/scripts/lava.scm:117 -msgid "_Lava..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/lava.scm:118 -msgid "Fill the current selection with lava" -msgstr "" - -#: ../plug-ins/script-fu/scripts/lava.scm:125 -msgid "Seed" -msgstr "" - -#: ../plug-ins/script-fu/scripts/lava.scm:127 -#: ../plug-ins/script-fu/scripts/swirltile.scm:64 -msgid "Roughness" -msgstr "" - -#: ../plug-ins/script-fu/scripts/lava.scm:131 -msgid "Use current gradient" -msgstr "" - -#: ../plug-ins/script-fu/scripts/line-nova.scm:106 -msgid "Line _Nova..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/line-nova.scm:107 -msgid "" -"Fill a layer with rays emanating outward from its center using the " -"foreground color" -msgstr "" - -#: ../plug-ins/script-fu/scripts/line-nova.scm:114 -msgid "Number of lines" -msgstr "" - -#: ../plug-ins/script-fu/scripts/line-nova.scm:115 -msgid "Sharpness (degrees)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/line-nova.scm:116 -msgid "Offset radius" -msgstr "" - -#: ../plug-ins/script-fu/scripts/line-nova.scm:117 -msgid "Randomness" -msgstr "" - -#: ../plug-ins/script-fu/scripts/mkbrush.scm:63 -msgid "_Rectangular..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/mkbrush.scm:64 -msgid "Create a rectangular brush" -msgstr "" - -#: ../plug-ins/script-fu/scripts/mkbrush.scm:69 -#: ../plug-ins/script-fu/scripts/mkbrush.scm:137 -#: ../plug-ins/script-fu/scripts/mkbrush.scm:193 -#: ../plug-ins/script-fu/scripts/mkbrush.scm:262 -msgid "Name" -msgstr "" - -#: ../plug-ins/script-fu/scripts/mkbrush.scm:72 -#: ../plug-ins/script-fu/scripts/mkbrush.scm:141 -#: ../plug-ins/script-fu/scripts/mkbrush.scm:196 -#: ../plug-ins/script-fu/scripts/mkbrush.scm:266 -#: ../plug-ins/script-fu/scripts/paste-as-brush.scm:70 -#: ../plug-ins/script-fu/scripts/select-to-brush.scm:143 -msgid "Spacing" -msgstr "" - -#: ../plug-ins/script-fu/scripts/mkbrush.scm:131 -msgid "Re_ctangular, Feathered..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/mkbrush.scm:132 -msgid "Create a rectangular brush with feathered edges" -msgstr "" - -#: ../plug-ins/script-fu/scripts/mkbrush.scm:140 -#: ../plug-ins/script-fu/scripts/mkbrush.scm:265 -msgid "Feathering" -msgstr "" - -#: ../plug-ins/script-fu/scripts/mkbrush.scm:187 -msgid "_Elliptical..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/mkbrush.scm:188 -msgid "Create an elliptical brush" -msgstr "" - -#: ../plug-ins/script-fu/scripts/mkbrush.scm:256 -msgid "Elli_ptical, Feathered..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/mkbrush.scm:257 -msgid "Create an elliptical brush with feathered edges" -msgstr "" - -#: ../plug-ins/script-fu/scripts/neon-logo.scm:244 -#: ../plug-ins/script-fu/scripts/neon-logo.scm:280 -msgid "N_eon..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/neon-logo.scm:245 -msgid "Convert the selected region (or alpha) into a neon-sign like object" -msgstr "" - -#: ../plug-ins/script-fu/scripts/neon-logo.scm:255 -#: ../plug-ins/script-fu/scripts/neon-logo.scm:291 -msgid "Create shadow" -msgstr "" - -#: ../plug-ins/script-fu/scripts/neon-logo.scm:281 -msgid "Create a logo in the style of a neon sign" -msgstr "" - -#: ../plug-ins/script-fu/scripts/news-text.scm:77 -msgid "Newsprint Te_xt..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/news-text.scm:78 -msgid "Create a logo in the style of newspaper printing" -msgstr "" - -#: ../plug-ins/script-fu/scripts/news-text.scm:86 -msgid "Cell size (pixels)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/news-text.scm:87 -#: ../plug-ins/script-fu/scripts/speed-text.scm:95 -msgid "Density (%)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/old-photo.scm:89 -msgid "_Old Photo..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/old-photo.scm:90 -msgid "Make an image look like an old photo" -msgstr "" - -#: ../plug-ins/script-fu/scripts/old-photo.scm:97 -msgid "Defocus" -msgstr "" - -#. since this plug-in uses the fuzzy-border plug-in, I used the -#. values of the latter, with the exception of the initial value -#. and the 'minimum' value. -#: ../plug-ins/script-fu/scripts/old-photo.scm:102 -msgid "Sepia" -msgstr "" - -#: ../plug-ins/script-fu/scripts/old-photo.scm:103 -msgid "Mottle" -msgstr "" - -#: ../plug-ins/script-fu/scripts/palette-export.scm:235 -msgid "Folder for the output file" -msgstr "" - -#: ../plug-ins/script-fu/scripts/palette-export.scm:236 -msgid "" -"The name of the file to create (if a file with this name already exist, it " -"will be replaced)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/palette-export.scm:244 -msgid "The filename you entered is not a suitable name for a file." -msgstr "" - -#: ../plug-ins/script-fu/scripts/palette-export.scm:246 -msgid "" -"All characters in the name are either white-spaces or characters which can " -"not appear in filenames." -msgstr "" - -#: ../plug-ins/script-fu/scripts/palette-export.scm:274 -msgid "" -"Export the active palette as a CSS stylesheet with the color entry name as " -"their class name, and the color itself as the color attribute" -msgstr "" - -#: ../plug-ins/script-fu/scripts/palette-export.scm:300 -msgid "Export the active palette as a PHP dictionary (name => color)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/palette-export.scm:332 -msgid "Export the active palette as a Python dictionary (name: color)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/palette-export.scm:361 -msgid "" -"Write all the colors in a palette to a text file, one hexadecimal value per " -"line (no names)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/palette-export.scm:408 -msgid "Export the active palette as a java.util.Hashtable" -msgstr "" - -#: ../plug-ins/script-fu/scripts/paste-as-brush.scm:56 -#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm:44 -msgid "There is no image data in the clipboard to paste." -msgstr "" - -#: ../plug-ins/script-fu/scripts/paste-as-brush.scm:62 -msgid "New _Brush..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/paste-as-brush.scm:63 -msgid "Paste the clipboard contents into a new brush" -msgstr "" - -#: ../plug-ins/script-fu/scripts/paste-as-brush.scm:68 -#: ../plug-ins/script-fu/scripts/select-to-brush.scm:141 -msgid "Brush name" -msgstr "" - -#: ../plug-ins/script-fu/scripts/paste-as-brush.scm:69 -#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm:57 -#: ../plug-ins/script-fu/scripts/select-to-brush.scm:142 -#: ../plug-ins/script-fu/scripts/select-to-pattern.scm:102 -msgid "File name" -msgstr "" - -#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm:50 -#, fuzzy -msgid "New _Pattern..." -msgstr "Pàtra_nan" - -#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm:51 -msgid "Paste the clipboard contents into a new pattern" -msgstr "" - -#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm:56 -#: ../plug-ins/script-fu/scripts/select-to-pattern.scm:101 -#, fuzzy -msgid "Pattern name" -msgstr "Pàtra_nan" - -#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:198 -msgid "_Perspective..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:199 -msgid "Add a perspective shadow to the selected region (or alpha)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:206 -msgid "Angle" -msgstr "" - -#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:207 -msgid "Relative distance of horizon" -msgstr "" - -#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:208 -msgid "Relative length of shadow" -msgstr "" - -#: ../plug-ins/script-fu/scripts/perspective-shadow.scm:212 -msgid "Interpolation" -msgstr "" - -#: ../plug-ins/script-fu/scripts/predator.scm:121 -msgid "_Predator..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/predator.scm:122 -msgid "Add a 'Predator' effect to the selected region (or alpha)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/predator.scm:129 -msgid "Edge amount" -msgstr "" - -#: ../plug-ins/script-fu/scripts/predator.scm:130 -msgid "Pixelize" -msgstr "" - -#: ../plug-ins/script-fu/scripts/predator.scm:131 -msgid "Pixel amount" -msgstr "" - -#: ../plug-ins/script-fu/scripts/pupi-button.scm:187 -msgid "_Round Button..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/pupi-button.scm:188 -msgid "Create images, each containing an oval button graphic" -msgstr "" - -#: ../plug-ins/script-fu/scripts/pupi-button.scm:196 -msgid "Upper color" -msgstr "" - -#: ../plug-ins/script-fu/scripts/pupi-button.scm:197 -msgid "Lower color" -msgstr "" - -#: ../plug-ins/script-fu/scripts/pupi-button.scm:199 -msgid "Upper color (active)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/pupi-button.scm:200 -msgid "Lower color (active)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/pupi-button.scm:201 -msgid "Text color (active)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/pupi-button.scm:202 -msgid "Padding X" -msgstr "" - -#: ../plug-ins/script-fu/scripts/pupi-button.scm:203 -msgid "Padding Y" -msgstr "" - -#: ../plug-ins/script-fu/scripts/pupi-button.scm:205 -msgid "Round ratio" -msgstr "" - -#: ../plug-ins/script-fu/scripts/pupi-button.scm:206 -msgid "Not pressed" -msgstr "" - -#: ../plug-ins/script-fu/scripts/pupi-button.scm:207 -msgid "Not pressed (active)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/rendermap.scm:80 -msgid "Render _Map..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/rendermap.scm:81 -msgid "Create an image filled with an Earth-like map pattern" -msgstr "" - -#: ../plug-ins/script-fu/scripts/rendermap.scm:90 -msgid "Behavior" -msgstr "" - -#: ../plug-ins/script-fu/scripts/rendermap.scm:90 -msgid "Tile" -msgstr "Leacaich" - -#: ../plug-ins/script-fu/scripts/rendermap.scm:90 -msgid "Detail in Middle" -msgstr "" - -#: ../plug-ins/script-fu/scripts/reverse-layers.scm:42 -msgid "Reverse Layer Order" -msgstr "" - -#: ../plug-ins/script-fu/scripts/reverse-layers.scm:43 -msgid "Reverse the order of layers in the image" -msgstr "" - -#: ../plug-ins/script-fu/scripts/ripply-anim.scm:119 -msgid "_Rippling..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/ripply-anim.scm:120 -msgid "" -"Create a multi-layer image by adding a ripple effect to the current image" -msgstr "" - -#: ../plug-ins/script-fu/scripts/ripply-anim.scm:127 -msgid "Rippling strength" -msgstr "" - -#: ../plug-ins/script-fu/scripts/ripply-anim.scm:128 -#: ../plug-ins/script-fu/scripts/waves-anim.scm:105 -msgid "Number of frames" -msgstr "" - -#: ../plug-ins/script-fu/scripts/ripply-anim.scm:129 -msgid "Edge behavior" -msgstr "" - -#: ../plug-ins/script-fu/scripts/ripply-anim.scm:129 -msgid "Wrap" -msgstr "Paisg" - -#: ../plug-ins/script-fu/scripts/ripply-anim.scm:129 -msgid "Smear" -msgstr "" - -#: ../plug-ins/script-fu/scripts/ripply-anim.scm:129 -msgid "Black" -msgstr "" - -#: ../plug-ins/script-fu/scripts/round-corners.scm:129 -msgid "_Round Corners..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/round-corners.scm:130 -msgid "" -"Round the corners of an image and optionally add a drop-shadow and background" -msgstr "" - -#: ../plug-ins/script-fu/scripts/round-corners.scm:137 -msgid "Edge radius" -msgstr "" - -#: ../plug-ins/script-fu/scripts/round-corners.scm:138 -msgid "Add drop-shadow" -msgstr "" - -#: ../plug-ins/script-fu/scripts/round-corners.scm:142 -msgid "Add background" -msgstr "" - -#: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm:53 -msgid "Se_t Colormap..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm:54 -msgid "Change the colormap of an image to the colors in a specified palette." -msgstr "" - -#: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm:61 -msgid "Palette" -msgstr "" - -#: ../plug-ins/script-fu/scripts/selection-round.scm:139 -msgid "Rounded R_ectangle..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/selection-round.scm:140 -msgid "Round the corners of the current selection" -msgstr "" - -#: ../plug-ins/script-fu/scripts/selection-round.scm:147 -msgid "Radius (%)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/selection-round.scm:148 -msgid "Concave" -msgstr "" - -#: ../plug-ins/script-fu/scripts/select-to-brush.scm:133 -msgid "To _Brush..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/select-to-brush.scm:134 -msgid "Convert a selection to a brush" -msgstr "" - -#: ../plug-ins/script-fu/scripts/select-to-image.scm:81 -msgid "To _Image" -msgstr "" - -#: ../plug-ins/script-fu/scripts/select-to-image.scm:82 -msgid "Convert a selection to an image" -msgstr "" - -#: ../plug-ins/script-fu/scripts/select-to-pattern.scm:93 -#, fuzzy -msgid "To _Pattern..." -msgstr "Pàtra_nan" - -#: ../plug-ins/script-fu/scripts/select-to-pattern.scm:94 -msgid "Convert a selection to a pattern" -msgstr "" - -#: ../plug-ins/script-fu/scripts/slide.scm:236 -msgid "_Slide..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/slide.scm:237 -msgid "Add a slide-film like frame, sprocket holes, and labels to an image" -msgstr "" - -#: ../plug-ins/script-fu/scripts/slide.scm:245 -msgid "Number" -msgstr "" - -#: ../plug-ins/script-fu/scripts/slide.scm:247 -msgid "Font color" -msgstr "" - -#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:204 -msgid "SOTA Chrome..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:205 -msgid "Create a State Of The Art chromed logo" -msgstr "" - -#: ../plug-ins/script-fu/scripts/speed-text.scm:86 -msgid "Speed Text..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/speed-text.scm:87 -msgid "Create a logo with a speedy text effect" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spinning-globe.scm:94 -msgid "_Spinning Globe..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/spinning-globe.scm:95 -msgid "Create an animation by mapping the current image onto a spinning sphere" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spinning-globe.scm:102 -msgid "Frames" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spinning-globe.scm:103 -msgid "Turn from left to right" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spinning-globe.scm:105 -msgid "Index to n colors (0 = remain RGB)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:240 -msgid "Rendering Spyro" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:314 -#, fuzzy -msgid "_Spyrogimp..." -msgstr "Spyrograph" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:315 -msgid "" -"Add Spirographs, Epitrochoids, and Lissajous Curves to the current layer" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:323 -msgid "Type" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:323 -msgid "Spyrograph" -msgstr "Spyrograph" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:324 -msgid "Epitrochoid" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:325 -msgid "Lissajous" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:326 -msgid "Shape" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:326 -msgid "Circle" -msgstr "Cearcall" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:328 -msgid "Triangle" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:329 -#, fuzzy -msgid "Square" -msgstr "Ceàrnagan" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:330 -msgid "Pentagon" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:331 -msgid "Hexagon" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:332 -msgid "Polygon: 7 sides" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:333 -msgid "Polygon: 8 sides" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:334 -msgid "Polygon: 9 sides" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:335 -msgid "Polygon: 10 sides" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:336 -msgid "Outer teeth" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:337 -msgid "Inner teeth" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:338 -msgid "Margin (pixels)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:339 -msgid "Hole ratio" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:340 -#: ../plug-ins/script-fu/scripts/text-circle.scm:215 -msgid "Start angle" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:342 -msgid "Tool" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:342 -msgid "Pencil" -msgstr "Peansail" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:343 -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:345 -msgid "Brush" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:344 -msgid "Airbrush" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:347 -msgid "Color method" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:347 -msgid "Solid Color" -msgstr "Dath soladach" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:348 -msgid "Gradient: Loop Sawtooth" -msgstr "" - -#: ../plug-ins/script-fu/scripts/spyrogimp.scm:349 -msgid "Gradient: Loop Triangle" -msgstr "" - -#: ../plug-ins/script-fu/scripts/starscape-logo.scm:139 -#, fuzzy -msgid "Sta_rscape..." -msgstr "_Brabhsaich..." - -#: ../plug-ins/script-fu/scripts/starscape-logo.scm:140 -msgid "Create a logo using a rock-like texture, a nova glow, and shadow" -msgstr "" - -#: ../plug-ins/script-fu/scripts/swirltile.scm:51 -msgid "Swirl-_Tile..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/swirltile.scm:52 -msgid "Create an image filled with a swirled tile effect" -msgstr "" - -#: ../plug-ins/script-fu/scripts/swirltile.scm:63 -msgid "Whirl amount" -msgstr "" - -#: ../plug-ins/script-fu/scripts/swirly-pattern.scm:82 -msgid "_Swirly..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/swirly-pattern.scm:83 -msgid "Create an image filled with a swirly pattern" -msgstr "" - -#: ../plug-ins/script-fu/scripts/swirly-pattern.scm:88 -msgid "Quarter size" -msgstr "" - -#: ../plug-ins/script-fu/scripts/swirly-pattern.scm:89 -msgid "Whirl angle" -msgstr "" - -#: ../plug-ins/script-fu/scripts/swirly-pattern.scm:90 -msgid "Number of times to whirl" -msgstr "" - -#: ../plug-ins/script-fu/scripts/test-sphere.scm:267 -#, fuzzy -msgid "_Sphere..." -msgstr "_Brabhsaich..." - -#: ../plug-ins/script-fu/scripts/text-circle.scm:207 -msgid "Text C_ircle..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/text-circle.scm:208 -msgid "" -"Create a logo by rendering the specified text along the perimeter of a circle" -msgstr "" - -#: ../plug-ins/script-fu/scripts/text-circle.scm:216 -msgid "Fill angle" -msgstr "" - -#: ../plug-ins/script-fu/scripts/text-circle.scm:218 -msgid "Antialias" -msgstr "" - -#: ../plug-ins/script-fu/scripts/textured-logo.scm:119 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:161 -msgid "_Textured..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/textured-logo.scm:120 -msgid "" -"Fill the selected region (or alpha) with a texture and add highlights, " -"shadows, and a mosaic background" -msgstr "" - -#: ../plug-ins/script-fu/scripts/textured-logo.scm:129 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:171 -msgid "Mosaic tile type" -msgstr "" - -#: ../plug-ins/script-fu/scripts/textured-logo.scm:129 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:171 -msgid "Squares" -msgstr "Ceàrnagan" - -#: ../plug-ins/script-fu/scripts/textured-logo.scm:130 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:172 -msgid "Hexagons" -msgstr "" - -#: ../plug-ins/script-fu/scripts/textured-logo.scm:131 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:173 -msgid "Octagons" -msgstr "" - -#: ../plug-ins/script-fu/scripts/textured-logo.scm:133 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:175 -msgid "Starting blend" -msgstr "" - -#: ../plug-ins/script-fu/scripts/textured-logo.scm:134 -#: ../plug-ins/script-fu/scripts/textured-logo.scm:176 -msgid "Ending blend" -msgstr "" - -#: ../plug-ins/script-fu/scripts/textured-logo.scm:162 -msgid "" -"Create a textured logo with highlights, shadows, and a mosaic background" -msgstr "" - -#: ../plug-ins/script-fu/scripts/textured-logo.scm:170 -msgid "Text pattern" -msgstr "" - -#: ../plug-ins/script-fu/scripts/tileblur.scm:68 -msgid "_Tileable Blur..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/tileblur.scm:69 -msgid "Blur the edges of an image so the result tiles seamlessly" -msgstr "" - -#: ../plug-ins/script-fu/scripts/tileblur.scm:77 -msgid "Blur vertically" -msgstr "" - -#: ../plug-ins/script-fu/scripts/tileblur.scm:78 -#, fuzzy -msgid "Blur horizontally" -msgstr "Còmhnard" - -#: ../plug-ins/script-fu/scripts/tileblur.scm:79 -msgid "Blur type" -msgstr "" +#: ../plug-ins/script-fu/scripts/textured-logo.scm:129 +#: ../plug-ins/script-fu/scripts/textured-logo.scm:171 +msgid "Squares" +msgstr "Ceàrnagan" #: ../plug-ins/script-fu/scripts/tileblur.scm:79 msgid "IIR" msgstr "IIR" - -#: ../plug-ins/script-fu/scripts/tileblur.scm:79 -msgid "RLE" -msgstr "" - -#: ../plug-ins/script-fu/scripts/title-header.scm:165 -msgid "Web Title Header..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/title-header.scm:166 -msgid "Create a decorative web title header" -msgstr "" - -#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:98 -#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:138 -msgid "_Particle Trace..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:99 -msgid "Add a Trace of Particles effect to the selected region (or alpha)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:107 -#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:147 -msgid "Hit rate" -msgstr "" - -#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:108 -#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:148 -msgid "Edge width" -msgstr "" - -#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:109 -#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:149 -msgid "Edge only" -msgstr "" - -#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:110 -#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:150 -msgid "Base color" -msgstr "" - -#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:139 -msgid "Create a logo using a Trace Of Particles effect" -msgstr "" - -#: ../plug-ins/script-fu/scripts/truchet.scm:165 -msgid "T_ruchet..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/truchet.scm:166 -msgid "Create an image filled with a Truchet pattern" -msgstr "" - -#: ../plug-ins/script-fu/scripts/truchet.scm:174 -msgid "Foreground color" -msgstr "" - -#: ../plug-ins/script-fu/scripts/unsharp-mask.scm:82 -msgid "Mask size" -msgstr "" - -#: ../plug-ins/script-fu/scripts/unsharp-mask.scm:83 -msgid "Mask opacity" -msgstr "" - -#: ../plug-ins/script-fu/scripts/waves-anim.scm:95 -msgid "_Waves..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/waves-anim.scm:96 -msgid "" -"Create a multi-layer image with an effect like a stone was thrown into the " -"current image" -msgstr "" - -#: ../plug-ins/script-fu/scripts/waves-anim.scm:103 -msgid "Amplitude" -msgstr "" - -#: ../plug-ins/script-fu/scripts/waves-anim.scm:104 -msgid "Wavelength" -msgstr "" - -#: ../plug-ins/script-fu/scripts/waves-anim.scm:106 -msgid "Invert direction" -msgstr "" - -#: ../plug-ins/script-fu/scripts/weave.scm:389 -msgid "_Weave..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/weave.scm:390 -msgid "" -"Create a new layer filled with a weave effect to be used as an overlay or " -"bump map" -msgstr "" - -#: ../plug-ins/script-fu/scripts/weave.scm:397 -msgid "Ribbon width" -msgstr "" - -#: ../plug-ins/script-fu/scripts/weave.scm:398 -msgid "Ribbon spacing" -msgstr "" - -#: ../plug-ins/script-fu/scripts/weave.scm:399 -msgid "Shadow darkness" -msgstr "" - -#: ../plug-ins/script-fu/scripts/weave.scm:400 -msgid "Shadow depth" -msgstr "" - -#: ../plug-ins/script-fu/scripts/weave.scm:401 -msgid "Thread length" -msgstr "" - -#: ../plug-ins/script-fu/scripts/weave.scm:402 -msgid "Thread density" -msgstr "" - -#: ../plug-ins/script-fu/scripts/weave.scm:403 -msgid "Thread intensity" -msgstr "" - -#: ../plug-ins/script-fu/scripts/xach-effect.scm:121 -msgid "_Xach-Effect..." -msgstr "" - -#: ../plug-ins/script-fu/scripts/xach-effect.scm:122 -msgid "Add a subtle translucent 3D effect to the selected region (or alpha)" -msgstr "" - -#: ../plug-ins/script-fu/scripts/xach-effect.scm:129 -msgid "Highlight X offset" -msgstr "" - -#: ../plug-ins/script-fu/scripts/xach-effect.scm:130 -msgid "Highlight Y offset" -msgstr "" - -#: ../plug-ins/script-fu/scripts/xach-effect.scm:131 -msgid "Highlight color" -msgstr "" - -#: ../plug-ins/script-fu/scripts/xach-effect.scm:132 -msgid "Highlight opacity" -msgstr "" - -#: ../plug-ins/script-fu/scripts/xach-effect.scm:133 -msgid "Drop shadow color" -msgstr "" - -#: ../plug-ins/script-fu/scripts/xach-effect.scm:134 -msgid "Drop shadow opacity" -msgstr "" - -#: ../plug-ins/script-fu/scripts/xach-effect.scm:135 -msgid "Drop shadow blur radius" -msgstr "" - -#: ../plug-ins/script-fu/scripts/xach-effect.scm:136 -msgid "Drop shadow X offset" -msgstr "" - -#: ../plug-ins/script-fu/scripts/xach-effect.scm:137 -msgid "Drop shadow Y offset" -msgstr "" diff -Nru gimp-2.8.18/po-script-fu/nb.po gimp-2.8.20/po-script-fu/nb.po --- gimp-2.8.18/po-script-fu/nb.po 2015-08-20 22:57:36.000000000 +0000 +++ gimp-2.8.20/po-script-fu/nb.po 2017-01-28 19:08:47.000000000 +0000 @@ -10,7 +10,7 @@ "PO-Revision-Date: 2009-11-16 18:37+0100\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" -"Language: no\n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" diff -Nru gimp-2.8.18/po-script-fu/pl.po gimp-2.8.20/po-script-fu/pl.po --- gimp-2.8.18/po-script-fu/pl.po 2016-05-25 22:26:48.000000000 +0000 +++ gimp-2.8.20/po-script-fu/pl.po 2017-01-28 19:08:47.000000000 +0000 @@ -1,35 +1,31 @@ -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Aviary.pl -# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz -# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: -# gnomepl@aviary.pl -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +# Polish translation for gimp-script-fu. +# Copyright © 1999-2016 the gimp authors. +# This file is distributed under the same license as the gimp package. # GNOME PL Team , 1999-2005. # Artur Polaczyński , 1999-2000. # Bartosz Kosiorek , 2005-2007. # Łukasz Jernaś , 2010. -# Piotr Drąg , 2011-2015. -# Aviary.pl , 2011-2015. +# Piotr Drąg , 2011-2016. +# Aviary.pl , 2011-2016. +# msgid "" msgstr "" "Project-Id-Version: gimp-script-fu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-23 00:20+0100\n" -"PO-Revision-Date: 2015-11-23 00:22+0100\n" +"POT-Creation-Date: 2016-09-07 18:48+0200\n" +"PO-Revision-Date: 2016-09-07 18:49+0200\n" "Last-Translator: Piotr Drąg \n" -"Language-Team: Polish \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Poedit-Language: Polish\n" -"X-Poedit-Country: Poland\n" #: ../plug-ins/script-fu/script-fu.c:111 msgid "Interactive console for Script-Fu development" -msgstr "Interaktywna konsola dla programowania w Script-Fu" +msgstr "Interaktywna konsola do programowania w Script-Fu" #: ../plug-ins/script-fu/script-fu.c:117 msgid "_Console" @@ -45,7 +41,7 @@ #: ../plug-ins/script-fu/script-fu.c:307 msgid "_GIMP Online" -msgstr "_GIMP w sieci" +msgstr "_GIMP w sieci" #: ../plug-ins/script-fu/script-fu.c:308 msgid "_User Manual" @@ -105,7 +101,7 @@ "Please close all Script-Fu windows and try again." msgstr "" "Nie można używać funkcji „Odśwież skrypty”, kiedy okno Script-Fu jest " -"otwarte. Proszę zamknąć wszystkie okna Script-Fu i spróbować ponownie." +"otwarte. Proszę zamknąć wszystkie okna Script-Fu i spróbować ponownie." #: ../plug-ins/script-fu/script-fu-console.c:130 #: ../plug-ins/script-fu/script-fu-console.c:197 @@ -114,11 +110,11 @@ #: ../plug-ins/script-fu/script-fu-console.c:193 msgid "Welcome to TinyScheme" -msgstr "Witamy w TinyScheme" +msgstr "Witamy w TinyScheme" #: ../plug-ins/script-fu/script-fu-console.c:199 msgid "Interactive Scheme Development" -msgstr "Interaktywne programowanie w języku Scheme" +msgstr "Interaktywne programowanie w języku Scheme" #: ../plug-ins/script-fu/script-fu-console.c:235 msgid "_Browse..." @@ -141,16 +137,16 @@ msgid "Script-Fu evaluation mode only allows non-interactive invocation" msgstr "Tryb obliczeniowy Script-Fu umożliwia tylko na uruchamianie wsadowe" -#: ../plug-ins/script-fu/script-fu-interface.c:198 +#: ../plug-ins/script-fu/script-fu-interface.c:200 msgid "Script-Fu cannot process two scripts at the same time." msgstr "Script-Fu nie może przetwarzać dwóch skryptów jednocześnie." -#: ../plug-ins/script-fu/script-fu-interface.c:200 +#: ../plug-ins/script-fu/script-fu-interface.c:202 #, c-format msgid "You are already running the \"%s\" script." msgstr "Skrypt „%s” jest już uruchomiony." -#: ../plug-ins/script-fu/script-fu-interface.c:226 +#: ../plug-ins/script-fu/script-fu-interface.c:228 #, c-format msgid "Script-Fu: %s" msgstr "Script-Fu: %s" @@ -158,44 +154,44 @@ #. we add a colon after the label; #. * some languages want an extra space here #. -#: ../plug-ins/script-fu/script-fu-interface.c:290 +#: ../plug-ins/script-fu/script-fu-interface.c:292 #, c-format msgid "%s:" msgstr "%s:" -#: ../plug-ins/script-fu/script-fu-interface.c:337 +#: ../plug-ins/script-fu/script-fu-interface.c:339 msgid "Script-Fu Color Selection" msgstr "Script-Fu: wybór koloru" -#: ../plug-ins/script-fu/script-fu-interface.c:446 +#: ../plug-ins/script-fu/script-fu-interface.c:448 msgid "Script-Fu File Selection" msgstr "Script-Fu: wybór pliku" -#: ../plug-ins/script-fu/script-fu-interface.c:449 +#: ../plug-ins/script-fu/script-fu-interface.c:451 msgid "Script-Fu Folder Selection" msgstr "Script-Fu: wybór katalogu" -#: ../plug-ins/script-fu/script-fu-interface.c:462 +#: ../plug-ins/script-fu/script-fu-interface.c:464 msgid "Script-Fu Font Selection" msgstr "Script-Fu: wybór czcionki" -#: ../plug-ins/script-fu/script-fu-interface.c:470 +#: ../plug-ins/script-fu/script-fu-interface.c:472 msgid "Script-Fu Palette Selection" msgstr "Script-Fu: wybór palety" -#: ../plug-ins/script-fu/script-fu-interface.c:479 +#: ../plug-ins/script-fu/script-fu-interface.c:481 msgid "Script-Fu Pattern Selection" msgstr "Script-Fu: wybór desenia" -#: ../plug-ins/script-fu/script-fu-interface.c:488 +#: ../plug-ins/script-fu/script-fu-interface.c:490 msgid "Script-Fu Gradient Selection" msgstr "Script-Fu: wybór gradientu" -#: ../plug-ins/script-fu/script-fu-interface.c:497 +#: ../plug-ins/script-fu/script-fu-interface.c:499 msgid "Script-Fu Brush Selection" msgstr "Script-Fu: wybór pędzla" -#: ../plug-ins/script-fu/script-fu-interface.c:857 +#: ../plug-ins/script-fu/script-fu-interface.c:868 #, c-format msgid "Error while executing %s:" msgstr "Błąd podczas wykonywania %s:" @@ -247,7 +243,7 @@ msgid "" "Outline the selected region (or alpha) with a pattern and add a drop shadow" msgstr "" -"Odrysowuje zaznaczony obszar (lub przezroczystość) deseniem i dodaje cień" +"Odrysowuje zaznaczony obszar (lub przezroczystość) deseniem i dodaje cień" #: ../plug-ins/script-fu/scripts/3d-outline.scm:128 #: ../plug-ins/script-fu/scripts/3d-outline.scm:172 @@ -302,7 +298,7 @@ #: ../plug-ins/script-fu/scripts/3d-outline.scm:167 msgid "Create a logo with outlined text and a drop shadow" -msgstr "Tworzy logo z krawędzi tekstu i rzuca cień" +msgstr "Tworzy logo z krawędzi tekstu i rzuca cień" #: ../plug-ins/script-fu/scripts/3d-outline.scm:173 #: ../plug-ins/script-fu/scripts/alien-glow-button.scm:156 @@ -590,7 +586,7 @@ #: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:176 msgid "Create an arrow graphic with an eerie glow for web pages" -msgstr "Tworzy grafikę strzałki z poświatą eerie dla stron WWW" +msgstr "Tworzy grafikę strzałki z poświatą eerie dla stron WWW" #: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:181 #: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:155 @@ -606,22 +602,22 @@ #: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182 #: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156 msgid "Right" -msgstr "W prawo" +msgstr "W prawo" #: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182 #: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156 msgid "Left" -msgstr "W lewo" +msgstr "W lewo" #: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182 #: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156 msgid "Up" -msgstr "W górę" +msgstr "W górę" #: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182 #: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156 msgid "Down" -msgstr "W dół" +msgstr "W dół" #: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:183 #: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:94 @@ -658,7 +654,7 @@ #: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:87 msgid "Create an Hrule graphic with an eerie glow for web pages" -msgstr "Tworzy grafikę poziomej linii z poświatą eerie dla stron WWW" +msgstr "Tworzy grafikę poziomej linii z poświatą eerie dla stron WWW" #: ../plug-ins/script-fu/scripts/alien-glow-bar.scm:92 msgid "Bar length" @@ -680,7 +676,7 @@ #: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:100 msgid "Create a bullet graphic with an eerie glow for web pages" -msgstr "Tworzy grafikę kropki z poświatą eerie dla stron WWW" +msgstr "Tworzy grafikę kropki z poświatą eerie dla stron WWW" #: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm:105 #: ../plug-ins/script-fu/scripts/text-circle.scm:214 @@ -703,7 +699,7 @@ #: ../plug-ins/script-fu/scripts/alien-glow-button.scm:151 msgid "Create a button graphic with an eerie glow for web pages" -msgstr "Tworzy grafikę przycisku z poświatą eerie dla stron WWW" +msgstr "Tworzy grafikę przycisku z poświatą eerie dla stron WWW" #: ../plug-ins/script-fu/scripts/alien-glow-button.scm:159 #: ../plug-ins/script-fu/scripts/basic1-logo.scm:68 @@ -745,7 +741,7 @@ #: ../plug-ins/script-fu/scripts/alien-glow-logo.scm:106 msgid "Create a logo with an alien glow around the text" -msgstr "Tworzy logo dookoła tekstu z nieziemskiej poświaty" +msgstr "Tworzy logo dookoła tekstu z nieziemskiej poświaty" #: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:126 #: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:169 @@ -779,7 +775,7 @@ #: ../plug-ins/script-fu/scripts/alien-neon-logo.scm:170 msgid "Create a logo with psychedelic outlines around the text" -msgstr "Tworzy logo z psychodelicznej obwódki dookoła zaznaczonego tekstu" +msgstr "Tworzy logo z psychodelicznej obwódki dookoła zaznaczonego tekstu" #: ../plug-ins/script-fu/scripts/basic1-logo.scm:59 #: ../plug-ins/script-fu/scripts/basic1-logo.scm:92 @@ -791,14 +787,14 @@ "Add a gradient effect, a drop shadow, and a background to the selected " "region (or alpha)" msgstr "" -"Dodaje efekt gradientu, rzuca cień i dodaje cień do zaznaczonego obszaru " +"Dodaje efekt gradientu, rzuca cień i dodaje cień do zaznaczonego obszaru " "(lub przezroczystości)" #: ../plug-ins/script-fu/scripts/basic1-logo.scm:93 msgid "" "Create a plain text logo with a gradient effect, a drop shadow, and a " "background" -msgstr "Tworzy proste tekstowe logo z gradientem, cieniem i tłem" +msgstr "Tworzy proste tekstowe logo z gradientem, cieniem i tłem" #: ../plug-ins/script-fu/scripts/basic2-logo.scm:81 #: ../plug-ins/script-fu/scripts/basic2-logo.scm:114 @@ -808,11 +804,11 @@ #: ../plug-ins/script-fu/scripts/basic2-logo.scm:82 msgid "Add a shadow and a highlight to the selected region (or alpha)" msgstr "" -"Dodaje cień i podświetlenie do zaznaczonego obszaru (lub przezroczystości)" +"Dodaje cień i podświetlenie do zaznaczonego obszaru (lub przezroczystości)" #: ../plug-ins/script-fu/scripts/basic2-logo.scm:115 msgid "Create a simple logo with a shadow and a highlight" -msgstr "Tworzy proste logo z cieniem i podświetleniem" +msgstr "Tworzy proste logo z cieniem i podświetleniem" #: ../plug-ins/script-fu/scripts/beveled-button.scm:80 #: ../plug-ins/script-fu/scripts/blended-logo.scm:142 @@ -830,7 +826,7 @@ #: ../plug-ins/script-fu/scripts/beveled-button.scm:142 msgid "Simple _Beveled Button..." -msgstr "_Prosty przycisk z fazą…" +msgstr "_Prosty przycisk z fazą…" #: ../plug-ins/script-fu/scripts/beveled-button.scm:143 msgid "Create a simple, beveled button graphic for webpages" @@ -933,8 +929,8 @@ "Create intermediate layers to blend two or more layers over a background as " "an animation" msgstr "" -"Tworzy szybkie warstwy nad tłem, aby połączyć dwie lub więcej warstw w " -"animację" +"Tworzy szybkie warstwy nad tłem, aby połączyć dwie lub więcej warstw " +"w animację" #: ../plug-ins/script-fu/scripts/blend-anim.scm:236 msgid "Intermediate frames" @@ -951,14 +947,14 @@ #: ../plug-ins/script-fu/scripts/blended-logo.scm:126 #: ../plug-ins/script-fu/scripts/blended-logo.scm:184 msgid "Blen_ded..." -msgstr "_Z gradientem…" +msgstr "_Z gradientem…" #: ../plug-ins/script-fu/scripts/blended-logo.scm:127 msgid "" "Add blended backgrounds, highlights, and shadows to the selected region (or " "alpha)" msgstr "" -"Dodaje przenikające tła, podświetlenia i cienie do zaznaczonego obszaru (lub " +"Dodaje przenikające tła, podświetlenia i cienie do zaznaczonego obszaru (lub " "przezroczystości)" #: ../plug-ins/script-fu/scripts/blended-logo.scm:134 @@ -1004,7 +1000,7 @@ #: ../plug-ins/script-fu/scripts/blended-logo.scm:185 msgid "Create a logo with blended backgrounds, highlights, and shadows" -msgstr "Tworzy logo z teł, podświetleń i cieni" +msgstr "Tworzy logo z teł, podświetleń i cieni" #: ../plug-ins/script-fu/scripts/bovinated-logo.scm:91 #: ../plug-ins/script-fu/scripts/bovinated-logo.scm:125 @@ -1032,7 +1028,7 @@ #: ../plug-ins/script-fu/scripts/bovinated-logo.scm:126 msgid "Create a logo with text in the style of 'cow spots'" -msgstr "Tworzy logo z tekstem w stylu „krowich łat”" +msgstr "Tworzy logo z tekstem w stylu „krowich łat”" #. --- false form of "if-1" #: ../plug-ins/script-fu/scripts/burn-in-anim.scm:212 @@ -1040,8 +1036,8 @@ "The Burn-In script needs two layers in total. A foreground layer with " "transparency and a background layer." msgstr "" -"Skrypt wypalenia potrzebuje dwóch warstw: warstwy pierwszoplanowej z " -"przezroczystością oraz warstwy tła." +"Skrypt wypalenia potrzebuje dwóch warstw: warstwy pierwszoplanowej " +"z przezroczystością oraz warstwy tła." #: ../plug-ins/script-fu/scripts/burn-in-anim.scm:219 msgid "B_urn-In..." @@ -1185,7 +1181,7 @@ #: ../plug-ins/script-fu/scripts/chalk.scm:82 msgid "Create a chalk drawing effect for the selected region (or alpha)" msgstr "" -"Tworzy efekt rysowania kredą w zaznaczonym obszarze (lub przezroczystości)" +"Tworzy efekt rysowania kredą w zaznaczonym obszarze (lub przezroczystości)" #: ../plug-ins/script-fu/scripts/chalk.scm:123 msgid "Create a logo resembling chalk scribbled on a blackboard" @@ -1237,7 +1233,7 @@ #: ../plug-ins/script-fu/scripts/chip-away.scm:187 msgid "Create a logo resembling a chipped wood carving" -msgstr "Tworzy logo przypominające rzeźbę z drzewa" +msgstr "Tworzy logo przypominające rzeźbę z drzewa" #: ../plug-ins/script-fu/scripts/chrome-it.scm:104 msgid "Layer 1" @@ -1273,8 +1269,8 @@ "Add a chrome effect to the selected region (or alpha) using a specified " "(grayscale) stencil" msgstr "" -"Dodaje efekt chromu do zaznaczonego obszaru (lub przezroczystości), używając " -"specyficznego szablonu (odcienie szarości)" +"Dodaje efekt chromu do zaznaczonego obszaru (lub przezroczystości) za pomocą " +"podanego szablonu (odcienie szarości)" #: ../plug-ins/script-fu/scripts/chrome-it.scm:222 #: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm:210 @@ -1373,7 +1369,7 @@ #: ../plug-ins/script-fu/scripts/clothify.scm:51 msgid "_Clothify..." -msgstr "Przekształcenie w _tkaninę…" +msgstr "Przekształcenie w _tkaninę…" #: ../plug-ins/script-fu/scripts/clothify.scm:52 msgid "Add a cloth-like texture to the selected region (or alpha)" @@ -1435,7 +1431,7 @@ "filling with a gradient" msgstr "" "Dodaje efekt komiksu do zaznaczonego obszaru (lub przezroczystości), poprzez " -"obrysowanie i wypełnienie gradientem" +"obrysowanie i wypełnienie gradientem" #: ../plug-ins/script-fu/scripts/comic-logo.scm:122 #: ../plug-ins/script-fu/scripts/comic-logo.scm:163 @@ -1451,7 +1447,7 @@ #: ../plug-ins/script-fu/scripts/comic-logo.scm:153 msgid "Create a comic-book style logo by outlining and filling with a gradient" -msgstr "Tworzy logo w stylu komiksu przez obrysowanie i wypełnienie gradientem" +msgstr "Tworzy logo w stylu komiksu przez obrysowanie i wypełnienie gradientem" #: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:140 #: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:178 @@ -1463,8 +1459,8 @@ "Add a metallic effect to the selected region (or alpha) with reflections and " "perspective shadows" msgstr "" -"Dodaje metaliczny efekt do zaznaczonego obszaru (lub przezroczystości) z " -"refleksami i cieniami" +"Dodaje metaliczny efekt do zaznaczonego obszaru (lub przezroczystości) " +"z refleksami i cieniami" #: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:148 #: ../plug-ins/script-fu/scripts/frosty-logo.scm:143 @@ -1475,7 +1471,7 @@ #: ../plug-ins/script-fu/scripts/coolmetal-logo.scm:179 msgid "Create a metallic logo with reflections and perspective shadows" -msgstr "Tworzy metaliczne logo z refleksami i cieniami" +msgstr "Tworzy metaliczne logo z refleksami i cieniami" #: ../plug-ins/script-fu/scripts/crystal-logo.scm:209 msgid "Crystal..." @@ -1491,11 +1487,11 @@ msgid "Background image" msgstr "Obraz tła" -#: ../plug-ins/script-fu/scripts/difference-clouds.scm:67 +#: ../plug-ins/script-fu/scripts/difference-clouds.scm:70 msgid "Difference Clouds..." msgstr "Różnica chmur…" -#: ../plug-ins/script-fu/scripts/difference-clouds.scm:68 +#: ../plug-ins/script-fu/scripts/difference-clouds.scm:71 msgid "Solid noise applied with Difference layer mode" msgstr "Jednolity szum nałożony za pomocą trybu warstw różnicy" @@ -1509,7 +1505,7 @@ #: ../plug-ins/script-fu/scripts/distress-selection.scm:113 msgid "Threshold (bigger 1<-->254 smaller)" -msgstr "Próg (większy 1<-->254 mniejszy)" +msgstr "Próg (większy 1←—→254 mniejszy)" #: ../plug-ins/script-fu/scripts/distress-selection.scm:114 msgid "Spread" @@ -1574,7 +1570,7 @@ #: ../plug-ins/script-fu/scripts/erase-rows.scm:40 msgid "Erase every other row or column" -msgstr "Czyści wszystkie inne wiersze i kolumny" +msgstr "Czyści wszystkie inne wiersze i kolumny" #: ../plug-ins/script-fu/scripts/erase-rows.scm:47 msgid "Rows/cols" @@ -1707,12 +1703,12 @@ "Add a frost effect to the selected region (or alpha) with an added drop " "shadow" msgstr "" -"Dodaje efekt oszronienia do zaznaczonego obszaru (lub przezroczystości) z " -"cieniem" +"Dodaje efekt oszronienia do zaznaczonego obszaru (lub przezroczystości) " +"z cieniem" #: ../plug-ins/script-fu/scripts/frosty-logo.scm:198 msgid "Create frozen logo with an added drop shadow" -msgstr "Tworzy oszronione logo z dodatkowym cieniem" +msgstr "Tworzy oszronione logo z dodatkowym cieniem" #: ../plug-ins/script-fu/scripts/fuzzyborder.scm:146 msgid "_Fuzzy Border..." @@ -1764,11 +1760,11 @@ #: ../plug-ins/script-fu/scripts/gimp-online.scm:85 msgid "_Working with Digital Camera Photos" -msgstr "_Praca ze zdjęciami z aparatu cyfrowego" +msgstr "_Praca ze zdjęciami z aparatu cyfrowego" #: ../plug-ins/script-fu/scripts/gimp-online.scm:98 msgid "Create, Open and Save _Files" -msgstr "_Tworzenie, otwieranie i zapisywanie plików" +msgstr "_Tworzenie, otwieranie i zapisywanie plików" #: ../plug-ins/script-fu/scripts/gimp-online.scm:111 msgid "_Basic Concepts" @@ -1784,7 +1780,7 @@ #: ../plug-ins/script-fu/scripts/gimp-online.scm:150 msgid "Create and Use _Selections" -msgstr "Tworzenie i używanie _zaznaczeń" +msgstr "Tworzenie i używanie _zaznaczeń" #: ../plug-ins/script-fu/scripts/gimp-online.scm:178 msgid "_Main Web Site" @@ -1819,7 +1815,7 @@ "Add gradients, patterns, shadows, and bump maps to the selected region (or " "alpha)" msgstr "" -"Dodaje gradienty, desenie, cienie i wypukłości do zaznaczonego obszaru (lub " +"Dodaje gradienty, desenie, cienie i wypukłości do zaznaczonego obszaru (lub " "przezroczystości)" #: ../plug-ins/script-fu/scripts/glossy.scm:204 @@ -1880,7 +1876,7 @@ #: ../plug-ins/script-fu/scripts/glossy.scm:268 msgid "Create a logo with gradients, patterns, shadows, and bump maps" -msgstr "Tworzy logo z gradientów, deseni, cieni oraz wypukłości" +msgstr "Tworzy logo z gradientów, deseni, cieni oraz wypukłości" #: ../plug-ins/script-fu/scripts/glowing-logo.scm:76 #: ../plug-ins/script-fu/scripts/glowing-logo.scm:109 @@ -1900,12 +1896,12 @@ #: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:94 #: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:133 msgid "Gradient Beve_l..." -msgstr "_Gradient z fazą…" +msgstr "_Gradient z fazą…" #: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:95 msgid "Add a shiny look and bevel effect to the selected region (or alpha)" msgstr "" -"Dodaje efekt błysku i przestrzenności do zaznaczonego obszaru (lub " +"Dodaje efekt błysku i przestrzenności do zaznaczonego obszaru (lub " "przezroczystości)" #: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:102 @@ -1921,7 +1917,7 @@ #: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm:134 msgid "Create a logo with a shiny look and beveled edges" -msgstr "Tworzy logo z błyszczącymi i przestrzennymi krawędziami" +msgstr "Tworzy logo z błyszczącymi i przestrzennymi krawędziami" #: ../plug-ins/script-fu/scripts/gradient-example.scm:63 msgid "Custom _Gradient..." @@ -1940,7 +1936,7 @@ "Draw a grid as specified by the lists of X and Y locations using the current " "brush" msgstr "" -"Rysuje siatkę ustawioną w liście położeń X i Y używając bieżącego pędzla" +"Rysuje siatkę ustawioną w liście położeń X i Y za pomocą bieżącego pędzla" #: ../plug-ins/script-fu/scripts/grid-system.scm:92 msgid "X divisions" @@ -1952,7 +1948,7 @@ #: ../plug-ins/script-fu/scripts/guides-from-selection.scm:32 msgid "New Guides from _Selection" -msgstr "Nowa prowadnica z _zaznaczenia" +msgstr "Nowa prowadnica z _zaznaczenia" #: ../plug-ins/script-fu/scripts/guides-from-selection.scm:33 msgid "Create four guides around the bounding box of the current selection" @@ -1960,7 +1956,7 @@ #: ../plug-ins/script-fu/scripts/guides-new-percent.scm:27 msgid "New Guide (by _Percent)..." -msgstr "Nowa prowadnica (w p_rocentach)…" +msgstr "Nowa prowadnica (w p_rocentach)…" #: ../plug-ins/script-fu/scripts/guides-new-percent.scm:28 msgid "Add a guide at the position specified as a percentage of the image size" @@ -1983,7 +1979,7 @@ #: ../plug-ins/script-fu/scripts/guides-new-percent.scm:37 msgid "Position (in %)" -msgstr "Położenie (w %)" +msgstr "Położenie (w %)" #: ../plug-ins/script-fu/scripts/guides-new.scm:27 msgid "New _Guide..." @@ -1991,7 +1987,7 @@ #: ../plug-ins/script-fu/scripts/guides-new.scm:28 msgid "Add a guide at the orientation and position specified (in pixels)" -msgstr "Dodaje prowadnice w ustalonym położeniu (w pikselach)" +msgstr "Dodaje prowadnice w ustalonym położeniu (w pikselach)" #: ../plug-ins/script-fu/scripts/guides-new.scm:36 msgid "Position" @@ -2003,7 +1999,7 @@ #: ../plug-ins/script-fu/scripts/guides-remove-all.scm:20 msgid "Remove all horizontal and vertical guides" -msgstr "Usuwa wszystkie poziome i pionowe prowadnice" +msgstr "Usuwa wszystkie poziome i pionowe prowadnice" #: ../plug-ins/script-fu/scripts/i26-gunya2.scm:92 msgid "Imigre-_26..." @@ -2011,7 +2007,7 @@ #: ../plug-ins/script-fu/scripts/i26-gunya2.scm:93 msgid "Create a logo in a two-color, scribbled text style" -msgstr "Tworzy pomazane logo w dwóch kolorach" +msgstr "Tworzy pomazane logo w dwóch kolorach" #: ../plug-ins/script-fu/scripts/i26-gunya2.scm:100 msgid "Frame color" @@ -2067,7 +2063,7 @@ "Fill a layer with rays emanating outward from its center using the " "foreground color" msgstr "" -"Wypełnia warstwę promieniami emanującymi ze środka obrazu, używając koloru " +"Wypełnia warstwę promieniami emanującymi ze środka obrazu za pomocą koloru " "pierwszoplanowego" #: ../plug-ins/script-fu/scripts/line-nova.scm:116 @@ -2116,7 +2112,7 @@ #: ../plug-ins/script-fu/scripts/mkbrush.scm:132 msgid "Create a rectangular brush with feathered edges" -msgstr "Tworzy prostokątny pędzel z rozmytymi krawędziami" +msgstr "Tworzy prostokątny pędzel z rozmytymi krawędziami" #: ../plug-ins/script-fu/scripts/mkbrush.scm:140 #: ../plug-ins/script-fu/scripts/mkbrush.scm:265 @@ -2137,7 +2133,7 @@ #: ../plug-ins/script-fu/scripts/mkbrush.scm:257 msgid "Create an elliptical brush with feathered edges" -msgstr "Tworzy eliptyczny pędzel z rozmytymi krawędziami" +msgstr "Tworzy eliptyczny pędzel z rozmytymi krawędziami" #: ../plug-ins/script-fu/scripts/neon-logo.scm:244 #: ../plug-ins/script-fu/scripts/neon-logo.scm:280 @@ -2156,7 +2152,7 @@ #: ../plug-ins/script-fu/scripts/neon-logo.scm:281 msgid "Create a logo in the style of a neon sign" -msgstr "Tworzy logo w stylu szyldu neonowego" +msgstr "Tworzy logo w stylu szyldu neonowego" #: ../plug-ins/script-fu/scripts/news-text.scm:77 msgid "Newsprint Te_xt..." @@ -2164,7 +2160,7 @@ #: ../plug-ins/script-fu/scripts/news-text.scm:78 msgid "Create a logo in the style of newspaper printing" -msgstr "Tworzy logo w stylu druku drukarskiego" +msgstr "Tworzy logo w stylu druku drukarskiego" #: ../plug-ins/script-fu/scripts/news-text.scm:86 msgid "Cell size (pixels)" @@ -2207,7 +2203,7 @@ "The name of the file to create (if a file with this name already exist, it " "will be replaced)" msgstr "" -"Nazwa pliku do utworzenia (jeśli plik o tej nazwie już istnieje, to zostanie " +"Nazwa pliku do utworzenia (jeśli plik o tej nazwie już istnieje, to zostanie " "zastąpiony)" #: ../plug-ins/script-fu/scripts/palette-export.scm:235 @@ -2219,42 +2215,43 @@ "All characters in the name are either white-spaces or characters which can " "not appear in filenames." msgstr "" -"Wszystkie znaki w nazwie są białymi znakami lub znakami, których nie można " -"używać w nazwach plików." +"Wszystkie znaki w nazwie są białymi znakami lub znakami, których nie można " +"używać w nazwach plików." #: ../plug-ins/script-fu/scripts/palette-export.scm:265 msgid "" "Export the active palette as a CSS stylesheet with the color entry name as " "their class name, and the color itself as the color attribute" msgstr "" -"Eksportuje aktywną paletę jako arkusz stylów CSS z nazwą wpisu koloru jako " -"ich nazwą klasy, a nazwą koloru jako atrybut" +"Eksportuje aktywną paletę jako arkusz stylów CSS z nazwą wpisu koloru jako " +"ich nazwą klasy, a nazwą koloru jako atrybut" #: ../plug-ins/script-fu/scripts/palette-export.scm:291 msgid "Export the active palette as a PHP dictionary (name => color)" -msgstr "Eksportowanie aktywnej palety jako katalog języka PHP (nazwa => kolor)" +msgstr "Eksportowanie aktywnej palety jako katalog języka PHP (nazwa → kolor)" #: ../plug-ins/script-fu/scripts/palette-export.scm:323 msgid "Export the active palette as a Python dictionary (name: color)" msgstr "" -"Eksportowanie aktywnej palety jako katalog języka Python (nazwa => kolor)" +"Eksportowanie aktywnej palety jako katalog języka Python (nazwa: kolor)" #: ../plug-ins/script-fu/scripts/palette-export.scm:352 msgid "" "Write all the colors in a palette to a text file, one hexadecimal value per " "line (no names)" msgstr "" -"Zapisywanie wszystkich kolorów w palecie do pliku tekstowego, jedna wartość " +"Zapisywanie wszystkich kolorów w palecie do pliku tekstowego, jedna wartość " "szesnastkowa na wiersz (bez nazw)" #: ../plug-ins/script-fu/scripts/palette-export.scm:399 msgid "Export the active palette as a java.util.Hashtable" -msgstr "Eksportowanie aktywnej palety jako java.util.Hashtable" +msgstr "" +"Eksportowanie aktywnej palety jako „java.util.Hashtable”" #: ../plug-ins/script-fu/scripts/paste-as-brush.scm:56 #: ../plug-ins/script-fu/scripts/paste-as-pattern.scm:44 msgid "There is no image data in the clipboard to paste." -msgstr "Nie odnaleziono danych obrazu w schowku do wklejenia." +msgstr "Nie odnaleziono danych obrazu w schowku do wklejenia." #: ../plug-ins/script-fu/scripts/paste-as-brush.scm:62 msgid "New _Brush..." @@ -2296,7 +2293,7 @@ #: ../plug-ins/script-fu/scripts/perspective-shadow.scm:199 msgid "Add a perspective shadow to the selected region (or alpha)" msgstr "" -"Dodaje cień z perspektywą do zaznaczonego obszaru (lub przezroczystości)" +"Dodaje cień z perspektywą do zaznaczonego obszaru (lub przezroczystości)" #: ../plug-ins/script-fu/scripts/perspective-shadow.scm:206 msgid "Angle" @@ -2452,7 +2449,7 @@ #: ../plug-ins/script-fu/scripts/round-corners.scm:130 msgid "" "Round the corners of an image and optionally add a drop-shadow and background" -msgstr "Zaokrągla rogi obrazu oraz opcjonalnie dodaje cień i tło" +msgstr "Zaokrągla rogi obrazu oraz opcjonalnie dodaje cień i tło" #: ../plug-ins/script-fu/scripts/round-corners.scm:137 msgid "Edge radius" @@ -2472,7 +2469,7 @@ #: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm:54 msgid "Change the colormap of an image to the colors in a specified palette." -msgstr "Zmienia mapę kolorów obrazu na kolory z podanej palety." +msgstr "Zmienia mapę kolorów obrazu na kolory z podanej palety." #: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm:61 msgid "Palette" @@ -2524,7 +2521,7 @@ #: ../plug-ins/script-fu/scripts/slide.scm:237 msgid "Add a slide-film like frame, sprocket holes, and labels to an image" -msgstr "Dodaje ramkę podobną do slajdu, perforacje i etykiety do obrazu" +msgstr "Dodaje ramkę podobną do slajdu, perforacje i etykiety do obrazu" #: ../plug-ins/script-fu/scripts/slide.scm:245 msgid "Number" @@ -2582,7 +2579,7 @@ #: ../plug-ins/script-fu/scripts/spyrogimp.scm:315 msgid "" "Add Spirographs, Epitrochoids, and Lissajous Curves to the current layer" -msgstr "Dodaje spirogramy, epitrochoidy i krzywe Lissajous do bieżącej warstwy" +msgstr "Dodaje spirogramy, epitrochoidy i krzywe Lissajous do bieżącej warstwy" #: ../plug-ins/script-fu/scripts/spyrogimp.scm:323 msgid "Type" @@ -2700,15 +2697,15 @@ #: ../plug-ins/script-fu/scripts/starscape-logo.scm:140 msgid "Create a logo using a rock-like texture, a nova glow, and shadow" -msgstr "Tworzy logo używając tekstury kamienia, błysku nowej oraz cienia" +msgstr "Tworzy logo za pomocą tekstury kamienia, błysku nowej oraz cienia" #: ../plug-ins/script-fu/scripts/swirltile.scm:51 msgid "Swirl-_Tile..." -msgstr "K_afel z wirem…" +msgstr "K_afel z wirem…" #: ../plug-ins/script-fu/scripts/swirltile.scm:52 msgid "Create an image filled with a swirled tile effect" -msgstr "Tworzy obraz wypełniony za pomocą efektu kafel z wirem" +msgstr "Tworzy obraz wypełniony za pomocą efektu kafel z wirem" #: ../plug-ins/script-fu/scripts/swirltile.scm:63 msgid "Whirl amount" @@ -2766,7 +2763,7 @@ "shadows, and a mosaic background" msgstr "" "Wypełnia zaznaczony obszar (lub przezroczystość) teksturą oraz dodaje " -"podświetlenie, cienie i tło mozaikowe" +"podświetlenie, cienie i tło mozaikowe" #: ../plug-ins/script-fu/scripts/textured-logo.scm:127 #: ../plug-ins/script-fu/scripts/textured-logo.scm:169 @@ -2802,7 +2799,7 @@ msgid "" "Create a textured logo with highlights, shadows, and a mosaic background" msgstr "" -"Tworzy logo z teksturą oraz dodaje podświetlenie, cienie i tło mozaikowe" +"Tworzy logo z teksturą oraz dodaje podświetlenie, cienie i tło mozaikowe" #: ../plug-ins/script-fu/scripts/textured-logo.scm:168 msgid "Text pattern" @@ -2877,7 +2874,7 @@ #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm:139 msgid "Create a logo using a Trace Of Particles effect" -msgstr "Tworzy logo używając efektu śledzenia cząsteczek" +msgstr "Tworzy logo za pomocą efektu śledzenia cząsteczek" #: ../plug-ins/script-fu/scripts/truchet.scm:165 msgid "T_ruchet..." @@ -2907,7 +2904,7 @@ msgid "" "Create a multi-layer image with an effect like a stone was thrown into the " "current image" -msgstr "Tworzy wielowarstwowy obraz z efektem rzuconego kamienia" +msgstr "Tworzy wielowarstwowy obraz z efektem rzuconego kamienia" #: ../plug-ins/script-fu/scripts/waves-anim.scm:103 msgid "Amplitude" @@ -2930,7 +2927,7 @@ "Create a new layer filled with a weave effect to be used as an overlay or " "bump map" msgstr "" -"Tworzy nową warstwę używając efektu fali do użycia jako nałożenie lub mapę " +"Tworzy nową warstwę za pomocą efektu fali do użycia jako nałożenie lub mapę " "wypukłości" #: ../plug-ins/script-fu/scripts/weave.scm:397 diff -Nru gimp-2.8.18/po-script-fu/rw.po gimp-2.8.20/po-script-fu/rw.po --- gimp-2.8.18/po-script-fu/rw.po 2015-08-20 22:57:36.000000000 +0000 +++ gimp-2.8.20/po-script-fu/rw.po 2017-01-28 19:08:47.000000000 +0000 @@ -23,7 +23,6 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"ULL NAME \n" #: ../plug-ins/script-fu/script-fu.c:111 msgid "Interactive console for Script-Fu development" diff -Nru gimp-2.8.18/po-script-fu/sr@latin.po gimp-2.8.20/po-script-fu/sr@latin.po --- gimp-2.8.18/po-script-fu/sr@latin.po 2015-08-20 22:57:36.000000000 +0000 +++ gimp-2.8.20/po-script-fu/sr@latin.po 2017-01-28 19:08:47.000000000 +0000 @@ -12,7 +12,7 @@ "PO-Revision-Date: 2014-03-27 09:07+0200\n" "Last-Translator: Miroslav Nikolić \n" "Language-Team: Serbian \n" -"Language: sr\n" +"Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po-script-fu/zh_HK.po gimp-2.8.20/po-script-fu/zh_HK.po --- gimp-2.8.18/po-script-fu/zh_HK.po 2015-08-20 22:57:37.000000000 +0000 +++ gimp-2.8.20/po-script-fu/zh_HK.po 2017-01-28 19:08:47.000000000 +0000 @@ -6,7 +6,7 @@ "PO-Revision-Date: 2012-09-10 19:13+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Hong Kong) \n" -"Language: zh_TW\n" +"Language: zh_HK\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po-tips/bs.po gimp-2.8.20/po-tips/bs.po --- gimp-2.8.18/po-tips/bs.po 2015-08-15 07:52:46.000000000 +0000 +++ gimp-2.8.20/po-tips/bs.po 2017-01-28 18:58:06.000000000 +0000 @@ -11,6 +11,7 @@ "PO-Revision-Date: 2015-02-14 22:23+0000\n" "Last-Translator: Samir Ribić \n" "Language-Team: Bosnian \n" +"Language: bs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po-tips/ca@valencia.po gimp-2.8.20/po-tips/ca@valencia.po --- gimp-2.8.18/po-tips/ca@valencia.po 2015-08-15 07:52:46.000000000 +0000 +++ gimp-2.8.20/po-tips/ca@valencia.po 2017-01-28 18:58:06.000000000 +0000 @@ -14,7 +14,7 @@ "PO-Revision-Date: 2011-12-23 20:58+0100\n" "Last-Translator: Eulalia \n" "Language-Team: Catalan \n" -"Language: ca-XV\n" +"Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po-tips/da.po gimp-2.8.20/po-tips/da.po --- gimp-2.8.18/po-tips/da.po 2015-08-20 22:57:37.000000000 +0000 +++ gimp-2.8.20/po-tips/da.po 2017-01-28 18:58:06.000000000 +0000 @@ -1,221 +1,203 @@ -# Danish translation of GIMP tips. +# Danish translation for GIMP tips. # Copyright (C) 2002, 03, 04, 05, 06, 08 Free Software Foundation, Inc. +# +# Yderligere oplysninger og konventioner kan findes på +# http://wiki.dansk-gruppen.dk/index.php/GIMP +# # Ole Laursen , 2002, 03, 04, 05, 06. # Joe Hansen , 2008. -# -# Se ../po/da.po for en liste over konventioner i Gimp'en. +# scootergrisen, 2015, 2016. # msgid "" msgstr "" "Project-Id-Version: GIMP tips\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-20 23:00+0200\n" -"PO-Revision-Date: 2008-10-20 18:36+0100\n" -"Last-Translator: Joe Hansen \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=gimp&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2016-03-16 07:11+0000\n" +"PO-Revision-Date: 2016-03-16 21:39+0100\n" +"Last-Translator: scootergrisen\n" "Language-Team: Danish \n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Language: da_DK\n" +"X-Source-Language: C\n" #: ../data/tips/gimp-tips.xml.in.h:1 msgid "" -"Ctrl-click with the Bucket Fill tool to have it use the background " -"color instead of the foreground color. Similarly, Ctrl-clicking " -"with the eyedropper tool sets the background color instead of the foreground " -"color." +"You can get context-sensitive help for most of GIMP's features by pressing " +"the F1 key at any time. This also works inside the menus." msgstr "" -"Ctrl-klik med udfyldningsværktøjet for at bruge baggrundsfarven i " -"stedet for forgrundsfarven. Tilsvarende vil Ctrl-klik med " -"farveopsnapperværktøjet vælge baggrundsfarven i stedet for forgrundsfarven." +"Du kan få kontekstfølsom hjælp til de fleste af Gimp'ens funktionaliteter " +"ved, når som helst, at trykke på F1-tasten. Det virker også inde i menuerne." #: ../data/tips/gimp-tips.xml.in.h:2 msgid "" -"Ctrl-clicking on the layer mask's preview in the Layers dialog " -"toggles the effect of the layer mask. Alt-clicking on the layer " -"mask's preview in the Layers dialog toggles viewing the mask directly." +"GIMP uses layers to let you organize your image. Think of them as a stack of " +"slides or filters, such that looking through them you see a composite of " +"their contents." msgstr "" -"Ctrl-klik på lagmaskens forhåndsvisning i lagvinduet slår " -"virkningen af masken til og fra. Alt-klik på lagmaskens " -"forhåndsvisning skifter mellem om masken vises direkte." +"Gimp'en bruger lag til at lade dig organisere dit billede. Tænk på dem som " +"en stak lysbilleder eller filtre. Når du kigger gennem dem, ser du et " +"billede der er sat sammen af deres indhold." #: ../data/tips/gimp-tips.xml.in.h:3 msgid "" -"Ctrl-drag with the Rotate tool will constrain the rotation to 15 " -"degree angles." +"You can perform many layer operations by right-clicking on the text label of " +"a layer in the Layers dialog." msgstr "" -"Ctrl-træk med roteringsværktøjet vil begrænse rotationen til 15 " -"graders vinkler." +"Du kan udføre mange lag-handlinger ved at højreklikke på tekstetiketten til " +"et lag i dialogen Lag." -# Ville egentlig bruge Skift her, men der er en anden streng med Shift. #: ../data/tips/gimp-tips.xml.in.h:4 msgid "" -"Shift-click on the eye icon in the Layers dialog to hide all layers " -"but that one. Shift-click again to show all layers." +"When you save an image to work on it again later, try using XCF, GIMP's " +"native file format (use the file extension .xcf). This preserves " +"the layers and many aspects of your work-in-progress. Once a project is " +"completed, you can export it as JPEG, PNG, GIF, etc." msgstr "" -"Shift-klik på øjeikonet i lagvinduet for at skjule alle lag pånær " -"dette. Shift-klik igen for at vise alle lag." +"Når du gemmer et billede for at arbejde på det senere, så prøv at bruge XCF " +"som er Gimp'ens eget filformat (brug filendelsen .xcf). Dette " +"bevarer lagene og alle andre aspekter af dit igangværende arbejde. Når et " +"projekt er færdigt, kan du gemme det som JPEG, PNG, GIF, osv." #: ../data/tips/gimp-tips.xml.in.h:5 msgid "" -"A floating selection must be anchored to a new layer or to the last active " -"layer before doing other operations on the image. Click on the "New " -"Layer" or the "Anchor Layer" button in the Layers dialog, or " -"use the menus to do the same." +"Most plug-ins work on the current layer of the current image. In some cases, " +"you will have to merge all layers (Image→Flatten Image) if you want the plug-" +"in to work on the whole image." msgstr "" -"En flydende markering skal forankres til et nyt lag eller det sidste aktive " -"lag før der kan foretages andre operationer på billedet. Klik på "Nyt " -"lag"- eller "Forankr lag"-knappen i lagvinduet eller brug " -"menuerne til at gøre det samme." +"De fleste plugins arbejder på det aktive lag i det aktive billede. I nogle " +"tilfælde bliver du nødt til at slå alle lagene sammen (Billede→Fladgør " +"billede) hvis du vil have modulet til at virke på hele billedet." #: ../data/tips/gimp-tips.xml.in.h:6 msgid "" -"After you enabled "Dynamic Keyboard Shortcuts" in the Preferences " -"dialog, you can reassign shortcut keys. Do so by bringing up the menu, " -"selecting a menu item, and pressing the desired key combination. If "" -"Save Keyboard Shortcuts" is enabled, the key bindings are saved when " -"you exit GIMP. You should probably disable "Dynamic Keyboard " -"Shortcuts" afterwards, to prevent accidentally assigning/reassigning " -"shortcuts." +"If a layer's name in the Layers dialog is displayed in bold, this " +"layer doesn't have an alpha-channel. You can add an alpha-channel using " +"Layer→Transparency→Add Alpha Channel." msgstr "" -"Hvis du aktiverer "Dynamiske tastegenveje" under indstillingerne, " -"kan du omdefinere genvejstaster i menuerne. Bring en menu frem, vælg et " -"menupunkt og tryk den ønskede tastekombination. Genvejen bliver gemt når du " -"afslutter Gimp'en hvis "Gem tastegenveje" er aktiveret. Du bør " -"formodentlig deaktivere dynamiske tastegenveje bagefter for at forhindre " -"omtildeling af en genvej ved et uheld." +"Hvis et lags navn i dialogen Lag vises med fed, har dette lag ikke en " +"alfa-kanal. Du kan tilføje en alfa-kanal med Lag→Gennemsigtighed→Tilføj alfa-" +"kanal." #: ../data/tips/gimp-tips.xml.in.h:7 msgid "" -"Click and drag on a ruler to place a guide on an image. All dragged " -"selections will snap to the guides. You can remove guides by dragging them " -"off the image with the Move tool." +"Not all effects can be applied to all kinds of images. This is indicated by " +"a grayed-out menu-entry. You may need to change the image mode to RGB " +"(Image→Mode→RGB), add an alpha-channel (Layer→Transparency→Add Alpha " +"Channel) or flatten it (Image→Flatten Image)." msgstr "" -"Klik og træk på en lineal for at placere en hjælpelinje i billedet. Alle " -"markeringer som bliver flyttet, vil så følge hjælpelinjerne. Du kan fjerne " -"linjerne igen ved at trække dem af billedet med flytteværktøjet." +"Ikke alle effekter kan bruges på alle typer billeder. Dette angives ved et " +"gråtonet menupunkt. Du får måske brug for at ændre billedtilstanden til RGB " +"(Billede→Tilstand→RGB), tilføje en alfa-kanal (Lag→Gennemsigtighed→Tilføj " +"alfa-kanal) eller fladgøre det (Billede→Fladgør billede)." #: ../data/tips/gimp-tips.xml.in.h:8 msgid "" -"GIMP supports gzip compression on the fly. Just add .gz (or ." -"bz2, if you have bzip2 installed) to the filename and your image will " -"be saved compressed. Of course loading compressed images works too." +"You can adjust or move a selection by using Alt-drag. If this makes " +"the window move, your window manager uses the Alt key already. Most " +"window managers can be configured to ignore the Alt key or to use " +"the Super key (or \"Windows logo\") instead." msgstr "" -"Gimp'en understøtter automatisk gzip-komprimering. Tilføj .gz " -"(eller .bz2 hvis du har bzip2 installeret) til filnavnet, og " -"billedet vil blive gemt komprimeret. Åbning af komprimerede billeder virker " -"selvfølgelig også." +"Du kan justere og flytte en markering ved at bruge Alt-træk. Hvis " +"dette får vinduet til at flytte sig, bruger din vindueshåndtering allerede " +"Alt-tasten. De fleste vindueshåndteringsprogrammer kan konfigureres " +"til at ignorere Alt-tasten eller til at anvende Super-" +"tasten (eller \"Windows logo\") i steden for." #: ../data/tips/gimp-tips.xml.in.h:9 msgid "" -"GIMP uses layers to let you organize your image. Think of them as a stack of " -"slides or filters, such that looking through them you see a composite of " -"their contents." +"You can drag and drop many things in GIMP. For example, dragging a color " +"from the toolbox or from a color palette and dropping it into an image will " +"fill the current selection with that color." msgstr "" -"Gimp'en bruger lag til at lade dig organisere dit billede. Tænk på dem som " -"en stabel lysbilleder eller filtre. Når du kigger gennem dem, ser du et " -"billede der er sat sammen af deres individuelle indhold." +"Du kan trække og slippe mange ting i Gimp'en. Hvis du f.eks. trækker en " +"farve fra værktøjskassen eller fra en farvepalet og slipper den i et " +"billede, vil billedet eller markeringen blive fyldt ud med den farve." #: ../data/tips/gimp-tips.xml.in.h:10 msgid "" -"If a layer's name in the Layers dialog is displayed in bold, this " -"layer doesn't have an alpha-channel. You can add an alpha-channel using " -"Layer→Transparency→Add Alpha Channel." +"You can use the middle mouse button to pan around the image (or optionally " +"hold Spacebar while you move the mouse)." msgstr "" -"Hvis et lags navn i lagvinduet vises med fed, har dette lag ikke en " -"alfakanal. Du kan tilføje en alfakanal med Lag→Gennemsigtighed→Tilføj " -"alfakanal." +"Du kan bruge den midterste museknap til at flytte rundt i billedet (eller " +"alternativt holde mellemrumstasten nede mens du flytter musen)." #: ../data/tips/gimp-tips.xml.in.h:11 msgid "" -"If some of your scanned photos do not look colorful enough, you can easily " -"improve their tonal range with the "Auto" button in the Levels " -"tool (Colors→Levels). If there are any color casts, you can correct them " -"with the Curves tool (Colors→Curves)." +"Click and drag on a ruler to place a guide on an image. All dragged " +"selections will snap to the guides. You can remove guides by dragging them " +"off the image with the Move tool." msgstr "" -"Hvis nogle af din indskannede fotografier ikke ser farverige nok ud, kan du " -"hurtigt forbedre deres farveområde med "Auto"-knappen i " -"niveauværktøjet (Farver→Niveauer). Hvis der er farveblødninger, kan du rette " -"dem med kurveværktøjet (Farver→Kurver)." +"Klik og træk på en lineal for at placere en hjælpelinje i billedet. Alle " +"markeringer som bliver flyttet, vil blive fastgjort til hjælpelinjerne. Du " +"kan fjerne linjerne igen ved at trække dem af billedet med flytteværktøjet." #: ../data/tips/gimp-tips.xml.in.h:12 msgid "" -"If you stroke a path (Edit→Stroke Path), the paint tools can be used with " -"their current settings. You can use the Paintbrush in gradient mode or even " -"the Eraser or the Smudge tool." +"You can drag a layer from the Layers dialog and drop it onto the toolbox. " +"This will create a new image containing only that layer." msgstr "" -"Hvis du bestryger en bane (Redigér→Bestryg bane), kan tegneværktøjerne " -"bruges med deres aktuelle indstillinger. Du kan bruge malerpenslen i " -"farveovergangstilstand, eller endda viskelæderet eller udtværingsværktøjet." +"Du kan trække et lag fra dialogen Lag og slippe det i værktøjskassen. Dette " +"opretter et nyt billede som kun indeholder det lag." #: ../data/tips/gimp-tips.xml.in.h:13 msgid "" -"If your screen is too cluttered, you can press Tab in an image " -"window to toggle the visibility of the toolbox and other dialogs." +"A floating selection must be anchored to a new layer or to the last active " +"layer before doing other operations on the image. Click on the "New " +"Layer" or the "Anchor Layer" button in the Layers dialog, or " +"use the menus to do the same." msgstr "" -"Hvis din skærm er for tæt pakket med vinduer kan du trykke på tabulator " -"flere gange i et billedvindue for at skjule værktøjskassen og andre vinduer." +"En flydende markering skal forankres til et nyt lag eller det sidste aktive " +"lag før der kan foretages andre operationer på billedet. Klik på "Nyt " +"lag"- eller "Forankr lag"-knappen i dialogen Lag eller brug " +"menuerne til at gøre det samme." #: ../data/tips/gimp-tips.xml.in.h:14 msgid "" -"Most plug-ins work on the current layer of the current image. In some cases, " -"you will have to merge all layers (Image→Flatten Image) if you want the plug-" -"in to work on the whole image." +"GIMP supports gzip compression on the fly. Just add .gz (or ." +"bz2, if you have bzip2 installed) to the filename and your image will " +"be saved compressed. Of course loading compressed images works too." msgstr "" -"De fleste udvidelsesmoduler arbejder på det aktive lag i det aktive billede. " -"I nogle tilfælde bliver du nødt til at slå alle lagene sammen " -"(Billede→Fladgør billede) hvis du vil have modulet til at virke på hele " -"billedet." +"Gimp'en understøtter automatisk gzip-komprimering. Tilføj .gz " +"(eller .bz2 hvis du har bzip2 installeret) til filnavnet, og " +"billedet vil blive gemt komprimeret. Åbning af komprimerede billeder virker " +"selvfølgelig også." #: ../data/tips/gimp-tips.xml.in.h:15 msgid "" -"Not all effects can be applied to all kinds of images. This is indicated by " -"a grayed-out menu-entry. You may need to change the image mode to RGB " -"(Image→Mode→RGB), add an alpha-channel (Layer→Transparency→Add Alpha " -"Channel) or flatten it (Image→Flatten Image)." -msgstr "" -"Ikke alle effekter kan bruges på alle typer billeder. Dette bliver indikeret " -"ved et gråtonet menupunkt. Du får måske bruge for at ændre billedtilstanden " -"til RGB (Billede→Tilstand→RGB), tilføje en alfakanal " -"(Lag→Gennemsigtighed→Tilføj alfakanal) eller fladgøre det (Billede→Fladgør " -"billede)." - -#: ../data/tips/gimp-tips.xml.in.h:16 -msgid "" "Pressing and holding the Shift key before making a selection allows " "you to add to the current selection instead of replacing it. Using Ctrl before making a selection subtracts from the current one." msgstr "" -"Hvis du holder Shift-tasten nede før du markerer noget, kan du " +"Hvis du holder Skift-tasten nede før du markerer noget, kan du " "tilføje til den aktuelle markering i stedet for at erstatte den. Hvis " "Ctrl holdes ned før noget markeres, trækkes der fra markeringen." -#: ../data/tips/gimp-tips.xml.in.h:17 +#: ../data/tips/gimp-tips.xml.in.h:16 msgid "" -"When you save an image to work on it again later, try using XCF, GIMP's " -"native file format (use the file extension .xcf). This preserves " -"the layers and every aspect of your work-in-progress. Once a project is " -"completed, you can save it as JPEG, PNG, GIF, ..." +"You can draw simple squares or circles using Edit→Stroke Selection. It " +"strokes the edge of your current selection. More complex shapes can be drawn " +"using the Path tool or with Filters→Render→Gfig." msgstr "" -"Når du gemmer et billede for at arbejde på det senere, så prøv at bruge XCF " -"som er Gimp'ens eget filformat (brug filendelsen .xcf). Dette " -"bevarer lagene og alle andre aspekter af dit igangværende arbejde. Når et " -"projekt er færdigt, kan du gemme det som JPEG, PNG, GIF, ..." +"Du kan tegne simple firkanter eller cirkler med Redigér→Bestryg markering. " +"Det bestryger kanten af den aktuelle markering. Mere komplekse figurer kan " +"tegnes med baneværktøjet eller med Filtre→Generér→Figurer." -#: ../data/tips/gimp-tips.xml.in.h:18 +#: ../data/tips/gimp-tips.xml.in.h:17 msgid "" -"You can adjust or move a selection by using Alt-drag. If this makes " -"the window move, your window manager uses the Alt key already. Most " -"window managers can be configured to ignore the Alt key or to use " -"the Super key (or \"Windows logo\") instead." +"If you stroke a path (Edit→Stroke Path), the paint tools can be used with " +"their current settings. You can use the Paintbrush in gradient mode or even " +"the Eraser or the Smudge tool." msgstr "" -"Du kan justere og flytte en markering ved at bruge Alt-træk. Hvis " -"dette får vinduet til at flytte sig, bruger din vindueshåndtering allerede " -"Alt-tasten. De fleste vindueshåndteringsprogrammer kan konfigureres " -"til at ignorere Alt-tasten eller til at anvende Super-" -"tasten (eller \"Windows logo\") i steden for." +"Hvis du bestryger en bane (Redigér→Bestryg bane), kan tegneværktøjerne " +"bruges med deres aktuelle indstillinger. Du kan bruge malerpenslen i " +"farveovergangstilstand, eller endda viskelæderet eller udtværingsværktøjet." -#: ../data/tips/gimp-tips.xml.in.h:19 +#: ../data/tips/gimp-tips.xml.in.h:18 msgid "" "You can create and edit complex selections using the Path tool. The Paths " "dialog allows you to work on multiple paths and to convert them to " @@ -225,167 +207,109 @@ "Banevinduet lader dig arbejde på flere baner og så konvertere dem til " "markeringer." +#: ../data/tips/gimp-tips.xml.in.h:19 +msgid "" +"You can use the paint tools to change the selection. Click on the "" +"Quick Mask" button at the bottom left of an image window. Change your " +"selection by painting in the image and click on the button again to convert " +"it back to a normal selection." +msgstr "" +"Du kan bruge tegneværktøjerne til at ændre markeringen. Klik på " +"ekspresmaskeknappen for neden til venstre i et billedvindue. Ændr " +"markeringen ved at tegne i billedet og klik på knappen igen for at " +"konvertere tilbage til en normal markering." + #: ../data/tips/gimp-tips.xml.in.h:20 msgid "" -"You can drag a layer from the Layers dialog and drop it onto the toolbox. " -"This will create a new image containing only that layer." +"You can save a selection to a channel (Select→Save to Channel) and then " +"modify this channel with any paint tools. Using the buttons in the Channels " +"dialog, you can toggle the visibility of this new channel or convert it to a " +"selection." msgstr "" -"Du kan trække et lag fra lagvinduet og slippe det i værktøjskassen. Dette " -"opretter et nyt billede som kun indeholder det lag." +"Du kan gemme en markering som en kanel (Markering→Gem som kanal) og så ændre " +"denne kanal med maleværktøjerne. Ved hjælp af knapperne i kanalvinduet kan " +"du slå synligheden af denne nye kanal til eller fra eller konvertere den til " +"en markering." #: ../data/tips/gimp-tips.xml.in.h:21 msgid "" -"You can drag and drop many things in GIMP. For example, dragging a color " -"from the toolbox or from a color palette and dropping it into an image will " -"fill the current selection with that color." +"After you enabled "Dynamic Keyboard Shortcuts" in the Preferences " +"dialog, you can reassign shortcut keys. Do so by bringing up the menu, " +"selecting a menu item, and pressing the desired key combination. If "" +"Save Keyboard Shortcuts" is enabled, the key bindings are saved when " +"you exit GIMP. You should probably disable "Dynamic Keyboard " +"Shortcuts" afterwards, to prevent accidentally assigning/reassigning " +"shortcuts." msgstr "" -"Du kan trække og slippe mange ting i Gimp'en. Hvis du f.eks. trækker en " -"farve fra værktøjskassen eller fra en farvepalet og slipper den i et " -"billede, vil billedet eller markeringen blive fyldt ud med den farve." +"Hvis du aktiverer "Dynamiske tastaturgenveje" under " +"indstillingerne, kan du omdefinere genvejstaster i menuerne. Bring en menu " +"frem, vælg et menupunkt og tryk den ønskede tastekombination. Genvejen " +"bliver gemt når du afslutter Gimp'en hvis "Gem tastaturgenveje" er " +"aktiveret. Du bør formodentlig deaktivere "Dynamiske " +"tastaturgenveje" bagefter for at forhindre omtildeling af en genvej ved " +"et uheld." #: ../data/tips/gimp-tips.xml.in.h:22 msgid "" -"You can draw simple squares or circles using Edit→Stroke Selection. It " -"strokes the edge of your current selection. More complex shapes can be drawn " -"using the Path tool or with Filters→Render→Gfig." +"If your screen is too cluttered, you can press Tab in an image " +"window to toggle the visibility of the toolbox and other dialogs." msgstr "" -"Du kan tegne simple firkanter eller cirkler med Rediger→Bestryg markering. " -"Det bestryger kanten af den aktuelle markering. Mere komplekse figurer kan " -"tegnes med baneværktøjet eller med Filtre→Generér→Figurer." +"Hvis din skærm er for tætpakket med vinduer kan du trykke på Tab " +"flere gange i et billedvindue for at skjule værktøjskassen og andre vinduer." #: ../data/tips/gimp-tips.xml.in.h:23 msgid "" -"You can get context-sensitive help for most of GIMP's features by pressing " -"the F1 key at any time. This also works inside the menus." +"Shift-click on the eye icon in the Layers dialog to hide all layers " +"but that one. Shift-click again to show all layers." msgstr "" -"Du kan få kontekstafhængig hjælp til de fleste af Gimp'ens faciliteter ved " -"at trykke på F1-tasten på et hvilket som helst tidspunkt. Det virker også " -"inde i menuer." +"Skift-klik på øjeikonet i dialogen Lag for at skjule alle lag pånær " +"dette. Skift-klik igen for at vise alle lag." #: ../data/tips/gimp-tips.xml.in.h:24 msgid "" -"You can perform many layer operations by right-clicking on the text label of " -"a layer in the Layers dialog." +"Ctrl-clicking on the layer mask's preview in the Layers dialog " +"toggles the effect of the layer mask. Alt-clicking on the layer " +"mask's preview in the Layers dialog toggles viewing the mask directly." msgstr "" -"Du kan udføre mange lagoperationer ved at højreklikke på tekstetiketten til " -"et lag i lagvinduet." +"Ctrl-klik på lagmaskens forhåndsvisning i dialogen Lag slår " +"virkningen af masken til og fra. Alt-klik på lagmaskens " +"forhåndsvisning skifter mellem om masken vises direkte." #: ../data/tips/gimp-tips.xml.in.h:25 msgid "" -"You can save a selection to a channel (Select→Save to Channel) and then " -"modify this channel with any paint tools. Using the buttons in the Channels " -"dialog, you can toggle the visibility of this new channel or convert it to a " -"selection." -msgstr "" -"Du kan gemme en markering som en kanel (Markering→Gem som kanal) og så ændre " -"denne kanal med maleværktøjerne. Ved hjælp af knapperne i kanalvinduet kan " -"du slå synligheden af denne nye kanal til eller fra eller konvertere den til " -"en markering." - -#: ../data/tips/gimp-tips.xml.in.h:26 -msgid "" "You can use Ctrl-Tab to cycle through all layers in an " "image (if your window manager doesn't trap those keys...)." msgstr "" "Du kan bruge Ctrl-Tab til at gå gennem alle lagene i et " "billede (hvis din vindueshåndtering ikke bruger den kombination...)." +#: ../data/tips/gimp-tips.xml.in.h:26 +msgid "" +"Ctrl-click with the Bucket Fill tool to have it use the background " +"color instead of the foreground color. Similarly, Ctrl-clicking " +"with the eyedropper tool sets the background color instead of the foreground " +"color." +msgstr "" +"Ctrl-klik med spandudfyldningsværktøjet for at bruge " +"baggrundsfarven i stedet for forgrundsfarven. Tilsvarende vil Ctrl-" +"klik med pipetteværktøjet vælge baggrundsfarven i stedet for forgrundsfarven." + #: ../data/tips/gimp-tips.xml.in.h:27 msgid "" -"You can use the middle mouse button to pan around the image (or optionally " -"hold Spacebar while you move the mouse)." +"Ctrl-drag with the Rotate tool will constrain the rotation to 15 " +"degree angles." msgstr "" -"Du kan bruge den midterste museknap til at flytte rundt i billedet (eller " -"alternativt holde mellemrumstasten nede mens du flytter musen)." +"Ctrl-træk med roteringsværktøjet vil begrænse rotationen til 15 " +"graders vinkler." #: ../data/tips/gimp-tips.xml.in.h:28 msgid "" -"You can use the paint tools to change the selection. Click on the "" -"Quick Mask" button at the bottom left of an image window. Change your " -"selection by painting in the image and click on the button again to convert " -"it back to a normal selection." +"If some of your scanned photos do not look colorful enough, you can easily " +"improve their tonal range with the "Auto" button in the Levels " +"tool (Colors→Levels). If there are any color casts, you can correct them " +"with the Curves tool (Colors→Curves)." msgstr "" -"Du kan bruge tegneværktøjerne til at ændre markeringen. Klik på " -"ekspresmaskeknappen for neden til venstre i et billedvindue. Ændr " -"markeringen ved at tegne i billedet og klik på knappen igen for at " -"konvertere tilbage til en normal markering." - -#~ msgid "Welcome to the GNU Image Manipulation Program!" -#~ msgstr "Velkommen til GNU Image Manipulation Program!" - -#~ msgid "" -#~ "GIMP allows you to undo most changes to the image, so feel free to " -#~ "experiment." -#~ msgstr "" -#~ "Gimp'en lader dig fortryde de fleste ændringer i et billede, så gå bare i " -#~ "gang med at eksperimentere." - -#~ msgid "" -#~ "To create a circle-shaped selection, hold Shift while doing an " -#~ "ellipse select. To place a circle precisely, drag horizontal and vertical " -#~ "guides tangent to the circle you want to select, place your cursor at the " -#~ "intersection of the guides, and the resulting selection will just touch " -#~ "the guides." -#~ msgstr "" -#~ "For at lave en perfekt cirkel skal du holde Shift-tasten nede " -#~ "mens du foretager en ellipsemarkering. Cirklen kan placeres præcist hvis " -#~ "du trækker vandrette og lodrette hjælpelinjer så de tangerer cirklen som " -#~ "skal markeres, og placerer markøren ved skæringspunktet mellem linjerne. " -#~ "Så vil resultatet lige præcis røre hjælpelinjerne." - -#~ msgid "" -#~ "Alt-click on the layer mask's preview in the Layers dialog " -#~ "toggles viewing the mask directly." -#~ msgstr "" -#~ "Hold Alt nede og klik på lagmaskens miniature i \"Lag\"-vinduet " -#~ "for at vise masken direkte." - -#~ msgid "" -#~ "When using a drawing tool (Paintbrush, Airbrush, or Pencil), Shift-click will draw a straight line from your last drawing point to your " -#~ "current cursor position. If you also press Ctrl, the line will " -#~ "be constrained to 15 degree angles." -#~ msgstr "" -#~ "Ved brug af et tegneværktøj (malerpensel, sprøjtepensel eller blyant) vil " -#~ "et klik med skiftetasten holdt nede tegne en ret linje fra det sidste " -#~ "tegnepunkt til den nuværende markørposition. Hvis du også trykker på " -#~ "Ctrl, tvinges linjen til at følge 15 graders vinkler." - -#~ msgid "" -#~ "You can adjust the selection range for fuzzy select by clicking and " -#~ "dragging left and right." -#~ msgstr "" -#~ "Du kan tilpasse markeringsintervallet for udflydende markering ved at " -#~ "klikke og trække til højre eller venstre." - -#~ msgid "" -#~ "The layer named "Background" is special because it lacks " -#~ "transparency. This prevents you from moving the layer up in the stack. " -#~ "You may add transparency to it by right-clicking in the Layers dialog and " -#~ "selecting "Add Alpha Channel"." -#~ msgstr "" -#~ "Laget ved navn "Baggrund" er specielt fordi det mangler " -#~ "gennemsigtighed. Dette forhindrer dig i at tilføje en lagmaske eller hæve " -#~ "laget i stakken. Du kan tilføje gennemsigtighed til det ved at " -#~ "højreklikke i lagvinduet og vælge "Tilføj alfakanal"." - -#~ msgid "" -#~ "The file selection dialog box has command-line completion with Tab, just like the shell. Type part of a filename, hit Tab, and " -#~ "voila, it's completed." -#~ msgstr "" -#~ "Filvælgervinduet har kommandolinjefuldførelse med tabulatortasten, " -#~ "ligesom en kommandoskal. Indtast en del af et filnavn, tryk på tabulator " -#~ "og vupti! Navnet bliver fuldført." - -#~ msgid "" -#~ "Nearly all image operations are performed by right-clicking on the image. " -#~ "And don't worry, you can undo most mistakes..." -#~ msgstr "" -#~ "Næsten alle billedoperationer foregår ved at højreklikke på billedet. Og " -#~ "vær ikke nervøs, du kan fortryde de fleste fejltagelser..." - -#~ msgid "You can adjust and re-place a selection by using Alt-drag." -#~ msgstr "" -#~ "Du kan tilpasse og flytte en markering med træk med Alt holdt " -#~ "nede." +"Hvis nogle af din indskannede fotografier ikke ser farverige nok ud, kan du " +"hurtigt forbedre deres farveområde med "Auto"-knappen i " +"niveauværktøjet (Farver→Niveauer). Hvis der er farveblødninger, kan du rette " +"dem med kurveværktøjet (Farver→Kurver)." diff -Nru gimp-2.8.18/po-tips/pl.po gimp-2.8.20/po-tips/pl.po --- gimp-2.8.18/po-tips/pl.po 2015-11-01 01:20:52.000000000 +0000 +++ gimp-2.8.20/po-tips/pl.po 2017-01-28 19:08:47.000000000 +0000 @@ -1,38 +1,34 @@ -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Aviary.pl -# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz -# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: -# gnomepl@aviary.pl -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +# Polish translation for gimp-tips. +# Copyright © 2002-2016 the gimp authors. +# This file is distributed under the same license as the gimp package. # GNOME PL Team , 2002-2005. # Artur Polaczyński , 2002-2003. # Bartosz Kosiorek , 2005-2007. -# Piotr Drąg , 2011-2015. -# Aviary.pl , 2011-2015. +# Piotr Drąg , 2011-2016. +# Aviary.pl , 2011-2016. +# msgid "" msgstr "" "Project-Id-Version: gimp-tips\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-29 18:37+0200\n" -"PO-Revision-Date: 2015-08-29 18:38+0200\n" +"POT-Creation-Date: 2016-09-07 18:48+0200\n" +"PO-Revision-Date: 2016-09-07 18:49+0200\n" "Last-Translator: Piotr Drąg \n" -"Language-Team: Polish \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Poedit-Language: Polish\n" -"X-Poedit-Country: Poland\n" #: ../data/tips/gimp-tips.xml.in.h:1 msgid "" "You can get context-sensitive help for most of GIMP's features by pressing " "the F1 key at any time. This also works inside the menus." msgstr "" -"Pomoc do wielu narzędzi i efektów programu GIMP dostępna jest po naciśnięciu " -"klawisza F1. Dostępna jest ona również w menu. " +"Pomoc do wielu narzędzi i efektów programu GIMP dostępna jest po naciśnięciu " +"klawisza F1. Dostępna jest ona również w menu. " #: ../data/tips/gimp-tips.xml.in.h:2 msgid "" @@ -41,9 +37,9 @@ "their contents." msgstr "" "Program GIMP opiera swoje działanie na warstwach, które umożliwiają " -"porządkowanie obrazu. Warstwy można sobie wyobrażać jako ułożone w stos " -"przeźrocza lub filtry, natomiast efekt końcowy jest złożeniem zawartości " -"składników stosu." +"porządkowanie obrazu. Warstwy można sobie wyobrażać jako ułożone w stos " +"przeźrocza lub filtry, natomiast efekt jest złożeniem zawartości składników " +"stosu." #: ../data/tips/gimp-tips.xml.in.h:3 msgid "" @@ -51,7 +47,7 @@ "a layer in the Layers dialog." msgstr "" "Wiele działań na warstwach (np. dopasowanie, przesuwanie) można wykonać " -"klikając drugim przyciskiem myszy nazwę warstwy w oknie „Warstwy”." +"klikając drugim przyciskiem myszy nazwę warstwy w oknie „Warstwy”." #: ../data/tips/gimp-tips.xml.in.h:4 msgid "" @@ -60,7 +56,7 @@ "the layers and many aspects of your work-in-progress. Once a project is " "completed, you can export it as JPEG, PNG, GIF, etc." msgstr "" -"Jeśli obraz jest zapisywany w celu ponowienia nad nim pracy w późniejszym " +"Jeśli obraz jest zapisywany w celu ponowienia nad nim pracy w późniejszym " "czasie, to można spróbować użyć formatu XCF, własnego formatu programu GIMP " "(rozszerzenie .xcf). Pozwoli to na zapisanie warstw, zaznaczeń oraz " "wielu innych rzeczy dotyczących danego projektu. Po ukończeniu pracy można " @@ -74,7 +70,7 @@ msgstr "" "Większość wtyczek wykonuje działania tylko na aktywnej warstwie. Jeśli " "działanie dotyczyć ma wszystkich warstw, przed jej wykonaniem należy " -"połączyć wszystkie warstwy w jedną („Obraz→Spłaszcz obraz”)." +"połączyć wszystkie warstwy w jedną („Obraz→Spłaszcz obraz”)." #: ../data/tips/gimp-tips.xml.in.h:6 msgid "" @@ -82,9 +78,9 @@ "layer doesn't have an alpha-channel. You can add an alpha-channel using " "Layer→Transparency→Add Alpha Channel." msgstr "" -"Jeśli nazwa warstwy w oknie „Warstwy” jest pogrubiona, oznacza to, że " -"nie posiada ona kanału alfa (przezroczystości). Można dodać kanał alfa " -"wybierając „Warstwa→Przezroczystość→Dodaj kanał alfa”." +"Jeśli nazwa warstwy w oknie „Warstwy” jest pogrubiona, oznacza to, że " +"nie ma ona kanału alfa (przezroczystości). Można dodać kanał alfa wybierając " +"„Warstwa→Przezroczystość→Dodaj kanał alfa”." #: ../data/tips/gimp-tips.xml.in.h:7 msgid "" @@ -94,7 +90,7 @@ "Channel) or flatten it (Image→Flatten Image)." msgstr "" "Nie wszystkie efekty mogą być wykorzystywane na obrazach dowolnych typów. " -"Efekty, których nie można użyć na bieżącym obrazie, są w menu szare. Aby ich " +"Efekty, których nie można użyć na bieżącym obrazie, są w menu szare. Aby ich " "użyć, należy zmienić tryb obrazu na RGB („Obraz→Tryb→RGB”), dodać kanał alfa " "(„Warstwa→Przezroczystość→Dodaj kanał alfa”) lub spłaszczyć obraz " "(„Obraz→Spłaszcz obraz”)." @@ -106,7 +102,7 @@ "window managers can be configured to ignore the Alt key or to use " "the Super key (or \"Windows logo\") instead." msgstr "" -"Zaznaczenie można przesuwać, przeciągając je z klawiszem Alt. Jeśli " +"Zaznaczenie można przesuwać, przeciągając je z klawiszem Alt. Jeśli " "to powoduje przesunięcie okna, oznacza to, że menedżer okien używa już " "klawisza Alt. Większość menedżerów okien jest skonfigurowanych tak, " "aby ignorować klawisz Alt lub używać zamiennie klawisza Super, if you have bzip2 installed) to the filename and your image will " "be saved compressed. Of course loading compressed images works too." msgstr "" -"Program GIMP obsługuję kompresję gzip w locie. Dodanie rozszerzenie .gz.gz (lub .bz2, jeśli program bzip2 jest zainstalowany) do nazwy " "pliku spowoduje skompresowanie obrazu. Oczywiście można także wczytywać " "skompresowane obrazy." @@ -179,10 +175,10 @@ "you to add to the current selection instead of replacing it. Using Ctrl before making a selection subtracts from the current one." msgstr "" -"Podczas korzystania z któregokolwiek z narzędzi zaznaczania możliwe jest " -"dodanie obszaru do już istniejącego zaznaczenia. W tym celu należy przed " -"rozpoczęciem zaznaczania przycisnąć i przytrzymać klawisz Shift. " -"Analogicznie, przyciśnięcie i przytrzymanie klawisza Ctrl spowoduje " +"Podczas korzystania z któregokolwiek z narzędzi zaznaczania możliwe jest " +"dodanie obszaru do już istniejącego zaznaczenia. W tym celu należy przed " +"rozpoczęciem zaznaczania przycisnąć i przytrzymać klawisz Shift. " +"Analogicznie, przyciśnięcie i przytrzymanie klawisza Ctrl spowoduje " "odjęcie nowego obszaru od istniejącego zaznaczenia." #: ../data/tips/gimp-tips.xml.in.h:16 @@ -192,8 +188,8 @@ "using the Path tool or with Filters→Render→Gfig." msgstr "" "„Edycja→Rysuj wzdłuż zaznaczenia” pozwala na rysowanie bieżącym pędzlem " -"krzywych wzdłuż krawędzi zaznaczenia. Bardziej złożone figury można uzyskać, " -"używając narzędzia „Ścieżki” lub opcji „Filtry→Renderowanie→Gfigury”." +"krzywych wzdłuż krawędzi zaznaczenia. Bardziej złożone figury można uzyskać " +"za pomocą narzędzia „Ścieżki” lub opcji „Filtry→Renderowanie→Gfigury”." #: ../data/tips/gimp-tips.xml.in.h:17 msgid "" @@ -202,8 +198,8 @@ "the Eraser or the Smudge tool." msgstr "" "Podczas rysowania wzdłuż ścieżki („Edycja→Rysuj wzdłuż ścieżki”) możliwe " -"jest użycie dowolnego narzędzia rysowania z jego bieżącymi ustawieniami. " -"Można więc pociągnąć ścieżkę „pędzlem” w trybie gradientu, „gumką” lub " +"jest użycie dowolnego narzędzia rysowania z jego bieżącymi ustawieniami. " +"Można więc pociągnąć ścieżkę „pędzlem” w trybie gradientu, „gumką” lub " "„rozsmarowywaniem”." #: ../data/tips/gimp-tips.xml.in.h:18 @@ -212,9 +208,9 @@ "dialog allows you to work on multiple paths and to convert them to " "selections." msgstr "" -"Przy użyciu narzędzia „Ścieżki”, można tworzyć i modyfikować skomplikowane " -"zaznaczenia. Okno „Ścieżki” pozwala pracować nad wieloma ścieżkami i " -"konwertować je do zaznaczenia." +"Przy użyciu narzędzia „Ścieżki”, można tworzyć i modyfikować skomplikowane " +"zaznaczenia. Okno „Ścieżki” pozwala pracować nad wieloma ścieżkami " +"i konwertować je do zaznaczenia." #: ../data/tips/gimp-tips.xml.in.h:19 msgid "" @@ -224,10 +220,10 @@ "it back to a normal selection." msgstr "" "Do zmiany zaznaczenia można używać narzędzi malowania. Wystarczy kliknąć " -"przycisk „Szybka maska” w lewym dolnym rogu okna obrazu (mały kwadracik). Od " -"tej chwili można modyfikować zaznaczenie jako kolor, używając bieżącego " +"przycisk „Szybka maska” w lewym dolnym rogu okna obrazu (mały kwadracik). Od " +"tej chwili można modyfikować zaznaczenie jako kolor za pomocą bieżącego " "narzędzia. Po zakończeniu modyfikacji można przywrócić zwykły widok, " -"klikając jeszcze raz na przycisk z „kwadracikiem”." +"klikając jeszcze raz na przycisk z „kwadracikiem”." #: ../data/tips/gimp-tips.xml.in.h:20 msgid "" @@ -236,8 +232,8 @@ "dialog, you can toggle the visibility of this new channel or convert it to a " "selection." msgstr "" -"Można zapisywać zaznaczenie do kanału („Zaznaczenie→Zapisz do kanału”) i " -"modyfikować je dowolnym narzędziem malarskim. Przyciskami w oknie „Kanały” " +"Można zapisywać zaznaczenie do kanału („Zaznaczenie→Zapisz do kanału”) " +"i modyfikować je dowolnym narzędziem malarskim. Przyciskami w oknie „Kanały” " "można ustawić widoczność kanału lub konwertować go na zaznaczenie." #: ../data/tips/gimp-tips.xml.in.h:21 @@ -250,11 +246,11 @@ "Shortcuts" afterwards, to prevent accidentally assigning/reassigning " "shortcuts." msgstr "" -"Jeśli w preferencjach programu GIMP włączono opcję „Dynamiczne skróty " -"klawiszowe”, wówczas można zmieniać skróty klawiszowe w trakcie działania. " -"Aby to zrobić, wystarczy otworzyć menu z wybranym poleceniem, wyróżnić " -"pozycję odpowiadającą poleceniu, a następnie przycisnąć kombinację klawiszy " -"stanowiącą nowy skrót klawiszowy. Jeśli w preferencjach włączona jest opcja " +"Jeśli w preferencjach programu GIMP włączono opcję „Dynamiczne skróty " +"klawiszowe”, wówczas można zmieniać skróty klawiszowe w trakcie działania. " +"Aby to zrobić, wystarczy otworzyć menu z wybranym poleceniem, wyróżnić " +"pozycję odpowiadającą poleceniu, a następnie przycisnąć kombinację klawiszy " +"stanowiącą nowy skrót klawiszowy. Jeśli w preferencjach włączona jest opcja " "„Zapisywanie skrótów klawiszowych przed zakończeniem”, to wszystkie skróty " "klawiszowe zostaną zapamiętane podczas zakończenia programu GIMP. Następnym " "razem warto wyłączyć „Dynamiczne skróty klawiszowe”, aby uniknąć " @@ -274,9 +270,9 @@ "Shift-click on the eye icon in the Layers dialog to hide all layers " "but that one. Shift-click again to show all layers." msgstr "" -"Shift i kliknięcie ikony oka umieszczonej obok podglądu wybranej " -"warstwy (w oknie „Warstwy”) ukrywa wszystkie warstwy poza jedną. Ponowne " -"kliknięcie ikony oka z klawiszem Shift wyświetli wszystkie warstwy." +"Shift i kliknięcie ikony oka umieszczonej obok podglądu wybranej " +"warstwy (w oknie „Warstwy”) ukrywa wszystkie warstwy poza jedną. Ponowne " +"kliknięcie ikony oka z klawiszem Shift wyświetli wszystkie warstwy." #: ../data/tips/gimp-tips.xml.in.h:24 msgid "" @@ -284,9 +280,9 @@ "toggles the effect of the layer mask. Alt-clicking on the layer " "mask's preview in the Layers dialog toggles viewing the mask directly." msgstr "" -"Ctrl i kliknięcie na podglądzie warstwy maski w oknie „Warstwy” " -"przełącza efekt warstwy maski. Alt i kliknięcie na podglądzie " -"warstwy maski w oknie „Warstwy” przełącza podgląd maski." +"Ctrl i kliknięcie podglądu warstwy maski w oknie „Warstwy” " +"przełącza efekt warstwy maski. Alt i kliknięcie podglądu warstwy " +"maski w oknie „Warstwy” przełącza podgląd maski." #: ../data/tips/gimp-tips.xml.in.h:25 msgid "" @@ -294,7 +290,7 @@ "image (if your window manager doesn't trap those keys...)." msgstr "" "Pomiędzy warstwami obrazu można przełączać się przy użyciu klawiszy Alt-Tab (o ile nie przechwyci ich menedżer okien)." +"tt>-Tab (o ile nie przechwyci ich menedżer okien)." #: ../data/tips/gimp-tips.xml.in.h:26 msgid "" @@ -303,18 +299,18 @@ "with the eyedropper tool sets the background color instead of the foreground " "color." msgstr "" -"Ctrl i kliknięcie na „Wypełnienie kubełkiem”, powoduje że do " +"Ctrl i kliknięcie „Wypełnienie kubełkiem” powoduje, że do " "wypełnienia zostanie użyty kolor tła, zamiast koloru pierwszoplanowego. " -"Podobnie Ctrl i kliknięcie na „Kroplomierzu” ustawia kolor tła " -"zamiast koloru pierwszoplanowego." +"Podobnie Ctrl i kliknięcie „Kroplomierz” ustawia kolor tła zamiast " +"koloru pierwszoplanowego." #: ../data/tips/gimp-tips.xml.in.h:27 msgid "" "Ctrl-drag with the Rotate tool will constrain the rotation to 15 " "degree angles." msgstr "" -"Podczas korzystania z narzędzia „Obrót”, przeciąganie kursora przy " -"wciśniętym klawiszu Ctrl wymusza obrót z krokiem co 15 stopni." +"Podczas korzystania z narzędzia „Obrót”, przeciąganie kursora przy " +"wciśniętym klawiszu Ctrl wymusza obrót z krokiem co 15 stopni." #: ../data/tips/gimp-tips.xml.in.h:28 msgid "" @@ -324,6 +320,6 @@ "with the Curves tool (Colors→Curves)." msgstr "" "Jeśli zeskanowane zdjęcia są mało kolorowe, można poprawić ich kolorystykę " -"korzystając z narzędzia „Poziomy” („Kolory→Poziomy”), klikając przycisk " +"korzystając z narzędzia „Poziomy” („Kolory→Poziomy”), klikając przycisk " "„Automatycznie”. Zniekształcenia kolorów można skorygować za pomocą " "narzędzia „Krzywe” („Kolory→Krzywe”)." diff -Nru gimp-2.8.18/po-tips/pt.po gimp-2.8.20/po-tips/pt.po --- gimp-2.8.18/po-tips/pt.po 2015-08-20 22:57:37.000000000 +0000 +++ gimp-2.8.20/po-tips/pt.po 2017-01-28 19:08:47.000000000 +0000 @@ -16,7 +16,7 @@ "PO-Revision-Date: 2015-07-22 10:46+0100\n" "Last-Translator: Pedro Albuquerque \n" "Language-Team: Português \n" -"Language: pt_PT\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po-tips/sr@latin.po gimp-2.8.20/po-tips/sr@latin.po --- gimp-2.8.18/po-tips/sr@latin.po 2015-08-20 22:57:37.000000000 +0000 +++ gimp-2.8.20/po-tips/sr@latin.po 2017-01-28 19:08:47.000000000 +0000 @@ -14,7 +14,7 @@ "PO-Revision-Date: 2014-03-27 06:44+0200\n" "Last-Translator: Miroslav Nikolić \n" "Language-Team: Serbian \n" -"Language: sr\n" +"Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po-tips/sr.po gimp-2.8.20/po-tips/sr.po --- gimp-2.8.18/po-tips/sr.po 2015-11-01 01:20:52.000000000 +0000 +++ gimp-2.8.20/po-tips/sr.po 2017-01-28 19:08:47.000000000 +0000 @@ -16,7 +16,7 @@ "PO-Revision-Date: 2013-04-08 15:43+0200\n" "Last-Translator: Милош Поповић \n" "Language-Team: српски \n" -"Language: \n" +"Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/po-tips/zh_HK.po gimp-2.8.20/po-tips/zh_HK.po --- gimp-2.8.18/po-tips/zh_HK.po 2015-08-15 07:52:46.000000000 +0000 +++ gimp-2.8.20/po-tips/zh_HK.po 2017-01-28 18:58:07.000000000 +0000 @@ -11,7 +11,7 @@ "PO-Revision-Date: 2010-10-30 19:53+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Hong Kong) \n" -"Language: zh_TW\n" +"Language: zh_HK\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gimp-2.8.18/py-compile gimp-2.8.20/py-compile --- gimp-2.8.18/py-compile 2014-10-20 00:18:19.000000000 +0000 +++ gimp-2.8.20/py-compile 2016-11-01 23:33:03.000000000 +0000 @@ -3,8 +3,7 @@ scriptversion=2011-06-08.12; # UTC -# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008, 2009, 2011 Free -# Software Foundation, Inc. +# Copyright (C) 2000-2014 Free Software Foundation, Inc. # 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 @@ -37,7 +36,7 @@ usage_error () { echo "$me: $*" >&2 - echo "Try \`$me --help' for more information." >&2 + echo "Try '$me --help' for more information." >&2 exit 1 } @@ -117,7 +116,7 @@ fi $PYTHON -c " -import sys, os, py_compile +import sys, os, py_compile, imp files = '''$files''' @@ -130,12 +129,19 @@ continue sys.stdout.write(file) sys.stdout.flush() - py_compile.compile(filepath, filepath + 'c', path) + if hasattr(imp, 'get_tag'): + py_compile.compile(filepath, imp.cache_from_source(filepath), path) + else: + py_compile.compile(filepath, filepath + 'c', path) sys.stdout.write('\n')" || exit $? # this will fail for python < 1.5, but that doesn't matter ... $PYTHON -O -c " -import sys, os, py_compile +import sys, os, py_compile, imp + +# pypy does not use .pyo optimization +if hasattr(sys, 'pypy_translation_info'): + sys.exit(0) files = '''$files''' sys.stdout.write('Byte-compiling python modules (optimized versions) ...\n') @@ -147,7 +153,10 @@ continue sys.stdout.write(file) sys.stdout.flush() - py_compile.compile(filepath, filepath + 'o', path) + if hasattr(imp, 'get_tag'): + py_compile.compile(filepath, imp.cache_from_source(filepath, False), path) + else: + py_compile.compile(filepath, filepath + 'o', path) sys.stdout.write('\n')" 2>/dev/null || : # Local Variables: diff -Nru gimp-2.8.18/test-driver gimp-2.8.20/test-driver --- gimp-2.8.18/test-driver 1970-01-01 00:00:00.000000000 +0000 +++ gimp-2.8.20/test-driver 2016-11-01 23:33:03.000000000 +0000 @@ -0,0 +1,148 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2013-07-13.22; # UTC + +# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# +# 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 2, 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 . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <$log_file 2>&1 +estatus=$? + +if test $enable_hard_errors = no && test $estatus -eq 99; then + tweaked_estatus=1 +else + tweaked_estatus=$estatus +fi + +case $tweaked_estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report the test outcome and exit status in the logs, so that one can +# know whether the test passed or failed simply by looking at the '.log' +# file, without the need of also peaking into the corresponding '.trs' +# file (automake bug#11814). +echo "$res $test_name (exit status: $estatus)" >>$log_file + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -Nru gimp-2.8.18/themes/Default/images/Makefile.in gimp-2.8.20/themes/Default/images/Makefile.in --- gimp-2.8.18/themes/Default/images/Makefile.in 2016-07-12 23:20:32.000000000 +0000 +++ gimp-2.8.20/themes/Default/images/Makefile.in 2017-01-31 23:41:05.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,35 +89,48 @@ build_triplet = @build@ host_triplet = @host@ subdir = themes/Default/images -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -117,12 +167,33 @@ DATA = $(noinst_DATA) $(themedata_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -869,7 +940,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu themes/Default/images/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu themes/Default/images/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -916,22 +986,25 @@ dir='$(DESTDIR)$(themedatadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -946,57 +1019,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -1012,12 +1040,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1029,15 +1052,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1046,6 +1065,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1210,23 +1244,23 @@ uninstall-am: uninstall-themedataDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip install-themedataDATA \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-themedataDATA +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-themedataDATA installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-themedataDATA + +.PRECIOUS: Makefile stock-icons.list: $(STOCK_IMAGES) Makefile.am diff -Nru gimp-2.8.18/themes/Default/images/preferences/Makefile.in gimp-2.8.20/themes/Default/images/preferences/Makefile.in --- gimp-2.8.18/themes/Default/images/preferences/Makefile.in 2016-07-12 23:20:32.000000000 +0000 +++ gimp-2.8.20/themes/Default/images/preferences/Makefile.in 2017-01-31 23:41:06.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = themes/Default/images/preferences -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(themedatadir)" DATA = $(themedata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -534,7 +585,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu themes/Default/images/preferences/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu themes/Default/images/preferences/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -579,11 +629,11 @@ @list='$(themedata_DATA)'; test -n "$(themedatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(themedatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -722,16 +772,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-themedataDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-themedataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-themedataDATA installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-themedataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/themes/Default/Makefile.in gimp-2.8.20/themes/Default/Makefile.in --- gimp-2.8.18/themes/Default/Makefile.in 2016-07-12 23:20:32.000000000 +0000 +++ gimp-2.8.20/themes/Default/Makefile.in 2017-01-31 23:41:05.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,35 +89,48 @@ build_triplet = @build@ host_triplet = @host@ subdir = themes/Default -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -117,12 +167,33 @@ DATA = $(themedata_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -506,7 +577,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu themes/Default/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu themes/Default/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -553,22 +623,25 @@ dir='$(DESTDIR)$(themedatadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -583,57 +656,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -649,12 +677,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -666,15 +689,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -683,6 +702,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -846,23 +880,23 @@ uninstall-am: uninstall-themedataDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip install-themedataDATA \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-themedataDATA +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-themedataDATA installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-themedataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/themes/Makefile.in gimp-2.8.20/themes/Makefile.in --- gimp-2.8.18/themes/Makefile.in 2016-07-12 23:20:33.000000000 +0000 +++ gimp-2.8.20/themes/Makefile.in 2017-01-31 23:41:06.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,35 +88,48 @@ build_triplet = @build@ host_triplet = @host@ subdir = themes -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -87,12 +137,33 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -473,7 +544,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu themes/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu themes/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -499,22 +569,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -529,57 +602,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -595,12 +623,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -612,15 +635,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -629,6 +648,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -789,22 +823,22 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/themes/Small/Makefile.in gimp-2.8.20/themes/Small/Makefile.in --- gimp-2.8.18/themes/Small/Makefile.in 2016-07-12 23:20:33.000000000 +0000 +++ gimp-2.8.20/themes/Small/Makefile.in 2017-01-31 23:41:06.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +89,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = themes/Small -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +157,8 @@ } am__installdirs = "$(DESTDIR)$(themedatadir)" DATA = $(themedata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -465,7 +516,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu themes/Small/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu themes/Small/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -510,11 +560,11 @@ @list='$(themedata_DATA)'; test -n "$(themedatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(themedatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -653,16 +703,19 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-themedataDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-themedataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-themedataDATA installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-themedataDATA + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/tools/Makefile.in gimp-2.8.20/tools/Makefile.in --- gimp-2.8.18/tools/Makefile.in 2016-07-12 23:20:34.000000000 +0000 +++ gimp-2.8.20/tools/Makefile.in 2017-01-31 23:41:07.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,16 +92,22 @@ noinst_PROGRAMS = test-clipboard$(EXEEXT) EXTRA_PROGRAMS = kernelgen$(EXEEXT) subdir = tools -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -78,12 +121,25 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = am_kernelgen_OBJECTS = kernelgen.$(OBJEXT) kernelgen_OBJECTS = $(am_kernelgen_OBJECTS) kernelgen_LDADD = $(LDADD) am_test_clipboard_OBJECTS = test-clipboard.$(OBJEXT) test_clipboard_OBJECTS = $(am_test_clipboard_OBJECTS) test_clipboard_DEPENDENCIES = $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -96,31 +152,28 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(gimptool_2_0_SOURCES) $(kernelgen_SOURCES) \ $(test_clipboard_SOURCES) DIST_SOURCES = $(gimptool_2_0_SOURCES) $(kernelgen_SOURCES) \ $(test_clipboard_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -128,12 +181,33 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = pdbgen +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -562,7 +636,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu tools/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -589,10 +662,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -613,7 +688,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -635,12 +711,15 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + gimptool-2.0$(EXEEXT): $(gimptool_2_0_OBJECTS) $(gimptool_2_0_DEPENDENCIES) $(EXTRA_gimptool_2_0_DEPENDENCIES) @rm -f gimptool-2.0$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gimptool_2_0_OBJECTS) $(gimptool_2_0_LDADD) $(LIBS) + kernelgen$(EXEEXT): $(kernelgen_OBJECTS) $(kernelgen_DEPENDENCIES) $(EXTRA_kernelgen_DEPENDENCIES) @rm -f kernelgen$(EXEEXT) $(AM_V_CCLD)$(LINK) $(kernelgen_OBJECTS) $(kernelgen_LDADD) $(LIBS) + test-clipboard$(EXEEXT): $(test_clipboard_OBJECTS) $(test_clipboard_DEPENDENCIES) $(EXTRA_test_clipboard_DEPENDENCIES) @rm -f test-clipboard$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_clipboard_OBJECTS) $(test_clipboard_LDADD) $(LIBS) @@ -660,14 +739,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -683,22 +762,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -713,57 +795,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -779,12 +816,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -796,15 +828,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -813,6 +841,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -981,24 +1024,24 @@ uninstall-am: uninstall-binPROGRAMS -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-binPROGRAMS clean-generic clean-libtool \ + clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool clean-noinstPROGRAMS ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-binPROGRAMS +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gimp-2.8.18/tools/pdbgen/Makefile.in gimp-2.8.20/tools/pdbgen/Makefile.in --- gimp-2.8.18/tools/pdbgen/Makefile.in 2016-07-12 23:20:34.000000000 +0000 +++ gimp-2.8.20/tools/pdbgen/Makefile.in 2017-01-31 23:41:07.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,26 +88,38 @@ build_triplet = @build@ host_triplet = @host@ subdir = tools/pdbgen -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4macros/alsa.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \ + $(top_srcdir)/m4macros/intltool.m4 \ + $(top_srcdir)/m4macros/libtool.m4 \ + $(top_srcdir)/m4macros/ltoptions.m4 \ + $(top_srcdir)/m4macros/ltsugar.m4 \ + $(top_srcdir)/m4macros/ltversion.m4 \ + $(top_srcdir)/m4macros/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \ $(top_srcdir)/m4macros/binreloc.m4 \ $(top_srcdir)/m4macros/detectcflags.m4 \ $(top_srcdir)/m4macros/gimpprint.m4 \ $(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -78,6 +127,8 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -538,7 +589,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/pdbgen/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu tools/pdbgen/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -562,11 +612,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -703,16 +753,19 @@ .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am + clean-libtool cscopelist-am ctags-am distclean \ + distclean-generic distclean-libtool distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am + +.PRECIOUS: Makefile $(srcdir)/enums.pl: stamp-enums